diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 4a04b2a7966d9..c71828001cc5a 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
  *
- * @since 2.0.0
  */
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Url\Helper\Data
-     * @since 2.0.0
      */
     protected $_urlHelper;
 
@@ -25,7 +23,6 @@ class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php
index 88c0f4bae2879..834e23bccae64 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
  *
- * @since 2.0.0
  */
 class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -19,7 +18,6 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
index 3cea0f791cfd0..cac45a5992fc9 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
  *
- * @since 2.0.0
  */
 class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\AdminNotification\Model\Inbox
-     * @since 2.0.0
      */
     protected $_notice;
 
@@ -26,7 +24,6 @@ class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\AdminNotification\Model\Inbox $notice
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/AdminNotification/Block/Inbox.php b/app/code/Magento/AdminNotification/Block/Inbox.php
index 66f455979c02a..7137181e3cb3d 100644
--- a/app/code/Magento/AdminNotification/Block/Inbox.php
+++ b/app/code/Magento/AdminNotification/Block/Inbox.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
index a3372bb111415..2a382319fe31c 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\AdminNotification\Block\System\Messages
  *
- * @since 2.0.0
  */
 class Messages extends \Magento\Backend\Block\Template
 {
@@ -16,13 +15,11 @@ class Messages extends \Magento\Backend\Block\Template
      * Message list
      *
      * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized
-     * @since 2.0.0
      */
     protected $_messages;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -31,7 +28,6 @@ class Messages extends \Magento\Backend\Block\Template
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Prepare html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -62,7 +57,6 @@ protected function _toHtml()
      * Retrieve message list
      *
      * @return \Magento\Framework\Notification\MessageInterface[]
-     * @since 2.0.0
      */
     public function getLastCritical()
     {
@@ -80,7 +74,6 @@ public function getLastCritical()
      * Retrieve number of critical messages
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCriticalCount()
     {
@@ -93,7 +86,6 @@ public function getCriticalCount()
      * Retrieve number of major messages
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMajorCount()
     {
@@ -106,7 +98,6 @@ public function getMajorCount()
      * Check whether system messages are present
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasMessages()
     {
@@ -117,7 +108,6 @@ public function hasMessages()
      * Retrieve message list url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getMessagesUrl()
     {
@@ -128,7 +118,6 @@ protected function _getMessagesUrl()
      * Initialize system message dialog widget
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSystemMessageDialogJson()
     {
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
index fc0e6d107fbdd..bd9153968973f 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UnreadMessagePopup extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
      * List of item classes per severity
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_itemClasses = [
         MessageInterface::SEVERITY_CRITICAL => 'error',
@@ -28,7 +26,6 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
      * System Message list
      *
      * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
-     * @since 2.0.0
      */
     protected $_messages;
 
@@ -36,7 +33,6 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      * Render block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -65,7 +60,6 @@ protected function _toHtml()
      * Retrieve list of unread messages
      *
      * @return MessageInterface[]
-     * @since 2.0.0
      */
     public function getUnreadMessages()
     {
@@ -76,7 +70,6 @@ public function getUnreadMessages()
      * Retrieve popup title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getPopupTitle()
     {
@@ -93,7 +86,6 @@ public function getPopupTitle()
      *
      * @param MessageInterface $message
      * @return string
-     * @since 2.0.0
      */
     public function getItemClass(MessageInterface $message)
     {
diff --git a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
index c9eab2040de86..9b05dd200e31c 100644
--- a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
+++ b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template
 {
@@ -34,7 +33,6 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
      * Collection of latest unread notifications
      *
      * @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
-     * @since 2.0.0
      */
     protected $_notificationList;
 
@@ -42,7 +40,6 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +54,6 @@ public function __construct(
      * Retrieve notification description start length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getNotificationDescriptionLength()
     {
@@ -68,7 +64,6 @@ public function getNotificationDescriptionLength()
      * Retrieve notification counter max value
      *
      * @return int
-     * @since 2.0.0
      */
     public function getNotificationCounterMax()
     {
@@ -79,7 +74,6 @@ public function getNotificationCounterMax()
      * Retrieve number of unread notifications
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUnreadNotificationCount()
     {
@@ -90,7 +84,6 @@ public function getUnreadNotificationCount()
      * Retrieve the list of latest unread notifications
      *
      * @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
-     * @since 2.0.0
      */
     public function getLatestUnreadNotifications()
     {
@@ -102,7 +95,6 @@ public function getLatestUnreadNotifications()
      *
      * @param string $dateString
      * @return string
-     * @since 2.0.0
      */
     public function formatNotificationDate($dateString)
     {
diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
index 12bc2010cce3a..277e25dac1727 100644
--- a/app/code/Magento/AdminNotification/Block/Window.php
+++ b/app/code/Magento/AdminNotification/Block/Window.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Window extends \Magento\Backend\Block\Template
 {
@@ -22,7 +21,6 @@ class Window extends \Magento\Backend\Block\Template
      * Severity icons url
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_severityIconsUrl;
 
@@ -30,7 +28,6 @@ class Window extends \Magento\Backend\Block\Template
      * Authentication
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
@@ -38,13 +35,11 @@ class Window extends \Magento\Backend\Block\Template
      * Critical messages collection
      *
      * @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
-     * @since 2.0.0
      */
     protected $_criticalCollection;
 
     /**
      * @var \Magento\Adminnotification\Model\Inbox
-     * @since 2.0.0
      */
     protected $_latestItem;
 
@@ -53,7 +48,6 @@ class Window extends \Magento\Backend\Block\Template
      * If it isn't defined then application considers it as false.
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate;
 
@@ -62,7 +56,6 @@ class Window extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -80,7 +73,6 @@ public function __construct(
      * Render block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -100,7 +92,6 @@ protected function _toHtml()
      * Retrieve latest critical item
      *
      * @return bool|\Magento\Adminnotification\Model\Inbox
-     * @since 2.0.0
      */
     protected function _getLatestItem()
     {
@@ -119,7 +110,6 @@ protected function _getLatestItem()
      * Check whether block should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShow()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
index 1cb61117a01f0..850af7dcd6954 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
index ae50103fe4db3..55d34127970fc 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\AjaxMarkAsRead
  *
- * @since 2.0.0
  */
 class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
@@ -17,7 +16,6 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
      * Mark notification as read (AJAX action)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
index 410cac3928666..9a68c5a49c70d 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
index ccc879bcac105..d6c75014d9697 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MarkAsRead
  *
- * @since 2.0.0
  */
 class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
@@ -22,7 +21,6 @@ class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notific
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
index f32c7cc1548bf..daf688e627678 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassMarkAsRead
  *
- * @since 2.0.0
  */
 class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
@@ -23,7 +22,6 @@ class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
index a1d81fec832d4..d2b6007bd98a5 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassRemove
  *
- * @since 2.0.0
  */
 class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
@@ -23,7 +22,6 @@ class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notific
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
index 081f58090f23d..9327676e12627 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Remove
  *
- * @since 2.0.0
  */
 class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
@@ -23,7 +22,6 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
index 0af9e89b85561..cc195d04a6941 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\AdminNotification\Controller\Adminhtml\System\Message\ListAction
  *
- * @since 2.0.0
  */
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
-     * @since 2.0.0
      */
     protected $messageCollection;
 
@@ -31,7 +28,6 @@ class ListAction extends \Magento\Backend\App\AbstractAction
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection $messageCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php b/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
index 5a029be286770..3a42b4c752d55 100644
--- a/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
+++ b/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
@@ -10,13 +10,11 @@
  *
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index 0d3423bee62e7..0d628bd9c9d07 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -13,7 +13,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Feed extends \Magento\Framework\Model\AbstractModel
 {
@@ -29,26 +28,22 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * Feed url
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_feedUrl;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_backendConfig;
 
     /**
      * @var \Magento\AdminNotification\Model\InboxFactory
-     * @since 2.0.0
      */
     protected $_inboxFactory;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\CurlFactory
      *
-     * @since 2.0.0
      */
     protected $curlFactory;
 
@@ -56,19 +51,16 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * Deployment configuration
      *
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     protected $_deploymentConfig;
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
-     * @since 2.0.0
      */
     protected $productMetadata;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -85,7 +77,6 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -113,7 +104,6 @@ public function __construct(
      * Init model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -123,7 +113,6 @@ protected function _construct()
      * Retrieve feed url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFeedUrl()
     {
@@ -138,7 +127,6 @@ public function getFeedUrl()
      * Check feed for modification
      *
      * @return $this
-     * @since 2.0.0
      */
     public function checkUpdate()
     {
@@ -179,7 +167,6 @@ public function checkUpdate()
      * Retrieve Update Frequency
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFrequency()
     {
@@ -190,7 +177,6 @@ public function getFrequency()
      * Retrieve Last update time
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLastUpdate()
     {
@@ -201,7 +187,6 @@ public function getLastUpdate()
      * Set last update time (now)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setLastUpdate()
     {
@@ -213,7 +198,6 @@ public function setLastUpdate()
      * Retrieve feed data as XML element
      *
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     public function getFeedData()
     {
@@ -249,7 +233,6 @@ public function getFeedData()
      * Retrieve feed as XML element
      *
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     public function getFeedXml()
     {
diff --git a/app/code/Magento/AdminNotification/Model/Inbox.php b/app/code/Magento/AdminNotification/Model/Inbox.php
index 5c670d06b9093..d13045a5c9cb5 100644
--- a/app/code/Magento/AdminNotification/Model/Inbox.php
+++ b/app/code/Magento/AdminNotification/Model/Inbox.php
@@ -30,13 +30,11 @@
  * @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
  *
  * @api
- * @since 2.0.0
  */
 class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -45,7 +43,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSeverities($severity = null)
     {
@@ -68,7 +65,6 @@ public function getSeverities($severity = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadLatestNotice()
     {
@@ -79,7 +75,6 @@ public function loadLatestNotice()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNoticeStatus()
     {
@@ -91,7 +86,6 @@ public function getNoticeStatus()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function parse(array $data)
     {
@@ -109,7 +103,6 @@ public function parse(array $data)
      * @param bool $isInternal
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function add($severity, $title, $description, $url = '', $isInternal = true)
     {
@@ -143,7 +136,6 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addCritical($title, $description, $url = '', $isInternal = true)
     {
@@ -159,7 +151,6 @@ public function addCritical($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMajor($title, $description, $url = '', $isInternal = true)
     {
@@ -175,7 +166,6 @@ public function addMajor($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMinor($title, $description, $url = '', $isInternal = true)
     {
@@ -191,7 +181,6 @@ public function addMinor($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addNotice($title, $description, $url = '', $isInternal = true)
     {
diff --git a/app/code/Magento/AdminNotification/Model/InboxInterface.php b/app/code/Magento/AdminNotification/Model/InboxInterface.php
index f241c6176bc0e..5248f171ceb21 100644
--- a/app/code/Magento/AdminNotification/Model/InboxInterface.php
+++ b/app/code/Magento/AdminNotification/Model/InboxInterface.php
@@ -10,7 +10,6 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 interface InboxInterface
 {
@@ -20,7 +19,6 @@ interface InboxInterface
      * @param int|null $severity
      * @return array|string|null
      * @api
-     * @since 2.0.0
      */
     public function getSeverities($severity = null);
 
@@ -29,7 +27,6 @@ public function getSeverities($severity = null);
      *
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function loadLatestNotice();
 
@@ -38,7 +35,6 @@ public function loadLatestNotice();
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getNoticeStatus();
 }
diff --git a/app/code/Magento/AdminNotification/Model/NotificationService.php b/app/code/Magento/AdminNotification/Model/NotificationService.php
index feb162954b83f..96ed6dcab9df4 100644
--- a/app/code/Magento/AdminNotification/Model/NotificationService.php
+++ b/app/code/Magento/AdminNotification/Model/NotificationService.php
@@ -10,19 +10,16 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class NotificationService
 {
     /**
      * @var \Magento\AdminNotification\Model\InboxFactory $notificationFactory
-     * @since 2.0.0
      */
     protected $_notificationFactory;
 
     /**
      * @param \Magento\AdminNotification\Model\InboxFactory $notificationFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\AdminNotification\Model\InboxFactory $notificationFactory)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\AdminNotification\Model\InboxFactory $notif
      * @param int $notificationId
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function markAsRead($notificationId)
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
index a166e7e4ca43d..d325ed437a3a6 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Co
      * Add remove filter
      *
      * @return Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
index 4cb605e1bb4c3..612ce319d938e 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * AdminNotification Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -27,7 +25,6 @@ protected function _construct()
      *
      * @param \Magento\AdminNotification\Model\Inbox $object
      * @return $this
-     * @since 2.0.0
      */
     public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
     {
@@ -60,7 +57,6 @@ public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
      * @param \Magento\AdminNotification\Model\Inbox $object
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
     {
@@ -91,7 +87,6 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
      * @param array $data
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function parse(\Magento\AdminNotification\Model\Inbox $object, array $data)
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
index 4592e445f5440..5bebf436eb883 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
@@ -11,7 +11,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * Add remove filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRemoveFilter()
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
index eafdb6c4c0770..bd45860556c9e 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abst
      * Resource collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
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 c1989881739cc..211657fac5b77 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
@@ -21,7 +20,6 @@ class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collec
      * Init collection select
      *
      * @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
index 7aafbe533c309..90cd28dd228ff 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Flag that notifies whether Primary key of table is auto-incremeted
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPkAutoIncrement = false;
 
@@ -23,7 +21,6 @@ class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
index a151e1349874a..2cf19318e0723 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * System message list
      *
      * @var \Magento\Framework\Notification\MessageList
-     * @since 2.0.0
      */
     protected $_messageList;
 
@@ -23,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Number of messages by severity
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_countBySeverity = [];
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Notification\MessageList $messageList
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -54,7 +50,6 @@ public function __construct(
      * Resource collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +63,6 @@ protected function _construct()
      * Initialize db query
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -80,7 +74,6 @@ protected function _initSelect()
      * Initialize system messages after load
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -104,7 +97,6 @@ protected function _afterLoad()
      *
      * @param int $severity
      * @return $this
-     * @since 2.0.0
      */
     public function setSeverity($severity)
     {
@@ -117,7 +109,6 @@ public function setSeverity($severity)
      *
      * @param int $severity
      * @return int
-     * @since 2.0.0
      */
     public function getCountBySeverity($severity)
     {
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
index 116ea0c4c4ad6..89f00fe0f52f2 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
 {
@@ -15,7 +14,6 @@ class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System
      * Unread message list
      *
      * @var \Magento\Framework\Notification\MessageInterface[]
-     * @since 2.0.0
      */
     protected $_unreadMessages = [];
 
@@ -23,7 +21,6 @@ class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System
      * Store new messages in database and remove outdated messages
      *
      * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function _afterLoad()
     {
@@ -63,7 +60,6 @@ public function _afterLoad()
      * Retrieve list of unread messages
      *
      * @return \Magento\Framework\Notification\MessageInterface[]
-     * @since 2.0.0
      */
     public function getUnread()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message.php b/app/code/Magento/AdminNotification/Model/System/Message.php
index 05e34f9676616..de437d9bf3e28 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message.php
@@ -8,13 +8,11 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -25,7 +23,6 @@ protected function _construct()
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -36,7 +33,6 @@ public function isDisplayed()
      * Retrieve message text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -47,7 +43,6 @@ public function getText()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
@@ -58,7 +53,6 @@ public function getSeverity()
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index 95440ff0cd719..63e62abcb6733 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -10,31 +10,26 @@
 
 /**
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
@@ -43,7 +38,6 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
@@ -61,7 +55,6 @@ public function __construct(
      * Get url for config settings where base url option can be changed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getConfigUrl()
     {
@@ -105,7 +98,6 @@ protected function _getConfigUrl()
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -116,7 +108,6 @@ public function getIdentity()
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -127,7 +118,6 @@ public function isDisplayed()
      * Retrieve message text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -143,7 +133,6 @@ public function getText()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
index ebbe84c1cd821..a5dc649a266a2 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
@@ -33,7 +29,6 @@ class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\AuthorizationInterface $authorization,
@@ -49,7 +44,6 @@ public function __construct(
      * Get array of cache types which require data refresh
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCacheTypesForRefresh()
     {
@@ -64,7 +58,6 @@ protected function _getCacheTypesForRefresh()
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -75,7 +68,6 @@ public function getIdentity()
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -90,7 +82,6 @@ public function isDisplayed()
      * Retrieve message text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -105,7 +96,6 @@ public function getText()
      * Retrieve problem management url
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -116,7 +106,6 @@ public function getLink()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php
index 1257f31b559ba..20f7e1f46b64d 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
 {
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\Flag
-     * @since 2.0.0
      */
     protected $_syncFlag;
 
@@ -21,7 +19,6 @@ abstract class AbstractSynchronization implements \Magento\Framework\Notificatio
      * Message identity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_identity;
 
@@ -29,13 +26,11 @@ abstract class AbstractSynchronization implements \Magento\Framework\Notificatio
      * Is displayed flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDisplayed = null;
 
     /**
      * @param \Magento\MediaStorage\Model\File\Storage\Flag $fileStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\MediaStorage\Model\File\Storage\Flag $fileStorage)
     {
@@ -46,7 +41,6 @@ public function __construct(\Magento\MediaStorage\Model\File\Storage\Flag $fileS
      * Check if message should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function _shouldBeDisplayed();
 
@@ -54,7 +48,6 @@ abstract protected function _shouldBeDisplayed();
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -65,7 +58,6 @@ public function getIdentity()
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -84,7 +76,6 @@ public function isDisplayed()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
index 8d15c30cef7f3..8b9695c1d3bad 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
@@ -16,7 +15,6 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
      * Message identity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_identity = 'MEDIA_SYNCHRONIZATION_ERROR';
 
@@ -24,7 +22,6 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _shouldBeDisplayed()
     {
@@ -36,7 +33,6 @@ protected function _shouldBeDisplayed()
      * Retrieve message text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getText()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
index b7e267ab93358..82f98b97f230d 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
@@ -15,7 +14,6 @@ class Success extends \Magento\AdminNotification\Model\System\Message\Media\Abst
      * Message identity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_identity = 'MEDIA_SYNCHRONIZATION_SUCCESS';
 
@@ -23,7 +21,6 @@ class Success extends \Magento\AdminNotification\Model\System\Message\Media\Abst
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _shouldBeDisplayed()
     {
@@ -37,7 +34,6 @@ protected function _shouldBeDisplayed()
      * Retrieve message text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getText()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index 2938c3592bc0b..dad52074befeb 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
@@ -23,7 +22,6 @@ class Security implements \Magento\Framework\Notification\MessageInterface
      * File path for verification
      *
      * @var string
-     * @since 2.0.0
      */
     private $_filePath = 'app/etc/config.php';
 
@@ -31,31 +29,26 @@ class Security implements \Magento\Framework\Notification\MessageInterface
      * Time out for HTTP verification request
      *
      * @var int
-     * @since 2.0.0
      */
     private $_verificationTimeOut = 2;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_backendConfig;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\CurlFactory
-     * @since 2.0.0
      */
     protected $_curlFactory;
 
@@ -64,7 +57,6 @@ class Security implements \Magento\Framework\Notification\MessageInterface
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
@@ -82,7 +74,6 @@ public function __construct(
      * Check verification result and return true if system must to show notification message
      *
      * @return bool
-     * @since 2.0.0
      */
     private function _canShowNotification()
     {
@@ -103,7 +94,6 @@ private function _canShowNotification()
      * If file is accessible return true or false
      *
      * @return bool
-     * @since 2.0.0
      */
     private function _isFileAccessible()
     {
@@ -124,7 +114,6 @@ private function _isFileAccessible()
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -135,7 +124,6 @@ public function getIdentity()
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -146,7 +134,6 @@ public function isDisplayed()
      * Retrieve message text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -160,7 +147,6 @@ public function getText()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 4a9fee93a3919..3275de2a82fb7 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -11,26 +11,22 @@
  * AdminNotification observer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {
     /**
      * @var \Magento\AdminNotification\Model\FeedFactory
-     * @since 2.0.0
      */
     protected $_feedFactory;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_backendAuthSession;
 
     /**
      * @param \Magento\AdminNotification\Model\FeedFactory $feedFactory
      * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\AdminNotification\Model\FeedFactory $feedFactory,
@@ -46,7 +42,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/AdminNotification/Setup/InstallSchema.php b/app/code/Magento/AdminNotification/Setup/InstallSchema.php
index 12ba09122bc35..081be974dc809 100644
--- a/app/code/Magento/AdminNotification/Setup/InstallSchema.php
+++ b/app/code/Magento/AdminNotification/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index f3493b330a753..823391e68cd31 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export\GetFilter
  *
- * @since 2.0.0
  */
 class GetFilter extends ExportController
 {
@@ -21,7 +20,6 @@ class GetFilter extends ExportController
      * Get grid-filter of entity attributes action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 1c628eb16595e..6a34541ac75d7 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
 {
@@ -25,31 +24,26 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $_storeResolver;
 
     /**
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $_groupRepository;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_passTierPrice = 0;
 
@@ -57,7 +51,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * List of items websites
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_priceWebsite = [
         ImportAdvancedPricing::COL_TIER_PRICE_WEBSITE,
@@ -67,7 +60,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * List of items customer groups
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_priceCustomerGroup = [
         ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP,
@@ -77,7 +69,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * Export template
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateExportData = [
         ImportAdvancedPricing::COL_SKU => '',
@@ -109,7 +100,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -157,7 +147,6 @@ public function __construct(
     /**
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function initTypeModels()
     {
@@ -198,7 +187,6 @@ protected function initTypeModels()
      * Export process
      *
      * @return string
-     * @since 2.0.0
      */
     public function export()
     {
@@ -233,7 +221,6 @@ public function export()
      *
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection)
     {
@@ -265,7 +252,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function getExportData()
     {
@@ -299,7 +285,6 @@ protected function getExportData()
      * @param array $exportData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function correctExportData($exportData)
     {
@@ -361,7 +346,6 @@ private function tierPriceTypeValue($tierPricePercentage)
      * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function getTierPrices(array $listSku, $table)
     {
@@ -434,7 +418,6 @@ protected function getTierPrices(array $listSku, $table)
      *
      * @param int $websiteId
      * @return string
-     * @since 2.0.0
      */
     protected function _getWebsiteCode($websiteId)
     {
@@ -458,7 +441,6 @@ protected function _getWebsiteCode($websiteId)
      * @param int $customerGroupId
      * @param null $allGroups
      * @return string
-     * @since 2.0.0
      */
     protected function _getCustomerGroupById($customerGroupId, $allGroups = null)
     {
@@ -473,7 +455,6 @@ protected function _getCustomerGroupById($customerGroupId, $allGroups = null)
      * Get Entity type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 25445ae0703a0..91b844e0c3587 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 {
@@ -58,7 +57,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * Validation failure message template definitions.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [
         ValidatorInterface::ERROR_INVALID_WEBSITE => 'Invalid value in Website column (website does not exists?)',
@@ -78,7 +76,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * If we should check column names
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needColumnCheck = true;
 
@@ -86,7 +83,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * Valid column names.
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [
         self::COL_SKU,
@@ -101,55 +97,46 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * Need to log in import history
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $logInHistory = true;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory
-     * @since 2.0.0
      */
     protected $_resourceFactory;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_productModel;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $_storeResolver;
 
     /**
      * @var ImportProduct
-     * @since 2.0.0
      */
     protected $_importProduct;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_validators = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_cachedSkuToDelete;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_oldSkus = null;
 
@@ -157,7 +144,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [self::COL_SKU];
 
@@ -165,13 +151,11 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * Catalog product entity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_catalogProductEntity;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -203,7 +187,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param AdvancedPricing\Validator\Website $websiteValidator
      * @param AdvancedPricing\Validator\TierPrice $tierPriceValidator
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -252,7 +235,6 @@ public function __construct(
      *
      * @param string $type
      * @return AdvancedPricing\Validator|AdvancedPricing\Validator\Website
-     * @since 2.0.0
      */
     protected function _getValidator($type)
     {
@@ -263,7 +245,6 @@ protected function _getValidator($type)
      * Entity type code getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -276,7 +257,6 @@ public function getEntityTypeCode()
      * @param array $rowData
      * @param int $rowNum
      * @return bool
-     * @since 2.0.0
      */
     public function validateRow(array $rowData, $rowNum)
     {
@@ -312,7 +292,6 @@ public function validateRow(array $rowData, $rowNum)
      *
      * @throws \Exception
      * @return bool Result of operation.
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -331,7 +310,6 @@ protected function _importData()
      * Save advanced pricing
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveAdvancedPricing()
     {
@@ -343,7 +321,6 @@ public function saveAdvancedPricing()
      * Deletes Advanced price data from raw data.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function deleteAdvancedPricing()
     {
@@ -372,7 +349,6 @@ public function deleteAdvancedPricing()
      * Replace advanced pricing
      *
      * @return $this
-     * @since 2.0.0
      */
     public function replaceAdvancedPricing()
     {
@@ -386,7 +362,6 @@ public function replaceAdvancedPricing()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function saveAndReplaceAdvancedPrices()
     {
@@ -450,7 +425,6 @@ protected function saveAndReplaceAdvancedPrices()
      * @param array $priceData
      * @param string $table
      * @return $this
-     * @since 2.0.0
      */
     protected function saveProductPrices(array $priceData, $table)
     {
@@ -482,7 +456,6 @@ protected function saveProductPrices(array $priceData, $table)
      * @param array $listSku
      * @param string $table
      * @return boolean
-     * @since 2.0.0
      */
     protected function deleteProductTierPrices(array $listSku, $table)
     {
@@ -520,7 +493,6 @@ protected function deleteProductTierPrices(array $listSku, $table)
      *
      * @param array $listSku
      * @return $this
-     * @since 2.0.0
      */
     protected function setUpdatedAt(array $listSku)
     {
@@ -538,7 +510,6 @@ protected function setUpdatedAt(array $listSku)
      *
      * @param string $websiteCode
      * @return array|int|string
-     * @since 2.0.0
      */
     protected function getWebSiteId($websiteCode)
     {
@@ -552,7 +523,6 @@ protected function getWebSiteId($websiteCode)
      *
      * @param string $customerGroup
      * @return int
-     * @since 2.0.0
      */
     protected function getCustomerGroupId($customerGroup)
     {
@@ -564,7 +534,6 @@ protected function getCustomerGroupId($customerGroup)
      * Retrieve product skus
      *
      * @return array
-     * @since 2.0.0
      */
     protected function retrieveOldSkus()
     {
@@ -585,7 +554,6 @@ protected function retrieveOldSkus()
      * @param array $prices
      * @param string $table
      * @return $this
-     * @since 2.0.0
      */
     protected function processCountExistingPrices($prices, $table)
     {
@@ -620,7 +588,6 @@ protected function processCountExistingPrices($prices, $table)
      * @param array $prices
      * @param array $existingPrice
      * @return void
-     * @since 2.0.0
      */
     protected function incrementCounterUpdated($prices, $existingPrice)
     {
@@ -638,7 +605,6 @@ protected function incrementCounterUpdated($prices, $existingPrice)
      *
      * @param array $tierPrices
      * @return $this
-     * @since 2.0.0
      */
     protected function processCountNewPrices(array $tierPrices)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
index 5229e8a974538..35ae530d539cd 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator
  *
- * @since 2.0.0
  */
 class Validator extends AbstractValidator implements RowValidatorInterface
 {
     /**
      * @var RowValidatorInterface[]|AbstractValidator[]
-     * @since 2.0.0
      */
     protected $validators = [];
 
     /**
      * @param RowValidatorInterface[] $validators
-     * @since 2.0.0
      */
     public function __construct($validators = [])
     {
@@ -35,7 +32,6 @@ public function __construct($validators = [])
      *
      * @param array $value
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -53,7 +49,6 @@ public function isValid($value)
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product $context
      * @return $this
-     * @since 2.0.0
      */
     public function init($context)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
index 30b55ec3cd31c..240a9d711fbec 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPrice
  *
- * @since 2.0.0
  */
 class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice
 {
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $storeResolver;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_tierPriceColumns = [
         AdvancedPricing::COL_TIER_PRICE_WEBSITE,
@@ -37,7 +34,6 @@ class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Valida
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Api\GroupRepositoryInterface $groupRepository,
@@ -50,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function init($context)
     {
@@ -63,7 +58,6 @@ public function init($context)
     /**
      * @param string $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function addDecimalError($attribute)
     {
@@ -83,7 +77,6 @@ protected function addDecimalError($attribute)
      * Get existing customers groups
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomerGroups()
     {
@@ -100,7 +93,6 @@ public function getCustomerGroups()
      * @param mixed $value
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -146,7 +138,6 @@ public function isValid($value)
      *
      * @param array $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidValueAndLength(array $value)
     {
@@ -164,7 +155,6 @@ protected function isValidValueAndLength(array $value)
      *
      * @param array $value
      * @return bool
-     * @since 2.0.0
      */
     protected function hasEmptyColumns(array $value)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
index 3b4f096117ba4..350a7e7651da0 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website
  *
- * @since 2.0.0
  */
 class Website extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $storeResolver;
 
     /**
      * @var \Magento\Store\Model\Website
-     * @since 2.0.0
      */
     protected $websiteModel;
 
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
      * @param \Magento\Store\Model\Website $websiteModel
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function init($context)
     {
@@ -56,7 +51,6 @@ public function init($context)
      * @param array $value
      * @param string $websiteCode
      * @return bool
-     * @since 2.0.0
      */
     protected function isWebsiteValid($value, $websiteCode)
     {
@@ -74,7 +68,6 @@ protected function isWebsiteValid($value, $websiteCode)
      *
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -93,7 +86,6 @@ public function isValid($value)
      * Get all websites value with currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAllWebsitesValue()
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php b/app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php
index 3919c424047c8..0b081923e28ec 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
 {
@@ -20,7 +19,6 @@ class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\Abstrac
      * @param AdvancedPricing $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSaveAdvancedPricing(AdvancedPricing $subject)
     {
@@ -35,7 +33,6 @@ public function afterSaveAdvancedPricing(AdvancedPricing $subject)
      * @param AdvancedPricing $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDeleteAdvancedPricing(AdvancedPricing $subject)
     {
@@ -48,7 +45,6 @@ public function afterDeleteAdvancedPricing(AdvancedPricing $subject)
      * Get price indexer
      *
      * @return \Magento\Framework\Indexer\IndexerInterface
-     * @since 2.0.0
      */
     protected function getPriceIndexer()
     {
diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php
index 7e464a5ad46d1..31059df5f77a3 100644
--- a/app/code/Magento/Analytics/ReportXml/Query.php
+++ b/app/code/Magento/Analytics/ReportXml/Query.php
@@ -92,7 +92,7 @@ public function getConfig()
      * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
      * @return mixed data which can be serialized by <b>json_encode</b>,
      * which is a value of any type other than a resource.
-     * @since 5.4.0
+     * @since 2.2.0
      */
     public function jsonSerialize()
     {
diff --git a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
index 92dd181f26434..f22cbaf46332b 100644
--- a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
+++ b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -18,7 +18,6 @@
 /**
  * Permission tree retriever
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AclRetriever
 {
@@ -27,25 +26,21 @@ class AclRetriever
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Authorization\Model\ResourceModel\Rules\CollectionFactory
-     * @since 2.0.0
      */
     protected $rulesCollectionFactory;
 
     /**
      * @var \Magento\Framework\Acl\Builder
-     * @since 2.0.0
      */
     protected $aclBuilder;
 
     /**
      * @var \Magento\Authorization\Model\ResourceModel\Role\CollectionFactory
-     * @since 2.0.0
      */
     protected $roleCollectionFactory;
 
@@ -56,7 +51,6 @@ class AclRetriever
      * @param RoleCollectionFactory $roleCollectionFactory
      * @param RulesCollectionFactory $rulesCollectionFactory
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(
         AclBuilder $aclBuilder,
@@ -78,7 +72,6 @@ public function __construct(
      * @return string[]
      * @throws AuthorizationException
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getAllowedResourcesByUser($userType, $userId)
     {
@@ -114,7 +107,6 @@ public function getAllowedResourcesByUser($userType, $userId)
      *
      * @param string $roleId
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllowedResourcesByRole($roleId)
     {
@@ -139,7 +131,6 @@ public function getAllowedResourcesByRole($roleId)
      * @param int $userId
      * @return \Magento\Authorization\Model\Role|bool False if no role associated with provided user was found.
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _getUserRole($userType, $userId)
     {
@@ -161,7 +152,6 @@ protected function _getUserRole($userType, $userId)
      *
      * @param int $userType
      * @return bool
-     * @since 2.0.0
      */
     protected function _canRoleBeCreatedForUserType($userType)
     {
diff --git a/app/code/Magento/Authorization/Model/Acl/Loader/Role.php b/app/code/Magento/Authorization/Model/Acl/Loader/Role.php
index eec9c026bddcb..5e1ce2c6f9700 100644
--- a/app/code/Magento/Authorization/Model/Acl/Loader/Role.php
+++ b/app/code/Magento/Authorization/Model/Acl/Loader/Role.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Authorization\Model\Acl\Loader\Role
  *
- * @since 2.0.0
  */
 class Role implements \Magento\Framework\Acl\LoaderInterface
 {
@@ -24,19 +23,16 @@ class Role implements \Magento\Framework\Acl\LoaderInterface
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Authorization\Model\Acl\Role\GroupFactory
-     * @since 2.0.0
      */
     protected $_groupFactory;
 
     /**
      * @var \Magento\Authorization\Model\Acl\Role\UserFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
@@ -65,7 +61,6 @@ class Role implements \Magento\Framework\Acl\LoaderInterface
      * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
      * @param Json $serializer
      * @param string $cacheKey
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Authorization\Model\Acl\Role\GroupFactory $groupFactory,
@@ -90,7 +85,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Acl $acl
      * @return void
-     * @since 2.0.0
      */
     public function populateAcl(\Magento\Framework\Acl $acl)
     {
diff --git a/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php b/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php
index 2227bb8b924bd..e1f22ed70c838 100644
--- a/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php
+++ b/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Authorization\Model\Acl\Loader\Rule
  *
- * @since 2.0.0
  */
 class Rule implements \Magento\Framework\Acl\LoaderInterface
 {
@@ -22,7 +21,6 @@ class Rule implements \Magento\Framework\Acl\LoaderInterface
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -58,7 +56,6 @@ class Rule implements \Magento\Framework\Acl\LoaderInterface
      * @param Json $serializer
      * @param string $cacheKey
      * @SuppressWarnings(PHPMD.UnusedFormalParameter):
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Acl\RootResource $rootResource,
@@ -82,7 +79,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Acl $acl
      * @return void
-     * @since 2.0.0
      */
     public function populateAcl(\Magento\Framework\Acl $acl)
     {
diff --git a/app/code/Magento/Authorization/Model/Acl/Role/Generic.php b/app/code/Magento/Authorization/Model/Acl/Role/Generic.php
index 6bc59039a82d1..c4d1f8baa25c6 100644
--- a/app/code/Magento/Authorization/Model/Acl/Role/Generic.php
+++ b/app/code/Magento/Authorization/Model/Acl/Role/Generic.php
@@ -7,7 +7,6 @@
 
 /**
  * Generic acl role
- * @since 2.0.0
  */
 class Generic extends \Zend_Acl_Role
 {
diff --git a/app/code/Magento/Authorization/Model/Acl/Role/Group.php b/app/code/Magento/Authorization/Model/Acl/Role/Group.php
index f4e5e6c4e4b65..4af8f7009a1bd 100644
--- a/app/code/Magento/Authorization/Model/Acl/Role/Group.php
+++ b/app/code/Magento/Authorization/Model/Acl/Role/Group.php
@@ -7,7 +7,6 @@
 
 /**
  * Acl Group model
- * @since 2.0.0
  */
 class Group extends \Magento\Authorization\Model\Acl\Role\Generic
 {
diff --git a/app/code/Magento/Authorization/Model/Acl/Role/User.php b/app/code/Magento/Authorization/Model/Acl/Role/User.php
index e3c48bce9c5dd..b7e9fbc63fccd 100644
--- a/app/code/Magento/Authorization/Model/Acl/Role/User.php
+++ b/app/code/Magento/Authorization/Model/Acl/Role/User.php
@@ -7,7 +7,6 @@
 
 /**
  * User acl role
- * @since 2.0.0
  */
 class User extends \Magento\Authorization\Model\Acl\Role\Generic
 {
diff --git a/app/code/Magento/Authorization/Model/CompositeUserContext.php b/app/code/Magento/Authorization/Model/CompositeUserContext.php
index b18197cdb2e3d..1f98631188307 100644
--- a/app/code/Magento/Authorization/Model/CompositeUserContext.php
+++ b/app/code/Magento/Authorization/Model/CompositeUserContext.php
@@ -15,19 +15,16 @@
  * Instead, it will try to find the first suitable child and return its result.
  *
  * @api
- * @since 2.0.0
  */
 class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
 {
     /**
      * @var UserContextInterface[]
-     * @since 2.0.0
      */
     protected $userContexts = [];
 
     /**
      * @var UserContextInterface|bool
-     * @since 2.0.0
      */
     protected $chosenUserContext;
 
@@ -36,7 +33,6 @@ class CompositeUserContext implements \Magento\Authorization\Model\UserContextIn
      *
      * @param CompositeHelper $compositeHelper
      * @param UserContextInterface[] $userContexts
-     * @since 2.0.0
      */
     public function __construct(CompositeHelper $compositeHelper, $userContexts = [])
     {
@@ -51,7 +47,6 @@ public function __construct(CompositeHelper $compositeHelper, $userContexts = []
      *
      * @param UserContextInterface $userContext
      * @return CompositeUserContext
-     * @since 2.0.0
      */
     protected function add(UserContextInterface $userContext)
     {
@@ -61,7 +56,6 @@ protected function add(UserContextInterface $userContext)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -70,7 +64,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
@@ -81,7 +74,6 @@ public function getUserType()
      * Retrieve user context
      *
      * @return UserContextInterface|bool False if none of the registered user contexts can identify user type
-     * @since 2.0.0
      */
     protected function getUserContext()
     {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php
index 00bb1aa1ec82b..22949341fbeca 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php
@@ -10,7 +10,6 @@
  *
  * @deprecated 2.2.0
  * @see \Magento\Authorization\Model\ResourceModel\Rules\Collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Authorization\Model\ResourceModel\Rules\Collection
 {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role.php b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
index 6b6969fc4d186..633ae741b44a1 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Role.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
@@ -9,7 +9,6 @@
 
 /**
  * Admin role resource model
- * @since 2.0.0
  */
 class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rule table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ruleTable;
 
@@ -25,7 +23,6 @@ class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Cache
      *
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -33,7 +30,6 @@ class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -61,7 +56,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $role
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
     {
@@ -105,7 +99,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
      * @param \Magento\Framework\Model\AbstractModel $role
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $role)
     {
@@ -118,7 +111,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $role)
      *
      * @param \Magento\Framework\Model\AbstractModel $role
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
     {
@@ -136,7 +128,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
      *
      * @param \Magento\Authorization\Model\Role $role
      * @return array
-     * @since 2.0.0
      */
     public function getRoleUsers(\Magento\Authorization\Model\Role $role)
     {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php
index 973bccacaa079..18f932d2732d0 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php
@@ -11,7 +11,6 @@
  * Admin role collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * @param int $userId
      * @param string $userType
      * @return $this
-     * @since 2.0.0
      */
     public function setUserFilter($userId, $userType)
     {
@@ -45,7 +42,6 @@ public function setUserFilter($userId, $userType)
      * Set roles filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRolesFilter()
     {
@@ -57,7 +53,6 @@ public function setRolesFilter()
      * Convert to option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role/Grid/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Role/Grid/Collection.php
index 5a5f073f6bd95..76e128a587e09 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Role/Grid/Collection.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Role/Grid/Collection.php
@@ -9,7 +9,6 @@
 
 /**
  * Admin role data grid collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Authorization\Model\ResourceModel\Role\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Authorization\Model\ResourceModel\Role\Collect
      * Prepare select for load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
index c72ff5c7162af..869c5c97f82bd 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
@@ -10,7 +10,6 @@
 
 /**
  * Admin rule resource model
- * @since 2.0.0
  */
 class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,19 +17,16 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Root ACL resource
      *
      * @var \Magento\Framework\Acl\RootResource
-     * @since 2.0.0
      */
     protected $_rootResource;
 
     /**
      * @var \Magento\Framework\Acl\Builder
-     * @since 2.0.0
      */
     protected $_aclBuilder;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -47,7 +43,6 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Acl\RootResource $rootResource
      * @param string $connectionName
      * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +77,6 @@ protected function _construct()
      * @param \Magento\Authorization\Model\Rules $rule
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveRel(\Magento\Authorization\Model\Rules $rule)
     {
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php
index a5025eb257259..d90cdfd1df6d7 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php
@@ -9,7 +9,6 @@
  * Rules collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      *
      * @param int $roleId
      * @return $this
-     * @since 2.0.0
      */
     public function getByRoles($roleId)
     {
@@ -44,7 +41,6 @@ public function getByRoles($roleId)
      * Sort by length
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSortByLength()
     {
diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
index db51a3e3875d2..ab6e180762ef1 100644
--- a/app/code/Magento/Authorization/Model/Role.php
+++ b/app/code/Magento/Authorization/Model/Role.php
@@ -26,13 +26,11 @@
  * @method string getRoleName()
  * @method \Magento\Authorization\Model\Role setRoleName(string $value)
  * @api
- * @since 2.0.0
  */
 class Role extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'authorization_roles';
 
@@ -42,7 +40,6 @@ class Role extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Authorization\Model\ResourceModel\Role $resource
      * @param \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,7 +53,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -66,7 +62,6 @@ public function __sleep()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -82,7 +77,6 @@ public function __wakeup()
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -93,7 +87,6 @@ protected function _construct()
      * Update object into database
      *
      * @return $this
-     * @since 2.0.0
      */
     public function update()
     {
@@ -105,7 +98,6 @@ public function update()
      * Return users for role
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRoleUsers()
     {
diff --git a/app/code/Magento/Authorization/Model/Rules.php b/app/code/Magento/Authorization/Model/Rules.php
index c097e80d8e02b..77ca82e059ca8 100644
--- a/app/code/Magento/Authorization/Model/Rules.php
+++ b/app/code/Magento/Authorization/Model/Rules.php
@@ -22,7 +22,6 @@
  * @method string getPermission()
  * @method \Magento\Authorization\Model\Rules setPermission(string $value)
  * @api
- * @since 2.0.0
  */
 class Rules extends \Magento\Framework\Model\AbstractModel
 {
@@ -34,7 +33,6 @@ class Rules extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Authorization\Model\ResourceModel\Rules $resource
      * @param \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -50,7 +48,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +56,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function update()
     {
@@ -69,7 +65,6 @@ public function update()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function saveRel()
     {
diff --git a/app/code/Magento/Authorization/Model/UserContextInterface.php b/app/code/Magento/Authorization/Model/UserContextInterface.php
index be2077a72f085..2db9cec811651 100644
--- a/app/code/Magento/Authorization/Model/UserContextInterface.php
+++ b/app/code/Magento/Authorization/Model/UserContextInterface.php
@@ -10,7 +10,6 @@
  * Interface for current user identification.
  *
  * @api
- * @since 2.0.0
  */
 interface UserContextInterface
 {
@@ -28,7 +27,6 @@ interface UserContextInterface
      *
      * @return int|null
      * @api
-     * @since 2.0.0
      */
     public function getUserId();
 
@@ -37,7 +35,6 @@ public function getUserId();
      *
      * @return int|null
      * @api
-     * @since 2.0.0
      */
     public function getUserType();
 }
diff --git a/app/code/Magento/Authorization/Setup/AuthorizationFactory.php b/app/code/Magento/Authorization/Setup/AuthorizationFactory.php
index 514dd52abf354..5feff786fb75e 100644
--- a/app/code/Magento/Authorization/Setup/AuthorizationFactory.php
+++ b/app/code/Magento/Authorization/Setup/AuthorizationFactory.php
@@ -9,7 +9,6 @@
  * Resource Setup Model
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class AuthorizationFactory
 {
@@ -17,7 +16,6 @@ class AuthorizationFactory
      * Role model factory
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleCollectionFactory;
 
@@ -25,7 +23,6 @@ class AuthorizationFactory
      * Factory for rules model
      *
      * @var \Magento\Authorization\Model\RulesFactory
-     * @since 2.0.0
      */
     protected $_rulesCollectionFactory;
 
@@ -33,7 +30,6 @@ class AuthorizationFactory
      * Role model factory
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
@@ -41,7 +37,6 @@ class AuthorizationFactory
      * Rules model factory
      *
      * @var \Magento\Authorization\Model\RulesFactory
-     * @since 2.0.0
      */
     protected $_rulesFactory;
 
@@ -52,7 +47,6 @@ class AuthorizationFactory
      * @param \Magento\Authorization\Model\ResourceModel\Rules\CollectionFactory $rulesCollectionFactory
      * @param \Magento\Authorization\Model\RoleFactory $roleFactory
      * @param \Magento\Authorization\Model\RulesFactory $rulesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Authorization\Model\ResourceModel\Role\CollectionFactory $roleCollectionFactory,
@@ -70,7 +64,6 @@ public function __construct(
      * Creates role collection
      *
      * @return \Magento\Authorization\Model\ResourceModel\Role\Collection
-     * @since 2.0.0
      */
     public function createRoleCollection()
     {
@@ -81,7 +74,6 @@ public function createRoleCollection()
      * Creates rules collection
      *
      * @return \Magento\Authorization\Model\ResourceModel\Rules\Collection
-     * @since 2.0.0
      */
     public function createRulesCollection()
     {
@@ -92,7 +84,6 @@ public function createRulesCollection()
      * Creates role model
      *
      * @return \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     public function createRole()
     {
@@ -103,7 +94,6 @@ public function createRole()
      * Creates rules model
      *
      * @return \Magento\Authorization\Model\Rules
-     * @since 2.0.0
      */
     public function createRules()
     {
diff --git a/app/code/Magento/Authorization/Setup/InstallData.php b/app/code/Magento/Authorization/Setup/InstallData.php
index 90f22a1f12990..b8b18706722a5 100644
--- a/app/code/Magento/Authorization/Setup/InstallData.php
+++ b/app/code/Magento/Authorization/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * Authorization factory
      *
      * @var AuthorizationFactory
-     * @since 2.0.0
      */
     private $authFactory;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param AuthorizationFactory $authFactory
-     * @since 2.0.0
      */
     public function __construct(AuthorizationFactory $authFactory)
     {
@@ -39,7 +36,6 @@ public function __construct(AuthorizationFactory $authFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Authorization/Setup/InstallSchema.php b/app/code/Magento/Authorization/Setup/InstallSchema.php
index e71b84de4c588..9471b448ea3b4 100644
--- a/app/code/Magento/Authorization/Setup/InstallSchema.php
+++ b/app/code/Magento/Authorization/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
index 2d299a3971e59..ca2bc286d38a8 100644
--- a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
+++ b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FraudDetails extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -23,7 +21,6 @@ class FraudDetails extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Sales\Model\Order\Payment
-     * @since 2.0.0
      */
     public function getPayment()
     {
@@ -46,7 +42,6 @@ public function getPayment()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php b/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
index 3888179013c65..1c8fb9ee29988 100644
--- a/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
+++ b/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
@@ -9,19 +9,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Iframe extends TransparentIframe
 {
     /**
      * @var \Magento\Authorizenet\Helper\DataFactory
-     * @since 2.0.0
      */
     protected $dataFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     private $messageManager;
 
@@ -33,7 +30,6 @@ class Iframe extends TransparentIframe
      * @param \Magento\Authorizenet\Helper\DataFactory $dataFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param string $area
      * @return \Magento\Authorizenet\Helper\Backend\Data|\Magento\Authorizenet\Helper\Data
-     * @since 2.0.0
      */
     public function getHelper($area)
     {
@@ -61,7 +56,6 @@ public function getHelper($area)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -73,7 +67,6 @@ protected function _beforeToHtml()
      * Add success message
      *
      * @return void
-     * @since 2.0.0
      */
     private function addSuccessMessage()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
index 972154175c120..cb5237e2ce52a 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\AddConfigured
  *
- * @since 2.0.0
  */
 class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
index e67e56f466a97..4328a532d2b01 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
index ceb408ac5bcc2..2cb472d64e5db 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\ConfigureProductToAdd
  *
- * @since 2.0.0
  */
 class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
index b915c62863dad..6f8ced0e7dc21 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\ConfigureQuoteItems
  *
- * @since 2.0.0
  */
 class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
index 9f8a75b5d984b..bf5be6a9d339f 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
index 0b07971225314..d9b7a5b7aa911 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\LoadBlock
  *
- * @since 2.0.0
  */
 class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
index 4ad78ed8d38a2..b393015ce1231 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
@@ -16,13 +16,11 @@
  * Class Place
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Place extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * @var DataHelper
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -35,7 +33,6 @@ class Place extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
      * @param DataHelper $helper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
index 113ba9680c52b..70d6a856d2372 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\ProcessData
  *
- * @since 2.0.0
  */
 class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
index da64bac28823c..bd9de956dc647 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -21,19 +20,16 @@ class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var \Magento\Authorizenet\Helper\Backend\Data
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -46,7 +42,6 @@ class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * @param \Magento\Framework\Registry $coreRegistry
      * @param LayoutFactory $resultLayoutFactory
      * @param \Magento\Authorizenet\Helper\Backend\Data $helper
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -76,7 +71,6 @@ public function __construct(
      * @param bool $cancelOrder
      * @param string $errorMsg
      * @return void
-     * @since 2.0.0
      */
     protected function _returnQuote($cancelOrder, $errorMsg)
     {
@@ -98,7 +92,6 @@ protected function _returnQuote($cancelOrder, $errorMsg)
      * Retrieve params and put javascript into iframe
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
index fc3d321ddf0db..f8777308383bc 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\Reorder
  *
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
index c3ca9b9d1af67..55fa35f5312f0 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\ReturnQuote
  *
- * @since 2.0.0
  */
 class ReturnQuote extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -17,7 +16,6 @@ class ReturnQuote extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Return quote
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _returnQuote()
     {
@@ -36,7 +34,6 @@ protected function _returnQuote()
      * Return order quote by ajax
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
index f31d64e86090d..a087209ef8618 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create\Save
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
index 2223a74f93995..8300161580fc6 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
index 3ee4d9f0e11fc..6bf2ac31ef5d3 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\Start
  *
- * @since 2.0.0
  */
 abstract class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
index fa5b41a25c619..fc9e7807cd99e 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
@@ -11,7 +11,6 @@
  * DirectPost Payment Controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Payment extends \Magento\Framework\App\Action\Action
 {
@@ -19,13 +18,11 @@ abstract class Payment extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Authorizenet\Helper\DataFactory
-     * @since 2.0.0
      */
     protected $dataFactory;
 
@@ -35,7 +32,6 @@ abstract class Payment extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Authorizenet\Helper\DataFactory $dataFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected function _getCheckout()
     {
@@ -60,7 +55,6 @@ protected function _getCheckout()
      * Get session model
      *
      * @return \Magento\Authorizenet\Model\Directpost\Session
-     * @since 2.0.0
      */
     protected function _getDirectPostSession()
     {
@@ -73,7 +67,6 @@ protected function _getDirectPostSession()
      *
      * @param string $area
      * @return void
-     * @since 2.0.0
      */
     protected function _responseAction($area = 'frontend')
     {
@@ -128,7 +121,6 @@ protected function _responseAction($area = 'frontend')
      * @param bool $cancelOrder
      * @param string $errorMsg
      * @return void
-     * @since 2.0.0
      */
     protected function _returnCustomerQuote($cancelOrder = false, $errorMsg = '')
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
index fcc2be1b44772..6414da8806205 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Directpost\Payment\BackendResponse
  *
- * @since 2.0.0
  */
 class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
@@ -18,7 +17,7 @@ class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Paymen
      * Action for Authorize.net SIM Relay Request.
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
+     * @since 2.1.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
index 7e7591c2aa323..a6671c977eb35 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
@@ -23,31 +23,26 @@
  * Class Place
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Place extends Payment
 {
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
-     * @since 2.0.0
      */
     protected $cartManagement;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Checkout\Model\Type\Onepage
-     * @since 2.0.0
      */
     protected $onepageCheckout;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -67,7 +62,6 @@ class Place extends Payment
      * @param Onepage $onepageCheckout
      * @param JsonHelper $jsonHelper
      * @param LoggerInterface|null $logger
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -90,7 +84,6 @@ public function __construct(
      * Send request to authorize.net
      *
      * @return string
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -131,7 +124,6 @@ public function execute()
      * Place order for checkout flow
      *
      * @return string
-     * @since 2.0.0
      */
     protected function placeCheckoutOrder()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
index c5a658cea5891..028b90bf7da50 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Redirect
- * @since 2.0.0
  */
 class Redirect extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
@@ -19,7 +18,6 @@ class Redirect extends \Magento\Authorizenet\Controller\Directpost\Payment
      * Retrieve params and put javascript into iframe
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
index 7157527bd9a50..4df749e5bdbac 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Directpost\Payment\Response
  *
- * @since 2.0.0
  */
 class Response extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
@@ -18,7 +17,6 @@ class Response extends \Magento\Authorizenet\Controller\Directpost\Payment
      * Action for Authorize.net SIM Relay Request.
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
index 3b69991f9415e..f92ba11d4990c 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Authorizenet\Controller\Directpost\Payment\ReturnQuote
  *
- * @since 2.0.0
  */
 class ReturnQuote extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
@@ -17,7 +16,6 @@ class ReturnQuote extends \Magento\Authorizenet\Controller\Directpost\Payment
      * Return customer quote by ajax
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Authorizenet/Helper/Backend/Data.php b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
index f23b56e1b38e0..c95806a524fac 100644
--- a/app/code/Magento/Authorizenet/Helper/Backend/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
@@ -15,7 +15,6 @@
  * Authorize.net Backend Data Helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends FrontendDataHelper
 {
@@ -24,7 +23,6 @@ class Data extends FrontendDataHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +40,6 @@ public function __construct(
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl($route, $params = [])
     {
@@ -53,7 +50,6 @@ protected function _getUrl($route, $params = [])
      * Retrieve place order url in admin
      *
      * @return  string
-     * @since 2.0.0
      */
     public function getPlaceOrderAdminUrl()
     {
@@ -65,7 +61,6 @@ public function getPlaceOrderAdminUrl()
      *
      * @param array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getSuccessOrderUrl($params)
     {
@@ -81,7 +76,6 @@ public function getSuccessOrderUrl($params)
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectIframeUrl($params)
     {
@@ -95,7 +89,6 @@ public function getRedirectIframeUrl($params)
      * @return string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getRelayUrl($storeId = null)
     {
diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
index 9623e718e86ca..7de71d8ed11e4 100644
--- a/app/code/Magento/Authorizenet/Helper/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Data.php
@@ -16,19 +16,16 @@
  * Authorize.net Data Helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends AbstractHelper
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -36,7 +33,6 @@ class Data extends AbstractHelper
      * Allowed currencies
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allowedCurrencyCodes = ['USD'];
 
@@ -44,7 +40,6 @@ class Data extends AbstractHelper
      * Transaction statuses key to value map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $transactionStatuses = [
         'authorizedPendingCapture' => 'Authorized/Pending Capture',
@@ -62,7 +57,6 @@ class Data extends AbstractHelper
      * Fraud filter actions key to value map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $fdsFilterActions = [
         'decline ' => 'Decline',
@@ -75,7 +69,6 @@ class Data extends AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -93,7 +86,6 @@ public function __construct(
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl($route, $params = [])
     {
@@ -111,7 +103,6 @@ protected function _getUrl($route, $params = [])
      *
      * @param string $controller
      * @return array
-     * @since 2.0.0
      */
     public function getSaveOrderUrlParams($controller)
     {
@@ -142,7 +133,6 @@ public function getSaveOrderUrlParams($controller)
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectIframeUrl($params)
     {
@@ -154,7 +144,6 @@ public function getRedirectIframeUrl($params)
      *
      * @param array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getSuccessOrderUrl($params)
     {
@@ -167,7 +156,6 @@ public function getSuccessOrderUrl($params)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return void
-     * @since 2.0.0
      */
     public function updateOrderEditIncrements(\Magento\Sales\Model\Order $order)
     {
@@ -190,7 +178,6 @@ public function updateOrderEditIncrements(\Magento\Sales\Model\Order $order)
      *
      * @param  array $messages
      * @return string
-     * @since 2.0.0
      */
     public function convertMessagesToMessage($messages)
     {
@@ -208,7 +195,6 @@ public function convertMessagesToMessage($messages)
      * @param bool|string $exception
      * @param bool|string $additionalMessage
      * @return bool|string
-     * @since 2.0.0
      */
     public function getTransactionMessage(
         $payment,
@@ -247,7 +233,6 @@ public function getTransactionMessage(
      *
      * @param  string $requestType
      * @return \Magento\Framework\Phrase|bool
-     * @since 2.0.0
      */
     protected function getOperation($requestType)
     {
@@ -272,7 +257,6 @@ protected function getOperation($requestType)
      * @param  \Magento\Payment\Model\InfoInterface $payment
      * @param float $amount
      * @return string
-     * @since 2.0.0
      */
     protected function formatPrice($payment, $amount)
     {
@@ -284,7 +268,6 @@ protected function formatPrice($payment, $amount)
      *
      * @param \Magento\Framework\App\ViewInterface $view
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentMethodsHtml(\Magento\Framework\App\ViewInterface $view)
     {
@@ -302,7 +285,6 @@ public function getPaymentMethodsHtml(\Magento\Framework\App\ViewInterface $view
      *
      * @param null|int|string $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getRelayUrl($storeId = null)
     {
@@ -315,7 +297,6 @@ public function getRelayUrl($storeId = null)
      * Get allowed currencies
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedCurrencyCodes()
     {
@@ -327,7 +308,6 @@ public function getAllowedCurrencyCodes()
      *
      * @param string $key
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getFdsFilterActionLabel($key)
     {
@@ -339,7 +319,6 @@ public function getFdsFilterActionLabel($key)
      *
      * @param string $key
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getTransactionStatusLabel($key)
     {
@@ -351,7 +330,6 @@ public function getTransactionStatusLabel($key)
      *
      * @param string $text
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function wrapGatewayError($text)
     {
diff --git a/app/code/Magento/Authorizenet/Helper/DataFactory.php b/app/code/Magento/Authorizenet/Helper/DataFactory.php
index a011bbf82039c..f3ccf16e7d396 100644
--- a/app/code/Magento/Authorizenet/Helper/DataFactory.php
+++ b/app/code/Magento/Authorizenet/Helper/DataFactory.php
@@ -10,7 +10,6 @@
 
 /**
  * Class DataFactory
- * @since 2.0.0
  */
 class DataFactory
 {
@@ -19,13 +18,11 @@ class DataFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $helperMap = [
         self::AREA_FRONTEND => \Magento\Authorizenet\Helper\Data::class,
@@ -36,7 +33,6 @@ class DataFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -49,7 +45,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $area
      * @return \Magento\Authorizenet\Helper\Backend\Data|\Magento\Authorizenet\Helper\Data
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function create($area)
     {
diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php
index 3bddf36be2381..ae9ac833a4395 100644
--- a/app/code/Magento/Authorizenet/Model/Authorizenet.php
+++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php
@@ -12,7 +12,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
 {
@@ -70,7 +69,6 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
 
     /**
      * @var \Magento\Authorizenet\Helper\Data
-     * @since 2.0.0
      */
     protected $dataHelper;
 
@@ -78,7 +76,6 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * Request factory
      *
      * @var \Magento\Authorizenet\Model\RequestFactory
-     * @since 2.0.0
      */
     protected $requestFactory;
 
@@ -86,13 +83,11 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * Response factory
      *
      * @var \Magento\Authorizenet\Model\ResponseFactory
-     * @since 2.0.0
      */
     protected $responseFactory;
 
     /**
      * @var \Magento\Authorizenet\Model\TransactionService;
-     * @since 2.0.0
      */
     protected $transactionService;
 
@@ -100,13 +95,11 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * Fields that should be replaced in debug with '***'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = ['merchantAuthentication', 'x_login'];
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory
-     * @since 2.0.0
      */
     protected $httpClientFactory;
 
@@ -129,7 +122,6 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -177,7 +169,6 @@ public function __construct(
      *
      * @param string $currencyCode
      * @return bool
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode)
     {
@@ -191,7 +182,6 @@ public function canUseForCurrency($currencyCode)
      * Return array of currency codes supplied by Payment Gateway
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAcceptedCurrencyCodes()
     {
@@ -208,7 +198,6 @@ public function getAcceptedCurrencyCodes()
      *
      * @param  \Magento\Payment\Model\InfoInterface $payment
      * @return $this
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -221,7 +210,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * @param string $transactionId
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function fetchTransactionFraudDetails($transactionId)
     {
@@ -248,7 +236,6 @@ public function fetchTransactionFraudDetails($transactionId)
      *
      * @param \Magento\Framework\Simplexml\Element $fraudFilters
      * @return array
-     * @since 2.0.0
      */
     protected function getFraudFilters($fraudFilters)
     {
@@ -268,7 +255,6 @@ protected function getFraudFilters($fraudFilters)
      * Return authorize payment request
      *
      * @return \Magento\Authorizenet\Model\Request
-     * @since 2.0.0
      */
     protected function getRequest()
     {
@@ -291,7 +277,6 @@ protected function getRequest()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function buildRequest(\Magento\Framework\DataObject $payment)
     {
@@ -390,7 +375,6 @@ protected function buildRequest(\Magento\Framework\DataObject $payment)
      * @param \Magento\Authorizenet\Model\Request $request
      * @return \Magento\Authorizenet\Model\Response
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function postRequest(\Magento\Authorizenet\Model\Request $request)
     {
@@ -452,7 +436,6 @@ protected function postRequest(\Magento\Authorizenet\Model\Request $request)
      *
      * @param  \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     protected function isGatewayActionsLocked($payment)
     {
diff --git a/app/code/Magento/Authorizenet/Model/Debug.php b/app/code/Magento/Authorizenet/Model/Debug.php
index 0e0345daa5a90..9c7bd352c58ca 100644
--- a/app/code/Magento/Authorizenet/Model/Debug.php
+++ b/app/code/Magento/Authorizenet/Model/Debug.php
@@ -20,13 +20,11 @@
  * @method \Magento\Authorizenet\Model\Debug setRequestDump(string $value)
  * @method string getResultDump()
  * @method \Magento\Authorizenet\Model\Debug setResultDump(string $value)
- * @since 2.0.0
  */
 class Debug extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index be9034011dff4..c1acd88db6dee 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements TransparentInterface, ConfigInterface
 {
@@ -23,13 +22,11 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Payment\Block\Transparent\Info::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info::class;
 
@@ -37,7 +34,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGateway = true;
 
@@ -45,7 +41,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -53,7 +48,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = true;
 
@@ -61,7 +55,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = true;
 
@@ -69,7 +62,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = true;
 
@@ -77,7 +69,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = true;
 
@@ -85,7 +76,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = true;
 
@@ -93,31 +83,26 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isInitializeNeeded = true;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Authorizenet\Model\Directpost\Response
-     * @since 2.0.0
      */
     protected $response;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
@@ -125,13 +110,11 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * Order factory
      *
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Sales\Api\TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
@@ -165,7 +148,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -225,7 +207,6 @@ public function __construct(
      *
      * @param \Magento\Authorizenet\Helper\Data $dataHelper
      * @return void
-     * @since 2.0.0
      */
     public function setDataHelper(\Magento\Authorizenet\Helper\Data $dataHelper)
     {
@@ -236,7 +217,6 @@ public function setDataHelper(\Magento\Authorizenet\Helper\Data $dataHelper)
      * Do not validate payment form using server methods
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -250,7 +230,6 @@ public function validate()
      * @param  float $amount
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -264,7 +243,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -297,7 +275,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function processCapture($result, $payment)
     {
@@ -344,7 +321,6 @@ protected function processCapture($result, $payment)
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -390,7 +366,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * @param float $amount
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -413,7 +388,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function processRefund(\Magento\Framework\DataObject $payment, $amount)
     {
@@ -459,7 +433,6 @@ protected function processRefund(\Magento\Framework\DataObject $payment, $amount
      * Get CGI url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCgiUrl()
     {
@@ -472,7 +445,6 @@ public function getCgiUrl()
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getRelayUrl($storeId = null)
     {
@@ -486,7 +458,6 @@ public function getRelayUrl($storeId = null)
      * Return response.
      *
      * @return \Magento\Authorizenet\Model\Directpost\Response
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -500,7 +471,6 @@ public function getResponse()
      * @param \Magento\Framework\DataObject $stateObject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject)
     {
@@ -528,7 +498,6 @@ public function initialize($paymentAction, $stateObject)
      *
      * @param \Magento\Sales\Model\Order $order Quote or order object.
      * @return \Magento\Authorizenet\Model\Directpost\Request
-     * @since 2.0.0
      */
     public function generateRequestFromOrder(\Magento\Sales\Model\Order $order)
     {
@@ -547,7 +516,6 @@ public function generateRequestFromOrder(\Magento\Sales\Model\Order $order)
      *
      * @param array $postData
      * @return $this
-     * @since 2.0.0
      */
     public function setResponseData(array $postData)
     {
@@ -560,7 +528,6 @@ public function setResponseData(array $postData)
      *
      * @return bool true in case of validation success.
      * @throws \Magento\Framework\Exception\LocalizedException In case of validation error
-     * @since 2.0.0
      */
     public function validateResponse()
     {
@@ -583,7 +550,6 @@ public function validateResponse()
      * @param array $responseData data from Authorize.net from $_POST
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException In case of validation error or order creation error
-     * @since 2.0.0
      */
     public function process(array $responseData)
     {
@@ -633,7 +599,6 @@ public function process(array $responseData)
      *
      * @param \Magento\Framework\DataObject $payment
      * @return void
-     * @since 2.0.0
      */
     protected function fillPaymentByResponse(\Magento\Framework\DataObject $payment)
     {
@@ -659,7 +624,6 @@ protected function fillPaymentByResponse(\Magento\Framework\DataObject $payment)
      *
      * @return true in case of Approved response
      * @throws \Magento\Framework\Exception\LocalizedException In case of Declined or Error response from Authorize.net
-     * @since 2.0.0
      */
     public function checkResponseCode()
     {
@@ -684,7 +648,6 @@ public function checkResponseCode()
      *
      * @return true in case of right transaction id
      * @throws \Magento\Framework\Exception\LocalizedException In case of bad transaction id.
-     * @since 2.0.0
      */
     public function checkTransId()
     {
@@ -701,7 +664,6 @@ public function checkTransId()
      *
      * @param float $amount
      * @return bool
-     * @since 2.0.0
      */
     protected function matchAmount($amount)
     {
@@ -717,7 +679,6 @@ protected function matchAmount($amount)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function processOrder(\Magento\Sales\Model\Order $order)
     {
@@ -771,7 +732,6 @@ protected function processOrder(\Magento\Sales\Model\Order $order)
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment $payment)
     {
@@ -803,7 +763,6 @@ protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     protected function addStatusComment(\Magento\Sales\Model\Order\Payment $payment)
     {
@@ -840,7 +799,6 @@ protected function addStatusComment(\Magento\Sales\Model\Order\Payment $payment)
      * @param string $message
      * @param bool $voidPayment
      * @return void
-     * @since 2.0.0
      */
     protected function declineOrder(\Magento\Sales\Model\Order $order, $message = '', $voidPayment = true)
     {
@@ -863,7 +821,6 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return string
-     * @since 2.0.0
      */
     protected function getRealParentTransactionId($payment)
     {
@@ -877,7 +834,6 @@ protected function getRealParentTransactionId($payment)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function getConfigInterface()
     {
@@ -890,7 +846,6 @@ public function getConfigInterface()
      * @param mixed $key
      * @param null $storeId
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($key, $storeId = null)
     {
@@ -902,7 +857,6 @@ public function getValue($key, $storeId = null)
      *
      * @param bool $isInitializeNeeded
      * @return void
-     * @since 2.0.0
      */
     public function setIsInitializeNeeded($isInitializeNeeded = true)
     {
@@ -913,7 +867,6 @@ public function setIsInitializeNeeded($isInitializeNeeded = true)
      * Get whether it is possible to capture
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -928,7 +881,6 @@ public function canCapture()
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
     {
@@ -960,7 +912,6 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
      * @param \Magento\Framework\DataObject $response
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     protected function addStatusCommentOnUpdate(
         \Magento\Sales\Model\Order\Payment $payment,
@@ -993,7 +944,6 @@ protected function addStatusCommentOnUpdate(
      * @param string $methodCode
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode)
     {
@@ -1005,7 +955,6 @@ public function setMethodCode($methodCode)
      * @param string $pathPattern
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function setPathPattern($pathPattern)
     {
@@ -1019,7 +968,6 @@ public function setPathPattern($pathPattern)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @link http://www.authorize.net/support/ReportingGuide_XML.pdf
      * @link http://developer.authorize.net/api/transaction_details/
-     * @since 2.0.0
      */
     protected function getTransactionResponse($transactionId)
     {
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index b0ecf34962805..d9a403e5c991e 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -10,13 +10,11 @@
 
 /**
  * Authorize.net request model for DirectPost model
- * @since 2.0.0
  */
 class Request extends AuthorizenetRequest
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_transKey = null;
 
@@ -25,7 +23,6 @@ class Request extends AuthorizenetRequest
      * Needed to generate sign.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTransactionKey()
     {
@@ -38,7 +35,6 @@ protected function _getTransactionKey()
      *
      * @param string $transKey
      * @return $this
-     * @since 2.0.0
      */
     protected function _setTransactionKey($transKey)
     {
@@ -56,7 +52,6 @@ protected function _setTransactionKey($transKey)
      * @param string $fpSequence An invoice number or random number.
      * @param string $fpTimestamp
      * @return string The fingerprint.
-     * @since 2.0.0
      */
     public function generateRequestSign(
         $merchantApiLoginId,
@@ -78,7 +73,6 @@ public function generateRequestSign(
      *
      * @param \Magento\Authorizenet\Model\Directpost $paymentMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentMethod)
     {
@@ -100,7 +94,6 @@ public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentM
      * @param \Magento\Sales\Model\Order $order
      * @param \Magento\Authorizenet\Model\Directpost $paymentMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setDataFromOrder(
         \Magento\Sales\Model\Order $order,
@@ -172,7 +165,6 @@ public function setDataFromOrder(
      * All needed fields should be placed in the object fist.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function signRequestData()
     {
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
index 4c35b33d675a3..2cdd02d7f8488 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php
@@ -9,7 +9,6 @@
 
 /**
  * Factory class for @see \Magento\Authorizenet\Model\Directpost\Request
- * @since 2.0.0
  */
 class Factory extends AuthorizenetRequestFactory
 {
@@ -18,7 +17,6 @@ class Factory extends AuthorizenetRequestFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response.php b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
index 3a4b160fb9e41..dc62c1e990dc3 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Response.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
@@ -10,7 +10,6 @@
 
 /**
  * Authorize.net response model for DirectPost model
- * @since 2.0.0
  */
 class Response extends AuthorizenetResponse
 {
@@ -22,7 +21,6 @@ class Response extends AuthorizenetResponse
      * @param string $amount
      * @param string $transactionId
      * @return string
-     * @since 2.0.0
      */
     public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
@@ -39,7 +37,6 @@ public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transact
      * @param string $merchantMd5
      * @param string $merchantApiLogin
      * @return bool
-     * @since 2.0.0
      */
     public function isValidHash($merchantMd5, $merchantApiLogin)
     {
@@ -52,7 +49,6 @@ public function isValidHash($merchantMd5, $merchantApiLogin)
      * Return if this is approved response from Authorize.net auth request.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isApproved()
     {
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
index 2b69df71a8f9f..c2a24ef386ab0 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php
@@ -9,7 +9,6 @@
 
 /**
  * Factory class for @see \Magento\Authorizenet\Model\Directpost\Response
- * @since 2.0.0
  */
 class Factory extends AuthorizenetResponseFactory
 {
@@ -18,7 +17,6 @@ class Factory extends AuthorizenetResponseFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Session.php b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
index 6272f7b387719..7ddedac161399 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Session.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
@@ -9,7 +9,6 @@
 
 /**
  * Authorize.net DirectPost session model
- * @since 2.0.0
  */
 class Session extends SessionManager
 {
@@ -18,7 +17,6 @@ class Session extends SessionManager
      *
      * @param string $orderIncrementId
      * @return void
-     * @since 2.0.0
      */
     public function addCheckoutOrderIncrementId($orderIncrementId)
     {
@@ -35,7 +33,6 @@ public function addCheckoutOrderIncrementId($orderIncrementId)
      *
      * @param string $orderIncrementId
      * @return void
-     * @since 2.0.0
      */
     public function removeCheckoutOrderIncrementId($orderIncrementId)
     {
@@ -56,7 +53,6 @@ public function removeCheckoutOrderIncrementId($orderIncrementId)
      *
      * @param string $orderIncrementId
      * @return bool
-     * @since 2.0.0
      */
     public function isCheckoutOrderIncrementIdExist($orderIncrementId)
     {
@@ -72,7 +68,6 @@ public function isCheckoutOrderIncrementIdExist($orderIncrementId)
      *
      * @param int|string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteId($id)
     {
diff --git a/app/code/Magento/Authorizenet/Model/Request.php b/app/code/Magento/Authorizenet/Model/Request.php
index 1d35beaf5e3dc..dc52f84baecee 100644
--- a/app/code/Magento/Authorizenet/Model/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Request.php
@@ -9,7 +9,6 @@
 
 /**
  * Request object
- * @since 2.0.0
  */
 class Request extends DataObject
 {
diff --git a/app/code/Magento/Authorizenet/Model/Request/Factory.php b/app/code/Magento/Authorizenet/Model/Request/Factory.php
index eee86d2c6395c..e60bbd0c88e83 100644
--- a/app/code/Magento/Authorizenet/Model/Request/Factory.php
+++ b/app/code/Magento/Authorizenet/Model/Request/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for @see \Magento\Authorizenet\Model\Request
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class Factory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class Factory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Authorizenet\Model\Request
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
index 37c4a3f84dbb9..ee6ec6783bb06 100644
--- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
+++ b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
@@ -7,7 +7,6 @@
 
 /**
  * Resource Authorize.net debug model
- * @since 2.0.0
  */
 class Debug extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Debug extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
index cff9e4020cb66..095ac5a91dd7c 100644
--- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
+++ b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Resource Authorize.net debug collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Authorizenet/Model/Response.php b/app/code/Magento/Authorizenet/Model/Response.php
index 3cbb55d9205fe..52b43c251dca2 100644
--- a/app/code/Magento/Authorizenet/Model/Response.php
+++ b/app/code/Magento/Authorizenet/Model/Response.php
@@ -9,7 +9,6 @@
 
 /**
  * Response object
- * @since 2.0.0
  */
 class Response extends DataObject
 {
diff --git a/app/code/Magento/Authorizenet/Model/Response/Factory.php b/app/code/Magento/Authorizenet/Model/Response/Factory.php
index 23941c23d9351..74bf8953471d2 100644
--- a/app/code/Magento/Authorizenet/Model/Response/Factory.php
+++ b/app/code/Magento/Authorizenet/Model/Response/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for @see \Magento\Authorizenet\Model\Response
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class Factory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class Factory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Authorizenet\Model\Response
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Authorizenet/Model/Source/Cctype.php b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
index 6c517058da8d7..0a5fe8ab9b341 100644
--- a/app/code/Magento/Authorizenet/Model/Source/Cctype.php
+++ b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
@@ -9,13 +9,11 @@
 
 /**
  * Authorize.net Payment CC Types Source Model
- * @since 2.0.0
  */
 class Cctype extends PaymentCctype
 {
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllowedTypes()
     {
diff --git a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
index 70e3a011ac5be..9943e1001da56 100644
--- a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
+++ b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php
@@ -10,13 +10,11 @@
 /**
  *
  * Authorize.net Payment Action Dropdown source
- * @since 2.0.0
  */
 class PaymentAction implements ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php
index ba326c1b3c477..fef22d6c913c0 100644
--- a/app/code/Magento/Authorizenet/Model/TransactionService.php
+++ b/app/code/Magento/Authorizenet/Model/TransactionService.php
@@ -15,7 +15,6 @@
 /**
  * Class TransactionService
  * @package Magento\Authorizenet\Model
- * @since 2.0.0
  */
 class TransactionService
 {
@@ -32,25 +31,21 @@ class TransactionService
      * Stored information about transaction
      *
      * @var array
-     * @since 2.0.0
      */
     protected $transactionDetails = [];
 
     /**
      * @var \Magento\Framework\Xml\Security
-     * @since 2.0.0
      */
     protected $xmlSecurityHelper;
 
     /**
      * @var \Magento\Payment\Model\Method\Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory
-     * @since 2.0.0
      */
     protected $httpClientFactory;
 
@@ -58,7 +53,6 @@ class TransactionService
      * Fields that should be replaced in debug with '***'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $debugReplacePrivateDataKeys = ['merchantAuthentication', 'x_login'];
 
@@ -66,7 +60,6 @@ class TransactionService
      * @param Security $xmlSecurityHelper
      * @param Logger $logger
      * @param ZendClientFactory $httpClientFactory
-     * @since 2.0.0
      */
     public function __construct(
         Security $xmlSecurityHelper,
@@ -84,7 +77,6 @@ public function __construct(
      * @param string $transactionId
      * @return \Magento\Framework\Simplexml\Element
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getTransactionDetails(Authorizenet $context, $transactionId)
     {
@@ -100,7 +92,6 @@ public function getTransactionDetails(Authorizenet $context, $transactionId)
      * @param string $transactionId
      * @return \Magento\Framework\Simplexml\Element
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function loadTransactionDetails(Authorizenet $context, $transactionId)
     {
@@ -154,7 +145,6 @@ protected function loadTransactionDetails(Authorizenet $context, $transactionId)
      * @param string $transactionKey
      * @param string $transactionId
      * @return string
-     * @since 2.0.0
      */
     private function getRequestBody($login, $transactionKey, $transactionId)
     {
@@ -178,7 +168,6 @@ private function getRequestBody($login, $transactionKey, $transactionId)
      *
      * @param string $xml
      * @return string
-     * @since 2.0.0
      */
     private function removePrivateDataFromXml($xml)
     {
diff --git a/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php b/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
index f0dcd07d9c133..27f83ddfbce7c 100644
--- a/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
+++ b/app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php
@@ -11,32 +11,27 @@
 /**
  * Class \Magento\Authorizenet\Observer\AddFieldsToResponseObserver
  *
- * @since 2.0.0
  */
 class AddFieldsToResponseObserver implements ObserverInterface
 {
     /**
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var \Magento\Authorizenet\Model\Directpost
-     * @since 2.0.0
      */
     protected $payment;
 
     /**
      * @var \Magento\Authorizenet\Model\Directpost\Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -45,7 +40,6 @@ class AddFieldsToResponseObserver implements ObserverInterface
      * @param \Magento\Authorizenet\Model\Directpost $payment
      * @param \Magento\Authorizenet\Model\Directpost\Session $session
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $coreRegistry,
@@ -64,7 +58,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php b/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
index 2044e9fe922f3..d4a0f0f1ce9b9 100644
--- a/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
+++ b/app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver
  *
- * @since 2.0.0
  */
 class SaveOrderAfterSubmitObserver implements ObserverInterface
 {
     /**
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $coreRegistry
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php b/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
index 081f13d187ee6..f295e2c97cffc 100644
--- a/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
+++ b/app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\Authorizenet\Observer\UpdateAllEditIncrementsObserver
  *
- * @since 2.0.0
  */
 class UpdateAllEditIncrementsObserver implements ObserverInterface
 {
     /**
      *
      * @var \Magento\Authorizenet\Helper\Data
-     * @since 2.0.0
      */
     protected $authorizenetData;
 
     /**
      * @param \Magento\Authorizenet\Helper\Data $authorizenetData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Authorizenet\Helper\Data $authorizenetData
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 68d963ada9b58..857b5e2a37f26 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -11,7 +11,6 @@
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractAction extends \Magento\Framework\App\Action\Action
 {
@@ -34,7 +33,6 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
      * Array of actions which can be processed without secret key validation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_publicActions = [];
 
@@ -42,61 +40,51 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
      * Namespace for session.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sessionNamespace = self::SESSION_NAMESPACE;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     protected $_auth;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseBaseUrl;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @since 2.0.0
      */
     public function __construct(Action\Context $context)
     {
@@ -113,7 +101,6 @@ public function __construct(Action\Context $context)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
@@ -124,7 +111,6 @@ protected function _isAllowed()
      * Retrieve adminhtml session model object
      *
      * @return \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -133,7 +119,6 @@ protected function _getSession()
 
     /**
      * @return \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected function getMessageManager()
     {
@@ -145,7 +130,6 @@ protected function getMessageManager()
      *
      * @param string $itemId current active menu item
      * @return $this
-     * @since 2.0.0
      */
     protected function _setActiveMenu($itemId)
     {
@@ -165,7 +149,6 @@ protected function _setActiveMenu($itemId)
      * @param string $title
      * @param string|null $link
      * @return $this
-     * @since 2.0.0
      */
     protected function _addBreadcrumb($label, $title, $link = null)
     {
@@ -176,7 +159,6 @@ protected function _addBreadcrumb($label, $title, $link = null)
     /**
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     protected function _addContent(\Magento\Framework\View\Element\AbstractBlock $block)
     {
@@ -186,7 +168,6 @@ protected function _addContent(\Magento\Framework\View\Element\AbstractBlock $bl
     /**
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     protected function _addLeft(\Magento\Framework\View\Element\AbstractBlock $block)
     {
@@ -196,7 +177,6 @@ protected function _addLeft(\Magento\Framework\View\Element\AbstractBlock $block
     /**
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     protected function _addJs(\Magento\Framework\View\Element\AbstractBlock $block)
     {
@@ -211,7 +191,6 @@ protected function _addJs(\Magento\Framework\View\Element\AbstractBlock $block)
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @param string $containerName
      * @return $this
-     * @since 2.0.0
      */
     private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractBlock $block, $containerName)
     {
@@ -222,7 +201,6 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB
     /**
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -254,7 +232,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      * Check whether url is checked
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isUrlChecked()
     {
@@ -268,7 +245,6 @@ protected function _isUrlChecked()
      * Check url keys. If non valid - redirect
      *
      * @return bool
-     * @since 2.0.0
      */
     public function _processUrlKeys()
     {
@@ -308,7 +284,6 @@ public function _processUrlKeys()
      * process force locale set through url params
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _processLocaleSettings()
     {
@@ -331,7 +306,6 @@ protected function _processLocaleSettings()
      * @param   string $path
      * @param   array $arguments
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected function _redirect($path, $arguments = [])
     {
@@ -349,7 +323,6 @@ protected function _redirect($path, $arguments = [])
      * @param string|null $module
      * @param array|null $params
      * @return void
-     * @since 2.0.0
      */
     protected function _forward($action, $controller = null, $module = null, array $params = null)
     {
@@ -363,7 +336,6 @@ protected function _forward($action, $controller = null, $module = null, array $
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
@@ -374,7 +346,6 @@ public function getUrl($route = '', $params = [])
      * Validate Secret Key
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateSecretKey()
     {
diff --git a/app/code/Magento/Backend/App/Action.php b/app/code/Magento/Backend/App/Action.php
index fbeb93b2a1bce..3acd60540a0ea 100644
--- a/app/code/Magento/Backend/App/Action.php
+++ b/app/code/Magento/Backend/App/Action.php
@@ -12,7 +12,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Action extends \Magento\Backend\App\AbstractAction
 {
diff --git a/app/code/Magento/Backend/App/Action/Context.php b/app/code/Magento/Backend/App/Action/Context.php
index 2dd2a9df786b5..efa9c952ef788 100644
--- a/app/code/Magento/Backend/App/Action/Context.php
+++ b/app/code/Magento/Backend/App/Action/Context.php
@@ -20,55 +20,46 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\App\Action\Context
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     protected $_auth;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseBaseUrl;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -93,7 +84,6 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $canUseBaseUrl
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -142,7 +132,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     public function getAuth()
     {
@@ -151,7 +140,6 @@ public function getAuth()
 
     /**
      * @return \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     public function getAuthorization()
     {
@@ -160,7 +148,6 @@ public function getAuthorization()
 
     /**
      * @return \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     public function getBackendUrl()
     {
@@ -170,7 +157,6 @@ public function getBackendUrl()
     /**
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanUseBaseUrl()
     {
@@ -179,7 +165,6 @@ public function getCanUseBaseUrl()
 
     /**
      * @return \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     public function getFormKeyValidator()
     {
@@ -188,7 +173,6 @@ public function getFormKeyValidator()
 
     /**
      * @return \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     public function getHelper()
     {
@@ -197,7 +181,6 @@ public function getHelper()
 
     /**
      * @return \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     public function getLocaleResolver()
     {
@@ -206,7 +189,6 @@ public function getLocaleResolver()
 
     /**
      * @return \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     public function getSession()
     {
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
index 6c0f3ba5c1805..68506a521c1cf 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
@@ -9,19 +9,16 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Authentication
 {
     /**
      * @var \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     protected $_auth;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_openActions = [
         'forgotpassword',
@@ -33,49 +30,41 @@ class Authentication
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $backendUrl;
 
     /**
      * @var \Magento\Backend\App\BackendAppList
-     * @since 2.0.0
      */
     protected $backendAppList;
 
     /**
      * @var \Magento\Framework\Controller\Result\RedirectFactory
-     * @since 2.0.0
      */
     protected $resultRedirectFactory;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
@@ -89,7 +78,6 @@ class Authentication
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Backend\App\BackendAppList $backendAppList
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Auth $auth,
@@ -120,7 +108,6 @@ public function __construct(
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDispatch(
         \Magento\Backend\App\AbstractAction $subject,
@@ -161,7 +148,6 @@ public function aroundDispatch(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return void
-     * @since 2.0.0
      */
     protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterface $request)
     {
@@ -206,7 +192,6 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     protected function _performLogin(\Magento\Framework\App\RequestInterface $request)
     {
@@ -233,7 +218,6 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
index 3bbeb0d347d07..6e9b305eac5c0 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Backend\App\Action\Plugin\MassactionKey
  *
- * @since 2.0.0
  */
 class MassactionKey
 {
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
index 58b1602e3836e..c35ee4b259d93 100644
--- a/app/code/Magento/Backend/App/Area/FrontNameResolver.php
+++ b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
 {
@@ -34,19 +33,16 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $standardPorts = ['http' => '80', 'https' => '443'];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $defaultFrontName;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -54,13 +50,11 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
@@ -68,7 +62,6 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      * @param \Magento\Backend\App\Config $config
      * @param DeploymentConfig $deploymentConfig
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Config $config,
@@ -85,7 +78,6 @@ public function __construct(
      *
      * @param bool $checkHost If true, verify front name is valid for this url (hostname is correct)
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFrontName($checkHost = false)
     {
@@ -103,7 +95,6 @@ public function getFrontName($checkHost = false)
      * Return whether the host from request is the backend host
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHostBackend()
     {
@@ -121,7 +112,6 @@ public function isHostBackend()
      *
      * @param string $url
      * @return mixed|string
-     * @since 2.0.0
      */
     private function getHostWithPort($url)
     {
diff --git a/app/code/Magento/Backend/App/BackendApp.php b/app/code/Magento/Backend/App/BackendApp.php
index 14d6c70b7674e..8c40b41ac35c7 100644
--- a/app/code/Magento/Backend/App/BackendApp.php
+++ b/app/code/Magento/Backend/App/BackendApp.php
@@ -9,25 +9,21 @@
 /**
  * Backend Application which uses Magento Backend authentication process
  * @api
- * @since 2.0.0
  */
 class BackendApp
 {
     /**
      * @var null
-     * @since 2.0.0
      */
     private $cookiePath;
 
     /**
      * @var null
-     * @since 2.0.0
      */
     private $startupPage;
 
     /**
      * @var null
-     * @since 2.0.0
      */
     private $aclResourceName;
 
@@ -35,7 +31,6 @@ class BackendApp
      * @param string $cookiePath
      * @param string $startupPage
      * @param string $aclResourceName
-     * @since 2.0.0
      */
     public function __construct(
         $cookiePath,
@@ -51,7 +46,6 @@ public function __construct(
      * Cookie path for the application to set cookie to
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookiePath()
     {
@@ -62,7 +56,6 @@ public function getCookiePath()
      * Startup Page of the application to redirect after login
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStartupPage()
     {
@@ -73,7 +66,6 @@ public function getStartupPage()
      * ACL resource name to authorize access to
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAclResource()
     {
diff --git a/app/code/Magento/Backend/App/BackendAppList.php b/app/code/Magento/Backend/App/BackendAppList.php
index ce29dfd462a1f..ae5ec0284511f 100644
--- a/app/code/Magento/Backend/App/BackendAppList.php
+++ b/app/code/Magento/Backend/App/BackendAppList.php
@@ -9,26 +9,22 @@
 /**
  * List of Backend Applications to allow injection of them through the DI
  * @api
- * @since 2.0.0
  */
 class BackendAppList
 {
     /**
      * @var BackendApp[]
-     * @since 2.0.0
      */
     private $backendApps = [];
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param array $backendApps
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -42,7 +38,6 @@ public function __construct(
      * Get Backend app based on its name
      *
      * @return BackendApp|null
-     * @since 2.0.0
      */
     public function getCurrentApp()
     {
@@ -58,7 +53,6 @@ public function getCurrentApp()
      *
      * @param string $appName
      * @return BackendApp|null
-     * @since 2.0.0
      */
     public function getBackendApp($appName)
     {
diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php
index bc23536cb130d..96eed3fb76afd 100644
--- a/app/code/Magento/Backend/App/Config.php
+++ b/app/code/Magento/Backend/App/Config.php
@@ -13,26 +13,24 @@
 
 /**
  * Backend config accessor.
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\App\Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $appConfig;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data;
 
     /**
      * @param \Magento\Framework\App\Config $appConfig
      * @return void
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config $appConfig)
     {
@@ -41,7 +39,6 @@ public function __construct(\Magento\Framework\App\Config $appConfig)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getValue($path)
     {
@@ -58,7 +55,6 @@ public function getValue($path)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setValue($path, $value)
     {
@@ -67,7 +63,6 @@ public function setValue($path, $value)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isSetFlag($path)
     {
diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php
index 70a1c743420f2..91467ef3cbaea 100644
--- a/app/code/Magento/Backend/App/ConfigInterface.php
+++ b/app/code/Magento/Backend/App/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Backend config accessor
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -22,19 +21,17 @@ interface ConfigInterface
      * @param string $path
      * @return mixed
      * @api
-     * @since 2.0.0
      */
     public function getValue($path);
 
     /**
      * Set config value
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @param string $path
      * @param mixed $value
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setValue($path, $value);
 
@@ -46,7 +43,6 @@ public function setValue($path, $value);
      * @param string $path
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isSetFlag($path);
 }
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index a8cf9e36e88e6..a89ac8a024ab0 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -9,20 +9,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_parts;
 
     /**
      * @param \Magento\Backend\App\ConfigInterface $config
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\ConfigInterface $config)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getPart($code)
     {
diff --git a/app/code/Magento/Backend/App/Request/PathInfoProcessor.php b/app/code/Magento/Backend/App/Request/PathInfoProcessor.php
index 3d57f2886b222..782a4702c6981 100644
--- a/app/code/Magento/Backend/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Backend/App/Request/PathInfoProcessor.php
@@ -9,26 +9,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     private $_helper;
 
     /**
      * @var \Magento\Store\App\Request\PathInfoProcessor
-     * @since 2.0.0
      */
     private $_subject;
 
     /**
      * @param \Magento\Store\App\Request\PathInfoProcessor $subject
      * @param \Magento\Backend\Helper\Data $helper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\App\Request\PathInfoProcessor $subject,
@@ -44,7 +40,6 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $pathInfo
      * @return string
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo)
     {
diff --git a/app/code/Magento/Backend/App/Response/Http/FileFactory.php b/app/code/Magento/Backend/App/Response/Http/FileFactory.php
index 129ebf8dee0fc..fa4fb39330f9e 100644
--- a/app/code/Magento/Backend/App/Response/Http/FileFactory.php
+++ b/app/code/Magento/Backend/App/Response/Http/FileFactory.php
@@ -9,43 +9,36 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FileFactory extends \Magento\Framework\App\Response\Http\FileFactory
 {
     /**
      * @var \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     protected $_auth;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_flag;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -57,7 +50,6 @@ class FileFactory extends \Magento\Framework\App\Response\Http\FileFactory
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\App\ActionFlag $flag
      * @param \Magento\Backend\Helper\Data $helper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
@@ -83,7 +75,6 @@ public function __construct(
      * @param   array $arguments
      * @return \Magento\Framework\App\ResponseInterface
      * @TODO move method
-     * @since 2.0.0
      */
     protected function _redirect($path, $arguments = [])
     {
@@ -104,7 +95,6 @@ protected function _redirect($path, $arguments = [])
      * @param string $contentType
      * @param int $contentLength    explicit content length, if strlen($content) isn't applicable
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function create(
         $fileName,
diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
index 1df493e78b9d4..040071ca572d5 100644
--- a/app/code/Magento/Backend/App/Router.php
+++ b/app/code/Magento/Backend/App/Router.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Router extends \Magento\Framework\App\Router\Base
 {
     /**
      * @var \Magento\Framework\UrlInterface $url
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -25,7 +23,6 @@ class Router extends \Magento\Framework\App\Router\Base
      * Order sensitive
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_requiredParams = ['areaFrontName', 'moduleFrontName', 'actionPath', 'actionName'];
 
@@ -34,13 +31,11 @@ class Router extends \Magento\Framework\App\Router\Base
      * not to pass dispatching to next routers
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $applyNoRoute = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pathPrefix = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
 
@@ -48,7 +43,6 @@ class Router extends \Magento\Framework\App\Router\Base
      * Check whether redirect should be used for secure routes
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _shouldRedirectToSecure()
     {
diff --git a/app/code/Magento/Backend/App/Router/NoRouteHandler.php b/app/code/Magento/Backend/App/Router/NoRouteHandler.php
index 1e6af1732af23..fc25c5adabeb0 100644
--- a/app/code/Magento/Backend/App/Router/NoRouteHandler.php
+++ b/app/code/Magento/Backend/App/Router/NoRouteHandler.php
@@ -9,26 +9,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInterface
 {
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Framework\App\Route\ConfigInterface
-     * @since 2.0.0
      */
     protected $routeConfig;
 
     /**
      * @param \Magento\Backend\Helper\Data $helper
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Helper\Data $helper,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Backend/App/UserConfig.php b/app/code/Magento/Backend/App/UserConfig.php
index 7c4764616e697..1a60c38d1783a 100644
--- a/app/code/Magento/Backend/App/UserConfig.php
+++ b/app/code/Magento/Backend/App/UserConfig.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UserConfig implements AppInterface
 {
@@ -22,7 +21,6 @@ class UserConfig implements AppInterface
      * Console response
      *
      * @var Response
-     * @since 2.0.0
      */
     private $response;
 
@@ -30,7 +28,6 @@ class UserConfig implements AppInterface
      * Requested changes
      *
      * @var array
-     * @since 2.0.0
      */
     private $request;
 
@@ -38,7 +35,6 @@ class UserConfig implements AppInterface
      * Factory for config models
      *
      * @var Factory
-     * @since 2.0.0
      */
     private $configFactory;
 
@@ -48,7 +44,6 @@ class UserConfig implements AppInterface
      * @param Factory $configFactory
      * @param Response $response
      * @param array $request
-     * @since 2.0.0
      */
     public function __construct(
         Factory $configFactory,
@@ -64,7 +59,6 @@ public function __construct(
      * Run application
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -77,7 +71,6 @@ public function launch()
      * Inserts provided user configuration data into database
      *
      * @return void
-     * @since 2.0.0
      */
     private function updateUserConfigData()
     {
@@ -90,7 +83,6 @@ private function updateUserConfigData()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
diff --git a/app/code/Magento/Backend/Block/AbstractBlock.php b/app/code/Magento/Backend/Block/AbstractBlock.php
index 88a527eafa0a5..51e1831b97aa2 100644
--- a/app/code/Magento/Backend/Block/AbstractBlock.php
+++ b/app/code/Magento/Backend/Block/AbstractBlock.php
@@ -12,20 +12,17 @@
  *
  * Marked as public API because it is actively used now.
  * @api
- * @since 2.0.0
  */
 class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
     {
diff --git a/app/code/Magento/Backend/Block/Admin/Formkey.php b/app/code/Magento/Backend/Block/Admin/Formkey.php
index 61ecde141f8d9..2e3474dac2498 100644
--- a/app/code/Magento/Backend/Block/Admin/Formkey.php
+++ b/app/code/Magento/Backend/Block/Admin/Formkey.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Formkey extends \Magento\Backend\Block\Template
 {
@@ -19,7 +18,6 @@ class Formkey extends \Magento\Backend\Block\Template
      * Get form key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormKey()
     {
diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
index 2a9ec48323b62..fa230c5a15236 100644
--- a/app/code/Magento/Backend/Block/Cache.php
+++ b/app/code/Magento/Backend/Block/Cache.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cache extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -15,7 +14,6 @@ class Cache extends \Magento\Backend\Block\Widget\Grid\Container
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -47,7 +45,6 @@ protected function _construct()
      * Get url for clean cache storage
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFlushStorageUrl()
     {
@@ -58,7 +55,6 @@ public function getFlushStorageUrl()
      * Get url for clean cache storage
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFlushSystemUrl()
     {
diff --git a/app/code/Magento/Backend/Block/Cache/Additional.php b/app/code/Magento/Backend/Block/Cache/Additional.php
index 5ab7924e330aa..52f41600f64f8 100644
--- a/app/code/Magento/Backend/Block/Cache/Additional.php
+++ b/app/code/Magento/Backend/Block/Cache/Additional.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Additional extends \Magento\Backend\Block\Template
 {
@@ -15,7 +14,6 @@ class Additional extends \Magento\Backend\Block\Template
      * Check if application is in production mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInProductionMode()
     {
@@ -24,7 +22,6 @@ public function isInProductionMode()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCleanImagesUrl()
     {
@@ -33,7 +30,6 @@ public function getCleanImagesUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCleanMediaUrl()
     {
@@ -42,7 +38,6 @@ public function getCleanMediaUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCleanStaticFilesUrl()
     {
diff --git a/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php b/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
index b803e77b02141..001bf2543c2e5 100644
--- a/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
+++ b/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Statuses extends \Magento\Backend\Block\Widget\Grid\Column
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
@@ -23,7 +21,6 @@ class Statuses extends \Magento\Backend\Block\Widget\Grid\Column
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Add to column decorated status
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFrameCallback()
     {
@@ -54,7 +50,6 @@ public function getFrameCallback()
      * @param bool $isExport
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function decorateStatus($value, $row, $column, $isExport)
     {
diff --git a/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php b/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php
index 70634a95e8af7..0882facbeaca9 100644
--- a/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php
+++ b/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Container extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
@@ -15,7 +14,6 @@ class Container extends \Magento\Backend\Block\Template implements \Magento\Back
      * Return Tab label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -26,7 +24,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -37,7 +34,6 @@ public function getTabTitle()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -48,7 +44,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Backend/Block/Context.php b/app/code/Magento/Backend/Block/Context.php
index f22b2da7a634e..060fb3eb0d762 100644
--- a/app/code/Magento/Backend/Block/Context.php
+++ b/app/code/Magento/Backend/Block/Context.php
@@ -18,13 +18,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\View\Element\Context
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
@@ -49,7 +47,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -97,7 +94,6 @@ public function __construct(
      * Retrieve Authorization
      *
      * @return \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     public function getAuthorization()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index ff2386061421e..e3de182751cb7 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Dashboard extends \Magento\Backend\Block\Template
 {
@@ -19,13 +18,11 @@ class Dashboard extends \Magento\Backend\Block\Template
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'dashboard/index.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -62,7 +59,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSwitchUrl()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
index bbc711801233a..fcd1243ffa9d1 100644
--- a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
@@ -12,19 +12,16 @@
  * Adminhtml dashboard tab abstract
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractDashboard extends \Magento\Backend\Block\Widget
 {
     /**
      * @var \Magento\Backend\Helper\Dashboard\AbstractDashboard
-     * @since 2.0.0
      */
     protected $_dataHelper = null;
 
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -32,7 +29,6 @@ abstract class AbstractDashboard extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -54,7 +49,6 @@ public function getCollection()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -65,7 +59,6 @@ public function getCount()
      * Get data helper
      *
      * @return \Magento\Backend\Helper\Dashboard\AbstractDashboard
-     * @since 2.0.0
      */
     public function getDataHelper()
     {
@@ -74,7 +67,6 @@ public function getDataHelper()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
@@ -83,7 +75,6 @@ protected function _prepareData()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
index 1e5871ae9a05e..29557f12c1093 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Bar.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
@@ -9,25 +9,21 @@
  * Adminhtml dashboard bar block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = [];
 
     /**
      * @var \Magento\Directory\Model\Currency|null
-     * @since 2.0.0
      */
     protected $_currentCurrencyCode = null;
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -39,7 +35,6 @@ public function getTotals()
      * @param float $value
      * @param bool $isQuantity
      * @return $this
-     * @since 2.0.0
      */
     public function addTotal($label, $value, $isQuantity = false)
     {
@@ -65,7 +60,6 @@ public function addTotal($label, $value, $isQuantity = false)
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function format($price)
     {
@@ -77,7 +71,6 @@ public function format($price)
      *
      * @param \Magento\Directory\Model\Currency $currency
      * @return void
-     * @since 2.0.0
      */
     public function setCurrency($currency)
     {
@@ -88,7 +81,6 @@ public function setCurrency($currency)
      * Retrieve currency model if not set then return currency model for current store
      *
      * @return \Magento\Directory\Model\Currency
-     * @since 2.0.0
      */
     public function getCurrency()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Diagrams.php b/app/code/Magento/Backend/Block/Dashboard/Diagrams.php
index fccd26b70b900..12770bc12268d 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Diagrams.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Diagrams.php
@@ -9,19 +9,16 @@
  * Adminhtml dashboard diagram tabs
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Diagrams extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/tabshoriz.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +29,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 3fe73e7c81d1c..cecd7b8050352 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -9,7 +9,6 @@
  * Adminhtml dashboard google chart block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
 {
@@ -22,7 +21,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * All series
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allSeries = [];
 
@@ -30,7 +28,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Axis labels
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_axisLabels = [];
 
@@ -38,7 +35,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Axis maps
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_axisMaps = [];
 
@@ -46,7 +42,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Data rows
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dataRows = [];
 
@@ -54,7 +49,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Simple encoding chars
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_simpleEncoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
@@ -62,7 +56,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Extended encoding chars
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_extendedEncoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
 
@@ -70,7 +63,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Chart width
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_width = '780';
 
@@ -78,7 +70,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Chart height
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_height = '384';
 
@@ -86,7 +77,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Google chart api data encoding
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_encoding = 'e';
 
@@ -94,13 +84,11 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Html identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_htmlId = '';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'dashboard/graph.phtml';
 
@@ -108,7 +96,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Adminhtml dashboard data
      *
      * @var \Magento\Backend\Helper\Dashboard\Data
-     * @since 2.0.0
      */
     protected $_dashboardData = null;
 
@@ -117,7 +104,6 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -133,7 +119,6 @@ public function __construct(
      * Get tab template
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTabTemplate()
     {
@@ -145,7 +130,6 @@ protected function _getTabTemplate()
      *
      * @param array $rows
      * @return void
-     * @since 2.0.0
      */
     public function setDataRows($rows)
     {
@@ -158,7 +142,6 @@ public function setDataRows($rows)
      * @param string $seriesId
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     public function addSeries($seriesId, array $options)
     {
@@ -170,7 +153,6 @@ public function addSeries($seriesId, array $options)
      *
      * @param string $seriesId
      * @return array|false
-     * @since 2.0.0
      */
     public function getSeries($seriesId)
     {
@@ -185,7 +167,6 @@ public function getSeries($seriesId)
      * Get all series
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllSeries()
     {
@@ -201,7 +182,6 @@ public function getAllSeries()
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getChartUrl($directUrl = true)
     {
@@ -471,7 +451,6 @@ public function getChartUrl($directUrl = true)
      * @param array $attributes
      * @param bool $single
      * @return array
-     * @since 2.0.0
      */
     protected function getRowsData($attributes, $single = false)
     {
@@ -495,7 +474,6 @@ protected function getRowsData($attributes, $single = false)
      * @param string $axis
      * @param array $labels
      * @return void
-     * @since 2.0.0
      */
     public function setAxisLabels($axis, $labels)
     {
@@ -507,7 +485,6 @@ public function setAxisLabels($axis, $labels)
      *
      * @param string $htmlId
      * @return void
-     * @since 2.0.0
      */
     public function setHtmlId($htmlId)
     {
@@ -518,7 +495,6 @@ public function setHtmlId($htmlId)
      * Get html id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -530,7 +506,6 @@ public function getHtmlId()
      *
      * @param int $number
      * @return int
-     * @since 2.0.0
      */
     protected function _getPow($number)
     {
@@ -546,7 +521,6 @@ protected function _getPow($number)
      * Return chart width
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getWidth()
     {
@@ -557,7 +531,6 @@ protected function getWidth()
      * Return chart height
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getHeight()
     {
@@ -567,7 +540,6 @@ protected function getHeight()
     /**
      * @param \Magento\Backend\Helper\Dashboard\AbstractDashboard $dataHelper
      * @return void
-     * @since 2.0.0
      */
     public function setDataHelper(\Magento\Backend\Helper\Dashboard\AbstractDashboard $dataHelper)
     {
@@ -578,7 +550,6 @@ public function setDataHelper(\Magento\Backend\Helper\Dashboard\AbstractDashboar
      * Prepare chart data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
index 640e6d632ae8b..fd9f2cf15babb 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -10,13 +10,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'dashboard/grid.phtml';
 
@@ -24,7 +22,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Setting default for every grid on dashboard
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grids.php b/app/code/Magento/Backend/Block/Dashboard/Grids.php
index 7a28b17a93217..986854da93cf8 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Grids.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grids.php
@@ -9,19 +9,16 @@
  * Adminhtml dashboard bottom tabs
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grids extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/tabshoriz.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -43,7 +40,6 @@ protected function _construct()
      *     3) specify class 'ajax'
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index 1bf00c20e473a..9d9409fba093b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -10,19 +10,16 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
@@ -32,7 +29,6 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +53,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -94,7 +88,6 @@ protected function _prepareCollection()
      * Process collection after loading
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -108,7 +101,6 @@ protected function _afterLoadCollection()
      * Prepares page sizes for dashboard grid with las 5 orders
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _preparePage()
     {
@@ -119,7 +111,6 @@ protected function _preparePage()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -159,7 +150,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index 753f3801b17d4..d0f056230bcd1 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -9,19 +9,16 @@
  * Adminhtml dashboard sales statistics bar
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sales extends \Magento\Backend\Block\Dashboard\Bar
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
@@ -30,7 +27,6 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -44,7 +40,6 @@ public function __construct(
 
     /**
      * @return $this|void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
index dadf602cd0d7e..2f48a8ef0766d 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -8,7 +8,6 @@
 /**
  * Dashboard search query column renderer
  * @api
- * @since 2.0.0
  */
 class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -16,7 +15,6 @@ class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
      * String helper
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $stringHelper;
 
@@ -24,7 +22,6 @@ class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Stdlib\StringUtils $stringHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
index 9ff32dd3bc59e..130bcdeb56bc5 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Backend\Block\Dashboard\Tab\Amounts
  *
- * @since 2.0.0
  */
 class Amounts extends \Magento\Backend\Block\Dashboard\Graph
 {
@@ -24,7 +23,6 @@ class Amounts extends \Magento\Backend\Block\Dashboard\Graph
      * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
      * @param \Magento\Backend\Helper\Dashboard\Order $dataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,7 +39,6 @@ public function __construct(
      * Initialize object
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +50,6 @@ protected function _construct()
      * Prepare chart data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index e1e431494d742..f276831c76758 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Most extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -25,7 +23,6 @@ class Most extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -78,7 +73,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -134,7 +128,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index 865a1a168f38c..86590aa3b4aa3 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -10,13 +10,11 @@
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
- * @since 2.0.0
  */
 class Newest extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -25,7 +23,6 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Customer\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -76,7 +71,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -134,7 +128,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
index e8c7df5479aeb..168207862d155 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Backend\Block\Dashboard\Tab\Orders
  *
- * @since 2.0.0
  */
 class Orders extends \Magento\Backend\Block\Dashboard\Graph
 {
@@ -24,7 +23,6 @@ class Orders extends \Magento\Backend\Block\Dashboard\Graph
      * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
      * @param \Magento\Backend\Helper\Dashboard\Order $dataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,7 +39,6 @@ public function __construct(
      * Initialize object
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +50,6 @@ protected function _construct()
      * Prepare chart data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index 27901d5a02208..cac10ae372004 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -10,19 +10,16 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Ordered extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
@@ -32,7 +29,6 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +53,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -88,7 +82,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -140,7 +133,6 @@ protected function _prepareColumns()
      *
      * @param \Magento\Catalog\Model\Product $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
index 232ee6d79fbb4..699c7274001d3 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
@@ -13,13 +13,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Viewed extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productsFactory;
 
@@ -28,7 +26,6 @@ class Viewed extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Product\CollectionFactory $productsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -86,7 +81,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -124,7 +118,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index b8c7aa9fd03ca..94f2cf1581aa2 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Backend\Block\Dashboard\Totals
  *
- * @since 2.0.0
  */
 class Totals extends \Magento\Backend\Block\Dashboard\Bar
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
@@ -35,7 +32,6 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * @return $this|void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/Denied.php b/app/code/Magento/Backend/Block/Denied.php
index 922d6670d8bce..c3785a641ecd3 100644
--- a/app/code/Magento/Backend/Block/Denied.php
+++ b/app/code/Magento/Backend/Block/Denied.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Denied extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
@@ -21,7 +19,6 @@ class Denied extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasAvailableResources()
     {
diff --git a/app/code/Magento/Backend/Block/GlobalSearch.php b/app/code/Magento/Backend/Block/GlobalSearch.php
index 1091a8d4b6d1c..d8098c1a3ce0b 100644
--- a/app/code/Magento/Backend/Block/GlobalSearch.php
+++ b/app/code/Magento/Backend/Block/GlobalSearch.php
@@ -7,20 +7,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class GlobalSearch extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::system/search.phtml';
 
     /**
      * Get components configuration
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetInitOptions()
     {
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
index 71e8b41cf93df..a078251420f60 100644
--- a/app/code/Magento/Backend/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -8,25 +8,21 @@
 /**
  * Adminhtml media library uploader
  * @api
- * @since 2.0.0
  */
 class Uploader extends \Magento\Backend\Block\Widget
 {
     /**
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::media/uploader.phtml';
 
     /**
      * @var \Magento\Framework\File\Size
-     * @since 2.0.0
      */
     protected $_fileSizeService;
 
@@ -34,7 +30,6 @@ class Uploader extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +72,6 @@ protected function _construct()
      * Get file size
      *
      * @return \Magento\Framework\File\Size
-     * @since 2.0.0
      */
     public function getFileSizeService()
     {
@@ -89,7 +82,6 @@ public function getFileSizeService()
      * Prepares layout and set element renderer
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -101,7 +93,6 @@ protected function _prepareLayout()
      * Retrieve uploader js object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -112,7 +103,6 @@ public function getJsObjectName()
      * Retrieve config json
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigJson()
     {
@@ -123,7 +113,6 @@ public function getConfigJson()
      * Retrieve config object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -141,7 +130,6 @@ public function getConfig()
      *
      * @param string $url url to uploader in current theme
      * @return string full URL
-     * @since 2.0.0
      */
     public function getUploaderUrl($url)
     {
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index bc953d536f5fb..a584edda0da04 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -16,7 +16,6 @@
  * @method array getAdditionalCacheKeyInfo()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -24,13 +23,11 @@ class Menu extends \Magento\Backend\Block\Template
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_containerRenderer;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_itemRenderer;
 
@@ -38,7 +35,6 @@ class Menu extends \Magento\Backend\Block\Template
      * Backend URL instance
      *
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -46,31 +42,26 @@ class Menu extends \Magento\Backend\Block\Template
      * Current selected item
      *
      * @var \Magento\Backend\Model\Menu\Item|false|null
-     * @since 2.0.0
      */
     protected $_activeItemModel = null;
 
     /**
      * @var \Magento\Backend\Model\Menu\Filter\IteratorFactory
-     * @since 2.0.0
      */
     protected $_iteratorFactory;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Backend\Model\Menu\Config
-     * @since 2.0.0
      */
     protected $_menuConfig;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -96,7 +87,6 @@ class Menu extends \Magento\Backend\Block\Template
      * @param array $data
      * @param MenuItemChecker|null $menuItemChecker
      * @param AnchorRenderer|null $anchorRenderer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -123,7 +113,6 @@ public function __construct(
      * Initialize template and cache settings
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -136,7 +125,6 @@ protected function _construct()
      *
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @return string
-     * @since 2.0.0
      */
     protected function _getAnchorLabel($menuItem)
     {
@@ -147,7 +135,6 @@ protected function _getAnchorLabel($menuItem)
      * Render menu item mouse events
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @return string
-     * @since 2.0.0
      */
     protected function _renderMouseEvent($menuItem)
     {
@@ -160,7 +147,6 @@ protected function _renderMouseEvent($menuItem)
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     protected function _renderItemCssClass($menuItem, $level)
     {
@@ -187,7 +173,6 @@ protected function _renderItemCssClass($menuItem, $level)
      *
      * @param \Magento\Backend\Model\Menu $menu
      * @return \Magento\Backend\Model\Menu\Filter\Iterator
-     * @since 2.0.0
      */
     protected function _getMenuIterator($menu)
     {
@@ -199,7 +184,6 @@ protected function _getMenuIterator($menu)
      *
      * @param   string $html
      * @return  string
-     * @since 2.0.0
      */
     protected function _afterToHtml($html)
     {
@@ -217,7 +201,6 @@ protected function _afterToHtml($html)
      *
      * @param string[] $match
      * @return string
-     * @since 2.0.0
      */
     protected function _callbackSecretKey($match)
     {
@@ -232,7 +215,6 @@ protected function _callbackSecretKey($match)
      * Retrieve cache lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -243,7 +225,6 @@ public function getCacheLifetime()
      * Get Key pieces for caching block content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -265,7 +246,6 @@ public function getCacheKeyInfo()
      * Get menu config model
      *
      * @return \Magento\Backend\Model\Menu
-     * @since 2.0.0
      */
     public function getMenuModel()
     {
@@ -278,7 +258,6 @@ public function getMenuModel()
      * @param \Magento\Backend\Model\Menu $menu
      * @param int $level
      * @return string HTML
-     * @since 2.0.0
      */
     public function renderMenu($menu, $level = 0)
     {
@@ -312,7 +291,6 @@ public function renderMenu($menu, $level = 0)
      *
      * @param \Magento\Backend\Model\Menu $items
      * @return int
-     * @since 2.0.0
      */
     protected function _countItems($items)
     {
@@ -333,7 +311,6 @@ protected function _countItems($items)
      * @param int $limit
      * @return array|void
      * @todo: Add Depth Level limit, and better logic for columns
-     * @since 2.0.0
      */
     protected function _columnBrake($items, $limit)
     {
@@ -368,7 +345,6 @@ protected function _columnBrake($items, $limit)
      * @param int $limit
      * @param $id int
      * @return string HTML code
-     * @since 2.0.0
      */
     protected function _addSubMenu($menuItem, $level, $limit, $id = null)
     {
@@ -399,7 +375,6 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
      * @return string HTML
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
     {
@@ -438,7 +413,6 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
      * Get current selected menu item
      *
      * @return \Magento\Backend\Model\Menu\Item|false
-     * @since 2.0.0
      */
     public function getActiveItemModel()
     {
diff --git a/app/code/Magento/Backend/Block/Page.php b/app/code/Magento/Backend/Block/Page.php
index 403d66b0d446a..5a0b5b4405e82 100644
--- a/app/code/Magento/Backend/Block/Page.php
+++ b/app/code/Magento/Backend/Block/Page.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Page extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -27,7 +25,6 @@ class Page extends \Magento\Backend\Block\Template
      * @param Template\Context $context
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      * Get current language
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLang()
     {
@@ -67,7 +62,6 @@ public function getLang()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
diff --git a/app/code/Magento/Backend/Block/Page/Copyright.php b/app/code/Magento/Backend/Block/Page/Copyright.php
index 85bf9e0128580..cb4af8b8208d5 100644
--- a/app/code/Magento/Backend/Block/Page/Copyright.php
+++ b/app/code/Magento/Backend/Block/Page/Copyright.php
@@ -9,7 +9,6 @@
  * Copyright footer block
  *
  * @api
- * @since 2.0.0
  */
 class Copyright extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Copyright extends \Magento\Backend\Block\Template
      * Path to template file in theme
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'page/copyright.phtml';
 }
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
index 5835c28d88f68..ef43eebc7d9de 100644
--- a/app/code/Magento/Backend/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Footer extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'page/footer.phtml';
 
@@ -43,7 +41,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index c14a89f74f2b9..becbf29c924d9 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -11,13 +11,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Header extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'page/header.phtml';
 
@@ -25,13 +23,11 @@ class Header extends \Magento\Backend\Block\Template
      * Backend data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData = null;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
@@ -40,7 +36,6 @@ class Header extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHomeLink()
     {
@@ -64,7 +58,6 @@ public function getHomeLink()
 
     /**
      * @return \Magento\User\Model\User|null
-     * @since 2.0.0
      */
     public function getUser()
     {
@@ -73,7 +66,6 @@ public function getUser()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLogoutLink()
     {
@@ -84,7 +76,6 @@ public function getLogoutLink()
      * Check if noscript notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayNoscriptNotice()
     {
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 094d1b34e4411..e8adb22247a27 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Notices extends \Magento\Backend\Block\Template
 {
@@ -21,7 +20,6 @@ class Notices extends \Magento\Backend\Block\Template
      * Check if noscript notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayNoscriptNotice()
     {
@@ -35,7 +33,6 @@ public function displayNoscriptNotice()
      * Check if demo store notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayDemoNotice()
     {
diff --git a/app/code/Magento/Backend/Block/Page/RequireJs.php b/app/code/Magento/Backend/Block/Page/RequireJs.php
index c168c6bb0e686..99f211a9c00b0 100644
--- a/app/code/Magento/Backend/Block/Page/RequireJs.php
+++ b/app/code/Magento/Backend/Block/Page/RequireJs.php
@@ -10,13 +10,11 @@
  * Require Js block
  *
  * @api
- * @since 2.0.0
  */
 class RequireJs extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
@@ -24,7 +22,6 @@ class RequireJs extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Retrieve Session Form Key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormKey()
     {
diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 8880cc74d4212..9cee717cb585a 100644
--- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -13,7 +13,6 @@
  *
  * @deprecated 2.2.0
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Reset extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -25,7 +24,6 @@ class Reset extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +36,6 @@ public function __construct(
      * Set template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +47,6 @@ protected function _construct()
      * Get robots.txt custom instruction default value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRobotsDefaultCustomInstructions()
     {
@@ -64,7 +60,6 @@ public function getRobotsDefaultCustomInstructions()
      * Generate button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonHtml()
     {
@@ -86,7 +81,6 @@ public function getButtonHtml()
      *
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -101,7 +95,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index a592c94fd0661..1b49a2ef0d590 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -10,7 +10,6 @@
  * Store switcher block
  *
  * @api
- * @since 2.0.0
  */
 class Switcher extends \Magento\Backend\Block\Template
 {
@@ -23,7 +22,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Name of website variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultWebsiteVarName = 'website';
 
@@ -31,7 +29,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Name of store group variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultStoreGroupVarName = 'group';
 
@@ -39,13 +36,11 @@ class Switcher extends \Magento\Backend\Block\Template
      * Name of store variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultStoreVarName = 'store';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds;
 
@@ -53,13 +48,11 @@ class Switcher extends \Magento\Backend\Block\Template
      * Url for store switcher hint
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_hintUrl;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasDefaultOption = true;
 
@@ -67,7 +60,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Block template filename
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::store/switcher.phtml';
 
@@ -75,7 +67,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Website factory
      *
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
@@ -83,7 +74,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Store Group Factory
      *
      * @var \Magento\Store\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $_storeGroupFactory;
 
@@ -91,7 +81,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * Store Factory
      *
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
@@ -101,7 +90,6 @@ class Switcher extends \Magento\Backend\Block\Template
      * @param \Magento\Store\Model\GroupFactory $storeGroupFactory
      * @param \Magento\Store\Model\StoreFactory $storeFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -118,7 +106,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -143,7 +130,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Store\Model\ResourceModel\Website\Collection
-     * @since 2.0.0
      */
     public function getWebsiteCollection()
     {
@@ -161,7 +147,6 @@ public function getWebsiteCollection()
      * Get websites
      *
      * @return \Magento\Store\Model\Website[]
-     * @since 2.0.0
      */
     public function getWebsites()
     {
@@ -176,7 +161,6 @@ public function getWebsites()
      * Check if can switch to websites
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWebsiteSwitchEnabled()
     {
@@ -186,7 +170,6 @@ public function isWebsiteSwitchEnabled()
     /**
      * @param string $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteVarName($varName)
     {
@@ -196,7 +179,6 @@ public function setWebsiteVarName($varName)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getWebsiteVarName()
     {
@@ -210,7 +192,6 @@ public function getWebsiteVarName()
     /**
      * @param \Magento\Store\Model\Website $website
      * @return bool
-     * @since 2.0.0
      */
     public function isWebsiteSelected(\Magento\Store\Model\Website $website)
     {
@@ -219,7 +200,6 @@ public function isWebsiteSelected(\Magento\Store\Model\Website $website)
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -232,7 +212,6 @@ public function getWebsiteId()
     /**
      * @param int|\Magento\Store\Model\Website $website
      * @return \Magento\Store\Model\ResourceModel\Group\Collection
-     * @since 2.0.0
      */
     public function getGroupCollection($website)
     {
@@ -247,7 +226,6 @@ public function getGroupCollection($website)
      *
      * @param \Magento\Store\Model\Website|int $website
      * @return array
-     * @since 2.0.0
      */
     public function getStoreGroups($website)
     {
@@ -261,7 +239,6 @@ public function getStoreGroups($website)
      * Check if can switch to store group
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStoreGroupSwitchEnabled()
     {
@@ -271,7 +248,6 @@ public function isStoreGroupSwitchEnabled()
     /**
      * @param string $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreGroupVarName($varName)
     {
@@ -281,7 +257,6 @@ public function setStoreGroupVarName($varName)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreGroupVarName()
     {
@@ -295,7 +270,6 @@ public function getStoreGroupVarName()
     /**
      * @param \Magento\Store\Model\Group $group
      * @return bool
-     * @since 2.0.0
      */
     public function isStoreGroupSelected(\Magento\Store\Model\Group $group)
     {
@@ -304,7 +278,6 @@ public function isStoreGroupSelected(\Magento\Store\Model\Group $group)
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreGroupId()
     {
@@ -317,7 +290,6 @@ public function getStoreGroupId()
     /**
      * @param \Magento\Store\Model\Group|int $group
      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     public function getStoreCollection($group)
     {
@@ -337,7 +309,6 @@ public function getStoreCollection($group)
      *
      * @param \Magento\Store\Model\Group|int $group
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getStores($group)
     {
@@ -357,7 +328,6 @@ public function getStores($group)
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -370,7 +340,6 @@ public function getStoreId()
     /**
      * @param \Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isStoreSelected(\Magento\Store\Model\Store $store)
     {
@@ -381,7 +350,6 @@ public function isStoreSelected(\Magento\Store\Model\Store $store)
      * Check if can switch to store views
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStoreSwitchEnabled()
     {
@@ -391,7 +359,6 @@ public function isStoreSwitchEnabled()
     /**
      * @param string $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreVarName($varName)
     {
@@ -401,7 +368,6 @@ public function setStoreVarName($varName)
 
     /**
      * @return mixed|string
-     * @since 2.0.0
      */
     public function getStoreVarName()
     {
@@ -414,7 +380,6 @@ public function getStoreVarName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSwitchUrl()
     {
@@ -434,7 +399,6 @@ public function getSwitchUrl()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasScopeSelected()
     {
@@ -445,7 +409,6 @@ public function hasScopeSelected()
      * Get current selection name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentSelectionName()
     {
@@ -463,7 +426,6 @@ public function getCurrentSelectionName()
      * Get current website name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentWebsiteName()
     {
@@ -480,7 +442,6 @@ public function getCurrentWebsiteName()
      * Get current store group name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentStoreGroupName()
     {
@@ -497,7 +458,6 @@ public function getCurrentStoreGroupName()
      * Get current store view name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentStoreName()
     {
@@ -513,7 +473,6 @@ public function getCurrentStoreName()
     /**
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -523,7 +482,6 @@ public function setStoreIds($storeIds)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -532,7 +490,6 @@ public function getStoreIds()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isShow()
     {
@@ -541,7 +498,6 @@ public function isShow()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -556,7 +512,6 @@ protected function _toHtml()
      *
      * @param bool $hasDefaultOption
      * @return bool
-     * @since 2.0.0
      */
     public function hasDefaultOption($hasDefaultOption = null)
     {
@@ -570,7 +525,6 @@ public function hasDefaultOption($hasDefaultOption = null)
      * Return url for store switcher hint
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHintUrl()
     {
@@ -581,7 +535,6 @@ public function getHintUrl()
      * Return store switcher hint html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHintHtml()
     {
@@ -603,7 +556,6 @@ public function getHintHtml()
      * Get whether iframe is being used
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUsingIframe()
     {
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
index f3d7ec9f14eb6..4274273e43160 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -11,7 +11,6 @@
 /**
  * Form fieldset renderer
  * @api
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
 {
@@ -19,13 +18,11 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
      * Form element which re-rendering
      *
      * @var \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
 
@@ -33,7 +30,6 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
      * Retrieve an element
      *
      * @return \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -45,7 +41,6 @@ public function getElement()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -57,7 +52,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * Return html for store switcher hint
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHintHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
index 4da48c176545c..90e539b57b4a0 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -8,7 +8,6 @@
 /**
  * Form fieldset renderer
  * @api
- * @since 2.0.0
  */
 class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
@@ -17,13 +16,11 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
      * Form element which re-rendering
      *
      * @var \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
 
@@ -31,7 +28,6 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
      * Retrieve an element
      *
      * @return \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -43,7 +39,6 @@ public function getElement()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -55,7 +50,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * Return html for store switcher hint
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHintHtml()
     {
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit.php b/app/code/Magento/Backend/Block/System/Account/Edit.php
index 9e0c462825d56..40bf15892b208 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
index 0fe1fcb68d718..64bc057402bdd 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
@@ -12,7 +12,6 @@
  * Adminhtml edit admin user account form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -20,19 +19,16 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\User\Model\UserFactory
-     * @since 2.0.0
      */
     protected $_userFactory;
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
@@ -53,7 +49,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param array $data
      * @param OptionInterface $deployedLocales Operates with deployed locales
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -75,7 +70,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Backend/Block/System/Cache/Edit.php b/app/code/Magento/Backend/Block/System/Cache/Edit.php
index 1005ac3530995..be4de93460131 100644
--- a/app/code/Magento/Backend/Block/System/Cache/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Cache/Edit.php
@@ -9,19 +9,16 @@
  * Cache management edit page
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::system/cache/edit.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +29,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -52,7 +48,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -61,7 +56,6 @@ public function getSaveButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -70,7 +64,6 @@ public function getSaveUrl()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function initForm()
     {
@@ -85,7 +78,6 @@ public function initForm()
      * Retrieve Catalog Tools Data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCatalogData()
     {
diff --git a/app/code/Magento/Backend/Block/System/Cache/Form.php b/app/code/Magento/Backend/Block/System/Cache/Form.php
index b92be9298c31f..a0f495c784d2e 100644
--- a/app/code/Magento/Backend/Block/System/Cache/Form.php
+++ b/app/code/Magento/Backend/Block/System/Cache/Form.php
@@ -9,13 +9,11 @@
  * Cache management form page
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $cacheTypeList;
 
@@ -25,7 +23,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Initialize cache management form
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initForm()
     {
diff --git a/app/code/Magento/Backend/Block/System/Design.php b/app/code/Magento/Backend/Block/System/Design.php
index f514129398886..b21336866f972 100644
--- a/app/code/Magento/Backend/Block/System/Design.php
+++ b/app/code/Magento/Backend/Block/System/Design.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Design extends \Magento\Backend\Block\Template
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit.php b/app/code/Magento/Backend/Block/System/Design/Edit.php
index e510d4887d1ce..05dbb443c2490 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Backend\Block\System\Design\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::system/design/edit.phtml';
 
@@ -22,7 +20,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -30,7 +27,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +49,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -99,7 +93,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDesignChangeId()
     {
@@ -108,7 +101,6 @@ public function getDesignChangeId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -117,7 +109,6 @@ public function getDeleteUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -126,7 +117,6 @@ public function getSaveUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -135,7 +125,6 @@ public function getValidationUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 22fd593abd625..ed0983f5a0b63 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Backend\Block\System\Design\Edit\Tab\General
  *
- * @since 2.0.0
  */
 class General extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Framework\View\Design\Theme\LabelFactory
-     * @since 2.0.0
      */
     protected $_labelFactory;
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -32,7 +29,6 @@ class General extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      * Initialise form fields
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tabs.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tabs.php
index a62806e03ce6e..dfb667d722f8b 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tabs.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tabs.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Backend\Block\System\Design\Edit\Tabs
  *
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -26,7 +24,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete.php b/app/code/Magento/Backend/Block/System/Store/Delete.php
index d3845caea46a2..8d2cc4039aaf4 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete.php
@@ -9,7 +9,6 @@
  * Store / store view / website delete form container
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Delete extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Backend\Block\Widget\Form\Container
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +50,6 @@ protected function _construct()
      * Get edit form container header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -68,7 +65,6 @@ public function getHeaderText()
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreTypeTitle($title)
     {
@@ -81,7 +77,6 @@ public function setStoreTypeTitle($title)
      *
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     public function setBackUrl($url)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
index 41a84394e2cb4..e479e8f560dae 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
@@ -9,7 +9,6 @@
  * Adminhtml cms block edit form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Init form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
index 61cd19f2b3838..ae80b56066a6d 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -9,13 +9,11 @@
  * Adminhtml store delete group block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Group extends \Magento\Backend\Block\Template
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
index df28ee4d2126e..da28a471130cc 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -9,13 +9,11 @@
  * Adminhtml store delete group block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Website extends \Magento\Backend\Block\Template
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit.php b/app/code/Magento/Backend/Block/System/Store/Edit.php
index dcfdd7951227d..43e4987090fe9 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit.php
@@ -12,7 +12,6 @@
  * @api
  *
  * Adminhtml store edit
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -20,7 +19,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -35,7 +33,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -52,7 +49,6 @@ public function __construct(
      * Init class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -115,7 +111,6 @@ protected function _construct()
      * Get Header text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -141,7 +136,6 @@ public function getHeaderText()
      * Build child form class form name based on value of store_type in registry
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _buildFormClassName()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
index 17e85139e9b02..f19799d2e4939 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 abstract class AbstractForm extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -19,7 +18,6 @@ abstract class AbstractForm extends \Magento\Backend\Block\Widget\Form\Generic
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Prepare form data
      *
      * @return \Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -73,7 +70,6 @@ protected function _prepareForm()
      * @param \Magento\Framework\Data\Form $form
      * @return void
      * @abstract
-     * @since 2.0.0
      */
     abstract protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form);
 }
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
index e6b7c2ed0c068..c8d04cef86d05 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
@@ -11,25 +11,21 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Group extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
 {
     /**
      * @var \Magento\Catalog\Model\Config\Source\Category
-     * @since 2.0.0
      */
     protected $_category;
 
     /**
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
     /**
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
@@ -41,7 +37,6 @@ class Group extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
      * @param \Magento\Store\Model\StoreFactory $storeFactory
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * @param \Magento\Framework\Data\Form $form
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
index d483f5532f86d..10e8a24c474f8 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
@@ -11,19 +11,16 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Store extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
 {
     /**
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
     /**
      * @var \Magento\Store\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $_groupFactory;
 
@@ -34,7 +31,6 @@ class Store extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
      * @param \Magento\Store\Model\GroupFactory $groupFactory
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form $form
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
     {
@@ -158,7 +153,6 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
      * Retrieve list of store groups
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getStoreGroups()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
index 7dd3e8429a8fa..ec4e2cd8b444c 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
@@ -11,13 +11,11 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Website extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
 {
     /**
      * @var \Magento\Store\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $_groupFactory;
 
@@ -27,7 +25,6 @@ class Website extends \Magento\Backend\Block\System\Store\Edit\AbstractForm
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Store\Model\GroupFactory $groupFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form $form
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
index 6803deb85d2be..59657f38465d7 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
@@ -9,13 +9,11 @@
  * Store render group
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Group extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
index 54cf56620af9c..23b2de683a958 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
@@ -9,13 +9,11 @@
  * Store render store
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
index a82832ce0c218..913e2c903d20c 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
@@ -9,13 +9,11 @@
  * Store render website
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Website extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php
index cf2153bbcd454..c9f99ee605169 100644
--- a/app/code/Magento/Backend/Block/System/Store/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Store.php
@@ -11,19 +11,16 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Backend';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index 614b49bc19c71..70af35d455877 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -23,44 +23,37 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Template extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var \Magento\Framework\Code\NameBuilder
-     * @since 2.0.0
      */
     protected $nameBuilder;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
     {
@@ -77,7 +70,6 @@ public function __construct(\Magento\Backend\Block\Template\Context $context, ar
      * Retrieve Session Form Key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormKey()
     {
@@ -94,7 +86,6 @@ public function getFormKey()
      * @return boolean
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isOutputEnabled($moduleName = null)
     {
@@ -105,7 +96,6 @@ public function isOutputEnabled($moduleName = null)
      * Make this public so that templates can use it properly with template engine
      *
      * @return \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     public function getAuthorization()
     {
@@ -116,7 +106,6 @@ public function getAuthorization()
      * Prepare html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -128,7 +117,6 @@ protected function _toHtml()
      * Return toolbar block instance
      *
      * @return bool|\Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     public function getToolbar()
     {
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index 327365b07d7fb..a25b04064a150 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -18,43 +18,36 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\View\Element\Template\Context
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var \Magento\Framework\Code\NameBuilder
-     * @since 2.0.0
      */
     protected $nameBuilder;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
@@ -91,7 +84,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -163,7 +155,6 @@ public function __construct(
      * Get store manager
      *
      * @return \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     public function getStoreManager()
     {
@@ -174,7 +165,6 @@ public function getStoreManager()
      * Retrieve Authorization
      *
      * @return \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     public function getAuthorization()
     {
@@ -183,7 +173,6 @@ public function getAuthorization()
 
     /**
      * @return \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     public function getBackendSession()
     {
@@ -192,7 +181,6 @@ public function getBackendSession()
 
     /**
      * @return \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     public function getMathRandom()
     {
@@ -201,7 +189,6 @@ public function getMathRandom()
 
     /**
      * @return \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     public function getFormKey()
     {
@@ -210,7 +197,6 @@ public function getFormKey()
 
     /**
      * @return \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     public function getNameBuilder()
     {
diff --git a/app/code/Magento/Backend/Block/Text/ListText.php b/app/code/Magento/Backend/Block/Text/ListText.php
index 05daaa8c8b5b8..71b6248059277 100644
--- a/app/code/Magento/Backend/Block/Text/ListText.php
+++ b/app/code/Magento/Backend/Block/Text/ListText.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ListText extends \Magento\Framework\View\Element\Text\ListText
 {
diff --git a/app/code/Magento/Backend/Block/Widget.php b/app/code/Magento/Backend/Block/Widget.php
index db84f68d09b24..b35f036257c9a 100644
--- a/app/code/Magento/Backend/Block/Widget.php
+++ b/app/code/Magento/Backend/Block/Widget.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Widget extends \Magento\Backend\Block\Template
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -31,7 +29,6 @@ public function getId()
      *
      * @param string $suffix
      * @return string
-     * @since 2.0.0
      */
     public function getSuffixId($suffix)
     {
@@ -40,7 +37,6 @@ public function getSuffixId($suffix)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -52,7 +48,6 @@ public function getHtmlId()
      *
      * @param array $params url parameters
      * @return string current url
-     * @since 2.0.0
      */
     public function getCurrentUrl($params = [])
     {
@@ -67,7 +62,6 @@ public function getCurrentUrl($params = [])
      * @param string|null $title
      * @param string|null $link
      * @return void
-     * @since 2.0.0
      */
     protected function _addBreadcrumb($label, $title = null, $link = null)
     {
@@ -83,7 +77,6 @@ protected function _addBreadcrumb($label, $title = null, $link = null)
      * @param string $buttonId
      * @param array $dataAttr
      * @return string
-     * @since 2.0.0
      */
     public function getButtonHtml($label, $onclick, $class = '', $buttonId = null, $dataAttr = [])
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Accordion.php b/app/code/Magento/Backend/Block/Widget/Accordion.php
index 27d408f599fd2..376276cb899c0 100644
--- a/app/code/Magento/Backend/Block/Widget/Accordion.php
+++ b/app/code/Magento/Backend/Block/Widget/Accordion.php
@@ -9,25 +9,21 @@
  * Magento_Backend accordion widget
  *
  * @api
- * @since 2.0.0
  */
 class Accordion extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_items = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/accordion.phtml';
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -38,7 +34,6 @@ public function getItems()
      * @param string $itemId
      * @param array $config
      * @return $this
-     * @since 2.0.0
      */
     public function addItem($itemId, $config)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Accordion/Item.php b/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
index 9a8bd4a3ab8b4..4650609a58025 100644
--- a/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
@@ -11,20 +11,17 @@
  * Accordion item
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Backend\Block\Widget
 {
     /**
      * @var Accordion
-     * @since 2.0.0
      */
     protected $_accordion;
 
     /**
      * @param Accordion $accordion
      * @return $this
-     * @since 2.0.0
      */
     public function setAccordion($accordion)
     {
@@ -34,7 +31,6 @@ public function setAccordion($accordion)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTarget()
     {
@@ -43,7 +39,6 @@ public function getTarget()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -58,7 +53,6 @@ public function getTitle()
 
     /**
      * @return null|string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -74,7 +68,6 @@ public function getContent()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -87,7 +80,6 @@ public function getClass()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Breadcrumbs.php b/app/code/Magento/Backend/Block/Widget/Breadcrumbs.php
index 98dcbe8e363c9..3124a64f679f0 100644
--- a/app/code/Magento/Backend/Block/Widget/Breadcrumbs.php
+++ b/app/code/Magento/Backend/Block/Widget/Breadcrumbs.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Breadcrumbs extends \Magento\Backend\Block\Template
 {
@@ -18,19 +17,16 @@ class Breadcrumbs extends \Magento\Backend\Block\Template
      * Breadcrumbs links
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_links = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/breadcrumbs.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +38,6 @@ protected function _construct()
      * @param string|null $title
      * @param string|null $url
      * @return $this
-     * @since 2.0.0
      */
     public function addLink($label, $title = null, $url = null)
     {
@@ -55,7 +50,6 @@ public function addLink($label, $title = null, $url = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index 7549ad61b68fb..51457199b05a0 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Button extends \Magento\Backend\Block\Widget
 {
@@ -19,7 +18,6 @@ class Button extends \Magento\Backend\Block\Widget
      * Define block template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Retrieve button type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -45,7 +42,6 @@ public function getType()
      * Retrieve onclick handler
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getOnClick()
     {
@@ -56,7 +52,6 @@ public function getOnClick()
      * Retrieve attributes html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributesHtml()
     {
@@ -85,7 +80,6 @@ public function getAttributesHtml()
      * @param array $classes
      * @param string $disabled
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareAttributes($title, $classes, $disabled)
     {
@@ -113,7 +107,6 @@ protected function _prepareAttributes($title, $classes, $disabled)
      *
      * @param array $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function _attributesToHtml($attributes)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
index 29c58ac22ba73..08043c4e39790 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ButtonList
 {
     /**
      * @var ItemFactory
-     * @since 2.0.0
      */
     protected $itemFactory;
 
     /**
      * @param ItemFactory $itemFactory
-     * @since 2.0.0
      */
     public function __construct(ItemFactory $itemFactory)
     {
@@ -29,7 +26,6 @@ public function __construct(ItemFactory $itemFactory)
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_buttons = [-1 => [], 0 => [], 1 => []];
 
@@ -43,7 +39,6 @@ public function __construct(ItemFactory $itemFactory)
      * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null)
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function add($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -65,7 +60,6 @@ public function add($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'too
      *
      * @param string $buttonId
      * @return void
-     * @since 2.0.0
      */
     public function remove($buttonId)
     {
@@ -86,7 +80,6 @@ public function remove($buttonId)
      * @param string|null $key
      * @param string $data
      * @return void
-     * @since 2.0.0
      */
     public function update($buttonId, $key, $data)
     {
@@ -115,7 +108,6 @@ public function update($buttonId, $key, $data)
      * Get all buttons
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -131,7 +123,6 @@ public function getItems()
      * @param Item $itemA
      * @param Item $itemB
      * @return int
-     * @since 2.0.0
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php b/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php
index 9d097fb9b02af..14bd7112b20a0 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Backend\Block\Widget\Button\ContextInterface
  *
- * @since 2.0.0
  */
 interface ContextInterface
 {
@@ -19,7 +18,6 @@ interface ContextInterface
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Button/Item.php b/app/code/Magento/Backend/Block/Widget/Button/Item.php
index 5944fbd536839..94ac0368db25e 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/Item.php
@@ -14,7 +14,6 @@
  * @method int getLevel()
  * @method int getSortOrder()
  * @method string getTitle()
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\DataObject
 {
@@ -22,7 +21,6 @@ class Item extends \Magento\Framework\DataObject
      * Object delete flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDeleted = false;
 
@@ -31,7 +29,6 @@ class Item extends \Magento\Framework\DataObject
      *
      * @param boolean $isDeleted
      * @return bool
-     * @since 2.0.0
      */
     public function isDeleted($isDeleted = null)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index f5549bcebfbd4..f6c1795ca1e68 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -17,7 +17,6 @@
  * @method string getStyle()
  * @method array getDataAttribute()
  * @api
- * @since 2.0.0
  */
 class SplitButton extends \Magento\Backend\Block\Widget
 {
@@ -25,7 +24,6 @@ class SplitButton extends \Magento\Backend\Block\Widget
      * Define block template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +37,6 @@ protected function _construct()
      * Retrieve <div> wrapper attributes html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributesHtml()
     {
@@ -67,7 +64,6 @@ public function getAttributesHtml()
      * Retrieve button attributes html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonAttributesHtml()
     {
@@ -109,7 +105,6 @@ public function getButtonAttributesHtml()
      * Retrieve toggle button attributes html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToggleAttributesHtml()
     {
@@ -144,7 +139,6 @@ public function getToggleAttributesHtml()
      * @param array $option
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getOptionAttributesHtml($key, $option)
     {
@@ -175,7 +169,6 @@ public function getOptionAttributesHtml($key, $option)
      * If this function returns false then split button will be rendered as simple button
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasSplit()
     {
@@ -188,7 +181,6 @@ public function hasSplit()
      * @param array $data
      * @param array &$attributes
      * @return void
-     * @since 2.0.0
      */
     protected function _getDataAttributes($data, &$attributes)
     {
@@ -206,7 +198,6 @@ protected function _getDataAttributes($data, &$attributes)
      * @param string $disabled
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareOptionAttributes($option, $title, $classes, $disabled)
     {
@@ -231,7 +222,6 @@ protected function _prepareOptionAttributes($option, $title, $classes, $disabled
      *
      * @param array $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributesString($attributes)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php b/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php
index 3a6caf310b38b..f1c45b0bdf3dd 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Backend\Block\Widget\Button\Toolbar
  *
- * @since 2.0.0
  */
 class Toolbar implements ToolbarInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function pushButtons(
         \Magento\Framework\View\Element\AbstractBlock $context,
@@ -50,7 +48,6 @@ public function pushButtons(
      * @param string $containerName
      * @param \Magento\Backend\Block\Widget\Button\Item $buttonItem
      * @return \Magento\Backend\Block\Widget\Button\Toolbar\Container
-     * @since 2.0.0
      */
     protected function createContainer(LayoutInterface $layout, $containerName, $buttonItem)
     {
@@ -68,7 +65,6 @@ protected function createContainer(LayoutInterface $layout, $containerName, $but
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param string $region
      * @return \Magento\Backend\Block\Template
-     * @since 2.0.0
      */
     protected function getToolbar(\Magento\Framework\View\Element\AbstractBlock $context, $region)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php b/app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php
index 48846c1d75a01..23a4fe829b292 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php
@@ -13,7 +13,6 @@
  * @method ContextInterface getContext()
  * @method ContextInterface setContext(ContextInterface $context)
  * @api
- * @since 2.0.0
  */
 class Container extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -23,7 +22,6 @@ class Container extends \Magento\Framework\View\Element\AbstractBlock
      * @param string $blockName
      * @param string $blockClassName
      * @return \Magento\Backend\Block\Widget\Button
-     * @since 2.0.0
      */
     protected function createButton($blockName, $blockClassName = null)
     {
@@ -35,7 +33,6 @@ protected function createButton($blockName, $blockClassName = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php b/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php
index 16a89e0d211b9..395fb1667fa39 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Backend\Block\Widget\Button\ToolbarInterface
  *
- * @since 2.0.0
  */
 interface ToolbarInterface
 {
@@ -20,7 +19,6 @@ interface ToolbarInterface
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function pushButtons(
         \Magento\Framework\View\Element\AbstractBlock $context,
diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php
index 238d48b84f9ee..41054ee1ee38e 100644
--- a/app/code/Magento/Backend/Block/Widget/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Container.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Container extends \Magento\Backend\Block\Template implements ContainerInterface
 {
@@ -25,38 +24,29 @@ class Container extends \Magento\Backend\Block\Template implements ContainerInte
 
     /**#@-*/
 
-    /**
-     * So called "container controller" to specify group of blocks participating in some action
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_controller = 'empty';
 
     /**
      * Header text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_headerText = 'Container Widget Header';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $toolbar;
 
     /**
      * @param Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Widget\Context $context, array $data = [])
     {
@@ -69,7 +59,6 @@ public function __construct(\Magento\Backend\Block\Widget\Context $context, arra
      * Initialize "controller" and "header text"
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -91,7 +80,6 @@ protected function _construct()
      * @param integer $sortOrder
      * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null)
      * @return $this
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -104,7 +92,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      *
      * @param string $buttonId
      * @return $this
-     * @since 2.0.0
      */
     public function removeButton($buttonId)
     {
@@ -119,7 +106,6 @@ public function removeButton($buttonId)
      * @param string|null $key
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -131,7 +117,6 @@ public function updateButton($buttonId, $key, $data)
      * Preparing child blocks for each added button
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -144,7 +129,6 @@ protected function _prepareLayout()
      *
      * @param string $region
      * @return string
-     * @since 2.0.0
      */
     public function getButtonsHtml($region = null)
     {
@@ -165,7 +149,6 @@ public function getButtonsHtml($region = null)
      * Get header text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -176,7 +159,6 @@ public function getHeaderText()
      * Get header CSS class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -187,7 +169,6 @@ public function getHeaderCssClass()
      * Get header HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderHtml()
     {
@@ -198,7 +179,6 @@ public function getHeaderHtml()
      * Check if there's anything to display in footer
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function hasFooterButtons()
     {
@@ -217,7 +197,6 @@ public function hasFooterButtons()
      *
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canRender(Button\Item $item)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/ContainerInterface.php b/app/code/Magento/Backend/Block/Widget/ContainerInterface.php
index 0a924b1af30a1..2ce0b8e19e815 100644
--- a/app/code/Magento/Backend/Block/Widget/ContainerInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/ContainerInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ContainerInterface extends \Magento\Backend\Block\Widget\Button\ContextInterface
 {
@@ -21,7 +20,6 @@ interface ContainerInterface extends \Magento\Backend\Block\Widget\Button\Contex
      * @param integer $sortOrder
      * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null)
      * @return $this
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar');
 
@@ -30,7 +28,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      *
      * @param string $buttonId
      * @return $this
-     * @since 2.0.0
      */
     public function removeButton($buttonId);
 
@@ -41,7 +38,6 @@ public function removeButton($buttonId);
      * @param string|null $key
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
index 45113e697eef2..ffa983a611623 100644
--- a/app/code/Magento/Backend/Block/Widget/Context.php
+++ b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -18,25 +18,21 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Backend\Block\Template\Context
 {
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $buttonToolbar;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
@@ -75,7 +71,6 @@ class Context extends \Magento\Backend\Block\Template\Context
      * @param Button\ToolbarInterface $toolbar
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -152,7 +147,6 @@ public function __construct(
      * Get button list
      *
      * @return \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     public function getButtonList()
     {
@@ -163,7 +157,6 @@ public function getButtonList()
      * Get button toolbar
      *
      * @return \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     public function getButtonToolbar()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
index b03c24b80cc35..75e9a4d9528cc 100644
--- a/app/code/Magento/Backend/Block/Widget/Form.php
+++ b/app/code/Magento/Backend/Block/Widget/Form.php
@@ -11,7 +11,6 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget
 {
@@ -19,20 +18,17 @@ class Form extends \Magento\Backend\Block\Widget
      * Form Object
      *
      * @var \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     protected $_form;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form.phtml';
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Backend\Block\Template\Context $context, ar
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +54,6 @@ protected function _construct()
      * You can redefine this method in child classes for changing layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -89,7 +83,6 @@ protected function _prepareLayout()
      * Get form object
      *
      * @return \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -100,7 +93,6 @@ public function getForm()
      * Get form HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -115,7 +107,6 @@ public function getFormHtml()
      *
      * @param \Magento\Framework\Data\Form $form
      * @return $this
-     * @since 2.0.0
      */
     public function setForm(\Magento\Framework\Data\Form $form)
     {
@@ -136,7 +127,6 @@ public function setForm(\Magento\Framework\Data\Form $form)
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -147,7 +137,6 @@ protected function _prepareForm()
      * This method is called before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -161,7 +150,6 @@ protected function _beforeToHtml()
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
@@ -175,7 +163,6 @@ protected function _initFormValues()
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @param array $exclude attributes that should be skipped
      * @return void
-     * @since 2.0.0
      */
     protected function _setFieldset($attributes, $fieldset, $exclude = [])
     {
@@ -223,7 +210,6 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
      *
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAttributeVisible(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -237,7 +223,6 @@ protected function _isAttributeVisible(\Magento\Eav\Model\Entity\Attribute $attr
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -265,7 +250,6 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
      *
      * @param \Magento\Framework\Data\Form\AbstractForm $baseElement
      * @return void
-     * @since 2.0.0
      */
     protected function _addElementTypes(\Magento\Framework\Data\Form\AbstractForm $baseElement)
     {
@@ -279,7 +263,6 @@ protected function _addElementTypes(\Magento\Framework\Data\Form\AbstractForm $b
      * Retrieve predefined additional element types
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -292,7 +275,6 @@ protected function _getAdditionalElementTypes()
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getAdditionalElementHtml($element)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index e3ee9460744fe..f0629de71d80e 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -11,37 +11,31 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Container extends \Magento\Backend\Block\Widget\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_objectId = 'id';
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_formScripts = [];
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_formInitScripts = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_mode = 'edit';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Backend';
     
@@ -57,13 +51,11 @@ class Container extends \Magento\Backend\Block\Widget\Container
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/container.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -122,7 +114,6 @@ protected function _construct()
      * Create form block
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -140,7 +131,6 @@ protected function _prepareLayout()
      * Build child form class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _buildFormClassName()
     {
@@ -153,7 +143,6 @@ protected function _buildFormClassName()
      * Get URL for back (reset) button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -162,7 +151,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -174,7 +162,6 @@ public function getDeleteUrl()
      *
      * @see getFormActionUrl()
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -185,7 +172,6 @@ public function getSaveUrl()
      * Get form action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormActionUrl()
     {
@@ -197,7 +183,6 @@ public function getFormActionUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -207,7 +192,6 @@ public function getFormHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormInitScripts()
     {
@@ -219,7 +203,6 @@ public function getFormInitScripts()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormScripts()
     {
@@ -231,7 +214,6 @@ public function getFormScripts()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderWidth()
     {
@@ -240,7 +222,6 @@ public function getHeaderWidth()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -249,7 +230,6 @@ public function getHeaderCssClass()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderHtml()
     {
@@ -261,7 +241,6 @@ public function getHeaderHtml()
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function setDataObject($object)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Element.php
index 48cebdbe2dad0..c3224d62b627e 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element.php
@@ -11,38 +11,32 @@
  * Form element widget block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Element extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var Form
-     * @since 2.0.0
      */
     protected $_form;
 
     /**
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_formBlock;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/element.phtml';
 
     /**
      * @param string $element
      * @return $this
-     * @since 2.0.0
      */
     public function setElement($element)
     {
@@ -53,7 +47,6 @@ public function setElement($element)
     /**
      * @param Form $form
      * @return $this
-     * @since 2.0.0
      */
     public function setForm($form)
     {
@@ -64,7 +57,6 @@ public function setForm($form)
     /**
      * @param \Magento\Framework\DataObject $formBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setFormBlock($formBlock)
     {
@@ -74,7 +66,6 @@ public function setFormBlock($formBlock)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 86d46e31723af..23c5605f416c0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -13,14 +13,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Dependence extends \Magento\Backend\Block\AbstractBlock
 {
     /**
      * name => id mapper
      * @var array
-     * @since 2.0.0
      */
     protected $_fields = [];
 
@@ -34,7 +32,6 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
      *     )
      * )
      * @var array
-     * @since 2.0.0
      */
     protected $_depends = [];
 
@@ -42,19 +39,16 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
      * Additional configuration options for the dependencies javascript controller
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configOptions = [];
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Dependency\FieldFactory
-     * @since 2.0.0
      */
     protected $_fieldFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -63,7 +57,6 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Config\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -82,7 +75,6 @@ public function __construct(
      * @param string $fieldId - element ID in DOM
      * @param string $fieldName - element name in their fieldset/form namespace
      * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
-     * @since 2.0.0
      */
     public function addFieldMap($fieldId, $fieldName)
     {
@@ -97,7 +89,6 @@ public function addFieldMap($fieldId, $fieldName)
      * @param string $fieldNameFrom
      * @param \Magento\Config\Model\Config\Structure\Element\Dependency\Field|string $refField
      * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
-     * @since 2.0.0
      */
     public function addFieldDependence($fieldName, $fieldNameFrom, $refField)
     {
@@ -116,7 +107,6 @@ public function addFieldDependence($fieldName, $fieldNameFrom, $refField)
      *
      * @param array $options
      * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
-     * @since 2.0.0
      */
     public function addConfigOptions(array $options)
     {
@@ -127,7 +117,6 @@ public function addConfigOptions(array $options)
     /**
      * HTML output getter
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -147,7 +136,6 @@ protected function _toHtml()
     /**
      * Field dependences JSON map generator
      * @return string
-     * @since 2.0.0
      */
     protected function _getDependsJson()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
index 85b828470cf6b..aa0b0c3352ebe 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
@@ -12,27 +12,23 @@
  * Backend image gallery item renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Gallery extends \Magento\Backend\Block\Template implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var AbstractElement|null
-     * @since 2.0.0
      */
     protected $_element = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/element/gallery.phtml';
 
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -43,7 +39,6 @@ public function render(AbstractElement $element)
     /**
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     public function setElement(AbstractElement $element)
     {
@@ -53,7 +48,6 @@ public function setElement(AbstractElement $element)
 
     /**
      * @return AbstractElement|null
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -62,7 +56,6 @@ public function getElement()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -71,7 +64,6 @@ public function getValues()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -91,7 +83,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -101,7 +92,6 @@ public function getAddButtonHtml()
     /**
      * @param string $image
      * @return string|string[]
-     * @since 2.0.0
      */
     public function getDeleteButtonHtml($image)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Generic.php b/app/code/Magento/Backend/Block/Widget/Form/Generic.php
index 6fa40f949b614..3b4e64752930b 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Generic.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Generic.php
@@ -9,13 +9,11 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Generic extends \Magento\Backend\Block\Widget\Form
 {
     /**
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
@@ -23,7 +21,6 @@ class Generic extends \Magento\Backend\Block\Widget\Form
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -32,7 +29,6 @@ class Generic extends \Magento\Backend\Block\Widget\Form
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
index 56d2a0317ef9b..a90e55ffcf412 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
@@ -14,25 +14,21 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Element extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/renderer/element.phtml';
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -42,7 +38,6 @@ public function getElement()
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
index a6d9aaf6bdb96..464ec47abf6b3 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
@@ -15,25 +15,21 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/renderer/fieldset.phtml';
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -43,7 +39,6 @@ public function getElement()
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
index 2f2d6da7cf134..79ec45f326fd0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
@@ -14,25 +14,21 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Element extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
-     * @since 2.0.0
      */
     protected $_element;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/form/renderer/fieldset/element.phtml';
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -42,7 +38,6 @@ public function getElement()
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 5c6529e134aa2..31746d2d67659 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -14,7 +14,6 @@
  * @method string getRowClickCallback() getRowClickCallback()
  * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback() setRowClickCallback(string $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget
 {
@@ -22,61 +21,51 @@ class Grid extends \Magento\Backend\Block\Widget
      * Page and sorting var names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_varNameLimit = 'limit';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_varNamePage = 'page';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_varNameSort = 'sort';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_varNameDir = 'dir';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_varNameFilter = 'filter';
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultLimit = 20;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultPage = 1;
 
     /**
      * @var bool|string
-     * @since 2.0.0
      */
     protected $_defaultSort = false;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultDir = 'desc';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultFilter = [];
 
@@ -84,7 +73,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Empty grid text
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_emptyText;
 
@@ -92,7 +80,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Empty grid text CSS class
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_emptyTextCss = 'empty-text';
 
@@ -100,7 +87,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Pager visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_pagerVisibility = true;
 
@@ -108,7 +94,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Massage block visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_messageBlockVisibility = false;
 
@@ -116,7 +101,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Should parameters be saved in session
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_saveParametersInSession = false;
 
@@ -124,7 +108,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * Count totals
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_countTotals = false;
 
@@ -132,25 +115,21 @@ class Grid extends \Magento\Backend\Block\Widget
      * Totals
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_varTotals;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid.phtml';
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendHelper;
 
@@ -158,7 +137,6 @@ class Grid extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -173,7 +151,6 @@ public function __construct(
     /**
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -211,7 +188,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return void
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -222,7 +198,6 @@ public function setCollection($collection)
      * Get collection object
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -233,7 +208,6 @@ public function getCollection()
      * Retrieve column set block
      *
      * @return \Magento\Backend\Block\Widget\Grid\ColumnSet
-     * @since 2.0.0
      */
     public function getColumnSet()
     {
@@ -245,7 +219,6 @@ public function getColumnSet()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getExportBlock()
     {
@@ -261,7 +234,6 @@ public function getExportBlock()
      * Retrieve list of grid columns
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumns()
     {
@@ -272,7 +244,6 @@ public function getColumns()
      * Count grid columns
      *
      * @return int
-     * @since 2.0.0
      */
     public function getColumnCount()
     {
@@ -284,7 +255,6 @@ public function getColumnCount()
      *
      * @param string $columnId
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getColumn($columnId)
     {
@@ -296,7 +266,6 @@ public function getColumn($columnId)
      *
      * @param mixed $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _setFilterValues($data)
     {
@@ -321,7 +290,6 @@ protected function _setFilterValues($data)
      *
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -344,7 +312,6 @@ protected function _addColumnFilterToCollection($column)
      *
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCollectionOrder($column)
     {
@@ -360,7 +327,6 @@ protected function _setCollectionOrder($column)
      * Get prepared collection
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getPreparedCollection()
     {
@@ -373,7 +339,6 @@ public function getPreparedCollection()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -412,7 +377,6 @@ protected function _prepareCollection()
      * Apply pagination to collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _preparePage()
     {
@@ -424,7 +388,6 @@ protected function _preparePage()
      * Initialize grid
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareGrid()
     {
@@ -455,7 +418,6 @@ protected function _prepareGrid()
      * Get massaction block
      *
      * @return bool|\Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getMassactionBlock()
     {
@@ -466,7 +428,6 @@ public function getMassactionBlock()
      * Prepare grid filter buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFilterButtons()
     {
@@ -500,7 +461,6 @@ protected function _prepareFilterButtons()
      * Initialize grid before rendering
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -512,7 +472,6 @@ protected function _beforeToHtml()
      * Retrieve limit request key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVarNameLimit()
     {
@@ -523,7 +482,6 @@ public function getVarNameLimit()
      * Retrieve page request key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVarNamePage()
     {
@@ -534,7 +492,6 @@ public function getVarNamePage()
      * Retrieve sort request key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVarNameSort()
     {
@@ -545,7 +502,6 @@ public function getVarNameSort()
      * Retrieve sort direction request key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVarNameDir()
     {
@@ -556,7 +512,6 @@ public function getVarNameDir()
      * Retrieve filter request key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVarNameFilter()
     {
@@ -568,7 +523,6 @@ public function getVarNameFilter()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setVarNameLimit($name)
     {
@@ -581,7 +535,6 @@ public function setVarNameLimit($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setVarNamePage($name)
     {
@@ -594,7 +547,6 @@ public function setVarNamePage($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setVarNameSort($name)
     {
@@ -607,7 +559,6 @@ public function setVarNameSort($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setVarNameDir($name)
     {
@@ -620,7 +571,6 @@ public function setVarNameDir($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setVarNameFilter($name)
     {
@@ -633,7 +583,6 @@ public function setVarNameFilter($name)
      *
      * @param bool $visible
      * @return $this
-     * @since 2.0.0
      */
     public function setPagerVisibility($visible = true)
     {
@@ -646,7 +595,6 @@ public function setPagerVisibility($visible = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getPagerVisibility()
     {
@@ -658,7 +606,6 @@ public function getPagerVisibility()
      *
      * @param bool $visible
      * @return void
-     * @since 2.0.0
      */
     public function setMessageBlockVisibility($visible = true)
     {
@@ -670,7 +617,6 @@ public function setMessageBlockVisibility($visible = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getMessageBlockVisibility()
     {
@@ -682,7 +628,6 @@ public function getMessageBlockVisibility()
      *
      * @param int $limit
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultLimit($limit)
     {
@@ -695,7 +640,6 @@ public function setDefaultLimit($limit)
      *
      * @param int $page
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultPage($page)
     {
@@ -708,7 +652,6 @@ public function setDefaultPage($page)
      *
      * @param string $sort
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultSort($sort)
     {
@@ -721,7 +664,6 @@ public function setDefaultSort($sort)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDir($dir)
     {
@@ -734,7 +676,6 @@ public function setDefaultDir($dir)
      *
      * @param string $filter
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultFilter($filter)
     {
@@ -746,7 +687,6 @@ public function setDefaultFilter($filter)
      * Check whether grid container should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayContainer()
     {
@@ -760,7 +700,6 @@ public function canDisplayContainer()
      * Retrieve grid reload url
      *
      * @return string;
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -773,7 +712,6 @@ public function getGridUrl()
      *
      * @param array $params url parameters
      * @return string current grid url
-     * @since 2.0.0
      */
     public function getAbsoluteGridUrl($params = [])
     {
@@ -786,7 +724,6 @@ public function getAbsoluteGridUrl($params = [])
      * @param string $paramName
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($paramName, $default = null)
     {
@@ -809,7 +746,6 @@ public function getParam($paramName, $default = null)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setSaveParametersInSession($flag)
     {
@@ -821,7 +757,6 @@ public function setSaveParametersInSession($flag)
      * Retrieve grid javascript object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -833,7 +768,6 @@ public function getJsObjectName()
      *
      * @param bool $count
      * @return $this
-     * @since 2.0.0
      */
     public function setCountTotals($count = true)
     {
@@ -846,7 +780,6 @@ public function setCountTotals($count = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCountTotals()
     {
@@ -858,7 +791,6 @@ public function getCountTotals()
      *
      * @param \Magento\Framework\DataObject $totals
      * @return void
-     * @since 2.0.0
      */
     public function setTotals(\Magento\Framework\DataObject $totals)
     {
@@ -869,7 +801,6 @@ public function setTotals(\Magento\Framework\DataObject $totals)
      * Retrieve totals
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -880,7 +811,6 @@ public function getTotals()
      * Generate list of grid buttons
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainButtonsHtml()
     {
@@ -896,7 +826,6 @@ public function getMainButtonsHtml()
      * Generate reset button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResetFilterButtonHtml()
     {
@@ -907,7 +836,6 @@ public function getResetFilterButtonHtml()
      * Generate search button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSearchButtonHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column.php b/app/code/Magento/Backend/Block/Widget/Grid/Column.php
index 3130cb392437a..7f9ae78414146 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Column extends \Magento\Backend\Block\Widget
 {
@@ -20,7 +19,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Parent grid
      *
      * @var \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected $_grid;
 
@@ -28,7 +26,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Column renderer
      *
      * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
-     * @since 2.0.0
      */
     protected $_renderer;
 
@@ -36,7 +33,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Column filter
      *
      * @var AbstractFilter
-     * @since 2.0.0
      */
     protected $_filter;
 
@@ -44,7 +40,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Column css classes
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_cssClass = null;
 
@@ -52,7 +47,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Renderer types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rendererTypes = [
         'action' => \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action::class,
@@ -81,7 +75,6 @@ class Column extends \Magento\Backend\Block\Widget
      * Filter types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filterTypes = [
         'datetime' => \Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime::class,
@@ -104,13 +97,11 @@ class Column extends \Magento\Backend\Block\Widget
     /**
      * Column is grouped
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGrouped = false;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -125,7 +116,6 @@ public function _construct()
      * Should column be displayed in grid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -137,7 +127,6 @@ public function isDisplayed()
      *
      * @param \Magento\Backend\Block\Widget\Grid $grid
      * @return $this
-     * @since 2.0.0
      */
     public function setGrid($grid)
     {
@@ -151,7 +140,6 @@ public function setGrid($grid)
      * Get grid block
      *
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     public function getGrid()
     {
@@ -162,7 +150,6 @@ public function getGrid()
      * Retrieve html id of filter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -173,7 +160,6 @@ public function getHtmlId()
      * Get html code for column properties
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlProperty()
     {
@@ -183,7 +169,6 @@ public function getHtmlProperty()
     /**
      * Get Header html
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderHtml()
     {
@@ -194,7 +179,6 @@ public function getHeaderHtml()
      * Get column css classes
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCssClass()
     {
@@ -218,7 +202,6 @@ public function getCssClass()
      * Get column css property
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCssProperty()
     {
@@ -230,7 +213,6 @@ public function getCssProperty()
      *
      * @param bool $value
      * @return void
-     * @since 2.0.0
      */
     public function setSortable($value)
     {
@@ -240,7 +222,6 @@ public function setSortable($value)
     /**
      * Get header css class name
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -253,7 +234,6 @@ public function getHeaderCssClass()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getSortable()
     {
@@ -265,7 +245,6 @@ public function getSortable()
      *
      * @param string $className
      * @return void
-     * @since 2.0.0
      */
     public function addHeaderCssClass($className)
     {
@@ -276,7 +255,6 @@ public function addHeaderCssClass($className)
     /**
      * Get header class names
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderHtmlProperty()
     {
@@ -293,7 +271,6 @@ public function getHeaderHtmlProperty()
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function getRowField(\Magento\Framework\DataObject $row)
     {
@@ -322,7 +299,6 @@ public function getRowField(\Magento\Framework\DataObject $row)
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function getRowFieldExport(\Magento\Framework\DataObject $row)
     {
@@ -347,7 +323,6 @@ public function getRowFieldExport(\Magento\Framework\DataObject $row)
      * Retrieve Header Name for Export
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExportHeader()
     {
@@ -363,7 +338,6 @@ public function getExportHeader()
      * @param string $value
      * @param array|string $decorators
      * @return string
-     * @since 2.0.0
      */
     protected function &_applyDecorators($value, $decorators)
     {
@@ -391,7 +365,6 @@ protected function &_applyDecorators($value, $decorators)
      *
      * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer $renderer
      * @return $this
-     * @since 2.0.0
      */
     public function setRenderer($renderer)
     {
@@ -405,7 +378,6 @@ public function setRenderer($renderer)
      * @param string $type type of renderer
      * @param string $className renderer class name
      * @return void
-     * @since 2.0.0
      */
     public function setRendererType($type, $className)
     {
@@ -416,7 +388,6 @@ public function setRendererType($type, $className)
      * Get renderer class name by renderer type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getRendererByType()
     {
@@ -432,7 +403,6 @@ protected function _getRendererByType()
      * Retrieve column renderer
      *
      * @return \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
-     * @since 2.0.0
      */
     public function getRenderer()
     {
@@ -451,7 +421,6 @@ public function getRenderer()
      *
      * @param string $filterClass filter class name
      * @return void
-     * @since 2.0.0
      */
     public function setFilter($filterClass)
     {
@@ -466,7 +435,6 @@ public function setFilter($filterClass)
      * @param string $type type of filter
      * @param string $className filter class name
      * @return void
-     * @since 2.0.0
      */
     public function setFilterType($type, $className)
     {
@@ -477,7 +445,6 @@ public function setFilterType($type, $className)
      * Get column filter class name by filter type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFilterByType()
     {
@@ -491,7 +458,6 @@ protected function _getFilterByType()
      * Get filter block
      *
      * @return AbstractFilter|false
-     * @since 2.0.0
      */
     public function getFilter()
     {
@@ -516,7 +482,6 @@ public function getFilter()
      * Get filter html code
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getFilterHtml()
     {
@@ -529,7 +494,6 @@ public function getFilterHtml()
      * Check if column is grouped
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGrouped()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
index d14a7172a8d2e..f5a61a1ce3fcc 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
@@ -8,14 +8,12 @@
 /**
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column
 {
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php
index 3ebdc9f933044..9641365aaf7b0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class AbstractFilter extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Backend\Block\Widget\Grid\Column\Filter\FilterInterface
@@ -20,13 +19,11 @@ class AbstractFilter extends \Magento\Backend\Block\AbstractBlock implements
      * Column related to filter
      *
      * @var \Magento\Backend\Block\Widget\Grid\Column
-     * @since 2.0.0
      */
     protected $_column;
 
     /**
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -34,7 +31,6 @@ class AbstractFilter extends \Magento\Backend\Block\AbstractBlock implements
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
-     * @since 2.0.0
      */
     public function setColumn($column)
     {
@@ -62,7 +57,6 @@ public function setColumn($column)
      * Retrieve column related to filter
      *
      * @return \Magento\Backend\Block\Widget\Grid\Column
-     * @since 2.0.0
      */
     public function getColumn()
     {
@@ -73,7 +67,6 @@ public function getColumn()
      * Retrieve html name of filter
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getHtmlName()
     {
@@ -84,7 +77,6 @@ protected function _getHtmlName()
      * Retrieve html id of filter
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getHtmlId()
     {
@@ -96,7 +88,6 @@ protected function _getHtmlId()
      *
      * @param mixed $index
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
@@ -107,7 +98,6 @@ public function getEscapedValue($index = null)
      * Retrieve condition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -119,7 +109,6 @@ public function getCondition()
      * Retrieve filter html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Checkbox.php
index c7fbf73c5b666..6ba8c37b0e4a8 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Checkbox.php
@@ -9,13 +9,11 @@
  * Checkbox grid column filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -24,7 +22,6 @@ public function getHtml()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -37,7 +34,6 @@ protected function _getOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Country.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Country.php
index 2a6073321cd0a..0280f3f2a1533 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Country.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Country.php
@@ -7,13 +7,11 @@
 
 /**
  * Country grid filter
- * @since 2.0.0
  */
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_directoriesFactory;
 
@@ -22,7 +20,6 @@ class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $directoriesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 0b23e5c248988..8f0b9b993554b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -11,25 +11,21 @@
 /**
  * Date grid column filter
  * @api
- * @since 2.0.0
  */
 class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -40,7 +36,6 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -133,7 +127,6 @@ public function getHtml()
     /**
      * @param string|null $index
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
@@ -150,7 +143,6 @@ public function getEscapedValue($index = null)
     /**
      * @param string|null $index
      * @return array|string|int|float|null
-     * @since 2.0.0
      */
     public function getValue($index = null)
     {
@@ -169,7 +161,6 @@ public function getValue($index = null)
 
     /**
      * @return array|string|int|float|null
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -181,7 +172,6 @@ public function getCondition()
     /**
      * @param array|string|int|float $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -207,7 +197,6 @@ public function setValue($value)
      *
      * @param string $date
      * @return \DateTime|null
-     * @since 2.0.0
      */
     protected function _convertDate($date)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 35f853ada57c3..96b3471db845e 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -11,7 +11,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @todo        date format
- * @since 2.0.0
  */
 class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
 {
@@ -22,7 +21,6 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue($index = null)
     {
@@ -63,7 +61,6 @@ public function getValue($index = null)
      *
      * @param string $date
      * @return \DateTime|null
-     * @since 2.0.0
      */
     protected function _convertDate($date)
     {
@@ -86,7 +83,6 @@ protected function _convertDate($date)
      * Render filter html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -146,7 +142,6 @@ public function getHtml()
      *
      * @param string $index
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php
index 37d8f69f7213d..21e5d85df28f9 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php
@@ -11,14 +11,12 @@
  * Grid column filter interface
  *
  * @api
- * @since 2.0.0
  */
 interface FilterInterface
 {
     /**
      * @return Column
      * @api
-     * @since 2.0.0
      */
     public function getColumn();
 
@@ -26,14 +24,12 @@ public function getColumn();
      * @param Column $column
      * @return AbstractFilter
      * @api
-     * @since 2.0.0
      */
     public function setColumn($column);
 
     /**
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getHtml();
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Massaction.php
index b935b86930a84..9da793dc9fc61 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Massaction.php
@@ -9,13 +9,11 @@
  * Massaction grid column filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Massaction extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Checkbox
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
index da8f7e1353c36..c6e271c3ec304 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
@@ -11,25 +11,21 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_currencyList = null;
 
     /**
      * @var \Magento\Directory\Model\Currency
-     * @since 2.0.0
      */
     protected $_currencyModel = null;
 
     /**
      * @var \Magento\Directory\Model\Currency\DefaultLocator
-     * @since 2.0.0
      */
     protected $_currencyLocator = null;
 
@@ -39,7 +35,6 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
      * @param \Magento\Directory\Model\Currency $currencyModel
      * @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Retrieve html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -106,7 +100,6 @@ public function getHtml()
      * Retrieve display currency select
      *
      * @return true|mixed
-     * @since 2.0.0
      */
     public function getDisplayCurrencySelect()
     {
@@ -121,7 +114,6 @@ public function getDisplayCurrencySelect()
      * Retrieve currency affect
      *
      * @return true|mixed
-     * @since 2.0.0
      */
     public function getCurrencyAffect()
     {
@@ -136,7 +128,6 @@ public function getCurrencyAffect()
      * Retrieve currency select html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrencySelectHtml()
     {
@@ -159,7 +150,6 @@ protected function _getCurrencySelectHtml()
      * Retrieve list of currencies
      *
      * @return array|null
-     * @since 2.0.0
      */
     protected function _getCurrencyList()
     {
@@ -174,7 +164,6 @@ protected function _getCurrencyList()
      *
      * @param null $index
      * @return array|null
-     * @since 2.0.0
      */
     public function getValue($index = null)
     {
@@ -192,7 +181,6 @@ public function getValue($index = null)
      * Retrieve filter condition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -221,7 +209,6 @@ public function getCondition()
      * Retrieve column currency code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getColumnCurrencyCode()
     {
@@ -241,7 +228,6 @@ protected function _getColumnCurrencyCode()
      * @param string $fromRate
      * @param string $toRate
      * @return float
-     * @since 2.0.0
      */
     protected function _getRate($fromRate, $toRate)
     {
@@ -253,7 +239,6 @@ protected function _getRate($fromRate, $toRate)
      *
      * @param string $displayCurrency
      * @return void
-     * @since 2.0.0
      */
     public function prepareRates($displayCurrency)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
index 4248ef8dcea40..2cbe264c5f396 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
@@ -9,13 +9,11 @@
  * Checkbox grid column filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Radio extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -28,7 +26,6 @@ protected function _getOptions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
index 72b0adc05bf7a..9aaeb26d9156b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Range extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -59,7 +57,6 @@ public function getHtml()
     /**
      * @param string|null $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($index = null)
     {
@@ -75,7 +72,6 @@ public function getValue($index = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
index 111805d3d2683..81c668c7284ef 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Select extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -50,7 +48,6 @@ protected function _getOptions()
      * @param array $option
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _renderOption($option, $value)
     {
@@ -64,7 +61,6 @@ protected function _renderOption($option, $value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -90,7 +86,6 @@ public function getHtml()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select/Extended.php
index ad6281174695c..58394fd7bbcc1 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select/Extended.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Filter\Select\Extended
  *
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
@@ -16,7 +15,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Get options for filter value
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/SkipList.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/SkipList.php
index a1fc65dd3fe00..4256732a1f258 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/SkipList.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/SkipList.php
@@ -9,13 +9,11 @@
  * Massaction grid column filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class SkipList extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
index a5414e5c1aed9..4a6f3e4e4bd87 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Filter\Store
  *
- * @since 2.0.0
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
@@ -20,7 +19,6 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -29,7 +27,6 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -120,7 +116,6 @@ public function getHtml()
      * Form condition from element's value
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
index 7fd0e95590e9c..3945ae26e7046 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
@@ -10,13 +10,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index 914f27eae883e..ddec3148545a1 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Filter\Theme
  *
- * @since 2.0.0
  */
 class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
      * @var \Magento\Framework\View\Design\Theme\LabelFactory
-     * @since 2.0.0
      */
     protected $_labelFactory;
 
@@ -27,7 +25,6 @@ class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Retrieve filter HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -66,7 +62,6 @@ public function getHtml()
      * Or load if options was not set.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -84,7 +79,6 @@ public function getOptions()
      *
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     protected function _drawOptions($options)
     {
@@ -116,7 +110,6 @@ protected function _drawOptions($options)
      * Retrieve filter condition for collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
index 49efb24da6f79..056cb01000b86 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
@@ -10,14 +10,12 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Multistore extends \Magento\Backend\Block\Widget\Grid\Column
 {
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
     {
@@ -28,7 +26,6 @@ public function __construct(\Magento\Backend\Block\Template\Context $context, ar
      * Get header css class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
index 9d4e39117c8f9..94db53e15c7af 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
@@ -13,26 +13,22 @@
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock implements RendererInterface
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth;
 
     /**
      * @var Column
-     * @since 2.0.0
      */
     protected $_column;
 
     /**
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     public function setColumn($column)
     {
@@ -42,7 +38,6 @@ public function setColumn($column)
 
     /**
      * @return Column
-     * @since 2.0.0
      */
     public function getColumn()
     {
@@ -54,7 +49,6 @@ public function getColumn()
      *
      * @param   Object $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(DataObject $row)
     {
@@ -73,7 +67,6 @@ public function render(DataObject $row)
      *
      * @param Object $row
      * @return string
-     * @since 2.0.0
      */
     public function renderExport(DataObject $row)
     {
@@ -83,7 +76,6 @@ public function renderExport(DataObject $row)
     /**
      * @param Object $row
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getValue(DataObject $row)
     {
@@ -101,7 +93,6 @@ protected function _getValue(DataObject $row)
     /**
      * @param Object $row
      * @return string
-     * @since 2.0.0
      */
     public function _getInputValueElement(DataObject $row)
     {
@@ -118,7 +109,6 @@ public function _getInputValueElement(DataObject $row)
     /**
      * @param Object $row
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getInputValue(DataObject $row)
     {
@@ -127,7 +117,6 @@ protected function _getInputValue(DataObject $row)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderHeader()
     {
@@ -159,7 +148,6 @@ public function renderHeader()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderProperty()
     {
@@ -184,7 +172,6 @@ public function renderProperty()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderCss()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index e2c5e56a05979..8c66e5f0097c5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -11,13 +11,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -25,7 +23,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -77,7 +73,6 @@ public function render(\Magento\Framework\DataObject $row)
      * @param array $action
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
     {
@@ -99,7 +94,6 @@ protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
      * @param array $action
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
     {
@@ -128,7 +122,6 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _transformActionData(&$action, &$actionCaption, \Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Button.php
index c1b6c0eb0acb5..bfaa9e0d1926b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Button.php
@@ -8,7 +8,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @since 2.0.0
  */
 class Button extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Button extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index c2bfe0a6cd392..6396bf0fee15b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -10,25 +10,21 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 55;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_values;
 
     /**
      * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -36,7 +32,6 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -51,7 +46,6 @@ public function __construct(
      * Returns values of the column
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -65,7 +59,6 @@ public function getValues()
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getValues()
     {
@@ -80,7 +73,6 @@ protected function _getValues()
      * @return  string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -122,7 +114,6 @@ public function render(\Magento\Framework\DataObject $row)
      * @param string $value   Value of the element
      * @param bool   $checked Whether it is checked
      * @return string
-     * @since 2.0.0
      */
     protected function _getCheckboxHtml($value, $checked)
     {
@@ -146,7 +137,6 @@ protected function _getCheckboxHtml($value, $checked)
      * Renders header of the column
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderHeader()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkboxes/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkboxes/Extended.php
index 75af1ba731c95..cf2fdabc8b9cc 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkboxes/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkboxes/Extended.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Renderer\Checkboxes\Extended
  *
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Checkbox
 {
@@ -16,7 +15,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Checkb
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     public function _getValues()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Concat.php
index 7f06319295bf5..9958001cae963 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Concat.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Concat.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Concat extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -19,7 +18,6 @@ class Concat extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
index 7fc1cad53e3ae..91e3a51c98df0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $localeLists;
 
@@ -24,7 +22,6 @@ class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index f331df8334b31..2209ac616ec3e 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -10,13 +10,11 @@
  * Backend grid item renderer currency
  *
  * @api
- * @since 2.0.0
  */
 class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 100;
 
@@ -24,7 +22,6 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * Currency objects cache
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected static $_currencies = [];
 
@@ -32,25 +29,21 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * Application object
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Model\Currency\DefaultLocator
-     * @since 2.0.0
      */
     protected $_currencyLocator;
 
     /**
      * @var \Magento\Directory\Model\Currency
-     * @since 2.0.0
      */
     protected $_defaultBaseCurrency;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -61,7 +54,6 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -87,7 +79,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -107,7 +98,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrencyCode($row)
     {
@@ -126,7 +116,6 @@ protected function _getCurrencyCode($row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return float|int
-     * @since 2.0.0
      */
     protected function _getRate($row)
     {
@@ -143,7 +132,6 @@ protected function _getRate($row)
      * Returns HTML for CSS
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderCss()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
index bebcd59a22d1e..d979204abe515 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
@@ -11,13 +11,11 @@
  * Backend grid item renderer date
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 160;
 
@@ -25,13 +23,11 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Date format string
      *
      * @var string
-     * @since 2.0.0
      */
     protected static $_format = null;
 
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -39,7 +35,6 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * @param \Magento\Backend\Block\Context $context
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
      *
      * @return string
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function _getFormat()
     {
@@ -80,7 +74,6 @@ protected function _getFormat()
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
index e9652e1d22441..35c5abb85a107 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -19,7 +18,6 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/DraggableHandle.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/DraggableHandle.php
index e36c2a4ca03bc..f28f342bd5b65 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/DraggableHandle.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/DraggableHandle.php
@@ -8,7 +8,6 @@
 /**
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class DraggableHandle extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class DraggableHandle extends \Magento\Backend\Block\Widget\Grid\Column\Renderer
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Input.php
index 45c38533ba127..0458fb35ed5e2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Input.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Input.php
@@ -8,13 +8,11 @@
 /**
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Input extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_values;
 
@@ -23,7 +21,6 @@ class Input extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Ip.php
index 47c41d17761ee..20bc85b802a2d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Ip.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Ip.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Ip extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -19,7 +18,6 @@ class Ip extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRend
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php
index 9c7d62e6d7b87..81bd97bd2721a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php
@@ -8,7 +8,6 @@
 /**
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Longtext extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -20,7 +19,6 @@ class Longtext extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index 01db1d05069e2..1fc4fc354b615 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Massaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Checkbox
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 20;
 
@@ -24,7 +22,6 @@ class Massaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Chec
      * Render header of the row
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderHeader()
     {
@@ -35,7 +32,6 @@ public function renderHeader()
      * Render HTML properties
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderProperty()
     {
@@ -50,7 +46,6 @@ public function renderProperty()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -66,7 +61,6 @@ public function render(\Magento\Framework\DataObject $row)
      * @param string $value
      * @param bool   $checked
      * @return string
-     * @since 2.0.0
      */
     protected function _getCheckboxHtml($value, $checked)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Number.php
index 7ee044f2a1fab..4e5941bc401bb 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Number.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Number.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Number extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 100;
 
@@ -25,7 +23,6 @@ class Number extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param \Magento\Framework\DataObject $row
      * @return mixed|string
-     * @since 2.0.0
      */
     protected function _getValue(\Magento\Framework\DataObject $row)
     {
@@ -46,7 +43,6 @@ protected function _getValue(\Magento\Framework\DataObject $row)
      * Renders CSS
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderCss()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
index 179feecdbae94..c927d07db26dc 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Options extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -18,7 +17,6 @@ class Options extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      * Get options from column
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -31,7 +29,6 @@ protected function _getOptions()
      * @param \Magento\Framework\DataObject $row
      * @return string|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Converter.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Converter.php
index a24b6ff8584dc..3a929bd644f3a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Converter.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Converter.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Converter
 {
@@ -16,7 +15,6 @@ class Converter
      *
      * @param array $treeData
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray($treeData)
     {
@@ -36,7 +34,6 @@ public function toFlatArray($treeData)
      *
      * @param array $flatData
      * @return array
-     * @since 2.0.0
      */
     public function toTreeArray($flatData)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Extended.php
index 3cbc2566f36b7..3fde303e87bb5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options/Extended.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Extended
  *
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options
 {
     /**
      * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -22,7 +20,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Option
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     public function _getOptions()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
index 2cee2a6b7fa3d..a78c7cf26611e 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 100;
 
@@ -24,13 +22,11 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      * Currency objects cache
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected static $_currencies = [];
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -38,7 +34,6 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -78,7 +72,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string|false
-     * @since 2.0.0
      */
     protected function _getCurrencyCode($row)
     {
@@ -96,7 +89,6 @@ protected function _getCurrencyCode($row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return float|int
-     * @since 2.0.0
      */
     protected function _getRate($row)
     {
@@ -113,7 +105,6 @@ protected function _getRate($row)
      * Renders CSS
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderCss()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio.php
index 23ed35dac1f35..4103fddbc6f2f 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio.php
@@ -10,25 +10,21 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Radio extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultWidth = 55;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_values;
 
     /**
      * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -36,7 +32,6 @@ class Radio extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -51,7 +46,6 @@ public function __construct(
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getValues()
     {
@@ -63,7 +57,6 @@ protected function _getValues()
      * Returns all values for the column
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -78,7 +71,6 @@ public function getValues()
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio/Extended.php
index afa43e1ec9762..2c2040bf62a3a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Radio/Extended.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Renderer\Radio\Extended
  *
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Radio
 {
@@ -16,7 +15,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Radio
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getValues()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php
index c895e4db2fcfa..37028e917d5d5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -23,7 +22,6 @@ interface RendererInterface
      * @return void
      * @abstract
      * @api
-     * @since 2.0.0
      */
     public function setColumn($column);
 
@@ -33,7 +31,6 @@ public function setColumn($column);
      * @abstract
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function getColumn();
 
@@ -43,7 +40,6 @@ public function getColumn();
      * @param \Magento\Framework\DataObject $row
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select.php
index 0985c982c8fc1..13f3db0fa477b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select.php
@@ -9,13 +9,11 @@
  * Grid select input column renderer
  *
  * @api
- * @since 2.0.0
  */
 class Select extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -23,7 +21,6 @@ class Select extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get options from column
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -50,7 +46,6 @@ protected function _getOptions()
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select/Extended.php
index 5cf40d0d38ccd..bc5cd4ff8fe4b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Select/Extended.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Backend\Block\Widget\Grid\Column\Renderer\Select\Extended
  *
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Select
 {
@@ -16,7 +15,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Select
      * Prepare data for renderer
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
index bb942c5fbfab8..c79ac3d8a3c85 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
@@ -9,25 +9,21 @@
  * Store grid column filter
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_skipAllStoresLabel = false;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_skipEmptyStoresLabel = false;
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -35,7 +31,6 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -50,7 +45,6 @@ public function __construct(
      * Retrieve System Store model
      *
      * @return \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected function _getStoreModel()
     {
@@ -62,7 +56,6 @@ protected function _getStoreModel()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     protected function _getShowAllStoresLabelFlag()
     {
@@ -78,7 +71,6 @@ protected function _getShowAllStoresLabelFlag()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     protected function _getShowEmptyStoresLabelFlag()
     {
@@ -96,7 +88,6 @@ protected function _getShowEmptyStoresLabelFlag()
      * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -148,7 +139,6 @@ public function render(\Magento\Framework\DataObject $row)
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function renderExport(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
index f0bd071e92825..5225f1038a738 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Text extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -20,7 +19,6 @@ class Text extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Format variables pattern
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_variablePattern = '/\\$([a-z0-9_]+)/i';
 
@@ -29,7 +27,6 @@ class Text extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      *
      * @param DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function _getValue(DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Wrapline.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Wrapline.php
index d412a6add197f..1eacbf87e428f 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Wrapline.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Wrapline.php
@@ -9,7 +9,6 @@
  * Backend grid item renderer line to wrap
  *
  * @api
- * @since 2.0.0
  */
 class Wrapline extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Wrapline extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * Default max length of a line at one row
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_defaultMaxLineLength = 60;
 
@@ -25,7 +23,6 @@ class Wrapline extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -33,7 +30,6 @@ class Wrapline extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 0436e4053db1a..e001c413d9640 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -9,13 +9,11 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ColumnSet extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
-     * @since 2.0.0
      */
     protected $_rowUrlGenerator;
 
@@ -23,7 +21,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Column headers visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_headersVisibility = true;
 
@@ -31,7 +28,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Filter visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_filterVisibility = true;
 
@@ -39,7 +35,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Empty grid text
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_emptyText;
 
@@ -47,7 +42,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Empty grid text CSS class
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_emptyTextCss = 'empty-text';
 
@@ -55,7 +49,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Label for empty cell
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_emptyCellLabel = '';
 
@@ -63,7 +56,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Count subtotals
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_countSubTotals = false;
 
@@ -71,7 +63,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Count totals
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_countTotals = false;
 
@@ -79,13 +70,11 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Columns to group by
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_groupedColumn = [];
 
     /**
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isCollapsed;
 
@@ -93,19 +82,16 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * Path to template file in theme
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid/column_set.phtml';
 
     /**
      * @var \Magento\Backend\Model\Widget\Grid\SubTotals
-     * @since 2.0.0
      */
     protected $_subTotals = null;
 
     /**
      * @var \Magento\Backend\Model\Widget\Grid\Totals
-     * @since 2.0.0
      */
     protected $_totals = null;
 
@@ -116,7 +102,6 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
      * @param \Magento\Backend\Model\Widget\Grid\Totals $totals
      * @param array $data
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -160,7 +145,6 @@ public function __construct(
      * Retrieve the list of columns
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumns()
     {
@@ -177,7 +161,6 @@ public function getColumns()
      * Count columns
      *
      * @return int
-     * @since 2.0.0
      */
     public function getColumnCount()
     {
@@ -189,7 +172,6 @@ public function getColumnCount()
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setSortable($value)
     {
@@ -207,7 +189,6 @@ public function setSortable($value)
      * @param string $type
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function setRendererType($type, $className)
     {
@@ -223,7 +204,6 @@ public function setRendererType($type, $className)
      * @param string $type
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function setFilterType($type, $className)
     {
@@ -237,7 +217,6 @@ public function setFilterType($type, $className)
      * Prepare block for rendering
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -260,7 +239,6 @@ protected function _beforeToHtml()
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($item)
     {
@@ -276,7 +254,6 @@ public function getRowUrl($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     public function getMultipleRows($item)
     {
@@ -288,7 +265,6 @@ public function getMultipleRows($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return bool
-     * @since 2.0.0
      */
     public function hasMultipleRows($item)
     {
@@ -298,7 +274,6 @@ public function hasMultipleRows($item)
     /**
      * Retrieve columns for multiple rows
      * @return array
-     * @since 2.0.0
      */
     public function getMultipleRowColumns()
     {
@@ -314,7 +289,6 @@ public function getMultipleRowColumns()
      *
      * @param \Magento\Framework\DataObject $item
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderSubTotal($item)
     {
@@ -325,7 +299,6 @@ public function shouldRenderSubTotal($item)
      * Check whether total should be rendered
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderTotal()
     {
@@ -338,7 +311,6 @@ public function shouldRenderTotal()
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return int|false
-     * @since 2.0.0
      */
     public function getRowspan($item, $column)
     {
@@ -360,7 +332,6 @@ public function getRowspan($item, $column)
      * @param string|object $column
      * @param string $value
      * @return bool|$this
-     * @since 2.0.0
      */
     public function isColumnGrouped($column, $value = null)
     {
@@ -380,7 +351,6 @@ public function isColumnGrouped($column, $value = null)
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderEmptyCell($item, $column)
     {
@@ -391,7 +361,6 @@ public function shouldRenderEmptyCell($item, $column)
      * Retrieve colspan for empty cell
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEmptyCellColspan()
     {
@@ -404,7 +373,6 @@ public function getEmptyCellColspan()
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderCell($item, $column)
     {
@@ -422,7 +390,6 @@ public function shouldRenderCell($item, $column)
      *
      * @param boolean $visible
      * @return void
-     * @since 2.0.0
      */
     public function setHeadersVisibility($visible = true)
     {
@@ -433,7 +400,6 @@ public function setHeadersVisibility($visible = true)
      * Return visibility of column headers
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHeaderVisible()
     {
@@ -445,7 +411,6 @@ public function isHeaderVisible()
      *
      * @param bool $visible
      * @return void
-     * @since 2.0.0
      */
     public function setFilterVisibility($visible = true)
     {
@@ -456,7 +421,6 @@ public function setFilterVisibility($visible = true)
      * Return visibility of filter
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isFilterVisible()
     {
@@ -468,7 +432,6 @@ public function isFilterVisible()
      *
      * @param string $cssClass
      * @return $this
-     * @since 2.0.0
      */
     public function setEmptyTextClass($cssClass)
     {
@@ -480,7 +443,6 @@ public function setEmptyTextClass($cssClass)
      * Return empty text CSS class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmptyTextClass()
     {
@@ -491,7 +453,6 @@ public function getEmptyTextClass()
      * Retrieve label for empty cell
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmptyCellLabel()
     {
@@ -503,7 +464,6 @@ public function getEmptyCellLabel()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setEmptyCellLabel($label)
     {
@@ -516,7 +476,6 @@ public function setEmptyCellLabel($label)
      *
      * @param bool $isCollapsed
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCollapsed($isCollapsed)
     {
@@ -529,7 +488,6 @@ public function setIsCollapsed($isCollapsed)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsCollapsed()
     {
@@ -540,7 +498,6 @@ public function getIsCollapsed()
      * Return grid of current column set
      *
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     public function getGrid()
     {
@@ -551,7 +508,6 @@ public function getGrid()
      * Return collection of current grid
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -563,7 +519,6 @@ public function getCollection()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCountSubTotals($flag = true)
     {
@@ -576,7 +531,6 @@ public function setCountSubTotals($flag = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCountSubTotals()
     {
@@ -588,7 +542,6 @@ public function getCountSubTotals()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCountTotals($flag = true)
     {
@@ -601,7 +554,6 @@ public function setCountTotals($flag = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCountTotals()
     {
@@ -613,7 +565,6 @@ public function getCountTotals()
      *
      * @param \Magento\Framework\DataObject $item
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getSubTotals($item)
     {
@@ -626,7 +577,6 @@ public function getSubTotals($item)
      * Retrieve subtotal items
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -640,7 +590,6 @@ public function getTotals()
      *
      * @param \Magento\Framework\DataObject $item
      * @return void
-     * @since 2.0.0
      */
     public function updateItemByFirstMultiRow(\Magento\Framework\DataObject $item)
     {
@@ -658,7 +607,6 @@ public function updateItemByFirstMultiRow(\Magento\Framework\DataObject $item)
      * Prepare sub-total object for counting sub-totals
      *
      * @return void
-     * @since 2.0.0
      */
     public function _prepareSubTotals()
     {
@@ -676,7 +624,6 @@ public function _prepareSubTotals()
      * Prepare total object for counting totals
      *
      * @return void
-     * @since 2.0.0
      */
     public function _prepareTotals()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Container.php b/app/code/Magento/Backend/Block/Widget/Grid/Container.php
index d7ab333a85bef..93e3ab257ab29 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Container.php
@@ -12,7 +12,6 @@
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Container extends \Magento\Backend\Block\Widget\Container
 {
@@ -27,27 +26,21 @@ class Container extends \Magento\Backend\Block\Widget\Container
 
     /**#@-*/
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_addButtonLabel;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_backButtonLabel;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Backend';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid/container.phtml';
 
@@ -55,7 +48,6 @@ class Container extends \Magento\Backend\Block\Widget\Container
      * Initialize object state with incoming parameters
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -84,7 +76,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -113,7 +104,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -122,7 +112,6 @@ public function getCreateUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridHtml()
     {
@@ -131,7 +120,6 @@ public function getGridHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonLabel()
     {
@@ -140,7 +128,6 @@ public function getAddButtonLabel()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonLabel()
     {
@@ -151,7 +138,6 @@ public function getBackButtonLabel()
      * Create "New" button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addNewButton()
     {
@@ -167,7 +153,6 @@ protected function _addNewButton()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _addBackButton()
     {
@@ -183,7 +168,6 @@ protected function _addBackButton()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -192,7 +176,6 @@ public function getHeaderCssClass()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderWidth()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 894428b6b0955..d829e14202c4d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -12,7 +12,6 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Grid\ExportInterface
 {
@@ -20,7 +19,6 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * Grid export types
      *
      * @var  \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_exportTypes = [];
 
@@ -28,7 +26,6 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * Rows per page for import
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_exportPageSize = 1000;
 
@@ -36,19 +33,16 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * Template file name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = "Magento_Backend::widget/grid/export.phtml";
 
     /**
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_directory;
 
@@ -56,7 +50,6 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * Additional path to folder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_path = 'export';
 
@@ -64,7 +57,6 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Data\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -78,7 +70,6 @@ public function __construct(
     /**
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -100,7 +91,6 @@ protected function _construct()
      * Retrieve grid columns
      *
      * @return \Magento\Backend\Block\Widget\Grid\Column[]
-     * @since 2.0.0
      */
     protected function _getColumns()
     {
@@ -111,7 +101,6 @@ protected function _getColumns()
      * Retrieve totals
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getTotals()
     {
@@ -123,7 +112,6 @@ protected function _getTotals()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCountTotals()
     {
@@ -134,7 +122,6 @@ public function getCountTotals()
      * Get collection object
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected function _getCollection()
     {
@@ -145,7 +132,6 @@ protected function _getCollection()
      * Retrieve grid export types
      *
      * @return  \Magento\Framework\DataObject[]|false
-     * @since 2.0.0
      */
     public function getExportTypes()
     {
@@ -156,7 +142,6 @@ public function getExportTypes()
      * Retrieve grid id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -167,7 +152,6 @@ public function getId()
      * Prepare export button
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -190,7 +174,6 @@ protected function _prepareLayout()
      * Render export button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExportButtonHtml()
     {
@@ -203,7 +186,6 @@ public function getExportButtonHtml()
      * @param   string $url
      * @param   string $label
      * @return  $this
-     * @since 2.0.0
      */
     public function addExportType($url, $label)
     {
@@ -218,7 +200,6 @@ public function addExportType($url, $label)
      *
      * @param array $fileData
      * @return string
-     * @since 2.0.0
      */
     protected function _getFileContainerContent(array $fileData)
     {
@@ -229,7 +210,6 @@ protected function _getFileContainerContent(array $fileData)
      * Retrieve Headers row array for Export
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getExportHeaders()
     {
@@ -246,7 +226,6 @@ protected function _getExportHeaders()
      * Retrieve Totals row array for Export
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getExportTotals()
     {
@@ -267,7 +246,6 @@ protected function _getExportTotals()
      * @param string $callback
      * @param array $args additional arguments for callback method
      * @return void
-     * @since 2.0.0
      */
     public function _exportIterateCollection($callback, array $args)
     {
@@ -305,7 +283,6 @@ public function _exportIterateCollection($callback, array $args)
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Framework\Filesystem\File\WriteInterface $stream
      * @return void
-     * @since 2.0.0
      */
     protected function _exportCsvItem(
         \Magento\Framework\DataObject $item,
@@ -326,7 +303,6 @@ protected function _exportCsvItem(
      * Return array with keys type and value
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCsvFile()
     {
@@ -356,7 +332,6 @@ public function getCsvFile()
      * Retrieve Grid data as CSV
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCsv()
     {
@@ -406,7 +381,6 @@ public function getCsv()
      * Retrieve data in xml
      *
      * @return string
-     * @since 2.0.0
      */
     public function getXml()
     {
@@ -435,7 +409,6 @@ public function getXml()
      *
      * @param \Magento\Framework\DataObject $data
      * @return string[]
-     * @since 2.0.0
      */
     public function getRowRecord(\Magento\Framework\DataObject $data)
     {
@@ -455,7 +428,6 @@ public function getRowRecord(\Magento\Framework\DataObject $data)
      *
      * @param string $sheetName
      * @return array
-     * @since 2.0.0
      */
     public function getExcelFile($sheetName = '')
     {
@@ -490,7 +462,6 @@ public function getExcelFile($sheetName = '')
      * Retrieve grid data as MS Excel 2003 XML Document
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExcel()
     {
@@ -534,7 +505,6 @@ public function getExcel()
      *
      * @param \Magento\Framework\Data\Collection $baseCollection
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected function _getRowCollection(\Magento\Framework\Data\Collection $baseCollection = null)
     {
@@ -568,7 +538,6 @@ protected function _getRowCollection(\Magento\Framework\Data\Collection $baseCol
      * Return prepared collection as row collection with additional conditions
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function _getPreparedCollection()
     {
@@ -582,7 +551,6 @@ public function _getPreparedCollection()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getExportPageSize()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php
index 4c4bd2b6c93ea..335f17ea00cfa 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 interface ExportInterface
 {
@@ -19,7 +18,6 @@ interface ExportInterface
      *
      * @return array|bool
      * @api
-     * @since 2.0.0
      */
     public function getExportTypes();
 
@@ -28,7 +26,6 @@ public function getExportTypes();
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getId();
 
@@ -36,7 +33,6 @@ public function getId();
      * Render export button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExportButtonHtml();
 
@@ -46,7 +42,6 @@ public function getExportButtonHtml();
      * @param   string $url
      * @param   string $label
      * @return  \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     public function addExportType($url, $label);
 
@@ -57,7 +52,6 @@ public function addExportType($url, $label);
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getCsvFile();
 
@@ -66,7 +60,6 @@ public function getCsvFile();
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getCsv();
 
@@ -75,7 +68,6 @@ public function getCsv();
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getXml();
 
@@ -87,7 +79,6 @@ public function getXml();
      * @param string $sheetName
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getExcelFile($sheetName = '');
 
@@ -96,7 +87,6 @@ public function getExcelFile($sheetName = '');
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getExcel();
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 6823ddbfa342f..9fb37fb840f84 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Backend\Block\Widget\Grid\ExportInterface
 {
@@ -32,7 +31,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      *      'total'     => string (sum, avg)
      * )
      * @var array
-     * @since 2.0.0
      */
     protected $_columns = [];
 
@@ -40,7 +38,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Collection object
      *
      * @var \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -48,7 +45,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Export flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isExport = false;
 
@@ -56,7 +52,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Grid export types
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_exportTypes = [];
 
@@ -64,7 +59,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Rows per page for import
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_exportPageSize = 1000;
 
@@ -72,7 +66,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Identifier of last grid column
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_lastColumnId;
 
@@ -80,7 +73,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Massaction row id field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_massactionIdField;
 
@@ -88,7 +80,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Massaction row id filter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_massactionIdFilter;
 
@@ -96,7 +87,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Massaction block name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_massactionBlockName = \Magento\Backend\Block\Widget\Grid\Massaction\Extended::class;
 
@@ -104,7 +94,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Columns view order
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columnsOrder = [];
 
@@ -112,7 +101,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Label for empty cell
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_emptyCellLabel = '';
 
@@ -120,7 +108,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Columns to group by
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_groupedColumn = [];
 
@@ -128,7 +115,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Column headers visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_headersVisibility = true;
 
@@ -136,7 +122,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Filter visibility
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_filterVisibility = true;
 
@@ -144,7 +129,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Empty grid text
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_emptyText;
 
@@ -152,13 +136,11 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Empty grid text CSS class
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_emptyTextCss = 'empty-text';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCollapsed;
 
@@ -166,7 +148,6 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Count subtotals
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_countSubTotals = false;
 
@@ -174,19 +155,16 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * SubTotals
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_subtotals = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid/extended.phtml';
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_directory;
 
@@ -194,13 +172,11 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
      * Additional path to folder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_path = 'export';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -214,7 +190,6 @@ protected function _construct()
      * Initialize child blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -263,7 +238,6 @@ protected function _prepareLayout()
      * Retrieve column set block
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getColumnSet()
     {
@@ -280,7 +254,6 @@ public function getColumnSet()
      * Generate export button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExportButtonHtml()
     {
@@ -293,7 +266,6 @@ public function getExportButtonHtml()
      * @param   string $url
      * @param   string $label
      * @return  $this
-     * @since 2.0.0
      */
     public function addExportType($url, $label)
     {
@@ -310,7 +282,6 @@ public function addExportType($url, $label)
      * @param   array|\Magento\Framework\DataObject $column
      * @return  $this
      * @throws  \Exception
-     * @since 2.0.0
      */
     public function addColumn($columnId, $column)
     {
@@ -337,7 +308,6 @@ public function addColumn($columnId, $column)
      *
      * @param string $columnId
      * @return $this
-     * @since 2.0.0
      */
     public function removeColumn($columnId)
     {
@@ -357,7 +327,6 @@ public function removeColumn($columnId)
      * @param   array|\Magento\Framework\DataObject $column
      * @param   string $after
      * @return  $this
-     * @since 2.0.0
      */
     public function addColumnAfter($columnId, $column, $after)
     {
@@ -372,7 +341,6 @@ public function addColumnAfter($columnId, $column, $after)
      * @param string $columnId
      * @param string $after
      * @return $this
-     * @since 2.0.0
      */
     public function addColumnsOrder($columnId, $after)
     {
@@ -384,7 +352,6 @@ public function addColumnsOrder($columnId, $after)
      * Retrieve columns order
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumnsOrder()
     {
@@ -395,7 +362,6 @@ public function getColumnsOrder()
      * Sort columns by predefined order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sortColumnsByOrder()
     {
@@ -416,7 +382,6 @@ public function sortColumnsByOrder()
      * Retrieve identifier of last column
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastColumnId()
     {
@@ -427,7 +392,6 @@ public function getLastColumnId()
      * Initialize grid columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -439,7 +403,6 @@ protected function _prepareColumns()
      * Prepare grid massaction block
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassactionBlock()
     {
@@ -455,7 +418,6 @@ protected function _prepareMassactionBlock()
      * Prepare grid massaction actions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -466,7 +428,6 @@ protected function _prepareMassaction()
      * Prepare grid massaction column
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassactionColumn()
     {
@@ -504,7 +465,6 @@ protected function _prepareMassactionColumn()
      * Apply sorting and filtering to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -528,7 +488,6 @@ protected function _prepareCollection()
      * Process collection after loading
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -539,7 +498,6 @@ protected function _afterLoadCollection()
      * Initialize grid before rendering
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareGrid()
     {
@@ -553,7 +511,6 @@ protected function _prepareGrid()
      * Retrieve grid HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -564,7 +521,6 @@ public function getHtml()
      * Retrieve massaction row identifier field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMassactionIdField()
     {
@@ -576,7 +532,6 @@ public function getMassactionIdField()
      *
      * @param  string    $idField
      * @return $this
-     * @since 2.0.0
      */
     public function setMassactionIdField($idField)
     {
@@ -588,7 +543,6 @@ public function setMassactionIdField($idField)
      * Retrieve massaction row identifier filter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMassactionIdFilter()
     {
@@ -600,7 +554,6 @@ public function getMassactionIdFilter()
      *
      * @param string $idFilter
      * @return $this
-     * @since 2.0.0
      */
     public function setMassactionIdFilter($idFilter)
     {
@@ -612,7 +565,6 @@ public function setMassactionIdFilter($idFilter)
      * Retrieve massaction block name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMassactionBlockName()
     {
@@ -624,7 +576,6 @@ public function getMassactionBlockName()
      *
      * @param  string    $blockName
      * @return $this
-     * @since 2.0.0
      */
     public function setMassactionBlockName($blockName)
     {
@@ -636,7 +587,6 @@ public function setMassactionBlockName($blockName)
      * Retrieve massaction block
      *
      * @return $this
-     * @since 2.0.0
      */
     public function getMassactionBlock()
     {
@@ -647,7 +597,6 @@ public function getMassactionBlock()
      * Generate massaction block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMassactionBlockHtml()
     {
@@ -658,7 +607,6 @@ public function getMassactionBlockHtml()
      * Retrieve columns to render
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSubTotalColumns()
     {
@@ -671,7 +619,6 @@ public function getSubTotalColumns()
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderCell($item, $column)
     {
@@ -688,7 +635,6 @@ public function shouldRenderCell($item, $column)
      * Retrieve label for empty cell
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmptyCellLabel()
     {
@@ -700,7 +646,6 @@ public function getEmptyCellLabel()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setEmptyCellLabel($label)
     {
@@ -713,7 +658,6 @@ public function setEmptyCellLabel($label)
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($item)
     {
@@ -726,7 +670,6 @@ public function getRowUrl($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     public function getMultipleRows($item)
     {
@@ -736,7 +679,6 @@ public function getMultipleRows($item)
     /**
      * Retrieve columns for multiple rows
      * @return array
-     * @since 2.0.0
      */
     public function getMultipleRowColumns()
     {
@@ -752,7 +694,6 @@ public function getMultipleRowColumns()
      *
      * @param \Magento\Framework\DataObject $item
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderSubTotal($item)
     {
@@ -765,7 +706,6 @@ public function shouldRenderSubTotal($item)
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return int|false
-     * @since 2.0.0
      */
     public function getRowspan($item, $column)
     {
@@ -781,7 +721,6 @@ public function getRowspan($item, $column)
      * @param string|object $column
      * @param string $value
      * @return boolean|$this
-     * @since 2.0.0
      */
     public function isColumnGrouped($column, $value = null)
     {
@@ -801,7 +740,6 @@ public function isColumnGrouped($column, $value = null)
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldRenderEmptyCell($item, $column)
     {
@@ -812,7 +750,6 @@ public function shouldRenderEmptyCell($item, $column)
      * Retrieve colspan for empty cell
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEmptyCellColspan()
     {
@@ -824,7 +761,6 @@ public function getEmptyCellColspan()
      *
      * @param \Magento\Framework\DataObject $item
      * @return \Magento\Framework\DataObject|string
-     * @since 2.0.0
      */
     public function getSubTotalItem($item)
     {
@@ -842,7 +778,6 @@ public function getSubTotalItem($item)
      * Count columns
      *
      * @return int
-     * @since 2.0.0
      */
     public function getColumnCount()
     {
@@ -854,7 +789,6 @@ public function getColumnCount()
      *
      * @param bool $visible
      * @return void
-     * @since 2.0.0
      */
     public function setHeadersVisibility($visible = true)
     {
@@ -866,7 +800,6 @@ public function setHeadersVisibility($visible = true)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getHeadersVisibility()
     {
@@ -878,7 +811,6 @@ public function getHeadersVisibility()
      *
      * @param bool $visible
      * @return void
-     * @since 2.0.0
      */
     public function setFilterVisibility($visible = true)
     {
@@ -890,7 +822,6 @@ public function setFilterVisibility($visible = true)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getFilterVisibility()
     {
@@ -902,7 +833,6 @@ public function getFilterVisibility()
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function setEmptyText($text)
     {
@@ -914,7 +844,6 @@ public function setEmptyText($text)
      * Return empty text for grid
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmptyText()
     {
@@ -926,7 +855,6 @@ public function getEmptyText()
      *
      * @param string $cssClass
      * @return $this
-     * @since 2.0.0
      */
     public function setEmptyTextClass($cssClass)
     {
@@ -938,7 +866,6 @@ public function setEmptyTextClass($cssClass)
      * Return empty text CSS class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmptyTextClass()
     {
@@ -950,7 +877,6 @@ public function getEmptyTextClass()
      *
      * @param bool $isCollapsed
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCollapsed($isCollapsed)
     {
@@ -963,7 +889,6 @@ public function setIsCollapsed($isCollapsed)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsCollapsed()
     {
@@ -975,7 +900,6 @@ public function getIsCollapsed()
      *
      * @param array $fileData
      * @return string
-     * @since 2.0.0
      */
     protected function _getFileContainerContent(array $fileData)
     {
@@ -986,7 +910,6 @@ protected function _getFileContainerContent(array $fileData)
      * Retrieve Headers row array for Export
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getExportHeaders()
     {
@@ -1003,7 +926,6 @@ protected function _getExportHeaders()
      * Retrieve Totals row array for Export
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getExportTotals()
     {
@@ -1024,7 +946,6 @@ protected function _getExportTotals()
      * @param string $callback
      * @param array $args additional arguments for callback method
      * @return void
-     * @since 2.0.0
      */
     public function _exportIterateCollection($callback, array $args)
     {
@@ -1060,7 +981,6 @@ public function _exportIterateCollection($callback, array $args)
      * @param \Magento\Framework\DataObject $item
      * @param \Magento\Framework\Filesystem\File\WriteInterface $stream
      * @return void
-     * @since 2.0.0
      */
     protected function _exportCsvItem(
         \Magento\Framework\DataObject $item,
@@ -1081,7 +1001,6 @@ protected function _exportCsvItem(
      * Return array with keys type and value
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCsvFile()
     {
@@ -1116,7 +1035,6 @@ public function getCsvFile()
      * Retrieve Grid data as CSV
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCsv()
     {
@@ -1171,7 +1089,6 @@ public function getCsv()
      * Retrieve data in xml
      *
      * @return string
-     * @since 2.0.0
      */
     public function getXml()
     {
@@ -1204,7 +1121,6 @@ public function getXml()
      *
      * @param \Magento\Framework\DataObject $data
      * @return string[]
-     * @since 2.0.0
      */
     public function getRowRecord(\Magento\Framework\DataObject $data)
     {
@@ -1224,7 +1140,6 @@ public function getRowRecord(\Magento\Framework\DataObject $data)
      *
      * @param string $sheetName
      * @return array
-     * @since 2.0.0
      */
     public function getExcelFile($sheetName = '')
     {
@@ -1263,7 +1178,6 @@ public function getExcelFile($sheetName = '')
      * Retrieve grid data as MS Excel 2003 XML Document
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExcel()
     {
@@ -1310,7 +1224,6 @@ public function getExcel()
      * Retrieve grid export types
      *
      * @return \Magento\Framework\DataObject[]|false
-     * @since 2.0.0
      */
     public function getExportTypes()
     {
@@ -1322,7 +1235,6 @@ public function getExportTypes()
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return void
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -1333,7 +1245,6 @@ public function setCollection($collection)
      * get collection object
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -1345,7 +1256,6 @@ public function getCollection()
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCountSubTotals($flag = true)
     {
@@ -1358,7 +1268,6 @@ public function setCountSubTotals($flag = true)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCountSubTotals()
     {
@@ -1370,7 +1279,6 @@ public function getCountSubTotals()
      *
      * @param \Magento\Framework\DataObject[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setSubTotals(array $items)
     {
@@ -1382,7 +1290,6 @@ public function setSubTotals(array $items)
      * Retrieve subtotal items
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getSubTotals()
     {
@@ -1393,7 +1300,6 @@ public function getSubTotals()
      * Generate list of grid buttons
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainButtonsHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
index 80a33491ee5a1..a768e3e17dca6 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Massaction extends \Magento\Backend\Block\Widget\Grid\Massaction\AbstractMassaction
 {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index f31e49c15ac4c..0a72c459c7ae0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -15,13 +15,11 @@
  * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
 {
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -29,13 +27,11 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
      * Massaction items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_items = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid/massaction.phtml';
 
@@ -43,7 +39,6 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -88,7 +82,6 @@ protected function _construct()
      * @param string $itemId
      * @param array|DataObject $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem($itemId, $item)
     {
@@ -124,7 +117,6 @@ private function isVisible(DataObject $item)
      *
      * @param string $itemId
      * @return \Magento\Backend\Block\Widget\Grid\Massaction\Item|null
-     * @since 2.0.0
      */
     public function getItem($itemId)
     {
@@ -139,7 +131,6 @@ public function getItem($itemId)
      * Retrieve massaction items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -150,7 +141,6 @@ public function getItems()
      * Retrieve massaction items JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemsJson()
     {
@@ -166,7 +156,6 @@ public function getItemsJson()
      * Retrieve massaction items count
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -177,7 +166,6 @@ public function getCount()
      * Checks are massactions available
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -188,7 +176,6 @@ public function isAvailable()
      * Retrieve global form field name for all massaction items
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormFieldName()
     {
@@ -199,7 +186,6 @@ public function getFormFieldName()
      * Retrieve form field name for internal use. Based on $this->getFormFieldName()
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormFieldNameInternal()
     {
@@ -210,7 +196,6 @@ public function getFormFieldNameInternal()
      * Retrieve massaction block js object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -221,7 +206,6 @@ public function getJsObjectName()
      * Retrieve grid block js object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridJsObjectName()
     {
@@ -232,7 +216,6 @@ public function getGridJsObjectName()
      * Retrieve JSON string of selected checkboxes
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectedJson()
     {
@@ -248,7 +231,6 @@ public function getSelectedJson()
      * Retrieve array of selected checkboxes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSelected()
     {
@@ -264,7 +246,6 @@ public function getSelected()
      * Retrieve apply button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApplyButtonHtml()
     {
@@ -273,7 +254,6 @@ public function getApplyButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJavaScript()
     {
@@ -290,7 +270,6 @@ public function getJavaScript()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridIdsJson()
     {
@@ -315,7 +294,6 @@ public function getGridIdsJson()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -327,7 +305,6 @@ public function getHtmlId()
      *
      * @param string $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function removeItem($itemId)
     {
@@ -343,7 +320,6 @@ public function removeItem($itemId)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSelectAll()
     {
@@ -355,7 +331,6 @@ public function getUseSelectAll()
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSelectAll($flag)
     {
@@ -367,7 +342,6 @@ public function setUseSelectAll($flag)
      * Prepare grid massaction column
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareMassactionColumn()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
index cda9b6349a399..20e394c17d477 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
@@ -10,13 +10,11 @@
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Additional extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Framework\View\Layout\Argument\Interpreter\Options
-     * @since 2.0.0
      */
     protected $_optionsInterpreter;
 
@@ -26,7 +24,6 @@ class Additional extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\View\Layout\Argument\Interpreter\Options $optionsInterpreter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -62,7 +58,6 @@ protected function _prepareForm()
      *
      * @param array &$item
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFormItem(array &$item)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index 1201ea29ef8a0..ac47f22a74ec8 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -14,7 +14,6 @@
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <core@magentocommerce.com>
  * @TODO MAGETWO-31510: Remove deprecated class
- * @since 2.0.0
  */
 class Extended extends \Magento\Backend\Block\Widget
 {
@@ -22,7 +21,6 @@ class Extended extends \Magento\Backend\Block\Widget
      * Massaction items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_items = [];
 
@@ -30,7 +28,6 @@ class Extended extends \Magento\Backend\Block\Widget
      * Path to template file in theme
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/grid/massaction_extended.phtml';
 
@@ -38,13 +35,11 @@ class Extended extends \Magento\Backend\Block\Widget
      * Backend data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData = null;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -53,7 +48,6 @@ class Extended extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      * Sets Massaction template
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -93,7 +86,6 @@ public function _construct()
      * @param string $itemId
      * @param array $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem($itemId, array $item)
     {
@@ -120,7 +112,6 @@ public function addItem($itemId, array $item)
      *
      * @param string $itemId
      * @return \Magento\Backend\Block\Widget\Grid\Massaction\Item|null
-     * @since 2.0.0
      */
     public function getItem($itemId)
     {
@@ -135,7 +126,6 @@ public function getItem($itemId)
      * Retrieve massaction items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -146,7 +136,6 @@ public function getItems()
      * Retrieve massaction items JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemsJson()
     {
@@ -162,7 +151,6 @@ public function getItemsJson()
      * Retrieve massaction items count
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -173,7 +161,6 @@ public function getCount()
      * Checks are massactions available
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -184,7 +171,6 @@ public function isAvailable()
      * Retrieve global form field name for all massaction items
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormFieldName()
     {
@@ -195,7 +181,6 @@ public function getFormFieldName()
      * Retrieve form field name for internal use. Based on $this->getFormFieldName()
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormFieldNameInternal()
     {
@@ -206,7 +191,6 @@ public function getFormFieldNameInternal()
      * Retrieve massaction block js object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -217,7 +201,6 @@ public function getJsObjectName()
      * Retrieve grid block js object name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridJsObjectName()
     {
@@ -228,7 +211,6 @@ public function getGridJsObjectName()
      * Retrieve JSON string of selected checkboxes
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectedJson()
     {
@@ -244,7 +226,6 @@ public function getSelectedJson()
      * Retrieve array of selected checkboxes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSelected()
     {
@@ -260,7 +241,6 @@ public function getSelected()
      * Retrieve apply button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApplyButtonHtml()
     {
@@ -269,7 +249,6 @@ public function getApplyButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJavaScript()
     {
@@ -286,7 +265,6 @@ public function getJavaScript()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridIdsJson()
     {
@@ -313,7 +291,6 @@ public function getGridIdsJson()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -325,7 +302,6 @@ public function getHtmlId()
      *
      * @param string $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function removeItem($itemId)
     {
@@ -341,7 +317,6 @@ public function removeItem($itemId)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSelectAll()
     {
@@ -353,7 +328,6 @@ public function getUseSelectAll()
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSelectAll($flag)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
index 117757144f4e5..27de7eecded70 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
- * @since 2.0.0
  */
 class Item extends \Magento\Backend\Block\Widget
 {
     /**
      * @var Extended
-     * @since 2.0.0
      */
     protected $_massaction = null;
 
@@ -25,7 +23,6 @@ class Item extends \Magento\Backend\Block\Widget
      *
      * @param  Extended $massaction
      * @return $this
-     * @since 2.0.0
      */
     public function setMassaction($massaction)
     {
@@ -37,7 +34,6 @@ public function setMassaction($massaction)
      * Retrieve parent massaction block
      *
      * @return Extended
-     * @since 2.0.0
      */
     public function getMassaction()
     {
@@ -50,7 +46,6 @@ public function getMassaction()
      * @param string|\Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAdditionalActionBlock($block)
     {
@@ -69,7 +64,6 @@ public function setAdditionalActionBlock($block)
     /**
      * @param array $config
      * @return \Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     protected function _createFromConfig(array $config)
     {
@@ -89,7 +83,6 @@ protected function _createFromConfig(array $config)
      * Retrieve additional action block for this item
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getAdditionalActionBlock()
     {
@@ -100,7 +93,6 @@ public function getAdditionalActionBlock()
      * Retrieve additional action block HTML for this item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalActionBlockHtml()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php
index 065cb4c394346..a85555220bee0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php
@@ -9,7 +9,6 @@
  * Backend grid widget massaction item additional action interface
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 interface AdditionalInterface
 {
@@ -17,7 +16,6 @@ interface AdditionalInterface
      * @param array $configuration
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function createFromConfiguration(array $configuration);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/DefaultAdditional.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/DefaultAdditional.php
index 789c10e061480..be7bd4105a373 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/DefaultAdditional.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/DefaultAdditional.php
@@ -9,14 +9,12 @@
  * Backend grid widget massaction item additional action default
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class DefaultAdditional extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Backend\Block\Widget\Grid\Massaction\Item\Additional\AdditionalInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createFromConfiguration(array $configuration)
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php b/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
index 759da7f5c0f52..34424f037c424 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
@@ -9,13 +9,11 @@
  * @api
  * @deprecated 2.2.0 in favour of UI component implementation
  * @method string|array getInputNames()
- * @since 2.0.0
  */
 class Serializer extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -23,7 +21,6 @@ class Serializer extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Preparing global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -56,7 +52,6 @@ protected function _prepareLayout()
      * Set serializer template
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -69,7 +64,6 @@ public function _construct()
      *
      * @param bool $asJSON
      * @return string|array
-     * @since 2.0.0
      */
     public function getColumnInputNames($asJSON = false)
     {
@@ -83,7 +77,6 @@ public function getColumnInputNames($asJSON = false)
      * Get object data as JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDataAsJSON()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Tab.php b/app/code/Magento/Backend/Block/Widget/Tab.php
index 34e1b94dda465..96d55e00261e9 100644
--- a/app/code/Magento/Backend/Block/Widget/Tab.php
+++ b/app/code/Magento/Backend/Block/Widget/Tab.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tab extends \Magento\Backend\Block\Template implements TabInterface
 {
@@ -18,7 +17,6 @@ class Tab extends \Magento\Backend\Block\Template implements TabInterface
      * Return Tab label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -29,7 +27,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -40,7 +37,6 @@ public function getTabTitle()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -51,7 +47,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -60,7 +55,6 @@ public function isHidden()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -69,7 +63,6 @@ public function getTabClass()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php b/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php
index 6d99dc20839d3..bf55470ab5935 100644
--- a/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php
+++ b/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php
@@ -9,7 +9,6 @@
  * Backend Widget Tab Interface
  *
  * @api
- * @since 2.0.0
  */
 interface TabInterface
 {
@@ -18,7 +17,6 @@ interface TabInterface
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getTabLabel();
 
@@ -27,7 +25,6 @@ public function getTabLabel();
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getTabTitle();
 
@@ -36,7 +33,6 @@ public function getTabTitle();
      *
      * @return boolean
      * @api
-     * @since 2.0.0
      */
     public function canShowTab();
 
@@ -45,7 +41,6 @@ public function canShowTab();
      *
      * @return boolean
      * @api
-     * @since 2.0.0
      */
     public function isHidden();
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index a2ef6015ce796..ce3e37afe91dd 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -10,7 +10,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget
 {
@@ -18,7 +17,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Tabs structure
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_tabs = [];
 
@@ -26,7 +24,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Active tab key
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_activeTab = null;
 
@@ -34,25 +31,21 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Destination HTML element id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_destElementId = 'content';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/tabs.phtml';
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     private $_jsonEncoder;
 
@@ -61,7 +54,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -78,7 +70,6 @@ public function __construct(
      * Retrieve destination html element id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDestElementId()
     {
@@ -90,7 +81,6 @@ public function getDestElementId()
      *
      * @param string $elementId
      * @return $this
-     * @since 2.0.0
      */
     public function setDestElementId($elementId)
     {
@@ -105,7 +95,6 @@ public function setDestElementId($elementId)
      * @param   array|\Magento\Framework\DataObject $tab
      * @param   string $afterTabId
      * @return  void
-     * @since 2.0.0
      */
     public function addTabAfter($tabId, $tab, $afterTabId)
     {
@@ -121,7 +110,6 @@ public function addTabAfter($tabId, $tab, $afterTabId)
      * @return  $this
      * @throws  \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addTab($tabId, $tab)
     {
@@ -172,7 +160,6 @@ public function addTab($tabId, $tab)
      * @param string $tabId
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _addTabByName($tab, $tabId)
     {
@@ -191,7 +178,6 @@ protected function _addTabByName($tab, $tabId)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getActiveTabId()
     {
@@ -204,7 +190,6 @@ public function getActiveTabId()
      *
      * @param string $tabId
      * @return $this
-     * @since 2.0.0
      */
     public function setActiveTab($tabId)
     {
@@ -231,7 +216,6 @@ public function setActiveTab($tabId)
      *
      * @param string $tabId
      * @return $this
-     * @since 2.0.0
      */
     protected function _setActiveTab($tabId)
     {
@@ -247,7 +231,6 @@ protected function _setActiveTab($tabId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -280,7 +263,6 @@ protected function _beforeToHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -289,7 +271,6 @@ public function getJsObjectName()
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getTabsIds()
     {
@@ -304,7 +285,6 @@ public function getTabsIds()
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @param bool $withPrefix
      * @return string
-     * @since 2.0.0
      */
     public function getTabId($tab, $withPrefix = true)
     {
@@ -317,7 +297,6 @@ public function getTabId($tab, $withPrefix = true)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab($tab)
     {
@@ -331,7 +310,6 @@ public function canShowTab($tab)
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getTabIsHidden($tab)
     {
@@ -344,7 +322,6 @@ public function getTabIsHidden($tab)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl($tab)
     {
@@ -363,7 +340,6 @@ public function getTabUrl($tab)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle($tab)
     {
@@ -376,7 +352,6 @@ public function getTabTitle($tab)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass($tab)
     {
@@ -392,7 +367,6 @@ public function getTabClass($tab)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel($tab)
     {
@@ -405,7 +379,6 @@ public function getTabLabel($tab)
     /**
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
-     * @since 2.0.0
      */
     public function getTabContent($tab)
     {
@@ -426,7 +399,6 @@ public function getTabContent($tab)
      * @param string $tabTwoId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function bindShadowTabs($tabOneId, $tabTwoId)
     {
@@ -460,7 +432,6 @@ public function bindShadowTabs($tabOneId, $tabTwoId)
      *
      * @param bool $asJson
      * @return array|string
-     * @since 2.0.0
      */
     public function getAllShadowTabs($asJson = true)
     {
@@ -486,7 +457,6 @@ public function getAllShadowTabs($asJson = true)
      * @param string $key
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setTabData($tab, $key, $value)
     {
@@ -505,7 +475,6 @@ public function setTabData($tab, $key, $value)
      *
      * @param string $tabId
      * @return $this
-     * @since 2.0.0
      */
     public function removeTab($tabId)
     {
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
index acf47f22a5b4e..540f046a13af6 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCacheCommand extends Command
 {
@@ -25,7 +24,6 @@ abstract class AbstractCacheCommand extends Command
      * CacheManager
      *
      * @var Manager
-     * @since 2.0.0
      */
     protected $cacheManager;
 
@@ -33,7 +31,6 @@ abstract class AbstractCacheCommand extends Command
      * Constructor
      *
      * @param Manager $cacheManager
-     * @since 2.0.0
      */
     public function __construct(Manager $cacheManager)
     {
@@ -43,7 +40,6 @@ public function __construct(Manager $cacheManager)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php
index 3cc20bd359d97..461e74e2e32cd 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCacheManageCommand extends AbstractCacheCommand
 {
@@ -22,7 +21,6 @@ abstract class AbstractCacheManageCommand extends AbstractCacheCommand
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -39,7 +37,6 @@ protected function configure()
      *
      * @param InputInterface $input
      * @return array
-     * @since 2.0.0
      */
     protected function getRequestedTypes(InputInterface $input)
     {
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php
index 74ea8242cf0a5..1e342ae4747f8 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCacheSetCommand extends AbstractCacheManageCommand
 {
@@ -19,13 +18,11 @@ abstract class AbstractCacheSetCommand extends AbstractCacheManageCommand
      * Is enable cache or not
      *
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function isEnable();
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
index f28478fc3e5f6..91c9caa00d948 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
@@ -13,20 +13,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCacheTypeManageCommand extends AbstractCacheManageCommand
 {
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @param Manager $cacheManager
      * @param EventManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Manager $cacheManager,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param array $cacheTypes
      * @return void
-     * @since 2.0.0
      */
     abstract protected function performAction(array $cacheTypes);
 
@@ -49,7 +45,6 @@ abstract protected function performAction(array $cacheTypes);
      * Get display message
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function getDisplayMessage();
 
@@ -59,7 +54,6 @@ abstract protected function getDisplayMessage();
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Backend/Console/Command/CacheCleanCommand.php b/app/code/Magento/Backend/Console/Command/CacheCleanCommand.php
index 3e621200c8f74..5b5294f3980bf 100644
--- a/app/code/Magento/Backend/Console/Command/CacheCleanCommand.php
+++ b/app/code/Magento/Backend/Console/Command/CacheCleanCommand.php
@@ -10,13 +10,11 @@
  * Command for cleaning cache
  *
  * @api
- * @since 2.0.0
  */
 class CacheCleanCommand extends AbstractCacheTypeManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -30,7 +28,6 @@ protected function configure()
      *
      * @param array $cacheTypes
      * @return void
-     * @since 2.0.0
      */
     protected function performAction(array $cacheTypes)
     {
@@ -40,7 +37,6 @@ protected function performAction(array $cacheTypes)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getDisplayMessage()
     {
diff --git a/app/code/Magento/Backend/Console/Command/CacheDisableCommand.php b/app/code/Magento/Backend/Console/Command/CacheDisableCommand.php
index 67fb0133f5cf5..3cd94b3167ca1 100644
--- a/app/code/Magento/Backend/Console/Command/CacheDisableCommand.php
+++ b/app/code/Magento/Backend/Console/Command/CacheDisableCommand.php
@@ -10,13 +10,11 @@
  * Command for disabling cache
  *
  * @api
- * @since 2.0.0
  */
 class CacheDisableCommand extends AbstractCacheSetCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -29,7 +27,6 @@ protected function configure()
      * Is Disable cache
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
diff --git a/app/code/Magento/Backend/Console/Command/CacheEnableCommand.php b/app/code/Magento/Backend/Console/Command/CacheEnableCommand.php
index 3cf866a6ea511..b3e8318f46abe 100644
--- a/app/code/Magento/Backend/Console/Command/CacheEnableCommand.php
+++ b/app/code/Magento/Backend/Console/Command/CacheEnableCommand.php
@@ -10,13 +10,11 @@
  * Command for enabling cache
  *
  * @api
- * @since 2.0.0
  */
 class CacheEnableCommand extends AbstractCacheSetCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -29,7 +27,6 @@ protected function configure()
      * Is enable cache
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
diff --git a/app/code/Magento/Backend/Console/Command/CacheFlushCommand.php b/app/code/Magento/Backend/Console/Command/CacheFlushCommand.php
index 220f5fd1772c5..9780df970e070 100644
--- a/app/code/Magento/Backend/Console/Command/CacheFlushCommand.php
+++ b/app/code/Magento/Backend/Console/Command/CacheFlushCommand.php
@@ -10,13 +10,11 @@
  * Command for flushing cache
  *
  * @api
- * @since 2.0.0
  */
 class CacheFlushCommand extends AbstractCacheTypeManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -30,7 +28,6 @@ protected function configure()
      *
      * @param array $cacheTypes
      * @return void
-     * @since 2.0.0
      */
     protected function performAction(array $cacheTypes)
     {
@@ -40,7 +37,6 @@ protected function performAction(array $cacheTypes)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getDisplayMessage()
     {
diff --git a/app/code/Magento/Backend/Console/Command/CacheStatusCommand.php b/app/code/Magento/Backend/Console/Command/CacheStatusCommand.php
index 30745c5dccc4d..93002cc0a8d4d 100644
--- a/app/code/Magento/Backend/Console/Command/CacheStatusCommand.php
+++ b/app/code/Magento/Backend/Console/Command/CacheStatusCommand.php
@@ -13,13 +13,11 @@
  * Command for checking cache status
  *
  * @api
- * @since 2.0.0
  */
 class CacheStatusCommand extends AbstractCacheCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -30,7 +28,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php b/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php
index bb35630b72b86..7dd57ca14783a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Ajax\Translate
  *
- * @since 2.0.0
  */
 class Translate extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     protected $inlineParser;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -31,7 +28,6 @@ class Translate extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Framework\Translate\Inline\ParserInterface $inlineParser
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Ajax action for inline translation
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
index 6fcbed23a34a9..94a79c911d480 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
@@ -9,7 +9,6 @@
 
 /**
  * Auth backend controller
- * @since 2.0.0
  */
 abstract class Auth extends AbstractAction
 {
@@ -17,7 +16,6 @@ abstract class Auth extends AbstractAction
      * Check if user has permissions to access this controller
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php
index 9e5f68605f497..21e1ca4070217 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Auth\DeniedIframe
  *
- * @since 2.0.0
  */
 class DeniedIframe extends \Magento\Backend\Controller\Adminhtml\Auth
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Retrieve response for deniedIframeAction()
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeniedIframe()
     {
@@ -48,7 +44,6 @@ protected function _getDeniedIframe()
      * Denied IFrame action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
index c852fed72f1f1..cee95a9f0a11a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Auth\DeniedJson
  *
- * @since 2.0.0
  */
 class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Retrieve response for deniedJsonAction()
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDeniedJson()
     {
@@ -50,7 +46,6 @@ protected function _getDeniedJson()
      * Denied JSON action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
index 48c2c01d9c95b..6d89ded853557 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Login extends \Magento\Backend\Controller\Adminhtml\Auth
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Login extends \Magento\Backend\Controller\Adminhtml\Auth
      *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      * Administrator login action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -63,7 +59,6 @@ public function execute()
      *
      * @param string $path
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     private function getRedirect($path)
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
index 75e9a01fedad7..88f944ee20b72 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Auth\Logout
  *
- * @since 2.0.0
  */
 class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
 {
@@ -17,7 +16,6 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
      * Administrator logout action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php b/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php
index 56ace1fc13d41..c217151fca6f5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php
@@ -9,7 +9,6 @@
 
 /**
  * Controller which handles authentication of backend app and redirects back to set cookie with backend app path
- * @since 2.0.0
  */
 class Redirect extends AbstractAction
 {
@@ -17,20 +16,17 @@ class Redirect extends AbstractAction
      * Array of actions which can be processed without secret key validation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_publicActions = ['redirect'];
 
     /**
      * @var \Magento\Backend\App\BackendAppList|null
-     * @since 2.0.0
      */
     private $backendAppList;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\App\BackendAppList $backendAppList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -56,7 +51,6 @@ public function execute()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index 30fa358884bb9..2392ff2a57206 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache
  *
- * @since 2.0.0
  */
 abstract class Cache extends Action
 {
@@ -24,25 +23,21 @@ abstract class Cache extends Action
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
     /**
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     protected $_cacheState;
 
     /**
      * @var \Magento\Framework\App\Cache\Frontend\Pool
-     * @since 2.0.0
      */
     protected $_cacheFrontendPool;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -52,7 +47,6 @@ abstract class Cache extends Action
      * @param \Magento\Framework\App\Cache\StateInterface $cacheState
      * @param \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -74,7 +68,6 @@ public function __construct(
      * @param array $types
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validateTypes(array $types)
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
index 3d9314b6fa7a8..5020ddfedaf44 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\CleanImages
  *
- * @since 2.0.0
  */
 class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -20,7 +19,6 @@ class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
      * Clean JS/css files cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
index a782a7f58748b..4518ab6e11f6e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\CleanMedia
  *
- * @since 2.0.0
  */
 class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -20,7 +19,6 @@ class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
      * Clean JS/css files cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
index 747b40ce2cb05..2bf800ab0879a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles
  *
- * @since 2.0.0
  */
 class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -19,7 +18,6 @@ class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
      * Clean static files cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
index a228025782931..d7580761ac25f 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\FlushAll
  *
- * @since 2.0.0
  */
 class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -17,7 +16,6 @@ class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
      * Flush cache storage
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
index afa347870214d..0042718b1a6e9 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\FlushSystem
  *
- * @since 2.0.0
  */
 class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -17,7 +16,6 @@ class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
      * Flush all magento cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
index 91ba9a428a0f6..2308d2c7f5e90 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Backend\Controller\Adminhtml\Cache
      * Display cache management grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
index 85b4fcafb28b5..669cffc536817 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
@@ -13,7 +13,6 @@
 
 /**
  * Controller disables some types of cache
- * @since 2.0.0
  */
 class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -27,7 +26,6 @@ class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache
      * Mass action for cache disabling
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
index 450c97c4eb8b4..99fefc6fe50d4 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
@@ -13,7 +13,6 @@
 
 /**
  * Controller enables some types of cache
- * @since 2.0.0
  */
 class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -27,7 +26,6 @@ class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache
      * Mass action for cache enabling
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
index 72274e1d5df47..4f6b51a4f8b04 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Cache\MassRefresh
  *
- * @since 2.0.0
  */
 class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
 {
@@ -20,7 +19,6 @@ class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
      * Mass action for cache refresh
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
index b7639377c324c..a4d3ed505c413 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard
  *
- * @since 2.0.0
  */
 abstract class Dashboard extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php
index 4b564d1b1de68..263d0e5965ff6 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\AjaxBlock
  *
- * @since 2.0.0
  */
 class AjaxBlock extends \Magento\Backend\Controller\Adminhtml\Dashboard
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class AjaxBlock extends \Magento\Backend\Controller\Adminhtml\Dashboard
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php
index b995c9852e322..0dd31bd37b6a2 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\CustomersMost
  *
- * @since 2.0.0
  */
 class CustomersMost extends AjaxBlock
 {
@@ -17,7 +16,6 @@ class CustomersMost extends AjaxBlock
      * Gets the list of most active customers
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php
index bdae2bc3b5a4b..e0014a0aa419b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\CustomersNewest
  *
- * @since 2.0.0
  */
 class CustomersNewest extends AjaxBlock
 {
@@ -17,7 +16,6 @@ class CustomersNewest extends AjaxBlock
      * Gets latest customers list
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
index a4d2272b7026b..4f240bec44625 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
index 002668d1d2c8b..df0679692724c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\ProductsViewed
  *
- * @since 2.0.0
  */
 class ProductsViewed extends AjaxBlock
 {
@@ -17,7 +16,6 @@ class ProductsViewed extends AjaxBlock
      * Gets most viewed products list
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index 6727b0903b9c5..e776596556527 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics
  *
- * @since 2.0.0
  */
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
@@ -18,7 +17,6 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sta
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param array $reportTypes
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -32,7 +30,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
index 8a669ad0f9a3e..f29ce7c73ab99 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Dashboard\Tunnel
  *
- * @since 2.0.0
  */
 class Tunnel extends \Magento\Backend\Controller\Adminhtml\Dashboard
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * This is done in order to include the image to a HTTPS-page regardless of web-service settings
      *
      * @return  \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Denied.php b/app/code/Magento/Backend/Controller/Adminhtml/Denied.php
index 5e6efd02f34a5..311ec8ae251c2 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Denied.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Denied.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Denied
  *
- * @since 2.0.0
  */
 class Denied extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index.php
index c9b1e86bb8854..4a27545b77cff 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index.php
@@ -9,7 +9,6 @@
 
 /**
  * Index backend controller
- * @since 2.0.0
  */
 abstract class Index extends AbstractAction
 {
@@ -17,7 +16,6 @@ abstract class Index extends AbstractAction
      * Check if user has permissions to access this controller
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php
index 1a6b3d308d131..b965abcbf44bf 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Index\ChangeLocale
  *
- * @since 2.0.0
  */
 class ChangeLocale extends \Magento\Backend\Controller\Adminhtml\Index
 {
@@ -17,7 +16,6 @@ class ChangeLocale extends \Magento\Backend\Controller\Adminhtml\Index
      * Change locale action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
index a171e2824db07..985798c2aee69 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -22,7 +20,6 @@ class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
      * Search modules list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_searchModules;
 
@@ -30,7 +27,6 @@ class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param array $searchModules
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Global Search Action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
index 9c9571457308d..2d20730b16d6a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\Index
 {
@@ -18,7 +17,6 @@ class Index extends \Magento\Backend\Controller\Adminhtml\Index
      * Always redirects to the startup page url
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
index f89e0b0f5a5f0..2404b1325fe08 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\Noroute\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Noroute action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System.php b/app/code/Magento/Backend/Controller/Adminhtml/System.php
index 2d2578e680da6..ce7bd87cb95d5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System.php
@@ -11,7 +11,6 @@
  * System admin controller
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class System extends AbstractAction
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
index 9fa8fc289e39c..be2cbbdeb804e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
@@ -11,7 +11,6 @@
  * Adminhtml account controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Account extends Action
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
index ef51ee8441512..b726e56c079d5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Account\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\System\Account
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index 764d17747b1bc..32f476ef95b32 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
 {
@@ -45,7 +44,6 @@ private function getSecurityCookie()
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
index df45c0a4245d2..c9fec141e67e2 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design
  *
- * @since 2.0.0
  */
 abstract class Design extends Action
 {
@@ -25,31 +24,26 @@ abstract class Design extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $dateFilter;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -60,7 +54,6 @@ abstract class Design extends Action
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
index 069afbe570374..9c44e036057ee 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php
index 52a93eff6d37d..f50da4ccb856e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php
index c198f93983a0a..42e77c25b9867 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
index b7219fcf9a744..055cdf9c6c281 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php
index b304a4b7208ae..aea2e26806e23 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
index 2af35d9170d93..f47a2dd12f0e9 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Design\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
@@ -18,7 +17,6 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
      *
      * @param array $data
      * @return array|null
-     * @since 2.0.0
      */
     protected function _filterPostData($data)
     {
@@ -33,7 +31,6 @@ protected function _filterPostData($data)
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
index 3beb50fc491c5..0526f3c517d04 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\System
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php
index 4ff1b94da2877..82060e07c2d18 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\SetStore
  *
- * @since 2.0.0
  */
 class SetStore extends \Magento\Backend\Controller\Adminhtml\System
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 1383d09236e95..4fbae6abb423a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -14,7 +14,6 @@
  * Store controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Store extends Action
 {
@@ -29,25 +28,21 @@ abstract class Store extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -57,7 +52,6 @@ abstract class Store extends Action
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -77,7 +71,6 @@ public function __construct(
      * Init actions
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function createPage()
     {
@@ -93,7 +86,6 @@ protected function createPage()
      * Backup database
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _backupDatabase()
     {
@@ -130,7 +122,6 @@ protected function _backupDatabase()
      *
      * @param string $typeTitle
      * @return $this
-     * @since 2.0.0
      */
     protected function _addDeletionNotice($typeTitle)
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
index 6c0a48141aebf..3188b0b312f27 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteGroup
  *
- * @since 2.0.0
  */
 class DeleteGroup extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
index b04b128570cb7..18038f8f03c2d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteGroupPost
  *
- * @since 2.0.0
  */
 class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
index 457ea57408e0f..75bda98d8a1e9 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteStore
  *
- * @since 2.0.0
  */
 class DeleteStore extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
index 71d4fa4daf741..cacc61a1665e3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteStorePost
  *
- * @since 2.0.0
  */
 class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
@@ -19,7 +18,6 @@ class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
      * Delete store view post action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
index 58c2e46799eb3..d5edf9b241d84 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteWebsite
  *
- * @since 2.0.0
  */
 class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
index 6ee8fe38e5a6b..5fa8c0f96f447 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\DeleteWebsitePost
  *
- * @since 2.0.0
  */
 class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php
index dcbe6a79d1a42..cbeba79fb4af9 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\EditGroup
  *
- * @since 2.0.0
  */
 class EditGroup extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
index 0cdb3ea830f26..4dd39dc3f89f8 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\EditStore
  *
- * @since 2.0.0
  */
 class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
@@ -17,7 +16,6 @@ class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
index cce59794e0045..9f2a422905ff2 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\EditWebsite
  *
- * @since 2.0.0
  */
 class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
index e607ea3c9dca9..b104704f41bdb 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Index returns Stores page
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
@@ -18,7 +17,6 @@ class Index extends \Magento\Backend\Controller\Adminhtml\System\Store
      * Returns Stores page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php
index d0ce95b389ee8..725d70e1cb15c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\NewGroup
  *
- * @since 2.0.0
  */
 class NewGroup extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php
index 8474c51ce42ad..9ec7043c553fe 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\NewStore
  *
- * @since 2.0.0
  */
 class NewStore extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php
index bc8ebb9d7d4aa..f75674f3e4dd6 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Backend\Controller\Adminhtml\System\Store\NewWebsite
  *
- * @since 2.0.0
  */
 class NewWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
index f0feaeadbb846..0976e37cb57ae 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
@@ -10,7 +10,6 @@
  * Class Save
  *
  * Save controller for system entities such as: Store, StoreGroup, Website
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
@@ -115,7 +114,6 @@ private function processGroupSave($postData)
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Cron/CleanCache.php b/app/code/Magento/Backend/Cron/CleanCache.php
index c02e5f606d0f6..f3ed98530365f 100644
--- a/app/code/Magento/Backend/Cron/CleanCache.php
+++ b/app/code/Magento/Backend/Cron/CleanCache.php
@@ -7,19 +7,16 @@
 
 /**
  * Backend event observer
- * @since 2.0.0
  */
 class CleanCache
 {
     /**
      * @var \Magento\Framework\App\Cache\Frontend\Pool
-     * @since 2.0.0
      */
     private $cacheFrontendPool;
 
     /**
      * @param \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
@@ -31,7 +28,6 @@ public function __construct(
      * Cron job method to clean old cache resources
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
index 40f272ae12b6b..4b630b5f05aca 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
@@ -9,7 +9,6 @@
  * Adminhtml abstract  dashboard helper.
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -17,7 +16,6 @@ abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractH
      * Helper collection
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|array
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -25,13 +23,11 @@ abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractH
      * Parameters for helper
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_params = [];
 
     /**
      * @return array|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -43,7 +39,6 @@ public function getCollection()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     abstract protected function _initCollection();
 
@@ -51,7 +46,6 @@ abstract protected function _initCollection();
      * Returns collection items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -60,7 +54,6 @@ public function getItems()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -70,7 +63,6 @@ public function getCount()
     /**
      * @param string $index
      * @return array
-     * @since 2.0.0
      */
     public function getColumn($index)
     {
@@ -95,7 +87,6 @@ public function getColumn($index)
      * @param string $name
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setParam($name, $value)
     {
@@ -105,7 +96,6 @@ public function setParam($name, $value)
     /**
      * @param array $params
      * @return void
-     * @since 2.0.0
      */
     public function setParams(array $params)
     {
@@ -115,7 +105,6 @@ public function setParams(array $params)
     /**
      * @param string $name
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($name)
     {
@@ -128,7 +117,6 @@ public function getParam($name)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getParams()
     {
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index b1ee7fe62d83c..9ab7b8b9db615 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -12,25 +12,21 @@
  * Data helper for dashboard
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     protected $_stores;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_installDate;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $_storeManager;
 
@@ -38,7 +34,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Retrieve stores configured in system.
      *
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -70,7 +64,6 @@ public function getStores()
      * Retrieve number of loaded stores
      *
      * @return int
-     * @since 2.0.0
      */
     public function countStores()
     {
@@ -81,7 +74,6 @@ public function countStores()
      * Prepare array with periods for dashboard graphs
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDatePeriods()
     {
@@ -100,7 +92,6 @@ public function getDatePeriods()
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function getChartDataHash($data)
     {
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index 0f0b0828e66e4..3c45ee69b6a06 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -11,26 +11,23 @@
  * Adminhtml dashboard helper for orders
  *
  * @api
- * @since 2.0.0
  */
 class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $_orderCollection;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.1.0
+     * @since 2.0.5
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -46,7 +43,7 @@ public function __construct(
      * @return \Magento\Store\Model\StoreManagerInterface
      *
      * @deprecated 2.1.0
-     * @since 2.1.0
+     * @since 2.0.5
      */
     private function getStoreManager()
     {
@@ -58,7 +55,6 @@ private function getStoreManager()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _initCollection()
     {
diff --git a/app/code/Magento/Backend/Helper/Data.php b/app/code/Magento/Backend/Helper/Data.php
index f006519e5f713..7e7722195133f 100644
--- a/app/code/Magento/Backend/Helper/Data.php
+++ b/app/code/Magento/Backend/Helper/Data.php
@@ -11,7 +11,6 @@
  * @api
  * @deprecated 2.2.0
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Data extends AbstractHelper
 {
@@ -19,43 +18,36 @@ class Data extends AbstractHelper
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_pageHelpUrl;
 
     /**
      * @var \Magento\Framework\App\Route\Config
-     * @since 2.0.0
      */
     protected $_routeConfig;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_locale;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Backend\Model\Auth
-     * @since 2.0.0
      */
     protected $_auth;
 
     /**
      * @var \Magento\Backend\App\Area\FrontNameResolver
-     * @since 2.0.0
      */
     protected $_frontNameResolver;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
@@ -67,7 +59,6 @@ class Data extends AbstractHelper
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
      * @param \Magento\Framework\Math\Random $mathRandom
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -89,7 +80,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPageHelpUrl()
     {
@@ -102,7 +92,6 @@ public function getPageHelpUrl()
     /**
      * @param string|null $url
      * @return $this
-     * @since 2.0.0
      */
     public function setPageHelpUrl($url = null)
     {
@@ -133,7 +122,6 @@ public function setPageHelpUrl($url = null)
     /**
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function addPageHelpUrl($suffix)
     {
@@ -145,7 +133,6 @@ public function addPageHelpUrl($suffix)
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
@@ -154,7 +141,6 @@ public function getUrl($route = '', $params = [])
 
     /**
      * @return int|bool
-     * @since 2.0.0
      */
     public function getCurrentUserId()
     {
@@ -169,7 +155,6 @@ public function getCurrentUserId()
      *
      * @param string $filterString
      * @return array
-     * @since 2.0.0
      */
     public function prepareFilterString($filterString)
     {
@@ -196,7 +181,6 @@ function (&$value) {
      * Generate unique token for reset password confirmation link
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateResetPasswordLinkToken()
     {
@@ -207,7 +191,6 @@ public function generateResetPasswordLinkToken()
      * Get backend start page URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHomePageUrl()
     {
@@ -219,7 +202,6 @@ public function getHomePageUrl()
      *
      * @param bool $checkHost
      * @return bool|string
-     * @since 2.0.0
      */
     public function getAreaFrontName($checkHost = false)
     {
diff --git a/app/code/Magento/Backend/Helper/Js.php b/app/code/Magento/Backend/Helper/Js.php
index f6db76081755a..77f6212536b3d 100644
--- a/app/code/Magento/Backend/Helper/Js.php
+++ b/app/code/Magento/Backend/Helper/Js.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Js
 {
@@ -34,7 +33,6 @@ class Js
      *
      * @param   string $encoded
      * @return  array
-     * @since 2.0.0
      */
     public function decodeGridSerializedInput($encoded)
     {
diff --git a/app/code/Magento/Backend/Model/AdminPathConfig.php b/app/code/Magento/Backend/Model/AdminPathConfig.php
index fe00eb331ddaf..1ec9284289fd7 100644
--- a/app/code/Magento/Backend/Model/AdminPathConfig.php
+++ b/app/code/Magento/Backend/Model/AdminPathConfig.php
@@ -11,25 +11,21 @@
 /**
  * Path config to be used in adminhtml area
  * @api
- * @since 2.0.0
  */
 class AdminPathConfig implements PathConfigInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $coreConfig;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $backendConfig;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
@@ -39,7 +35,6 @@ class AdminPathConfig implements PathConfigInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
@@ -56,7 +51,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
     {
@@ -68,7 +62,6 @@ public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $req
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function shouldBeSecure($path)
     {
@@ -87,7 +80,6 @@ public function shouldBeSecure($path)
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultPath()
     {
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
index 35d2086decdc7..fb3fe06ca1278 100644
--- a/app/code/Magento/Backend/Model/Auth.php
+++ b/app/code/Magento/Backend/Model/Auth.php
@@ -13,19 +13,16 @@
  * Backend Auth model
  *
  * @api
- * @since 2.0.0
  */
 class Auth
 {
     /**
      * @var \Magento\Backend\Model\Auth\StorageInterface
-     * @since 2.0.0
      */
     protected $_authStorage;
 
     /**
      * @var \Magento\Backend\Model\Auth\Credential\StorageInterface
-     * @since 2.0.0
      */
     protected $_credentialStorage;
 
@@ -33,7 +30,6 @@ class Auth
      * Backend data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData;
 
@@ -41,19 +37,16 @@ class Auth
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_coreConfig;
 
     /**
      * @var \Magento\Framework\Data\Collection\ModelFactory
-     * @since 2.0.0
      */
     protected $_modelFactory;
 
@@ -64,7 +57,6 @@ class Auth
      * @param \Magento\Backend\Model\Auth\Credential\StorageInterface $credentialStorage
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Framework\Data\Collection\ModelFactory $modelFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -88,7 +80,6 @@ public function __construct(
      * @param \Magento\Backend\Model\Auth\StorageInterface $storage
      * @return $this
      * @throws \Magento\Framework\Exception\AuthenticationException
-     * @since 2.0.0
      */
     public function setAuthStorage($storage)
     {
@@ -105,7 +96,6 @@ public function setAuthStorage($storage)
      *
      * @return \Magento\Backend\Model\Auth\StorageInterface
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAuthStorage()
     {
@@ -117,7 +107,6 @@ public function getAuthStorage()
      * an instance of \Magento\Backend\Model\Auth\Credential\StorageInterface
      *
      * @return \Magento\Backend\Model\Auth\Credential\StorageInterface
-     * @since 2.0.0
      */
     public function getUser()
     {
@@ -128,7 +117,6 @@ public function getUser()
      * Initialize credential storage from configuration
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initCredentialStorage()
     {
@@ -142,7 +130,6 @@ protected function _initCredentialStorage()
      *
      * @return null|\Magento\Backend\Model\Auth\Credential\StorageInterface
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCredentialStorage()
     {
@@ -156,7 +143,6 @@ public function getCredentialStorage()
      * @param string $password
      * @return void
      * @throws \Magento\Framework\Exception\AuthenticationException
-     * @since 2.0.0
      */
     public function login($username, $password)
     {
@@ -201,7 +187,6 @@ public function login($username, $password)
      * Perform logout process
      *
      * @return void
-     * @since 2.0.0
      */
     public function logout()
     {
@@ -212,7 +197,6 @@ public function logout()
      * Check if current user is logged in
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLoggedIn()
     {
@@ -226,7 +210,6 @@ public function isLoggedIn()
      * @return void
      * @throws \Magento\Framework\Exception\AuthenticationException
      * @static
-     * @since 2.0.0
      */
     public static function throwException(Phrase $msg = null)
     {
diff --git a/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php b/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php
index b75df4f29b609..3b55eb5241ecf 100644
--- a/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php
+++ b/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 interface StorageInterface
 {
@@ -20,7 +19,6 @@ interface StorageInterface
      * @param string $username
      * @param string $password
      * @return bool
-     * @since 2.0.0
      */
     public function authenticate($username, $password);
 
@@ -31,7 +29,6 @@ public function authenticate($username, $password);
      * @param string $password
      * @return $this
      * @abstract
-     * @since 2.0.0
      */
     public function login($username, $password);
 
@@ -40,7 +37,6 @@ public function login($username, $password);
      *
      * @return $this
      * @abstract
-     * @since 2.0.0
      */
     public function reload();
 
@@ -49,7 +45,6 @@ public function reload();
      *
      * @return bool
      * @abstract
-     * @since 2.0.0
      */
     public function hasAvailableResources();
 
@@ -59,7 +54,6 @@ public function hasAvailableResources();
      * @param bool $hasResources
      * @return $this
      * @abstract
-     * @since 2.0.0
      */
     public function setHasAvailableResources($hasResources);
 }
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index 23d6f4a5881d3..098ffec7ea9fd 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -22,7 +22,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @todo implement solution that keeps is_first_visit flag in session during redirects
  * @api
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager implements \Magento\Backend\Model\Auth\StorageInterface
 {
@@ -35,7 +34,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      * Whether it is the first page after successful login
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isFirstAfterLogin;
 
@@ -43,19 +41,16 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      * Access Control List builder
      *
      * @var \Magento\Framework\Acl\Builder
-     * @since 2.0.0
      */
     protected $_aclBuilder;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -74,7 +69,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      * @param \Magento\Backend\App\ConfigInterface $config
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -111,7 +105,6 @@ public function __construct(
      *
      * @param  \Magento\User\Model\User $user
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     public function refreshAcl($user = null)
     {
@@ -137,7 +130,6 @@ public function refreshAcl($user = null)
      * @param   string $resource
      * @param   string $privilege
      * @return  boolean
-     * @since 2.0.0
      */
     public function isAllowed($resource, $privilege = null)
     {
@@ -163,7 +155,6 @@ public function isAllowed($resource, $privilege = null)
      * Check if user is logged in
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isLoggedIn()
     {
@@ -174,7 +165,6 @@ public function isLoggedIn()
      * Set session UpdatedAt to current time
      *
      * @return void
-     * @since 2.0.0
      */
     public function prolong()
     {
@@ -197,7 +187,6 @@ public function prolong()
      * Check if it is the first page after successful login
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFirstPageAfterLogin()
     {
@@ -212,7 +201,6 @@ public function isFirstPageAfterLogin()
      *
      * @param bool $value
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     public function setIsFirstPageAfterLogin($value)
     {
@@ -224,7 +212,6 @@ public function setIsFirstPageAfterLogin($value)
      * Process of configuring of current auth storage when login was performed
      *
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     public function processLogin()
     {
@@ -246,7 +233,6 @@ public function processLogin()
      * Process of configuring of current auth storage when logout was performed
      *
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     public function processLogout()
     {
@@ -261,7 +247,6 @@ public function processLogout()
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isValidForPath($path)
     {
diff --git a/app/code/Magento/Backend/Model/Auth/StorageInterface.php b/app/code/Magento/Backend/Model/Auth/StorageInterface.php
index dac755feb00cd..60ed16a20848a 100644
--- a/app/code/Magento/Backend/Model/Auth/StorageInterface.php
+++ b/app/code/Magento/Backend/Model/Auth/StorageInterface.php
@@ -9,7 +9,6 @@
  * Backend Auth Storage interface
  *
  * @api
- * @since 2.0.0
  */
 interface StorageInterface
 {
@@ -19,7 +18,6 @@ interface StorageInterface
      * @return $this
      * @abstract
      * @api
-     * @since 2.0.0
      */
     public function processLogin();
 
@@ -29,7 +27,6 @@ public function processLogin();
      * @return $this
      * @abstract
      * @api
-     * @since 2.0.0
      */
     public function processLogout();
 
@@ -39,7 +36,6 @@ public function processLogout();
      * @return bool
      * @abstract
      * @api
-     * @since 2.0.0
      */
     public function isLoggedIn();
 
@@ -49,7 +45,6 @@ public function isLoggedIn();
      * @return void
      * @abstract
      * @api
-     * @since 2.0.0
      */
     public function prolong();
 }
diff --git a/app/code/Magento/Backend/Model/Authorization/RoleLocator.php b/app/code/Magento/Backend/Model/Authorization/RoleLocator.php
index 002f8e98445aa..4af0a8b29db1d 100644
--- a/app/code/Magento/Backend/Model/Authorization/RoleLocator.php
+++ b/app/code/Magento/Backend/Model/Authorization/RoleLocator.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RoleLocator implements \Magento\Framework\Authorization\RoleLocatorInterface
 {
@@ -15,13 +14,11 @@ class RoleLocator implements \Magento\Framework\Authorization\RoleLocatorInterfa
      * Authentication service
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @param \Magento\Backend\Model\Auth\Session $session
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Model\Auth\Session $session)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Backend\Model\Auth\Session $session)
      * Retrieve current role
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAclRoleId()
     {
diff --git a/app/code/Magento/Backend/Model/Cache/ResourceModel/Grid/Collection.php b/app/code/Magento/Backend/Model/Cache/ResourceModel/Grid/Collection.php
index d139354f05899..409c821b64ee2 100644
--- a/app/code/Magento/Backend/Model/Cache/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Backend/Model/Cache/ResourceModel/Grid/Collection.php
@@ -9,20 +9,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -39,7 +36,6 @@ public function __construct(
      * @param bool $logQuery
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Backend/Model/Locale/Manager.php b/app/code/Magento/Backend/Model/Locale/Manager.php
index b2fe0a8c1621f..6aaed1a39881f 100644
--- a/app/code/Magento/Backend/Model/Locale/Manager.php
+++ b/app/code/Magento/Backend/Model/Locale/Manager.php
@@ -10,25 +10,21 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Manager
 {
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $_translator;
 
@@ -45,7 +41,6 @@ class Manager
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\TranslateInterface $translator
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
@@ -64,7 +59,6 @@ public function __construct(
      *
      * @param string $localeCode
      * @return $this
-     * @since 2.0.0
      */
     public function switchBackendInterfaceLocale($localeCode)
     {
@@ -92,7 +86,6 @@ public function getGeneralLocale()
      * Get user interface locale stored in session data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserInterfaceLocale()
     {
diff --git a/app/code/Magento/Backend/Model/Locale/Resolver.php b/app/code/Magento/Backend/Model/Locale/Resolver.php
index 5e95cd6d36974..fd6589ebf5fc8 100644
--- a/app/code/Magento/Backend/Model/Locale/Resolver.php
+++ b/app/code/Magento/Backend/Model/Locale/Resolver.php
@@ -8,31 +8,26 @@
 /**
  * Backend locale model
  * @api
- * @since 2.0.0
  */
 class Resolver extends \Magento\Framework\Locale\Resolver
 {
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Backend\Model\Locale\Manager
-     * @since 2.0.0
      */
     protected $_localeManager;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\Validator\Locale
-     * @since 2.0.0
      */
     protected $_localeValidator;
 
@@ -46,7 +41,6 @@ class Resolver extends \Magento\Framework\Locale\Resolver
      * @param \Magento\Framework\Validator\Locale $localeValidator
      * @param null $locale
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -70,7 +64,6 @@ public function __construct(
      *
      * @param string $locale
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale = null)
     {
diff --git a/app/code/Magento/Backend/Model/Menu.php b/app/code/Magento/Backend/Model/Menu.php
index fb5002a8fb008..a953eec3bd6d0 100644
--- a/app/code/Magento/Backend/Model/Menu.php
+++ b/app/code/Magento/Backend/Model/Menu.php
@@ -15,7 +15,6 @@
  * Backend menu model
  *
  * @api
- * @since 2.0.0
  */
 class Menu extends \ArrayObject
 {
@@ -23,13 +22,11 @@ class Menu extends \ArrayObject
      * Path in tree structure
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_path = '';
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -52,7 +49,6 @@ class Menu extends \ArrayObject
      * @param string $pathInMenuStructure
      * @param Factory|null $menuItemFactory
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         LoggerInterface $logger,
@@ -78,7 +74,6 @@ public function __construct(
      * @param int $index
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function add(Item $item, $parentId = null, $index = null)
     {
@@ -106,7 +101,6 @@ public function add(Item $item, $parentId = null, $index = null)
      *
      * @param string $itemId
      * @return Item|null
-     * @since 2.0.0
      */
     public function get($itemId)
     {
@@ -133,7 +127,6 @@ public function get($itemId)
      * @param int $sortIndex
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function move($itemId, $toItemId, $sortIndex = null)
     {
@@ -150,7 +143,6 @@ public function move($itemId, $toItemId, $sortIndex = null)
      *
      * @param string $itemId
      * @return bool
-     * @since 2.0.0
      */
     public function remove($itemId)
     {
@@ -179,7 +171,6 @@ public function remove($itemId)
      * @param string $itemId
      * @param int $position
      * @return bool
-     * @since 2.0.0
      */
     public function reorder($itemId, $position)
     {
@@ -203,7 +194,6 @@ public function reorder($itemId, $position)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function isLast(Item $item)
     {
@@ -214,7 +204,6 @@ public function isLast(Item $item)
      * Find first menu item that user is able to access
      *
      * @return Item|null
-     * @since 2.0.0
      */
     public function getFirstAvailable()
     {
@@ -241,7 +230,6 @@ public function getFirstAvailable()
      *
      * @param string $itemId
      * @return Item[]
-     * @since 2.0.0
      */
     public function getParentItems($itemId)
     {
@@ -257,7 +245,6 @@ public function getParentItems($itemId)
      * @param string $itemId
      * @param array &$parents
      * @return bool
-     * @since 2.0.0
      */
     protected function _findParentItems($menu, $itemId, &$parents)
     {
@@ -280,7 +267,6 @@ protected function _findParentItems($menu, $itemId, &$parents)
      * Serialize menu
      *
      * @return string
-     * @since 2.0.0
      */
     public function serialize()
     {
diff --git a/app/code/Magento/Backend/Model/Menu/AbstractDirector.php b/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
index ef78c192ea3b9..9b70d3405d715 100644
--- a/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
+++ b/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
@@ -7,20 +7,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDirector
 {
     /**
      * Factory model
      * @var \Magento\Backend\Model\Menu\Builder\CommandFactory
-     * @since 2.0.0
      */
     protected $_commandFactory;
 
     /**
      * @param \Magento\Backend\Model\Menu\Builder\CommandFactory $factory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Model\Menu\Builder\CommandFactory $factory)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Backend\Model\Menu\Builder\CommandFactory $
      * @param \Magento\Backend\Model\Menu\Builder $builder
      * @param \Psr\Log\LoggerInterface $logger
      * @return void
-     * @since 2.0.0
      */
     abstract public function direct(
         array $config,
diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/app/code/Magento/Backend/Model/Menu/Builder.php
index 4f24c4cf32aa6..435f1014cf363 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder.php
@@ -9,25 +9,21 @@
  * Menu builder object. Retrieves commands (\Magento\Backend\Model\Menu\Builder\AbstractCommand)
  * to build menu (\Magento\Backend\Model\Menu)
  * @api
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var \Magento\Backend\Model\Menu\Builder\AbstractCommand[]
-     * @since 2.0.0
      */
     protected $_commands = [];
 
     /**
      * @var \Magento\Backend\Model\Menu\Item\Factory
-     * @since 2.0.0
      */
     protected $_itemFactory;
 
     /**
      * @param \Magento\Backend\Model\Menu\Item\Factory $menuItemFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Model\Menu\Item\Factory $menuItemFactory)
     {
@@ -39,7 +35,6 @@ public function __construct(\Magento\Backend\Model\Menu\Item\Factory $menuItemFa
      *
      * @param \Magento\Backend\Model\Menu\Builder\AbstractCommand $command
      * @return $this
-     * @since 2.0.0
      */
     public function processCommand(\Magento\Backend\Model\Menu\Builder\AbstractCommand $command)
     {
@@ -57,7 +52,6 @@ public function processCommand(\Magento\Backend\Model\Menu\Builder\AbstractComma
      * @param \Magento\Backend\Model\Menu $menu
      * @return \Magento\Backend\Model\Menu
      * @throws \OutOfRangeException in case given parent id does not exists
-     * @since 2.0.0
      */
     public function getResult(\Magento\Backend\Model\Menu $menu)
     {
@@ -104,7 +98,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
      * @param string $paramName
      * @param mixed $defaultValue
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
index aaf9b2762371e..9a5bcf67162e0 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
@@ -8,7 +8,6 @@
 /**
  * Menu builder command
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCommand
 {
@@ -16,7 +15,6 @@ abstract class AbstractCommand
      * List of required params
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_requiredParams = ["id"];
 
@@ -24,7 +22,6 @@ abstract class AbstractCommand
      * Command params array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
@@ -32,14 +29,12 @@ abstract class AbstractCommand
      * Next command in the chain
      *
      * @var \Magento\Backend\Model\Menu\Builder\AbstractCommand
-     * @since 2.0.0
      */
     protected $_next = null;
 
     /**
      * @param array $data
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -55,7 +50,6 @@ public function __construct(array $data = [])
      * Retrieve id of element to apply command to
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -68,7 +62,6 @@ public function getId()
      * @param \Magento\Backend\Model\Menu\Builder\AbstractCommand $command
      * @return $this
      * @throws \InvalidArgumentException if invalid chaining command is supplied
-     * @since 2.0.0
      */
     public function chain(\Magento\Backend\Model\Menu\Builder\AbstractCommand $command)
     {
@@ -85,7 +78,6 @@ public function chain(\Magento\Backend\Model\Menu\Builder\AbstractCommand $comma
      *
      * @param array $itemParams
      * @return array
-     * @since 2.0.0
      */
     public function execute(array $itemParams = [])
     {
@@ -101,7 +93,6 @@ public function execute(array $itemParams = [])
      *
      * @param array $itemParams
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _execute(array $itemParams);
 }
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/Command/Add.php b/app/code/Magento/Backend/Model/Menu/Builder/Command/Add.php
index 2fab071980dac..ae9565be24297 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/Command/Add.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/Command/Add.php
@@ -8,7 +8,6 @@
 /**
  * Builder command to add menu items
  * @api
- * @since 2.0.0
  */
 class Add extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
 {
@@ -16,7 +15,6 @@ class Add extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
      * List of params that command requires for execution
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_requiredParams = ["id", "title", "module", "resource"];
 
@@ -26,7 +24,6 @@ class Add extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
      * @param \Magento\Backend\Model\Menu\Builder\AbstractCommand $command
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function chain(\Magento\Backend\Model\Menu\Builder\AbstractCommand $command)
     {
@@ -41,7 +38,6 @@ public function chain(\Magento\Backend\Model\Menu\Builder\AbstractCommand $comma
      *
      * @param array $itemParams
      * @return array
-     * @since 2.0.0
      */
     protected function _execute(array $itemParams)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/Command/Remove.php b/app/code/Magento/Backend/Model/Menu/Builder/Command/Remove.php
index bf766f600cc6e..46cfa5fee1806 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/Command/Remove.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/Command/Remove.php
@@ -8,7 +8,6 @@
 /**
  * Command to remove menu item
  * @api
- * @since 2.0.0
  */
 class Remove extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
 {
@@ -17,7 +16,6 @@ class Remove extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
      *
      * @param array $itemParams
      * @return array
-     * @since 2.0.0
      */
     protected function _execute(array $itemParams)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/Command/Update.php b/app/code/Magento/Backend/Model/Menu/Builder/Command/Update.php
index ac2395a2d41c6..abd03726f200e 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/Command/Update.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/Command/Update.php
@@ -8,7 +8,6 @@
 /**
  * Command to update menu item data
  * @api
- * @since 2.0.0
  */
 class Update extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
 {
@@ -17,7 +16,6 @@ class Update extends \Magento\Backend\Model\Menu\Builder\AbstractCommand
      *
      * @param array $itemParams
      * @return array
-     * @since 2.0.0
      */
     protected function _execute(array $itemParams)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/CommandFactory.php b/app/code/Magento/Backend/Model/Menu/Builder/CommandFactory.php
index 46b3ff7761a14..337a3d583ca6e 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/CommandFactory.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/CommandFactory.php
@@ -8,19 +8,16 @@
 /**
  * Menu builder command factory
  * @api
- * @since 2.0.0
  */
 class CommandFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $commandName
      * @param array $data
      * @return \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     public function create($commandName, array $data = [])
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Config.php b/app/code/Magento/Backend/Model/Menu/Config.php
index b38af1516c226..2386959417918 100644
--- a/app/code/Magento/Backend/Model/Menu/Config.php
+++ b/app/code/Magento/Backend/Model/Menu/Config.php
@@ -8,7 +8,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -18,19 +17,16 @@ class Config
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Backend\Model\MenuFactory
-     * @since 2.0.0
      */
     protected $_menuFactory;
 
@@ -38,37 +34,31 @@ class Config
      * Menu model
      *
      * @var \Magento\Backend\Model\Menu
-     * @since 2.0.0
      */
     protected $_menu;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Backend\Model\Menu\Config\Reader
-     * @since 2.0.0
      */
     protected $_configReader;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Backend\Model\Menu\AbstractDirector
-     * @since 2.0.0
      */
     protected $_director;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -82,7 +72,6 @@ class Config
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Menu\Builder $menuBuilder,
@@ -114,7 +103,6 @@ public function __construct(
      * @throws \Exception
      * @throws \BadMethodCallException|\Exception
      * @throws \Exception|\OutOfRangeException
-     * @since 2.0.0
      */
     public function getMenu()
     {
@@ -139,7 +127,6 @@ public function getMenu()
      * Initialize menu object
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initMenu()
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Config/Converter.php b/app/code/Magento/Backend/Model/Menu/Config/Converter.php
index e3c58964e6c99..1444ab3a21c36 100644
--- a/app/code/Magento/Backend/Model/Menu/Config/Converter.php
+++ b/app/code/Magento/Backend/Model/Menu/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class Converter converts xml to appropriate array
  * @api
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param mixed $dom
      * @return array
-     * @since 2.0.0
      */
     public function convert($dom)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Config/Menu/Dom.php b/app/code/Magento/Backend/Model/Menu/Config/Menu/Dom.php
index b92949618de8d..30ba12dd04b15 100644
--- a/app/code/Magento/Backend/Model/Menu/Config/Menu/Dom.php
+++ b/app/code/Magento/Backend/Model/Menu/Config/Menu/Dom.php
@@ -8,7 +8,6 @@
 /**
  * Menu configuration files handler
  * @api
- * @since 2.0.0
  */
 class Dom extends \Magento\Framework\Config\Dom
 {
@@ -19,7 +18,6 @@ class Dom extends \Magento\Framework\Config\Dom
      * @return \DOMElement|null
      * @throws \Magento\Framework\Exception\LocalizedException an exception is possible if original document contains
      * multiple fixed nodes
-     * @since 2.0.0
      */
     protected function _getMatchedNode($nodePath)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Config/Reader.php b/app/code/Magento/Backend/Model/Menu/Config/Reader.php
index 8a37b7fb88dd8..9b1a3cde08b36 100644
--- a/app/code/Magento/Backend/Model/Menu/Config/Reader.php
+++ b/app/code/Magento/Backend/Model/Menu/Config/Reader.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -22,7 +21,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Backend/Model/Menu/Config/SchemaLocator.php b/app/code/Magento/Backend/Model/Menu/Config/SchemaLocator.php
index 9b40c86c46aa9..371f0443a1432 100644
--- a/app/code/Magento/Backend/Model/Menu/Config/SchemaLocator.php
+++ b/app/code/Magento/Backend/Model/Menu/Config/SchemaLocator.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -19,7 +18,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -27,13 +25,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -44,7 +40,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -55,7 +50,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Director/Director.php b/app/code/Magento/Backend/Model/Menu/Director/Director.php
index b946488c28119..c7f7c2d322739 100644
--- a/app/code/Magento/Backend/Model/Menu/Director/Director.php
+++ b/app/code/Magento/Backend/Model/Menu/Director/Director.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Director extends \Magento\Backend\Model\Menu\AbstractDirector
 {
@@ -16,7 +15,6 @@ class Director extends \Magento\Backend\Model\Menu\AbstractDirector
      * Log message patterns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messagePatterns = ['update' => 'Item %s was updated', 'remove' => 'Item %s was removed'];
 
@@ -26,7 +24,6 @@ class Director extends \Magento\Backend\Model\Menu\AbstractDirector
      * @param array $data command params
      * @param \Psr\Log\LoggerInterface $logger
      * @return \Magento\Backend\Model\Menu\Builder\AbstractCommand
-     * @since 2.0.0
      */
     protected function _getCommand($data, $logger)
     {
@@ -46,7 +43,6 @@ protected function _getCommand($data, $logger)
      * @param \Magento\Backend\Model\Menu\Builder $builder
      * @param \Psr\Log\LoggerInterface $logger
      * @return void
-     * @since 2.0.0
      */
     public function direct(
         array $config,
diff --git a/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php b/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php
index f49a69fbdaa03..712b2e9a28e97 100644
--- a/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php
+++ b/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php
@@ -8,7 +8,6 @@
 /**
  * Menu filter iterator
  * @api
- * @since 2.0.0
  */
 class Iterator extends \FilterIterator
 {
@@ -16,7 +15,6 @@ class Iterator extends \FilterIterator
      * Constructor
      *
      * @param \Iterator $iterator
-     * @since 2.0.0
      */
     public function __construct(\Iterator $iterator)
     {
@@ -27,7 +25,6 @@ public function __construct(\Iterator $iterator)
      * Check whether the current element of the iterator is acceptable
      *
      * @return bool true if the current element is acceptable, otherwise false.
-     * @since 2.0.0
      */
     public function accept()
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index f6e046ea0a31b..0d29b46b933a2 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Item
 {
@@ -22,7 +21,6 @@ class Item
      * Menu item id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_id;
 
@@ -30,7 +28,6 @@ class Item
      * Menu item title
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_title;
 
@@ -38,7 +35,6 @@ class Item
      * Module of menu item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName;
 
@@ -46,7 +42,6 @@ class Item
      * Menu item sort index in list
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sortIndex = null;
 
@@ -54,7 +49,6 @@ class Item
      * Menu item action
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_action = null;
 
@@ -62,7 +56,6 @@ class Item
      * Parent menu item id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_parentId = null;
 
@@ -70,7 +63,6 @@ class Item
      * Acl resource of menu item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -78,7 +70,6 @@ class Item
      * Item tooltip text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_tooltip;
 
@@ -86,7 +77,6 @@ class Item
      * Path from root element in tree
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_path = '';
 
@@ -94,7 +84,6 @@ class Item
      * Acl
      *
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_acl;
 
@@ -102,7 +91,6 @@ class Item
      * Module that item is dependent on
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_dependsOnModule;
 
@@ -110,7 +98,6 @@ class Item
      * Global config option that item is dependent on
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_dependsOnConfig;
 
@@ -118,31 +105,26 @@ class Item
      * Submenu item list
      *
      * @var Menu
-     * @since 2.0.0
      */
     protected $_submenu;
 
     /**
      * @var \Magento\Backend\Model\MenuFactory
-     * @since 2.0.0
      */
     protected $_menuFactory;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlModel;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Backend\Model\Menu\Item\Validator
-     * @since 2.0.0
      */
     protected $_validator;
 
@@ -151,7 +133,6 @@ class Item
      *
      * @var string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_serializedSubmenu;
 
@@ -159,13 +140,11 @@ class Item
      * Module list
      *
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     protected $_moduleList;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     private $_moduleManager;
 
@@ -186,7 +165,6 @@ class Item
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Menu\Item\Validator $validator,
@@ -216,7 +194,6 @@ public function __construct(
      * @param string $key
      * @param mixed $defaultValue
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getArgument(array $array, $key, $defaultValue = null)
     {
@@ -227,7 +204,6 @@ protected function _getArgument(array $array, $key, $defaultValue = null)
      * Retrieve item id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -249,7 +225,6 @@ public function getTarget()
      * Check whether item has subnodes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -260,7 +235,6 @@ public function hasChildren()
      * Retrieve submenu
      *
      * @return Menu
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -274,7 +248,6 @@ public function getChildren()
      * Retrieve menu item url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -288,7 +261,6 @@ public function getUrl()
      * Retrieve menu item action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAction()
     {
@@ -301,7 +273,6 @@ public function getAction()
      * @param string $action
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setAction($action)
     {
@@ -314,7 +285,6 @@ public function setAction($action)
      * Check whether item has javascript callback on click
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasClickCallback()
     {
@@ -325,7 +295,6 @@ public function hasClickCallback()
      * Retrieve item click callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClickCallback()
     {
@@ -339,7 +308,6 @@ public function getClickCallback()
      * Retrieve tooltip text title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -352,7 +320,6 @@ public function getTitle()
      * @param string $title
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -365,7 +332,6 @@ public function setTitle($title)
      * Check whether item has tooltip text
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasTooltip()
     {
@@ -376,7 +342,6 @@ public function hasTooltip()
      * Retrieve item tooltip text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTooltip()
     {
@@ -389,7 +354,6 @@ public function getTooltip()
      * @param string $tooltip
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setTooltip($tooltip)
     {
@@ -404,7 +368,6 @@ public function setTooltip($tooltip)
      * @param string $module
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setModule($module)
     {
@@ -419,7 +382,6 @@ public function setModule($module)
      * @param string $moduleName
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setModuleDependency($moduleName)
     {
@@ -434,7 +396,6 @@ public function setModuleDependency($moduleName)
      * @param string $configPath
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setConfigDependency($configPath)
     {
@@ -447,7 +408,6 @@ public function setConfigDependency($configPath)
      * Check whether item is disabled. Disabled items are not shown to user
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled()
     {
@@ -460,7 +420,6 @@ public function isDisabled()
      * Check whether module that item depends on is active
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isModuleDependenciesAvailable()
     {
@@ -475,7 +434,6 @@ protected function _isModuleDependenciesAvailable()
      * Check whether config dependency is available
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isConfigDependenciesAvailable()
     {
@@ -489,7 +447,6 @@ protected function _isConfigDependenciesAvailable()
      * Check whether item is allowed to the user
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Factory.php b/app/code/Magento/Backend/Model/Menu/Item/Factory.php
index 8dd79904ef534..2a1e179f3e00c 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Factory.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Factory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Backend\Model\Menu\Item
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Validator.php b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
index 7b4b24a871b50..e383354231f76 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Validator.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Validator
 {
@@ -15,7 +14,6 @@ class Validator
      * The list of required params
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_required = ['id', 'title', 'resource'];
 
@@ -23,7 +21,6 @@ class Validator
      * List of created item ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ids = [];
 
@@ -31,13 +28,11 @@ class Validator
      * The list of primitive validators
      *
      * @var \Zend_Validate[]
-     * @since 2.0.0
      */
     protected $_validators = [];
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -76,7 +71,6 @@ public function __construct()
      * @return void
      * @throws \InvalidArgumentException
      * @throws \BadMethodCallException
-     * @since 2.0.0
      */
     public function validate($data)
     {
@@ -116,7 +110,6 @@ public function validate($data)
      * @param mixed $value
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validateParam($param, $value)
     {
diff --git a/app/code/Magento/Backend/Model/Menu/Iterator.php b/app/code/Magento/Backend/Model/Menu/Iterator.php
index 9fadd8ca079df..6bf295702a10f 100644
--- a/app/code/Magento/Backend/Model/Menu/Iterator.php
+++ b/app/code/Magento/Backend/Model/Menu/Iterator.php
@@ -8,7 +8,6 @@
 /**
  * Menu iterator
  * @api
- * @since 2.0.0
  */
 class Iterator extends \ArrayIterator
 {
@@ -16,7 +15,6 @@ class Iterator extends \ArrayIterator
      * Rewind to first element
      *
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
diff --git a/app/code/Magento/Backend/Model/ResourceModel/Translate.php b/app/code/Magento/Backend/Model/ResourceModel/Translate.php
index e7527ca953b72..ec9fd8bfa1768 100644
--- a/app/code/Magento/Backend/Model/ResourceModel/Translate.php
+++ b/app/code/Magento/Backend/Model/ResourceModel/Translate.php
@@ -8,7 +8,6 @@
 /**
  * Backend translate resource model
  * @api
- * @since 2.0.0
  */
 class Translate extends \Magento\Translation\Model\ResourceModel\Translate
 {
@@ -17,7 +16,6 @@ class Translate extends \Magento\Translation\Model\ResourceModel\Translate
      * Use always default scope for store id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getStoreId()
     {
diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
index 8fa7dffbd6f9c..4ce437dc2617b 100644
--- a/app/code/Magento/Backend/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -20,7 +20,6 @@
  * @method Customer setResults(array $results)
  * @method array getResults()
  * @api
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\DataObject
 {
@@ -28,31 +27,26 @@ class Customer extends \Magento\Framework\DataObject
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -64,7 +58,6 @@ class Customer extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Customer\Helper\View $customerViewHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Helper\Data $adminhtmlData,
@@ -84,7 +77,6 @@ public function __construct(
      * Load search results
      *
      * @return $this
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/app/code/Magento/Backend/Model/Search/Order.php b/app/code/Magento/Backend/Model/Search/Order.php
index bbfb77169e5f6..5970e8b586e16 100644
--- a/app/code/Magento/Backend/Model/Search/Order.php
+++ b/app/code/Magento/Backend/Model/Search/Order.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Order extends \Magento\Framework\DataObject
 {
@@ -18,20 +17,17 @@ class Order extends \Magento\Framework\DataObject
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param \Magento\Backend\Helper\Data $adminhtmlData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
@@ -45,7 +41,6 @@ public function __construct(
      * Load search results
      *
      * @return $this
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/app/code/Magento/Backend/Model/Session.php b/app/code/Magento/Backend/Model/Session.php
index 5e16468eb9092..4f4e1e61db77e 100644
--- a/app/code/Magento/Backend/Model/Session.php
+++ b/app/code/Magento/Backend/Model/Session.php
@@ -9,7 +9,6 @@
  * Backend user session
  *
  * @api
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
@@ -19,7 +18,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param string $path
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isValidForPath($path)
     {
diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php
index da9a682965032..09bb5ba521352 100644
--- a/app/code/Magento/Backend/Model/Session/AdminConfig.php
+++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php
@@ -15,7 +15,6 @@
 /**
  * Magento Backend session configuration
  * @api
- * @since 2.0.0
  */
 class AdminConfig extends Config
 {
@@ -26,19 +25,16 @@ class AdminConfig extends Config
 
     /**
      * @var FrontNameResolver
-     * @since 2.0.0
      */
     protected $_frontNameResolver;
 
     /**
      * @var \Magento\Backend\App\BackendAppList
-     * @since 2.0.0
      */
     private $backendAppList;
 
     /**
      * @var \Magento\Backend\Model\UrlFactory
-     * @since 2.0.0
      */
     private $backendUrlFactory;
 
@@ -56,7 +52,6 @@ class AdminConfig extends Config
      * @param string $lifetimePath
      * @param string $sessionName
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ValidatorFactory $validatorFactory,
@@ -95,7 +90,6 @@ public function __construct(
      * Determine the admin path
      *
      * @return string
-     * @since 2.0.0
      */
     private function extractAdminPath()
     {
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 6ae27d4520e37..2c072c051388b 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -24,7 +24,6 @@
  * @method Quote setOrderId($orderId)
  * @method int getOrderId()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Quote extends \Magento\Framework\Session\SessionManager
 {
@@ -32,7 +31,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * Quote model object
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -40,7 +38,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * Store model object
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -48,19 +45,16 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * Order model object
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -68,25 +62,21 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * Sales quote repository
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -107,7 +97,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -152,7 +141,6 @@ public function __construct(
      * Retrieve quote model object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -189,7 +177,6 @@ public function getQuote()
      * Retrieve store model object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -207,7 +194,6 @@ public function getStore()
      * Retrieve order model object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/Config.php b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
index c54e7145d13ae..93d44899705ce 100644
--- a/app/code/Magento/Backend/Model/Translate/Inline/Config.php
+++ b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
@@ -8,26 +8,22 @@
 /**
  * Backend Inline Translation config
  * @api
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
 {
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Developer\Helper\Data
-     * @since 2.0.0
      */
     protected $devHelper;
 
     /**
      * @param \Magento\Backend\App\ConfigInterface $config
      * @param \Magento\Developer\Helper\Data $devHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\ConfigInterface $config,
@@ -39,7 +35,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isActive($scope = null)
     {
@@ -48,7 +43,6 @@ public function isActive($scope = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isDevAllowed($scope = null)
     {
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index fd8fd61ab01f0..b2040c90493f2 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -14,7 +14,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlInterface
 {
@@ -29,13 +28,11 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * Authentication session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Backend\Model\Menu
-     * @since 2.0.0
      */
     protected $_menu;
 
@@ -43,13 +40,11 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * Startup page url from config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_startupMenuItemId;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendHelper;
 
@@ -57,37 +52,31 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * Menu config
      *
      * @var \Magento\Backend\Model\Menu\Config
-     * @since 2.0.0
      */
     protected $_menuConfig;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_scope;
 
@@ -116,7 +105,6 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * @param HostChecker|null $hostChecker
      * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
@@ -171,7 +159,6 @@ public function __construct(
      * Retrieve is secure mode for ULR logic
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSecure()
     {
@@ -187,7 +174,6 @@ protected function _isSecure()
      * @param array $data
      * @param bool $unsetOldParams
      * @return $this
-     * @since 2.0.0
      */
     protected function _setRouteParams(array $data, $unsetOldParams = true)
     {
@@ -207,7 +193,6 @@ protected function _setRouteParams(array $data, $unsetOldParams = true)
      * @param string $routePath
      * @param array $routeParams
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($routePath = null, $routeParams = null)
     {
@@ -253,7 +238,6 @@ public function getUrl($routePath = null, $routeParams = null)
      * @param string $controller Controller name
      * @param string $action Action name
      * @return string
-     * @since 2.0.0
      */
     public function getSecretKey($routeName = null, $controller = null, $action = null)
     {
@@ -288,7 +272,6 @@ public function getSecretKey($routeName = null, $controller = null, $action = nu
      * Return secret key settings flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function useSecretKey()
     {
@@ -299,7 +282,6 @@ public function useSecretKey()
      * Enable secret key using
      *
      * @return $this
-     * @since 2.0.0
      */
     public function turnOnSecretKey()
     {
@@ -311,7 +293,6 @@ public function turnOnSecretKey()
      * Disable secret key using
      *
      * @return $this
-     * @since 2.0.0
      */
     public function turnOffSecretKey()
     {
@@ -323,7 +304,6 @@ public function turnOffSecretKey()
      * Refresh admin menu cache etc.
      *
      * @return void
-     * @since 2.0.0
      */
     public function renewSecretUrls()
     {
@@ -334,7 +314,6 @@ public function renewSecretUrls()
      * Find admin start page url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStartupPageUrl()
     {
@@ -353,7 +332,6 @@ public function getStartupPageUrl()
      * Find first menu item that user is able to access
      *
      * @return string
-     * @since 2.0.0
      */
     public function findFirstAvailableMenu()
     {
@@ -375,7 +353,6 @@ public function findFirstAvailableMenu()
      * Get Menu model
      *
      * @return \Magento\Backend\Model\Menu
-     * @since 2.0.0
      */
     protected function _getMenu()
     {
@@ -390,7 +367,6 @@ protected function _getMenu()
      *
      * @param \Magento\Backend\Model\Auth\Session $session
      * @return $this
-     * @since 2.0.0
      */
     public function setSession(\Magento\Backend\Model\Auth\Session $session)
     {
@@ -402,7 +378,6 @@ public function setSession(\Magento\Backend\Model\Auth\Session $session)
      * Retrieve auth session
      *
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -413,7 +388,6 @@ protected function _getSession()
      * Return backend area front name, defined in configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAreaFrontName()
     {
@@ -428,7 +402,6 @@ public function getAreaFrontName()
      * Add backend area front name as a prefix to action path
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getActionPath()
     {
@@ -445,7 +418,6 @@ protected function _getActionPath()
      * Get scope for the url instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected function _getScope()
     {
@@ -465,7 +437,6 @@ protected function _getScope()
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _getConfigCacheId($path)
     {
@@ -478,7 +449,6 @@ protected function _getConfigCacheId($path)
      *
      * @param string $path
      * @return null|string
-     * @since 2.0.0
      */
     protected function _getConfig($path)
     {
diff --git a/app/code/Magento/Backend/Model/Url/ScopeResolver.php b/app/code/Magento/Backend/Model/Url/ScopeResolver.php
index 51389c94bef47..0d886f8f4547a 100644
--- a/app/code/Magento/Backend/Model/Url/ScopeResolver.php
+++ b/app/code/Magento/Backend/Model/Url/ScopeResolver.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ScopeResolver extends \Magento\Framework\Url\ScopeResolver
 {
diff --git a/app/code/Magento/Backend/Model/UrlInterface.php b/app/code/Magento/Backend/Model/UrlInterface.php
index e78e97e94ac80..3d75d617398c4 100644
--- a/app/code/Magento/Backend/Model/UrlInterface.php
+++ b/app/code/Magento/Backend/Model/UrlInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface UrlInterface extends \Magento\Framework\UrlInterface
 {
@@ -28,7 +27,6 @@ interface UrlInterface extends \Magento\Framework\UrlInterface
      * @param string $controller Controller name
      * @param string $action Action name
      * @return string
-     * @since 2.0.0
      */
     public function getSecretKey($routeName = null, $controller = null, $action = null);
 
@@ -36,7 +34,6 @@ public function getSecretKey($routeName = null, $controller = null, $action = nu
      * Return secret key settings flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function useSecretKey();
 
@@ -44,7 +41,6 @@ public function useSecretKey();
      * Enable secret key using
      *
      * @return \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     public function turnOnSecretKey();
 
@@ -52,7 +48,6 @@ public function turnOnSecretKey();
      * Disable secret key using
      *
      * @return \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     public function turnOffSecretKey();
 
@@ -60,7 +55,6 @@ public function turnOffSecretKey();
      * Refresh admin menu cache etc.
      *
      * @return \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     public function renewSecretUrls();
 
@@ -68,7 +62,6 @@ public function renewSecretUrls();
      * Find admin start page url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStartupPageUrl();
 
@@ -77,7 +70,6 @@ public function getStartupPageUrl();
      *
      * @param \Magento\Backend\Model\Auth\Session $session
      * @return \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     public function setSession(\Magento\Backend\Model\Auth\Session $session);
 
@@ -85,7 +77,6 @@ public function setSession(\Magento\Backend\Model\Auth\Session $session);
      * Return backend area front name, defined in configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAreaFrontName();
 
@@ -93,7 +84,6 @@ public function getAreaFrontName();
      * Find first menu item that user is able to access
      *
      * @return string
-     * @since 2.0.0
      */
     public function findFirstAvailableMenu();
 }
diff --git a/app/code/Magento/Backend/Model/View/Layout/Builder.php b/app/code/Magento/Backend/Model/View/Layout/Builder.php
index 536e5f69bf0aa..9eaaf1a9f892a 100644
--- a/app/code/Magento/Backend/Model/View/Layout/Builder.php
+++ b/app/code/Magento/Backend/Model/View/Layout/Builder.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Builder extends \Magento\Framework\View\Layout\Builder
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function afterGenerateBlock()
     {
diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
index e5a08b6ed2c61..80264b2f6a1ff 100644
--- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
+++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
@@ -12,7 +12,6 @@
 /**
  * Backend block structure reader with ACL support
  * @api
- * @since 2.0.0
  */
 class Block extends Layout\Reader\Block
 {
@@ -25,7 +24,6 @@ class Block extends Layout\Reader\Block
      * @param InterpreterInterface $argumentInterpreter
      * @param Condition $conditionReader
      * @param string|null $scopeType
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
diff --git a/app/code/Magento/Backend/Model/View/Page/Builder.php b/app/code/Magento/Backend/Model/View/Page/Builder.php
index 2810953ed5320..53b6229f970c8 100644
--- a/app/code/Magento/Backend/Model/View/Page/Builder.php
+++ b/app/code/Magento/Backend/Model/View/Page/Builder.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Builder extends View\Page\Builder
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function afterGenerateBlock()
     {
diff --git a/app/code/Magento/Backend/Model/View/Result/Forward.php b/app/code/Magento/Backend/Model/View/Result/Forward.php
index adfe1f708d021..426f743b32862 100644
--- a/app/code/Magento/Backend/Model/View/Result/Forward.php
+++ b/app/code/Magento/Backend/Model/View/Result/Forward.php
@@ -12,19 +12,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Forward extends \Magento\Framework\Controller\Result\Forward
 {
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $actionFlag;
 
@@ -32,7 +29,6 @@ class Forward extends \Magento\Framework\Controller\Result\Forward
      * @param RequestInterface $request
      * @param Session $session
      * @param ActionFlag $actionFlag
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request, Session $session, ActionFlag $actionFlag)
     {
@@ -44,7 +40,6 @@ public function __construct(RequestInterface $request, Session $session, ActionF
     /**
      * @param string $action
      * @return $this
-     * @since 2.0.0
      */
     public function forward($action)
     {
diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php
index 1a076a453e52b..e59d062146968 100644
--- a/app/code/Magento/Backend/Model/View/Result/Page.php
+++ b/app/code/Magento/Backend/Model/View/Result/Page.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Page extends View\Result\Page
 {
@@ -19,7 +18,6 @@ class Page extends View\Result\Page
      *
      * @param string $itemId current active menu item
      * @return $this
-     * @since 2.0.0
      */
     public function setActiveMenu($itemId)
     {
@@ -41,7 +39,6 @@ public function setActiveMenu($itemId)
      * @param string $title
      * @param string|null $link
      * @return $this
-     * @since 2.0.0
      */
     public function addBreadcrumb($label, $title, $link = null)
     {
@@ -58,7 +55,6 @@ public function addBreadcrumb($label, $title, $link = null)
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     public function addContent(View\Element\AbstractBlock $block)
     {
@@ -70,7 +66,6 @@ public function addContent(View\Element\AbstractBlock $block)
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     public function addLeft(View\Element\AbstractBlock $block)
     {
@@ -82,7 +77,6 @@ public function addLeft(View\Element\AbstractBlock $block)
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     public function addJs(View\Element\AbstractBlock $block)
     {
@@ -97,7 +91,6 @@ public function addJs(View\Element\AbstractBlock $block)
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @param string $containerName
      * @return $this
-     * @since 2.0.0
      */
     protected function moveBlockToContainer(View\Element\AbstractBlock $block, $containerName)
     {
diff --git a/app/code/Magento/Backend/Model/View/Result/Redirect.php b/app/code/Magento/Backend/Model/View/Result/Redirect.php
index 5a3fc303c542e..fbb0f8bcd4694 100644
--- a/app/code/Magento/Backend/Model/View/Result/Redirect.php
+++ b/app/code/Magento/Backend/Model/View/Result/Redirect.php
@@ -14,19 +14,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Redirect extends \Magento\Framework\Controller\Result\Redirect
 {
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $actionFlag;
 
@@ -37,7 +34,6 @@ class Redirect extends \Magento\Framework\Controller\Result\Redirect
      * @param \Magento\Backend\Model\UrlInterface $urlBuilder
      * @param Session $session
      * @param ActionFlag $actionFlag
-     * @since 2.0.0
      */
     public function __construct(
         App\Response\RedirectInterface $redirect,
@@ -54,7 +50,6 @@ public function __construct(
      * Set referer url or dashboard if referer does not exist
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRefererOrBaseUrl()
     {
@@ -64,7 +59,6 @@ public function setRefererOrBaseUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/app/code/Magento/Backend/Model/View/Result/RedirectFactory.php b/app/code/Magento/Backend/Model/View/Result/RedirectFactory.php
index 28cf8d241f7e1..73fe23c3f7166 100644
--- a/app/code/Magento/Backend/Model/View/Result/RedirectFactory.php
+++ b/app/code/Magento/Backend/Model/View/Result/RedirectFactory.php
@@ -10,7 +10,6 @@
 /**
  * Factory class for \Magento\Backend\Model\View\Result\Redirect
  * @api
- * @since 2.0.0
  */
 class RedirectFactory extends \Magento\Framework\Controller\Result\RedirectFactory
 {
@@ -18,7 +17,6 @@ class RedirectFactory extends \Magento\Framework\Controller\Result\RedirectFacto
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,14 +24,12 @@ class RedirectFactory extends \Magento\Framework\Controller\Result\RedirectFacto
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
index 756a63207c832..b730ee5fd5ea1 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\TotalsInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota
      * 'value' => column expression
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columns = [];
 
@@ -28,7 +26,6 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota
      * 'value' => counted total
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = [];
 
@@ -36,7 +33,6 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota
      * Factory model
      *
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -44,14 +40,12 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota
      * Parser for expressions like operand operation operand
      *
      * @var \Magento\Backend\Model\Widget\Grid\Parser
-     * @since 2.0.0
      */
     protected $_parser;
 
     /**
      * @param \Magento\Framework\DataObject\Factory $factory
      * @param \Magento\Backend\Model\Widget\Grid\Parser $parser
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DataObject\Factory $factory,
@@ -68,7 +62,6 @@ public function __construct(
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
      * @abstract
-     * @since 2.0.0
      */
     abstract protected function _countSum($index, $collection);
 
@@ -79,7 +72,6 @@ abstract protected function _countSum($index, $collection);
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
      * @abstract
-     * @since 2.0.0
      */
     abstract protected function _countAverage($index, $collection);
 
@@ -90,7 +82,6 @@ abstract protected function _countAverage($index, $collection);
      * @param string $expr
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _count($index, $expr, $collection)
     {
@@ -116,7 +107,6 @@ protected function _count($index, $expr, $collection)
      * @param string $expr
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _countExpr($expr, $collection)
     {
@@ -147,7 +137,6 @@ protected function _countExpr($expr, $collection)
      * @param float|int &$tmpResult
      * @param float|int $result
      * @return void
-     * @since 2.0.0
      */
     protected function _checkOperandsSet(&$firstOperand, &$secondOperand, &$tmpResult, $result)
     {
@@ -168,7 +157,6 @@ protected function _checkOperandsSet(&$firstOperand, &$secondOperand, &$tmpResul
      * @param float|int $secondOperand
      * @param string $operation
      * @return float|int
-     * @since 2.0.0
      */
     protected function _operate($firstOperand, $secondOperand, $operation)
     {
@@ -196,7 +184,6 @@ protected function _operate($firstOperand, $secondOperand, $operation)
      * @param string $operand
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _checkOperand($operand, $collection)
     {
@@ -218,7 +205,6 @@ protected function _checkOperand($operand, $collection)
      * @param string $index
      * @param string $totalExpr
      * @return $this
-     * @since 2.0.0
      */
     public function setColumn($index, $totalExpr)
     {
@@ -230,7 +216,6 @@ public function setColumn($index, $totalExpr)
      * Return columns set
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumns()
     {
@@ -242,7 +227,6 @@ public function getColumns()
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function countTotals($collection)
     {
@@ -257,7 +241,6 @@ public function countTotals($collection)
      * Get totals as object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -269,7 +252,6 @@ public function getTotals()
      *
      * @param bool $isFullReset
      * @return void
-     * @since 2.0.0
      */
     public function reset($isFullReset = false)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Parser.php b/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
index ae500105755d8..1976302f34cf7 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Parser
 {
@@ -15,7 +14,6 @@ class Parser
      * List of allowed operations
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_operations = ['-', '+', '/', '*'];
 
@@ -24,7 +22,6 @@ class Parser
      *
      * @param string $expression
      * @return array
-     * @since 2.0.0
      */
     public function parseExpression($expression)
     {
@@ -50,7 +47,6 @@ public function parseExpression($expression)
      *
      * @param string $operation
      * @return bool
-     * @since 2.0.0
      */
     public function isOperation($operation)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php b/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php
index 5501b9d231a1a..be36d90a61435 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface GeneratorInterface
 {
@@ -17,7 +16,6 @@ interface GeneratorInterface
      * @param \Magento\Framework\DataObject $item
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getUrl($item);
 }
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGenerator.php b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGenerator.php
index a89bf243f238e..c08982ffc798a 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGenerator.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGenerator.php
@@ -8,31 +8,26 @@
 /**
  * Grid row url generator
  * @api
- * @since 2.0.0
  */
 class UrlGenerator implements \Magento\Backend\Model\Widget\Grid\Row\GeneratorInterface
 {
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlModel;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_path;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_params = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_extraParamsTemplate = [];
 
@@ -40,7 +35,6 @@ class UrlGenerator implements \Magento\Backend\Model\Widget\Grid\Row\GeneratorIn
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param array $args
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Model\UrlInterface $backendUrl, array $args = [])
     {
@@ -62,7 +56,6 @@ public function __construct(\Magento\Backend\Model\UrlInterface $backendUrl, arr
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($item)
     {
@@ -78,7 +71,6 @@ public function getUrl($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareParameters($item)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorFactory.php b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorFactory.php
index aceb62c602f88..61030a3d94676 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorFactory.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorFactory.php
@@ -9,19 +9,16 @@
  * Grid row url generator factory
  *
  * @api
- * @since 2.0.0
  */
 class UrlGeneratorFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createUrlGenerator($generatorClassName, array $arguments = [])
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorId.php b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorId.php
index 0a80777a8ab8e..8fb767a593796 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorId.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Row/UrlGeneratorId.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UrlGeneratorId implements \Magento\Backend\Model\Widget\Grid\Row\GeneratorInterface
 {
@@ -18,7 +17,6 @@ class UrlGeneratorId implements \Magento\Backend\Model\Widget\Grid\Row\Generator
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($item)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/SubTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/SubTotals.php
index e6cae02e10874..db3d9eeefc30a 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/SubTotals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/SubTotals.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SubTotals extends \Magento\Backend\Model\Widget\Grid\AbstractTotals
 {
@@ -17,7 +16,6 @@ class SubTotals extends \Magento\Backend\Model\Widget\Grid\AbstractTotals
      * @param string $index
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _countSum($index, $collection)
     {
@@ -34,7 +32,6 @@ protected function _countSum($index, $collection)
      * @param string $index
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _countAverage($index, $collection)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Totals.php b/app/code/Magento/Backend/Model/Widget/Grid/Totals.php
index 1a9de7eb31e1e..e77012bb52ee9 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Totals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Totals.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Backend\Model\Widget\Grid\AbstractTotals
 {
@@ -17,7 +16,6 @@ class Totals extends \Magento\Backend\Model\Widget\Grid\AbstractTotals
      * @param string $index
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _countSum($index, $collection)
     {
@@ -38,7 +36,6 @@ protected function _countSum($index, $collection)
      * @param string $index
      * @param \Magento\Framework\Data\Collection $collection
      * @return float|int
-     * @since 2.0.0
      */
     protected function _countAverage($index, $collection)
     {
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php b/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php
index 4fc545368d533..dae27b0767334 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface TotalsInterface
 {
@@ -18,7 +17,6 @@ interface TotalsInterface
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\DataObject
      * @api
-     * @since 2.0.0
      */
     public function countTotals($collection);
 }
diff --git a/app/code/Magento/Backend/Service/V1/ModuleService.php b/app/code/Magento/Backend/Service/V1/ModuleService.php
index 802d1490f3b50..63f046f6009f5 100644
--- a/app/code/Magento/Backend/Service/V1/ModuleService.php
+++ b/app/code/Magento/Backend/Service/V1/ModuleService.php
@@ -8,19 +8,16 @@
 
 /**
  * Module service.
- * @since 2.0.0
  */
 class ModuleService implements ModuleServiceInterface
 {
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     protected $moduleList;
 
     /**
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Module\ModuleListInterface $moduleList
@@ -32,7 +29,6 @@ public function __construct(
      * Returns an array of enabled modules
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getModules()
     {
diff --git a/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php
index 46ec10855fcd3..c04ab23ab7486 100644
--- a/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php
+++ b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for module service.
  * @api
- * @since 2.0.0
  */
 interface ModuleServiceInterface
 {
@@ -17,7 +16,6 @@ interface ModuleServiceInterface
      * Returns an array of enabled modules
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getModules();
 }
diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
index 4b430cf50f061..2d1723886b1dd 100644
--- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php
+++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
@@ -15,7 +15,6 @@
 /**
  * Deployment configuration options needed for Backend module
  *
- * @since 2.0.0
  */
 class ConfigOptionsList implements ConfigOptionsListInterface
 {
@@ -31,7 +30,6 @@ class ConfigOptionsList implements ConfigOptionsListInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -48,7 +46,6 @@ public function getOptions()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -67,7 +64,6 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
index c031ca987bc9a..459ef27bf6a15 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Backup.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Backup extends \Magento\Backend\Block\Template
 {
@@ -20,13 +19,11 @@ class Backup extends \Magento\Backend\Block\Template
      * Block's template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backup::backup/list.phtml';
 
     /**
      * @return AbstractBlock|void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -65,7 +62,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridHtml()
     {
@@ -76,7 +72,6 @@ public function getGridHtml()
      * Generate html code for pop-up messages that will appear when user click on "Rollback" link
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDialogsHtml()
     {
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
index 9e0c7e0c6ce9c..884636e815578 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
@@ -9,7 +9,6 @@
 
 /**
  * Backend rollback dialogs block
- * @since 2.0.0
  */
 class Dialogs extends Template
 {
@@ -17,7 +16,6 @@ class Dialogs extends Template
      * Block's template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backup::backup/dialogs.phtml';
 }
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 66ec5afa7e998..52ba9a013edc5 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Backup\Block\Adminhtml\Grid\Column\Renderer\Download
  *
- * @since 2.0.0
  */
 class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -23,7 +22,6 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      *
      * @param \Magento\Framework\DataObject $row
      * @return mixed
-     * @since 2.0.0
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
index a4e36cde52917..bf7fe670039fa 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Rollback extends \Magento\Backend\Block\Widget\Grid\Column
 {
     /**
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_backupHelper;
 
@@ -27,7 +25,6 @@ class Rollback extends \Magento\Backend\Block\Widget\Grid\Column
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backup\Helper\Data $backupHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Check permission for rollback
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
index e289799fc57a3..3dda624564601 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -25,31 +24,26 @@ abstract class Index extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Backup\Factory
-     * @since 2.0.0
      */
     protected $_backupFactory;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Backup\Model\BackupFactory
-     * @since 2.0.0
      */
     protected $_backupModelFactory;
 
     /**
      * @var \Magento\Framework\App\MaintenanceMode
-     * @since 2.0.0
      */
     protected $maintenanceMode;
 
@@ -60,7 +54,6 @@ abstract class Index extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
index 84a128fbad9f6..2a7e848ad097d 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Backup\Controller\Adminhtml\Index\Create
  *
- * @since 2.0.0
  */
 class Create extends \Magento\Backup\Controller\Adminhtml\Index
 {
@@ -21,7 +20,6 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index
      *
      * @return void|\Magento\Backend\App\Action
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
index ce66b047e1563..ac5dac570481a 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Backup\Controller\Adminhtml\Index\Download
  *
- * @since 2.0.0
  */
 class Download extends \Magento\Backup\Controller\Adminhtml\Index
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -29,7 +27,6 @@ class Download extends \Magento\Backup\Controller\Adminhtml\Index
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * Download backup action
      *
      * @return void|\Magento\Backend\App\Action
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php
index cefb04e63306b..2d533846250f4 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Backup\Controller\Adminhtml\Index\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backup\Controller\Adminhtml\Index
 {
@@ -19,7 +18,6 @@ class Grid extends \Magento\Backup\Controller\Adminhtml\Index
      * Backup list action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
index b65e0805900ab..144f03e1ea2c8 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backup\Controller\Adminhtml\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backup\Controller\Adminhtml\Index
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Backup\Controller\Adminhtml\Index
      * Backup list action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
index 9d48921b99da9..b1b925ee6df93 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Backup\Controller\Adminhtml\Index\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Backup\Controller\Adminhtml\Index
 {
@@ -17,7 +16,6 @@ class MassDelete extends \Magento\Backup\Controller\Adminhtml\Index
      * Delete backups mass action
      *
      * @return \Magento\Backend\App\Action
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
index 3c461fb83e283..0451f6ed09bd1 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
@@ -11,7 +11,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
 {
@@ -22,7 +21,6 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Cron/SystemBackup.php b/app/code/Magento/Backup/Cron/SystemBackup.php
index 4e92d283de2f5..6b98c50c7e1c0 100644
--- a/app/code/Magento/Backup/Cron/SystemBackup.php
+++ b/app/code/Magento/Backup/Cron/SystemBackup.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Backup\Cron\SystemBackup
  *
- * @since 2.0.0
  */
 class SystemBackup
 {
@@ -25,7 +24,6 @@ class SystemBackup
      * Error messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -33,7 +31,6 @@ class SystemBackup
      * Backup data
      *
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_backupData = null;
 
@@ -41,13 +38,11 @@ class SystemBackup
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -55,7 +50,6 @@ class SystemBackup
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -63,19 +57,16 @@ class SystemBackup
      * Filesystem facade
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Backup\Factory
-     * @since 2.0.0
      */
     protected $_backupFactory;
 
     /**
      * @var \Magento\Framework\App\MaintenanceMode
-     * @since 2.0.0
      */
     protected $maintenanceMode;
 
@@ -87,7 +78,6 @@ class SystemBackup
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Backup\Factory $backupFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backup\Helper\Data $backupData,
@@ -112,7 +102,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index 0adcbf9cf4b14..ed032c13f8753 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -12,25 +12,21 @@
 /**
  * Backup data helper
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
@@ -41,7 +37,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param Filesystem $filesystem
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      * Get all possible backup type values with descriptive title
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBackupTypes()
     {
@@ -75,7 +69,6 @@ public function getBackupTypes()
      * Get all possible backup type values
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getBackupTypesList()
     {
@@ -91,7 +84,6 @@ public function getBackupTypesList()
      * Get default backup type value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultBackupType()
     {
@@ -102,7 +94,6 @@ public function getDefaultBackupType()
      * Get directory path where backups stored
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackupsDir()
     {
@@ -114,7 +105,6 @@ public function getBackupsDir()
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getExtensionByType($type)
     {
@@ -126,7 +116,6 @@ public function getExtensionByType($type)
      * Get all types to extensions map
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExtensions()
     {
@@ -143,7 +132,6 @@ public function getExtensions()
      *
      * @param \Magento\Backup\Model\Backup $backup
      * @return string
-     * @since 2.0.0
      */
     public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
     {
@@ -164,7 +152,6 @@ public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
      * Check Permission for Rollback
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRollbackAllowed()
     {
@@ -175,7 +162,6 @@ public function isRollbackAllowed()
      * Get paths that should be ignored when creating system snapshots
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getBackupIgnorePaths()
     {
@@ -197,7 +183,6 @@ public function getBackupIgnorePaths()
      * Get paths that should be ignored when rolling back system snapshots
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getRollbackIgnorePaths()
     {
@@ -220,7 +205,6 @@ public function getRollbackIgnorePaths()
      *
      * @param string $type
      * @return void|string
-     * @since 2.0.0
      */
     public function getCreateSuccessMessageByType($type)
     {
@@ -244,7 +228,6 @@ public function getCreateSuccessMessageByType($type)
      * Invalidate Cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function invalidateCache()
     {
@@ -260,7 +243,6 @@ public function invalidateCache()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function nameToDisplayName($name)
     {
@@ -272,7 +254,6 @@ public function nameToDisplayName($name)
      *
      * @param string $filename
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function extractDataFromFilename($filename)
     {
diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
index 615900c1af0cf..62ff1b1ccf2a3 100644
--- a/app/code/Magento/Backup/Model/Backup.php
+++ b/app/code/Magento/Backup/Model/Backup.php
@@ -16,7 +16,6 @@
  * @method string getTime()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Backup extends \Magento\Framework\DataObject implements \Magento\Framework\Backup\Db\BackupInterface
 {
@@ -29,7 +28,6 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
      * Type of backup file
      *
      * @var string
-     * @since 2.0.0
      */
     private $_type = 'db';
 
@@ -37,19 +35,16 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
      * Gz file pointer
      *
      * @var \Magento\Framework\Filesystem\File\WriteInterface
-     * @since 2.0.0
      */
     protected $_stream = null;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -57,7 +52,6 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
      * Locale model
      *
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -65,19 +59,16 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
      * Backend auth session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_backendAuthSession;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $varDirectory;
 
@@ -88,7 +79,6 @@ class Backup extends \Magento\Framework\DataObject implements \Magento\Framework
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\Framework\Filesystem $filesystem
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backup\Helper\Data $helper,
@@ -113,7 +103,6 @@ public function __construct(
      *
      * @param int $time
      * @return $this
-     * @since 2.0.0
      */
     public function setTime($time)
     {
@@ -126,7 +115,6 @@ public function setTime($time)
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path)
     {
@@ -139,7 +127,6 @@ public function setPath($path)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -153,7 +140,6 @@ public function setName($name)
      * @param string $fileName
      * @param string $filePath
      * @return $this
-     * @since 2.0.0
      */
     public function load($fileName, $filePath)
     {
@@ -179,7 +165,6 @@ public function load($fileName, $filePath)
      * Checks backup file exists.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function exists()
     {
@@ -190,7 +175,6 @@ public function exists()
      * Return file name of backup file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileName()
     {
@@ -211,7 +195,6 @@ public function getFileName()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setType($value = 'db')
     {
@@ -230,7 +213,6 @@ public function setType($value = 'db')
      * Returns type of backup file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -243,7 +225,6 @@ public function getType()
      * @param string &$content
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setFile(&$content)
     {
@@ -262,7 +243,6 @@ public function setFile(&$content)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function &getFile()
     {
@@ -278,7 +258,6 @@ public function &getFile()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteFile()
     {
@@ -297,7 +276,6 @@ public function deleteFile()
      * @return $this
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Backup\Exception\NotEnoughPermissions
-     * @since 2.0.0
      */
     public function open($write = false)
     {
@@ -337,7 +315,6 @@ public function open($write = false)
      *
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function _getStream()
     {
@@ -352,7 +329,6 @@ protected function _getStream()
      *
      * @param int $length
      * @return string
-     * @since 2.0.0
      */
     public function read($length)
     {
@@ -363,7 +339,6 @@ public function read($length)
      * Check end of file.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function eof()
     {
@@ -376,7 +351,6 @@ public function eof()
      * @param string $string
      * @return $this
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function write($string)
     {
@@ -395,7 +369,6 @@ public function write($string)
      * Close open backup file
      *
      * @return $this
-     * @since 2.0.0
      */
     public function close()
     {
@@ -409,7 +382,6 @@ public function close()
      * Print output
      *
      * @return string
-     * @since 2.0.0
      */
     public function output()
     {
@@ -426,7 +398,6 @@ public function output()
 
     /**
      * @return int|mixed
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -447,7 +418,6 @@ public function getSize()
      *
      * @param string $password
      * @return bool
-     * @since 2.0.0
      */
     public function validateUserPassword($password)
     {
@@ -459,7 +429,6 @@ public function validateUserPassword($password)
      * Get file path.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFilePath()
     {
diff --git a/app/code/Magento/Backup/Model/BackupFactory.php b/app/code/Magento/Backup/Model/BackupFactory.php
index 832fea68b14c8..c64f7ff02952e 100644
--- a/app/code/Magento/Backup/Model/BackupFactory.php
+++ b/app/code/Magento/Backup/Model/BackupFactory.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class BackupFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param int $timestamp
      * @param string $type
      * @return \Magento\Backup\Model\Backup
-     * @since 2.0.0
      */
     public function create($timestamp, $type)
     {
diff --git a/app/code/Magento/Backup/Model/Config/Backend/Cron.php b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
index 422a0d8cae491..296a51c710eb4 100644
--- a/app/code/Magento/Backup/Model/Config/Backend/Cron.php
+++ b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
@@ -8,7 +8,6 @@
 /**
  * Backup by cron backend model
  * @api
- * @since 2.0.0
  */
 class Cron extends \Magento\Framework\App\Config\Value
 {
@@ -24,13 +23,11 @@ class Cron extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_runModelPath = '';
 
@@ -44,7 +41,6 @@ class Cron extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param string $runModelPath
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Backup/Model/Config/Source/Type.php b/app/code/Magento/Backup/Model/Config/Source/Type.php
index 96898735389c3..efa6199c43581 100644
--- a/app/code/Magento/Backup/Model/Config/Source/Type.php
+++ b/app/code/Magento/Backup/Model/Config/Source/Type.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
@@ -18,13 +17,11 @@ class Type implements \Magento\Framework\Option\ArrayInterface
      * Backup data
      *
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_backupData = null;
 
     /**
      * @param \Magento\Backup\Helper\Data $backupData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backup\Helper\Data $backupData)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Backup\Helper\Data $backupData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Backup/Model/Db.php b/app/code/Magento/Backup/Model/Db.php
index b0f5d323cc667..4d542d9f222a5 100644
--- a/app/code/Magento/Backup/Model/Db.php
+++ b/app/code/Magento/Backup/Model/Db.php
@@ -9,7 +9,6 @@
  * Database backup model
  *
  * @api
- * @since 2.0.0
  */
 class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
 {
@@ -23,7 +22,6 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
      * Backup resource model
      *
      * @var \Magento\Backup\Model\ResourceModel\Db
-     * @since 2.0.0
      */
     protected $_resourceDb = null;
 
@@ -31,14 +29,12 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
      * Core resource model
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource = null;
 
     /**
      * @param \Magento\Backup\Model\ResourceModel\Db $resourceDb
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backup\Model\ResourceModel\Db $resourceDb,
@@ -52,7 +48,6 @@ public function __construct(
      * List of tables which data should not be backed up
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ignoreDataTablesList = ['importexport/importdata'];
 
@@ -60,7 +55,6 @@ public function __construct(
      * Retrieve resource model
      *
      * @return \Magento\Backup\Model\ResourceModel\Db
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -69,7 +63,6 @@ public function getResource()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTables()
     {
@@ -80,7 +73,6 @@ public function getTables()
      * @param string $tableName
      * @param bool $addDropIfExists
      * @return string
-     * @since 2.0.0
      */
     public function getTableCreateScript($tableName, $addDropIfExists = false)
     {
@@ -90,7 +82,6 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
     /**
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataDump($tableName)
     {
@@ -99,7 +90,6 @@ public function getTableDataDump($tableName)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -108,7 +98,6 @@ public function getHeader()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFooter()
     {
@@ -117,7 +106,6 @@ public function getFooter()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderSql()
     {
@@ -139,7 +127,6 @@ public function renderSql()
      *
      * @param \Magento\Framework\Backup\Db\BackupInterface $backup
      * @return $this
-     * @since 2.0.0
      */
     public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backup)
     {
@@ -198,7 +185,6 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
      * Get database backup size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDBBackupSize()
     {
@@ -218,7 +204,6 @@ public function getDBBackupSize()
      * Returns the list of tables which data should not be backed up
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getIgnoreDataTablesList()
     {
diff --git a/app/code/Magento/Backup/Model/Fs/Collection.php b/app/code/Magento/Backup/Model/Fs/Collection.php
index 8f0039fd52ca1..0e5ba18c263e9 100644
--- a/app/code/Magento/Backup/Model/Fs/Collection.php
+++ b/app/code/Magento/Backup/Model/Fs/Collection.php
@@ -10,13 +10,11 @@
 /**
  * Backup data collection
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection\Filesystem
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_varDirectory;
 
@@ -24,7 +22,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * Folder, where all backups are stored
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_path = 'backups';
 
@@ -32,7 +29,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * Backup data
      *
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_backupData = null;
 
@@ -40,7 +36,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * Backup model
      *
      * @var \Magento\Backup\Model\Backup
-     * @since 2.0.0
      */
     protected $_backup = null;
 
@@ -49,7 +44,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * @param \Magento\Backup\Helper\Data $backupData
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Backup\Model\Backup $backup
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -92,7 +86,6 @@ public function __construct(
      * Create .htaccess file and deny backups directory access from web
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _hideBackupsForApache()
     {
@@ -107,7 +100,6 @@ protected function _hideBackupsForApache()
      *
      * @param string $filename
      * @return array
-     * @since 2.0.0
      */
     protected function _generateRow($filename)
     {
diff --git a/app/code/Magento/Backup/Model/Grid/Options.php b/app/code/Magento/Backup/Model/Grid/Options.php
index 05c272ef60eab..ba4cd66973a8a 100644
--- a/app/code/Magento/Backup/Model/Grid/Options.php
+++ b/app/code/Magento/Backup/Model/Grid/Options.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Options implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Backup\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @param \Magento\Backup\Helper\Data $backupHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backup\Helper\Data $backupHelper)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Backup\Helper\Data $backupHelper)
     /**
      * Return backup types array
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Db.php b/app/code/Magento/Backup/Model/ResourceModel/Db.php
index c4c46e3767c0c..6198603c92508 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Db.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Db.php
@@ -8,7 +8,6 @@
 /**
  * Database backup resource model
  * @api
- * @since 2.0.0
  */
 class Db
 {
@@ -16,7 +15,6 @@ class Db
      * Database connection adapter
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -25,7 +23,6 @@ class Db
      * [tbl_name] = array(create foreign key strings)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_foreignKeys = [];
 
@@ -33,7 +30,6 @@ class Db
      * Backup resource helper
      *
      * @var \Magento\Backup\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -42,7 +38,6 @@ class Db
      *
      * @param \Magento\Backup\Model\ResourceModel\HelperFactory $resHelperFactory
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backup\Model\ResourceModel\HelperFactory $resHelperFactory,
@@ -56,7 +51,6 @@ public function __construct(
      * Clear data
      *
      * @return void
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -67,7 +61,6 @@ public function clear()
      * Retrieve table list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTables()
     {
@@ -79,7 +72,6 @@ public function getTables()
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDropSql($tableName)
     {
@@ -92,7 +84,6 @@ public function getTableDropSql($tableName)
      * @param string $tableName
      * @param bool $withForeignKeys
      * @return string
-     * @since 2.0.0
      */
     public function getTableCreateSql($tableName, $withForeignKeys = false)
     {
@@ -104,7 +95,6 @@ public function getTableCreateSql($tableName, $withForeignKeys = false)
      *
      * @param string|null $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableForeignKeysSql($tableName = null)
     {
@@ -128,7 +118,6 @@ public function getTableForeignKeysSql($tableName = null)
      *
      * @param string $tableName
      * @return \Magento\Framework\DataObject|bool
-     * @since 2.0.0
      */
     public function getTableStatus($tableName)
     {
@@ -156,7 +145,6 @@ public function getTableStatus($tableName)
      * @param null|int $count
      * @param null|int $offset
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataSql($tableName, $count = null, $offset = null)
     {
@@ -169,7 +157,6 @@ public function getTableDataSql($tableName, $count = null, $offset = null)
      * @param string|array|\Zend_Db_Expr $tableName
      * @param bool $addDropIfExists
      * @return string
-     * @since 2.0.0
      */
     public function getTableCreateScript($tableName, $addDropIfExists = false)
     {
@@ -181,7 +168,6 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableHeader($tableName)
     {
@@ -196,7 +182,6 @@ public function getTableHeader($tableName)
      * @param bool $step
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getTableDataDump($tableName, $step = false)
     {
@@ -207,7 +192,6 @@ public function getTableDataDump($tableName, $step = false)
      * Returns SQL header data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -218,7 +202,6 @@ public function getHeader()
      * Returns SQL footer data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFooter()
     {
@@ -230,7 +213,6 @@ public function getFooter()
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataBeforeSql($tableName)
     {
@@ -242,7 +224,6 @@ public function getTableDataBeforeSql($tableName)
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataAfterSql($tableName)
     {
@@ -253,7 +234,6 @@ public function getTableDataAfterSql($tableName)
      * Start transaction mode
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beginTransaction()
     {
@@ -266,7 +246,6 @@ public function beginTransaction()
      * Commit transaction
      *
      * @return $this
-     * @since 2.0.0
      */
     public function commitTransaction()
     {
@@ -279,7 +258,6 @@ public function commitTransaction()
      * Rollback transaction
      *
      * @return $this
-     * @since 2.0.0
      */
     public function rollBackTransaction()
     {
@@ -293,7 +271,6 @@ public function rollBackTransaction()
      *
      * @param string $command
      * @return $this
-     * @since 2.0.0
      */
     public function runCommand($command)
     {
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Helper.php b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
index 71f9778e010d9..4078250c5afdd 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper
 {
@@ -17,7 +16,6 @@ class Helper extends \Magento\Framework\DB\Helper
      * [tbl_name] = array(create foreign key strings)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_foreignKeys = [];
 
@@ -25,7 +23,6 @@ class Helper extends \Magento\Framework\DB\Helper
      * Core Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
@@ -33,7 +30,6 @@ class Helper extends \Magento\Framework\DB\Helper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDropSql($tableName)
     {
@@ -62,7 +57,6 @@ public function getTableDropSql($tableName)
      *
      * @param string|null $tableName
      * @return string|bool
-     * @since 2.0.0
      */
     public function getTableForeignKeysSql($tableName = null)
     {
@@ -87,7 +81,6 @@ public function getTableForeignKeysSql($tableName = null)
      * @param string $tableName
      * @param array $foreignKeys
      * @return string
-     * @since 2.0.0
      */
     protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys)
     {
@@ -108,7 +101,6 @@ protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys)
      * @param string $tableName
      * @param boolean $addDropIfExists
      * @return string
-     * @since 2.0.0
      */
     public function getTableCreateScript($tableName, $addDropIfExists = false)
     {
@@ -133,7 +125,6 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
      * @param bool $withForeignKeys
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getTableCreateSql($tableName, $withForeignKeys = false)
     {
@@ -180,7 +171,6 @@ public function getTableCreateSql($tableName, $withForeignKeys = false)
      * Returns SQL header data, move from original resource model
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -212,7 +202,6 @@ public function getHeader()
      * Returns SQL footer data, move from original resource model
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFooter()
     {
@@ -235,7 +224,6 @@ public function getFooter()
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataBeforeSql($tableName)
     {
@@ -252,7 +240,6 @@ public function getTableDataBeforeSql($tableName)
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableDataAfterSql($tableName)
     {
@@ -267,7 +254,6 @@ public function getTableDataAfterSql($tableName)
      * @param int $count
      * @param int $offset
      * @return string
-     * @since 2.0.0
      */
     public function getPartInsertSql($tableName, $count = null, $offset = null)
     {
@@ -298,7 +284,6 @@ public function getPartInsertSql($tableName, $count = null, $offset = null)
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getInsertSql($tableName)
     {
@@ -311,7 +296,6 @@ public function getInsertSql($tableName)
      * @param string $tableName
      * @param array $row
      * @return string
-     * @since 2.0.0
      */
     protected function _quoteRow($tableName, array $row)
     {
@@ -337,7 +321,6 @@ protected function _quoteRow($tableName, array $row)
      * Prepare transaction isolation level for backup process
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepareTransactionIsolationLevel()
     {
@@ -348,7 +331,6 @@ public function prepareTransactionIsolationLevel()
      * Restore transaction isolation level after backup
      *
      * @return void
-     * @since 2.0.0
      */
     public function restoreTransactionIsolationLevel()
     {
diff --git a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
index 8e3b605daf84a..9ba801ff47a8d 100644
--- a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
+++ b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Countries
- * @since 2.0.0
  */
 class Countries extends Select
 {
@@ -27,7 +26,6 @@ class Countries extends Select
      * @param Context $context
      * @param Country $countryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Country $countryHelper, array $data = [])
     {
@@ -39,7 +37,6 @@ public function __construct(Context $context, Country $countryHelper, array $dat
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -54,7 +51,6 @@ protected function _toHtml()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setInputName($value)
     {
diff --git a/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
index e17a9385e9ea6..824af5a2930ef 100644
--- a/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
+++ b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
@@ -15,13 +15,13 @@
  * Class VaultTokenRenderer
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class VaultTokenRenderer extends AbstractTokenRenderer
 {
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
@@ -31,7 +31,7 @@ class VaultTokenRenderer extends AbstractTokenRenderer
      * @param Template\Context $context
      * @param Config $config
      * @param array $data
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Template\Context $context,
@@ -44,7 +44,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconUrl()
     {
@@ -53,7 +53,7 @@ public function getIconUrl()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconHeight()
     {
@@ -62,7 +62,7 @@ public function getIconHeight()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconWidth()
     {
@@ -74,7 +74,7 @@ public function getIconWidth()
      *
      * @param PaymentTokenInterface $token
      * @return boolean
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function canRender(PaymentTokenInterface $token)
     {
@@ -84,7 +84,7 @@ public function canRender(PaymentTokenInterface $token)
     /**
      * Get email of PayPal payer
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getPayerEmail()
     {
diff --git a/app/code/Magento/Braintree/Block/Form.php b/app/code/Magento/Braintree/Block/Form.php
index 57b79ca57c17c..4c28665301fcc 100644
--- a/app/code/Magento/Braintree/Block/Form.php
+++ b/app/code/Magento/Braintree/Block/Form.php
@@ -18,14 +18,12 @@
 
 /**
  * Class Form
- * @since 2.0.0
  */
 class Form extends Cc
 {
 
     /**
      * @var Quote
-     * @since 2.0.0
      */
     protected $sessionQuote;
 
@@ -54,7 +52,6 @@ class Form extends Cc
      * @param GatewayConfig $gatewayConfig
      * @param CcType $ccType
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -73,7 +70,6 @@ public function __construct(
     /**
      * Get list of available card types of order billing address country
      * @return array
-     * @since 2.0.0
      */
     public function getCcAvailableTypes()
     {
@@ -85,7 +81,6 @@ public function getCcAvailableTypes()
     /**
      * Check if cvv validation is available
      * @return boolean
-     * @since 2.0.0
      */
     public function useCvv()
     {
diff --git a/app/code/Magento/Braintree/Block/Info.php b/app/code/Magento/Braintree/Block/Info.php
index d4ad3879013e5..fd8d5a8f7654c 100644
--- a/app/code/Magento/Braintree/Block/Info.php
+++ b/app/code/Magento/Braintree/Block/Info.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Info
- * @since 2.0.0
  */
 class Info extends ConfigurableInfo
 {
diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
index 6bee98905b07f..d91971f4f55d7 100644
--- a/app/code/Magento/Braintree/Gateway/Config/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/Config.php
@@ -63,7 +63,7 @@ public function __construct(
     /**
      * Get list of available dynamic descriptors keys
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $dynamicDescriptorKeys = [
         'name', 'phone', 'url'
@@ -229,7 +229,7 @@ public function isActive()
     /**
      * Get list of configured dynamic descriptors
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getDynamicDescriptors()
     {
@@ -247,7 +247,7 @@ public function getDynamicDescriptors()
      * Get Merchant account ID
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getMerchantAccountId()
     {
diff --git a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
index 418cfbd4d2f3e..c7ae58fac4a4d 100644
--- a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
@@ -28,13 +28,13 @@ class Config extends \Magento\Payment\Gateway\Config\Config
 
     /**
      * @var CcConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $ccConfig;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $icon = [];
 
@@ -45,7 +45,7 @@ class Config extends \Magento\Payment\Gateway\Config\Config
      * @param CcConfig $ccConfig
      * @param null $methodCode
      * @param string $pathPattern
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -124,7 +124,7 @@ public function getTitle()
     /**
      * Is need to skip order review
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isSkipOrderReview()
     {
@@ -134,7 +134,7 @@ public function isSkipOrderReview()
     /**
      * Get PayPal icon
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getPayPalIcon()
     {
diff --git a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
index 32bf517c3c16c..fbb040495b481 100644
--- a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
@@ -10,26 +10,26 @@
 
 /**
  * Class DescriptorDataBuilder
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DescriptorDataBuilder implements BuilderInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $descriptorKey = 'descriptor';
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * DescriptorDataBuilder constructor.
      * @param Config $config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(Config $config)
     {
@@ -39,7 +39,7 @@ public function __construct(Config $config)
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function build(array $buildSubject)
     {
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
index 68d312d7d6b58..d7c6365cf8ff1 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
@@ -11,26 +11,26 @@
 
 /**
  * Class DeviceDataBuilder
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DeviceDataBuilder implements BuilderInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $deviceDataKey = 'deviceData';
 
     /**
      * @var SubjectReader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $subjectReader;
 
     /**
      * DeviceDataBuilder constructor.
      * @param SubjectReader $subjectReader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(SubjectReader $subjectReader)
     {
@@ -39,7 +39,7 @@ public function __construct(SubjectReader $subjectReader)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function build(array $buildSubject)
     {
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
index b99bc15ca20d3..0c10d912fb05f 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
@@ -11,33 +11,33 @@
 
 /**
  * Vault Data Builder
- * @since 2.2.0
+ * @since 2.1.3
  */
 class VaultDataBuilder implements BuilderInterface
 {
     /**
      * Additional options in request to gateway
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $optionsKey = 'options';
 
     /**
      * The option that determines whether the payment method associated with
      * the successful transaction should be stored in the Vault.
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $storeInVaultOnSuccess = 'storeInVaultOnSuccess';
 
     /**
      * @var SubjectReader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $subjectReader;
 
     /**
      * VaultDataBuilder constructor.
      * @param SubjectReader $subjectReader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(SubjectReader $subjectReader)
     {
@@ -46,7 +46,7 @@ public function __construct(SubjectReader $subjectReader)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function build(array $buildSubject)
     {
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
index 7b70272a64834..0c196629fff0f 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
@@ -17,31 +17,31 @@
 
 /**
  * Vault Details Handler
- * @since 2.2.0
+ * @since 2.1.3
  */
 class VaultDetailsHandler implements HandlerInterface
 {
     /**
      * @var PaymentTokenInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentTokenFactory;
 
     /**
      * @var OrderPaymentExtensionInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentExtensionFactory;
 
     /**
      * @var SubjectReader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $subjectReader;
 
     /**
      * @var DateTimeFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $dateTimeFactory;
 
@@ -52,7 +52,7 @@ class VaultDetailsHandler implements HandlerInterface
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
      * @param SubjectReader $subjectReader
      * @param DateTimeFactory $dateTimeFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         PaymentTokenInterfaceFactory $paymentTokenFactory,
@@ -68,7 +68,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function handle(array $handlingSubject, array $response)
     {
@@ -89,7 +89,7 @@ public function handle(array $handlingSubject, array $response)
      *
      * @param \Braintree\Transaction $transaction
      * @return PaymentTokenInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getVaultPaymentToken(Transaction $transaction)
     {
@@ -113,7 +113,7 @@ private function getVaultPaymentToken(Transaction $transaction)
 
     /**
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getExpirationDate()
     {
@@ -126,7 +126,7 @@ private function getExpirationDate()
      * Get payment extension attributes
      * @param InfoInterface $payment
      * @return OrderPaymentExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getExtensionAttributes(InfoInterface $payment)
     {
diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
index 45fee08e9451c..bd0c85d33c2d0 100644
--- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
@@ -27,7 +27,7 @@ class RiskDataHandler implements HandlerInterface
 
     /**
      * Risk data Review status
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $statusReview = 'Review';
 
diff --git a/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
index 2cc50ff3afa48..2d20e43399989 100644
--- a/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
@@ -16,26 +16,26 @@
 
 /**
  * Gets Ui component configuration for Braintree PayPal Vault
- * @since 2.2.0
+ * @since 2.1.3
  */
 class TokenUiComponentProvider implements TokenUiComponentProviderInterface
 {
 
     /**
      * @var TokenUiComponentInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $componentFactory;
 
     /**
      * @var UrlInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $urlBuilder;
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
@@ -43,7 +43,7 @@ class TokenUiComponentProvider implements TokenUiComponentProviderInterface
      * @param TokenUiComponentInterfaceFactory $componentFactory
      * @param UrlInterface $urlBuilder
      * @param Config $config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         TokenUiComponentInterfaceFactory $componentFactory,
@@ -57,7 +57,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getComponentForToken(PaymentTokenInterface $paymentToken)
     {
@@ -82,7 +82,7 @@ public function getComponentForToken(PaymentTokenInterface $paymentToken)
     /**
      * Get url to retrieve payment method nonce
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getNonceRetrieveUrl()
     {
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index 3d3ddabe68227..26af1aa71669d 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -11,7 +11,7 @@
 
 /**
  * Class ConfigProvider
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ConfigProvider implements ConfigProviderInterface
 {
@@ -21,13 +21,13 @@ class ConfigProvider implements ConfigProviderInterface
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * @var ResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resolver;
 
@@ -36,7 +36,7 @@ class ConfigProvider implements ConfigProviderInterface
      *
      * @param Config $config
      * @param ResolverInterface $resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(Config $config, ResolverInterface $resolver)
     {
@@ -48,7 +48,7 @@ public function __construct(Config $config, ResolverInterface $resolver)
      * Retrieve assoc array of checkout configuration
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php
index 76946b104a993..e46c6410532e1 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php
@@ -14,26 +14,26 @@
 
 /**
  * Class TokenUiComponentProvider
- * @since 2.2.0
+ * @since 2.1.3
  */
 class TokenUiComponentProvider implements TokenUiComponentProviderInterface
 {
     /**
      * @var TokenUiComponentInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $componentFactory;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $urlBuilder;
 
     /**
      * @param TokenUiComponentInterfaceFactory $componentFactory
      * @param UrlInterface $urlBuilder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         TokenUiComponentInterfaceFactory $componentFactory,
@@ -47,7 +47,7 @@ public function __construct(
      * Get UI component for token
      * @param PaymentTokenInterface $paymentToken
      * @return TokenUiComponentInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getComponentForToken(PaymentTokenInterface $paymentToken)
     {
@@ -70,7 +70,7 @@ public function getComponentForToken(PaymentTokenInterface $paymentToken)
     /**
      * Get url to retrieve payment method nonce
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getNonceRetrieveUrl()
     {
diff --git a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
index a50fb84156191..132f4b92a3e2d 100644
--- a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
+++ b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
@@ -11,7 +11,6 @@
 
 /**
  * Class AddPaypalShortcuts
- * @since 2.0.0
  */
 class AddPaypalShortcuts implements ObserverInterface
 {
@@ -25,7 +24,6 @@ class AddPaypalShortcuts implements ObserverInterface
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php b/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php
index e73489b3175a9..cb775b783c52e 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php
@@ -7,7 +7,7 @@
 
 /**
  * Class DateRange
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DateRange extends \Magento\Ui\Component\Filters\Type\Date
 {
@@ -15,7 +15,7 @@ class DateRange extends \Magento\Ui\Component\Filters\Type\Date
      * Braintree date format
      *
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected static $dateFormat = 'Y-m-d\TH:i:00O';
 }
diff --git a/app/code/Magento/Bundle/Api/Data/BundleOptionInterface.php b/app/code/Magento/Bundle/Api/Data/BundleOptionInterface.php
index 0e23f4af3d07d..f8051bb7895e4 100644
--- a/app/code/Magento/Bundle/Api/Data/BundleOptionInterface.php
+++ b/app/code/Magento/Bundle/Api/Data/BundleOptionInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface BundleOptionInterface
  * @api
- * @since 2.0.0
  */
 interface BundleOptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface BundleOptionInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get bundle option id.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -26,7 +24,6 @@ public function getOptionId();
      *
      * @param int $optionId
      * @return int
-     * @since 2.0.0
      */
     public function setOptionId($optionId);
 
@@ -34,7 +31,6 @@ public function setOptionId($optionId);
      * Get bundle option quantity.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOptionQty();
 
@@ -43,7 +39,6 @@ public function getOptionQty();
      *
      * @param int $optionQty
      * @return int
-     * @since 2.0.0
      */
     public function setOptionQty($optionQty);
 
@@ -51,7 +46,6 @@ public function setOptionQty($optionQty);
      * Get bundle option selection ids.
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getOptionSelections();
 
@@ -60,7 +54,6 @@ public function getOptionSelections();
      *
      * @param int[] $optionSelections
      * @return int[]
-     * @since 2.0.0
      */
     public function setOptionSelections(array $optionSelections);
 
@@ -68,7 +61,6 @@ public function setOptionSelections(array $optionSelections);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Bundle\Api\Data\BundleOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -77,7 +69,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Bundle\Api\Data\BundleOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Bundle\Api\Data\BundleOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Bundle/Api/Data/LinkInterface.php b/app/code/Magento/Bundle/Api/Data/LinkInterface.php
index a105940473fa7..b68317cb3b420 100644
--- a/app/code/Magento/Bundle/Api/Data/LinkInterface.php
+++ b/app/code/Magento/Bundle/Api/Data/LinkInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface LinkInterface
  * @api
- * @since 2.0.0
  */
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -21,7 +20,6 @@ interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Get the identifier
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -30,7 +28,6 @@ public function getId();
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -38,7 +35,6 @@ public function setId($id);
      * Get linked product sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -47,7 +43,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -55,7 +50,6 @@ public function setSku($sku);
      * Get option id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -64,7 +58,6 @@ public function getOptionId();
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId);
 
@@ -72,7 +65,6 @@ public function setOptionId($optionId);
      * Get qty
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -81,7 +73,6 @@ public function getQty();
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -89,7 +80,6 @@ public function setQty($qty);
      * Get position
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -98,7 +88,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -107,7 +96,6 @@ public function setPosition($position);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsDefault();
 
@@ -116,7 +104,6 @@ public function getIsDefault();
      *
      * @param bool $isDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefault($isDefault);
 
@@ -124,7 +111,6 @@ public function setIsDefault($isDefault);
      * Get price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -133,7 +119,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -141,7 +126,6 @@ public function setPrice($price);
      * Get price type
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPriceType();
 
@@ -150,7 +134,6 @@ public function getPriceType();
      *
      * @param int $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType);
 
@@ -158,7 +141,6 @@ public function setPriceType($priceType);
      * Get whether quantity could be changed
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCanChangeQuantity();
 
@@ -167,7 +149,6 @@ public function getCanChangeQuantity();
      *
      * @param int $canChangeQuantity
      * @return $this
-     * @since 2.0.0
      */
     public function setCanChangeQuantity($canChangeQuantity);
 
@@ -175,7 +156,6 @@ public function setCanChangeQuantity($canChangeQuantity);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Bundle\Api\Data\LinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -184,7 +164,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Bundle/Api/Data/OptionInterface.php b/app/code/Magento/Bundle/Api/Data/OptionInterface.php
index 97fff434356d1..65c7111abf997 100644
--- a/app/code/Magento/Bundle/Api/Data/OptionInterface.php
+++ b/app/code/Magento/Bundle/Api/Data/OptionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface OptionInterface
  * @api
- * @since 2.0.0
  */
 interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Get option id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -27,7 +25,6 @@ public function getOptionId();
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId);
 
@@ -35,7 +32,6 @@ public function setOptionId($optionId);
      * Get option title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -44,7 +40,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -52,7 +47,6 @@ public function setTitle($title);
      * Get is required option
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getRequired();
 
@@ -61,7 +55,6 @@ public function getRequired();
      *
      * @param bool $required
      * @return $this
-     * @since 2.0.0
      */
     public function setRequired($required);
 
@@ -69,7 +62,6 @@ public function setRequired($required);
      * Get input type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getType();
 
@@ -78,7 +70,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -86,7 +77,6 @@ public function setType($type);
      * Get option position
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -95,7 +85,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -103,7 +92,6 @@ public function setPosition($position);
      * Get product sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -112,7 +100,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -120,7 +107,6 @@ public function setSku($sku);
      * Get product links
      *
      * @return \Magento\Bundle\Api\Data\LinkInterface[]|null
-     * @since 2.0.0
      */
     public function getProductLinks();
 
@@ -129,7 +115,6 @@ public function getProductLinks();
      *
      * @param \Magento\Bundle\Api\Data\LinkInterface[] $productLinks
      * @return $this
-     * @since 2.0.0
      */
     public function setProductLinks(array $productLinks = null);
 
@@ -137,7 +122,6 @@ public function setProductLinks(array $productLinks = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Bundle\Api\Data\OptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -146,7 +130,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php b/app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php
index 0ee61acdb192a..0325f3f653193 100644
--- a/app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php
+++ b/app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface OptionTypeInterface
  * @api
- * @since 2.0.0
  */
 interface OptionTypeInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface OptionTypeInterface extends \Magento\Framework\Api\ExtensibleDataInter
      * Get type label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -26,7 +24,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -34,7 +31,6 @@ public function setLabel($label);
      * Get type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -43,7 +39,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -51,7 +46,6 @@ public function setCode($code);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Bundle\Api\Data\OptionTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -60,7 +54,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php b/app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php
index d88e6f5f1f2eb..686da4d78c9d7 100644
--- a/app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php
+++ b/app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for Management of ProductLink
  * @api
- * @since 2.0.0
  */
 interface ProductLinkManagementInterface
 {
@@ -21,7 +20,6 @@ interface ProductLinkManagementInterface
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getChildren($productSku, $optionId = null);
 
@@ -35,7 +33,6 @@ public function getChildren($productSku, $optionId = null);
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
      * @return int
-     * @since 2.0.0
      */
     public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct);
 
@@ -46,7 +43,6 @@ public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\L
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function saveChild(
         $sku,
@@ -61,7 +57,6 @@ public function saveChild(
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
      * @return int
-     * @since 2.0.0
      */
     public function addChild(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -78,7 +73,6 @@ public function addChild(
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function removeChild($sku, $optionId, $childSku);
 }
diff --git a/app/code/Magento/Bundle/Api/ProductOptionManagementInterface.php b/app/code/Magento/Bundle/Api/ProductOptionManagementInterface.php
index 25b83b362a3da..94c54c3dabf2a 100644
--- a/app/code/Magento/Bundle/Api/ProductOptionManagementInterface.php
+++ b/app/code/Magento/Bundle/Api/ProductOptionManagementInterface.php
@@ -10,7 +10,6 @@
  * Option manager for bundle products
  *
  * @api
- * @since 2.0.0
  */
 interface ProductOptionManagementInterface
 {
@@ -21,7 +20,6 @@ interface ProductOptionManagementInterface
      * @return int
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function save(\Magento\Bundle\Api\Data\OptionInterface $option);
 }
diff --git a/app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php b/app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php
index 2ef3f0073a8e4..af470c93c0f36 100644
--- a/app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php
+++ b/app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface ProductOptionRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface ProductOptionRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface ProductOptionRepositoryInterface
      * @return \Magento\Bundle\Api\Data\OptionInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function get($sku, $optionId);
 
@@ -32,7 +30,6 @@ public function get($sku, $optionId);
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getList($sku);
 
@@ -43,7 +40,6 @@ public function getList($sku);
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function delete(\Magento\Bundle\Api\Data\OptionInterface $option);
 
@@ -55,7 +51,6 @@ public function delete(\Magento\Bundle\Api\Data\OptionInterface $option);
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function deleteById($sku, $optionId);
 
@@ -67,7 +62,6 @@ public function deleteById($sku, $optionId);
      * @return int
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
diff --git a/app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php b/app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php
index ef7827bb7b850..af1293fb5c9fb 100644
--- a/app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php
+++ b/app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface ProductOptionTypeListInterface
  * @api
- * @since 2.0.0
  */
 interface ProductOptionTypeListInterface
 {
@@ -17,7 +16,6 @@ interface ProductOptionTypeListInterface
      * Get all types for options for bundle products
      *
      * @return \Magento\Bundle\Api\Data\OptionTypeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php
index 6c20cf1d9466d..9e3ddd49db009 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php
@@ -9,7 +9,6 @@
  * Adminhtml block for fieldset of bundle product
  *
  * @api
- * @since 2.0.0
  */
 class Bundle extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
 {
@@ -17,7 +16,6 @@ class Bundle extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
      * Returns string with json config for bundle product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index 67917af874b7f..38305edce241a 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml';
 
@@ -24,7 +22,6 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
      * @param  string $elementId
      * @param  string $containerId
      * @return string
-     * @since 2.0.0
      */
     public function setValidationContainer($elementId, $containerId)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index 01585c3f9f8ac..1391e18d9d4fd 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/composite/fieldset/options/type/multi.phtml';
 
@@ -24,7 +22,6 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      * @param  string $elementId
      * @param  string $containerId
      * @return string
-     * @since 2.0.0
      */
     public function setValidationContainer($elementId, $containerId)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
index 3ef27bfac6da1..7ae5611ef59ba 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/composite/fieldset/options/type/radio.phtml';
 
@@ -24,7 +22,6 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      * @param  string $elementId
      * @param  string $containerId
      * @return string
-     * @since 2.0.0
      */
     public function setValidationContainer($elementId, $containerId)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
index 36be21e054150..9f618cb0c56ab 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/composite/fieldset/options/type/select.phtml';
 
@@ -24,7 +22,6 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
      * @param  string $elementId
      * @param  string $containerId
      * @return string
-     * @since 2.0.0
      */
     public function setValidationContainer($elementId, $containerId)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index c421d061e54f0..5911bf5c393b5 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -11,7 +11,6 @@
 /**
  * Bundle product attributes tab
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
 {
@@ -21,7 +20,6 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attri
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -134,7 +132,6 @@ function changeTaxClassId() {
      * Get current product from registry
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 8b93ca46a3f6a..9091cb07c8ac5 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend
  *
- * @since 2.0.0
  */
 class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
      * Initialize block template
-     * @since 2.0.0
      */
     private $template = 'Magento_Bundle::catalog/product/edit/tab/attributes/extend.phtml';
 
@@ -32,13 +30,11 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     private $formFactory;
 
@@ -47,7 +43,6 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +71,6 @@ protected function _construct()
      * Get Element Html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -89,7 +82,6 @@ public function getElementHtml()
      * Execute method getElementHtml from parrent class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentElementHtml()
     {
@@ -98,7 +90,6 @@ public function getParentElementHtml()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -120,7 +111,6 @@ public function getOptions()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabledField()
     {
@@ -133,7 +123,6 @@ public function isDisabledField()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -147,7 +136,6 @@ public function getProduct()
      * @param string $switchAttributeCode
      * @return \Magento\Framework\Data\Form\Element\Select
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getExtendedElement($switchAttributeCode)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
index aebc56e6e3bb8..b3e52e5560cc2 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
@@ -9,13 +9,11 @@
  * Bundle Special Price Attribute Block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Special extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index b0fd88917c263..f124740a766ab 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -9,19 +9,16 @@
  * Adminhtml catalog product bundle items tab block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_product = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/bundle.phtml';
 
@@ -29,7 +26,6 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,7 +33,6 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -50,7 +45,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -59,7 +53,6 @@ public function getTabUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -70,7 +63,6 @@ public function getTabClass()
      * Prepare layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -101,7 +93,6 @@ protected function _prepareLayout()
      * Check block readonly
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -110,7 +101,6 @@ public function isReadonly()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -119,7 +109,6 @@ public function getAddButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOptionsBoxHtml()
     {
@@ -128,7 +117,6 @@ public function getOptionsBoxHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldSuffix()
     {
@@ -137,7 +125,6 @@ public function getFieldSuffix()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -146,7 +133,6 @@ public function getProduct()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -155,7 +141,6 @@ public function getTabLabel()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -164,7 +149,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -173,7 +157,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -184,7 +167,6 @@ public function isHidden()
      * Get parent tab code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTab()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 9f87bd0057bfc..809763c732958 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option
  *
- * @since 2.0.0
  */
 class Option extends \Magento\Backend\Block\Widget
 {
@@ -18,7 +17,6 @@ class Option extends \Magento\Backend\Block\Widget
      * Form element
      *
      * @var AbstractElement|null
-     * @since 2.0.0
      */
     protected $_element = null;
 
@@ -26,13 +24,11 @@ class Option extends \Magento\Backend\Block\Widget
      * List of bundle product options
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_options = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/bundle/option.phtml';
 
@@ -40,19 +36,16 @@ class Option extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Bundle\Model\Source\Option\Type
-     * @since 2.0.0
      */
     protected $_optionTypes;
 
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $_yesno;
 
@@ -62,7 +55,6 @@ class Option extends \Magento\Backend\Block\Widget
      * @param \Magento\Bundle\Model\Source\Option\Type $optionTypes
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +75,6 @@ public function __construct(
      * Sets block template and necessary data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -93,7 +84,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId()
     {
@@ -102,7 +92,6 @@ public function getFieldId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName()
     {
@@ -113,7 +102,6 @@ public function getFieldName()
      * Retrieve Product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -126,7 +114,6 @@ public function getProduct()
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -137,7 +124,6 @@ public function render(AbstractElement $element)
     /**
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     public function setElement(AbstractElement $element)
     {
@@ -147,7 +133,6 @@ public function setElement(AbstractElement $element)
 
     /**
      * @return AbstractElement|null
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -156,7 +141,6 @@ public function getElement()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isMultiWebsites()
     {
@@ -165,7 +149,6 @@ public function isMultiWebsites()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -206,7 +189,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -215,7 +197,6 @@ public function getAddButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCloseSearchButtonHtml()
     {
@@ -224,7 +205,6 @@ public function getCloseSearchButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddSelectionButtonHtml()
     {
@@ -235,7 +215,6 @@ public function getAddSelectionButtonHtml()
      * Retrieve list of bundle product options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -265,7 +244,6 @@ public function getOptions()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getAddButtonId()
     {
@@ -275,7 +253,6 @@ public function getAddButtonId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOptionDeleteButtonHtml()
     {
@@ -284,7 +261,6 @@ public function getOptionDeleteButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSelectionHtml()
     {
@@ -293,7 +269,6 @@ public function getSelectionHtml()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTypeSelectHtml()
     {
@@ -316,7 +291,6 @@ public function getTypeSelectHtml()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRequireSelectHtml()
     {
@@ -335,7 +309,6 @@ public function getRequireSelectHtml()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isDefaultStore()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index 380529d9abb4a..5b73c22b5781a 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -9,19 +9,16 @@
  * Bundle selection product block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Search extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/bundle/option/search.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +29,6 @@ protected function _construct()
      * Create search grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -50,7 +46,6 @@ protected function _prepareLayout()
      * Prepare search grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
index 1bb1432446542..7fbcf70d781d1 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -9,7 +9,6 @@
  * Bundle selection product grid
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -17,13 +16,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Bundle data
      *
      * @var \Magento\Bundle\Helper\Data
-     * @since 2.0.0
      */
     protected $_bundleData = null;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -33,7 +30,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Bundle\Helper\Data $bundleData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +61,6 @@ protected function _construct()
      * Prepare grid filter buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFilterButtons()
     {
@@ -88,7 +82,6 @@ protected function _prepareFilterButtons()
      * Initialize grid before rendering
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -100,7 +93,6 @@ protected function _beforeToHtml()
      * Apply sorting and filtering to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -138,7 +130,6 @@ protected function _prepareCollection()
      * Initialize grid columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -189,7 +180,6 @@ protected function _prepareColumns()
      * Retrieve grid reload url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -201,7 +191,6 @@ public function getGridUrl()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
@@ -214,7 +203,6 @@ protected function _getSelectedProducts()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getProducts()
     {
@@ -233,7 +221,6 @@ protected function _getProducts()
      * Retrieve array of allowed product types for bundle selection product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedSelectionTypes()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index c9a57f7130bd0..353808dc66a72 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -9,13 +9,11 @@
  * Bundle selection renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Selection extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/bundle/option/selection.phtml';
 
@@ -23,7 +21,6 @@ class Selection extends \Magento\Backend\Block\Widget
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -31,19 +28,16 @@ class Selection extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Bundle\Model\Source\Option\Selection\Price\Type
-     * @since 2.0.0
      */
     protected $_priceType;
 
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $_yesno;
 
@@ -54,7 +48,6 @@ class Selection extends \Magento\Backend\Block\Widget
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -75,7 +68,6 @@ public function __construct(
      * Initialize bundle option selection block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -87,7 +79,6 @@ protected function _construct()
      * Return field id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId()
     {
@@ -98,7 +89,6 @@ public function getFieldId()
      * Return field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName()
     {
@@ -109,7 +99,6 @@ public function getFieldName()
      * Prepare block layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -125,7 +114,6 @@ protected function _prepareLayout()
      * Retrieve delete button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectionDeleteButtonHtml()
     {
@@ -136,7 +124,6 @@ public function getSelectionDeleteButtonHtml()
      * Retrieve price type select html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPriceTypeSelectHtml()
     {
@@ -162,7 +149,6 @@ public function getPriceTypeSelectHtml()
      * Retrieve qty type select html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getQtyTypeSelectHtml()
     {
@@ -183,7 +169,6 @@ public function getQtyTypeSelectHtml()
      * Return search url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectionSearchUrl()
     {
@@ -194,7 +179,6 @@ public function getSelectionSearchUrl()
      * Check if used website scope price
      *
      * @return string
-     * @since 2.0.0
      */
     public function isUsedWebsitePrice()
     {
@@ -206,7 +190,6 @@ public function isUsedWebsitePrice()
      * Retrieve price scope checkbox html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckboxScopeHtml()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
index a9c08862416a5..d8e0bcafa8ca9 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
@@ -9,19 +9,16 @@
  * Adminhtml product edit tabs
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tabs extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_attributeTabBlock = \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes::class;
 
     /**
      * @return $this|void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php b/app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php
index 805ada11c7845..971889c455421 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Bundle\Block\Adminhtml\Order\Create\Sidebar
  *
- * @since 2.0.0
  */
 class Sidebar
 {
@@ -21,7 +20,6 @@ class Sidebar
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetItemQty(
         \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
@@ -43,7 +41,6 @@ public function aroundGetItemQty(
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsConfigurationRequired(
         \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index f25bec3ef5c53..d7eb91013d94a 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -12,7 +12,6 @@
  * Adminhtml sales order item renderer
  *
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer
 {
@@ -56,7 +55,6 @@ public function __construct(
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
-     * @since 2.0.0
      */
     public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
     {
@@ -71,7 +69,6 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      *
      * @param \Magento\Framework\DataObject $item
      * @return array|null
-     * @since 2.0.0
      */
     public function getChildren($item)
     {
@@ -108,7 +105,6 @@ public function getChildren($item)
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isShipmentSeparately($item = null)
     {
@@ -145,7 +141,6 @@ public function isShipmentSeparately($item = null)
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isChildCalculated($item = null)
     {
@@ -183,7 +178,6 @@ public function isChildCalculated($item = null)
     /**
      * @param mixed $item
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getSelectionAttributes($item)
     {
@@ -200,7 +194,6 @@ public function getSelectionAttributes($item)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions()
     {
@@ -222,7 +215,6 @@ public function getOrderOptions()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -236,7 +228,6 @@ public function getOrderItem()
     /**
      * @param mixed $item
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($item)
     {
@@ -259,7 +250,6 @@ public function getValueHtml($item)
     /**
      * @param object $item
      * @return bool
-     * @since 2.0.0
      */
     public function canShowPriceInfo($item)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index 6a10c0d4f9e96..fca670f63becc 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -12,7 +12,6 @@
  * Adminhtml sales order item renderer
  *
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer
 {
@@ -68,7 +67,6 @@ public function __construct(
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
-     * @since 2.0.0
      */
     public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
     {
@@ -82,7 +80,6 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      * @param null|object $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isShipmentSeparately($item = null)
     {
@@ -116,7 +113,6 @@ public function isShipmentSeparately($item = null)
      * @param null|object $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isChildCalculated($item = null)
     {
@@ -151,7 +147,6 @@ public function isChildCalculated($item = null)
     /**
      * @param mixed $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getSelectionAttributes($item)
     {
@@ -168,7 +163,6 @@ public function getSelectionAttributes($item)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions()
     {
@@ -191,7 +185,6 @@ public function getOrderOptions()
     /**
      * @param object $item
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($item)
     {
@@ -214,7 +207,6 @@ public function getValueHtml($item)
     /**
      * @param object $item
      * @return bool
-     * @since 2.0.0
      */
     public function canShowPriceInfo($item)
     {
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/Price.php b/app/code/Magento/Bundle/Block/Catalog/Product/Price.php
index 7e0f816242cb6..6096575eca56b 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/Price.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/Price.php
@@ -8,13 +8,11 @@
 /**
  * Bundle product price block
  * @api
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Block\Product\Price
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
@@ -28,7 +26,6 @@ class Price extends \Magento\Catalog\Block\Product\Price
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param \Magento\Tax\Helper\Data $taxData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * With corrections for Dynamic prices
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBothPrices()
     {
@@ -75,7 +71,6 @@ public function displayBothPrices()
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId
      * @return bool|\Magento\Store\Model\Website
-     * @since 2.0.0
      */
     public function getWebsite($storeId)
     {
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 138337c7c4d52..56e30849698c8 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -14,14 +14,12 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
 {
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
@@ -29,31 +27,26 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $catalogProduct;
 
     /**
      * @var \Magento\Bundle\Model\Product\PriceFactory
-     * @since 2.0.0
      */
     protected $productPriceFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $selectedOptions = [];
 
@@ -71,7 +64,6 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -115,7 +107,6 @@ private function getCatalogRuleProcessor()
      *
      * @param bool $stripSelection
      * @return array
-     * @since 2.0.0
      */
     public function getOptions($stripSelection = false)
     {
@@ -146,7 +137,6 @@ public function getOptions($stripSelection = false)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
@@ -162,7 +152,6 @@ public function hasOptions()
      *
      * @return string
      *
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
@@ -218,7 +207,6 @@ public function getJsonConfig()
      *
      * @param Option $option
      * @return string
-     * @since 2.0.0
      */
     public function getOptionHtml(Option $option)
     {
@@ -235,7 +223,6 @@ public function getOptionHtml(Option $option)
      * @param Product $product
      * @param Product $selection
      * @return array
-     * @since 2.0.0
      */
     private function getSelectionItemData(Product $product, Product $selection)
     {
@@ -276,7 +263,6 @@ private function getSelectionItemData(Product $product, Product $selection)
      * @param Product $product
      * @param Product $selection
      * @return array
-     * @since 2.0.0
      */
     private function getTierPrices(Product $product, Product $selection)
     {
@@ -317,7 +303,6 @@ private function getTierPrices(Product $product, Product $selection)
      * @param Option $option
      * @param Product $product
      * @return array
-     * @since 2.0.0
      */
     private function getSelections(Option $option, Product $product)
     {
@@ -344,7 +329,6 @@ private function getSelections(Option $option, Product $product)
      * @param Product $product
      * @param int $position
      * @return array
-     * @since 2.0.0
      */
     private function getOptionItemData(Option $option, Product $product, $position)
     {
@@ -362,7 +346,6 @@ private function getOptionItemData(Option $option, Product $product, $position)
      * @param Product $product
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     private function getConfigData(Product $product, array $options)
     {
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 8eadc95665969..872d0956f7d16 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -11,7 +11,6 @@
 /**
  * Bundle option renderer
  * @api
- * @since 2.0.0
  */
 class Option extends \Magento\Bundle\Block\Catalog\Product\Price
 {
@@ -19,7 +18,6 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
      * Store pre-configured options
      *
      * @var int|array|string
-     * @since 2.0.0
      */
     protected $_selectedOptions;
 
@@ -27,25 +25,21 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
      * Show if option has a single selection
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_showSingle;
 
     /**
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogHelper;
 
@@ -62,7 +56,6 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -96,7 +89,6 @@ public function __construct(
      * Check if option has a single selection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showSingle()
     {
@@ -114,7 +106,6 @@ public function showSingle()
      * Retrieve default values for template
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultValues()
     {
@@ -147,7 +138,6 @@ public function getDefaultValues()
      * Collect selected options
      *
      * @return int|array|string
-     * @since 2.0.0
      */
     protected function _getSelectedOptions()
     {
@@ -177,7 +167,6 @@ protected function _getSelectedOptions()
      *
      * @param  \Magento\Catalog\Model\Product $selection
      * @return bool
-     * @since 2.0.0
      */
     public function isSelected($selection)
     {
@@ -197,7 +186,6 @@ public function isSelected($selection)
      * Retrieve selected option qty
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getSelectedQty()
     {
@@ -219,7 +207,6 @@ protected function _getSelectedQty()
      * Get product model
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -233,7 +220,6 @@ public function getProduct()
      * @param \Magento\Catalog\Model\Product $selection
      * @param bool $includeContainer
      * @return string
-     * @since 2.0.0
      */
     public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     {
@@ -251,7 +237,6 @@ public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
      *
      * @param \Magento\Catalog\Model\Product $selection
      * @return int|float
-     * @since 2.0.0
      */
     public function getSelectionPrice($selection)
     {
@@ -276,7 +261,6 @@ public function getSelectionPrice($selection)
      * @param \Magento\Catalog\Model\Product $selection
      * @param bool $includeContainer
      * @return string
-     * @since 2.0.0
      */
     public function getSelectionTitlePrice($selection, $includeContainer = true)
     {
@@ -293,7 +277,6 @@ public function getSelectionTitlePrice($selection, $includeContainer = true)
      * @param int $containerId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -305,7 +288,6 @@ public function setValidationContainer($elementId, $containerId)
      *
      * @param \Magento\Bundle\Model\Option $option
      * @return mixed
-     * @since 2.0.0
      */
     public function setOption(\Magento\Bundle\Model\Option $option)
     {
@@ -320,7 +302,6 @@ public function setOption(\Magento\Bundle\Model\Option $option)
      * @param \Magento\Catalog\Model\Product $selection
      * @param bool $includeContainer
      * @return string
-     * @since 2.0.0
      */
     public function renderPriceString($selection, $includeContainer = true)
     {
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
index 6410c1257f824..549466b5dd985 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
@@ -9,13 +9,11 @@
  * Bundle option checkbox type renderer
  *
  * @api
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/view/type/bundle/option/checkbox.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
index 74a637446c1f1..2b386ab2be5d0 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
@@ -9,13 +9,11 @@
  * Bundle option multi select type renderer
  *
  * @api
- * @since 2.0.0
  */
 class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
index 75bb4843e4ac2..625bc260dcc56 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
@@ -9,13 +9,11 @@
  * Bundle option radiobox type renderer
  *
  * @api
- * @since 2.0.0
  */
 class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/view/type/bundle/option/radio.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
index 734f566770f20..7d705257ae318 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
@@ -9,13 +9,11 @@
  * Bundle option dropdown type renderer
  *
  * @api
- * @since 2.0.0
  */
 class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/view/type/bundle/option/select.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index bbc1756706c94..7cdd88b52056e 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -13,7 +13,6 @@
  * Shopping cart item render block
  *
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
 {
@@ -21,7 +20,6 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * Bundle catalog product configuration
      *
      * @var Configuration
-     * @since 2.0.0
      */
     protected $_bundleProductConfiguration = null;
 
@@ -38,7 +36,6 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param Configuration $bundleProductConfiguration
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -74,7 +71,6 @@ public function __construct(
      * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionList()
     {
@@ -85,7 +81,6 @@ public function getOptionList()
      * Return cart item error messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
index 9ef75c192a452..5fa2ab51a6caf 100644
--- a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -11,7 +11,6 @@
 /**
  * Order item render block
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
 {
@@ -48,7 +47,6 @@ public function __construct(
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isShipmentSeparately($item = null)
     {
@@ -85,7 +83,6 @@ public function isShipmentSeparately($item = null)
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isChildCalculated($item = null)
     {
@@ -123,7 +120,6 @@ public function isChildCalculated($item = null)
     /**
      * @param mixed $item
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getSelectionAttributes($item)
     {
@@ -141,7 +137,6 @@ public function getSelectionAttributes($item)
     /**
      * @param mixed $item
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($item)
     {
@@ -158,7 +153,6 @@ public function getValueHtml($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($item)
     {
@@ -194,7 +188,6 @@ public function getChildren($item)
     /**
      * @param mixed $item
      * @return bool
-     * @since 2.0.0
      */
     public function canShowPriceInfo($item)
     {
@@ -211,7 +204,6 @@ public function canShowPriceInfo($item)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemPrice($item)
     {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AddAttributeToTemplate.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AddAttributeToTemplate.php
index 005c8efdeff2e..4806aab9ceef7 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AddAttributeToTemplate.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AddAttributeToTemplate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\AddAttributeToTemplate
  *
- * @since 2.0.0
  */
 class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product\AddAttributeToTemplate
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsPriceGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsPriceGrid.php
index fc2432338aa7d..555fd8f6af187 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsPriceGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsPriceGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\AlertsPriceGrid
  *
- * @since 2.0.0
  */
 class AlertsPriceGrid extends \Magento\Catalog\Controller\Adminhtml\Product\AlertsPriceGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsStockGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsStockGrid.php
index 95abd21203373..ab65c97e97d61 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsStockGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/AlertsStockGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\AlertsStockGrid
  *
- * @since 2.0.0
  */
 class AlertsStockGrid extends \Magento\Catalog\Controller\Adminhtml\Product\AlertsStockGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Categories.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Categories.php
index 29b3c48f81515..e53a6e6a76551 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Categories.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Categories.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Categories
  *
- * @since 2.0.0
  */
 class Categories extends \Magento\Catalog\Controller\Adminhtml\Product\Categories
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
index 1d3708556ed82..24d35aa4b1c22 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Crosssell
  *
- * @since 2.0.0
  */
 class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
index 82e90ff8f8c9d..8e04f195d9481 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\CrosssellGrid
  *
- * @since 2.0.0
  */
 class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CustomOptions.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CustomOptions.php
index c3ef0221b9461..1cf5d3131553e 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CustomOptions.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CustomOptions.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\CustomOptions
  *
- * @since 2.0.0
  */
 class CustomOptions extends \Magento\Catalog\Controller\Adminhtml\Product\CustomOptions
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Duplicate.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Duplicate.php
index cff88e205cabd..b702fe95233e5 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Duplicate.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Duplicate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Duplicate
  *
- * @since 2.0.0
  */
 class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product\Duplicate
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Edit.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Edit.php
index 2d84f6af3da3f..7b5538ca3746c 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Edit.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php
index 78e5631b1f972..3a36a0647c960 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper
-     * @since 2.0.0
      */
     protected $initializationHelper;
 
@@ -26,7 +24,6 @@ class Form extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Action\Context $context
      * @param Product\Builder $productBuilder
      * @param Product\Initialization\Helper $initializationHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Grid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Grid.php
index aac2ad357d45c..bc40092f1449d 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Grid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Controller\Adminhtml\Product\Grid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/GridOnly.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/GridOnly.php
index 8fb7ec64b2ff6..205e273ba10ac 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/GridOnly.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/GridOnly.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\GridOnly
  *
- * @since 2.0.0
  */
 class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product\GridOnly
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Index.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Index.php
index b37c3f07d0194..dce8469d15445 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Index.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Index
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassDelete.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassDelete.php
index 8dbbd55419090..92ccfaceabff3 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassDelete.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassDelete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product\MassDelete
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassStatus.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassStatus.php
index 76c2c7aa07f2a..b75e7ba585de2 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassStatus.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/MassStatus.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\MassStatus
  *
- * @since 2.0.0
  */
 class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product\MassStatus
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/NewAction.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/NewAction.php
index 5916637d5a085..5d93047a4e6d3 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/NewAction.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\NewAction
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Options.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Options.php
index 11a34244ca39d..f4b0669172dc2 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Options.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Options.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Options
  *
- * @since 2.0.0
  */
 class Options extends \Magento\Catalog\Controller\Adminhtml\Product\Options
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/OptionsImportGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/OptionsImportGrid.php
index b9c1aa6efdd2e..51660e2dd6772 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/OptionsImportGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/OptionsImportGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\OptionsImportGrid
  *
- * @since 2.0.0
  */
 class OptionsImportGrid extends \Magento\Catalog\Controller\Adminhtml\Product\OptionsImportGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
index 78c96440c7182..88a7e4ce2ebb0 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Related
  *
- * @since 2.0.0
  */
 class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
index f6289eb288a2f..d3b791b095271 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\RelatedGrid
  *
- * @since 2.0.0
  */
 class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Save.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Save.php
index 9ba93142a0e99..43f335f632d90 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Save.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Save
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/ShowUpdateResult.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/ShowUpdateResult.php
index 91f09d2e531ee..492f301450ecd 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/ShowUpdateResult.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/ShowUpdateResult.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product\ShowUpdateResult
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/SuggestAttributes.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/SuggestAttributes.php
index 5b5f754b11618..fa2fca6f016ec 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/SuggestAttributes.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/SuggestAttributes.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\SuggestAttributes
  *
- * @since 2.0.0
  */
 class SuggestAttributes extends \Magento\Catalog\Controller\Adminhtml\Product\SuggestAttributes
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
index 4d77002a0085c..224fcb12c2db8 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Upsell
  *
- * @since 2.0.0
  */
 class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
index bd5470800a697..2f328ac16e588 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\UpsellGrid
  *
- * @since 2.0.0
  */
 class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Validate.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Validate.php
index 4eca02306e4db..64d59679bebbe 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Validate.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Validate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Validate
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Wysiwyg.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Wysiwyg.php
index 151f365f2001d..d809387cfcb7c 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Wysiwyg.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Wysiwyg.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit\Wysiwyg
  *
- * @since 2.0.0
  */
 class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product\Wysiwyg
 {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php
index 8be527ed573a0..399dd06aeaa5e 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Selection\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\App\Action
 {
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php
index f63afb6f9be0c..1334b30ab2597 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Bundle\Controller\Adminhtml\Bundle\Selection\Search
  *
- * @since 2.0.0
  */
 class Search extends \Magento\Backend\App\Action
 {
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
index 3d5dc2a3c8f09..41d5eee0e063d 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
@@ -15,7 +15,6 @@
 /**
  * Class Bundle
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Bundle
 {
@@ -27,7 +26,6 @@ class Bundle
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -62,7 +60,6 @@ class Bundle
      * @param ProductRepository $productRepository
      * @param StoreManager $storeManager
      * @param ProductCustomOptionInterfaceFactory $customOptionFactory
-     * @since 2.0.0
      */
     public function __construct(
         RequestInterface $request,
@@ -90,7 +87,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function afterInitialize(
         \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $subject,
diff --git a/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
index 636ac2fe15af8..98a2fc67404a9 100644
--- a/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
@@ -12,7 +12,6 @@
 /**
  * Helper for fetching properties by product configuration item
  * @api
- * @since 2.0.0
  */
 class Configuration extends AbstractHelper implements ConfigurationInterface
 {
@@ -20,7 +19,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Core data
      *
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
@@ -28,7 +26,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Catalog product configuration
      *
      * @var \Magento\Catalog\Helper\Product\Configuration
-     * @since 2.0.0
      */
     protected $productConfiguration;
 
@@ -36,7 +33,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -54,7 +50,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -77,7 +72,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @param int $selectionId
      * @return float
-     * @since 2.0.0
      */
     public function getSelectionQty(\Magento\Catalog\Model\Product $product, $selectionId)
     {
@@ -94,7 +88,6 @@ public function getSelectionQty(\Magento\Catalog\Model\Product $product, $select
      * @param ItemInterface $item
      * @param \Magento\Catalog\Model\Product $selectionProduct
      * @return float
-     * @since 2.0.0
      */
     public function getSelectionFinalPrice(ItemInterface $item, \Magento\Catalog\Model\Product $selectionProduct)
     {
@@ -122,7 +115,6 @@ public function getSelectionFinalPrice(ItemInterface $item, \Magento\Catalog\Mod
      *
      * @param ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getBundleOptions(ItemInterface $item)
     {
@@ -186,7 +178,6 @@ public function getBundleOptions(ItemInterface $item)
      *
      * @param ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptions(ItemInterface $item)
     {
diff --git a/app/code/Magento/Bundle/Helper/Data.php b/app/code/Magento/Bundle/Helper/Data.php
index 8761444d3d5c6..dbd4a6a039c27 100644
--- a/app/code/Magento/Bundle/Helper/Data.php
+++ b/app/code/Magento/Bundle/Helper/Data.php
@@ -9,20 +9,17 @@
  * Bundle helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Retrieve array of allowed product types for bundle selection product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedSelectionTypes()
     {
diff --git a/app/code/Magento/Bundle/Model/BundleOption.php b/app/code/Magento/Bundle/Model/BundleOption.php
index 159b4bc4efa5a..ece0e7a2b665d 100644
--- a/app/code/Magento/Bundle/Model/BundleOption.php
+++ b/app/code/Magento/Bundle/Model/BundleOption.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Bundle\Model\BundleOption
  *
- * @since 2.0.0
  */
 class BundleOption extends AbstractExtensibleModel implements BundleOptionInterface
 {
@@ -26,7 +25,6 @@ class BundleOption extends AbstractExtensibleModel implements BundleOptionInterf
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -36,7 +34,6 @@ public function getOptionId()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOptionQty()
     {
@@ -46,7 +43,6 @@ public function getOptionQty()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOptionSelections()
     {
@@ -56,7 +52,6 @@ public function getOptionSelections()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setOptionId($optionId)
     {
@@ -66,7 +61,6 @@ public function setOptionId($optionId)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setOptionQty($optionQty)
     {
@@ -76,7 +70,6 @@ public function setOptionQty($optionQty)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setOptionSelections(array $optionSelections)
     {
@@ -86,7 +79,6 @@ public function setOptionSelections(array $optionSelections)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -96,7 +88,6 @@ public function getExtensionAttributes()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\BundleOptionExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Bundle/Model/CartItemProcessor.php b/app/code/Magento/Bundle/Model/CartItemProcessor.php
index 67c91c523da97..abdbbadfeee9a 100644
--- a/app/code/Magento/Bundle/Model/CartItemProcessor.php
+++ b/app/code/Magento/Bundle/Model/CartItemProcessor.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Bundle\Model\CartItemProcessor
  *
- * @since 2.0.0
  */
 class CartItemProcessor implements CartItemProcessorInterface
 {
     /**
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var QuoteApi\ProductOptionExtensionFactory
-     * @since 2.0.0
      */
     protected $productOptionExtensionFactory;
 
     /**
      * @var BundleOptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $bundleOptionFactory;
 
     /**
      * @var QuoteApi\ProductOptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $productOptionFactory;
 
@@ -46,7 +41,6 @@ class CartItemProcessor implements CartItemProcessorInterface
      * @param QuoteApi\ProductOptionExtensionFactory $productOptionExtensionFactory
      * @param BundleOptionInterfaceFactory $bundleOptionFactory
      * @param QuoteApi\ProductOptionInterfaceFactory $productOptionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DataObject\Factory $objectFactory,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -86,7 +79,6 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function processOptions(CartItemInterface $cartItem)
     {
diff --git a/app/code/Magento/Bundle/Model/Link.php b/app/code/Magento/Bundle/Model/Link.php
index 76c067de38f3e..7df6668cec8d8 100644
--- a/app/code/Magento/Bundle/Model/Link.php
+++ b/app/code/Magento/Bundle/Model/Link.php
@@ -9,7 +9,6 @@
 /**
  * Class Link
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Bundle\Api\Data\LinkInterface
@@ -30,7 +29,6 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -39,7 +37,6 @@ public function getId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -48,7 +45,6 @@ public function setId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -57,7 +53,6 @@ public function getSku()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -66,7 +61,6 @@ public function getOptionId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -75,7 +69,6 @@ public function getQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -84,7 +77,6 @@ public function getPosition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsDefault()
     {
@@ -93,7 +85,6 @@ public function getIsDefault()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -102,7 +93,6 @@ public function getPrice()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPriceType()
     {
@@ -111,7 +101,6 @@ public function getPriceType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCanChangeQuantity()
     {
@@ -123,7 +112,6 @@ public function getCanChangeQuantity()
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -135,7 +123,6 @@ public function setSku($sku)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId)
     {
@@ -147,7 +134,6 @@ public function setOptionId($optionId)
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -159,7 +145,6 @@ public function setQty($qty)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -171,7 +156,6 @@ public function setPosition($position)
      *
      * @param bool $isDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefault($isDefault)
     {
@@ -183,7 +167,6 @@ public function setIsDefault($isDefault)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -195,7 +178,6 @@ public function setPrice($price)
      *
      * @param int $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType)
     {
@@ -207,7 +189,6 @@ public function setPriceType($priceType)
      *
      * @param int $canChangeQuantity
      * @return $this
-     * @since 2.0.0
      */
     public function setCanChangeQuantity($canChangeQuantity)
     {
@@ -218,7 +199,6 @@ public function setCanChangeQuantity($canChangeQuantity)
      * {@inheritdoc}
      *
      * @return \Magento\Bundle\Api\Data\LinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -230,7 +210,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index cce7defbb913b..3e95c1df06d58 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -15,43 +15,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Bundle\Api\Data\LinkInterfaceFactory
-     * @since 2.0.0
      */
     protected $linkFactory;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\BundleFactory
-     * @since 2.0.0
      */
     protected $bundleFactory;
 
     /**
      * @var SelectionFactory
-     * @since 2.0.0
      */
     protected $bundleSelection;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $optionCollection;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -69,7 +62,6 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
      * @param \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory $optionCollection
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
@@ -91,7 +83,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildren($productSku, $optionId = null)
     {
@@ -115,7 +106,6 @@ public function getChildren($productSku, $optionId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct)
     {
@@ -128,7 +118,6 @@ public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\L
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function saveChild(
         $sku,
@@ -182,7 +171,6 @@ public function saveChild(
      * @return \Magento\Bundle\Model\Selection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function mapProductLinkToSelectionModel(
         \Magento\Bundle\Model\Selection $selectionModel,
@@ -223,7 +211,6 @@ protected function mapProductLinkToSelectionModel(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addChild(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -303,7 +290,6 @@ public function addChild(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removeChild($sku, $optionId, $childSku)
     {
@@ -345,7 +331,6 @@ public function removeChild($sku, $optionId, $childSku)
      * @param \Magento\Catalog\Model\Product $selection
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Api\Data\LinkInterface
-     * @since 2.0.0
      */
     private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\Catalog\Model\Product $product)
     {
@@ -376,7 +361,6 @@ private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\C
     /**
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
-     * @since 2.0.0
      */
     private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
diff --git a/app/code/Magento/Bundle/Model/Option.php b/app/code/Magento/Bundle/Model/Option.php
index a55fae8017ba3..ce6eb62b74494 100644
--- a/app/code/Magento/Bundle/Model/Option.php
+++ b/app/code/Magento/Bundle/Model/Option.php
@@ -12,7 +12,6 @@
  * @method int getParentId()
  * @method null|\Magento\Catalog\Model\Product[] getSelections()
  * @method Option setParentId(int $value)
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Bundle\Api\Data\OptionInterface
@@ -29,19 +28,13 @@ class Option extends \Magento\Framework\Model\AbstractExtensibleModel implements
     const KEY_PRODUCT_LINKS = 'product_links';
     /**#@-*/
 
-    /**
-     * Default selection object
-     *
-     * @var \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $defaultSelection = null;
 
     /**
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +47,6 @@ protected function _construct()
      *
      * @param \Magento\Catalog\Model\Product $selection
      * @return void
-     * @since 2.0.0
      */
     public function addSelection(\Magento\Catalog\Model\Product $selection)
     {
@@ -70,7 +62,6 @@ public function addSelection(\Magento\Catalog\Model\Product $selection)
      * Check Is Saleable Option
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSaleable()
     {
@@ -91,7 +82,6 @@ public function isSaleable()
      * Retrieve default Selection object
      *
      * @return \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
      */
     public function getDefaultSelection()
     {
@@ -110,7 +100,6 @@ public function getDefaultSelection()
      * Check is multi Option selection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMultiSelection()
     {
@@ -123,7 +112,6 @@ public function isMultiSelection()
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -135,7 +123,6 @@ public function getSearchableData($productId, $storeId)
      *
      * @param int $selectionId
      * @return \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
      */
     public function getSelectionById($selectionId)
     {
@@ -153,7 +140,6 @@ public function getSelectionById($selectionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -162,7 +148,6 @@ public function getOptionId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -171,7 +156,6 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRequired()
     {
@@ -180,7 +164,6 @@ public function getRequired()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -189,7 +172,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -198,7 +180,6 @@ public function getPosition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -207,7 +188,6 @@ public function getSku()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductLinks()
     {
@@ -219,7 +199,6 @@ public function getProductLinks()
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId)
     {
@@ -231,7 +210,6 @@ public function setOptionId($optionId)
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -243,7 +221,6 @@ public function setTitle($title)
      *
      * @param bool $required
      * @return $this
-     * @since 2.0.0
      */
     public function setRequired($required)
     {
@@ -255,7 +232,6 @@ public function setRequired($required)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -267,7 +243,6 @@ public function setType($type)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -279,7 +254,6 @@ public function setPosition($position)
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -291,7 +265,6 @@ public function setSku($sku)
      *
      * @param \Magento\Bundle\Api\Data\LinkInterface[] $productLinks
      * @return $this
-     * @since 2.0.0
      */
     public function setProductLinks(array $productLinks = null)
     {
@@ -302,7 +275,6 @@ public function setProductLinks(array $productLinks = null)
      * {@inheritdoc}
      *
      * @return \Magento\Bundle\Api\Data\OptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -314,7 +286,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Bundle/Model/Option/Validator.php b/app/code/Magento/Bundle/Model/Option/Validator.php
index 252d956002f79..381d3675e9188 100644
--- a/app/code/Magento/Bundle/Model/Option/Validator.php
+++ b/app/code/Magento/Bundle/Model/Option/Validator.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Bundle\Model\Option\Validator
  *
- * @since 2.0.0
  */
 class Validator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * @var NotEmpty
-     * @since 2.0.0
      */
     private $notEmpty;
 
     /**
      * @param NotEmptyFactory $notEmptyFactory
-     * @since 2.0.0
      */
     public function __construct(NotEmptyFactory $notEmptyFactory)
     {
@@ -35,7 +32,6 @@ public function __construct(NotEmptyFactory $notEmptyFactory)
      * @param \Magento\Bundle\Model\Option $value
      * @return boolean
      * @throws Zend_Validate_Exception If validation of $value is impossible
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -49,7 +45,6 @@ public function isValid($value)
      * @return void
      * @throws Zend_Validate_Exception
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function validateRequiredFields($value)
     {
diff --git a/app/code/Magento/Bundle/Model/OptionManagement.php b/app/code/Magento/Bundle/Model/OptionManagement.php
index d809a7e160345..fa567bb39e57e 100644
--- a/app/code/Magento/Bundle/Model/OptionManagement.php
+++ b/app/code/Magento/Bundle/Model/OptionManagement.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Bundle\Model\OptionManagement
  *
- * @since 2.0.0
  */
 class OptionManagement implements \Magento\Bundle\Api\ProductOptionManagementInterface
 {
     /**
      * @var \Magento\Bundle\Api\ProductOptionRepositoryInterface
-     * @since 2.0.0
      */
     protected $optionRepository;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @param \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Bundle\Api\Data\OptionInterface $option)
     {
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index 0773a0ddd582d..b5a1c0a5474d8 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -15,61 +15,51 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var Product\Type
-     * @since 2.0.0
      */
     protected $type;
 
     /**
      * @var \Magento\Bundle\Api\Data\OptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Option
-     * @since 2.0.0
      */
     protected $optionResource;
 
     /**
      * @var \Magento\Store\Model\StoreManager
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Bundle\Api\ProductLinkManagementInterface
-     * @since 2.0.0
      */
     protected $linkManagement;
 
     /**
      * @var Product\OptionList
-     * @since 2.0.0
      */
     protected $productOptionList;
 
     /**
      * @var Product\LinksList
-     * @since 2.0.0
      */
     protected $linkList;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -90,7 +80,6 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      * @param Product\LinksList $linkList
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -116,7 +105,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($sku, $optionId)
     {
@@ -147,7 +135,6 @@ public function get($sku, $optionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
@@ -167,7 +154,6 @@ public function getListByProduct(ProductInterface $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
     {
@@ -184,7 +170,6 @@ public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($sku, $optionId)
     {
@@ -196,7 +181,6 @@ public function deleteById($sku, $optionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -253,7 +237,6 @@ public function save(
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return $this
-     * @since 2.0.0
      */
     protected function updateOptionSelection(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -296,7 +279,6 @@ protected function updateOptionSelection(
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     private function getProduct($sku)
     {
@@ -314,7 +296,6 @@ private function getProduct($sku)
      * @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
      *
      * @return array
-     * @since 2.0.0
      */
     private function compareLinks(array $firstArray, array $secondArray)
     {
diff --git a/app/code/Magento/Bundle/Model/OptionTypeList.php b/app/code/Magento/Bundle/Model/OptionTypeList.php
index 686da8bc160de..16360b50d47c2 100644
--- a/app/code/Magento/Bundle/Model/OptionTypeList.php
+++ b/app/code/Magento/Bundle/Model/OptionTypeList.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Bundle\Model\OptionTypeList
  *
- * @since 2.0.0
  */
 class OptionTypeList implements \Magento\Bundle\Api\ProductOptionTypeListInterface
 {
     /**
      * @var Source\Option\Type
-     * @since 2.0.0
      */
     protected $types;
 
     /**
      * @var \Magento\Bundle\Api\Data\OptionTypeInterfaceFactory
-     * @since 2.0.0
      */
     protected $typeFactory;
 
     /**
      * @param Source\Option\Type $type
      * @param \Magento\Bundle\Api\Data\OptionTypeInterfaceFactory $typeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Bundle\Model\Source\Option\Type $type,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
index 98bc0c05b40c5..f3c0548f76e5d 100644
--- a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
+++ b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
@@ -9,7 +9,6 @@
  * Class PriceBackend
  *
  *  Make price validation optional for bundle dynamic
- * @since 2.0.0
  */
 class PriceBackend
 {
@@ -19,7 +18,6 @@ class PriceBackend
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $object
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundValidate(
         \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject,
diff --git a/app/code/Magento/Bundle/Model/Plugin/Product.php b/app/code/Magento/Bundle/Model/Plugin/Product.php
index 1f9e690d85721..b3f26ffb24575 100644
--- a/app/code/Magento/Bundle/Model/Plugin/Product.php
+++ b/app/code/Magento/Bundle/Model/Plugin/Product.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Bundle\Model\Plugin\Product
  *
- * @since 2.0.0
  */
 class Product
 {
     /**
      * @var Type
-     * @since 2.0.0
      */
     private $type;
 
     /**
      * @param Type $type
-     * @since 2.0.0
      */
     public function __construct(Type $type)
     {
@@ -34,7 +31,6 @@ public function __construct(Type $type)
      * @param CatalogProduct $product
      * @param array $identities
      * @return string[]
-     * @since 2.0.0
      */
     public function afterGetIdentities(
         CatalogProduct $product,
diff --git a/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php b/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
index 853059bca2d15..790dd54bc42e0 100644
--- a/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
+++ b/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
@@ -11,7 +11,6 @@
 
 /**
  * Plugin for Magento\Quote\Model\Quote\Item\ToOrderItem
- * @since 2.0.0
  */
 class QuoteItem
 {
diff --git a/app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/View.php
index fa71684b3069f..874fb8cbb5e6f 100644
--- a/app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/View.php
+++ b/app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/View.php
@@ -12,19 +12,16 @@
  * Bundle Price View Attribute Renderer
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var OptionFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
     /**
      * @param OptionFactory $optionFactory
-     * @since 2.0.0
      */
     public function __construct(OptionFactory $optionFactory)
     {
@@ -35,7 +32,6 @@ public function __construct(OptionFactory $optionFactory)
      * Get all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -53,7 +49,6 @@ public function getAllOptions()
      *
      * @param string|integer $value
      * @return string|bool
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -69,7 +64,6 @@ public function getOptionText($value)
      * Retrieve flat column definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -92,7 +86,6 @@ public function getFlatColumns()
      *
      * @param   int $store
      * @return  \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
index 1686055eb7663..9edd733b2ac62 100644
--- a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
@@ -7,25 +7,21 @@
 
 /**
  * Price model for external catalogs
- * @since 2.0.0
  */
 class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\CatalogPrice
-     * @since 2.0.0
      */
     protected $commonPriceModel;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
@@ -33,7 +29,6 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -47,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCatalogPrice(
         \Magento\Catalog\Model\Product $product,
@@ -85,7 +79,6 @@ public function getCatalogPrice(
      * @param \Magento\Catalog\Model\Product $product
      * @return null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php b/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php
index df735fedb2de0..8567b7288ee99 100644
--- a/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php
+++ b/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Bundle\Model\Product\CopyConstructor\Bundle
  *
- * @since 2.0.0
  */
 class Bundle implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
@@ -21,7 +20,6 @@ class Bundle implements \Magento\Catalog\Model\Product\CopyConstructorInterface
      * @param Product $product
      * @param Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(Product $product, Product $duplicate)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/LinksList.php b/app/code/Magento/Bundle/Model/Product/LinksList.php
index dfd83289225d4..d6a466b83974f 100644
--- a/app/code/Magento/Bundle/Model/Product/LinksList.php
+++ b/app/code/Magento/Bundle/Model/Product/LinksList.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Bundle\Model\Product\LinksList
  *
- * @since 2.0.0
  */
 class LinksList
 {
     /**
      * @var \Magento\Bundle\Api\Data\LinkInterfaceFactory
-     * @since 2.0.0
      */
     protected $linkFactory;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     protected $type;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -35,7 +31,6 @@ class LinksList
      * @param \Magento\Bundle\Api\Data\LinkInterfaceFactory $linkFactory
      * @param Type $type
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Bundle\Api\Data\LinkInterfaceFactory $linkFactory,
@@ -51,7 +46,6 @@ public function __construct(
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param int $optionId
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
-     * @since 2.0.0
      */
     public function getItems(\Magento\Catalog\Api\Data\ProductInterface $product, $optionId)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/OptionList.php b/app/code/Magento/Bundle/Model/Product/OptionList.php
index 83ab414bd8c80..5ae4a7791cb61 100644
--- a/app/code/Magento/Bundle/Model/Product/OptionList.php
+++ b/app/code/Magento/Bundle/Model/Product/OptionList.php
@@ -9,37 +9,31 @@
 /**
  * Class \Magento\Bundle\Model\Product\OptionList
  *
- * @since 2.0.0
  */
 class OptionList
 {
     /**
      * @var \Magento\Bundle\Api\Data\OptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     protected $type;
 
     /**
      * @var LinksList
-     * @since 2.0.0
      */
     protected $linkList;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -49,7 +43,6 @@ class OptionList
      * @param LinksList $linkList
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Bundle\Model\Product\Type $type,
@@ -68,7 +61,6 @@ public function __construct(
     /**
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
-     * @since 2.0.0
      */
     public function getItems(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 5c1831a65dbec..ce0425be6d31a 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -13,7 +13,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
@@ -31,7 +30,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * Flag which indicates - is min/max prices have been calculated by index
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPricesCalculatedByIndex;
 
@@ -39,7 +37,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -67,7 +64,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory,
@@ -105,7 +101,6 @@ public function __construct(
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsPricesCalculatedByIndex()
     {
@@ -117,7 +112,6 @@ public function getIsPricesCalculatedByIndex()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getPrice($product)
     {
@@ -134,7 +128,6 @@ public function getPrice($product)
      * @param \Magento\Catalog\Model\Product $product
      * @param null|float $qty
      * @return float
-     * @since 2.0.0
      */
     public function getTotalBundleItemsPrice($product, $qty = null)
     {
@@ -171,7 +164,6 @@ public function getTotalBundleItemsPrice($product, $qty = null)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product)
     {
@@ -191,7 +183,6 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
      * @param   float                     $qty
      * @param   \Magento\Catalog\Model\Product $product
      * @return  float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty, $product)
     {
@@ -220,7 +211,6 @@ public function getFinalPrice($qty, $product)
      * @param \Magento\Catalog\Model\Product $childProduct
      * @param float                      $childProductQty
      * @return float
-     * @since 2.0.0
      */
     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
     {
@@ -238,7 +228,6 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)
     {
@@ -393,7 +382,6 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
-     * @since 2.0.0
      */
     public function getOptions($product)
     {
@@ -419,7 +407,6 @@ public function getOptions($product)
      * @return float
      *
      * @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
-     * @since 2.0.0
      */
     public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQty = null, $multiplyQty = true)
     {
@@ -433,7 +420,6 @@ public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQ
      * @param \Magento\Catalog\Model\Product $selectionProduct
      * @param float                    $qty
      * @return float
-     * @since 2.0.0
      */
     public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
     {
@@ -451,7 +437,6 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
      * @param  bool                       $multiplyQty
      * @param  bool                       $takeTierPrice
      * @return float
-     * @since 2.0.0
      */
     public function getSelectionFinalTotalPrice(
         $bundleProduct,
@@ -504,7 +489,6 @@ public function getSelectionFinalTotalPrice(
      * @param   float                    $qty
      * @param   float                    $finalPrice
      * @return  float
-     * @since 2.0.0
      */
     protected function _applyTierPrice($product, $qty, $finalPrice)
     {
@@ -530,7 +514,6 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
      * @return  float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getTierPrice($qty, $product)
     {
@@ -628,7 +611,6 @@ public function getTierPrice($qty, $product)
      * @param string $specialPriceTo
      * @param mixed  $store
      * @return float
-     * @since 2.0.0
      */
     public function calculateSpecialPrice(
         $finalPrice,
@@ -654,7 +636,6 @@ public function calculateSpecialPrice(
      * @param float|string $price
      * @param int          $bundleQty
      * @return float
-     * @since 2.0.0
      */
     public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index ec092dacbbb08..5758569df8f82 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -21,7 +21,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
 {
@@ -34,7 +33,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is composite
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = true;
 
@@ -42,7 +40,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Options Collection
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyOptionsCollection = '_cache_instance_options_collection';
 
@@ -51,7 +48,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      *
      * @var string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_keySelectionsCollection = '_cache_instance_selections_collection';
 
@@ -59,7 +55,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for used Selections
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyUsedSelections = '_cache_instance_used_selections';
 
@@ -67,7 +62,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for used selections ids
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyUsedSelectionsIds = '_cache_instance_used_selections_ids';
 
@@ -75,7 +69,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for used options
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyUsedOptions = '_cache_instance_used_options';
 
@@ -83,7 +76,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for used options ids
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyUsedOptionsIds = '_cache_instance_used_options_ids';
 
@@ -91,7 +83,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is possible to configure
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canConfigure = true;
 
@@ -99,7 +90,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -107,67 +97,56 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Bundle\Model\OptionFactory
-     * @since 2.0.0
      */
     protected $_bundleOption;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Selection
-     * @since 2.0.0
      */
     protected $_bundleSelection;
 
     /**
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Selection\CollectionFactory
-     * @since 2.0.0
      */
     protected $_bundleCollection;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\BundleFactory
-     * @since 2.0.0
      */
     protected $_bundleFactory;
 
     /**
      * @var \Magento\Bundle\Model\SelectionFactory $bundleModelSelection
-     * @since 2.0.0
      */
     protected $_bundleModelSelection;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $_stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockStateInterface
-     * @since 2.0.0
      */
     protected $_stockState;
 
@@ -210,7 +189,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param SelectionCollectionFilterApplier|null $selectionCollectionFilterApplier
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -275,7 +253,6 @@ public function __construct(
      * Return relation info about used products
      *
      * @return \Magento\Framework\DataObject Object with information data
-     * @since 2.0.0
      */
     public function getRelationInfo()
     {
@@ -296,7 +273,6 @@ public function getRelationInfo()
      * @param int $parentId
      * @param bool $required
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -308,7 +284,6 @@ public function getChildrenIds($parentId, $required = true)
      *
      * @param int|array $childId
      * @return array
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -320,7 +295,6 @@ public function getParentIdsByChild($childId)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getSku($product)
     {
@@ -351,7 +325,6 @@ public function getSku($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getWeight($product)
     {
@@ -383,7 +356,6 @@ public function getWeight($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual($product)
     {
@@ -410,7 +382,6 @@ public function isVirtual($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return $this|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function beforeSave($product)
     {
@@ -455,7 +426,6 @@ public function beforeSave($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getOptions($product)
     {
@@ -468,7 +438,6 @@ public function getOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsIds($product)
     {
@@ -481,7 +450,6 @@ public function getOptionsIds($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
-     * @since 2.0.0
      */
     public function getOptionsCollection($product)
     {
@@ -510,7 +478,6 @@ public function getOptionsCollection($product)
      * @param array $optionIds
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Model\ResourceModel\Selection\Collection
-     * @since 2.0.0
      */
     public function getSelectionsCollection($optionIds, $product)
     {
@@ -556,7 +523,6 @@ public function getSelectionsCollection($optionIds, $product)
      * @param   mixed $value
      * @param   \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function updateQtyOption($options, \Magento\Framework\DataObject $option, $value, $product)
     {
@@ -590,7 +556,6 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
      * @param \Magento\Catalog\Model\Product $product
      * @return int
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareQuoteItemQty($qty, $product)
     {
@@ -604,7 +569,6 @@ public function prepareQuoteItemQty($qty, $product)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function isSalable($product)
     {
@@ -670,7 +634,6 @@ public function isSalable($product)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -829,7 +792,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
     /**
      * @param array $array
      * @return int[]|int[][]
-     * @since 2.0.0
      */
     private function recursiveIntval(array $array)
     {
@@ -849,7 +811,6 @@ private function recursiveIntval(array $array)
     /**
      * @param array $array
      * @return int[]
-     * @since 2.0.0
      */
     private function multiToFlatArray(array $array)
     {
@@ -869,7 +830,6 @@ private function multiToFlatArray(array $array)
      * Retrieve message for specify option(s)
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSpecifyOptionMessage()
     {
@@ -882,7 +842,6 @@ public function getSpecifyOptionMessage()
      * @param array $selectionIds
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Model\ResourceModel\Selection\Collection
-     * @since 2.0.0
      */
     public function getSelectionsByIds($selectionIds, $product)
     {
@@ -931,7 +890,6 @@ public function getSelectionsByIds($selectionIds, $product)
      * @param array $optionIds
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
-     * @since 2.0.0
      */
     public function getOptionsByIds($optionIds, $product)
     {
@@ -967,7 +925,6 @@ public function getOptionsByIds($optionIds, $product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions($product)
     {
@@ -1035,7 +992,6 @@ public function getOrderOptions($product)
      * @param  \Magento\Catalog\Model\Product $firstItem
      * @param  \Magento\Catalog\Model\Product $secondItem
      * @return int
-     * @since 2.0.0
      */
     public function shakeSelections($firstItem, $secondItem)
     {
@@ -1065,7 +1021,6 @@ public function shakeSelections($firstItem, $secondItem)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions($product)
     {
@@ -1088,7 +1043,6 @@ public function hasOptions($product)
      * @return boolean true
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getForceChildItemQtyChanges($product)
     {
@@ -1101,7 +1055,6 @@ public function getForceChildItemQtyChanges($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($product)
     {
@@ -1125,7 +1078,6 @@ public function getSearchableData($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function checkProductBuyState($product)
     {
@@ -1171,7 +1123,6 @@ public function checkProductBuyState($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getProductsToPurchaseByReqGroups($product)
     {
@@ -1203,7 +1154,6 @@ public function getProductsToPurchaseByReqGroups($product)
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processBuyRequest($product, $buyRequest)
     {
@@ -1223,7 +1173,6 @@ public function processBuyRequest($product, $buyRequest)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function canConfigure($product)
     {
@@ -1238,7 +1187,6 @@ public function canConfigure($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
@@ -1249,7 +1197,6 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities(\Magento\Catalog\Model\Product $product)
     {
@@ -1272,7 +1219,6 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
      * @param int[] $qtys
      * @param int $selectionOptionId
      * @return float
-     * @since 2.0.0
      */
     protected function getQty($selection, $qtys, $selectionOptionId)
     {
@@ -1290,7 +1236,6 @@ protected function getQty($selection, $qtys, $selectionOptionId)
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Framework\DataObject $selection
      * @return float|int
-     * @since 2.0.0
      */
     protected function getBeforeQty($product, $selection)
     {
@@ -1311,7 +1256,6 @@ protected function getBeforeQty($product, $selection)
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $optionsCollection, $options)
     {
@@ -1331,7 +1275,6 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function checkSelectionsIsSale($selections, $skipSaleableCheck, $optionsCollection, $options)
     {
@@ -1359,7 +1302,6 @@ protected function checkSelectionsIsSale($selections, $skipSaleableCheck, $optio
      * @param array $_result
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function checkIsResult($_result)
     {
@@ -1378,7 +1320,6 @@ protected function checkIsResult($_result)
      * @param \Magento\Catalog\Model\Product\Option[] $options
      * @param \Magento\Framework\DataObject[] $selections
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected function mergeSelectionsWithOptions($options, $selections)
     {
diff --git a/app/code/Magento/Bundle/Model/ProductOptionProcessor.php b/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
index e2406d09591dd..a3a88261eba20 100644
--- a/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
@@ -16,26 +16,22 @@
 /**
  * Class \Magento\Bundle\Model\ProductOptionProcessor
  *
- * @since 2.0.0
  */
 class ProductOptionProcessor implements ProductOptionProcessorInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var BundleOptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $bundleOptionFactory;
 
     /**
      * @param DataObjectFactory $objectFactory
      * @param BundleOptionInterfaceFactory $bundleOptionFactory
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(ProductOptionInterface $productOption)
     {
@@ -75,7 +70,6 @@ public function convertToBuyRequest(ProductOptionInterface $productOption)
      *
      * @param ProductOptionInterface $productOption
      * @return array
-     * @since 2.0.0
      */
     protected function getBundleOptions(ProductOptionInterface $productOption)
     {
@@ -91,7 +85,6 @@ protected function getBundleOptions(ProductOptionInterface $productOption)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToProductOption(DataObject $request)
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Bundle.php b/app/code/Magento/Bundle/Model/ResourceModel/Bundle.php
index 18e740e573b9e..a731d9e978c94 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Bundle.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Bundle.php
@@ -9,19 +9,16 @@
  * Bundle Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Bundle extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Relation
-     * @since 2.0.0
      */
     protected $_productRelation;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote
-     * @since 2.0.0
      */
     protected $quoteResource;
 
@@ -30,7 +27,6 @@ class Bundle extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\ResourceModel\Product\Relation $productRelation
      * @param \Magento\Quote\Model\ResourceModel\Quote $quoteResource
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -61,7 +56,6 @@ protected function _construct()
      * @param int $productId
      * @param array $columns
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getSelect($productId, $columns = [])
     {
@@ -85,7 +79,6 @@ protected function _getSelect($productId, $columns = [])
      *
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function getSelectionsData($productId)
     {
@@ -97,7 +90,6 @@ public function getSelectionsData($productId)
      *
      * @param int $productId
      * @return void
-     * @since 2.0.0
      */
     public function dropAllQuoteChildItems($productId)
     {
@@ -127,7 +119,6 @@ public function dropAllQuoteChildItems($productId)
      * @param int $productId
      * @param array $ids
      * @return void
-     * @since 2.0.0
      */
     public function dropAllUnneededSelections($productId, $ids)
     {
@@ -144,7 +135,6 @@ public function dropAllUnneededSelections($productId, $ids)
      * @param int $parentId
      * @param array $childIds
      * @return $this
-     * @since 2.0.0
      */
     public function saveProductRelations($parentId, $childIds)
     {
@@ -173,7 +163,6 @@ public function addProductRelation($parentId, $childId)
      * @param int $parentId
      * @param array $childIds
      * @return $this
-     * @since 2.0.0
      */
     public function addProductRelations($parentId, $childIds)
     {
@@ -187,7 +176,6 @@ public function addProductRelations($parentId, $childIds)
      * @param int $parentId
      * @param array $childIds
      * @return $this
-     * @since 2.0.0
      */
     public function removeProductRelations($parentId, $childIds)
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
index 0c010c81ec0c5..02b34ecdc29cc 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -11,7 +11,6 @@
  * Bundle products Price indexer resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
 {
@@ -28,7 +27,6 @@ protected function reindex($entityIds = null)
      * Retrieve temporary price index table name for fixed bundle products
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBundlePriceTable()
     {
@@ -39,7 +37,6 @@ protected function _getBundlePriceTable()
      * Retrieve table name for temporary bundle selection prices index
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBundleSelectionTable()
     {
@@ -50,7 +47,6 @@ protected function _getBundleSelectionTable()
      * Retrieve table name for temporary bundle option prices index
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBundleOptionTable()
     {
@@ -61,7 +57,6 @@ protected function _getBundleOptionTable()
      * Prepare temporary price index table for fixed bundle products
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareBundlePriceTable()
     {
@@ -73,7 +68,6 @@ protected function _prepareBundlePriceTable()
      * Prepare table structure for temporary bundle selection prices index
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareBundleSelectionTable()
     {
@@ -85,7 +79,6 @@ protected function _prepareBundleSelectionTable()
      * Prepare table structure for temporary bundle option prices index
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareBundleOptionTable()
     {
@@ -100,7 +93,6 @@ protected function _prepareBundleOptionTable()
      * @param int|array $entityIds the entity ids limitation
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareBundlePriceByType($priceType, $entityIds = null)
     {
@@ -243,7 +235,6 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
      * Calculate fixed bundle product selections price
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _calculateBundleOptionPrice()
     {
@@ -323,7 +314,6 @@ protected function _calculateBundleOptionPrice()
      * @param int $priceType
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _calculateBundleSelectionPrice($priceType)
     {
@@ -440,7 +430,6 @@ protected function _calculateBundleSelectionPrice($priceType)
      *
      * @param int|array $entityIds  the entity ids limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareBundlePrice($entityIds = null)
     {
@@ -465,7 +454,6 @@ protected function _prepareBundlePrice($entityIds = null)
      *
      * @param int|array $entityIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareTierPriceIndex($entityIds = null)
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
index 3bd8b29c800cd..fbe9363a1cf38 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
@@ -12,7 +12,6 @@
  * Bundle Stock Status Indexer Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Stock extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
@@ -73,7 +72,6 @@ public function __construct(
      * Retrieve table name for temporary bundle option stock index
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBundleOptionTable()
     {
@@ -86,7 +84,6 @@ protected function _getBundleOptionTable()
      * @param int|array $entityIds
      * @param bool $usePrimaryTable use primary or temporary index table
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryTable = false)
     {
@@ -130,7 +127,6 @@ protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryT
      * @param int|array $entityIds
      * @param bool $usePrimaryTable use primary or temporary index table
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
@@ -166,7 +162,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
      *
      * @param int|array $entityIds  the product limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIndexTable($entityIds = null)
     {
@@ -181,7 +176,6 @@ protected function _prepareIndexTable($entityIds = null)
      *
      * @param array|int $entityIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateIndex($entityIds)
     {
@@ -195,7 +189,6 @@ protected function _updateIndex($entityIds)
      * Clean temporary bundle options stock data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _cleanBundleOptionStockData()
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option.php b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
index 06cb695fa2daf..c0eb69faccc93 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
@@ -12,13 +12,11 @@
 
 /**
  * Bundle Option Resource Model
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Bundle\Model\Option\Validator
-     * @since 2.0.0
      */
     private $validator;
 
@@ -39,7 +37,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Bundle\Model\Option\Validator $validator
      * @param string $connectionName
      * @param EntityManager|null $entityManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -58,7 +55,6 @@ public function __construct(
      * Initialize connection and define resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +79,6 @@ public function removeOptionSelections($optionId)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -124,7 +119,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -148,7 +142,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -193,7 +186,6 @@ public function getSearchableData($productId, $storeId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValidationRulesBeforeSave()
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
index b1bca6fc9037d..39fa5415b969c 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Bundle Options Resource Collection
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * All item ids cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_itemIds;
 
@@ -24,7 +22,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * True when selections appended
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_selectionsAppended = false;
 
@@ -32,7 +29,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Init model and resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +40,6 @@ protected function _construct()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function joinValues($storeId)
     {
@@ -95,7 +90,6 @@ public function joinValues($storeId)
      *
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductIdFilter($productId)
     {
@@ -134,7 +128,6 @@ public function setProductLinkFilter($productLinkFieldValue)
      * Sets order by position
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setPositionOrder()
     {
@@ -151,7 +144,6 @@ public function setPositionOrder()
      * @param bool $stripBefore
      * @param bool $appendAll
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function appendSelections($selectionsCollection, $stripBefore = false, $appendAll = true)
     {
@@ -181,7 +173,6 @@ public function appendSelections($selectionsCollection, $stripBefore = false, $a
      * Removes appended selections before
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _stripSelections()
     {
@@ -197,7 +188,6 @@ protected function _stripSelections()
      *
      * @param array|int $ids
      * @return $this
-     * @since 2.0.0
      */
     public function setIdFilter($ids)
     {
@@ -213,7 +203,6 @@ public function setIdFilter($ids)
      * Reset all item ids cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetAllIds()
     {
@@ -225,7 +214,6 @@ public function resetAllIds()
      * Retrieve all ids for collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
index 2a1084962d500..4db715fbd5adc 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
@@ -15,7 +15,6 @@
  * Bundle Selection Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Selection extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -61,7 +60,6 @@ public function __construct(
      * Define main table and id field
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +75,6 @@ protected function _construct()
      * @param int $parentId
      * @param bool $required
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -133,7 +130,6 @@ public function getChildrenIds($parentId, $required = true)
      *
      * @param int|array $childId
      * @return array
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -161,7 +157,6 @@ public function getParentIdsByChild($childId)
      *
      * @param \Magento\Bundle\Model\Selection $item
      * @return void
-     * @since 2.0.0
      */
     public function saveSelectionPrice($item)
     {
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 89bd939a2335e..c4b977f0fee2d 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -17,7 +17,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -25,7 +24,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Selection table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_selectionTable;
 
@@ -53,7 +51,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Initialize collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +63,6 @@ protected function _construct()
      * Set store id for each collection item when collection was loaded
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _afterLoad()
     {
@@ -83,7 +79,6 @@ public function _afterLoad()
      * Initialize collection select
      *
      * @return $this|void
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -100,7 +95,6 @@ protected function _initSelect()
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function joinPrices($websiteId)
     {
@@ -136,7 +130,6 @@ public function joinPrices($websiteId)
      *
      * @param array $optionIds
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionIdsFilter($optionIds)
     {
@@ -151,7 +144,6 @@ public function setOptionIdsFilter($optionIds)
      *
      * @param array $selectionIds
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectionIdsFilter($selectionIds)
     {
@@ -165,7 +157,6 @@ public function setSelectionIdsFilter($selectionIds)
      * Set position order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setPositionOrder()
     {
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
index cd6dd60dda8f1..4d150c96a6301 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -13,7 +13,6 @@
  * Order pdf items renderer
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
 {
@@ -68,7 +67,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($item)
     {
@@ -107,7 +105,6 @@ public function getChildren($item)
      * @param \Magento\Framework\DataObject $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isShipmentSeparately($item = null)
     {
@@ -146,7 +143,6 @@ public function isShipmentSeparately($item = null)
      * @param \Magento\Framework\DataObject $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isChildCalculated($item = null)
     {
@@ -187,7 +183,6 @@ public function isChildCalculated($item = null)
      * @param \Magento\Framework\DataObject $item
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getBundleOptions($item = null)
     {
@@ -203,7 +198,6 @@ public function getBundleOptions($item = null)
      *
      * @param \Magento\Framework\DataObject $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getSelectionAttributes($item)
     {
@@ -224,7 +218,6 @@ public function getSelectionAttributes($item)
      * @param \Magento\Framework\DataObject $item
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getOrderOptions($item = null)
     {
@@ -248,7 +241,6 @@ public function getOrderOptions($item = null)
      * Retrieve Order Item
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -264,7 +256,6 @@ public function getOrderItem()
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($item)
     {
@@ -291,7 +282,6 @@ public function getValueHtml($item)
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canShowPriceInfo($item)
     {
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index affc02e9275ed..3d7d05396e0fc 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -10,7 +10,6 @@
 
 /**
  * Order creditmemo pdf default items renderer
- * @since 2.0.0
  */
 class Creditmemo extends AbstractItems
 {
@@ -18,7 +17,6 @@ class Creditmemo extends AbstractItems
      * Core string
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -36,7 +34,6 @@ class Creditmemo extends AbstractItems
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -71,7 +68,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 395078eaabc5a..e9a1a8d276a15 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -12,13 +12,11 @@
  * Order invoice pdf default items renderer
  *
  * @codingStandardsIgnoreFile
- * @since 2.0.0
  */
 class Invoice extends AbstractItems
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -36,7 +34,6 @@ class Invoice extends AbstractItems
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -71,7 +68,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index 6f16524f1bbdc..08ccf0618d03e 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -10,13 +10,11 @@
 
 /**
  * Order shipment pdf items renderer
- * @since 2.0.0
  */
 class Shipment extends AbstractItems
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -34,7 +32,6 @@ class Shipment extends AbstractItems
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -69,7 +66,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Bundle/Model/Selection.php b/app/code/Magento/Bundle/Model/Selection.php
index cb1501a972e75..c8d5ba86e8804 100644
--- a/app/code/Magento/Bundle/Model/Selection.php
+++ b/app/code/Magento/Bundle/Model/Selection.php
@@ -29,7 +29,6 @@
  * @method int getSelectionCanChangeQty()
  * @method \Magento\Bundle\Model\Selection setSelectionCanChangeQty(int $value)
  * @api
- * @since 2.0.0
  */
 class Selection extends \Magento\Framework\Model\AbstractModel
 {
@@ -37,7 +36,6 @@ class Selection extends \Magento\Framework\Model\AbstractModel
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData;
 
@@ -48,7 +46,6 @@ class Selection extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Bundle\Model\ResourceModel\Selection $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -66,7 +63,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +74,6 @@ protected function _construct()
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php
index c0de0455e8811..987597196f054 100644
--- a/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php
+++ b/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php
@@ -11,13 +11,11 @@
  * Extended Attributes Source Model
  *
  * @api
- * @since 2.0.0
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Bundle/Model/Source/Option/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Type.php
index 816a8252ec4e1..f129d24ade671 100644
--- a/app/code/Magento/Bundle/Model/Source/Option/Type.php
+++ b/app/code/Magento/Bundle/Model/Source/Option/Type.php
@@ -14,7 +14,6 @@
 /**
  * Class Type
  *
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Framework\Option\ArrayInterface,
@@ -27,10 +26,7 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     const KEY_CODE = 'code';
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $options = [];
 
     /**
@@ -42,7 +38,6 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      * Get Bundle Option Type
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -85,7 +79,6 @@ public function toOptionArray()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -94,7 +87,6 @@ public function getLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -106,7 +98,6 @@ public function getCode()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -118,7 +109,6 @@ public function setLabel($label)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -129,7 +119,6 @@ public function setCode($code)
      * {@inheritdoc}
      *
      * @return \Magento\Bundle\Api\Data\OptionTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -141,7 +130,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
index 3c2b7bb9f7c37..f944ef2d2caff 100644
--- a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
+++ b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Bundle\Observer\AppendUpsellProductsObserver
  *
- * @since 2.0.0
  */
 class AppendUpsellProductsObserver implements ObserverInterface
 {
@@ -18,25 +17,21 @@ class AppendUpsellProductsObserver implements ObserverInterface
      * Bundle data
      *
      * @var \Magento\Bundle\Helper\Data
-     * @since 2.0.0
      */
     protected $bundleData;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Selection
-     * @since 2.0.0
      */
     protected $bundleSelection;
 
     /**
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $productVisibility;
 
@@ -45,7 +40,6 @@ class AppendUpsellProductsObserver implements ObserverInterface
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
      * @param \Magento\Catalog\Model\Config $config
      * @param \Magento\Bundle\Model\ResourceModel\Selection $bundleSelection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Bundle\Helper\Data $bundleData,
@@ -66,7 +60,6 @@ public function __construct(
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php b/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
index f6bebcea6e044..081111d9ed77d 100644
--- a/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
+++ b/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Bundle\Observer\InitOptionRendererObserver
  *
- * @since 2.0.0
  */
 class InitOptionRendererObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class InitOptionRendererObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Bundle/Observer/SetAttributeTabBlockObserver.php b/app/code/Magento/Bundle/Observer/SetAttributeTabBlockObserver.php
index db8273f23e980..8cd65070bbf6a 100644
--- a/app/code/Magento/Bundle/Observer/SetAttributeTabBlockObserver.php
+++ b/app/code/Magento/Bundle/Observer/SetAttributeTabBlockObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Bundle\Observer\SetAttributeTabBlockObserver
  *
- * @since 2.0.0
  */
 class SetAttributeTabBlockObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class SetAttributeTabBlockObserver implements ObserverInterface
      * Catalog helper
      *
      * @var \Magento\Catalog\Helper\Catalog
-     * @since 2.0.0
      */
     protected $helperCatalog;
 
     /**
      * @param \Magento\Catalog\Helper\Catalog $helperCatalog
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Helper\Catalog $helperCatalog)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Catalog\Helper\Catalog $helperCatalog)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/BundleCalculatorInterface.php b/app/code/Magento/Bundle/Pricing/Adjustment/BundleCalculatorInterface.php
index 77445fabe043f..491d7d92b4679 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/BundleCalculatorInterface.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/BundleCalculatorInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * Bundle calculator interface
- * @since 2.0.0
  */
 interface BundleCalculatorInterface extends CalculatorInterface
 {
@@ -20,7 +19,6 @@ interface BundleCalculatorInterface extends CalculatorInterface
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaxAmount($amount, Product $saleableItem, $exclude = null);
 
@@ -29,7 +27,6 @@ public function getMaxAmount($amount, Product $saleableItem, $exclude = null);
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = null);
 
@@ -38,7 +35,6 @@ public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = n
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinRegularAmount($amount, Product $saleableItem, $exclude = null);
 
@@ -50,7 +46,6 @@ public function getMinRegularAmount($amount, Product $saleableItem, $exclude = n
      * @param bool $searchMin
      * @param \Magento\Framework\Pricing\Amount\AmountInterface|null $bundleProductAmount
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getOptionsAmount(
         Product $saleableItem,
@@ -67,7 +62,6 @@ public function getOptionsAmount(
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
      * @param null|bool|string|array $exclude code of adjustment that has to be excluded
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude = null);
 
@@ -78,7 +72,6 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
      * @param Product $bundleProduct
      * @param bool $useRegularPrice
      * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
-     * @since 2.0.0
      */
     public function createSelectionPriceList($option, $bundleProduct, $useRegularPrice = false);
 
@@ -89,7 +82,6 @@ public function createSelectionPriceList($option, $bundleProduct, $useRegularPri
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
      * @param bool $searchMin
      * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
-     * @since 2.0.0
      */
     public function processOptions($option, $selectionPriceList, $searchMin = true);
 
@@ -97,7 +89,6 @@ public function processOptions($option, $selectionPriceList, $searchMin = true);
      * @param float $amount
      * @param Product $saleableItem
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getAmountWithoutOption($amount, Product $saleableItem);
 }
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index 0f2f3e1c7b8b3..4f6776883780b 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -20,25 +20,21 @@
 /**
  * Bundle price calculator
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Calculator implements BundleCalculatorInterface
 {
     /**
      * @var CalculatorBase
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var AmountFactory
-     * @since 2.0.0
      */
     protected $amountFactory;
 
     /**
      * @var BundleSelectionFactory
-     * @since 2.0.0
      */
     protected $selectionFactory;
 
@@ -46,13 +42,11 @@ class Calculator implements BundleCalculatorInterface
      * Tax helper, needed to get rounding setting
      *
      * @var TaxHelper
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -75,7 +69,6 @@ class Calculator implements BundleCalculatorInterface
      * @param TaxHelper $taxHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param SelectionPriceListProviderInterface|null $selectionPriceListProvider
-     * @since 2.0.0
      */
     public function __construct(
         CalculatorBase $calculator,
@@ -102,7 +95,6 @@ public function __construct(
      * @param null|array $context
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAmount($amount, SaleableInterface $saleableItem, $exclude = null, $context = [])
     {
@@ -116,7 +108,6 @@ public function getAmount($amount, SaleableInterface $saleableItem, $exclude = n
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinRegularAmount($amount, Product $saleableItem, $exclude = null)
     {
@@ -130,7 +121,6 @@ public function getMinRegularAmount($amount, Product $saleableItem, $exclude = n
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
     {
@@ -144,7 +134,6 @@ public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
      * @param Product $saleableItem
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = null)
     {
@@ -160,7 +149,6 @@ public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = n
      * @param float $baseAmount
      * @param bool $useRegularPrice
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getOptionsAmount(
         Product $saleableItem,
@@ -188,7 +176,6 @@ public function getOptionsAmount(
      * @param float $amount
      * @param Product $saleableItem
      * @return \Magento\Framework\Pricing\Amount\AmountInterface|void
-     * @since 2.0.0
      */
     public function getAmountWithoutOption($amount, Product $saleableItem)
     {
@@ -206,7 +193,6 @@ public function getAmountWithoutOption($amount, Product $saleableItem)
      * @param bool $searchMin
      * @param bool $useRegularPrice
      * @return array
-     * @since 2.0.0
      */
     protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useRegularPrice = false)
     {
@@ -235,7 +221,6 @@ private function getSelectionPriceListProvider()
      * @param bool $canSkipRequiredOption
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function canSkipOption($option, $canSkipRequiredOption)
     {
@@ -248,7 +233,6 @@ protected function canSkipOption($option, $canSkipRequiredOption)
      * @param Product $bundleProduct
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function hasRequiredOption($bundleProduct)
     {
@@ -267,7 +251,6 @@ function ($item) {
      * @param Product $saleableItem
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function getBundleOptions(Product $saleableItem)
     {
@@ -286,7 +269,6 @@ protected function getBundleOptions(Product $saleableItem)
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude = null)
     {
@@ -305,7 +287,6 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
      * @param null|bool|string|arrayy $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
     {
@@ -326,7 +307,6 @@ protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $
      * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
     {
@@ -392,7 +372,6 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
      * @param Product $bundleProduct
      * @param bool $useRegularPrice
      * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
-     * @since 2.0.0
      */
     public function createSelectionPriceList($option, $bundleProduct, $useRegularPrice = false)
     {
@@ -427,7 +406,6 @@ public function createSelectionPriceList($option, $bundleProduct, $useRegularPri
      * @param bool $searchMin
      * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function processOptions($option, $selectionPriceList, $searchMin = true)
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
index ce38efcbc95d0..995572636e759 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
@@ -11,7 +11,6 @@
 
 /**
  * Bundle option price model
- * @since 2.0.0
  */
 class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterface
 {
@@ -22,19 +21,16 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
 
     /**
      * @var BundleCalculatorInterface
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var BundleSelectionFactory
-     * @since 2.0.0
      */
     protected $selectionFactory;
 
     /**
      * @var float|bool|null
-     * @since 2.0.0
      */
     protected $maximalPrice;
 
@@ -44,7 +40,6 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
      * @param BundleCalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param BundleSelectionFactory $bundleSelectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -60,7 +55,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -74,7 +68,6 @@ public function getValue()
      * Getter for maximal price of options
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getMaxValue()
     {
@@ -88,7 +81,6 @@ public function getMaxValue()
      * Get Options with attached Selections collection
      *
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -114,7 +106,6 @@ public function getOptions()
      *
      * @param \Magento\Bundle\Model\Selection $selection
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getOptionSelectionAmount($selection)
     {
@@ -141,7 +132,6 @@ public function getOptionSelectionAmount($selection)
      *
      * @param bool $searchMin
      * @return bool|float
-     * @since 2.0.0
      */
     protected function calculateOptions($searchMin = true)
     {
@@ -163,7 +153,6 @@ protected function calculateOptions($searchMin = true)
      * Get minimal amount of bundle price with options
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php
index 95609cd930efa..0e47ec0be23a9 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php
@@ -8,7 +8,6 @@
 /**
  * Option price interface
  * @api
- * @since 2.0.0
  */
 interface BundleOptionPriceInterface
 {
@@ -16,14 +15,12 @@ interface BundleOptionPriceInterface
      * Return calculated options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions();
 
     /**
      * @param \Magento\Bundle\Model\Selection $selection
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getOptionSelectionAmount($selection);
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
index 246e3abe70c6c..034b735764011 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
@@ -14,19 +14,16 @@
 
 /**
  * Bundle product regular price model
- * @since 2.0.0
  */
 class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface
 {
     /**
      * @var BundleCalculatorInterface
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var AmountInterface
-     * @since 2.0.0
      */
     protected $maximalPrice;
 
@@ -35,7 +32,6 @@ class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice imp
      * @param float $quantity
      * @param BundleCalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -68,7 +63,6 @@ public function getAmount()
      * Returns max price
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaximalPrice()
     {
@@ -88,7 +82,6 @@ public function getMaximalPrice()
      * Returns min price
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinimalPrice()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
index ad39841d686fd..12e3e27d74057 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
@@ -11,7 +11,6 @@
 /**
  * Bundle selection price factory
  * @api
- * @since 2.0.0
  */
 class BundleSelectionFactory
 {
@@ -24,7 +23,6 @@ class BundleSelectionFactory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -32,7 +30,6 @@ class BundleSelectionFactory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -47,7 +44,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param float $quantity
      * @param array $arguments
      * @return BundleSelectionPrice
-     * @since 2.0.0
      */
     public function create(
         Product $bundleProduct,
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 17916cd3475ef..2eea5190fece5 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -18,7 +18,6 @@
  * Bundle option price
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class BundleSelectionPrice extends AbstractPrice
 {
@@ -29,7 +28,6 @@ class BundleSelectionPrice extends AbstractPrice
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $bundleProduct;
 
@@ -37,25 +35,21 @@ class BundleSelectionPrice extends AbstractPrice
      * Event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var DiscountCalculator
-     * @since 2.0.0
      */
     protected $discountCalculator;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $useRegularPrice;
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $selection;
 
@@ -63,7 +57,6 @@ class BundleSelectionPrice extends AbstractPrice
      * Code of parent adjustment to be skipped from calculation
      *
      * @var string
-     * @since 2.0.0
      */
     protected $excludeAdjustment = null;
 
@@ -77,7 +70,6 @@ class BundleSelectionPrice extends AbstractPrice
      * @param DiscountCalculator $discountCalculator
      * @param bool $useRegularPrice
      * @param array $excludeAdjustment
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -103,7 +95,6 @@ public function __construct(
      * Get the price value for one of selection product
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -154,7 +145,6 @@ public function getValue()
      * Get Price Amount object
      *
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -181,7 +171,6 @@ public function getAmount()
 
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getProduct()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
index 02c953aec0034..ac5a4cbb2cb62 100644
--- a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
@@ -15,7 +15,6 @@
 /**
  * Configured price model
  * @api
- * @since 2.0.0
  */
 class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPriceInterface
 {
@@ -26,13 +25,11 @@ class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPrice
 
     /**
      * @var BundleCalculatorInterface
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var null|ItemInterface
-     * @since 2.0.0
      */
     protected $item;
 
@@ -51,7 +48,6 @@ class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPrice
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param ItemInterface $item
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -70,7 +66,6 @@ public function __construct(
     /**
      * @param ItemInterface $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(ItemInterface $item)
     {
@@ -82,7 +77,6 @@ public function setItem(ItemInterface $item)
      * Get Options with attached Selections collection
      *
      * @return array|\Magento\Bundle\Model\ResourceModel\Option\Collection
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -116,7 +110,6 @@ public function getOptions()
      *
      * @param float $baseValue
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getConfiguredAmount($baseValue = 0.)
     {
@@ -138,7 +131,6 @@ public function getConfiguredAmount($baseValue = 0.)
      * Get price value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -157,7 +149,6 @@ public function getValue()
      * Get Amount for configured price which is included amount for all selected options
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php b/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
index e27716e613e07..6990149efc373 100644
--- a/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
+++ b/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
@@ -10,7 +10,6 @@
 
 /**
  * Class DiscountCalculator
- * @since 2.0.0
  */
 class DiscountCalculator
 {
@@ -20,7 +19,6 @@ class DiscountCalculator
      * @param Product $product
      * @param float|null $value
      * @return float|null
-     * @since 2.0.0
      */
     public function calculateDiscount(Product $product, $value = null)
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/DiscountProviderInterface.php b/app/code/Magento/Bundle/Pricing/Price/DiscountProviderInterface.php
index 5a43c34673ad2..99a5c3eee269b 100644
--- a/app/code/Magento/Bundle/Pricing/Price/DiscountProviderInterface.php
+++ b/app/code/Magento/Bundle/Pricing/Price/DiscountProviderInterface.php
@@ -9,13 +9,11 @@
 /**
  * Interface DiscountProviderInterface
  * @api
- * @since 2.0.0
  */
 interface DiscountProviderInterface
 {
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountPercent();
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
index 41d0f47fb9700..e431189356982 100644
--- a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
@@ -15,31 +15,26 @@
 
 /**
  * Final price model
- * @since 2.0.0
  */
 class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements FinalPriceInterface
 {
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $maximalPrice;
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $minimalPrice;
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $priceWithoutOption;
 
     /**
      * @var \Magento\Bundle\Pricing\Price\BundleOptionPrice
-     * @since 2.0.0
      */
     protected $bundleOptionPrice;
 
@@ -54,7 +49,6 @@ class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements Fi
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -69,7 +63,6 @@ public function __construct(
      * Returns price value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -81,7 +74,6 @@ public function getValue()
      * Returns max price
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaximalPrice()
     {
@@ -118,7 +110,6 @@ private function getProductOptionRepository()
      * Returns min price
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinimalPrice()
     {
@@ -129,7 +120,6 @@ public function getMinimalPrice()
      * Returns price amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -168,7 +158,6 @@ private function loadProductCustomOptions()
      * get bundle product price without any option
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getPriceWithoutOption()
     {
@@ -182,7 +171,6 @@ public function getPriceWithoutOption()
      * Returns option price
      *
      * @return \Magento\Bundle\Pricing\Price\BundleOptionPrice
-     * @since 2.0.0
      */
     protected function getBundleOptionPrice()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/FinalPriceInterface.php b/app/code/Magento/Bundle/Pricing/Price/FinalPriceInterface.php
index 9c25fd7455437..cbb2232db300a 100644
--- a/app/code/Magento/Bundle/Pricing/Price/FinalPriceInterface.php
+++ b/app/code/Magento/Bundle/Pricing/Price/FinalPriceInterface.php
@@ -9,13 +9,11 @@
 /**
  * Interface FinalPriceInterface
  * @api
- * @since 2.0.0
  */
 interface FinalPriceInterface extends \Magento\Catalog\Pricing\Price\FinalPriceInterface
 {
     /**
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getPriceWithoutOption();
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/RegularPriceInterface.php b/app/code/Magento/Bundle/Pricing/Price/RegularPriceInterface.php
index 49de6a5f4e44d..ab6305c1d5132 100644
--- a/app/code/Magento/Bundle/Pricing/Price/RegularPriceInterface.php
+++ b/app/code/Magento/Bundle/Pricing/Price/RegularPriceInterface.php
@@ -9,7 +9,6 @@
 /**
  * Regular price interface
  * @api
- * @since 2.0.0
  */
 interface RegularPriceInterface extends \Magento\Framework\Pricing\Price\BasePriceProviderInterface
 {
@@ -17,7 +16,6 @@ interface RegularPriceInterface extends \Magento\Framework\Pricing\Price\BasePri
      * Get Minimal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinimalPrice();
 
@@ -25,7 +23,6 @@ public function getMinimalPrice();
      * Get Maximal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaximalPrice();
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/SpecialPrice.php b/app/code/Magento/Bundle/Pricing/Price/SpecialPrice.php
index 884685fdd869f..a1697525c1eda 100644
--- a/app/code/Magento/Bundle/Pricing/Price/SpecialPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/SpecialPrice.php
@@ -10,13 +10,11 @@
 
 /**
  * Special price model
- * @since 2.0.0
  */
 class SpecialPrice extends \Magento\Catalog\Pricing\Price\SpecialPrice implements DiscountProviderInterface
 {
     /**
      * @var float|false
-     * @since 2.0.0
      */
     protected $percent;
 
@@ -24,7 +22,6 @@ class SpecialPrice extends \Magento\Catalog\Pricing\Price\SpecialPrice implement
      * Returns discount percent
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getDiscountPercent()
     {
@@ -38,7 +35,6 @@ public function getDiscountPercent()
      * Returns price value
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -60,7 +56,6 @@ public function getValue()
      * Returns regular price
      *
      * @return bool|float
-     * @since 2.0.0
      */
     protected function getRegularPrice()
     {
@@ -69,7 +64,6 @@ protected function getRegularPrice()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/TierPrice.php b/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
index 06913d9f9ae7a..121b43bc0428a 100644
--- a/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
@@ -12,19 +12,16 @@
 
 /**
  * Bundle tier prices model
- * @since 2.0.0
  */
 class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice implements DiscountProviderInterface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $filterByBasePrice = false;
 
     /**
      * @var float|false
-     * @since 2.0.0
      */
     protected $percent;
 
@@ -32,7 +29,6 @@ class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice implements Disc
      * Returns percent discount
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getDiscountPercent()
     {
@@ -64,7 +60,6 @@ public function getDiscountPercent()
      * Returns pricing value
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -86,7 +81,6 @@ public function getValue()
      * Returns regular price
      *
      * @return bool|float
-     * @since 2.0.0
      */
     protected function getRegularPrice()
     {
@@ -101,7 +95,6 @@ protected function getRegularPrice()
      * @param float $firstPrice
      * @param float $secondPrice
      * @return bool
-     * @since 2.0.0
      */
     protected function isFirstPriceBetter($firstPrice, $secondPrice)
     {
@@ -110,7 +103,6 @@ protected function isFirstPriceBetter($firstPrice, $secondPrice)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount()
     {
diff --git a/app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php
index dd6d933c6938b..1265f9be06d94 100644
--- a/app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php
@@ -12,7 +12,6 @@
 
 /**
  * Class for final_price rendering
- * @since 2.0.0
  */
 class FinalPriceBox extends CatalogRender\FinalPriceBox
 {
@@ -20,7 +19,6 @@ class FinalPriceBox extends CatalogRender\FinalPriceBox
      * Check if bundle product has one or more options, or custom options, with different prices
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showRangePrice()
     {
diff --git a/app/code/Magento/Bundle/Setup/InstallData.php b/app/code/Magento/Bundle/Setup/InstallData.php
index ee7ed4b354961..6a3ff08c4d781 100644
--- a/app/code/Magento/Bundle/Setup/InstallData.php
+++ b/app/code/Magento/Bundle/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -40,7 +37,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Bundle/Setup/InstallSchema.php b/app/code/Magento/Bundle/Setup/InstallSchema.php
index 3df1cee45f812..662938034976e 100644
--- a/app/code/Magento/Bundle/Setup/InstallSchema.php
+++ b/app/code/Magento/Bundle/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Bundle/Setup/UpgradeSchema.php b/app/code/Magento/Bundle/Setup/UpgradeSchema.php
index d28bf0d7e60d9..00ecd8c20728f 100755
--- a/app/code/Magento/Bundle/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Bundle/Setup/UpgradeSchema.php
@@ -12,7 +12,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
@@ -20,7 +19,6 @@ class UpgradeSchema implements UpgradeSchemaInterface
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/BundleImportExport/Model/Export/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Export/Product/Type/Bundle.php
index cbf35f8615fd5..a75e8ba41b73a 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/Product/Type/Bundle.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Bundle
- * @since 2.0.0
  */
 class Bundle extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
 {
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
index 466f26aa6b91d..e30ad30fde16c 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -15,7 +15,6 @@
 
 /**
  * Class RowCustomizer
- * @since 2.0.0
  */
 class RowCustomizer implements RowCustomizerInterface
 {
@@ -43,7 +42,6 @@ class RowCustomizer implements RowCustomizerInterface
      * Mapping for bundle types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $typeMapping = [
         '0' => self::VALUE_DYNAMIC,
@@ -54,7 +52,6 @@ class RowCustomizer implements RowCustomizerInterface
      * Mapping for price views
      *
      * @var array
-     * @since 2.0.0
      */
     protected $priceViewMapping = [
         '0' => self::VALUE_PRICE_RANGE,
@@ -65,7 +62,6 @@ class RowCustomizer implements RowCustomizerInterface
      * Mapping for price types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $priceTypeMapping = [
         '0' => self::VALUE_FIXED,
@@ -76,7 +72,6 @@ class RowCustomizer implements RowCustomizerInterface
      * Bundle product columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $bundleColumns = [
         self::BUNDLE_PRICE_TYPE_COL,
@@ -90,7 +85,6 @@ class RowCustomizer implements RowCustomizerInterface
      * Product's bundle data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $bundleData = [];
 
@@ -129,7 +123,6 @@ private function getBundleColumns()
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param int[] $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function prepareData($collection, $productIds)
     {
@@ -150,7 +143,6 @@ public function prepareData($collection, $productIds)
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     public function addHeaderColumns($columns)
     {
@@ -165,7 +157,6 @@ public function addHeaderColumns($columns)
      * @param array $dataRow
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function addData($dataRow, $productId)
     {
@@ -183,7 +174,6 @@ public function addData($dataRow, $productId)
      * @param int $productId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAdditionalRowsCount($additionalRowsCount, $productId)
     {
@@ -195,7 +185,6 @@ public function getAdditionalRowsCount($additionalRowsCount, $productId)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     protected function populateBundleData($collection)
     {
@@ -218,7 +207,6 @@ protected function populateBundleData($collection)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     protected function getFormattedBundleOptionValues($product)
     {
@@ -246,7 +234,6 @@ protected function getFormattedBundleOptionValues($product)
      * @param string $optionValues
      * @param SelectionCollection $selections
      * @return string
-     * @since 2.0.0
      */
     protected function getFormattedBundleSelections($optionValues, SelectionCollection $selections)
     {
@@ -283,7 +270,6 @@ function ($value, $key) {
      *
      * @param \Magento\Bundle\Model\Option $option
      * @return string
-     * @since 2.0.0
      */
     protected function getFormattedOptionValues($option)
     {
@@ -300,7 +286,6 @@ protected function getFormattedOptionValues($option)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function getTypeValue($type)
     {
@@ -312,7 +297,6 @@ protected function getTypeValue($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function getPriceViewValue($type)
     {
@@ -324,7 +308,6 @@ protected function getPriceViewValue($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function getPriceTypeValue($type)
     {
@@ -348,7 +331,6 @@ private function getShipmentTypeValue($type)
      *
      * @param array $dataRow
      * @return array
-     * @since 2.0.0
      */
     protected function cleanNotBundleAdditionalAttributes($dataRow)
     {
@@ -365,7 +347,6 @@ protected function cleanNotBundleAdditionalAttributes($dataRow)
      *
      * @param array $additionalAttributes
      * @return string
-     * @since 2.0.0
      */
     protected function getNotBundleAttributes($additionalAttributes)
     {
@@ -383,7 +364,7 @@ protected function getNotBundleAttributes($additionalAttributes)
      *
      * @param string $additionalAttributes
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function parseAdditionalAttributes($additionalAttributes)
     {
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index c3bd9fbf07ec5..66044784a262f 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -17,7 +17,6 @@
  * Class Bundle
  * @package Magento\BundleImportExport\Model\Import\Product\Type
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
@@ -61,7 +60,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Array of cached options.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cachedOptions = [];
 
@@ -69,7 +67,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Array of cached skus.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cachedSkus = [];
 
@@ -77,7 +74,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Mapping array between cached skus and products.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cachedSkuToProducts = [];
 
@@ -85,7 +81,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Array of queries selecting cached options.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cachedOptionSelectQuery = [];
 
@@ -93,7 +88,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [
         'price_type',
@@ -105,7 +99,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Custom fields mapping.
      *
      * @inherited
-     * @since 2.0.0
      */
     protected $_customFieldsMapping = [
         'price_type' => 'bundle_price_type',
@@ -119,7 +112,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Bundle field mapping.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_bundleFieldMapping = [
         'is_default' => 'default',
@@ -131,7 +123,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Option type mapping.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionTypeMapping = [
         'dropdown' => 'select',
@@ -153,7 +144,6 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * @param array $params
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
      * @param Bundle\RelationsDataSaver|null $relationsDataSaver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
@@ -176,7 +166,6 @@ public function __construct(
      * @param int $entityId
      *
      * @return array
-     * @since 2.0.0
      */
     protected function parseSelections($rowData, $entityId)
     {
@@ -219,7 +208,6 @@ protected function parseSelections($rowData, $entityId)
      * @param array $values
      *
      * @return array
-     * @since 2.0.0
      */
     protected function parseOption($values)
     {
@@ -248,7 +236,6 @@ protected function parseOption($values)
      * @param int $index
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function populateOptionTemplate($option, $entityId, $index = null)
     {
@@ -273,7 +260,6 @@ protected function populateOptionTemplate($option, $entityId, $index = null)
      * @param int $storeId
      *
      * @return array|bool
-     * @since 2.0.0
      */
     protected function populateOptionValueTemplate($option, $optionId, $storeId = 0)
     {
@@ -298,7 +284,6 @@ protected function populateOptionValueTemplate($option, $optionId, $storeId = 0)
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function populateSelectionTemplate($selection, $optionId, $parentId, $index)
     {
@@ -333,7 +318,6 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
      * Retrieve mapping between skus and products.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function retrieveProducsByCachedSkus()
     {
@@ -353,7 +337,6 @@ protected function retrieveProducsByCachedSkus()
      * Save product type specific data.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function saveData()
     {
@@ -399,7 +382,6 @@ public function saveData()
      * @param int $rowNum
      * @param bool $isNewProduct
      * @return bool
-     * @since 2.0.0
      */
     public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
     {
@@ -416,7 +398,6 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
      * @param array $rowData
      * @param bool $withDefaultValue
      * @return array
-     * @since 2.0.0
      */
     public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDefaultValue = true)
     {
@@ -430,7 +411,6 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function transformBundleCustomAttributes($rowData)
     {
@@ -460,7 +440,6 @@ protected function transformBundleCustomAttributes($rowData)
      * Populates existing options.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function populateExistingOptions()
     {
@@ -494,7 +473,6 @@ protected function populateExistingOptions()
      * @param array $existingOptions
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function populateExistingSelections($existingOptions)
     {
@@ -536,7 +514,6 @@ protected function populateExistingSelections($existingOptions)
      * Insert options.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function insertOptions()
     {
@@ -581,7 +558,6 @@ protected function insertOptions()
      * Populate array for insert option values
      * @param array $optionIds
      * @return array
-     * @since 2.0.0
      */
     protected function populateInsertOptionValues($optionIds)
     {
@@ -606,7 +582,6 @@ protected function populateInsertOptionValues($optionIds)
      * Insert selections.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function insertSelections()
     {
@@ -641,7 +616,6 @@ protected function insertSelections()
      * Initialize attributes parameters for all attributes' sets.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributes()
     {
@@ -673,7 +647,6 @@ protected function _initAttributes()
      * @param array $productIds
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function deleteOptionsAndSelections($productIds)
     {
@@ -710,7 +683,6 @@ protected function deleteOptionsAndSelections($productIds)
      * Clear cached values between bunches
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function clear()
     {
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index bb81fd3966daa..bce790b7017cc 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CacheInvalidate\Model\PurgeCache
  *
- * @since 2.0.0
  */
 class PurgeCache
 {
@@ -18,19 +17,16 @@ class PurgeCache
 
     /**
      * @var \Magento\PageCache\Model\Cache\Server
-     * @since 2.0.0
      */
     protected $cacheServer;
 
     /**
      * @var \Magento\CacheInvalidate\Model\SocketFactory
-     * @since 2.0.0
      */
     protected $socketAdapterFactory;
 
     /**
      * @var InvalidateLogger
-     * @since 2.0.0
      */
     private $logger;
 
@@ -40,7 +36,6 @@ class PurgeCache
      * @param \Magento\PageCache\Model\Cache\Server $cacheServer
      * @param \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory
      * @param InvalidateLogger $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Cache\Server $cacheServer,
@@ -58,7 +53,6 @@ public function __construct(
      *
      * @param string $tagsPattern
      * @return bool Return true if successful; otherwise return false
-     * @since 2.0.0
      */
     public function sendPurgeRequest($tagsPattern)
     {
diff --git a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
index 5778e24b1c6bc..c58d3306121d1 100644
--- a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
+++ b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\CacheInvalidate\Model\SocketFactory
  *
- * @since 2.0.0
  */
 class SocketFactory
 {
     /**
      * @return \Zend\Http\Client\Adapter\Socket
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
index 470df549153c1..8930b59624db8 100644
--- a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CacheInvalidate\Observer\FlushAllCacheObserver
  *
- * @since 2.0.0
  */
 class FlushAllCacheObserver implements ObserverInterface
 {
@@ -18,20 +17,17 @@ class FlushAllCacheObserver implements ObserverInterface
      * Application config object
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\CacheInvalidate\Model\PurgeCache
-     * @since 2.0.0
      */
     protected $purgeCache;
 
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\CacheInvalidate\Model\PurgeCache $purgeCache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -47,7 +43,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index 308b3dbc57d95..621f39a65e414 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver
  *
- * @since 2.0.0
  */
 class InvalidateVarnishObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class InvalidateVarnishObserver implements ObserverInterface
      * Application config object
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\CacheInvalidate\Model\PurgeCache
-     * @since 2.0.0
      */
     protected $purgeCache;
 
@@ -32,14 +29,13 @@ class InvalidateVarnishObserver implements ObserverInterface
      * Invalidation tags resolver
      *
      * @var \Magento\Framework\App\Cache\Tag\Resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $tagResolver;
 
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\CacheInvalidate\Model\PurgeCache $purgeCache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -55,7 +51,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -78,9 +73,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return \Magento\Framework\App\Cache\Tag\Resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getTagResolver()
     {
diff --git a/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
index 8288cc394824b..8d6fe96022313 100644
--- a/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
@@ -8,19 +8,16 @@
 
 /**
  * Captcha block for adminhtml area
- * @since 2.0.0
  */
 class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
 {
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -30,7 +27,6 @@ class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
      * @param \Magento\Backend\Model\UrlInterface $url
      * @param \Magento\Backend\App\ConfigInterface $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Returns URL to controller action which returns new captcha image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRefreshUrl()
     {
diff --git a/app/code/Magento/Captcha/Block/Captcha.php b/app/code/Magento/Captcha/Block/Captcha.php
index 3546336e13d7d..e4c686b2aa7c2 100644
--- a/app/code/Magento/Captcha/Block/Captcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Captcha extends \Magento\Framework\View\Element\Template
 {
@@ -21,7 +20,6 @@ class Captcha extends \Magento\Framework\View\Element\Template
      * Captcha data
      *
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_captchaData = null;
 
@@ -29,7 +27,6 @@ class Captcha extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Captcha\Helper\Data $captchaData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Renders captcha HTML (if required)
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
index 6db81b95dadfc..c0a091ca2d0d9 100644
--- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -7,25 +7,21 @@
 
 /**
  * Captcha block
- * @since 2.0.0
  */
 class DefaultCaptcha extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'default.phtml';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_captcha;
 
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_captchaData;
 
@@ -33,7 +29,6 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Captcha\Helper\Data $captchaData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -48,7 +43,6 @@ public function __construct(
      * Returns template path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplate()
     {
@@ -59,7 +53,6 @@ public function getTemplate()
      * Returns URL to controller action which returns new captcha image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRefreshUrl()
     {
@@ -71,7 +64,6 @@ public function getRefreshUrl()
      * Renders captcha HTML (if required)
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -86,7 +78,6 @@ protected function _toHtml()
      * Returns captcha model
      *
      * @return \Magento\Captcha\Model\CaptchaInterface
-     * @since 2.0.0
      */
     public function getCaptchaModel()
     {
diff --git a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php
index ad88187dd4852..8ccfab08d0981 100644
--- a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php
+++ b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Captcha\Controller\Adminhtml\Refresh\Refresh
  *
- * @since 2.0.0
  */
 class Refresh extends \Magento\Backend\App\Action
 {
@@ -46,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -67,7 +65,6 @@ public function execute()
      * Check if user has permissions to access this controller
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
index d730f84f1d06b..f50306ba1af16 100644
--- a/app/code/Magento/Captcha/Controller/Refresh/Index.php
+++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Captcha\Controller\Refresh\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $captchaHelper;
 
@@ -34,7 +32,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param \Magento\Captcha\Helper\Data $captchaHelper
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -49,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php b/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php
index 002424594b8d5..cb5f1c4547507 100644
--- a/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php
+++ b/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php
@@ -9,13 +9,11 @@
 
 /**
  * Captcha cron actions
- * @since 2.0.0
  */
 class DeleteExpiredImages
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -23,19 +21,16 @@ class DeleteExpiredImages
      * CAPTCHA helper
      *
      * @var \Magento\Captcha\Helper\Adminhtml\Data
-     * @since 2.0.0
      */
     protected $_adminHelper;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
     /**
      * @var \Magento\Store\Model\StoreManager
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -44,7 +39,6 @@ class DeleteExpiredImages
      * @param \Magento\Captcha\Helper\Adminhtml\Data $adminHelper
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Store\Model\StoreManager $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -62,7 +56,6 @@ public function __construct(
      * Delete Expired Captcha Images
      *
      * @return \Magento\Captcha\Cron\DeleteExpiredImages
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -81,7 +74,6 @@ public function execute()
      * @param \Magento\Store\Model\Website|null $website
      * @param \Magento\Store\Model\Store|null $store
      * @return void
-     * @since 2.0.0
      */
     protected function _deleteExpiredImagesForWebsite(
         \Magento\Captcha\Helper\Data $helper,
diff --git a/app/code/Magento/Captcha/Cron/DeleteOldAttempts.php b/app/code/Magento/Captcha/Cron/DeleteOldAttempts.php
index 0133e9a48c9ba..0e635122ab540 100644
--- a/app/code/Magento/Captcha/Cron/DeleteOldAttempts.php
+++ b/app/code/Magento/Captcha/Cron/DeleteOldAttempts.php
@@ -7,19 +7,16 @@
 
 /**
  * Captcha cron actions
- * @since 2.0.0
  */
 class DeleteOldAttempts
 {
     /**
      * @var \Magento\Captcha\Model\ResourceModel\LogFactory
-     * @since 2.0.0
      */
     protected $resLogFactory;
 
     /**
      * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
@@ -31,7 +28,6 @@ public function __construct(
      * Delete Unnecessary logged attempts
      *
      * @return \Magento\Captcha\Cron\DeleteOldAttempts
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
index c7de2c2da6c08..6d268308f84c1 100644
--- a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
+++ b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Captcha\Helper\Adminhtml\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Captcha\Helper\Data
 {
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_backendConfig;
 
@@ -30,7 +28,6 @@ class Data extends \Magento\Captcha\Helper\Data
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Captcha\Model\CaptchaFactory $factory
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * @param string $key The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\App\Config\Element
-     * @since 2.0.0
      */
     public function getConfig($key, $store = null)
     {
@@ -61,7 +57,6 @@ public function getConfig($key, $store = null)
      *
      * @param mixed $website
      * @return string
-     * @since 2.0.0
      */
     protected function _getWebsiteCode($website = null)
     {
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index b4dad5f98c935..9372510911f7f 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -13,7 +13,6 @@
  * Captcha image model
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -45,25 +44,21 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * List uses Models of Captcha
      * @var array
-     * @since 2.0.0
      */
     protected $_captcha = [];
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Captcha\Model\CaptchaFactory
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -72,7 +67,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Filesystem $filesystem
      * @param \Magento\Captcha\Model\CaptchaFactory $factory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -91,7 +85,6 @@ public function __construct(
      *
      * @param string $formId
      * @return \Magento\Captcha\Model\CaptchaInterface
-     * @since 2.0.0
      */
     public function getCaptcha($formId)
     {
@@ -114,7 +107,6 @@ public function getCaptcha($formId)
      * @param string $key The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\App\Config\Element
-     * @since 2.0.0
      */
     public function getConfig($key, $store = null)
     {
@@ -132,7 +124,6 @@ public function getConfig($key, $store = null)
      * [['arial'] => ['label' => 'Arial', 'path' => '/www/magento/fonts/arial.ttf']]
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFonts()
     {
@@ -155,7 +146,6 @@ public function getFonts()
      *
      * @param mixed $website
      * @return string
-     * @since 2.0.0
      */
     public function getImgDir($website = null)
     {
@@ -170,7 +160,6 @@ public function getImgDir($website = null)
      *
      * @param mixed $website
      * @return string
-     * @since 2.0.0
      */
     protected function _getWebsiteCode($website = null)
     {
@@ -182,7 +171,6 @@ protected function _getWebsiteCode($website = null)
      *
      * @param mixed $website
      * @return string
-     * @since 2.0.0
      */
     public function getImgUrl($website = null)
     {
diff --git a/app/code/Magento/Captcha/Model/CaptchaFactory.php b/app/code/Magento/Captcha/Model/CaptchaFactory.php
index 5cbc7ff93d805..3b2cf5aa2f076 100644
--- a/app/code/Magento/Captcha/Model/CaptchaFactory.php
+++ b/app/code/Magento/Captcha/Model/CaptchaFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Captcha\Model\CaptchaFactory
  *
- * @since 2.0.0
  */
 class CaptchaFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $formId
      * @return \Magento\Captcha\Model\CaptchaInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($captchaType, $formId)
     {
diff --git a/app/code/Magento/Captcha/Model/CaptchaInterface.php b/app/code/Magento/Captcha/Model/CaptchaInterface.php
index 4806fc1e2d836..9ee81e4b19f50 100644
--- a/app/code/Magento/Captcha/Model/CaptchaInterface.php
+++ b/app/code/Magento/Captcha/Model/CaptchaInterface.php
@@ -11,7 +11,6 @@
  * Captcha Model Interface
  *
  * @api
- * @since 2.0.0
  */
 interface CaptchaInterface
 {
@@ -20,7 +19,6 @@ interface CaptchaInterface
      *
      * @abstract
      * @return void
-     * @since 2.0.0
      */
     public function generate();
 
@@ -30,14 +28,12 @@ public function generate();
      * @param string $word
      * @return bool
      * @abstract
-     * @since 2.0.0
      */
     public function isCorrect($word);
 
     /**
      * Get Block Name
      * @return string
-     * @since 2.0.0
      */
     public function getBlockName();
 }
diff --git a/app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php b/app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php
index 05198231f3ccd..4fe0cef2d8fa9 100644
--- a/app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php
+++ b/app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Captcha\Model\Cart\ConfigPlugin
  *
- * @since 2.0.0
  */
 class ConfigPlugin
 {
     /**
      * @var \Magento\Captcha\Model\Checkout\ConfigProvider
-     * @since 2.0.0
      */
     protected $configProvider;
 
     /**
      * @param \Magento\Captcha\Model\Checkout\ConfigProvider $configProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Model\Checkout\ConfigProvider $configProvider
@@ -34,7 +31,6 @@ public function __construct(
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetConfig(\Magento\Checkout\Block\Cart\Sidebar $subject, array $result)
     {
diff --git a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
index 4a6a94252424a..9cc579b7ffd79 100644
--- a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Captcha\Model\Checkout\ConfigProvider
  *
- * @since 2.0.0
  */
 class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $captchaData;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $formIds;
 
@@ -34,7 +30,6 @@ class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Captcha\Helper\Data $captchaData
      * @param array $formIds
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -48,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -70,7 +64,6 @@ public function getConfig()
      *
      * @param string $formId
      * @return bool
-     * @since 2.0.0
      */
     protected function isCaseSensitive($formId)
     {
@@ -82,7 +75,6 @@ protected function isCaseSensitive($formId)
      *
      * @param string $formId
      * @return int
-     * @since 2.0.0
      */
     protected function getImageHeight($formId)
     {
@@ -94,7 +86,6 @@ protected function getImageHeight($formId)
      *
      * @param string $formId
      * @return string
-     * @since 2.0.0
      */
     protected function getImageSrc($formId)
     {
@@ -110,7 +101,6 @@ protected function getImageSrc($formId)
      * Returns URL to controller action which returns new captcha image
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getRefreshUrl()
     {
@@ -123,7 +113,6 @@ protected function getRefreshUrl()
      *
      * @param string $formId
      * @return bool
-     * @since 2.0.0
      */
     protected function isRequired($formId)
     {
@@ -135,7 +124,6 @@ protected function isRequired($formId)
      *
      * @param string $formId
      * @return \Magento\Captcha\Model\CaptchaInterface
-     * @since 2.0.0
      */
     protected function getCaptchaModel($formId)
     {
diff --git a/app/code/Magento/Captcha/Model/Config/Font.php b/app/code/Magento/Captcha/Model/Config/Font.php
index 6ae79f1689f8c..956cb0d7c9cf1 100644
--- a/app/code/Magento/Captcha/Model/Config/Font.php
+++ b/app/code/Magento/Captcha/Model/Config/Font.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Captcha\Model\Config\Font
  *
- * @since 2.0.0
  */
 class Font implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,13 +21,11 @@ class Font implements \Magento\Framework\Option\ArrayInterface
      * Captcha data
      *
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_captchaData = null;
 
     /**
      * @param \Magento\Captcha\Helper\Data $captchaData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Captcha\Helper\Data $captchaData)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Captcha\Helper\Data $captchaData)
      * Get options for font selection field
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
index 5b82f61ebbaf3..d33ea3a147e34 100644
--- a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
+++ b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Captcha\Model\Config\Form\AbstractForm
  *
- * @since 2.0.0
  */
 abstract class AbstractForm extends Value implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configPath;
 
@@ -30,7 +28,6 @@ abstract class AbstractForm extends Value implements \Magento\Framework\Option\A
      * Returns options for form multiselect
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Captcha/Model/Config/Form/Backend.php b/app/code/Magento/Captcha/Model/Config/Form/Backend.php
index 78a837fde304b..6b49a7cd4b613 100644
--- a/app/code/Magento/Captcha/Model/Config/Form/Backend.php
+++ b/app/code/Magento/Captcha/Model/Config/Form/Backend.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Captcha\Model\Config\Form\Backend
  *
- * @since 2.0.0
  */
 class Backend extends \Magento\Captcha\Model\Config\Form\AbstractForm
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configPath = 'captcha/backend/areas';
 }
diff --git a/app/code/Magento/Captcha/Model/Config/Form/Frontend.php b/app/code/Magento/Captcha/Model/Config/Form/Frontend.php
index 3c53c1acdef96..9a4c54452ea6a 100644
--- a/app/code/Magento/Captcha/Model/Config/Form/Frontend.php
+++ b/app/code/Magento/Captcha/Model/Config/Form/Frontend.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Captcha\Model\Config\Form\Frontend
  *
- * @since 2.0.0
  */
 class Frontend extends \Magento\Captcha\Model\Config\Form\AbstractForm
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configPath = 'captcha/frontend/areas';
 }
diff --git a/app/code/Magento/Captcha/Model/Config/Mode.php b/app/code/Magento/Captcha/Model/Config/Mode.php
index 31f5e58567c66..a211a1c5d1836 100644
--- a/app/code/Magento/Captcha/Model/Config/Mode.php
+++ b/app/code/Magento/Captcha/Model/Config/Mode.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Captcha\Model\Config\Mode
  *
- * @since 2.0.0
  */
 class Mode implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class Mode implements \Magento\Framework\Option\ArrayInterface
      * Get options for captcha mode selection field
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
index 5bdec5e5b1952..33a493c796ab4 100644
--- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
+++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Captcha\Model\Customer\Plugin\AjaxLogin
  *
- * @since 2.0.0
  */
 class AjaxLogin
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $sessionManager;
 
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -42,7 +38,6 @@ class AjaxLogin
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $formIds;
 
@@ -53,7 +48,6 @@ class AjaxLogin
      * @param array $formIds
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         CaptchaHelper $helper,
@@ -76,7 +70,6 @@ public function __construct(
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function aroundExecute(
         \Magento\Customer\Controller\Ajax\Login $subject,
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index 1986a6392a9a5..2cb276a7349de 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -9,7 +9,6 @@
  * Implementation of \Zend\Captcha\Image
  *
  * @api
- * @since 2.0.0
  */
 class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model\CaptchaInterface
 {
@@ -82,7 +81,6 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
      * @param ResourceModel\LogFactory $resLogFactory
      * @param string $formId
      * @throws \Zend\Captcha\Exception\ExtensionNotLoadedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Session\SessionManagerInterface $session,
@@ -113,7 +111,6 @@ private function getFormIdKey($key)
      * Get Block Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBlockName()
     {
@@ -125,7 +122,6 @@ public function getBlockName()
      *
      * @param null|string $login
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired($login = null)
     {
@@ -149,7 +145,6 @@ public function isRequired($login = null)
      * Check if CAPTCHA has to be shown to logged in user on this form
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShownToLoggedInUser()
     {
@@ -239,7 +234,6 @@ private function isUserAuth()
      * Whether to respect case while checking the answer
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCaseSensitive()
     {
@@ -250,7 +244,6 @@ public function isCaseSensitive()
      * Get font to use when generating captcha
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFont()
     {
@@ -271,7 +264,6 @@ public function getFont()
      * After this time isCorrect() is going to return FALSE even if word was guessed correctly
      *
      * @return int
-     * @since 2.0.0
      */
     public function getExpiration()
     {
@@ -289,7 +281,6 @@ public function getExpiration()
      * Get timeout for session token
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimeout()
     {
@@ -300,7 +291,6 @@ public function getTimeout()
      * Get captcha image directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImgDir()
     {
@@ -311,7 +301,6 @@ public function getImgDir()
      * Get captcha image base URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImgUrl()
     {
@@ -323,7 +312,6 @@ public function getImgUrl()
      *
      * @param string $word
      * @return bool
-     * @since 2.0.0
      */
     public function isCorrect($word)
     {
@@ -345,7 +333,6 @@ public function isCorrect($word)
      * Return full URL to captcha image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImgSrc()
     {
@@ -357,7 +344,6 @@ public function getImgSrc()
      *
      * @param string $login
      * @return $this
-     * @since 2.0.0
      */
     public function logAttempt($login)
     {
@@ -502,7 +488,6 @@ private function getTargetForms()
      * Get captcha word
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWord()
     {
diff --git a/app/code/Magento/Captcha/Model/ResourceModel/Log.php b/app/code/Magento/Captcha/Model/ResourceModel/Log.php
index 06d518be9860b..95b7d3a5a0a03 100644
--- a/app/code/Magento/Captcha/Model/ResourceModel/Log.php
+++ b/app/code/Magento/Captcha/Model/ResourceModel/Log.php
@@ -9,7 +9,6 @@
  * Log Attempts resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -27,13 +26,11 @@ class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $_remoteAddress;
 
@@ -42,7 +39,6 @@ class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +67,6 @@ protected function _construct()
      * @param string|null $login
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function logAttempt($login)
     {
@@ -110,7 +104,6 @@ public function logAttempt($login)
      * @param string $login
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteUserAttempts($login)
     {
@@ -136,7 +129,6 @@ public function deleteUserAttempts($login)
      *
      * @return null|int
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function countAttemptsByRemoteAddress()
     {
@@ -164,7 +156,6 @@ public function countAttemptsByRemoteAddress()
      * @param string $login
      * @return null|int
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function countAttemptsByUserLogin($login)
     {
@@ -190,7 +181,6 @@ public function countAttemptsByUserLogin($login)
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteOldAttempts()
     {
diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
index 35985c06ae537..60f1753cf6a08 100644
--- a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
+++ b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Captcha\Observer\CaptchaStringResolver
  *
- * @since 2.0.0
  */
 class CaptchaStringResolver
 {
@@ -18,7 +17,6 @@ class CaptchaStringResolver
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $formId
      * @return string
-     * @since 2.0.0
      */
     public function resolve(\Magento\Framework\App\RequestInterface $request, $formId)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
index d903cd173a731..561377243267e 100644
--- a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
@@ -12,37 +12,31 @@
 /**
  * Class \Magento\Captcha\Observer\CheckContactUsFormObserver
  *
- * @since 2.0.0
  */
 class CheckContactUsFormObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirect;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
@@ -58,7 +52,6 @@ class CheckContactUsFormObserver implements ObserverInterface
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\App\Response\RedirectInterface $redirect
      * @param CaptchaStringResolver $captchaStringResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -79,7 +72,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckForgotpasswordObserver.php b/app/code/Magento/Captcha/Observer/CheckForgotpasswordObserver.php
index a69afe0ff46e3..bbfc9e7890b43 100644
--- a/app/code/Magento/Captcha/Observer/CheckForgotpasswordObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckForgotpasswordObserver.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Captcha\Observer\CheckForgotpasswordObserver
  *
- * @since 2.0.0
  */
 class CheckForgotpasswordObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirect;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
@@ -50,7 +44,6 @@ class CheckForgotpasswordObserver implements ObserverInterface
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\App\Response\RedirectInterface $redirect
      * @param CaptchaStringResolver $captchaStringResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -71,7 +64,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
index 0ce8dcb91653d..86e2f6ff8779e 100644
--- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Captcha\Observer\CheckGuestCheckoutObserver
  *
- * @since 2.0.0
  */
 class CheckGuestCheckoutObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
     /**
      * @var \Magento\Checkout\Model\Type\Onepage
-     * @since 2.0.0
      */
     protected $_typeOnepage;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -50,7 +44,6 @@ class CheckGuestCheckoutObserver implements ObserverInterface
      * @param CaptchaStringResolver $captchaStringResolver
      * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -71,7 +64,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
index f37f7956fc8de..febe911675d0a 100644
--- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Captcha\Observer\CheckRegisterCheckoutObserver
  *
- * @since 2.0.0
  */
 class CheckRegisterCheckoutObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
     /**
      * @var \Magento\Checkout\Model\Type\Onepage
-     * @since 2.0.0
      */
     protected $_typeOnepage;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -50,7 +44,6 @@ class CheckRegisterCheckoutObserver implements ObserverInterface
      * @param CaptchaStringResolver $captchaStringResolver
      * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -71,7 +64,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckUserCreateObserver.php b/app/code/Magento/Captcha/Observer/CheckUserCreateObserver.php
index 7f724898e3688..bf307c758d5a3 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserCreateObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserCreateObserver.php
@@ -10,50 +10,42 @@
 /**
  * Class \Magento\Captcha\Observer\CheckUserCreateObserver
  *
- * @since 2.0.0
  */
 class CheckUserCreateObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlManager;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirect;
 
@@ -65,7 +57,6 @@ class CheckUserCreateObserver implements ObserverInterface
      * @param \Magento\Framework\UrlInterface $urlManager
      * @param \Magento\Framework\App\Response\RedirectInterface $redirect
      * @param CaptchaStringResolver $captchaStringResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -90,7 +81,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index cdcd4efe608cd..b3a0f2468eb6f 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Captcha\Observer\CheckUserForgotPasswordBackendObserver
  *
- * @since 2.0.0
  */
 class CheckUserForgotPasswordBackendObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -50,7 +44,6 @@ class CheckUserForgotPasswordBackendObserver implements ObserverInterface
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -72,7 +65,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @throws \Magento\Framework\Exception\Plugin\AuthenticationException
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
index d947a56683f3e..1ebb60226a6f4 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Captcha\Observer\CheckUserLoginBackendObserver
  *
- * @since 2.0.0
  */
 class CheckUserLoginBackendObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -37,7 +33,6 @@ class CheckUserLoginBackendObserver implements ObserverInterface
      * @param \Magento\Captcha\Helper\Data $helper
      * @param CaptchaStringResolver $captchaStringResolver
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -55,7 +50,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @throws \Magento\Framework\Exception\Plugin\AuthenticationException
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
index 1d876013a74f6..5ac210316dd1e 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
@@ -12,37 +12,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CheckUserLoginObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var CaptchaStringResolver
-     * @since 2.0.0
      */
     protected $captchaStringResolver;
 
@@ -50,7 +44,6 @@ class CheckUserLoginObserver implements ObserverInterface
      * Customer data
      *
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -75,7 +68,6 @@ class CheckUserLoginObserver implements ObserverInterface
      * @param \Magento\Framework\Session\SessionManagerInterface $customerSession
      * @param CaptchaStringResolver $captchaStringResolver
      * @param \Magento\Customer\Model\Url $customerUrl
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Helper\Data $helper,
@@ -135,7 +127,6 @@ private function getAuthentication()
      * @param \Magento\Framework\Event\Observer $observer
      * @throws NoSuchEntityException
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
index 20d7319b3b431..d96b72ca9c093 100644
--- a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Captcha\Observer\ResetAttemptForBackendObserver
  *
- * @since 2.0.0
  */
 class ResetAttemptForBackendObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Model\ResourceModel\LogFactory
-     * @since 2.2.0
      */
     public $resLogFactory;
 
     /**
      * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return \Magento\Captcha\Observer\ResetAttemptForBackendObserver
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
index 1d5eaca6f1f02..71ae80a93b528 100644
--- a/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
+++ b/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Captcha\Observer\ResetAttemptForFrontendObserver
  *
- * @since 2.0.0
  */
 class ResetAttemptForFrontendObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Captcha\Model\ResourceModel\LogFactory
-     * @since 2.0.0
      */
     public $resLogFactory;
 
     /**
      * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return \Magento\Captcha\Observer\ResetAttemptForFrontendObserver
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Captcha/Setup/InstallSchema.php b/app/code/Magento/Captcha/Setup/InstallSchema.php
index 553ce168116c4..23452d0e37ddc 100644
--- a/app/code/Magento/Captcha/Setup/InstallSchema.php
+++ b/app/code/Magento/Captcha/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Catalog/Api/AttributeSetManagementInterface.php b/app/code/Magento/Catalog/Api/AttributeSetManagementInterface.php
index f9634fc46b736..3a76e1aeb5ff8 100644
--- a/app/code/Magento/Catalog/Api/AttributeSetManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/AttributeSetManagementInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AttributeSetManagementInterface
 {
@@ -20,7 +19,6 @@ interface AttributeSetManagementInterface
      * @return \Magento\Eav\Api\Data\AttributeSetInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function create(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet, $skeletonId);
 }
diff --git a/app/code/Magento/Catalog/Api/AttributeSetRepositoryInterface.php b/app/code/Magento/Catalog/Api/AttributeSetRepositoryInterface.php
index 6b5f9dec1ac0f..34bfe4dea6075 100644
--- a/app/code/Magento/Catalog/Api/AttributeSetRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/AttributeSetRepositoryInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AttributeSetRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface AttributeSetRepositoryInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException If attribute set is not found
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
 
@@ -29,7 +27,6 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Eav\Api\Data\AttributeSetSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -39,7 +36,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param int $attributeSetId
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $attributeSetId is not found
      * @return \Magento\Eav\Api\Data\AttributeSetInterface
-     * @since 2.0.0
      */
     public function get($attributeSetId);
 
@@ -50,7 +46,6 @@ public function get($attributeSetId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
 
@@ -61,7 +56,6 @@ public function delete(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($attributeSetId);
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/CategoryAttributeOptionManagementInterface.php
index f21d7c264e036..a2b4f2d2f2b21 100644
--- a/app/code/Magento/Catalog/Api/CategoryAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryAttributeOptionManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface RepositoryInterface must be implemented in new model
  * @api
- * @since 2.0.0
  */
 interface CategoryAttributeOptionManagementInterface
 {
@@ -20,7 +19,6 @@ interface CategoryAttributeOptionManagementInterface
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      * @return \Magento\Eav\Api\Data\AttributeOptionInterface[]
-     * @since 2.0.0
      */
     public function getItems($attributeCode);
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryAttributeRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryAttributeRepositoryInterface.php
index 1457a2bd9c1f3..32f4d81d6457b 100644
--- a/app/code/Magento/Catalog/Api/CategoryAttributeRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryAttributeRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface RepositoryInterface must be implemented in new model
  * @api
- * @since 2.0.0
  */
 interface CategoryAttributeRepositoryInterface extends \Magento\Framework\Api\MetadataServiceInterface
 {
@@ -18,7 +17,6 @@ interface CategoryAttributeRepositoryInterface extends \Magento\Framework\Api\Me
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -27,7 +25,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param string $attributeCode
      * @return \Magento\Catalog\Api\Data\CategoryAttributeInterface
-     * @since 2.0.0
      */
     public function get($attributeCode);
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryLinkManagementInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkManagementInterface.php
index d99b26ad6f339..e132ff8251c06 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkManagementInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryLinkManagementInterface
 {
@@ -17,7 +16,6 @@ interface CategoryLinkManagementInterface
      *
      * @param int $categoryId
      * @return \Magento\Catalog\Api\Data\CategoryProductLinkInterface[]
-     * @since 2.0.0
      */
     public function getAssignedProducts($categoryId);
 
diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 22cbda9c12a55..81d705939a73c 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryLinkRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface CategoryLinkRepositoryInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
@@ -33,7 +31,6 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
@@ -46,7 +43,6 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function deleteByIds($categoryId, $sku);
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryManagementInterface.php b/app/code/Magento/Catalog/Api/CategoryManagementInterface.php
index 4d4e0f0df4c23..abd89b739dbba 100644
--- a/app/code/Magento/Catalog/Api/CategoryManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryManagementInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryManagementInterface
 {
@@ -20,7 +19,6 @@ interface CategoryManagementInterface
      * @param int $depth
      * @throws \Magento\Framework\Exception\NoSuchEntityException If ID is not found
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface containing Tree objects
-     * @since 2.0.0
      */
     public function getTree($rootCategoryId = null, $depth = null);
 
@@ -33,7 +31,6 @@ public function getTree($rootCategoryId = null, $depth = null);
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function move($categoryId, $parentId, $afterId = null);
 
@@ -41,7 +38,6 @@ public function move($categoryId, $parentId, $afterId = null);
      * Provide the number of category count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount();
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryRepositoryInterface.php
index 544281e0eee7c..262b3761bea9a 100644
--- a/app/code/Magento/Catalog/Api/CategoryRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryRepositoryInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface CategoryRepositoryInterface
      * @param \Magento\Catalog\Api\Data\CategoryInterface $category
      * @return \Magento\Catalog\Api\Data\CategoryInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\CategoryInterface $category);
 
@@ -30,7 +28,6 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category);
      * @param int $storeId
      * @return \Magento\Catalog\Api\Data\CategoryInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($categoryId, $storeId = null);
 
@@ -42,7 +39,6 @@ public function get($categoryId, $storeId = null);
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category);
 
@@ -54,7 +50,6 @@ public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category);
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function deleteByIdentifier($categoryId);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
index c43607595aa32..8573824a73006 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface
 {
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php
index 4258e9444906f..1400f04f2c7b0 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryAttributeSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -16,7 +15,6 @@ interface CategoryAttributeSearchResultsInterface extends \Magento\Framework\Api
      * Get attributes list.
      *
      * @return \Magento\Catalog\Api\Data\CategoryAttributeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param \Magento\Catalog\Api\Data\CategoryAttributeInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
index a934103074e3e..c0f836bc1430d 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
@@ -10,20 +10,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -31,7 +28,6 @@ public function setId($id);
      * Get parent category ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -40,7 +36,6 @@ public function getParentId();
      *
      * @param int $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($parentId);
 
@@ -48,7 +43,6 @@ public function setParentId($parentId);
      * Get category name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -57,7 +51,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -65,7 +58,6 @@ public function setName($name);
      * Check whether category is active
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -74,7 +66,6 @@ public function getIsActive();
      *
      * @param bool $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 
@@ -82,7 +73,6 @@ public function setIsActive($isActive);
      * Get category position
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -91,7 +81,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -99,7 +88,6 @@ public function setPosition($position);
      * Get category level
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getLevel();
 
@@ -108,78 +96,66 @@ public function getLevel();
      *
      * @param int $level
      * @return $this
-     * @since 2.0.0
      */
     public function setLevel($level);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getChildren();
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
     /**
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
     /**
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getPath();
 
     /**
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path);
 
     /**
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getAvailableSortBy();
 
     /**
      * @param string[]|string $availableSortBy
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableSortBy($availableSortBy);
 
     /**
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIncludeInMenu();
 
     /**
      * @param bool $includeInMenu
      * @return $this
-     * @since 2.0.0
      */
     public function setIncludeInMenu($includeInMenu);
 
@@ -187,7 +163,6 @@ public function setIncludeInMenu($includeInMenu);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\CategoryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -196,7 +171,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryProductLinkInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryProductLinkInterface.php
index d8173b811c8d2..115d28c304933 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryProductLinkInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryProductLinkInterface.php
@@ -10,33 +10,28 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryProductLinkInterface extends ExtensibleDataInterface
 {
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku();
 
     /**
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
     /**
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -44,7 +39,6 @@ public function setPosition($position);
      * Get category id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryId();
 
@@ -53,7 +47,6 @@ public function getCategoryId();
      *
      * @param string $categoryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCategoryId($categoryId);
 
@@ -61,7 +54,6 @@ public function setCategoryId($categoryId);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -70,7 +62,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
index c2506f586e51d..7c8814b7e73fb 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
@@ -9,20 +9,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CategoryTreeInterface
 {
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -30,7 +27,6 @@ public function setId($id);
      * Get parent category ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -39,7 +35,6 @@ public function getParentId();
      *
      * @param int $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($parentId);
 
@@ -47,7 +42,6 @@ public function setParentId($parentId);
      * Get category name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -56,7 +50,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -65,7 +58,6 @@ public function setName($name);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -74,7 +66,6 @@ public function getIsActive();
      *
      * @param bool $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 
@@ -82,7 +73,6 @@ public function setIsActive($isActive);
      * Get category position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -91,7 +81,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -99,7 +88,6 @@ public function setPosition($position);
      * Get category level
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLevel();
 
@@ -108,7 +96,6 @@ public function getLevel();
      *
      * @param int $level
      * @return $this
-     * @since 2.0.0
      */
     public function setLevel($level);
 
@@ -116,7 +103,6 @@ public function setLevel($level);
      * Get product count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductCount();
 
@@ -125,20 +111,17 @@ public function getProductCount();
      *
      * @param int $productCount
      * @return $this
-     * @since 2.0.0
      */
     public function setProductCount($productCount);
 
     /**
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]
-     * @since 2.0.0
      */
     public function getChildrenData();
 
     /**
      * @param \Magento\Catalog\Api\Data\CategoryTreeInterface[] $childrenData
      * @return $this
-     * @since 2.0.0
      */
     public function setChildrenData(array $childrenData = null);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CustomOptionInterface.php b/app/code/Magento/Catalog/Api/Data/CustomOptionInterface.php
index 293849d0031cc..f401ec11088b4 100644
--- a/app/code/Magento/Catalog/Api/Data/CustomOptionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CustomOptionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CustomOptionInterface
  * @api
- * @since 2.0.0
  */
 interface CustomOptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -23,7 +22,6 @@ interface CustomOptionInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get option id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -32,7 +30,6 @@ public function getOptionId();
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     public function setOptionId($value);
 
@@ -40,7 +37,6 @@ public function setOptionId($value);
      * Get option value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOptionValue();
 
@@ -49,7 +45,6 @@ public function getOptionValue();
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     public function setOptionValue($value);
 
@@ -57,7 +52,6 @@ public function setOptionValue($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\CustomOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -66,7 +60,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\CustomOptionExtensionInterface|null $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CustomOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
index ebd5b0ca03f7c..d4e735ad57b82 100644
--- a/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface EavAttributeInterface extends \Magento\Eav\Api\Data\AttributeInterface
 {
@@ -56,7 +55,6 @@ interface EavAttributeInterface extends \Magento\Eav\Api\Data\AttributeInterface
      * Enable WYSIWYG flag
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsWysiwygEnabled();
 
@@ -65,7 +63,6 @@ public function getIsWysiwygEnabled();
      *
      * @param bool $isWysiwygEnabled
      * @return $this
-     * @since 2.0.0
      */
     public function setIsWysiwygEnabled($isWysiwygEnabled);
 
@@ -73,7 +70,6 @@ public function setIsWysiwygEnabled($isWysiwygEnabled);
      * Whether the HTML tags are allowed on the frontend
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsHtmlAllowedOnFront();
 
@@ -82,7 +78,6 @@ public function getIsHtmlAllowedOnFront();
      *
      * @param bool $isHtmlAllowedOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront);
 
@@ -90,7 +85,6 @@ public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront);
      * Whether it is used for sorting in product listing
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getUsedForSortBy();
 
@@ -99,7 +93,6 @@ public function getUsedForSortBy();
      *
      * @param bool $usedForSortBy
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedForSortBy($usedForSortBy);
 
@@ -107,7 +100,6 @@ public function setUsedForSortBy($usedForSortBy);
      * Whether it used in layered navigation
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsFilterable();
 
@@ -116,7 +108,6 @@ public function getIsFilterable();
      *
      * @param bool $isFilterable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterable($isFilterable);
 
@@ -124,7 +115,6 @@ public function setIsFilterable($isFilterable);
      * Whether it is used in search results layered navigation
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsFilterableInSearch();
 
@@ -132,7 +122,6 @@ public function getIsFilterableInSearch();
      * Whether it is used in catalog product grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsUsedInGrid();
 
@@ -140,7 +129,6 @@ public function getIsUsedInGrid();
      * Whether it is visible in catalog product grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsVisibleInGrid();
 
@@ -148,7 +136,6 @@ public function getIsVisibleInGrid();
      * Whether it is filterable in catalog product grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsFilterableInGrid();
 
@@ -184,7 +171,6 @@ public function setIsFilterableInGrid($isFilterableInGrid);
      *
      * @param bool $isFilterableInSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterableInSearch($isFilterableInSearch);
 
@@ -192,7 +178,6 @@ public function setIsFilterableInSearch($isFilterableInSearch);
      * Get position
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -201,7 +186,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -218,7 +202,6 @@ public function setPosition($position);
      *  - 'downloadable'
      *
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getApplyTo();
 
@@ -227,7 +210,6 @@ public function getApplyTo();
      *
      * @param string[]|string $applyTo
      * @return $this
-     * @since 2.0.0
      */
     public function setApplyTo($applyTo);
 
@@ -235,7 +217,6 @@ public function setApplyTo($applyTo);
      * Whether the attribute can be used in Quick Search
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsSearchable();
 
@@ -244,7 +225,6 @@ public function getIsSearchable();
      *
      * @param string $isSearchable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSearchable($isSearchable);
 
@@ -252,7 +232,6 @@ public function setIsSearchable($isSearchable);
      * Whether the attribute can be used in Advanced Search
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsVisibleInAdvancedSearch();
 
@@ -261,7 +240,6 @@ public function getIsVisibleInAdvancedSearch();
      *
      * @param string $isVisibleInAdvancedSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch);
 
@@ -269,7 +247,6 @@ public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch);
      * Whether the attribute can be compared on the frontend
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsComparable();
 
@@ -278,7 +255,6 @@ public function getIsComparable();
      *
      * @param string $isComparable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsComparable($isComparable);
 
@@ -286,7 +262,6 @@ public function setIsComparable($isComparable);
      * Whether the attribute can be used for promo rules
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsUsedForPromoRules();
 
@@ -295,7 +270,6 @@ public function getIsUsedForPromoRules();
      *
      * @param string $isUsedForPromoRules
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUsedForPromoRules($isUsedForPromoRules);
 
@@ -303,7 +277,6 @@ public function setIsUsedForPromoRules($isUsedForPromoRules);
      * Whether the attribute is visible on the frontend
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront();
 
@@ -312,7 +285,6 @@ public function getIsVisibleOnFront();
      *
      * @param string $isVisibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront);
 
@@ -320,7 +292,6 @@ public function setIsVisibleOnFront($isVisibleOnFront);
      * Whether the attribute can be used in product listing
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUsedInProductListing();
 
@@ -329,7 +300,6 @@ public function getUsedInProductListing();
      *
      * @param string $usedInProductListing
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedInProductListing($usedInProductListing);
 
@@ -337,7 +307,6 @@ public function setUsedInProductListing($usedInProductListing);
      * Whether attribute is visible on frontend.
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsVisible();
 
@@ -346,7 +315,6 @@ public function getIsVisible();
      *
      * @param bool $isVisible
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisible($isVisible);
 
@@ -354,7 +322,6 @@ public function setIsVisible($isVisible);
      * Retrieve attribute scope
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getScope();
 
@@ -363,13 +330,11 @@ public function getScope();
      *
      * @param string $scope
      * @return $this
-     * @since 2.0.0
      */
     public function setScope($scope);
 
     /**
      * @return \Magento\Catalog\Api\Data\EavAttributeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
index 7113c73e37e20..fc10811f12329 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface
 {
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
index 891ae6e1978db..ebe519a3c366b 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeMediaGalleryEntryInterface extends ExtensibleDataInterface
 {
@@ -28,7 +27,6 @@ interface ProductAttributeMediaGalleryEntryInterface extends ExtensibleDataInter
      * Retrieve gallery entry ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -37,7 +35,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -45,7 +42,6 @@ public function setId($id);
      * Get media type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaType();
 
@@ -54,7 +50,6 @@ public function getMediaType();
      *
      * @param string $mediaType
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaType($mediaType);
 
@@ -62,7 +57,6 @@ public function setMediaType($mediaType);
      * Retrieve gallery entry alternative text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -71,7 +65,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -79,7 +72,6 @@ public function setLabel($label);
      * Retrieve gallery entry position (sort order)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -88,7 +80,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -96,7 +87,6 @@ public function setPosition($position);
      * Check if gallery entry is hidden from product page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled();
 
@@ -105,7 +95,6 @@ public function isDisabled();
      *
      * @param bool $disabled
      * @return $this
-     * @since 2.0.0
      */
     public function setDisabled($disabled);
 
@@ -113,7 +102,6 @@ public function setDisabled($disabled);
      * Retrieve gallery entry image types (thumbnail, image, small_image etc)
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getTypes();
 
@@ -122,7 +110,6 @@ public function getTypes();
      *
      * @param string[] $types
      * @return $this
-     * @since 2.0.0
      */
     public function setTypes(array $types = null);
 
@@ -130,7 +117,6 @@ public function setTypes(array $types = null);
      * Get file path
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFile();
 
@@ -139,7 +125,6 @@ public function getFile();
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function setFile($file);
 
@@ -147,7 +132,6 @@ public function setFile($file);
      * Get media gallery content
      *
      * @return \Magento\Framework\Api\Data\ImageContentInterface|null
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -156,7 +140,6 @@ public function getContent();
      *
      * @param \Magento\Framework\Api\Data\ImageContentInterface $content
      * @return $this
-     * @since 2.0.0
      */
     public function setContent($content);
 
@@ -164,7 +147,6 @@ public function setContent($content);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -173,7 +155,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php
index 2a3457f524199..26627f7a86c42 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -16,7 +15,6 @@ interface ProductAttributeSearchResultsInterface extends \Magento\Framework\Api\
      * Get attributes list.
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeTypeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeTypeInterface.php
index 6701a443380ab..705b8d2ed3207 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeTypeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeTypeInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeTypeInterface extends ExtensibleDataInterface
 {
@@ -22,7 +21,6 @@ interface ProductAttributeTypeInterface extends ExtensibleDataInterface
      * Get value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -31,7 +29,6 @@ public function getValue();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -39,7 +36,6 @@ public function setValue($value);
      * Get type label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -48,7 +44,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -56,7 +51,6 @@ public function setLabel($label);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -65,7 +59,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
index a05e5a3e3a134..c1610054e53db 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductCustomOptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -86,7 +85,6 @@ interface ProductCustomOptionInterface extends \Magento\Framework\Api\Extensible
      * Get product SKU
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductSku();
 
@@ -95,7 +93,6 @@ public function getProductSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setProductSku($sku);
 
@@ -103,7 +100,6 @@ public function setProductSku($sku);
      * Get option id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -112,7 +108,6 @@ public function getOptionId();
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId);
 
@@ -120,7 +115,6 @@ public function setOptionId($optionId);
      * Get option title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -129,7 +123,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -137,7 +130,6 @@ public function setTitle($title);
      * Get option type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -146,7 +138,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -154,7 +145,6 @@ public function setType($type);
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -163,7 +153,6 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -172,7 +161,6 @@ public function setSortOrder($sortOrder);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsRequire();
 
@@ -181,7 +169,6 @@ public function getIsRequire();
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRequire($isRequired);
 
@@ -189,7 +176,6 @@ public function setIsRequire($isRequired);
      * Get price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -198,7 +184,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -206,7 +191,6 @@ public function setPrice($price);
      * Get price type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPriceType();
 
@@ -215,7 +199,6 @@ public function getPriceType();
      *
      * @param string $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType);
 
@@ -223,7 +206,6 @@ public function setPriceType($priceType);
      * Get Sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -232,72 +214,61 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getFileExtension();
 
     /**
      * @param string $fileExtension
      * @return $this
-     * @since 2.0.0
      */
     public function setFileExtension($fileExtension);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getMaxCharacters();
 
     /**
      * @param int $maxCharacters
      * @return $this
-     * @since 2.0.0
      */
     public function setMaxCharacters($maxCharacters);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getImageSizeX();
 
     /**
      * @param int $imageSizeX
      * @return $this
-     * @since 2.0.0
      */
     public function setImageSizeX($imageSizeX);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getImageSizeY();
 
     /**
      * @param int $imageSizeY
      * @return $this
-     * @since 2.0.0
      */
     public function setImageSizeY($imageSizeY);
 
     /**
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface[]|null
-     * @since 2.0.0
      */
     public function getValues();
 
     /**
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface[] $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues(array $values = null);
 
@@ -305,7 +276,6 @@ public function setValues(array $values = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -314,7 +284,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionTypeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionTypeInterface.php
index 2e45f33eaf2d9..89ecdc53ebd27 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionTypeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionTypeInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductCustomOptionTypeInterface extends ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface ProductCustomOptionTypeInterface extends ExtensibleDataInterface
      * Get option type label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -27,7 +25,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -35,7 +32,6 @@ public function setLabel($label);
      * Get option type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -44,7 +40,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -52,7 +47,6 @@ public function setCode($code);
      * Get option type group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroup();
 
@@ -61,7 +55,6 @@ public function getGroup();
      *
      * @param string $group
      * @return $this
-     * @since 2.0.0
      */
     public function setGroup($group);
 
@@ -69,7 +62,6 @@ public function setGroup($group);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -78,7 +70,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionValuesInterface.php b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionValuesInterface.php
index b13f688aedb20..46aa214fb7101 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionValuesInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionValuesInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductCustomOptionValuesInterface
 {
@@ -16,7 +15,6 @@ interface ProductCustomOptionValuesInterface
      * Get option title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -25,7 +23,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -33,7 +30,6 @@ public function setTitle($title);
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -42,7 +38,6 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -50,7 +45,6 @@ public function setSortOrder($sortOrder);
      * Get price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -59,7 +53,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -67,7 +60,6 @@ public function setPrice($price);
      * Get price type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPriceType();
 
@@ -76,7 +68,6 @@ public function getPriceType();
      *
      * @param string $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType);
 
@@ -84,7 +75,6 @@ public function setPriceType($priceType);
      * Get Sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -93,7 +83,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -101,7 +90,6 @@ public function setSku($sku);
      * Get Option type id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOptionTypeId();
 
@@ -110,7 +98,6 @@ public function getOptionTypeId();
      *
      * @param int $optionTypeId
      * @return int|null
-     * @since 2.0.0
      */
     public function setOptionTypeId($optionTypeId);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductInterface.php b/app/code/Magento/Catalog/Api/Data/ProductInterface.php
index 54652067b537f..8fc94246bec04 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -42,7 +41,6 @@ interface ProductInterface extends \Magento\Framework\Api\CustomAttributesDataIn
      * Product id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -51,7 +49,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -59,7 +56,6 @@ public function setId($id);
      * Product sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -68,7 +64,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -76,7 +71,6 @@ public function setSku($sku);
      * Product name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName();
 
@@ -85,7 +79,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -93,7 +86,6 @@ public function setName($name);
      * Product attribute set id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAttributeSetId();
 
@@ -102,7 +94,6 @@ public function getAttributeSetId();
      *
      * @param int $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId);
 
@@ -110,7 +101,6 @@ public function setAttributeSetId($attributeSetId);
      * Product price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -119,7 +109,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -127,7 +116,6 @@ public function setPrice($price);
      * Product status
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -136,7 +124,6 @@ public function getStatus();
      *
      * @param int $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status);
 
@@ -144,7 +131,6 @@ public function setStatus($status);
      * Product visibility
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getVisibility();
 
@@ -153,7 +139,6 @@ public function getVisibility();
      *
      * @param int $visibility
      * @return $this
-     * @since 2.0.0
      */
     public function setVisibility($visibility);
 
@@ -161,7 +146,6 @@ public function setVisibility($visibility);
      * Product type id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTypeId();
 
@@ -170,7 +154,6 @@ public function getTypeId();
      *
      * @param string $typeId
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeId($typeId);
 
@@ -178,7 +161,6 @@ public function setTypeId($typeId);
      * Product created date
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -187,7 +169,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -195,7 +176,6 @@ public function setCreatedAt($createdAt);
      * Product updated date
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -204,7 +184,6 @@ public function getUpdatedAt();
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt);
 
@@ -212,7 +191,6 @@ public function setUpdatedAt($updatedAt);
      * Product weight
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeight();
 
@@ -221,7 +199,6 @@ public function getWeight();
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight);
 
@@ -229,7 +206,6 @@ public function setWeight($weight);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -238,7 +214,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes);
 
@@ -246,7 +221,6 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
      * Get product links info
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]|null
-     * @since 2.0.0
      */
     public function getProductLinks();
 
@@ -255,7 +229,6 @@ public function getProductLinks();
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $links
      * @return $this
-     * @since 2.0.0
      */
     public function setProductLinks(array $links = null);
 
@@ -263,7 +236,6 @@ public function setProductLinks(array $links = null);
      * Get list of product options
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface[]|null
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -272,7 +244,6 @@ public function getOptions();
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null);
 
@@ -280,7 +251,6 @@ public function setOptions(array $options = null);
      * Get media gallery entries
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
-     * @since 2.0.0
      */
     public function getMediaGalleryEntries();
 
@@ -289,7 +259,6 @@ public function getMediaGalleryEntries();
      *
      * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaGalleryEntries(array $mediaGalleryEntries = null);
 
@@ -297,7 +266,6 @@ public function setMediaGalleryEntries(array $mediaGalleryEntries = null);
      * Gets list of product tier prices
      *
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]|null
-     * @since 2.0.0
      */
     public function getTierPrices();
 
@@ -306,7 +274,6 @@ public function getTierPrices();
      *
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface[] $tierPrices
      * @return $this
-     * @since 2.0.0
      */
     public function setTierPrices(array $tierPrices = null);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductLinkAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductLinkAttributeInterface.php
index 9fd5713346496..40cfc32936375 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductLinkAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductLinkAttributeInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductLinkAttributeInterface extends ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface ProductLinkAttributeInterface extends ExtensibleDataInterface
      * Get attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -27,7 +25,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -35,7 +32,6 @@ public function setCode($code);
      * Get attribute type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -44,7 +40,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -52,7 +47,6 @@ public function setType($type);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -61,7 +55,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductLinkInterface.php b/app/code/Magento/Catalog/Api/Data/ProductLinkInterface.php
index d47182bb00efe..7966024cbbe5d 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductLinkInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductLinkInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductLinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -16,7 +15,6 @@ interface ProductLinkInterface extends \Magento\Framework\Api\ExtensibleDataInte
      * Get SKU
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -25,7 +23,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -33,7 +30,6 @@ public function setSku($sku);
      * Get link type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinkType();
 
@@ -42,7 +38,6 @@ public function getLinkType();
      *
      * @param string $linkType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkType($linkType);
 
@@ -50,7 +45,6 @@ public function setLinkType($linkType);
      * Get linked product sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinkedProductSku();
 
@@ -59,7 +53,6 @@ public function getLinkedProductSku();
      *
      * @param string $linkedProductSku
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkedProductSku($linkedProductSku);
 
@@ -67,7 +60,6 @@ public function setLinkedProductSku($linkedProductSku);
      * Get linked product type (simple, virtual, etc)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinkedProductType();
 
@@ -76,7 +68,6 @@ public function getLinkedProductType();
      *
      * @param string $linkedProductType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkedProductType($linkedProductType);
 
@@ -84,7 +75,6 @@ public function setLinkedProductType($linkedProductType);
      * Get linked item position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -93,7 +83,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -101,7 +90,6 @@ public function setPosition($position);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -110,7 +98,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductLinkExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductLinkTypeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductLinkTypeInterface.php
index f03b9e6f9d3e5..c57c8348b0551 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductLinkTypeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductLinkTypeInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductLinkTypeInterface extends ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface ProductLinkTypeInterface extends ExtensibleDataInterface
      * Get link type code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -27,7 +25,6 @@ public function getCode();
      *
      * @param int $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -35,7 +32,6 @@ public function setCode($code);
      * Get link type name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -44,7 +40,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -52,7 +47,6 @@ public function setName($name);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -61,7 +55,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductOptionInterface.php b/app/code/Magento/Catalog/Api/Data/ProductOptionInterface.php
index ab8269048cd77..ba1cfd9a1b198 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductOptionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductOptionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Product option interface
  * @api
- * @since 2.0.0
  */
 interface ProductOptionInterface extends ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface ProductOptionInterface extends ExtensibleDataInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -27,7 +25,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php b/app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php
index e7c4a63d128e1..dbaa093f0874d 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -16,7 +15,6 @@ interface ProductSearchResultsInterface extends \Magento\Framework\Api\SearchRes
      * Get attributes list.
      *
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductTierPriceInterface.php b/app/code/Magento/Catalog/Api/Data/ProductTierPriceInterface.php
index 482743d3d34f2..ff681be49be60 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductTierPriceInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductTierPriceInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductTierPriceInterface extends ExtensibleDataInterface
 {
@@ -25,7 +24,6 @@ interface ProductTierPriceInterface extends ExtensibleDataInterface
      * Retrieve customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId();
 
@@ -34,7 +32,6 @@ public function getCustomerGroupId();
      *
      * @param int $customerGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($customerGroupId);
 
@@ -42,7 +39,6 @@ public function setCustomerGroupId($customerGroupId);
      * Retrieve tier qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -51,7 +47,6 @@ public function getQty();
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -59,7 +54,6 @@ public function setQty($qty);
      * Retrieve price value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -68,7 +62,6 @@ public function getValue();
      *
      * @param float $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -76,7 +69,6 @@ public function setValue($value);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductTierPriceExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -85,7 +77,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductTierPriceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductTierPriceExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductTypeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductTypeInterface.php
index 52dfa1dae243d..dca8cd87192e2 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductTypeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductTypeInterface.php
@@ -11,7 +11,6 @@
 /**
  * Product type details
  * @api
- * @since 2.0.0
  */
 interface ProductTypeInterface extends ExtensibleDataInterface
 {
@@ -19,7 +18,6 @@ interface ProductTypeInterface extends ExtensibleDataInterface
      * Get product type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -28,7 +26,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -36,7 +33,6 @@ public function setName($name);
      * Get product type label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -45,7 +41,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -53,7 +48,6 @@ public function setLabel($label);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\ProductTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -62,7 +56,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php
index 2880c08ffcacf..9dd962f6c0326 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php
@@ -8,20 +8,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductWebsiteLinkInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSku();
 
     /**
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -29,7 +26,6 @@ public function setSku($sku);
      * Get website ids
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
@@ -38,7 +34,6 @@ public function getWebsiteId();
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeGroupRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeGroupRepositoryInterface.php
index 0c04a462fd156..f63c95145de57 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeGroupRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeGroupRepositoryInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeGroupRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface ProductAttributeGroupRepositoryInterface
      *
      * @param \Magento\Eav\Api\Data\AttributeGroupInterface $group
      * @return \Magento\Eav\Api\Data\AttributeGroupInterface
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -36,7 +33,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $groupId
      * @return \Magento\Eav\Api\Data\AttributeGroupInterface
-     * @since 2.0.0
      */
     public function get($groupId);
 
@@ -45,7 +41,6 @@ public function get($groupId);
      *
      * @param \Magento\Eav\Api\Data\AttributeGroupInterface $group
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
 
@@ -54,7 +49,6 @@ public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
      *
      * @param int $groupId
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($groupId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeManagementInterface.php
index b7c746c1242cc..c89a60264b4fc 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeManagementInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeManagementInterface
 {
@@ -22,7 +21,6 @@ interface ProductAttributeManagementInterface
      * @return int
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function assign($attributeSetId, $attributeGroupId, $attributeCode, $sortOrder);
 
@@ -35,7 +33,6 @@ public function assign($attributeSetId, $attributeGroupId, $attributeCode, $sort
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
      * @return bool
-     * @since 2.0.0
      */
     public function unassign($attributeSetId, $attributeCode);
 
@@ -45,7 +42,6 @@ public function unassign($attributeSetId, $attributeCode);
      * @param string $attributeSetId
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $attributeSetId is not found
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface[]
-     * @since 2.0.0
      */
     public function getAttributes($attributeSetId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterface.php
index 39c723e83a46e..496dced5d1709 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterface.php
@@ -11,7 +11,6 @@
  * @todo implement this interface as a \Magento\Catalog\Model\Product\Attribute\Media\GalleryManagement.
  * Move logic from service there.
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeMediaGalleryManagementInterface
 {
@@ -24,7 +23,6 @@ interface ProductAttributeMediaGalleryManagementInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function create(
         $sku,
@@ -39,7 +37,6 @@ public function create(
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function update(
         $sku,
@@ -54,7 +51,6 @@ public function update(
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function remove($sku, $entryId);
 
@@ -65,7 +61,6 @@ public function remove($sku, $entryId);
      * @param int $entryId
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface
-     * @since 2.0.0
      */
     public function get($sku, $entryId);
 
@@ -74,7 +69,6 @@ public function get($sku, $entryId);
      *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
-     * @since 2.0.0
      */
     public function getList($sku);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 029637986bc84..79d9e349839ef 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeOptionManagementInterface
 {
@@ -19,7 +18,6 @@ interface ProductAttributeOptionManagementInterface
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      * @return \Magento\Eav\Api\Data\AttributeOptionInterface[]
-     * @since 2.0.0
      */
     public function getItems($attributeCode);
 
@@ -31,7 +29,6 @@ public function getItems($attributeCode);
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function add($attributeCode, $option);
 
@@ -44,7 +41,6 @@ public function add($attributeCode, $option);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function delete($attributeCode, $optionId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeRepositoryInterface.php
index 819df9acfba5f..43ca17b788b27 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface RepositoryInterface must be implemented in new model
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeRepositoryInterface extends \Magento\Framework\Api\MetadataServiceInterface
 {
@@ -18,7 +17,6 @@ interface ProductAttributeRepositoryInterface extends \Magento\Framework\Api\Met
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -28,7 +26,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param string $attributeCode
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($attributeCode);
 
@@ -40,7 +37,6 @@ public function get($attributeCode);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);
 
@@ -51,7 +47,6 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
      * @return bool True if the entity was deleted (always true)
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);
 
@@ -62,7 +57,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attr
      * @return bool
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function deleteById($attributeCode);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeTypesListInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeTypesListInterface.php
index c2b0a684ae1cc..87a6727235372 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeTypesListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeTypesListInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductAttributeTypesListInterface
 {
@@ -16,7 +15,6 @@ interface ProductAttributeTypesListInterface
      * Retrieve list of product attribute types
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeTypeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
index e6b58a6f15d96..4367332224538 100644
--- a/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductCustomOptionRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface ProductCustomOptionRepositoryInterface
      *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface[]
-     * @since 2.0.0
      */
     public function getList($sku);
 
@@ -38,7 +36,6 @@ public function getProductOptions(
      * @param string $sku
      * @param int $optionId
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface
-     * @since 2.0.0
      */
     public function get($sku, $optionId);
 
@@ -47,7 +44,6 @@ public function get($sku, $optionId);
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option);
 
@@ -69,7 +65,6 @@ public function duplicate(
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option);
 
@@ -77,7 +72,6 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
      * @param string $sku
      * @param int $optionId
      * @return bool
-     * @since 2.0.0
      */
     public function deleteByIdentifier($sku, $optionId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductCustomOptionTypeListInterface.php b/app/code/Magento/Catalog/Api/ProductCustomOptionTypeListInterface.php
index 8c2ce79b18f7f..145b9596ab82b 100644
--- a/app/code/Magento/Catalog/Api/ProductCustomOptionTypeListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductCustomOptionTypeListInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductCustomOptionTypeListInterface
 {
@@ -16,7 +15,6 @@ interface ProductCustomOptionTypeListInterface
      * Get custom option types
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionTypeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/app/code/Magento/Catalog/Api/ProductLinkManagementInterface.php b/app/code/Magento/Catalog/Api/ProductLinkManagementInterface.php
index d99736056ecf5..bf934b8965979 100644
--- a/app/code/Magento/Catalog/Api/ProductLinkManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductLinkManagementInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductLinkManagementInterface
 {
@@ -18,7 +17,6 @@ interface ProductLinkManagementInterface
      * @param string $sku
      * @param string $type
      * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]
-     * @since 2.0.0
      */
     public function getLinkedItemsByType($sku, $type);
 
@@ -30,7 +28,6 @@ public function getLinkedItemsByType($sku, $type);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return bool
-     * @since 2.0.0
      */
     public function setProductLinks($sku, array $items);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductLinkRepositoryInterface.php
index 52391a34d3ccf..5d8f724a9197b 100644
--- a/app/code/Magento/Catalog/Api/ProductLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductLinkRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface Product links handling interface
  * @api
- * @since 2.0.0
  */
 interface ProductLinkRepositoryInterface
 {
@@ -29,7 +28,6 @@ public function getList(\Magento\Catalog\Api\Data\ProductInterface $product);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return bool
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity);
 
@@ -40,7 +38,6 @@ public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity);
 
@@ -51,7 +48,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($sku, $type, $linkedProductSku);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductLinkTypeListInterface.php b/app/code/Magento/Catalog/Api/ProductLinkTypeListInterface.php
index 50b0749467f4f..07b80d73f4993 100644
--- a/app/code/Magento/Catalog/Api/ProductLinkTypeListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductLinkTypeListInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductLinkTypeListInterface
 {
@@ -16,7 +15,6 @@ interface ProductLinkTypeListInterface
      * Retrieve information about available product link types
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkTypeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param string $type
      * @return \Magento\Catalog\Api\Data\ProductLinkAttributeInterface[]
-     * @since 2.0.0
      */
     public function getItemAttributes($type);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductManagementInterface.php b/app/code/Magento/Catalog/Api/ProductManagementInterface.php
index c7408f57dcad6..3fd4f5e6d149a 100644
--- a/app/code/Magento/Catalog/Api/ProductManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductManagementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductManagementInterface
 {
@@ -16,7 +15,6 @@ interface ProductManagementInterface
      *
      * @param null|int $status
      * @return int
-     * @since 2.0.0
      */
     public function getCount($status = null);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductMediaAttributeManagementInterface.php b/app/code/Magento/Catalog/Api/ProductMediaAttributeManagementInterface.php
index 68ccaf9c582d7..a3addd4ec4a65 100644
--- a/app/code/Magento/Catalog/Api/ProductMediaAttributeManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductMediaAttributeManagementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductMediaAttributeManagementInterface
 {
@@ -16,7 +15,6 @@ interface ProductMediaAttributeManagementInterface
      *
      * @param string $attributeSetName
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface[] list of media attributes
-     * @since 2.0.0
      */
     public function getList($attributeSetName);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductRepositoryInterface.php
index 9466b3dcf6f43..458feb48cec70 100644
--- a/app/code/Magento/Catalog/Api/ProductRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRepositoryInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface ProductRepositoryInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveOptions = false);
 
@@ -35,7 +33,6 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
      * @param bool $forceReload
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($sku, $editMode = false, $storeId = null, $forceReload = false);
 
@@ -48,7 +45,6 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
      * @param bool $forceReload
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false);
 
@@ -58,7 +54,6 @@ public function getById($productId, $editMode = false, $storeId = null, $forceRe
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return bool Will returned True if deleted
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductInterface $product);
 
@@ -67,7 +62,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductInterface $product);
      * @return bool Will returned True if deleted
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function deleteById($sku);
 
@@ -76,7 +70,6 @@ public function deleteById($sku);
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Catalog\Api\Data\ProductSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php b/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
index 3f0a8d63619b5..c6e4f4c8c88bb 100644
--- a/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * @api
  * @deprecated 2.2.0 use ScopedProductTierPriceManagementInterface instead
- * @since 2.0.0
  */
 interface ProductTierPriceManagementInterface
 {
@@ -23,7 +22,6 @@ interface ProductTierPriceManagementInterface
      * @return boolean
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function add($sku, $customerGroupId, $price, $qty);
 
@@ -36,7 +34,6 @@ public function add($sku, $customerGroupId, $price, $qty);
      * @return boolean
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function remove($sku, $customerGroupId, $qty);
 
@@ -47,7 +44,6 @@ public function remove($sku, $customerGroupId, $qty);
      * @param string $customerGroupId 'all' can be used to specify 'ALL GROUPS'
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getList($sku, $customerGroupId);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductTypeListInterface.php b/app/code/Magento/Catalog/Api/ProductTypeListInterface.php
index 281c8209aed50..688be67760f45 100644
--- a/app/code/Magento/Catalog/Api/ProductTypeListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductTypeListInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ProductTypeListInterface
 {
@@ -17,7 +16,6 @@ interface ProductTypeListInterface
      * Retrieve available product types
      *
      * @return \Magento\Catalog\Api\Data\ProductTypeInterface[]
-     * @since 2.0.0
      */
     public function getProductTypes();
 }
diff --git a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php
index af04c8aa9f1b7..10d6b8c48177e 100644
--- a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface ProductWebsiteLinkRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface ProductWebsiteLinkRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface ProductWebsiteLinkRepositoryInterface
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function save(Data\ProductWebsiteLinkInterface $productWebsiteLink);
 
@@ -32,7 +30,6 @@ public function save(Data\ProductWebsiteLinkInterface $productWebsiteLink);
      * @return bool will returned True if website successfully unassigned from product
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink);
 
@@ -44,7 +41,6 @@ public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink);
      * @return bool will returned True if website successfully unassigned from product
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function deleteById($sku, $websiteId);
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index ae8e9cb712cb7..331679874629b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -10,7 +10,6 @@
 
 /**
  * Class AbstractCategory
- * @since 2.0.0
  */
 class AbstractCategory extends \Magento\Backend\Block\Template
 {
@@ -18,25 +17,21 @@ class AbstractCategory extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Tree
-     * @since 2.0.0
      */
     protected $_categoryTree;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_withProductCount;
 
@@ -46,7 +41,6 @@ class AbstractCategory extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
      * Retrieve current category instance
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -75,7 +68,6 @@ public function getCategory()
 
     /**
      * @return int|string|null
-     * @since 2.0.0
      */
     public function getCategoryId()
     {
@@ -87,7 +79,6 @@ public function getCategoryId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryName()
     {
@@ -96,7 +87,6 @@ public function getCategoryName()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCategoryPath()
     {
@@ -108,7 +98,6 @@ public function getCategoryPath()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasStoreRootCategory()
     {
@@ -121,7 +110,6 @@ public function hasStoreRootCategory()
 
     /**
      * @return Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -134,7 +122,6 @@ public function getStore()
      * @param int $recursionLevel
      * @return Node|array|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
     {
@@ -176,7 +163,6 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function _getDefaultStoreId()
     {
@@ -185,7 +171,6 @@ protected function _getDefaultStoreId()
 
     /**
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getCategoryCollection()
     {
@@ -220,7 +205,6 @@ public function getCategoryCollection()
      *
      * @param array $ids
      * @return mixed
-     * @since 2.0.0
      */
     public function getRootByIds($ids)
     {
@@ -246,7 +230,6 @@ public function getRootByIds($ids)
      * @param mixed $parentNodeCategory
      * @param int $recursionLevel
      * @return Node
-     * @since 2.0.0
      */
     public function getNode($parentNodeCategory, $recursionLevel = 2)
     {
@@ -268,7 +251,6 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
     /**
      * @param array $args
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl(array $args = [])
     {
@@ -279,7 +261,6 @@ public function getSaveUrl(array $args = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEditUrl()
     {
@@ -293,7 +274,6 @@ public function getEditUrl()
      * Return ids of root categories as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRootIds()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index 305a4d88b5091..7a05d8e4a37bf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -16,25 +16,21 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree
  *
- * @since 2.0.0
  */
 class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
 {
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $_selectedIds = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_expandedPath = [];
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -43,7 +39,6 @@ protected function _prepareLayout()
 
     /**
      * @return int[]
-     * @since 2.0.0
      */
     public function getCategoryIds()
     {
@@ -53,7 +48,6 @@ public function getCategoryIds()
     /**
      * @param mixed $ids
      * @return $this
-     * @since 2.0.0
      */
     public function setCategoryIds($ids)
     {
@@ -68,7 +62,6 @@ public function setCategoryIds($ids)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getExpandedPath()
     {
@@ -78,7 +71,6 @@ protected function getExpandedPath()
     /**
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     protected function setExpandedPath($path)
     {
@@ -91,7 +83,6 @@ protected function setExpandedPath($path)
      * @param int $level
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getNodeJson($node, $level = 1)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
index 2c10735056a33..412cf64fac270 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
index aaf0376545697..288c189b5c00a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Helper\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -31,7 +29,6 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -47,7 +44,6 @@ public function __construct(
 
     /**
      * @return bool|string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
index 8cdbd92b9a590..53e5fcb4e5f7b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep
  *
- * @since 2.0.0
  */
 class Pricestep extends \Magento\Framework\Data\Form\Element\Text
 {
@@ -22,7 +21,6 @@ class Pricestep extends \Magento\Framework\Data\Form\Element\Text
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToggleCode()
     {
@@ -35,7 +33,6 @@ public function getToggleCode()
      * Retrieve Element HTML fragment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
index 3ef695a51ec63..c5ac625c18bd1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available
  *
- * @since 2.0.0
  */
 class Available extends \Magento\Framework\Data\Form\Element\Multiselect
 {
@@ -22,7 +21,6 @@ class Available extends \Magento\Framework\Data\Form\Element\Multiselect
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToggleCode()
     {
@@ -35,7 +33,6 @@ public function getToggleCode()
      * Retrieve Element HTML fragment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
index 914f61dd9748b..7e1ba3cea36d8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby
  *
- * @since 2.0.0
  */
 class DefaultSortby extends \Magento\Framework\Data\Form\Element\Select
 {
@@ -22,7 +21,6 @@ class DefaultSortby extends \Magento\Framework\Data\Form\Element\Select
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToggleCode()
     {
@@ -35,7 +33,6 @@ public function getToggleCode()
      * Retrieve Element HTML fragment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index 4cf6ce001a3a8..2eb2927f056cb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -26,13 +25,11 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -42,7 +39,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -70,7 +65,6 @@ protected function _construct()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -80,7 +74,6 @@ public function getCategory()
     /**
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -103,7 +96,6 @@ protected function _addColumnFilterToCollection($column)
 
     /**
      * @return Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -143,7 +135,6 @@ protected function _prepareCollection()
 
     /**
      * @return Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -199,7 +190,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -208,7 +198,6 @@ public function getGridUrl()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 615b135763e28..1c8a8d586bcb5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -22,31 +22,26 @@
  * @package Magento\Catalog\Block\Adminhtml\Category
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/category/tree.phtml';
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
     /**
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -59,7 +54,6 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Backend\Model\Auth\Session $backendSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -79,7 +73,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -89,7 +82,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -127,7 +119,6 @@ protected function _prepareLayout()
      *
      * @param string $namePart
      * @return string
-     * @since 2.0.0
      */
     public function getSuggestedCategoriesJson($namePart)
     {
@@ -191,7 +182,6 @@ public function getSuggestedCategoriesJson($namePart)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddRootButtonHtml()
     {
@@ -200,7 +190,6 @@ public function getAddRootButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddSubButtonHtml()
     {
@@ -209,7 +198,6 @@ public function getAddSubButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getExpandButtonHtml()
     {
@@ -218,7 +206,6 @@ public function getExpandButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCollapseButtonHtml()
     {
@@ -227,7 +214,6 @@ public function getCollapseButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreSwitcherHtml()
     {
@@ -237,7 +223,6 @@ public function getStoreSwitcherHtml()
     /**
      * @param bool|null $expanded
      * @return string
-     * @since 2.0.0
      */
     public function getLoadTreeUrl($expanded = null)
     {
@@ -250,7 +235,6 @@ public function getLoadTreeUrl($expanded = null)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNodesUrl()
     {
@@ -259,7 +243,6 @@ public function getNodesUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSwitchTreeUrl()
     {
@@ -272,7 +255,6 @@ public function getSwitchTreeUrl()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsWasExpanded()
     {
@@ -281,7 +263,6 @@ public function getIsWasExpanded()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMoveUrl()
     {
@@ -291,7 +272,6 @@ public function getMoveUrl()
     /**
      * @param mixed|null $parenNodeCategory
      * @return array
-     * @since 2.0.0
      */
     public function getTree($parenNodeCategory = null)
     {
@@ -303,7 +283,6 @@ public function getTree($parenNodeCategory = null)
     /**
      * @param mixed|null $parenNodeCategory
      * @return string
-     * @since 2.0.0
      */
     public function getTreeJson($parenNodeCategory = null)
     {
@@ -318,7 +297,6 @@ public function getTreeJson($parenNodeCategory = null)
      * @param string $path
      * @param string $javascriptVarName
      * @return string
-     * @since 2.0.0
      */
     public function getBreadcrumbsJavascript($path, $javascriptVarName)
     {
@@ -349,7 +327,6 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getNodeJson($node, $level = 0)
     {
@@ -401,7 +378,6 @@ protected function _getNodeJson($node, $level = 0)
      *
      * @param \Magento\Framework\DataObject $node
      * @return string
-     * @since 2.0.0
      */
     public function buildNodeName($node)
     {
@@ -415,7 +391,6 @@ public function buildNodeName($node)
     /**
      * @param Node|array $node
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCategoryMoveable($node)
     {
@@ -429,7 +404,6 @@ protected function _isCategoryMoveable($node)
     /**
      * @param Node|array $node
      * @return bool
-     * @since 2.0.0
      */
     protected function _isParentSelectedCategory($node)
     {
@@ -447,7 +421,6 @@ protected function _isParentSelectedCategory($node)
      * Check if page loaded by outside link to category edit
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isClearEdit()
     {
@@ -458,7 +431,6 @@ public function isClearEdit()
      * Check availability of adding root category
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canAddRootCategory()
     {
@@ -475,7 +447,6 @@ public function canAddRootCategory()
      * Check availability of adding sub category
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canAddSubCategory()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
index 73416ed2600f4..9a87510268b39 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedCategories = [];
 
@@ -29,13 +27,11 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
      * Defines tree template and init tree params
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/category/widget/tree.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      *
      * @param array $selectedCategories
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectedCategories($selectedCategories)
     {
@@ -61,7 +56,6 @@ public function setSelectedCategories($selectedCategories)
      * Getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedCategories()
     {
@@ -73,7 +67,6 @@ public function getSelectedCategories()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element Form Element
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function prepareElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -117,7 +110,6 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Category Tree node onClick listener js function
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNodeClickListener()
     {
@@ -157,7 +149,6 @@ function (node, e) {
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     protected function _getNodeJson($node, $level = 0)
     {
@@ -174,7 +165,6 @@ protected function _getNodeJson($node, $level = 0)
      * Adds some extra params to categories collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getCategoryCollection()
     {
@@ -187,7 +177,6 @@ public function getCategoryCollection()
      * @param bool|null $expanded
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getLoadTreeUrl($expanded = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Form.php
index 8c7efbaf24a9b..84e691748b378 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Form
  *
- * @since 2.0.0
  */
 class Form extends Generic
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
index df6c4b2cf2e1f..1b810204abbcd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Form\Renderer\Config\DateFieldsOrder
  *
- * @since 2.0.0
  */
 class DateFieldsOrder extends Field
 {
@@ -25,7 +24,6 @@ class DateFieldsOrder extends Field
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index d4312ef4e3099..c9383711bdb1b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -17,14 +17,12 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Form\Renderer\Config\YearRange
  *
- * @since 2.0.0
  */
 class YearRange extends Field
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index 013502eceea23..9afe97d721b09 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
  *
- * @since 2.0.0
  */
 class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
 {
     /**
      * Initialize block template
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Catalog::catalog/form/renderer/fieldset/element.phtml';
 
@@ -28,7 +26,6 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
      * Retrieve data object related with form
      *
      * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getDataObject()
     {
@@ -39,7 +36,6 @@ public function getDataObject()
      * Retireve associated with element attribute object
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -50,7 +46,6 @@ public function getAttribute()
      * Retrieve associated attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -61,7 +56,6 @@ public function getAttributeCode()
      * Check "Use default" checkbox display availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayUseDefault()
     {
@@ -81,7 +75,6 @@ public function canDisplayUseDefault()
      * Check default value usage fact
      *
      * @return bool
-     * @since 2.0.0
      */
     public function usedDefault()
     {
@@ -105,7 +98,6 @@ public function usedDefault()
      * Disable field in default value using case
      *
      * @return \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
-     * @since 2.0.0
      */
     public function checkFieldDisable()
     {
@@ -121,7 +113,6 @@ public function checkFieldDisable()
      * GLOBAL | WEBSITE | STORE
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScopeLabel()
     {
@@ -145,7 +136,6 @@ public function getScopeLabel()
      * Retrieve element label html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementLabelHtml()
     {
@@ -161,7 +151,6 @@ public function getElementLabelHtml()
      * Retrieve element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -172,7 +161,6 @@ public function getElementHtml()
      * Default sore ID getter
      *
      * @return integer
-     * @since 2.0.0
      */
     protected function _getDefaultStoreId()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index 25be7f6f56208..419be73618029 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg
  *
- * @since 2.0.0
  */
 class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
 {
@@ -22,7 +21,6 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData = null;
 
@@ -30,19 +28,16 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * Catalog data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager = null;
 
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $_wysiwygConfig;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -55,7 +50,6 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -78,7 +72,6 @@ public function __construct(
      * Retrieve additional html and put it at the end of element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
@@ -150,7 +143,6 @@ public function getAfterElementHtml()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsWysiwygEnabled()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
index 7a80c60c2a6ea..154d040740f68 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
@@ -19,13 +19,11 @@
  *
  * @deprecated 2.2.0
  * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
- * @since 2.0.0
  */
 class Content extends Generic
 {
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $_wysiwygConfig;
 
@@ -35,7 +33,6 @@ class Content extends Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Adding editor field to render
      *
      * @return Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Product.php
index 40494aaceb6a4..778af791c30f2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Container
 {
     /**
      * @var \Magento\Catalog\Model\Product\TypeFactory
-     * @since 2.0.0
      */
     protected $_typeFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -34,7 +31,6 @@ class Product extends \Magento\Backend\Block\Widget\Container
      * @param \Magento\Catalog\Model\Product\TypeFactory $typeFactory
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Prepare button and grid
      *
      * @return \Magento\Catalog\Block\Adminhtml\Product
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -73,7 +68,6 @@ protected function _prepareLayout()
      * Retrieve options for 'Add Product' split button
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAddProductButtonOptions()
     {
@@ -102,7 +96,6 @@ function ($elementOne, $elementTwo) {
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function _getProductCreateUrl($type)
     {
@@ -116,7 +109,6 @@ protected function _getProductCreateUrl($type)
      * Check whether it is single store mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
index 7d3179b5bfeaf..98fcc03e6511f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
@@ -9,13 +9,11 @@
  * Adminhtml catalog product attributes block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Attribute extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 0101a9e3837e5..f930919ea9882 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -9,7 +9,6 @@
  * Product attribute edit page
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Block group name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Catalog';
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -33,7 +30,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -101,7 +96,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -115,7 +109,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      * Retrieve header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -133,7 +126,6 @@ public function getHeaderText()
      * Retrieve URL for validation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -144,7 +136,6 @@ public function getValidationUrl()
      * Retrieve URL for save
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
index 72a11f6d4e73d..2d569d4620cbb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
@@ -17,13 +17,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends Generic
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index 66f46626feff6..3a0427e45e42e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -21,7 +21,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Advanced extends Generic
 {
@@ -29,19 +28,16 @@ class Advanced extends Generic
      * Eav data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_eavData = null;
 
     /**
      * @var Yesno
-     * @since 2.0.0
      */
     protected $_yesNo;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $disableScopeChangeList;
 
@@ -59,7 +55,6 @@ class Advanced extends Generic
      * @param Data $eavData
      * @param array $disableScopeChangeList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -81,7 +76,6 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -266,7 +260,6 @@ protected function _prepareForm()
      * Initialize form fileds values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
@@ -278,7 +271,6 @@ protected function _initFormValues()
      * Retrieve attribute object from registry
      *
      * @return mixed
-     * @since 2.0.0
      */
     private function getAttributeObject()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index 1f4956b6b3258..8294d97474885 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -22,19 +22,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Front extends Generic
 {
     /**
      * @var Yesno
-     * @since 2.0.0
      */
     protected $_yesNo;
 
     /**
      * @var PropertyLocker
-     * @since 2.0.0
      */
     private $propertyLocker;
 
@@ -45,7 +42,6 @@ class Front extends Generic
      * @param Yesno $yesNo
      * @param PropertyLocker $propertyLocker
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      * {@inheritdoc}
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 6b9e8c8c3c140..a22fd5d68a5f6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -16,7 +16,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Main extends AbstractMain
 {
@@ -25,7 +24,6 @@ class Main extends AbstractMain
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -85,7 +83,6 @@ protected function _prepareForm()
      * Retrieve additional element types for product attributes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index b4254f612e2f3..43a58a7880e51 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Options
  *
- * @since 2.0.0
  */
 class Options extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\AbstractOptions
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
index 2cb72b5052c97..b0c7bae2cc712 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\System
  *
- * @since 2.0.0
  */
 class System extends Generic
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
index d2bb78aa9210d..58378f49191f6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
index 73bc909858dc9..ab5026b1e69b9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
@@ -15,13 +15,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends AbstractGrid
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -30,7 +28,6 @@ class Grid extends AbstractGrid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Prepare product attributes grid collection object
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -61,7 +57,6 @@ protected function _prepareCollection()
      * Prepare product attributes grid columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
index c4c0c3afca365..a9b10d97ec006 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
@@ -15,13 +15,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -59,7 +57,6 @@ protected function _prepareForm()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -82,7 +79,6 @@ protected function _getAdditionalElementTypes()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 097db765e6335..729f67b55fa13 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -15,13 +15,11 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Main extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/set/main.phtml';
 
@@ -29,37 +27,31 @@ class Main extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $_typeFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\GroupFactory
-     * @since 2.0.0
      */
     protected $_groupFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface
-     * @since 2.0.0
      */
     protected $attributeMapper;
 
@@ -72,7 +64,6 @@ class Main extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param AttributeMapperInterface $attributeMapper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -97,7 +88,6 @@ public function __construct(
      * Prepare Global Layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -178,7 +168,6 @@ protected function _prepareLayout()
      * Retrieve Attribute Set Group Tree HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroupTreeHtml()
     {
@@ -189,7 +178,6 @@ public function getGroupTreeHtml()
      * Retrieve Attribute Set Edit Form HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSetFormHtml()
     {
@@ -200,7 +188,6 @@ public function getSetFormHtml()
      * Retrieve Block Header Text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getHeader()
     {
@@ -211,7 +198,6 @@ protected function _getHeader()
      * Retrieve Attribute Set Save URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMoveUrl()
     {
@@ -222,7 +208,6 @@ public function getMoveUrl()
      * Retrieve Attribute Set Group Save URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroupUrl()
     {
@@ -233,7 +218,6 @@ public function getGroupUrl()
      * Retrieve Attribute Set Group Tree as JSON format
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroupTreeJson()
     {
@@ -275,7 +259,6 @@ public function getGroupTreeJson()
      * Retrieve Unused in Attribute Set Attribute Tree as JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeTreeJson()
     {
@@ -326,7 +309,6 @@ public function getAttributeTreeJson()
      * Retrieve Delete Group Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteGroupButton()
     {
@@ -337,7 +319,6 @@ public function getDeleteGroupButton()
      * Retrieve Add New Group Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddGroupButton()
     {
@@ -348,7 +329,6 @@ public function getAddGroupButton()
      * Retrieve current Attribute Set object
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Set
-     * @since 2.0.0
      */
     protected function _getAttributeSet()
     {
@@ -359,7 +339,6 @@ protected function _getAttributeSet()
      * Retrieve current attribute set Id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getSetId()
     {
@@ -371,7 +350,6 @@ protected function _getSetId()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsCurrentSetDefault()
     {
@@ -390,7 +368,6 @@ public function getIsCurrentSetDefault()
      * Prepare HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
index 9945c9da86611..a0565ff8d0b2d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formattribute
  *
- * @since 2.0.0
  */
 class Formattribute extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
index 30a074c3f8243..4e0ffdf65a655 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formgroup
  *
- * @since 2.0.0
  */
 class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $_typeFactory;
 
@@ -30,7 +28,6 @@ class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Eav\Model\Entity\TypeFactory $typeFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -86,7 +82,6 @@ protected function _prepareForm()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function _getSetId()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
index 0794c91867c05..a1ad1550f739f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formset
  *
- * @since 2.0.0
  */
 class Formset extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $_setFactory;
 
@@ -26,7 +24,6 @@ class Formset extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Prepares attribute set form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
index 463c6f05b6e31..92c8307ffede0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree\Attribute
  *
- * @since 2.0.0
  */
 class Attribute extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index 5f56079a0727e..90fd1de2b8669 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree\Group
  *
- * @since 2.0.0
  */
 class Group extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index ef75c7e475c3b..5d0eaa3ea9bab 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Add
  *
- * @since 2.0.0
  */
 class Add extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
 
     /**
      * @return AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -61,7 +58,6 @@ protected function _prepareLayout()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getHeader()
     {
@@ -70,7 +66,6 @@ protected function _getHeader()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -81,7 +76,6 @@ public function getFormHtml()
      * Return id of form, used by this block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormId()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index b35656e8c23cf..82dfad3fc2aff 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Main extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -43,7 +40,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNewButtonHtml()
     {
@@ -52,7 +48,6 @@ public function getNewButtonHtml()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getHeader()
     {
@@ -61,7 +56,6 @@ protected function _getHeader()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
index 458362d5ff896..c98e469a0ee1b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Main\Filter
  *
- * @since 2.0.0
  */
 class Filter extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $_setFactory;
 
@@ -30,7 +28,6 @@ class Filter extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
index 79c1a727d8c4c..1bc6ea39a0ec6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
@@ -10,19 +10,16 @@
  * Adminhtml catalog product composite configure block
  *
  * @api
- * @since 2.0.0
  */
 class Configure extends \Magento\Backend\Block\Widget
 {
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/composite/configure.phtml';
 
@@ -30,13 +27,11 @@ class Configure extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
@@ -45,7 +40,6 @@ class Configure extends \Magento\Backend\Block\Widget
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +56,6 @@ public function __construct(
      * Retrieve product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -81,7 +74,6 @@ public function getProduct()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(\Magento\Catalog\Model\Product $product = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
index 25452582f6c83..5683328b0f811 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
@@ -9,7 +9,6 @@
  * Adminhtml block for showing product options fieldsets
  *
  * @api
- * @since 2.0.0
  */
 class Error extends \Magento\Framework\View\Element\Template
 {
@@ -17,13 +16,11 @@ class Error extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -32,7 +29,6 @@ class Error extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * configuration controls
      *
      * @return string
-     * @since 2.0.0
      */
     public function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
index c3046c2f86c36..0e4da2ab4b5c8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
@@ -9,7 +9,6 @@
  * Adminhtml block for showing product options fieldsets
  *
  * @api
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Framework\View\Element\Text\ListText
 {
@@ -18,7 +17,6 @@ class Fieldset extends \Magento\Framework\View\Element\Text\ListText
      * Iterates through fieldsets and fetches complete html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
index d9bfec597ee77..60b0a09f46292 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
@@ -9,7 +9,6 @@
  * Adminhtml block for fieldset of product custom options
  *
  * @api
- * @since 2.0.0
  */
 class Options extends \Magento\Catalog\Block\Product\View\Options
 {
@@ -19,7 +18,6 @@ class Options extends \Magento\Catalog\Block\Product\View\Options
      * @param \Magento\Catalog\Model\Product\Option $option
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOptionHtml(\Magento\Catalog\Model\Product\Option $option)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
index 560daf3d0fab3..7f196b8e30aaa 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
@@ -9,7 +9,6 @@
  * Adminhtml block for fieldset of product custom options
  *
  * @api
- * @since 2.0.0
  */
 class Qty extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class Qty extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Qty extends \Magento\Framework\View\Element\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Constructor for our block with options
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -52,7 +48,6 @@ public function _construct()
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -68,7 +63,6 @@ public function getProduct()
      * Return selected qty
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQtyValue()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
index 0ac39d73ca638..75c577fd9b4d3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
@@ -11,13 +11,11 @@
  * for single item
  *
  * @api
- * @since 2.0.0
  */
 class Result extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\View\Helper\Js
-     * @since 2.0.0
      */
     protected $_jsHelper = null;
 
@@ -25,13 +23,11 @@ class Result extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -41,7 +37,6 @@ class Result extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Forms script response
      *
      * @return string
-     * @since 2.0.0
      */
     public function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index 6723ca87dc358..d9d8943181951 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit.phtml';
 
@@ -29,25 +27,21 @@ class Edit extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $_attributeSetFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_productHelper;
 
@@ -58,7 +52,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -77,7 +70,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -90,7 +82,6 @@ protected function _construct()
      * Retrieve currently edited product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -101,7 +92,6 @@ public function getProduct()
      * Add elements in layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -159,7 +149,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonHtml()
     {
@@ -168,7 +157,6 @@ public function getBackButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCancelButtonHtml()
     {
@@ -177,7 +165,6 @@ public function getCancelButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -186,7 +173,6 @@ public function getSaveButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveAndEditButtonHtml()
     {
@@ -195,7 +181,6 @@ public function getSaveAndEditButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteButtonHtml()
     {
@@ -206,7 +191,6 @@ public function getDeleteButtonHtml()
      * Get Save Split Button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveSplitButtonHtml()
     {
@@ -215,7 +199,6 @@ public function getSaveSplitButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -224,7 +207,6 @@ public function getValidationUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -233,7 +215,6 @@ public function getSaveUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveAndContinueUrl()
     {
@@ -245,7 +226,6 @@ public function getSaveAndContinueUrl()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -254,7 +234,6 @@ public function getProductId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getProductSetId()
     {
@@ -267,7 +246,6 @@ public function getProductSetId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDuplicateUrl()
     {
@@ -277,7 +255,6 @@ public function getDuplicateUrl()
     /**
      * @deprecated 2.2.0
      * @return string
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -291,7 +268,6 @@ public function getHeader()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSetName()
     {
@@ -304,7 +280,6 @@ public function getAttributeSetName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSelectedTabId()
     {
@@ -315,7 +290,6 @@ public function getSelectedTabId()
      * Get fields masks from config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFieldsAutogenerationMasks()
     {
@@ -326,7 +300,6 @@ public function getFieldsAutogenerationMasks()
      * Retrieve available placeholders
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesAllowedForAutogeneration()
     {
@@ -337,7 +310,6 @@ public function getAttributesAllowedForAutogeneration()
      * Get formed array with attribute codes and Apply To property
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributes()
     {
@@ -355,7 +327,6 @@ protected function _getAttributes()
      * Get dropdown options for save split button
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSaveSplitButtonOptions()
     {
@@ -407,7 +378,6 @@ protected function _getSaveSplitButtonOptions()
      * Check whether new product is being created
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isProductNew()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
index 4489bfdf2e969..f0c4251da7742 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Attribute extends \Magento\Backend\Block\Widget
 {
@@ -24,7 +23,6 @@ class Attribute extends \Magento\Backend\Block\Widget
      * Adminhtml catalog product edit action attribute
      *
      * @var ActionAttribute
-     * @since 2.0.0
      */
     protected $_helperActionAttribute = null;
 
@@ -32,7 +30,6 @@ class Attribute extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param ActionAttribute $helperActionAttribute
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -89,7 +85,6 @@ protected function _prepareLayout()
      * Retrieve selected products for update
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getProducts()
     {
@@ -100,7 +95,6 @@ public function getProducts()
      * Retrieve block attributes update helper
      *
      * @return ActionAttribute|null
-     * @since 2.0.0
      */
     protected function _getHelper()
     {
@@ -111,7 +105,6 @@ protected function _getHelper()
      * Retrieve back button html code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonHtml()
     {
@@ -122,7 +115,6 @@ public function getBackButtonHtml()
      * Retrieve cancel button html code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCancelButtonHtml()
     {
@@ -133,7 +125,6 @@ public function getCancelButtonHtml()
      * Retrieve save button html code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -144,7 +135,6 @@ public function getSaveButtonHtml()
      * Get save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -156,7 +146,6 @@ public function getSaveUrl()
      * Get validation url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 68d9850cb4575..74d7ac6a90f9e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -18,20 +18,17 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
-     * @since 2.0.0
      */
     protected $_attributeAction;
 
@@ -42,7 +39,6 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeAction
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +64,6 @@ protected function _construct()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -106,7 +100,6 @@ protected function _prepareForm()
      * Retrieve attributes for product mass update
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -117,7 +110,6 @@ public function getAttributes()
      * Additional element types for product attributes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -134,7 +126,6 @@ protected function _getAdditionalElementTypes()
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getAdditionalElementHtml($element)
     {
@@ -164,7 +155,6 @@ protected function _getAdditionalElementHtml($element)
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -173,7 +163,6 @@ public function getTabLabel()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -182,7 +171,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -191,7 +179,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 314d090934e0c..d847dc38539a7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -9,19 +9,16 @@
  * Products mass update inventory tab
  *
  * @api
- * @since 2.0.0
  */
 class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\CatalogInventory\Model\Source\Backorders
-     * @since 2.0.0
      */
     protected $_backorders;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -36,7 +33,6 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Retrieve Backorders Options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBackordersOption()
     {
@@ -64,7 +59,6 @@ public function getBackordersOption()
      * Retrieve field suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldSuffix()
     {
@@ -75,7 +69,6 @@ public function getFieldSuffix()
      * Retrieve current store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -88,7 +81,6 @@ public function getStoreId()
      *
      * @param string $field
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultConfigValue($field)
     {
@@ -99,7 +91,6 @@ public function getDefaultConfigValue($field)
      * Tab settings
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -108,7 +99,6 @@ public function getTabLabel()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -117,7 +107,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -126,7 +115,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
index f7806723827ed..81220164c2766 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
@@ -16,13 +16,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Websites extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @return Website[]
-     * @since 2.0.0
      */
     public function getWebsiteCollection()
     {
@@ -32,7 +30,6 @@ public function getWebsiteCollection()
     /**
      * @param Website $website
      * @return Group[]
-     * @since 2.0.0
      */
     public function getGroupCollection(Website $website)
     {
@@ -42,7 +39,6 @@ public function getGroupCollection(Website $website)
     /**
      * @param Group $group
      * @return array
-     * @since 2.0.0
      */
     public function getStoreCollection(Group $group)
     {
@@ -53,7 +49,6 @@ public function getStoreCollection(Group $group)
      * Tab settings
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -62,7 +57,6 @@ public function getTabLabel()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -71,7 +65,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -80,7 +73,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
index 4f98b206337dd..e0ddc8cc2e961 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
index ab7204d61f402..4c8774298e5e1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet
  *
- * @since 2.0.0
  */
 class AttributeSet extends \Magento\Backend\Block\Widget\Form
 {
@@ -22,7 +21,6 @@ class AttributeSet extends \Magento\Backend\Block\Widget\Form
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -30,7 +28,6 @@ class AttributeSet extends \Magento\Backend\Block\Widget\Form
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Get options for suggest widget
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectorOptions()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index 49b5b78894746..cd27d36278cdc 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Js
  *
- * @since 2.0.0
  */
 class Js extends \Magento\Backend\Block\Template
 {
@@ -21,19 +20,16 @@ class Js extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var TaxCalculationInterface
-     * @since 2.0.0
      */
     protected $calculationService;
 
     /**
      * @var ProductTaxClassSource
-     * @since 2.0.0
      */
     protected $productTaxClassSource;
 
@@ -41,7 +37,6 @@ class Js extends \Magento\Backend\Block\Template
      * Current customer
      *
      * @var CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -49,7 +44,6 @@ class Js extends \Magento\Backend\Block\Template
      * Json helper
      *
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -61,7 +55,6 @@ class Js extends \Magento\Backend\Block\Template
      * @param TaxCalculationInterface $calculationService
      * @param ProductTaxClassSource $productTaxClassSource
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -84,7 +77,6 @@ public function __construct(
      * Get currently edited product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -95,7 +87,6 @@ public function getProduct()
      * Get store object of curently edited product
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -110,7 +101,6 @@ public function getStore()
      * Get all tax rates JSON for all product tax classes.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAllRatesByProductClassJson()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
index 2b8b02b4aa742..0a766bc4c0cb3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
@@ -13,19 +13,16 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
@@ -36,7 +33,6 @@ class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Form preparation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -107,7 +102,6 @@ protected function _prepareForm()
      * Get parent category options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getParentCategoryOptions()
     {
@@ -133,7 +127,6 @@ protected function _getParentCategoryOptions()
      * Category save action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveCategoryUrl()
     {
@@ -144,7 +137,6 @@ public function getSaveCategoryUrl()
      * Attach new category dialog widget initialization
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
index 3b2618a9cced3..5640a94bf2dcc 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
@@ -11,7 +11,6 @@
  * Class Serializer
  * @package Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Serializer extends \Magento\Framework\View\Element\Template
 {
@@ -40,7 +39,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -52,7 +50,6 @@ public function _construct()
     /**
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getProductsJSON()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 91bbf8e8d8abb..1cb938b1650ee 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts
  *
- * @since 2.0.0
  */
 class Alerts extends \Magento\Backend\Block\Widget\Tab
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/tab/alert.phtml';
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -71,7 +68,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAccordionHtml()
     {
@@ -82,7 +78,6 @@ public function getAccordionHtml()
      * Tab is hidden
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index fa7995f71f203..214c232b5b195 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -12,7 +12,6 @@
  * Sign up for an alert when the product price changes grid
  *
  * @api
- * @since 2.0.0
  */
 class Price extends Extended
 {
@@ -20,13 +19,11 @@ class Price extends Extended
      * Catalog data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\ProductAlert\Model\PriceFactory
-     * @since 2.0.0
      */
     protected $_priceFactory;
 
@@ -36,7 +33,6 @@ class Price extends Extended
      * @param \Magento\ProductAlert\Model\PriceFactory $priceFactory
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +63,6 @@ protected function _construct()
 
     /**
      * @return Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -86,7 +80,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -123,7 +116,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
index 284e91c431cfe..7a708894ccbed 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
@@ -12,7 +12,6 @@
  * Sign up for an alert when the product price changes grid
  *
  * @api
- * @since 2.0.0
  */
 class Stock extends Extended
 {
@@ -20,13 +19,11 @@ class Stock extends Extended
      * Catalog data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\ProductAlert\Model\StockFactory
-     * @since 2.0.0
      */
     protected $_stockFactory;
 
@@ -36,7 +33,6 @@ class Stock extends Extended
      * @param \Magento\ProductAlert\Model\StockFactory $stockFactory
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +63,6 @@ protected function _construct()
 
     /**
      * @return Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -86,7 +80,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -110,7 +103,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
index ce974cec8dd71..b25cdd7cb72e4 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
 {
@@ -24,7 +23,6 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -136,7 +134,6 @@ protected function _prepareForm()
      * Retrieve additional element types
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
index 968018764c099..b2fb40234f63e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Create
  *
- * @since 2.0.0
  */
 class Create extends Button
 {
@@ -24,7 +23,6 @@ class Create extends Button
      * Config of create new attribute
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_config = null;
 
@@ -32,7 +30,6 @@ class Create extends Button
      * Retrieve config of new attribute creation
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -45,7 +42,6 @@ public function getConfig()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -94,7 +90,6 @@ protected function _beforeToHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -112,7 +107,6 @@ protected function _toHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index 5b6f8ee52aa2a..c13f253906c7a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search
  *
- * @since 2.0.0
  */
 class Search extends \Magento\Backend\Block\Widget
 {
@@ -22,19 +21,16 @@ class Search extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -44,7 +40,6 @@ class Search extends \Magento\Backend\Block\Widget
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Define block template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +67,6 @@ protected function _construct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSelectorOptions()
     {
@@ -93,7 +86,6 @@ public function getSelectorOptions()
      * @param string $labelPart
      * @param int $templateId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {
@@ -123,7 +115,6 @@ public function getSuggestedAttributes($labelPart, $templateId = null)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddAttributeUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/ChildTab.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/ChildTab.php
index 3098f6ae2ff3e..4c0468d087342 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/ChildTab.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/ChildTab.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab
  *
- * @since 2.0.0
  */
 class ChildTab extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Backend\Block\Widget\Tab\TabInterface
-     * @since 2.0.0
      */
     protected $tab;
 
     /**
      * @param \Magento\Backend\Block\Widget\Tab\TabInterface $tab
      * @return $this
-     * @since 2.0.0
      */
     public function setTab(\Magento\Backend\Block\Widget\Tab\TabInterface $tab)
     {
@@ -35,7 +32,6 @@ public function setTab(\Magento\Backend\Block\Widget\Tab\TabInterface $tab)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -44,7 +40,6 @@ public function getTitle()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -53,7 +48,6 @@ public function getContent()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabId()
     {
@@ -62,7 +56,6 @@ public function getTabId()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isTabOpened()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 0a7af2abf0b4f..5dab3e2bac695 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -12,7 +12,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Crosssell extends Extended
 {
@@ -20,43 +19,36 @@ class Crosssell extends Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $_linkFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory]
-     * @since 2.0.0
      */
     protected $_setsFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_status;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_visibility;
 
@@ -73,7 +65,6 @@ class Crosssell extends Extended
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -101,7 +92,6 @@ public function __construct(
      * Set grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -121,7 +111,6 @@ protected function _construct()
      * Retrieve currently edited product model
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -133,7 +122,6 @@ public function getProduct()
      *
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -160,7 +148,6 @@ protected function _addColumnFilterToCollection($column)
      * Prepare collection
      *
      * @return Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -188,7 +175,6 @@ protected function _prepareCollection()
      * Checks when this block is readonly
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -200,7 +186,6 @@ public function isReadonly()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -340,7 +325,6 @@ protected function _prepareColumns()
      * Retrieve grid URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -358,7 +342,6 @@ public function getGridUrl()
      * Retrieve selected crosssell products
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
@@ -373,7 +356,6 @@ protected function _getSelectedProducts()
      * Retrieve crosssell products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedCrossSellProducts()
     {
@@ -390,7 +372,6 @@ public function getSelectedCrossSellProducts()
      * @param \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collection $collection
      * @param \Magento\Backend\Block\Widget\Grid\Column\Extended $column
      * @return $this
-     * @since 2.0.0
      */
     public function filterProductPosition($collection, $column)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
index 0497d950a9795..e52c1d3aa4985 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
@@ -9,19 +9,16 @@
 
 /**
  * Product inventory data
- * @since 2.0.0
  */
 class Inventory extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/tab/inventory.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -29,31 +26,26 @@ class Inventory extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Model\Source\Stock
-     * @since 2.0.0
      */
     protected $stock;
 
     /**
      * @var \Magento\CatalogInventory\Model\Source\Backorders
-     * @since 2.0.0
      */
     protected $backorders;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -66,7 +58,6 @@ class Inventory extends \Magento\Backend\Block\Widget
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -89,7 +80,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getBackordersOption()
     {
@@ -104,7 +94,6 @@ public function getBackordersOption()
      * Retrieve stock option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStockOption()
     {
@@ -119,7 +108,6 @@ public function getStockOption()
      * Return current product instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -130,7 +118,6 @@ public function getProduct()
      * Retrieve Catalog Inventory  Stock Item Model
      *
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem()
     {
@@ -143,7 +130,6 @@ public function getStockItem()
     /**
      * @param string $field
      * @return string|null
-     * @since 2.0.0
      */
     public function getFieldValue($field)
     {
@@ -161,7 +147,6 @@ public function getFieldValue($field)
     /**
      * @param string $field
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfigFieldValue($field)
     {
@@ -180,7 +165,6 @@ public function getConfigFieldValue($field)
     /**
      * @param string $field
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultConfigValue($field)
     {
@@ -191,7 +175,6 @@ public function getDefaultConfigValue($field)
      * Is readonly stock
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -200,7 +183,6 @@ public function isReadonly()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isNew()
     {
@@ -212,7 +194,6 @@ public function isNew()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldSuffix()
     {
@@ -223,7 +204,6 @@ public function getFieldSuffix()
      * Check Whether product type can have fractional quantity or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseQtyDecimals()
     {
@@ -234,7 +214,6 @@ public function canUseQtyDecimals()
      * Check if product type is virtual
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual()
     {
@@ -243,7 +222,6 @@ public function isVirtual()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
index c0ed401794d03..b9fee3823bd68 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -9,19 +9,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Options extends Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options.phtml';
 
     /**
      * @return Widget
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -44,7 +41,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -53,7 +49,6 @@ public function getAddButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOptionsBoxHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index a233bcd4e4eca..64856a5c69dc7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -17,31 +17,26 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Option extends Widget
 {
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_productInstance;
 
     /**
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_values;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_itemCount = 1;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options/option.phtml';
 
@@ -49,31 +44,26 @@ class Option extends Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ProductOptions\ConfigInterface
-     * @since 2.0.0
      */
     protected $_productOptionConfig;
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_product;
 
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $_configYesNo;
 
     /**
      * @var \Magento\Catalog\Model\Config\Source\Product\Options\Type
-     * @since 2.0.0
      */
     protected $_optionType;
 
@@ -85,7 +75,6 @@ class Option extends Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -108,7 +97,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -120,7 +108,6 @@ protected function _construct()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getItemCount()
     {
@@ -130,7 +117,6 @@ public function getItemCount()
     /**
      * @param int $itemCount
      * @return $this
-     * @since 2.0.0
      */
     public function setItemCount($itemCount)
     {
@@ -142,7 +128,6 @@ public function setItemCount($itemCount)
      * Get Product
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -161,7 +146,6 @@ public function getProduct()
     /**
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -173,7 +157,6 @@ public function setProduct($product)
      * Retrieve options field name prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName()
     {
@@ -184,7 +167,6 @@ public function getFieldName()
      * Retrieve options field id prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId()
     {
@@ -195,7 +177,6 @@ public function getFieldId()
      * Check block is readonly
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -204,7 +185,6 @@ public function isReadonly()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -217,7 +197,6 @@ protected function _prepareLayout()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getAddButtonId()
     {
@@ -227,7 +206,6 @@ public function getAddButtonId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTypeSelectHtml()
     {
@@ -249,7 +227,6 @@ public function getTypeSelectHtml()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRequireSelectHtml()
     {
@@ -270,7 +247,6 @@ public function getRequireSelectHtml()
      * Retrieve html templates for different types of product custom options
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplatesHtml()
     {
@@ -302,7 +278,6 @@ public function getTemplatesHtml()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getOptionValues()
     {
@@ -426,7 +401,6 @@ public function getOptionValues()
      * @param string $select_id
      * @param array $containers
      * @return string
-     * @since 2.0.0
      */
     public function getCheckboxScopeHtml($id, $name, $checked = true, $select_id = '-1', array $containers = [])
     {
@@ -462,7 +436,6 @@ public function getCheckboxScopeHtml($id, $name, $checked = true, $select_id = '
      * @param float $value
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getPriceValue($value, $type)
     {
@@ -477,7 +450,6 @@ public function getPriceValue($value, $type)
      * Return product grid url for custom options import popup
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductGridUrl()
     {
@@ -488,7 +460,6 @@ public function getProductGridUrl()
      * Return custom options getter URL for ajax queries
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomOptionsUrl()
     {
@@ -499,7 +470,6 @@ public function getCustomOptionsUrl()
      * Return current product id
      *
      * @return null|int
-     * @since 2.0.0
      */
     public function getCurrentProductId()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
index 8d901fa36c3c7..37c46de6ff3d9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
@@ -16,7 +16,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
 {
@@ -26,7 +25,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
      * @param Product|\Magento\Framework\DataObject $row
      * @return string|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -37,7 +35,6 @@ public function getRowUrl($row)
      * Remove some grid columns for product grid in popup
      *
      * @return void
-     * @since 2.0.0
      */
     public function _prepareColumns()
     {
@@ -51,7 +48,6 @@ public function _prepareColumns()
      * Add import action to massaction block
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _prepareMassaction()
     {
@@ -63,7 +59,6 @@ public function _prepareMassaction()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -89,7 +84,6 @@ protected function _prepareCollection()
      * Define grid update URL for ajax queries
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
index 0cdde1e6367f5..1e94025edd4c6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
  *
- * @since 2.0.0
  */
 class AbstractType extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_name = 'abstract';
 
     /**
      * @var \Magento\Catalog\Model\Config\Source\Product\Options\Price
-     * @since 2.0.0
      */
     protected $_optionPrice;
 
@@ -34,7 +31,6 @@ class AbstractType extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -81,7 +76,6 @@ protected function _prepareLayout()
      *
      * @param string $extraParams
      * @return string
-     * @since 2.0.0
      */
     public function getPriceTypeSelectHtml($extraParams = '')
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
index e5cf872f519f7..28869a6bcd54b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date
  *
- * @since 2.0.0
  */
 class Date extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options/type/date.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
index 899f470a77d7b..daea7900dcaa9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File
  *
- * @since 2.0.0
  */
 class File extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options/type/file.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
index 75301802665dd..a7e7ee0e4e1a7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select
  *
- * @since 2.0.0
  */
 class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options/type/select.phtml';
 
@@ -28,7 +26,6 @@ class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\T
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +37,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -69,7 +65,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -78,7 +73,6 @@ public function getAddButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteButtonHtml()
     {
@@ -90,7 +84,6 @@ public function getDeleteButtonHtml()
      *
      * @param string $extraParams
      * @return string
-     * @since 2.0.0
      */
     public function getPriceTypeSelectHtml($extraParams = '')
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
index 2f2aca22f87bc..fe5405b12834e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text
  *
- * @since 2.0.0
  */
 class Text extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/options/type/text.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
index 1f0fa2c77fd53..89cbdc9f7f382 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
index 6f15ac55ff678..5ffd3d1dda38d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
@@ -14,7 +14,6 @@
  * Adminhtml group price item abstract renderer
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractGroup extends Widget implements RendererInterface
 {
@@ -22,7 +21,6 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * Form element instance
      *
      * @var \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     protected $_element;
 
@@ -30,7 +28,6 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * Customer groups cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customerGroups;
 
@@ -38,7 +35,6 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * Websites cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websites;
 
@@ -46,7 +42,6 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * Catalog data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -54,37 +49,31 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $_groupRepository;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $_searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -98,7 +87,6 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -125,7 +113,6 @@ public function __construct(
      * Retrieve current product instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -137,7 +124,6 @@ public function getProduct()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -150,7 +136,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group\AbstractGroup
-     * @since 2.0.0
      */
     public function setElement(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -162,7 +147,6 @@ public function setElement(\Magento\Framework\Data\Form\Element\AbstractElement
      * Retrieve form element instance
      *
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -173,7 +157,6 @@ public function getElement()
      * Prepare group price values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -202,7 +185,6 @@ public function getValues()
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function _sortValues($data)
     {
@@ -214,7 +196,6 @@ protected function _sortValues($data)
      *
      * @param int|null $groupId  return name by customer group id
      * @return array|string
-     * @since 2.0.0
      */
     public function getCustomerGroups($groupId = null)
     {
@@ -241,7 +222,6 @@ public function getCustomerGroups($groupId = null)
      * Retrieve list of initial customer groups
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getInitialCustomerGroups()
     {
@@ -252,7 +232,6 @@ protected function _getInitialCustomerGroups()
      * Retrieve number of websites
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteCount()
     {
@@ -263,7 +242,6 @@ public function getWebsiteCount()
      * Show website column and switcher for group price table
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMultiWebsites()
     {
@@ -274,7 +252,6 @@ public function isMultiWebsites()
      * Retrieve allowed for edit websites
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsites()
     {
@@ -316,7 +293,6 @@ public function getWebsites()
      * Retrieve default value for customer group
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultCustomerGroup()
     {
@@ -327,7 +303,6 @@ public function getDefaultCustomerGroup()
      * Retrieve default value for website
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultWebsite()
     {
@@ -341,7 +316,6 @@ public function getDefaultWebsite()
      * Retrieve 'add group price item' button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -353,7 +327,6 @@ public function getAddButtonHtml()
      *
      * @param string $default
      * @return string
-     * @since 2.0.0
      */
     public function getPriceColumnHeader($default)
     {
@@ -369,7 +342,6 @@ public function getPriceColumnHeader($default)
      *
      * @param string $default
      * @return string
-     * @since 2.0.0
      */
     public function getPriceValidation($default)
     {
@@ -384,7 +356,6 @@ public function getPriceValidation($default)
      * Retrieve Group Price entity attribute
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -395,7 +366,6 @@ public function getAttribute()
      * Check group price attribute scope is global
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeGlobal()
     {
@@ -406,7 +376,6 @@ public function isScopeGlobal()
      * Show group prices grid website column
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShowWebsiteColumn()
     {
@@ -420,7 +389,6 @@ public function isShowWebsiteColumn()
      * Check is allow change website value for combination
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowChangeWebsite()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index f56ab478baa50..a80ddd8c122a1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -7,13 +7,11 @@
 
 /**
  * Adminhtml tier price item renderer
- * @since 2.0.0
  */
 class Tier extends Group\AbstractGroup
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/price/tier.phtml';
 
@@ -21,7 +19,6 @@ class Tier extends Group\AbstractGroup
      * Retrieve list of initial customer groups
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getInitialCustomerGroups()
     {
@@ -33,7 +30,6 @@ protected function _getInitialCustomerGroups()
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function _sortValues($data)
     {
@@ -48,7 +44,6 @@ protected function _sortValues($data)
      * @param array $b
      * @return int
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _sortTierPrices($a, $b)
     {
@@ -70,7 +65,6 @@ protected function _sortTierPrices($a, $b)
      * Add "Add tier" button to layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index f7ee82cf25457..b8a0a9cd07005 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Related extends Extended
 {
@@ -18,43 +17,36 @@ class Related extends Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $_linkFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory]
-     * @since 2.0.0
      */
     protected $_setsFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_status;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_visibility;
 
@@ -71,7 +63,6 @@ class Related extends Extended
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -99,7 +90,6 @@ public function __construct(
      * Set grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -119,7 +109,6 @@ protected function _construct()
      * Retrieve currently edited product model
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -131,7 +120,6 @@ public function getProduct()
      *
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -158,7 +146,6 @@ protected function _addColumnFilterToCollection($column)
      * Prepare collection
      *
      * @return Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -184,7 +171,6 @@ protected function _prepareCollection()
      * Checks when this block is readonly
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -196,7 +182,6 @@ public function isReadonly()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -335,7 +320,6 @@ protected function _prepareColumns()
      * Rerieve grid URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -353,7 +337,6 @@ public function getGridUrl()
      * Retrieve selected related products
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
@@ -368,7 +351,6 @@ protected function _getSelectedProducts()
      * Retrieve related products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedRelatedProducts()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 143deaba620bc..cb3d0ca26de65 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -15,43 +14,36 @@ class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $_linkFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory]
-     * @since 2.0.0
      */
     protected $_setsFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_status;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_visibility;
 
@@ -68,7 +60,6 @@ class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -96,7 +87,6 @@ public function __construct(
      * Set grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -116,7 +106,6 @@ protected function _construct()
      * Retirve currently edited product model
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -128,7 +117,6 @@ public function getProduct()
      *
      * @param object $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -155,7 +143,6 @@ protected function _addColumnFilterToCollection($column)
      * Checks when this block is readonly
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -166,7 +153,6 @@ public function isReadonly()
      * Prepare collection
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -193,7 +179,6 @@ protected function _prepareCollection()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -332,7 +317,6 @@ protected function _prepareColumns()
      * Rerieve grid URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -350,7 +334,6 @@ public function getGridUrl()
      * Retrieve selected upsell products
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
@@ -365,7 +348,6 @@ protected function _getSelectedProducts()
      * Retrieve upsell products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedUpsellProducts()
     {
@@ -382,7 +364,6 @@ public function getSelectedUpsellProducts()
      * @param \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collection
      * @param \Magento\Backend\Block\Widget\Grid\Column\Extended $column
      * @return $this
-     * @since 2.0.0
      */
     public function filterProductPosition($collection, $column)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
index 50c0ba1b65845..ffc17c30b17d6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites
  *
- * @since 2.0.0
  */
 class Websites extends \Magento\Backend\Block\Store\Switcher
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_storeFromHtml;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/websites.phtml';
 
@@ -34,7 +31,6 @@ class Websites extends \Magento\Backend\Block\Store\Switcher
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -45,7 +41,6 @@ class Websites extends \Magento\Backend\Block\Store\Switcher
      * @param \Magento\Store\Model\StoreFactory $storeFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Retrieve edited product model instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -74,7 +68,6 @@ public function getProduct()
      * Get store ID of current product
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -85,7 +78,6 @@ public function getStoreId()
      * Get ID of current product
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -96,7 +88,6 @@ public function getProductId()
      * Retrieve array of website IDs of current product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsites()
     {
@@ -108,7 +99,6 @@ public function getWebsites()
      *
      * @param int $websiteId
      * @return bool
-     * @since 2.0.0
      */
     public function hasWebsite($websiteId)
     {
@@ -119,7 +109,6 @@ public function hasWebsite($websiteId)
      * Check websites block is readonly
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -131,7 +120,6 @@ public function isReadonly()
      *
      * @param int $storeId
      * @return null|string
-     * @since 2.0.0
      */
     public function getStoreName($storeId)
     {
@@ -143,7 +131,6 @@ public function getStoreName($storeId)
      *
      * @param \Magento\Store\Model\Store $storeTo
      * @return string
-     * @since 2.0.0
      */
     public function getChooseFromStoreHtml($storeTo)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index 9482ba359edb3..04c3a208b97f9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -21,7 +21,6 @@
 /**
  * Admin product edit tabs
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tabs extends WigetTabs
 {
@@ -31,13 +30,11 @@ class Tabs extends WigetTabs
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_attributeTabBlock = \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Catalog::product/edit/tabs.phtml';
 
@@ -45,7 +42,6 @@ class Tabs extends WigetTabs
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -53,7 +49,6 @@ class Tabs extends WigetTabs
      * Catalog data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -61,25 +56,21 @@ class Tabs extends WigetTabs
      * Adminhtml catalog
      *
      * @var Catalog
-     * @since 2.0.0
      */
     protected $_helperCatalog = null;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var InlineInterface
-     * @since 2.0.0
      */
     protected $_translateInline;
 
@@ -95,7 +86,6 @@ class Tabs extends WigetTabs
      * @param InlineInterface $translateInline
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -120,7 +110,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -132,7 +121,6 @@ protected function _construct()
     /**
      * @param int $attributeSetId
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection
-     * @since 2.0.0
      */
     public function getGroupCollection($attributeSetId)
     {
@@ -147,7 +135,6 @@ public function getGroupCollection($attributeSetId)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -295,7 +282,6 @@ protected function _prepareLayout()
      * Check whether active tab belong to advanced group
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAdvancedTabGroupActive()
     {
@@ -306,7 +292,6 @@ public function isAdvancedTabGroupActive()
      * Retrieve product object from object if not from registry
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -320,7 +305,6 @@ public function getProduct()
      * Getting attribute block name for tabs
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeTabBlock()
     {
@@ -333,7 +317,6 @@ public function getAttributeTabBlock()
     /**
      * @param string $attributeTabBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeTabBlock($attributeTabBlock)
     {
@@ -346,7 +329,6 @@ public function setAttributeTabBlock($attributeTabBlock)
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function _translateHtml($html)
     {
@@ -357,7 +339,6 @@ protected function _translateHtml($html)
     /**
      * @param string $parentTab
      * @return string
-     * @since 2.0.0
      */
     public function getAccordion($parentTab)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index 57339c61c2b61..f8005d119598c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -16,32 +16,27 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Frontend\Product\Watermark
  *
- * @since 2.0.0
  */
 class Watermark extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var \Magento\Framework\Data\Form\Element\Factory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     protected $_formField;
 
     /**
      * @var \Magento\Catalog\Model\Config\Source\Watermark\Position
-     * @since 2.0.0
      */
     protected $_watermarkPosition;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_imageTypes;
 
@@ -52,7 +47,6 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param array $imageTypes
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -72,7 +66,6 @@ public function __construct(
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -138,7 +131,6 @@ public function render(AbstractElement $element)
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _getHeaderHtml($element)
     {
@@ -163,7 +155,6 @@ protected function _getHeaderHtml($element)
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getFooterHtml($element)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index f68cffa9a5889..602961e8979c9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -9,49 +9,41 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory]
-     * @since 2.0.0
      */
     protected $_setsFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_status;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_visibility;
 
     /**
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
@@ -68,7 +60,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +85,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -109,7 +99,6 @@ protected function _construct()
 
     /**
      * @return Store
-     * @since 2.0.0
      */
     protected function _getStore()
     {
@@ -119,7 +108,6 @@ protected function _getStore()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -200,7 +188,6 @@ protected function _prepareCollection()
     /**
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -222,7 +209,6 @@ protected function _addColumnFilterToCollection($column)
     /**
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -387,7 +373,6 @@ protected function _prepareColumns()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -440,7 +425,6 @@ protected function _prepareMassaction()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -450,7 +434,6 @@ public function getGridUrl()
     /**
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
index 215a3f9982c83..59769901f9574 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Apply
  *
- * @since 2.0.0
  */
 class Apply extends \Magento\Framework\Data\Form\Element\Multiselect
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -49,7 +47,6 @@ public function getElementHtml()
      * @param bool $readonly
      * @param bool $useDisabled
      * @return $this
-     * @since 2.0.0
      */
     public function setReadonly($readonly, $useDisabled = false)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
index 9eb686eb0da08..d4461f3d32ac5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
@@ -9,13 +9,11 @@
  * Product form boolean field helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Boolean extends \Magento\Framework\Data\Form\Element\Select
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index 0523c42c28f92..d95065cdcd108 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -13,13 +13,11 @@
 
 /**
  * Product form category field helper
- * @since 2.0.0
  */
 class Category extends \Magento\Framework\Data\Form\Element\Multiselect
 {
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -27,25 +25,21 @@ class Category extends \Magento\Framework\Data\Form\Element\Multiselect
      * Backend data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var AuthorizationInterface
-     * @since 2.0.0
      */
     protected $authorization;
 
@@ -59,7 +53,6 @@ class Category extends \Magento\Framework\Data\Form\Element\Multiselect
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param AuthorizationInterface $authorization
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -88,7 +81,6 @@ public function __construct(
      * Get values for select
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -112,7 +104,6 @@ public function getValues()
      * Get categories collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     protected function _getCategoriesCollection()
     {
@@ -123,7 +114,6 @@ protected function _getCategoriesCollection()
      * Attach category suggest widget initialization
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
@@ -161,7 +151,6 @@ public function getAfterElementHtml()
      * Get selector options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectorOptions()
     {
@@ -178,7 +167,6 @@ protected function _getSelectorOptions()
      * Whether permission is granted
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isAllowed()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
index f2f03d23ecdbd..d318c59773fde 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
  *
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Data\Form\Element\Select
 {
@@ -22,7 +21,6 @@ class Config extends \Magento\Framework\Data\Form\Element\Select
      * Retrieve element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -52,7 +50,6 @@ public function getElementHtml()
      * Get config value data
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getValueFromConfig()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index cadb240d08a2a..f7970ba7b617d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -21,7 +21,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery
  *
- * @since 2.0.0
  */
 class Gallery extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -87,7 +86,6 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
      * @param Registry $registry
      * @param \Magento\Framework\Data\Form $form
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -104,7 +102,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -127,7 +124,6 @@ public function getImages()
      * Prepares content block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentHtml()
     {
@@ -181,7 +177,6 @@ public function getDataScopeHtmlId()
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayUseDefault($attribute)
     {
@@ -197,7 +192,6 @@ public function canDisplayUseDefault($attribute)
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function usedDefault($attribute)
     {
@@ -224,7 +218,6 @@ public function usedDefault($attribute)
      *
      * @param Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getScopeLabel($attribute)
     {
@@ -247,7 +240,6 @@ public function getScopeLabel($attribute)
      * Retrieve data object related with form
      *
      * @return ProductInterface|Product
-     * @since 2.0.0
      */
     public function getDataObject()
     {
@@ -260,7 +252,6 @@ public function getDataObject()
      *
      * @param Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeFieldName($attribute)
     {
@@ -273,7 +264,6 @@ public function getAttributeFieldName($attribute)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -284,7 +274,6 @@ public function toHtml()
      * Default sore ID getter
      *
      * @return integer
-     * @since 2.0.0
      */
     protected function _getDefaultStoreId()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index bd5ea0d90ad03..95366ab7db383 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -21,31 +21,27 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content
  *
- * @since 2.0.0
  */
 class Content extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/helper/gallery.phtml';
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $_mediaConfig;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $imageHelper;
 
@@ -54,7 +50,6 @@ class Content extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,7 +64,6 @@ public function __construct(
 
     /**
      * @return AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -97,7 +91,6 @@ protected function _prepareLayout()
      * Retrieve uploader block
      *
      * @return Uploader
-     * @since 2.0.0
      */
     public function getUploader()
     {
@@ -108,7 +101,6 @@ public function getUploader()
      * Retrieve uploader block html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUploaderHtml()
     {
@@ -117,7 +109,6 @@ public function getUploaderHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -126,7 +117,6 @@ public function getJsObjectName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddImagesButton()
     {
@@ -140,7 +130,6 @@ public function getAddImagesButton()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getImagesJson()
     {
@@ -187,7 +176,6 @@ private function sortImagesByPosition($images)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getImagesValuesJson()
     {
@@ -205,7 +193,6 @@ public function getImagesValuesJson()
      * Get image types data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getImageTypes()
     {
@@ -227,7 +214,6 @@ public function getImageTypes()
      * Retrieve default state allowance
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasUseDefault()
     {
@@ -244,7 +230,6 @@ public function hasUseDefault()
      * Retrieve media attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMediaAttributes()
     {
@@ -255,7 +240,6 @@ public function getMediaAttributes()
      * Retrieve JSON data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImageTypesJson()
     {
@@ -264,8 +248,8 @@ public function getImageTypesJson()
 
     /**
      * @return \Magento\Catalog\Helper\Image
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getImageHelper()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
index e79ecfd3888f1..03fda8cea76f3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
     /**
      * @return bool|string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
@@ -35,7 +33,6 @@ protected function _getUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckbox()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
index a63263f408cc5..95177e234c4af 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
@@ -8,7 +8,6 @@
 
 /**
  * Product form price field helper
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Data\Form\Element\Text
 {
@@ -16,19 +15,16 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -40,7 +36,6 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param \Magento\Tax\Helper\Data $taxData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -59,7 +54,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +63,6 @@ protected function _construct()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
@@ -102,7 +95,6 @@ public function getAfterElementHtml()
     /**
      * @param mixed $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function _getTaxObservingCode($attribute)
     {
@@ -114,7 +106,6 @@ protected function _getTaxObservingCode($attribute)
     /**
      * @param mixed $attribute
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected function getStore($attribute)
     {
@@ -129,7 +120,6 @@ protected function getStore($attribute)
      * @param null|int|string $index
      * @return null|string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index a026be439edc7..f998ebbae5d43 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight
  *
- * @since 2.0.0
  */
 class Weight extends \Magento\Framework\Data\Form\Element\Text
 {
@@ -23,19 +22,16 @@ class Weight extends \Magento\Framework\Data\Form\Element\Text
      * Weight switcher radio-button element
      *
      * @var \Magento\Framework\Data\Form\Element\Checkbox
-     * @since 2.0.0
      */
     protected $weightSwitcher;
 
     /**
      * @var \Magento\Framework\Locale\Format
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -46,7 +42,6 @@ class Weight extends \Magento\Framework\Data\Form\Element\Text
      * @param \Magento\Framework\Locale\Format $localeFormat
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -81,7 +76,6 @@ public function __construct(
      * Add Weight Switcher radio-button element html to weight field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -114,7 +108,6 @@ public function getElementHtml()
      *
      * @param Form $form
      * @return $this
-     * @since 2.0.0
      */
     public function setForm($form)
     {
@@ -126,7 +119,6 @@ public function setForm($form)
      * @param null|int|string $index
      * @return null|string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
index 7c269b2d32c55..b6b29d119bc1d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
@@ -11,7 +11,6 @@
  * JSON products custom options
  *
  * @api
- * @since 2.0.0
  */
 class Ajax extends \Magento\Backend\Block\AbstractBlock
 {
@@ -19,19 +18,16 @@ class Ajax extends \Magento\Backend\Block\AbstractBlock
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -41,7 +37,6 @@ class Ajax extends \Magento\Backend\Block\AbstractBlock
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Return product custom options in JSON format
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
index df3ba74e6f3c3..81bf32f3c80c8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
@@ -13,14 +13,12 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Block\Product\Price
 {
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId
      * @return bool|\Magento\Store\Model\Website
-     * @since 2.0.0
      */
     public function getWebsite($storeId)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
index 0ed2cd221133b..38e72e0bd30fb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
@@ -19,37 +19,31 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends Extended
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedProducts = [];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category
-     * @since 2.0.0
      */
     protected $_resourceCategory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_resourceProduct;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
@@ -61,7 +55,6 @@ class Chooser extends Extended
      * @param \Magento\Catalog\Model\ResourceModel\Category $resourceCategory
      * @param \Magento\Catalog\Model\ResourceModel\Product $resourceProduct
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +76,6 @@ public function __construct(
      * Block construction, prepare grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -97,7 +89,6 @@ protected function _construct()
      *
      * @param AbstractElement $element Form Element
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function prepareElementHtml(AbstractElement $element)
     {
@@ -154,7 +145,6 @@ public function prepareElementHtml(AbstractElement $element)
      * Checkbox Check JS Callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckboxCheckCallback()
     {
@@ -169,7 +159,6 @@ public function getCheckboxCheckCallback()
      * Grid Row JS Callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowClickCallback()
     {
@@ -206,7 +195,6 @@ function (grid, event) {
      * Category Tree node onClick listener js function
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryClickListenerJs()
     {
@@ -227,7 +215,6 @@ function (node, e) {
      *
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -248,7 +235,6 @@ protected function _addColumnFilterToCollection($column)
      * Prepare products collection, defined collection filters (category, product type)
      *
      * @return Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -280,7 +266,6 @@ protected function _prepareCollection()
      * Prepare columns for products grid
      *
      * @return Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -339,7 +324,6 @@ protected function _prepareColumns()
      * Adds additional parameter to URL for loading only products grid
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -360,7 +344,6 @@ public function getGridUrl()
      *
      * @param array $selectedProducts
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectedProducts($selectedProducts)
     {
@@ -372,7 +355,6 @@ public function setSelectedProducts($selectedProducts)
      * Getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedProducts()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 4593632dac9cd..3faf7efbdf5a0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser\Container
  *
- * @since 2.0.0
  */
 class Container extends Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/widget/chooser/container.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
index 5583d4cb55419..dbeff93683bc0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -7,19 +7,16 @@
 
 /**
  * Class Link
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rss/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -27,7 +24,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +44,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -58,7 +52,6 @@ public function getLink()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -69,7 +62,6 @@ public function getLabel()
      * Check whether status notification is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -78,7 +70,6 @@ public function isRssAllowed()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index e4f40bfd622c8..ac1fd8c692ed2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -10,19 +10,16 @@
 /**
  * Class NotifyStock
  * @package Magento\Catalog\Block\Adminhtml\Rss
- * @since 2.0.0
  */
 class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
     /**
      * @var \Magento\Catalog\Model\Rss\Product\NotifyStock
-     * @since 2.0.0
      */
     protected $rssModel;
 
@@ -31,7 +28,6 @@ class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataPr
      * @param \Magento\Catalog\Model\Rss\Product\NotifyStock $rssModel
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -56,7 +51,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -80,7 +74,6 @@ public function getRssData()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -89,7 +82,6 @@ public function getCacheLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -98,7 +90,6 @@ public function isAllowed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -107,7 +98,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index e24c2c044a72c..7f77fd5db3637 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Catalog\Block\Breadcrumbs
  *
- * @since 2.0.0
  */
 class Breadcrumbs extends \Magento\Framework\View\Element\Template
 {
@@ -26,7 +25,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * Catalog data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -34,7 +32,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * @param Context $context
      * @param Data $catalogData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Data $catalogData, array $data = [])
     {
@@ -47,7 +44,6 @@ public function __construct(Context $context, Data $catalogData, array $data = [
      *
      * @param null|string|bool|int|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getTitleSeparator($store = null)
     {
@@ -59,7 +55,6 @@ public function getTitleSeparator($store = null)
      * Preparing layout
      *
      * @return \Magento\Catalog\Block\Breadcrumbs
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index d18d80534bfbf..0cdfe71a53593 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -9,7 +9,6 @@
  * Class Link
  * @api
  * @package Magento\Catalog\Block\Category\Rss
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
@@ -17,13 +16,11 @@ class Link extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry = null;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -32,7 +29,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -59,7 +54,6 @@ public function isRssAllowed()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -68,7 +62,6 @@ public function getLabel()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
@@ -81,7 +74,6 @@ protected function getLinkParams()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isTopCategory()
     {
@@ -90,7 +82,6 @@ public function isTopCategory()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
diff --git a/app/code/Magento/Catalog/Block/Category/View.php b/app/code/Magento/Catalog/Block/Category/View.php
index a7e463e34cad4..c95ded2a8ba0a 100644
--- a/app/code/Magento/Catalog/Block/Category/View.php
+++ b/app/code/Magento/Catalog/Block/Category/View.php
@@ -9,7 +9,6 @@
  * Class View
  * @api
  * @package Magento\Catalog\Block\Category
- * @since 2.0.0
  */
 class View extends \Magento\Framework\View\Element\Template implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -17,7 +16,6 @@ class View extends \Magento\Framework\View\Element\Template implements \Magento\
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,13 +23,11 @@ class View extends \Magento\Framework\View\Element\Template implements \Magento\
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
     /**
      * @var \Magento\Catalog\Helper\Category
-     * @since 2.0.0
      */
     protected $_categoryHelper;
 
@@ -41,7 +37,6 @@ class View extends \Magento\Framework\View\Element\Template implements \Magento\
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Helper\Category $categoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -99,7 +93,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getProductListHtml()
     {
@@ -110,7 +103,6 @@ public function getProductListHtml()
      * Retrieve current category model object
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getCurrentCategory()
     {
@@ -122,7 +114,6 @@ public function getCurrentCategory()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCmsBlockHtml()
     {
@@ -140,7 +131,6 @@ public function getCmsBlockHtml()
     /**
      * Check if category display mode is "Products Only"
      * @return bool
-     * @since 2.0.0
      */
     public function isProductMode()
     {
@@ -150,7 +140,6 @@ public function isProductMode()
     /**
      * Check if category display mode is "Static Block and Products"
      * @return bool
-     * @since 2.0.0
      */
     public function isMixedMode()
     {
@@ -162,7 +151,6 @@ public function isMixedMode()
      * For anchor category with applied filter Static Block Only mode not allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isContentMode()
     {
@@ -184,7 +172,6 @@ public function isContentMode()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index ba2131fc70ac7..86c3b85d15006 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -17,13 +17,11 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Navigation extends \Magento\Framework\View\Element\Template implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var Category
-     * @since 2.0.0
      */
     protected $_categoryInstance;
 
@@ -31,7 +29,6 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Current category key
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentCategoryKey;
 
@@ -39,7 +36,6 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Array of level position counters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_itemLevelPositions = [];
 
@@ -47,13 +43,11 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Catalog category
      *
      * @var \Magento\Catalog\Helper\Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
@@ -61,7 +55,6 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Customer session
      *
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -69,7 +62,6 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
@@ -77,13 +69,11 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Category\Flat\State
-     * @since 2.0.0
      */
     protected $flatState;
 
@@ -97,7 +87,6 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\Indexer\Category\Flat\State $flatState
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -122,7 +111,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -138,7 +126,6 @@ protected function _construct()
      * Get current category
      *
      * @return Category
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -149,7 +136,6 @@ public function getCategory()
      * Get Key pieces for caching block content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -178,7 +164,6 @@ public function getCacheKeyInfo()
      * Get current category key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentCategoryKey()
     {
@@ -198,7 +183,6 @@ public function getCurrentCategoryKey()
      * Retrieve child categories of current category
      *
      * @return \Magento\Framework\Data\Tree\Node\Collection
-     * @since 2.0.0
      */
     public function getCurrentChildCategories()
     {
@@ -215,7 +199,6 @@ public function getCurrentChildCategories()
      *
      * @param   \Magento\Framework\DataObject $category
      * @return  bool
-     * @since 2.0.0
      */
     public function isCategoryActive($category)
     {
@@ -230,7 +213,6 @@ public function isCategoryActive($category)
      *
      * @param Category $category
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryUrl($category)
     {
@@ -247,7 +229,6 @@ public function getCategoryUrl($category)
      * Enter description here...
      *
      * @return Category
-     * @since 2.0.0
      */
     public function getCurrentCategory()
     {
@@ -258,7 +239,6 @@ public function getCurrentCategory()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index 6b35f9250317a..6e56878c00287 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -11,13 +11,11 @@
  * @deprecated 2.2.0
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AbstractProduct extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_priceBlock = [];
 
@@ -25,7 +23,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Flag which allow/disallow to use link for as low as price
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useLinkForAsLowAs = true;
 
@@ -33,7 +30,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Default product amount per row
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultColumnCount = 3;
 
@@ -41,7 +37,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Product amount per row depending on custom page layout of category
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columnCountLayoutDepend = [];
 
@@ -49,7 +44,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -57,7 +51,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
@@ -65,49 +58,41 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $_mathRandom;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $_cartHelper;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $_compareProduct;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $_imageHelper;
 
     /**
      * @var ReviewRendererInterface
-     * @since 2.0.0
      */
     protected $reviewRenderer;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -120,7 +105,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
     /**
      * @param Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Block\Product\Context $context, array $data = [])
     {
@@ -145,7 +129,6 @@ public function __construct(\Magento\Catalog\Block\Product\Context $context, arr
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($product, $additional = [])
     {
@@ -172,7 +155,6 @@ public function getAddToCartUrl($product, $additional = [])
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getSubmitUrl($product, $additional = [])
     {
@@ -192,7 +174,6 @@ public function getSubmitUrl($product, $additional = [])
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToWishlistParams($product)
     {
@@ -203,7 +184,6 @@ public function getAddToWishlistParams($product)
      * Retrieve Add Product to Compare Products List URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCompareUrl()
     {
@@ -215,7 +195,6 @@ public function getAddToCompareUrl()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return int|null
-     * @since 2.0.0
      */
     public function getMinimalQty($product)
     {
@@ -231,7 +210,6 @@ public function getMinimalQty($product)
      * @param bool $templateType
      * @param bool $displayIfNoReviews
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
@@ -245,7 +223,6 @@ public function getReviewsSummaryHtml(
      * Retrieve currently viewed product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -262,7 +239,6 @@ public function getProduct()
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected function _addProductAttributesAndPrices(
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
@@ -281,7 +257,6 @@ protected function _addProductAttributesAndPrices(
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional the route params
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($product, $additional = [])
     {
@@ -300,7 +275,6 @@ public function getProductUrl($product, $additional = [])
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasProductUrl($product)
     {
@@ -320,7 +294,6 @@ public function hasProductUrl($product)
      * Retrieve product amount per row
      *
      * @return int
-     * @since 2.0.0
      */
     public function getColumnCount()
     {
@@ -341,7 +314,6 @@ public function getColumnCount()
      * @param string $pageLayout
      * @param int $columnCount
      * @return \Magento\Catalog\Block\Product\ListProduct
-     * @since 2.0.0
      */
     public function addColumnCountLayoutDepend($pageLayout, $columnCount)
     {
@@ -354,7 +326,6 @@ public function addColumnCountLayoutDepend($pageLayout, $columnCount)
      *
      * @param string $pageLayout
      * @return \Magento\Catalog\Block\Product\ListProduct
-     * @since 2.0.0
      */
     public function removeColumnCountLayoutDepend($pageLayout)
     {
@@ -370,7 +341,6 @@ public function removeColumnCountLayoutDepend($pageLayout)
      *
      * @param string $pageLayout
      * @return int|boolean
-     * @since 2.0.0
      */
     public function getColumnCountLayoutDepend($pageLayout)
     {
@@ -385,7 +355,6 @@ public function getColumnCountLayoutDepend($pageLayout)
      * Retrieve current page layout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageLayout()
     {
@@ -399,7 +368,6 @@ public function getPageLayout()
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanShowProductPrice($product)
     {
@@ -410,7 +378,6 @@ public function getCanShowProductPrice($product)
      * Get if it is necessary to show product stock status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayProductStockStatus()
     {
@@ -425,7 +392,6 @@ public function displayProductStockStatus()
      * @param int $length
      * @param string|null $chars
      * @return string
-     * @since 2.0.0
      */
     public function getRandomString($length, $chars = null)
     {
@@ -437,7 +403,6 @@ public function getRandomString($length, $chars = null)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getProductPrice(\Magento\Catalog\Model\Product $product)
     {
@@ -456,7 +421,6 @@ public function getProductPrice(\Magento\Catalog\Model\Product $product)
      * @param string $renderZone
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function getProductPriceHtml(
         \Magento\Catalog\Model\Product $product,
@@ -482,7 +446,6 @@ public function getProductPriceHtml(
      * Whether redirect to cart enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRedirectToCartEnabled()
     {
@@ -497,7 +460,6 @@ public function isRedirectToCartEnabled()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return mixed
-     * @since 2.0.0
      */
     public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
     {
@@ -512,7 +474,6 @@ public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
     /**
      * @param null $type
      * @return bool|\Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getDetailsRenderer($type = null)
     {
@@ -528,7 +489,6 @@ public function getDetailsRenderer($type = null)
 
     /**
      * @return \Magento\Framework\View\Element\RendererList
-     * @since 2.0.0
      */
     protected function getDetailsRendererList()
     {
@@ -546,7 +506,6 @@ protected function getDetailsRendererList()
      * @param string $imageId
      * @param array $attributes
      * @return \Magento\Catalog\Block\Product\Image
-     * @since 2.0.0
      */
     public function getImage($product, $imageId, $attributes = [])
     {
diff --git a/app/code/Magento/Catalog/Block/Product/AwareInterface.php b/app/code/Magento/Catalog/Block/Product/AwareInterface.php
index 59954f1508485..6c0646daa910d 100644
--- a/app/code/Magento/Catalog/Block/Product/AwareInterface.php
+++ b/app/code/Magento/Catalog/Block/Product/AwareInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Class Product Aware interface
- * @since 2.2.0
+ * @since 2.1.1
  */
 interface AwareInterface
 {
@@ -16,7 +16,7 @@ interface AwareInterface
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function setProduct(\Magento\Catalog\Api\Data\ProductInterface $product);
 }
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index 1979b1d251e6f..301db574b96a4 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -14,7 +14,6 @@
  * Catalog products compare block
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -22,7 +21,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Product Compare items collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection
-     * @since 2.0.0
      */
     protected $_items;
 
@@ -30,7 +28,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Compare Products comparable attributes cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -38,7 +35,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Flag which allow/disallow to use link for as low as price
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useLinkForAsLowAs = false;
 
@@ -46,13 +42,11 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Customer id
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_customerId = null;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -60,7 +54,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Customer visitor
      *
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -68,7 +61,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -76,19 +68,16 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * Item collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemCollectionFactory;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -101,7 +90,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -130,7 +118,6 @@ public function __construct(
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToWishlistParams($product)
     {
@@ -146,7 +133,6 @@ public function getAddToWishlistParams($product)
      * Preparing layout
      *
      * @return \Magento\Catalog\Block\Product\Compare\ListCompare
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -160,7 +146,6 @@ protected function _prepareLayout()
      * Retrieve Product Compare items collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -192,7 +177,6 @@ public function getItems()
      * Retrieve Product Compare Attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -209,7 +193,6 @@ public function getAttributes()
      * @param Product $product
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getProductAttributeValue($product, $attribute)
     {
@@ -234,7 +217,6 @@ public function getProductAttributeValue($product, $attribute)
      * Retrieve Print URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -246,7 +228,6 @@ public function getPrintUrl()
      *
      * @param int $id
      * @return \Magento\Catalog\Block\Product\Compare\ListCompare
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -260,7 +241,6 @@ public function setCustomerId($id)
      * @param Product $product
      * @param string|null $idSuffix
      * @return string
-     * @since 2.0.0
      */
     public function getProductPrice(\Magento\Catalog\Model\Product $product, $idSuffix = '')
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 2e02ad72211c9..a1d53ec7ad969 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -18,85 +18,71 @@
  *
  * @deprecated 2.2.0
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\View\Element\Template\Context
 {
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $compareProduct;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $catalogConfig;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxData;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $catalogHelper;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var ReviewRendererInterface
-     * @since 2.0.0
      */
     protected $reviewRenderer;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var ImageBuilder
-     * @since 2.0.0
      */
     protected $imageBuilder;
 
@@ -140,7 +126,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -224,7 +209,6 @@ public function __construct(
 
     /**
      * @return \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     public function getStockRegistry()
     {
@@ -233,7 +217,6 @@ public function getStockRegistry()
 
     /**
      * @return \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     public function getCartHelper()
     {
@@ -242,7 +225,6 @@ public function getCartHelper()
 
     /**
      * @return \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     public function getCatalogConfig()
     {
@@ -251,7 +233,6 @@ public function getCatalogConfig()
 
     /**
      * @return \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     public function getCatalogHelper()
     {
@@ -260,7 +241,6 @@ public function getCatalogHelper()
 
     /**
      * @return \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     public function getCompareProduct()
     {
@@ -269,7 +249,6 @@ public function getCompareProduct()
 
     /**
      * @return \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     public function getImageHelper()
     {
@@ -278,7 +257,6 @@ public function getImageHelper()
 
     /**
      * @return \Magento\Catalog\Block\Product\ImageBuilder
-     * @since 2.0.0
      */
     public function getImageBuilder()
     {
@@ -287,7 +265,6 @@ public function getImageBuilder()
 
     /**
      * @return \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     public function getMathRandom()
     {
@@ -296,7 +273,6 @@ public function getMathRandom()
 
     /**
      * @return \Magento\Framework\Registry
-     * @since 2.0.0
      */
     public function getRegistry()
     {
@@ -305,7 +281,6 @@ public function getRegistry()
 
     /**
      * @return \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     public function getTaxData()
     {
@@ -314,7 +289,6 @@ public function getTaxData()
 
     /**
      * @return \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     public function getWishlistHelper()
     {
@@ -323,7 +297,6 @@ public function getWishlistHelper()
 
     /**
      * @return \Magento\Catalog\Block\Product\ReviewRendererInterface
-     * @since 2.0.0
      */
     public function getReviewRenderer()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Gallery.php b/app/code/Magento/Catalog/Block/Product/Gallery.php
index 3b3dac6a66235..8f8d156f70698 100644
--- a/app/code/Magento/Catalog/Block/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/Gallery.php
@@ -17,7 +17,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Gallery extends \Magento\Framework\View\Element\Template
 {
@@ -25,7 +24,6 @@ class Gallery extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -33,7 +31,6 @@ class Gallery extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -56,7 +52,6 @@ protected function _prepareLayout()
 
     /**
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -65,7 +60,6 @@ public function getProduct()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getGalleryCollection()
     {
@@ -74,7 +68,6 @@ public function getGalleryCollection()
 
     /**
      * @return Image|null
-     * @since 2.0.0
      */
     public function getCurrentImage()
     {
@@ -92,7 +85,6 @@ public function getCurrentImage()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getImageUrl()
     {
@@ -101,7 +93,6 @@ public function getImageUrl()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getImageFile()
     {
@@ -112,7 +103,6 @@ public function getImageFile()
      * Retrieve image width
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function getImageWidth()
     {
@@ -134,7 +124,6 @@ public function getImageWidth()
 
     /**
      * @return Image|false
-     * @since 2.0.0
      */
     public function getPreviousImage()
     {
@@ -154,7 +143,6 @@ public function getPreviousImage()
 
     /**
      * @return Image|false
-     * @since 2.0.0
      */
     public function getNextImage()
     {
@@ -178,7 +166,6 @@ public function getNextImage()
 
     /**
      * @return false|string
-     * @since 2.0.0
      */
     public function getPreviousImageUrl()
     {
@@ -191,7 +178,6 @@ public function getPreviousImageUrl()
 
     /**
      * @return false|string
-     * @since 2.0.0
      */
     public function getNextImageUrl()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
index df5fb2dab1513..a7938d6312c53 100644
--- a/app/code/Magento/Catalog/Block/Product/Image.php
+++ b/app/code/Magento/Catalog/Block/Product/Image.php
@@ -15,32 +15,27 @@
  * @method mixed getResizedImageHeight()
  * @method float getRatio()
  * @method string getCustomAttributes()
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $attributes = [];
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index b12d64b8d0a25..324d210064b23 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -10,44 +10,37 @@
 /**
  * Class \Magento\Catalog\Block\Product\ImageBuilder
  *
- * @since 2.0.0
  */
 class ImageBuilder
 {
     /**
      * @var ImageFactory
-     * @since 2.0.0
      */
     protected $imageFactory;
 
     /**
      * @var HelperFactory
-     * @since 2.0.0
      */
     protected $helperFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $imageId;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $attributes = [];
 
     /**
      * @param HelperFactory $helperFactory
      * @param ImageFactory $imageFactory
-     * @since 2.0.0
      */
     public function __construct(
         HelperFactory $helperFactory,
@@ -62,7 +55,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -75,7 +67,6 @@ public function setProduct(\Magento\Catalog\Model\Product $product)
      *
      * @param string $imageId
      * @return $this
-     * @since 2.0.0
      */
     public function setImageId($imageId)
     {
@@ -88,7 +79,6 @@ public function setImageId($imageId)
      *
      * @param array $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributes(array $attributes)
     {
@@ -102,7 +92,6 @@ public function setAttributes(array $attributes)
      * Retrieve image custom attributes for HTML element
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getCustomAttributes()
     {
@@ -118,7 +107,6 @@ protected function getCustomAttributes()
      *
      * @param \Magento\Catalog\Helper\Image $helper
      * @return float|int
-     * @since 2.0.0
      */
     protected function getRatio(\Magento\Catalog\Helper\Image $helper)
     {
@@ -134,7 +122,6 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
      * Create image block
      *
      * @return \Magento\Catalog\Block\Product\Image
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 46e6a2982990d..6f95dd676d186 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -19,7 +19,6 @@
  * Product list
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ListProduct extends AbstractProduct implements IdentityInterface
 {
@@ -27,7 +26,6 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * Default toolbar block name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultToolbarBlock = Toolbar::class;
 
@@ -35,7 +33,6 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * Product Collection
      *
      * @var AbstractCollection
-     * @since 2.0.0
      */
     protected $_productCollection;
 
@@ -43,25 +40,21 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
     /**
      * @var \Magento\Framework\Url\Helper\Data
-     * @since 2.0.0
      */
     protected $urlHelper;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -72,7 +65,6 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * @param CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -107,7 +99,6 @@ public function __construct(
      * even when it did not pass externally and therefore isn't cached yet
      *
      * @return AbstractCollection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
@@ -122,7 +113,6 @@ protected function _getProductCollection()
      * Get catalog layer model
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function getLayer()
     {
@@ -133,7 +123,6 @@ public function getLayer()
      * Retrieve loaded category collection
      *
      * @return AbstractCollection
-     * @since 2.0.0
      */
     public function getLoadedProductCollection()
     {
@@ -144,7 +133,6 @@ public function getLoadedProductCollection()
      * Retrieve current view mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -155,7 +143,6 @@ public function getMode()
      * Need use as _prepareLayout - but problem in declaring collection from
      * another block (was problem with search result)
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -170,7 +157,6 @@ protected function _beforeToHtml()
      * Retrieve Toolbar block
      *
      * @return Toolbar
-     * @since 2.0.0
      */
     public function getToolbarBlock()
     {
@@ -189,7 +175,6 @@ public function getToolbarBlock()
      * Retrieve additional blocks html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalHtml()
     {
@@ -200,7 +185,6 @@ public function getAdditionalHtml()
      * Retrieve list toolbar HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToolbarHtml()
     {
@@ -210,7 +194,6 @@ public function getToolbarHtml()
     /**
      * @param AbstractCollection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -221,7 +204,6 @@ public function setCollection($collection)
     /**
      * @param array|string|integer|\Magento\Framework\App\Config\Element $code
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute($code)
     {
@@ -231,7 +213,6 @@ public function addAttribute($code)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getPriceBlockTemplate()
     {
@@ -242,7 +223,6 @@ public function getPriceBlockTemplate()
      * Retrieve Catalog Config object
      *
      * @return \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected function _getConfig()
     {
@@ -254,7 +234,6 @@ protected function _getConfig()
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Block\Product\ListProduct
-     * @since 2.0.0
      */
     public function prepareSortableFieldsByCategory($category)
     {
@@ -281,7 +260,6 @@ public function prepareSortableFieldsByCategory($category)
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -301,7 +279,6 @@ public function getIdentities()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
     {
@@ -318,7 +295,6 @@ public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getProductPrice(\Magento\Catalog\Model\Product $product)
     {
@@ -346,7 +322,6 @@ public function getProductPrice(\Magento\Catalog\Model\Product $product)
      * i.e. rendering happens in the scope of product list, but not single product
      *
      * @return \Magento\Framework\Pricing\Render
-     * @since 2.0.0
      */
     protected function getPriceRender()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/NewProduct.php b/app/code/Magento/Catalog/Block/Product/NewProduct.php
index 6c07cf8c71bbe..cb0904fe5fa64 100644
--- a/app/code/Magento/Catalog/Block/Product/NewProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/NewProduct.php
@@ -11,7 +11,6 @@
  * New products block
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implements
     \Magento\Framework\DataObject\IdentityInterface
@@ -25,13 +24,11 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
      * Products count
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_productsCount;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -39,7 +36,6 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -47,7 +43,6 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
@@ -57,7 +52,6 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -79,7 +73,6 @@ public function __construct(
      * Initialize block's cache
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -99,7 +92,6 @@ protected function _construct()
      * Get Key pieces for caching block content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -117,7 +109,6 @@ public function getCacheKeyInfo()
      * Prepare and return product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|Object|\Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
@@ -169,7 +160,6 @@ protected function _getProductCollection()
      * Prepare collection with new products
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -182,7 +172,6 @@ protected function _beforeToHtml()
      *
      * @param int $count
      * @return $this
-     * @since 2.0.0
      */
     public function setProductsCount($count)
     {
@@ -194,7 +183,6 @@ public function setProductsCount($count)
      * Get how much products should be displayed at once.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductsCount()
     {
@@ -208,7 +196,6 @@ public function getProductsCount()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Price.php b/app/code/Magento/Catalog/Block/Product/Price.php
index f1f12e53201ce..8bed7451cd555 100644
--- a/app/code/Magento/Catalog/Block/Product/Price.php
+++ b/app/code/Magento/Catalog/Block/Product/Price.php
@@ -8,19 +8,16 @@
 
 /**
  * Product price block
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\View\Element\Template implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var null
-     * @since 2.0.0
      */
     protected $_priceDisplayType = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idSuffix = '';
 
@@ -28,7 +25,6 @@ class Price extends \Magento\Framework\View\Element\Template implements \Magento
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -36,31 +32,26 @@ class Price extends \Magento\Framework\View\Element\Template implements \Magento
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $_cartHelper;
 
@@ -73,7 +64,6 @@ class Price extends \Magento\Framework\View\Element\Template implements \Magento
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -98,7 +88,6 @@ public function __construct(
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -111,7 +100,6 @@ public function getProduct()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getDisplayMinimalPrice()
     {
@@ -121,7 +109,6 @@ public function getDisplayMinimalPrice()
     /**
      * @param string $idSuffix
      * @return $this
-     * @since 2.0.0
      */
     public function setIdSuffix($idSuffix)
     {
@@ -131,7 +118,6 @@ public function setIdSuffix($idSuffix)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getIdSuffix()
     {
@@ -144,7 +130,6 @@ public function getIdSuffix()
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($product, $additional = [])
     {
@@ -155,7 +140,6 @@ public function getAddToCartUrl($product, $additional = [])
      * Prevent displaying if the price is not available
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -170,7 +154,6 @@ protected function _toHtml()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getRealPriceJs($product)
     {
@@ -183,7 +166,6 @@ public function getRealPriceJs($product)
      *
      * @param string $sku
      * @return string
-     * @since 2.0.0
      */
     public function prepareSku($sku)
     {
@@ -196,7 +178,6 @@ public function prepareSku($sku)
      * @param int $length
      * @param string|null $chars
      * @return string
-     * @since 2.0.0
      */
     public function getRandomString($length, $chars = null)
     {
@@ -207,7 +188,6 @@ public function getRandomString($length, $chars = null)
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
index 8613fda1780ca..69ae694c13361 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\ProductList\Crosssell
  *
- * @since 2.0.0
  */
 class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -20,7 +19,6 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
      * Crosssell item collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     protected $_itemCollection;
 
@@ -28,7 +26,6 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
      * Prepare crosssell items data
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Crosssell
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
@@ -53,7 +50,6 @@ protected function _prepareData()
      * Prepare items collection
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Crosssell
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -65,7 +61,6 @@ protected function _beforeToHtml()
      * Retrieve crosssell items collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Item/AddTo/Compare.php b/app/code/Magento/Catalog/Block/Product/ProductList/Item/AddTo/Compare.php
index c98a3b9ee6554..b73e30080b07f 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Item/AddTo/Compare.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Item/AddTo/Compare.php
@@ -9,13 +9,13 @@
  * Add product to compare
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Compare extends \Magento\Catalog\Block\Product\ProductList\Item\Block
 {
     /**
      * @return \Magento\Catalog\Helper\Product\Compare
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getCompareHelper()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Item/Block.php b/app/code/Magento/Catalog/Block/Product/ProductList/Item/Block.php
index 26194585c4095..9fb8fbbb0ab1f 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Item/Block.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Item/Block.php
@@ -11,19 +11,19 @@
 
 /**
  * Class List Item Block
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Block extends AbstractProduct implements ProductAwareInterface
 {
     /**
      * @var ProductInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $product;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function setProduct(ProductInterface $product)
     {
@@ -33,7 +33,7 @@ public function setProduct(ProductInterface $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getProduct()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Item/Container.php b/app/code/Magento/Catalog/Block/Product/ProductList/Item/Container.php
index 5f0835abeca0e..d2951f2b0dd13 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Item/Container.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Item/Container.php
@@ -11,13 +11,13 @@
  * Class List Item Block Container
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Container extends Block
 {
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getChildHtml($alias = '', $useCache = false)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Promotion.php b/app/code/Magento/Catalog/Block/Product/ProductList/Promotion.php
index cb057d792390d..3714aadd4769b 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Promotion.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Promotion.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\ProductList\Promotion
  *
- * @since 2.0.0
  */
 class Promotion extends \Magento\Catalog\Block\Product\ListProduct
 {
@@ -20,13 +19,11 @@ class Promotion extends \Magento\Catalog\Block\Product\ListProduct
      * Product collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -38,7 +35,6 @@ class Promotion extends \Magento\Catalog\Block\Product\ListProduct
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param CollectionFactory $productCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Random.php b/app/code/Magento/Catalog/Block/Product/ProductList/Random.php
index 76958a3d3818e..cf67c6d709fb5 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Random.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Random.php
@@ -11,7 +11,6 @@
  * Catalog product random items block
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Random extends \Magento\Catalog\Block\Product\ListProduct
 {
@@ -19,13 +18,11 @@ class Random extends \Magento\Catalog\Block\Product\ListProduct
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -37,7 +34,6 @@ class Random extends \Magento\Catalog\Block\Product\ListProduct
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 2ce13e27fb3ad..346570b955249 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -16,13 +16,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var Collection
-     * @since 2.0.0
      */
     protected $_itemCollection;
 
@@ -30,7 +28,6 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -38,7 +35,6 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -46,13 +42,11 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * Checkout cart
      *
      * @var \Magento\Checkout\Model\ResourceModel\Cart
-     * @since 2.0.0
      */
     protected $_checkoutCart;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -63,7 +57,6 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -85,7 +78,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
@@ -112,7 +104,6 @@ protected function _prepareData()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -122,7 +113,6 @@ protected function _beforeToHtml()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -140,7 +130,6 @@ public function getItems()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -155,7 +144,6 @@ public function getIdentities()
      * Find out if some products can be easy added to cart
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canItemsAddToCart()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 7063f6c79372d..6be038ee00392 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -15,7 +15,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Toolbar extends \Magento\Framework\View\Element\Template
 {
@@ -23,7 +22,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Products collection
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_collection = null;
 
@@ -31,7 +29,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * List of available order fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_availableOrder = null;
 
@@ -39,7 +36,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * List of available view types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_availableMode = [];
 
@@ -47,7 +43,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Is enable View switcher
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_enableViewSwitcher = true;
 
@@ -55,7 +50,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Is Expanded
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isExpanded = true;
 
@@ -63,7 +57,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Default Order field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = null;
 
@@ -71,7 +64,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Default direction
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_direction = ProductList::DEFAULT_SORT_DIRECTION;
 
@@ -79,19 +71,16 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Default View mode
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_viewMode = null;
 
     /**
      * @var bool $_paramsMemorizeAllowed
-     * @since 2.0.0
      */
     protected $_paramsMemorizeAllowed = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/list/toolbar.phtml';
 
@@ -99,7 +88,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -107,31 +95,26 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
     /**
      * @var ToolbarModel
-     * @since 2.0.0
      */
     protected $_toolbarModel;
 
     /**
      * @var ProductList
-     * @since 2.0.0
      */
     protected $_productListHelper;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
@@ -144,7 +127,6 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param ProductList $productListHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -169,7 +151,6 @@ public function __construct(
      * Disable list state params memorizing
      *
      * @return $this
-     * @since 2.0.0
      */
     public function disableParamsMemorizing()
     {
@@ -183,7 +164,6 @@ public function disableParamsMemorizing()
      * @param string $param parameter name
      * @param mixed $value parameter value
      * @return $this
-     * @since 2.0.0
      */
     protected function _memorizeParam($param, $value)
     {
@@ -198,7 +178,6 @@ protected function _memorizeParam($param, $value)
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -221,7 +200,6 @@ public function setCollection($collection)
      * Return products collection instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -232,7 +210,6 @@ public function getCollection()
      * Return current page from request
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -243,7 +220,6 @@ public function getCurrentPage()
      * Get grit products sort order field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentOrder()
     {
@@ -277,7 +253,6 @@ public function getCurrentOrder()
      * Retrieve current direction
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentDirection()
     {
@@ -305,7 +280,6 @@ public function getCurrentDirection()
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultOrder($field)
     {
@@ -321,7 +295,6 @@ public function setDefaultOrder($field)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDirection($dir)
     {
@@ -335,7 +308,6 @@ public function setDefaultDirection($dir)
      * Retrieve available Order fields list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableOrders()
     {
@@ -348,7 +320,6 @@ public function getAvailableOrders()
      *
      * @param array $orders
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableOrders($orders)
     {
@@ -362,7 +333,6 @@ public function setAvailableOrders($orders)
      * @param string $order
      * @param string $value
      * @return \Magento\Catalog\Block\Product\ProductList\Toolbar
-     * @since 2.0.0
      */
     public function addOrderToAvailableOrders($order, $value)
     {
@@ -376,7 +346,6 @@ public function addOrderToAvailableOrders($order, $value)
      *
      * @param string $order
      * @return $this
-     * @since 2.0.0
      */
     public function removeOrderFromAvailableOrders($order)
     {
@@ -392,7 +361,6 @@ public function removeOrderFromAvailableOrders($order)
      *
      * @param string $order
      * @return bool
-     * @since 2.0.0
      */
     public function isOrderCurrent($order)
     {
@@ -404,7 +372,6 @@ public function isOrderCurrent($order)
      *
      * @param array $params Query parameters
      * @return string
-     * @since 2.0.0
      */
     public function getPagerUrl($params = [])
     {
@@ -419,7 +386,6 @@ public function getPagerUrl($params = [])
     /**
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getPagerEncodedUrl($params = [])
     {
@@ -430,7 +396,6 @@ public function getPagerEncodedUrl($params = [])
      * Retrieve current View mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentMode()
     {
@@ -453,7 +418,6 @@ public function getCurrentMode()
      *
      * @param string $mode
      * @return bool
-     * @since 2.0.0
      */
     public function isModeActive($mode)
     {
@@ -464,7 +428,6 @@ public function isModeActive($mode)
      * Retrieve available view modes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getModes()
     {
@@ -479,7 +442,6 @@ public function getModes()
      *
      * @param array $modes
      * @return $this
-     * @since 2.0.0
      */
     public function setModes($modes)
     {
@@ -494,7 +456,6 @@ public function setModes($modes)
      * Disable view switcher
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Toolbar
-     * @since 2.0.0
      */
     public function disableViewSwitcher()
     {
@@ -506,7 +467,6 @@ public function disableViewSwitcher()
      * Enable view switcher
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Toolbar
-     * @since 2.0.0
      */
     public function enableViewSwitcher()
     {
@@ -518,7 +478,6 @@ public function enableViewSwitcher()
      * Is a enabled view switcher
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabledViewSwitcher()
     {
@@ -529,7 +488,6 @@ public function isEnabledViewSwitcher()
      * Disable Expanded
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Toolbar
-     * @since 2.0.0
      */
     public function disableExpanded()
     {
@@ -541,7 +499,6 @@ public function disableExpanded()
      * Enable Expanded
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Toolbar
-     * @since 2.0.0
      */
     public function enableExpanded()
     {
@@ -553,7 +510,6 @@ public function enableExpanded()
      * Check is Expanded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isExpanded()
     {
@@ -564,7 +520,6 @@ public function isExpanded()
      * Retrieve default per page values
      *
      * @return string (comma separated)
-     * @since 2.0.0
      */
     public function getDefaultPerPageValue()
     {
@@ -580,7 +535,6 @@ public function getDefaultPerPageValue()
      * Retrieve available limits for current view mode
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableLimit()
     {
@@ -591,7 +545,6 @@ public function getAvailableLimit()
      * Get specified products limit display per page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLimit()
     {
@@ -623,7 +576,6 @@ public function getLimit()
     /**
      * @param int $limit
      * @return bool
-     * @since 2.0.0
      */
     public function isLimitCurrent($limit)
     {
@@ -632,7 +584,6 @@ public function isLimitCurrent($limit)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getFirstNum()
     {
@@ -642,7 +593,6 @@ public function getFirstNum()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLastNum()
     {
@@ -652,7 +602,6 @@ public function getLastNum()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getTotalNum()
     {
@@ -661,7 +610,6 @@ public function getTotalNum()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isFirstPage()
     {
@@ -670,7 +618,6 @@ public function isFirstPage()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLastPageNum()
     {
@@ -681,7 +628,6 @@ public function getLastPageNum()
      * Render pagination HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPagerHtml()
     {
@@ -724,7 +670,6 @@ public function getPagerHtml()
      *
      * @param array $customOptions Optional parameter for passing custom selectors from template
      * @return string
-     * @since 2.0.0
      */
     public function getWidgetOptionsJson(array $customOptions = [])
     {
@@ -748,7 +693,6 @@ public function getWidgetOptionsJson(array $customOptions = [])
      * Get order field
      *
      * @return null|string
-     * @since 2.0.0
      */
     protected function getOrderField()
     {
@@ -762,7 +706,6 @@ protected function getOrderField()
      * Load Available Orders
      *
      * @return $this
-     * @since 2.0.0
      */
     private function loadAvailableOrders()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index 401d75375cc43..ccf6a41cb95f5 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -16,31 +16,26 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_columnCount = 4;
 
     /**
      * @var  \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_items;
 
     /**
      * @var Collection
-     * @since 2.0.0
      */
     protected $_itemCollection;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_itemLimits = [];
 
@@ -48,7 +43,6 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -56,7 +50,6 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -64,13 +57,11 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \
      * Checkout cart
      *
      * @var \Magento\Checkout\Model\ResourceModel\Cart
-     * @since 2.0.0
      */
     protected $_checkoutCart;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -81,7 +72,6 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -103,7 +93,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
@@ -134,7 +123,6 @@ protected function _prepareData()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -144,7 +132,6 @@ protected function _beforeToHtml()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -160,7 +147,6 @@ public function getItemCollection()
 
     /**
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -172,7 +158,6 @@ public function getItems()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getRowCount()
     {
@@ -182,7 +167,6 @@ public function getRowCount()
     /**
      * @param string $columns
      * @return $this
-     * @since 2.0.0
      */
     public function setColumnCount($columns)
     {
@@ -194,7 +178,6 @@ public function setColumnCount($columns)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getColumnCount()
     {
@@ -203,7 +186,6 @@ public function getColumnCount()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function resetItemsIterator()
     {
@@ -213,7 +195,6 @@ public function resetItemsIterator()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getIterableItem()
     {
@@ -229,7 +210,6 @@ public function getIterableItem()
      * @param string $type
      * @param int $limit
      * @return \Magento\Catalog\Block\Product\ProductList\Upsell
-     * @since 2.0.0
      */
     public function setItemLimit($type, $limit)
     {
@@ -242,7 +222,6 @@ public function setItemLimit($type, $limit)
     /**
      * @param string $type
      * @return array|int
-     * @since 2.0.0
      */
     public function getItemLimit($type = '')
     {
@@ -260,7 +239,6 @@ public function getItemLimit($type = '')
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ReviewRenderer/DefaultProvider.php b/app/code/Magento/Catalog/Block/Product/ReviewRenderer/DefaultProvider.php
index 1654e875e247b..241d6b3f247c9 100644
--- a/app/code/Magento/Catalog/Block/Product/ReviewRenderer/DefaultProvider.php
+++ b/app/code/Magento/Catalog/Block/Product/ReviewRenderer/DefaultProvider.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\ReviewRenderer\DefaultProvider
  *
- * @since 2.0.0
  */
 class DefaultProvider implements ReviewRendererInterface
 {
@@ -23,7 +22,6 @@ class DefaultProvider implements ReviewRendererInterface
      * @param string $templateType
      * @param bool $displayIfNoReviews
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php b/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
index 9efe201d33dc0..6fc118d97cb32 100644
--- a/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
+++ b/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Block\Product\ReviewRendererInterface
  *
- * @since 2.0.0
  */
 interface ReviewRendererInterface
 {
@@ -24,7 +23,6 @@ interface ReviewRendererInterface
      * @param string $templateType
      * @param bool $displayIfNoReviews
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Catalog/Block/Product/TemplateSelector.php b/app/code/Magento/Catalog/Block/Product/TemplateSelector.php
index 4e5f8111d4d5c..415dd0d9e9b95 100644
--- a/app/code/Magento/Catalog/Block/Product/TemplateSelector.php
+++ b/app/code/Magento/Catalog/Block/Product/TemplateSelector.php
@@ -9,7 +9,6 @@
  * Product gallery
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class TemplateSelector extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class TemplateSelector extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class TemplateSelector extends \Magento\Framework\View\Element\Template
      * Set collection factory
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $_setColFactory;
 
@@ -33,7 +30,6 @@ class TemplateSelector extends \Magento\Framework\View\Element\Template
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -43,7 +39,6 @@ class TemplateSelector extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      *
      * @param string $labelPart
      * @return array
-     * @since 2.0.0
      */
     public function getSuggestedTemplates($labelPart)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index ef5a51e4291fa..aaac3787d0332 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -12,7 +12,6 @@
  * Product View block
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends AbstractProduct implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -20,56 +19,47 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_productHelper;
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $productTypeConfig;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -87,7 +77,6 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
      * @param array $data
      * @codingStandardsIgnoreStart
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -123,8 +112,7 @@ public function __construct(
      * Return wishlist widget options
      *
      * @return array
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     public function getWishlistOptions()
     {
@@ -135,7 +123,6 @@ public function getWishlistOptions()
      * Add meta information from product to head block
      *
      * @return \Magento\Catalog\Block\Product\View
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -181,7 +168,6 @@ protected function _prepareLayout()
      * Retrieve current product model
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -196,7 +182,6 @@ public function getProduct()
      * Check if product can be emailed to friend
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEmailToFriend()
     {
@@ -209,7 +194,6 @@ public function canEmailToFriend()
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($product, $additional = [])
     {
@@ -233,7 +217,6 @@ public function getAddToCartUrl($product, $additional = [])
      * price calculation depending on product options
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
@@ -289,7 +272,6 @@ public function getJsonConfig()
      * Return true if product has options
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
@@ -303,7 +285,6 @@ public function hasOptions()
      * Check if product has required options
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasRequiredOptions()
     {
@@ -317,7 +298,6 @@ public function hasRequiredOptions()
      * instantly.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStartCustomization()
     {
@@ -330,7 +310,6 @@ public function isStartCustomization()
      *
      * @param null|\Magento\Catalog\Model\Product $product
      * @return int|float
-     * @since 2.0.0
      */
     public function getProductDefaultQty($product = null)
     {
@@ -352,7 +331,6 @@ public function getProductDefaultQty($product = null)
      * Get container name, where product options should be displayed
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOptionsContainer()
     {
@@ -363,7 +341,6 @@ public function getOptionsContainer()
      * Check whether quantity field should be rendered
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldRenderQuantity()
     {
@@ -374,7 +351,6 @@ public function shouldRenderQuantity()
      * Get Validation Rules for Quantity field
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQuantityValidators()
     {
@@ -387,7 +363,6 @@ public function getQuantityValidators()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -403,7 +378,6 @@ public function getIdentities()
      * Retrieve customer data object
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getCustomerId()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
index 4645c11f9b361..b89db5092227e 100644
--- a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
+++ b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 abstract class AbstractView extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
      * @var \Magento\Framework\Stdlib\ArrayUtils
-     * @since 2.0.0
      */
     protected $arrayUtils;
 
@@ -24,7 +22,6 @@ abstract class AbstractView extends \Magento\Catalog\Block\Product\AbstractProdu
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -60,7 +56,6 @@ public function getProduct()
      * @param string $prefix
      * @param bool $forceSetAll
      * @return array
-     * @since 2.0.0
      */
     public function decorateArray($array, $prefix = 'decorated_', $forceSetAll = false)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/AddTo/Compare.php b/app/code/Magento/Catalog/Block/Product/View/AddTo/Compare.php
index eddc8df0af25b..9e52d822ba360 100644
--- a/app/code/Magento/Catalog/Block/Product/View/AddTo/Compare.php
+++ b/app/code/Magento/Catalog/Block/Product/View/AddTo/Compare.php
@@ -10,7 +10,7 @@
  * Product view compare block
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Compare extends \Magento\Catalog\Block\Product\View
 {
@@ -18,7 +18,7 @@ class Compare extends \Magento\Catalog\Block\Product\View
      * Return compare params
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getPostDataParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Additional.php b/app/code/Magento/Catalog/Block/Product/View/Additional.php
index 0c96a68ecab25..598854a3e6bfe 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Additional.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php
@@ -13,25 +13,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Additional extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_list;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/view/additional.phtml';
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getChildHtmlList()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index 385152619b334..52039e23e0335 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -17,13 +17,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Attributes extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_product = null;
 
@@ -31,13 +29,11 @@ class Attributes extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -46,7 +42,6 @@ class Attributes extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
 
     /**
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -78,7 +72,6 @@ public function getProduct()
      * @param array $excludeAttr
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getAdditionalData(array $excludeAttr = [])
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
index 35d69e9f58cb8..75a0228e1785f 100644
--- a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
+++ b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
@@ -9,7 +9,6 @@
  * Simple product data view
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class BaseImage extends \Magento\Catalog\Block\Product\View\AbstractView
 {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Description.php b/app/code/Magento/Catalog/Block/Product/View/Description.php
index dac69d4ceaed7..194f3a706eb54 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Description.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Description.php
@@ -15,13 +15,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Description extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_product = null;
 
@@ -29,7 +27,6 @@ class Description extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,7 +34,6 @@ class Description extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
 
     /**
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index fd7b6fd67c412..dad8c51c7d4f2 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -17,19 +17,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Gallery extends \Magento\Catalog\Block\Product\View\AbstractView
 {
     /**
      * @var \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     protected $configView;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -38,7 +35,6 @@ class Gallery extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Retrieve collection of gallery images
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getGalleryImages()
     {
@@ -91,7 +86,6 @@ public function getGalleryImages()
      * Return magnifier options
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMagnifier()
     {
@@ -102,7 +96,6 @@ public function getMagnifier()
      * Return breakpoints options
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBreakpoints()
     {
@@ -113,7 +106,6 @@ public function getBreakpoints()
      * Retrieve product images in JSON format
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGalleryImagesJson()
     {
@@ -150,7 +142,6 @@ public function getGalleryImagesJson()
      *
      * @param null|\Magento\Framework\DataObject $image
      * @return string
-     * @since 2.0.0
      */
     public function getGalleryUrl($image = null)
     {
@@ -166,7 +157,6 @@ public function getGalleryUrl($image = null)
      *
      * @param \Magento\Framework\DataObject $image
      * @return bool
-     * @since 2.0.0
      */
     public function isMainImage($image)
     {
@@ -179,7 +169,6 @@ public function isMainImage($image)
      * @param string $attributeName
      * @param string $default
      * @return string
-     * @since 2.0.0
      */
     public function getImageAttribute($imageId, $attributeName, $default = null)
     {
@@ -192,7 +181,6 @@ public function getImageAttribute($imageId, $attributeName, $default = null)
      * Retrieve config view
      *
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     private function getConfigView()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
index b834c084f5f39..1858f79be03cc 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
@@ -16,13 +16,11 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Options extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -30,7 +28,6 @@ class Options extends \Magento\Framework\View\Element\Template
      * Product option
      *
      * @var \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     protected $_option;
 
@@ -38,7 +35,6 @@ class Options extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry = null;
 
@@ -46,25 +42,21 @@ class Options extends \Magento\Framework\View\Element\Template
      * Catalog product
      *
      * @var Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData;
 
@@ -77,7 +69,6 @@ class Options extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -103,7 +94,6 @@ public function __construct(
      *
      * @return Product
      * @throws \LogicExceptions
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -122,7 +112,6 @@ public function getProduct()
      *
      * @param Product $product
      * @return \Magento\Catalog\Block\Product\View\Options
-     * @since 2.0.0
      */
     public function setProduct(Product $product = null)
     {
@@ -133,7 +122,6 @@ public function setProduct(Product $product = null)
     /**
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getGroupOfOption($type)
     {
@@ -146,7 +134,6 @@ public function getGroupOfOption($type)
      * Get product options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -155,7 +142,6 @@ public function getOptions()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
@@ -170,7 +156,6 @@ public function hasOptions()
      *
      * @param \Magento\Catalog\Model\Product\Option\Value|\Magento\Catalog\Model\Product\Option $option
      * @return array
-     * @since 2.0.0
      */
     protected function _getPriceConfiguration($option)
     {
@@ -218,7 +203,6 @@ protected function _getPriceConfiguration($option)
      * Get json representation of
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
@@ -256,7 +240,6 @@ public function getJsonConfig()
      *
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return string
-     * @since 2.0.0
      */
     public function getOptionHtml(\Magento\Catalog\Model\Product\Option $option)
     {
@@ -275,7 +258,6 @@ public function getOptionHtml(\Magento\Catalog\Model\Product\Option $option)
      * @param string $prefix
      * @param bool $forceSetAll
      * @return array
-     * @since 2.0.0
      */
     public function decorateArray($array, $prefix = 'decorated_', $forceSetAll = false)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 081c88bc9ec4a..f1972cf7a1d06 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
 {
@@ -23,7 +22,6 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      * Product object
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -31,19 +29,16 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      * Product option object
      *
      * @var \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     protected $_option;
 
     /**
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogHelper;
 
@@ -52,7 +47,6 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData,
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Block\Product\View\Options\AbstractOptions
-     * @since 2.0.0
      */
     public function setProduct(\Magento\Catalog\Model\Product $product = null)
     {
@@ -82,7 +75,6 @@ public function setProduct(\Magento\Catalog\Model\Product $product = null)
      * Retrieve Product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -94,7 +86,6 @@ public function getProduct()
      *
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return \Magento\Catalog\Block\Product\View\Options\AbstractOptions
-     * @since 2.0.0
      */
     public function setOption(\Magento\Catalog\Model\Product\Option $option)
     {
@@ -106,7 +97,6 @@ public function setOption(\Magento\Catalog\Model\Product\Option $option)
      * Get option
      *
      * @return \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     public function getOption()
     {
@@ -115,7 +105,6 @@ public function getOption()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormatedPrice()
     {
@@ -136,7 +125,6 @@ public function getFormatedPrice()
      * @param array $value
      * @param bool $flag
      * @return string
-     * @since 2.0.0
      */
     protected function _formatPrice($value, $flag = true)
     {
@@ -174,7 +162,6 @@ protected function _formatPrice($value, $flag = true)
      * @param float $price
      * @param bool $includingTax
      * @return float
-     * @since 2.0.0
      */
     public function getPrice($price, $includingTax = null)
     {
@@ -191,7 +178,6 @@ public function getPrice($price, $includingTax = null)
      *
      * @param float $price
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyPrice($price)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index 2683240eeccbf..04434b12c9f64 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -9,7 +9,6 @@
  * Product options text type block
  *
  * @api
- * @since 2.0.0
  */
 class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
@@ -17,7 +16,6 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * Fill date and time options with leading zeros or not
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_fillLeadingZeros = true;
 
@@ -25,7 +23,6 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * Catalog product option type date
      *
      * @var \Magento\Catalog\Model\Product\Option\Type\Date
-     * @since 2.0.0
      */
     protected $_catalogProductOptionTypeDate;
 
@@ -35,7 +32,6 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Catalog\Model\Product\Option\Type\Date $catalogProductOptionTypeDate
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Use JS calendar settings
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function useCalendar()
     {
@@ -63,7 +58,6 @@ public function useCalendar()
      * Date input
      *
      * @return string Formatted Html
-     * @since 2.0.0
      */
     public function getDateHtml()
     {
@@ -78,7 +72,6 @@ public function getDateHtml()
      * JS Calendar html
      *
      * @return string Formatted Html
-     * @since 2.0.0
      */
     public function getCalendarDateHtml()
     {
@@ -116,7 +109,6 @@ public function getCalendarDateHtml()
      * Date (dd/mm/yyyy) html drop-downs
      *
      * @return string Formatted Html
-     * @since 2.0.0
      */
     public function getDropDownsDateHtml()
     {
@@ -139,7 +131,6 @@ public function getDropDownsDateHtml()
      * Time (hh:mm am/pm) html drop-downs
      *
      * @return string Formatted Html
-     * @since 2.0.0
      */
     public function getTimeHtml()
     {
@@ -170,7 +161,6 @@ public function getTimeHtml()
      * @param int $to    End position
      * @param int|null $value Value selected
      * @return string Formatted Html
-     * @since 2.0.0
      */
     protected function _getSelectFromToHtml($name, $from, $to, $value = null)
     {
@@ -187,7 +177,6 @@ protected function _getSelectFromToHtml($name, $from, $to, $value = null)
      * @param string $name Id/name of html select element
      * @param int|null $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getHtmlSelect($name, $value = null)
     {
@@ -235,7 +224,6 @@ protected function _getHtmlSelect($name, $value = null)
      *
      * @param int $value
      * @return string|int
-     * @since 2.0.0
      */
     protected function _getValueWithLeadingZeros($value)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/DefaultType.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/DefaultType.php
index 11f6674762b1e..25669891832ae 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/DefaultType.php
@@ -9,7 +9,6 @@
  * Product options default type block
  *
  * @api
- * @since 2.0.0
  */
 class DefaultType extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/File.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/File.php
index 38afe2b138859..1473f8cd99ef7 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/File.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/File.php
@@ -9,7 +9,6 @@
  * Product options text type block
  *
  * @api
- * @since 2.0.0
  */
 class File extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
@@ -17,7 +16,6 @@ class File extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * Returns info of file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileInfo()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 435deea6041e9..3abe9df41dc5b 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -9,7 +9,6 @@
  * Product options text type block
  *
  * @api
- * @since 2.0.0
  */
 class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
@@ -20,7 +19,6 @@ class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getValuesHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Text.php
index 94b0027d981d7..8c2f836e37ed4 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Text.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Text.php
@@ -9,7 +9,6 @@
  * Product options text type block
  *
  * @api
- * @since 2.0.0
  */
 class Text extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
@@ -17,7 +16,6 @@ class Text extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      * Returns default value to show in text input
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Price.php b/app/code/Magento/Catalog/Block/Product/View/Price.php
index b5a973ea34dd4..88acd2454d041 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Price.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Price.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\View\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Price extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -28,7 +26,6 @@ class Price extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
 
     /**
      * @return  array|float
-     * @since 2.0.0
      */
     public function getPrice()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Tabs.php b/app/code/Magento/Catalog/Block/Product/View/Tabs.php
index 41558e5bbf50c..ac154f93e7fa6 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Tabs.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\View\Tabs
  *
- * @since 2.0.0
  */
 class Tabs extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Tabs extends \Magento\Framework\View\Element\Template
      * Configured tabs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_tabs = [];
 
@@ -33,7 +31,6 @@ class Tabs extends \Magento\Framework\View\Element\Template
      * @param string $template
      * @param string $header
      * @return void
-     * @since 2.0.0
      */
     public function addTab($alias, $title, $block, $template, $header = null)
     {
@@ -50,7 +47,6 @@ public function addTab($alias, $title, $block, $template, $header = null)
      * Return configured tabs
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTabs()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
index cfbab7be5c0a0..0bb565938136a 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Simple extends \Magento\Catalog\Block\Product\View\AbstractView
 {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
index d41d4a5d5e22f..d1c89a80e3892 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Virtual extends \Magento\Catalog\Block\Product\View\AbstractView
 {
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
index d83d79e57be36..65a57e9c1d4ed 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Block\Product\Widget\Html\Pager
  *
- * @since 2.0.0
  */
 class Pager extends \Magento\Theme\Block\Html\Pager
 {
@@ -24,7 +23,6 @@ class Pager extends \Magento\Theme\Block\Html\Pager
      * Size of collection which may has a manual limitation
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_collectionSize;
 
@@ -32,7 +30,6 @@ class Pager extends \Magento\Theme\Block\Html\Pager
      * Current page
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_currentPage;
 
@@ -40,7 +37,6 @@ class Pager extends \Magento\Theme\Block\Html\Pager
      * Last page
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_lastPage;
 
@@ -50,7 +46,6 @@ class Pager extends \Magento\Theme\Block\Html\Pager
      * It may be limited by manual
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCollectionSize()
     {
@@ -69,7 +64,6 @@ public function getCollectionSize()
      * If current page is grate then total count of page current page will be equals total count of page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -90,7 +84,6 @@ public function getCurrentPage()
      * Return items count per page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLimit()
     {
@@ -111,7 +104,6 @@ public function getLimit()
      *
      * @param   \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection
      * @return  \Magento\Catalog\Block\Product\Widget\Html\Pager
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -131,7 +123,6 @@ public function setCollection($collection)
      * Return position number in collection for first item on current page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFirstNum()
     {
@@ -142,7 +133,6 @@ public function getFirstNum()
      * Return position number in collection for last item on current page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLastNum()
     {
@@ -156,7 +146,6 @@ public function getLastNum()
      * It may be limited by manual
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalNum()
     {
@@ -168,7 +157,6 @@ public function getTotalNum()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLastPageNum()
     {
@@ -185,7 +173,6 @@ public function getLastPageNum()
      * Checks if current page is the first page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFirstPage()
     {
@@ -196,7 +183,6 @@ public function isFirstPage()
      * Checks if current page is the last page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLastPage()
     {
@@ -207,7 +193,6 @@ public function isLastPage()
      * Return array of pages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPages()
     {
@@ -235,7 +220,6 @@ public function getPages()
      * Retrieve url for previous page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviousPageUrl()
     {
@@ -246,7 +230,6 @@ public function getPreviousPageUrl()
      * Retrieve url for next page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextPageUrl()
     {
@@ -257,7 +240,6 @@ public function getNextPageUrl()
      * Retrieve url for last page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastPageUrl()
     {
@@ -268,7 +250,6 @@ public function getLastPageUrl()
      * Initialize frame data, such as frame start, frame start etc.
      *
      * @return \Magento\Catalog\Block\Product\Widget\Html\Pager
-     * @since 2.0.0
      */
     protected function _initFrame()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
index 6f96eed6bcd83..5d942626a0370 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -7,7 +7,6 @@
 
 /**
  * New products widget
- * @since 2.0.0
  */
 class NewWidget extends \Magento\Catalog\Block\Product\NewProduct implements \Magento\Widget\Block\BlockInterface
 {
@@ -42,7 +41,6 @@ class NewWidget extends \Magento\Catalog\Block\Product\NewProduct implements \Ma
      * Instance of pager block
      *
      * @var \Magento\Catalog\Block\Product\Widget\Html\Pager
-     * @since 2.0.0
      */
     protected $_pager;
 
@@ -86,7 +84,6 @@ public function __construct(
      * Product collection initialize process
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|Object|\Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
@@ -107,7 +104,6 @@ protected function _getProductCollection()
      * Prepare collection for recent product list
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|Object|\Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected function _getRecentlyAddedProductsCollection()
     {
@@ -127,7 +123,6 @@ protected function _getRecentlyAddedProductsCollection()
      * Get number of current page based on query value
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -138,7 +133,6 @@ public function getCurrentPage()
      * Get key pieces for caching block content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -157,7 +151,6 @@ public function getCacheKeyInfo()
      * Retrieve display type for products
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayType()
     {
@@ -171,7 +164,6 @@ public function getDisplayType()
      * Retrieve how many products should be displayed
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductsCount()
     {
@@ -185,7 +177,6 @@ public function getProductsCount()
      * Retrieve how many products should be displayed
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductsPerPage()
     {
@@ -199,7 +190,6 @@ public function getProductsPerPage()
      * Return flag whether pager need to be shown or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showPager()
     {
@@ -213,7 +203,6 @@ public function showPager()
      * Retrieve how many products should be displayed on page
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getPageSize()
     {
@@ -224,7 +213,6 @@ protected function getPageSize()
      * Render pagination HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPagerHtml()
     {
@@ -259,7 +247,6 @@ public function getPagerHtml()
      * @param array $arguments
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getProductPriceHtml(
         \Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index e849203d5e16e..fbfd494c336e6 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -13,49 +13,41 @@
  * Class Category
  * @package Magento\Catalog\Block\Rss
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Category extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Catalog\Model\Rss\Category
-     * @since 2.0.0
      */
     protected $rssModel;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -69,7 +61,6 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -93,7 +84,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -108,7 +98,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -168,7 +157,6 @@ public function getRssData()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     protected function renderPriceHtml(\Magento\Catalog\Model\Product $product)
     {
@@ -200,7 +188,6 @@ protected function renderPriceHtml(\Magento\Catalog\Model\Product $product)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -213,7 +200,6 @@ protected function getStoreId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -222,7 +208,6 @@ public function getCacheLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -234,7 +219,6 @@ public function isAllowed()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -274,7 +258,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
index c676962dfa442..20c4bef0845d6 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
@@ -10,31 +10,26 @@
 /**
  * Class NewProducts
  * @package Magento\Catalog\Block\Rss\Product
- * @since 2.0.0
  */
 class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Catalog\Model\Rss\Product\NewProducts
-     * @since 2.0.0
      */
     protected $rssModel;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -44,7 +39,6 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
      * @param \Magento\Catalog\Model\Rss\Product\NewProducts $rssModel
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +65,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -81,7 +73,6 @@ public function isAllowed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -142,7 +133,6 @@ public function getRssData()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -158,7 +148,6 @@ protected function getStoreId()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     protected function renderPriceHtml(\Magento\Catalog\Model\Product $product)
     {
@@ -189,7 +178,6 @@ protected function renderPriceHtml(\Magento\Catalog\Model\Product $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -198,7 +186,6 @@ public function getCacheLifetime()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -213,7 +200,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index c7dacd9588c15..c61bee4417cbc 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -12,61 +12,51 @@
  * Class Special
  * @package Magento\Catalog\Block\Rss\Product
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Special extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Output
-     * @since 2.0.0
      */
     protected $outputHelper;
 
     /**
      * @var \Magento\Catalog\Model\Rss\Product\Special
-     * @since 2.0.0
      */
     protected $rssModel;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpHelper;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     private $localeResolver;
 
@@ -82,7 +72,6 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -110,7 +99,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -120,7 +108,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -171,7 +158,6 @@ public function getRssData()
     /**
      * @param \Magento\Catalog\Model\Product $item
      * @return array
-     * @since 2.0.0
      */
     protected function getEntryData(\Magento\Catalog\Model\Product $item)
     {
@@ -221,7 +207,6 @@ protected function getEntryData(\Magento\Catalog\Model\Product $item)
      * Get store id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -236,7 +221,6 @@ protected function getStoreId()
      * Get customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getCustomerGroupId()
     {
@@ -251,7 +235,6 @@ protected function getCustomerGroupId()
      * Check if RSS feed allowed
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -263,7 +246,6 @@ public function isAllowed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -272,7 +254,6 @@ public function getCacheLifetime()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -286,7 +267,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Catalog/Block/ShortcutButtons.php b/app/code/Magento/Catalog/Block/ShortcutButtons.php
index b8ff47e92121f..50e6841229901 100644
--- a/app/code/Magento/Catalog/Block/ShortcutButtons.php
+++ b/app/code/Magento/Catalog/Block/ShortcutButtons.php
@@ -13,7 +13,6 @@
  * Accepts shortcuts on shortcut_buttons_container event and render shortcuts using custom order
  *
  * @api
- * @since 2.0.0
  */
 class ShortcutButtons extends Template
 {
@@ -26,21 +25,16 @@ class ShortcutButtons extends Template
 
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_shortcuts = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCatalogProduct;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $_orPosition;
 
@@ -49,7 +43,6 @@ class ShortcutButtons extends Template
      * @param bool $isCatalogProduct
      * @param null|string $orPosition
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -67,7 +60,6 @@ public function __construct(
      *
      * @param Template $block
      * @return void
-     * @since 2.0.0
      */
     public function addShortcut(Template $block)
     {
@@ -79,7 +71,6 @@ public function addShortcut(Template $block)
     /**
      * Dispatch shortcuts container event
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -98,7 +89,6 @@ protected function _beforeToHtml()
      * Render all shortcuts
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Block/ShortcutInterface.php b/app/code/Magento/Catalog/Block/ShortcutInterface.php
index 644ddf602cf68..96bed4053f7cc 100644
--- a/app/code/Magento/Catalog/Block/ShortcutInterface.php
+++ b/app/code/Magento/Catalog/Block/ShortcutInterface.php
@@ -9,7 +9,6 @@
  * Shortcut block interface
  *
  * @api
- * @since 2.0.0
  */
 interface ShortcutInterface
 {
@@ -17,7 +16,6 @@ interface ShortcutInterface
      * Get shortcut alias
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAlias();
 }
diff --git a/app/code/Magento/Catalog/Block/Widget/Link.php b/app/code/Magento/Catalog/Block/Widget/Link.php
index 05dd47488bd3f..d0e3a410b8f4a 100644
--- a/app/code/Magento/Catalog/Block/Widget/Link.php
+++ b/app/code/Magento/Catalog/Block/Widget/Link.php
@@ -18,14 +18,12 @@
 /**
  * Class \Magento\Catalog\Block\Widget\Link
  *
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento\Widget\Block\BlockInterface
 {
     /**
      * Entity model name which must be used to retrieve entity specific data.
      * @var null|\Magento\Catalog\Model\ResourceModel\AbstractResource
-     * @since 2.0.0
      */
     protected $_entityResource = null;
 
@@ -33,7 +31,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Prepared href attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_href;
 
@@ -41,7 +38,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Prepared anchor text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_anchorText;
 
@@ -49,7 +45,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Url finder for category
      *
      * @var UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
@@ -58,7 +53,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * @param UrlFinderInterface $urlFinder
      * @param \Magento\Catalog\Model\ResourceModel\AbstractResource $entityResource
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -78,7 +72,6 @@ public function __construct(
      * @throws \RuntimeException
      * @return string|false
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -119,7 +112,6 @@ public function getHref()
      * @param string $idPath
      * @throws \RuntimeException
      * @return array
-     * @since 2.0.0
      */
     protected function parseIdPath($idPath)
     {
@@ -136,7 +128,6 @@ protected function parseIdPath($idPath)
      * If anchor text was not specified get entity name from DB.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -166,7 +157,6 @@ public function getLabel()
      * or return empty string if url can't be prepared
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php b/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
index 3a44728c93b62..bcfb034835eae 100644
--- a/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
+++ b/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Catalog\Console\Command\ImagesResizeCommand
  *
- * @since 2.0.0
  */
 class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
 {
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Model\Product\Image\CacheFactory
-     * @since 2.0.0
      */
     protected $imageCacheFactory;
 
@@ -41,7 +36,6 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Model\Product\Image\CacheFactory $imageCacheFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\State $appState,
@@ -58,7 +52,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -68,7 +61,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(
         \Symfony\Component\Console\Input\InputInterface $input,
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index ad62233dd06fb..53e18faf9ddd4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -7,7 +7,6 @@
 
 /**
  * Catalog category controller
- * @since 2.0.0
  */
 abstract class Category extends \Magento\Backend\App\Action
 {
@@ -30,7 +29,6 @@ abstract class Category extends \Magento\Backend\App\Action
      *
      * @param bool $getRootInstead
      * @return \Magento\Catalog\Model\Category|false
-     * @since 2.0.0
      */
     protected function _initCategory($getRootInstead = false)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
index 8638d38ab3c03..08cdedcfededc 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
@@ -10,7 +10,6 @@
  * Class Add Category
  *
  * @package Magento\Catalog\Controller\Adminhtml\Category
- * @since 2.0.0
  */
 class Add extends \Magento\Catalog\Controller\Adminhtml\Category
 {
@@ -18,7 +17,6 @@ class Add extends \Magento\Catalog\Controller\Adminhtml\Category
      * Forward factory for result
      *
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -27,7 +25,6 @@ class Add extends \Magento\Catalog\Controller\Adminhtml\Category
      *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Add new category form
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
index 7cc55129585c7..06bb64b30e55b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\CategoriesJson
  *
- * @since 2.0.0
  */
 class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      * Get tree node (Ajax version)
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
index 23e442babad17..4ff6eb0c8f18b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Delete category action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index 1fc581795bdf9..de43d788608b4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -36,7 +33,6 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php
index 5256c81231a57..b55fd50b0e564 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class Grid extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Display list of products related to current category
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
index 3b0761c9360f3..e663ebcacf11e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Catalog categories index action
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index eb1c02507682a..4882dc1da933b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Move
  *
- * @since 2.0.0
  */
 class Move extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -36,7 +32,6 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory,
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Move category action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index 710dc79cce712..327c9d3cbf603 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\RefreshPath
  *
- * @since 2.0.0
  */
 class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Build response for refresh input element 'path' in form
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 1ebf9da7cf729..78595d5e6600a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -12,25 +12,21 @@
  * Class Save
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -51,7 +47,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
 
     /**
      * @var StoreManagerInterface
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private $storeManager;
 
@@ -70,7 +66,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -95,7 +90,6 @@ public function __construct(
      * @deprecated 2.2.0
      * @param array $rawData
      * @return array
-     * @since 2.0.0
      */
     protected function _filterCategoryPostData(array $rawData)
     {
@@ -121,7 +115,6 @@ protected function _filterCategoryPostData(array $rawData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php
index 9189d90a8d9c4..55782a4d64452 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\SuggestCategories
  *
- * @since 2.0.0
  */
 class SuggestCategories extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class SuggestCategories extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      * Category list suggestion based on already entered symbols
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
index 00c49a0951998..bf3a9c365ed00 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Tree
  *
- * @since 2.0.0
  */
 class Tree extends \Magento\Catalog\Controller\Adminhtml\Category
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class Tree extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Retrieve category tree
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
index 6ff949e99e4d2..991f7617ea3d2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
@@ -11,20 +11,17 @@
  * Catalog category widgets controller for CMS WYSIWYG
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Widget extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return BlockInterface
-     * @since 2.0.0
      */
     protected function _getCategoryTreeBlock()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php
index 2ab9adea27da9..ae8f5ae12f278 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Widget\CategoriesJson
  *
- * @since 2.0.0
  */
 class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category\Widget
 {
@@ -17,13 +16,11 @@ class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category\Widg
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -32,7 +29,6 @@ class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category\Widg
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Categories tree node (Ajax version)
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php
index 83a760a227cc0..4a9db262afb29 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Catalog\Controller\Adminhtml\Category\Widget
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -23,7 +21,6 @@ class Chooser extends \Magento\Catalog\Controller\Adminhtml\Category\Widget
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Chooser Source action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Wysiwyg.php
index db7ee74d8637b..f58a9343841e2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Wysiwyg.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Category\Wysiwyg
  *
- * @since 2.0.0
  */
 class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product\Wysiwyg
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
index 5599ae86aff6d..a8882c5640324 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
@@ -10,7 +10,6 @@
 /**
  * Catalog product controller
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Product extends \Magento\Backend\App\Action
 {
@@ -23,14 +22,12 @@ abstract class Product extends \Magento\Backend\App\Action
 
     /**
      * @var Product\Builder
-     * @since 2.0.0
      */
     protected $productBuilder;
 
     /**
      * @param Action\Context $context
      * @param Product\Builder $productBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
index 67b222322f579..278950720cc89 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\AbstractProductGrid
  *
- * @since 2.0.0
  */
 abstract class AbstractProductGrid extends Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -27,7 +25,6 @@ abstract class AbstractProductGrid extends Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index aa40d3fc76495..6958b6671d054 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -12,7 +12,6 @@
 
 /**
  * Adminhtml catalog product action attribute update controller
- * @since 2.0.0
  */
 abstract class Attribute extends Action
 {
@@ -25,14 +24,12 @@ abstract class Attribute extends Action
 
     /**
      *  @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
-     * @since 2.0.0
      */
     protected $attributeHelper;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Validate selection of products for mass update
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _validateProducts()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
index 4b6c26038bd19..e59f32e32a4d0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -26,13 +24,11 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * MassActions filter
      *
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -42,7 +38,6 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -59,7 +54,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 873235632d129..82496446aef9f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -11,19 +11,16 @@
 /**
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $_productPriceIndexerProcessor;
 
@@ -31,13 +28,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
     /**
      * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockItemFactory;
 
@@ -45,13 +40,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * Stock Indexer
      *
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $_stockIndexerProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -64,7 +57,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -92,7 +84,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
index 22d5953182c84..011692155cd5a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -30,7 +27,6 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attr
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Attributes validation action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index 718eefb035c00..af44fab9d69af 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -23,13 +23,11 @@
  * Class AddAttributeToTemplate
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -89,7 +87,6 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory|null $attributeGroupFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -107,7 +104,6 @@ public function __construct(
      * Add attribute to attribute set
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
index 33554b9a571b3..ef441084b36df 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\AlertsPriceGrid
  *
- * @since 2.0.0
  */
 class AlertsPriceGrid extends AbstractProductGrid
 {
@@ -17,7 +16,6 @@ class AlertsPriceGrid extends AbstractProductGrid
      * Get alerts price grid
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
index c93d76dfc231a..80b58182f8f62 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\AlertsStockGrid
  *
- * @since 2.0.0
  */
 class AlertsStockGrid extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -30,7 +28,6 @@ class AlertsStockGrid extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Get alerts stock grid
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
index e91c99340ec0b..a8a66cb6af2f8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute
  *
- * @since 2.0.0
  */
 abstract class Attribute extends \Magento\Backend\App\Action
 {
@@ -28,13 +27,11 @@ abstract class Attribute extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_attributeLabelCache;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -42,13 +39,11 @@ abstract class Attribute extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -59,7 +54,6 @@ abstract class Attribute extends \Magento\Backend\App\Action
      * @param \Magento\Framework\Cache\FrontendInterface $attributeLabelCache
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -78,7 +72,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -93,7 +86,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
     /**
      * @param \Magento\Framework\Phrase|null $title
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function createActionPage($title = null)
     {
@@ -124,7 +116,6 @@ protected function createActionPage($title = null)
      *
      * @param string $label
      * @return string
-     * @since 2.0.0
      */
     protected function generateCode($label)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
index 5e67e08b80da9..436c6dee05f3b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
index 685c71ee943f2..4df1dcc72fad5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
index 2f95fbd75266d..843e40b07ae4a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
index dd5b9b1a73e64..04a1ce5af068c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -25,7 +23,6 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 21670c4e86c17..e252cef138696 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -14,43 +14,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @var \Magento\Catalog\Model\Product\AttributeSet\BuildFactory
-     * @since 2.0.0
      */
     protected $buildFactory;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $productHelper;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-     * @since 2.0.0
      */
     protected $attributeFactory;
 
     /**
      * @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory
-     * @since 2.0.0
      */
     protected $validatorFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory
-     * @since 2.0.0
      */
     protected $groupCollectionFactory;
 
@@ -73,7 +66,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -103,7 +95,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 179b88744cf48..30b1ca7755ecb 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
@@ -19,19 +18,17 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $multipleAttributeList;
 
@@ -45,7 +42,6 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param array $multipleAttributeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -66,7 +62,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -131,7 +126,7 @@ public function execute()
      * @param array $optionsValues
      * @param array $deletedOptions
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isUniqueAdminValues(array $optionsValues, array $deletedOptions)
     {
@@ -166,7 +161,7 @@ private function setMessageToResponse($response, $messages)
      * @param DataObject $response
      * @param array|null $options
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function checkUniqueOption(DataObject $response, array $options = null)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 522ae9c26b0b0..ce582a49625e3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Builder
  *
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $wysiwygConfig;
 
@@ -57,7 +52,6 @@ class Builder
      * @param Registry $registry
      * @param WysiwygModel\Config $wysiwygConfig
      * @param StoreFactory|null $storeFactory
-     * @since 2.0.0
      */
     public function __construct(
         ProductFactory $productFactory,
@@ -79,7 +73,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function build(RequestInterface $request)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php
index b13f8c747dc3a..c07de4e3fd35f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Categories
  *
- * @since 2.0.0
  */
 class Categories extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Categories extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get categories fieldset block
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
index a6874ec5eb129..b86726bc7e67d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
  *
- * @since 2.0.0
  */
 class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get crosssell products grid and serializer block
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
index 5ba0aec4dff05..ee160b85b1476 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
  *
- * @since 2.0.0
  */
 class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get crosssell products grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php
index d49541bf0b6e1..a44321e71c73f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\CustomOptions
  *
- * @since 2.0.0
  */
 class CustomOptions extends \Magento\Catalog\Controller\Adminhtml\Product
 {
@@ -20,13 +19,11 @@ class CustomOptions extends \Magento\Catalog\Controller\Adminhtml\Product
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -35,7 +32,6 @@ class CustomOptions extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Builder $productBuilder
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Show custom options in JSON format for specified products
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php
index d3cffeb0f59e5..bef724a5c4a82 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Datafeeds\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
index 6247149b865f4..4209dae56abef 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Duplicate
  *
- * @since 2.0.0
  */
 class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Catalog\Model\Product\Copier
-     * @since 2.0.0
      */
     protected $productCopier;
 
@@ -26,7 +24,6 @@ class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Create product duplicate
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index de5742b3f0ec5..a4967309c3d67 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
 {
@@ -17,13 +16,11 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
      * Array of actions which can be processed without secret key validation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_publicActions = ['edit'];
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -31,7 +28,6 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Product edit form
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
index eda728e8c6a76..c0c819d931da1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Gallery\Upload
  *
- * @since 2.0.0
  */
 class Upload extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ class Upload extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php
index 12713abe0b12d..33ff75176dee0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Grid extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Product grid for AJAX request
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
index 056b47f39ac39..04ef63ba63c4a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\GridOnly
  *
- * @since 2.0.0
  */
 class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -30,7 +27,6 @@ class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Get specified tab grid
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
index 879aa51b9cef5..919a3041af3a8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Group\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\App\Action
 {
@@ -22,7 +21,6 @@ class Save extends \Magento\Backend\App\Action
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
index 9da6340aff8a1..cfdfa1c3ee66e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Index extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Product list page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index f5e68154ae278..f7458fb13b229 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -16,38 +16,32 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Helper
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var StockDataFilter
-     * @since 2.0.0
      */
     protected $stockFilter;
 
     /**
      * @var \Magento\Backend\Helper\Js
-     * @since 2.0.0
      */
     protected $jsHelper;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $dateFilter;
 
@@ -71,7 +65,6 @@ class Helper
 
     /**
      * @var ProductLinks
-     * @since 2.0.0
      */
     protected $productLinks;
 
@@ -107,7 +100,6 @@ class Helper
      * @param \Magento\Catalog\Api\ProductRepositoryInterface|null $productRepository
      * @param \Magento\Catalog\Model\Product\LinkTypeProvider|null $linkTypeProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -233,7 +225,6 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function initialize(\Magento\Catalog\Model\Product $product)
     {
@@ -321,7 +312,6 @@ protected function normalize(array $productData)
      * @param array $productOptions product options
      * @param array $overwriteOptions default value options
      * @return array
-     * @since 2.0.0
      */
     public function mergeProductOptions($productOptions, $overwriteOptions)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactory.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactory.php
index aafaf0b539447..6a658c7b67b97 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactory.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerFactory
  *
- * @since 2.0.0
  */
 class HandlerFactory
 {
@@ -16,13 +15,11 @@ class HandlerFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return object
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($instance, array $arguments = [])
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
index ea4edb72aadcb..002f2a3886ae9 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
@@ -8,14 +8,12 @@
 /**
  * Interface \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface
  *
- * @since 2.0.0
  */
 interface HandlerInterface
 {
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function handle(\Magento\Catalog\Model\Product $product);
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Handler/Composite.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Handler/Composite.php
index bf42559a06cc7..15076c1410257 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Handler/Composite.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Handler/Composite.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Handler\Composite
  *
- * @since 2.0.0
  */
 class Composite implements HandlerInterface
 {
@@ -20,14 +19,12 @@ class Composite implements HandlerInterface
      * Array of handler interface objects
      *
      * @var HandlerInterface[]
-     * @since 2.0.0
      */
     protected $handlers;
 
     /**
      * @param HandlerFactory $factory
      * @param array $handlers
-     * @since 2.0.0
      */
     public function __construct(HandlerFactory $factory, array $handlers = [])
     {
@@ -41,7 +38,6 @@ public function __construct(HandlerFactory $factory, array $handlers = [])
      *
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     public function handle(Product $product)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
index d662416f8487a..f7e69bc72ea18 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
@@ -10,7 +10,6 @@
 
 /**
  * Class StockDataFilter
- * @since 2.0.0
  */
 class StockDataFilter
 {
@@ -21,20 +20,17 @@ class StockDataFilter
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param StockConfigurationInterface $stockConfiguration
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -50,7 +46,6 @@ public function __construct(
      * @param array $stockData
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function filter(array $stockData)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
index 8f22890d7c48b..28be9ce05e096 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
 {
@@ -23,13 +22,11 @@ class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
      * Massactions filter
      *
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -38,7 +35,6 @@ class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Builder $productBuilder
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -53,7 +49,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index ee0e6fb6c9de6..ec5eb9de3fe35 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -14,13 +14,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $_productPriceIndexerProcessor;
 
@@ -28,13 +26,11 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
      * MassActions filter
      *
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -44,7 +40,6 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -66,7 +61,6 @@ public function __construct(
      * @param int $status
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function _validateMassStatus(array $productIds, $status)
     {
@@ -83,7 +77,6 @@ public function _validateMassStatus(array $productIds, $status)
      * Update product(s) status action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
index 978a3740548cd..09aaaf719ba80 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var Initialization\StockDataFilter
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $stockFilter;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -42,7 +38,6 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Initialization\StockDataFilter $stockFilter
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Create new product page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php
index fb0a6fc067190..e025643e687a3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Options
  *
- * @since 2.0.0
  */
 class Options extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class Options extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get options fieldset block
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php
index 6b9437a7c388c..0ed2801149503 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\OptionsImportGrid
  *
- * @since 2.0.0
  */
 class OptionsImportGrid extends AbstractProductGrid
 {
@@ -17,7 +16,6 @@ class OptionsImportGrid extends AbstractProductGrid
      * Show product grid for custom options import popup
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
index a08af81451abd..0239892da377f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Related
  *
- * @since 2.0.0
  */
 class Related extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -24,7 +22,6 @@ class Related extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
index 04aab223200a6..27959a2503185 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
  *
- * @since 2.0.0
  */
 class RelatedGrid extends Related
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index bdd5e92b13bc8..93d5d92a40a14 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -14,25 +14,21 @@
 /**
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var Initialization\Helper
-     * @since 2.0.0
      */
     protected $initializationHelper;
 
     /**
      * @var \Magento\Catalog\Model\Product\Copier
-     * @since 2.0.0
      */
     protected $productCopier;
 
     /**
      * @var \Magento\Catalog\Model\Product\TypeTransitionManager
-     * @since 2.0.0
      */
     protected $productTypeManager;
 
@@ -44,7 +40,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -69,7 +64,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
      * @param \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -92,7 +86,6 @@ public function __construct(
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -198,7 +191,6 @@ public function execute()
      * @param array $postData
      * @param int $productId
      * @return void
-     * @since 2.0.0
      */
     private function handleImageRemoveError($postData, $productId)
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
index f1460478dd221..5231bdd340650 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
@@ -9,7 +9,6 @@
  * Adminhtml entity sets controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Set extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ abstract class Set extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Define in register catalog_product entity type code as entityType
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _setTypeId()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
index c447dbf2ca37d..c578879f45a21 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\Add
  *
- * @since 2.0.0
  */
 class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
index cd5dd005f7a91..fc2ad7dff8847 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeSetRepository;
 
@@ -23,7 +21,6 @@ class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Eav\Api\AttributeSetRepositoryInterface $attributeSetRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
index 8795ca966d3a0..85272af34697c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
index e777eb41f0568..efd10e087b844 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index d4516407cfc1e..a0f8ba0817b39 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -30,7 +27,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Retrieve catalog product entity type id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getEntityTypeId()
     {
@@ -65,7 +60,6 @@ protected function _getEntityTypeId()
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php
index 111fb4818ddfb..9151c7ab0ca4c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Set\SetGrid
  *
- * @since 2.0.0
  */
 class SetGrid extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class SetGrid extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
index fe6421c125800..082bbe1e8c0a2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Catalog\Helper\Product\Composite
-     * @since 2.0.0
      */
     protected $productCompositeHelper;
 
@@ -27,7 +25,6 @@ class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param Context $context
      * @param Builder $productBuilder
      * @param Composite $productCompositeHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * in Wishlist and Cart controllers.
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
index 5e8db6457be9a..6f3c23da12485 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\SuggestAttributeSets
  *
- * @since 2.0.0
  */
 class SuggestAttributeSets extends \Magento\Backend\App\Action
 {
@@ -22,13 +21,11 @@ class SuggestAttributeSets extends \Magento\Backend\App\Action
     
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\AttributeSet\SuggestedSet
-     * @since 2.0.0
      */
     protected $suggestedSet;
 
@@ -36,7 +33,6 @@ class SuggestAttributeSets extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Catalog\Model\Product\AttributeSet\SuggestedSet $suggestedSet
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Action for attribute set selector
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php
index 134e3c359b32b..60a4742f8ac38 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\SuggestAttributes
  *
- * @since 2.0.0
  */
 class SuggestAttributes extends \Magento\Backend\App\Action
 {
@@ -22,13 +21,11 @@ class SuggestAttributes extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -36,7 +33,6 @@ class SuggestAttributes extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Search for attributes by part of attribute's label in admin store
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
index 01f62e609558d..5a3dc6c654b6b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Upsell
  *
- * @since 2.0.0
  */
 class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get upsell products grid and serializer block
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
index 08fcc47c1607e..cd5acf682aa1b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
  *
- * @since 2.0.0
  */
 class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get upsell products grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
index e37108bb896fc..6b1c33876415a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -15,7 +15,6 @@
  * Product validate
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
 {
@@ -23,31 +22,26 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_dateFilter;
 
     /**
      * @var \Magento\Catalog\Model\Product\Validator
-     * @since 2.0.0
      */
     protected $productValidator;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
@@ -71,7 +65,6 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -96,7 +89,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\Result\Json
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php
index 9406cf0c93008..30244e862e174 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -29,7 +26,6 @@ class Chooser extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      * Chooser Source action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
index 4aa343cd35eac..c4dbe918c51db 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Controller\Adminhtml\Product\Wysiwyg
  *
- * @since 2.0.0
  */
 class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -30,7 +27,6 @@ class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * WYSIWYG editor action for ajax request
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index d9068e8310177..a72f764a5f1f6 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends \Magento\Framework\App\Action\Action
 {
@@ -21,7 +20,6 @@ class View extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -29,7 +27,6 @@ class View extends \Magento\Framework\App\Action\Action
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
@@ -37,31 +34,26 @@ class View extends \Magento\Framework\App\Action\Action
      * Catalog design
      *
      * @var \Magento\Catalog\Model\Design
-     * @since 2.0.0
      */
     protected $_catalogDesign;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -69,13 +61,11 @@ class View extends \Magento\Framework\App\Action\Action
      * Catalog Layer Resolver
      *
      * @var Resolver
-     * @since 2.0.0
      */
     private $layerResolver;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -93,7 +83,6 @@ class View extends \Magento\Framework\App\Action\Action
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -123,7 +112,6 @@ public function __construct(
      * Initialize requested category object
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected function _initCategory()
     {
@@ -161,7 +149,6 @@ protected function _initCategory()
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
index d17f42fa3b003..b05aa1871e7df 100644
--- a/app/code/Magento/Catalog/Controller/Index/Index.php
+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * Index action
      *
      * @return $this
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product.php b/app/code/Magento/Catalog/Controller/Product.php
index 7f758f6f42569..862137ec820a4 100644
--- a/app/code/Magento/Catalog/Controller/Product.php
+++ b/app/code/Magento/Catalog/Controller/Product.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Controller\Product
  *
- * @since 2.0.0
  */
 abstract class Product extends \Magento\Framework\App\Action\Action implements ViewInterface
 {
@@ -21,7 +20,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action implements V
      * Initialize requested product object
      *
      * @return ModelProduct
-     * @since 2.0.0
      */
     protected function _initProduct()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 7f5f56080cfd7..1ee146e5aaa70 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -14,7 +14,6 @@
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Compare extends \Magento\Framework\App\Action\Action
 {
@@ -22,7 +21,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Customer id
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_customerId = null;
 
@@ -30,7 +28,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
@@ -38,7 +35,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Catalog product compare list
      *
      * @var \Magento\Catalog\Model\Product\Compare\ListCompare
-     * @since 2.0.0
      */
     protected $_catalogProductCompareList;
 
@@ -46,7 +42,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Customer visitor
      *
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -54,7 +49,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -62,7 +56,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Item collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemCollectionFactory;
 
@@ -70,31 +63,26 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * Compare item factory
      *
      * @var \Magento\Catalog\Model\Product\Compare\ItemFactory
-     * @since 2.0.0
      */
     protected $_compareItemFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -113,7 +101,6 @@ abstract class Compare extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param ProductRepositoryInterface $productRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -146,7 +133,6 @@ public function __construct(
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
index 0397300074c26..42bd4f355c7ec 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Controller\Product\Compare\Add
  *
- * @since 2.0.0
  */
 class Add extends \Magento\Catalog\Controller\Product\Compare
 {
@@ -19,7 +18,6 @@ class Add extends \Magento\Catalog\Controller\Product\Compare
      * Add item to compare list
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
index f7f5565635712..f23b95e2d0eff 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Controller\Product\Compare\Clear
  *
- * @since 2.0.0
  */
 class Clear extends \Magento\Catalog\Controller\Product\Compare
 {
@@ -19,7 +18,6 @@ class Clear extends \Magento\Catalog\Controller\Product\Compare
      * Remove all items from comparison list
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index f3646a776b614..3eba058318a7d 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -12,13 +12,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Product\Compare
 {
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
@@ -37,7 +35,6 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -73,7 +70,6 @@ public function __construct(
      * Compare index action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index 4b7f6dbff0abf..3acf290b47efa 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Controller\Product\Compare\Remove
  *
- * @since 2.0.0
  */
 class Remove extends \Magento\Catalog\Controller\Product\Compare
 {
@@ -19,7 +18,6 @@ class Remove extends \Magento\Catalog\Controller\Product\Compare
      * Remove item from compare list
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/Gallery.php b/app/code/Magento/Catalog/Controller/Product/Gallery.php
index cae148f93197e..d028f7e3ee0f6 100644
--- a/app/code/Magento/Catalog/Controller/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Controller/Product/Gallery.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Catalog\Controller\Product\Gallery
  *
- * @since 2.0.0
  */
 class Gallery extends \Magento\Catalog\Controller\Product
 {
     /**
      * @var Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -35,7 +32,6 @@ class Gallery extends \Magento\Catalog\Controller\Product
      * @param Context $context
      * @param Result\ForwardFactory $resultForwardFactory
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      * View product gallery action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
index 50ce78a00b117..ba4fd44239411 100644
--- a/app/code/Magento/Catalog/Controller/Product/View.php
+++ b/app/code/Magento/Catalog/Controller/Product/View.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Catalog\Controller\Product\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Catalog\Controller\Product
 {
     /**
      * @var \Magento\Catalog\Helper\Product\View
-     * @since 2.0.0
      */
     protected $viewHelper;
 
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -41,7 +37,6 @@ class View extends \Magento\Catalog\Controller\Product
      * @param \Magento\Catalog\Helper\Product\View $viewHelper
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      * Redirect if product failed to load
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\Controller\Result\Forward
-     * @since 2.0.0
      */
     protected function noProductRedirect()
     {
@@ -78,7 +72,6 @@ protected function noProductRedirect()
      * Product view action
      *
      * @return \Magento\Framework\Controller\Result\Forward|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php b/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
index 01b71e748cb9b..8741eb41053da 100644
--- a/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
+++ b/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Catalog\Controller\Product\View\ViewInterface
  *
- * @since 2.0.0
  */
 interface ViewInterface
 {
diff --git a/app/code/Magento/Catalog/Cron/DeleteAbandonedStoreFlatTables.php b/app/code/Magento/Catalog/Cron/DeleteAbandonedStoreFlatTables.php
index 2d16a6f00441c..ef72c7d048c59 100644
--- a/app/code/Magento/Catalog/Cron/DeleteAbandonedStoreFlatTables.php
+++ b/app/code/Magento/Catalog/Cron/DeleteAbandonedStoreFlatTables.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Cron\DeleteAbandonedStoreFlatTables
  *
- * @since 2.0.0
  */
 class DeleteAbandonedStoreFlatTables
 {
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     private $indexer;
 
     /**
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $indexer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $indexer
@@ -32,7 +29,6 @@ public function __construct(
      * Delete all product flat tables for not existing stores
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
index 2332c785852a1..8db874e04ece6 100644
--- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
@@ -14,25 +14,25 @@
 /**
  * Cron operation is responsible for deleting all product prices on WEBSITE level
  * in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DeleteOutdatedPriceValues
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resource;
 
     /**
      * @var AttributeRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributeRepository;
 
     /**
      * @var ScopeConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeConfig;
 
@@ -40,7 +40,7 @@ class DeleteOutdatedPriceValues
      * @param ResourceConnection $resource
      * @param AttributeRepository $attributeRepository
      * @param ScopeConfig $scopeConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ResourceConnection $resource,
@@ -56,7 +56,7 @@ public function __construct(
      * Delete all price values for non-admin stores if PRICE_SCOPE is global
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php b/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
index a52766f798e4f..08c869282837c 100644
--- a/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
+++ b/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
@@ -13,49 +13,41 @@
 /**
  * Class \Magento\Catalog\Cron\RefreshSpecialPrices
  *
- * @since 2.0.0
  */
 class RefreshSpecialPrices
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $_processor;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -72,7 +64,6 @@ class RefreshSpecialPrices
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -94,7 +85,6 @@ public function __construct(
      * Retrieve write connection instance
      *
      * @return bool|\Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function _getConnection()
     {
@@ -108,7 +98,6 @@ protected function _getConnection()
      * Add products to changes list with price which depends on date
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -149,7 +138,6 @@ public function execute()
      * @param string $attrCode
      * @param \Zend_Db_Expr $attrConditionValue
      * @return void
-     * @since 2.0.0
      */
     protected function _refreshSpecialPriceByStore($storeId, $attrCode, $attrConditionValue)
     {
diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index 94734f93ff638..1657ee6b9e88c 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Catalog\CustomerData\CompareProducts
  *
- * @since 2.0.0
  */
 class CompareProducts implements SectionSourceInterface
 {
     /**
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Catalog\Model\Product\Url
-     * @since 2.0.0
      */
     protected $productUrl;
 
@@ -30,7 +27,6 @@ class CompareProducts implements SectionSourceInterface
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
@@ -44,7 +40,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
@@ -59,7 +54,6 @@ public function getSectionData()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getItems()
     {
diff --git a/app/code/Magento/Catalog/Helper/Catalog.php b/app/code/Magento/Catalog/Helper/Catalog.php
index c64a75de2fc0e..83535fa19e969 100644
--- a/app/code/Magento/Catalog/Helper/Catalog.php
+++ b/app/code/Magento/Catalog/Helper/Catalog.php
@@ -9,7 +9,6 @@
  * Adminhtml Catalog helper
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -17,7 +16,6 @@ class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
      * Attribute Tab block name for product edit
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_attributeTabBlock = null;
 
@@ -25,7 +23,6 @@ class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
      * Attribute Tab block name for category edit
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_categoryAttributeTabBlock;
 
@@ -33,7 +30,6 @@ class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
      * Retrieve Attribute Tab Block Name for Product Edit
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeTabBlock()
     {
@@ -45,7 +41,6 @@ public function getAttributeTabBlock()
      *
      * @param string $attributeTabBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeTabBlock($attributeTabBlock)
     {
@@ -57,7 +52,6 @@ public function setAttributeTabBlock($attributeTabBlock)
      * Retrieve Attribute Tab Block Name for Category Edit
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryAttributeTabBlock()
     {
@@ -69,7 +63,6 @@ public function getCategoryAttributeTabBlock()
      *
      * @param string $attributeTabBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setCategoryAttributeTabBlock($attributeTabBlock)
     {
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/app/code/Magento/Catalog/Helper/Category.php
index 778a6ecebdaaa..ae42acf4b196e 100644
--- a/app/code/Magento/Catalog/Helper/Category.php
+++ b/app/code/Magento/Catalog/Helper/Category.php
@@ -15,7 +15,6 @@
  * Catalog category helper
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Category extends AbstractHelper
 {
@@ -27,7 +26,6 @@ class Category extends AbstractHelper
      * Store categories cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeCategories = [];
 
@@ -35,7 +33,6 @@ class Category extends AbstractHelper
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -43,7 +40,6 @@ class Category extends AbstractHelper
      * Category factory
      *
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
@@ -51,13 +47,11 @@ class Category extends AbstractHelper
      * Lib data collection factory
      *
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_dataCollectionFactory;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -67,7 +61,6 @@ class Category extends AbstractHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
      * @param CategoryRepositoryInterface $categoryRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -91,7 +84,6 @@ public function __construct(
      * @param bool $toLoad
      * @return \Magento\Framework\Data\Tree\Node\Collection or
      * \Magento\Catalog\Model\ResourceModel\Category\Collection or array
-     * @since 2.0.0
      */
     public function getStoreCategories($sorted = false, $asCollection = false, $toLoad = true)
     {
@@ -131,7 +123,6 @@ public function getStoreCategories($sorted = false, $asCollection = false, $toLo
      *
      * @param ModelCategory $category
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryUrl($category)
     {
@@ -146,7 +137,6 @@ public function getCategoryUrl($category)
      *
      * @param ModelCategory|int $category
      * @return bool
-     * @since 2.0.0
      */
     public function canShow($category)
     {
@@ -177,7 +167,6 @@ public function canShow($category)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canUseCanonicalTag($store = null)
     {
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 60063b7aabf1b..8bc45dab06033 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -20,7 +20,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -51,7 +50,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Breadcrumb Path cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_categoryPath;
 
@@ -59,7 +57,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Currently selected store ID if applicable
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -67,7 +64,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -75,7 +71,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog product
      *
      * @var Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
@@ -83,19 +78,16 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog category
      *
      * @var Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_templateFilterModel;
 
@@ -103,7 +95,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
@@ -111,7 +102,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -119,7 +109,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Template filter factory
      *
      * @var \Magento\Catalog\Model\Template\Filter\Factory
-     * @since 2.0.0
      */
     protected $_templateFilterFactory;
 
@@ -127,7 +116,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Tax class key factory
      *
      * @var \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory
-     * @since 2.0.0
      */
     protected $_taxClassKeyFactory;
 
@@ -135,7 +123,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Tax helper
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -143,7 +130,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Quote details factory
      *
      * @var \Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory
-     * @since 2.0.0
      */
     protected $_quoteDetailsFactory;
 
@@ -151,13 +137,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Quote details item factory
      *
      * @var \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $_quoteDetailsItemFactory;
 
     /**
      * @var CustomerSession
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -165,7 +149,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Tax calculation service interface
      *
      * @var \Magento\Tax\Api\TaxCalculationInterface
-     * @since 2.0.0
      */
     protected $_taxCalculationService;
 
@@ -173,37 +156,31 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Price currency
      *
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerGroupRepository;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\RegionInterfaceFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
@@ -230,7 +207,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory
      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -283,7 +259,6 @@ public function __construct(
      *
      * @param int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($store)
     {
@@ -296,7 +271,6 @@ public function setStoreId($store)
      * and creating array of categories|product paths for breadcrumbs
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBreadcrumbPath()
     {
@@ -334,7 +308,6 @@ public function getBreadcrumbPath()
      *
      * @param int $categoryId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCategoryLink($categoryId)
     {
@@ -351,7 +324,6 @@ protected function _isCategoryLink($categoryId)
      * Return current category object
      *
      * @return \Magento\Catalog\Model\Category|null
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -362,7 +334,6 @@ public function getCategory()
      * Retrieve current Product object
      *
      * @return \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -373,7 +344,6 @@ public function getProduct()
      * Retrieve Visitor/Customer Last Viewed URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastViewedUrl()
     {
@@ -412,7 +382,6 @@ public function getLastViewedUrl()
      * @param string $sku
      * @param int $length
      * @return string[]
-     * @since 2.0.0
      */
     public function splitSku($sku, $length = 30)
     {
@@ -423,7 +392,6 @@ public function splitSku($sku, $length = 30)
      * Retrieve attribute hidden fields
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeHiddenFields()
     {
@@ -438,7 +406,6 @@ public function getAttributeHiddenFields()
      * Retrieve Catalog Price Scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPriceScope()
     {
@@ -452,7 +419,6 @@ public function getPriceScope()
      * Is Global Price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPriceGlobal()
     {
@@ -463,7 +429,6 @@ public function isPriceGlobal()
      * Check if the store is configured to use static URLs for media
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUsingStaticUrlsAllowed()
     {
@@ -478,7 +443,6 @@ public function isUsingStaticUrlsAllowed()
      * Check if the parsing of URL directives is allowed for the catalog
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUrlDirectivesParsingAllowed()
     {
@@ -493,7 +457,6 @@ public function isUrlDirectivesParsingAllowed()
      * Retrieve template processor for catalog content
      *
      * @return \Magento\Framework\Filter\Template
-     * @since 2.0.0
      */
     public function getPageTemplateProcessor()
     {
@@ -504,7 +467,6 @@ public function getPageTemplateProcessor()
      * Whether to display items count for each filter option
      * @param int $storeId Store view ID
      * @return bool
-     * @since 2.0.0
      */
     public function shouldDisplayProductCountOnLayer($storeId = null)
     {
@@ -518,7 +480,6 @@ public function shouldDisplayProductCountOnLayer($storeId = null)
     /**
      * @param array $taxAddress
      * @return \Magento\Customer\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     private function convertDefaultTaxAddress(array $taxAddress = null)
     {
@@ -552,7 +513,6 @@ private function convertDefaultTaxAddress(array $taxAddress = null)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getTaxPrice(
         $product,
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index b3a67f6811f1b..37ffc27ef92a0 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Image extends AbstractHelper
 {
@@ -25,7 +24,6 @@ class Image extends AbstractHelper
      * Current model
      *
      * @var \Magento\Catalog\Model\Product\Image
-     * @since 2.0.0
      */
     protected $_model;
 
@@ -33,7 +31,6 @@ class Image extends AbstractHelper
      * Scheduled for resize image
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_scheduleResize = true;
 
@@ -41,7 +38,6 @@ class Image extends AbstractHelper
      * Scheduled for rotate image
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_scheduleRotate = false;
 
@@ -49,7 +45,6 @@ class Image extends AbstractHelper
      * Angle
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_angle;
 
@@ -57,7 +52,6 @@ class Image extends AbstractHelper
      * Watermark file name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_watermark;
 
@@ -65,7 +59,6 @@ class Image extends AbstractHelper
      * Watermark Position
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_watermarkPosition;
 
@@ -73,7 +66,6 @@ class Image extends AbstractHelper
      * Watermark Size
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_watermarkSize;
 
@@ -81,7 +73,6 @@ class Image extends AbstractHelper
      * Watermark Image opacity
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_watermarkImageOpacity;
 
@@ -89,7 +80,6 @@ class Image extends AbstractHelper
      * Current Product
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -97,7 +87,6 @@ class Image extends AbstractHelper
      * Image File
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_imageFile;
 
@@ -105,13 +94,11 @@ class Image extends AbstractHelper
      * Image Placeholder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_placeholder;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -119,19 +106,16 @@ class Image extends AbstractHelper
      * Product image factory
      *
      * @var \Magento\Catalog\Model\Product\ImageFactory
-     * @since 2.0.0
      */
     protected $_productImageFactory;
 
     /**
      * @var \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     protected $viewConfig;
 
     /**
      * @var \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     protected $configView;
 
@@ -139,7 +123,6 @@ class Image extends AbstractHelper
      * Image configuration attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $attributes = [];
 
@@ -155,7 +138,6 @@ class Image extends AbstractHelper
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
      * @param \Magento\Catalog\Model\View\Asset\PlaceholderFactory $placeholderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -177,7 +159,6 @@ public function __construct(
      * Reset all previous data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _reset()
     {
@@ -201,7 +182,6 @@ protected function _reset()
      * @param string $imageId
      * @param array $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function init($product, $imageId, $attributes = [])
     {
@@ -223,7 +203,6 @@ public function init($product, $imageId, $attributes = [])
      * Set image properties
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function setImageProperties()
     {
@@ -268,7 +247,6 @@ protected function setImageProperties()
      * Set watermark properties
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function setWatermarkProperties()
     {
@@ -307,7 +285,6 @@ protected function setWatermarkProperties()
      * @param int $width
      * @param int $height
      * @return $this
-     * @since 2.0.0
      */
     public function resize($width, $height = null)
     {
@@ -321,7 +298,6 @@ public function resize($width, $height = null)
      *
      * @param int $quality
      * @return $this
-     * @since 2.0.0
      */
     public function setQuality($quality)
     {
@@ -337,7 +313,6 @@ public function setQuality($quality)
      * @see \Magento\Catalog\Model\Product\Image
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function keepAspectRatio($flag)
     {
@@ -356,7 +331,6 @@ public function keepAspectRatio($flag)
      * @param bool $flag
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function keepFrame($flag)
     {
@@ -375,7 +349,6 @@ public function keepFrame($flag)
      * @param bool $flag
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function keepTransparency($flag)
     {
@@ -390,7 +363,6 @@ public function keepTransparency($flag)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function constrainOnly($flag)
     {
@@ -407,7 +379,6 @@ public function constrainOnly($flag)
      * @see \Magento\Catalog\Model\Product\Image
      * @param array $colorRGB
      * @return $this
-     * @since 2.0.0
      */
     public function backgroundColor($colorRGB)
     {
@@ -424,7 +395,6 @@ public function backgroundColor($colorRGB)
      *
      * @param int $angle
      * @return $this
-     * @since 2.0.0
      */
     public function rotate($angle)
     {
@@ -443,7 +413,6 @@ public function rotate($angle)
      * @param string $size
      * @param int $imageOpacity
      * @return $this
-     * @since 2.0.0
      */
     public function watermark($fileName, $position, $size = null, $imageOpacity = null)
     {
@@ -464,7 +433,6 @@ public function watermark($fileName, $position, $size = null, $imageOpacity = nu
      *
      * @param string $fileName
      * @return void
-     * @since 2.0.0
      */
     public function placeholder($fileName)
     {
@@ -479,7 +447,6 @@ public function placeholder($fileName)
      *
      * @deprecated 2.2.0 Returns only default placeholder.
      * Does not take into account custom placeholders set in Configuration.
-     * @since 2.0.0
      */
     public function getPlaceholder($placeholder = null)
     {
@@ -497,7 +464,6 @@ public function getPlaceholder($placeholder = null)
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function applyScheduledActions()
     {
@@ -522,7 +488,6 @@ protected function applyScheduledActions()
      * Initialize base image file
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initBaseFile()
     {
@@ -542,7 +507,6 @@ protected function initBaseFile()
      * Check if scheduled actions is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isScheduledActionsAllowed()
     {
@@ -557,7 +521,6 @@ protected function isScheduledActionsAllowed()
      * Retrieve image URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -571,7 +534,6 @@ public function getUrl()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function save()
     {
@@ -583,7 +545,6 @@ public function save()
      * Return resized product image information
      *
      * @return array
-     * @since 2.0.0
      */
     public function getResizedImageInfo()
     {
@@ -594,7 +555,6 @@ public function getResizedImageInfo()
     /**
      * @param null|string $placeholder
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultPlaceholderUrl($placeholder = null)
     {
@@ -616,7 +576,6 @@ public function getDefaultPlaceholderUrl($placeholder = null)
      * Get current Image model
      *
      * @return \Magento\Catalog\Model\Product\Image
-     * @since 2.0.0
      */
     protected function _getModel()
     {
@@ -631,7 +590,6 @@ protected function _getModel()
      *
      * @param int $angle
      * @return $this
-     * @since 2.0.0
      */
     protected function setAngle($angle)
     {
@@ -643,7 +601,6 @@ protected function setAngle($angle)
      * Get Rotation Angle
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getAngle()
     {
@@ -655,7 +612,6 @@ protected function getAngle()
      *
      * @param string $watermark
      * @return $this
-     * @since 2.0.0
      */
     protected function setWatermark($watermark)
     {
@@ -668,7 +624,6 @@ protected function setWatermark($watermark)
      * Get watermark file name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getWatermark()
     {
@@ -680,7 +635,6 @@ protected function getWatermark()
      *
      * @param string $position
      * @return $this
-     * @since 2.0.0
      */
     protected function setWatermarkPosition($position)
     {
@@ -693,7 +647,6 @@ protected function setWatermarkPosition($position)
      * Get watermark position
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getWatermarkPosition()
     {
@@ -706,7 +659,6 @@ protected function getWatermarkPosition()
      *
      * @param string $size
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkSize($size)
     {
@@ -719,7 +671,6 @@ public function setWatermarkSize($size)
      * Get watermark size
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getWatermarkSize()
     {
@@ -731,7 +682,6 @@ protected function getWatermarkSize()
      *
      * @param int $imageOpacity
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
@@ -744,7 +694,6 @@ public function setWatermarkImageOpacity($imageOpacity)
      * Get watermark image opacity
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getWatermarkImageOpacity()
     {
@@ -760,7 +709,6 @@ protected function getWatermarkImageOpacity()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     protected function setProduct($product)
     {
@@ -772,7 +720,6 @@ protected function setProduct($product)
      * Get current Product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function getProduct()
     {
@@ -784,7 +731,6 @@ protected function getProduct()
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function setImageFile($file)
     {
@@ -796,7 +742,6 @@ public function setImageFile($file)
      * Get Image file
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getImageFile()
     {
@@ -808,7 +753,6 @@ protected function getImageFile()
      *
      * @param string $string
      * @return array|bool
-     * @since 2.0.0
      */
     protected function parseSize($string)
     {
@@ -823,7 +767,6 @@ protected function parseSize($string)
      * Retrieve original image width
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalWidth()
     {
@@ -834,7 +777,6 @@ public function getOriginalWidth()
      * Retrieve original image height
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalHeight()
     {
@@ -846,7 +788,6 @@ public function getOriginalHeight()
      * 0 - width, 1 - height
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getOriginalSizeArray()
     {
@@ -857,7 +798,6 @@ public function getOriginalSizeArray()
      * Retrieve config view
      *
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     protected function getConfigView()
     {
@@ -871,7 +811,6 @@ protected function getConfigView()
      * Retrieve image type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -882,7 +821,6 @@ public function getType()
      * Retrieve image width
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWidth()
     {
@@ -893,7 +831,6 @@ public function getWidth()
      * Retrieve image height
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeight()
     {
@@ -904,7 +841,6 @@ public function getHeight()
      * Retrieve image frame flag
      *
      * @return false|string
-     * @since 2.0.0
      */
     public function getFrame()
     {
@@ -920,7 +856,6 @@ public function getFrame()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function getAttribute($name)
     {
@@ -931,7 +866,6 @@ protected function getAttribute($name)
      * Return image label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index a5311d8365404..a5139aa0eaa24 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Helper\Output
  *
- * @since 2.0.0
  */
 class Output extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -20,7 +19,6 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
      * Array of existing handlers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_handlers;
 
@@ -28,7 +26,6 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
      * Template processor instance
      *
      * @var Template
-     * @since 2.0.0
      */
     protected $_templateProcessor = null;
 
@@ -36,7 +33,6 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -44,13 +40,11 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -59,7 +53,6 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param Data $catalogData
      * @param \Magento\Framework\Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -75,7 +68,6 @@ public function __construct(
 
     /**
      * @return Template
-     * @since 2.0.0
      */
     protected function _getTemplateProcessor()
     {
@@ -92,7 +84,6 @@ protected function _getTemplateProcessor()
      * @param string $method
      * @param object $handler
      * @return $this
-     * @since 2.0.0
      */
     public function addHandler($method, $handler)
     {
@@ -114,7 +105,6 @@ public function addHandler($method, $handler)
      *
      * @param string $method
      * @return array
-     * @since 2.0.0
      */
     public function getHandlers($method)
     {
@@ -129,7 +119,6 @@ public function getHandlers($method)
      * @param mixed $result
      * @param array $params
      * @return mixed
-     * @since 2.0.0
      */
     public function process($method, $result, $params)
     {
@@ -149,7 +138,6 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
@@ -189,7 +177,6 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
-     * @since 2.0.0
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index 908edd9e4e787..c0d5d1d9e4503 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -14,7 +14,6 @@
 /**
  * Catalog category helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Product extends \Magento\Framework\Url\Helper\Data
 {
@@ -28,25 +27,21 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * Flag that shows if Magento has to check product to be saleable (enabled and/or inStock)
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_skipSaleableCheck = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_statuses;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_priceBlock;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -54,13 +49,11 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
-     * @since 2.0.0
      */
     protected $_attributeConfig;
 
@@ -68,7 +61,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
@@ -76,7 +68,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * Invalidate product category indexer params
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_reindexProductCategoryIndexerData;
 
@@ -84,25 +75,21 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * Invalidate price indexer params
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_reindexPriceIndexerData;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -118,7 +105,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
      * @param ProductRepositoryInterface $productRepository
      * @param CategoryRepositoryInterface $categoryRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -149,7 +135,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product|array $data
      * @return bool
-     * @since 2.0.0
      */
     public function isDataForPriceIndexerWasChanged($data)
     {
@@ -179,7 +164,6 @@ public function isDataForPriceIndexerWasChanged($data)
      *
      * @param \Magento\Catalog\Model\Product $data
      * @return bool
-     * @since 2.0.0
      */
     public function isDataForProductCategoryIndexerWasChanged(\Magento\Catalog\Model\Product $data)
     {
@@ -196,7 +180,6 @@ public function isDataForProductCategoryIndexerWasChanged(\Magento\Catalog\Model
      *
      * @param int|ModelProduct $product
      * @return string|bool
-     * @since 2.0.0
      */
     public function getProductUrl($product)
     {
@@ -213,7 +196,6 @@ public function getProductUrl($product)
      *
      * @param ModelProduct $product
      * @return float
-     * @since 2.0.0
      */
     public function getPrice($product)
     {
@@ -225,7 +207,6 @@ public function getPrice($product)
      *
      * @param ModelProduct $product
      * @return float
-     * @since 2.0.0
      */
     public function getFinalPrice($product)
     {
@@ -237,7 +218,6 @@ public function getFinalPrice($product)
      *
      * @param ModelProduct|\Magento\Framework\DataObject $product
      * @return string|bool
-     * @since 2.0.0
      */
     public function getImageUrl($product)
     {
@@ -256,7 +236,6 @@ public function getImageUrl($product)
      *
      * @param ModelProduct|\Magento\Framework\DataObject $product
      * @return string|bool
-     * @since 2.0.0
      */
     public function getSmallImageUrl($product)
     {
@@ -275,7 +254,6 @@ public function getSmallImageUrl($product)
      *
      * @param ModelProduct|\Magento\Framework\DataObject $product
      * @return string|bool
-     * @since 2.0.0
      */
     public function getThumbnailUrl($product)
     {
@@ -292,7 +270,6 @@ public function getThumbnailUrl($product)
     /**
      * @param ModelProduct $product
      * @return string
-     * @since 2.0.0
      */
     public function getEmailToFriendUrl($product)
     {
@@ -306,7 +283,6 @@ public function getEmailToFriendUrl($product)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getStatuses()
     {
@@ -324,7 +300,6 @@ public function getStatuses()
      * @param string $where
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function canShow($product, $where = 'catalog')
     {
@@ -347,7 +322,6 @@ public function canShow($product, $where = 'catalog')
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canUseCanonicalTag($store = null)
     {
@@ -365,7 +339,6 @@ public function canUseCanonicalTag($store = null)
      *
      * @param string $inputType
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeInputTypes($inputType = null)
     {
@@ -392,7 +365,6 @@ public function getAttributeInputTypes($inputType = null)
      *
      * @param string $inputType
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeBackendModelByInputType($inputType)
     {
@@ -408,7 +380,6 @@ public function getAttributeBackendModelByInputType($inputType)
      *
      * @param string $inputType
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeSourceModelByInputType($inputType)
     {
@@ -432,7 +403,6 @@ public function getAttributeSourceModelByInputType($inputType)
      * @return bool|ModelProduct
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function initProduct($productId, $controller, $params = null)
     {
@@ -511,7 +481,6 @@ public function initProduct($productId, $controller, $params = null)
      * @param ModelProduct $product
      * @param \Magento\Framework\DataObject $buyRequest
      * @return Product
-     * @since 2.0.0
      */
     public function prepareProductOptions($product, $buyRequest)
     {
@@ -535,7 +504,6 @@ public function prepareProductOptions($product, $buyRequest)
      * @param \Magento\Framework\DataObject|array $buyRequest
      * @param \Magento\Framework\DataObject|array $params
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function addParamsToBuyRequest($buyRequest, $params)
     {
@@ -577,7 +545,6 @@ public function addParamsToBuyRequest($buyRequest, $params)
      *
      * @param bool $skipSaleableCheck
      * @return Product
-     * @since 2.0.0
      */
     public function setSkipSaleableCheck($skipSaleableCheck = false)
     {
@@ -590,7 +557,6 @@ public function setSkipSaleableCheck($skipSaleableCheck = false)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getSkipSaleableCheck()
     {
@@ -601,7 +567,6 @@ public function getSkipSaleableCheck()
      * Get masks for auto generation of fields
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getFieldsAutogenerationMasks()
     {
@@ -612,7 +577,6 @@ public function getFieldsAutogenerationMasks()
      * Retrieve list of attributes that allowed for autogeneration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesAllowedForAutogeneration()
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index 7787ebb57e6d9..06ba9fb62c081 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -14,7 +14,6 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Compare extends \Magento\Framework\Url\Helper\Data
 {
@@ -22,7 +21,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Product Compare Items Collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_itemCollection;
 
@@ -30,7 +28,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Product Comapare Items Collection has items flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasItems;
 
@@ -38,7 +35,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Allow used Flat catalog product for product compare items collection
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_allowUsedFlat = true;
 
@@ -46,7 +42,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Customer id
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_customerId = null;
 
@@ -54,7 +49,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
@@ -62,7 +56,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -70,7 +63,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Customer visitor
      *
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -78,7 +70,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -86,31 +77,26 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * Product compare item collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemCollectionFactory;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $_formKey;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistHelper;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $postHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $_storeManager;
 
@@ -126,7 +112,6 @@ class Compare extends \Magento\Framework\Url\Helper\Data
      * @param \Magento\Wishlist\Helper\Data $wishlistHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -156,7 +141,6 @@ public function __construct(
      * Retrieve compare list url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getListUrl()
     {
@@ -178,7 +162,6 @@ public function getListUrl()
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getPostDataParams($product)
     {
@@ -189,7 +172,6 @@ public function getPostDataParams($product)
      * Retrieve url for adding product to compare list
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddUrl()
     {
@@ -201,7 +183,6 @@ public function getAddUrl()
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToWishlistParams($product)
     {
@@ -219,7 +200,6 @@ public function getAddToWishlistParams($product)
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($product)
     {
@@ -237,7 +217,6 @@ public function getAddToCartUrl($product)
      * Retrieve remove item from compare list url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveUrl()
     {
@@ -249,7 +228,6 @@ public function getRemoveUrl()
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getPostDataRemove($product)
     {
@@ -266,7 +244,6 @@ public function getPostDataRemove($product)
      * Retrieve clear compare list url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClearListUrl()
     {
@@ -277,7 +254,6 @@ public function getClearListUrl()
      * Get parameters to clear compare list
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostDataClearList()
     {
@@ -293,7 +269,6 @@ public function getPostDataClearList()
      * Retrieve compare list items collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -330,7 +305,6 @@ public function getItemCollection()
      *
      * @param bool $logout
      * @return $this
-     * @since 2.0.0
      */
     public function calculate($logout = false)
     {
@@ -359,7 +333,6 @@ public function calculate($logout = false)
      * Retrieve count of items in compare list
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemCount()
     {
@@ -374,7 +347,6 @@ public function getItemCount()
      * Check has items
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasItems()
     {
@@ -386,7 +358,6 @@ public function hasItems()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowUsedFlat($flag)
     {
@@ -399,7 +370,6 @@ public function setAllowUsedFlat($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getAllowUsedFlat()
     {
@@ -411,7 +381,6 @@ public function getAllowUsedFlat()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index a9c169974b2e6..cd58cd9c74143 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -21,7 +21,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Composite extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -29,7 +28,6 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,25 +35,21 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog product
      *
      * @var Product
-     * @since 2.0.0
      */
     protected $_catalogProduct = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -66,7 +60,6 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
      * @param Registry $coreRegistry
      * @param LayoutFactory $resultLayoutFactory
      * @param ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -88,7 +81,6 @@ public function __construct(
      * Init layout of product configuration update result
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     protected function _initUpdateResultLayout()
     {
@@ -103,7 +95,6 @@ protected function _initUpdateResultLayout()
      *
      * @param \Magento\Framework\DataObject $updateResult
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function renderUpdateResult(\Magento\Framework\DataObject $updateResult)
     {
@@ -120,7 +111,6 @@ public function renderUpdateResult(\Magento\Framework\DataObject $updateResult)
      * @param bool $isOk
      * @param string $productType
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     protected function _initConfigureResultLayout($isOk, $productType)
     {
@@ -143,7 +133,6 @@ protected function _initConfigureResultLayout($isOk, $productType)
      *
      * @param \Magento\Framework\DataObject $configureResult
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function renderConfigureResult(\Magento\Framework\DataObject $configureResult)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index 44e5befcdc836..a88a27f1e7fbe 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -14,7 +14,6 @@
  * Helper for fetching properties by product configurational item
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Configuration extends AbstractHelper implements ConfigurationInterface
 {
@@ -22,7 +21,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Filter manager
      *
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filter;
 
@@ -30,7 +28,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Product option factory
      *
      * @var \Magento\Catalog\Model\Product\OptionFactory
-     * @since 2.0.0
      */
     protected $_productOptionFactory;
 
@@ -38,7 +35,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -54,7 +50,6 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * @param \Magento\Framework\Filter\FilterManager $filter
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -75,7 +70,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getCustomOptions(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item)
     {
@@ -133,7 +127,6 @@ public function getCustomOptions(\Magento\Catalog\Model\Product\Configuration\It
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptions(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item)
     {
@@ -165,7 +158,6 @@ public function getOptions(\Magento\Catalog\Model\Product\Configuration\Item\Ite
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($optionValue, $params = null)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php b/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php
index 9fec82a3764d5..df20c3060f14f 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php
@@ -10,7 +10,6 @@
  * Interface for product configuration helpers
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigurationInterface
 {
@@ -19,7 +18,6 @@ interface ConfigurationInterface
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptions(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item);
 }
diff --git a/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php b/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php
index c37475d5431a3..ba1288fb61137 100644
--- a/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php
+++ b/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php
@@ -7,32 +7,27 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ConfigurationPool
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface[]
-     * @since 2.0.0
      */
     private $_instances = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $instancesByType = [];
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $instancesByType
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $instancesByType)
     {
@@ -44,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return \Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function get($className)
     {
@@ -67,7 +61,6 @@ public function get($className)
     /**
      * @param string $productType
      * @return Configuration\ConfigurationInterface
-     * @since 2.0.0
      */
     public function getByProductType($productType)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 2e24cf5b7aeaa..2c1bacdb99e12 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -12,7 +12,6 @@
 /**
  * Class Attribute
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Backend\Helper\Data
 {
@@ -20,7 +19,6 @@ class Attribute extends \Magento\Backend\Helper\Data
      * Selected products for mass-update
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected $_products;
 
@@ -28,7 +26,6 @@ class Attribute extends \Magento\Backend\Helper\Data
      * Array of same attributes for selected products
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -36,31 +33,26 @@ class Attribute extends \Magento\Backend\Helper\Data
      * Excluded from batch update attribute codes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_excludedAttributes = ['url_key'];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productsFactory;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -77,7 +69,6 @@ class Attribute extends \Magento\Backend\Helper\Data
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productsFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -104,7 +95,6 @@ public function __construct(
      * Product collection didn't load
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getProducts()
     {
@@ -131,7 +121,6 @@ public function getProducts()
      * @param array $productIds
      *
      * @return void
-     * @since 2.0.0
      */
     public function setProductIds($productIds)
     {
@@ -142,7 +131,6 @@ public function setProductIds($productIds)
      * Return array of selected product ids from post or session
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -153,7 +141,6 @@ public function getProductIds()
      * Return selected store id from request
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getSelectedStoreId()
     {
@@ -164,7 +151,6 @@ public function getSelectedStoreId()
      * Return array of attribute sets by selected products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductsSetIds()
     {
@@ -175,7 +161,6 @@ public function getProductsSetIds()
      * Return collection of same attributes for selected products without unique
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -210,7 +195,6 @@ public function getAttributes()
     /**
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getStoreWebsiteId($storeId)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 50efb02bf4a5d..f139d41566bbb 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -13,7 +13,6 @@
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -31,13 +30,11 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * Resource instance
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_columns;
 
@@ -45,7 +42,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * List of indexes uses in flat product table
      *
      * @var null|array
-     * @since 2.0.0
      */
     protected $_indexes;
 
@@ -53,7 +49,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * Retrieve catalog product flat columns array in old format (used before MMDB support)
      *
      * @return array
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -61,7 +56,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * Required system attributes for preload
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_systemAttributes = ['status', 'required_options', 'tax_class_id', 'weight'];
 
@@ -69,37 +63,31 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * EAV Config instance
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
-     * @since 2.0.0
      */
     protected $_attributeConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeCodes;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_flatAttributeGroups = [];
 
@@ -107,37 +95,31 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * Config factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_addFilterableAttrs;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_addChildData;
 
     /**
      * @var \Magento\Framework\Mview\View\Changelog
-     * @since 2.0.0
      */
     protected $_changelog;
 
@@ -154,7 +136,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * @param bool $addChildData
      * @param array $flatAttributeGroups
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -186,7 +167,6 @@ public function __construct(
      * Retrieve catalog product flat columns array in DDL format
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumnsDdlDefinition()
     {
@@ -242,7 +222,6 @@ public function getFlatColumnsDdlDefinition()
      * Check whether filterable attributes should be added
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAddFilterableAttributes()
     {
@@ -253,7 +232,6 @@ public function isAddFilterableAttributes()
      * Check whether child data should be added
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAddChildData()
     {
@@ -264,7 +242,6 @@ public function isAddChildData()
      * Retrieve catalog product flat table columns array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -289,7 +266,6 @@ public function getFlatColumns()
      * Retrieve entity type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -300,7 +276,6 @@ public function getEntityType()
      * Retrieve Catalog Entity Type Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -314,7 +289,6 @@ public function getEntityTypeId()
      * Retrieve attribute objects for flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -348,7 +322,6 @@ public function getAttributes()
      * Retrieve attribute codes using for flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeCodes()
     {
@@ -401,7 +374,6 @@ public function getAttributeCodes()
      * Retrieve catalog product flat table indexes array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -455,7 +427,6 @@ public function getFlatIndexes()
      *
      * @param array $attributes
      * @return array
-     * @since 2.0.0
      */
     public function getTablesStructure(array $attributes)
     {
@@ -477,7 +448,6 @@ public function getTablesStructure(array $attributes)
      *
      * @param string|array $name
      * @return string
-     * @since 2.0.0
      */
     public function getTable($name)
     {
@@ -489,7 +459,6 @@ public function getTable($name)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getFlatTableName($storeId)
     {
@@ -502,7 +471,6 @@ public function getFlatTableName($storeId)
      * @param string $attributeCode
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Eav\Model\Entity\Attribute
-     * @since 2.0.0
      */
     public function getAttribute($attributeCode)
     {
@@ -524,7 +492,6 @@ public function getAttribute($attributeCode)
      * Delete all product flat tables for not existing stores
      *
      * @return void
-     * @since 2.0.0
      */
     public function deleteAbandonedStoreFlatTables()
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index 3b2180ed90e97..37e1c0a1380e8 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -12,7 +12,6 @@
  * Class ProductList
  *
  * @api
- * @since 2.0.0
  */
 class ProductList
 {
@@ -27,7 +26,6 @@ class ProductList
     const DEFAULT_SORT_DIRECTION = 'asc';
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -35,13 +33,11 @@ class ProductList
      * Default limits per page
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultAvailableLimit  = [10 => 10,20 => 20,50 => 50];
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -53,7 +49,6 @@ public function __construct(
      * Returns available mode for view
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getAvailableViewMode()
     {
@@ -85,7 +80,6 @@ public function getAvailableViewMode()
      *
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultViewMode($options = [])
     {
@@ -99,7 +93,6 @@ public function getDefaultViewMode($options = [])
      * Get default sort field
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getDefaultSortField()
     {
@@ -114,7 +107,6 @@ public function getDefaultSortField()
      *
      * @param string $mode
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableLimit($mode)
     {
@@ -143,7 +135,6 @@ public function getAvailableLimit($mode)
      *
      * @param string $viewMode
      * @return string (comma separated)
-     * @since 2.0.0
      */
     public function getDefaultLimitPerPageValue($viewMode)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 5d8d5bcdd5fd7..46ac05168715b 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -13,7 +13,6 @@
 /**
  * Catalog category helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -21,7 +20,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * List of catalog product session message groups
      *
      * @var array
-     * @since 2.0.0
      */
     protected $messageGroups;
 
@@ -29,7 +27,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,7 +34,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct = null;
 
@@ -45,7 +41,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog design
      *
      * @var \Magento\Catalog\Model\Design
-     * @since 2.0.0
      */
     protected $_catalogDesign;
 
@@ -53,19 +48,16 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
@@ -80,7 +72,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param array $messageGroups
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -111,7 +102,6 @@ public function __construct(
      * @return \Magento\Catalog\Helper\Product\View
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function initProductLayout(ResultPage $resultPage, $product, $params = null)
     {
@@ -188,7 +178,6 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Catalog\Helper\Product\View
-     * @since 2.0.0
      */
     public function prepareAndRender(ResultPage $resultPage, $productId, $controller, $params = null)
     {
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 3f17d21a87fe0..252073024820f 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -12,7 +12,6 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensibleModel
 {
@@ -23,7 +22,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * value for store
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_defaultValues;
 
@@ -31,7 +29,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * This array contains codes of attributes which have value in current store
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_storeValuesFlags;
 
@@ -39,7 +36,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Locked attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_lockedAttributes = [];
 
@@ -47,7 +43,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Is model deleteable
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isDeleteable = true;
 
@@ -55,7 +50,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Is model readonly
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isReadonly = false;
 
@@ -63,7 +57,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -82,7 +75,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -111,7 +103,6 @@ public function __construct(
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function lockAttribute($attributeCode)
     {
@@ -124,7 +115,6 @@ public function lockAttribute($attributeCode)
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function unlockAttribute($attributeCode)
     {
@@ -139,7 +129,6 @@ public function unlockAttribute($attributeCode)
      * Unlock all attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unlockAttributes()
     {
@@ -151,7 +140,6 @@ public function unlockAttributes()
      * Retrieve locked attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLockedAttributes()
     {
@@ -162,7 +150,6 @@ public function getLockedAttributes()
      * Checks that model have locked attributes
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function hasLockedAttributes()
     {
@@ -174,7 +161,6 @@ public function hasLockedAttributes()
      *
      * @param mixed $attributeCode
      * @return boolean
-     * @since 2.0.0
      */
     public function isLockedAttribute($attributeCode)
     {
@@ -194,7 +180,6 @@ public function isLockedAttribute($attributeCode)
      * @param string|array $key
      * @param mixed $value
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -224,7 +209,6 @@ public function setData($key, $value = null)
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsetData($key = null)
     {
@@ -239,7 +223,6 @@ public function unsetData($key = null)
      * Get collection instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getResourceCollection()
     {
@@ -254,7 +237,6 @@ public function getResourceCollection()
      * @param null|string|array $value
      * @param string $additionalAttributes
      * @return bool|\Magento\Catalog\Model\AbstractModel
-     * @since 2.0.0
      */
     public function loadByAttribute($attribute, $value, $additionalAttributes = '*')
     {
@@ -278,7 +260,6 @@ public function loadByAttribute($attribute, $value, $additionalAttributes = '*')
      * Retrieve sore object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -289,7 +270,6 @@ public function getStore()
      * Retrieve all store ids of object current website
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteStoreIds()
     {
@@ -306,7 +286,6 @@ public function getWebsiteStoreIds()
      * @return  $this
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function setAttributeDefaultValue($attributeCode, $value)
     {
@@ -338,7 +317,6 @@ private function getAttributeScopeOverriddenValue()
      * @return  array|boolean
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function getAttributeDefaultValue($attributeCode)
     {
@@ -361,7 +339,6 @@ public function getAttributeDefaultValue($attributeCode)
      * @return  $this
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function setExistsStoreValueFlag($attributeCode)
     {
@@ -377,7 +354,6 @@ public function setExistsStoreValueFlag($attributeCode)
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function getExistsStoreValueFlag($attributeCode)
     {
@@ -401,7 +377,6 @@ public function getExistsStoreValueFlag($attributeCode)
      * Before save unlock attributes
      *
      * @return \Magento\Catalog\Model\AbstractModel
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -413,7 +388,6 @@ public function beforeSave()
      * Checks model is deletable
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isDeleteable()
     {
@@ -425,7 +399,6 @@ public function isDeleteable()
      *
      * @param boolean $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDeleteable($value)
     {
@@ -437,7 +410,6 @@ public function setIsDeleteable($value)
      * Checks model is deletable
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -449,7 +421,6 @@ public function isReadonly()
      *
      * @param boolean $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIsReadonly($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index 6fe1b3e07d2b7..dac70a03909a4 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -22,7 +21,6 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
      * Layout update validator factory
      *
      * @var ValidatorFactory
-     * @since 2.0.0
      */
     protected $_layoutUpdateValidatorFactory;
 
@@ -30,7 +28,6 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
      * Construct the custom layout update class
      *
      * @param ValidatorFactory $layoutUpdateValidatorFactory
-     * @since 2.0.0
      */
     public function __construct(ValidatorFactory $layoutUpdateValidatorFactory)
     {
@@ -43,7 +40,6 @@ public function __construct(ValidatorFactory $layoutUpdateValidatorFactory)
      * @param \Magento\Framework\DataObject $object
      * @return bool
      * @throws Exception
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
index 5f0b0057d5358..f26851a317c72 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
@@ -12,7 +12,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime
 {
@@ -20,7 +19,6 @@ class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime
      * Date model
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -29,7 +27,6 @@ class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime
      *
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -44,7 +41,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $object
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _getValueForSave($object)
     {
@@ -60,7 +56,6 @@ protected function _getValueForSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -81,7 +76,6 @@ public function beforeSave($object)
      * @param \Magento\Framework\DataObject $object
      * @throws \Magento\Eav\Model\Entity\Attribute\Exception
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Config.php b/app/code/Magento/Catalog/Model/Attribute/Config.php
index 4cdcce2eaa70c..455f4796425fb 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Config.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Config.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Catalog\Model\Attribute\Config
  *
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Catalog\Model\Attribute\Config\Data
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
     /**
      * @param \Magento\Catalog\Model\Attribute\Config\Data $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Attribute\Config\Data $dataStorage)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Catalog\Model\Attribute\Config\Data $dataSt
      *
      * @param string $groupName Name of an attribute group
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeNames($groupName)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Config/Converter.php b/app/code/Magento/Catalog/Model/Attribute/Config/Converter.php
index c1144b88f0127..8b2d4583697b4 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Config/Converter.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\Attribute\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Config/Data.php b/app/code/Magento/Catalog/Model/Attribute/Config/Data.php
index a1b3436eb844d..584b605eb85cf 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Config/Data.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides catalog attributes configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Attribute\Config\Reader $reader,
diff --git a/app/code/Magento/Catalog/Model/Attribute/Config/Reader.php b/app/code/Magento/Catalog/Model/Attribute/Config/Reader.php
index 988c1fe1a589b..99aaf5fc8c2fa 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Config/Reader.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Config/Reader.php
@@ -7,7 +7,6 @@
 
 /**
  * Loads catalog attributes configuration from multiple XML files by merging them together
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -15,7 +14,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/group' => 'name', '/config/group/attribute' => 'name'];
 
@@ -30,7 +28,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Catalog/Model/Attribute/Config/SchemaLocator.php b/app/code/Magento/Catalog/Model/Attribute/Config/SchemaLocator.php
index a9d134ccd34e0..d80c34c0c3443 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Config/SchemaLocator.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Attribute\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,13 +19,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for both individual and merged configs
      *
      * @var string
-     * @since 2.0.0
      */
     private $_schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -45,7 +41,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php b/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
index c907c536dd4f5..66287c1ca8a8a 100644
--- a/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
+++ b/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Catalog\Model\Attribute\LockValidatorComposite
  *
- * @since 2.0.0
  */
 class LockValidatorComposite implements LockValidatorInterface
 {
     /**
      * @var LockValidatorInterface[]
-     * @since 2.0.0
      */
     protected $validators = [];
 
@@ -24,7 +22,6 @@ class LockValidatorComposite implements LockValidatorInterface
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $validators
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $validators = [])
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return void
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $object, $attributeSet = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
index 3d97e64e3a552..d259a4dcb3987 100644
--- a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
+++ b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Catalog\Model\Attribute\LockValidatorInterface
  *
- * @since 2.0.0
  */
 interface LockValidatorInterface
 {
@@ -22,7 +21,6 @@ interface LockValidatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return void
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $object, $attributeSet = null);
 }
diff --git a/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php b/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
index af90f15635d2a..64e8d9b3aa5aa 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Catalog\Model\Attribute\Source\Scopes
  *
- * @since 2.0.0
  */
 class Scopes implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 995e6316cd830..a5349b59bdee9 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -34,7 +34,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Category extends \Magento\Catalog\Model\AbstractModel implements
     \Magento\Framework\DataObject\IdentityInterface,
@@ -86,19 +85,13 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
     const KEY_CHILDREN_DATA = 'children_data';
     /**#@-*/
 
-    /**
-     * Prefix of model events names
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_eventPrefix = 'catalog_category';
 
     /**
      * Parameter name in event
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'category';
 
@@ -106,7 +99,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Model cache tag for clear cache in after save and after delete
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheTag = self::CACHE_TAG;
 
@@ -114,7 +106,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * URL Model instance
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -123,7 +114,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
      * @deprecated 2.2.0 since 2.2.0
-     * @since 2.0.0
      */
     protected $_urlRewrite;
 
@@ -131,7 +121,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Use flat resource model flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useFlatResource = false;
 
@@ -139,7 +128,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Category design attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_designAttributes = [
         'custom_design',
@@ -154,7 +142,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Attributes are that part of interface
      *
      * @var array
-     * @since 2.0.0
      */
     protected $interfaceAttributes = [
         'id',
@@ -174,7 +161,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Category tree model
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\Tree
-     * @since 2.0.0
      */
     protected $_treeModel = null;
 
@@ -182,7 +168,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Core data
      *
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filter;
 
@@ -190,7 +175,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -198,7 +182,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
@@ -206,7 +189,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Store collection factory
      *
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storeCollectionFactory;
 
@@ -214,43 +196,36 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Category tree factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
-     * @since 2.0.0
      */
     protected $_categoryTreeFactory;
 
     /**
      * @var Indexer\Category\Flat\State
-     * @since 2.0.0
      */
     protected $flatState;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Framework\Api\MetadataServiceInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
@@ -277,7 +252,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -331,7 +305,6 @@ public function __construct(
      * Initialize resource mode
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -346,7 +319,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -362,7 +334,6 @@ protected function getCustomAttributesCodes()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseFlatResource()
     {
@@ -373,7 +344,6 @@ public function getUseFlatResource()
      * Retrieve URL instance
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function getUrlInstance()
     {
@@ -384,7 +354,6 @@ public function getUrlInstance()
      * Retrieve category tree model
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Tree
-     * @since 2.0.0
      */
     public function getTreeModel()
     {
@@ -395,7 +364,6 @@ public function getTreeModel()
      * Enter description here...
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Tree
-     * @since 2.0.0
      */
     public function getTreeModelInstance()
     {
@@ -409,7 +377,6 @@ public function getTreeModelInstance()
      * @param  null|int $afterCategoryId category id after which we have put current category
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function move($parentId, $afterCategoryId)
     {
@@ -489,7 +456,6 @@ public function move($parentId, $afterCategoryId)
      * Retrieve default attribute set id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultAttributeSetId()
     {
@@ -500,7 +466,6 @@ public function getDefaultAttributeSetId()
      * Get category products collection
      *
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
@@ -519,7 +484,6 @@ public function getProductCollection()
      * @return array
      * @todo Use with Flat Resource
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getAttributes($noDesignAttributes = false)
     {
@@ -543,7 +507,6 @@ public function getAttributes($noDesignAttributes = false)
      * array($productId => $position)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductsPosition()
     {
@@ -563,7 +526,6 @@ public function getProductsPosition()
      * Retrieve array of store ids for category
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -609,7 +571,6 @@ public function getStoreIds()
      * If store id is underfined for category return current active store id
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -624,7 +585,6 @@ public function getStoreId()
      *
      * @param int|string $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -640,7 +600,6 @@ public function setStoreId($storeId)
      * Get category url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -675,7 +634,6 @@ public function getUrl()
      * Retrieve category id URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryIdUrl()
     {
@@ -691,7 +649,6 @@ public function getCategoryIdUrl()
      *
      * @param string $str
      * @return string
-     * @since 2.0.0
      */
     public function formatUrlKey($str)
     {
@@ -702,7 +659,6 @@ public function formatUrlKey($str)
      * @param string $attributeCode
      * @return bool|string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getImageUrl($attributeCode = 'image')
     {
@@ -726,7 +682,6 @@ public function getImageUrl($attributeCode = 'image')
      * Get parent category object
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getParentCategory()
     {
@@ -740,7 +695,6 @@ public function getParentCategory()
      * Get parent category identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -756,7 +710,6 @@ public function getParentId()
      * Get all parent categories ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParentIds()
     {
@@ -767,7 +720,6 @@ public function getParentIds()
      * Retrieve dates for custom design (from & to)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomDesignDate()
     {
@@ -782,7 +734,6 @@ public function getCustomDesignDate()
      * Retrieve design attributes array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDesignAttributes()
     {
@@ -798,7 +749,6 @@ public function getDesignAttributes()
      *
      * @param string $attributeCode
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     private function _getAttribute($attributeCode)
     {
@@ -815,7 +765,6 @@ private function _getAttribute($attributeCode)
      *
      * @param boolean $asArray return result as array instead of comma-separated list of IDs
      * @return array|string
-     * @since 2.0.0
      */
     public function getAllChildren($asArray = false)
     {
@@ -831,7 +780,6 @@ public function getAllChildren($asArray = false)
      * Retrieve children ids comma separated
      *
      * @return string
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -843,7 +791,6 @@ public function getChildren()
      * Return comma separated string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPathInStore()
     {
@@ -863,7 +810,6 @@ public function getPathInStore()
      *
      * @param   int $id
      * @return  bool
-     * @since 2.0.0
      */
     public function checkId($id)
     {
@@ -875,7 +821,6 @@ public function checkId($id)
      * Result array contain id of current category because it is part of the path
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPathIds()
     {
@@ -891,7 +836,6 @@ public function getPathIds()
      * Retrieve level
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLevel()
     {
@@ -906,7 +850,6 @@ public function getLevel()
      *
      * @param array $ids
      * @return bool
-     * @since 2.0.0
      */
     public function verifyIds(array $ids)
     {
@@ -917,7 +860,6 @@ public function verifyIds(array $ids)
      * Retrieve Is Category has children flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -928,7 +870,6 @@ public function hasChildren()
      * Retrieve Request Path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestPath()
     {
@@ -939,7 +880,6 @@ public function getRequestPath()
      * Retrieve Name data wrapper
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -951,7 +891,6 @@ public function getName()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -965,7 +904,6 @@ public function beforeDelete()
      * Retrieve anchors above
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAnchorsAbove()
     {
@@ -996,7 +934,6 @@ public function getAnchorsAbove()
      * Retrieve count products of category
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductCount()
     {
@@ -1014,7 +951,6 @@ public function getProductCount()
      * @param bool $asCollection
      * @param bool $toLoad
      * @return \Magento\Framework\Data\Tree\Node\Collection|\Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true)
     {
@@ -1026,7 +962,6 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
      * Return parent categories of current category
      *
      * @return \Magento\Framework\DataObject[]|\Magento\Catalog\Model\Category[]
-     * @since 2.0.0
      */
     public function getParentCategories()
     {
@@ -1037,7 +972,6 @@ public function getParentCategories()
      * Return children categories of current category
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection|\Magento\Catalog\Model\Category[]
-     * @since 2.0.0
      */
     public function getChildrenCategories()
     {
@@ -1048,7 +982,6 @@ public function getChildrenCategories()
      * Return parent category of current category with own custom design settings
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getParentDesignCategory()
     {
@@ -1059,7 +992,6 @@ public function getParentDesignCategory()
      * Check category is in Root Category list
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInRootCategoryList()
     {
@@ -1071,7 +1003,6 @@ public function isInRootCategoryList()
      * Retrieve Available int Product Listing sort by
      *
      * @return null|array
-     * @since 2.0.0
      */
     public function getAvailableSortBy()
     {
@@ -1090,7 +1021,6 @@ public function getAvailableSortBy()
      * code as key, value - name
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableSortByOptions()
     {
@@ -1115,7 +1045,6 @@ public function getAvailableSortByOptions()
      * Retrieve Product Listing Default Sort By
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSortBy()
     {
@@ -1136,7 +1065,6 @@ public function getDefaultSortBy()
      *
      * @throws \Magento\Eav\Model\Entity\Attribute\Exception
      * @return true|array
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -1147,7 +1075,6 @@ public function validate()
      * Add reindexCallback
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -1160,7 +1087,6 @@ public function afterSave()
      * Init indexing process after category save
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindex()
     {
@@ -1182,7 +1108,6 @@ public function reindex()
      * Init indexing process after category delete
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -1194,7 +1119,6 @@ public function afterDeleteCommit()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -1213,7 +1137,6 @@ public function getIdentities()
     /**
      * @codeCoverageIgnoreStart
      * @return string|null
-     * @since 2.0.0
      */
     public function getPath()
     {
@@ -1222,7 +1145,6 @@ public function getPath()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -1231,7 +1153,6 @@ public function getPosition()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getChildrenCount()
     {
@@ -1240,7 +1161,6 @@ public function getChildrenCount()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -1249,7 +1169,6 @@ public function getCreatedAt()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -1259,7 +1178,6 @@ public function getUpdatedAt()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -1268,7 +1186,6 @@ public function getIsActive()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getCategoryId()
     {
@@ -1277,7 +1194,6 @@ public function getCategoryId()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getDisplayMode()
     {
@@ -1286,7 +1202,6 @@ public function getDisplayMode()
 
     /**
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIncludeInMenu()
     {
@@ -1295,7 +1210,6 @@ public function getIncludeInMenu()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getUrlKey()
     {
@@ -1304,7 +1218,6 @@ public function getUrlKey()
 
     /**
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|null
-     * @since 2.0.0
      */
     public function getChildrenData()
     {
@@ -1318,7 +1231,6 @@ public function getChildrenData()
      *
      * @return array
      * @todo refactor with converter for AbstractExtensibleModel
-     * @since 2.0.0
      */
     public function __toArray()
     {
@@ -1345,7 +1257,6 @@ public function __toArray()
      * Convert Category model into flat array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray()
     {
@@ -1370,7 +1281,6 @@ public function toFlatArray()
      *
      * @param int $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($parentId)
     {
@@ -1382,7 +1292,6 @@ public function setParentId($parentId)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -1394,7 +1303,6 @@ public function setName($name)
      *
      * @param bool $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
@@ -1406,7 +1314,6 @@ public function setIsActive($isActive)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -1418,7 +1325,6 @@ public function setPosition($position)
      *
      * @param int $level
      * @return $this
-     * @since 2.0.0
      */
     public function setLevel($level)
     {
@@ -1428,7 +1334,6 @@ public function setLevel($level)
     /**
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -1438,7 +1343,6 @@ public function setUpdatedAt($updatedAt)
     /**
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -1448,7 +1352,6 @@ public function setCreatedAt($createdAt)
     /**
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path)
     {
@@ -1458,7 +1361,6 @@ public function setPath($path)
     /**
      * @param string[]|string $availableSortBy
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableSortBy($availableSortBy)
     {
@@ -1468,7 +1370,6 @@ public function setAvailableSortBy($availableSortBy)
     /**
      * @param bool $includeInMenu
      * @return $this
-     * @since 2.0.0
      */
     public function setIncludeInMenu($includeInMenu)
     {
@@ -1480,7 +1381,6 @@ public function setIncludeInMenu($includeInMenu)
      *
      * @param int $productCount
      * @return $this
-     * @since 2.0.0
      */
     public function setProductCount($productCount)
     {
@@ -1490,7 +1390,6 @@ public function setProductCount($productCount)
     /**
      * @param \Magento\Catalog\Api\Data\CategoryTreeInterface[] $childrenData
      * @return $this
-     * @since 2.0.0
      */
     public function setChildrenData(array $childrenData = null)
     {
@@ -1501,7 +1400,6 @@ public function setChildrenData(array $childrenData = null)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\CategoryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1513,7 +1411,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute.php b/app/code/Magento/Catalog/Model/Category/Attribute.php
index 06d395d84b1a5..e950bf0ad1377 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute.php
@@ -9,7 +9,6 @@
  * Class Attribute
  *
  * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
- * @since 2.0.0
  */
 class Attribute extends \Magento\Catalog\Model\Entity\Attribute implements
     \Magento\Catalog\Api\Data\CategoryAttributeInterface
@@ -27,7 +26,6 @@ class Attribute extends \Magento\Catalog\Model\Entity\Attribute implements
      * Return empty array if applied to all products
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getApplyTo()
     {
@@ -46,7 +44,6 @@ public function getApplyTo()
      *
      * @param string []|string
      * @return $this
-     * @since 2.0.0
      */
     public function setApplyTo($applyTo)
     {
@@ -59,7 +56,6 @@ public function setApplyTo($applyTo)
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsWysiwygEnabled()
     {
@@ -71,7 +67,6 @@ public function getIsWysiwygEnabled()
      *
      * @param bool $isWysiwygEnabled
      * @return $this
-     * @since 2.0.0
      */
     public function setIsWysiwygEnabled($isWysiwygEnabled)
     {
@@ -80,7 +75,6 @@ public function setIsWysiwygEnabled($isWysiwygEnabled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsHtmlAllowedOnFront()
     {
@@ -92,7 +86,6 @@ public function getIsHtmlAllowedOnFront()
      *
      * @param bool $isHtmlAllowedOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront)
     {
@@ -101,7 +94,6 @@ public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUsedForSortBy()
     {
@@ -113,7 +105,6 @@ public function getUsedForSortBy()
      *
      * @param bool $usedForSortBy
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedForSortBy($usedForSortBy)
     {
@@ -122,7 +113,6 @@ public function setUsedForSortBy($usedForSortBy)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterable()
     {
@@ -134,7 +124,6 @@ public function getIsFilterable()
      *
      * @param bool $isFilterable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterable($isFilterable)
     {
@@ -143,7 +132,6 @@ public function setIsFilterable($isFilterable)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterableInSearch()
     {
@@ -152,7 +140,6 @@ public function getIsFilterableInSearch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUsedInGrid()
     {
@@ -161,7 +148,6 @@ public function getIsUsedInGrid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleInGrid()
     {
@@ -170,7 +156,6 @@ public function getIsVisibleInGrid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterableInGrid()
     {
@@ -182,7 +167,6 @@ public function getIsFilterableInGrid()
      *
      * @param bool $isFilterableInSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterableInSearch($isFilterableInSearch)
     {
@@ -191,7 +175,6 @@ public function setIsFilterableInSearch($isFilterableInSearch)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -203,7 +186,6 @@ public function getPosition()
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -212,7 +194,6 @@ public function setPosition($position)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsSearchable()
     {
@@ -224,7 +205,6 @@ public function getIsSearchable()
      *
      * @param string $isSearchable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSearchable($isSearchable)
     {
@@ -233,7 +213,6 @@ public function setIsSearchable($isSearchable)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleInAdvancedSearch()
     {
@@ -245,7 +224,6 @@ public function getIsVisibleInAdvancedSearch()
      *
      * @param string $isVisibleInAdvancedSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch)
     {
@@ -254,7 +232,6 @@ public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsComparable()
     {
@@ -266,7 +243,6 @@ public function getIsComparable()
      *
      * @param string $isComparable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsComparable($isComparable)
     {
@@ -275,7 +251,6 @@ public function setIsComparable($isComparable)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUsedForPromoRules()
     {
@@ -287,7 +262,6 @@ public function getIsUsedForPromoRules()
      *
      * @param string $isUsedForPromoRules
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUsedForPromoRules($isUsedForPromoRules)
     {
@@ -296,7 +270,6 @@ public function setIsUsedForPromoRules($isUsedForPromoRules)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -308,7 +281,6 @@ public function getIsVisibleOnFront()
      *
      * @param string $isVisibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -317,7 +289,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUsedInProductListing()
     {
@@ -329,7 +300,6 @@ public function getUsedInProductListing()
      *
      * @param string $usedInProductListing
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedInProductListing($usedInProductListing)
     {
@@ -338,7 +308,6 @@ public function setUsedInProductListing($usedInProductListing)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisible()
     {
@@ -350,7 +319,6 @@ public function getIsVisible()
      *
      * @param bool $isVisible
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisible($isVisible)
     {
@@ -361,7 +329,6 @@ public function setIsVisible($isVisible)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getScope()
     {
@@ -380,7 +347,6 @@ public function getScope()
      *
      * @param string $scope
      * @return $this
-     * @since 2.0.0
      */
     public function setScope($scope)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
index aec961f4358df..80fe54c09685e 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -9,7 +9,6 @@
  * Catalog category image attribute backend model
  *
  * @api
- * @since 2.0.0
  */
 class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -17,7 +16,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
@@ -25,7 +23,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @var \Magento\Framework\Filesystem
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -33,7 +30,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_fileUploaderFactory;
 
@@ -41,7 +37,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @var \Psr\Log\LoggerInterface
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -61,7 +56,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -146,7 +140,6 @@ private function isTmpFileAvailable($value)
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Catalog\Model\Category\Attribute\Backend\Image
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index 9293169609c00..e5328e924655f 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -19,7 +18,6 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -27,7 +25,6 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Construct
      *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -93,7 +89,6 @@ public function validate($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -116,7 +111,6 @@ public function beforeSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Category/Attribute/OptionManagement.php
index 147ddf2404ce3..3b132011be05b 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/OptionManagement.php
@@ -7,19 +7,16 @@
 
 /**
  * Product options management class
- * @since 2.0.0
  */
 class OptionManagement implements \Magento\Catalog\Api\CategoryAttributeOptionManagementInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeOptionManagementInterface
-     * @since 2.0.0
      */
     protected $eavOptionManagement;
 
     /**
      * @param \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
@@ -30,7 +27,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItems($attributeCode)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 39215d496688f..1890ea0f7d99e 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -9,19 +9,16 @@
  * Catalog category landing page attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
-     * @since 2.0.0
      */
     protected $pageLayoutBuilder;
 
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
index 403829dc7b9b9..6a6c228e63fd6 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
@@ -9,14 +9,12 @@
  * Catalog category landing page attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Mode extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Page.php
index bd09a1219d63b..666a5f50678a9 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Page.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Page.php
@@ -11,7 +11,6 @@
  * Catalog category landing page attribute source
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -19,7 +18,6 @@ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Block collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_blockCollectionFactory;
 
@@ -27,7 +25,6 @@ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Construct
      *
      * @param CollectionFactory $blockCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $blockCollectionFactory)
     {
@@ -36,7 +33,6 @@ public function __construct(CollectionFactory $blockCollectionFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
index 953e4666183a3..97bc00bc7dd64 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
@@ -9,7 +9,6 @@
  * Catalog Category *_sort_by Attributes Source Model
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -17,7 +16,6 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -25,7 +23,6 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Construct
      *
      * @param \Magento\Catalog\Model\Config $catalogConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
      * Retrieve Catalog Config Singleton
      *
      * @return \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected function _getCatalogConfig()
     {
@@ -45,7 +41,6 @@ protected function _getCatalogConfig()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Category/AttributeRepository.php b/app/code/Magento/Catalog/Model/Category/AttributeRepository.php
index 211143207b03b..8e86ac20884b7 100644
--- a/app/code/Magento/Catalog/Model/Category/AttributeRepository.php
+++ b/app/code/Magento/Catalog/Model/Category/AttributeRepository.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\Catalog\Model\Category\AttributeRepository
  *
- * @since 2.0.0
  */
 class AttributeRepository implements CategoryAttributeRepositoryInterface
 {
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Eav\Api\AttributeRepositoryInterface
-     * @since 2.0.0
      */
     protected $eavAttributeRepository;
 
@@ -37,7 +33,6 @@ class AttributeRepository implements CategoryAttributeRepositoryInterface
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Eav\Api\AttributeRepositoryInterface $eavAttributeRepository
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -65,7 +59,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($attributeCode)
     {
@@ -78,7 +71,6 @@ public function get($attributeCode)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
index 3332df2ea74dc..6080f74d5fa06 100644
--- a/app/code/Magento/Catalog/Model/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
@@ -9,31 +9,26 @@
 
 /**
  * Retrieve category data represented in tree structure
- * @since 2.0.0
  */
 class Tree
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Tree
-     * @since 2.0.0
      */
     protected $categoryTree;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     protected $categoryCollection;
 
     /**
      * @var \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory
-     * @since 2.0.0
      */
     protected $treeFactory;
 
@@ -42,7 +37,6 @@ class Tree
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
      * @param \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
@@ -59,7 +53,6 @@ public function __construct(
     /**
      * @param \Magento\Catalog\Model\Category|null $category
      * @return Node|null
-     * @since 2.0.0
      */
     public function getRootNode($category = null)
     {
@@ -80,7 +73,6 @@ public function getRootNode($category = null)
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return Node
-     * @since 2.0.0
      */
     protected function getNode(\Magento\Catalog\Model\Category $category)
     {
@@ -94,7 +86,6 @@ protected function getNode(\Magento\Catalog\Model\Category $category)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function prepareCollection()
     {
@@ -117,7 +108,6 @@ protected function prepareCollection()
      * @param int $depth
      * @param int $currentLevel
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface
-     * @since 2.0.0
      */
     public function getTree($node, $depth = null, $currentLevel = 0)
     {
@@ -141,7 +131,6 @@ public function getTree($node, $depth = null, $currentLevel = 0)
      * @param int $depth
      * @param int $currentLevel
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|[]
-     * @since 2.0.0
      */
     protected function getChildren($node, $depth, $currentLevel)
     {
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
index c5a5471bc5b56..cbb0a1b475462 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
@@ -8,13 +8,11 @@
 
 /**
  * Class CategoryLinkManagement
- * @since 2.0.0
  */
 class CategoryLinkManagement implements \Magento\Catalog\Api\CategoryLinkManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -38,7 +36,6 @@ class CategoryLinkManagement implements \Magento\Catalog\Api\CategoryLinkManagem
 
     /**
      * @var \Magento\Catalog\Api\Data\CategoryProductLinkInterfaceFactory
-     * @since 2.0.0
      */
     protected $productLinkFactory;
 
@@ -53,7 +50,6 @@ class CategoryLinkManagement implements \Magento\Catalog\Api\CategoryLinkManagem
      *
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Api\Data\CategoryProductLinkInterfaceFactory $productLinkFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
@@ -65,7 +61,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAssignedProducts($categoryId)
     {
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
index 079dc5cf26926..816baa750cd6a 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Catalog\Model\CategoryLinkRepository
  *
- * @since 2.0.0
  */
 class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkRepositoryInterface
 {
     /**
      * @var CategoryRepository
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
     {
@@ -70,7 +65,6 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
     {
@@ -79,7 +73,6 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteByIds($categoryId, $sku)
     {
diff --git a/app/code/Magento/Catalog/Model/CategoryManagement.php b/app/code/Magento/Catalog/Model/CategoryManagement.php
index 79380983eaea0..9c815cdfa94bb 100644
--- a/app/code/Magento/Catalog/Model/CategoryManagement.php
+++ b/app/code/Magento/Catalog/Model/CategoryManagement.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Catalog\Model\CategoryManagement
  *
- * @since 2.0.0
  */
 class CategoryManagement implements \Magento\Catalog\Api\CategoryManagementInterface
 {
     /**
      * @var CategoryRepository
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Catalog\Model\Category\Tree
-     * @since 2.0.0
      */
     protected $categoryTree;
 
@@ -44,7 +41,6 @@ class CategoryManagement implements \Magento\Catalog\Api\CategoryManagementInter
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param Category\Tree $categoryTree
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoriesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
@@ -58,7 +54,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTree($rootCategoryId = null, $depth = null)
     {
@@ -114,7 +109,6 @@ private function getTopLevelCategory()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function move($categoryId, $parentId, $afterId = null)
     {
@@ -143,7 +137,6 @@ public function move($categoryId, $parentId, $afterId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/app/code/Magento/Catalog/Model/CategoryProductLink.php b/app/code/Magento/Catalog/Model/CategoryProductLink.php
index b682de4583548..fcd9d74cfcf77 100644
--- a/app/code/Magento/Catalog/Model/CategoryProductLink.php
+++ b/app/code/Magento/Catalog/Model/CategoryProductLink.php
@@ -8,7 +8,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CategoryProductLink extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Catalog\Api\Data\CategoryProductLinkInterface
@@ -23,7 +22,6 @@ class CategoryProductLink extends \Magento\Framework\Api\AbstractExtensibleObjec
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -32,7 +30,6 @@ public function getSku()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -41,7 +38,6 @@ public function getPosition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCategoryId()
     {
@@ -51,7 +47,6 @@ public function getCategoryId()
     /**
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -61,7 +56,6 @@ public function setSku($sku)
     /**
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -73,7 +67,6 @@ public function setPosition($position)
      *
      * @param string $categoryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCategoryId($categoryId)
     {
@@ -84,7 +77,6 @@ public function setCategoryId($categoryId)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -96,7 +88,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CategoryProductLinkExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index 803ceccfd9cdc..9891026165712 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -14,31 +14,26 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInterface
 {
     /**
      * @var Category[]
-     * @since 2.0.0
      */
     protected $instances = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category
-     * @since 2.0.0
      */
     protected $categoryResource;
 
@@ -58,7 +53,6 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      * List of fields that can used config values in case when value does not defined directly
      *
      * @var array
-     * @since 2.0.0
      */
     protected $useConfigFields = ['available_sort_by', 'default_sort_by', 'filter_price_range'];
 
@@ -66,7 +60,6 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
@@ -80,7 +73,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
     {
@@ -136,7 +128,6 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($categoryId, $storeId = null)
     {
@@ -158,7 +149,6 @@ public function get($categoryId, $storeId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category)
     {
@@ -180,7 +170,6 @@ public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteByIdentifier($categoryId)
     {
@@ -194,7 +183,6 @@ public function deleteByIdentifier($categoryId)
      * @param  Category $category
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function validateCategory(Category $category)
     {
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 009a7e3dd9878..227821463b7f0 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -13,7 +13,6 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Config extends \Magento\Eav\Model\Config
 {
@@ -21,31 +20,26 @@ class Config extends \Magento\Eav\Model\Config
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_attributeSetsById;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_attributeSetsByName;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_attributeGroupsById;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_attributeGroupsByName;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_productTypesById;
 
@@ -53,7 +47,6 @@ class Config extends \Magento\Eav\Model\Config
      * Array of attributes codes needed for product load
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productAttributes;
 
@@ -61,7 +54,6 @@ class Config extends \Magento\Eav\Model\Config
      * Product Attributes used in product listing
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_usedInProductListing;
 
@@ -69,13 +61,11 @@ class Config extends \Magento\Eav\Model\Config
      * Product Attributes For Sort By
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_usedForSortBy;
 
     /**
      * @var int|float|string|null
-     * @since 2.0.0
      */
     protected $_storeId = null;
 
@@ -83,7 +73,6 @@ class Config extends \Magento\Eav\Model\Config
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -91,7 +80,6 @@ class Config extends \Magento\Eav\Model\Config
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -99,7 +87,6 @@ class Config extends \Magento\Eav\Model\Config
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -107,7 +94,6 @@ class Config extends \Magento\Eav\Model\Config
      * Set collection factory
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $_setCollectionFactory;
 
@@ -115,7 +101,6 @@ class Config extends \Magento\Eav\Model\Config
      * Group collection factory
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory
-     * @since 2.0.0
      */
     protected $_groupCollectionFactory;
 
@@ -123,7 +108,6 @@ class Config extends \Magento\Eav\Model\Config
      * Product type factory
      *
      * @var \Magento\Catalog\Model\Product\TypeFactory
-     * @since 2.0.0
      */
     protected $_productTypeFactory;
 
@@ -131,7 +115,6 @@ class Config extends \Magento\Eav\Model\Config
      * Config factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
@@ -153,7 +136,6 @@ class Config extends \Magento\Eav\Model\Config
      * @param SerializerInterface $serializer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
@@ -192,7 +174,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -204,7 +185,6 @@ protected function _construct()
      *
      * @param integer $storeId
      * @return \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -216,7 +196,6 @@ public function setStoreId($storeId)
      * Return store id, if is not set return current app store
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -228,7 +207,6 @@ public function getStoreId()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeSets()
     {
@@ -253,7 +231,6 @@ public function loadAttributeSets()
      * @param string|int|float $entityTypeId
      * @param float|int $id
      * @return false|string
-     * @since 2.0.0
      */
     public function getAttributeSetName($entityTypeId, $id)
     {
@@ -274,7 +251,6 @@ public function getAttributeSetName($entityTypeId, $id)
      * @param string|int|float $entityTypeId
      * @param string|null $name
      * @return false|string|int
-     * @since 2.0.0
      */
     public function getAttributeSetId($entityTypeId, $name = null)
     {
@@ -294,7 +270,6 @@ public function getAttributeSetId($entityTypeId, $name = null)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeGroups()
     {
@@ -319,7 +294,6 @@ public function loadAttributeGroups()
      * @param float|int|string $attributeSetId
      * @param float|int|string $id
      * @return bool|string
-     * @since 2.0.0
      */
     public function getAttributeGroupName($attributeSetId, $id)
     {
@@ -341,7 +315,6 @@ public function getAttributeGroupName($attributeSetId, $id)
      * @param float|int|string $attributeSetId
      * @param string $name
      * @return bool|string|int|float
-     * @since 2.0.0
      */
     public function getAttributeGroupId($attributeSetId, $name)
     {
@@ -362,7 +335,6 @@ public function getAttributeGroupId($attributeSetId, $name)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadProductTypes()
     {
@@ -385,7 +357,6 @@ public function loadProductTypes()
     /**
      * @param string $name
      * @return false|string
-     * @since 2.0.0
      */
     public function getProductTypeId($name)
     {
@@ -402,7 +373,6 @@ public function getProductTypeId($name)
     /**
      * @param float|int|string $id
      * @return false|string
-     * @since 2.0.0
      */
     public function getProductTypeName($id)
     {
@@ -419,7 +389,6 @@ public function getProductTypeName($id)
      * @param \Magento\Framework\DataObject $source
      * @param string $value
      * @return null|mixed
-     * @since 2.0.0
      */
     public function getSourceOptionId($source, $value)
     {
@@ -435,7 +404,6 @@ public function getSourceOptionId($source, $value)
      * Load Product attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductAttributes()
     {
@@ -449,7 +417,6 @@ public function getProductAttributes()
      * Retrieve resource model
      *
      * @return \Magento\Catalog\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -460,7 +427,6 @@ protected function _getResource()
      * Retrieve Attributes used in product listing
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesUsedInProductListing()
     {
@@ -484,7 +450,6 @@ public function getAttributesUsedInProductListing()
      * Retrieve Attributes array used for sort by
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesUsedForSortBy()
     {
@@ -506,7 +471,6 @@ public function getAttributesUsedForSortBy()
      * key = code, value = name
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeUsedForSortByArray()
     {
@@ -524,7 +488,6 @@ public function getAttributeUsedForSortByArray()
      *
      * @param mixed $store
      * @return string
-     * @since 2.0.0
      */
     public function getProductListDefaultSortBy($store = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Backend/Category.php b/app/code/Magento/Catalog/Model/Config/Backend/Category.php
index 9d1b2ddf4e3d8..5ca94c9b034dc 100644
--- a/app/code/Magento/Catalog/Model/Config/Backend/Category.php
+++ b/app/code/Magento/Catalog/Model/Config/Backend/Category.php
@@ -9,7 +9,6 @@
  * Config category field backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Category extends \Magento\Framework\App\Config\Value
 {
@@ -17,7 +16,6 @@ class Category extends \Magento\Framework\App\Config\Value
      * Catalog category
      *
      * @var \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
@@ -32,7 +30,6 @@ class Category extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -50,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
index 8a1ca4a727033..e2b0a91574021 100644
--- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
@@ -9,7 +9,6 @@
  * Clone model for media images related config fields
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\App\Config\Value
 {
@@ -17,7 +16,6 @@ class Image extends \Magento\Framework\App\Config\Value
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -25,7 +23,6 @@ class Image extends \Magento\Framework\App\Config\Value
      * Attribute collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -39,7 +36,6 @@ class Image extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      * Get fields prefixes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPrefixes()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Category.php b/app/code/Magento/Catalog/Model/Config/Source/Category.php
index 0d9e62596ef30..24d7cc0b67378 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Category.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Category.php
@@ -9,7 +9,6 @@
  * Config category source
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Category implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,7 +16,6 @@ class Category implements \Magento\Framework\Option\ArrayInterface
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @since 2.0.0
      */
     protected $_categoryCollectionFactory;
 
@@ -25,7 +23,6 @@ class Category implements \Magento\Framework\Option\ArrayInterface
      * Construct
      *
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @param bool $addEmpty
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($addEmpty = true)
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
index 823ad8e3532b6..c3311b7399db3 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
@@ -9,7 +9,6 @@
  * Catalog products per page on Grid mode source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class GridPerPage implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,7 +16,6 @@ class GridPerPage implements \Magento\Framework\Option\ArrayInterface
      * Options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
@@ -25,7 +23,6 @@ class GridPerPage implements \Magento\Framework\Option\ArrayInterface
      * Constructor
      *
      * @param string $perPageValues
-     * @since 2.0.0
      */
     public function __construct($perPageValues)
     {
@@ -34,7 +31,6 @@ public function __construct($perPageValues)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListMode.php b/app/code/Magento/Catalog/Model/Config/Source/ListMode.php
index 042951aedf52c..4da5d2b650965 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ListMode.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ListMode.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\ListMode
  *
- * @since 2.0.0
  */
 class ListMode implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class ListMode implements \Magento\Framework\Option\ArrayInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
index 6a57c783ac0e4..ae6cc555a6955 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
@@ -9,7 +9,6 @@
  * Catalog products per page on List mode source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class ListPerPage implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,7 +16,6 @@ class ListPerPage implements \Magento\Framework\Option\ArrayInterface
      * Pager Options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_pagerOptions;
 
@@ -25,7 +23,6 @@ class ListPerPage implements \Magento\Framework\Option\ArrayInterface
      * Constructor
      *
      * @param string $options
-     * @since 2.0.0
      */
     public function __construct($options)
     {
@@ -34,7 +31,6 @@ public function __construct($options)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
index 2e59184259779..80b859b01ed23 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\ListSort
  *
- * @since 2.0.0
  */
 class ListSort implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class ListSort implements \Magento\Framework\Option\ArrayInterface
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -30,7 +28,6 @@ class ListSort implements \Magento\Framework\Option\ArrayInterface
      * Construct
      *
      * @param \Magento\Catalog\Model\Config $catalogConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
      * Retrieve option values array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -57,7 +53,6 @@ public function toOptionArray()
      * Retrieve Catalog Config Singleton
      *
      * @return \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected function _getCatalogConfig()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php b/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php
index 97df8e196f16b..cb55773e88211 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\Price\Scope
  *
- * @since 2.0.0
  */
 class Scope implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class Scope implements \Magento\Framework\Option\ArrayInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php b/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php
index ac5bbffe33633..55822ee678398 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\Price\Step
  *
- * @since 2.0.0
  */
 class Step implements ArrayInterface
 {
@@ -19,7 +18,6 @@ class Step implements ArrayInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
index 2c39036592117..2385bcfd035d4 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
@@ -11,7 +11,6 @@
  * Price types mode source
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price implements ProductPriceOptionsInterface
 {
@@ -19,7 +18,6 @@ class Price implements ProductPriceOptionsInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php
index 01a9ec340b104..8f6e34ca81e3a 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php
@@ -7,7 +7,6 @@
 
 /**
  * Product option types mode source
- * @since 2.0.0
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,7 +14,6 @@ class Type implements \Magento\Framework\Option\ArrayInterface
      * Product Option Config
      *
      * @var \Magento\Catalog\Model\ProductOptions\ConfigInterface
-     * @since 2.0.0
      */
     protected $_productOptionConfig;
 
@@ -23,7 +21,6 @@ class Type implements \Magento\Framework\Option\ArrayInterface
      * Constructor
      *
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Catalog\Model\ProductOptions\ConfigInterfac
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php
index d4e1c56f83a9a..4424baf350fa6 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php
@@ -8,7 +8,6 @@
 /**
  * Catalog products per page on Grid mode source
  *
- * @since 2.0.0
  */
 class Thumbnail implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,7 +19,6 @@ class Thumbnail implements \Magento\Framework\Option\ArrayInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php b/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php
index 2aa4d9a87d3b4..69bf1ae5e40e4 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\TimeFormat
  *
- * @since 2.0.0
  */
 class TimeFormat implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class TimeFormat implements \Magento\Framework\Option\ArrayInterface
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
index fa96991df8e06..feb1f5a5dacf0 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Config\Source\Watermark\Position
  *
- * @since 2.0.0
  */
 class Position implements \Magento\Framework\Option\ArrayInterface
 {
@@ -23,7 +22,6 @@ class Position implements \Magento\Framework\Option\ArrayInterface
      *
      * @codeCoverageIgnore
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php b/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
index d2f1c7f74c3e4..ba1149b02dbb3 100644
--- a/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
+++ b/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Catalog\Model\CustomOptions\CustomOption
  *
- * @since 2.0.0
  */
 class CustomOption extends AbstractExtensibleModel implements CustomOptionInterface
 {
@@ -31,7 +30,6 @@ class CustomOption extends AbstractExtensibleModel implements CustomOptionInterf
      * @param AbstractDb|null $resourceCollection
      * @param FileProcessor $fileProcessor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -57,7 +55,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -66,7 +63,6 @@ public function getOptionId()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setOptionId($value)
     {
@@ -75,7 +71,6 @@ public function setOptionId($value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getOptionValue()
     {
@@ -94,7 +89,6 @@ public function getOptionValue()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setOptionValue($value)
     {
@@ -103,7 +97,6 @@ public function setOptionValue($value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -112,7 +105,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CustomOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php b/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
index ca52a3b45aa06..8364db4645aeb 100644
--- a/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
+++ b/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
@@ -14,31 +14,26 @@
 /**
  * Class \Magento\Catalog\Model\CustomOptions\CustomOptionProcessor
  *
- * @since 2.0.0
  */
 class CustomOptionProcessor implements CartItemProcessorInterface
 {
     /**
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\ProductOptionFactory
-     * @since 2.0.0
      */
     protected $productOptionFactory;
 
     /**
      * @var \Magento\Quote\Api\Data\ProductOptionExtensionFactory
-     * @since 2.0.0
      */
     protected $extensionFactory;
 
     /**
      * @var \Magento\Catalog\Model\CustomOptions\CustomOptionFactory
-     * @since 2.0.0
      */
     protected $customOptionFactory;
 
@@ -62,7 +57,6 @@ class CustomOptionProcessor implements CartItemProcessorInterface
      * @param ProductOptionExtensionFactory $extensionFactory
      * @param CustomOptionFactory $customOptionFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DataObject\Factory $objectFactory,
@@ -81,7 +75,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -102,7 +95,6 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function processOptions(CartItemInterface $cartItem)
     {
@@ -130,7 +122,6 @@ public function processOptions(CartItemInterface $cartItem)
      *
      * @param CartItemInterface $cartItem
      * @return array
-     * @since 2.0.0
      */
     protected function getOptions(CartItemInterface $cartItem)
     {
@@ -147,7 +138,6 @@ protected function getOptions(CartItemInterface $cartItem)
      *
      * @param array $options
      * @return null
-     * @since 2.0.0
      */
     protected function updateOptionsValues(array &$options)
     {
diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
index ea948cc683dcb..cd35560e90dce 100644
--- a/app/code/Magento/Catalog/Model/Design.php
+++ b/app/code/Magento/Catalog/Model/Design.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Design extends \Magento\Framework\Model\AbstractModel
 {
@@ -23,13 +22,11 @@ class Design extends \Magento\Framework\Model\AbstractModel
      * Design package instance
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design = null;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -41,7 +38,6 @@ class Design extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      *
      * @param string $design
      * @return $this
-     * @since 2.0.0
      */
     public function applyCustomDesign($design)
     {
@@ -75,7 +70,6 @@ public function applyCustomDesign($design)
      *
      * @param \Magento\Catalog\Model\Category|\Magento\Catalog\Model\Product $object
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getDesignSettings($object)
     {
@@ -106,7 +100,6 @@ public function getDesignSettings($object)
      *
      * @param \Magento\Catalog\Model\Category|\Magento\Catalog\Model\Product $object
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _extractSettings($object)
     {
@@ -144,7 +137,6 @@ protected function _extractSettings($object)
      * @param \Magento\Framework\DataObject $categorySettings
      * @param \Magento\Framework\DataObject $productSettings
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _mergeSettings($categorySettings, $productSettings)
     {
diff --git a/app/code/Magento/Catalog/Model/Entity/Attribute.php b/app/code/Magento/Catalog/Model/Entity/Attribute.php
index 1ce41909d80f5..2506382045169 100644
--- a/app/code/Magento/Catalog/Model/Entity/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Entity/Attribute.php
@@ -46,7 +46,6 @@
  * @method \Magento\Catalog\Model\Entity\Attribute setIsUsedForPromoRules(int $value)
  * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\Entity\Attribute
 {
@@ -54,7 +53,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * Event Prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_entity_attribute';
 
@@ -62,7 +60,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * Event Object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'attribute';
 
@@ -70,7 +67,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
 
     /**
      * @var LockValidatorInterface
-     * @since 2.0.0
      */
     protected $attrLockValidator;
 
@@ -96,7 +92,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -149,7 +144,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -167,7 +161,6 @@ public function beforeSave()
      * Processing object after save data
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
index 6e1810b3a6e56..22cb3c3264df5 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
@@ -9,7 +9,6 @@
  * Entity/Attribute/Model - select product design options container from config
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Container extends \Magento\Eav\Model\Entity\Attribute\Source\Config
 {
@@ -18,7 +17,6 @@ class Container extends \Magento\Eav\Model\Entity\Attribute\Source\Config
      *
      * @param string|integer $value
      * @return string|false
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapper.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapper.php
index f30c22302bf68..6de1721b26b59 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapper.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapper.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapper
  *
- * @since 2.0.0
  */
 class AttributeMapper implements AttributeMapperInterface
 {
@@ -20,13 +19,11 @@ class AttributeMapper implements AttributeMapperInterface
      * Unassignable attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $unassignableAttributes;
 
     /**
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
-     * @since 2.0.0
      */
     public function __construct(Attribute\Config $attributeConfig)
     {
@@ -38,7 +35,6 @@ public function __construct(Attribute\Config $attributeConfig)
      *
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function map(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
index 960af691f26fd..35af7c4b4a4b8 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface
  *
- * @since 2.0.0
  */
 interface AttributeMapperInterface
 {
@@ -21,7 +20,6 @@ interface AttributeMapperInterface
      *
      * @param Attribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function map(Attribute $attribute);
 }
diff --git a/app/code/Magento/Catalog/Model/Factory.php b/app/code/Magento/Catalog/Model/Factory.php
index 136064102498b..8cc2e1f2798b4 100644
--- a/app/code/Magento/Catalog/Model/Factory.php
+++ b/app/code/Magento/Catalog/Model/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
index 2c4f93281481f..8df0155753ac4 100644
--- a/app/code/Magento/Catalog/Model/ImageExtractor.php
+++ b/app/code/Magento/Catalog/Model/ImageExtractor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\ImageExtractor
  *
- * @since 2.0.0
  */
 class ImageExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface
 {
@@ -21,7 +20,6 @@ class ImageExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtrac
      * @param \DOMElement $mediaNode
      * @param string $mediaParentTag
      * @return array
-     * @since 2.0.0
      */
     public function process(\DOMElement $mediaNode, $mediaParentTag)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
index bcbc6a8a24936..9f37b508adeed 100644
--- a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractFlatState
 {
@@ -25,19 +24,16 @@ abstract class AbstractFlatState
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAvailable;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -45,7 +41,6 @@ abstract class AbstractFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param bool $isAvailable
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -61,7 +56,6 @@ public function __construct(
      * Check if Flat Index is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFlatEnabled()
     {
@@ -72,7 +66,6 @@ public function isFlatEnabled()
      * Check if Flat Index is available for use
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
index 8200a6a4580be..7a1e4be468423 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
@@ -11,31 +11,27 @@
  * Category flat indexer
  *
  * @api
- * @since 2.0.0
  */
 class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Category\Flat\Action\FullFactory
-     * @since 2.0.0
      */
     protected $fullActionFactory;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Category\Flat\Action\RowsFactory
-     * @since 2.0.0
      */
     protected $rowsActionFactory;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheContext;
 
@@ -43,7 +39,6 @@ class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Frame
      * @param Flat\Action\FullFactory $fullActionFactory
      * @param Flat\Action\RowsFactory $rowsActionFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(
         Flat\Action\FullFactory $fullActionFactory,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -82,7 +76,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -95,7 +88,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -107,7 +99,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -118,8 +109,8 @@ public function executeRow($id)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index c81cea0cf303d..582e1f0fbb871 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
  *
- * @since 2.0.0
  */
 class AbstractAction
 {
@@ -27,19 +26,16 @@ class AbstractAction
      * Attribute codes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $attributeCodes;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -47,7 +43,6 @@ class AbstractAction
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $resourceHelper;
 
@@ -55,13 +50,11 @@ class AbstractAction
      * Flat columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $columns = [];
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -83,7 +76,6 @@ class AbstractAction
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -102,7 +94,6 @@ public function __construct(
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function addTemporaryTableSuffix($tableName)
     {
@@ -113,7 +104,6 @@ protected function addTemporaryTableSuffix($tableName)
      * Retrieve list of columns for flat structure
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumns()
     {
@@ -125,7 +115,6 @@ public function getColumns()
      *
      * @param integer $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
     {
@@ -144,7 +133,6 @@ public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT
      *
      * @param string $tableName
      * @return \Magento\Framework\DB\Ddl\Table
-     * @since 2.0.0
      */
     protected function getFlatTableStructure($tableName)
     {
@@ -204,7 +192,6 @@ protected function getFlatTableStructure($tableName)
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function getStaticColumns()
     {
@@ -279,7 +266,6 @@ protected function getStaticColumns()
      * Return array of eav columns, skip attribute with static type
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getEavColumns()
     {
@@ -345,7 +331,6 @@ protected function getEavColumns()
      * Return array of attribute codes for entity type 'catalog_category'
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributes()
     {
@@ -382,7 +367,6 @@ protected function getAttributes()
      * @param array $entityIds
      * @param integer $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributeValues($entityIds, $storeId)
     {
@@ -417,7 +401,6 @@ protected function getAttributeValues($entityIds, $storeId)
      * @param array $entityIds
      * @param integer $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributeTypeValues($type, $entityIds, $storeId)
     {
@@ -464,7 +447,6 @@ protected function getAttributeTypeValues($type, $entityIds, $storeId)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function prepareValuesToInsert($data)
     {
@@ -484,7 +466,6 @@ protected function prepareValuesToInsert($data)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function getTableName($name)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
index abf3bd1662198..8409491458bdc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\Action\Full
  *
- * @since 2.0.0
  */
 class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 {
@@ -21,7 +20,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
      * Whether table changes are allowed
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $allowTableChanges = true;
 
@@ -30,7 +28,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function addOldTableSuffix($tableName)
     {
@@ -42,7 +39,6 @@ protected function addOldTableSuffix($tableName)
      *
      * @param \Magento\Store\Model\Store[] $stores
      * @return Full
-     * @since 2.0.0
      */
     protected function populateFlatTables(array $stores)
     {
@@ -100,7 +96,6 @@ protected function populateFlatTables(array $stores)
      *
      * @param int $store
      * @return Full
-     * @since 2.0.0
      */
     protected function createTable($store)
     {
@@ -118,7 +113,6 @@ protected function createTable($store)
      *
      * @param \Magento\Store\Model\Store[] $stores if empty, create tables for all stores of the application
      * @return Full
-     * @since 2.0.0
      */
     protected function createTables(array $stores = [])
     {
@@ -141,7 +135,6 @@ protected function createTables(array $stores = [])
      *
      * @param \Magento\Store\Model\Store[] $stores
      * @return Full
-     * @since 2.0.0
      */
     protected function switchTables(array $stores = [])
     {
@@ -178,7 +171,6 @@ protected function switchTables(array $stores = [])
      * Transactional rebuild flat data from eav
      *
      * @return Full
-     * @since 2.0.0
      */
     public function reindexAll()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index 860314ab07aa1..0b19a74da12bf 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\Action\Rows
  *
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 {
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -26,7 +24,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param CategoryRepositoryInterface $categoryRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -44,7 +41,6 @@ public function __construct(
      * @param \Magento\Store\Model\Store $store
      * @param bool $useTempTable
      * @return string
-     * @since 2.0.0
      */
     protected function getTableNameByStore(\Magento\Store\Model\Store $store, $useTempTable)
     {
@@ -58,7 +54,6 @@ protected function getTableNameByStore(\Magento\Store\Model\Store $store, $useTe
      * @param int[] $entityIds
      * @param bool $useTempTable
      * @return Rows
-     * @since 2.0.0
      */
     public function reindex(array $entityIds = [], $useTempTable = false)
     {
@@ -119,7 +114,6 @@ public function reindex(array $entityIds = [], $useTempTable = false)
      * @param \Magento\Store\Model\Store $store
      * @param bool $useTempTable
      * @return void
-     * @since 2.0.0
      */
     protected function deleteNonStoreCategories(\Magento\Store\Model\Store $store, $useTempTable)
     {
@@ -154,7 +148,6 @@ protected function deleteNonStoreCategories(\Magento\Store\Model\Store $store, $
      * @param int[] $ids
      * @param \Magento\Store\Model\Store $store
      * @return int[]
-     * @since 2.0.0
      */
     protected function filterIdsByStore(array $ids, $store)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
index 190e8ba2d0aae..1507cdc05ba1c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\Plugin\IndexerConfigData
  *
- * @since 2.0.0
  */
 class IndexerConfigData
 {
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @param State $state
-     * @since 2.0.0
      */
     public function __construct(State $state)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
index b2452fe26ad18..d359d88bf41b9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\Plugin\StoreGroup
  *
- * @since 2.0.0
  */
 class StoreGroup
 {
@@ -25,20 +24,17 @@ class StoreGroup
 
     /**
      * @var IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @param IndexerRegistry $indexerRegistry
      * @param State $state
-     * @since 2.0.0
      */
     public function __construct(IndexerRegistry $indexerRegistry, State $state)
     {
@@ -51,7 +47,6 @@ public function __construct(IndexerRegistry $indexerRegistry, State $state)
      *
      * @param AbstractModel $group
      * @return bool
-     * @since 2.0.0
      */
     protected function validate(AbstractModel $group)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreView.php
index 257a33523cdd2..34e9e5849041d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreView.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Flat\Plugin\StoreView
  *
- * @since 2.0.0
  */
 class StoreView extends StoreGroup
 {
@@ -17,7 +16,6 @@ class StoreView extends StoreGroup
      *
      * @param \Magento\Framework\Model\AbstractModel $store
      * @return bool
-     * @since 2.0.0
      */
     protected function validate(\Magento\Framework\Model\AbstractModel $store)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php
index c1c6ffac91e8c..af4d3ea24c12e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/System/Config/Mode.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/System/Config/Mode.php
index 6229a837017fc..b4c6febef0a98 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/System/Config/Mode.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/System/Config/Mode.php
@@ -7,19 +7,16 @@
 
 /**
  * Flat category on/off backend
- * @since 2.0.0
  */
 class Mode extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Indexer\Model\Indexer\State
-     * @since 2.0.0
      */
     protected $indexerState;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -33,7 +30,6 @@ class Mode extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Set after commit callback
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -67,7 +62,6 @@ public function afterSave()
      * Process flat enabled mode change
      *
      * @return void
-     * @since 2.0.0
      */
     public function processValue()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
index f16873bea156f..fd115c427d31c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
@@ -11,7 +11,6 @@
  * Category product indexer
  *
  * @api
- * @since 2.0.0
  */
 class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
@@ -22,25 +21,22 @@ class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Fr
 
     /**
      * @var Product\Action\FullFactory
-     * @since 2.0.0
      */
     protected $fullActionFactory;
 
     /**
      * @var Product\Action\RowsFactory
-     * @since 2.0.0
      */
     protected $rowsActionFactory;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $cacheContext;
 
@@ -48,7 +44,6 @@ class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Fr
      * @param Product\Action\FullFactory $fullActionFactory
      * @param Product\Action\RowsFactory $rowsActionFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(
         Product\Action\FullFactory $fullActionFactory,
@@ -65,7 +60,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -78,7 +72,7 @@ public function execute($ids)
      *
      * @param int[] $ids
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function registerEntities($ids)
     {
@@ -89,7 +83,6 @@ protected function registerEntities($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -101,7 +94,7 @@ public function executeFull()
      * Add tags to cache context
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function registerTags()
     {
@@ -113,7 +106,6 @@ protected function registerTags()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -125,7 +117,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -137,7 +128,6 @@ public function executeRow($id)
      *
      * @param int[] $ids
      * @return $this
-     * @since 2.0.0
      */
     protected function executeAction($ids)
     {
@@ -158,8 +148,8 @@ protected function executeAction($ids)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 326b5cdde94ca..1036889dfa969 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -18,7 +18,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractAction
 {
@@ -46,7 +45,6 @@ abstract class AbstractAction
      * Cached non anchor categories select by store id
      *
      * @var \Magento\Framework\DB\Select[]
-     * @since 2.0.0
      */
     protected $nonAnchorSelects = [];
 
@@ -54,7 +52,6 @@ abstract class AbstractAction
      * Cached anchor categories select by store id
      *
      * @var \Magento\Framework\DB\Select[]
-     * @since 2.0.0
      */
     protected $anchorSelects = [];
 
@@ -62,7 +59,6 @@ abstract class AbstractAction
      * Cached all product select by store id
      *
      * @var \Magento\Framework\DB\Select[]
-     * @since 2.0.0
      */
     protected $productsSelects = [];
 
@@ -70,25 +66,21 @@ abstract class AbstractAction
      * Category path by id
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $categoryPath = [];
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -96,13 +88,11 @@ abstract class AbstractAction
      * Whether to use main or temporary index table
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $useTempTable = true;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -129,7 +119,6 @@ abstract class AbstractAction
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
      * @param QueryGenerator $queryGenerator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -149,7 +138,6 @@ public function __construct(
      * Run full reindex
      *
      * @return $this
-     * @since 2.0.0
      */
     abstract public function execute();
 
@@ -157,7 +145,6 @@ abstract public function execute();
      * Run reindexation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reindex()
     {
@@ -175,7 +162,6 @@ protected function reindex()
      *
      * @param string|string[] $table
      * @return string
-     * @since 2.0.0
      */
     protected function getTable($table)
     {
@@ -189,7 +175,6 @@ protected function getTable($table)
      * The name is switched between 'catalog_category_product_index' and 'catalog_category_product_index_replica'
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getMainTable()
     {
@@ -200,7 +185,6 @@ protected function getMainTable()
      * Return temporary index table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getMainTmpTable()
     {
@@ -214,7 +198,6 @@ protected function getMainTmpTable()
      *
      * @param int $categoryId
      * @return string
-     * @since 2.0.0
      */
     protected function getPathFromCategoryId($categoryId)
     {
@@ -237,7 +220,6 @@ protected function getPathFromCategoryId($categoryId)
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -332,7 +314,6 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
      * Check whether select ranging is needed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isRangingNeeded()
     {
@@ -346,7 +327,6 @@ protected function isRangingNeeded()
      * @param string $field
      * @param int $range
      * @return \Magento\Framework\DB\Select[]
-     * @since 2.0.0
      */
     protected function prepareSelectsByRange(
         \Magento\Framework\DB\Select $select,
@@ -375,7 +355,6 @@ protected function prepareSelectsByRange(
      *
      * @param \Magento\Store\Model\Store $store
      * @return void
-     * @since 2.0.0
      */
     protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     {
@@ -397,7 +376,6 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     protected function hasAnchorSelect(\Magento\Store\Model\Store $store)
     {
@@ -410,7 +388,6 @@ protected function hasAnchorSelect(\Magento\Store\Model\Store $store)
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function createAnchorSelect(\Magento\Store\Model\Store $store)
     {
@@ -611,7 +588,6 @@ protected function fillTempCategoryTreeIndex($temporaryName)
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -626,7 +602,6 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Store\Model\Store $store
      * @return void
-     * @since 2.0.0
      */
     protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     {
@@ -649,7 +624,6 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getAllProducts(\Magento\Store\Model\Store $store)
     {
@@ -743,7 +717,6 @@ protected function getAllProducts(\Magento\Store\Model\Store $store)
      * Check whether indexation of root category is needed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isIndexRootCategoryNeeded()
     {
@@ -755,7 +728,6 @@ protected function isIndexRootCategoryNeeded()
      *
      * @param \Magento\Store\Model\Store $store
      * @return void
-     * @since 2.0.0
      */
     protected function reindexRootCategory(\Magento\Store\Model\Store $store)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index c2366bd1ba1e3..ea89f88772f2a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -14,7 +14,6 @@
  *
  * @package Magento\Catalog\Model\Indexer\Category\Product\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
@@ -98,7 +97,6 @@ public function __construct(
      * Refresh entities index
      *
      * @return $this
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -111,7 +109,6 @@ public function execute()
      * Return select for remove unnecessary data
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getSelectUnnecessaryData()
     {
@@ -136,7 +133,6 @@ protected function getSelectUnnecessaryData()
      * Remove unnecessary data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function removeUnnecessaryData()
     {
@@ -149,7 +145,6 @@ protected function removeUnnecessaryData()
      * Publish data from tmp to index
      *
      * @return void
-     * @since 2.0.0
      */
     protected function publishData()
     {
@@ -171,7 +166,6 @@ protected function publishData()
      * Clear all index data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function clearTmpData()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
index 1ff0d9c981ad6..ad931fb848fc7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Product\Action\Rows
  *
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
@@ -16,7 +15,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * Limitation by categories
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $limitationByCategories;
 
@@ -26,7 +24,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param int[] $entityIds
      * @param bool $useTempTable
      * @return $this
-     * @since 2.0.0
      */
     public function execute(array $entityIds = [], $useTempTable = false)
     {
@@ -44,7 +41,6 @@ public function execute(array $entityIds = [], $useTempTable = false)
      * Return array of all category root IDs + tree root ID
      *
      * @return int[]
-     * @since 2.0.0
      */
     protected function getRootCategoryIds()
     {
@@ -61,7 +57,6 @@ protected function getRootCategoryIds()
      * Remove index entries before reindexation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function removeEntries()
     {
@@ -74,7 +69,6 @@ protected function removeEntries()
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -87,7 +81,6 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -99,7 +92,6 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
      * Check whether select ranging is needed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isRangingNeeded()
     {
@@ -110,7 +102,6 @@ protected function isRangingNeeded()
      * Check whether indexation of root category is needed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isIndexRootCategoryNeeded()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/RowsFactory.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/RowsFactory.php
index 24344d1de19a7..db10f9ff23072 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/RowsFactory.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/RowsFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Catalog\Model\Indexer\Category\Product\Action\Rows
- * @since 2.0.0
  */
 class RowsFactory
 {
@@ -15,7 +14,6 @@ class RowsFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class RowsFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class RowsFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      * @param array $data
      * @throws \InvalidArgumentException
      * @return \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
index 4717d781c6e69..75dc8c79682f9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState
  *
- * @since 2.0.0
  */
 class MviewState
 {
     /**
      * @var \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @var \Magento\Framework\Mview\View\ChangelogInterface
-     * @since 2.0.0
      */
     protected $changelog;
 
@@ -33,7 +30,6 @@ class MviewState
      * Related indexers IDs
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $viewIds = [
         \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID,
@@ -43,7 +39,6 @@ class MviewState
     /**
      * @param \Magento\Framework\Mview\View\StateInterface $state
      * @param \Magento\Framework\Mview\View\ChangelogInterface $changelog
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Mview\View\StateInterface $state,
@@ -58,7 +53,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Mview\View\StateInterface $state
      * @return \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     public function afterSetStatus(\Magento\Framework\Mview\View\StateInterface $state)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 49529b8a00d96..c6196226f5aab 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Product\Plugin\StoreGroup
  *
- * @since 2.0.0
  */
 class StoreGroup
 {
@@ -25,13 +24,11 @@ class StoreGroup
 
     /**
      * @var IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @param IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(IndexerRegistry $indexerRegistry)
     {
@@ -77,7 +74,6 @@ public function afterSave(AbstractDb $subject, AbstractDb $objectResource)
      *
      * @param AbstractModel $group
      * @return bool
-     * @since 2.0.0
      */
     protected function validate(AbstractModel $group)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
index 4b5de2ed67232..896987a3f26d3 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Category\Product\Plugin\StoreView
  *
- * @since 2.0.0
  */
 class StoreView extends StoreGroup
 {
@@ -17,7 +16,6 @@ class StoreView extends StoreGroup
      *
      * @param \Magento\Framework\Model\AbstractModel $store
      * @return bool
-     * @since 2.0.0
      */
     protected function validate(\Magento\Framework\Model\AbstractModel $store)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php
index 5d8fb9bd60f87..9bdb503c46bf0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php
@@ -9,7 +9,6 @@
  * Category product link indexer
  *
  * @api
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category.php
index 3573ceed2adbd..c7ccbc996ed71 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Category extends \Magento\Catalog\Model\Indexer\Category\Product
 {
@@ -20,7 +19,6 @@ class Category extends \Magento\Catalog\Model\Indexer\Category\Product
      * @param \Magento\Catalog\Model\Indexer\Category\Product\Action\FullFactory $fullActionFactory
      * @param Category\Action\RowsFactory $rowsActionFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Category\Product\Action\FullFactory $fullActionFactory,
@@ -34,7 +32,7 @@ public function __construct(
      * Add tags to cache context
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function registerTags()
     {
@@ -51,7 +49,7 @@ protected function registerTags()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function registerEntities($ids)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index 9eb2e104b0d36..848dab5204e95 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Category\Action\Rows
  *
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
@@ -20,7 +19,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * Limitation by products
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $limitationByProducts;
 
@@ -36,7 +34,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param int[] $entityIds
      * @param bool $useTempTable
      * @return $this
-     * @since 2.0.0
      */
     public function execute(array $entityIds = [], $useTempTable = false)
     {
@@ -90,7 +87,6 @@ private function registerCategories($entityIds)
      * Remove index entries before reindexation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function removeEntries()
     {
@@ -105,7 +101,6 @@ protected function removeEntries()
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -118,7 +113,6 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
@@ -131,7 +125,6 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getAllProducts(\Magento\Store\Model\Store $store)
     {
@@ -143,7 +136,6 @@ protected function getAllProducts(\Magento\Store\Model\Store $store)
      * Check whether select ranging is needed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isRangingNeeded()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/RowsFactory.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/RowsFactory.php
index 7ba6137256e96..433aba652d361 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/RowsFactory.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/RowsFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Catalog\Model\Indexer\Product\Category\Action\Rows
- * @since 2.0.0
  */
 class RowsFactory extends \Magento\Catalog\Model\Indexer\Category\Product\Action\RowsFactory
 {
@@ -16,7 +15,6 @@ class RowsFactory extends \Magento\Catalog\Model\Indexer\Category\Product\Action
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php
index 1f0327e25e020..49421c8041e7f 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php
@@ -9,7 +9,6 @@
  * Product category link indexer
  *
  * @api
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav.php
index cdd2b9495c5ca..10455c8af940d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav.php
@@ -10,31 +10,27 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Eav
  *
- * @since 2.0.0
  */
 class Eav implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Row
-     * @since 2.0.0
      */
     protected $_productEavIndexerRow;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Rows
-     * @since 2.0.0
      */
     protected $_productEavIndexerRows;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full
-     * @since 2.0.0
      */
     protected $_productEavIndexerFull;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheContext;
 
@@ -42,7 +38,6 @@ class Eav implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framew
      * @param Eav\Action\Row $productEavIndexerRow
      * @param Eav\Action\Rows $productEavIndexerRows
      * @param Eav\Action\Full $productEavIndexerFull
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Eav\Action\Row $productEavIndexerRow,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -71,7 +65,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -89,7 +82,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -101,7 +93,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -112,8 +103,8 @@ public function executeRow($id)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
index 77bb2c2d7a097..a44adef593f98 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
@@ -7,7 +7,6 @@
 
 /**
  * Abstract action reindex class
- * @since 2.0.0
  */
 abstract class AbstractAction
 {
@@ -15,19 +14,16 @@ abstract class AbstractAction
      * EAV Indexers by type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_types;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory
-     * @since 2.0.0
      */
     protected $_eavSourceFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory
-     * @since 2.0.0
      */
     protected $_eavDecimalFactory;
 
@@ -35,7 +31,6 @@ abstract class AbstractAction
      * AbstractAction constructor.
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
@@ -50,7 +45,6 @@ public function __construct(
      *
      * @param array|int $ids
      * @return void
-     * @since 2.0.0
      */
     abstract public function execute($ids);
 
@@ -58,7 +52,6 @@ abstract public function execute($ids);
      * Retrieve array of EAV type indexers
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav[]
-     * @since 2.0.0
      */
     public function getIndexers()
     {
@@ -78,7 +71,6 @@ public function getIndexers()
      * @param string $type
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getIndexer($type)
     {
@@ -95,7 +87,6 @@ public function getIndexer($type)
      * @param null|array|int $ids
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     public function reindex($ids = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
index 6f8e32eb80a93..9fae4d9865301 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Full reindex action
- * @since 2.0.0
  */
 class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
 {
@@ -76,7 +75,6 @@ public function __construct(
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($ids = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php
index 51ec980a6a257..74d7edde92c01 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Row reindex action
- * @since 2.0.0
  */
 class Row extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
 {
@@ -18,7 +17,6 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($id = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php
index 542725f190187..3595756abb5b0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Rows reindex action for mass actions
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
 {
@@ -18,7 +17,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
index e65cf84f57918..d337fe8ce679d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Eav\Plugin\AttributeSet
  *
- * @since 2.0.0
  */
 class AttributeSet
 {
@@ -31,13 +30,11 @@ class AttributeSet
 
     /**
      * @var Processor
-     * @since 2.0.0
      */
     private $_indexerEavProcessor;
 
     /**
      * @var AttributeSet\IndexableAttributeFilter
-     * @since 2.0.0
      */
     private $_attributeFilter;
 
@@ -47,7 +44,6 @@ class AttributeSet
      * @param Processor $indexerEavProcessor
      * @param AttributeSet\IndexableAttributeFilter $filter
      * @param SetFactory $attributeSetFactory
-     * @since 2.0.0
      */
     public function __construct(
         Processor $indexerEavProcessor,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
index aacafbd2b455a..026bdcb3c23a8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Eav\Plugin\AttributeSet\IndexableAttributeFilter
  *
- * @since 2.0.0
  */
 class IndexableAttributeFilter
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Catalog\Model\ResourceModel\Eav\AttributeFa
      *
      * @param \Magento\Eav\Model\Entity\Attribute\Set $set
      * @return array
-     * @since 2.0.0
      */
     public function filter(\Magento\Eav\Model\Entity\Attribute\Set $set)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
index 4403e8ea99213..4b80b3ff9b29d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Eav\Plugin\StoreView
  *
- * @since 2.0.0
  */
 class StoreView
 {
@@ -16,13 +15,11 @@ class StoreView
      * Product attribute indexer processor
      *
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_indexerEavProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(
         \Magento\Store\Model\ResourceModel\Store $subject,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Processor.php
index aae9351a27c13..a94d523fe3bac 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Processor.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Processor.php
@@ -9,7 +9,6 @@
  * EAV attribute indexer in catalog
  *
  * @api
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat.php
index 2bdedade31f12..b617a681aeb24 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat.php
@@ -10,31 +10,27 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Flat
  *
- * @since 2.0.0
  */
 class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row
-     * @since 2.0.0
      */
     protected $_productFlatIndexerRow;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Rows
-     * @since 2.0.0
      */
     protected $_productFlatIndexerRows;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Full
-     * @since 2.0.0
      */
     protected $_productFlatIndexerFull;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheContext;
 
@@ -42,7 +38,6 @@ class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Frame
      * @param Flat\Action\Row $productFlatIndexerRow
      * @param Flat\Action\Rows $productFlatIndexerRows
      * @param Flat\Action\Full $productFlatIndexerFull
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row $productFlatIndexerRow,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -71,7 +65,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -89,7 +82,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -101,7 +93,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -112,8 +103,8 @@ public function executeRow($id)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index a2c1736609cde..d4abc8ab6661e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -12,7 +12,6 @@
 /**
  * Abstract action reindex class
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractAction
 {
@@ -20,7 +19,6 @@ abstract class AbstractAction
      * Suffix for value field on composite attributes
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_valueFieldSuffix = '_value';
 
@@ -28,31 +26,26 @@ abstract class AbstractAction
      * Suffix for drop table (uses on flat table rename)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_tableDropSuffix = '_drop_indexer';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productIndexerHelper;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_productType;
 
@@ -60,7 +53,6 @@ abstract class AbstractAction
      * Existing flat tables flags pool
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_flatTablesExist = [];
 
@@ -68,19 +60,16 @@ abstract class AbstractAction
      * List of product types available in installation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productTypes = [];
 
     /**
      * @var TableBuilder
-     * @since 2.0.0
      */
     protected $_tableBuilder;
 
     /**
      * @var FlatTableBuilder
-     * @since 2.0.0
      */
     protected $_flatTableBuilder;
 
@@ -97,7 +86,6 @@ abstract class AbstractAction
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param TableBuilder $tableBuilder
      * @param FlatTableBuilder $flatTableBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -120,7 +108,6 @@ public function __construct(
      *
      * @param array|int $ids
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-     * @since 2.0.0
      */
     abstract public function execute($ids);
 
@@ -129,7 +116,6 @@ abstract public function execute($ids);
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function _getTemporaryTableName($tableName)
     {
@@ -143,7 +129,6 @@ protected function _getTemporaryTableName($tableName)
      * @param int|string $storeId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _cleanOnFailure(array $tablesList, $storeId)
     {
@@ -161,7 +146,6 @@ protected function _cleanOnFailure(array $tablesList, $storeId)
      * @param array $changedIds
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _reindex($storeId, array $changedIds = [])
     {
@@ -190,7 +174,6 @@ protected function _reindex($storeId, array $changedIds = [])
      * as key - type code, value - instance model
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getProductTypeInstances()
     {
@@ -212,7 +195,6 @@ protected function _getProductTypeInstances()
      * @param int|array $productIds Update child product(s) only
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _updateRelationProducts($storeId, $productIds = null)
     {
@@ -272,7 +254,6 @@ protected function _updateRelationProducts($storeId, $productIds = null)
      *
      * @param int $storeId
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
-     * @since 2.0.0
      */
     protected function _cleanRelationProducts($storeId)
     {
@@ -341,7 +322,6 @@ protected function _cleanRelationProducts($storeId)
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFlatTableExists($storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index f2f422a51dc6e..bb4b459c526a4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser
  *
- * @since 2.0.0
  */
 class Eraser
 {
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $productIndexerHelper;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -38,7 +34,6 @@ class Eraser
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -56,7 +51,6 @@ public function __construct(
      * @param array $ids
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     public function removeDeletedProducts(array &$ids, $storeId)
     {
@@ -85,7 +79,6 @@ public function removeDeletedProducts(array &$ids, $storeId)
      * @param int|array $productId
      * @param null|int $storeId
      * @return void
-     * @since 2.0.0
      */
     public function deleteProductsFromStore($productId, $storeId = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Full.php
index a52cdd7d6bf0c..4f0fe9ec29581 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Full.php
@@ -8,7 +8,6 @@
 /**
  * Class Full reindex action
  *
- * @since 2.0.0
  */
 class Full extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 {
@@ -21,7 +20,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($ids = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index d3fa253feeb11..7e20919e6cce2 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Indexer
- * @since 2.0.0
  */
 class Indexer
 {
@@ -29,20 +28,17 @@ class Indexer
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productIndexerHelper;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -61,7 +57,6 @@ public function __construct(
      * @return \Magento\Catalog\Model\Indexer\Product\Flat
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function write($storeId, $productId, $valueFieldSuffix = '')
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index efb89186a0485..b5dbdb68606ff 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Row reindex action
- * @since 2.0.0
  */
 class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer
-     * @since 2.0.0
      */
     protected $flatItemWriter;
 
     /**
      * @var Eraser
-     * @since 2.0.0
      */
     protected $flatItemEraser;
 
@@ -35,7 +32,6 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      * @param FlatTableBuilder $flatTableBuilder
      * @param Indexer $flatItemWriter
      * @param Eraser $flatItemEraser
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -65,7 +61,6 @@ public function __construct(
      * @param int|null $id
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($id = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
index 7f962d62806e3..7b2a6272c7052 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
@@ -11,13 +11,11 @@
 /**
  * Class Rows reindex action for mass actions
  *
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 {
     /**
      * @var Eraser
-     * @since 2.0.0
      */
     protected $flatItemEraser;
 
@@ -29,7 +27,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      * @param TableBuilder $tableBuilder
      * @param FlatTableBuilder $flatTableBuilder
      * @param Eraser $flatItemEraser
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -58,7 +55,6 @@ public function __construct(
      *
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\Action\Rows
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
index b54878fdf9768..54f06463dc8a1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
@@ -9,32 +9,27 @@
 
 /**
  * Class TableData
- * @since 2.0.0
  */
 class TableData implements \Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface
 {
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productIndexerHelper;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -51,7 +46,6 @@ public function __construct(
      * @param string $flatDropName
      * @param string $temporaryFlatTableName
      * @return void
-     * @since 2.0.0
      */
     public function move($flatTable, $flatDropName, $temporaryFlatTableName)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 20f13eb2c79e8..08089d5437e94 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -12,7 +12,6 @@
 /**
  * Class FlatTableBuilder
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class FlatTableBuilder
 {
@@ -29,31 +28,26 @@ class FlatTableBuilder
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productIndexerHelper;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var TableDataInterface
-     * @since 2.0.0
      */
     protected $_tableData;
 
@@ -69,7 +63,6 @@ class FlatTableBuilder
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param TableDataInterface $tableData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
@@ -95,7 +88,6 @@ public function __construct(
      * @param string $tableDropSuffix
      * @param bool $fillTmpTables
      * @return void
-     * @since 2.0.0
      */
     public function build($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix, $fillTmpTables)
     {
@@ -126,7 +118,6 @@ public function build($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _createTemporaryFlatTable($storeId)
     {
@@ -216,7 +207,6 @@ protected function _createTemporaryFlatTable($storeId)
      * @param int|string $storeId
      * @param string $valueFieldSuffix
      * @return void
-     * @since 2.0.0
      */
     protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldSuffix)
     {
@@ -311,7 +301,6 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
      * @param int|string $storeId
      * @param string $valueFieldSuffix
      * @return void
-     * @since 2.0.0
      */
     protected function _updateTemporaryTableByStoreValues(
         array $tables,
@@ -375,7 +364,6 @@ protected function _updateTemporaryTableByStoreValues(
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function _getTemporaryTableName($tableName)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
index 8103b85bf758f..c58dd58333c3e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
@@ -11,7 +11,6 @@
 
 /**
  * Plugin for Magento\Indexer\Model\Config\Data
- * @since 2.0.0
  */
 class IndexerConfigData
 {
@@ -23,7 +22,6 @@ class IndexerConfigData
 
     /**
      * @param ProductFlatIndexerState $state
-     * @since 2.0.0
      */
     public function __construct(ProductFlatIndexerState $state)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
index f6aa4a8bfa964..33c9144de1137 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Flat\Plugin\Store
  *
- * @since 2.0.0
  */
 class Store
 {
@@ -19,13 +18,11 @@ class Store
      * Product flat indexer processor
      *
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(\Magento\Store\Model\ResourceModel\Store $subject, \Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
index 6bb1ac404e35c..25918bd1453d8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Flat\Plugin\StoreGroup
  *
- * @since 2.0.0
  */
 class StoreGroup
 {
@@ -19,13 +18,11 @@ class StoreGroup
      * Product flat indexer processor
      *
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(\Magento\Store\Model\ResourceModel\Group $subject, \Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Processor.php
index ac7302a56aa34..9189cb4c16d46 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Processor.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Processor.php
@@ -9,7 +9,6 @@
  * Catalog flat indexer
  *
  * @api
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
@@ -20,14 +19,12 @@ class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
-     * @since 2.0.0
      */
     protected $_state;
 
     /**
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
@@ -43,7 +40,6 @@ public function __construct(
      * @param int $id
      * @param bool $forceReindex
      * @return void
-     * @since 2.0.0
      */
     public function reindexRow($id, $forceReindex = false)
     {
@@ -59,7 +55,6 @@ public function reindexRow($id, $forceReindex = false)
      * @param int[] $ids
      * @param bool $forceReindex
      * @return void
-     * @since 2.0.0
      */
     public function reindexList($ids, $forceReindex = false)
     {
@@ -73,7 +68,6 @@ public function reindexList($ids, $forceReindex = false)
      * Run full reindex
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -87,7 +81,6 @@ public function reindexAll()
      * Mark Product flat indexer as invalid
      *
      * @return void
-     * @since 2.0.0
      */
     public function markIndexerAsInvalid()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/State.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/State.php
index 7bc7deb06abe8..f0f044b1d0e76 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/State.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/State.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
 {
@@ -23,7 +22,6 @@ class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productFlatIndexerHelper;
 
@@ -32,7 +30,6 @@ class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $flatIndexerHelper
      * @param bool $isAvailable
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -46,7 +43,6 @@ public function __construct(
 
     /**
      * @return \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     public function getFlatIndexerHelper()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/System/Config/Mode.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/System/Config/Mode.php
index 0bde470168d94..985c5a53a8dd9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/System/Config/Mode.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/System/Config/Mode.php
@@ -7,19 +7,16 @@
 
 /**
  * Flat product on/off backend
- * @since 2.0.0
  */
 class Mode extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Indexer\Model\Indexer\State
-     * @since 2.0.0
      */
     protected $indexerState;
 
@@ -33,7 +30,6 @@ class Mode extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Set after commit callback
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -67,7 +62,6 @@ public function afterSave()
      * Process flat enabled mode change
      *
      * @return void
-     * @since 2.0.0
      */
     public function processValue()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
index 226d7394d6deb..91ab1d0915ea7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
@@ -7,13 +7,13 @@
 
 /**
  * Class Builder
- * @since 2.2.0
+ * @since 2.1.4
  */
 class Builder implements BuilderInterface
 {
     /**
      * @var \Magento\Framework\DB\Ddl\Table
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private $tableInstance;
 
@@ -22,7 +22,7 @@ class Builder implements BuilderInterface
      *
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param string $tableName
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $tableName)
     {
@@ -31,7 +31,7 @@ public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $conn
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function addColumn($name, $type, $size = null, $options = [], $comment = null)
     {
@@ -41,7 +41,7 @@ public function addColumn($name, $type, $size = null, $options = [], $comment =
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function getTable()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/BuilderInterface.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/BuilderInterface.php
index 86e94f1687c87..f0bd3b1348828 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/BuilderInterface.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/BuilderInterface.php
@@ -9,7 +9,7 @@
  * Interface BuilderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.4
  */
 interface BuilderInterface
 {
@@ -33,13 +33,13 @@ interface BuilderInterface
      * @param string $comment column description
      * @return $this
      * @throws \Zend_Db_Exception
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function addColumn($name, $type, $size = null, $options = [], $comment = null);
 
     /**
      * @return \Magento\Framework\DB\Ddl\Table
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function getTable();
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index 1a25e4b96d571..b63e83c1d3382 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder
  *
- * @since 2.0.0
  */
 class TableBuilder
 {
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productIndexerHelper;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -40,7 +37,7 @@ class TableBuilder
 
     /**
      * @var BuilderInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private $tableBuilderFactory;
 
@@ -48,7 +45,6 @@ class TableBuilder
      * Check whether builder was executed
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isExecuted = false;
 
@@ -58,7 +54,6 @@ class TableBuilder
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param BuilderInterfaceFactory|null $tableBuilderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
@@ -79,7 +74,6 @@ public function __construct(
      * @param array $changedIds
      * @param string $valueFieldSuffix
      * @return void
-     * @since 2.0.0
      */
     public function build($storeId, $changedIds, $valueFieldSuffix)
     {
@@ -141,7 +135,6 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
      * @param string $valueFieldSuffix
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _createTemporaryTable($tableName, array $columns, $valueFieldSuffix)
     {
@@ -213,7 +206,6 @@ protected function _createTemporaryTable($tableName, array $columns, $valueField
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function _getTemporaryTableName($tableName)
     {
@@ -227,7 +219,6 @@ protected function _getTemporaryTableName($tableName)
      * @param array  $columns
      * @param array  $changedIds
      * @return void
-     * @since 2.0.0
      */
     protected function _fillTemporaryEntityTable($tableName, array $columns, array $changedIds = [])
     {
@@ -256,7 +247,6 @@ protected function _fillTemporaryEntityTable($tableName, array $columns, array $
      * @param string $tableName
      * @param string $columnName
      * @return void
-     * @since 2.0.0
      */
     protected function _addPrimaryKeyToTable($tableName, $columnName = 'entity_id')
     {
@@ -277,7 +267,6 @@ protected function _addPrimaryKeyToTable($tableName, $columnName = 'entity_id')
      * @param string $valueFieldSuffix
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     protected function _fillTemporaryTable(
         $tableName,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
index f0d90ee58efee..81cacc4660d6c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
@@ -9,25 +9,21 @@
 
 /**
  * Class TableData
- * @since 2.0.0
  */
 class TableData implements TableDataInterface
 {
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     {
@@ -41,7 +37,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
      * @param string $flatDropName
      * @param string $temporaryFlatTableName
      * @return void
-     * @since 2.0.0
      */
     public function move($flatTable, $flatDropName, $temporaryFlatTableName)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
index 200aa8e24554a..59ba258dc129a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface TableDataInterface
- * @since 2.0.0
  */
 interface TableDataInterface
 {
@@ -18,7 +17,6 @@ interface TableDataInterface
      * @param string $flatDropName
      * @param string $temporaryFlatTableName
      * @return void
-     * @since 2.0.0
      */
     public function move($flatTable, $flatDropName, $temporaryFlatTableName);
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price.php
index 369ea0436ce73..25bda35762d53 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price.php
@@ -10,31 +10,27 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Price
  *
- * @since 2.0.0
  */
 class Price implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Action\Row
-     * @since 2.0.0
      */
     protected $_productPriceIndexerRow;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Action\Rows
-     * @since 2.0.0
      */
     protected $_productPriceIndexerRows;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Action\Full
-     * @since 2.0.0
      */
     protected $_productPriceIndexerFull;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheContext;
 
@@ -42,7 +38,6 @@ class Price implements \Magento\Framework\Indexer\ActionInterface, \Magento\Fram
      * @param Price\Action\Row $productPriceIndexerRow
      * @param Price\Action\Rows $productPriceIndexerRows
      * @param Price\Action\Full $productPriceIndexerFull
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Price\Action\Row $productPriceIndexerRow,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -71,7 +65,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -89,7 +82,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -101,7 +93,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -112,8 +103,8 @@ public function executeRow($id)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index fea22d2fb1ff9..b44ea5ec79ec4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -9,7 +9,6 @@
  * Abstract action reindex class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractAction
 {
@@ -17,13 +16,11 @@ abstract class AbstractAction
      * Default Product Type Price indexer resource model
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-     * @since 2.0.0
      */
     protected $_defaultIndexerResource;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -31,13 +28,11 @@ abstract class AbstractAction
      * Core config model
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -45,25 +40,21 @@ abstract class AbstractAction
      * Currency factory
      *
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_catalogProductType;
 
@@ -71,13 +62,11 @@ abstract class AbstractAction
      * Indexer price factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory
-     * @since 2.0.0
      */
     protected $_indexerPriceFactory;
 
     /**
      * @var array|null
-     * @since 2.0.0
      */
     protected $_indexers;
 
@@ -96,7 +85,6 @@ abstract class AbstractAction
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
@@ -124,7 +112,6 @@ public function __construct(
      *
      * @param array|int $ids
      * @return void
-     * @since 2.0.0
      */
     abstract public function execute($ids);
 
@@ -133,7 +120,6 @@ abstract public function execute($ids);
      *
      * @param array $processIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     * @since 2.0.0
      */
     protected function _syncData(array $processIds = [])
     {
@@ -165,7 +151,6 @@ protected function _syncData(array $processIds = [])
      * Prepare website current dates table
      *
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     * @since 2.0.0
      */
     protected function _prepareWebsiteDateTable()
     {
@@ -228,7 +213,6 @@ protected function _prepareWebsiteDateTable()
      *
      * @param int|array $entityIds the entity ids limitation
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     * @since 2.0.0
      */
     protected function _prepareTierPriceIndex($entityIds = null)
     {
@@ -325,7 +309,6 @@ protected function _prepareTierPriceIndex($entityIds = null)
      * Retrieve price indexers per product type
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface[]
-     * @since 2.0.0
      */
     public function getTypeIndexers()
     {
@@ -358,7 +341,6 @@ public function getTypeIndexers()
      * @param string $productTypeId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function _getIndexer($productTypeId)
     {
@@ -376,7 +358,6 @@ protected function _getIndexer($productTypeId)
      * @param string $destTable
      * @param null|string $where
      * @return void
-     * @since 2.0.0
      */
     protected function _insertFromTable($sourceTable, $destTable, $where = null)
     {
@@ -400,7 +381,6 @@ protected function _insertFromTable($sourceTable, $destTable, $where = null)
      *
      * @param string $table
      * @return void
-     * @since 2.0.0
      */
     protected function _emptyTable($table)
     {
@@ -413,7 +393,6 @@ protected function _emptyTable($table)
      * @param array $changedIds
      * @return array Affected ids
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _reindexRows($changedIds = [])
     {
@@ -489,7 +468,6 @@ protected function _reindexRows($changedIds = [])
      * @param null|array $parentIds
      * @param array $excludeIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     * @since 2.0.0
      */
     protected function _copyRelationIndexData($parentIds, $excludeIds = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
index f15c7963fda9d..1c86ac7cfe6c5 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -10,7 +10,6 @@
 /**
  * Class Full reindex action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
 {
@@ -100,7 +99,6 @@ public function __construct(
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($ids = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php
index 6d947575ed01f..6af794bc00c78 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php
@@ -8,7 +8,6 @@
 /**
  * Class Row reindex action
  *
- * @since 2.0.0
  */
 class Row extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
 {
@@ -19,7 +18,6 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($id = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
index 7493a98c8fa49..27b50eea883b0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
@@ -8,7 +8,6 @@
 /**
  * Class Rows reindex action for mass actions
  *
- * @since 2.0.0
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
 {
@@ -19,7 +18,6 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/AbstractPlugin.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/AbstractPlugin.php
index 8ad9cc4a25fbe..dacbc5ec81473 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/AbstractPlugin.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/AbstractPlugin.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
  *
- * @since 2.0.0
  */
 abstract class AbstractPlugin
 {
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\Indexer\IndexerRegistry $indexerR
      * Invalidate indexer
      *
      * @return void
-     * @since 2.0.0
      */
     protected function invalidateIndexer()
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
index 0fea2013a746c..9c421e0a19ea1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Price\Plugin\CustomerGroup
  *
- * @since 2.0.0
  */
 class CustomerGroup extends AbstractPlugin
 {
@@ -21,7 +20,6 @@ class CustomerGroup extends AbstractPlugin
      * @param string                   $result
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(GroupRepositoryInterface $subject, $result)
     {
@@ -36,7 +34,6 @@ public function afterSave(GroupRepositoryInterface $subject, $result)
      * @param string                   $result
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(GroupRepositoryInterface $subject, $result)
     {
@@ -51,7 +48,6 @@ public function afterDelete(GroupRepositoryInterface $subject, $result)
      * @param string                   $result
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDeleteById(GroupRepositoryInterface $subject, $result)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
index 41ee1a2638b4e..e88bb8ff836ba 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website
  *
- * @since 2.0.0
  */
 class Website
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $_processor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Price\Processor $processor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Price\Process
      * @return \Magento\Store\Model\ResourceModel\Website
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(\Magento\Store\Model\ResourceModel\Website $subject, $result)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Processor.php
index 7a1fb197f4e6f..ae91320743ccd 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Processor.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Processor.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScope.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScope.php
index 5bebde72706fd..1b0bdcc1b4f6c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScope.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScope.php
@@ -7,13 +7,11 @@
 
 /**
  * Price scope backend model
- * @since 2.0.0
  */
 class PriceScope extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -26,7 +24,6 @@ class PriceScope extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Set after commit callback
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -58,7 +54,6 @@ public function afterSave()
      * Process product price scope change
      *
      * @return void
-     * @since 2.0.0
      */
     public function processValue()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 9ca610a06e80e..53ff52dc971f1 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -15,7 +15,6 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Layer extends \Magento\Framework\DataObject
 {
@@ -23,7 +22,6 @@ class Layer extends \Magento\Framework\DataObject
      * Product collections array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productCollections = [];
 
@@ -31,7 +29,6 @@ class Layer extends \Magento\Framework\DataObject
      * Key which can be used for load/save aggregation data
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_stateKey = null;
 
@@ -39,7 +36,6 @@ class Layer extends \Magento\Framework\DataObject
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry = null;
 
@@ -47,7 +43,6 @@ class Layer extends \Magento\Framework\DataObject
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -55,7 +50,6 @@ class Layer extends \Magento\Framework\DataObject
      * Catalog product
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
@@ -63,7 +57,6 @@ class Layer extends \Magento\Framework\DataObject
      * Attribute collection factory
      *
      * @var AttributeCollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -71,31 +64,26 @@ class Layer extends \Magento\Framework\DataObject
      * Layer state factory
      *
      * @var \Magento\Catalog\Model\Layer\StateFactory
-     * @since 2.0.0
      */
     protected $_layerStateFactory;
 
     /**
      * @var \Magento\Catalog\Model\Layer\ItemCollectionProviderInterface
-     * @since 2.0.0
      */
     protected $collectionProvider;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Category\StateKey
-     * @since 2.0.0
      */
     protected $stateKeyGenerator;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Category\CollectionFilter
-     * @since 2.0.0
      */
     protected $collectionFilter;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -108,7 +96,6 @@ class Layer extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\ContextInterface $context,
@@ -136,7 +123,6 @@ public function __construct(
      * Get layer state key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStateKey()
     {
@@ -150,7 +136,6 @@ public function getStateKey()
      * Retrieve current layer product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
@@ -170,7 +155,6 @@ public function getProductCollection()
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function prepareProductCollection($collection)
     {
@@ -186,7 +170,6 @@ public function prepareProductCollection($collection)
      * about existing intexes
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function apply()
     {
@@ -206,7 +189,6 @@ public function apply()
      * If no category found in registry, the root will be taken
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getCurrentCategory()
     {
@@ -230,7 +212,6 @@ public function getCurrentCategory()
      * @param mixed $category
      * @return \Magento\Catalog\Model\Layer
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setCurrentCategory($category)
     {
@@ -261,7 +242,6 @@ public function setCurrentCategory($category)
      * Retrieve current store model
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getCurrentStore()
     {
@@ -272,7 +252,6 @@ public function getCurrentStore()
      * Retrieve layer state object
      *
      * @return \Magento\Catalog\Model\Layer\State
-     * @since 2.0.0
      */
     public function getState()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/AvailabilityFlagInterface.php b/app/code/Magento/Catalog/Model/Layer/AvailabilityFlagInterface.php
index f1688fc83b0cd..597932bf897a4 100644
--- a/app/code/Magento/Catalog/Model/Layer/AvailabilityFlagInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/AvailabilityFlagInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AvailabilityFlagInterface
 {
@@ -18,7 +17,6 @@ interface AvailabilityFlagInterface
      * @param \Magento\Catalog\Model\Layer $layer
      * @param array $filters
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($layer, array $filters = []);
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/Category.php b/app/code/Magento/Catalog/Model/Layer/Category.php
index e1ef3a7039dab..9c61144d9c705 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category
  *
- * @since 2.0.0
  */
 class Category extends \Magento\Catalog\Model\Layer
 {
@@ -25,7 +24,6 @@ class Category extends \Magento\Catalog\Model\Layer
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/AvailabilityFlag.php b/app/code/Magento/Catalog/Model/Layer/Category/AvailabilityFlag.php
index 865ddc1f5dc7e..01f9233cad80b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/AvailabilityFlag.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/AvailabilityFlag.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category\AvailabilityFlag
  *
- * @since 2.0.0
  */
 class AvailabilityFlag implements AvailabilityFlagInterface
 {
@@ -22,7 +21,6 @@ class AvailabilityFlag implements AvailabilityFlagInterface
      * @param \Magento\Catalog\Model\Layer $layer
      * @param array $filters
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($layer, array $filters = [])
     {
@@ -32,7 +30,6 @@ public function isEnabled($layer, array $filters = [])
     /**
      * @param array $filters
      * @return bool
-     * @since 2.0.0
      */
     protected function canShowOptions($filters)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Category/CollectionFilter.php
index 579e2a9bb2e60..f27ae538cecfa 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/CollectionFilter.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category\CollectionFilter
  *
- * @since 2.0.0
  */
 class CollectionFilter implements CollectionFilterInterface
 {
@@ -20,7 +19,6 @@ class CollectionFilter implements CollectionFilterInterface
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $productVisibility;
 
@@ -28,7 +26,6 @@ class CollectionFilter implements CollectionFilterInterface
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $catalogConfig;
 
@@ -37,7 +34,6 @@ class CollectionFilter implements CollectionFilterInterface
      *
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
      * @param \Magento\Catalog\Model\Config $catalogConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Visibility $productVisibility,
@@ -53,7 +49,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param \Magento\Catalog\Model\Category $category
      * @return void
-     * @since 2.0.0
      */
     public function filter(
         $collection,
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
index a1e0cc2a72155..f2d60f41c66ab 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category\FilterableAttributeList
  *
- * @since 2.0.0
  */
 class FilterableAttributeList implements FilterableAttributeListInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -33,7 +30,6 @@ class FilterableAttributeList implements FilterableAttributeListInterface
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory,
@@ -47,7 +43,6 @@ public function __construct(
      * Retrieve list of filterable attributes
      *
      * @return array|\Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -67,7 +62,6 @@ public function getList()
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected function _prepareAttributeCollection($collection)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/Catalog/Model/Layer/Category/ItemCollectionProvider.php
index 3fea217ac13f0..d82fcfc19d1a1 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/ItemCollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/ItemCollectionProvider.php
@@ -11,14 +11,12 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category\ItemCollectionProvider
  *
- * @since 2.0.0
  */
 class ItemCollectionProvider implements ItemCollectionProviderInterface
 {
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getCollection(\Magento\Catalog\Model\Category $category)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
index cbcd5d2e4b130..15f150f4f7de2 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Category\StateKey
  *
- * @since 2.0.0
  */
 class StateKey implements StateKeyInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return string
-     * @since 2.0.0
      */
     public function toString($category)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php b/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
index 68dc303eb717a..0727a6d4d3c7b 100644
--- a/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\CollectionFilterInterface
  *
- * @since 2.0.0
  */
 interface CollectionFilterInterface
 {
@@ -19,7 +18,6 @@ interface CollectionFilterInterface
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param \Magento\Catalog\Model\Category $category
      * @return void
-     * @since 2.0.0
      */
     public function filter(
         $collection,
diff --git a/app/code/Magento/Catalog/Model/Layer/Context.php b/app/code/Magento/Catalog/Model/Layer/Context.php
index 83ff944183ddc..bc9c71f3fbd62 100644
--- a/app/code/Magento/Catalog/Model/Layer/Context.php
+++ b/app/code/Magento/Catalog/Model/Layer/Context.php
@@ -16,25 +16,21 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
- * @since 2.0.0
  */
 class Context implements ContextInterface
 {
     /**
      * @var ItemCollectionProviderInterface
-     * @since 2.0.0
      */
     protected $collectionProvider;
 
     /**
      * @var StateKeyInterface
-     * @since 2.0.0
      */
     protected $stateKey;
 
     /**
      * @var CollectionFilterInterface
-     * @since 2.0.0
      */
     protected $collectionFilter;
 
@@ -42,7 +38,6 @@ class Context implements ContextInterface
      * @param ItemCollectionProviderInterface $collectionProvider
      * @param StateKeyInterface $stateKey
      * @param CollectionFilterInterface $collectionFilter
-     * @since 2.0.0
      */
     public function __construct(
         ItemCollectionProviderInterface $collectionProvider,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return ItemCollectionProviderInterface
-     * @since 2.0.0
      */
     public function getCollectionProvider()
     {
@@ -65,7 +59,6 @@ public function getCollectionProvider()
 
     /**
      * @return StateKeyInterface
-     * @since 2.0.0
      */
     public function getStateKey()
     {
@@ -74,7 +67,6 @@ public function getStateKey()
 
     /**
      * @return CollectionFilterInterface
-     * @since 2.0.0
      */
     public function getCollectionFilter()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/ContextInterface.php b/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
index e137b17f6dfd7..00aec9db66f7a 100644
--- a/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
@@ -16,25 +16,21 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with their
  * corresponding abstract classes.
- * @since 2.0.0
  */
 interface ContextInterface
 {
     /**
      * @return ItemCollectionProviderInterface
-     * @since 2.0.0
      */
     public function getCollectionProvider();
 
     /**
      * @return StateKeyInterface
-     * @since 2.0.0
      */
     public function getStateKey();
 
     /**
      * @return CollectionFilterInterface
-     * @since 2.0.0
      */
     public function getCollectionFilter();
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index 0c6d934eff60a..da9caa59b0980 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -9,7 +9,6 @@
  * Layer category filter abstract model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractFilter extends \Magento\Framework\DataObject implements FilterInterface
 {
@@ -19,7 +18,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Request variable name with filter value
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_requestVar;
 
@@ -27,7 +25,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Array of filter items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_items;
 
@@ -35,7 +32,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
@@ -43,7 +39,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -51,7 +46,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Filter item factory
      *
      * @var \Magento\Catalog\Model\Layer\Filter\ItemFactory
-     * @since 2.0.0
      */
     protected $_filterItemFactory;
 
@@ -59,7 +53,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * Item Data Builder
      *
      * @var \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder
-     * @since 2.0.0
      */
     protected $itemDataBuilder;
 
@@ -72,7 +65,6 @@ abstract class AbstractFilter extends \Magento\Framework\DataObject implements F
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param array $data
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -96,7 +88,6 @@ public function __construct(
      *
      * @param   string $varName
      * @return  \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-     * @since 2.0.0
      */
     public function setRequestVar($varName)
     {
@@ -108,7 +99,6 @@ public function setRequestVar($varName)
      * Get request variable name which is used for apply filter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestVar()
     {
@@ -119,7 +109,6 @@ public function getRequestVar()
      * Get filter value for reset current filter state
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -130,7 +119,6 @@ public function getResetValue()
      * Retrieve filter value for Clear All Items filter state
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCleanValue()
     {
@@ -143,7 +131,6 @@ public function getCleanValue()
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -154,7 +141,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * Get fiter items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
@@ -165,7 +151,6 @@ public function getItemsCount()
      * Get all filter items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -180,7 +165,6 @@ public function getItems()
      *
      * @param array $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items)
     {
@@ -201,7 +185,6 @@ public function setItems(array $items)
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
@@ -212,7 +195,6 @@ protected function _getItemsData()
      * Initialize filter items
      *
      * @return  \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-     * @since 2.0.0
      */
     protected function _initItems()
     {
@@ -229,7 +211,6 @@ protected function _initItems()
      * Retrieve layer object
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function getLayer()
     {
@@ -248,7 +229,6 @@ public function getLayer()
      * @param   mixed $value
      * @param   int $count
      * @return  \Magento\Catalog\Model\Layer\Filter\Item
-     * @since 2.0.0
      */
     protected function _createItem($label, $value, $count = 0)
     {
@@ -263,7 +243,6 @@ protected function _createItem($label, $value, $count = 0)
      * Get all product ids from from collection with applied filters
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getFilterEntityIds()
     {
@@ -274,7 +253,6 @@ protected function _getFilterEntityIds()
      * Get product collection select object with applied filters
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getBaseCollectionSql()
     {
@@ -286,7 +264,6 @@ protected function _getBaseCollectionSql()
      *
      * @param   \Magento\Eav\Model\Entity\Attribute $attribute
      * @return  \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-     * @since 2.0.0
      */
     public function setAttributeModel($attribute)
     {
@@ -300,7 +277,6 @@ public function setAttributeModel($attribute)
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttributeModel()
     {
@@ -316,7 +292,6 @@ public function getAttributeModel()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -327,7 +302,6 @@ public function getName()
      * Retrieve current store id scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -343,7 +317,6 @@ public function getStoreId()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -354,7 +327,6 @@ public function setStoreId($storeId)
      * Retrieve Website ID scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -370,7 +342,6 @@ public function getWebsiteId()
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -381,7 +352,6 @@ public function setWebsiteId($websiteId)
      * Clear current element link text, for example 'Clear Price'
      *
      * @return false|string
-     * @since 2.0.0
      */
     public function getClearLinkText()
     {
@@ -394,7 +364,6 @@ public function getClearLinkText()
      * @param   int $optionId
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return  string|bool
-     * @since 2.0.0
      */
     protected function getOptionText($optionId)
     {
@@ -406,7 +375,6 @@ protected function getOptionText($optionId)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return int
-     * @since 2.0.0
      */
     protected function getAttributeIsFilterable($attribute)
     {
@@ -419,7 +387,6 @@ protected function getAttributeIsFilterable($attribute)
      * @param int $optionCount Count of search results with this option
      * @param int $totalSize Current search results count
      * @return bool
-     * @since 2.0.0
      */
     protected function isOptionReducesResults($optionCount, $totalSize)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
index 6c8abf957a295..12b44f5fcd124 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
@@ -9,7 +9,6 @@
  * Layer attribute filter
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 {
@@ -17,7 +16,6 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Resource instance
      *
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Attribute
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -25,13 +23,11 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Framework\Filter\StripTags
-     * @since 2.0.0
      */
     protected $tagFilter;
 
@@ -44,7 +40,6 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\Filter\StripTags $tagFilter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -67,7 +62,6 @@ public function __construct(
      * Retrieve resource instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Attribute
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -79,7 +73,6 @@ protected function _getResource()
      *
      * @param   \Magento\Framework\App\RequestInterface $request
      * @return  $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -101,7 +94,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
index 1dafee30b7d2e..e0a002a968a09 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
@@ -11,7 +11,6 @@
 
 /**
  * Layer category filter
- * @since 2.0.0
  */
 class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 {
@@ -19,7 +18,6 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Active Category Id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_categoryId;
 
@@ -27,7 +25,6 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Applied Category
      *
      * @var \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected $_appliedCategory;
 
@@ -35,7 +32,6 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Core data
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -43,13 +39,11 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var CategoryDataProvider
-     * @since 2.0.0
      */
     private $dataProvider;
 
@@ -63,7 +57,6 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param \Magento\Framework\Escaper $escaper
      * @param CategoryFactory $categoryDataProviderFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -84,7 +77,6 @@ public function __construct(
      * Get filter value for reset current filter state
      *
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -96,7 +88,6 @@ public function getResetValue()
      *
      * @param   \Magento\Framework\App\RequestInterface $request
      * @return  $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -120,7 +111,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * Get filter name
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -131,7 +121,6 @@ public function getName()
      * Get data array for building category filter items
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Category.php
index 96e6f6ed2a342..f5336f0c540e4 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Category.php
@@ -13,43 +13,36 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\DataProvider\Category
  *
- * @since 2.0.0
  */
 class Category
 {
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $coreRegistry;
 
     /**
      * @var CategoryModel
-     * @since 2.0.0
      */
     private $category;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $categoryId;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $isApplied = false;
 
     /**
      * @var Layer
-     * @since 2.0.0
      */
     private $layer;
 
     /**
      * @var CategoryModelFactory
-     * @since 2.0.0
      */
     private $categoryFactory;
 
@@ -58,7 +51,6 @@ class Category
      * @param CategoryModelFactory $categoryFactory
      * @param Layer $layer
      * @internal param $data
-     * @since 2.0.0
      */
     public function __construct(
         Registry $coreRegistry,
@@ -74,7 +66,6 @@ public function __construct(
      * Validate category for using as filter
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -96,7 +87,6 @@ public function isValid()
     /**
      * @param int $categoryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCategoryId($categoryId)
     {
@@ -109,7 +99,6 @@ public function setCategoryId($categoryId)
 
     /**
      * @return boolean
-     * @since 2.0.0
      */
     private function isApplied()
     {
@@ -120,7 +109,6 @@ private function isApplied()
      * Get selected category object
      *
      * @return CategoryModel
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -153,7 +141,6 @@ public function getCategory()
      * Get filter value for reset current filter state
      *
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -176,7 +163,6 @@ public function getResetValue()
 
     /**
      * @return Layer
-     * @since 2.0.0
      */
     private function getLayer()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
index 4775120abf330..159f1a4e835ce 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\DataProvider\Decimal
  *
- * @since 2.0.0
  */
 class Decimal
 {
@@ -18,37 +17,31 @@ class Decimal
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $max;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $min;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $range;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $rangeItemsCount = [];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal $resource)
     {
@@ -58,7 +51,6 @@ public function __construct(\Magento\Catalog\Model\ResourceModel\Layer\Filter\De
     /**
      * @param FilterInterface $filter
      * @return int
-     * @since 2.0.0
      */
     public function getRange(FilterInterface $filter)
     {
@@ -80,7 +72,6 @@ public function getRange(FilterInterface $filter)
     /**
      * @param int $range
      * @return void
-     * @since 2.0.0
      */
     public function setRange($range)
     {
@@ -92,7 +83,6 @@ public function setRange($range)
      *
      * @param FilterInterface $filter
      * @return float
-     * @since 2.0.0
      */
     public function getMaxValue(FilterInterface $filter)
     {
@@ -108,7 +98,6 @@ public function getMaxValue(FilterInterface $filter)
      *
      * @param FilterInterface $filter
      * @return float
-     * @since 2.0.0
      */
     public function getMinValue(FilterInterface $filter)
     {
@@ -125,7 +114,6 @@ public function getMinValue(FilterInterface $filter)
      * @param int $range
      * @param FilterInterface $filter
      * @return mixed
-     * @since 2.0.0
      */
     public function getRangeItemCounts($range, FilterInterface $filter)
     {
@@ -141,7 +129,6 @@ public function getRangeItemCounts($range, FilterInterface $filter)
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -151,7 +138,6 @@ public function getResource()
     /**
      * @param FilterInterface $filter
      * @return mixed
-     * @since 2.0.0
      */
     private function loadValues(FilterInterface $filter)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
index ed575dc40a1a1..d7d855331fc24 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
  *
- * @since 2.0.0
  */
 class Price
 {
@@ -46,55 +45,46 @@ class Price
 
     /**
      * @var Layer
-     * @since 2.0.0
      */
     private $layer;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $maxPrice;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $rangeItemCounts = [];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $coreRegistry;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $priceRange;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $priorIntervals;
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     private $interval = [];
 
@@ -103,7 +93,6 @@ class Price
      * @param Registry $coreRegistry
      * @param ScopeConfigInterface $scopeConfig
      * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price $resource
-     * @since 2.0.0
      */
     public function __construct(
         Layer $layer,
@@ -119,7 +108,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getInterval()
     {
@@ -129,7 +117,6 @@ public function getInterval()
     /**
      * @param array $interval
      * @return void
-     * @since 2.0.0
      */
     public function setInterval($interval)
     {
@@ -138,7 +125,6 @@ public function setInterval($interval)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRangeCalculationValue()
     {
@@ -150,7 +136,6 @@ public function getRangeCalculationValue()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRangeStepValue()
     {
@@ -162,7 +147,6 @@ public function getRangeStepValue()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getOnePriceIntervalValue()
     {
@@ -176,7 +160,6 @@ public function getOnePriceIntervalValue()
      * Get interval division limit
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIntervalDivisionLimitValue()
     {
@@ -190,7 +173,6 @@ public function getIntervalDivisionLimitValue()
      * Get maximum number of intervals
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getRangeMaxIntervalsValue()
     {
@@ -202,7 +184,6 @@ public function getRangeMaxIntervalsValue()
 
     /**
      * @return Layer
-     * @since 2.0.0
      */
     public function getLayer()
     {
@@ -213,7 +194,6 @@ public function getLayer()
      * Get price range for building filter steps
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPriceRange()
     {
@@ -254,7 +234,6 @@ public function getPriceRange()
      *
      * @param   int $range
      * @return  int
-     * @since 2.0.0
      */
     public function getRangeItemCounts($range)
     {
@@ -285,7 +264,6 @@ public function getRangeItemCounts($range)
      * Get maximum price from layer products set
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMaxPrice()
     {
@@ -304,7 +282,6 @@ public function getMaxPrice()
     /**
      * @param string $filterParams
      * @return array
-     * @since 2.0.0
      */
     public function getPriorFilters($filterParams)
     {
@@ -328,7 +305,6 @@ public function getPriorFilters($filterParams)
      *
      * @param string $filter
      * @return array|bool
-     * @since 2.0.0
      */
     public function validateFilter($filter)
     {
@@ -349,7 +325,6 @@ public function validateFilter($filter)
      * Get filter value for reset current filter state
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -368,7 +343,6 @@ public function getResetValue()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getPriorIntervals()
     {
@@ -378,7 +352,6 @@ public function getPriorIntervals()
     /**
      * @param array $priorInterval
      * @return void
-     * @since 2.0.0
      */
     public function setPriorIntervals($priorInterval)
     {
@@ -387,7 +360,6 @@ public function setPriorIntervals($priorInterval)
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -396,7 +368,6 @@ public function getResource()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalRequestData()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index 0a6b11ea5bb67..dac2632ff6db8 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -7,7 +7,6 @@
 
 /**
  * Catalog Layer Decimal Attribute Filter Model
- * @since 2.0.0
  */
 class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 {
@@ -15,19 +14,16 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Resource instance
      *
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var DataProvider\Decimal
-     * @since 2.0.0
      */
     private $dataProvider;
 
@@ -39,7 +35,6 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory $filterDecimalFactory
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -101,7 +95,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * @param   int $range
      * @param   float $value
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _renderItemLabel($range, $value)
     {
@@ -114,7 +107,6 @@ protected function _renderItemLabel($range, $value)
      * Retrieve data for build decimal filter items
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index a19dab3d1c0cb..823bd6a781a0b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory
  *
- * @since 2.0.0
  */
 class AlgorithmFactory
 {
@@ -31,19 +30,16 @@ class AlgorithmFactory
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $algorithms;
 
@@ -53,7 +49,6 @@ class AlgorithmFactory
      * @param ObjectManagerInterface $objectManager
      * @param ScopeConfigInterface $scopeConfig
      * @param array $algorithms
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -71,7 +66,6 @@ public function __construct(
      * @param array $data
      * @return AlgorithmInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmInterface.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmInterface.php
index 49fc939ac214b..8ac3cfeebd269 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AlgorithmInterface
 {
@@ -15,7 +14,6 @@ interface AlgorithmInterface
      * @param int[] $intervals
      * @param string $additionalRequestData
      * @return array
-     * @since 2.0.0
      */
     public function getItemsData(array $intervals = [], $additionalRequestData = '');
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
index 105472c50b483..33e957e1d53de 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Auto implements AlgorithmInterface
 {
@@ -23,43 +22,36 @@ class Auto implements AlgorithmInterface
 
     /**
      * @var Algorithm
-     * @since 2.0.0
      */
     private $algorithm;
 
     /**
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     private $layer;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var Render
-     * @since 2.0.0
      */
     private $render;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $coreRegistry;
 
     /**
      * @var Range
-     * @since 2.0.0
      */
     private $range;
 
     /**
      * @var Price
-     * @since 2.0.0
      */
     private $resource;
 
@@ -71,7 +63,6 @@ class Auto implements AlgorithmInterface
      * @param Registry $coreRegistry
      * @param Price $resource
      * @param Range $range
-     * @since 2.0.0
      */
     public function __construct(
         Algorithm $algorithm,
@@ -93,7 +84,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemsData(array $intervals = [], $additionalRequestData = '')
     {
@@ -112,7 +102,6 @@ public function getItemsData(array $intervals = [], $additionalRequestData = '')
 
     /**
      * @return number
-     * @since 2.0.0
      */
     private function getRange()
     {
@@ -131,7 +120,6 @@ private function getRange()
      * Get maximum price from layer products set
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMaxPriceInt()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
index c7a8e1b8603c2..2995b9bfac0fc 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Dynamic\Improved
  *
- * @since 2.0.0
  */
 class Improved implements AlgorithmInterface
 {
@@ -23,31 +22,26 @@ class Improved implements AlgorithmInterface
 
     /**
      * @var Algorithm
-     * @since 2.0.0
      */
     private $algorithm;
 
     /**
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     private $layer;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var Render
-     * @since 2.0.0
      */
     private $render;
 
     /**
      * @var IntervalFactory
-     * @since 2.0.0
      */
     private $intervalFactory;
 
@@ -57,7 +51,6 @@ class Improved implements AlgorithmInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param Render $render
      * @param IntervalFactory $intervalFactory
-     * @since 2.0.0
      */
     public function __construct(
         Algorithm $algorithm,
@@ -75,7 +68,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemsData(array $intervals = [], $additionalRequestData = '')
     {
@@ -115,7 +107,6 @@ public function getItemsData(array $intervals = [], $additionalRequestData = '')
      * Get interval division limit
      *
      * @return int
-     * @since 2.0.0
      */
     private function getIntervalDivisionLimit()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
index 3665102846dcd..cc39cd7aa9aad 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Dynamic\Manual
  *
- * @since 2.0.0
  */
 class Manual implements AlgorithmInterface
 {
@@ -31,7 +30,6 @@ class Manual implements AlgorithmInterface
      * @param Registry $coreRegistry
      * @param Price $resource
      * @param Range $range
-     * @since 2.0.0
      */
     public function __construct(
         Algorithm $algorithm,
@@ -56,7 +54,6 @@ public function __construct(
      * @param string $additionalRequestData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getItemsData(array $intervals = [], $additionalRequestData = '')
     {
@@ -77,7 +74,6 @@ public function getItemsData(array $intervals = [], $additionalRequestData = '')
     /**
      * @param array $items
      * @return array
-     * @since 2.0.0
      */
     private function processRange($items)
     {
@@ -100,7 +96,6 @@ private function processRange($items)
      * Get maximum number of intervals
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaxIntervalsNumber()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Factory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Factory.php
index a8e841bb2794f..684f0378d34e9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Factory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Catalog\Model\Layer\Filter\Attribute
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/FilterInterface.php b/app/code/Magento/Catalog/Model/Layer/Filter/FilterInterface.php
index 7229e82e1c8c2..76e49da6a5e12 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/FilterInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/FilterInterface.php
@@ -9,7 +9,6 @@
  * Layer filter interface
  *
  * @api
- * @since 2.0.0
  */
 interface FilterInterface
 {
@@ -18,7 +17,6 @@ interface FilterInterface
      *
      * @param   string $varName
      * @return  \Magento\Catalog\Model\Layer\Filter\FilterInterface
-     * @since 2.0.0
      */
     public function setRequestVar($varName);
 
@@ -26,7 +24,6 @@ public function setRequestVar($varName);
      * Get request variable name which is used for apply filter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestVar();
 
@@ -34,7 +31,6 @@ public function getRequestVar();
      * Get filter value for reset current filter state
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getResetValue();
 
@@ -42,7 +38,6 @@ public function getResetValue();
      * Retrieve filter value for Clear All Items filter state
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCleanValue();
 
@@ -51,7 +46,6 @@ public function getCleanValue();
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request);
 
@@ -59,7 +53,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request);
      * Get filter items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemsCount();
 
@@ -67,7 +60,6 @@ public function getItemsCount();
      * Get all filter items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -76,7 +68,6 @@ public function getItems();
      *
      * @param array $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 
@@ -84,7 +75,6 @@ public function setItems(array $items);
      * Retrieve layer object
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function getLayer();
 
@@ -93,7 +83,6 @@ public function getLayer();
      *
      * @param   \Magento\Eav\Model\Entity\Attribute $attribute
      * @return  \Magento\Catalog\Model\Layer\Filter\FilterInterface
-     * @since 2.0.0
      */
     public function setAttributeModel($attribute);
 
@@ -102,7 +91,6 @@ public function setAttributeModel($attribute);
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttributeModel();
 
@@ -111,7 +99,6 @@ public function getAttributeModel();
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getName();
 
@@ -119,7 +106,6 @@ public function getName();
      * Retrieve current store id scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -128,7 +114,6 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -136,7 +121,6 @@ public function setStoreId($storeId);
      * Retrieve Website ID scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
@@ -145,7 +129,6 @@ public function getWebsiteId();
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 
@@ -153,7 +136,6 @@ public function setWebsiteId($websiteId);
      * Clear current element link text, for example 'Clear Price'
      *
      * @return false|string
-     * @since 2.0.0
      */
     public function getClearLinkText();
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
index f40c451630579..cdf95ba3d9695 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Item
  *
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\DataObject
 {
@@ -24,7 +23,6 @@ class Item extends \Magento\Framework\DataObject
      * Url
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -32,7 +30,6 @@ class Item extends \Magento\Framework\DataObject
      * Html pager block
      *
      * @var \Magento\Theme\Block\Html\Pager
-     * @since 2.0.0
      */
     protected $_htmlPagerBlock;
 
@@ -42,7 +39,6 @@ class Item extends \Magento\Framework\DataObject
      * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Theme\Block\Html\Pager $htmlPagerBlock
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\UrlInterface $url,
@@ -59,7 +55,6 @@ public function __construct(
      *
      * @return \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getFilter()
     {
@@ -76,7 +71,6 @@ public function getFilter()
      * Get filter item url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -92,7 +86,6 @@ public function getUrl()
      * Get url for remove item from filter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveUrl()
     {
@@ -108,7 +101,6 @@ public function getRemoveUrl()
      * Get url for "clear" link
      *
      * @return false|string
-     * @since 2.0.0
      */
     public function getClearLinkUrl()
     {
@@ -130,7 +122,6 @@ public function getClearLinkUrl()
      * Get item filter name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -141,7 +132,6 @@ public function getName()
      * Get item value as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueString()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
index 70bdc477d0afe..cfb0e23209120 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder
  *
- * @since 2.0.0
  */
 class DataBuilder
 {
@@ -27,7 +26,6 @@ class DataBuilder
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     protected $_itemsData = [];
 
@@ -38,7 +36,6 @@ class DataBuilder
      * @param string $label
      * @param int $count
      * @return void
-     * @since 2.0.0
      */
     public function addItemData($label, $value, $count)
     {
@@ -53,7 +50,6 @@ public function addItemData($label, $value, $count)
      * Get Items Data
      *
      * @return array
-     * @since 2.0.0
      */
     public function build()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 2de9cc4dbbbd4..ec5e2bff81ab3 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -12,7 +12,6 @@
  * Layer price filter
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 {
@@ -20,7 +19,6 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Resource instance
      *
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -28,7 +26,6 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -36,7 +33,6 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Catalog layer filter price algorithm
      *
      * @var \Magento\Framework\Search\Dynamic\Algorithm
-     * @since 2.0.0
      */
     protected $_priceAlgorithm;
 
@@ -44,31 +40,26 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var Dynamic\AlgorithmFactory
-     * @since 2.0.0
      */
     private $algorithmFactory;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
-     * @since 2.0.0
      */
     private $dataProvider;
 
@@ -85,7 +76,6 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param DataProvider\PriceFactory $dataProviderFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -115,7 +105,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -157,7 +146,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * Retrieve active customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -174,7 +162,6 @@ public function getCustomerGroupId()
      *
      * @param int $customerGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($customerGroupId)
     {
@@ -185,7 +172,6 @@ public function setCustomerGroupId($customerGroupId)
      * Retrieve active currency rate for filter
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyRate()
     {
@@ -206,7 +192,6 @@ public function getCurrencyRate()
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrencyRate($rate)
     {
@@ -217,7 +202,6 @@ public function setCurrencyRate($rate)
      * Get filter value for reset current filter state
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -228,7 +212,6 @@ public function getResetValue()
      * Get 'clear price' link text
      *
      * @return \Magento\Framework\Phrase|bool
-     * @since 2.0.0
      */
     public function getClearLinkText()
     {
@@ -246,7 +229,6 @@ public function getClearLinkText()
      * @param float|string $fromPrice
      * @param float|string $toPrice
      * @return float|\Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
@@ -269,7 +251,6 @@ protected function _renderRangeLabel($fromPrice, $toPrice)
      * Get additional request param data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getAdditionalRequestData()
     {
@@ -290,7 +271,6 @@ protected function _getAdditionalRequestData()
      * Get data for build price filter items
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
@@ -303,7 +283,6 @@ protected function _getItemsData()
      * Apply price range filter to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyPriceRange()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
index f173828e9fc4e..8f3d2adf19075 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Range
 {
@@ -20,19 +19,16 @@ class Range
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $registry;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var Resolver
-     * @since 2.0.0
      */
     private $layerResolver;
 
@@ -41,7 +37,6 @@ class Range
      * @param ScopeConfigInterface $scopeConfig
      * @param Resolver $layerResolver
      * @internal param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(Registry $registry, ScopeConfigInterface $scopeConfig, Resolver $layerResolver)
     {
@@ -52,7 +47,6 @@ public function __construct(Registry $registry, ScopeConfigInterface $scopeConfi
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getPriceRange()
     {
@@ -64,7 +58,6 @@ public function getPriceRange()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getConfigRangeStep()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index f8eea85b1b864..842ee7c8a4f82 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Filter\Price\Render
  *
- * @since 2.0.0
  */
 class Render
 {
@@ -21,19 +20,16 @@ class Render
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     private $priceCurrency;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var DataBuilder
-     * @since 2.0.0
      */
     private $itemDataBuilder;
 
@@ -41,7 +37,6 @@ class Render
      * @param PriceCurrencyInterface $priceCurrency
      * @param ScopeConfigInterface $scopeConfig
      * @param DataBuilder $itemDataBuilder
-     * @since 2.0.0
      */
     public function __construct(
         PriceCurrencyInterface $priceCurrency,
@@ -59,7 +54,6 @@ public function __construct(
      * @param float|string $fromPrice
      * @param float|string $toPrice
      * @return float|\Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function renderRangeLabel($fromPrice, $toPrice)
     {
@@ -85,7 +79,6 @@ public function renderRangeLabel($fromPrice, $toPrice)
      * @param int $range
      * @param int[] $dbRanges
      * @return array
-     * @since 2.0.0
      */
     public function renderRangeData($range, $dbRanges)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterList.php b/app/code/Magento/Catalog/Model/Layer/FilterList.php
index 0dd867f7631fa..428a01650e2c1 100644
--- a/app/code/Magento/Catalog/Model/Layer/FilterList.php
+++ b/app/code/Magento/Catalog/Model/Layer/FilterList.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\FilterList
  *
- * @since 2.0.0
  */
 class FilterList
 {
@@ -22,19 +21,16 @@ class FilterList
      * Filter factory
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var FilterableAttributeListInterface
-     * @since 2.0.0
      */
     protected $filterableAttributes;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $filterTypes = [
         self::CATEGORY_FILTER  => \Magento\Catalog\Model\Layer\Filter\Category::class,
@@ -45,7 +41,6 @@ class FilterList
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\AbstractFilter[]
-     * @since 2.0.0
      */
     protected $filters = [];
 
@@ -53,7 +48,6 @@ class FilterList
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param FilterableAttributeListInterface $filterableAttributes
      * @param array $filters
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -72,7 +66,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Layer $layer
      * @return array|Filter\AbstractFilter[]
-     * @since 2.0.0
      */
     public function getFilters(\Magento\Catalog\Model\Layer $layer)
     {
@@ -93,7 +86,6 @@ public function getFilters(\Magento\Catalog\Model\Layer $layer)
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @param \Magento\Catalog\Model\Layer $layer
      * @return \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-     * @since 2.0.0
      */
     protected function createAttributeFilter(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
@@ -113,7 +105,6 @@ protected function createAttributeFilter(
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function getAttributeFilterClass(\Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php b/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
index e09c8adac04bc..547e57a909b57 100644
--- a/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\FilterableAttributeListInterface
  *
- * @since 2.0.0
  */
 interface FilterableAttributeListInterface
 {
@@ -17,7 +16,6 @@ interface FilterableAttributeListInterface
      * Retrieve list of filterable attributes
      *
      * @return array|\Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getList();
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php b/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
index 5c3f2ccbf6b12..68f21c88a2d03 100644
--- a/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
@@ -10,14 +10,12 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\ItemCollectionProviderInterface
  *
- * @since 2.0.0
  */
 interface ItemCollectionProviderInterface
 {
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getCollection(\Magento\Catalog\Model\Category $category);
 }
diff --git a/app/code/Magento/Catalog/Model/Layer/Resolver.php b/app/code/Magento/Catalog/Model/Layer/Resolver.php
index 56ddc80487342..fe1a8ac8d4e2b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Resolver.php
+++ b/app/code/Magento/Catalog/Model/Layer/Resolver.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Resolver
  *
- * @since 2.0.0
  */
 class Resolver
 {
@@ -20,7 +19,6 @@ class Resolver
      * Catalog view layer models list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $layersPool;
 
@@ -28,20 +26,17 @@ class Resolver
      * Filter factory
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $layer = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $layersPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -56,7 +51,6 @@ public function __construct(
      *
      * @param string $layerType
      * @return void
-     * @since 2.0.0
      */
     public function create($layerType)
     {
@@ -73,7 +67,6 @@ public function create($layerType)
      * Get current Catalog Layer
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Search.php b/app/code/Magento/Catalog/Model/Layer/Search.php
index de657ecc70723..57fce5922c410 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Search
  *
- * @since 2.0.0
  */
 class Search extends \Magento\Catalog\Model\Layer
 {
@@ -27,7 +26,6 @@ class Search extends \Magento\Catalog\Model\Layer
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
index 96979b5b00f36..0d07d253bc351 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Search\CollectionFilter
  *
- * @since 2.0.0
  */
 class CollectionFilter implements CollectionFilterInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $catalogConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var Visibility
-     * @since 2.0.0
      */
     protected $productVisibility;
 
@@ -40,7 +36,6 @@ class CollectionFilter implements CollectionFilterInterface
      * @param Config $catalogConfig
      * @param StoreManagerInterface $storeManager
      * @param Visibility $productVisibility
-     * @since 2.0.0
      */
     public function __construct(
         Config $catalogConfig,
@@ -59,7 +54,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function filter(
         $collection,
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Search/Filter/Attribute.php
index 28575c987a9b0..2f6e9ea37e652 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/Filter/Attribute.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Search\Filter\Attribute
  *
- * @since 2.0.0
  */
 class Attribute extends \Magento\Catalog\Model\Layer\Filter\Attribute
 {
@@ -22,7 +21,6 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\Attribute
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute  $attribute
      * @return int
-     * @since 2.0.0
      */
     protected function getAttributeIsFilterable($attribute)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
index b3a5847a28f7e..ca68d99e50181 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Search\FilterableAttributeList
  *
- * @since 2.0.0
  */
 class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\FilterableAttributeList
 {
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected function _prepareAttributeCollection($collection)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/ItemCollectionProvider.php b/app/code/Magento/Catalog/Model/Layer/Search/ItemCollectionProvider.php
index 105b4f809edb5..8f885eb686069 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/ItemCollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/ItemCollectionProvider.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Catalog\Model\Layer\Search\ItemCollectionProvider
  *
- * @since 2.0.0
  */
 class ItemCollectionProvider implements ItemCollectionProviderInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
     /**
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $collectionFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(CollectionFactory $collectionFactory)
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getCollection(\Magento\Catalog\Model\Category $category)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/State.php b/app/code/Magento/Catalog/Model/Layer/State.php
index 3a4890e44579f..c143ac1786b60 100644
--- a/app/code/Magento/Catalog/Model/Layer/State.php
+++ b/app/code/Magento/Catalog/Model/Layer/State.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class State extends DataObject
 {
@@ -23,7 +22,6 @@ class State extends DataObject
      *
      * @param   Item $filter
      * @return  $this
-     * @since 2.0.0
      */
     public function addFilter($filter)
     {
@@ -39,7 +37,6 @@ public function addFilter($filter)
      * @param  Item[] $filters
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function setFilters($filters)
     {
@@ -54,7 +51,6 @@ public function setFilters($filters)
      * Get applied to layer filter items
      *
      * @return Item[]
-     * @since 2.0.0
      */
     public function getFilters()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php b/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
index e88dd160cae64..4d43f836af4ce 100644
--- a/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\StateKeyInterface
  *
- * @since 2.0.0
  */
 interface StateKeyInterface
 {
@@ -18,7 +17,6 @@ interface StateKeyInterface
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return string
-     * @since 2.0.0
      */
     public function toString($category);
 }
diff --git a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
index 10d7b94f67e30..50ef65520c87d 100644
--- a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
@@ -11,13 +11,11 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
@@ -25,14 +23,12 @@ class DepersonalizePlugin
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $catalogSession;
 
     /**
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -48,7 +44,6 @@ public function __construct(
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
     {
diff --git a/app/code/Magento/Catalog/Model/Plugin/Log.php b/app/code/Magento/Catalog/Model/Plugin/Log.php
index 474b75bd20949..e728bc402b7fb 100644
--- a/app/code/Magento/Catalog/Model/Plugin/Log.php
+++ b/app/code/Magento/Catalog/Model/Plugin/Log.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Catalog\Model\Plugin\Log
  *
- * @since 2.0.0
  */
 class Log
 {
     /**
      * @var \Magento\Catalog\Model\Product\Compare\Item
-     * @since 2.0.0
      */
     protected $_productCompareItem;
 
     /**
      * @param \Magento\Catalog\Model\Product\Compare\Item $productCompareItem
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Product\Compare\Item $productCompareItem)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Catalog\Model\Product\Compare\Item $product
      *
      * @return \Magento\Customer\Model\ResourceModel\Visitor
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterClean(\Magento\Customer\Model\ResourceModel\Visitor $subject, $logResourceModel)
     {
diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
index 2a75a6c90bfe4..5f6469c378024 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Catalog\Model\Plugin\ProductRepository\TransactionWrapper
  *
- * @since 2.0.0
  */
 class TransactionWrapper
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $resourceModel;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product $resourceModel
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product $resourceModel
@@ -38,7 +35,6 @@ public function __construct(
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundSave(
         \Magento\Catalog\Api\ProductRepositoryInterface $subject,
@@ -65,7 +61,6 @@ public function aroundSave(
      * @return bool
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDelete(
         \Magento\Catalog\Api\ProductRepositoryInterface $subject,
@@ -91,7 +86,6 @@ public function aroundDelete(
      * @return bool
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDeleteById(
         \Magento\Catalog\Api\ProductRepositoryInterface $subject,
diff --git a/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php b/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
index 67050d7799954..2c40bdb9da1ee 100644
--- a/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
+++ b/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
@@ -11,7 +11,6 @@
 
 /**
  * Plugin for Magento\Quote\Model\Quote\Item\ToOrderItem
- * @since 2.0.0
  */
 class QuoteItemProductOption
 {
diff --git a/app/code/Magento/Catalog/Model/Plugin/ShowOutOfStockConfig.php b/app/code/Magento/Catalog/Model/Plugin/ShowOutOfStockConfig.php
index 3e0c45bbe8a9a..668e138a0e69f 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ShowOutOfStockConfig.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ShowOutOfStockConfig.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Model\Plugin\ShowOutOfStockConfig
  *
- * @since 2.0.0
  */
 class ShowOutOfStockConfig
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_eavIndexerProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $eavIndexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor $eavIndexerProcessor)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor
      * @param mixed $result
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function afterSave(\Magento\Framework\App\Config\Value $subject, $result)
     {
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 21008187b6284..c454b3cb8c6fa 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -37,7 +37,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Product extends \Magento\Catalog\Model\AbstractModel implements
     IdentityInterface,
@@ -73,25 +72,21 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheTag = self::CACHE_TAG;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_product';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'product';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAffectOptions = false;
 
@@ -99,7 +94,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product type singleton instance
      *
      * @var \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected $_typeInstance = null;
 
@@ -107,7 +101,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product link instance
      *
      * @var Product\Link
-     * @since 2.0.0
      */
     protected $_linkInstance;
 
@@ -115,7 +108,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product object customization (not stored in DB)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customOptions = [];
 
@@ -123,19 +115,16 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product Url Instance
      *
      * @var Product\Url
-     * @since 2.0.0
      */
     protected $_urlModel = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected static $_url;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -143,7 +132,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product option factory
      *
      * @var Product\OptionFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
@@ -151,13 +139,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Product option
      *
      * @var Product\Option
-     * @since 2.0.0
      */
     protected $optionInstance;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_links = null;
 
@@ -165,7 +151,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Flag for available duplicate function
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isDuplicable = true;
 
@@ -173,7 +158,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Flag for get Price function
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_calculatePrice = true;
 
@@ -181,19 +165,16 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct = null;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -201,7 +182,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog product type
      *
      * @var Product\Type
-     * @since 2.0.0
      */
     protected $_catalogProductType;
 
@@ -209,7 +189,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog product media config
      *
      * @var Product\Media\Config
-     * @since 2.0.0
      */
     protected $_catalogProductMediaConfig;
 
@@ -217,7 +196,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog product status
      *
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_catalogProductStatus;
 
@@ -225,7 +203,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Catalog product visibility
      *
      * @var Product\Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -233,7 +210,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Stock item factory
      *
      * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $_stockItemFactory;
 
@@ -241,7 +217,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Item option factory
      *
      * @var \Magento\Catalog\Model\Product\Configuration\Item\OptionFactory
-     * @since 2.0.0
      */
     protected $_itemOptionFactory;
 
@@ -249,43 +224,36 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Filesystem facade
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $_productPriceIndexerProcessor;
 
     /**
      * @var Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_productEavIndexerProcessor;
 
     /**
      * @var \Magento\Framework\Pricing\PriceInfo\Base
-     * @since 2.0.0
      */
     protected $_priceInfo;
 
     /**
      * @var CategoryRepository
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -293,62 +261,52 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Instance of category collection.
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     protected $categoryCollection;
 
     /**
      * @var Product\Image\CacheFactory
-     * @since 2.0.0
      */
     protected $imageCacheFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
     /**
      * @param \Magento\Catalog\Model\ProductLink\CollectionProvider
-     * @since 2.0.0
      */
     protected $entityCollectionProvider;
 
     /**
      * @param \Magento\Catalog\Model\Product\LinkTypeProvider
-     * @since 2.0.0
      */
     protected $linkProvider;
 
     /**
      * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory
-     * @since 2.0.0
      */
     protected $productLinkFactory;
 
     /**
      * @param \Magento\Catalog\Api\Data\ProductLinkExtensionFactory
-     * @since 2.0.0
      */
     protected $productLinkExtensionFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_productIdCached;
 
     /**
      * List of attributes in ProductInterface
      * @var array
-     * @since 2.0.0
      */
     protected $interfaceAttributes = [
         ProductInterface::SKU,
@@ -367,7 +325,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -375,7 +332,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * Media converter pool
      *
      * @var Product\Attribute\Backend\Media\EntryConverterPool
-     * @since 2.0.0
      */
     protected $mediaGalleryEntryConverterPool;
 
@@ -431,7 +387,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -513,7 +468,6 @@ public function __construct(
      * Initialize resources
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -522,7 +476,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -537,7 +490,6 @@ protected function getCustomAttributesCodes()
      * Retrieve Store Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -551,7 +503,6 @@ public function getStoreId()
      * Get collection instance
      *
      * @return object
-     * @since 2.0.0
      */
     public function getResourceCollection()
     {
@@ -564,7 +515,6 @@ public function getResourceCollection()
      * Get product url model
      *
      * @return Product\Url
-     * @since 2.0.0
      */
     public function getUrlModel()
     {
@@ -577,7 +527,6 @@ public function getUrlModel()
      * @todo implement full validation process with errors returning which are ignoring now
      *
      * @return array
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -592,7 +541,6 @@ public function validate()
      *
      * @return string
      * @codeCoverageIgnoreStart
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -605,7 +553,6 @@ public function getName()
      * Get product price through type instance
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -622,7 +569,6 @@ public function getPrice()
      * @see \Magento\Catalog\Model\Product\Visibility
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVisibility()
     {
@@ -633,7 +579,6 @@ public function getVisibility()
      * Get product attribute set id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getAttributeSetId()
     {
@@ -644,7 +589,6 @@ public function getAttributeSetId()
      * Get product creation date
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -655,7 +599,6 @@ public function getCreatedAt()
      * Get previous product update date
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -667,7 +610,6 @@ public function getUpdatedAt()
      *
      * @param bool $calculate
      * @return void
-     * @since 2.0.0
      */
     public function setPriceCalculation($calculate = true)
     {
@@ -678,7 +620,6 @@ public function setPriceCalculation($calculate = true)
      * Get product type identifier
      *
      * @return array|string
-     * @since 2.0.0
      */
     public function getTypeId()
     {
@@ -691,7 +632,6 @@ public function getTypeId()
      * Get product status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -704,7 +644,6 @@ public function getStatus()
      * Type instance implements product type depended logic and is a singleton shared by all products of the same type.
      *
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function getTypeInstance()
     {
@@ -719,7 +658,6 @@ public function getTypeInstance()
      *
      * @param \Magento\Catalog\Model\Product\Type\AbstractType|null $instance  Product type instance
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function setTypeInstance($instance)
     {
@@ -731,7 +669,6 @@ public function setTypeInstance($instance)
      * Retrieve link instance
      *
      * @return  Product\Link
-     * @since 2.0.0
      */
     public function getLinkInstance()
     {
@@ -743,7 +680,6 @@ public function getLinkInstance()
      *
      * @param   string $sku
      * @return  integer
-     * @since 2.0.0
      */
     public function getIdBySku($sku)
     {
@@ -754,7 +690,6 @@ public function getIdBySku($sku)
      * Retrieve product category id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCategoryId()
     {
@@ -769,7 +704,6 @@ public function getCategoryId()
      * Retrieve product category
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getCategory()
     {
@@ -785,7 +719,6 @@ public function getCategory()
      * Retrieve assigned category Ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCategoryIds()
     {
@@ -809,7 +742,6 @@ public function getCategoryIds()
      * Retrieve product categories
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCategoryCollection()
     {
@@ -826,7 +758,6 @@ public function getCategoryCollection()
      *
      * @param \Magento\Framework\Data\Collection $categoryCollection
      * @return $this
-     * @since 2.0.0
      */
     protected function setCategoryCollection(\Magento\Framework\Data\Collection $categoryCollection)
     {
@@ -838,7 +769,6 @@ protected function setCategoryCollection(\Magento\Framework\Data\Collection $cat
      * Retrieve product websites identifiers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteIds()
     {
@@ -853,7 +783,6 @@ public function getWebsiteIds()
      * Get all sore ids where product is presented
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -878,7 +807,6 @@ public function getStoreIds()
      * @param bool $skipSuper Not used
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAttributes($groupId = null, $skipSuper = false)
     {
@@ -903,7 +831,6 @@ public function getAttributes($groupId = null, $skipSuper = false)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -972,7 +899,6 @@ public function beforeSave()
      *
      * @param   bool $value
      * @return  bool
-     * @since 2.0.0
      */
     public function canAffectOptions($value = null)
     {
@@ -986,7 +912,6 @@ public function canAffectOptions($value = null)
      * Saving product type related data and init index
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -1020,7 +945,6 @@ public function afterSave()
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -1035,7 +959,6 @@ public function setQty($qty)
      * Get quantity for product
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -1046,7 +969,6 @@ public function getQty()
      * Callback for entity reindex
      *
      * @return void
-     * @since 2.0.0
      */
     public function priceReindexCallback()
     {
@@ -1059,7 +981,6 @@ public function priceReindexCallback()
      * Reindex callback for EAV indexer
      *
      * @return void
-     * @since 2.0.0
      */
     public function eavReindexCallback()
     {
@@ -1072,7 +993,6 @@ public function eavReindexCallback()
      * Check if data was changed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDataChanged()
     {
@@ -1088,7 +1008,6 @@ public function isDataChanged()
      * Init indexing process after product save
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindex()
     {
@@ -1106,7 +1025,6 @@ public function reindex()
      * Register indexing event before delete product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -1118,7 +1036,6 @@ public function beforeDelete()
      * Init indexing process after product delete commit
      *
      * @return void
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -1131,7 +1048,6 @@ public function afterDeleteCommit()
      * Load product options if they exists
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -1146,7 +1062,6 @@ protected function _afterLoad()
      * Clear cache related with product id
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cleanCache()
     {
@@ -1158,7 +1073,6 @@ public function cleanCache()
      * Get product price model
      *
      * @return \Magento\Catalog\Model\Product\Type\Price
-     * @since 2.0.0
      */
     public function getPriceModel()
     {
@@ -1169,7 +1083,6 @@ public function getPriceModel()
      * Get product Price Info object
      *
      * @return \Magento\Framework\Pricing\PriceInfo\Base
-     * @since 2.0.0
      */
     public function getPriceInfo()
     {
@@ -1183,7 +1096,6 @@ public function getPriceInfo()
      * Gets list of product tier prices
      *
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]|null
-     * @since 2.0.0
      */
     public function getTierPrices()
     {
@@ -1195,7 +1107,6 @@ public function getTierPrices()
      *
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface[] $tierPrices
      * @return $this
-     * @since 2.0.0
      */
     public function setTierPrices(array $tierPrices = null)
     {
@@ -1208,7 +1119,6 @@ public function setTierPrices(array $tierPrices = null)
      *
      * @param   float $qty
      * @return  float|array
-     * @since 2.0.0
      */
     public function getTierPrice($qty = null)
     {
@@ -1219,7 +1129,6 @@ public function getTierPrice($qty = null)
      * Get formatted by currency product price
      *
      * @return  array || double
-     * @since 2.0.0
      */
     public function getFormatedPrice()
     {
@@ -1235,7 +1144,6 @@ public function getFormatedPrice()
      *
      * @param float $price Price amount
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function setFinalPrice($price)
     {
@@ -1248,7 +1156,6 @@ public function setFinalPrice($price)
      *
      * @param float $qty
      * @return float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty = null)
     {
@@ -1262,7 +1169,6 @@ public function getFinalPrice($qty = null)
      * Returns calculated final price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCalculatedFinalPrice()
     {
@@ -1273,7 +1179,6 @@ public function getCalculatedFinalPrice()
      * Returns minimal price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinimalPrice()
     {
@@ -1284,7 +1189,6 @@ public function getMinimalPrice()
      * Returns special price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSpecialPrice()
     {
@@ -1295,7 +1199,6 @@ public function getSpecialPrice()
      * Returns starting date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialFromDate()
     {
@@ -1306,7 +1209,6 @@ public function getSpecialFromDate()
      * Returns end date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialToDate()
     {
@@ -1317,7 +1219,6 @@ public function getSpecialToDate()
      * Retrieve array of related products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedProducts()
     {
@@ -1336,7 +1237,6 @@ public function getRelatedProducts()
      * Retrieve related products identifiers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedProductIds()
     {
@@ -1354,7 +1254,6 @@ public function getRelatedProductIds()
      * Retrieve collection related product
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     public function getRelatedProductCollection()
     {
@@ -1367,7 +1266,6 @@ public function getRelatedProductCollection()
      * Retrieve collection related link
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Collection
-     * @since 2.0.0
      */
     public function getRelatedLinkCollection()
     {
@@ -1383,7 +1281,6 @@ public function getRelatedLinkCollection()
      * Retrieve array of up sell products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUpSellProducts()
     {
@@ -1401,7 +1298,6 @@ public function getUpSellProducts()
      * Retrieve up sell products identifiers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUpSellProductIds()
     {
@@ -1419,7 +1315,6 @@ public function getUpSellProductIds()
      * Retrieve collection up sell product
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     public function getUpSellProductCollection()
     {
@@ -1432,7 +1327,6 @@ public function getUpSellProductCollection()
      * Retrieve collection up sell link
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Collection
-     * @since 2.0.0
      */
     public function getUpSellLinkCollection()
     {
@@ -1448,7 +1342,6 @@ public function getUpSellLinkCollection()
      * Retrieve array of cross sell products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCrossSellProducts()
     {
@@ -1466,7 +1359,6 @@ public function getCrossSellProducts()
      * Retrieve cross sell products identifiers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCrossSellProductIds()
     {
@@ -1484,7 +1376,6 @@ public function getCrossSellProductIds()
      * Retrieve collection cross sell product
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     public function getCrossSellProductCollection()
     {
@@ -1497,7 +1388,6 @@ public function getCrossSellProductCollection()
      * Retrieve collection cross sell link
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Collection
-     * @since 2.0.0
      */
     public function getCrossSellLinkCollection()
     {
@@ -1513,7 +1403,6 @@ public function getCrossSellLinkCollection()
      * Get product links info
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]
-     * @since 2.0.0
      */
     public function getProductLinks()
     {
@@ -1528,7 +1417,6 @@ public function getProductLinks()
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $links
      * @return $this
-     * @since 2.0.0
      */
     public function setProductLinks(array $links = null)
     {
@@ -1545,7 +1433,6 @@ public function setProductLinks(array $links = null)
      * Retrieve attributes for media gallery
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMediaAttributes()
     {
@@ -1565,7 +1452,6 @@ public function getMediaAttributes()
      * Retrieve assoc array that contains media attribute values of the product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMediaAttributeValues()
     {
@@ -1581,7 +1467,6 @@ public function getMediaAttributeValues()
      * Retrieve media gallery images
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getMediaGalleryImages()
     {
@@ -1634,7 +1519,6 @@ public function hasGalleryAttribute()
      * @param boolean       $move              if true, it will move source file
      * @param boolean       $exclude           mark image as disabled in product page view
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function addImageToMediaGallery($file, $mediaAttribute = null, $move = false, $exclude = true)
     {
@@ -1655,7 +1539,6 @@ public function addImageToMediaGallery($file, $mediaAttribute = null, $move = fa
      * Retrieve product media config
      *
      * @return Product\Media\Config
-     * @since 2.0.0
      */
     public function getMediaConfig()
     {
@@ -1666,7 +1549,6 @@ public function getMediaConfig()
      * Returns visible status IDs in catalog
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVisibleInCatalogStatuses()
     {
@@ -1677,7 +1559,6 @@ public function getVisibleInCatalogStatuses()
      * Retrieve visible statuses
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVisibleStatuses()
     {
@@ -1688,7 +1569,6 @@ public function getVisibleStatuses()
      * Check Product visible in catalog
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisibleInCatalog()
     {
@@ -1699,7 +1579,6 @@ public function isVisibleInCatalog()
      * Retrieve visible in site visibilities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVisibleInSiteVisibilities()
     {
@@ -1710,7 +1589,6 @@ public function getVisibleInSiteVisibilities()
      * Check Product visible in site
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisibleInSiteVisibility()
     {
@@ -1721,7 +1599,6 @@ public function isVisibleInSiteVisibility()
      * Checks product can be duplicated
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isDuplicable()
     {
@@ -1733,7 +1610,6 @@ public function isDuplicable()
      *
      * @param boolean $value
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function setIsDuplicable($value)
     {
@@ -1745,7 +1621,6 @@ public function setIsDuplicable($value)
      * Check is product available for sale
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSalable()
     {
@@ -1777,7 +1652,6 @@ public function isSalable()
      * Check whether the product type or stock allows to purchase the product
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -1789,7 +1663,6 @@ public function isAvailable()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSalable()
     {
@@ -1809,7 +1682,6 @@ public function getIsSalable()
      * Data helper wrapper
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual()
     {
@@ -1820,7 +1692,6 @@ public function isVirtual()
      * Alias for isSalable()
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSaleable()
     {
@@ -1831,7 +1702,6 @@ public function isSaleable()
      * Whether product available in stock
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInStock()
     {
@@ -1843,7 +1713,6 @@ public function isInStock()
      *
      * @param string $attributeCode Code of the attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeText($attributeCode)
     {
@@ -1856,7 +1725,6 @@ public function getAttributeText($attributeCode)
      * Returns array with dates for custom design
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomDesignDate()
     {
@@ -1872,7 +1740,6 @@ public function getCustomDesignDate()
      *
      * @param  bool $useSid
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($useSid = null)
     {
@@ -1884,7 +1751,6 @@ public function getProductUrl($useSid = null)
      *
      * @param array $params the route params
      * @return string
-     * @since 2.0.0
      */
     public function getUrlInStore($params = [])
     {
@@ -1896,7 +1762,6 @@ public function getUrlInStore($params = [])
      *
      * @param string $str URL
      * @return string
-     * @since 2.0.0
      */
     public function formatUrlKey($str)
     {
@@ -1910,7 +1775,6 @@ public function formatUrlKey($str)
      * @param mixed  $value New attribute value
      * @param int    $store Store ID
      * @return void
-     * @since 2.0.0
      */
     public function addAttributeUpdate($code, $value, $store)
     {
@@ -1930,7 +1794,6 @@ public function addAttributeUpdate($code, $value, $store)
      *
      * @param array $arrAttributes Attribute array
      * @return array
-     * @since 2.0.0
      */
     public function toArray(array $arrAttributes = [])
     {
@@ -1948,7 +1811,6 @@ public function toArray(array $arrAttributes = [])
      *
      * @param array $data Array to form the object from
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function fromArray(array $data)
     {
@@ -1973,7 +1835,6 @@ public function fromArray(array $data)
      * Returns request path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestPath()
     {
@@ -1983,7 +1844,6 @@ public function getRequestPath()
     /**
      * Custom function for other modules
      * @return string
-     * @since 2.0.0
      */
     public function getGiftMessageAvailable()
     {
@@ -1994,7 +1854,6 @@ public function getGiftMessageAvailable()
      * Check is product composite
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isComposite()
     {
@@ -2005,7 +1864,6 @@ public function isComposite()
      * Check if product can be configured
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canConfigure()
     {
@@ -2017,7 +1875,6 @@ public function canConfigure()
      * Retrieve sku through type instance
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -2028,7 +1885,6 @@ public function getSku()
      * Retrieve weight through type instance
      *
      * @return float
-     * @since 2.0.0
      */
     public function getWeight()
     {
@@ -2039,7 +1895,6 @@ public function getWeight()
      * Retrieve option instance
      *
      * @return Product\Option
-     * @since 2.0.0
      */
     public function getOptionInstance()
     {
@@ -2055,7 +1910,6 @@ public function getOptionInstance()
      *
      * @param Product\Option $option
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function addOption(Product\Option $option)
     {
@@ -2071,7 +1925,6 @@ public function addOption(Product\Option $option)
      *
      * @param int $optionId
      * @return Product\Option|null
-     * @since 2.0.0
      */
     public function getOptionById($optionId)
     {
@@ -2091,7 +1944,6 @@ public function getOptionById($optionId)
      * Retrieve options collection of product
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Collection
-     * @since 2.0.0
      */
     public function getProductOptionsCollection()
     {
@@ -2102,7 +1954,6 @@ public function getProductOptionsCollection()
      * Get all options of product
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface[]|null
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -2112,7 +1963,6 @@ public function getOptions()
     /**
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null)
     {
@@ -2125,7 +1975,6 @@ public function setOptions(array $options = null)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsVirtual()
     {
@@ -2139,7 +1988,6 @@ public function getIsVirtual()
      * @param   mixed  $value   Value of the option
      * @param   int|Product    $product Product ID
      * @return  $this
-     * @since 2.0.0
      */
     public function addCustomOption($code, $value, $product = null)
     {
@@ -2156,7 +2004,6 @@ public function addCustomOption($code, $value, $product = null)
      *
      * @param array $options Array of options
      * @return void
-     * @since 2.0.0
      */
     public function setCustomOptions(array $options)
     {
@@ -2167,7 +2014,6 @@ public function setCustomOptions(array $options)
      * Get all custom options of the product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomOptions()
     {
@@ -2179,7 +2025,6 @@ public function getCustomOptions()
      *
      * @param   string $code
      * @return  array
-     * @since 2.0.0
      */
     public function getCustomOption($code)
     {
@@ -2193,7 +2038,6 @@ public function getCustomOption($code)
      * Checks if there custom option for this product
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasCustomOptions()
     {
@@ -2209,7 +2053,6 @@ public function hasCustomOptions()
      *
      * @param   int $categoryId
      * @return  bool
-     * @since 2.0.0
      */
     public function canBeShowInCategory($categoryId)
     {
@@ -2220,7 +2063,6 @@ public function canBeShowInCategory($categoryId)
      * Retrieve category ids where product is available
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableInCategories()
     {
@@ -2231,7 +2073,6 @@ public function getAvailableInCategories()
      * Retrieve default attribute set id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultAttributeSetId()
     {
@@ -2242,7 +2083,6 @@ public function getDefaultAttributeSetId()
      * Reset all model data
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -2255,7 +2095,6 @@ public function reset()
      * Get cache tags associated with object id
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getCacheIdTags()
     {
@@ -2275,7 +2114,6 @@ public function getCacheIdTags()
      *
      * @param  array $productIds
      * @return boolean|null
-     * @since 2.0.0
      */
     public function isProductsHasSku(array $productIds)
     {
@@ -2296,7 +2134,6 @@ public function isProductsHasSku(array $productIds)
      *
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function processBuyRequest(\Magento\Framework\DataObject $buyRequest)
     {
@@ -2329,7 +2166,6 @@ function ($value) {
      * Get preconfigured values from product
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getPreconfiguredValues()
     {
@@ -2346,7 +2182,6 @@ public function getPreconfiguredValues()
      * To be sure that all product custom options does not has ID and has product instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function prepareCustomOptions()
     {
@@ -2363,7 +2198,6 @@ public function prepareCustomOptions()
      * Clearing references on product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _clearReferences()
     {
@@ -2375,7 +2209,6 @@ protected function _clearReferences()
      * Clearing product's data
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _clearData()
     {
@@ -2398,7 +2231,6 @@ protected function _clearData()
      * Clearing references to product from product's options
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _clearOptionReferences()
     {
@@ -2421,7 +2253,6 @@ protected function _clearOptionReferences()
      *
      * @param string|array $columns One or several columns
      * @return array
-     * @since 2.0.0
      */
     public function getProductEntitiesInfo($columns = null)
     {
@@ -2432,7 +2263,6 @@ public function getProductEntitiesInfo($columns = null)
      * Checks whether product has disabled status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled()
     {
@@ -2443,7 +2273,6 @@ public function isDisabled()
      * Sets product image from it's child if possible
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImage()
     {
@@ -2455,7 +2284,6 @@ public function getImage()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -2504,7 +2332,6 @@ private function isStockStatusChanged()
      * Reload PriceInfo object
      *
      * @return \Magento\Framework\Pricing\PriceInfo\Base
-     * @since 2.0.0
      */
     public function reloadPriceInfo()
     {
@@ -2519,7 +2346,6 @@ public function reloadPriceInfo()
      *
      * @return array
      * @todo refactor with converter for AbstractExtensibleModel
-     * @since 2.0.0
      */
     public function __toArray()
     {
@@ -2546,7 +2372,6 @@ public function __toArray()
      * Convert Category model into flat array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray()
     {
@@ -2569,7 +2394,6 @@ public function toFlatArray()
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -2581,7 +2405,6 @@ public function setSku($sku)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -2593,7 +2416,6 @@ public function setName($name)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -2605,7 +2427,6 @@ public function setStoreId($storeId)
      *
      * @param int $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -2617,7 +2438,6 @@ public function setAttributeSetId($attributeSetId)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -2629,7 +2449,6 @@ public function setPrice($price)
      *
      * @param int $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status)
     {
@@ -2641,7 +2460,6 @@ public function setStatus($status)
      *
      * @param int $visibility
      * @return $this
-     * @since 2.0.0
      */
     public function setVisibility($visibility)
     {
@@ -2653,7 +2471,6 @@ public function setVisibility($visibility)
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -2665,7 +2482,6 @@ public function setCreatedAt($createdAt)
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -2677,7 +2493,6 @@ public function setUpdatedAt($updatedAt)
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight)
     {
@@ -2689,7 +2504,6 @@ public function setWeight($weight)
      *
      * @param string $typeId
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeId($typeId)
     {
@@ -2703,7 +2517,6 @@ public function setTypeId($typeId)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductExtensionInterface
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -2721,7 +2534,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes)
     {
@@ -2733,7 +2545,6 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
     /**
      * @param array $mediaGallery
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
-     * @since 2.0.0
      */
     protected function convertToMediaGalleryInterface(array $mediaGallery)
     {
@@ -2750,7 +2561,6 @@ protected function convertToMediaGalleryInterface(array $mediaGallery)
 
     /**
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
-     * @since 2.0.0
      */
     public function getMediaGalleryEntries()
     {
@@ -2766,7 +2576,6 @@ public function getMediaGalleryEntries()
     /**
      * @param ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaGalleryEntries(array $mediaGalleryEntries = null)
     {
@@ -2837,7 +2646,7 @@ private function getMediaGalleryProcessor()
      *
      * @param array $productIds
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setAssociatedProductIds(array $productIds)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index d8874a84b0344..34c50d5ee4ce7 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Action extends \Magento\Framework\Model\AbstractModel
 {
@@ -22,25 +21,21 @@ class Action extends \Magento\Framework\Model\AbstractModel
      * Product website factory
      *
      * @var \Magento\Catalog\Model\Product\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_productWebsiteFactory;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_productEavIndexerProcessor;
 
@@ -54,7 +49,6 @@ class Action extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -78,7 +72,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -89,7 +82,6 @@ protected function _construct()
      * Retrieve resource instance wrapper
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Action
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -103,7 +95,6 @@ protected function _getResource()
      * @param array $attrData
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function updateAttributes($productIds, $attrData, $storeId)
     {
@@ -134,7 +125,6 @@ public function updateAttributes($productIds, $attrData, $storeId)
      * @param array $attributesData
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _hasIndexableAttributes($attributesData)
     {
@@ -151,7 +141,6 @@ protected function _hasIndexableAttributes($attributesData)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute|string $attribute
      * @return bool
-     * @since 2.0.0
      */
     protected function _attributeIsIndexable($attribute)
     {
@@ -173,7 +162,6 @@ protected function _attributeIsIndexable($attribute)
      * @param array $websiteIds
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     public function updateWebsites($productIds, $websiteIds, $type)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
index 03308a43a4c0f..c2108b0273bdb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
@@ -11,7 +11,6 @@
  * Product attribute for enable/disable option
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -20,7 +19,6 @@ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
index bca2c5009ddd4..b62301dece2f3 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Backend\Category
  *
- * @since 2.0.0
  */
 class Category extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -23,7 +22,6 @@ class Category extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacke
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 9482601790a2d..023f518211fed 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -17,7 +17,6 @@
  * Catalog product abstract group price backend attribute model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractGroupPrice extends Price
 {
@@ -31,7 +30,6 @@ abstract class AbstractGroupPrice extends Price
      * Website currency codes and rates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates;
 
@@ -40,7 +38,6 @@ abstract class AbstractGroupPrice extends Price
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract protected function _getDuplicateErrorMessage();
 
@@ -48,13 +45,11 @@ abstract protected function _getDuplicateErrorMessage();
      * Catalog product type
      *
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_catalogProductType;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
@@ -67,7 +62,6 @@ abstract protected function _getDuplicateErrorMessage();
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param GroupManagementInterface $groupManagement
      * @param ScopeOverriddenValue|null $scopeOverriddenValue
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -95,7 +89,6 @@ public function __construct(
      * Retrieve websites currency rates and base currency codes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getWebsiteCurrencyRates()
     {
@@ -132,7 +125,6 @@ protected function _getWebsiteCurrencyRates()
      * Retrieve resource instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-     * @since 2.0.0
      */
     abstract protected function _getResource();
 
@@ -142,7 +134,6 @@ abstract protected function _getResource();
      * @param array $objectArray
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getAdditionalUniqueFields($objectArray)
     {
@@ -167,7 +158,6 @@ protected function getAdditionalFields($objectArray)
      *
      * @param \Magento\Catalog\Model\Product\Type\Price $priceObject
      * @return bool
-     * @since 2.0.0
      */
     protected function _isPriceFixed($priceObject)
     {
@@ -182,7 +172,6 @@ protected function _isPriceFixed($priceObject)
      * @return \Magento\Framework\Phrase|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -283,7 +272,6 @@ protected function validatePrice(array $priceRow)
      * @param string $productTypeId
      * @param int $websiteId
      * @return array
-     * @since 2.0.0
      */
     public function preparePriceData(array $priceData, $productTypeId, $websiteId)
     {
@@ -316,7 +304,6 @@ public function preparePriceData(array $priceData, $productTypeId, $websiteId)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
@@ -397,7 +384,6 @@ protected function modifyPriceData($object, $data)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
@@ -539,7 +525,6 @@ protected function updateValues(array $valuesToUpdate, array $oldValues)
      *
      * @param  \Magento\Catalog\Model\Product $object
      * @return array
-     * @since 2.0.0
      */
     public function getAffectedFields($object)
     {
@@ -561,7 +546,6 @@ public function getAffectedFields($object)
      * Get resource model instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
-     * @since 2.0.0
      */
     public function getResource()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterInterface.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterInterface.php
index 34c1a1a945377..2d6e9d66ea6d7 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterInterface.php
@@ -13,7 +13,6 @@
  * Interface EntryConverterInterface. Create Media Gallery Entry and extract Entry data
  *
  * @api
- * @since 2.0.0
  */
 interface EntryConverterInterface
 {
@@ -21,7 +20,6 @@ interface EntryConverterInterface
      * Return Media Gallery Entry type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaEntryType();
 
@@ -31,7 +29,6 @@ public function getMediaEntryType();
      * @param Product $product
      * @param array $rowData
      * @return ProductAttributeMediaGalleryEntryInterface[]
-     * @since 2.0.0
      */
     public function convertTo(Product $product, array $rowData);
 
@@ -40,7 +37,6 @@ public function convertTo(Product $product, array $rowData);
      *
      * @param ProductAttributeMediaGalleryEntryInterface $entry
      * @return array
-     * @since 2.0.0
      */
     public function convertFrom(ProductAttributeMediaGalleryEntryInterface $entry);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterPool.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterPool.php
index 817854f77bfc4..ee4f3af3f3a90 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterPool.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/EntryConverterPool.php
@@ -10,19 +10,16 @@
  * Class aggregate all Media Gallery Entry Converters
  *
  * @api
- * @since 2.0.0
  */
 class EntryConverterPool
 {
     /**
      * @var EntryConverterInterface[]
-     * @since 2.0.0
      */
     private $mediaGalleryEntryConvertersCollection;
 
     /**
      * @param EntryConverterInterface[] $mediaGalleryEntryConvertersCollection
-     * @since 2.0.0
      */
     public function __construct(array $mediaGalleryEntryConvertersCollection)
     {
@@ -42,7 +39,6 @@ public function __construct(array $mediaGalleryEntryConvertersCollection)
      * @param string $mediaType
      * @return EntryConverterInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getConverterByMediaType($mediaType)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php
index f0ae6f5969869..a8eff8d54a4c8 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php
@@ -12,7 +12,6 @@
 
 /**
  * Converter for Image media gallery type
- * @since 2.0.0
  */
 class ImageEntryConverter implements EntryConverterInterface
 {
@@ -23,20 +22,17 @@ class ImageEntryConverter implements EntryConverterInterface
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory
-     * @since 2.0.0
      */
     protected $mediaGalleryEntryFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMediaEntryType()
     {
@@ -59,7 +54,6 @@ public function getMediaEntryType()
      * @param Product $product
      * @param array $rowData
      * @return ProductAttributeMediaGalleryEntryInterface $entry
-     * @since 2.0.0
      */
     public function convertTo(Product $product, array $rowData)
     {
@@ -83,7 +77,6 @@ public function convertTo(Product $product, array $rowData)
     /**
      * @param ProductAttributeMediaGalleryEntryInterface $entry
      * @return array
-     * @since 2.0.0
      */
     public function convertFrom(ProductAttributeMediaGalleryEntryInterface $entry)
     {
@@ -103,7 +96,6 @@ public function convertFrom(ProductAttributeMediaGalleryEntryInterface $entry)
     /**
      * @param ImageContentInterface $content
      * @return array
-     * @since 2.0.0
      */
     protected function convertFromMediaGalleryEntryContentInterface(
         ImageContentInterface $content = null
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index b42a840f8808c..a725087e7a6fe 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -22,7 +21,6 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Catalog helper
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -30,7 +28,6 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -38,7 +35,6 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Currency factory
      *
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -46,13 +42,11 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Core config model
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
@@ -69,7 +63,6 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param ScopeOverriddenValue|null $scopeOverriddenValue
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -94,7 +87,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function setAttribute($attribute)
     {
@@ -108,7 +100,6 @@ public function setAttribute($attribute)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function setScope($attribute)
     {
@@ -131,7 +122,6 @@ public function setScope($attribute)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
@@ -176,7 +166,6 @@ private function isUseDefault($object)
      * @param \Magento\Catalog\Model\Product $object
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -199,7 +188,6 @@ public function validate($object)
      *
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isPositiveOrZero($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
index 0d64a42fd3103..c314e173c9970 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Backend\Sku
  *
- * @since 2.0.0
  */
 class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -33,13 +32,11 @@ class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\StringUtils $string)
     {
@@ -53,7 +50,6 @@ public function __construct(\Magento\Framework\Stdlib\StringUtils $string)
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -76,7 +72,6 @@ public function validate($object)
      *
      * @param Product $object
      * @return void
-     * @since 2.0.0
      */
     protected function _generateUniqueSku($object)
     {
@@ -102,7 +97,6 @@ protected function _generateUniqueSku($object)
      *
      * @param Product $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -116,7 +110,6 @@ public function beforeSave($object)
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param Product $object
      * @return int
-     * @since 2.0.0
      */
     protected function _getLastSimilarAttributeValueIncrement($attribute, $object)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
index 9f515e1ddca32..17960a09b899d 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
@@ -14,7 +14,6 @@
  * @see StockItemInterface when you want to change the stock data
  * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
  * @see StockItemRepositoryInterface::save as extension point for customization of saving process
- * @since 2.0.0
  */
 class Stock extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -22,7 +21,6 @@ class Stock extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Stock Registry
      *
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -30,7 +28,6 @@ class Stock extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Construct
      *
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param Product $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
@@ -61,7 +57,6 @@ public function afterLoad($object)
      * @param Product $object
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 0acc1cf82ea66..93975178e5df3 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice
  *
- * @since 2.0.0
  */
 class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
 {
@@ -24,7 +23,6 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
      * Catalog product attribute backend tierprice
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-     * @since 2.0.0
      */
     protected $_productAttributeBackendTierprice;
 
@@ -38,7 +36,6 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $productAttributeTierprice
      * @param ScopeOverriddenValue|null $scopeOverriddenValue
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -68,7 +65,6 @@ public function __construct(
      * Retrieve resource instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -80,7 +76,6 @@ protected function _getResource()
      *
      * @param array $objectArray
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalUniqueFields($objectArray)
     {
@@ -106,7 +101,6 @@ protected function getAdditionalFields($objectArray)
      * Error message when duplicates
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getDuplicateErrorMessage()
     {
@@ -118,7 +112,6 @@ protected function _getDuplicateErrorMessage()
      *
      * @param \Magento\Catalog\Model\Product\Type\Price $priceObject
      * @return bool
-     * @since 2.0.0
      */
     protected function _isPriceFixed($priceObject)
     {
@@ -129,7 +122,6 @@ protected function _isPriceFixed($priceObject)
      * By default attribute value is considered non-scalar that can be stored in a generic way
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScalar()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
index e81128e53073c..b79230d859096 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Backend\Weight
  *
- * @since 2.0.0
  */
 class Weight extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat
@@ -41,7 +38,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $object
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -60,7 +56,6 @@ public function validate($object)
      *
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isPositiveOrZero($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/DefaultAttributes.php b/app/code/Magento/Catalog/Model/Product/Attribute/DefaultAttributes.php
index 4dce41a99107f..fd71b10fb6207 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/DefaultAttributes.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/DefaultAttributes.php
@@ -11,7 +11,6 @@
  * Product default attributes provider
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class DefaultAttributes implements ProviderInterface
 {
@@ -19,7 +18,6 @@ class DefaultAttributes implements ProviderInterface
      * Retrieve default entity static attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDefaultAttributes()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index 91af5eb643a5a..a0dfb2b4ee9b2 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Frontend\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
 {
@@ -22,7 +21,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -30,7 +28,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
      * Construct
      *
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      * @param  \Magento\Catalog\Model\Product $product
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getUrl($product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
index 2fb134a12baf7..dacef56de30d4 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Group
  *
- * @since 2.0.0
  */
 class Group extends \Magento\Eav\Model\Entity\Attribute\Group
 {
@@ -19,7 +18,6 @@ class Group extends \Magento\Eav\Model\Entity\Attribute\Group
      * Attribute collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -34,7 +32,6 @@ class Group extends \Magento\Eav\Model\Entity\Attribute\Group
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -64,7 +61,6 @@ public function __construct(
      * Check if group contains system attributes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasSystemAttributes()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Management.php b/app/code/Magento/Catalog/Model/Product/Attribute/Management.php
index bb566ba790c6c..e0c6bd83c89f6 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Management.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Management.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Management
  *
- * @since 2.0.0
  */
 class Management implements \Magento\Catalog\Api\ProductAttributeManagementInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeManagementInterface
-     * @since 2.0.0
      */
     protected $eavAttributeManagement;
 
     /**
      * @param \Magento\Eav\Api\AttributeManagementInterface $eavAttributeManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeManagementInterface $eavAttributeManagement
@@ -31,7 +28,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function assign($attributeSetId, $attributeGroupId, $attributeCode, $sortOrder)
     {
@@ -46,7 +42,6 @@ public function assign($attributeSetId, $attributeGroupId, $attributeCode, $sort
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function unassign($attributeSetId, $attributeCode)
     {
@@ -55,7 +50,6 @@ public function unassign($attributeSetId, $attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributes($attributeSetId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index 030926e78932f..b8fbbef9400ea 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\OptionManagement
  *
- * @since 2.0.0
  */
 class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeOptionManagementInterface
-     * @since 2.0.0
      */
     protected $eavOptionManagement;
 
     /**
      * @param \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
@@ -33,7 +30,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems($attributeCode)
     {
@@ -45,7 +41,6 @@ public function getItems($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function add($attributeCode, $option)
     {
@@ -58,7 +53,6 @@ public function add($attributeCode, $option)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($attributeCode, $optionId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
index 8a1b854b4a5f6..270a2f229678b 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
@@ -12,49 +12,41 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Attribute
-     * @since 2.0.0
      */
     protected $attributeResource;
 
     /**
      * @var \Magento\Eav\Model\AttributeRepository
-     * @since 2.0.0
      */
     protected $eavAttributeRepository;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory
-     * @since 2.0.0
      */
     protected $inputtypeValidatorFactory;
 
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $productHelper;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -66,7 +58,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory $validatorFactory
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Attribute $attributeResource,
@@ -88,7 +79,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($attributeCode)
     {
@@ -100,7 +90,6 @@ public function get($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -114,7 +103,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
@@ -214,7 +202,6 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
@@ -224,7 +211,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($attributeCode)
     {
@@ -237,7 +223,6 @@ public function deleteById($attributeCode)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
@@ -249,7 +234,6 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
      *
      * @param string $label
      * @return string
-     * @since 2.0.0
      */
     protected function generateCode($label)
     {
@@ -267,7 +251,6 @@ protected function generateCode($label)
      * @param string $code
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function validateCode($code)
     {
@@ -283,7 +266,6 @@ protected function validateCode($code)
      * @param  string $frontendInput
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function validateFrontendInput($frontendInput)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
index 76919424dea95..c3fac33de6169 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\SetManagement
  *
- * @since 2.0.0
  */
 class SetManagement implements \Magento\Catalog\Api\AttributeSetManagementInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeSetManagementInterface
-     * @since 2.0.0
      */
     protected $attributeSetManagement;
 
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeSetRepository;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -37,7 +33,6 @@ class SetManagement implements \Magento\Catalog\Api\AttributeSetManagementInterf
      * @param \Magento\Eav\Api\AttributeSetManagementInterface $attributeSetManagement
      * @param \Magento\Eav\Api\AttributeSetRepositoryInterface $attributeSetRepository
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeSetManagementInterface $attributeSetManagement,
@@ -51,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet, $skeletonId)
     {
@@ -67,7 +61,6 @@ public function create(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet
      * @param int $skeletonId
      * @return void
      * @throws StateException
-     * @since 2.0.0
      */
     protected function validateSkeletonSet($skeletonId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
index 62006240d86e3..e68b2d976413f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\SetRepository
  *
- * @since 2.0.0
  */
 class SetRepository implements \Magento\Catalog\Api\AttributeSetRepositoryInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeSetRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -44,7 +39,6 @@ class SetRepository implements \Magento\Catalog\Api\AttributeSetRepositoryInterf
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeSetRepositoryInterface $attributeSetRepository,
@@ -60,7 +54,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
     {
@@ -70,7 +63,6 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -90,7 +82,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($attributeSetId)
     {
@@ -101,7 +92,6 @@ public function get($attributeSetId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
     {
@@ -111,7 +101,6 @@ public function delete(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($attributeSetId)
     {
@@ -125,7 +114,6 @@ public function deleteById($attributeSetId)
      * @param  \Magento\Eav\Api\Data\AttributeSetInterface $attributeSet
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function validate(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Boolean.php
index bc83d2245930d..52d215d8d9ba8 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Boolean.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Boolean.php
@@ -9,7 +9,6 @@
  * Product attribute source model for enable/disable option
  *
  * @api
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Source\Boolean
 {
@@ -22,7 +21,6 @@ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Source\Boolean
      * Retrieve all attribute options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
index 7dc2bdb8858ac..2699636e02810 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
@@ -17,13 +17,11 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Source\Countryofmanufacture
  *
- * @since 2.0.0
  */
 class Countryofmanufacture extends AbstractSource implements OptionSourceInterface
 {
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
@@ -31,7 +29,6 @@ class Countryofmanufacture extends AbstractSource implements OptionSourceInterfa
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -39,7 +36,6 @@ class Countryofmanufacture extends AbstractSource implements OptionSourceInterfa
      * Country factory
      *
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
@@ -55,7 +51,6 @@ class Countryofmanufacture extends AbstractSource implements OptionSourceInterfa
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CountryFactory $countryFactory,
@@ -71,7 +66,6 @@ public function __construct(
      * Get list of all available countries
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index eb512aafdc646..f8a8496ff0559 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\Source\Inputtype
  *
- * @since 2.0.0
  */
 class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
 {
@@ -22,7 +21,6 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -30,14 +28,12 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Framework\Registry $coreRegistry)
     {
@@ -50,7 +46,6 @@ public function __construct(\Magento\Framework\Event\ManagerInterface $eventMana
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index a1d0eb6c6d291..63b1444d1db07 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -9,19 +9,16 @@
  * Catalog product landing page attribute source
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
-     * @since 2.0.0
      */
     protected $pageLayoutBuilder;
 
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
index f0801d12052c9..9f75caac275bb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
@@ -13,7 +13,6 @@
  * Product status functionality model
  *
  * @api
- * @since 2.0.0
  */
 class Status extends AbstractSource implements SourceInterface, OptionSourceInterface
 {
@@ -30,7 +29,6 @@ class Status extends AbstractSource implements SourceInterface, OptionSourceInte
      * Retrieve Visible Status Ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getVisibleStatusIds()
     {
@@ -42,7 +40,6 @@ public function getVisibleStatusIds()
      * Default Product Enable status
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getSaleableStatusIds()
     {
@@ -53,7 +50,6 @@ public function getSaleableStatusIds()
      * Retrieve option array
      *
      * @return string[]
-     * @since 2.0.0
      */
     public static function getOptionArray()
     {
@@ -64,7 +60,6 @@ public static function getOptionArray()
      * Retrieve option array with empty value
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -82,7 +77,6 @@ public function getAllOptions()
      *
      * @param string $optionId
      * @return string
-     * @since 2.0.0
      */
     public function getOptionText($optionId)
     {
@@ -97,7 +91,6 @@ public function getOptionText($optionId)
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
      * @param string $dir direction
      * @return AbstractSource
-     * @since 2.0.0
      */
     public function addValueSortToCollection($collection, $dir = 'asc')
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Type.php b/app/code/Magento/Catalog/Model/Product/Attribute/Type.php
index 5f68f2966e984..b7fba013b5002 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Type.php
@@ -8,14 +8,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Catalog\Api\Data\ProductAttributeTypeInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -24,7 +22,6 @@ public function getValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -36,7 +33,6 @@ public function getLabel()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -48,7 +44,6 @@ public function setValue($value)
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -59,7 +54,6 @@ public function setLabel($label)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -71,7 +65,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductAttributeTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/TypesList.php b/app/code/Magento/Catalog/Model/Product/Attribute/TypesList.php
index 4541f2b6bf77c..6e728df9defbb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/TypesList.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/TypesList.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Catalog\Model\Product\Attribute\TypesList
  *
- * @since 2.0.0
  */
 class TypesList implements \Magento\Catalog\Api\ProductAttributeTypesListInterface
 {
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory
-     * @since 2.0.0
      */
     private $inputTypeFactory;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductAttributeTypeInterfaceFactory
-     * @since 2.0.0
      */
     private $attributeTypeFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
@@ -35,7 +31,6 @@ class TypesList implements \Magento\Catalog\Api\ProductAttributeTypesListInterfa
      * @param Source\InputtypeFactory $inputTypeFactory
      * @param \Magento\Catalog\Api\Data\ProductAttributeTypeInterfaceFactory $attributeTypeFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory $inputTypeFactory,
@@ -49,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
index b6d721d8d7e2d..0b435a20daa46 100644
--- a/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
+++ b/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Catalog\Model\Product\AttributeSet\Build
  *
- * @since 2.0.0
  */
 class Build
 {
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $attributeSetFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $entityTypeId;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $skeletonId;
 
     /**
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory  $attributeSetFactory
@@ -51,7 +45,6 @@ public function __construct(
     /**
      * @param int $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypeId($entityTypeId)
     {
@@ -62,7 +55,6 @@ public function setEntityTypeId($entityTypeId)
     /**
      * @param int $skeletonId
      * @return $this
-     * @since 2.0.0
      */
     public function setSkeletonId($skeletonId)
     {
@@ -73,7 +65,6 @@ public function setSkeletonId($skeletonId)
     /**
      * @param string $setName
      * @return $this
-     * @since 2.0.0
      */
     public function setName($setName)
     {
@@ -84,7 +75,6 @@ public function setName($setName)
     /**
      * @return \Magento\Eav\Model\Entity\Attribute\Set
      * @throws AlreadyExistsException
-     * @since 2.0.0
      */
     public function getAttributeSet()
     {
@@ -106,7 +96,6 @@ public function getAttributeSet()
     /**
      * @trows \InvalidArgumentException
      * @return void
-     * @since 2.0.0
      */
     protected function validateParameters()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
index a9b12470740e9..195d032345446 100644
--- a/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
+++ b/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
@@ -8,20 +8,17 @@
 /**
  * Class \Magento\Catalog\Model\Product\AttributeSet\Options
  *
- * @since 2.0.0
  */
 class Options implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * @var null|array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $collectionFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product $product
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $collectionFactory,
@@ -33,7 +30,6 @@ public function __construct(
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/SuggestedSet.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/SuggestedSet.php
index 7b4696107806d..985144f756206 100644
--- a/app/code/Magento/Catalog/Model/Product/AttributeSet/SuggestedSet.php
+++ b/app/code/Magento/Catalog/Model/Product/AttributeSet/SuggestedSet.php
@@ -7,7 +7,6 @@
 
 /**
  * Suggested product attribute set
- * @since 2.0.0
  */
 class SuggestedSet
 {
@@ -15,7 +14,6 @@ class SuggestedSet
      * Set collection factory
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $attributeSetCollectionFactory;
 
@@ -23,13 +21,11 @@ class SuggestedSet
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $resourceHelper;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $product;
 
@@ -37,7 +33,6 @@ class SuggestedSet
      * @param \Magento\Catalog\Model\ResourceModel\Product $product
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attributeSetCollectionFactory
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product $product,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param string $labelPart
      * @return array
-     * @since 2.0.0
      */
     public function getSuggestedSets($labelPart)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CartConfiguration.php b/app/code/Magento/Catalog/Model/Product/CartConfiguration.php
index f5bb8c6496302..9b76cd4eabd95 100644
--- a/app/code/Magento/Catalog/Model/Product/CartConfiguration.php
+++ b/app/code/Magento/Catalog/Model/Product/CartConfiguration.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\CartConfiguration
  *
- * @since 2.0.0
  */
 class CartConfiguration
 {
@@ -22,7 +21,6 @@ class CartConfiguration
      * @param \Magento\Catalog\Model\Product $product
      * @param array $config
      * @return bool
-     * @since 2.0.0
      */
     public function isProductConfigured(\Magento\Catalog\Model\Product $product, $config)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CatalogPrice.php b/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
index 4bc8d4df4c390..a8519d1bcd52f 100644
--- a/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
@@ -7,19 +7,16 @@
 
 /**
  * Price model for external catalogs
- * @since 2.0.0
  */
 class CatalogPrice implements CatalogPriceInterface
 {
     /**
      * @var CatalogPriceFactory
-     * @since 2.0.0
      */
     protected $priceModelFactory;
 
     /**
      * @var array catalog price models for different product types
-     * @since 2.0.0
      */
     protected $priceModelPool;
 
@@ -27,7 +24,6 @@ class CatalogPrice implements CatalogPriceInterface
      *
      * @param CatalogPriceFactory $priceModelFactory
      * @param array $priceModelPool
-     * @since 2.0.0
      */
     public function __construct(CatalogPriceFactory $priceModelFactory, array $priceModelPool)
     {
@@ -37,7 +33,6 @@ public function __construct(CatalogPriceFactory $priceModelFactory, array $price
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCatalogPrice(
         \Magento\Catalog\Model\Product $product,
@@ -58,7 +53,6 @@ public function getCatalogPrice(
      * @param \Magento\Catalog\Model\Product $product
      * @return float
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CatalogPriceFactory.php b/app/code/Magento/Catalog/Model/Product/CatalogPriceFactory.php
index c36bdf594a067..563c407498f15 100644
--- a/app/code/Magento/Catalog/Model/Product/CatalogPriceFactory.php
+++ b/app/code/Magento/Catalog/Model/Product/CatalogPriceFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * Price model for external catalogs
- * @since 2.0.0
  */
 class CatalogPriceFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $name
      * @return \Magento\Catalog\Model\Product\CatalogPriceInterface
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function create($name)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CatalogPriceInterface.php b/app/code/Magento/Catalog/Model/Product/CatalogPriceInterface.php
index d0e09be94e3e5..e9619a4833403 100644
--- a/app/code/Magento/Catalog/Model/Product/CatalogPriceInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/CatalogPriceInterface.php
@@ -10,7 +10,6 @@
  * Product price interface for external catalogs
  *
  * @api
- * @since 2.0.0
  */
 interface CatalogPriceInterface
 {
@@ -21,7 +20,6 @@ interface CatalogPriceInterface
      * @param null|\Magento\Store\Api\Data\StoreInterface $store Store view
      * @param bool $inclTax
      * @return null|float
-     * @since 2.0.0
      */
     public function getCatalogPrice(
         \Magento\Catalog\Model\Product $product,
@@ -34,7 +32,6 @@ public function getCatalogPrice(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return float|null
-     * @since 2.0.0
      */
     public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index 69d89440c5d32..9d8fa10ba9603 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -19,7 +19,6 @@
  * @method \Magento\Catalog\Model\Product\Compare\Item setProductId(int $value)
  * @method int getStoreId()
  * @method \Magento\Catalog\Model\Product\Compare\Item setStoreId(int $value)
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -32,7 +31,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_compare_item';
 
@@ -42,7 +40,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * In observe method you can use $observer->getEvent()->getItem() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'item';
 
@@ -50,7 +47,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * Catalog product compare
      *
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $_catalogProductCompare = null;
 
@@ -58,7 +54,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -66,7 +61,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * Customer visitor
      *
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -74,7 +68,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -88,7 +81,6 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -112,7 +104,6 @@ public function __construct(
      * Initialize resourse model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -123,7 +114,6 @@ protected function _construct()
      * Retrieve Resource instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Compare\Item
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -134,7 +124,6 @@ protected function _getResource()
      * Set current store before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -151,7 +140,6 @@ public function beforeSave()
      *
      * @param int $visitorId
      * @return $this
-     * @since 2.0.0
      */
     public function addVisitorId($visitorId)
     {
@@ -164,7 +152,6 @@ public function addVisitorId($visitorId)
      *
      * @param Product|int $product
      * @return $this
-     * @since 2.0.0
      */
     public function loadByProduct($product)
     {
@@ -177,7 +164,6 @@ public function loadByProduct($product)
      *
      * @param Product|int $product
      * @return $this
-     * @since 2.0.0
      */
     public function addProductData($product)
     {
@@ -194,7 +180,6 @@ public function addProductData($product)
      * Retrieve data for save
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDataForSave()
     {
@@ -210,7 +195,6 @@ public function getDataForSave()
      * Customer login bind process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function bindCustomerLogin()
     {
@@ -226,7 +210,6 @@ public function bindCustomerLogin()
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function bindCustomerLogout(\Magento\Framework\Event\Observer $observer = null)
     {
@@ -240,7 +223,6 @@ public function bindCustomerLogout(\Magento\Framework\Event\Observer $observer =
      * Clean compare items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -252,7 +234,6 @@ public function clean()
      * Retrieve Customer Id if loggined
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -267,7 +248,6 @@ public function getCustomerId()
      * Retrieve Visitor Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVisitorId()
     {
@@ -282,7 +262,6 @@ public function getVisitorId()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
index e97578be6925d..bb33749d25129 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class ListCompare extends \Magento\Framework\DataObject
 {
@@ -20,7 +19,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * Customer visitor
      *
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -28,7 +26,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -36,7 +33,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * Catalog product compare item
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item
-     * @since 2.0.0
      */
     protected $_catalogProductCompareItem;
 
@@ -44,7 +40,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * Item collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemCollectionFactory;
 
@@ -52,7 +47,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * Compare item factory
      *
      * @var \Magento\Catalog\Model\Product\Compare\ItemFactory
-     * @since 2.0.0
      */
     protected $_compareItemFactory;
 
@@ -65,7 +59,6 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
@@ -88,7 +81,6 @@ public function __construct(
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function addProduct($product)
     {
@@ -110,7 +102,6 @@ public function addProduct($product)
      *
      * @param string[] $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function addProducts($productIds)
     {
@@ -126,7 +117,6 @@ public function addProducts($productIds)
      * Retrieve Compare Items Collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -138,7 +128,6 @@ public function getItemCollection()
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function removeProduct($product)
     {
@@ -159,7 +148,6 @@ public function removeProduct($product)
      *
      * @param \Magento\Catalog\Model\Product\Compare\Item $item
      * @return $this
-     * @since 2.0.0
      */
     protected function _addVisitorToItem($item)
     {
@@ -177,7 +165,6 @@ protected function _addVisitorToItem($item)
      * @param int $customerId
      * @param int $visitorId
      * @return bool
-     * @since 2.0.0
      */
     public function hasItems($customerId, $visitorId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Condition.php b/app/code/Magento/Catalog/Model/Product/Condition.php
index e1f70ae4bfa1c..c27569ce7b7c4 100644
--- a/app/code/Magento/Catalog/Model/Product/Condition.php
+++ b/app/code/Magento/Catalog/Model/Product/Condition.php
@@ -14,7 +14,6 @@
  * @method Condition setPkFieldName(string $fieldName)
  * @method string|array getTable()
  * @method Condition setTable($table)
- * @since 2.0.0
  */
 class Condition extends \Magento\Framework\DataObject implements Condition\ConditionInterface
 {
@@ -22,7 +21,6 @@ class Condition extends \Magento\Framework\DataObject implements Condition\Condi
      * @param AbstractCollection $collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function applyToCollection($collection)
     {
@@ -40,7 +38,6 @@ public function applyToCollection($collection)
      * @param AdapterInterface $dbAdapter
      *
      * @return Select|string
-     * @since 2.0.0
      */
     public function getIdsSelect($dbAdapter)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php b/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
index ac50194f1d9d1..f1be3a1d4d599 100644
--- a/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
@@ -12,21 +12,18 @@
 /**
  * Interface \Magento\Catalog\Model\Product\Condition\ConditionInterface
  *
- * @since 2.0.0
  */
 interface ConditionInterface
 {
     /**
      * @param AbstractCollection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function applyToCollection($collection);
 
     /**
      * @param AdapterInterface $dbAdapter
      * @return Select|string
-     * @since 2.0.0
      */
     public function getIdsSelect($dbAdapter);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php
index c682cf5d3578f..06937bf5cf23b 100644
--- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php
@@ -10,7 +10,6 @@
  * Product configurational item interface
  *
  * @api
- * @since 2.0.0
  */
 interface ItemInterface
 {
@@ -18,7 +17,6 @@ interface ItemInterface
      * Retrieve associated product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct();
 
@@ -27,7 +25,6 @@ public function getProduct();
      *
      * @param   string $code
      * @return  \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
-     * @since 2.0.0
      */
     public function getOptionByCode($code);
 
@@ -39,7 +36,6 @@ public function getOptionByCode($code);
      *  - 'urlParams' - additional parameters for url (custom option id, or item id, for example)
      *
      * @return null|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFileDownloadParams();
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php
index dc9790b1c1d21..99083e989a548 100644
--- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Configuration\Item\Option
  *
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\DataObject implements
     \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
@@ -23,7 +22,6 @@ class Option extends \Magento\Framework\DataObject implements
      * Returns value of this option
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
index 3e4df122666e5..7baa2e0493207 100644
--- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
@@ -14,7 +14,6 @@
 /**
  * Interface \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
  *
- * @since 2.0.0
  */
 interface OptionInterface
 {
@@ -22,7 +21,6 @@ interface OptionInterface
      * Retrieve value associated with this option
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue();
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
index 21f90f23fbc02..9e7739d86458d 100644
--- a/app/code/Magento/Catalog/Model/Product/Copier.php
+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Copier
  *
- * @since 2.0.0
  */
 class Copier
 {
@@ -24,13 +23,11 @@ class Copier
 
     /**
      * @var CopyConstructorInterface
-     * @since 2.0.0
      */
     protected $copyConstructor;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
@@ -43,7 +40,6 @@ class Copier
     /**
      * @param CopyConstructorInterface $copyConstructor
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(
         CopyConstructorInterface $copyConstructor,
@@ -58,7 +54,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function copy(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructor/Composite.php b/app/code/Magento/Catalog/Model/Product/CopyConstructor/Composite.php
index 20e524f65d274..42a92017693eb 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructor/Composite.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructor/Composite.php
@@ -12,20 +12,17 @@
  * Performs duplication process by applying product type convertors
  *
  * @api
- * @since 2.0.0
  */
 class Composite implements CopyConstructorInterface
 {
     /**
      * @var CopyConstructorInterface[]
-     * @since 2.0.0
      */
     protected $constructors;
 
     /**
      * @param CopyConstructorFactory $factory
      * @param string[] $constructors
-     * @since 2.0.0
      */
     public function __construct(CopyConstructorFactory $factory, array $constructors = [])
     {
@@ -40,7 +37,6 @@ public function __construct(CopyConstructorFactory $factory, array $constructors
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructor/CrossSell.php b/app/code/Magento/Catalog/Model/Product/CopyConstructor/CrossSell.php
index 439fb3d02720b..931d566e73f31 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructor/CrossSell.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructor/CrossSell.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\CopyConstructor\CrossSell
  *
- * @since 2.0.0
  */
 class CrossSell implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
@@ -18,7 +17,6 @@ class CrossSell implements \Magento\Catalog\Model\Product\CopyConstructorInterfa
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructor/Related.php b/app/code/Magento/Catalog/Model/Product/CopyConstructor/Related.php
index ca849d2e59701..d50802b5a5e06 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructor/Related.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructor/Related.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\CopyConstructor\Related
  *
- * @since 2.0.0
  */
 class Related implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
@@ -18,7 +17,6 @@ class Related implements \Magento\Catalog\Model\Product\CopyConstructorInterface
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructor/UpSell.php b/app/code/Magento/Catalog/Model/Product/CopyConstructor/UpSell.php
index 4d098023dc813..14e6c0a327179 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructor/UpSell.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructor/UpSell.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\CopyConstructor\UpSell
  *
- * @since 2.0.0
  */
 class UpSell implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
@@ -18,7 +17,6 @@ class UpSell implements \Magento\Catalog\Model\Product\CopyConstructorInterface
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructorFactory.php b/app/code/Magento/Catalog/Model/Product/CopyConstructorFactory.php
index fb4bc4a7b4ba9..898e242a36109 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructorFactory.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructorFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\CopyConstructorFactory
  *
- * @since 2.0.0
  */
 class CopyConstructorFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return CopyConstructorInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($instance, array $arguments = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/CopyConstructorInterface.php b/app/code/Magento/Catalog/Model/Product/CopyConstructorInterface.php
index 56e24fd626dba..c0f03ff911557 100644
--- a/app/code/Magento/Catalog/Model/Product/CopyConstructorInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/CopyConstructorInterface.php
@@ -9,7 +9,6 @@
  * Contains duplication logic for variety of product types
  *
  * @api
- * @since 2.0.0
  */
 interface CopyConstructorInterface
 {
@@ -19,7 +18,6 @@ interface CopyConstructorInterface
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Edit/WeightResolver.php b/app/code/Magento/Catalog/Model/Product/Edit/WeightResolver.php
index 03f3e0c7cf3db..2a1f54daefb65 100644
--- a/app/code/Magento/Catalog/Model/Product/Edit/WeightResolver.php
+++ b/app/code/Magento/Catalog/Model/Product/Edit/WeightResolver.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Edit\WeightResolver
  *
- * @since 2.0.0
  */
 class WeightResolver
 {
@@ -26,7 +25,6 @@ class WeightResolver
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function resolveProductHasWeight(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Exception.php b/app/code/Magento/Catalog/Model/Product/Exception.php
index 7c61bd621c97a..bcd9ddb057ab8 100644
--- a/app/code/Magento/Catalog/Model/Product/Exception.php
+++ b/app/code/Magento/Catalog/Model/Product/Exception.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Exception extends LocalizedException
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 5b43cf5c88103..799e91bacd4c5 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -71,7 +71,7 @@ class CreateHandler implements ExtensionInterface
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $mediaAttributeCodes;
 
@@ -429,7 +429,7 @@ protected function copyImage($file)
      * Get Media Attribute Codes cached value
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getMediaAttributeCodes()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
index 38a225eeedeea..6df27bbba60d5 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
@@ -12,7 +12,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Entry extends AbstractExtensibleModel implements ProductAttributeMediaGalleryEntryInterface
 {
@@ -20,7 +19,6 @@ class Entry extends AbstractExtensibleModel implements ProductAttributeMediaGall
      * Retrieve gallery entry ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -31,7 +29,6 @@ public function getId()
      * Get media type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaType()
     {
@@ -42,7 +39,6 @@ public function getMediaType()
      * Retrieve gallery entry alternative text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -53,7 +49,6 @@ public function getLabel()
      * Retrieve gallery entry position (sort order)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -64,7 +59,6 @@ public function getPosition()
      * Check if gallery entry is hidden from product page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled()
     {
@@ -75,7 +69,6 @@ public function isDisabled()
      * Retrieve gallery entry image types (thumbnail, image, small_image etc)
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getTypes()
     {
@@ -86,7 +79,6 @@ public function getTypes()
      * Get file path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFile()
     {
@@ -95,7 +87,6 @@ public function getFile()
 
     /**
      * @return \Magento\Framework\Api\Data\ImageContentInterface|null
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -107,7 +98,6 @@ public function getContent()
      *
      * @param string $mediaType
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaType($mediaType)
     {
@@ -119,7 +109,6 @@ public function setMediaType($mediaType)
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -131,7 +120,6 @@ public function setLabel($label)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -143,7 +131,6 @@ public function setPosition($position)
      *
      * @param bool $disabled
      * @return $this
-     * @since 2.0.0
      */
     public function setDisabled($disabled)
     {
@@ -155,7 +142,6 @@ public function setDisabled($disabled)
      *
      * @param string[] $types
      * @return $this
-     * @since 2.0.0
      */
     public function setTypes(array $types = null)
     {
@@ -167,7 +153,6 @@ public function setTypes(array $types = null)
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function setFile($file)
     {
@@ -179,7 +164,6 @@ public function setFile($file)
      *
      * @param $content \Magento\Framework\Api\Data\ImageContentInterface
      * @return $this
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -190,7 +174,6 @@ public function setContent($content)
      * {@inheritdoc}
      *
      * @return ProductAttributeMediaGalleryEntryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -202,7 +185,6 @@ public function getExtensionAttributes()
      *
      * @param ProductAttributeMediaGalleryEntryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(ProductAttributeMediaGalleryEntryExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php b/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
index 1996744259e93..5dec4aa8395a6 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Gallery\EntryResolver
  *
- * @since 2.0.0
  */
 class EntryResolver
 {
@@ -22,7 +21,6 @@ class EntryResolver
      * @param Product $product
      * @param int $entryId
      * @return string|null
-     * @since 2.0.0
      */
     public function getEntryFilePathById(Product $product, $entryId)
     {
@@ -45,7 +43,6 @@ public function getEntryFilePathById(Product $product, $entryId)
      * @param Product $product
      * @param string $filePath
      * @return int|null
-     * @since 2.0.0
      */
     public function getEntryIdByFilePath(Product $product, $filePath)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 1f552a3b613f7..1b5f96baeaf9f 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -15,19 +15,16 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var ImageContentValidatorInterface
-     * @since 2.0.0
      */
     protected $contentValidator;
 
@@ -36,7 +33,6 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
      * @param ImageContentValidatorInterface $contentValidator
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
     {
@@ -89,7 +84,6 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
     {
@@ -127,7 +121,6 @@ public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($sku, $entryId)
     {
@@ -154,7 +147,6 @@ public function remove($sku, $entryId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($sku, $entryId)
     {
@@ -176,7 +168,6 @@ public function get($sku, $entryId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/MimeTypeExtensionMap.php b/app/code/Magento/Catalog/Model/Product/Gallery/MimeTypeExtensionMap.php
index ce8a9fe1d1a9a..1782b2bb51c83 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/MimeTypeExtensionMap.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/MimeTypeExtensionMap.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap
  *
- * @since 2.0.0
  */
 class MimeTypeExtensionMap
 {
@@ -17,7 +16,6 @@ class MimeTypeExtensionMap
      * MIME type/extension map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mimeTypeExtensionMap = [
         'image/jpg' => 'jpg',
@@ -29,7 +27,6 @@ class MimeTypeExtensionMap
     /**
      * @param string $mimeType
      * @return string
-     * @since 2.0.0
      */
     public function getMimeTypeExtension($mimeType)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
index 7496962e1318e..297269e115b8d 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
@@ -76,7 +76,7 @@ public function execute($entity, $arguments = [])
      * @param Product $product
      * @param array $mediaEntries
      * @return void
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function addMediaDataToProduct(Product $product, array $mediaEntries)
     {
@@ -95,7 +95,7 @@ public function addMediaDataToProduct(Product $product, array $mediaEntries)
     /**
      * @param array $rawData
      * @return array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function substituteNullsWithDefaultValues(array $rawData)
     {
@@ -131,7 +131,7 @@ public function getAttribute()
      * @param string $key
      * @param string[] &$image
      * @return string
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @since 2.1.0
      */
     protected function findDefaultValue($key, &$image)
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index a1fc5ff68bcba..f45edf4643596 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -16,19 +16,16 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_width;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_height;
 
@@ -36,151 +33,126 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * Default quality value (for JPEG images only).
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_quality = 80;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_keepAspectRatio = true;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_keepFrame = true;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_keepTransparency = true;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_constrainOnly = true;
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $_backgroundColor = [255, 255, 255];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_baseFile;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isBaseFilePlaceholder;
 
     /**
      * @var string|bool
-     * @since 2.0.0
      */
     protected $_newFile;
 
     /**
      * @var MagentoImage
-     * @since 2.0.0
      */
     protected $_processor;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_destinationSubdir;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_angle;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_watermarkFile;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_watermarkPosition;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_watermarkWidth;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_watermarkHeight;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_watermarkImageOpacity = 70;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
     /**
      * @var \Magento\Framework\Image\Factory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $_viewFileSystem;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDatabase = null;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $_catalogProductMediaConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -222,7 +194,6 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Catalog\Model\View\Asset\PlaceholderFactory|null $viewAssetPlaceholderFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -259,7 +230,6 @@ public function __construct(
     /**
      * @param int $width
      * @return $this
-     * @since 2.0.0
      */
     public function setWidth($width)
     {
@@ -269,7 +239,6 @@ public function setWidth($width)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getWidth()
     {
@@ -279,7 +248,6 @@ public function getWidth()
     /**
      * @param int $height
      * @return $this
-     * @since 2.0.0
      */
     public function setHeight($height)
     {
@@ -289,7 +257,6 @@ public function setHeight($height)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getHeight()
     {
@@ -301,7 +268,6 @@ public function getHeight()
      *
      * @param int $quality
      * @return $this
-     * @since 2.0.0
      */
     public function setQuality($quality)
     {
@@ -313,7 +279,6 @@ public function setQuality($quality)
      * Get image quality
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQuality()
     {
@@ -323,7 +288,6 @@ public function getQuality()
     /**
      * @param bool $keep
      * @return $this
-     * @since 2.0.0
      */
     public function setKeepAspectRatio($keep)
     {
@@ -334,7 +298,6 @@ public function setKeepAspectRatio($keep)
     /**
      * @param bool $keep
      * @return $this
-     * @since 2.0.0
      */
     public function setKeepFrame($keep)
     {
@@ -345,7 +308,6 @@ public function setKeepFrame($keep)
     /**
      * @param bool $keep
      * @return $this
-     * @since 2.0.0
      */
     public function setKeepTransparency($keep)
     {
@@ -356,7 +318,6 @@ public function setKeepTransparency($keep)
     /**
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setConstrainOnly($flag)
     {
@@ -367,7 +328,6 @@ public function setConstrainOnly($flag)
     /**
      * @param int[] $rgbArray
      * @return $this
-     * @since 2.0.0
      */
     public function setBackgroundColor(array $rgbArray)
     {
@@ -378,7 +338,6 @@ public function setBackgroundColor(array $rgbArray)
     /**
      * @param string $size
      * @return $this
-     * @since 2.0.0
      */
     public function setSize($size)
     {
@@ -402,7 +361,6 @@ public function setSize($size)
     /**
      * @param string|null $file
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkMemory($file = null)
     {
@@ -414,7 +372,6 @@ protected function _checkMemory($file = null)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _getMemoryLimit()
     {
@@ -438,7 +395,6 @@ protected function _getMemoryLimit()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function _getMemoryUsage()
     {
@@ -452,7 +408,6 @@ protected function _getMemoryUsage()
      * @param string|null $file
      * @return float|int
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getNeedMemoryForFile($file = null)
     {
@@ -488,7 +443,6 @@ protected function _getNeedMemoryForFile($file = null)
      *
      * @param int[] $rgbArray
      * @return string
-     * @since 2.0.0
      */
     protected function _rgbToString($rgbArray)
     {
@@ -509,7 +463,6 @@ protected function _rgbToString($rgbArray)
      * @param string $file
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function setBaseFile($file)
     {
@@ -539,7 +492,6 @@ public function setBaseFile($file)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBaseFile()
     {
@@ -549,7 +501,6 @@ public function getBaseFile()
     /**
      * @deprecated 2.2.0
      * @return bool|string
-     * @since 2.0.0
      */
     public function getNewFile()
     {
@@ -560,7 +511,6 @@ public function getNewFile()
      * Retrieve 'true' if image is a base file placeholder
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isBaseFilePlaceholder()
     {
@@ -570,7 +520,6 @@ public function isBaseFilePlaceholder()
     /**
      * @param MagentoImage $processor
      * @return $this
-     * @since 2.0.0
      */
     public function setImageProcessor($processor)
     {
@@ -580,7 +529,6 @@ public function setImageProcessor($processor)
 
     /**
      * @return MagentoImage
-     * @since 2.0.0
      */
     public function getImageProcessor()
     {
@@ -600,7 +548,6 @@ public function getImageProcessor()
     /**
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter
      * @return $this
-     * @since 2.0.0
      */
     public function resize()
     {
@@ -614,7 +561,6 @@ public function resize()
     /**
      * @param int $angle
      * @return $this
-     * @since 2.0.0
      */
     public function rotate($angle)
     {
@@ -630,7 +576,6 @@ public function rotate($angle)
      *
      * @param int $angle
      * @return $this
-     * @since 2.0.0
      */
     public function setAngle($angle)
     {
@@ -650,7 +595,6 @@ public function setAngle($angle)
      * @param int $opacity
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function setWatermark(
         $file,
@@ -701,7 +645,6 @@ public function setWatermark(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function saveFile()
     {
@@ -716,7 +659,6 @@ public function saveFile()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -726,7 +668,6 @@ public function getUrl()
     /**
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setDestinationSubdir($dir)
     {
@@ -736,7 +677,6 @@ public function setDestinationSubdir($dir)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDestinationSubdir()
     {
@@ -745,7 +685,6 @@ public function getDestinationSubdir()
 
     /**
      * @return bool|void
-     * @since 2.0.0
      */
     public function isCached()
     {
@@ -757,7 +696,6 @@ public function isCached()
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkFile($file)
     {
@@ -769,7 +707,6 @@ public function setWatermarkFile($file)
      * Get watermark file name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWatermarkFile()
     {
@@ -781,7 +718,6 @@ public function getWatermarkFile()
      * or false if file not found
      *
      * @return string | bool
-     * @since 2.0.0
      */
     protected function _getWatermarkFilePath()
     {
@@ -816,7 +752,6 @@ protected function _getWatermarkFilePath()
      *
      * @param string $position
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkPosition($position)
     {
@@ -828,7 +763,6 @@ public function setWatermarkPosition($position)
      * Get watermark position
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWatermarkPosition()
     {
@@ -840,7 +774,6 @@ public function getWatermarkPosition()
      *
      * @param int $imageOpacity
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
@@ -852,7 +785,6 @@ public function setWatermarkImageOpacity($imageOpacity)
      * Get watermark image opacity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWatermarkImageOpacity()
     {
@@ -864,7 +796,6 @@ public function getWatermarkImageOpacity()
      *
      * @param array $size
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkSize($size)
     {
@@ -879,7 +810,6 @@ public function setWatermarkSize($size)
      *
      * @param int $width
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkWidth($width)
     {
@@ -891,7 +821,6 @@ public function setWatermarkWidth($width)
      * Get watermark width
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWatermarkWidth()
     {
@@ -903,7 +832,6 @@ public function getWatermarkWidth()
      *
      * @param int $height
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkHeight($height)
     {
@@ -915,7 +843,6 @@ public function setWatermarkHeight($height)
      * Get watermark height
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWatermarkHeight()
     {
@@ -924,7 +851,6 @@ public function getWatermarkHeight()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function clearCache()
     {
@@ -940,7 +866,6 @@ public function clearCache()
      *
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     protected function _fileExists($filename)
     {
@@ -957,7 +882,6 @@ protected function _fileExists($filename)
      * Return resized product image information
      *
      * @return array
-     * @since 2.0.0
      */
     public function getResizedImageInfo()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Image/Cache.php b/app/code/Magento/Catalog/Model/Product/Image/Cache.php
index 1d88f34354cd7..1bb650557d0a2 100644
--- a/app/code/Magento/Catalog/Model/Product/Image/Cache.php
+++ b/app/code/Magento/Catalog/Model/Product/Image/Cache.php
@@ -14,31 +14,26 @@
 /**
  * Class \Magento\Catalog\Model\Product\Image\Cache
  *
- * @since 2.0.0
  */
 class Cache
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $viewConfig;
 
     /**
      * @var ThemeCollection
-     * @since 2.0.0
      */
     protected $themeCollection;
 
     /**
      * @var ImageHelper
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
@@ -46,7 +41,6 @@ class Cache
      * @param ConfigInterface $viewConfig
      * @param ThemeCollection $themeCollection
      * @param ImageHelper $imageHelper
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $viewConfig,
@@ -64,7 +58,6 @@ public function __construct(
      * Collect data for 'Magento_Catalog' module from /etc/view.xml files.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getData()
     {
@@ -89,7 +82,6 @@ protected function getData()
      *
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function generate(Product $product)
     {
@@ -113,7 +105,6 @@ public function generate(Product $product)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function processImageData(Product $product, array $imageData, $file)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinks.php b/app/code/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinks.php
index 54ba8a8cd4f51..9e2f0cc35ba96 100644
--- a/app/code/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinks.php
+++ b/app/code/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinks.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks
  *
- * @since 2.0.0
  */
 class ProductLinks
 {
@@ -19,7 +18,6 @@ class ProductLinks
      * @param array $links link data
      * @return \Magento\Catalog\Model\Product
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function initializeLinks(\Magento\Catalog\Model\Product $product, array $links)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php
index a7b8701642175..25e0bdca526cb 100644
--- a/app/code/Magento/Catalog/Model/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/Product/Link.php
@@ -23,7 +23,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\AbstractModel
 {
@@ -35,7 +34,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_attributes = null;
 
@@ -43,7 +41,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
@@ -51,7 +48,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
      * Link collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Link\CollectionFactory
-     * @since 2.0.0
      */
     protected $_linkCollectionFactory;
 
@@ -63,8 +59,7 @@ class Link extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\CatalogInventory\Helper\Stock
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     protected $stockHelper;
 
@@ -77,7 +72,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -99,7 +93,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -108,7 +101,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function useRelatedLinks()
     {
@@ -118,7 +110,6 @@ public function useRelatedLinks()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function useUpSellLinks()
     {
@@ -128,7 +119,6 @@ public function useUpSellLinks()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function useCrossSellLinks()
     {
@@ -141,7 +131,6 @@ public function useCrossSellLinks()
      *
      * @param   string $type
      * @return  string
-     * @since 2.0.0
      */
     public function getAttributeTypeTable($type)
     {
@@ -152,7 +141,6 @@ public function getAttributeTypeTable($type)
      * Retrieve linked product collection
      *
      * @return ProductCollection
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
@@ -164,7 +152,6 @@ public function getProductCollection()
      * Retrieve link collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getLinkCollection()
     {
@@ -175,7 +162,6 @@ public function getLinkCollection()
     /**
      * @param int $type
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes($type = null)
     {
@@ -194,7 +180,6 @@ public function getAttributes($type = null)
      *
      * @param   \Magento\Catalog\Model\Product $product
      * @return  $this
-     * @since 2.0.0
      */
     public function saveProductRelations($product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/LinkTypeProvider.php b/app/code/Magento/Catalog/Model/Product/LinkTypeProvider.php
index 79a665633f0b8..2b4cac8a258eb 100644
--- a/app/code/Magento/Catalog/Model/Product/LinkTypeProvider.php
+++ b/app/code/Magento/Catalog/Model/Product/LinkTypeProvider.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\LinkTypeProvider
  *
- * @since 2.0.0
  */
 class LinkTypeProvider implements \Magento\Catalog\Api\ProductLinkTypeListInterface
 {
@@ -20,25 +19,21 @@ class LinkTypeProvider implements \Magento\Catalog\Api\ProductLinkTypeListInterf
      * Represented by an assoc array with the following format 'product_link_name' => 'product_link_code'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $linkTypes;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductLinkTypeInterfaceFactory
-     * @since 2.0.0
      */
     protected $linkTypeFactory;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductLinkAttributeInterfaceFactory
-     * @since 2.0.0
      */
     protected $linkAttributeFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $linkFactory;
 
@@ -47,7 +42,6 @@ class LinkTypeProvider implements \Magento\Catalog\Api\ProductLinkTypeListInterf
      * @param \Magento\Catalog\Api\Data\ProductLinkAttributeInterfaceFactory $linkAttributeFactory
      * @param LinkFactory $linkFactory
      * @param array $linkTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\Data\ProductLinkTypeInterfaceFactory $linkTypeFactory,
@@ -65,7 +59,6 @@ public function __construct(
      * Retrieve information about available product link types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLinkTypes()
     {
@@ -74,7 +67,6 @@ public function getLinkTypes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -91,7 +83,6 @@ public function getItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemAttributes($type)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
index 757403e36ea5c..27bcefea67513 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Catalog\Model\Product\Media\AttributeManagement
  *
- * @since 2.0.0
  */
 class AttributeManagement implements ProductMediaAttributeManagementInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($attributeSetName)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index dd6da0838ecd8..a3963b90ee01a 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -17,7 +17,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
@@ -25,19 +24,17 @@ class Config implements ConfigInterface
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var Attribute
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $attributeHelper;
 
     /**
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(StoreManagerInterface $storeManager)
     {
@@ -49,7 +46,6 @@ public function __construct(StoreManagerInterface $storeManager)
      * relatively to media folder
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaPathAddition()
     {
@@ -61,7 +57,6 @@ public function getBaseMediaPathAddition()
      * relatively to media folder
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaUrlAddition()
     {
@@ -70,7 +65,6 @@ public function getBaseMediaUrlAddition()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaPath()
     {
@@ -79,7 +73,6 @@ public function getBaseMediaPath()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaUrl()
     {
@@ -91,7 +84,6 @@ public function getBaseMediaUrl()
      * relatively to media folder
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseTmpMediaPath()
     {
@@ -100,7 +92,6 @@ public function getBaseTmpMediaPath()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBaseTmpMediaUrl()
     {
@@ -112,7 +103,6 @@ public function getBaseTmpMediaUrl()
     /**
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMediaUrl($file)
     {
@@ -122,7 +112,6 @@ public function getMediaUrl($file)
     /**
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMediaPath($file)
     {
@@ -132,7 +121,6 @@ public function getMediaPath($file)
     /**
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getTmpMediaUrl($file)
     {
@@ -145,7 +133,6 @@ public function getTmpMediaUrl($file)
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getTmpMediaShortUrl($file)
     {
@@ -157,7 +144,6 @@ public function getTmpMediaShortUrl($file)
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMediaShortUrl($file)
     {
@@ -167,7 +153,6 @@ public function getMediaShortUrl($file)
     /**
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getTmpMediaPath($file)
     {
@@ -177,7 +162,6 @@ public function getTmpMediaPath($file)
     /**
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareFile($file)
     {
@@ -186,7 +170,7 @@ protected function _prepareFile($file)
 
     /**
      * @return array
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getMediaAttributeCodes()
     {
@@ -195,7 +179,7 @@ public function getMediaAttributeCodes()
 
     /**
      * @return Attribute
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function getAttributeHelper()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
index 0f7ac8be23020..b609debf3ee10 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Catalog\Model\Product\Media\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -20,7 +19,6 @@ interface ConfigInterface
      * Retrieve base url for media files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaUrl();
 
@@ -28,7 +26,6 @@ public function getBaseMediaUrl();
      * Retrieve base path for media files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaPath();
 
@@ -37,7 +34,6 @@ public function getBaseMediaPath();
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMediaUrl($file);
 
@@ -46,7 +42,6 @@ public function getMediaUrl($file);
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMediaPath($file);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 44221dce5dd08..15015aaab9d2a 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -27,7 +27,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Option extends AbstractExtensibleModel implements ProductCustomOptionInterface
 {
@@ -61,21 +60,16 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
     const KEY_IMAGE_SIZE_X = 'image_size_x';
     /**#@-*/
 
-    /**
-     * @var Product
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $product;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $values = null;
 
@@ -83,7 +77,6 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * Catalog product option value
      *
      * @var Option\Value
-     * @since 2.0.0
      */
     protected $productOptionValue;
 
@@ -91,19 +84,16 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * Product option factory
      *
      * @var \Magento\Catalog\Model\Product\Option\Type\Factory
-     * @since 2.0.0
      */
     protected $optionTypeFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var Option\Validator\Pool
-     * @since 2.0.0
      */
     protected $validatorPool;
 
@@ -126,7 +116,6 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -160,7 +149,6 @@ public function __construct(
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -169,7 +157,6 @@ protected function _getResource()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -182,7 +169,6 @@ protected function _construct()
      *
      * @param Option\Value $value
      * @return $this
-     * @since 2.0.0
      */
     public function addValue(Option\Value $value)
     {
@@ -195,7 +181,6 @@ public function addValue(Option\Value $value)
      *
      * @param int $valueId
      * @return Option\Value|null
-     * @since 2.0.0
      */
     public function getValueById($valueId)
     {
@@ -220,7 +205,6 @@ public function hasValues($type = null)
 
     /**
      * @return ProductCustomOptionValuesInterface[]|null
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -231,7 +215,6 @@ public function getValues()
      * Retrieve value instance
      *
      * @return Option\Value
-     * @since 2.0.0
      */
     public function getValueInstance()
     {
@@ -243,7 +226,6 @@ public function getValueInstance()
      *
      * @param array $option
      * @return $this
-     * @since 2.0.0
      */
     public function addOption($option)
     {
@@ -255,7 +237,6 @@ public function addOption($option)
      * Get all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -267,7 +248,6 @@ public function getOptions()
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options)
     {
@@ -279,7 +259,6 @@ public function setOptions($options)
      * Set options to empty array
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unsetOptions()
     {
@@ -291,7 +270,6 @@ public function unsetOptions()
      * Retrieve product instance
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -303,7 +281,6 @@ public function getProduct()
      *
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(Product $product = null)
     {
@@ -316,7 +293,6 @@ public function setProduct(Product $product = null)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getGroupByType($type = null)
     {
@@ -345,7 +321,6 @@ public function getGroupByType($type = null)
      * @param string $type Option type
      * @return \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function groupFactory($type)
     {
@@ -408,7 +383,6 @@ public function beforeSave()
     /**
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -438,7 +412,6 @@ public function afterSave()
      *
      * @param bool $flag
      * @return float
-     * @since 2.0.0
      */
     public function getPrice($flag = false)
     {
@@ -455,7 +428,6 @@ public function getPrice($flag = false)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function deletePrices($optionId)
     {
@@ -468,7 +440,6 @@ public function deletePrices($optionId)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteTitles($optionId)
     {
@@ -492,7 +463,6 @@ public function getProductOptions(Product $product)
      * Get collection of values for current option
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getValuesCollection()
     {
@@ -507,7 +477,6 @@ public function getValuesCollection()
      * @param array $optionIds
      * @param int $storeId
      * @return Collection
-     * @since 2.0.0
      */
     public function getOptionValuesByOptionId($optionIds, $storeId)
     {
@@ -522,7 +491,6 @@ public function getOptionValuesByOptionId($optionIds, $storeId)
      * @param int $oldProductId
      * @param int $newProductId
      * @return $this
-     * @since 2.0.0
      */
     public function duplicate($oldProductId, $newProductId)
     {
@@ -537,7 +505,6 @@ public function duplicate($oldProductId, $newProductId)
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -548,7 +515,6 @@ public function getSearchableData($productId, $storeId)
      * Clearing object's data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearData()
     {
@@ -561,7 +527,6 @@ protected function _clearData()
      * Clearing cyclic references
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearReferences()
     {
@@ -575,7 +540,6 @@ protected function _clearReferences()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -586,7 +550,6 @@ protected function _getValidationRulesBeforeSave()
      * Get product SKU
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductSku()
     {
@@ -602,7 +565,6 @@ public function getProductSku()
      *
      * @return int|null
      * @codeCoverageIgnoreStart
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -613,7 +575,6 @@ public function getOptionId()
      * Get option title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -624,7 +585,6 @@ public function getTitle()
      * Get option type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -635,7 +595,6 @@ public function getType()
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -647,7 +606,6 @@ public function getSortOrder()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsRequire()
     {
@@ -658,7 +616,6 @@ public function getIsRequire()
      * Get price type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPriceType()
     {
@@ -669,7 +626,6 @@ public function getPriceType()
      * Get Sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -678,7 +634,6 @@ public function getSku()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getFileExtension()
     {
@@ -687,7 +642,6 @@ public function getFileExtension()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getMaxCharacters()
     {
@@ -696,7 +650,6 @@ public function getMaxCharacters()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getImageSizeX()
     {
@@ -705,7 +658,6 @@ public function getImageSizeX()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getImageSizeY()
     {
@@ -717,7 +669,6 @@ public function getImageSizeY()
      *
      * @param string $productSku
      * @return $this
-     * @since 2.0.0
      */
     public function setProductSku($productSku)
     {
@@ -729,7 +680,6 @@ public function setProductSku($productSku)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionId($optionId)
     {
@@ -741,7 +691,6 @@ public function setOptionId($optionId)
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -753,7 +702,6 @@ public function setTitle($title)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -765,7 +713,6 @@ public function setType($type)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -777,7 +724,6 @@ public function setSortOrder($sortOrder)
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRequire($isRequired)
     {
@@ -789,7 +735,6 @@ public function setIsRequire($isRequired)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -801,7 +746,6 @@ public function setPrice($price)
      *
      * @param string $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType)
     {
@@ -813,7 +757,6 @@ public function setPriceType($priceType)
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -823,7 +766,6 @@ public function setSku($sku)
     /**
      * @param string $fileExtension
      * @return $this
-     * @since 2.0.0
      */
     public function setFileExtension($fileExtension)
     {
@@ -833,7 +775,6 @@ public function setFileExtension($fileExtension)
     /**
      * @param int $maxCharacters
      * @return $this
-     * @since 2.0.0
      */
     public function setMaxCharacters($maxCharacters)
     {
@@ -843,7 +784,6 @@ public function setMaxCharacters($maxCharacters)
     /**
      * @param int $imageSizeX
      * @return $this
-     * @since 2.0.0
      */
     public function setImageSizeX($imageSizeX)
     {
@@ -853,7 +793,6 @@ public function setImageSizeX($imageSizeX)
     /**
      * @param int $imageSizeY
      * @return $this
-     * @since 2.0.0
      */
     public function setImageSizeY($imageSizeY)
     {
@@ -863,7 +802,6 @@ public function setImageSizeY($imageSizeY)
     /**
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface[] $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues(array $values = null)
     {
@@ -875,7 +813,6 @@ public function setValues(array $values = null)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -901,7 +838,6 @@ public function getRegularPrice()
     /**
      * @param Product $product
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getProductOptionCollection(Product $product)
     {
@@ -934,7 +870,6 @@ public function getProductOptionCollection(Product $product)
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Converter.php b/app/code/Magento/Catalog/Model/Product/Option/Converter.php
index bc7600ff3fea2..35ee7670c55cf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Converter.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Converter
  *
- * @since 2.0.0
  */
 class Converter
 {
@@ -18,7 +17,6 @@ class Converter
      * Convert option data to array
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
      * @return array
-     * @since 2.0.0
      */
     public function toArray(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Repository.php b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
index fa0c20cc35a68..e65a11abeb50c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface
 {
@@ -32,13 +31,11 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option
-     * @since 2.0.0
      */
     protected $optionResource;
 
@@ -56,7 +53,6 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
 
     /**
      * @var Converter
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -69,7 +65,6 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
      * @param \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory|null $collectionFactory
      * @param \Magento\Catalog\Model\Product\OptionFactory|null $optionFactory
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -92,7 +87,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
@@ -115,7 +109,6 @@ public function getProductOptions(ProductInterface $product, $requiredOnly = fal
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($sku, $optionId)
     {
@@ -129,7 +122,6 @@ public function get($sku, $optionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $entity)
     {
@@ -156,7 +148,6 @@ public function duplicate(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option)
     {
@@ -197,7 +188,6 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteByIdentifier($sku, $optionId)
     {
@@ -225,7 +215,6 @@ public function deleteByIdentifier($sku, $optionId)
      * @param $newValues array
      * @param $originalValues \Magento\Catalog\Model\Product\Option\Value[]
      * @return array
-     * @since 2.0.0
      */
     protected function markRemovedValues($newValues, $originalValues)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type.php b/app/code/Magento/Catalog/Model/Product/Option/Type.php
index d6c0accf951a7..7f570a10c9f66 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type.php
@@ -8,7 +8,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Catalog\Api\Data\ProductCustomOptionTypeInterface
@@ -25,7 +24,6 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Get option type label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -36,7 +34,6 @@ public function getLabel()
      * Get option type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -47,7 +44,6 @@ public function getCode()
      * Get option type group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroup()
     {
@@ -59,7 +55,6 @@ public function getGroup()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -71,7 +66,6 @@ public function setLabel($label)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -83,7 +77,6 @@ public function setCode($code)
      *
      * @param string $group
      * @return $this
-     * @since 2.0.0
      */
     public function setGroup($group)
     {
@@ -94,7 +87,6 @@ public function setGroup($group)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -106,7 +98,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductCustomOptionTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index a01e78a07972c..d1dde6e859c9f 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -11,19 +11,16 @@
  * Catalog product option date type
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formattedOptionValue = null;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -41,7 +38,6 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -64,7 +60,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -145,7 +140,6 @@ public function validateUserValue($values)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function prepareForCart()
     {
@@ -202,7 +196,6 @@ public function prepareForCart()
      * @param string $optionValue Prepared for cart option value
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($optionValue)
     {
@@ -244,7 +237,6 @@ public function getFormattedOptionValue($optionValue)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getPrintableOptionValue($optionValue)
     {
@@ -256,7 +248,6 @@ public function getPrintableOptionValue($optionValue)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getEditableOptionValue($optionValue)
     {
@@ -270,7 +261,6 @@ public function getEditableOptionValue($optionValue)
      * @param array $productOptionValues Values for product option
      * @return string|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function parseOptionValue($optionValue, $productOptionValues)
     {
@@ -287,7 +277,6 @@ public function parseOptionValue($optionValue, $productOptionValues)
      *
      * @param string $optionValue
      * @return array
-     * @since 2.0.0
      */
     public function prepareOptionValueForRequest($optionValue)
     {
@@ -310,7 +299,6 @@ public function prepareOptionValueForRequest($optionValue)
      * Use Calendar on frontend or not
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function useCalendar()
     {
@@ -321,7 +309,6 @@ public function useCalendar()
      * Time Format
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function is24hTimeFormat()
     {
@@ -332,7 +319,6 @@ public function is24hTimeFormat()
      * Year range start
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getYearStart()
     {
@@ -348,7 +334,6 @@ public function getYearStart()
      * Year range end
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getYearEnd()
     {
@@ -365,7 +350,6 @@ public function getYearEnd()
      *
      * @param string $internalValue Datetime value in internal format
      * @return void
-     * @since 2.0.0
      */
     protected function _setInternalInRequest($internalValue)
     {
@@ -384,7 +368,6 @@ protected function _setInternalInRequest($internalValue)
      * Does option have date?
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _dateExists()
     {
@@ -401,7 +384,6 @@ protected function _dateExists()
      * Does option have time?
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _timeExists()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 8d3a92d3a7844..cf87886fae358 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -17,7 +17,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DefaultType extends \Magento\Framework\DataObject
 {
@@ -25,7 +24,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * Option Instance
      *
      * @var \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     protected $_option;
 
@@ -33,7 +31,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * Product Instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -41,7 +38,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * TODO: Fill in description
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productOptions = [];
 
@@ -49,7 +45,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -57,7 +52,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -67,7 +61,6 @@ class DefaultType extends \Magento\Framework\DataObject
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -84,7 +77,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return $this
-     * @since 2.0.0
      */
     public function setOption($option)
     {
@@ -97,7 +89,6 @@ public function setOption($option)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     public function getOption()
     {
@@ -112,7 +103,6 @@ public function getOption()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -125,7 +115,6 @@ public function setProduct($product)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -140,7 +129,6 @@ public function getProduct()
      *
      * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getConfigurationItemOption()
     {
@@ -164,7 +152,6 @@ public function getConfigurationItemOption()
      *
      * @return \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getConfigurationItem()
     {
@@ -188,7 +175,6 @@ public function getConfigurationItem()
      *
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -203,7 +189,6 @@ public function getRequest()
      *
      * @param string $key Config value key
      * @return string
-     * @since 2.0.0
      */
     public function getConfigData($key)
     {
@@ -216,7 +201,6 @@ public function getConfigData($key)
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -239,7 +223,6 @@ public function validateUserValue($values)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getSkipCheckRequiredOption()
     {
@@ -252,7 +235,6 @@ public function getSkipCheckRequiredOption()
      *
      * @return string|null Prepared option value
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function prepareForCart()
     {
@@ -268,7 +250,6 @@ public function prepareForCart()
      * Flag to indicate that custom option has own customized output (blocks, native html etc.)
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCustomizedView()
     {
@@ -280,7 +261,6 @@ public function isCustomizedView()
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($optionValue)
     {
@@ -292,7 +272,6 @@ public function getFormattedOptionValue($optionValue)
      *
      * @param array $optionInfo
      * @return string
-     * @since 2.0.0
      */
     public function getCustomizedView($optionInfo)
     {
@@ -304,7 +283,6 @@ public function getCustomizedView($optionInfo)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getPrintableOptionValue($optionValue)
     {
@@ -317,7 +295,6 @@ public function getPrintableOptionValue($optionValue)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getEditableOptionValue($optionValue)
     {
@@ -331,7 +308,6 @@ public function getEditableOptionValue($optionValue)
      * @param array $productOptionValues Values for product option
      * @return string|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function parseOptionValue($optionValue, $productOptionValues)
     {
@@ -343,7 +319,6 @@ public function parseOptionValue($optionValue, $productOptionValues)
      *
      * @param string $optionValue
      * @return string|null
-     * @since 2.0.0
      */
     public function prepareOptionValueForRequest($optionValue)
     {
@@ -357,7 +332,6 @@ public function prepareOptionValueForRequest($optionValue)
      * @param float $basePrice For percent price type
      * @return float
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getOptionPrice($optionValue, $basePrice)
     {
@@ -373,7 +347,6 @@ public function getOptionPrice($optionValue, $basePrice)
      * @param string $skuDelimiter Delimiter for Sku parts
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getOptionSku($optionValue, $skuDelimiter)
     {
@@ -384,7 +357,6 @@ public function getOptionSku($optionValue, $skuDelimiter)
      * Return value => key all product options (using for parsing)
      *
      * @return array Array of Product custom options, reversing option values and option ids
-     * @since 2.0.0
      */
     public function getProductOptions()
     {
@@ -425,7 +397,6 @@ public function getProductOptions()
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
-     * @since 2.0.0
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Factory.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Factory.php
index 4989a01f2f7f4..e50dc9ce9f285 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Factory.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Type\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index dedc7f85b87dc..b912ae08c8abc 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -17,20 +17,17 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
     /**
      * Url for custom option download controller
      * @var string
-     * @since 2.0.0
      */
     protected $_customOptionDownloadUrl = 'sales/download/downloadCustomOption';
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     protected $_formattedOptionValue = null;
 
@@ -38,7 +35,6 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
      * @deprecated 2.2.0
      * @see $mediaDirectory
-     * @since 2.0.0
      */
     protected $_rootDirectory;
 
@@ -52,13 +48,11 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDatabase = null;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -66,7 +60,6 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * Url
      *
      * @var \Magento\Catalog\Model\Product\Option\UrlBuilder
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
@@ -74,19 +67,16 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * Item option factory
      *
      * @var \Magento\Quote\Model\Quote\Item\OptionFactory
-     * @since 2.0.0
      */
     protected $_itemOptionFactory;
 
     /**
      * @var File\ValidatorInfo
-     * @since 2.0.0
      */
     protected $validatorInfo;
 
     /**
      * @var File\ValidatorFile
-     * @since 2.0.0
      */
     protected $validatorFile;
 
@@ -98,7 +88,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 
     /**
      * @var Filesystem
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private $filesystem;
 
@@ -115,7 +105,6 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param Filesystem $filesystem
      * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -148,7 +137,6 @@ public function __construct(
      * Flag to indicate that custom option has own customized output (blocks, native html etc.)
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCustomizedView()
     {
@@ -160,7 +148,6 @@ public function isCustomizedView()
      *
      * @param array $optionInfo
      * @return string|void
-     * @since 2.0.0
      */
     public function getCustomizedView($optionInfo)
     {
@@ -179,7 +166,6 @@ public function getCustomizedView($optionInfo)
      * Returns additional params for processing options
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getProcessingParams()
     {
@@ -200,7 +186,6 @@ protected function _getProcessingParams()
      * Or returns null, if we need to get file from uploaded array.
      *
      * @return null|array
-     * @since 2.0.0
      */
     protected function _getCurrentConfigFileInfo()
     {
@@ -230,7 +215,6 @@ protected function _getCurrentConfigFileInfo()
      * @throws LocalizedException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -299,7 +283,6 @@ public function validateUserValue($values)
      * Prepare option value for cart
      *
      * @return string|null Prepared option value
-     * @since 2.0.0
      */
     public function prepareForCart()
     {
@@ -340,7 +323,6 @@ public function prepareForCart()
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($optionValue)
     {
@@ -370,7 +352,6 @@ public function getFormattedOptionValue($optionValue)
      * @param string|array $optionValue Serialized string of option data or its data array
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getOptionHtml($optionValue)
     {
@@ -398,7 +379,6 @@ protected function _getOptionHtml($optionValue)
      *
      * @param string|array $value
      * @return array
-     * @since 2.0.0
      */
     protected function _unserializeValue($value)
     {
@@ -416,7 +396,6 @@ protected function _unserializeValue($value)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getPrintableOptionValue($optionValue)
     {
@@ -430,7 +409,6 @@ public function getPrintableOptionValue($optionValue)
      * @return string
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getEditableOptionValue($optionValue)
     {
@@ -455,7 +433,6 @@ public function getEditableOptionValue($optionValue)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function parseOptionValue($optionValue, $productOptionValues)
     {
@@ -475,7 +452,6 @@ public function parseOptionValue($optionValue, $productOptionValues)
      *
      * @param string $optionValue
      * @return string|null
-     * @since 2.0.0
      */
     public function prepareOptionValueForRequest($optionValue)
     {
@@ -490,7 +466,6 @@ public function prepareOptionValueForRequest($optionValue)
      * Quote item to order item copy process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function copyQuoteToOrder()
     {
@@ -526,7 +501,6 @@ public function copyQuoteToOrder()
      *
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomOptionDownloadUrl($url)
     {
@@ -540,7 +514,6 @@ public function setCustomOptionDownloadUrl($url)
      * @param string|null $route
      * @param array|null $params
      * @return string
-     * @since 2.0.0
      */
     protected function _getOptionDownloadUrl($route, $params)
     {
@@ -550,7 +523,6 @@ protected function _getOptionDownloadUrl($route, $params)
     /**
      * @param array $value
      * @return string
-     * @since 2.0.0
      */
     protected function prepareSize($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
index 51e95b15a4299..91c5d9aab8b0c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Type\File\ValidateFactory
  *
- * @since 2.0.0
  */
 class ValidateFactory
 {
     /**
      * @return \Zend_Validate
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
index ab5cf4a852f39..2c4b76d637d53 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -9,25 +9,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Validator
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\File\Size
-     * @since 2.0.0
      */
     protected $fileSize;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $rootDirectory;
 
@@ -35,7 +31,6 @@ abstract class Validator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\File\Size $fileSize
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -52,7 +47,6 @@ public function __construct(
      *
      * @param string $key Config value key
      * @return string
-     * @since 2.0.0
      */
     protected function getConfigData($key)
     {
@@ -70,7 +64,6 @@ protected function getConfigData($key)
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return string[] Array of error messages
      * @see \Magento\Catalog\Model\Product\Option\Type\File::_getValidatorErrors
-     * @since 2.0.0
      */
     protected function getValidatorErrors($errors, $fileInfo, $option)
     {
@@ -129,7 +122,6 @@ protected function getValidatorErrors($errors, $fileInfo, $option)
      * @param string $extensions String to parse
      * @return array|null
      * @see \Magento\Catalog\Model\Product\Option\Type\File::_parseExtensionsString
-     * @since 2.0.0
      */
     protected function parseExtensionsString($extensions)
     {
@@ -145,7 +137,6 @@ protected function parseExtensionsString($extensions)
      * @param array $fileFullPath
      * @return \Zend_File_Transfer_Adapter_Http|\Zend_Validate $object
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function buildImageValidator($object, $option, $fileFullPath = null)
     {
@@ -189,7 +180,6 @@ protected function buildImageValidator($object, $option, $fileFullPath = null)
      * @param array|string $fileInfo - either file data from \Zend_File_Transfer or file path
      * @return boolean
      * @see \Magento\Catalog\Model\Product\Option\Type\File::_isImage
-     * @since 2.0.0
      */
     protected function isImage($fileInfo)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
index 4b9ea0eeb6e70..e2dfc8f50a1b4 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ValidatorFile extends Validator
 {
@@ -21,7 +20,6 @@ class ValidatorFile extends Validator
      * Relative path for main destination folder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'custom_options';
 
@@ -29,7 +27,6 @@ class ValidatorFile extends Validator
      * Relative path for quote folder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $quotePath = 'custom_options/quote';
 
@@ -37,37 +34,32 @@ class ValidatorFile extends Validator
      * Relative path for order folder
      *
      * @var string
-     * @since 2.0.0
      */
     protected $orderPath = 'custom_options/order';
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\FileTransferFactory
-     * @since 2.0.0
      */
     protected $httpFactory;
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var \Magento\Framework\Validator\File\IsImage
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $isImageValidator;
 
@@ -78,7 +70,6 @@ class ValidatorFile extends Validator
      * @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory
      * @param \Magento\Framework\Validator\File\IsImage $isImageValidator
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -97,7 +88,6 @@ public function __construct(
     /**
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(Product $product)
     {
@@ -117,7 +107,6 @@ public function setProduct(Product $product)
      * @throws \Zend_File_Transfer_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function validate($processingParams, $option)
     {
@@ -231,7 +220,6 @@ public function validate($processingParams, $option)
      *
      * @return void
      * @see \Magento\Catalog\Model\Product\Option\Type\File::_initFilesystem
-     * @since 2.0.0
      */
     protected function initFilesystem()
     {
@@ -249,7 +237,6 @@ protected function initFilesystem()
     /**
      * @return bool
      * @todo need correctly name
-     * @since 2.0.0
      */
     protected function validateContentLength()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
index 005ab5c57f127..a5ebf0189a7bf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
@@ -9,37 +9,31 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Type\File\ValidatorInfo
  *
- * @since 2.0.0
  */
 class ValidatorInfo extends Validator
 {
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $coreFileStorageDatabase;
 
     /**
      * @var ValidateFactory
-     * @since 2.0.0
      */
     protected $validateFactory;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $useQuotePath;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileFullPath;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileRelativePath;
 
@@ -49,7 +43,6 @@ class ValidatorInfo extends Validator
      * @param \Magento\Framework\File\Size $fileSize
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase
      * @param ValidateFactory $validateFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -66,7 +59,6 @@ public function __construct(
     /**
      * @param mixed $useQuotePath
      * @return $this
-     * @since 2.0.0
      */
     public function setUseQuotePath($useQuotePath)
     {
@@ -79,7 +71,6 @@ public function setUseQuotePath($useQuotePath)
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate($optionValue, $option)
     {
@@ -124,7 +115,6 @@ public function validate($optionValue, $option)
     /**
      * @param string $fileRelativePath
      * @return string
-     * @since 2.0.0
      */
     protected function buildSecretKey($fileRelativePath)
     {
@@ -134,7 +124,6 @@ protected function buildSecretKey($fileRelativePath)
     /**
      * @param array $optionValue
      * @return void
-     * @since 2.0.0
      */
     protected function initFilePath($optionValue)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index 26d8a0693197c..78cce7bd76163 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -9,19 +9,16 @@
 
 /**
  * Catalog product option select type
- * @since 2.0.0
  */
 class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
     /**
      * @var string|array
-     * @since 2.0.0
      */
     protected $_formattedOptionValue;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -29,7 +26,6 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -39,7 +35,6 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -59,7 +54,6 @@ public function __construct(
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -86,7 +80,6 @@ public function validateUserValue($values)
      * Prepare option value for cart
      *
      * @return string|null Prepared option value
-     * @since 2.0.0
      */
     public function prepareForCart()
     {
@@ -102,7 +95,6 @@ public function prepareForCart()
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($optionValue)
     {
@@ -117,7 +109,6 @@ public function getFormattedOptionValue($optionValue)
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getPrintableOptionValue($optionValue)
     {
@@ -128,7 +119,6 @@ public function getPrintableOptionValue($optionValue)
      * Return currently unavailable product configuration message
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getWrongConfigurationMessage()
     {
@@ -140,7 +130,6 @@ protected function _getWrongConfigurationMessage()
      *
      * @param string $optionValue Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getEditableOptionValue($optionValue)
     {
@@ -182,7 +171,6 @@ public function getEditableOptionValue($optionValue)
      * @param string $optionValue
      * @param array $productOptionValues Values for product option
      * @return string|null
-     * @since 2.0.0
      */
     public function parseOptionValue($optionValue, $productOptionValues)
     {
@@ -209,7 +197,6 @@ public function parseOptionValue($optionValue, $productOptionValues)
      *
      * @param string $optionValue
      * @return string
-     * @since 2.0.0
      */
     public function prepareOptionValueForRequest($optionValue)
     {
@@ -225,7 +212,6 @@ public function prepareOptionValueForRequest($optionValue)
      * @param string $optionValue Prepared for cart option value
      * @param float $basePrice
      * @return float
-     * @since 2.0.0
      */
     public function getOptionPrice($optionValue, $basePrice)
     {
@@ -272,7 +258,6 @@ public function getOptionPrice($optionValue, $basePrice)
      * @param string $optionValue Prepared for cart option value
      * @param string $skuDelimiter Delimiter for Sku parts
      * @return string
-     * @since 2.0.0
      */
     public function getOptionSku($optionValue, $skuDelimiter)
     {
@@ -313,7 +298,6 @@ public function getOptionSku($optionValue, $skuDelimiter)
      * Check if option has single or multiple values selection
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isSingleSelection()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
index e0a594f70f802..79ee37c51671d 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
@@ -9,7 +9,6 @@
 
 /**
  * Catalog product option text type
- * @since 2.0.0
  */
 class Text extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
@@ -17,13 +16,11 @@ class Text extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper = null;
 
@@ -33,7 +30,6 @@ class Text extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -53,7 +49,6 @@ public function __construct(
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -83,7 +78,6 @@ public function validateUserValue($values)
      * Prepare option value for cart
      *
      * @return string|null Prepared option value
-     * @since 2.0.0
      */
     public function prepareForCart()
     {
@@ -99,7 +93,6 @@ public function prepareForCart()
      *
      * @param string $value Prepared for cart option value
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedOptionValue($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/UrlBuilder.php b/app/code/Magento/Catalog/Model/Product/Option/UrlBuilder.php
index 2bdecd03bc736..ef8ef245ecf43 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/UrlBuilder.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/UrlBuilder.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\UrlBuilder
  *
- * @since 2.0.0
  */
 class UrlBuilder
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_frontendUrlBuilder;
 
     /**
      * @param \Magento\Framework\UrlInterface $frontendUrlBuilder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
      * @param string|null $route
      * @param array|null $params
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($route, $params)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index 0677177ef8077..657a2242769f2 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Validator\DefaultValidator
  *
- * @since 2.0.0
  */
 class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
 {
@@ -20,7 +19,6 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
      * Product option types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $productOptionTypes;
 
@@ -28,14 +26,12 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
      * Price types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $priceTypes;
 
     /**
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
      * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
@@ -62,7 +58,6 @@ public function __construct(
      * @param  \Magento\Catalog\Model\Product\Option $value
      * @return boolean
      * @throws Zend_Validate_Exception If validation of $value is impossible
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -90,7 +85,6 @@ public function isValid($value)
      *
      * @param Option $option
      * @return bool
-     * @since 2.0.0
      */
     protected function validateOptionRequiredFields(Option $option)
     {
@@ -109,7 +103,6 @@ protected function validateOptionRequiredFields(Option $option)
      * @param string $title
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidOptionTitle($title, $storeId)
     {
@@ -129,7 +122,6 @@ protected function isValidOptionTitle($title, $storeId)
      *
      * @param Option $option
      * @return bool
-     * @since 2.0.0
      */
     protected function validateOptionType(Option $option)
     {
@@ -141,7 +133,6 @@ protected function validateOptionType(Option $option)
      *
      * @param Option $option
      * @return bool
-     * @since 2.0.0
      */
     protected function validateOptionValue(Option $option)
     {
@@ -153,7 +144,6 @@ protected function validateOptionValue(Option $option)
      *
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isEmpty($value)
     {
@@ -166,7 +156,6 @@ protected function isEmpty($value)
      * @param string $value
      * @param array $range
      * @return bool
-     * @since 2.0.0
      */
     protected function isInRange($value, array $range)
     {
@@ -178,7 +167,6 @@ protected function isInRange($value, array $range)
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isNegative($value)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/File.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/File.php
index 90edfb20f9ff1..33e73b7fe0f45 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/File.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Validator\File
  *
- * @since 2.0.0
  */
 class File extends DefaultValidator
 {
@@ -20,7 +19,6 @@ class File extends DefaultValidator
      *
      * @param Option $option
      * @return bool
-     * @since 2.0.0
      */
     protected function validateOptionValue(Option $option)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
index 2bc52a8576f9d..5eaaf2523260a 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Validator\Pool
  *
- * @since 2.0.0
  */
 class Pool
 {
     /**
      * @var \Zend_Validate_Interface
-     * @since 2.0.0
      */
     protected $validators;
 
     /**
      * @param \Zend_Validate_Interface[] $validators
-     * @since 2.0.0
      */
     public function __construct(array $validators)
     {
@@ -33,7 +30,6 @@ public function __construct(array $validators)
      *
      * @param string $type
      * @return \Zend_Validate_Interface
-     * @since 2.0.0
      */
     public function get($type)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index 52fc677c0b6a3..ef1c3c58eadca 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Validator\Select
  *
- * @since 2.0.0
  */
 class Select extends DefaultValidator
 {
@@ -20,7 +19,6 @@ class Select extends DefaultValidator
      *
      * @param array $values
      * @return bool
-     * @since 2.0.0
      */
     protected function checkAllValuesRemoved($values)
     {
@@ -39,7 +37,6 @@ protected function checkAllValuesRemoved($values)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function validateOptionValue(Option $option)
     {
@@ -80,7 +77,6 @@ protected function validateOptionValue(Option $option)
      * @param int $price
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidOptionPrice($priceType, $price, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Text.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Text.php
index 7de1cfeb91ec2..7f77b61c1682e 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Text.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Text.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Option\Validator\Text
  *
- * @since 2.0.0
  */
 class Text extends DefaultValidator
 {
@@ -20,7 +19,6 @@ class Text extends DefaultValidator
      *
      * @param Option $option
      * @return bool
-     * @since 2.0.0
      */
     protected function validateOptionValue(Option $option)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index 8d8fb45618742..5d9dd630d454e 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -22,7 +22,6 @@
  * @method \Magento\Catalog\Model\Product\Option\Value setOptionId(int $value)
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface
 {
@@ -42,21 +41,16 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
     const KEY_OPTION_TYPE_ID = 'option_type_id';
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_values = [];
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $_product;
 
     /**
      * @var Option
-     * @since 2.0.0
      */
     protected $_option;
 
@@ -64,7 +58,6 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      * Value collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory
-     * @since 2.0.0
      */
     protected $_valueCollectionFactory;
 
@@ -75,7 +68,6 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -97,7 +89,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -108,7 +99,6 @@ protected function _construct()
      * @codeCoverageIgnoreStart
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function addValue($value)
     {
@@ -118,7 +108,6 @@ public function addValue($value)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -128,7 +117,6 @@ public function getValues()
     /**
      * @param array $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues($values)
     {
@@ -138,7 +126,6 @@ public function setValues($values)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function unsetValues()
     {
@@ -149,7 +136,6 @@ public function unsetValues()
     /**
      * @param Option $option
      * @return $this
-     * @since 2.0.0
      */
     public function setOption(Option $option)
     {
@@ -159,7 +145,6 @@ public function setOption(Option $option)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function unsetOption()
     {
@@ -171,7 +156,6 @@ public function unsetOption()
      * Enter description here...
      *
      * @return Option
-     * @since 2.0.0
      */
     public function getOption()
     {
@@ -181,7 +165,6 @@ public function getOption()
     /**
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -193,7 +176,6 @@ public function setProduct($product)
 
     /**
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -205,7 +187,6 @@ public function getProduct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function saveValues()
     {
@@ -239,7 +220,6 @@ public function saveValues()
      *
      * @param bool $flag
      * @return float|int
-     * @since 2.0.0
      */
     public function getPrice($flag = false)
     {
@@ -255,7 +235,6 @@ public function getPrice($flag = false)
      * Return regular price.
      *
      * @return float|int
-     * @since 2.0.0
      */
     public function getRegularPrice()
     {
@@ -272,7 +251,6 @@ public function getRegularPrice()
      *
      * @param Option $option
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection
-     * @since 2.0.0
      */
     public function getValuesCollection(Option $option)
     {
@@ -291,7 +269,6 @@ public function getValuesCollection(Option $option)
      * @param int $option_id
      * @param int $store_id
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection
-     * @since 2.0.0
      */
     public function getValuesByOption($optionIds, $option_id, $store_id)
     {
@@ -309,7 +286,6 @@ public function getValuesByOption($optionIds, $option_id, $store_id)
     /**
      * @param int $option_id
      * @return $this
-     * @since 2.0.0
      */
     public function deleteValue($option_id)
     {
@@ -320,7 +296,6 @@ public function deleteValue($option_id)
     /**
      * @param int $option_type_id
      * @return $this
-     * @since 2.0.0
      */
     public function deleteValues($option_type_id)
     {
@@ -334,7 +309,6 @@ public function deleteValues($option_type_id)
      * @param int $oldOptionId
      * @param int $newOptionId
      * @return $this
-     * @since 2.0.0
      */
     public function duplicate($oldOptionId, $newOptionId)
     {
@@ -347,7 +321,6 @@ public function duplicate($oldOptionId, $newOptionId)
      *
      * @return string
      * @codeCoverageIgnoreStart
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -358,7 +331,6 @@ public function getTitle()
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -369,7 +341,6 @@ public function getSortOrder()
      * Get price type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPriceType()
     {
@@ -380,7 +351,6 @@ public function getPriceType()
      * Get Sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -391,7 +361,6 @@ public function getSku()
      * Get Sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getOptionTypeId()
     {
@@ -403,7 +372,6 @@ public function getOptionTypeId()
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -415,7 +383,6 @@ public function setTitle($title)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -427,7 +394,6 @@ public function setSortOrder($sortOrder)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -439,7 +405,6 @@ public function setPrice($price)
      *
      * @param string $priceType
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceType($priceType)
     {
@@ -451,7 +416,6 @@ public function setPriceType($priceType)
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -463,7 +427,6 @@ public function setSku($sku)
      *
      * @param int $optionTypeId
      * @return int|null
-     * @since 2.0.0
      */
     public function setOptionTypeId($optionTypeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
index 932f97a0fe1ff..3c3fda8e8a90c 100644
--- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php
+++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Catalog\Model\Product\PriceModifier
  *
- * @since 2.0.0
  */
 class PriceModifier
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -41,7 +38,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function removeTierPrice(\Magento\Catalog\Model\Product $product, $customerGroupId, $qty, $websiteId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier/Composite.php b/app/code/Magento/Catalog/Model/Product/PriceModifier/Composite.php
index a1efb26ef5070..4f8ddfee6d1a1 100644
--- a/app/code/Magento/Catalog/Model/Product/PriceModifier/Composite.php
+++ b/app/code/Magento/Catalog/Model/Product/PriceModifier/Composite.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\Catalog\Model\Product\PriceModifier\Composite
  *
- * @since 2.0.0
  */
 class Composite implements PriceModifierInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $modifiers;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param array $modifiers
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, array $modifiers = [])
     {
@@ -48,7 +44,6 @@ public function __construct(ObjectManagerInterface $objectManager, array $modifi
      * @param mixed $price
      * @param Product $product
      * @return mixed
-     * @since 2.0.0
      */
     public function modifyPrice($price, Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifierInterface.php b/app/code/Magento/Catalog/Model/Product/PriceModifierInterface.php
index af2a0ed9a222e..77af87653bf60 100644
--- a/app/code/Magento/Catalog/Model/Product/PriceModifierInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/PriceModifierInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface PriceModifierInterface
 {
@@ -22,7 +21,6 @@ interface PriceModifierInterface
      * @param Product $product
      * @return mixed
      * @api
-     * @since 2.0.0
      */
     public function modifyPrice($price, Product $product);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
index fa1be02002cee..ca5324ebc575f 100644
--- a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
+++ b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -8,7 +8,7 @@
 
 /**
  * Resolvers check whether product available for sale or not
- * @since 2.2.0
+ * @since 2.1.3
  */
 class SalableResolver implements SalableResolverInterface
 {
@@ -17,7 +17,7 @@ class SalableResolver implements SalableResolverInterface
      *
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
      * @return boolean
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
index a9f0b88f50f18..872fbc8a7c218 100644
--- a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * Interface resolver checks whether product available for sale
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface SalableResolverInterface
 {
@@ -17,7 +17,7 @@ interface SalableResolverInterface
      *
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
      * @return boolean
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem);
 }
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
index bb35f67863b38..37b3fc33e7b34 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
@@ -9,7 +9,6 @@
  * Class Toolbar
  *
  * @api
- * @since 2.0.0
  */
 class Toolbar
 {
@@ -42,13 +41,11 @@ class Toolbar
      * Request
      *
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param \Magento\Framework\App\Request\Http $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request
@@ -60,7 +57,6 @@ public function __construct(
      * Get sort order
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -71,7 +67,6 @@ public function getOrder()
      * Get sort direction
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getDirection()
     {
@@ -82,7 +77,6 @@ public function getDirection()
      * Get sort mode
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -93,7 +87,6 @@ public function getMode()
      * Get products per page limit
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getLimit()
     {
@@ -104,7 +97,6 @@ public function getLimit()
      * Return current page from request
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/ReservedAttributeList.php b/app/code/Magento/Catalog/Model/Product/ReservedAttributeList.php
index 1ee18ba4de83d..4ea64a1d815ca 100644
--- a/app/code/Magento/Catalog/Model/Product/ReservedAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Product/ReservedAttributeList.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ReservedAttributeList
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_reservedAttributes;
 
@@ -24,7 +22,6 @@ class ReservedAttributeList
      * @param string $productModel
      * @param array $reservedAttributes
      * @param array $allowedAttributes
-     * @since 2.0.0
      */
     public function __construct($productModel, array $reservedAttributes = [], array $allowedAttributes = [])
     {
@@ -44,7 +41,6 @@ public function __construct($productModel, array $reservedAttributes = [], array
      *
      * @param \Magento\Catalog\Model\Entity\Attribute $attribute
      * @return boolean
-     * @since 2.0.0
      */
     public function isReservedAttribute($attribute)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/TierPrice.php b/app/code/Magento/Catalog/Model/Product/TierPrice.php
index 6c506c92921d8..8f4742afd0d10 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPrice.php
@@ -8,7 +8,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class TierPrice extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Catalog\Api\Data\ProductTierPriceInterface
@@ -17,7 +16,6 @@ class TierPrice extends \Magento\Framework\Model\AbstractExtensibleModel impleme
      * Retrieve tier qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -28,7 +26,6 @@ public function getQty()
      * Retrieve price value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -40,7 +37,6 @@ public function getValue()
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -52,7 +48,6 @@ public function setQty($qty)
      *
      * @param float $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -63,7 +58,6 @@ public function setValue($value)
      * Retrieve customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -75,7 +69,6 @@ public function getCustomerGroupId()
      *
      * @param int $customerGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($customerGroupId)
     {
@@ -84,7 +77,6 @@ public function setCustomerGroupId($customerGroupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -93,7 +85,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductTierPriceExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index 4426e500a5a45..7cecd2f37bb84 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -16,49 +16,41 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory
-     * @since 2.0.0
      */
     protected $priceFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\PriceModifier
-     * @since 2.0.0
      */
     protected $priceModifier;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
@@ -70,7 +62,6 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param GroupManagementInterface $groupManagement
      * @param GroupRepositoryInterface $groupRepository
-     * @since 2.0.0
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
@@ -94,7 +85,6 @@ public function __construct(
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function add($sku, $customerGroupId, $price, $qty)
     {
@@ -159,7 +149,6 @@ public function add($sku, $customerGroupId, $price, $qty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($sku, $customerGroupId, $qty)
     {
@@ -175,7 +164,6 @@ public function remove($sku, $customerGroupId, $qty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku, $customerGroupId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
index 14627629baf7e..91a1d51e5b55b 100644
--- a/app/code/Magento/Catalog/Model/Product/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -12,7 +12,6 @@
  * Product type model
  *
  * @api
- * @since 2.0.0
  */
 class Type implements OptionSourceInterface
 {
@@ -43,7 +42,6 @@ class Type implements OptionSourceInterface
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -51,7 +49,6 @@ class Type implements OptionSourceInterface
      * Product types
      *
      * @var array|string
-     * @since 2.0.0
      */
     protected $_types;
 
@@ -59,7 +56,6 @@ class Type implements OptionSourceInterface
      * Composite product type Ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_compositeTypes;
 
@@ -67,7 +63,6 @@ class Type implements OptionSourceInterface
      * Price models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_priceModels;
 
@@ -75,7 +70,6 @@ class Type implements OptionSourceInterface
      * Product types by type indexing priority
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_typesPriority;
 
@@ -83,7 +77,6 @@ class Type implements OptionSourceInterface
      * Product type factory
      *
      * @var \Magento\Catalog\Model\Product\Type\Pool
-     * @since 2.0.0
      */
     protected $_productTypePool;
 
@@ -91,13 +84,11 @@ class Type implements OptionSourceInterface
      * Price model factory
      *
      * @var \Magento\Catalog\Model\Product\Type\Price\Factory
-     * @since 2.0.0
      */
     protected $_priceFactory;
 
     /**
      * @var \Magento\Framework\Pricing\PriceInfo\Factory
-     * @since 2.0.0
      */
     protected $_priceInfoFactory;
 
@@ -108,7 +99,6 @@ class Type implements OptionSourceInterface
      * @param \Magento\Catalog\Model\Product\Type\Pool $productTypePool
      * @param \Magento\Catalog\Model\Product\Type\Price\Factory $priceFactory
      * @param \Magento\Framework\Pricing\PriceInfo\Factory $priceInfoFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductTypes\ConfigInterface $config,
@@ -127,7 +117,6 @@ public function __construct(
      *
      * @param   \Magento\Catalog\Model\Product $product
      * @return  \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function factory($product)
     {
@@ -151,7 +140,6 @@ public function factory($product)
      *
      * @param   string $productType
      * @return  \Magento\Catalog\Model\Product\Type\Price
-     * @since 2.0.0
      */
     public function priceFactory($productType)
     {
@@ -176,7 +164,6 @@ public function priceFactory($productType)
      *
      * @param Product $saleableItem
      * @return \Magento\Framework\Pricing\PriceInfoInterface
-     * @since 2.0.0
      */
     public function getPriceInfo(Product $saleableItem)
     {
@@ -187,7 +174,6 @@ public function getPriceInfo(Product $saleableItem)
      * Get product type labels array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionArray()
     {
@@ -202,7 +188,6 @@ public function getOptionArray()
      * Get product type labels array with empty value
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOption()
     {
@@ -215,7 +200,6 @@ public function getAllOption()
      * Get product type labels array with empty value for option element
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -228,7 +212,6 @@ public function getAllOptions()
      * Get product type labels array for option element
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -244,7 +227,6 @@ public function getOptions()
      *
      * @param string $optionId
      * @return null|string
-     * @since 2.0.0
      */
     public function getOptionText($optionId)
     {
@@ -256,7 +238,6 @@ public function getOptionText($optionId)
      * Get product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypes()
     {
@@ -274,7 +255,6 @@ public function getTypes()
      * Return composite product type Ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCompositeTypes()
     {
@@ -294,7 +274,6 @@ public function getCompositeTypes()
      * Return product types by type indexing priority
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypesByPriority()
     {
@@ -328,7 +307,6 @@ public function getTypesByPriority()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 797c53203e44c..4b3b9588cdac7 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractType
 {
@@ -24,13 +23,11 @@ abstract class AbstractType
      * Product type instance id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_typeId;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_editableAttributes;
 
@@ -38,7 +35,6 @@ abstract class AbstractType
      * Is a composite product type
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = false;
 
@@ -46,7 +42,6 @@ abstract class AbstractType
      * If product can be configured
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canConfigure = false;
 
@@ -54,7 +49,6 @@ abstract class AbstractType
      * Whether product quantity is fractional number or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseQtyDecimals = true;
 
@@ -62,7 +56,6 @@ abstract class AbstractType
      * File queue array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fileQueue = [];
 
@@ -100,13 +93,11 @@ abstract class AbstractType
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_fileStorageDb;
 
@@ -114,7 +105,6 @@ abstract class AbstractType
      * Cache key for Product Attributes
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheProductSetAttributes = '_cache_instance_product_set_attributes';
 
@@ -123,7 +113,6 @@ abstract class AbstractType
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product);
 
@@ -131,7 +120,6 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -139,13 +127,11 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -153,7 +139,6 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Catalog product type
      *
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_catalogProductType;
 
@@ -161,7 +146,6 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -169,13 +153,11 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Catalog product option
      *
      * @var \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     protected $_catalogProductOption;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -201,7 +183,6 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * @param ProductRepositoryInterface $productRepository
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -233,7 +214,6 @@ public function __construct(
      *
      * @param   string $typeId
      * @return  \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function setTypeId($typeId)
     {
@@ -245,7 +225,6 @@ public function setTypeId($typeId)
      * Return relation info about used products for specific type instance
      *
      * @return \Magento\Framework\DataObject Object with information data
-     * @since 2.0.0
      */
     public function getRelationInfo()
     {
@@ -264,7 +243,6 @@ public function getRelationInfo()
      * @param bool $required
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -277,7 +255,6 @@ public function getChildrenIds($parentId, $required = true)
      * @param int|array $childId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -289,7 +266,6 @@ public function getParentIdsByChild($childId)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
-     * @since 2.0.0
      */
     public function getSetAttributes($product)
     {
@@ -308,7 +284,6 @@ public function getSetAttributes($product)
      * @param \Magento\Catalog\Model\Entity\Attribute $attributeOne
      * @param \Magento\Catalog\Model\Entity\Attribute $attributeTwo
      * @return int
-     * @since 2.0.0
      */
     public function attributesCompare($attributeOne, $attributeTwo)
     {
@@ -329,7 +304,6 @@ public function attributesCompare($attributeOne, $attributeTwo)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
-     * @since 2.0.0
      */
     public function getEditableAttributes($product)
     {
@@ -342,7 +316,6 @@ public function getEditableAttributes($product)
      * @param  int $attributeId
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute|null
-     * @since 2.0.0
      */
     public function getAttributeById($attributeId, $product)
     {
@@ -362,7 +335,6 @@ public function getAttributeById($attributeId, $product)
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isVirtual($product)
     {
@@ -374,7 +346,6 @@ public function isVirtual($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isSalable($product)
     {
@@ -395,7 +366,6 @@ public function isSalable($product)
      * @param  string $processMode
      * @return array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -461,7 +431,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
      * @return array|string
-     * @since 2.0.0
      */
     public function processConfiguration(
         \Magento\Framework\DataObject $buyRequest,
@@ -481,7 +450,6 @@ public function processConfiguration(
      * @param \Magento\Catalog\Model\Product $product
      * @param null|string $processMode
      * @return array|string
-     * @since 2.0.0
      */
     public function prepareForCartAdvanced(\Magento\Framework\DataObject $buyRequest, $product, $processMode = null)
     {
@@ -499,7 +467,6 @@ public function prepareForCartAdvanced(\Magento\Framework\DataObject $buyRequest
      * @param \Magento\Framework\DataObject $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @return array|string
-     * @since 2.0.0
      */
     public function prepareForCart(\Magento\Framework\DataObject $buyRequest, $product)
     {
@@ -513,7 +480,6 @@ public function prepareForCart(\Magento\Framework\DataObject $buyRequest, $produ
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function processFileQueue()
     {
@@ -573,7 +539,6 @@ public function processFileQueue()
      *                                    'src_name'=>'filename',
      *                                    'dst_name'=>'filename2'])
      * @return void
-     * @since 2.0.0
      */
     public function addFileQueue($queueOptions)
     {
@@ -585,7 +550,6 @@ public function addFileQueue($queueOptions)
      *
      * @param string $processMode
      * @return bool
-     * @since 2.0.0
      */
     protected function _isStrictProcessMode($processMode)
     {
@@ -596,7 +560,6 @@ protected function _isStrictProcessMode($processMode)
      * Retrieve message for specify option(s)
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSpecifyOptionMessage()
     {
@@ -611,7 +574,6 @@ public function getSpecifyOptionMessage()
      * @param string $processMode
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -661,7 +623,6 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
      * @param  \Magento\Catalog\Model\Product $product
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function checkProductBuyState($product)
     {
@@ -689,7 +650,6 @@ public function checkProductBuyState($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions($product)
     {
@@ -741,7 +701,6 @@ public function getOrderOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function save($product)
     {
@@ -761,7 +720,6 @@ public function save($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function _removeNotApplicableAttributes($product)
     {
@@ -779,7 +737,6 @@ protected function _removeNotApplicableAttributes($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($product)
     {
@@ -794,7 +751,6 @@ public function beforeSave($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isComposite($product)
     {
@@ -807,7 +763,6 @@ public function isComposite($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function canConfigure($product)
     {
@@ -818,7 +773,6 @@ public function canConfigure($product)
      * Check if product qty is fractional number
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseQtyDecimals()
     {
@@ -830,7 +784,6 @@ public function canUseQtyDecimals()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getSku($product)
     {
@@ -847,7 +800,6 @@ public function getSku($product)
      * @param \Magento\Catalog\Model\Product $product Product with Custom Options
      * @param string $sku Product SKU without option
      * @return string
-     * @since 2.0.0
      */
     public function getOptionSku($product, $sku = '')
     {
@@ -885,7 +837,6 @@ public function getOptionSku($product, $sku = '')
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getWeight($product)
     {
@@ -897,7 +848,6 @@ public function getWeight($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions($product)
     {
@@ -917,7 +867,6 @@ public function hasOptions($product)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function updateQtyOption($options, \Magento\Framework\DataObject $option, $value, $product)
     {
@@ -929,7 +878,6 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasRequiredOptions($product)
     {
@@ -944,7 +892,6 @@ public function hasRequiredOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return int|\Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStoreFilter($product)
     {
@@ -958,7 +905,6 @@ public function getStoreFilter($product)
      * @param $store int|\Magento\Store\Model\Store
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreFilter($store, $product)
     {
@@ -975,7 +921,6 @@ public function setStoreFilter($store, $product)
      * @return boolean false
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getForceChildItemQtyChanges($product)
     {
@@ -989,7 +934,6 @@ public function getForceChildItemQtyChanges($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return float
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareQuoteItemQty($qty, $product)
     {
@@ -1004,7 +948,6 @@ public function prepareQuoteItemQty($qty, $product)
      * @param \Magento\Quote\Model\Quote\Item\Option $option
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function assignProductToOption($optionProduct, $option, $product)
     {
@@ -1022,7 +965,6 @@ public function assignProductToOption($optionProduct, $option, $product)
      *
      * @param array $config
      * @return $this
-     * @since 2.0.0
      */
     public function setConfig($config)
     {
@@ -1043,7 +985,6 @@ public function setConfig($config)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($product)
     {
@@ -1064,7 +1005,6 @@ public function getSearchableData($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getProductsToPurchaseByReqGroups($product)
     {
@@ -1081,7 +1021,6 @@ public function getProductsToPurchaseByReqGroups($product)
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processBuyRequest($product, $buyRequest)
     {
@@ -1094,7 +1033,6 @@ public function processBuyRequest($product, $buyRequest)
      * @param  \Magento\Catalog\Model\Product $product
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
-     * @since 2.0.0
      */
     public function checkProductConfiguration($product, $buyRequest)
     {
@@ -1125,7 +1063,6 @@ public function checkProductConfiguration($product, $buyRequest)
      * Determine presence of weight for product type
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasWeight()
     {
@@ -1138,7 +1075,6 @@ public function hasWeight()
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setImageFromChildProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -1151,7 +1087,6 @@ public function setImageFromChildProduct(\Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $product
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdentities(\Magento\Catalog\Model\Product $product)
     {
@@ -1162,7 +1097,6 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
      * @param \Magento\Catalog\Model\Product\Type\AbstractType $product
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAssociatedProducts($product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Pool.php b/app/code/Magento/Catalog/Model/Product/Type/Pool.php
index 17de89a97697c..6051a2f30a768 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Pool.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Pool.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Type\Pool
  *
- * @since 2.0.0
  */
 class Pool
 {
@@ -20,7 +19,6 @@ class Pool
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Pool
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function get($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 5a32d55a23460..2e78130b426fa 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -17,7 +17,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price
 {
@@ -28,7 +27,6 @@ class Price
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $attributeCache = [];
 
@@ -36,7 +34,6 @@ class Price
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -44,13 +41,11 @@ class Price
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -58,7 +53,6 @@ class Price
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -66,31 +60,26 @@ class Price
      * Rule factory
      *
      * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @since 2.0.0
      */
     protected $_ruleFactory;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory
-     * @since 2.0.0
      */
     protected $tierPriceFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -114,7 +103,6 @@ class Price
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory,
@@ -146,7 +134,6 @@ public function __construct(
      *
      * @param Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getPrice($product)
     {
@@ -160,7 +147,6 @@ public function getPrice($product)
      * @param float|null $qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBasePrice($product, $qty = null)
     {
@@ -177,7 +163,6 @@ public function getBasePrice($product, $qty = null)
      * @param float|null $qty
      * @param Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty, $product)
     {
@@ -206,7 +191,6 @@ public function getFinalPrice($qty, $product)
      * @return float
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
     {
@@ -220,7 +204,6 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
      * @param string $key
      * @param bool $returnRawData
      * @return array
-     * @since 2.0.0
      */
     protected function getExistingPrices($product, $key, $returnRawData = false)
     {
@@ -245,7 +228,6 @@ protected function getExistingPrices($product, $key, $returnRawData = false)
      * Returns the website to use for group or tier prices, based on the price scope setting
      *
      * @return int|mixed
-     * @since 2.0.0
      */
     protected function getWebsiteForPriceScope()
     {
@@ -265,7 +247,6 @@ protected function getWebsiteForPriceScope()
      * @param   float $qty
      * @param   float $finalPrice
      * @return  float
-     * @since 2.0.0
      */
     protected function _applyTierPrice($product, $qty, $finalPrice)
     {
@@ -288,7 +269,6 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
      * @return  float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getTierPrice($qty, $product)
     {
@@ -368,7 +348,6 @@ public function getTierPrice($qty, $product)
      * Gets the CUST_GROUP_ALL id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getAllCustomerGroupsId()
     {
@@ -381,7 +360,6 @@ protected function getAllCustomerGroupsId()
      *
      * @param Product $product
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
-     * @since 2.0.0
      */
     public function getTierPrices($product)
     {
@@ -415,7 +393,6 @@ public function getTierPrices($product)
      * @param Product $product
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface[] $tierPrices
      * @return $this
-     * @since 2.0.0
      */
     public function setTierPrices($product, array $tierPrices = null)
     {
@@ -453,7 +430,6 @@ public function setTierPrices($product, array $tierPrices = null)
     /**
      * @param Product $product
      * @return int
-     * @since 2.0.0
      */
     protected function _getCustomerGroupId($product)
     {
@@ -469,7 +445,6 @@ protected function _getCustomerGroupId($product)
      * @param   Product $product
      * @param   float $finalPrice
      * @return  float
-     * @since 2.0.0
      */
     protected function _applySpecialPrice($product, $finalPrice)
     {
@@ -487,7 +462,6 @@ protected function _applySpecialPrice($product, $finalPrice)
      *
      * @param   Product $product
      * @return  int
-     * @since 2.0.0
      */
     public function getTierPriceCount($product)
     {
@@ -501,7 +475,6 @@ public function getTierPriceCount($product)
      * @param   float $qty
      * @param   Product $product
      * @return  array|float
-     * @since 2.0.0
      */
     public function getFormatedTierPrice($qty, $product)
     {
@@ -524,7 +497,6 @@ public function getFormatedTierPrice($qty, $product)
      *
      * @param   Product $product
      * @return  array || float
-     * @since 2.0.0
      */
     public function getFormatedPrice($product)
     {
@@ -539,7 +511,6 @@ public function getFormatedPrice($product)
      * @param float $finalPrice
      * @return float
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _applyOptionsPrice($product, $qty, $finalPrice)
     {
@@ -573,7 +544,6 @@ protected function _applyOptionsPrice($product, $qty, $finalPrice)
      * @param   integer|null $gId
      * @param   int|null $productId
      * @return  float
-     * @since 2.0.0
      */
     public function calculatePrice(
         $basePrice,
@@ -626,7 +596,6 @@ public function calculatePrice(
      * @param string $specialPriceTo
      * @param int|string|Store $store
      * @return float
-     * @since 2.0.0
      */
     public function calculateSpecialPrice(
         $finalPrice,
@@ -647,7 +616,6 @@ public function calculateSpecialPrice(
      * Check is tier price value fixed or percent of original price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTierPriceFixed()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price/Factory.php b/app/code/Magento/Catalog/Model/Product/Type/Price/Factory.php
index 4d002471523a5..5053bd5b4222f 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price/Factory.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Type\Price\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Catalog\Model\Product\Type\Price
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Simple.php b/app/code/Magento/Catalog/Model/Product/Type/Simple.php
index 825cef9aa1a4b..b8d4eabf79caf 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Simple.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Simple.php
@@ -7,7 +7,6 @@
 
 /**
  * Simple product type implementation
- * @since 2.0.0
  */
 class Simple extends \Magento\Catalog\Model\Product\Type\AbstractType
 {
@@ -16,7 +15,6 @@ class Simple extends \Magento\Catalog\Model\Product\Type\AbstractType
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php
index 609dbc4afa922..f972f6371cc0c 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Type\Virtual
  *
- * @since 2.0.0
  */
 class Virtual extends \Magento\Catalog\Model\Product\Type\AbstractType
 {
@@ -23,7 +22,6 @@ class Virtual extends \Magento\Catalog\Model\Product\Type\AbstractType
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual($product)
     {
@@ -34,7 +32,6 @@ public function isVirtual($product)
      * Check that product of this type has weight
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasWeight()
     {
@@ -46,7 +43,6 @@ public function hasWeight()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
index 22e288c0d4bbb..9c59fc2a63aad 100644
--- a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
+++ b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\TypeTransitionManager
  *
- * @since 2.0.0
  */
 class TypeTransitionManager
 {
@@ -24,20 +23,17 @@ class TypeTransitionManager
      * List of compatible product types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $compatibleTypes;
 
     /**
      * @var Edit\WeightResolver
-     * @since 2.0.0
      */
     protected $weightResolver;
 
     /**
      * @param Edit\WeightResolver $weightResolver
      * @param array $compatibleTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Edit\WeightResolver $weightResolver,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function processProduct(Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index 67e38a341308b..ef41ea08d46cb 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -12,7 +12,6 @@
  * Product Url model
  *
  * @api
- * @since 2.0.0
  */
 class Url extends \Magento\Framework\DataObject
 {
@@ -20,13 +19,11 @@ class Url extends \Magento\Framework\DataObject
      * URL instance
      *
      * @var \Magento\Framework\UrlFactory
-     * @since 2.0.0
      */
     protected $urlFactory;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filter;
 
@@ -34,19 +31,16 @@ class Url extends \Magento\Framework\DataObject
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $sidResolver;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
@@ -57,7 +51,6 @@ class Url extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param UrlFinderInterface $urlFinder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\UrlFactory $urlFactory,
@@ -79,7 +72,6 @@ public function __construct(
      * Retrieve URL Instance
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     private function getUrlInstance()
     {
@@ -92,7 +84,6 @@ private function getUrlInstance()
      * @param \Magento\Catalog\Model\Product $product
      * @param array $params the URL route params
      * @return string
-     * @since 2.0.0
      */
     public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params = [])
     {
@@ -106,7 +97,6 @@ public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params =
      * @param  \Magento\Catalog\Model\Product $product
      * @param  bool $useSid forced SID mode
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($product, $useSid = null)
     {
@@ -127,7 +117,6 @@ public function getProductUrl($product, $useSid = null)
      *
      * @param string $str
      * @return string
-     * @since 2.0.0
      */
     public function formatUrlKey($str)
     {
@@ -142,7 +131,6 @@ public function formatUrlKey($str)
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Validator.php b/app/code/Magento/Catalog/Model/Product/Validator.php
index a61685dcb5037..060f3917bbe46 100644
--- a/app/code/Magento/Catalog/Model/Product/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Validator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Validator
  *
- * @since 2.0.0
  */
 class Validator
 {
@@ -24,7 +23,6 @@ class Validator
      * @param \Magento\Framework\DataObject $response
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function validate(Product $product, RequestInterface $request, \Magento\Framework\DataObject $response)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Visibility.php b/app/code/Magento/Catalog/Model/Product/Visibility.php
index a01e6bdd44154..c9089eb423ebd 100644
--- a/app/code/Magento/Catalog/Model/Product/Visibility.php
+++ b/app/code/Magento/Catalog/Model/Product/Visibility.php
@@ -12,7 +12,6 @@
  * Catalog Product visibility model and attribute source model
  *
  * @api
- * @since 2.0.0
  */
 class Visibility extends \Magento\Framework\DataObject implements OptionSourceInterface
 {
@@ -28,7 +27,6 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
      * Reference to the attribute instance
      *
      * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     protected $_attribute;
 
@@ -36,7 +34,6 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
      * Eav entity attribute
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
-     * @since 2.0.0
      */
     protected $_eavEntityAttribute;
 
@@ -45,7 +42,6 @@ class Visibility extends \Magento\Framework\DataObject implements OptionSourceIn
      *
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute $eavEntityAttribute
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute $eavEntityAttribute,
@@ -59,7 +55,6 @@ public function __construct(
      * Retrieve visible in catalog ids array
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getVisibleInCatalogIds()
     {
@@ -70,7 +65,6 @@ public function getVisibleInCatalogIds()
      * Retrieve visible in search ids array
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getVisibleInSearchIds()
     {
@@ -81,7 +75,6 @@ public function getVisibleInSearchIds()
      * Retrieve visible in site ids array
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getVisibleInSiteIds()
     {
@@ -92,7 +85,6 @@ public function getVisibleInSiteIds()
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getOptionArray()
     {
@@ -108,7 +100,6 @@ public static function getOptionArray()
      * Retrieve all options
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getAllOption()
     {
@@ -121,7 +112,6 @@ public static function getAllOption()
      * Retrieve all options
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getAllOptions()
     {
@@ -137,7 +127,6 @@ public static function getAllOptions()
      *
      * @param int $optionId
      * @return string
-     * @since 2.0.0
      */
     public static function getOptionText($optionId)
     {
@@ -149,7 +138,6 @@ public static function getOptionText($optionId)
      * Retrieve flat column definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -171,7 +159,6 @@ public function getFlatColumns()
      * Retrieve Indexes for Flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -183,7 +170,6 @@ public function getFlatIndexes()
      *
      * @param int $store
      * @return \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
@@ -195,7 +181,6 @@ public function getFlatUpdateSelect($store)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function setAttribute($attribute)
     {
@@ -207,7 +192,6 @@ public function setAttribute($attribute)
      * Get attribute instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -220,7 +204,6 @@ public function getAttribute()
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
      * @param string $dir direction
      * @return $this
-     * @since 2.0.0
      */
     public function addValueSortToCollection($collection, $dir = 'asc')
     {
@@ -268,7 +251,6 @@ public function addValueSortToCollection($collection, $dir = 'asc')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Website.php b/app/code/Magento/Catalog/Model/Product/Website.php
index 1a0baf4fe7fb3..fa5d0134fa221 100644
--- a/app/code/Magento/Catalog/Model/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/Product/Website.php
@@ -21,7 +21,6 @@
 /**
  * Class \Magento\Catalog\Model\Product\Website
  *
- * @since 2.0.0
  */
 class Website extends \Magento\Framework\Model\AbstractModel
 {
@@ -29,7 +28,6 @@ class Website extends \Magento\Framework\Model\AbstractModel
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +38,6 @@ protected function _construct()
      * Retrieve Resource instance wrapper
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Website
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -54,7 +51,6 @@ protected function _getResource()
      * @param array $productIds
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function removeProducts($websiteIds, $productIds)
     {
@@ -75,7 +71,6 @@ public function removeProducts($websiteIds, $productIds)
      * @param array $productIds
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addProducts($websiteIds, $productIds)
     {
@@ -95,7 +90,6 @@ public function addProducts($websiteIds, $productIds)
      *
      * @param int|array $productIds
      * @return array
-     * @since 2.0.0
      */
     public function getWebsites($productIds)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php b/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
index 97f2ffa7bdf5b..18168750cd155 100644
--- a/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Catalog\Model\ProductAttributeGroupRepository
  *
- * @since 2.0.0
  */
 class ProductAttributeGroupRepository implements \Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeGroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group
-     * @since 2.0.0
      */
     protected $groupResource;
 
@@ -38,7 +34,6 @@ class ProductAttributeGroupRepository implements \Magento\Catalog\Api\ProductAtt
      * @param \Magento\Eav\Api\AttributeGroupRepositoryInterface $groupRepository
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group $groupResource
      * @param Product\Attribute\GroupFactory $groupFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeGroupRepositoryInterface $groupRepository,
@@ -52,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {
@@ -61,7 +55,6 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -70,7 +63,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($groupId)
     {
@@ -85,7 +77,6 @@ public function get($groupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($groupId)
     {
@@ -97,7 +88,6 @@ public function deleteById($groupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Attribute.php b/app/code/Magento/Catalog/Model/ProductLink/Attribute.php
index 1efcaad9d2724..b55b62a4d810f 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Attribute.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Attribute extends \Magento\Framework\Api\AbstractExtensibleObject implements ProductLinkAttributeInterface
 {
@@ -23,7 +22,6 @@ class Attribute extends \Magento\Framework\Api\AbstractExtensibleObject implemen
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -32,7 +30,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -44,7 +41,6 @@ public function getType()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -56,7 +52,6 @@ public function setCode($code)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -67,7 +62,6 @@ public function setType($type)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -79,7 +73,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductLinkAttributeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
index 0c98470c8aa3d..340b38ffde5d5 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\CollectionProvider
  *
- * @since 2.0.0
  */
 class CollectionProvider
 {
     /**
      * @var CollectionProviderInterface[]
-     * @since 2.0.0
      */
     protected $providers;
 
     /**
      * @var ConverterPool
-     * @since 2.0.0
      */
     protected $converterPool;
 
     /**
      * @param ConverterPool $converterPool
      * @param CollectionProviderInterface[] $providers
-     * @since 2.0.0
      */
     public function __construct(ConverterPool $converterPool, array $providers = [])
     {
@@ -46,7 +42,6 @@ public function __construct(ConverterPool $converterPool, array $providers = [])
      * @param string $type
      * @return array
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function getCollection(\Magento\Catalog\Model\Product $product, $type)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Crosssell.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Crosssell.php
index 0b4511dada688..252d5ca5a36aa 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Crosssell.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Crosssell.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\CollectionProvider\Crosssell
  *
- * @since 2.0.0
  */
 class Crosssell implements \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLinkedProducts(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Related.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Related.php
index 5c0882d934721..4c6553f7f8fd6 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Related.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Related.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\CollectionProvider\Related
  *
- * @since 2.0.0
  */
 class Related implements \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLinkedProducts(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Upsell.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Upsell.php
index fd02c4dd77260..0aa379289bc7b 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Upsell.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/Upsell.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\CollectionProvider\Upsell
  *
- * @since 2.0.0
  */
 class Upsell implements \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLinkedProducts(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
index 30d898f2b8905..2311ea5e1c506 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
  *
- * @since 2.0.0
  */
 interface CollectionProviderInterface
 {
@@ -18,7 +17,6 @@ interface CollectionProviderInterface
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product[]
-     * @since 2.0.0
      */
     public function getLinkedProducts(\Magento\Catalog\Model\Product $product);
 }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
index 26cfaa9705237..70e41ce03fb99 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Catalog\Model\ProductLink\Converter\ConverterInterface
  *
- * @since 2.0.0
  */
 interface ConverterInterface
 {
@@ -18,7 +17,6 @@ interface ConverterInterface
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function convert(\Magento\Catalog\Model\Product $product);
 }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
index a1d6bd6da1702..5d8d6ecfa955b 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\Converter\ConverterPool
  *
- * @since 2.0.0
  */
 class ConverterPool
 {
     /**
      * @var ConverterInterface[]
-     * @since 2.0.0
      */
     protected $converters;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $defaultConverterCode = 'default';
 
     /**
      * @param  ConverterInterface[] $converters
-     * @since 2.0.0
      */
     public function __construct(array $converters)
     {
@@ -39,7 +35,6 @@ public function __construct(array $converters)
      *
      * @param string $linkType
      * @return ConverterInterface
-     * @since 2.0.0
      */
     public function getConverter($linkType)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Converter/DefaultConverter.php b/app/code/Magento/Catalog/Model/ProductLink/Converter/DefaultConverter.php
index d21e8a9d03e60..8b4c6570b8765 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Converter/DefaultConverter.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Converter/DefaultConverter.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\Converter\DefaultConverter
  *
- * @since 2.0.0
  */
 class DefaultConverter implements ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Link.php b/app/code/Magento/Catalog/Model/ProductLink/Link.php
index e93fc8d7a14f0..ebf90c0523818 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Link.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Link.php
@@ -8,7 +8,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Catalog\Api\Data\ProductLinkInterface
@@ -28,7 +27,6 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
      *
      * @param string $key
      * @return mixed|null
-     * @since 2.0.0
      */
     protected function _get($key)
     {
@@ -40,7 +38,6 @@ protected function _get($key)
      *
      * @return array
      * @todo refactor with converter for AbstractExtensibleModel
-     * @since 2.0.0
      */
     public function __toArray()
     {
@@ -68,7 +65,6 @@ public function __toArray()
      *
      * @identifier
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -80,7 +76,6 @@ public function getSku()
      *
      * @identifier
      * @return string
-     * @since 2.0.0
      */
     public function getLinkType()
     {
@@ -92,7 +87,6 @@ public function getLinkType()
      *
      * @identifier
      * @return string
-     * @since 2.0.0
      */
     public function getLinkedProductSku()
     {
@@ -103,7 +97,6 @@ public function getLinkedProductSku()
      * Get linked product type (simple, virtual, etc)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinkedProductType()
     {
@@ -114,7 +107,6 @@ public function getLinkedProductType()
      * Get product position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -126,7 +118,6 @@ public function getPosition()
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -138,7 +129,6 @@ public function setSku($sku)
      *
      * @param string $linkType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkType($linkType)
     {
@@ -150,7 +140,6 @@ public function setLinkType($linkType)
      *
      * @param string $linkedProductSku
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkedProductSku($linkedProductSku)
     {
@@ -162,7 +151,6 @@ public function setLinkedProductSku($linkedProductSku)
      *
      * @param string $linkedProductType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkedProductType($linkedProductType)
     {
@@ -174,7 +162,6 @@ public function setLinkedProductType($linkedProductType)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -185,7 +172,6 @@ public function setPosition($position)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -202,7 +188,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductLinkExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Management.php b/app/code/Magento/Catalog/Model/ProductLink/Management.php
index c9826a28bcddc..a4745d3daab05 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Management.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Management.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\Catalog\Model\ProductLink\Management
  *
- * @since 2.0.0
  */
 class Management implements \Magento\Catalog\Api\ProductLinkManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkTypeProvider
-     * @since 2.0.0
      */
     protected $linkTypeProvider;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLinkedItemsByType($sku, $type)
     {
@@ -71,7 +66,6 @@ public function getLinkedItemsByType($sku, $type)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductLinks($sku, array $items)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
index 619701b0e4666..198aa75411411 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 {
@@ -47,31 +46,26 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var CollectionProvider
-     * @since 2.0.0
      */
     protected $entityCollectionProvider;
 
     /**
      * @var LinksInitializer
-     * @since 2.0.0
      */
     protected $linkInitializer;
 
     /**
      * @var Management
-     * @since 2.0.0
      */
     protected $linkManagement;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
@@ -98,7 +92,6 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
      * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory
      * @param \Magento\Catalog\Api\Data\ProductLinkExtensionFactory|null $productLinkExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -122,7 +115,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     {
@@ -201,7 +193,6 @@ public function getList(\Magento\Catalog\Api\Data\ProductInterface $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     {
@@ -235,7 +226,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($sku, $type, $linkedProductSku)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Type.php b/app/code/Magento/Catalog/Model/ProductLink/Type.php
index 464d8ce76f0e6..e22741e4a2565 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Type.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Type.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Api\AbstractExtensibleObject implements ProductLinkTypeInterface
 {
@@ -23,7 +22,6 @@ class Type extends \Magento\Framework\Api\AbstractExtensibleObject implements Pr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -32,7 +30,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -44,7 +41,6 @@ public function getName()
      *
      * @param int $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -56,7 +52,6 @@ public function setCode($code)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -67,7 +62,6 @@ public function setName($name)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -79,7 +73,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductLinkTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductManagement.php b/app/code/Magento/Catalog/Model/ProductManagement.php
index dbf3baf3a9a67..7d10c3ce8fcb5 100644
--- a/app/code/Magento/Catalog/Model/ProductManagement.php
+++ b/app/code/Magento/Catalog/Model/ProductManagement.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Catalog\Model\ProductManagement
  *
- * @since 2.0.0
  */
 class ProductManagement implements ProductManagementInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $productsFactory;
 
     /**
      * @param CollectionFactory $productsFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $productsFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(CollectionFactory $productsFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount($status = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductOption.php b/app/code/Magento/Catalog/Model/ProductOption.php
index 10aec69958472..1e1c5618bf306 100644
--- a/app/code/Magento/Catalog/Model/ProductOption.php
+++ b/app/code/Magento/Catalog/Model/ProductOption.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Catalog\Model\ProductOption
  *
- * @since 2.0.0
  */
 class ProductOption extends AbstractExtensibleModel implements ProductOptionInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -26,7 +24,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductOptionProcessor.php b/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
index d98f6b341d79d..6cd3857eafa8a 100644
--- a/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Catalog\Model\ProductOptionProcessor
  *
- * @since 2.0.0
  */
 class ProductOptionProcessor implements ProductOptionProcessorInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var CustomOptionFactory
-     * @since 2.0.0
      */
     protected $customOptionFactory;
 
@@ -40,7 +37,6 @@ class ProductOptionProcessor implements ProductOptionProcessorInterface
     /**
      * @param DataObjectFactory $objectFactory
      * @param CustomOptionFactory $customOptionFactory
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function convertToBuyRequest(ProductOptionInterface $productOption)
     {
@@ -76,7 +71,6 @@ public function convertToBuyRequest(ProductOptionInterface $productOption)
      *
      * @param ProductOptionInterface $productOption
      * @return array
-     * @since 2.0.0
      */
     protected function getCustomOptions(ProductOptionInterface $productOption)
     {
@@ -92,7 +86,6 @@ protected function getCustomOptions(ProductOptionInterface $productOption)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function convertToProductOption(DataObject $request)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductOptionProcessorInterface.php b/app/code/Magento/Catalog/Model/ProductOptionProcessorInterface.php
index d6029e101faaa..f15135ed2a7ed 100644
--- a/app/code/Magento/Catalog/Model/ProductOptionProcessorInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductOptionProcessorInterface.php
@@ -12,7 +12,6 @@
  * Allows to dump and apply product configurations
  *
  * @api
- * @since 2.0.0
  */
 interface ProductOptionProcessorInterface
 {
@@ -21,7 +20,6 @@ interface ProductOptionProcessorInterface
      *
      * @param ProductOptionInterface $productOption
      * @return DataObject
-     * @since 2.0.0
      */
     public function convertToBuyRequest(ProductOptionInterface $productOption);
 
@@ -30,7 +28,6 @@ public function convertToBuyRequest(ProductOptionInterface $productOption);
      *
      * @param DataObject $request
      * @return array
-     * @since 2.0.0
      */
     public function convertToProductOption(DataObject $request);
 }
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/Config.php b/app/code/Magento/Catalog/Model/ProductOptions/Config.php
index 8fba8c3b3e0ab..1ab2d544b8b31 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/Config.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides product options configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data implements
     \Magento\Catalog\Model\ProductOptions\ConfigInterface
@@ -21,7 +20,6 @@ class Config extends \Magento\Framework\Config\Data implements
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductOptions\Config\Reader $reader,
@@ -37,7 +35,6 @@ public function __construct(
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getOption($name)
     {
@@ -48,7 +45,6 @@ public function getOption($name)
      * Get configuration of all registered product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAll()
     {
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php b/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
index 02227fa033a51..5994bb57fb17a 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductOptions\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -18,7 +17,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -56,7 +54,6 @@ public function convert($source)
      * @param string $attributeName
      * @param string|null $defaultValue
      * @return null|string
-     * @since 2.0.0
      */
     protected function _getAttributeValue(\DOMNode $node, $attributeName, $defaultValue = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/Config/Reader.php b/app/code/Magento/Catalog/Model/ProductOptions/Config/Reader.php
index e0af96e9b16f4..2a2d2890b4a0a 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/Config/Reader.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductOptions\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/option' => 'name', '/config/option/inputType' => 'name'];
 
@@ -29,7 +27,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/Config/SchemaLocator.php b/app/code/Magento/Catalog/Model/ProductOptions/Config/SchemaLocator.php
index 162477c48982f..5d3225cfcd155 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/Config/SchemaLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductOptions\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php b/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
index 97168ef2ebdfd..b41429736591e 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Catalog\Model\ProductOptions\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getOption($name);
 
@@ -25,7 +23,6 @@ public function getOption($name);
      * Get configuration of all registered product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAll();
 }
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/TypeList.php b/app/code/Magento/Catalog/Model/ProductOptions/TypeList.php
index dafed9d2ff80b..d05413e55b853 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/TypeList.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/TypeList.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Catalog\Model\ProductOptions\TypeList
  *
- * @since 2.0.0
  */
 class TypeList implements \Magento\Catalog\Api\ProductCustomOptionTypeListInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductCustomOptionTypeInterfaceFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @param Config $config
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionTypeInterfaceFactory $factory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index 5ec1302bdf769..265abcefd7321 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -27,7 +27,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterface
 {
@@ -39,115 +38,96 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
 
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var Product[]
-     * @since 2.0.0
      */
     protected $instances = [];
 
     /**
      * @var Product[]
-     * @since 2.0.0
      */
     protected $instancesById = [];
 
     /**
      * @var \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper
-     * @since 2.0.0
      */
     protected $initializationHelper;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $resourceModel;
 
     /**
      * @var Product\Initialization\Helper\ProductLinks
-     * @since 2.0.0
      */
     protected $linkInitializer;
 
     /**
      * @var Product\LinkTypeProvider
-     * @since 2.0.0
      */
     protected $linkTypeProvider;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $extensibleDataObjectConverter;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $fileSystem;
 
     /**
      * @var ImageContentInterfaceFactory
-     * @since 2.0.0
      */
     protected $contentFactory;
 
     /**
      * @var ImageProcessorInterface
-     * @since 2.0.0
      */
     protected $imageProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -202,7 +182,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param int $cacheLimit [optional]
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         ProductFactory $productFactory,
@@ -254,7 +233,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($sku, $editMode = false, $storeId = null, $forceReload = false)
     {
@@ -283,7 +261,6 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false)
     {
@@ -310,7 +287,6 @@ public function getById($productId, $editMode = false, $storeId = null, $forceRe
      *
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     protected function getCacheKey($data)
     {
@@ -353,7 +329,6 @@ private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterf
      * @param bool $createNew
      * @return \Magento\Catalog\Api\Data\ProductInterface|Product
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     protected function initializeProductData(array $productData, $createNew)
     {
@@ -379,7 +354,6 @@ protected function initializeProductData(array $productData, $createNew)
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)
     {
@@ -408,7 +382,6 @@ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product
      * @throws InputException
      * @throws StateException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function processNewMediaGalleryEntry(
         ProductInterface $product,
@@ -456,7 +429,6 @@ protected function processNewMediaGalleryEntry(
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $newLinks
      * @return $this
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $product, $newLinks)
     {
@@ -522,7 +494,6 @@ private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $produc
      * @throws InputException
      * @throws StateException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function processMediaGallery(ProductInterface $product, $mediaGalleryEntries)
     {
@@ -590,7 +561,6 @@ protected function processMediaGallery(ProductInterface $product, $mediaGalleryE
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveOptions = false)
     {
@@ -682,7 +652,6 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
@@ -706,7 +675,6 @@ public function delete(\Magento\Catalog\Api\Data\ProductInterface $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($sku)
     {
@@ -716,7 +684,6 @@ public function deleteById($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -760,7 +727,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
diff --git a/app/code/Magento/Catalog/Model/ProductType.php b/app/code/Magento/Catalog/Model/ProductType.php
index 4f9f8c74384b7..48267ed8ed760 100644
--- a/app/code/Magento/Catalog/Model/ProductType.php
+++ b/app/code/Magento/Catalog/Model/ProductType.php
@@ -11,7 +11,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ProductType extends \Magento\Framework\Api\AbstractExtensibleObject implements ProductTypeInterface
 {
@@ -24,7 +23,6 @@ class ProductType extends \Magento\Framework\Api\AbstractExtensibleObject implem
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -33,7 +31,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -45,7 +42,6 @@ public function getLabel()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -57,7 +53,6 @@ public function setName($name)
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -68,7 +63,6 @@ public function setLabel($label)
      * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\ProductTypeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -80,7 +74,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductTypeExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductTypeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductTypeList.php b/app/code/Magento/Catalog/Model/ProductTypeList.php
index 08d8c2cb472b3..f34d379a4ca91 100644
--- a/app/code/Magento/Catalog/Model/ProductTypeList.php
+++ b/app/code/Magento/Catalog/Model/ProductTypeList.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductTypeList
  *
- * @since 2.0.0
  */
 class ProductTypeList implements ProductTypeListInterface
 {
@@ -21,7 +20,6 @@ class ProductTypeList implements ProductTypeListInterface
      * Product type configuration provider
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $productTypeConfig;
 
@@ -29,7 +27,6 @@ class ProductTypeList implements ProductTypeListInterface
      * Product type factory
      *
      * @var \Magento\Catalog\Api\Data\ProductTypeInterfaceFactory
-     * @since 2.0.0
      */
     private $productTypeFactory;
 
@@ -37,14 +34,12 @@ class ProductTypeList implements ProductTypeListInterface
      * List of product types
      *
      * @var array
-     * @since 2.0.0
      */
     private $productTypes;
 
     /**
      * @param ConfigInterface $productTypeConfig
      * @param \Magento\Catalog\Api\Data\ProductTypeInterfaceFactory $productTypeFactory
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $productTypeConfig,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductTypes()
     {
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/Config.php b/app/code/Magento/Catalog/Model/ProductTypes/Config.php
index b6e36c508c3c1..171ab0f1ad0f6 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/Config.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides product types configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data implements \Magento\Catalog\Model\ProductTypes\ConfigInterface
 {
@@ -20,7 +19,6 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\Catalog\
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductTypes\Config\Reader $reader,
@@ -36,7 +34,6 @@ public function __construct(
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getType($name)
     {
@@ -47,7 +44,6 @@ public function getType($name)
      * Get configuration of all registered product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAll()
     {
@@ -59,7 +55,6 @@ public function getAll()
      *
      * @param string $typeId
      * @return bool
-     * @since 2.0.0
      */
     public function isProductSet($typeId)
     {
@@ -70,7 +65,6 @@ public function isProductSet($typeId)
      * Get composable types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getComposableTypes()
     {
@@ -83,7 +77,6 @@ public function getComposableTypes()
      * @param string $attributeName
      * @param string $value
      * @return array
-     * @since 2.0.0
      */
     public function filter($attributeName, $value = 'true')
     {
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php b/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
index e084c714b0600..d4f332348c690 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductTypes\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -20,7 +19,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @throws \InvalidArgumentException
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -102,7 +100,6 @@ public function convert($source)
      * @param string $attributeName
      * @param string|null $default
      * @return null|string
-     * @since 2.0.0
      */
     protected function _getAttributeValue(\DOMNode $input, $attributeName, $default = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/Config/Reader.php b/app/code/Magento/Catalog/Model/ProductTypes/Config/Reader.php
index f06bd85e9840f..42da4391f3c7b 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/Config/Reader.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductTypes\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/type' => 'name',
@@ -36,7 +34,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/Config/SchemaLocator.php b/app/code/Magento/Catalog/Model/ProductTypes/Config/SchemaLocator.php
index 61424c5f4c68f..002fa90a6753d 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/Config/SchemaLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductTypes\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/ConfigInterface.php b/app/code/Magento/Catalog/Model/ProductTypes/ConfigInterface.php
index 7ae28d5a316a3..10fe4aae0ce2a 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Provides product types configuration
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -18,7 +17,6 @@ interface ConfigInterface
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getType($name);
 
@@ -26,7 +24,6 @@ public function getType($name);
      * Get configuration of all registered product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAll();
 
@@ -35,7 +32,6 @@ public function getAll();
      *
      * @param string $typeId
      * @return bool
-     * @since 2.0.0
      */
     public function isProductSet($typeId);
 
@@ -43,7 +39,6 @@ public function isProductSet($typeId);
      * Get composable types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getComposableTypes();
 
@@ -53,7 +48,6 @@ public function getComposableTypes();
      * @param string $customAttributeName
      * @param string $value
      * @return array
-     * @since 2.0.0
      */
     public function filter($customAttributeName, $value = 'true');
 }
diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLink.php b/app/code/Magento/Catalog/Model/ProductWebsiteLink.php
index 1d1139584cf65..e71962939555b 100644
--- a/app/code/Magento/Catalog/Model/ProductWebsiteLink.php
+++ b/app/code/Magento/Catalog/Model/ProductWebsiteLink.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Catalog\Model\ProductWebsiteLink
  *
- * @since 2.0.0
  */
 class ProductWebsiteLink extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Catalog\Api\Data\ProductWebsiteLinkInterface
@@ -23,7 +22,6 @@ class ProductWebsiteLink extends \Magento\Framework\Api\AbstractSimpleObject imp
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -32,7 +30,6 @@ public function getSku()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -42,7 +39,6 @@ public function getWebsiteId()
     /**
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -51,7 +47,6 @@ public function setSku($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
index 7134a5fd44911..af18bf2f9e63f 100644
--- a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Catalog\Model\ProductWebsiteLinkRepository
  *
- * @since 2.0.0
  */
 class ProductWebsiteLinkRepository implements \Magento\Catalog\Api\ProductWebsiteLinkRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -35,7 +32,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(ProductWebsiteLinkInterface $productWebsiteLink)
     {
@@ -61,7 +57,6 @@ public function save(ProductWebsiteLinkInterface $productWebsiteLink)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(ProductWebsiteLinkInterface $productLink)
     {
@@ -70,7 +65,6 @@ public function delete(ProductWebsiteLinkInterface $productLink)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($sku, $websiteId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index 32ce1ebe9f358..d7d4ab238020a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -16,7 +16,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
 {
@@ -24,7 +23,6 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -32,7 +30,6 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
      * Model factory
      *
      * @var \Magento\Catalog\Model\Factory
-     * @since 2.0.0
      */
     protected $_modelFactory;
 
@@ -41,7 +38,6 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Factory $modelFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Re-declare attribute model
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultAttributeModel()
     {
@@ -69,7 +64,6 @@ protected function _getDefaultAttributeModel()
      * Returns default Store ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultStoreId()
     {
@@ -82,7 +76,6 @@ public function getDefaultStoreId()
      * @param \Magento\Framework\DataObject $object
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isApplicableAttribute($object, $attribute)
     {
@@ -98,7 +91,6 @@ protected function _isApplicableAttribute($object, $attribute)
      * @param string $method
      * @param array $args array of arguments
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isCallableAttributeInstance($instance, $method, $args)
     {
@@ -121,7 +113,6 @@ protected function _isCallableAttributeInstance($instance, $method, $args)
      * @param \Magento\Framework\DataObject $object
      * @param string $table
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadAttributesSelect($object, $table)
     {
@@ -166,7 +157,6 @@ protected function _getLoadAttributesSelect($object, $table)
      *
      * @param array $selects
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _prepareLoadSelect(array $selects)
     {
@@ -182,7 +172,6 @@ protected function _prepareLoadSelect(array $selects)
      * @param AbstractAttribute $attribute
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveAttributeValue($object, $attribute, $value)
     {
@@ -250,7 +239,6 @@ protected function _saveAttributeValue($object, $attribute, $value)
      * @param AbstractAttribute $attribute
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _insertAttribute($object, $attribute, $value)
     {
@@ -296,7 +284,6 @@ protected function _insertAttribute($object, $attribute, $value)
      * @param mixed $value
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
@@ -311,7 +298,6 @@ protected function _updateAttribute($object, $attribute, $valueId, $value)
      * @param mixed $value
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateAttributeForStore($object, $attribute, $value, $storeId)
     {
@@ -358,7 +344,6 @@ protected function _updateAttributeForStore($object, $attribute, $value, $storeI
      * @param string $table
      * @param array $info
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteAttributes($object, $table, $info)
     {
@@ -426,7 +411,6 @@ protected function _deleteAttributes($object, $table, $info)
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getOrigObject($object)
     {
@@ -449,7 +433,6 @@ protected function _getOrigObject($object)
      * @param mixed $value New value of the attribute.
      * @param array &$origData
      * @return bool
-     * @since 2.0.0
      */
     protected function _canUpdateAttribute(AbstractAttribute $attribute, $value, array &$origData)
     {
@@ -477,7 +460,6 @@ protected function _canUpdateAttribute(AbstractAttribute $attribute, $value, arr
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getAttributeRawValue($entityId, $attribute, $store)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
index 1858938ea6579..301ea9c85a8b0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
@@ -12,7 +12,6 @@
  * Catalog attribute resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
 {
@@ -20,13 +19,11 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var LockValidatorInterface
-     * @since 2.0.0
      */
     protected $attrLockValidator;
 
@@ -43,7 +40,6 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param LockValidatorInterface $lockValidator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -63,7 +59,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -79,7 +74,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -92,7 +86,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param  \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearUselessAttributeValues(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -121,7 +114,6 @@ protected function _clearUselessAttributeValues(\Magento\Framework\Model\Abstrac
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index e684a187baf50..0b73dbf508570 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Category extends AbstractResource
 {
@@ -23,7 +22,6 @@ class Category extends AbstractResource
      * Category tree object
      *
      * @var \Magento\Framework\Data\Tree\Db
-     * @since 2.0.0
      */
     protected $_tree;
 
@@ -31,7 +29,6 @@ class Category extends AbstractResource
      * Catalog products table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_categoryProductTable;
 
@@ -45,7 +42,6 @@ class Category extends AbstractResource
      * Id of 'is_active' category attribute
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_isActiveAttributeId = null;
 
@@ -53,7 +49,6 @@ class Category extends AbstractResource
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId = null;
 
@@ -61,7 +56,6 @@ class Category extends AbstractResource
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -69,7 +63,6 @@ class Category extends AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @since 2.0.0
      */
     protected $_categoryCollectionFactory;
 
@@ -77,7 +70,6 @@ class Category extends AbstractResource
      * Category tree factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
-     * @since 2.0.0
      */
     protected $_categoryTreeFactory;
 
@@ -103,7 +95,6 @@ class Category extends AbstractResource
      * @param Category\CollectionFactory $categoryCollectionFactory
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -134,7 +125,6 @@ public function __construct(
      *
      * @return \Magento\Eav\Model\Entity\Type
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -148,7 +138,6 @@ public function getEntityType()
      * Category product table name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryProductTable()
     {
@@ -163,7 +152,6 @@ public function getCategoryProductTable()
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -175,7 +163,6 @@ public function setStoreId($storeId)
      * Return store id
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -189,7 +176,6 @@ public function getStoreId()
      * Retrieve category tree object
      *
      * @return \Magento\Framework\Data\Tree\Db
-     * @since 2.0.0
      */
     protected function _getTree()
     {
@@ -206,7 +192,6 @@ protected function _getTree()
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeDelete(\Magento\Framework\DataObject $object)
     {
@@ -220,7 +205,6 @@ protected function _beforeDelete(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function deleteChildren(\Magento\Framework\DataObject $object)
     {
@@ -252,7 +236,6 @@ public function deleteChildren(\Magento\Framework\DataObject $object)
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\DataObject $object)
     {
@@ -300,7 +283,6 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\DataObject $object)
     {
@@ -321,7 +303,6 @@ protected function _afterSave(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Catalog\Model\Category $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _savePath($object)
     {
@@ -341,7 +322,6 @@ protected function _savePath($object)
      *
      * @param string $path
      * @return int
-     * @since 2.0.0
      */
     protected function _getMaxPosition($path)
     {
@@ -372,7 +352,6 @@ protected function _getMaxPosition($path)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _saveCategoryProducts($category)
     {
@@ -466,7 +445,6 @@ protected function _saveCategoryProducts($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return array
-     * @since 2.0.0
      */
     public function getProductsPosition($category)
     {
@@ -486,7 +464,6 @@ public function getProductsPosition($category)
      *
      * @param int $categoryId
      * @return int
-     * @since 2.0.0
      */
     public function getChildrenCount($categoryId)
     {
@@ -506,7 +483,6 @@ public function getChildrenCount($categoryId)
      *
      * @param int $entityId
      * @return bool
-     * @since 2.0.0
      */
     public function checkId($entityId)
     {
@@ -526,7 +502,6 @@ public function checkId($entityId)
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function verifyIds(array $ids)
     {
@@ -551,7 +526,6 @@ public function verifyIds(array $ids)
      * @param \Magento\Catalog\Model\Category $category
      * @param bool $isActiveFlag
      * @return int
-     * @since 2.0.0
      */
     public function getChildrenAmount($category, $isActiveFlag = true)
     {
@@ -591,7 +565,6 @@ public function getChildrenAmount($category, $isActiveFlag = true)
      * Get "is_active" attribute identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsActiveAttributeId()
     {
@@ -610,7 +583,6 @@ public function getIsActiveAttributeId()
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @param mixed $expectedValue
      * @return array
-     * @since 2.0.0
      */
     public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValue)
     {
@@ -647,7 +619,6 @@ public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValu
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return int
-     * @since 2.0.0
      */
     public function getProductCount($category)
     {
@@ -675,7 +646,6 @@ public function getProductCount($category)
      * @param boolean $asCollection
      * @param boolean $toLoad
      * @return \Magento\Framework\Data\Tree\Node\Collection|\Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true)
     {
@@ -696,7 +666,6 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getParentCategories($category)
     {
@@ -723,7 +692,6 @@ public function getParentCategories($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getParentDesignCategory($category)
     {
@@ -764,7 +732,6 @@ public function getParentDesignCategory($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getChildrenCategories($category)
     {
@@ -797,7 +764,6 @@ public function getChildrenCategories($category)
      * @param \Magento\Catalog\Model\Category $category
      * @param boolean $recursive
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($category, $recursive = true)
     {
@@ -841,7 +807,6 @@ public function getChildren($category, $recursive = true)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return array
-     * @since 2.0.0
      */
     public function getAllChildren($category)
     {
@@ -857,7 +822,6 @@ public function getAllChildren($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return boolean
-     * @since 2.0.0
      */
     public function isInRootCategoryList($category)
     {
@@ -872,7 +836,6 @@ public function isInRootCategoryList($category)
      *
      * @param integer $categoryId
      * @return boolean
-     * @since 2.0.0
      */
     public function isForbiddenToDelete($categoryId)
     {
@@ -895,7 +858,6 @@ public function isForbiddenToDelete($categoryId)
      *
      * @param int $categoryId
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryPathById($categoryId)
     {
@@ -917,7 +879,6 @@ public function getCategoryPathById($categoryId)
      * @param \Magento\Catalog\Model\Category $newParent
      * @param null|int $afterCategoryId
      * @return $this
-     * @since 2.0.0
      */
     public function changeParent(
         \Magento\Catalog\Model\Category $category,
@@ -997,7 +958,6 @@ public function changeParent(
      * @param \Magento\Catalog\Model\Category $newParent
      * @param null|int $afterCategoryId
      * @return int
-     * @since 2.0.0
      */
     protected function _processPositions($category, $newParent, $afterCategoryId)
     {
@@ -1034,7 +994,6 @@ protected function _processPositions($category, $newParent, $afterCategoryId)
      * Get total number of persistent categories in the system, excluding the default category
      *
      * @return int
-     * @since 2.0.0
      */
     public function countVisible()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php
index 9a87a274df370..a12120613c2a7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php
@@ -9,7 +9,6 @@
  * Catalog category EAV additional attribute resource collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Colle
      * Entity factory
      *
      * @var \Magento\Eav\Model\EntityFactory
-     * @since 2.0.0
      */
     protected $_eavEntityFactory;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Colle
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -51,7 +48,6 @@ public function __construct(
      * Joins catalog/eav_attribute table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -73,7 +69,6 @@ protected function _initSelect()
      * @param int $typeId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setEntityTypeFilter($typeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php
index 019cba6040f29..3e6bea7e0a8d6 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php
@@ -9,7 +9,6 @@
  * Category image attribute frontend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
 {
@@ -19,7 +18,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -27,7 +25,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
      * Construct
      *
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      *
      * @param \Magento\Framework\DataObject $object
      * @return string|null
-     * @since 2.0.0
      */
     public function getUrl($object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php
index 5b8d64f7b6722..41b9a5b6861e3 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php
@@ -9,19 +9,16 @@
  * Catalog category landing page attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_cmsLayouts;
 
     /**
      * @param array $cmsLayouts
-     * @since 2.0.0
      */
     public function __construct(array $cmsLayouts = [])
     {
@@ -32,7 +29,6 @@ public function __construct(array $cmsLayouts = [])
      * Return cms layout update options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php
index 48fbdecda4fa7..955342cb3c2ee 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php
@@ -9,7 +9,6 @@
  * Catalog category landing page attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -17,7 +16,6 @@ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Block collection factory
      *
      * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory
-     * @since 2.0.0
      */
     protected $_blockCollectionFactory;
 
@@ -25,7 +23,6 @@ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Construct
      *
      * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Cms\Model\ResourceModel\Block\CollectionFac
      * Return all block options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index 6f471dcd59f54..af5f38e608226 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -20,7 +19,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_category_collection';
 
@@ -28,7 +26,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Event object name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'category_collection';
 
@@ -36,7 +33,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Name of product table
      *
      * @var string
-     * @since 2.0.0
      */
     private $_productTable;
 
@@ -44,7 +40,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Store id, that we should count products on
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_productStoreId;
 
@@ -52,7 +47,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Name of product website table
      *
      * @var string
-     * @since 2.0.0
      */
     private $_productWebsiteTable;
 
@@ -60,7 +54,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Load with product count flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_loadWithProductCount = false;
 
@@ -68,7 +61,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Init collection and determine table names
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +72,6 @@ protected function _construct()
      *
      * @param array $categoryIds
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($categoryIds)
     {
@@ -109,7 +100,6 @@ public function addIdFilter($categoryIds)
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setLoadProductCount($flag)
     {
@@ -121,7 +111,6 @@ public function setLoadProductCount($flag)
      * Before collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -133,7 +122,6 @@ protected function _beforeLoad()
      * After collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -147,7 +135,6 @@ protected function _afterLoad()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductStoreId($storeId)
     {
@@ -159,7 +146,6 @@ public function setProductStoreId($storeId)
      * Get id of the store that we should count products on
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductStoreId()
     {
@@ -175,7 +161,6 @@ public function getProductStoreId()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -201,7 +186,6 @@ public function load($printQuery = false, $logQuery = false)
      * Load categories product count
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadProductCount()
     {
@@ -217,7 +201,6 @@ protected function _loadProductCount()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function loadProductCount($items, $countRegular = true, $countAnchor = true)
     {
@@ -309,7 +292,6 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
      *
      * @param string $regexp
      * @return $this
-     * @since 2.0.0
      */
     public function addPathFilter($regexp)
     {
@@ -321,7 +303,6 @@ public function addPathFilter($regexp)
      * Joins url rewrite rules to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinUrlRewrite()
     {
@@ -343,7 +324,6 @@ public function joinUrlRewrite()
      * Add active category filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIsActiveFilter()
     {
@@ -359,7 +339,6 @@ public function addIsActiveFilter()
      * Add name attribute to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addNameToResult()
     {
@@ -371,7 +350,6 @@ public function addNameToResult()
      * Add url rewrite rules to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addUrlRewriteToResult()
     {
@@ -384,7 +362,6 @@ public function addUrlRewriteToResult()
      *
      * @param array|string $paths
      * @return $this
-     * @since 2.0.0
      */
     public function addPathsFilter($paths)
     {
@@ -407,7 +384,6 @@ public function addPathsFilter($paths)
      *
      * @param int|string $level
      * @return $this
-     * @since 2.0.0
      */
     public function addLevelFilter($level)
     {
@@ -419,7 +395,6 @@ public function addLevelFilter($level)
      * Add root category filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRootLevelFilter()
     {
@@ -433,7 +408,6 @@ public function addRootLevelFilter()
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderField($field)
     {
@@ -445,7 +419,6 @@ public function addOrderField($field)
      * Getter for _productWebsiteTable
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductWebsiteTable()
     {
@@ -459,7 +432,6 @@ public function getProductWebsiteTable()
      * Getter for _productTable
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductTable()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php
index 479ee9105f255..9d3829c53e751 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php
@@ -8,19 +8,16 @@
 /**
  * Class Factory
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Return newly created instance of the category collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index 54f37adfae30c..ce48c4321a187 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
 {
@@ -21,7 +20,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -29,7 +27,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Loaded
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_loaded = false;
 
@@ -37,7 +34,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Nodes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_nodes = [];
 
@@ -45,7 +41,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Inactive categories ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_inactiveCategoryIds;
 
@@ -53,7 +48,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -61,7 +55,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -69,7 +62,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -77,8 +69,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @deprecated 2.1.0
-     * @since 2.0.0
+     * @deprecated 2.0.12
      */
     protected $_categoryCollectionFactory;
 
@@ -86,13 +77,12 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category factory
      *
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private $categoryFlatCollectionFactory;
 
@@ -108,7 +98,6 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param string $connectionName
      * @param \Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory|null $categoryFlatCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -135,7 +124,6 @@ public function __construct(
      * Resource initializations
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -147,7 +135,6 @@ protected function _construct()
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -159,7 +146,6 @@ public function setStoreId($storeId)
      * Return store id
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -173,7 +159,6 @@ public function getStoreId()
      * Get main table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainTable()
     {
@@ -185,7 +170,6 @@ public function getMainTable()
      *
      * @param integer $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
     {
@@ -208,7 +192,6 @@ public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT
      *
      * @param array $ids
      * @return $this
-     * @since 2.0.0
      */
     public function addInactiveCategoryIds($ids)
     {
@@ -223,7 +206,6 @@ public function addInactiveCategoryIds($ids)
      * Retrieve inactive categories ids
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initInactiveCategoryIds()
     {
@@ -236,7 +218,6 @@ protected function _initInactiveCategoryIds()
      * Retrieve inactive categories ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInactiveCategoryIds()
     {
@@ -255,7 +236,6 @@ public function getInactiveCategoryIds()
      * @param integer $storeId
      * @param bool $skipMenuFilter
      * @return array
-     * @since 2.0.0
      */
     protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId = 0, $skipMenuFilter = false)
     {
@@ -338,7 +318,6 @@ protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId
      * @param string $path
      * @param \Magento\Framework\DataObject $parent
      * @return void
-     * @since 2.0.0
      */
     public function addChildNodes($children, $path, $parent)
     {
@@ -375,7 +354,6 @@ public function addChildNodes($children, $path, $parent)
      * @param integer $recursionLevel
      * @param integer $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getNodes($parentId, $recursionLevel = 0, $storeId = 0)
     {
@@ -420,7 +398,6 @@ public function getNodes($parentId, $recursionLevel = 0, $storeId = 0)
      * @param boolean $asCollection
      * @param boolean $toLoad
      * @return array|\Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true)
     {
@@ -457,7 +434,6 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
      * @param integer $nodeId
      * @param array $nodes
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getNodeById($nodeId, $nodes = null)
     {
@@ -482,7 +458,6 @@ public function getNodeById($nodeId, $nodes = null)
      *
      * @param mixed $attribute
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     public function getAttribute($attribute)
     {
@@ -495,7 +470,6 @@ public function getAttribute($attribute)
      * @param \Magento\Catalog\Model\Category $category
      * @param bool $isActiveFlag
      * @return integer
-     * @since 2.0.0
      */
     public function getChildrenAmount($category, $isActiveFlag = true)
     {
@@ -518,7 +492,6 @@ public function getChildrenAmount($category, $isActiveFlag = true)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return integer
-     * @since 2.0.0
      */
     public function getProductCount($category)
     {
@@ -540,7 +513,6 @@ public function getProductCount($category)
      * @param \Magento\Catalog\Model\Category $category
      * @param bool $isActive
      * @return \Magento\Catalog\Model\Category[]
-     * @since 2.0.0
      */
     public function getParentCategories($category, $isActive = true)
     {
@@ -576,7 +548,6 @@ public function getParentCategories($category, $isActive = true)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     public function getParentDesignCategory($category)
     {
@@ -607,7 +578,6 @@ public function getParentDesignCategory($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\Category[]
-     * @since 2.0.0
      */
     public function getChildrenCategories($category)
     {
@@ -620,7 +590,6 @@ public function getChildrenCategories($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return boolean
-     * @since 2.0.0
      */
     public function isInRootCategoryList($category)
     {
@@ -635,7 +604,6 @@ public function isInRootCategoryList($category)
      * @param bool $recursive
      * @param bool $isActive
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($category, $recursive = true, $isActive = true)
     {
@@ -665,7 +633,6 @@ public function getChildren($category, $recursive = true, $isActive = true)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return array
-     * @since 2.0.0
      */
     public function getAllChildren($category)
     {
@@ -681,7 +648,6 @@ public function getAllChildren($category)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function checkId($id)
     {
@@ -701,7 +667,6 @@ public function checkId($id)
      * @param array $filterIds
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getAnchorsAbove(array $filterIds, $storeId = 0)
     {
@@ -724,7 +689,6 @@ public function getAnchorsAbove(array $filterIds, $storeId = 0)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return array
-     * @since 2.0.0
      */
     public function getProductsPosition($category)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
index 8af834b391fd5..3b3005f1ce65a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
@@ -17,7 +17,6 @@
  * Catalog category flat collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -25,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_category_collection';
 
@@ -33,7 +31,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Event object name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'category_collection';
 
@@ -41,7 +38,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -49,7 +45,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store id of application
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -61,7 +56,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -80,7 +74,6 @@ public function __construct(
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -92,7 +85,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -108,7 +100,6 @@ protected function _initSelect()
      *
      * @param array|int|string $categoryIds
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($categoryIds)
     {
@@ -136,7 +127,6 @@ public function addIdFilter($categoryIds)
      * Before collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -148,7 +138,6 @@ protected function _beforeLoad()
      * After collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -161,7 +150,6 @@ protected function _afterLoad()
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -174,7 +162,6 @@ public function setStoreId($storeId)
      * If store id is not set yet, return store of application
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -189,7 +176,6 @@ public function getStoreId()
      *
      * @param string $parent
      * @return $this
-     * @since 2.0.0
      */
     public function addParentPathFilter($parent)
     {
@@ -201,7 +187,6 @@ public function addParentPathFilter($parent)
      * Add store filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter()
     {
@@ -214,7 +199,6 @@ public function addStoreFilter()
      *
      * @param string $sorted
      * @return $this
-     * @since 2.0.0
      */
     public function addSortedField($sorted)
     {
@@ -228,7 +212,6 @@ public function addSortedField($sorted)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function addIsActiveFilter()
     {
@@ -244,7 +227,6 @@ public function addIsActiveFilter()
      * Add name field to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addNameToResult()
     {
@@ -257,7 +239,6 @@ public function addNameToResult()
      *
      * @param array|string $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSelect($attribute = '*')
     {
@@ -297,7 +278,6 @@ public function addAttributeToSelect($attribute = '*')
      * Retrieve resource instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Flat
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -310,7 +290,6 @@ public function getResource()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -327,7 +306,6 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
      * @param string $attribute
      * @param null|string|array $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToFilter($attribute, $condition = null)
     {
@@ -340,7 +318,6 @@ public function addAttributeToFilter($attribute, $condition = null)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function addUrlRewriteToResult()
     {
@@ -359,7 +336,6 @@ public function addUrlRewriteToResult()
     /**
      * @param string|array $paths
      * @return $this
-     * @since 2.0.0
      */
     public function addPathsFilter($paths)
     {
@@ -382,7 +358,6 @@ public function addPathsFilter($paths)
     /**
      * @param string $level
      * @return $this
-     * @since 2.0.0
      */
     public function addLevelFilter($level)
     {
@@ -393,7 +368,6 @@ public function addLevelFilter($level)
     /**
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderField($field)
     {
@@ -407,7 +381,6 @@ public function addOrderField($field)
      * @param integer $pageNum
      * @param integer $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPage($pageNum, $pageSize)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
index fb13ee1966c34..df82c02a3e576 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
@@ -12,7 +12,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tree extends Dbp
 {
@@ -26,19 +25,16 @@ class Tree extends Dbp
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     private $_eventManager;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
-     * @since 2.0.0
      */
     private $_attributeConfig;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Collection\Factory
-     * @since 2.0.0
      */
     private $_collectionFactory;
 
@@ -46,7 +42,6 @@ class Tree extends Dbp
      * Categories resource collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -54,7 +49,6 @@ class Tree extends Dbp
      * Join URL rewrites data to collection flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_joinUrlRewriteIntoCollection = false;
 
@@ -62,7 +56,6 @@ class Tree extends Dbp
      * Inactive categories ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_inactiveCategoryIds = null;
 
@@ -70,13 +63,11 @@ class Tree extends Dbp
      * Store id
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_storeId = null;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_coreResource;
 
@@ -84,7 +75,6 @@ class Tree extends Dbp
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -92,7 +82,6 @@ class Tree extends Dbp
      * Cache
      *
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -100,7 +89,6 @@ class Tree extends Dbp
      * Catalog category
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
@@ -119,7 +107,6 @@ class Tree extends Dbp
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
      * @param Collection\Factory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category $catalogCategory,
@@ -154,7 +141,6 @@ public function __construct(
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -166,7 +152,6 @@ public function setStoreId($storeId)
      * Return store id
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -187,7 +172,6 @@ public function getStoreId()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addCollectionData(
         $collection = null,
@@ -251,7 +235,6 @@ public function addCollectionData(
      *
      * @param mixed $ids
      * @return $this
-     * @since 2.0.0
      */
     public function addInactiveCategoryIds($ids)
     {
@@ -266,7 +249,6 @@ public function addInactiveCategoryIds($ids)
      * Retrieve inactive categories ids
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initInactiveCategoryIds()
     {
@@ -279,7 +261,6 @@ protected function _initInactiveCategoryIds()
      * Retrieve inactive categories ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInactiveCategoryIds()
     {
@@ -296,7 +277,6 @@ public function getInactiveCategoryIds()
      * @param Collection $collection
      * @param array $allIds
      * @return array
-     * @since 2.0.0
      */
     protected function _getDisabledIds($collection, $allIds)
     {
@@ -324,7 +304,6 @@ protected function _getDisabledIds($collection, $allIds)
      * @param Collection $collection
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function _getInactiveItemIds($collection, $storeId)
     {
@@ -365,7 +344,6 @@ protected function _getInactiveItemIds($collection, $storeId)
      * @param int $id
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     protected function _getItemIsActive($id)
     {
@@ -380,7 +358,6 @@ protected function _getItemIsActive($id)
      *
      * @param boolean $sorted
      * @return Collection
-     * @since 2.0.0
      */
     public function getCollection($sorted = false)
     {
@@ -395,7 +372,6 @@ public function getCollection($sorted = false)
      *
      * @param Collection|array $object
      * @return void
-     * @since 2.0.0
      */
     protected function _clean($object)
     {
@@ -412,7 +388,6 @@ protected function _clean($object)
      *
      * @param Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -428,7 +403,6 @@ public function setCollection($collection)
      *
      * @param boolean $sorted
      * @return Collection
-     * @since 2.0.0
      */
     protected function _getDefaultCollection($sorted = false)
     {
@@ -456,7 +430,6 @@ protected function _getDefaultCollection($sorted = false)
      * @param mixed $newParent
      * @param mixed $prevNode
      * @return void
-     * @since 2.0.0
      */
     public function move($category, $newParent, $prevNode = null)
     {
@@ -470,7 +443,6 @@ public function move($category, $newParent, $prevNode = null)
      * Move tree after
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterMove()
     {
@@ -487,7 +459,6 @@ protected function _afterMove()
      * @return $this|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function loadByIds($ids, $addCollectionData = true, $updateAnchorProductCount = true)
     {
@@ -557,7 +528,6 @@ public function loadByIds($ids, $addCollectionData = true, $updateAnchorProductC
      * @param bool $addCollectionData
      * @param bool $withRootNode
      * @return array
-     * @since 2.0.0
      */
     public function loadBreadcrumbsArray($path, $addCollectionData = true, $withRootNode = false)
     {
@@ -589,7 +559,6 @@ public function loadBreadcrumbsArray($path, $addCollectionData = true, $withRoot
      *
      * @param array &$data
      * @return void
-     * @since 2.0.0
      */
     protected function _updateAnchorProductCount(&$data)
     {
@@ -609,7 +578,6 @@ protected function _updateAnchorProductCount(&$data)
      * @param bool $sorted
      * @param array $optionalAttributes
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _createCollectionDataSelect($sorted = true, $optionalAttributes = [])
     {
@@ -697,7 +665,6 @@ protected function _createCollectionDataSelect($sorted = true, $optionalAttribut
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function getExistingCategoryIdsBySpecifiedIds($ids)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
index 47a0f7b8cbcd2..76947a9488297 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
@@ -12,7 +12,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
 {
@@ -20,7 +19,6 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
      * Current scope (store Id)
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -28,7 +26,6 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -46,7 +43,6 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -93,7 +89,6 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
      *
      * @param int|string|\Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -106,7 +101,6 @@ public function setStore($store)
      *
      * @param int|string|\Magento\Store\Api\Data\StoreInterface $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -121,7 +115,6 @@ public function setStoreId($storeId)
      * Return current store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -135,7 +128,6 @@ public function getStoreId()
      * Retrieve default store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultStoreId()
     {
@@ -148,7 +140,6 @@ public function getDefaultStoreId()
      * @param string $table
      * @param array|int $attributeIds
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {
@@ -217,7 +208,6 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
      * @param string $table
      * @param string $type
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _addLoadAttributesSelectValues($select, $table, $type)
     {
@@ -245,7 +235,6 @@ protected function _addLoadAttributesSelectValues($select, $table, $type)
      * @param string $fieldCode
      * @param string $fieldAlias
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $condition, $fieldCode, $fieldAlias)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
index 57055d1bde901..7fb13265cd130 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
@@ -9,7 +9,6 @@
  * Catalog Config Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * catalog_product entity type id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -25,7 +23,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId = null;
 
@@ -33,7 +30,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -41,7 +37,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -50,7 +45,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -67,7 +61,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -79,7 +72,6 @@ protected function _construct()
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -92,7 +84,6 @@ public function setStoreId($storeId)
      * If is not set return current app store
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -106,7 +97,6 @@ public function getStoreId()
      * Retrieve catalog_product entity type id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -121,7 +111,6 @@ public function getEntityTypeId()
      * Retrieve Product Attributes Used in Catalog Product listing
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesUsedInListing()
     {
@@ -151,7 +140,6 @@ public function getAttributesUsedInListing()
      * Retrieve Used Product Attributes for Catalog Product Listing Sort By
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesUsedForSortBy()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 543f68e15e162..a64013bffcf44 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -31,7 +31,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
     \Magento\Catalog\Api\Data\ProductAttributeInterface,
@@ -45,7 +44,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
 
     /**
      * @var LockValidatorInterface
-     * @since 2.0.0
      */
     protected $attrLockValidator;
 
@@ -53,7 +51,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * Event object name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'attribute';
 
@@ -61,7 +58,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * Array with labels
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_labels = null;
 
@@ -69,25 +65,21 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalog_entity_attribute';
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     * @since 2.0.0
      */
     protected $_productFlatIndexerHelper;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_indexerEavProcessor;
 
@@ -116,7 +108,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -172,7 +163,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -185,7 +175,6 @@ protected function _construct()
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -224,7 +213,6 @@ public function beforeSave()
      * Processing object after save data
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -249,7 +237,6 @@ public function afterSave()
      * Is attribute enabled for flat indexing
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isEnabledInFlat()
     {
@@ -264,7 +251,6 @@ protected function _isEnabledInFlat()
      * Is original attribute enabled for flat indexing
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isOriginalEnabledInFlat()
     {
@@ -280,7 +266,6 @@ protected function _isOriginalEnabledInFlat()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -292,7 +277,6 @@ public function beforeDelete()
      * Init indexing process after catalog eav attribute delete commit
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -311,7 +295,6 @@ public function afterDeleteCommit()
      * Return is attribute global
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getIsGlobal()
     {
@@ -322,7 +305,6 @@ public function getIsGlobal()
      * Retrieve attribute is global scope flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeGlobal()
     {
@@ -333,7 +315,6 @@ public function isScopeGlobal()
      * Retrieve attribute is website scope website
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeWebsite()
     {
@@ -344,7 +325,6 @@ public function isScopeWebsite()
      * Retrieve attribute is store scope flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeStore()
     {
@@ -355,7 +335,6 @@ public function isScopeStore()
      * Retrieve store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -371,7 +350,6 @@ public function getStoreId()
      * Return empty array if applied to all products
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getApplyTo()
     {
@@ -386,7 +364,6 @@ public function getApplyTo()
      * Retrieve source model
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-     * @since 2.0.0
      */
     public function getSourceModel()
     {
@@ -403,7 +380,6 @@ public function getSourceModel()
      * Whether allowed for rule condition
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowedForRuleCondition()
     {
@@ -425,7 +401,6 @@ public function isAllowedForRuleCondition()
      * Get default attribute source model
      *
      * @return string
-     * @since 2.0.0
      */
     public function _getDefaultSourceModel()
     {
@@ -437,7 +412,6 @@ public function _getDefaultSourceModel()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isIndexable()
     {
@@ -472,7 +446,6 @@ public function isIndexable()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _isOriginalIndexable()
     {
@@ -505,7 +478,6 @@ protected function _isOriginalIndexable()
      * Retrieve index type for indexable attribute
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getIndexType()
     {
@@ -522,7 +494,6 @@ public function getIndexType()
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsWysiwygEnabled()
     {
@@ -531,7 +502,6 @@ public function getIsWysiwygEnabled()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsHtmlAllowedOnFront()
     {
@@ -540,7 +510,6 @@ public function getIsHtmlAllowedOnFront()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUsedForSortBy()
     {
@@ -549,7 +518,6 @@ public function getUsedForSortBy()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterable()
     {
@@ -558,7 +526,6 @@ public function getIsFilterable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterableInSearch()
     {
@@ -567,7 +534,6 @@ public function getIsFilterableInSearch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUsedInGrid()
     {
@@ -576,7 +542,6 @@ public function getIsUsedInGrid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleInGrid()
     {
@@ -585,7 +550,6 @@ public function getIsVisibleInGrid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsFilterableInGrid()
     {
@@ -594,7 +558,6 @@ public function getIsFilterableInGrid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -603,7 +566,6 @@ public function getPosition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsSearchable()
     {
@@ -612,7 +574,6 @@ public function getIsSearchable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleInAdvancedSearch()
     {
@@ -621,7 +582,6 @@ public function getIsVisibleInAdvancedSearch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsComparable()
     {
@@ -630,7 +590,6 @@ public function getIsComparable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUsedForPromoRules()
     {
@@ -639,7 +598,6 @@ public function getIsUsedForPromoRules()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -648,7 +606,6 @@ public function getIsVisibleOnFront()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUsedInProductListing()
     {
@@ -657,7 +614,6 @@ public function getUsedInProductListing()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsVisible()
     {
@@ -668,7 +624,6 @@ public function getIsVisible()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getScope()
     {
@@ -686,7 +641,6 @@ public function getScope()
      *
      * @param bool $isWysiwygEnabled
      * @return $this
-     * @since 2.0.0
      */
     public function setIsWysiwygEnabled($isWysiwygEnabled)
     {
@@ -698,7 +652,6 @@ public function setIsWysiwygEnabled($isWysiwygEnabled)
      *
      * @param bool $isHtmlAllowedOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront)
     {
@@ -710,7 +663,6 @@ public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront)
      *
      * @param bool $usedForSortBy
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedForSortBy($usedForSortBy)
     {
@@ -722,7 +674,6 @@ public function setUsedForSortBy($usedForSortBy)
      *
      * @param bool $isFilterable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterable($isFilterable)
     {
@@ -734,7 +685,6 @@ public function setIsFilterable($isFilterable)
      *
      * @param bool $isFilterableInSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterableInSearch($isFilterableInSearch)
     {
@@ -746,7 +696,6 @@ public function setIsFilterableInSearch($isFilterableInSearch)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -758,7 +707,6 @@ public function setPosition($position)
      *
      * @param string []|string
      * @return $this
-     * @since 2.0.0
      */
     public function setApplyTo($applyTo)
     {
@@ -773,7 +721,6 @@ public function setApplyTo($applyTo)
      *
      * @param string $isSearchable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSearchable($isSearchable)
     {
@@ -785,7 +732,6 @@ public function setIsSearchable($isSearchable)
      *
      * @param string $isVisibleInAdvancedSearch
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch)
     {
@@ -797,7 +743,6 @@ public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch)
      *
      * @param string $isComparable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsComparable($isComparable)
     {
@@ -809,7 +754,6 @@ public function setIsComparable($isComparable)
      *
      * @param string $isUsedForPromoRules
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUsedForPromoRules($isUsedForPromoRules)
     {
@@ -821,7 +765,6 @@ public function setIsUsedForPromoRules($isUsedForPromoRules)
      *
      * @param string $isVisibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -833,7 +776,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
      *
      * @param string $usedInProductListing
      * @return $this
-     * @since 2.0.0
      */
     public function setUsedInProductListing($usedInProductListing)
     {
@@ -845,7 +787,6 @@ public function setUsedInProductListing($usedInProductListing)
      *
      * @param bool $isVisible
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisible($isVisible)
     {
@@ -857,7 +798,6 @@ public function setIsVisible($isVisible)
      *
      * @param string $scope
      * @return $this
-     * @since 2.0.0
      */
     public function setScope($scope)
     {
@@ -875,7 +815,6 @@ public function setScope($scope)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -885,7 +824,7 @@ public function afterDelete()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -898,7 +837,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Helper.php b/app/code/Magento/Catalog/Model/ResourceModel/Helper.php
index 757559795ea43..a08cd5ad38233 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Helper.php
@@ -7,14 +7,12 @@
 
 /**
  * Eav Mysql resource helper model
- * @since 2.0.0
  */
 class Helper extends \Magento\Eav\Model\ResourceModel\Helper
 {
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'Magento_Catalog')
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php
index 76a1c9fc9ba18..a846a32f064db 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * @param int $value
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function applyFilterToCollection(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter, $value)
     {
@@ -63,7 +60,6 @@ public function applyFilterToCollection(\Magento\Catalog\Model\Layer\Filter\Filt
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
-     * @since 2.0.0
      */
     public function getCount(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php
index ca16941ecf1ac..92c6622481fb9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Decimal extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Decimal extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -34,7 +32,6 @@ protected function _construct()
      * @param int $index
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function applyFilterToCollection(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter, $range, $index)
     {
@@ -70,7 +67,6 @@ public function applyFilterToCollection(\Magento\Catalog\Model\Layer\Filter\Filt
      *
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @return array
-     * @since 2.0.0
      */
     public function getMinMax(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter)
     {
@@ -96,7 +92,6 @@ public function getMinMax(\Magento\Catalog\Model\Layer\Filter\FilterInterface $f
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getSelect($filter)
     {
@@ -134,7 +129,6 @@ protected function _getSelect($filter)
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @param int $range
      * @return array
-     * @since 2.0.0
      */
     public function getCount(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter, $range)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index 4ee242d7aa2e3..2a503fda81e66 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -23,25 +22,21 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     private $layer;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     private $session;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -52,7 +47,6 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Customer\Model\Session $session
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param null $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -74,7 +68,6 @@ public function __construct(
      *
      * @param int $range
      * @return array
-     * @since 2.0.0
      */
     public function getCount($range)
     {
@@ -101,7 +94,6 @@ public function getCount($range)
      * Retrieve clean select with joined price index table
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getSelect()
     {
@@ -170,7 +162,6 @@ protected function _getSelect()
      *
      * @param string|null $conditionString
      * @return string|null
-     * @since 2.0.0
      */
     protected function _replaceTableAlias($conditionString)
     {
@@ -199,7 +190,6 @@ protected function _replaceTableAlias($conditionString)
      * @param \Magento\Framework\DB\Select $select
      * @param bool $replaceAlias
      * @return string
-     * @since 2.0.0
      */
     protected function _getPriceExpression($select, $replaceAlias = true)
     {
@@ -222,7 +212,6 @@ protected function _getPriceExpression($select, $replaceAlias = true)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     protected function _getFullPriceExpression($select)
     {
@@ -238,7 +227,6 @@ protected function _getFullPriceExpression($select)
      * @param float $price
      * @param bool $decrease
      * @return float
-     * @since 2.0.0
      */
     protected function _getComparingValue($price, $decrease = true)
     {
@@ -256,7 +244,6 @@ protected function _getComparingValue($price, $decrease = true)
      * @param int $index
      * @param null|int $lowerPrice
      * @return array|false
-     * @since 2.0.0
      */
     public function loadPreviousPrices($price, $index, $lowerPrice = null)
     {
@@ -282,7 +269,6 @@ public function loadPreviousPrices($price, $index, $lowerPrice = null)
      * @param null|int $lowerPrice
      * @param null|int $upperPrice
      * @return array
-     * @since 2.0.0
      */
     public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null)
     {
@@ -307,7 +293,6 @@ public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPri
      * @param int $rightIndex
      * @param null|int $upperPrice
      * @return array|false
-     * @since 2.0.0
      */
     public function loadNextPrices($price, $rightIndex, $upperPrice = null)
     {
@@ -348,7 +333,6 @@ public function loadNextPrices($price, $rightIndex, $upperPrice = null)
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @param mixed $interval
      * @return $this
-     * @since 2.0.0
      */
     public function applyPriceRange(\Magento\Catalog\Model\Layer\Filter\FilterInterface $filter, $interval)
     {
@@ -385,7 +369,6 @@ public function applyPriceRange(\Magento\Catalog\Model\Layer\Filter\FilterInterf
      * Initialize connection and define main table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -396,7 +379,6 @@ protected function _construct()
      * Retrieve joined price index table alias
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getIndexTableAlias()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php
index 86d0bb752ed7e..072c588c0c0bb 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php
@@ -8,8 +8,7 @@
 use Magento\Framework\App\ResourceConnection;
 
 /**
- * @deprecated 2.2.0
- * @since 2.0.0
+ * @deprecated 2.1.3
  */
 class MaxHeapTableSizeProcessor
 {
@@ -17,13 +16,11 @@ class MaxHeapTableSizeProcessor
      * Database connection adapter
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $defaultMaxHeapTableSie;
 
@@ -31,13 +28,11 @@ class MaxHeapTableSizeProcessor
      * Current max_heap_table_size value (in Bytes)
      *
      * @var int
-     * @since 2.0.0
      */
     protected $currentMaxHeapTableSize = null;
 
     /**
      * @param ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(ResourceConnection $resource)
     {
@@ -52,7 +47,6 @@ public function __construct(ResourceConnection $resource)
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function set($maxHeapTableSize = null)
     {
@@ -74,7 +68,6 @@ public function set($maxHeapTableSize = null)
      *
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function restore()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index ef7506b0dbf8a..755982b0554af 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -14,7 +14,6 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Product extends AbstractResource
 {
@@ -22,7 +21,6 @@ class Product extends AbstractResource
      * Product to website linkage table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_productWebsiteTable;
 
@@ -30,7 +28,6 @@ class Product extends AbstractResource
      * Product to category linkage table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_productCategoryTable;
 
@@ -38,7 +35,6 @@ class Product extends AbstractResource
      * Catalog category
      *
      * @var Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
@@ -46,25 +42,21 @@ class Product extends AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @since 2.0.0
      */
     protected $_categoryCollectionFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $setFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $typeFactory;
 
@@ -76,7 +68,6 @@ class Product extends AbstractResource
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\DefaultAttributes
-     * @since 2.0.0
      */
     protected $defaultAttributes;
 
@@ -105,7 +96,6 @@ class Product extends AbstractResource
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -139,7 +129,6 @@ public function __construct(
      *
      * @return \Magento\Eav\Model\Entity\Type
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -153,7 +142,6 @@ public function getEntityType()
      * Product Website table name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductWebsiteTable()
     {
@@ -168,7 +156,6 @@ public function getProductWebsiteTable()
      *
      * @deprecated 2.2.0
      * @return string
-     * @since 2.0.0
      */
     public function getProductCategoryTable()
     {
@@ -182,7 +169,6 @@ public function getProductCategoryTable()
      * Default product attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getDefaultAttributes()
     {
@@ -195,7 +181,6 @@ protected function _getDefaultAttributes()
      * @deprecated 2.2.0
      * @param \Magento\Catalog\Model\Product|int $product
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteIds($product)
     {
@@ -213,7 +198,6 @@ public function getWebsiteIds($product)
      *
      * @param   array $productIds
      * @return  array
-     * @since 2.0.0
      */
     public function getWebsiteIdsByProductIds($productIds)
     {
@@ -241,7 +225,6 @@ public function getWebsiteIdsByProductIds($productIds)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getCategoryIds($product)
     {
@@ -254,7 +237,6 @@ public function getCategoryIds($product)
      *
      * @param string $sku
      * @return int|false
-     * @since 2.0.0
      */
     public function getIdBySku($sku)
     {
@@ -272,7 +254,6 @@ public function getIdBySku($sku)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\DataObject $object)
     {
@@ -291,7 +272,6 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $product
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\DataObject $product)
     {
@@ -301,7 +281,6 @@ protected function _afterSave(\Magento\Framework\DataObject $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($object)
     {
@@ -319,7 +298,6 @@ public function delete($object)
      * @deprecated 2.2.0
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveWebsiteIds($product)
     {
@@ -347,7 +325,6 @@ protected function _saveWebsiteIds($product)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function _saveCategories(\Magento\Framework\DataObject $object)
     {
@@ -359,7 +336,6 @@ protected function _saveCategories(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getCategoryCollection($product)
     {
@@ -383,7 +359,6 @@ public function getCategoryCollection($product)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableInCategories($object)
     {
@@ -411,7 +386,6 @@ public function getAvailableInCategories($object)
      * Get default attribute source model
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultAttributeSourceModel()
     {
@@ -424,7 +398,6 @@ public function getDefaultAttributeSourceModel()
      * @param \Magento\Catalog\Model\Product $product
      * @param int $categoryId
      * @return string
-     * @since 2.0.0
      */
     public function canBeShowInCategory($product, $categoryId)
     {
@@ -448,7 +421,6 @@ public function canBeShowInCategory($product, $categoryId)
      * @param int $oldId
      * @param int $newId
      * @return $this
-     * @since 2.0.0
      */
     public function duplicate($oldId, $newId)
     {
@@ -502,7 +474,6 @@ public function duplicate($oldId, $newId)
      *
      * @param  array $productIds
      * @return array
-     * @since 2.0.0
      */
     public function getProductsSku(array $productIds)
     {
@@ -521,7 +492,6 @@ public function getProductsSku(array $productIds)
      *
      * @param  array $productSkuList
      * @return array
-     * @since 2.0.0
      */
     public function getProductsIdsBySkus(array $productSkuList)
     {
@@ -545,7 +515,6 @@ public function getProductsIdsBySkus(array $productSkuList)
      *
      * @param  array|string|null $columns
      * @return array
-     * @since 2.0.0
      */
     public function getProductEntitiesInfo($columns = null)
     {
@@ -566,7 +535,6 @@ public function getProductEntitiesInfo($columns = null)
      * Get total number of records in the system
      *
      * @return int
-     * @since 2.0.0
      */
     public function countAll()
     {
@@ -579,7 +547,6 @@ public function countAll()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
index 9f21d16ff119f..f4adb755439b4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
@@ -11,7 +11,6 @@
  * Catalog Product Mass processing resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Action extends \Magento\Catalog\Model\ResourceModel\AbstractResource
 {
@@ -19,7 +18,6 @@ class Action extends \Magento\Catalog\Model\ResourceModel\AbstractResource
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +37,6 @@ protected function _construct()
      * @param int $storeId
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function updateAttributes($entityIds, $attrData, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index b377c91beb897..efcf76598dcdf 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
  *
- * @since 2.0.0
  */
 abstract class AbstractGroupPrice extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -24,7 +23,6 @@ abstract class AbstractGroupPrice extends \Magento\Framework\Model\ResourceModel
      * @param int $productId
      * @param int $websiteId
      * @return array
-     * @since 2.0.0
      */
     public function loadPriceData($productId, $websiteId = null)
     {
@@ -83,7 +81,6 @@ protected function getProductIdFieldName()
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     protected function _loadPriceDataColumns($columns)
     {
@@ -95,7 +92,6 @@ protected function _loadPriceDataColumns($columns)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _loadPriceDataSelect($select)
     {
@@ -109,7 +105,6 @@ protected function _loadPriceDataSelect($select)
      * @param int $websiteId
      * @param int $priceId
      * @return int The number of affected rows
-     * @since 2.0.0
      */
     public function deletePriceData($productId, $websiteId = null, $priceId = null)
     {
@@ -135,7 +130,6 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null)
      *
      * @param \Magento\Framework\DataObject $priceObject
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
-     * @since 2.0.0
      */
     public function savePriceData(\Magento\Framework\DataObject $priceObject)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
index f77e08e834d21..b75fa1491aa77 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
@@ -12,7 +12,6 @@
  * Product image attribute backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Image extends AbstractBackend
 {
@@ -20,7 +19,6 @@ class Image extends AbstractBackend
      * Filesystem facade
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -28,14 +26,12 @@ class Image extends AbstractBackend
      * File Uploader factory
      *
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $_fileUploaderFactory;
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this|void
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php
index 583255abdb2a9..e3edc4a0dc48e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php
@@ -11,7 +11,6 @@
  * Catalog product tier price backend attribute model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tierprice extends AbstractGroupPrice
 {
@@ -19,7 +18,6 @@ class Tierprice extends AbstractGroupPrice
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     protected function _loadPriceDataColumns($columns)
     {
@@ -46,7 +43,6 @@ protected function _loadPriceDataColumns($columns)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _loadPriceDataSelect($select)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Collection.php
index fe0a16a7f87a3..8ba126f6a532e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Collection.php
@@ -9,7 +9,6 @@
  * Catalog product EAV additional attribute resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Colle
      * Entity factory
      *
      * @var \Magento\Eav\Model\EntityFactory
-     * @since 2.0.0
      */
     protected $_eavEntityFactory;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Colle
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -50,7 +47,6 @@ public function __construct(
      * Resource model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +60,6 @@ protected function _construct()
      * Initialize select object
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -100,7 +95,6 @@ protected function _initSelect()
      * @param  int $typeId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setEntityTypeFilter($typeId)
     {
@@ -111,7 +105,6 @@ public function setEntityTypeFilter($typeId)
      * Return array of fields to load attribute values
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getLoadDataFields()
     {
@@ -131,7 +124,6 @@ protected function _getLoadDataFields()
      * Remove price from attribute list
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removePriceFilter()
     {
@@ -142,7 +134,6 @@ public function removePriceFilter()
      * Specify "is_visible_in_advanced_search" filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addDisplayInAdvancedSearchFilter()
     {
@@ -153,7 +144,6 @@ public function addDisplayInAdvancedSearchFilter()
      * Specify "is_filterable" filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIsFilterableFilter()
     {
@@ -164,7 +154,6 @@ public function addIsFilterableFilter()
      * Add filterable in search filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIsFilterableInSearchFilter()
     {
@@ -175,7 +164,6 @@ public function addIsFilterableInSearchFilter()
      * Specify filter by "is_visible" field
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addVisibleFilter()
     {
@@ -186,7 +174,6 @@ public function addVisibleFilter()
      * Specify "is_searchable" filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIsSearchableFilter()
     {
@@ -198,7 +185,6 @@ public function addIsSearchableFilter()
      *
      * @param bool $addRequiredCodes
      * @return $this
-     * @since 2.0.0
      */
     public function addToIndexFilter($addRequiredCodes = false)
     {
@@ -226,7 +212,6 @@ public function addToIndexFilter($addRequiredCodes = false)
      * Specify filter for attributes used in quick search
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSearchableAttributeFilter()
     {
@@ -244,7 +229,6 @@ public function addSearchableAttributeFilter()
      * Add is used in grid filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIsUsedInGridFilter()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
index 7256b68d5f86f..694f839592b57 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface BaseSelectProcessorInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface BaseSelectProcessorInterface
 {
@@ -22,7 +22,7 @@ interface BaseSelectProcessorInterface
     /**
      * @param Select $select
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(Select $select);
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 2ffecb469569c..e281a085b01bf 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -30,7 +30,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @method \Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface getResource()
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -46,7 +45,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'entity_id';
 
@@ -54,7 +52,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Catalog Product Flat is enabled cache per store
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_flatEnabled = [];
 
@@ -62,7 +59,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Product websites table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_productWebsiteTable;
 
@@ -70,7 +66,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Product categories table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_productCategoryTable;
 
@@ -78,7 +73,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Is add URL rewrites to collection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addUrlRewrite = false;
 
@@ -86,7 +80,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Add URL rewrite for category
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_urlRewriteCategory = '';
 
@@ -94,7 +87,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Is add final price to product collection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addFinalPrice = false;
 
@@ -102,7 +94,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Cache for all ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allIdsCache = null;
 
@@ -110,13 +101,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Is add tax percents to product collection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addTaxPercents = false;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation
-     * @since 2.0.0
      */
     protected $_productLimitationFilters;
 
@@ -124,13 +113,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Category product count select
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_productCountSelect = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isWebsiteFilter = false;
 
@@ -138,7 +125,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Additional field filters, applied in _productLimitationJoinPrice()
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_priceDataFieldFilters = [];
 
@@ -146,7 +132,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Price expression sql
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_priceExpression;
 
@@ -154,7 +139,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Additional price expression sql part
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_additionalPriceExpression;
 
@@ -162,7 +146,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Max prise (statistics data)
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_maxPrice;
 
@@ -170,7 +153,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Min prise (statistics data)
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_minPrice;
 
@@ -178,7 +160,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Prise standard deviation (statistics data)
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_priceStandardDeviation;
 
@@ -186,7 +167,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Prises count (statistics data)
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pricesCount = null;
 
@@ -194,7 +174,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Cloned Select after dispatching 'catalog_prepare_price_select' event
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_catalogPreparePriceSelect = null;
 
@@ -202,7 +181,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Catalog product flat
      *
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
-     * @since 2.0.0
      */
     protected $_catalogProductFlatState = null;
 
@@ -210,7 +188,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Catalog data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager = null;
 
@@ -218,7 +195,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -226,13 +202,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -240,7 +214,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Catalog url
      *
      * @var \Magento\Catalog\Model\ResourceModel\Url
-     * @since 2.0.0
      */
     protected $_catalogUrl;
 
@@ -248,7 +221,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Product option factory
      *
      * @var \Magento\Catalog\Model\Product\OptionFactory
-     * @since 2.0.0
      */
     protected $_productOptionFactory;
 
@@ -256,19 +228,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Customer\Api\GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
@@ -276,25 +245,24 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * Need to add websites to result flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needToAddWebsiteNamesToResult;
 
     /**
      * @var Gallery
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $mediaGalleryResource;
 
     /**
      * @var GalleryReadHandler
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $productGalleryReadHandler;
 
     /**
      * @var MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
@@ -337,7 +305,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * @param MetadataPool|null $metadataPool
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -397,7 +364,6 @@ public function __construct(
      * Get cloned Select after dispatching 'catalog_prepare_price_select' event
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getCatalogPreparedSelect()
     {
@@ -409,7 +375,6 @@ public function getCatalogPreparedSelect()
      *
      * @param \Magento\Framework\DB\Select $select
      * @return $this
-     * @since 2.0.0
      */
     protected function _preparePriceExpressionParameters($select)
     {
@@ -446,7 +411,6 @@ protected function _preparePriceExpressionParameters($select)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return string
-     * @since 2.0.0
      */
     public function getPriceExpression($select)
     {
@@ -460,7 +424,6 @@ public function getPriceExpression($select)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalPriceExpression($select)
     {
@@ -474,7 +437,6 @@ public function getAdditionalPriceExpression($select)
      * Get currency rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyRate()
     {
@@ -485,7 +447,6 @@ public function getCurrencyRate()
      * Retrieve Catalog Product Flat Helper object
      *
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\State
-     * @since 2.0.0
      */
     public function getFlatState()
     {
@@ -497,7 +458,6 @@ public function getFlatState()
      * Return always false if magento run admin
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabledFlat()
     {
@@ -511,7 +471,6 @@ public function isEnabledFlat()
      * Initialize resources
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -530,7 +489,6 @@ protected function _construct()
      * @param string $model
      * @param string $entityModel
      * @return $this
-     * @since 2.0.0
      */
     protected function _init($model, $entityModel)
     {
@@ -544,7 +502,6 @@ protected function _init($model, $entityModel)
      * Define product website and category product tables
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initTables()
     {
@@ -556,7 +513,6 @@ protected function _initTables()
      * Prepare static entity fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareStaticFields()
     {
@@ -571,7 +527,6 @@ protected function _prepareStaticFields()
      * Redeclared for specifying id field name without getting resource model inside model
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getNewEmptyItem()
     {
@@ -587,7 +542,6 @@ public function getNewEmptyItem()
      *
      * @param \Magento\Eav\Model\Entity\AbstractEntity $entity
      * @return $this
-     * @since 2.0.0
      */
     public function setEntity($entity)
     {
@@ -603,7 +557,6 @@ public function setEntity($entity)
      *
      * @param mixed $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -620,7 +573,6 @@ public function setStore($store)
      * in catalog_product_entity we store just products
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -648,7 +600,6 @@ protected function _initSelect()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function _loadAttributes($printQuery = false, $logQuery = false)
     {
@@ -665,7 +616,6 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
      * @param array|string|integer|\Magento\Framework\App\Config\Element $attribute
      * @param bool|string $joinType
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSelect($attribute, $joinType = false)
     {
@@ -701,7 +651,6 @@ public function addAttributeToSelect($attribute, $joinType = false)
      * Adding url rewrites, minimal prices, final prices, tax percents
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -722,7 +671,6 @@ protected function _afterLoad()
      * Prepare Url Data object
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareUrlDataObject()
     {
@@ -756,7 +704,6 @@ protected function _prepareUrlDataObject()
      * @param mixed $productId
      * @param boolean $exclude
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($productId, $exclude = false)
     {
@@ -790,7 +737,6 @@ public function addIdFilter($productId, $exclude = false)
      * Add for each product websites information
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteNamesToResult()
     {
@@ -800,7 +746,6 @@ public function addWebsiteNamesToResult()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -819,7 +764,6 @@ public function load($printQuery = false, $logQuery = false)
      * Processs adding product website names to result collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function doAddWebsiteNamesToResult()
     {
@@ -863,7 +807,6 @@ protected function doAddWebsiteNamesToResult()
      *
      * @param null|string|bool|int|Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($store = null)
     {
@@ -886,7 +829,6 @@ public function addStoreFilter($store = null)
      *
      * @param null|bool|int|string|array $websites
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($websites = null)
     {
@@ -904,7 +846,6 @@ public function addWebsiteFilter($websites = null)
      * Get filters applied to collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation
-     * @since 2.0.0
      */
     public function getLimitationFilters()
     {
@@ -916,7 +857,6 @@ public function getLimitationFilters()
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return $this
-     * @since 2.0.0
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
@@ -941,7 +881,6 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      *
      * @param array $categoriesFilter
      * @return $this
-     * @since 2.0.0
      */
     public function addCategoriesFilter(array $categoriesFilter)
     {
@@ -963,7 +902,6 @@ public function addCategoriesFilter(array $categoriesFilter)
      *
      * @param string $conditionType
      * @return mixed
-     * @since 2.0.0
      */
     private function mapConditionType($conditionType)
     {
@@ -978,7 +916,6 @@ private function mapConditionType($conditionType)
      * Join minimal price attribute to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinMinimalPrice()
     {
@@ -991,7 +928,6 @@ public function joinMinimalPrice()
      *
      * @param string $attribute
      * @return array|null
-     * @since 2.0.0
      */
     public function getMaxAttributeValue($attribute)
     {
@@ -1027,7 +963,6 @@ public function getMaxAttributeValue($attribute)
      * @param string $attribute
      * @param int $range
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeValueCountByRange($attribute, $range)
     {
@@ -1067,7 +1002,6 @@ public function getAttributeValueCountByRange($attribute, $range)
      *
      * @param string $attribute
      * @return array ($value => $count)
-     * @since 2.0.0
      */
     public function getAttributeValueCount($attribute)
     {
@@ -1116,7 +1050,6 @@ public function getAttributeValueCount($attribute)
      *
      * @param string $attribute attribute code
      * @return array
-     * @since 2.0.0
      */
     public function getAllAttributeValues($attribute)
     {
@@ -1149,7 +1082,6 @@ public function getAllAttributeValues($attribute)
      * Get SQL for get record count without left JOINs
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -1162,7 +1094,6 @@ public function getSelectCountSql()
      * @param null $select
      * @param bool $resetLeftJoins
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
     {
@@ -1179,7 +1110,6 @@ protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
      * Prepare statistics data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareStatisticsData()
     {
@@ -1208,7 +1138,6 @@ protected function _prepareStatisticsData()
      * Retrieve clear select
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getClearSelect()
     {
@@ -1220,7 +1149,6 @@ protected function _getClearSelect()
      *
      * @param \Magento\Framework\DB\Select $select
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _buildClearSelect($select = null)
     {
@@ -1241,7 +1169,6 @@ protected function _buildClearSelect($select = null)
      * @param int|string $limit
      * @param int|string $offset
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds($limit = null, $offset = null)
     {
@@ -1257,7 +1184,6 @@ public function getAllIds($limit = null, $offset = null)
      * Retrieve product count select for categories
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getProductCountSelect()
     {
@@ -1293,7 +1219,6 @@ public function getProductCountSelect()
      * Destruct product count select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unsProductCountSelect()
     {
@@ -1306,7 +1231,6 @@ public function unsProductCountSelect()
      *
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $categoryCollection
      * @return $this
-     * @since 2.0.0
      */
     public function addCountToCategories($categoryCollection)
     {
@@ -1364,7 +1288,6 @@ public function addCountToCategories($categoryCollection)
      * Retrieve unique attribute set ids in collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSetIds()
     {
@@ -1381,7 +1304,6 @@ public function getSetIds()
      * Return array of unique product type ids in collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductTypeIds()
     {
@@ -1397,7 +1319,6 @@ public function getProductTypeIds()
      * Joins url rewrite rules to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinUrlRewrite()
     {
@@ -1417,7 +1338,6 @@ public function joinUrlRewrite()
      *
      * @param int|string $categoryId
      * @return $this
-     * @since 2.0.0
      */
     public function addUrlRewrite($categoryId = '')
     {
@@ -1444,7 +1364,6 @@ public function addUrlRewrite($categoryId = '')
      * Add URL rewrites to collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addUrlRewrite()
     {
@@ -1493,7 +1412,6 @@ protected function _addUrlRewrite()
      * Add minimal price data to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addMinimalPrice()
     {
@@ -1504,7 +1422,6 @@ public function addMinimalPrice()
      * Add price data for calculate final price
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addFinalPrice()
     {
@@ -1516,7 +1433,6 @@ public function addFinalPrice()
      *
      * @param boolean $resetCache
      * @return array
-     * @since 2.0.0
      */
     public function getAllIdsCache($resetCache = false)
     {
@@ -1538,7 +1454,6 @@ public function getAllIdsCache($resetCache = false)
      *
      * @param array $value
      * @return $this
-     * @since 2.0.0
      */
     public function setAllIdsCache($value)
     {
@@ -1552,7 +1467,6 @@ public function setAllIdsCache($value)
      * @param int $customerGroupId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function addPriceData($customerGroupId = null, $websiteId = null)
     {
@@ -1585,7 +1499,6 @@ public function addPriceData($customerGroupId = null, $websiteId = null)
      * @param string $joinType
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
     {
@@ -1656,7 +1569,6 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
      * Add requere tax percent flag for product collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addTaxPercents()
     {
@@ -1668,7 +1580,6 @@ public function addTaxPercents()
      * Get require tax percent flag value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function requireTaxPercent()
     {
@@ -1679,7 +1590,6 @@ public function requireTaxPercent()
      * Adding product custom options to result collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionsToResult()
     {
@@ -1716,7 +1626,6 @@ public function addOptionsToResult()
      * Filter products with required options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByRequiredOptions()
     {
@@ -1729,7 +1638,6 @@ public function addFilterByRequiredOptions()
      *
      * @param array $visibility
      * @return $this
-     * @since 2.0.0
      */
     public function setVisibility($visibility)
     {
@@ -1747,7 +1655,6 @@ public function setVisibility($visibility)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -1807,7 +1714,6 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
      * Prepare limitation filters
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareProductLimitationFilters()
     {
@@ -1848,7 +1754,6 @@ protected function _prepareProductLimitationFilters()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _productLimitationJoinWebsite()
     {
@@ -1903,7 +1808,6 @@ protected function _productLimitationJoinWebsite()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _productLimitationJoinStore()
     {
@@ -1939,7 +1843,6 @@ protected function _productLimitationJoinStore()
      * Join Product Price Table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _productLimitationJoinPrice()
     {
@@ -1952,7 +1855,6 @@ protected function _productLimitationJoinPrice()
      * @see \Magento\Catalog\Model\ResourceModel\Product\Collection::_productLimitationJoinPrice()
      * @param bool $joinLeft
      * @return $this
-     * @since 2.0.0
      */
     protected function _productLimitationPrice($joinLeft = false)
     {
@@ -2016,7 +1918,6 @@ protected function _productLimitationPrice($joinLeft = false)
      * Apply front-end price limitation filters to the collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function applyFrontendPriceLimitations()
     {
@@ -2040,7 +1941,6 @@ public function applyFrontendPriceLimitations()
      * Method supports multiple changes in one collection object for this parameters
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyProductLimitations()
     {
@@ -2092,7 +1992,6 @@ protected function _applyProductLimitations()
      * for combinations of category_id filter states
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyZeroStoreProductLimitations()
     {
@@ -2127,7 +2026,6 @@ protected function _applyZeroStoreProductLimitations()
      * Add category ids to loaded items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addCategoryIds()
     {
@@ -2172,7 +2070,6 @@ public function addCategoryIds()
      * Add tier price data to loaded items.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addTierPriceData()
     {
@@ -2306,7 +2203,6 @@ private function getBackend()
      * @param array $fields - list of fields
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function addPriceDataFieldFilter($comparisonFormat, $fields)
     {
@@ -2331,7 +2227,7 @@ public function addPriceDataFieldFilter($comparisonFormat, $fields)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function addMediaGalleryData()
     {
@@ -2392,8 +2288,8 @@ public function getProductEntityMetadata()
      * Retrieve GalleryReadHandler
      *
      * @return GalleryReadHandler
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getGalleryReadHandler()
     {
@@ -2404,9 +2300,9 @@ private function getGalleryReadHandler()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getMediaGalleryResource()
     {
@@ -2420,7 +2316,6 @@ private function getMediaGalleryResource()
      * Clear collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -2446,7 +2341,6 @@ public function clear()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
@@ -2462,7 +2356,6 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      * Get products max price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMaxPrice()
     {
@@ -2477,7 +2370,6 @@ public function getMaxPrice()
      * Get products min price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinPrice()
     {
@@ -2492,7 +2384,6 @@ public function getMinPrice()
      * Get standard deviation of products price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceStandardDeviation()
     {
@@ -2507,7 +2398,6 @@ public function getPriceStandardDeviation()
      * Get count of product prices
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPricesCount()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php
index 9d038641a2e7e..7eb0552e355fc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php
@@ -9,7 +9,6 @@
  * Catalog compare item resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param \Magento\Catalog\Model\Product\Compare\Item $object
      * @param \Magento\Catalog\Model\Product|int $product
      * @return bool
-     * @since 2.0.0
      */
     public function loadByProduct(\Magento\Catalog\Model\Product\Compare\Item $object, $product)
     {
@@ -66,7 +63,6 @@ public function loadByProduct(\Magento\Catalog\Model\Product\Compare\Item $objec
      * @param int $customerId
      * @param int $visitorId
      * @return int
-     * @since 2.0.0
      */
     public function getCount($customerId, $visitorId)
     {
@@ -88,7 +84,6 @@ public function getCount($customerId, $visitorId)
      * Clean compare table
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -128,7 +123,6 @@ public function clean()
      *
      * @param \Magento\Catalog\Model\Product\Compare\Item $object
      * @return $this
-     * @since 2.0.0
      */
     public function purgeVisitorByCustomer($object)
     {
@@ -150,7 +144,6 @@ public function purgeVisitorByCustomer($object)
      *
      * @param \Magento\Catalog\Model\Product\Compare\Item $object
      * @return $this
-     * @since 2.0.0
      */
     public function updateCustomerFromVisitor($object)
     {
@@ -231,7 +224,6 @@ public function updateCustomerFromVisitor($object)
      * @param int $visitorId
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function clearItems($visitorId = null, $customerId = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
index 9b830d61ac955..8d58a672141cf 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
@@ -12,7 +12,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -20,7 +19,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Customer Filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_customerId = 0;
 
@@ -28,7 +26,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Visitor Filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_visitorId = 0;
 
@@ -36,7 +33,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Comparable attributes cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_comparableAttributes;
 
@@ -44,7 +40,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Catalog product compare
      *
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $_catalogProductCompare = null;
 
@@ -52,7 +47,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Catalog product compare item
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item
-     * @since 2.0.0
      */
     protected $_catalogProductCompareItem;
 
@@ -82,7 +76,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -138,7 +131,6 @@ public function __construct(
      * Initialize resources
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -154,7 +146,6 @@ protected function _construct()
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -168,7 +159,6 @@ public function setCustomerId($customerId)
      *
      * @param int $visitorId
      * @return $this
-     * @since 2.0.0
      */
     public function setVisitorId($visitorId)
     {
@@ -181,7 +171,6 @@ public function setVisitorId($visitorId)
      * Retrieve customer filter applied to collection
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -192,7 +181,6 @@ public function getCustomerId()
      * Retrieve visitor filter applied to collection
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVisitorId()
     {
@@ -203,7 +191,6 @@ public function getVisitorId()
      * Retrieve condition for join filters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConditionForJoin()
     {
@@ -222,7 +209,6 @@ public function getConditionForJoin()
      * Add join to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _addJoinToSelect()
     {
@@ -248,7 +234,6 @@ public function _addJoinToSelect()
      * Retrieve comapre products attribute set ids
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributeSetIds()
     {
@@ -290,7 +275,6 @@ protected function _getAttributeSetIds()
      *
      * @param array $setIds
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributeIdsBySetIds(array $setIds)
     {
@@ -310,7 +294,6 @@ protected function _getAttributeIdsBySetIds(array $setIds)
      * Retrieve Merged comparable attributes for compared product items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getComparableAttributes()
     {
@@ -361,7 +344,6 @@ public function getComparableAttributes()
      * Load Comparable attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadComparableAttributes()
     {
@@ -379,7 +361,6 @@ public function loadComparableAttributes()
      * Use product as collection item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useProductItem()
     {
@@ -395,7 +376,6 @@ public function useProductItem()
      * Retrieve product ids from collection
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -411,7 +391,6 @@ public function getProductIds()
      * Clear compare items by condition
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -426,7 +405,6 @@ public function clear()
      * Overwrite disable flat for compared item if required EAV resource
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabledFlat()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php
index 1f828f6e2475e..801efc825041f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php
@@ -10,20 +10,20 @@
 
 /**
  * Class CompositeBaseSelectProcessor
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CompositeBaseSelectProcessor implements BaseSelectProcessorInterface
 {
     /**
      * @var BaseSelectProcessorInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessors;
 
     /**
      * @param BaseSelectProcessorInterface[] $baseSelectProcessors
      * @throws InputException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         array $baseSelectProcessors
@@ -41,7 +41,7 @@ public function __construct(
     /**
      * @param Select $select
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(Select $select)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
index ff6651e3f37b8..58dde2d0cf4b5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
@@ -12,7 +12,6 @@
  * Catalog Product Flat resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements DefaultAttributesProvider
 {
@@ -20,7 +19,6 @@ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * Store scope Id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -28,7 +26,6 @@ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -36,13 +33,11 @@ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\DefaultAttributes
-     * @since 2.0.0
      */
     protected $defaultAttributes;
 
@@ -52,7 +47,6 @@ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * @param \Magento\Catalog\Model\Config $catalogConfig
      * @param \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Init connection and resource table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +76,6 @@ protected function _construct()
      * Retrieve store for resource model
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -95,7 +87,6 @@ public function getStoreId()
      *
      * @param null|string|bool|int|Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($store)
     {
@@ -118,7 +109,6 @@ public function setStoreId($store)
      *
      * @param mixed $store
      * @return string
-     * @since 2.0.0
      */
     public function getFlatTableName($store = null)
     {
@@ -132,7 +122,6 @@ public function getFlatTableName($store = null)
      * Retrieve entity type id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTypeId()
     {
@@ -144,7 +133,6 @@ public function getTypeId()
      *
      * @param string $attributeCode
      * @return array|null
-     * @since 2.0.0
      */
     public function getAttributeForSelect($attributeCode)
     {
@@ -167,7 +155,6 @@ public function getAttributeForSelect($attributeCode)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSortColumn($attributeCode)
     {
@@ -186,7 +173,6 @@ public function getAttributeSortColumn($attributeCode)
      * Retrieve Flat Table columns list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTableColumns()
     {
@@ -200,7 +186,6 @@ public function getAllTableColumns()
      *
      * @param integer|string|\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeStatic($attribute)
     {
@@ -228,7 +213,6 @@ public function isAttributeStatic($attribute)
      * Rewrote for EAV collection compatibility
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityIdField()
     {
@@ -241,7 +225,6 @@ public function getEntityIdField()
      *
      * @param mixed $attribute
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     public function getAttribute($attribute)
     {
@@ -252,7 +235,6 @@ public function getAttribute($attribute)
      * Retrieve main resource table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainTable()
     {
@@ -263,7 +245,6 @@ public function getMainTable()
      * Retrieve default entity static attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDefaultAttributes()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index 16941b9e062f5..3a43e49a83737 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -156,7 +156,7 @@ protected function createBaseLoadSelect($entityId, $storeId, $attributeId)
      * @param int $attributeId
      * @return \Magento\Framework\DB\Select
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function createBatchBaseSelect($storeId, $attributeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php
index b600242fe01e4..e8fd872f271f4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php
@@ -13,7 +13,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\AbstractResource
 {
@@ -21,7 +20,6 @@ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\Abst
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -38,7 +36,6 @@ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\Abst
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      *
      * @param string $attributeCode
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     protected function _getAttribute($attributeCode)
     {
@@ -74,7 +70,6 @@ protected function _getAttribute($attributeCode)
      * @param \Zend_Db_Expr $condition       the limitation condition
      * @param bool $required                if required or has condition used INNER join, else - LEFT
      * @return \Zend_Db_Expr                 the attribute value expression
-     * @since 2.0.0
      */
     protected function _addAttributeToSelect($select, $attrCode, $entity, $store, $condition = null, $required = false)
     {
@@ -136,7 +131,6 @@ protected function _addAttributeToSelect($select, $attrCode, $entity, $store, $c
      * @param bool $store add default store join
      * @param string|\Zend_Db_Expr $joinCondition the limitation for website_id
      * @return $this
-     * @since 2.0.0
      */
     protected function _addWebsiteJoinToSelect($select, $store = true, $joinCondition = null)
     {
@@ -169,7 +163,6 @@ protected function _addWebsiteJoinToSelect($select, $store = true, $joinConditio
      * @param string|\Zend_Db_Expr $website the limitation of website_id
      * @param string|\Zend_Db_Expr $product the limitation of product_id
      * @return $this
-     * @since 2.0.0
      */
     protected function _addProductWebsiteJoinToSelect($select, $website, $product)
     {
@@ -187,7 +180,6 @@ protected function _addProductWebsiteJoinToSelect($select, $website, $product)
      *
      * @param int|array $childIds
      * @return array
-     * @since 2.0.0
      */
     public function getRelationsByChild($childIds)
     {
@@ -213,7 +205,6 @@ public function getRelationsByChild($childIds)
      *
      * @param int|array $parentIds
      * @return array
-     * @since 2.0.0
      */
     public function getRelationsByParent($parentIds)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index 531d171197f55..c4e3fb1bf1e70 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -13,7 +13,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer
 {
@@ -21,7 +20,6 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -33,7 +31,6 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param null $connectionName
      * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -51,7 +48,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -78,7 +74,6 @@ public function reindexAll()
      * @param int|array $processIds
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexEntities($processIds)
     {
@@ -98,7 +93,6 @@ public function reindexEntities($processIds)
      * @param int $attributeId
      * @param bool $isIndexable
      * @return $this
-     * @since 2.0.0
      */
     public function reindexAttribute($attributeId, $isIndexable = true)
     {
@@ -123,7 +117,6 @@ public function reindexAttribute($attributeId, $isIndexable = true)
      * @param array $entityIds      the entity ids limitation
      * @param int $attributeId      the attribute id limitation
      * @return $this
-     * @since 2.0.0
      */
     abstract protected function _prepareIndex($entityIds = null, $attributeId = null);
 
@@ -131,7 +124,6 @@ abstract protected function _prepareIndex($entityIds = null, $attributeId = null
      * Remove Not Visible products from temporary data index
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _removeNotVisibleEntityFromIndex()
     {
@@ -166,7 +158,6 @@ protected function _removeNotVisibleEntityFromIndex()
      *
      * @param array $parentIds the parent entity ids limitation
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _prepareRelationIndexSelect($parentIds = null)
     {
@@ -225,7 +216,6 @@ protected function _prepareRelationIndexSelect($parentIds = null)
      *
      * @param array $parentIds the parent entity ids limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareRelationIndex($parentIds = null)
     {
@@ -248,7 +238,6 @@ protected function _prepareRelationIndex($parentIds = null)
      * the catalog/eav_attribute table must have alias is ca
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getIndexableAttributesCondition()
     {
@@ -269,7 +258,6 @@ protected function _getIndexableAttributesCondition()
      * @param int $attributeId
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _removeAttributeIndexData($attributeId)
     {
@@ -292,7 +280,6 @@ protected function _removeAttributeIndexData($attributeId)
      * @param int $attributeId
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _synchronizeAttributeIndexData($attributeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
index a1aff9a987259..fee2463828e52 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
@@ -11,7 +11,6 @@
  * Catalog Product Eav Decimal Attributes Indexer resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Decimal extends AbstractEav
 {
@@ -19,7 +18,6 @@ class Decimal extends AbstractEav
      * Initialize connection and define main index table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * @param array $entityIds the entity ids limitation
      * @param int $attributeId the attribute id limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIndex($entityIds = null, $attributeId = null)
     {
@@ -134,7 +131,6 @@ protected function _prepareIndex($entityIds = null, $attributeId = null)
      * Retrieve decimal indexable attributes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getIndexableAttributes()
     {
@@ -165,7 +161,6 @@ protected function _getIndexableAttributes()
      * @param string $table
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdxTable($table = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
index f291aad3158c2..8379b23f3b34b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -12,7 +12,6 @@
  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Source extends AbstractEav
 {
@@ -22,7 +21,6 @@ class Source extends AbstractEav
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -35,7 +33,6 @@ class Source extends AbstractEav
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param null|string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Initialize connection and define main index table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -71,7 +67,6 @@ protected function _construct()
      *
      * @param bool $multiSelect
      * @return array
-     * @since 2.0.0
      */
     protected function _getIndexableAttributes($multiSelect)
     {
@@ -101,7 +96,6 @@ protected function _getIndexableAttributes($multiSelect)
      * @param array $entityIds the entity ids limitation
      * @param int $attributeId the attribute id limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIndex($entityIds = null, $attributeId = null)
     {
@@ -118,7 +112,6 @@ protected function _prepareIndex($entityIds = null, $attributeId = null)
      * @param int $attributeId the attribute id limitation
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
     {
@@ -217,7 +210,6 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
      * @param array $entityIds the entity ids limitation
      * @param int $attributeId the attribute id limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMultiselectIndex($entityIds = null, $attributeId = null)
     {
@@ -310,7 +302,6 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveIndexData(array $data)
     {
@@ -332,7 +323,6 @@ protected function _saveIndexData(array $data)
      * @param string|null $table
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdxTable($table = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
index e6e06cb934cce..7c870e54d4a0e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -14,37 +14,37 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $resource;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $customerSession;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
     /**
      * @var BaseSelectProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessor;
 
@@ -55,7 +55,7 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface|null $baseSelectProcessor
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -74,7 +74,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index ad5708932f584..568b09e0e58da 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -15,7 +15,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DefaultPrice extends AbstractIndexer implements PriceInterface
 {
@@ -23,7 +22,6 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * Product type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_typeId;
 
@@ -31,7 +29,6 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * Product Type is composite flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = false;
 
@@ -39,7 +36,6 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * Core data
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -47,7 +43,6 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -67,7 +62,6 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param string|null $connectionName
      * @param null|\Magento\Indexer\Model\Indexer\StateFactory $stateFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -86,7 +80,6 @@ public function __construct(
      * Get Table strategy
      *
      * @return \Magento\Framework\Indexer\Table\StrategyInterface
-     * @since 2.0.0
      */
     public function getTableStrategy()
     {
@@ -97,7 +90,6 @@ public function getTableStrategy()
      * Define main price index table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -109,7 +101,6 @@ protected function _construct()
      *
      * @param string $typeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeId($typeCode)
     {
@@ -122,7 +113,6 @@ public function setTypeId($typeCode)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getTypeId()
     {
@@ -139,7 +129,6 @@ public function getTypeId()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsComposite($flag)
     {
@@ -152,7 +141,6 @@ public function setIsComposite($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsComposite()
     {
@@ -164,7 +152,6 @@ public function getIsComposite()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -185,7 +172,6 @@ public function reindexAll()
      *
      * @param int|array $entityIds
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-     * @since 2.0.0
      */
     public function reindexEntity($entityIds)
     {
@@ -196,7 +182,6 @@ public function reindexEntity($entityIds)
     /**
      * @param null|int|array $entityIds
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-     * @since 2.0.0
      */
     protected function reindex($entityIds = null)
     {
@@ -214,7 +199,6 @@ protected function reindex($entityIds = null)
      * @see _prepareDefaultFinalPriceTable()
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultFinalPriceTable()
     {
@@ -225,7 +209,6 @@ protected function _getDefaultFinalPriceTable()
      * Prepare final price temporary index table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareDefaultFinalPriceTable()
     {
@@ -237,7 +220,6 @@ protected function _prepareDefaultFinalPriceTable()
      * Retrieve website current dates table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getWebsiteDateTable()
     {
@@ -250,7 +232,6 @@ protected function _getWebsiteDateTable()
      * @param int|array $entityIds the entity ids limitation
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareFinalPriceData($entityIds = null)
     {
@@ -264,7 +245,6 @@ protected function _prepareFinalPriceData($entityIds = null)
      * @param string|null $type product type, all if null
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function prepareFinalPriceDataForType($entityIds, $type)
     {
@@ -428,7 +408,6 @@ protected function getSelect($entityIds = null, $type = null)
      * Retrieve table name for custom option temporary aggregation data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCustomOptionAggregateTable()
     {
@@ -439,7 +418,6 @@ protected function _getCustomOptionAggregateTable()
      * Retrieve table name for custom option prices data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCustomOptionPriceTable()
     {
@@ -450,7 +428,6 @@ protected function _getCustomOptionPriceTable()
      * Prepare table structure for custom option temporary aggregation data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCustomOptionAggregateTable()
     {
@@ -462,7 +439,6 @@ protected function _prepareCustomOptionAggregateTable()
      * Prepare table structure for custom option prices data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCustomOptionPriceTable()
     {
@@ -475,7 +451,6 @@ protected function _prepareCustomOptionPriceTable()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _applyCustomOption()
     {
@@ -655,7 +630,6 @@ protected function _applyCustomOption()
      *
      * @param int[]|null $entityIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _movePriceDataToIndexTable($entityIds = null)
     {
@@ -691,7 +665,6 @@ protected function _movePriceDataToIndexTable($entityIds = null)
      * Retrieve table name for product tier price index
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTierPriceIndexTable()
     {
@@ -704,7 +677,6 @@ protected function _getTierPriceIndexTable()
      * @param string $table
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdxTable($table = null)
     {
@@ -713,7 +685,6 @@ public function getIdxTable($table = null)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function hasEntity()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
index b91ae55b48d65..e10d2add49cb4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
index ad03472288ff3..c79a2da6714a6 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 interface PriceInterface
 {
@@ -19,7 +18,6 @@ interface PriceInterface
      * Reindex temporary (price result data) for all products
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reindexAll();
 
@@ -28,7 +26,6 @@ public function reindexAll();
      *
      * @param int|array $entityIds
      * @return $this
-     * @since 2.0.0
      */
     public function reindexEntity($entityIds);
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
index 2be0ca512a321..8442113dc8ac7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
@@ -9,7 +9,6 @@
  * Catalog product link resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Product Link Attributes Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_attributesTable;
 
@@ -25,7 +23,6 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Catalog product relation
      *
      * @var Relation
-     * @since 2.0.0
      */
     protected $_catalogProductRelation;
 
@@ -35,7 +32,6 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param Relation $catalogProductRelation
      * @param string|null $connectionName
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Define main table name and attributes table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -108,7 +103,7 @@ public function getProductLinkId($parentId, $linkedProductId, $typeId)
      *
      * @param int $parentId ID of product
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function hasProductLinks($parentId)
     {
@@ -137,7 +132,6 @@ public function hasProductLinks($parentId)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function saveProductLinks($parentId, $data, $typeId)
     {
@@ -208,7 +202,6 @@ public function saveProductLinks($parentId, $data, $typeId)
      * @param string $type
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareAttributeValue($type, $value)
     {
@@ -225,7 +218,6 @@ protected function _prepareAttributeValue($type, $value)
      *
      * @param int $typeId
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesByType($typeId)
     {
@@ -245,7 +237,6 @@ public function getAttributesByType($typeId)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeTypeTable($type)
     {
@@ -261,7 +252,6 @@ public function getAttributeTypeTable($type)
      * @param int $parentId
      * @param int $typeId
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $typeId)
     {
@@ -292,7 +282,6 @@ public function getChildrenIds($parentId, $typeId)
      * @param int|array $childId
      * @param int $typeId
      * @return string[]
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId, $typeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
index 0ab6ad1eb2e51..5eeb86d1d91ab 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product object
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product Link model class
      *
      * @var \Magento\Catalog\Model\Product\Link
-     * @since 2.0.0
      */
     protected $_linkModel;
 
@@ -34,7 +31,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product Link Type identifier
      *
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_linkTypeId;
 
@@ -42,7 +38,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +52,6 @@ protected function _construct()
      *
      * @param \Magento\Catalog\Model\Product\Link $linkModel
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkModel(\Magento\Catalog\Model\Product\Link $linkModel)
     {
@@ -72,7 +66,6 @@ public function setLinkModel(\Magento\Catalog\Model\Product\Link $linkModel)
      * Retrieve collection link model
      *
      * @return \Magento\Catalog\Model\Product\Link
-     * @since 2.0.0
      */
     public function getLinkModel()
     {
@@ -84,7 +77,6 @@ public function getLinkModel()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -96,7 +88,6 @@ public function setProduct(\Magento\Catalog\Model\Product $product)
      * Retrieve collection base product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -107,7 +98,6 @@ public function getProduct()
      * Add link's type to filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addLinkTypeIdFilter()
     {
@@ -121,7 +111,6 @@ public function addLinkTypeIdFilter()
      * Add product to filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addProductIdFilter()
     {
@@ -135,7 +124,6 @@ public function addProductIdFilter()
      * Join attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinAttributes()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 081dd095bf418..4837d8397898f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -11,7 +11,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Store product model
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -27,7 +25,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Store product link model
      *
      * @var \Magento\Catalog\Model\Product\Link
-     * @since 2.0.0
      */
     protected $_linkModel;
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Store link type id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_linkTypeId;
 
@@ -43,7 +39,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Store strong mode flag that determine if needed for inner join or left join of linked products
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isStrongMode;
 
@@ -51,7 +46,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Store flag that determine if product filter was enabled
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasLinkFilter = false;
 
@@ -60,7 +54,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      *
      * @param \Magento\Catalog\Model\Product\Link $linkModel
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkModel(\Magento\Catalog\Model\Product\Link $linkModel)
     {
@@ -75,7 +68,6 @@ public function setLinkModel(\Magento\Catalog\Model\Product\Link $linkModel)
      * Enable strong mode for inner join of linked products
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setIsStrongMode()
     {
@@ -87,7 +79,6 @@ public function setIsStrongMode()
      * Retrieve collection link model
      *
      * @return \Magento\Catalog\Model\Product\Link
-     * @since 2.0.0
      */
     public function getLinkModel()
     {
@@ -99,7 +90,6 @@ public function getLinkModel()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -115,7 +105,6 @@ public function setProduct(\Magento\Catalog\Model\Product $product)
      * Retrieve collection base product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -127,7 +116,6 @@ public function getProduct()
      *
      * @param array $products
      * @return $this
-     * @since 2.0.0
      */
     public function addExcludeProductFilter($products)
     {
@@ -146,7 +134,6 @@ public function addExcludeProductFilter($products)
      *
      * @param array|int|string $products
      * @return $this
-     * @since 2.0.0
      */
     public function addProductFilter($products)
     {
@@ -166,7 +153,6 @@ public function addProductFilter($products)
      * Add random sorting order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRandomOrder()
     {
@@ -179,7 +165,6 @@ public function setRandomOrder()
      *
      * @param string $groupBy
      * @return $this
-     * @since 2.0.0
      */
     public function setGroupBy($groupBy = 'e.entity_id')
     {
@@ -191,7 +176,6 @@ public function setGroupBy($groupBy = 'e.entity_id')
      * Join linked products when specified link model
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -206,7 +190,6 @@ protected function _beforeLoad()
      * Join linked products and their attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinLinks()
     {
@@ -255,7 +238,6 @@ protected function _joinLinks()
      *
      * @param string $dir sort type asc|desc
      * @return $this
-     * @since 2.0.0
      */
     public function setPositionOrder($dir = self::SORT_ORDER_ASC)
     {
@@ -270,7 +252,6 @@ public function setPositionOrder($dir = self::SORT_ORDER_ASC)
      *
      * @param string $dir sort type asc|desc
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetIdOrder($dir = self::SORT_ORDER_ASC)
     {
@@ -288,7 +269,6 @@ public function setAttributeSetIdOrder($dir = self::SORT_ORDER_ASC)
      * Join attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinAttributes()
     {
@@ -323,7 +303,6 @@ public function joinAttributes()
      * @param string|array $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -340,7 +319,6 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
      *
      * @param int $type
      * @return array
-     * @since 2.0.0
      */
     public function getLinkAttributes($type = null)
     {
@@ -353,7 +331,6 @@ public function getLinkAttributes($type = null)
      * @param string $code
      * @param array $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addLinkAttributeToFilter($code, $condition)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
index 588874fa170a7..0671568b4f401 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -14,43 +14,43 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderByBasePrice
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $resource;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $eavConfig;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $catalogHelper;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
     /**
      * @var BaseSelectProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessor;
 
@@ -61,7 +61,7 @@ class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilde
      * @param \Magento\Catalog\Helper\Data $catalogHelper
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface $baseSelectProcessor
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -82,7 +82,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
index 9eed0c4875c1d..4de2308b70249 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -13,55 +13,55 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderBySpecialPrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $resource;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $eavConfig;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $catalogHelper;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $dateTime;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $localeDate;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
     /**
      * @var BaseSelectProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessor;
 
@@ -74,7 +74,7 @@ class LinkedProductSelectBuilderBySpecialPrice implements LinkedProductSelectBui
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface $baseSelectProcessor
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -99,7 +99,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
index f79dcd76787da..a55ad16c5abfd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -12,7 +12,7 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderByTierPrice
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderByTierPrice implements LinkedProductSelectBuilderInterface
 {
@@ -23,37 +23,37 @@ class LinkedProductSelectBuilderByTierPrice implements LinkedProductSelectBuilde
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $resource;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $customerSession;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $catalogHelper;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
     /**
      * @var BaseSelectProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessor;
 
@@ -64,7 +64,7 @@ class LinkedProductSelectBuilderByTierPrice implements LinkedProductSelectBuilde
      * @param \Magento\Catalog\Helper\Data $catalogHelper
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface $baseSelectProcessor
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -85,7 +85,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
index 8b55db0f6d6f6..14011049aa32e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -9,19 +9,19 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderComposite implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var LinkedProductSelectBuilderInterface[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $linkedProductSelectBuilder;
 
     /**
      * @param LinkedProductSelectBuilderInterface[] $linkedProductSelectBuilder
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct($linkedProductSelectBuilder)
     {
@@ -30,7 +30,7 @@ public function __construct($linkedProductSelectBuilder)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
index 9543d8c6ef1bc..00f02a71da460 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
@@ -7,14 +7,14 @@
 
 /**
  * Provide Select object for retrieve product id with minimal price
- * @since 2.2.0
+ * @since 2.1.1
  */
 interface LinkedProductSelectBuilderInterface
 {
     /**
      * @param int $productId
      * @return \Magento\Framework\DB\Select[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId);
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index f36ffb664b94d..953fea2ee6dba 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -12,7 +12,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -26,7 +25,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -34,7 +32,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Currency factory
      *
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -42,7 +39,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core config model
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -54,7 +50,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -73,7 +68,6 @@ public function __construct(
      * Define main table and initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -85,7 +79,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -102,7 +95,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -243,7 +235,6 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -323,7 +314,6 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
      * @param int $optionId
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     protected function getColFromOptionTable($tableName, $optionId, $storeId)
     {
@@ -346,7 +336,6 @@ protected function getColFromOptionTable($tableName, $optionId, $storeId)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function deletePrices($optionId)
     {
@@ -363,7 +352,6 @@ public function deletePrices($optionId)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteTitles($optionId)
     {
@@ -382,7 +370,6 @@ public function deleteTitles($optionId)
      * @param int $oldProductId
      * @param int $newProductId
      * @return \Magento\Catalog\Model\Product\Option
-     * @since 2.0.0
      */
     public function duplicate(\Magento\Catalog\Model\Product\Option $object, $oldProductId, $newProductId)
     {
@@ -466,7 +453,6 @@ public function duplicate(\Magento\Catalog\Model\Product\Option $object, $oldPro
      * @param int $storeId
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php
index 1ae15ceebb78a..4a85efc6399fb 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php
@@ -15,7 +15,6 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -35,7 +34,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -43,7 +41,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Option value factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory
-     * @since 2.0.0
      */
     protected $_optionValueCollectionFactory;
 
@@ -58,7 +55,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @param MetadataPool $metadataPool
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -82,7 +78,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -97,7 +92,6 @@ protected function _construct()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function getOptions($storeId)
     {
@@ -111,7 +105,6 @@ public function getOptions($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addTitleToResult($storeId)
     {
@@ -147,7 +140,6 @@ public function addTitleToResult($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addPriceToResult($storeId)
     {
@@ -193,7 +185,6 @@ public function addPriceToResult($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addValuesToResult($storeId = null)
     {
@@ -238,7 +229,6 @@ public function addValuesToResult($storeId = null)
      *
      * @param array|\Magento\Catalog\Model\Product|int $product
      * @return $this
-     * @since 2.0.0
      */
     public function addProductToFilter($product)
     {
@@ -309,7 +299,6 @@ public function getProductOptions($productId, $storeId, $requiredOnly = false)
      *
      * @param bool $required
      * @return $this
-     * @since 2.0.0
      */
     public function addRequiredFilter($required = true)
     {
@@ -322,7 +311,6 @@ public function addRequiredFilter($required = true)
      *
      * @param string|array $optionIds
      * @return $this
-     * @since 2.0.0
      */
     public function addIdsToFilter($optionIds)
     {
@@ -334,7 +322,6 @@ public function addIdsToFilter($optionIds)
      * Call of protected method reset
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 0f406a0bf891e..1a1d97d087caa 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -9,7 +9,6 @@
  * Catalog product custom option resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -25,7 +23,6 @@ class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Currency factory
      *
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -33,7 +30,6 @@ class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core config model
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -51,7 +47,6 @@ class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      * Define main table and initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +77,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -100,7 +93,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -229,7 +221,6 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -302,7 +293,6 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
      * @param int $optionId
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     protected function getOptionIdFromOptionTable($tableName, $optionId, $storeId)
     {
@@ -325,7 +315,6 @@ protected function getOptionIdFromOptionTable($tableName, $optionId, $storeId)
      *
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteValue($optionId)
     {
@@ -352,7 +341,6 @@ public function deleteValue($optionId)
      *
      * @param int $optionTypeId
      * @return void
-     * @since 2.0.0
      */
     public function deleteValues($optionTypeId)
     {
@@ -370,7 +358,6 @@ public function deleteValues($optionTypeId)
      * @param int $oldOptionId
      * @param int $newOptionId
      * @return \Magento\Catalog\Model\Product\Option\Value
-     * @since 2.0.0
      */
     public function duplicate(\Magento\Catalog\Model\Product\Option\Value $object, $oldOptionId, $newOptionId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
index e1d47d9be9c5e..9b5027d15a43d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function getValues($storeId)
     {
@@ -47,7 +44,6 @@ public function getValues($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addTitlesToResult($storeId)
     {
@@ -114,7 +110,6 @@ public function addTitlesToResult($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addTitleToResult($storeId)
     {
@@ -148,7 +143,6 @@ public function addTitleToResult($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addPriceToResult($storeId)
     {
@@ -196,7 +190,6 @@ public function addPriceToResult($storeId)
      * @param int $storeId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getValuesByOption($optionIds, $storeId = null)
     {
@@ -212,7 +205,6 @@ public function getValuesByOption($optionIds, $storeId = null)
      *
      * @param array|\Magento\Catalog\Model\Product\Option|int $option
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionToFilter($option)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
index 2dd8c520ae1fa..3c39c0f8fe779 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
@@ -9,7 +9,6 @@
  * Catalog Product Relations Resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Relation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Relation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize resource model and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param int $parentId
      * @param array $childIds
      * @return $this
-     * @since 2.0.0
      */
     public function processRelations($parentId, $childIds)
     {
@@ -78,7 +75,6 @@ public function addRelation($parentId, $childId)
      * @param int[] $childIds
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addRelations($parentId, $childIds)
     {
@@ -99,7 +95,6 @@ public function addRelations($parentId, $childIds)
      * @param int[] $childIds
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function removeRelations($parentId, $childIds)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
index 5ab64c4d45c95..f54c23ade6b3e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
@@ -16,25 +16,25 @@
 
 /**
  * Class StatusBaseSelectProcessor
- * @since 2.2.0
+ * @since 2.1.3
  */
 class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
 {
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $eavConfig;
 
     /**
      * @var MetadataPool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $metadataPool;
 
     /**
      * @var StoreResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeResolver;
 
@@ -42,7 +42,7 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
      * @param Config $eavConfig
      * @param MetadataPool $metadataPool
      * @param StoreResolverInterface $storeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Config $eavConfig,
@@ -57,7 +57,7 @@ public function __construct(
     /**
      * @param Select $select
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(Select $select)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
index 83d56f02b73c0..771f781678e44 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
@@ -7,7 +7,6 @@
 
 /**
  * Catalog Product Website Resource Model
- * @since 2.0.0
  */
 class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -23,7 +21,6 @@ class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Initialize connection and define resource table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
      * @param array $productIds
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function removeProducts($websiteIds, $productIds)
     {
@@ -86,7 +81,6 @@ public function removeProducts($websiteIds, $productIds)
      * @param array $productIds
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function addProducts($websiteIds, $productIds)
     {
@@ -123,7 +117,6 @@ public function addProducts($websiteIds, $productIds)
      *
      * @param array $productIds
      * @return array
-     * @since 2.0.0
      */
     public function getWebsites($productIds)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Setup/PropertyMapper.php b/app/code/Magento/Catalog/Model/ResourceModel/Setup/PropertyMapper.php
index 45d7e219e9c13..b39dd63c6d200 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Setup/PropertyMapper.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Setup/PropertyMapper.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\ResourceModel\Setup\PropertyMapper
  *
- * @since 2.0.0
  */
 class PropertyMapper extends PropertyMapperAbstract
 {
@@ -23,7 +22,6 @@ class PropertyMapper extends PropertyMapperAbstract
      * @param int $entityTypeId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index f4d0926a23a15..31a33ee1bffb0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -20,7 +20,6 @@
  * @package Magento\Catalog\Model\ResourceModel
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -28,7 +27,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Stores configuration array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_stores;
 
@@ -36,7 +34,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Category attribute properties cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_categoryAttributes = [];
 
@@ -44,7 +41,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Product attribute properties cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productAttributes = [];
 
@@ -52,7 +48,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Limit products for select
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_productLimit = 250;
 
@@ -60,13 +55,11 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Cache of root category children ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rootChildrenIds = [];
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -74,7 +67,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Catalog category
      *
      * @var \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected $_catalogCategory;
 
@@ -82,7 +74,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Catalog product
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
@@ -90,7 +81,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -98,13 +88,11 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $productResource;
 
@@ -123,7 +111,6 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\Category $catalogCategory
      * @param \Psr\Log\LoggerInterface $logger
      * @param null $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -146,7 +133,6 @@ public function __construct(
      * Load core Url rewrite model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -158,7 +144,6 @@ protected function _construct()
      *
      * @param int $storeId
      * @return \Magento\Store\Model\Store|\Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getStores($storeId = null)
     {
@@ -178,7 +163,6 @@ public function getStores($storeId = null)
      * @param int|array $categoryIds
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId)
     {
@@ -283,7 +267,6 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId)
      * @param int|array $productIds
      * @param string $storeId
      * @return array
-     * @since 2.0.0
      */
     public function _getProductAttribute($attributeCode, $productIds, $storeId)
     {
@@ -361,7 +344,6 @@ public function _getProductAttribute($attributeCode, $productIds, $storeId)
      *
      * @param \Magento\Framework\DataObject $category
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCategoryParentId(\Magento\Framework\DataObject $category)
     {
@@ -379,7 +361,6 @@ protected function _prepareCategoryParentId(\Magento\Framework\DataObject $categ
      *
      * @param \Magento\Store\Model\Store[] $stores
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     protected function _prepareStoreRootCategories($stores)
     {
@@ -414,7 +395,6 @@ protected function _prepareStoreRootCategories($stores)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getCategories($categoryIds, $storeId = null, $path = null)
     {
@@ -514,7 +494,6 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null)
      * @param int $categoryId
      * @param int $storeId
      * @return \Magento\Framework\DataObject|false
-     * @since 2.0.0
      */
     public function getCategory($categoryId, $storeId)
     {
@@ -535,7 +514,6 @@ public function getCategory($categoryId, $storeId)
      * @param int|array $categoryIds
      * @param int $storeId
      * @return array|false
-     * @since 2.0.0
      */
     public function getCategories($categoryIds, $storeId)
     {
@@ -554,7 +532,6 @@ public function getCategories($categoryIds, $storeId)
      * @param int $entityId
      * @param int &$lastEntityId
      * @return array
-     * @since 2.0.0
      */
     protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId)
     {
@@ -633,7 +610,6 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId
      * @param int $productId
      * @param int $storeId
      * @return \Magento\Framework\DataObject|false
-     * @since 2.0.0
      */
     public function getProduct($productId, $storeId)
     {
@@ -651,7 +627,6 @@ public function getProduct($productId, $storeId)
      * @param int $storeId
      * @param int &$lastEntityId
      * @return array
-     * @since 2.0.0
      */
     public function getProductsByStore($storeId, &$lastEntityId)
     {
@@ -671,7 +646,6 @@ public function getProductsByStore($storeId, &$lastEntityId)
      *
      * @param array $products
      * @return array
-     * @since 2.0.0
      */
     public function getRewriteByProductStore(array $products)
     {
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index 5f83991015089..a58569d1b59d7 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -8,25 +8,21 @@
 /**
  * Class Category
  * @package Magento\Catalog\Model\Rss
- * @since 2.0.0
  */
 class Category
 {
     /**
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $catalogLayer;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $visibility;
 
@@ -34,7 +30,6 @@ class Category
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
      * @param \Magento\Catalog\Model\Product\Visibility $visibility
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Resolver $layerResolver,
@@ -50,7 +45,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function getProductCollection(\Magento\Catalog\Model\Category $category, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
index 74adc3ec5e4f1..10bbe8b749ae7 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
@@ -8,25 +8,21 @@
 /**
  * Class NewProducts
  * @package Magento\Catalog\Model\Rss\Product
- * @since 2.0.0
  */
 class NewProducts
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $visibility;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
@@ -34,7 +30,6 @@ class NewProducts
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Catalog\Model\Product\Visibility $visibility
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
@@ -49,7 +44,6 @@ public function __construct(
     /**
      * @param int $storeId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getProductsCollection($storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php b/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
index 2cb3f31436ddd..eb002f16bbbd3 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
@@ -8,25 +8,21 @@
 /**
  * Class NotifyStock
  * @package Magento\Catalog\Model\Rss\Product
- * @since 2.0.0
  */
 class NotifyStock extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\StockFactory
-     * @since 2.0.0
      */
     protected $stockFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $productStatus;
 
@@ -34,7 +30,6 @@ class NotifyStock extends \Magento\Framework\Model\AbstractModel
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -43,7 +38,6 @@ class NotifyStock extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\CatalogInventory\Model\ResourceModel\StockFactory $stockFactory
      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
@@ -59,7 +53,6 @@ public function __construct(
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getProductsCollection()
     {
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/Special.php b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
index a3ed7192edf95..2d25a580d22c5 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
@@ -8,26 +8,22 @@
 /**
  * Class Special
  * @package Magento\Catalog\Model\Rss\Product
- * @since 2.0.0
  */
 class Special
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
@@ -41,7 +37,6 @@ public function __construct(
      * @param int $storeId
      * @param int $customerGroupId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getProductsCollection($storeId, $customerGroupId)
     {
diff --git a/app/code/Magento/Catalog/Model/Session.php b/app/code/Magento/Catalog/Model/Session.php
index 80ac57f088e0b..a4c5a1ce2d51b 100644
--- a/app/code/Magento/Catalog/Model/Session.php
+++ b/app/code/Magento/Catalog/Model/Session.php
@@ -9,7 +9,6 @@
  * Catalog session model
  *
  * @api
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index 3ce6dacc34830..d2b6c338f012f 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -24,31 +24,26 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Suffix extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\UrlRewrite\Helper\UrlRewrite
-     * @since 2.0.0
      */
     protected $urlRewriteHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -77,7 +72,6 @@ class Suffix extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -121,7 +115,6 @@ private function getAppConfig()
      * Check url rewrite suffix - whether we can support it
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -131,7 +124,6 @@ public function beforeSave()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -182,7 +174,6 @@ private function isCategorySuffixChanged()
      * Update suffix for url rewrites
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function updateSuffixForUrlRewrites()
     {
@@ -221,7 +212,6 @@ protected function updateSuffixForUrlRewrites()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     protected function getStoreIds()
     {
@@ -241,7 +231,6 @@ protected function getStoreIds()
     /**
      * @param array $storeIds
      * @return array
-     * @since 2.0.0
      */
     protected function getOverrideStoreIds($storeIds)
     {
diff --git a/app/code/Magento/Catalog/Model/System/Config/Source/Inputtype.php b/app/code/Magento/Catalog/Model/System/Config/Source/Inputtype.php
index b0cd3e8a86f46..f697b4d8698f3 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Source/Inputtype.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Catalog\Model\System\Config\Source\Inputtype
  *
- * @since 2.0.0
  */
 class Inputtype
 {
     /**
      * Get input types which use predefined source
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index fa71e565176e9..a3f4d5004182f 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -18,7 +18,6 @@
  * Work with catalog(store, website) urls
  *
  * @package Magento\Catalog\Model\Template
- * @since 2.0.0
  */
 class Filter extends \Magento\Framework\Filter\Template
 {
@@ -26,7 +25,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Use absolute links flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useAbsoluteLinks = false;
 
@@ -34,13 +32,11 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useSessionInUrl = false;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -48,7 +44,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -57,7 +52,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param array $variables
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -75,7 +69,6 @@ public function __construct(
      *
      * @param bool $flag
      * @return \Magento\Email\Model\Template\Filter
-     * @since 2.0.0
      */
     public function setUseAbsoluteLinks($flag)
     {
@@ -89,7 +82,6 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return \Magento\Email\Model\Template\Filter
-     * @since 2.0.0
      */
     public function setUseSessionInUrl($flag)
     {
@@ -103,7 +95,6 @@ public function setUseSessionInUrl($flag)
      * @param array $construction
      * @return string
      * @see \Magento\Email\Model\Template\Filter::viewDirective() method has been copypasted
-     * @since 2.0.0
      */
     public function viewDirective($construction)
     {
@@ -133,7 +124,6 @@ public function viewDirective($construction)
      * @param array $construction
      * @return string
      * @see \Magento\Email\Model\Template\Filter::mediaDirective() method has been copypasted
-     * @since 2.0.0
      */
     public function mediaDirective($construction)
     {
@@ -148,7 +138,6 @@ public function mediaDirective($construction)
      * @param array $construction
      * @return string
      * @see \Magento\Email\Model\Template\Filter::storeDirective() method has been copypasted
-     * @since 2.0.0
      */
     public function storeDirective($construction)
     {
diff --git a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
index cf8d480567a4b..2d5a25cdf4ef3 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Catalog\Model\Template\Filter\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Framework\Filter\Template
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/Date.php
index fd0106bf39a0e..e982ff5c07427 100644
--- a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/Date.php
@@ -9,13 +9,11 @@
 
 /**
  * Catalog product option date validator
- * @since 2.0.0
  */
 class Date extends \Magento\Catalog\Model\Product\Option\Type\Date
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateUserValue($values)
     {
@@ -28,7 +26,6 @@ public function validateUserValue($values)
     /**
      * @param array $values
      * @return array mixed
-     * @since 2.0.0
      */
     protected function formatValues($values)
     {
@@ -51,7 +48,6 @@ protected function formatValues($values)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function useCalendar()
     {
diff --git a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
index 0dc916eb97cc2..8aadbe63ddf97 100644
--- a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
+++ b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
@@ -13,32 +13,27 @@
 /**
  * Class \Magento\Catalog\Model\Webapi\Product\Option\Type\File\Processor
  *
- * @since 2.0.0
  */
 class Processor
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\Framework\Api\ImageProcessor
-     * @since 2.0.0
      */
     protected $imageProcessor;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $destinationFolder = 'custom_options/quote';
 
     /**
      * @param Filesystem $filesystem
      * @param ImageProcessor $imageProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -51,7 +46,6 @@ public function __construct(
     /**
      * @param ImageContentInterface $imageContent
      * @return string
-     * @since 2.0.0
      */
     protected function saveFile(ImageContentInterface $imageContent)
     {
@@ -63,7 +57,6 @@ protected function saveFile(ImageContentInterface $imageContent)
      * @param ImageContentInterface $imageContent
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function processFileContent(ImageContentInterface $imageContent)
     {
diff --git a/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php b/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
index 94019e0b8645c..46a993abd4207 100644
--- a/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
+++ b/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver
  *
- * @since 2.0.0
  */
 class CatalogCheckIsUsingStaticUrlsAllowedObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class CatalogCheckIsUsingStaticUrlsAllowedObserver implements ObserverInterface
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $catalogData;
 
     /**
      * @param \Magento\Catalog\Helper\Data $catalogData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Helper\Data $catalogData)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Catalog\Helper\Data $catalogData)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
index 22971570743e6..27e1b44704156 100644
--- a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
+++ b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
@@ -11,13 +11,11 @@
 /**
  * Catalog Compare Item Model
  *
- * @since 2.0.0
  */
 class BindCustomerLoginObserver implements ObserverInterface
 {
     /**
      * @param Item $item
-     * @since 2.0.0
      */
     public function __construct(
         Item $item
@@ -31,7 +29,6 @@ public function __construct(
      * @return $this
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
index bd119bae70967..11b8d3f854f65 100644
--- a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
+++ b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
@@ -11,13 +11,11 @@
 /**
  * Catalog Compare Item Model
  *
- * @since 2.0.0
  */
 class BindCustomerLogoutObserver implements ObserverInterface
 {
     /**
      * @param Item $item
-     * @since 2.0.0
      */
     public function __construct(
         Item $item
@@ -31,7 +29,6 @@ public function __construct(
      * @return $this
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/MenuCategoryData.php b/app/code/Magento/Catalog/Observer/MenuCategoryData.php
index 02f71d50a0021..63fe0258249cd 100644
--- a/app/code/Magento/Catalog/Observer/MenuCategoryData.php
+++ b/app/code/Magento/Catalog/Observer/MenuCategoryData.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Catalog\Observer\MenuCategoryData
  *
- * @since 2.0.0
  */
 class MenuCategoryData
 {
@@ -16,7 +15,6 @@ class MenuCategoryData
      * Catalog category
      *
      * @var \Magento\Catalog\Helper\Category
-     * @since 2.0.0
      */
     protected $catalogCategory;
 
@@ -24,7 +22,6 @@ class MenuCategoryData
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     private $catalogLayer = null;
 
@@ -32,13 +29,11 @@ class MenuCategoryData
      * Catalog layer resolver
      *
      * @var \Magento\Catalog\Model\Layer\Resolver
-     * @since 2.0.0
      */
     protected $layerResolver;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -46,7 +41,6 @@ class MenuCategoryData
      * @param \Magento\Catalog\Helper\Category $catalogCategory
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Category $catalogCategory,
@@ -63,7 +57,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Tree\Node $category
      * @return array
-     * @since 2.0.0
      */
     public function getMenuCategoryData($category)
     {
@@ -92,7 +85,6 @@ public function getMenuCategoryData($category)
      *
      * @param \Magento\Framework\Data\Tree\Node $category
      * @return bool
-     * @since 2.0.0
      */
     protected function hasActive($category)
     {
@@ -113,7 +105,6 @@ protected function hasActive($category)
     /**
      * Get catalog layer
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     private function getCatalogLayer()
     {
diff --git a/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php b/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
index b8aff6259fd52..d03a8a64a25c4 100644
--- a/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
+++ b/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
@@ -16,25 +16,25 @@
 /**
  * Observer is responsible for changing scope for all price attributes in system
  * depending on 'Catalog Price Scope' configuration parameter
- * @since 2.2.0
+ * @since 2.1.3
  */
 class SwitchPriceAttributeScopeOnConfigChange implements ObserverInterface
 {
     /**
      * @var ReinitableConfigInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * @var ProductAttributeRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $productAttributeRepository;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $searchCriteriaBuilder;
 
@@ -42,7 +42,7 @@ class SwitchPriceAttributeScopeOnConfigChange implements ObserverInterface
      * @param ReinitableConfigInterface $config
      * @param ProductAttributeRepositoryInterface $productAttributeRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ReinitableConfigInterface $config,
@@ -61,7 +61,7 @@ public function __construct(
      * @param EventObserver $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
index afc6153099ddd..53e7add165aa0 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute
  *
- * @since 2.0.0
  */
 class Execute
 {
     /**
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $typeList;
 
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -46,7 +42,6 @@ public function __construct(
      * @return AbstractAction
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterExecute(AbstractAction $subject, AbstractAction $result)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php
index 3e12bf8be5ac9..a3145b7502467 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php
@@ -11,21 +11,18 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * @deprecated 2.2.0
- * @since 2.0.0
+ * @deprecated 2.1.3
  */
 class MaxHeapTableSizeProcessorOnFullReindex
 {
     /**
      * @var MaxHeapTableSizeProcessor
-     * @since 2.0.0
      */
     protected $maxHeapTableSizeProcessor;
 
     /**
      * @param MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor
      * @param LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor,
@@ -39,7 +36,6 @@ public function __construct(
      * @param Full $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeExecute(Full $subject)
     {
@@ -55,7 +51,6 @@ public function beforeExecute(Full $subject)
      * @param Full $result
      * @return Full
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterExecute(Full $subject, Full $result)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php b/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
index ca59e9dc24cfa..1c0bdddfeea65 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Catalog\Plugin\Model\Product\Action\UpdateAttributesFlushCache
  *
- * @since 2.0.0
  */
 class UpdateAttributesFlushCache
 {
     /**
      * @var CacheContext
-     * @since 2.0.0
      */
     protected $cacheContext;
 
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @param CacheContext $cacheContext
      * @param EventManager $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         CacheContext $cacheContext,
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
index 10c53506e7408..607d7189a0bfc 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save
  *
- * @since 2.0.0
  */
 class Save
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var TypeListInterface
-     * @since 2.0.0
      */
     protected $typeList;
 
     /**
      * @param Config $config
      * @param TypeListInterface $typeList
-     * @since 2.0.0
      */
     public function __construct(Config $config, TypeListInterface $typeList)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index 0df38881751a3..0d8b346a943fd 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Catalog\Plugin\Model\ResourceModel\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -22,15 +21,11 @@ class Config
     const PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID = 'PRODUCT_LISTING_SORT_BY_ATTRIBUTES';
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $cache;
 
     /**
      * @var bool|null
-     * @since 2.0.0
      */
     protected $isCacheEnabled = null;
 
@@ -44,7 +39,6 @@ class Config
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\App\Cache\StateInterface $cacheState
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
@@ -60,7 +54,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param callable $proceed
      * @return array
-     * @since 2.0.0
      */
     public function aroundGetAttributesUsedInListing(
         \Magento\Catalog\Model\ResourceModel\Config $config,
@@ -88,7 +81,6 @@ public function aroundGetAttributesUsedInListing(
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param callable $proceed
      * @return array
-     * @since 2.0.0
      */
     public function aroundGetAttributesUsedForSortBy(
         \Magento\Catalog\Model\ResourceModel\Config $config,
diff --git a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
index d66aff8ad273a..54a13be864db7 100644
--- a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
@@ -11,7 +11,6 @@
 
 /**
  * Class BasePrice
- * @since 2.0.0
  */
 class BasePrice extends AbstractPrice
 {
@@ -24,7 +23,6 @@ class BasePrice extends AbstractPrice
      * Get Base Price Value
      *
      * @return float|bool
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
index 21affa31fa0dd..87d031d8d5b35 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
@@ -12,7 +12,6 @@
 
 /**
  * Configured price model
- * @since 2.0.0
  */
 class ConfiguredPrice extends FinalPrice implements ConfiguredPriceInterface
 {
@@ -23,7 +22,6 @@ class ConfiguredPrice extends FinalPrice implements ConfiguredPriceInterface
 
     /**
      * @var null|ItemInterface
-     * @since 2.0.0
      */
     protected $item;
 
@@ -33,7 +31,6 @@ class ConfiguredPrice extends FinalPrice implements ConfiguredPriceInterface
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param ItemInterface $item
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -49,7 +46,6 @@ public function __construct(
     /**
      * @param ItemInterface $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(ItemInterface $item)
     {
@@ -61,7 +57,6 @@ public function setItem(ItemInterface $item)
      * Get value of configured options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getOptionsValue()
     {
@@ -90,7 +85,6 @@ protected function getOptionsValue()
      * Price value of product with configured options
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
index 8eb1a2f397118..e6d35a0f5239a 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Configured price interface
- * @since 2.0.0
  */
 interface ConfiguredPriceInterface
 {
@@ -22,7 +21,6 @@ interface ConfiguredPriceInterface
     /**
      * @param ItemInterface $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(ItemInterface $item);
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
index 725555ccb4590..5026286610118 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
@@ -15,7 +15,6 @@
 /**
  * Class OptionPrice
  *
- * @since 2.0.0
  */
 class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterface
 {
@@ -26,7 +25,6 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $priceOptions;
 
@@ -34,7 +32,6 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf
      * Code of parent adjustment to be skipped from calculation
      *
      * @var string
-     * @since 2.0.0
      */
     protected $excludeAdjustment = null;
 
@@ -44,7 +41,6 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param array $excludeAdjustment
-     * @since 2.0.0
      */
     public function __construct(
         SaleableInterface $saleableItem,
@@ -63,7 +59,6 @@ public function __construct(
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -122,7 +117,6 @@ public function getValue()
      * @param null|bool|string|array $exclude
      * @param null|array $context
      * @return AmountInterface|bool|float
-     * @since 2.0.0
      */
     public function getCustomAmount($amount = null, $exclude = null, $context = [])
     {
@@ -140,7 +134,6 @@ public function getCustomAmount($amount = null, $exclude = null, $context = [])
      *
      * @param bool $getMin
      * @return float
-     * @since 2.0.0
      */
     public function getCustomOptionRange($getMin)
     {
@@ -160,7 +153,6 @@ public function getCustomOptionRange($getMin)
      * Return price for select custom options
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSelectedOptions()
     {
@@ -189,7 +181,6 @@ public function getSelectedOptions()
      *
      * @param array $values
      * @return float
-     * @since 2.0.0
      */
     protected function processOptions(array $values)
     {
@@ -213,7 +204,6 @@ protected function processOptions(array $values)
      * Get Product Options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceInterface.php
index 25ea6ffd4b731..b969b948a80a5 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceInterface.php
@@ -9,7 +9,6 @@
  * Option price interface
  *
  * @api
- * @since 2.0.0
  */
 interface CustomOptionPriceInterface
 {
@@ -22,7 +21,6 @@ interface CustomOptionPriceInterface
      * Return calculated options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -31,7 +29,6 @@ public function getOptions();
      *
      * @param bool $getMin
      * @return float
-     * @since 2.0.0
      */
     public function getCustomOptionRange($getMin);
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php b/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
index 5f7ab28634aad..5aea8a7381936 100644
--- a/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
@@ -11,7 +11,6 @@
 
 /**
  * Final price model
- * @since 2.0.0
  */
 class FinalPrice extends AbstractPrice implements FinalPriceInterface
 {
@@ -22,19 +21,16 @@ class FinalPrice extends AbstractPrice implements FinalPriceInterface
 
     /**
      * @var BasePrice
-     * @since 2.0.0
      */
     private $basePrice;
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $minimalPrice;
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $maximalPrice;
 
@@ -42,7 +38,6 @@ class FinalPrice extends AbstractPrice implements FinalPriceInterface
      * Get Value
      *
      * @return float|bool
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -53,7 +48,6 @@ public function getValue()
      * Get Minimal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinimalPrice()
     {
@@ -73,7 +67,6 @@ public function getMinimalPrice()
      * Get Maximal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaximalPrice()
     {
@@ -93,7 +86,6 @@ public function getMaximalPrice()
      * Retrieve base price instance lazily
      *
      * @return BasePrice|\Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     protected function getBasePrice()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/FinalPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/FinalPriceInterface.php
index d044d165af41f..4523e054df07c 100644
--- a/app/code/Magento/Catalog/Pricing/Price/FinalPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/FinalPriceInterface.php
@@ -10,7 +10,6 @@
  * Special price interface
  *
  * @api
- * @since 2.0.0
  */
 interface FinalPriceInterface
 {
@@ -18,7 +17,6 @@ interface FinalPriceInterface
      * Get Minimal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinimalPrice();
 
@@ -26,7 +24,6 @@ public function getMinimalPrice();
      * Get Maximal Price Amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaximalPrice();
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
index 0d893f2d46ee1..609255d852da3 100644
--- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
@@ -11,7 +11,6 @@
 
 /**
  * Class RegularPrice
- * @since 2.0.0
  */
 class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
 {
@@ -24,7 +23,6 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
      * Get price value
      *
      * @return float|bool
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
index 293f8654793cb..b1bfc6ff4ad6f 100644
--- a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
@@ -14,7 +14,6 @@
 
 /**
  * Special price model
- * @since 2.0.0
  */
 class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BasePriceProviderInterface
 {
@@ -25,7 +24,6 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
@@ -35,7 +33,6 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param TimezoneInterface $localeDate
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -50,7 +47,6 @@ public function __construct(
 
     /**
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -69,7 +65,6 @@ public function getValue()
      * Returns special price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSpecialPrice()
     {
@@ -84,7 +79,6 @@ public function getSpecialPrice()
      * Returns starting date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialFromDate()
     {
@@ -95,7 +89,6 @@ public function getSpecialFromDate()
      * Returns end date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialToDate()
     {
@@ -104,7 +97,6 @@ public function getSpecialToDate()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeDateInInterval()
     {
@@ -117,7 +109,6 @@ public function isScopeDateInInterval()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
index 56bde12f79572..f7a8fa0c9d77c 100644
--- a/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Special price interface
- * @since 2.0.0
  */
 interface SpecialPriceInterface
 {
@@ -16,7 +15,6 @@ interface SpecialPriceInterface
      * Returns special price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSpecialPrice();
 
@@ -24,7 +22,6 @@ public function getSpecialPrice();
      * Returns starting date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialFromDate();
 
@@ -32,19 +29,16 @@ public function getSpecialFromDate();
      * Returns end date of the special price
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSpecialToDate();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeDateInInterval();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount();
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 525daf3c1fda2..01c837f854856 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -19,7 +19,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class TierPrice extends AbstractPrice implements TierPriceInterface, BasePriceProviderInterface
 {
@@ -30,13 +29,11 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $customerGroup;
 
@@ -44,7 +41,6 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * Raw price list stored in DB
      *
      * @var array
-     * @since 2.0.0
      */
     protected $rawPriceList;
 
@@ -52,13 +48,11 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * Applicable price list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $priceList;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -69,7 +63,6 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -94,7 +87,6 @@ public function __construct(
      * Get price value
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -127,7 +119,6 @@ public function getValue()
      * @param float $firstPrice
      * @param float $secondPrice
      * @return bool
-     * @since 2.0.0
      */
     protected function isFirstPriceBetter($firstPrice, $secondPrice)
     {
@@ -136,7 +127,6 @@ protected function isFirstPriceBetter($firstPrice, $secondPrice)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getTierPriceCount()
     {
@@ -145,7 +135,6 @@ public function getTierPriceCount()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTierPriceList()
     {
@@ -167,7 +156,6 @@ function (&$priceData) {
     /**
      * @param array $priceList
      * @return array
-     * @since 2.0.0
      */
     protected function filterTierPrices(array $priceList)
     {
@@ -207,7 +195,6 @@ protected function filterTierPrices(array $priceList)
 
     /**
      * @return float
-     * @since 2.0.0
      */
     protected function getBasePrice()
     {
@@ -218,7 +205,6 @@ protected function getBasePrice()
     /**
      * @param AmountInterface $amount
      * @return float
-     * @since 2.0.0
      */
     public function getSavePercent(AmountInterface $amount)
     {
@@ -231,7 +217,6 @@ public function getSavePercent(AmountInterface $amount)
     /**
      * @param float|string $price
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected function applyAdjustment($price)
     {
@@ -245,7 +230,6 @@ protected function applyAdjustment($price)
      * @param int $prevPriceGroup
      * @param float|string $prevQty
      * @return bool
-     * @since 2.0.0
      */
     protected function canApplyTierPrice(array $currentTierPrice, $prevPriceGroup, $prevQty)
     {
@@ -280,7 +264,6 @@ protected function canApplyTierPrice(array $currentTierPrice, $prevPriceGroup, $
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function getStoredTierPrices()
     {
@@ -315,7 +298,6 @@ protected function getStoredTierPrices()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/TierPriceInterface.php
index 89f96f1f364d7..96837e7072667 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPriceInterface.php
@@ -10,25 +10,21 @@
  * Tier price interface
  *
  * @api
- * @since 2.0.0
  */
 interface TierPriceInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTierPriceList();
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getTierPriceCount();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPercentageDiscount();
 }
diff --git a/app/code/Magento/Catalog/Pricing/Render.php b/app/code/Magento/Catalog/Pricing/Render.php
index 738310df8b5e2..9a584e46e2cae 100644
--- a/app/code/Magento/Catalog/Pricing/Render.php
+++ b/app/code/Magento/Catalog/Pricing/Render.php
@@ -18,13 +18,11 @@
  * @api
  * @method string getPriceRender()
  * @method string getPriceTypeCode()
- * @since 2.0.0
  */
 class Render extends Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -34,7 +32,6 @@ class Render extends Template
      * @param Template\Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * Produce and return block's html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -70,7 +66,6 @@ protected function _toHtml()
      * Returns saleable item instance
      *
      * @return Product
-     * @since 2.0.0
      */
     protected function getProduct()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
index d38c6f58d8b14..0722f018ae4eb 100644
--- a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
@@ -10,7 +10,6 @@
 
 /**
  * Class for configured_price rendering
- * @since 2.0.0
  */
 class ConfiguredPriceBox extends FinalPriceBox
 {
@@ -18,7 +17,6 @@ class ConfiguredPriceBox extends FinalPriceBox
      * Retrieve an item instance to the configured price model
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
index d9399a3fd244d..e3b3ec095fafd 100644
--- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
@@ -22,13 +22,12 @@
  *
  * @method bool getUseLinkForAsLowAs()
  * @method bool getDisplayMinimalPrice()
- * @since 2.0.0
  */
 class FinalPriceBox extends BasePriceBox
 {
     /**
      * @var SalableResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $salableResolver;
 
@@ -46,7 +45,7 @@ class FinalPriceBox extends BasePriceBox
      * @param array $data
      * @param SalableResolverInterface $salableResolver
      * @param MinimalPriceCalculatorInterface $minimalPriceCalculator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Context $context,
@@ -65,7 +64,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -95,7 +93,7 @@ protected function _toHtml()
      * Check is MSRP applicable for the current product.
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.4
      */
     protected function isMsrpPriceApplicable()
     {
@@ -116,7 +114,6 @@ protected function isMsrpPriceApplicable()
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function wrapResult($html)
     {
@@ -130,7 +127,6 @@ protected function wrapResult($html)
      * Render minimal amount
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderAmountMinimal()
     {
@@ -156,7 +152,6 @@ public function renderAmountMinimal()
      * Define if the special price should be shown
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasSpecialPrice()
     {
@@ -169,7 +164,6 @@ public function hasSpecialPrice()
      * Define if the minimal price should be shown
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showMinimalPrice()
     {
@@ -188,7 +182,7 @@ public function showMinimalPrice()
      * Get Key for caching block content
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getCacheKey()
     {
@@ -199,7 +193,7 @@ public function getCacheKey()
      * {@inheritdoc}
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getCacheKeyInfo()
     {
@@ -214,7 +208,7 @@ public function getCacheKeyInfo()
      * By default (if flag is not set) is false
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function isProductList()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
index 24f60e1d65aed..190168ed583fc 100644
--- a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
@@ -18,19 +18,16 @@
  *
  * @method string getPriceElementIdPrefix()
  * @method string getIdSuffix()
- * @since 2.0.0
  */
 class PriceBox extends PriceBoxRender
 {
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
@@ -43,7 +40,6 @@ class PriceBox extends PriceBoxRender
      * @param Random $mathRandom
      * @param array $data
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      *
      * @param mixed $valueToEncode
      * @return string
-     * @since 2.0.0
      */
     public function jsonEncode($valueToEncode)
     {
@@ -77,7 +72,6 @@ public function jsonEncode($valueToEncode)
      * @param int $length
      * @param string|null $chars
      * @return string
-     * @since 2.0.0
      */
     public function getRandomString($length, $chars = null)
     {
@@ -90,7 +84,6 @@ public function getRandomString($length, $chars = null)
      * @param Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanDisplayQty(Product $product)
     {
diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index 15c2e31162196..f85407a9a9d7a 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CategorySetup extends EavSetup
 {
@@ -25,7 +24,6 @@ class CategorySetup extends EavSetup
      * Category model factory
      *
      * @var CategoryFactory
-     * @since 2.0.0
      */
     private $categoryFactory;
 
@@ -47,7 +45,6 @@ class CategorySetup extends EavSetup
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
      * @param CategoryFactory $categoryFactory
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -66,7 +63,6 @@ public function __construct(
      * @param array $data
      * @return \Magento\Catalog\Model\Category
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function createCategory($data = [])
     {
@@ -78,7 +74,6 @@ public function createCategory($data = [])
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getDefaultEntities()
     {
diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php
index fd9b8ef683304..a7867dee0fa92 100644
--- a/app/code/Magento/Catalog/Setup/InstallData.php
+++ b/app/code/Magento/Catalog/Setup/InstallData.php
@@ -14,7 +14,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * Category setup factory
      *
      * @var CategorySetupFactory
-     * @since 2.0.0
      */
     private $categorySetupFactory;
 
@@ -50,7 +48,6 @@ private function getDefaultCategory()
      * Init
      *
      * @param CategorySetupFactory $categorySetupFactory
-     * @since 2.0.0
      */
     public function __construct(CategorySetupFactory $categorySetupFactory)
     {
@@ -62,7 +59,6 @@ public function __construct(CategorySetupFactory $categorySetupFactory)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Catalog/Setup/InstallSchema.php b/app/code/Magento/Catalog/Setup/InstallSchema.php
index a7216480b2440..a96f58ecc046a 100644
--- a/app/code/Magento/Catalog/Setup/InstallSchema.php
+++ b/app/code/Magento/Catalog/Setup/InstallSchema.php
@@ -12,7 +12,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
@@ -20,7 +19,6 @@ class InstallSchema implements InstallSchemaInterface
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php
index 0d0be0ea651a0..4c0c1b0246837 100644
--- a/app/code/Magento/Catalog/Setup/UpgradeData.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeData.php
@@ -14,7 +14,6 @@
  * Upgrade Data script
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -22,7 +21,6 @@ class UpgradeData implements UpgradeDataInterface
      * Category setup factory
      *
      * @var CategorySetupFactory
-     * @since 2.0.0
      */
     private $categorySetupFactory;
 
@@ -53,7 +51,6 @@ class UpgradeData implements UpgradeDataInterface
      * @param \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
      * @param UpgradeWidgetData $upgradeWidgetData
      * @param UpgradeWebsiteAttributes $upgradeWebsiteAttributes
-     * @since 2.0.0
      */
     public function __construct(
         CategorySetupFactory $categorySetupFactory,
@@ -72,7 +69,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -428,7 +424,7 @@ private function disallowUsingHtmlForProductName(ModuleDataSetupInterface $setup
     /**
      * @param CategorySetup $categorySetup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function changePriceAttributeDefaultScope($categorySetup)
     {
diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
index 8edca5616bb21..a6c9a5ec5c992 100755
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
@@ -15,14 +15,12 @@
 
 /**
  * Upgrade the Catalog module DB scheme
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -335,7 +333,6 @@ protected function addUniqueKeyToCategoryProductTable(SchemaSetupInterface $setu
      *
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     protected function createValueToEntityTable(SchemaSetupInterface $setup)
     {
@@ -399,7 +396,6 @@ protected function createValueToEntityTable(SchemaSetupInterface $setup)
      *
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     protected function addForeignKeys(SchemaSetupInterface $setup)
     {
@@ -438,7 +434,6 @@ protected function addForeignKeys(SchemaSetupInterface $setup)
     /**
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function addSupportVideoMediaAttributes(SchemaSetupInterface $setup)
     {
@@ -533,7 +528,6 @@ private function addSupportVideoMediaAttributes(SchemaSetupInterface $setup)
      * Remove Group Price
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function removeGroupPrice(SchemaSetupInterface $setup)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index 4f874a92d2581..14b35a043c5dd 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ColumnFactory
 {
     /**
      * @var \Magento\Framework\View\Element\UiComponentFactory
-     * @since 2.0.0
      */
     protected $componentFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsComponentMap = [
         'text' => 'Magento_Ui/js/grid/columns/column',
@@ -30,7 +27,6 @@ class ColumnFactory
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $dataTypeMap = [
         'default' => 'text',
@@ -43,7 +39,6 @@ class ColumnFactory
 
     /**
      * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Element\UiComponentFactory $componentFactory)
     {
@@ -55,7 +50,6 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @param array $config
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-     * @since 2.0.0
      */
     public function create($attribute, $context, array $config = [])
     {
@@ -89,7 +83,6 @@ public function create($attribute, $context, array $config = [])
     /**
      * @param string $dataType
      * @return string
-     * @since 2.0.0
      */
     protected function getJsComponent($dataType)
     {
@@ -99,7 +92,6 @@ protected function getJsComponent($dataType)
     /**
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function getDataType($attribute)
     {
@@ -113,7 +105,6 @@ protected function getDataType($attribute)
      *
      * @param string $frontendInput
      * @return string
-     * @since 2.0.0
      */
     protected function getFilterType($frontendInput)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
index 22a7edcb7d641..76e2914447ab8 100644
--- a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FilterFactory
 {
     /**
      * @var \Magento\Framework\View\Element\UiComponentFactory
-     * @since 2.0.0
      */
     protected $componentFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $filterMap = [
         'default' => 'filterInput',
@@ -31,7 +28,6 @@ class FilterFactory
 
     /**
      * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Element\UiComponentFactory $componentFactory)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @param array $config
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-     * @since 2.0.0
      */
     public function create($attribute, $context, $config = [])
     {
@@ -72,7 +67,6 @@ public function create($attribute, $context, $config = [])
     /**
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function getFilterType($attribute)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/AbstractRepository.php b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/AbstractRepository.php
index 181f799d7895f..cd96b4c64389c 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/AbstractRepository.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/AbstractRepository.php
@@ -7,26 +7,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractRepository implements RepositoryInterface
 {
     /**
      * @var null|\Magento\Catalog\Api\Data\ProductAttributeInterface[]
-     * @since 2.0.0
      */
     protected $attributes;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
@@ -38,13 +34,11 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     abstract protected function buildSearchCriteria();
 
     /**
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface[]
-     * @since 2.0.0
      */
     public function getList()
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/Repository.php b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/Repository.php
index 2b28f1b8ddde3..1bef5902ae685 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/Repository.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/Repository.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Repository extends AbstractRepository
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function buildSearchCriteria()
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/RepositoryInterface.php b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/RepositoryInterface.php
index 3b57fdf81f7f5..7294c8d2140a9 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/RepositoryInterface.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Attribute/RepositoryInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RepositoryInterface
 {
@@ -15,7 +14,6 @@ interface RepositoryInterface
      * Get attributes
      *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface[]
-     * @since 2.0.0
      */
     public function getList();
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
index 128dd90fc1fac..a316ac4843c94 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Columns extends \Magento\Ui\Component\Listing\Columns
 {
@@ -18,13 +17,11 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
 
     /**
      * @var \Magento\Catalog\Ui\Component\Listing\Attribute\RepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $filterMap = [
         'default' => 'text',
@@ -40,7 +37,6 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
      * @param \Magento\Catalog\Ui\Component\Listing\Attribute\RepositoryInterface $attributeRepository
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\UiComponent\ContextInterface $context,
@@ -56,7 +52,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -81,7 +76,6 @@ public function prepare()
      *
      * @param string $frontendInput
      * @return string
-     * @since 2.0.0
      */
     protected function getFilterType($frontendInput)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
index e3874c088bc32..b7cc46818b311 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Price extends \Magento\Ui\Component\Listing\Columns\Column
 {
@@ -21,7 +20,6 @@ class Price extends \Magento\Ui\Component\Listing\Columns\Column
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $localeCurrency;
 
@@ -32,7 +30,6 @@ class Price extends \Magento\Ui\Component\Listing\Columns\Column
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -52,7 +49,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
index e946959810c00..92474f050fa55 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
@@ -14,13 +14,11 @@
  * Class ProductActions
  *
  * @api
- * @since 2.0.0
  */
 class ProductActions extends Column
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -30,7 +28,6 @@ class ProductActions extends Column
      * @param UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
index 875262a9cf660..c4ec0aedfa6b9 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
 {
@@ -25,7 +24,6 @@ class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -45,7 +43,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -72,7 +69,6 @@ public function prepareDataSource(array $dataSource)
      * @param array $row
      *
      * @return null|string
-     * @since 2.0.0
      */
     protected function getAlt($row)
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5d66ca2253473..642ba9b967020 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Websites extends \Magento\Ui\Component\Listing\Columns\Column
 {
@@ -24,7 +23,6 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -34,7 +32,6 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      * @param StoreManagerInterface $storeManager
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -50,7 +47,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -78,7 +74,6 @@ public function prepareDataSource(array $dataSource)
     /**
      * Prepare component configuration
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddStoreFieldToCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddStoreFieldToCollection.php
index a5761bf6b258f..35962ccbfb390 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddStoreFieldToCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddStoreFieldToCollection.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AddStoreFieldToCollection implements AddFilterToCollectionInterface
 {
@@ -19,7 +18,6 @@ class AddStoreFieldToCollection implements AddFilterToCollectionInterface
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -27,7 +25,6 @@ class AddStoreFieldToCollection implements AddFilterToCollectionInterface
      * Construct
      *
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(StoreManagerInterface $storeManager)
     {
@@ -36,7 +33,6 @@ public function __construct(StoreManagerInterface $storeManager)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addFilter(Collection $collection, $field, $condition = null)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php
index 4fc58a8a87372..e1b5f59d0e322 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php
@@ -12,13 +12,11 @@
  * Class AddWebsitesFieldToCollection
  *
  * @api
- * @since 2.0.0
  */
 class AddWebsitesFieldToCollection implements AddFieldToCollectionInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addField(Collection $collection, $field, $alias = null)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index 428ef5ef26bee..e1f726d90ff11 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -45,7 +45,7 @@ class Categories extends AbstractModifier
 
     /**
      * @var array
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @since 2.1.0
      */
     protected $categoriesTrees = [];
@@ -70,7 +70,7 @@ class Categories extends AbstractModifier
 
     /**
      * @var CacheInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $cacheManager;
 
@@ -109,8 +109,8 @@ public function __construct(
      * Retrieve cache interface
      *
      * @return CacheInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getCacheManager()
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index 7b32f8a7c14f5..adba6b38c38ca 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
@@ -11,7 +11,6 @@
  * Class ProductDataProvider
  *
  * @api
- * @since 2.0.0
  */
 class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
@@ -19,19 +18,16 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * Product collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected $collection;
 
     /**
      * @var \Magento\Ui\DataProvider\AddFieldToCollectionInterface[]
-     * @since 2.0.0
      */
     protected $addFieldStrategies;
 
     /**
      * @var \Magento\Ui\DataProvider\AddFilterToCollectionInterface[]
-     * @since 2.0.0
      */
     protected $addFilterStrategies;
 
@@ -46,7 +42,6 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
      * @param array $meta
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -68,7 +63,6 @@ public function __construct(
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -89,7 +83,6 @@ public function getData()
      * @param string|array $field
      * @param string|null $alias
      * @return void
-     * @since 2.0.0
      */
     public function addField($field, $alias = null)
     {
@@ -102,7 +95,6 @@ public function addField($field, $alias = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index e820b67c6e6a6..aafd8fd696607 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
 {
@@ -25,7 +24,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attributes that should be exported
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_bannedAttributes = ['media_gallery'];
 
@@ -64,7 +62,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Pairs of attribute set ID-to-name.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attrSetIdToName = [];
 
@@ -72,7 +69,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Categories ID to text-path hash.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_categories = [];
 
@@ -80,7 +76,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Root category names for each category
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rootCategories = [];
 
@@ -88,7 +83,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [
         'status',
@@ -96,7 +90,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $collectedMultiselectsData = [];
 
@@ -104,7 +97,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [self::COL_SKU];
 
@@ -112,7 +104,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Array of supported product types as keys with appropriate model object as value.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productTypeModels = [];
 
@@ -120,7 +111,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Array of pairs store ID to its code.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIdToCode = [];
 
@@ -128,7 +118,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Website ID-to-code.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websiteIdToCode = [];
 
@@ -136,7 +125,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attribute types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeTypes = [];
 
@@ -144,7 +132,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attributes defined by user
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $userDefinedAttributes = [];
 
@@ -152,7 +140,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Product collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_entityCollectionFactory;
 
@@ -160,7 +147,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Product collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected $_entityCollection;
 
@@ -168,7 +154,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Items per page for collection limitation
      *
      * @var null
-     * @since 2.0.0
      */
     protected $_itemsPerPage = null;
 
@@ -176,67 +161,56 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Header columns for export file
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_headerColumns = [];
 
     /**
      * @var \Magento\ImportExport\Model\Export\ConfigInterface
-     * @since 2.0.0
      */
     protected $_exportConfig;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
-     * @since 2.0.0
      */
     protected $_attrSetColFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     protected $_categoryColFactory;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory
-     * @since 2.0.0
      */
     protected $_itemFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection
-     * @since 2.0.0
      */
     protected $_optionColFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_attributeColFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Export\Product\Type\Factory
-     * @since 2.0.0
      */
     protected $_typeFactory;
 
@@ -244,13 +218,11 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Provider of product link types
      *
      * @var \Magento\Catalog\Model\Product\LinkTypeProvider
-     * @since 2.0.0
      */
     protected $_linkTypeProvider;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface
-     * @since 2.0.0
      */
     protected $rowCustomizer;
 
@@ -258,7 +230,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Map between import file fields and system fields/attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fieldsMap = [
         'image' => 'base_image',
@@ -296,7 +267,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attributes codes which shows as date
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $dateAttrCodes = [
         'special_from_date',
@@ -311,7 +282,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Attributes codes which are appropriate for export and not the part of additional_attributes.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_exportMainAttrCodes = [
         self::COL_SKU,
@@ -396,7 +366,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
      * @param array $dateAttrCodes
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -446,7 +415,6 @@ public function __construct(
      * Initialize attribute sets code-to-id pairs.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initAttributeSets()
     {
@@ -461,7 +429,6 @@ protected function initAttributeSets()
      * Initialize categories ID to text-path hash.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initCategories()
     {
@@ -489,7 +456,6 @@ protected function initCategories()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     protected function initTypeModels()
     {
@@ -531,7 +497,6 @@ protected function initTypeModels()
      * Initialize website values.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initWebsites()
     {
@@ -547,7 +512,6 @@ protected function initWebsites()
      *
      * @param  int[] $productIds
      * @return array
-     * @since 2.0.0
      */
     protected function getMediaGallery(array $productIds)
     {
@@ -600,7 +564,6 @@ protected function getMediaGallery(array $productIds)
      *
      * @param  int[] $productIds
      * @return array
-     * @since 2.0.0
      */
     protected function prepareCatalogInventory(array $productIds)
     {
@@ -635,7 +598,6 @@ protected function prepareCatalogInventory(array $productIds)
      *
      * @param  int[] $productIds
      * @return array
-     * @since 2.0.0
      */
     protected function prepareLinks(array $productIds)
     {
@@ -705,7 +667,6 @@ protected function prepareLinks(array $productIds)
      * @param array &$rowCategories
      * @param int $productId
      * @return bool
-     * @since 2.0.0
      */
     protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $productId)
     {
@@ -728,7 +689,6 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function _getHeaderColumns()
     {
@@ -741,7 +701,6 @@ public function _getHeaderColumns()
      * @param array $customOptionsData
      * @param array $stockItemRows
      * @return void
-     * @since 2.0.0
      */
     protected function setHeaderColumns($customOptionsData, $stockItemRows)
     {
@@ -783,7 +742,6 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
      * Get attributes codes which are appropriate for export and not the part of additional_attributes.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getExportMainAttrCodes()
     {
@@ -792,7 +750,6 @@ protected function _getExportMainAttrCodes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getEntityCollection($resetCollection = false)
     {
@@ -806,7 +763,6 @@ protected function _getEntityCollection($resetCollection = false)
      * Get items per page
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getItemsPerPage()
     {
@@ -857,7 +813,6 @@ protected function getItemsPerPage()
      * @param int $page
      * @param int $pageSize
      * @return void
-     * @since 2.0.0
      */
     protected function paginateCollection($page, $pageSize)
     {
@@ -868,7 +823,6 @@ protected function paginateCollection($page, $pageSize)
      * Export process
      *
      * @return string
-     * @since 2.0.0
      */
     public function export()
     {
@@ -928,7 +882,6 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function getExportData()
     {
@@ -968,7 +921,6 @@ protected function getExportData()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function collectRawData()
     {
@@ -1071,7 +1023,7 @@ protected function collectRawData()
      *
      * @param string|array $value
      * @return string|array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function wrapValue($value)
     {
@@ -1088,7 +1040,6 @@ private function wrapValue($value)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function collectMultirawData()
     {
@@ -1132,7 +1083,6 @@ protected function collectMultirawData()
      * @param \Magento\Catalog\Model\Product $item
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function hasMultiselectData($item, $storeId)
     {
@@ -1145,7 +1095,6 @@ protected function hasMultiselectData($item, $storeId)
      * @param string $attrCode
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function collectMultiselectValues($item, $attrCode, $storeId)
     {
@@ -1169,7 +1118,6 @@ protected function collectMultiselectValues($item, $attrCode, $storeId)
      * @param string $code
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidAttributeValue($code, $value)
     {
@@ -1299,7 +1247,6 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
      * @param array $dataRow
      * @param array $multiRawData
      * @return array
-     * @since 2.0.0
      */
     protected function addMultirowData($dataRow, $multiRawData)
     {
@@ -1313,7 +1260,6 @@ protected function addMultirowData($dataRow, $multiRawData)
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _customFieldsMapping($rowData)
     {
@@ -1332,7 +1278,6 @@ protected function _customFieldsMapping($rowData)
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _customHeadersMapping($rowData)
     {
@@ -1347,7 +1292,6 @@ protected function _customHeadersMapping($rowData)
     /**
      * @param array $option
      * @return string
-     * @since 2.0.0
      */
     protected function optionRowToCellString($option)
     {
@@ -1365,7 +1309,6 @@ protected function optionRowToCellString($option)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function getCustomOptionsData($productIds)
     {
@@ -1437,7 +1380,6 @@ protected function getCustomOptionsData($productIds)
      *
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection)
     {
@@ -1472,7 +1414,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
      * Entity attributes collection getter.
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getAttributeCollection()
     {
@@ -1483,7 +1424,6 @@ public function getAttributeCollection()
      * EAV entity type code getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -1494,7 +1434,6 @@ public function getEntityTypeCode()
      * Initialize attribute option values and types.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initAttributes()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php
index 80f9a6020150e..67ae877f7a620 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php
@@ -11,7 +11,6 @@
  * Export entity product type abstract model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractType
 {
@@ -19,7 +18,6 @@ abstract class AbstractType
      * Overridden attributes parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeOverrides = [];
 
@@ -27,7 +25,6 @@ abstract class AbstractType
      * Array of attributes codes which are disabled for export.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_disabledAttrs = [];
 
@@ -35,7 +32,6 @@ abstract class AbstractType
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
@@ -43,7 +39,6 @@ abstract class AbstractType
      * Return disabled attributes codes.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDisabledAttrs()
     {
@@ -54,7 +49,6 @@ public function getDisabledAttrs()
      * Get attribute codes with index (not label) value.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getIndexValueAttributes()
     {
@@ -65,7 +59,6 @@ public function getIndexValueAttributes()
      * Additional check for model availability. If method returns FALSE - model is not suitable for data processing.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSuitable()
     {
@@ -77,7 +70,6 @@ public function isSuitable()
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function overrideAttribute(Attribute $attribute)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Factory.php b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Factory.php
index 71af24bed919f..bd395d5df1663 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Factory.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Export\Product\Type\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php
index fd8c80cb76c6c..a0a0c68042f35 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php
@@ -9,7 +9,6 @@
  * Export entity product type simple model
  *
  * @api
- * @since 2.0.0
  */
 class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
 {
@@ -17,7 +16,6 @@ class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\Abst
      * Overridden attributes parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeOverrides = [
         'has_options' => ['source_model' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class],
@@ -30,7 +28,6 @@ class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\Abst
      * Array of attributes codes which are disabled for export.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_disabledAttrs = [
         'old_id',
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php b/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php
index 47a6a24bf3d28..17e2a7e857529 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php
@@ -12,26 +12,22 @@
  * Class Composite
  *
  * @api
- * @since 2.0.0
  */
 class Composite implements RowCustomizerInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $customizers;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param array $customizers
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, $customizers = [])
     {
@@ -45,7 +41,6 @@ public function __construct(ObjectManagerInterface $objectManager, $customizers
      * @param mixed $collection
      * @param int[] $productIds
      * @return mixed|void
-     * @since 2.0.0
      */
     public function prepareData($collection, $productIds)
     {
@@ -59,7 +54,6 @@ public function prepareData($collection, $productIds)
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     public function addHeaderColumns($columns)
     {
@@ -75,7 +69,6 @@ public function addHeaderColumns($columns)
      * @param array $dataRow
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function addData($dataRow, $productId)
     {
@@ -91,7 +84,6 @@ public function addData($dataRow, $productId)
      * @param array $additionalRowsCount
      * @param int $productId
      * @return array|mixed
-     * @since 2.0.0
      */
     public function getAdditionalRowsCount($additionalRowsCount, $productId)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php b/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php
index ab8b6f0ff113e..2720281ab7304 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php
@@ -9,7 +9,6 @@
  * Interface RowCustomizerInterface
  *
  * @api
- * @since 2.0.0
  */
 interface RowCustomizerInterface
 {
@@ -19,7 +18,6 @@ interface RowCustomizerInterface
      * @param mixed $collection
      * @param int[] $productIds
      * @return mixed
-     * @since 2.0.0
      */
     public function prepareData($collection, $productIds);
 
@@ -28,7 +26,6 @@ public function prepareData($collection, $productIds);
      *
      * @param array $columns
      * @return mixed
-     * @since 2.0.0
      */
     public function addHeaderColumns($columns);
 
@@ -38,7 +35,6 @@ public function addHeaderColumns($columns);
      * @param array $dataRow
      * @param int $productId
      * @return mixed
-     * @since 2.0.0
      */
     public function addData($dataRow, $productId);
 
@@ -48,7 +44,6 @@ public function addData($dataRow, $productId);
      * @param array $additionalRowsCount
      * @param int $productId
      * @return mixed
-     * @since 2.0.0
      */
     public function getAdditionalRowsCount($additionalRowsCount, $productId);
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index f30ba62ad27b1..8280cdcdb6f30 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -28,7 +28,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @codingStandardsIgnoreFile
- * @since 2.0.0
  */
 class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 {
@@ -158,7 +157,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Attribute cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeCache = [];
 
@@ -166,7 +164,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Pairs of attribute set ID-to-name.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attrSetIdToName = [];
 
@@ -174,30 +171,29 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Pairs of attribute set name-to-ID.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attrSetNameToId = [];
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $mediaGalleryTableName;
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $mediaGalleryValueTableName;
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $mediaGalleryEntityToValueTableName;
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $productEntityTableName;
 
@@ -205,7 +201,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [
         'status',
@@ -216,7 +211,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Links attribute name-to-link type ID.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_linkNameToId = [
         '_related_' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED,
@@ -228,7 +222,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Attributes codes which shows as date
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $dateAttrCodes = [
         'special_from_date',
@@ -243,7 +237,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Need to log in import history
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $logInHistory = true;
 
@@ -251,7 +244,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Attribute id for product images storage.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_mediaGalleryAttributeId = null;
 
@@ -259,7 +251,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [
         ValidatorInterface::ERROR_INVALID_SCOPE => 'Invalid value in Scope column',
@@ -302,7 +293,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Map between import file fields and system fields/attributes.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fieldsMap = [
         'image' => 'base_image',
@@ -350,7 +340,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_oldSku = [];
 
@@ -358,7 +347,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [
         self::COL_STORE,
@@ -401,7 +389,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $defaultStockData = [
         'manage_stock' => 1,
@@ -435,7 +422,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * of media gallery items.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_imagesArrayKeys = ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image'];
 
@@ -443,7 +429,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [self::COL_SKU];
 
@@ -451,7 +436,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Array of supported product types as keys with appropriate model object as value.
      *
      * @var \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType[]
-     * @since 2.0.0
      */
     protected $_productTypeModels = [];
 
@@ -459,7 +443,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Media files uploader
      *
      * @var \Magento\CatalogImportExport\Model\Import\Uploader
-     * @since 2.0.0
      */
     protected $_fileUploader;
 
@@ -467,7 +450,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Import entity which provide import of product custom options
      *
      * @var \Magento\CatalogImportExport\Model\Import\Product\Option
-     * @since 2.0.0
      */
     protected $_optionEntity;
 
@@ -475,25 +457,21 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface
-     * @since 2.0.0
      */
     protected $stockStateProvider;
 
@@ -501,140 +479,121 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\ImportExport\Model\Import\Config
-     * @since 2.0.0
      */
     protected $_importConfig;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory
-     * @since 2.0.0
      */
     protected $_resourceFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $_setColFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\Type\Factory
-     * @since 2.0.0
      */
     protected $_productTypeFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $_linkFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory
-     * @since 2.0.0
      */
     protected $_proxyProdFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\UploaderFactory
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory
-     * @since 2.0.0
      */
     protected $_stockResItemFac;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var Product\StoreResolver
-     * @since 2.0.0
      */
     protected $storeResolver;
 
     /**
      * @var Product\SkuProcessor
-     * @since 2.0.0
      */
     protected $skuProcessor;
 
     /**
      * @var Product\CategoryProcessor
-     * @since 2.0.0
      */
     protected $categoryProcessor;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Catalog\Model\Product\Url
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $productUrl;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $websitesCache = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $categoriesCache = [];
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $productUrlSuffix = [];
 
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $productUrlKeys = [];
 
@@ -642,13 +601,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Instance of product tax class processor.
      *
      * @var Product\TaxClassProcessor
-     * @since 2.0.0
      */
     protected $taxClassProcessor;
 
     /**
      * @var Product\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -656,31 +613,26 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Array of validated rows.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $validatedRows;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     private $_logger;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $masterAttributeCode = 'sku';
 
     /**
      * @var ObjectRelationProcessor
-     * @since 2.0.0
      */
     protected $objectRelationProcessor;
 
     /**
      * @var TransactionManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
@@ -688,7 +640,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Flag for replace operation.
      *
      * @var null
-     * @since 2.0.0
      */
     protected $_replaceFlag = null;
 
@@ -696,19 +647,18 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Flag for replace operation.
      *
      * @var null
-     * @since 2.0.0
      */
     protected $cachedImages = null;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $urlKeys = [];
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $rowNumbers = [];
 
@@ -732,7 +682,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Escaped separator value for regular expression.
      * The value is based on PSEUDO_MULTI_LINE_SEPARATOR constant.
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $multiLineSeparatorForRegexp;
 
@@ -794,7 +744,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -899,7 +848,6 @@ public function __construct(
      * @param array $rowData Row data
      * @param int $rowNum
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeValid($attrCode, array $attrParams, array $rowData, $rowNum)
     {
@@ -916,7 +864,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
      *
      * Multiple value separator getter.
      * @return string
-     * @since 2.0.0
      */
     public function getMultipleValueSeparator()
     {
@@ -930,7 +877,6 @@ public function getMultipleValueSeparator()
      * Retrieve instance of product custom options import entity
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Option
-     * @since 2.0.0
      */
     public function getOptionEntity()
     {
@@ -941,7 +887,6 @@ public function getOptionEntity()
      * Retrieve id of media gallery attribute.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMediaGalleryAttributeId()
     {
@@ -956,7 +901,6 @@ public function getMediaGalleryAttributeId()
     /**
      * @param string $name
      * @return Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function retrieveProductTypeByName($name)
     {
@@ -971,7 +915,6 @@ public function retrieveProductTypeByName($name)
      *
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $params)
     {
@@ -985,7 +928,6 @@ public function setParameters(array $params)
      * Delete products for replacement.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function deleteProductsForReplacement()
     {
@@ -1003,7 +945,6 @@ public function deleteProductsForReplacement()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _deleteProducts()
     {
@@ -1053,7 +994,6 @@ protected function _deleteProducts()
      * @throws \Exception
      * @return bool Result of operation.
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -1074,7 +1014,6 @@ protected function _importData()
      * Replace imported products.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _replaceProducts()
     {
@@ -1094,7 +1033,6 @@ protected function _replaceProducts()
      * Save products data.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveProductsData()
     {
@@ -1116,7 +1054,6 @@ protected function _saveProductsData()
      * Initialize attribute sets code-to-id pairs.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributeSets()
     {
@@ -1131,7 +1068,6 @@ protected function _initAttributeSets()
      * Initialize existent product SKUs.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSkus()
     {
@@ -1145,7 +1081,6 @@ protected function _initSkus()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initTypeModels()
     {
@@ -1181,7 +1116,6 @@ protected function _initTypeModels()
 
     /**
      * Initialize Product error templates
-     * @since 2.0.0
      */
     protected function _initErrorTemplates()
     {
@@ -1196,7 +1130,6 @@ protected function _initErrorTemplates()
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRowForDb(array $rowData)
     {
@@ -1229,7 +1162,6 @@ protected function _prepareRowForDb(array $rowData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _saveLinks()
     {
@@ -1362,7 +1294,6 @@ protected function _saveLinks()
      *
      * @param array $attributesData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveProductAttributes(array $attributesData)
     {
@@ -1397,7 +1328,6 @@ protected function _saveProductAttributes(array $attributesData)
      *
      * @param array $categoriesData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveProductCategories(array $categoriesData)
     {
@@ -1478,7 +1408,7 @@ public function saveProductEntity(array $entityRowsIn, array $entityRowsUp)
     /**
      * Return additional data, needed to select.
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getOldSkuFieldsForSelect()
     {
@@ -1489,7 +1419,7 @@ private function getOldSkuFieldsForSelect()
      * Adds newly created products to _oldSku
      * @param array $newProducts
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function updateOldSku(array $newProducts)
     {
@@ -1527,7 +1457,7 @@ private function getNewSkuFieldsForSelect()
     /**
      * Init media gallery resources
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected function initMediaGalleryResources()
     {
@@ -1548,7 +1478,6 @@ protected function initMediaGalleryResources()
      *
      * @param array $bunch
      * @return array
-     * @since 2.0.0
      */
     protected function getExistingImages($bunch)
     {
@@ -1599,7 +1528,6 @@ protected function getExistingImages($bunch)
     /**
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     public function getImagesFromRow(array $rowData)
     {
@@ -1635,7 +1563,6 @@ public function getImagesFromRow(array $rowData)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _saveProducts()
     {
@@ -1965,7 +1892,6 @@ protected function _saveProducts()
     /**
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function processRowCategories($rowData)
     {
@@ -1993,7 +1919,6 @@ protected function processRowCategories($rowData)
     /**
      * @param string $productSku
      * @return array
-     * @since 2.0.0
      */
     public function getProductWebsites($productSku)
     {
@@ -2003,7 +1928,6 @@ public function getProductWebsites($productSku)
     /**
      * @param string $productSku
      * @return array
-     * @since 2.0.0
      */
     public function getProductCategories($productSku)
     {
@@ -2013,7 +1937,6 @@ public function getProductCategories($productSku)
     /**
      * @param string $storeCode
      * @return array|int|null|string
-     * @since 2.0.0
      */
     public function getStoreIdByCode($storeCode)
     {
@@ -2028,7 +1951,6 @@ public function getStoreIdByCode($storeCode)
      *
      * @param array $tierPriceData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveProductTierPrices(array $tierPriceData)
     {
@@ -2068,7 +1990,6 @@ protected function _saveProductTierPrices(array $tierPriceData)
      *
      * @return \Magento\CatalogImportExport\Model\Import\Uploader
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getUploader()
     {
@@ -2109,7 +2030,6 @@ protected function _getUploader()
     /**
      * @return Uploader
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getUploader()
     {
@@ -2122,7 +2042,6 @@ public function getUploader()
      *
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     protected function uploadMediaFiles($fileName, $renameFileOff = false)
     {
@@ -2157,7 +2076,6 @@ private function getSystemFile($fileName)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _saveMediaGallery(array $mediaGalleryData)
     {
@@ -2253,7 +2171,6 @@ protected function _saveMediaGallery(array $mediaGalleryData)
      *
      * @param array $websiteData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveProductWebsites(array $websiteData)
     {
@@ -2291,7 +2208,6 @@ protected function _saveProductWebsites(array $websiteData)
      * Stock item saving.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveStockItem()
     {
@@ -2380,7 +2296,6 @@ private function reindexProducts($productIdsToReindex = [])
      *
      * @param string $attrCode
      * @return mixed
-     * @since 2.0.0
      */
     public function retrieveAttributeByCode($attrCode)
     {
@@ -2398,7 +2313,6 @@ public function retrieveAttributeByCode($attrCode)
      * Attribute set ID-to-name pairs getter.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttrSetIdToName()
     {
@@ -2409,7 +2323,6 @@ public function getAttrSetIdToName()
      * DB connection getter.
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -2421,7 +2334,6 @@ public function getConnection()
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -2436,7 +2348,6 @@ public function getEntityTypeCode()
      *
      * @var string $sku
      * @return array
-     * @since 2.0.0
      */
     public function getNewSku($sku = null)
     {
@@ -2447,7 +2358,6 @@ public function getNewSku($sku = null)
      * Get next bunch of validated rows.
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getNextBunch()
     {
@@ -2461,7 +2371,6 @@ public function getNextBunch()
      * new products with the same SKU in different letter cases.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOldSku()
     {
@@ -2472,7 +2381,6 @@ public function getOldSku()
      * Retrieve Category Processor
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor
-     * @since 2.0.0
      */
     public function getCategoryProcessor()
     {
@@ -2484,7 +2392,6 @@ public function getCategoryProcessor()
      *
      * @param array $rowData
      * @return int
-     * @since 2.0.0
      */
     public function getRowScope(array $rowData)
     {
@@ -2503,7 +2410,6 @@ public function getRowScope(array $rowData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function validateRow(array $rowData, $rowNum)
     {
@@ -2638,7 +2544,7 @@ public function validateRow(array $rowData, $rowNum)
     /**
      * @param array $rowData
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private function isNeedToValidateUrlKey($rowData)
     {
@@ -2673,7 +2579,6 @@ private function prepareNewSkuData($sku)
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     private function _parseAdditionalAttributes($rowData)
     {
@@ -2695,7 +2600,7 @@ private function _parseAdditionalAttributes($rowData)
      *
      * @param string $additionalAttributes Attributes data that will be parsed
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function parseAdditionalAttributes($additionalAttributes)
     {
@@ -2716,7 +2621,7 @@ private function parseAdditionalAttributes($additionalAttributes)
      * @param string $attributesData Attributes data that will be parsed. It keeps data in format:
      *      code=value,code2=value2...,codeN=valueN
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function parseAttributesWithoutWrappedValues($attributesData)
     {
@@ -2756,7 +2661,7 @@ private function parseAttributesWithoutWrappedValues($attributesData)
      *  E.g. attribute with code 'attr_code' has value 'my"value'. This data should be stored as attr_code="my""value"
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function parseAttributesWithWrappedValues($attributesData)
     {
@@ -2781,7 +2686,7 @@ private function parseAttributesWithWrappedValues($attributesData)
      * @param string $values
      * @param string $delimiter
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_LINE_SEPARATOR)
     {
@@ -2800,7 +2705,7 @@ public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_
      * Retrieves escaped PSEUDO_MULTI_LINE_SEPARATOR if it is metacharacter for regular expression
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getMultiLineSeparatorForRegexp()
     {
@@ -2818,7 +2723,6 @@ private function getMultiLineSeparatorForRegexp()
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     private function _setStockUseConfigFieldsValues($rowData)
     {
@@ -2843,7 +2747,6 @@ private function _setStockUseConfigFieldsValues($rowData)
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     private function _customFieldsMapping($rowData)
     {
@@ -2872,7 +2775,6 @@ private function _customFieldsMapping($rowData)
      * Validate data rows and save bunches to DB
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveValidatedBunches()
     {
@@ -2904,7 +2806,7 @@ protected function _saveValidatedBunches()
      * Check that url_keys are not assigned to other products in DB
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function checkUrlKeyDuplicates()
     {
@@ -2933,7 +2835,7 @@ protected function checkUrlKeyDuplicates()
      *
      * @param int $storeId
      * @return string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function getProductUrlSuffix($storeId = null)
     {
@@ -2950,7 +2852,7 @@ protected function getProductUrlSuffix($storeId = null)
     /**
      * @param array $rowData
      * @return string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function getUrlKey($rowData)
     {
@@ -2967,7 +2869,7 @@ protected function getUrlKey($rowData)
 
     /**
      * @return Proxy\Product\ResourceModel
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function getResource()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
index 43fdb03aa4b9d..8c55f28a586ec 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -9,7 +9,6 @@
  * Class CategoryProcessor
  *
  * @api
- * @since 2.0.0
  */
 class CategoryProcessor
 {
@@ -20,7 +19,6 @@ class CategoryProcessor
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @since 2.0.0
      */
     protected $categoryColFactory;
 
@@ -28,7 +26,6 @@ class CategoryProcessor
      * Categories text-path to ID hash.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $categories = [];
 
@@ -36,7 +33,6 @@ class CategoryProcessor
      * Categories id to object cache.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $categoriesCache = [];
 
@@ -44,7 +40,6 @@ class CategoryProcessor
      * Instance of catalog category factory.
      *
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
@@ -59,7 +54,6 @@ class CategoryProcessor
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryColFactory
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryColFactory,
@@ -72,7 +66,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function initCategories()
     {
@@ -110,7 +103,6 @@ protected function initCategories()
      * @param int $parentId
      *
      * @return int
-     * @since 2.0.0
      */
     protected function createCategory($name, $parentId)
     {
@@ -137,7 +129,6 @@ protected function createCategory($name, $parentId)
      * @param string $categoryPath
      *
      * @return int
-     * @since 2.0.0
      */
     protected function upsertCategory($categoryPath)
     {
@@ -169,7 +160,6 @@ protected function upsertCategory($categoryPath)
      * @param string $categoriesSeparator
      *
      * @return array
-     * @since 2.0.0
      */
     public function upsertCategories($categoriesString, $categoriesSeparator)
     {
@@ -235,7 +225,6 @@ public function clearFailedCategories()
      * @param int $categoryId
      *
      * @return \Magento\Catalog\Model\Category|null
-     * @since 2.0.0
      */
     public function getCategoryById($categoryId)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 146b4142d68bf..22306f727ed4e 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -21,7 +21,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 {
@@ -67,7 +66,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * All stores code-ID pairs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeCodeToId = [];
 
@@ -75,7 +73,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * List of products sku-ID pairs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productsSkuToId = [];
 
@@ -83,7 +80,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Instance of import/export resource helper
      *
      * @var \Magento\ImportExport\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -91,7 +87,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Flag for global prices property
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPriceGlobal;
 
@@ -99,7 +94,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * List of specific custom option types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_specificTypes = [
         'date' => ['price', 'sku'],
@@ -118,7 +112,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Keep product id value for every row which will be imported
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_rowProductId;
 
@@ -126,7 +119,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Keep product sku value for every row during validation
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_rowProductSku;
 
@@ -134,7 +126,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Keep store id value for every row which will be imported
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_rowStoreId;
 
@@ -142,7 +133,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Keep information about row status
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_rowIsMain;
 
@@ -150,7 +140,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Keep type value for every row which will be imported
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_rowType;
 
@@ -158,7 +147,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Product model instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_productModel;
 
@@ -166,7 +154,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * DB data source model
      *
      * @var \Magento\ImportExport\Model\ResourceModel\Import\Data
-     * @since 2.0.0
      */
     protected $_dataSourceModel;
 
@@ -174,7 +161,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * DB connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -182,7 +168,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Custom options tables
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_tables = [
         'catalog_product_entity' => null,
@@ -198,7 +183,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Parent import product entity
      *
      * @var \Magento\CatalogImportExport\Model\Import\Product
-     * @since 2.0.0
      */
     protected $_productEntity;
 
@@ -206,7 +190,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Existing custom options data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_oldCustomOptions;
 
@@ -214,7 +197,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * New custom options data for existing products
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_newOptionsOldData = [];
 
@@ -222,7 +204,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * New custom options data for not existing products
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_newOptionsNewData = [];
 
@@ -230,7 +211,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * New custom options counter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_newCustomOptionId = 0;
 
@@ -238,7 +218,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Product options collection
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection
-     * @since 2.0.0
      */
     protected $_optionCollection;
 
@@ -269,19 +248,13 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**#@-*/
 
-    /**
-     * Collection by pages iterator
-     *
-     * @var \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_byPagesIterator;
 
     /**
      * Number of items to fetch from db in one query
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pageSize;
 
@@ -289,7 +262,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -297,49 +269,41 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\ImportExport\Model\ImportFactory
-     * @since 2.0.0
      */
     protected $_importFactory;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_optionColFactory;
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory
-     * @since 2.0.0
      */
     protected $_colIteratorFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -375,7 +339,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ImportExport\Model\ResourceModel\Import\Data $importData,
@@ -439,7 +402,6 @@ public function __construct(
      * Initialization of error message templates
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessageTemplates()
     {
@@ -494,7 +456,6 @@ protected function _initMessageTemplates()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTables(array $data)
     {
@@ -516,7 +477,6 @@ protected function _initTables(array $data)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _initStores(array $data)
     {
@@ -537,7 +497,6 @@ protected function _initStores(array $data)
      * @param array $data
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initSourceEntities(array $data)
     {
@@ -581,7 +540,6 @@ protected function _initSourceEntities(array $data)
      * Load exiting custom options data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initOldCustomOptions()
     {
@@ -631,7 +589,6 @@ protected function _initOldCustomOptions()
      * Imported entity type code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -645,7 +602,6 @@ public function getEntityTypeCode()
      * - custom options with the same name have different data types.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validateAmbiguousData()
     {
@@ -673,7 +629,6 @@ public function validateAmbiguousData()
      * Find options with the same titles for input data
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _findNewOptionsWithTheSameTitles()
     {
@@ -692,7 +647,6 @@ protected function _findNewOptionsWithTheSameTitles()
      *
      * @param array $sourceProductData
      * @return array
-     * @since 2.0.0
      */
     protected function _getNewOptionsWithTheSameTitlesErrorRows(array $sourceProductData)
     {
@@ -721,7 +675,6 @@ protected function _getNewOptionsWithTheSameTitlesErrorRows(array $sourceProduct
      * Find options with the same titles in DB
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _findOldOptionsWithTheSameTitles()
     {
@@ -755,7 +708,6 @@ protected function _findOldOptionsWithTheSameTitles()
      * Find source file options, which have analogs in DB with the same name, but with different type
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _findNewOldOptionsTypeMismatch()
     {
@@ -787,7 +739,6 @@ protected function _findNewOldOptionsTypeMismatch()
      * @param array $newOptionData
      * @param array $newOptionTitles
      * @return bool|int
-     * @since 2.0.0
      */
     protected function _findExistingOptionId(array $newOptionData, array $newOptionTitles)
     {
@@ -811,7 +762,6 @@ protected function _findExistingOptionId(array $newOptionData, array $newOptionT
      * @param string $errorCode
      * @param array $errorNumbers
      * @return void
-     * @since 2.0.0
      */
     protected function _addRowsErrors($errorCode, array $errorNumbers)
     {
@@ -826,7 +776,6 @@ protected function _addRowsErrors($errorCode, array $errorNumbers)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateMainRow(array $rowData, $rowNumber)
     {
@@ -862,7 +811,6 @@ protected function _validateMainRow(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateMainRowAdditionalData(array $rowData, $rowNumber)
     {
@@ -880,7 +828,6 @@ protected function _validateMainRowAdditionalData(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return void
-     * @since 2.0.0
      */
     protected function _saveNewOptionData(array $rowData, $rowNumber)
     {
@@ -942,7 +889,6 @@ protected function _saveNewOptionData(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateSecondaryRow(array $rowData, $rowNumber)
     {
@@ -976,7 +922,6 @@ protected function _validateSecondaryRow(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function validateRow(array $rowData, $rowNumber)
     {
@@ -1015,7 +960,6 @@ public function validateRow(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateSpecificTypeParameters(array $rowData, $rowNumber)
     {
@@ -1043,7 +987,6 @@ protected function _validateSpecificTypeParameters(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateSpecificParameterData($typeParameter, array $rowData, $rowNumber)
     {
@@ -1067,7 +1010,6 @@ protected function _validateSpecificParameterData($typeParameter, array $rowData
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function _isRowWithCustomOption(array $rowData)
     {
@@ -1081,7 +1023,6 @@ protected function _isRowWithCustomOption(array $rowData)
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function _isMainOptionRow(array $rowData)
     {
@@ -1093,7 +1034,6 @@ protected function _isMainOptionRow(array $rowData)
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSecondaryOptionRow(array $rowData)
     {
@@ -1107,7 +1047,6 @@ protected function _isSecondaryOptionRow(array $rowData)
      * @param array &$titles
      * @param array $typeValues
      * @return bool
-     * @since 2.0.0
      */
     protected function _isReadyForSaving(array &$options, array &$titles, array $typeValues)
     {
@@ -1131,7 +1070,6 @@ protected function _isReadyForSaving(array &$options, array &$titles, array $typ
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _getMultiRowFormat($rowData)
     {
@@ -1229,7 +1167,6 @@ private function addFileOptions($result, $optionRow)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -1325,7 +1262,6 @@ protected function _importData()
      * Load data of existed products
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initProductsSku()
     {
@@ -1351,7 +1287,6 @@ protected function _initProductsSku()
      * @param array &$products
      * @param array &$prices
      * @return array|null
-     * @since 2.0.0
      */
     protected function _collectOptionMainData(
         array $rowData,
@@ -1399,7 +1334,6 @@ protected function _collectOptionMainData(
      * @param array &$childCount
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _collectOptionTypeData(
         array $rowData,
@@ -1462,7 +1396,6 @@ protected function _collectOptionTypeData(
      * @param int $prevOptionId
      * @param array &$titles
      * @return void
-     * @since 2.0.0
      */
     protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$titles)
     {
@@ -1484,7 +1417,6 @@ protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$ti
      * @param array &$prices
      * @param array &$typeValues
      * @return $this
-     * @since 2.0.0
      */
     protected function _compareOptionsWithExisting(array &$options, array &$titles, array &$prices, array &$typeValues)
     {
@@ -1513,7 +1445,6 @@ protected function _compareOptionsWithExisting(array &$options, array &$titles,
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function _parseRequiredData(array $rowData)
     {
@@ -1556,7 +1487,6 @@ protected function _parseRequiredData(array $rowData)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     protected function _isRowHasSpecificType($type)
     {
@@ -1573,7 +1503,6 @@ protected function _isRowHasSpecificType($type)
      * @param array $rowData
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     protected function _getProductData(array $rowData, $productId)
     {
@@ -1599,7 +1528,6 @@ protected function _getProductData(array $rowData, $productId)
      * @param int $optionId
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptionData(array $rowData, $productId, $optionId, $type)
     {
@@ -1638,7 +1566,6 @@ protected function _getOptionData(array $rowData, $productId, $optionId, $type)
      * @param int $optionId
      * @param string $type
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _getPriceData(array $rowData, $optionId, $type)
     {
@@ -1677,7 +1604,6 @@ protected function _getPriceData(array $rowData, $optionId, $type)
      * @param bool $defaultStore
      * @return array|false
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultStore = true)
     {
@@ -1710,7 +1636,6 @@ protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultS
      *
      * @param array $productIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteEntities(array $productIds)
     {
@@ -1727,7 +1652,6 @@ protected function _deleteEntities(array $productIds)
      *
      * @param array $optionIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteSpecificTypeValues(array $optionIds)
     {
@@ -1744,7 +1668,6 @@ protected function _deleteSpecificTypeValues(array $optionIds)
      *
      * @param array $options Options data
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveOptions(array $options)
     {
@@ -1758,7 +1681,6 @@ protected function _saveOptions(array $options)
      *
      * @param array $titles Option titles data
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveTitles(array $titles)
     {
@@ -1784,7 +1706,6 @@ protected function _saveTitles(array $titles)
      *
      * @param array $prices Option prices data
      * @return $this
-     * @since 2.0.0
      */
     protected function _savePrices(array $prices)
     {
@@ -1804,7 +1725,6 @@ protected function _savePrices(array $prices)
      *
      * @param array $typeValues Option type values
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveSpecificTypeValues(array $typeValues)
     {
@@ -1829,7 +1749,6 @@ protected function _saveSpecificTypeValues(array $typeValues)
      *
      * @param array $typePrices option type prices
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveSpecificTypePrices(array $typePrices)
     {
@@ -1857,7 +1776,6 @@ protected function _saveSpecificTypePrices(array $typePrices)
      *
      * @param array $typeTitles Option type titles
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveSpecificTypeTitles(array $typeTitles)
     {
@@ -1887,7 +1805,6 @@ protected function _saveSpecificTypeTitles(array $typeTitles)
      *
      * @param array $data Product data which will be updated
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateProducts(array $data)
     {
@@ -1908,7 +1825,6 @@ protected function _updateProducts(array $data)
      * @param array $rowData
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
      protected function _parseCustomOptions($rowData)
     {
@@ -1951,7 +1867,6 @@ protected function _parseCustomOptions($rowData)
      * Clear product sku to id array.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearProductsSkuToId()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
index 3199d835ce433..8cd3d168c771a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
@@ -9,7 +9,6 @@
  * Interface RowValidatorInterface
  *
  * @api
- * @since 2.0.0
  */
 interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorInterface
 {
@@ -95,7 +94,6 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
      *
      * @param \Magento\CatalogImportExport\Model\Import\Product $context
      * @return $this
-     * @since 2.0.0
      */
     public function init($context);
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
index 77280155c05ee..fb4b790fd5f43 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
@@ -9,19 +9,16 @@
  * Class SkuProcessor
  *
  * @api
- * @since 2.0.0
  */
 class SkuProcessor
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $oldSkus;
 
@@ -36,13 +33,11 @@ class SkuProcessor
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $newSkus;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $productTypeModels;
 
@@ -72,7 +67,6 @@ class SkuProcessor
 
     /**
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory
@@ -83,7 +77,6 @@ public function __construct(
     /**
      * @param array $typeModels
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeModels($typeModels)
     {
@@ -95,7 +88,6 @@ public function setTypeModels($typeModels)
      * Get old skus array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOldSkus()
     {
@@ -109,7 +101,6 @@ public function getOldSkus()
      * Reload old skus.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reloadOldSkus()
     {
@@ -122,7 +113,6 @@ public function reloadOldSkus()
      * @param string $sku
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function addNewSku($sku, $data)
     {
@@ -136,7 +126,6 @@ public function addNewSku($sku, $data)
      * @param string $key
      * @param mixed $data
      * @return $this
-     * @since 2.0.0
      */
     public function setNewSkuData($sku, $key, $data)
     {
@@ -150,7 +139,6 @@ public function setNewSkuData($sku, $key, $data)
     /**
      * @param null|string $sku
      * @return array|null
-     * @since 2.0.0
      */
     public function getNewSku($sku = null)
     {
@@ -165,7 +153,6 @@ public function getNewSku($sku = null)
      * Get skus data.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSkus()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index fef2fff2d05c4..2d70d9b1daf21 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
  *
- * @since 2.0.0
  */
 class StoreResolver
 {
@@ -16,7 +15,6 @@ class StoreResolver
      * Store manager instance.
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -24,7 +22,6 @@ class StoreResolver
      * Website code-to-ID
      *
      * @var array
-     * @since 2.0.0
      */
     protected $websiteCodeToId = [];
 
@@ -32,7 +29,6 @@ class StoreResolver
      * Website code to store code-to-ID pairs which it consists.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $websiteCodeToStoreIds = [];
 
@@ -40,7 +36,6 @@ class StoreResolver
      * All stores code-ID pairs.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $storeCodeToId = [];
 
@@ -48,13 +43,11 @@ class StoreResolver
      * Store ID to its website stores IDs.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $storeIdToWebsiteStoreIds = [];
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -65,7 +58,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      * Initialize website values.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initWebsites()
     {
@@ -80,7 +72,6 @@ protected function _initWebsites()
     /**
      * @param null|string $code
      * @return array|string|null
-     * @since 2.0.0
      */
     public function getWebsiteCodeToId($code = null)
     {
@@ -96,7 +87,6 @@ public function getWebsiteCodeToId($code = null)
     /**
      * @param null|string $code
      * @return array|string|null
-     * @since 2.0.0
      */
     public function getWebsiteCodeToStoreIds($code = null)
     {
@@ -113,7 +103,6 @@ public function getWebsiteCodeToStoreIds($code = null)
      * Initialize stores hash.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initStores()
     {
@@ -127,7 +116,6 @@ protected function _initStores()
     /**
      * @param null|string $code
      * @return array|string|null
-     * @since 2.0.0
      */
     public function getStoreCodeToId($code = null)
     {
@@ -143,7 +131,6 @@ public function getStoreCodeToId($code = null)
     /**
      * @param null|string $code
      * @return array|string|null
-     * @since 2.0.0
      */
     public function getStoreIdToWebsiteStoreIds($code = null)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
index 86fbd6b6028b0..019555b4b0c49 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor
  *
- * @since 2.0.0
  */
 class TaxClassProcessor
 {
@@ -24,7 +23,6 @@ class TaxClassProcessor
      * Tax classes.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $taxClasses;
 
@@ -32,7 +30,6 @@ class TaxClassProcessor
      * Instance of tax class collection factory.
      *
      * @var \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -40,14 +37,12 @@ class TaxClassProcessor
      * Instance of tax model factory.
      *
      * @var \Magento\Tax\Model\ClassModelFactory
-     * @since 2.0.0
      */
     protected $classModelFactory;
 
     /**
      * @param \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory $collectionFactory
      * @param \Magento\Tax\Model\ClassModelFactory $classModelFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory $collectionFactory,
@@ -62,7 +57,6 @@ public function __construct(
      * Initiate tax classes.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initTaxClasses()
     {
@@ -83,7 +77,6 @@ protected function initTaxClasses()
      * @param string $taxClassName
      * @param AbstractType $productTypeModel
      * @return integer
-     * @since 2.0.0
      */
     protected function createTaxClass($taxClassName, AbstractType $productTypeModel)
     {
@@ -106,7 +99,6 @@ protected function createTaxClass($taxClassName, AbstractType $productTypeModel)
      * @param string $taxClassName
      * @param AbstractType $productTypeModel
      * @return object
-     * @since 2.0.0
      */
     public function upsertTaxClass($taxClassName, AbstractType $productTypeModel)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index a22622ab7d4b5..900a036a573c2 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -17,7 +17,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractType
 {
@@ -25,7 +24,6 @@ abstract class AbstractType
      * Common attributes cache
      *
      * @var array
-     * @since 2.0.0
      */
     public static $commonAttributesCache = [];
 
@@ -33,7 +31,6 @@ abstract class AbstractType
      * Attribute Code to Id cache
      *
      * @var array
-     * @since 2.0.0
      */
     public static $attributeCodeToId = [];
 
@@ -51,7 +48,6 @@ abstract class AbstractType
      * ...
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes = [];
 
@@ -59,7 +55,6 @@ abstract class AbstractType
      * Attributes' codes which will be allowed anyway, independently from its visibility property.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_forcedAttributesCodes = [];
 
@@ -67,7 +62,6 @@ abstract class AbstractType
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
@@ -75,7 +69,6 @@ abstract class AbstractType
      * Validation failure entity specific message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [];
 
@@ -83,7 +76,6 @@ abstract class AbstractType
      * Validation failure general message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_genericMessageTemplates = [
         RowValidatorInterface::ERROR_INVALID_WEIGHT => 'Weight value is incorrect',
@@ -94,7 +86,6 @@ abstract class AbstractType
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [];
 
@@ -102,7 +93,6 @@ abstract class AbstractType
      * Custom entity type fields mapping.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customFieldsMapping = [];
 
@@ -110,7 +100,6 @@ abstract class AbstractType
      * Product entity object.
      *
      * @var \Magento\CatalogImportExport\Model\Import\Product
-     * @since 2.0.0
      */
     protected $_entityModel;
 
@@ -118,31 +107,26 @@ abstract class AbstractType
      * Product type (simple, etc.).
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attrSetColFac;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_prodAttrColFac;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -171,7 +155,6 @@ abstract class AbstractType
      * @param array $params
      * @param MetadataPool|null $metadataPool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
@@ -207,7 +190,6 @@ public function __construct(
     /**
      * @param array $templateCollection
      * @return $this
-     * @since 2.0.0
      */
     protected function initMessageTemplates(array $templateCollection)
     {
@@ -226,7 +208,6 @@ protected function initMessageTemplates(array $templateCollection)
      * @param mixed $attribute
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
     {
@@ -242,7 +223,6 @@ protected function _addAttributeParams($attrSetName, array $attrParams, $attribu
      * @param string $attributeCode
      * @param string $attributeSet
      * @return array
-     * @since 2.0.0
      */
     public function retrieveAttribute($attributeCode, $attributeSet)
     {
@@ -257,7 +237,6 @@ public function retrieveAttribute($attributeCode, $attributeSet)
      *
      * @param array|string $attrSetData Product row data or simply attribute set name.
      * @return array
-     * @since 2.0.0
      */
     protected function _getProductAttributes($attrSetData)
     {
@@ -272,7 +251,6 @@ protected function _getProductAttributes($attrSetData)
      * Initialize attributes parameters for all attributes' sets.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributes()
     {
@@ -321,7 +299,6 @@ protected function _initAttributes()
      * @param string $attributeSetName
      * @param array $attributeIds
      * @return void
-     * @since 2.0.0
      */
     protected function attachAttributesById($attributeSetName, $attributeIds)
     {
@@ -366,7 +343,6 @@ protected function attachAttributesById($attributeSetName, $attributeIds)
      *
      * @param string $attributeCode
      * @return mixed
-     * @since 2.0.0
      */
     public function retrieveAttributeFromCache($attributeCode)
     {
@@ -387,7 +363,6 @@ public function retrieveAttributeFromCache($attributeCode)
      * @param string $optionValue
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeOption($code, $optionKey, $optionValue)
     {
@@ -405,7 +380,6 @@ public function addAttributeOption($code, $optionKey, $optionValue)
      * @param string $attrCode
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isAttributeRequiredCheckNeeded($attrCode)
     {
@@ -419,7 +393,6 @@ protected function _isAttributeRequiredCheckNeeded($attrCode)
      * @param int $rowNum
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isParticularAttributesValid(array $rowData, $rowNum)
     {
@@ -431,7 +404,6 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
      *
      * @param string $value
      * @return int
-     * @since 2.0.0
      */
     protected function _isPriceCorr($value)
     {
@@ -442,7 +414,6 @@ protected function _isPriceCorr($value)
      * Particular attribute names getter.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getParticularAttributes()
     {
@@ -453,7 +424,6 @@ public function getParticularAttributes()
      * Return entity custom Fields mapping.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getCustomFieldsMapping()
     {
@@ -468,7 +438,6 @@ public function getCustomFieldsMapping()
      * @param bool $isNewProduct Optional
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
     {
@@ -510,7 +479,6 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
      * Additional check for model availability. If method returns FALSE - model is not suitable for data processing.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSuitable()
     {
@@ -526,7 +494,6 @@ public function isSuitable()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDefaultValue = true)
     {
@@ -563,7 +530,6 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     public function clearEmptyData(array $rowData)
     {
@@ -579,7 +545,6 @@ public function clearEmptyData(array $rowData)
      * Save product type specific data.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveData()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Factory.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Factory.php
index 185b578812cb2..61153c0a555cc 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Factory.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Import product type factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,13 +14,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Simple.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Simple.php
index 1bd7edf067f68..66bd323182a06 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Simple.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Simple.php
@@ -9,7 +9,6 @@
  * Import entity simple product type
  *
  * @api
- * @since 2.0.0
  */
 class Simple extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
@@ -17,7 +16,6 @@ class Simple extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
      * Attributes' codes which will be allowed anyway, independently from its visibility property.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_forcedAttributesCodes = [
         'related_tgtr_position_behavior',
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Virtual.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Virtual.php
index 0683d5866d6c6..adeae073fa229 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Virtual.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/Virtual.php
@@ -9,7 +9,6 @@
  * Import entity virtual product type
  *
  * @api
- * @since 2.0.0
  */
 class Virtual extends \Magento\CatalogImportExport\Model\Import\Product\Type\Simple
 {
@@ -24,7 +23,6 @@ class Virtual extends \Magento\CatalogImportExport\Model\Import\Product\Type\Sim
      * @param array $rowData
      * @param bool $withDefaultValue
      * @return array
-     * @since 2.0.0
      */
     public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDefaultValue = true)
     {
@@ -38,7 +36,6 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function setWeightVirtualProduct(array $rowData)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 1f53f03626773..3433fab59ed95 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -12,37 +12,31 @@
  * Class Validator
  *
  * @api
- * @since 2.0.0
  */
 class Validator extends AbstractValidator implements RowValidatorInterface
 {
     /**
      * @var RowValidatorInterface[]|AbstractValidator[]
-     * @since 2.0.0
      */
     protected $validators = [];
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
-     * @since 2.0.0
      */
     protected $context;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_uniqueAttributes;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_rowData;
 
@@ -55,7 +49,6 @@ class Validator extends AbstractValidator implements RowValidatorInterface
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param RowValidatorInterface[] $validators
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -69,7 +62,6 @@ public function __construct(
      * @param mixed $attrCode
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     protected function textValidation($attrCode, $type)
     {
@@ -92,7 +84,7 @@ protected function textValidation($attrCode, $type)
      * @param array $possibleOptions
      * @param string $value
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function validateOption($attrCode, $possibleOptions, $value)
     {
@@ -116,7 +108,6 @@ private function validateOption($attrCode, $possibleOptions, $value)
      * @param mixed $attrCode
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     protected function numericValidation($attrCode, $type)
     {
@@ -145,7 +136,6 @@ protected function numericValidation($attrCode, $type)
      * @param array $attributeParams
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     public function isRequiredAttributeValid($attrCode, array $attributeParams, array $rowData)
     {
@@ -170,7 +160,6 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function isAttributeValid($attrCode, array $attrParams, array $rowData)
     {
@@ -271,7 +260,6 @@ public function getInvalidAttribute()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function isValidAttributes()
     {
@@ -297,7 +285,6 @@ protected function isValidAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -318,7 +305,6 @@ public function isValid($value)
      *
      * @param array $rowData
      * @return int
-     * @since 2.0.0
      */
     public function getRowScope(array $rowData)
     {
@@ -331,7 +317,6 @@ public function getRowScope(array $rowData)
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product $context
      * @return $this
-     * @since 2.0.0
      */
     public function init($context)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
index 8e4512bab931f..81f198969c997 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator
  *
- * @since 2.0.0
  */
 abstract class AbstractImportValidator extends AbstractValidator implements RowValidatorInterface
 {
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
-     * @since 2.0.0
      */
     protected $context;
 
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product $context
      * @return $this
-     * @since 2.0.0
      */
     public function init($context)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractPrice.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractPrice.php
index b73cee48d09ae..8a184727b8c34 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractPrice.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractPrice.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice
  *
- * @since 2.0.0
  */
 abstract class AbstractPrice extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -30,14 +27,12 @@ abstract class AbstractPrice extends AbstractImportValidator implements RowValid
      * Customer groups ID-to-name.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $customerGroups = [];
 
     /**
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Api\GroupRepositoryInterface $groupRepository,
@@ -49,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function init($context)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
index 9807fc2aa5eb6..19c191ade7920 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\Media
  *
- * @since 2.0.0
  */
 class Media extends AbstractImportValidator implements RowValidatorInterface
 {
@@ -51,7 +50,6 @@ public function __construct(Validator $validator = null)
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $mediaAttributes = ['image', 'small_image', 'thumbnail'];
 
@@ -60,7 +58,6 @@ public function __construct(Validator $validator = null)
      * @return bool
      * @deprecated 2.2.0 As this method doesn't give guarantee of correct url validation.
      * @see \Magento\Framework\Url\Validator::isValid() It provides better url validation.
-     * @since 2.0.0
      */
     protected function checkValidUrl($string)
     {
@@ -70,7 +67,6 @@ protected function checkValidUrl($string)
     /**
      * @param string $string
      * @return bool
-     * @since 2.0.0
      */
     protected function checkPath($string)
     {
@@ -80,7 +76,6 @@ protected function checkPath($string)
     /**
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     protected function checkFileExists($path)
     {
@@ -93,7 +88,6 @@ protected function checkFileExists($path)
      * @param array $value
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
index 1376e71b05737..728d3e4d17621 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
@@ -9,13 +9,11 @@
 
 /**
  * Class Quantity
- * @since 2.0.0
  */
 class Quantity extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
index 2a3de3a505ae6..d06e5a651027a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\SuperProductsSku
  *
- * @since 2.0.0
  */
 class SuperProductsSku extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * @var SkuProcessor
-     * @since 2.0.0
      */
     protected $skuProcessor;
 
     /**
      * @param SkuProcessor $skuProcessor
-     * @since 2.0.0
      */
     public function __construct(
         SkuProcessor $skuProcessor
@@ -33,7 +30,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
index 748636e503a88..c498434deae1f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\TierPrice
  *
- * @since 2.0.0
  */
 class TierPrice extends AbstractPrice implements RowValidatorInterface
 {
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $storeResolver;
 
@@ -24,7 +22,6 @@ class TierPrice extends AbstractPrice implements RowValidatorInterface
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Api\GroupRepositoryInterface $groupRepository,
@@ -38,7 +35,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
index 305650e16296e..3a8a6f91a5386 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\Website
  *
- * @since 2.0.0
  */
 class Website extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
-     * @since 2.0.0
      */
     protected $storeResolver;
 
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\CatalogImportExport\Model\Import\Product\St
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
index d3619279e8152..5ab71ec24c1ce 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Product\Validator\Weight
  *
- * @since 2.0.0
  */
 class Weight extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php
index 8aef1eb331ac9..2f3e9a297b7fa 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Proxy\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Catalog\Model\Product
 {
@@ -22,7 +21,6 @@ class Product extends \Magento\Catalog\Model\Product
      * DO NOT Initialize resources.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php
index 3b28142b3a45e..31393e65db212 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel
  *
- * @since 2.0.0
  */
 class ResourceModel extends \Magento\Catalog\Model\ResourceModel\Product
 {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index e4ce5ff2aeeb4..03d773aa91aa4 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -12,7 +12,6 @@
  * Import entity product model
  *
  * @api
- * @since 2.0.0
  */
 class Uploader extends \Magento\MediaStorage\Model\File\Uploader
 {
@@ -29,7 +28,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Temp directory.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_tmpDir = '';
 
@@ -37,7 +35,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Destination directory.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_destDir = '';
 
@@ -45,7 +42,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * All mime types.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedMimeTypes = [
         'jpg' => 'image/jpeg',
@@ -60,7 +56,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Image factory.
      *
      * @var \Magento\Framework\Image\AdapterFactory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
@@ -68,7 +63,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Validator.
      *
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_validator;
 
@@ -76,7 +70,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Instance of filesystem directory write interface.
      *
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_directory;
 
@@ -84,7 +77,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Instance of filesystem read factory.
      *
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     protected $_readFactory;
 
@@ -92,7 +84,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Instance of media file storage database.
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb;
 
@@ -100,7 +91,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * Instance of media file storage.
      *
      * @var \Magento\MediaStorage\Helper\File\Storage
-     * @since 2.0.0
      */
     protected $_coreFileStorage;
 
@@ -113,7 +103,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
      * @param null $filePath
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb,
@@ -139,7 +128,6 @@ public function __construct(
      * Initiate uploader default settings
      *
      * @return void
-     * @since 2.0.0
      */
     public function init()
     {
@@ -158,7 +146,6 @@ public function init()
      * @param string $fileName
      * @param bool $renameFileOff
      * @return array
-     * @since 2.0.0
      */
     public function move($fileName, $renameFileOff = false)
     {
@@ -195,7 +182,6 @@ public function move($fileName, $renameFileOff = false)
      * @param string $filePath
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _setUploadFile($filePath)
     {
@@ -214,7 +200,6 @@ protected function _setUploadFile($filePath)
      *
      * @param string $filePath
      * @return array
-     * @since 2.0.0
      */
     protected function _readFileInfo($filePath)
     {
@@ -234,7 +219,6 @@ protected function _readFileInfo($filePath)
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _validateFile()
     {
@@ -265,7 +249,6 @@ protected function _validateFile()
      *
      * @param string $ext
      * @return string
-     * @since 2.0.0
      */
     protected function _getMimeTypeByExt($ext)
     {
@@ -279,7 +262,6 @@ protected function _getMimeTypeByExt($ext)
      * Obtain TMP file path prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTmpDir()
     {
@@ -291,7 +273,6 @@ public function getTmpDir()
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function setTmpDir($path)
     {
@@ -306,7 +287,6 @@ public function setTmpDir($path)
      * Obtain destination file path prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDestDir()
     {
@@ -318,7 +298,6 @@ public function getDestDir()
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function setDestDir($path)
     {
@@ -335,7 +314,6 @@ public function setDestDir($path)
      * @param string $tmpPath
      * @param string $destPath
      * @return bool
-     * @since 2.0.0
      */
     protected function _moveFile($tmpPath, $destPath)
     {
@@ -354,7 +332,6 @@ protected function _moveFile($tmpPath, $destPath)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function chmod($file)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
index ef68f0950c236..b22c8a63eb09a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Category\Product\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Category\Product\Processor
-     * @since 2.0.0
      */
     protected $_indexerCategoryProductProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Category\Product\Proc
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
index c0fb09fc397d4..77693eb460078 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Product\Category\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Category\Processor
-     * @since 2.0.0
      */
     protected $_indexerProductCategoryProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Category\Proc
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Eav/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Eav/Plugin/Import.php
index 60c81b875c8b3..e39fe85cee6e6 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Eav/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Eav/Plugin/Import.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Product\Eav\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
-     * @since 2.0.0
      */
     protected $_indexerEavProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
index f3472c299f6fe..0c9aa05bef551 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     * @since 2.0.0
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Price/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Price/Plugin/Import.php
index 08f6eddeb898a..a7bb96e395fe1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Price/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Price/Plugin/Import.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Product\Price\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
 {
@@ -20,7 +19,6 @@ class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\Abstrac
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $result)
     {
@@ -34,7 +32,6 @@ public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $
      * Get price indexer
      *
      * @return \Magento\Framework\Indexer\IndexerInterface
-     * @since 2.0.0
      */
     protected function getPriceIndexer()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Stock/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Stock/Plugin/Import.php
index ad86888f16647..db3848e590114 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Stock/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Stock/Plugin/Import.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogImportExport\Model\Indexer\Stock\Plugin\Import
  *
- * @since 2.0.0
  */
 class Import
 {
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $_stockndexerProcessor;
 
     /**
      * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockndexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockndexerProcessor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Proces
      *
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
index d1d70c1e95fe5..9249da56d8186 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
@@ -14,7 +14,6 @@
 /**
  * Interface StockCollectionInterface
  * @api
- * @since 2.0.0
  */
 interface StockCollectionInterface extends SearchResultsInterface
 {
@@ -22,7 +21,6 @@ interface StockCollectionInterface extends SearchResultsInterface
      * Get items
      *
      * @return \Magento\CatalogInventory\Api\Data\StockInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -31,7 +29,6 @@ public function getItems();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
index d16c8fbf543ae..f3288d632cfb1 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface Stock
  * @api
- * @since 2.0.0
  */
 interface StockInterface extends ExtensibleDataInterface
 {
@@ -22,7 +21,6 @@ interface StockInterface extends ExtensibleDataInterface
      * Retrieve stock identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStockId();
 
@@ -31,7 +29,6 @@ public function getStockId();
      *
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId);
 
@@ -39,7 +36,6 @@ public function setStockId($stockId);
      * Retrieve stock name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStockName();
 
@@ -48,7 +44,6 @@ public function getStockName();
      *
      * @param string $stockName
      * @return $this
-     * @since 2.0.0
      */
     public function setStockName($stockName);
 
@@ -56,7 +51,6 @@ public function setStockName($stockName);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\CatalogInventory\Api\Data\StockExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -65,7 +59,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
index f101e921de98d..9a36d0caa0bd2 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
@@ -14,7 +14,6 @@
 /**
  * Interface StockItemCollectionInterface
  * @api
- * @since 2.0.0
  */
 interface StockItemCollectionInterface extends SearchResultsInterface
 {
@@ -22,7 +21,6 @@ interface StockItemCollectionInterface extends SearchResultsInterface
      * Get items
      *
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -31,7 +29,6 @@ public function getItems();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 
@@ -39,7 +36,6 @@ public function setItems(array $items);
      * Get search criteria.
      *
      * @return \Magento\CatalogInventory\Api\StockItemCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 }
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
index 1d861dd142115..63dc05ec57c0a 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface StockItem
  * @api
- * @since 2.0.0
  */
 interface StockItemInterface extends ExtensibleDataInterface
 {
@@ -57,27 +56,23 @@ interface StockItemInterface extends ExtensibleDataInterface
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getItemId();
 
     /**
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($itemId);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId();
 
     /**
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($productId);
 
@@ -85,7 +80,6 @@ public function setProductId($productId);
      * Retrieve stock identifier
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStockId();
 
@@ -94,20 +88,17 @@ public function getStockId();
      *
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId);
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getQty();
 
     /**
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -115,7 +106,6 @@ public function setQty($qty);
      * Retrieve Stock Availability
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function getIsInStock();
 
@@ -124,42 +114,36 @@ public function getIsInStock();
      *
      * @param bool|int $isInStock
      * @return $this
-     * @since 2.0.0
      */
     public function setIsInStock($isInStock);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsQtyDecimal();
 
     /**
      * @param bool $isQtyDecimal
      * @return $this
-     * @since 2.0.0
      */
     public function setIsQtyDecimal($isQtyDecimal);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShowDefaultNotificationMessage();
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigMinQty();
 
     /**
      * @param bool $useConfigMinQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMinQty($useConfigMinQty);
 
@@ -167,7 +151,6 @@ public function setUseConfigMinQty($useConfigMinQty);
      * Retrieve minimal quantity available for item status in stock
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinQty();
 
@@ -176,20 +159,17 @@ public function getMinQty();
      *
      * @param float $minQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMinQty($minQty);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getUseConfigMinSaleQty();
 
     /**
      * @param int $useConfigMinSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMinSaleQty($useConfigMinSaleQty);
 
@@ -197,7 +177,6 @@ public function setUseConfigMinSaleQty($useConfigMinSaleQty);
      * Retrieve Minimum Qty Allowed in Shopping Cart or NULL when there is no limitation
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinSaleQty();
 
@@ -206,21 +185,18 @@ public function getMinSaleQty();
      *
      * @param float $minSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMinSaleQty($minSaleQty);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigMaxSaleQty();
 
     /**
      * @param bool $useConfigMaxSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMaxSaleQty($useConfigMaxSaleQty);
 
@@ -228,7 +204,6 @@ public function setUseConfigMaxSaleQty($useConfigMaxSaleQty);
      * Retrieve Maximum Qty Allowed in Shopping Cart data wrapper
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMaxSaleQty();
 
@@ -237,21 +212,18 @@ public function getMaxSaleQty();
      *
      * @param float $maxSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMaxSaleQty($maxSaleQty);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigBackorders();
 
     /**
      * @param bool $useConfigBackorders
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigBackorders($useConfigBackorders);
 
@@ -259,7 +231,6 @@ public function setUseConfigBackorders($useConfigBackorders);
      * Retrieve backorders status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getBackorders();
 
@@ -268,21 +239,18 @@ public function getBackorders();
      *
      * @param int $backOrders
      * @return $this
-     * @since 2.0.0
      */
     public function setBackorders($backOrders);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigNotifyStockQty();
 
     /**
      * @param bool $useConfigNotifyStockQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigNotifyStockQty($useConfigNotifyStockQty);
 
@@ -290,7 +258,6 @@ public function setUseConfigNotifyStockQty($useConfigNotifyStockQty);
      * Retrieve Notify for Quantity Below data wrapper
      *
      * @return float
-     * @since 2.0.0
      */
     public function getNotifyStockQty();
 
@@ -299,21 +266,18 @@ public function getNotifyStockQty();
      *
      * @param float $notifyStockQty
      * @return $this
-     * @since 2.0.0
      */
     public function setNotifyStockQty($notifyStockQty);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigQtyIncrements();
 
     /**
      * @param bool $useConfigQtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigQtyIncrements($useConfigQtyIncrements);
 
@@ -321,7 +285,6 @@ public function setUseConfigQtyIncrements($useConfigQtyIncrements);
      * Retrieve Quantity Increments data wrapper
      *
      * @return float|false
-     * @since 2.0.0
      */
     public function getQtyIncrements();
 
@@ -330,21 +293,18 @@ public function getQtyIncrements();
      *
      * @param float $qtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyIncrements($qtyIncrements);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigEnableQtyInc();
 
     /**
      * @param bool $useConfigEnableQtyInc
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigEnableQtyInc($useConfigEnableQtyInc);
 
@@ -353,7 +313,6 @@ public function setUseConfigEnableQtyInc($useConfigEnableQtyInc);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEnableQtyIncrements();
 
@@ -362,21 +321,18 @@ public function getEnableQtyIncrements();
      *
      * @param bool $enableQtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setEnableQtyIncrements($enableQtyIncrements);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigManageStock();
 
     /**
      * @param bool $useConfigManageStock
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigManageStock($useConfigManageStock);
 
@@ -385,54 +341,46 @@ public function setUseConfigManageStock($useConfigManageStock);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getManageStock();
 
     /**
      * @param bool $manageStock
      * @return $this
-     * @since 2.0.0
      */
     public function setManageStock($manageStock);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLowStockDate();
 
     /**
      * @param string $lowStockDate
      * @return $this
-     * @since 2.0.0
      */
     public function setLowStockDate($lowStockDate);
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsDecimalDivided();
 
     /**
      * @param bool $isDecimalDivided
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDecimalDivided($isDecimalDivided);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStockStatusChangedAuto();
 
     /**
      * @param int $stockStatusChangedAuto
      * @return $this
-     * @since 2.0.0
      */
     public function setStockStatusChangedAuto($stockStatusChangedAuto);
 
@@ -440,7 +388,6 @@ public function setStockStatusChangedAuto($stockStatusChangedAuto);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -449,7 +396,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
index 16b70bcd25f4c..b7535645e117f 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Stock Status collection interface
  * @api
- * @since 2.0.0
  */
 interface StockStatusCollectionInterface extends SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface StockStatusCollectionInterface extends SearchResultsInterface
      * Get items
      *
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 
@@ -35,7 +32,6 @@ public function setItems(array $items);
      * Get search criteria.
      *
      * @return \Magento\CatalogInventory\Api\StockStatusCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 }
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
index d97b45b32dff7..4282d6b238854 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface StockStatusInterface
  * @api
- * @since 2.0.0
  */
 interface StockStatusInterface extends ExtensibleDataInterface
 {
@@ -27,59 +26,50 @@ interface StockStatusInterface extends ExtensibleDataInterface
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getProductId();
 
     /**
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($productId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStockId();
 
     /**
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getQty();
 
     /**
      * @param int $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStockStatus();
 
     /**
      * @param int $stockStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setStockStatus($stockStatus);
 
     /**
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem();
 
@@ -87,7 +77,6 @@ public function getStockItem();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -96,7 +85,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
index edacf2ab2dcde..7f4afea26d437 100644
--- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockConfigurationInterface
  * @api
- * @since 2.0.0
  */
 interface StockConfigurationInterface
 {
@@ -16,14 +15,12 @@ interface StockConfigurationInterface
      * Retrieve Default Scope ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultScopeId();
 
     /**
      * @param int $filter
      * @return int[]
-     * @since 2.0.0
      */
     public function getIsQtyTypeIds($filter = null);
 
@@ -32,7 +29,6 @@ public function getIsQtyTypeIds($filter = null);
      *
      * @param int $productTypeId
      * @return bool
-     * @since 2.0.0
      */
     public function isQty($productTypeId);
 
@@ -41,14 +37,12 @@ public function isQty($productTypeId);
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function canSubtractQty($storeId = null);
 
     /**
      * @param int $storeId
      * @return float
-     * @since 2.0.0
      */
     public function getMinQty($storeId = null);
 
@@ -56,21 +50,18 @@ public function getMinQty($storeId = null);
      * @param int $storeId
      * @param int $customerGroupId
      * @return float
-     * @since 2.0.0
      */
     public function getMinSaleQty($storeId = null, $customerGroupId = null);
 
     /**
      * @param int $storeId
      * @return float
-     * @since 2.0.0
      */
     public function getMaxSaleQty($storeId = null);
 
     /**
      * @param int $storeId
      * @return float
-     * @since 2.0.0
      */
     public function getNotifyStockQty($storeId = null);
 
@@ -80,14 +71,12 @@ public function getNotifyStockQty($storeId = null);
      * @param int $storeId
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEnableQtyIncrements($storeId = null);
 
     /**
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getQtyIncrements($store = null);
 
@@ -96,7 +85,6 @@ public function getQtyIncrements($store = null);
      *
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getBackorders($storeId = null);
 
@@ -105,7 +93,6 @@ public function getBackorders($storeId = null);
      *
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getManageStock($storeId = null);
 
@@ -115,7 +102,6 @@ public function getManageStock($storeId = null);
      * @param int $storeId
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanBackInStock($storeId = null);
 
@@ -124,7 +110,6 @@ public function getCanBackInStock($storeId = null);
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isShowOutOfStock($storeId = null);
 
@@ -133,7 +118,6 @@ public function isShowOutOfStock($storeId = null);
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isAutoReturnEnabled($storeId = null);
 
@@ -143,7 +127,6 @@ public function isAutoReturnEnabled($storeId = null);
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayProductStockStatus($storeId = null);
 
@@ -151,7 +134,6 @@ public function isDisplayProductStockStatus($storeId = null);
      * @param string $field
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultConfigValue($field, $storeId = null);
 
@@ -159,7 +141,6 @@ public function getDefaultConfigValue($field, $storeId = null);
      * Retrieve inventory item options (used in config)
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getConfigItemOptions();
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
index b793dce2a1cb8..a838901f77dbc 100644
--- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockCriteriaInterface
  * @api
- * @since 2.0.0
  */
 interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
@@ -17,7 +16,6 @@ interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterfac
      *
      * @param \Magento\CatalogInventory\Api\StockCriteriaInterface $criteria
      * @return bool
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockCriteriaInterface $criteria);
 
@@ -26,7 +24,6 @@ public function addCriteria(\Magento\CatalogInventory\Api\StockCriteriaInterface
      *
      * @param int $scope
      * @return bool
-     * @since 2.0.0
      */
     public function setScopeFilter($scope);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
index b0632c68be8f2..13ffb054d925e 100644
--- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockIndexInterface
  * @api
- * @since 2.0.0
  */
 interface StockIndexInterface
 {
@@ -18,7 +17,6 @@ interface StockIndexInterface
      * @param int $productId
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function rebuild($productId = null, $scopeId = null);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
index 24f745076cde6..3d5041f26d49e 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockItemCriteriaInterface
  * @api
- * @since 2.0.0
  */
 interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
@@ -17,7 +16,6 @@ interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInte
      *
      * @param \Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria
      * @return bool
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria);
 
@@ -26,7 +24,6 @@ public function addCriteria(\Magento\CatalogInventory\Api\StockItemCriteriaInter
      *
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function setStockStatus($storeId = null);
 
@@ -35,7 +32,6 @@ public function setStockStatus($storeId = null);
      *
      * @param \Magento\CatalogInventory\Api\Data\StockInterface $stock
      * @return bool
-     * @since 2.0.0
      */
     public function setStockFilter($stock);
 
@@ -44,7 +40,6 @@ public function setStockFilter($stock);
      *
      * @param int $scope
      * @return bool
-     * @since 2.0.0
      */
     public function setScopeFilter($scope);
 
@@ -53,7 +48,6 @@ public function setScopeFilter($scope);
      *
      * @param int|int[] $products
      * @return bool
-     * @since 2.0.0
      */
     public function setProductsFilter($products);
 
@@ -62,7 +56,6 @@ public function setProductsFilter($products);
      *
      * @param bool $isStockManagedInConfig
      * @return bool
-     * @since 2.0.0
      */
     public function setManagedFilter($isStockManagedInConfig);
 
@@ -72,7 +65,6 @@ public function setManagedFilter($isStockManagedInConfig);
      * @param string $comparisonMethod
      * @param float $qty
      * @return bool
-     * @since 2.0.0
      */
     public function setQtyFilter($comparisonMethod, $qty);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
index 2e42fb06cacfa..98627910d9669 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockItemRepository
  * @api
- * @since 2.0.0
  */
 interface StockItemRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface StockItemRepositoryInterface
      *
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem);
 
@@ -26,7 +24,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
      *
      * @param int $stockItemId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function get($stockItemId);
 
@@ -35,7 +32,6 @@ public function get($stockItemId);
      *
      * @param \Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria
      * @return \Magento\CatalogInventory\Api\Data\StockItemCollectionInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria);
 
@@ -44,14 +40,12 @@ public function getList(\Magento\CatalogInventory\Api\StockItemCriteriaInterface
      *
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem);
 
     /**
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
index 28a47fc798e06..ef4df59671c86 100644
--- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockManagementInterface
  * @api
- * @since 2.0.0
  */
 interface StockManagementInterface
 {
@@ -19,7 +18,6 @@ interface StockManagementInterface
      * @param float $qty
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function backItemQty($productId, $qty, $scopeId = null);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
index eb12a224028e1..db70ae18c3c32 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
@@ -8,14 +8,12 @@
 /**
  * Interface StockRegistryInterface
  * @api
- * @since 2.0.0
  */
 interface StockRegistryInterface
 {
     /**
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function getStock($scopeId = null);
 
@@ -23,7 +21,6 @@ public function getStock($scopeId = null);
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem($productId, $scopeId = null);
 
@@ -32,7 +29,6 @@ public function getStockItem($productId, $scopeId = null);
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getStockItemBySku($productSku, $scopeId = null);
 
@@ -40,7 +36,6 @@ public function getStockItemBySku($productSku, $scopeId = null);
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function getStockStatus($productId, $scopeId = null);
 
@@ -49,7 +44,6 @@ public function getStockStatus($productId, $scopeId = null);
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getStockStatusBySku($productSku, $scopeId = null);
 
@@ -59,7 +53,6 @@ public function getStockStatusBySku($productSku, $scopeId = null);
      * @param int $productId
      * @param int $scopeId
      * @return int
-     * @since 2.0.0
      */
     public function getProductStockStatus($productId, $scopeId = null);
 
@@ -68,7 +61,6 @@ public function getProductStockStatus($productId, $scopeId = null);
      * @param int $scopeId
      * @return int
      * @throw \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getProductStockStatusBySku($productSku, $scopeId = null);
 
@@ -80,7 +72,6 @@ public function getProductStockStatusBySku($productSku, $scopeId = null);
      * @param int $currentPage
      * @param int $pageSize
      * @return \Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface
-     * @since 2.0.0
      */
     public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0);
 
@@ -89,7 +80,6 @@ public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
      * @return int
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function updateStockItemBySku($productSku, \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
index 7c78b683ca745..2cb94a8a29b6c 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface StockRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface StockRepositoryInterface
      *
      * @param \Magento\CatalogInventory\Api\Data\StockInterface $stock
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function save(\Magento\CatalogInventory\Api\Data\StockInterface $stock);
 
@@ -26,7 +24,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockInterface $stock);
      *
      * @param int $stockId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function get($stockId);
 
@@ -35,7 +32,6 @@ public function get($stockId);
      *
      * @param \Magento\CatalogInventory\Api\StockCriteriaInterface $collectionBuilder
      * @return \Magento\CatalogInventory\Api\Data\StockCollectionInterface
-     * @since 2.0.0
      */
     public function getList(StockCriteriaInterface $collectionBuilder);
 
@@ -44,7 +40,6 @@ public function getList(StockCriteriaInterface $collectionBuilder);
      *
      * @param \Magento\CatalogInventory\Api\Data\StockInterface $stock
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\CatalogInventory\Api\Data\StockInterface $stock);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
index 92b87506adc8e..eb45b96fcb9e7 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockStateInterface
  * @api
- * @since 2.0.0
  */
 interface StockStateInterface
 {
@@ -16,7 +15,6 @@ interface StockStateInterface
      * @param int $productId
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function verifyStock($productId, $scopeId = null);
 
@@ -24,7 +22,6 @@ public function verifyStock($productId, $scopeId = null);
      * @param int $productId
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function verifyNotification($productId, $scopeId = null);
 
@@ -35,7 +32,6 @@ public function verifyNotification($productId, $scopeId = null);
      * @param float $origQty
      * @param int $scopeId
      * @return int
-     * @since 2.0.0
      */
     public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null);
 
@@ -47,7 +43,6 @@ public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $
      * @param int $scopeId
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function checkQty($productId, $qty, $scopeId = null);
 
@@ -59,7 +54,6 @@ public function checkQty($productId, $qty, $scopeId = null);
      * @param float $qty
      * @param int $scopeId
      * @return float
-     * @since 2.0.0
      */
     public function suggestQty($productId, $qty, $scopeId = null);
 
@@ -69,7 +63,6 @@ public function suggestQty($productId, $qty, $scopeId = null);
      * @param int $productId
      * @param int $scopeId
      * @return float
-     * @since 2.0.0
      */
     public function getStockQty($productId, $scopeId = null);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
index 9cc3dd220a411..5c2cc18061f36 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockStatusCriteriaInterface
  * @api
- * @since 2.0.0
  */
 interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
@@ -17,7 +16,6 @@ interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaIn
      *
      * @param \Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria
      * @return bool
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria);
 
@@ -26,7 +24,6 @@ public function addCriteria(\Magento\CatalogInventory\Api\StockStatusCriteriaInt
      *
      * @param int $scope
      * @return bool
-     * @since 2.0.0
      */
     public function setScopeFilter($scope);
 
@@ -35,7 +32,6 @@ public function setScopeFilter($scope);
      *
      * @param int $products
      * @return bool
-     * @since 2.0.0
      */
     public function setProductsFilter($products);
 
@@ -44,7 +40,6 @@ public function setProductsFilter($products);
      *
      * @param float $qty
      * @return bool
-     * @since 2.0.0
      */
     public function setQtyFilter($qty);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
index 7dfe5f3075186..2219e73a187b5 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface StockStatusRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface StockStatusRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface StockStatusRepositoryInterface
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function save(\Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus);
 
@@ -26,7 +24,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockStatusInterface $st
      *
      * @param string $stockStatusId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function get($stockStatusId);
 
@@ -35,7 +32,6 @@ public function get($stockStatusId);
      *
      * @param \Magento\CatalogInventory\Api\StockStatusCriteriaInterface $searchCriteria
      * @return \Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface
-     * @since 2.0.0
      */
     public function getList(StockStatusCriteriaInterface $searchCriteria);
 
@@ -44,7 +40,6 @@ public function getList(StockStatusCriteriaInterface $searchCriteria);
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus);
 }
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
index eadfb11f0a11e..dc992378d128b 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
@@ -12,7 +12,6 @@
 
 /**
  * HTML select element block with customer groups options
- * @since 2.0.0
  */
 class Customergroup extends \Magento\Framework\View\Element\Html\Select
 {
@@ -20,7 +19,6 @@ class Customergroup extends \Magento\Framework\View\Element\Html\Select
      * Customer groups cache
      *
      * @var array
-     * @since 2.0.0
      */
     private $_customerGroups;
 
@@ -28,25 +26,21 @@ class Customergroup extends \Magento\Framework\View\Element\Html\Select
      * Flag whether to add group all option or no
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addGroupAllOption = true;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -58,7 +52,6 @@ class Customergroup extends \Magento\Framework\View\Element\Html\Select
      * @param GroupRepositoryInterface $groupRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -79,7 +72,6 @@ public function __construct(
      *
      * @param int $groupId return name by customer group id
      * @return array|string
-     * @since 2.0.0
      */
     protected function _getCustomerGroups($groupId = null)
     {
@@ -100,7 +92,6 @@ protected function _getCustomerGroups($groupId = null)
     /**
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setInputName($value)
     {
@@ -111,7 +102,6 @@ public function setInputName($value)
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function _toHtml()
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
index 63c5d73468514..e2dcd0a0a33b0 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
@@ -9,13 +9,11 @@
  * Adminhtml catalog inventory "Minimum Qty Allowed in Shopping Cart" field
  *
  * @api
- * @since 2.0.0
  */
 class Minsaleqty extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
 {
     /**
      * @var Customergroup
-     * @since 2.0.0
      */
     protected $_groupRenderer;
 
@@ -23,7 +21,6 @@ class Minsaleqty extends \Magento\Config\Block\System\Config\Form\Field\FieldArr
      * Retrieve group column renderer
      *
      * @return Customergroup
-     * @since 2.0.0
      */
     protected function _getGroupRenderer()
     {
@@ -42,7 +39,6 @@ protected function _getGroupRenderer()
      * Prepare to render
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareToRender()
     {
@@ -60,7 +56,6 @@ protected function _prepareToRender()
      *
      * @param \Magento\Framework\DataObject $row
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
index 7d13516b001ef..89bb921c84e21 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Stock extends \Magento\Framework\Data\Form\Element\Select
 {
@@ -23,7 +22,6 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select
      * Quantity field element
      *
      * @var \Magento\Framework\Data\Form\Element\Text
-     * @since 2.0.0
      */
     protected $_qty;
 
@@ -31,7 +29,6 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select
      * Is product composite
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isProductComposite;
 
@@ -39,7 +36,6 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select
      * Text element factory
      *
      * @var \Magento\Framework\Data\Form\Element\TextFactory
-     * @since 2.0.0
      */
     protected $_factoryText;
 
@@ -47,7 +43,6 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
@@ -58,7 +53,6 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select
      * @param \Magento\Framework\Data\Form\Element\TextFactory $factoryText
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -80,7 +74,6 @@ public function __construct(
      * Create quantity field
      *
      * @return \Magento\Framework\Data\Form\Element\Text
-     * @since 2.0.0
      */
     protected function _createQtyElement()
     {
@@ -94,7 +87,6 @@ protected function _createQtyElement()
      * Join quantity and in stock elements' html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -110,7 +102,6 @@ public function getElementHtml()
      *
      * @param Form $form
      * @return Form
-     * @since 2.0.0
      */
     public function setForm($form)
     {
@@ -123,7 +114,6 @@ public function setForm($form)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -139,7 +129,6 @@ public function setValue($value)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -151,7 +140,6 @@ public function setName($name)
      * Get whether product is composite
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isProductComposite()
     {
@@ -165,7 +153,6 @@ protected function _isProductComposite()
      * Disable fields depending on product type
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _disableFields()
     {
@@ -187,7 +174,6 @@ protected function _disableFields()
      * @param string $quantityFieldId
      * @param string $inStockFieldId
      * @return string
-     * @since 2.0.0
      */
     protected function _getJs($quantityFieldId, $inStockFieldId)
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
index 7978dd85d3d09..5d521cb44c8a5 100644
--- a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
+++ b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogInventory\Block\Plugin\ProductView
  *
- * @since 2.0.0
  */
 class ProductView
 {
     /**
      * @var StockRegistryInterface
-     * @since 2.0.0
      */
     private $stockRegistry;
 
     /**
      * @param StockRegistryInterface $stockRegistry
-     * @since 2.0.0
      */
     public function __construct(
         StockRegistryInterface $stockRegistry
@@ -34,7 +31,6 @@ public function __construct(
      * @param \Magento\Catalog\Block\Product\View $block
      * @param array $validators
      * @return array
-     * @since 2.0.0
      */
     public function afterGetQuantityValidators(
         \Magento\Catalog\Block\Product\View $block,
diff --git a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
index 476ee28a3f914..9efdf4d673c21 100644
--- a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
+++ b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
@@ -13,7 +13,6 @@
  * Product qty increments block
  *
  * @api
- * @since 2.0.0
  */
 class Qtyincrements extends Template implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class Qtyincrements extends Template implements IdentityInterface
      * Qty Increments cache
      *
      * @var float|false
-     * @since 2.0.0
      */
     protected $_qtyIncrements;
 
@@ -29,13 +27,11 @@ class Qtyincrements extends Template implements IdentityInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -44,7 +40,6 @@ class Qtyincrements extends Template implements IdentityInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Retrieve current product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -72,7 +66,6 @@ public function getProduct()
      * Retrieve current product name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductName()
     {
@@ -83,7 +76,6 @@ public function getProductName()
      * Retrieve product qty increments
      *
      * @return float|false
-     * @since 2.0.0
      */
     public function getProductQtyIncrements()
     {
@@ -104,7 +96,6 @@ public function getProductQtyIncrements()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 8afbfd8f62159..568fa600ec52d 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -10,7 +10,6 @@
 
 /**
  * Product stock qty abstract block
- * @since 2.0.0
  */
 abstract class AbstractStockqty extends \Magento\Framework\View\Element\Template
 {
@@ -25,19 +24,16 @@ abstract class AbstractStockqty extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -47,7 +43,6 @@ abstract class AbstractStockqty extends \Magento\Framework\View\Element\Template
      * @param \Magento\CatalogInventory\Api\StockStateInterface $stockState
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      * Retrieve current product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -78,7 +72,6 @@ public function getProduct()
      * Retrieve current product stock qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getStockQty()
     {
@@ -98,7 +91,6 @@ public function getStockQty()
      *
      * @param Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getProductStockQty($product)
     {
@@ -109,7 +101,6 @@ public function getProductStockQty($product)
      * Retrieve threshold of qty to display stock qty message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThresholdQty()
     {
@@ -127,7 +118,6 @@ public function getThresholdQty()
      * Retrieve id of message placeholder in template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPlaceholderId()
     {
@@ -138,7 +128,6 @@ public function getPlaceholderId()
      * Retrieve visibility of stock qty message
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMsgVisible()
     {
@@ -149,7 +138,6 @@ public function isMsgVisible()
      * Retrieve current product qty left in stock
      *
      * @return float
-     * @since 2.0.0
      */
     public function getStockQtyLeft()
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/Composite.php b/app/code/Magento/CatalogInventory/Block/Stockqty/Composite.php
index b18f7191b6718..36e0171a787dc 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/Composite.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/Composite.php
@@ -10,7 +10,6 @@
 
 /**
  * Product stock qty block for abstract composite product
- * @since 2.0.0
  */
 abstract class Composite extends DefaultStockqty
 {
@@ -18,7 +17,6 @@ abstract class Composite extends DefaultStockqty
      * Child products cache
      *
      * @var Product[]
-     * @since 2.0.0
      */
     private $_childProducts;
 
@@ -26,7 +24,6 @@ abstract class Composite extends DefaultStockqty
      * Retrieve child products
      *
      * @return Product[]
-     * @since 2.0.0
      */
     abstract protected function _getChildProducts();
 
@@ -34,7 +31,6 @@ abstract protected function _getChildProducts();
      * Retrieve child products (using cache)
      *
      * @return Product[]
-     * @since 2.0.0
      */
     public function getChildProducts()
     {
@@ -48,7 +44,6 @@ public function getChildProducts()
      * Retrieve id of details table placeholder in template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDetailsPlaceholderId()
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
index 5cb871d486139..ebb6b03c11f4f 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
@@ -10,7 +10,6 @@
  * Product stock qty default block
  *
  * @api
- * @since 2.0.0
  */
 class DefaultStockqty extends AbstractStockqty implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -18,7 +17,6 @@ class DefaultStockqty extends AbstractStockqty implements \Magento\Framework\Dat
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -32,7 +30,6 @@ protected function _toHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/Type/Grouped.php b/app/code/Magento/CatalogInventory/Block/Stockqty/Type/Grouped.php
index 45a32a96ed5cd..1b9ba426fc8a6 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/Type/Grouped.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/Type/Grouped.php
@@ -10,7 +10,6 @@
 
 /**
  * Product stock qty block for grouped product type
- * @since 2.0.0
  */
 class Grouped extends \Magento\CatalogInventory\Block\Stockqty\Composite
 {
@@ -18,7 +17,6 @@ class Grouped extends \Magento\CatalogInventory\Block\Stockqty\Composite
      * Retrieve child products
      *
      * @return Product[]
-     * @since 2.0.0
      */
     protected function _getChildProducts()
     {
diff --git a/app/code/Magento/CatalogInventory/Helper/Data.php b/app/code/Magento/CatalogInventory/Helper/Data.php
index c51d2640e8d99..c18aacd08d6de 100644
--- a/app/code/Magento/CatalogInventory/Helper/Data.php
+++ b/app/code/Magento/CatalogInventory/Helper/Data.php
@@ -8,7 +8,6 @@
 
 /**
  * Catalog Inventory default helper
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
index bdf651b3dc580..baa1a9e02ab9e 100644
--- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
@@ -13,7 +13,6 @@
 
 /**
  * MinSaleQty value manipulation helper
- * @since 2.0.0
  */
 class Minsaleqty
 {
@@ -21,19 +20,16 @@ class Minsaleqty
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -54,7 +50,6 @@ class Minsaleqty
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param GroupManagementInterface $groupManagement
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -73,7 +68,6 @@ public function __construct(
      *
      * @param int|float|string|null $qty
      * @return float|null
-     * @since 2.0.0
      */
     protected function fixQty($qty)
     {
@@ -85,7 +79,6 @@ protected function fixQty($qty)
      *
      * @param int|float|string|array $value
      * @return string
-     * @since 2.0.0
      */
     protected function serializeValue($value)
     {
@@ -113,7 +106,6 @@ protected function serializeValue($value)
      *
      * @param int|float|string $value
      * @return array
-     * @since 2.0.0
      */
     protected function unserializeValue($value)
     {
@@ -131,7 +123,6 @@ protected function unserializeValue($value)
      *
      * @param string|array $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isEncodedArrayFieldValue($value)
     {
@@ -155,7 +146,6 @@ protected function isEncodedArrayFieldValue($value)
      *
      * @param array $value
      * @return array
-     * @since 2.0.0
      */
     protected function encodeArrayFieldValue(array $value)
     {
@@ -172,7 +162,6 @@ protected function encodeArrayFieldValue(array $value)
      *
      * @param array $value
      * @return array
-     * @since 2.0.0
      */
     protected function decodeArrayFieldValue(array $value)
     {
@@ -198,7 +187,6 @@ protected function decodeArrayFieldValue(array $value)
      * @param int $customerGroupId
      * @param null|string|bool|int|Store $store
      * @return float|null
-     * @since 2.0.0
      */
     public function getConfigValue($customerGroupId, $store = null)
     {
@@ -232,7 +220,6 @@ public function getConfigValue($customerGroupId, $store = null)
      *
      * @param string|array $value
      * @return array
-     * @since 2.0.0
      */
     public function makeArrayFieldValue($value)
     {
@@ -248,7 +235,6 @@ public function makeArrayFieldValue($value)
      *
      * @param string|array $value
      * @return string
-     * @since 2.0.0
      */
     public function makeStorableArrayFieldValue($value)
     {
@@ -263,7 +249,6 @@ public function makeStorableArrayFieldValue($value)
      * Return the all customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getAllCustomersGroupId()
     {
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index c4d4fd13f6b71..faa7e6bc32afc 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -17,7 +17,6 @@
 /**
  * Class Stock
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Stock
 {
@@ -25,7 +24,6 @@ class Stock
      * Store model manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -33,25 +31,21 @@ class Stock
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var Status
-     * @since 2.0.0
      */
     protected $stockStatusResource;
 
     /**
      * @var StatusFactory
-     * @since 2.0.0
      */
     protected $stockStatusFactory;
 
     /**
      * @var StockRegistryProviderInterface
-     * @since 2.0.0
      */
     private $stockRegistryProvider;
 
@@ -66,7 +60,6 @@ class Stock
      * @param ScopeConfigInterface $scopeConfig
      * @param StatusFactory $stockStatusFactory
      * @param StockRegistryProviderInterface $stockRegistryProvider
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -86,7 +79,6 @@ public function __construct(
      * @param Product $product
      * @param int $status
      * @return void
-     * @since 2.0.0
      */
     public function assignStatusToProduct(Product $product, $status = null)
     {
@@ -104,7 +96,6 @@ public function assignStatusToProduct(Product $product, $status = null)
      * @param AbstractCollection $productCollection
      * @deprecated 2.1.0 Use Stock::addIsInStockFilterToCollection instead
      * @return void
-     * @since 2.0.0
      */
     public function addStockStatusToProducts(AbstractCollection $productCollection)
     {
@@ -122,7 +113,6 @@ public function addStockStatusToProducts(AbstractCollection $productCollection)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collection
      * @return void
-     * @since 2.0.0
      */
     public function addInStockFilterToCollection($collection)
     {
@@ -155,7 +145,6 @@ public function addInStockFilterToCollection($collection)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return void
-     * @since 2.0.0
      */
     public function addIsInStockFilterToCollection($collection)
     {
@@ -176,7 +165,6 @@ public function addIsInStockFilterToCollection($collection)
 
     /**
      * @return Status
-     * @since 2.0.0
      */
     protected function getStockStatusResource()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
index 0c31feaeb6e84..abaef96a3a2cd 100644
--- a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
+++ b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
@@ -10,20 +10,20 @@
 
 /**
  * Catalog inventory module plugin
- * @since 2.1.0
+ * @since 2.0.9
  */
 class AddStockStatusToCollection
 {
     /**
      * @var \Magento\CatalogInventory\Helper\Stock
-     * @since 2.1.0
+     * @since 2.0.9
      */
     protected $stockHelper;
     
     /**
      * @param \Magento\CatalogInventory\Model\Configuration $configuration
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __construct(
         \Magento\CatalogInventory\Helper\Stock $stockHelper
@@ -36,7 +36,7 @@ public function __construct(
      * @param bool $printQuery
      * @param bool $logQuery
      * @return array
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 7a0388ce31072..da496f7a3d258 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -19,13 +19,11 @@
  * @method \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Item extends \Magento\CatalogInventory\Model\Stock\Item implements IdentityInterface
 {
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -44,7 +42,6 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item implements Identit
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -83,7 +80,6 @@ public function __construct(
      * Getter for customer group id, return default group if not set
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -97,7 +93,6 @@ public function getCustomerGroupId()
      * Check if qty check can be skipped. Skip checking in adminhtml area
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isQtyCheckApplicable()
     {
@@ -108,7 +103,6 @@ protected function _isQtyCheckApplicable()
      * Check if notification message should be added despite of backorders notification flag
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _hasDefaultNotificationMessage()
     {
@@ -117,7 +111,6 @@ protected function _hasDefaultNotificationMessage()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdminArea()
     {
@@ -127,7 +120,6 @@ public function hasAdminArea()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShowDefaultNotificationMessage()
     {
@@ -136,7 +128,6 @@ public function getShowDefaultNotificationMessage()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/AbstractValue.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/AbstractValue.php
index 29145afda7625..acd1e06202531 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/AbstractValue.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/AbstractValue.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogInventory\Model\Config\Backend\AbstractValue
  *
- * @since 2.0.0
  */
 abstract class AbstractValue extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\CatalogInventory\Api\StockIndexInterface
-     * @since 2.0.0
      */
     protected $stockIndex;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $_stockIndexerProcessor;
 
@@ -38,7 +35,6 @@ abstract class AbstractValue extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
index 3d31c789f06a0..1061065baf625 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogInventory\Model\Config\Backend\Backorders
  *
- * @since 2.0.0
  */
 class Backorders extends AbstractValue
 {
@@ -22,7 +21,6 @@ class Backorders extends AbstractValue
      * After change Catalog Inventory Backorders value process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
index e115a1d46783e..40b84019c5cc3 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
@@ -14,14 +14,12 @@
 /**
  * Class \Magento\CatalogInventory\Model\Config\Backend\Managestock
  *
- * @since 2.0.0
  */
 class Managestock extends AbstractValue
 {
     /**
      * After change Catalog Inventory Manage Stock value process
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/ShowOutOfStock.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/ShowOutOfStock.php
index cfa3854ff0d3a..742904f168ff3 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/ShowOutOfStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/ShowOutOfStock.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogInventory\Model\Config\Backend\ShowOutOfStock
  *
- * @since 2.0.0
  */
 class ShowOutOfStock extends AbstractValue
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 38d6c981ad8e6..69d1bbf790fb8 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Configuration
- * @since 2.0.0
  */
 class Configuration implements StockConfigurationInterface
 {
@@ -104,7 +103,6 @@ class Configuration implements StockConfigurationInterface
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -112,13 +110,11 @@ class Configuration implements StockConfigurationInterface
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var MinsaleqtyHelper
-     * @since 2.0.0
      */
     protected $minsaleqtyHelper;
 
@@ -126,13 +122,11 @@ class Configuration implements StockConfigurationInterface
      * All product types registry in scope of quantity availability
      *
      * @var array
-     * @since 2.0.0
      */
     protected $isQtyTypeIds;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -141,7 +135,6 @@ class Configuration implements StockConfigurationInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param MinsaleqtyHelper $minsaleqtyHelper
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $config,
@@ -157,7 +150,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultScopeId()
     {
@@ -169,7 +161,6 @@ public function getDefaultScopeId()
     /**
      * @param int|null $filter
      * @return array
-     * @since 2.0.0
      */
     public function getIsQtyTypeIds($filter = null)
     {
@@ -193,7 +184,6 @@ public function getIsQtyTypeIds($filter = null)
     /**
      * @param int $productTypeId
      * @return bool
-     * @since 2.0.0
      */
     public function isQty($productTypeId)
     {
@@ -206,7 +196,6 @@ public function isQty($productTypeId)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSubtractQty($store = null)
     {
@@ -220,7 +209,6 @@ public function canSubtractQty($store = null)
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float
-     * @since 2.0.0
      */
     public function getMinQty($store = null)
     {
@@ -235,7 +223,6 @@ public function getMinQty($store = null)
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @param int $customerGroupId
      * @return float
-     * @since 2.0.0
      */
     public function getMinSaleQty($store = null, $customerGroupId = null)
     {
@@ -245,7 +232,6 @@ public function getMinSaleQty($store = null, $customerGroupId = null)
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float|null
-     * @since 2.0.0
      */
     public function getMaxSaleQty($store = null)
     {
@@ -259,7 +245,6 @@ public function getMaxSaleQty($store = null)
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float
-     * @since 2.0.0
      */
     public function getNotifyStockQty($store = null)
     {
@@ -276,7 +261,6 @@ public function getNotifyStockQty($store = null)
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEnableQtyIncrements($store = null)
     {
@@ -290,7 +274,6 @@ public function getEnableQtyIncrements($store = null)
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getQtyIncrements($store = null)
     {
@@ -306,7 +289,6 @@ public function getQtyIncrements($store = null)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getBackorders($store = null)
     {
@@ -322,7 +304,6 @@ public function getBackorders($store = null)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getManageStock($store = null)
     {
@@ -339,7 +320,6 @@ public function getManageStock($store = null)
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanBackInStock($store = null)
     {
@@ -355,7 +335,6 @@ public function getCanBackInStock($store = null)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isShowOutOfStock($store = null)
     {
@@ -371,7 +350,6 @@ public function isShowOutOfStock($store = null)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isAutoReturnEnabled($store = null)
     {
@@ -388,7 +366,6 @@ public function isAutoReturnEnabled($store = null)
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayProductStockStatus($store = null)
     {
@@ -403,7 +380,6 @@ public function isDisplayProductStockStatus($store = null)
      * @param string $field
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultConfigValue($field, $store = null)
     {
@@ -432,7 +408,6 @@ public function getStockThresholdQty($store = null)
      * Retrieve inventory item options (used in config)
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getConfigItemOptions()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock.php
index 09036405f1b85..cb1bfd851c6b8 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock.php
@@ -10,31 +10,27 @@
 /**
  * Class \Magento\CatalogInventory\Model\Indexer\Stock
  *
- * @since 2.0.0
  */
 class Stock implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Row
-     * @since 2.0.0
      */
     protected $_productStockIndexerRow;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Rows
-     * @since 2.0.0
      */
     protected $_productStockIndexerRows;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Full
-     * @since 2.0.0
      */
     protected $_productStockIndexerFull;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheContext;
 
@@ -42,7 +38,6 @@ class Stock implements \Magento\Framework\Indexer\ActionInterface, \Magento\Fram
      * @param Stock\Action\Row $productStockIndexerRow
      * @param Stock\Action\Rows $productStockIndexerRows
      * @param Stock\Action\Full $productStockIndexerFull
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Model\Indexer\Stock\Action\Row $productStockIndexerRow,
@@ -60,7 +55,6 @@ public function __construct(
      * @param int[] $ids
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -72,7 +66,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -91,7 +84,6 @@ public function executeFull()
      * @param int[] $ids
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -104,7 +96,6 @@ public function executeList(array $ids)
      * @param int $id
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -115,8 +106,8 @@ public function executeRow($id)
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
index 4788ea835e0a9..3e1ccba58a39c 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
@@ -15,7 +15,6 @@
  * Abstract action reindex class
  *
  * @package Magento\CatalogInventory\Model\Indexer\Stock
- * @since 2.0.0
  */
 abstract class AbstractAction
 {
@@ -23,25 +22,21 @@ abstract class AbstractAction
      * Resource instance
      *
      * @var Resource
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory
-     * @since 2.0.0
      */
     protected $_indexerFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_catalogProductType;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -50,7 +45,6 @@ abstract class AbstractAction
      * Sorted by priority
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_indexers = [];
 
@@ -58,19 +52,16 @@ abstract class AbstractAction
      * Flag that defines if need to use "_idx" index table suffix instead of "_tmp"
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isNeedUseIdxTable = false;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.0.0
      */
     private $cacheContext;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     private $eventManager;
 
@@ -86,7 +77,6 @@ abstract class AbstractAction
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Indexer\CacheContext $cacheContext
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -108,7 +98,6 @@ public function __construct(
      * @param array|int $ids
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function execute($ids);
 
@@ -116,7 +105,6 @@ abstract public function execute($ids);
      * Retrieve connection instance
      *
      * @return bool|\Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function _getConnection()
     {
@@ -130,7 +118,6 @@ protected function _getConnection()
      * Retrieve Stock Indexer Models per Product Type
      *
      * @return \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface[]
-     * @since 2.0.0
      */
     protected function _getTypeIndexers()
     {
@@ -153,7 +140,6 @@ protected function _getTypeIndexers()
      *
      * @param string $entityName
      * @return string
-     * @since 2.0.0
      */
     protected function _getTable($entityName)
     {
@@ -165,7 +151,6 @@ protected function _getTable($entityName)
      *
      * @param int|array $childIds
      * @return array
-     * @since 2.0.0
      */
     public function getRelationsByChild($childIds)
     {
@@ -181,7 +166,6 @@ public function getRelationsByChild($childIds)
      * Reindex all
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -199,7 +183,6 @@ public function reindexAll()
      * Synchronize data between index storage and original storage
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _syncData()
     {
@@ -221,7 +204,6 @@ protected function _syncData()
      * @param string $tableName
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _deleteOldRelations($tableName)
     {
@@ -243,7 +225,6 @@ protected function _deleteOldRelations($tableName)
      *
      * @param array $productIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _reindexRows($productIds = [])
     {
@@ -308,7 +289,6 @@ private function getCacheCleaner()
      *
      * @param bool|null $value
      * @return bool
-     * @since 2.0.0
      */
     public function useIdxTable($value = null)
     {
@@ -322,7 +302,6 @@ public function useIdxTable($value = null)
      * Retrieve temporary index table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getIdxTable()
     {
@@ -336,7 +315,6 @@ protected function _getIdxTable()
      * Clean up temporary index table
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearTemporaryIndexTable()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index 13f22b4a922b8..4ec526c1e20b4 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -27,7 +27,6 @@
  *
  * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Full extends AbstractAction
 {
@@ -120,7 +119,6 @@ public function __construct(
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($ids = null)
     {
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 ee19e31c33236..c7dfcffee3d31 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
@@ -12,7 +12,6 @@
  * Class Row reindex action
  *
  * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
- * @since 2.0.0
  */
 class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
@@ -23,7 +22,6 @@ class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute($id = null)
     {
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 c9c177ea1d066..f107955f0201e 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
@@ -12,7 +12,6 @@
  * Class Rows reindex action for mass actions
  *
  * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
- * @since 2.0.0
  */
 class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
@@ -23,7 +22,6 @@ class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
index 8baca68fd23ff..ef3f055e24017 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogInventory\Model\Indexer\Stock\Plugin\StoreGroup
  *
- * @since 2.0.0
  */
 class StoreGroup
 {
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $_indexerProcessor;
 
     /**
      * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor  $indexerProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Processor $indexerProcessor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Proces
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(
         \Magento\Store\Model\ResourceModel\Group $subject,
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
index 996cc8f059ecd..96e54145dbd35 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CatalogInventory\Model\Indexer\Stock\Processor
  *
- * @since 2.0.0
  */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/AfterProductLoad.php b/app/code/Magento/CatalogInventory/Model/Plugin/AfterProductLoad.php
index aa130e57afc12..b12e486fb0822 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/AfterProductLoad.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/AfterProductLoad.php
@@ -11,19 +11,16 @@
  * @see StockItemInterface when you want to change the stock data
  * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
  * @see StockItemRepositoryInterface::save as extension point for customization of saving process
- * @since 2.0.0
  */
 class AfterProductLoad
 {
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     private $stockRegistry;
 
     /**
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -36,7 +33,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function afterLoad(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php b/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php
index 871f0a7fa86b5..27575fa955232 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php
@@ -17,7 +17,6 @@
  * @see StockItemInterface when you want to change the stock data
  * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
  * @see StockItemRepositoryInterface::save as extension point for customization of saving process
- * @since 2.0.0
  */
 class AroundProductRepositorySave
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
index 2bccbde200917..a9d68424dbc1b 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute
  *
- * @since 2.0.0
  */
 class FilterCustomAttribute
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $blackList;
 
     /**
      * @param array $blackList
-     * @since 2.0.0
      */
     public function __construct(array $blackList = [])
     {
@@ -39,7 +36,6 @@ public function __construct(array $blackList = [])
      * @return \Magento\Eav\Model\AttributeRepository
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
index 496861748dfa7..bcfcdb9ac61af 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogInventory\Model\Plugin\Layer
  *
- * @since 2.0.0
  */
 class Layer
 {
@@ -16,7 +15,6 @@ class Layer
      * Stock status instance
      *
      * @var \Magento\CatalogInventory\Helper\Stock
-     * @since 2.0.0
      */
     protected $stockHelper;
 
@@ -24,14 +22,12 @@ class Layer
      * Store config instance
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Helper\Stock $stockHelper,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforePrepareProductCollection(
         \Magento\Catalog\Model\Layer $subject,
@@ -65,7 +60,6 @@ public function beforePrepareProductCollection(
      * Get config value for 'display out of stock' option
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isEnabledShowOutOfStock()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Product/CopyConstructor/CatalogInventory.php b/app/code/Magento/CatalogInventory/Model/Product/CopyConstructor/CatalogInventory.php
index 835baca220636..9dd37276d8d65 100644
--- a/app/code/Magento/CatalogInventory/Model/Product/CopyConstructor/CatalogInventory.php
+++ b/app/code/Magento/CatalogInventory/Model/Product/CopyConstructor/CatalogInventory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogInventory\Model\Product\CopyConstructor\CatalogInventory
  *
- * @since 2.0.0
  */
 class CatalogInventory implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -34,7 +31,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 7a98958667fa1..3667836bdf75c 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -19,31 +19,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class QuantityValidator
 {
     /**
      * @var QuantityValidator\Initializer\Option
-     * @since 2.0.0
      */
     protected $optionInitializer;
 
     /**
      * @var QuantityValidator\Initializer\StockItem
-     * @since 2.0.0
      */
     protected $stockItemInitializer;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
@@ -53,7 +48,6 @@ class QuantityValidator
      * @param StockRegistryInterface $stockRegistry
      * @param StockStateInterface $stockState
      * @return void
-     * @since 2.0.0
      */
     public function __construct(
         Option $optionInitializer,
@@ -102,7 +96,6 @@ private function addErrorInfoToQuote($result, $quoteItem)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function validate(Observer $observer)
     {
@@ -229,7 +222,6 @@ public function validate(Observer $observer)
      * @param \Magento\Quote\Model\Quote\Item $item
      * @param int $code
      * @return void
-     * @since 2.0.0
      */
     protected function _removeErrorsFromQuoteAndItem($item, $code)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
index 72334503db8fe..d3fbf1cb35f0b 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option
  *
- * @since 2.0.0
  */
 class Option
 {
     /**
      * @var QuoteItemQtyList
-     * @since 2.0.0
      */
     protected $quoteItemQtyList;
 
     /**
      * @var StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
@@ -38,7 +34,6 @@ class Option
      * @param QuoteItemQtyList $quoteItemQtyList
      * @param StockRegistryInterface $stockRegistry
      * @param StockStateInterface $stockState
-     * @since 2.0.0
      */
     public function __construct(
         QuoteItemQtyList $quoteItemQtyList,
@@ -58,7 +53,6 @@ public function __construct(
      *
      * @return \Magento\CatalogInventory\Model\Stock\Item
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getStockItem(
         \Magento\Quote\Model\Quote\Item\Option $option,
@@ -94,7 +88,6 @@ public function getStockItem(
      *
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function initialize(
         \Magento\Quote\Model\Quote\Item\Option $option,
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessor.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessor.php
index e414dfde8cf3d..68ab1dcf4510e 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessor.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessor.php
@@ -10,25 +10,21 @@
 
 /**
  * @deprecated 2.2.0 No more used
- * @since 2.0.0
  */
 class QtyProcessor
 {
     /**
      * @var QuoteItemQtyList
-     * @since 2.0.0
      */
     protected $quoteItemQtyList;
 
     /**
      * @var Item
-     * @since 2.0.0
      */
     protected $item;
 
     /**
      * @param QuoteItemQtyList $quoteItemQtyList
-     * @since 2.0.0
      */
     public function __construct(QuoteItemQtyList $quoteItemQtyList)
     {
@@ -39,7 +35,6 @@ public function __construct(QuoteItemQtyList $quoteItemQtyList)
      * @param Item $quoteItem
      * @return $this
      * @deprecated 2.2.0 No more used
-     * @since 2.0.0
      */
     public function setItem(Item $quoteItem)
     {
@@ -51,7 +46,6 @@ public function setItem(Item $quoteItem)
      * @param float $qty
      * @return float|int
      * @deprecated 2.2.0 No more used
-     * @since 2.0.0
      */
     public function getRowQty($qty)
     {
@@ -66,7 +60,6 @@ public function getRowQty($qty)
      * @param int $qty
      * @return int
      * @deprecated 2.2.0 No more used
-     * @since 2.0.0
      */
     public function getQtyForCheck($qty)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
index abccb83fbaa8b..1134291a5bf1a 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\StockItem
  *
- * @since 2.0.0
  */
 class StockItem
 {
     /**
      * @var QuoteItemQtyList
-     * @since 2.0.0
      */
     protected $quoteItemQtyList;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $typeConfig;
 
     /**
      * @var StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
@@ -38,7 +34,6 @@ class StockItem
      * @param ConfigInterface $typeConfig
      * @param QuoteItemQtyList $quoteItemQtyList
      * @param StockStateInterface $stockState
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $typeConfig,
@@ -61,7 +56,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function initialize(
         \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem,
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php
index 41c907ae88b69..dbde4cc345431 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList
  *
- * @since 2.0.0
  */
 class QuoteItemQtyList
 {
@@ -17,7 +16,6 @@ class QuoteItemQtyList
      * data is valid if you check quote item qty and use singleton instance
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_checkedQuoteItems = [];
 
@@ -31,7 +29,6 @@ class QuoteItemQtyList
      * @param float $itemQty
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQty($productId, $quoteItemId, $quoteId, $itemQty)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
index ed5abe4fd696a..5b4b7c5a8a7dd 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
@@ -17,7 +17,6 @@
  * CatalogInventory Default Stock Status Indexer Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class DefaultStock extends AbstractIndexer implements StockInterface
 {
@@ -25,7 +24,6 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * Current Product Type Id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_typeId;
 
@@ -33,7 +31,6 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * Product Type is composite flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = false;
 
@@ -41,7 +38,6 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -73,7 +69,6 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -90,7 +85,6 @@ public function __construct(
      * Initialize connection and define main table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -102,7 +96,6 @@ protected function _construct()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -123,7 +116,6 @@ public function reindexAll()
      *
      * @param int|array $entityIds
      * @return $this
-     * @since 2.0.0
      */
     public function reindexEntity($entityIds)
     {
@@ -166,7 +158,6 @@ public function setActionType($type)
      *
      * @param string $typeId
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeId($typeId)
     {
@@ -179,7 +170,6 @@ public function setTypeId($typeId)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getTypeId()
     {
@@ -194,7 +184,6 @@ public function getTypeId()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsComposite($flag)
     {
@@ -207,7 +196,6 @@ public function setIsComposite($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsComposite()
     {
@@ -218,7 +206,6 @@ public function getIsComposite()
      * Retrieve is Global Manage Stock enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isManageStock()
     {
@@ -235,7 +222,6 @@ protected function _isManageStock()
      * @param bool $usePrimaryTable use primary or temporary index table
      * @return \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
@@ -283,7 +269,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
      *
      * @param int|array $entityIds the product limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIndexTable($entityIds = null)
     {
@@ -301,7 +286,6 @@ protected function _prepareIndexTable($entityIds = null)
      *
      * @param array|int $entityIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateIndex($entityIds)
     {
@@ -354,7 +338,6 @@ private function deleteOldRecords(array $ids)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateIndexTable($data)
     {
@@ -374,7 +357,6 @@ protected function _updateIndexTable($data)
      * @param string $table
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdxTable($table = null)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
index 94ec070fb8198..40bdc6b7809d9 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
@@ -8,7 +8,6 @@
 /**
  * CatalogInventory Stock Indexer Interface
  * @api
- * @since 2.0.0
  */
 interface StockInterface
 {
@@ -16,7 +15,6 @@ interface StockInterface
      * Reindex all stock status data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reindexAll();
 
@@ -25,7 +23,6 @@ public function reindexAll();
      *
      * @param int|array $entityIds
      * @return $this
-     * @since 2.0.0
      */
     public function reindexEntity($entityIds);
 
@@ -34,7 +31,6 @@ public function reindexEntity($entityIds);
      *
      * @param string $typeId
      * @return $this
-     * @since 2.0.0
      */
     public function setTypeId($typeId);
 
@@ -43,7 +39,6 @@ public function setTypeId($typeId);
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getTypeId();
 }
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
index b91d5580dc171..016e7a17eb2ac 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class StockFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -25,13 +23,11 @@ class StockFactory
      * Default Stock Indexer resource model name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultIndexer = \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock::class;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($indexerClassName = '', array $data = [])
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
index c983dc302aa1e..52bffc92cdc1f 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
@@ -14,13 +14,13 @@
 
 /**
  * Class StockStatusBaseSelectProcessor
- * @since 2.2.0
+ * @since 2.1.3
  */
 class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resource;
 
@@ -33,7 +33,7 @@ class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
     /**
      * @param ResourceConnection $resource
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface|null $stockConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ResourceConnection $resource,
@@ -49,7 +49,7 @@ public function __construct(
      *
      * @param Select $select
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(Select $select)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/QtyCounterInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/QtyCounterInterface.php
index 7c34101d0ea65..d127db245a22f 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/QtyCounterInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/QtyCounterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Correct particular stock products qty
- * @since 2.0.0
  */
 interface QtyCounterInterface
 {
@@ -18,7 +17,6 @@ interface QtyCounterInterface
      * @param int $websiteId
      * @param string $operator +/-
      * @return void
-     * @since 2.0.0
      */
     public function correctItemsQty(array $items, $websiteId, $operator);
 }
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
index 2459689beba11..62ce1d9086498 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -11,13 +11,11 @@
 
 /**
  * Stock resource model
- * @since 2.0.0
  */
 class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements QtyCounterInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -25,7 +23,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Is initialized configuration flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isConfig;
 
@@ -33,7 +30,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Manage Stock flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isConfigManageStock;
 
@@ -41,7 +37,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Backorders
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isConfigBackorders;
 
@@ -49,7 +44,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Minimum quantity allowed in shopping card
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_configMinQty;
 
@@ -57,7 +51,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Product types that could have quantities
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configTypeIds;
 
@@ -65,7 +58,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Notify for quantity below _configNotifyStockQty value
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_configNotifyStockQty;
 
@@ -73,20 +65,17 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var StoreManagerInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -97,7 +86,6 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
      * @param StockConfigurationInterface $stockConfiguration
      * @param StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -118,7 +106,6 @@ public function __construct(
      * Define main table and initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -131,7 +118,6 @@ protected function _construct()
      * @param int[] $productIds
      * @param int $websiteId
      * @return array
-     * @since 2.0.0
      */
     public function lockProductsStock($productIds, $websiteId)
     {
@@ -160,7 +146,6 @@ public function lockProductsStock($productIds, $websiteId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function correctItemsQty(array $items, $websiteId, $operator)
     {
@@ -188,7 +173,6 @@ public function correctItemsQty(array $items, $websiteId, $operator)
      * Load some inventory configuration settings
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initConfig()
     {
@@ -218,7 +202,6 @@ protected function _initConfig()
      * @param string|int $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function updateSetOutOfStock($website = null)
     {
@@ -254,7 +237,6 @@ public function updateSetOutOfStock($website = null)
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function updateSetInStock($website)
     {
@@ -288,7 +270,6 @@ public function updateSetInStock($website)
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function updateLowStockDate($website)
     {
@@ -326,7 +307,6 @@ public function updateLowStockDate($website)
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param array $fields
      * @return $this
-     * @since 2.0.0
      */
     public function addLowStockFilter(\Magento\Catalog\Model\ResourceModel\Product\Collection $collection, $fields)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Collection.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Collection.php
index 139f12946ac70..0dbd6a1e94270 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Collection.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Collection.php
@@ -12,13 +12,11 @@
 /**
  * Class Collection
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock
- * @since 2.0.0
  */
 class Collection extends AbstractSearchResult implements StockCollectionInterface
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
index a480d0b04b1a7..895fffaa4f80b 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
@@ -13,7 +13,6 @@
 
 /**
  * Stock item resource model
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,13 +20,11 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Whether index events should be processed immediately
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $processIndexEvents = true;
 
     /**
      * @var Processor
-     * @since 2.0.0
      */
     protected $stockIndexerProcessor;
 
@@ -35,7 +32,6 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param Processor $processor
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Define main table and initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +59,6 @@ protected function _construct()
      * @param int $productId
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByProductId(\Magento\CatalogInventory\Api\Data\StockItemInterface $item, $productId, $stockId)
     {
@@ -87,7 +81,6 @@ public function loadByProductId(\Magento\CatalogInventory\Api\Data\StockItemInte
      * @param int $value
      * @param \Magento\CatalogInventory\Model\Stock\Item $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -102,7 +95,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param \Magento\Framework\DataObject $object
      * @param string $table
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareDataForTable(\Magento\Framework\DataObject $object, $table)
     {
@@ -125,7 +117,6 @@ protected function _prepareDataForTable(\Magento\Framework\DataObject $object, $
      *
      * @param AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -142,7 +133,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param bool $process
      * @return $this
-     * @since 2.0.0
      */
     public function setProcessIndexEvents($process = true)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/Collection.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/Collection.php
index 0d041cf910102..56aa2fb891237 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/Collection.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/Collection.php
@@ -12,13 +12,11 @@
 /**
  * Class Collection
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock\Item
- * @since 2.0.0
  */
 class Collection extends AbstractSearchResult implements StockItemCollectionInterface
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
index b0b02e71f70bf..fd67b0f82a5bd 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
@@ -12,13 +12,11 @@
 
 /**
  * Class StockItemCriteria
- * @since 2.0.0
  */
 class StockItemCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockItemCriteriaInterface
 {
     /**
      * @param string $mapper
-     * @since 2.0.0
      */
     public function __construct($mapper = '')
     {
@@ -28,7 +26,6 @@ public function __construct($mapper = '')
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setStockStatus($storeId = null)
     {
@@ -38,7 +35,6 @@ public function setStockStatus($storeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setStockFilter($stock)
     {
@@ -48,7 +44,6 @@ public function setStockFilter($stock)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setScopeFilter($scope)
     {
@@ -58,7 +53,6 @@ public function setScopeFilter($scope)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setProductsFilter($products)
     {
@@ -68,7 +62,6 @@ public function setProductsFilter($products)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setManagedFilter($isStockManagedInConfig)
     {
@@ -78,7 +71,6 @@ public function setManagedFilter($isStockManagedInConfig)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setQtyFilter($comparisonMethod, $qty)
     {
@@ -91,7 +83,6 @@ public function setQtyFilter($comparisonMethod, $qty)
      *
      * @param \Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria
      * @return bool
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
index 6f12ebb17ca6e..5d6abfc5c1b75 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
@@ -19,7 +19,6 @@
  * Interface StockItemCriteriaMapper
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock\Status
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockItemCriteriaMapper extends GenericMapper
 {
@@ -43,7 +42,6 @@ class StockItemCriteriaMapper extends GenericMapper
      * @param StoreManagerInterface $storeManager
      * @param MapperFactory $mapperFactory
      * @param Select $select
-     * @since 2.0.0
      */
     public function __construct(
         Logger $logger,
@@ -59,7 +57,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
@@ -69,7 +66,6 @@ protected function init()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function mapInitialCondition()
     {
@@ -82,7 +78,6 @@ public function mapInitialCondition()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function mapStockFilter($stock)
     {
@@ -94,7 +89,6 @@ public function mapStockFilter($stock)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function mapWebsiteFilter($website)
     {
@@ -106,7 +100,6 @@ public function mapWebsiteFilter($website)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function mapProductsFilter($products)
     {
@@ -130,7 +123,6 @@ public function mapProductsFilter($products)
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function mapStockStatus($storeId = null)
     {
@@ -149,7 +141,6 @@ public function mapStockStatus($storeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function mapManagedFilter($isStockManagedInConfig)
     {
@@ -163,7 +154,6 @@ public function mapManagedFilter($isStockManagedInConfig)
     /**
      * @inheritdoc
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function mapQtyFilter($comparisonMethod, $qty)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index f1c032587e584..76baac07de919 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -12,7 +12,6 @@
 /**
  * CatalogInventory Stock Status per website Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -29,13 +27,11 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Website model factory
      *
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -51,7 +47,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -71,7 +66,6 @@ public function __construct(
      * Resource model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -87,7 +81,6 @@ protected function _construct()
      * @param int|null $websiteId
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function saveProductStatus(
         $productId,
@@ -132,7 +125,6 @@ public function saveProductStatus(
      * @param int $websiteId
      * @param int $stockId
      * @return array
-     * @since 2.0.0
      */
     public function getProductsStockStatuses($productIds, $websiteId, $stockId = Stock::DEFAULT_STOCK_ID)
     {
@@ -153,7 +145,6 @@ public function getProductsStockStatuses($productIds, $websiteId, $stockId = Sto
      * Return array as key website_id, value store_id
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteStores()
     {
@@ -167,7 +158,6 @@ public function getWebsiteStores()
      *
      * @param array|int $productIds
      * @return array
-     * @since 2.0.0
      */
     public function getProductsType($productIds)
     {
@@ -192,7 +182,6 @@ public function getProductsType($productIds)
      * @param int $lastEntityId
      * @param int $limit
      * @return array
-     * @since 2.0.0
      */
     public function getProductCollection($lastEntityId = 0, $limit = 1000)
     {
@@ -213,7 +202,6 @@ public function getProductCollection($lastEntityId = 0, $limit = 1000)
      * @param \Magento\Store\Model\Website $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return Status
-     * @since 2.0.0
      */
     public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Magento\Store\Model\Website $website)
     {
@@ -231,7 +219,7 @@ public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Ma
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param bool $isFilterInStock
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function addStockDataToCollection($collection, $isFilterInStock)
     {
@@ -266,7 +254,6 @@ public function addStockDataToCollection($collection, $isFilterInStock)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function addIsInStockFilterToCollection($collection)
     {
@@ -299,7 +286,6 @@ public function addIsInStockFilterToCollection($collection)
      * @param int[] $productIds
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getProductStatus($productIds, $storeId = null)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/Collection.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/Collection.php
index a129758b2f0bb..408f42f6a8c58 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/Collection.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/Collection.php
@@ -12,13 +12,11 @@
 /**
  * Class Collection
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock\Status
- * @since 2.0.0
  */
 class Collection extends AbstractSearchResult implements StockStatusCollectionInterface
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index f8f0269c0c156..563a36194c990 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -12,13 +12,11 @@
 
 /**
  * Class StockStatusCriteria
- * @since 2.0.0
  */
 class StockStatusCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockStatusCriteriaInterface
 {
     /**
      * @param string $mapper
-     * @since 2.0.0
      */
     public function __construct($mapper = '')
     {
@@ -28,7 +26,6 @@ public function __construct($mapper = '')
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setScopeFilter($scope)
     {
@@ -37,7 +34,6 @@ public function setScopeFilter($scope)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setProductsFilter($products)
     {
@@ -46,7 +42,6 @@ public function setProductsFilter($products)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setQtyFilter($qty)
     {
@@ -55,7 +50,6 @@ public function setQtyFilter($qty)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteriaMapper.php
index e5218b6b9d0da..820ccc7ff5cfb 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteriaMapper.php
@@ -11,13 +11,11 @@
 /**
  * Class StockStatusCriteriaMapper
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock\Status
- * @since 2.0.0
  */
 class StockStatusCriteriaMapper extends GenericMapper
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
@@ -28,7 +26,6 @@ protected function init()
      * Apply initial query parameters
      *
      * @return void
-     * @since 2.0.0
      */
     public function mapInitialCondition()
     {
@@ -44,7 +41,6 @@ public function mapInitialCondition()
      *
      * @param int|\Magento\Store\Model\Website $website
      * @return void
-     * @since 2.0.0
      */
     public function mapWebsiteFilter($website)
     {
@@ -59,7 +55,6 @@ public function mapWebsiteFilter($website)
      *
      * @param int|array|\Magento\Catalog\Model\Product|\Magento\Catalog\Model\Product[] $products
      * @return void
-     * @since 2.0.0
      */
     public function mapProductsFilter($products)
     {
@@ -85,7 +80,6 @@ public function mapProductsFilter($products)
      *
      * @param float|int $qty
      * @return void
-     * @since 2.0.0
      */
     public function mapQtyFilter($qty)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteria.php
index c17dc4d8788e0..60fa22e3c6781 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteria.php
@@ -9,13 +9,11 @@
 
 /**
  * Class StockCriteria
- * @since 2.0.0
  */
 class StockCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockCriteriaInterface
 {
     /**
      * @param string $mapper
-     * @since 2.0.0
      */
     public function __construct($mapper = '')
     {
@@ -26,7 +24,6 @@ public function __construct($mapper = '')
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setScopeFilter($scope)
     {
@@ -39,7 +36,6 @@ public function setScopeFilter($scope)
      *
      * @param \Magento\CatalogInventory\Api\StockCriteriaInterface $criteria
      * @return bool
-     * @since 2.0.0
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockCriteriaInterface $criteria)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteriaMapper.php
index 388a72fcc13fd..33eee7dff10ad 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteriaMapper.php
@@ -11,13 +11,11 @@
 /**
  * Class StockCriteriaMapper
  * @package Magento\CatalogInventory\Model\ResourceModel\Stock
- * @since 2.0.0
  */
 class StockCriteriaMapper extends GenericMapper
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function init()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
index f9074b4cb6f31..4bdedac279b67 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
@@ -8,13 +8,11 @@
 /**
  * Back orders source class
  * @api
- * @since 2.0.0
  */
 class Backorders implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Stock.php b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
index 7ee4857f59bf3..0a3e8db196567 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
@@ -10,7 +10,6 @@
 /**
  * CatalogInventory Stock source model
  * @api
- * @since 2.0.0
  */
 class Stock extends AbstractSource
 {
@@ -18,7 +17,6 @@ class Stock extends AbstractSource
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
index 44b77dd487840..f711268bc7930 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
@@ -7,14 +7,12 @@
 
 /**
  * Interface StockRegistryProviderInterface
- * @since 2.0.0
  */
 interface StockRegistryProviderInterface
 {
     /**
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function getStock($scopeId);
 
@@ -22,7 +20,6 @@ public function getStock($scopeId);
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem($productId, $scopeId);
 
@@ -30,7 +27,6 @@ public function getStockItem($productId, $scopeId);
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function getStockStatus($productId, $scopeId);
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
index 97d4901263c51..89fb54e7e496b 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
@@ -9,21 +9,18 @@
 
 /**
  * Interface StockStateProviderInterface
- * @since 2.0.0
  */
 interface StockStateProviderInterface
 {
     /**
      * @param StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     public function verifyStock(StockItemInterface $stockItem);
 
     /**
      * @param StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     public function verifyNotification(StockItemInterface $stockItem);
 
@@ -33,7 +30,6 @@ public function verifyNotification(StockItemInterface $stockItem);
      * @param int|float $qtyToCheck
      * @param int|float $origQty
      * @return int
-     * @since 2.0.0
      */
     public function checkQuoteItemQty(StockItemInterface $stockItem, $itemQty, $qtyToCheck, $origQty = 0);
 
@@ -44,7 +40,6 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $itemQty, $qtyT
      * @param int|float $qty
      * @exception \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function checkQty(StockItemInterface $stockItem, $qty);
 
@@ -55,7 +50,6 @@ public function checkQty(StockItemInterface $stockItem, $qty);
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @return int|float
-     * @since 2.0.0
      */
     public function suggestQty(StockItemInterface $stockItem, $qty);
 
@@ -63,7 +57,6 @@ public function suggestQty(StockItemInterface $stockItem, $qty);
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function checkQtyIncrements(StockItemInterface $stockItem, $qty);
 
@@ -72,7 +65,6 @@ public function checkQtyIncrements(StockItemInterface $stockItem, $qty);
      *
      * @param StockItemInterface $stockItem
      * @return float
-     * @since 2.0.0
      */
     public function getStockQty(StockItemInterface $stockItem);
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock.php b/app/code/Magento/CatalogInventory/Model/Stock.php
index e66379b3973fc..f36d49f632fa1 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock.php
@@ -11,7 +11,6 @@
 /**
  * Class Stock
  *
- * @since 2.0.0
  */
 class Stock extends AbstractExtensibleModel implements StockInterface
 {
@@ -56,7 +55,6 @@ class Stock extends AbstractExtensibleModel implements StockInterface
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +67,6 @@ protected function _construct()
      * Retrieve stock identifier
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStockId()
     {
@@ -80,7 +77,6 @@ public function getStockId()
      * Retrieve website identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -91,7 +87,6 @@ public function getWebsiteId()
      * Retrieve Stock Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStockName()
     {
@@ -103,7 +98,6 @@ public function getStockName()
      *
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId)
     {
@@ -115,7 +109,6 @@ public function setStockId($stockId)
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -127,7 +120,6 @@ public function setWebsiteId($websiteId)
      *
      * @param string $stockName
      * @return $this
-     * @since 2.0.0
      */
     public function setStockName($stockName)
     {
@@ -138,7 +130,6 @@ public function setStockName($stockName)
      * {@inheritdoc}
      *
      * @return \Magento\CatalogInventory\Api\Data\StockExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -150,7 +141,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\CatalogInventory\Api\Data\StockExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index c83d158babf47..15200cf453d43 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -19,7 +19,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Item extends AbstractExtensibleModel implements StockItemInterface
 {
@@ -52,31 +51,26 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      * Store model manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockItemRepository;
 
     /**
      * @var float|false
-     * @since 2.0.0
      */
     protected $qtyIncrements;
 
@@ -84,7 +78,6 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      * Store id
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $storeId;
 
@@ -92,13 +85,11 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      * Customer group id
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $customerGroupId;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
@@ -116,7 +107,6 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -152,7 +142,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -161,7 +150,6 @@ protected function _construct()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getItemId()
     {
@@ -172,7 +160,6 @@ public function getItemId()
      * Retrieve Website Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -187,7 +174,6 @@ public function getWebsiteId()
      * Retrieve stock identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStockId()
     {
@@ -202,7 +188,6 @@ public function getStockId()
      * Retrieve Product Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -212,7 +197,6 @@ public function getProductId()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getStockStatusChangedAuto()
     {
@@ -221,7 +205,6 @@ public function getStockStatusChangedAuto()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -232,7 +215,6 @@ public function getQty()
      * Retrieve Stock Availability
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function getIsInStock()
     {
@@ -245,7 +227,6 @@ public function getIsInStock()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsQtyDecimal()
     {
@@ -255,7 +236,6 @@ public function getIsQtyDecimal()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsDecimalDivided()
     {
@@ -264,7 +244,6 @@ public function getIsDecimalDivided()
 
     /**
      * @return string Timestamp
-     * @since 2.0.0
      */
     public function getLowStockDate()
     {
@@ -276,7 +255,6 @@ public function getLowStockDate()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShowDefaultNotificationMessage()
     {
@@ -286,7 +264,6 @@ public function getShowDefaultNotificationMessage()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigMinQty()
     {
@@ -297,7 +274,6 @@ public function getUseConfigMinQty()
      * Retrieve minimal quantity available for item status in stock
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinQty()
     {
@@ -312,7 +288,6 @@ public function getMinQty()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigMinSaleQty()
     {
@@ -323,7 +298,6 @@ public function getUseConfigMinSaleQty()
      * Retrieve Minimum Qty Allowed in Shopping Cart or NULL when there is no limitation
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMinSaleQty()
     {
@@ -339,7 +313,6 @@ public function getMinSaleQty()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigMaxSaleQty()
     {
@@ -350,7 +323,6 @@ public function getUseConfigMaxSaleQty()
      * Retrieve Maximum Qty Allowed in Shopping Cart data wrapper
      *
      * @return float
-     * @since 2.0.0
      */
     public function getMaxSaleQty()
     {
@@ -366,7 +338,6 @@ public function getMaxSaleQty()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigNotifyStockQty()
     {
@@ -377,7 +348,6 @@ public function getUseConfigNotifyStockQty()
      * Retrieve Notify for Quantity Below data wrapper
      *
      * @return float
-     * @since 2.0.0
      */
     public function getNotifyStockQty()
     {
@@ -390,7 +360,6 @@ public function getNotifyStockQty()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigEnableQtyInc()
     {
@@ -402,7 +371,6 @@ public function getUseConfigEnableQtyInc()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEnableQtyIncrements()
     {
@@ -417,7 +385,6 @@ public function getEnableQtyIncrements()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigQtyIncrements()
     {
@@ -428,7 +395,6 @@ public function getUseConfigQtyIncrements()
      * Retrieve Quantity Increments
      *
      * @return int|false
-     * @since 2.0.0
      */
     public function getQtyIncrements()
     {
@@ -450,7 +416,6 @@ public function getQtyIncrements()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigBackorders()
     {
@@ -461,7 +426,6 @@ public function getUseConfigBackorders()
      * Retrieve backorders status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getBackorders()
     {
@@ -474,7 +438,6 @@ public function getBackorders()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseConfigManageStock()
     {
@@ -485,7 +448,6 @@ public function getUseConfigManageStock()
      * Retrieve can Manage Stock
      *
      * @return int
-     * @since 2.0.0
      */
     public function getManageStock()
     {
@@ -503,7 +465,6 @@ public function getManageStock()
      * @param string $quoteError
      * @param string $errorIndex
      * @return $this
-     * @since 2.0.0
      */
     protected function _addQuoteItemError(
         \Magento\Quote\Model\Quote\Item $item,
@@ -523,7 +484,6 @@ protected function _addQuoteItemError(
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function save()
     {
@@ -536,7 +496,6 @@ public function save()
      *
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(Product $product)
     {
@@ -554,7 +513,6 @@ public function setProduct(Product $product)
      *
      * @param int $value Value of store id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($value)
     {
@@ -566,7 +524,6 @@ public function setStoreId($value)
      * Retrieve Store Id (product or current)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -580,7 +537,6 @@ public function getStoreId()
      * Getter for customer group id, return current customer group if not set
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -595,7 +551,6 @@ public function getCustomerGroupId()
      *
      * @param int $value Value of customer group id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($value)
     {
@@ -608,7 +563,6 @@ public function setCustomerGroupId($value)
     /**
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($itemId)
     {
@@ -618,7 +572,6 @@ public function setItemId($itemId)
     /**
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($productId)
     {
@@ -630,7 +583,6 @@ public function setProductId($productId)
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -642,7 +594,6 @@ public function setWebsiteId($websiteId)
      *
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId)
     {
@@ -652,7 +603,6 @@ public function setStockId($stockId)
     /**
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -664,7 +614,6 @@ public function setQty($qty)
      *
      * @param bool|int $isInStock
      * @return $this
-     * @since 2.0.0
      */
     public function setIsInStock($isInStock)
     {
@@ -674,7 +623,6 @@ public function setIsInStock($isInStock)
     /**
      * @param bool $isQtyDecimal
      * @return $this
-     * @since 2.0.0
      */
     public function setIsQtyDecimal($isQtyDecimal)
     {
@@ -684,7 +632,6 @@ public function setIsQtyDecimal($isQtyDecimal)
     /**
      * @param bool $useConfigMinQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMinQty($useConfigMinQty)
     {
@@ -696,7 +643,6 @@ public function setUseConfigMinQty($useConfigMinQty)
      *
      * @param float $minQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMinQty($minQty)
     {
@@ -706,7 +652,6 @@ public function setMinQty($minQty)
     /**
      * @param int $useConfigMinSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMinSaleQty($useConfigMinSaleQty)
     {
@@ -718,7 +663,6 @@ public function setUseConfigMinSaleQty($useConfigMinSaleQty)
      *
      * @param float $minSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMinSaleQty($minSaleQty)
     {
@@ -728,7 +672,6 @@ public function setMinSaleQty($minSaleQty)
     /**
      * @param bool $useConfigMaxSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigMaxSaleQty($useConfigMaxSaleQty)
     {
@@ -740,7 +683,6 @@ public function setUseConfigMaxSaleQty($useConfigMaxSaleQty)
      *
      * @param float $maxSaleQty
      * @return $this
-     * @since 2.0.0
      */
     public function setMaxSaleQty($maxSaleQty)
     {
@@ -750,7 +692,6 @@ public function setMaxSaleQty($maxSaleQty)
     /**
      * @param bool $useConfigBackorders
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigBackorders($useConfigBackorders)
     {
@@ -762,7 +703,6 @@ public function setUseConfigBackorders($useConfigBackorders)
      *
      * @param int $backOrders
      * @return $this
-     * @since 2.0.0
      */
     public function setBackorders($backOrders)
     {
@@ -772,7 +712,6 @@ public function setBackorders($backOrders)
     /**
      * @param bool $useConfigNotifyStockQty
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigNotifyStockQty($useConfigNotifyStockQty)
     {
@@ -784,7 +723,6 @@ public function setUseConfigNotifyStockQty($useConfigNotifyStockQty)
      *
      * @param float $notifyStockQty
      * @return $this
-     * @since 2.0.0
      */
     public function setNotifyStockQty($notifyStockQty)
     {
@@ -794,7 +732,6 @@ public function setNotifyStockQty($notifyStockQty)
     /**
      * @param bool $useConfigQtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigQtyIncrements($useConfigQtyIncrements)
     {
@@ -806,7 +743,6 @@ public function setUseConfigQtyIncrements($useConfigQtyIncrements)
      *
      * @param float $qtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyIncrements($qtyIncrements)
     {
@@ -816,7 +752,6 @@ public function setQtyIncrements($qtyIncrements)
     /**
      * @param bool $useConfigEnableQtyInc
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigEnableQtyInc($useConfigEnableQtyInc)
     {
@@ -828,7 +763,6 @@ public function setUseConfigEnableQtyInc($useConfigEnableQtyInc)
      *
      * @param bool $enableQtyIncrements
      * @return $this
-     * @since 2.0.0
      */
     public function setEnableQtyIncrements($enableQtyIncrements)
     {
@@ -838,7 +772,6 @@ public function setEnableQtyIncrements($enableQtyIncrements)
     /**
      * @param bool $useConfigManageStock
      * @return $this
-     * @since 2.0.0
      */
     public function setUseConfigManageStock($useConfigManageStock)
     {
@@ -848,7 +781,6 @@ public function setUseConfigManageStock($useConfigManageStock)
     /**
      * @param bool $manageStock
      * @return $this
-     * @since 2.0.0
      */
     public function setManageStock($manageStock)
     {
@@ -858,7 +790,6 @@ public function setManageStock($manageStock)
     /**
      * @param string $lowStockDate
      * @return $this
-     * @since 2.0.0
      */
     public function setLowStockDate($lowStockDate)
     {
@@ -868,7 +799,6 @@ public function setLowStockDate($lowStockDate)
     /**
      * @param bool $isDecimalDivided
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDecimalDivided($isDecimalDivided)
     {
@@ -878,7 +808,6 @@ public function setIsDecimalDivided($isDecimalDivided)
     /**
      * @param int $stockStatusChangedAuto
      * @return $this
-     * @since 2.0.0
      */
     public function setStockStatusChangedAuto($stockStatusChangedAuto)
     {
@@ -889,7 +818,6 @@ public function setStockStatusChangedAuto($stockStatusChangedAuto)
      * {@inheritdoc}
      *
      * @return \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -901,7 +829,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
index 2721e99be4fc7..9a56c8e8804ec 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -14,7 +14,6 @@
 
 /**
  * CatalogInventory Stock Status
- * @since 2.0.0
  */
 class Status extends AbstractExtensibleModel implements StockStatusInterface
 {
@@ -45,7 +44,6 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -73,7 +71,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -84,7 +81,6 @@ protected function _construct()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -93,7 +89,6 @@ public function getProductId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -102,7 +97,6 @@ public function getWebsiteId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStockId()
     {
@@ -111,7 +105,6 @@ public function getStockId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -120,7 +113,6 @@ public function getQty()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStockStatus()
     {
@@ -131,7 +123,6 @@ public function getStockStatus()
 
     /**
      * @return StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem()
     {
@@ -143,7 +134,6 @@ public function getStockItem()
     /**
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($productId)
     {
@@ -153,7 +143,6 @@ public function setProductId($productId)
     /**
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -163,7 +152,6 @@ public function setWebsiteId($websiteId)
     /**
      * @param int $stockId
      * @return $this
-     * @since 2.0.0
      */
     public function setStockId($stockId)
     {
@@ -173,7 +161,6 @@ public function setStockId($stockId)
     /**
      * @param int $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -183,7 +170,6 @@ public function setQty($qty)
     /**
      * @param int $stockStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setStockStatus($stockStatus)
     {
@@ -194,7 +180,6 @@ public function setStockStatus($stockStatus)
      * {@inheritdoc}
      *
      * @return \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -206,7 +191,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index 7dc9a2e72e160..3492a5ed2fcff 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -27,73 +27,61 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockItemRepository implements StockItemRepositoryInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var StockStateProviderInterface
-     * @since 2.0.0
      */
     protected $stockStateProvider;
 
     /**
      * @var StockItemResource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var StockItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockItemFactory;
 
     /**
      * @var StockItemCollectionInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockItemCollectionFactory;
 
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var QueryBuilderFactory
-     * @since 2.0.0
      */
     protected $queryBuilderFactory;
 
     /**
      * @var MapperFactory
-     * @since 2.0.0
      */
     protected $mapperFactory;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var Processor
-     * @since 2.0.0
      */
     protected $indexProcessor;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -105,7 +93,7 @@ class StockItemRepository implements StockItemRepositoryInterface
 
     /**
      * @var  \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $productCollectionFactory;
 
@@ -125,7 +113,6 @@ class StockItemRepository implements StockItemRepositoryInterface
      * @param DateTime $dateTime
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory|null $collectionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         StockConfigurationInterface $stockConfiguration,
@@ -158,7 +145,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem)
     {
@@ -207,7 +193,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function get($stockItemId)
     {
@@ -221,7 +206,6 @@ public function get($stockItemId)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getList(\Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria)
     {
@@ -235,7 +219,6 @@ public function getList(\Magento\CatalogInventory\Api\StockItemCriteriaInterface
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function delete(StockItemInterface $stockItem)
     {
@@ -254,7 +237,6 @@ public function delete(StockItemInterface $stockItem)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
index 67a47f2bf228d..84e4be91c42fb 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
@@ -20,37 +20,31 @@
 /**
  * Class StockRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockRepository implements StockRepositoryInterface
 {
     /**
      * @var StockResource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var StockFactory
-     * @since 2.0.0
      */
     protected $stockFactory;
 
     /**
      * @var StockCollectionInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockCollectionFactory;
 
     /**
      * @var QueryBuilderFactory
-     * @since 2.0.0
      */
     protected $queryBuilderFactory;
 
     /**
      * @var MapperFactory
-     * @since 2.0.0
      */
     protected $mapperFactory;
 
@@ -66,7 +60,6 @@ class StockRepository implements StockRepositoryInterface
      * @param StockCollectionInterfaceFactory $collectionFactory
      * @param QueryBuilderFactory $queryBuilderFactory
      * @param MapperFactory $mapperFactory
-     * @since 2.0.0
      */
     public function __construct(
         StockResource $resource,
@@ -86,7 +79,6 @@ public function __construct(
      * @param StockInterface $stock
      * @return StockInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(StockInterface $stock)
     {
@@ -102,7 +94,6 @@ public function save(StockInterface $stock)
      * @param int $stockId
      * @return StockInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($stockId)
     {
@@ -117,7 +108,6 @@ public function get($stockId)
     /**
      * @param \Magento\CatalogInventory\Api\StockCriteriaInterface $criteria
      * @return \Magento\CatalogInventory\Api\Data\StockCollectionInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\CatalogInventory\Api\StockCriteriaInterface $criteria)
     {
@@ -133,7 +123,6 @@ public function getList(\Magento\CatalogInventory\Api\StockCriteriaInterface $cr
      * @param StockInterface $stock
      * @return bool|true
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(StockInterface $stock)
     {
@@ -153,7 +142,6 @@ public function delete(StockInterface $stock)
      * @param int $id
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
index 3b8d71f5e64cb..09aaefd36cd7c 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
@@ -18,37 +18,31 @@
 /**
  * Class StockStatusRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockStatusRepository implements StockStatusRepositoryInterface
 {
     /**
      * @var StockStatusResource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var StatusFactory
-     * @since 2.0.0
      */
     protected $stockStatusFactory;
 
     /**
      * @var StockStatusCollectionInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockStatusCollectionFactory;
 
     /**
      * @var QueryBuilderFactory
-     * @since 2.0.0
      */
     protected $queryBuilderFactory;
 
     /**
      * @var MapperFactory
-     * @since 2.0.0
      */
     protected $mapperFactory;
 
@@ -64,7 +58,6 @@ class StockStatusRepository implements StockStatusRepositoryInterface
      * @param StockStatusCollectionInterfaceFactory $collectionFactory
      * @param QueryBuilderFactory $queryBuilderFactory
      * @param MapperFactory $mapperFactory
-     * @since 2.0.0
      */
     public function __construct(
         StockStatusResource $resource,
@@ -84,7 +77,6 @@ public function __construct(
      * @param StockStatusInterface $stockStatus
      * @return StockStatusInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(StockStatusInterface $stockStatus)
     {
@@ -99,7 +91,6 @@ public function save(StockStatusInterface $stockStatus)
     /**
      * @param string $stockStatusId
      * @return StockStatusInterface|Status
-     * @since 2.0.0
      */
     public function get($stockStatusId)
     {
@@ -111,7 +102,6 @@ public function get($stockStatusId)
     /**
      * @param \Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria
      * @return \Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria)
     {
@@ -127,7 +117,6 @@ public function getList(\Magento\CatalogInventory\Api\StockStatusCriteriaInterfa
      * @param StockStatusInterface $stockStatus
      * @return bool|true
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(StockStatusInterface $stockStatus)
     {
@@ -147,7 +136,6 @@ public function delete(StockStatusInterface $stockStatus)
      * @param int $id
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index 5cdd89abc3a6e..d930925022738 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -18,31 +18,26 @@
 /**
  * Class StockIndex
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockIndex implements StockIndexInterface
 {
     /**
      * @var StockRegistryProviderInterface
-     * @since 2.0.0
      */
     protected $stockRegistryProvider;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Status
-     * @since 2.0.0
      */
     protected $stockStatusResource;
 
     /**
      * @var ProductType
-     * @since 2.0.0
      */
     protected $productType;
 
@@ -50,7 +45,6 @@ class StockIndex implements StockIndexInterface
      * Retrieve website models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $websites;
 
@@ -58,7 +52,6 @@ class StockIndex implements StockIndexInterface
      * Product Type Instances cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $productTypes = [];
 
@@ -67,7 +60,6 @@ class StockIndex implements StockIndexInterface
      * @param ProductRepositoryInterface $productRepository
      * @param ProductWebsite $productWebsite
      * @param ProductType $productType
-     * @since 2.0.0
      */
     public function __construct(
         StockRegistryProviderInterface $stockRegistryProvider,
@@ -89,7 +81,6 @@ public function __construct(
      * @deprecated 2.1.0
      * @return true
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function rebuild($productId = null, $scopeId = null)
     {
@@ -120,7 +111,6 @@ public function rebuild($productId = null, $scopeId = null)
      * @param int $websiteId
      * @deprecated 2.1.0
      * @return void
-     * @since 2.0.0
      */
     public function updateProductStockStatus($productId, $websiteId)
     {
@@ -145,7 +135,6 @@ public function updateProductStockStatus($productId, $websiteId)
      * @param int $status
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function processChildren(
         $productId,
@@ -209,7 +198,6 @@ protected function processChildren(
      *
      * @param int|null $websiteId
      * @return array
-     * @since 2.0.0
      */
     protected function getWebsitesWithDefaultStores($websiteId = null)
     {
@@ -231,7 +219,6 @@ protected function getWebsitesWithDefaultStores($websiteId = null)
      * @param int $productId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     protected function processParents($productId, $websiteId)
     {
@@ -262,7 +249,6 @@ protected function processParents($productId, $websiteId)
      * as key - type code, value - instance model
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getProductTypeInstances()
     {
@@ -278,7 +264,6 @@ protected function getProductTypeInstances()
 
     /**
      * @return \Magento\CatalogInventory\Model\ResourceModel\Stock\Status
-     * @since 2.0.0
      */
     protected function getStockStatusResource()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 1a0aa38965783..06599446a9ea9 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -15,43 +15,36 @@
 
 /**
  * Class StockManagement
- * @since 2.0.0
  */
 class StockManagement implements StockManagementInterface
 {
     /**
      * @var StockRegistryProviderInterface
-     * @since 2.0.0
      */
     protected $stockRegistryProvider;
 
     /**
      * @var StockState
-     * @since 2.0.0
      */
     protected $stockState;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var ResourceStock
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var QtyCounterInterface
-     * @since 2.0.0
      */
     private $qtyCounter;
 
@@ -62,7 +55,6 @@ class StockManagement implements StockManagementInterface
      * @param StockConfigurationInterface $stockConfiguration
      * @param ProductRepositoryInterface $productRepository
      * @param QtyCounterInterface $qtyCounter
-     * @since 2.0.0
      */
     public function __construct(
         ResourceStock $stockResource,
@@ -89,7 +81,6 @@ public function __construct(
      * @return StockItemInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function registerProductsSale($items, $websiteId = null)
     {
@@ -138,7 +129,6 @@ public function registerProductsSale($items, $websiteId = null)
      * @param string[] $items
      * @param int $websiteId
      * @return bool
-     * @since 2.0.0
      */
     public function revertProductsSale($items, $websiteId = null)
     {
@@ -156,7 +146,6 @@ public function revertProductsSale($items, $websiteId = null)
      * @param float $qty
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function backItemQty($productId, $qty, $scopeId = null)
     {
@@ -184,7 +173,6 @@ public function backItemQty($productId, $qty, $scopeId = null)
      *
      * @param int $productId
      * @return string
-     * @since 2.0.0
      */
     protected function getProductType($productId)
     {
@@ -193,7 +181,6 @@ protected function getProductType($productId)
 
     /**
      * @return ResourceStock
-     * @since 2.0.0
      */
     protected function getResource()
     {
@@ -205,7 +192,6 @@ protected function getResource()
      *
      * @param StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     protected function canSubtractQty(StockItemInterface $stockItem)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index 46354c26af371..d688132fdb916 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -17,37 +17,31 @@
  * Class StockRegistry
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockRegistry implements StockRegistryInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var StockRegistryProviderInterface
-     * @since 2.0.0
      */
     protected $stockRegistryProvider;
 
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var StockItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $stockItemRepository;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory
-     * @since 2.0.0
      */
     protected $criteriaFactory;
 
@@ -57,7 +51,6 @@ class StockRegistry implements StockRegistryInterface
      * @param StockItemRepositoryInterface $stockItemRepository
      * @param StockItemCriteriaInterfaceFactory $criteriaFactory
      * @param ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(
         StockConfigurationInterface $stockConfiguration,
@@ -76,7 +69,6 @@ public function __construct(
     /**
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function getStock($scopeId = null)
     {
@@ -88,7 +80,6 @@ public function getStock($scopeId = null)
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem($productId, $scopeId = null)
     {
@@ -101,7 +92,6 @@ public function getStockItem($productId, $scopeId = null)
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getStockItemBySku($productSku, $scopeId = null)
     {
@@ -114,7 +104,6 @@ public function getStockItemBySku($productSku, $scopeId = null)
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function getStockStatus($productId, $scopeId = null)
     {
@@ -127,7 +116,6 @@ public function getStockStatus($productId, $scopeId = null)
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getStockStatusBySku($productSku, $scopeId = null)
     {
@@ -141,7 +129,6 @@ public function getStockStatusBySku($productSku, $scopeId = null)
      * @param int $productId
      * @param int $scopeId
      * @return int
-     * @since 2.0.0
      */
     public function getProductStockStatus($productId, $scopeId = null)
     {
@@ -155,7 +142,6 @@ public function getProductStockStatus($productId, $scopeId = null)
      * @param null $scopeId
      * @return int
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getProductStockStatusBySku($productSku, $scopeId = null)
     {
@@ -166,7 +152,6 @@ public function getProductStockStatusBySku($productSku, $scopeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0)
     {
@@ -180,7 +165,6 @@ public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function updateStockItemBySku($productSku, \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem)
     {
@@ -200,7 +184,6 @@ public function updateStockItemBySku($productSku, \Magento\CatalogInventory\Api\
      * @param string $productSku
      * @return int
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     protected function resolveProductId($productSku)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 56e70dbe3058a..80d28adbb1a64 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -20,61 +20,51 @@
 /**
  * Class StockRegistryProvider
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StockRegistryProvider implements StockRegistryProviderInterface
 {
     /**
      * @var StockRepositoryInterface
-     * @since 2.0.0
      */
     protected $stockRepository;
 
     /**
      * @var StockInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockFactory;
 
     /**
      * @var StockItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $stockItemRepository;
 
     /**
      * @var StockItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockItemFactory;
 
     /**
      * @var StockStatusRepositoryInterface
-     * @since 2.0.0
      */
     protected $stockStatusRepository;
 
     /**
      * @var StockStatusInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockStatusFactory;
 
     /**
      * @var StockCriteriaInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockCriteriaFactory;
 
     /**
      * @var StockItemCriteriaInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockItemCriteriaFactory;
 
     /**
      * @var StockStatusCriteriaInterfaceFactory
-     * @since 2.0.0
      */
     protected $stockStatusCriteriaFactory;
 
@@ -95,7 +85,6 @@ class StockRegistryProvider implements StockRegistryProviderInterface
      * @param StockItemCriteriaInterfaceFactory $stockItemCriteriaFactory
      * @param StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         StockRepositoryInterface $stockRepository,
@@ -122,7 +111,6 @@ public function __construct(
     /**
      * @param int|null $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
-     * @since 2.0.0
      */
     public function getStock($scopeId)
     {
@@ -145,7 +133,6 @@ public function getStock($scopeId)
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
-     * @since 2.0.0
      */
     public function getStockItem($productId, $scopeId)
     {
@@ -168,7 +155,6 @@ public function getStockItem($productId, $scopeId)
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
-     * @since 2.0.0
      */
     public function getStockStatus($productId, $scopeId)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index 4e4c2435203e3..ac6dc16366798 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -12,25 +12,21 @@
 
 /**
  * Interface StockState
- * @since 2.0.0
  */
 class StockState implements StockStateInterface
 {
     /**
      * @var StockStateProviderInterface
-     * @since 2.0.0
      */
     protected $stockStateProvider;
 
     /**
      * @var StockRegistryProviderInterface
-     * @since 2.0.0
      */
     protected $stockRegistryProvider;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -38,7 +34,6 @@ class StockState implements StockStateInterface
      * @param StockStateProviderInterface $stockStateProvider
      * @param StockRegistryProviderInterface $stockRegistryProvider
      * @param StockConfigurationInterface $stockConfiguration
-     * @since 2.0.0
      */
     public function __construct(
         StockStateProviderInterface $stockStateProvider,
@@ -54,7 +49,6 @@ public function __construct(
      * @param int $productId
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function verifyStock($productId, $scopeId = null)
     {
@@ -69,7 +63,6 @@ public function verifyStock($productId, $scopeId = null)
      * @param int $productId
      * @param int $scopeId
      * @return bool
-     * @since 2.0.0
      */
     public function verifyNotification($productId, $scopeId = null)
     {
@@ -88,7 +81,6 @@ public function verifyNotification($productId, $scopeId = null)
      * @param int $scopeId
      * @exception \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function checkQty($productId, $qty, $scopeId = null)
     {
@@ -107,7 +99,6 @@ public function checkQty($productId, $qty, $scopeId = null)
      * @param float $qty
      * @param int $scopeId
      * @return float
-     * @since 2.0.0
      */
     public function suggestQty($productId, $qty, $scopeId = null)
     {
@@ -124,7 +115,6 @@ public function suggestQty($productId, $qty, $scopeId = null)
      * @param int $productId
      * @param int $scopeId
      * @return float
-     * @since 2.0.0
      */
     public function getStockQty($productId, $scopeId = null)
     {
@@ -140,7 +130,6 @@ public function getStockQty($productId, $scopeId = null)
      * @param float $qty
      * @param int $websiteId
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function checkQtyIncrements($productId, $qty, $websiteId = null)
     {
@@ -158,7 +147,6 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null)
      * @param float $origQty
      * @param int $scopeId
      * @return int
-     * @since 2.0.0
      */
     public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index c50ec85b6a1dc..4cffc678314b2 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -17,37 +17,31 @@
 
 /**
  * Interface StockStateProvider
- * @since 2.0.0
  */
 class StockStateProvider implements StockStateProviderInterface
 {
     /**
      * @var MathDivision
-     * @since 2.0.0
      */
     protected $mathDivision;
 
     /**
      * @var FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $qtyCheckApplicable;
 
@@ -57,7 +51,6 @@ class StockStateProvider implements StockStateProviderInterface
      * @param ObjectFactory $objectFactory
      * @param ProductFactory $productFactory
      * @param bool $qtyCheckApplicable
-     * @since 2.0.0
      */
     public function __construct(
         MathDivision $mathDivision,
@@ -76,7 +69,6 @@ public function __construct(
     /**
      * @param StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     public function verifyStock(StockItemInterface $stockItem)
     {
@@ -94,7 +86,6 @@ public function verifyStock(StockItemInterface $stockItem)
     /**
      * @param StockItemInterface $stockItem
      * @return bool
-     * @since 2.0.0
      */
     public function verifyNotification(StockItemInterface $stockItem)
     {
@@ -110,7 +101,6 @@ public function verifyNotification(StockItemInterface $stockItem)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQty, $origQty = 0)
     {
@@ -242,7 +232,6 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
      * @param int|float $qty
      * @exception \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function checkQty(StockItemInterface $stockItem, $qty)
     {
@@ -271,7 +260,6 @@ public function checkQty(StockItemInterface $stockItem, $qty)
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @return int|float
-     * @since 2.0.0
      */
     public function suggestQty(StockItemInterface $stockItem, $qty)
     {
@@ -309,7 +297,6 @@ public function suggestQty(StockItemInterface $stockItem, $qty)
      * @param StockItemInterface $stockItem
      * @param float|int $qty
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function checkQtyIncrements(StockItemInterface $stockItem, $qty)
     {
@@ -347,7 +334,6 @@ public function checkQtyIncrements(StockItemInterface $stockItem, $qty)
      * @return float
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getStockQty(StockItemInterface $stockItem)
     {
@@ -385,7 +371,6 @@ public function getStockQty(StockItemInterface $stockItem)
     /**
      * @param string|float|int|null $qty
      * @return float|null
-     * @since 2.0.0
      */
     protected function getNumber($qty)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minqty.php b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minqty.php
index ac10831c18918..f49d41b5dd656 100644
--- a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minqty.php
+++ b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minqty.php
@@ -8,7 +8,6 @@
 
 /**
  * Minimum product qty backend model
- * @since 2.0.0
  */
 class Minqty extends \Magento\Framework\App\Config\Value
 {
@@ -16,7 +15,6 @@ class Minqty extends \Magento\Framework\App\Config\Value
      * Validate minimum product qty value
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php
index 0881722d6d3e6..af510381bc211 100644
--- a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php
@@ -7,7 +7,6 @@
 
 /**
  * Backend for serialized array data
- * @since 2.0.0
  */
 class Minsaleqty extends \Magento\Framework\App\Config\Value
 {
@@ -15,7 +14,6 @@ class Minsaleqty extends \Magento\Framework\App\Config\Value
      * Catalog inventory minsaleqty
      *
      * @var \Magento\CatalogInventory\Helper\Minsaleqty
-     * @since 2.0.0
      */
     protected $_catalogInventoryMinsaleqty = null;
 
@@ -28,7 +26,6 @@ class Minsaleqty extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      * Process data after load
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -61,7 +57,6 @@ protected function _afterLoad()
      * Prepare data before save
      *
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
index 6971330e48efb..f34d765b0e5f0 100644
--- a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
+++ b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
@@ -9,7 +9,6 @@
 
 /**
  * Backend for qty increments
- * @since 2.0.0
  */
 class Qtyincrements extends \Magento\Framework\App\Config\Value
 {
@@ -18,7 +17,6 @@ class Qtyincrements extends \Magento\Framework\App\Config\Value
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
index 7cf6f68b04968..3f92fffa599bd 100644
--- a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogInventory\Observer\AddInventoryDataObserver
  *
- * @since 2.0.0
  */
 class AddInventoryDataObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogInventory\Helper\Stock
-     * @since 2.0.0
      */
     protected $stockHelper;
 
     /**
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogInventory\Helper\Stock $stockHelper)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\CatalogInventory\Helper\Stock $stockHelper)
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index 6fd697ee49536..1e99794d68a40 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -12,26 +12,22 @@
 
 /**
  * Catalog inventory module observer
- * @since 2.0.0
  */
 class CancelOrderItemObserver implements ObserverInterface
 {
     /**
      * @var StockManagementInterface
-     * @since 2.0.0
      */
     protected $stockManagement;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $priceIndexer;
 
     /**
      * @param StockManagementInterface $stockManagement
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
-     * @since 2.0.0
      */
     public function __construct(
         StockManagementInterface $stockManagement,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param   EventObserver $observer
      * @return  void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php b/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
index 9c4bac42b4610..e921c06ff508e 100644
--- a/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\CatalogInventory\Observer\CheckoutAllSubmitAfterObserver
  *
- * @since 2.0.0
  */
 class CheckoutAllSubmitAfterObserver implements ObserverInterface
 {
     /**
      * @var SubtractQuoteInventoryObserver
-     * @since 2.0.0
      */
     protected $subtractQuoteInventoryObserver;
 
     /**
      * @var ReindexQuoteInventoryObserver
-     * @since 2.0.0
      */
     protected $reindexQuoteInventoryObserver;
 
     /**
      * @param SubtractQuoteInventoryObserver $subtractQuoteInventoryObserver
      * @param ReindexQuoteInventoryObserver $reindexQuoteInventoryObserver
-     * @since 2.0.0
      */
     public function __construct(
         SubtractQuoteInventoryObserver $subtractQuoteInventoryObserver,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/DisplayProductStatusInfoObserver.php b/app/code/Magento/CatalogInventory/Observer/DisplayProductStatusInfoObserver.php
index cf9c52b94274a..dbd3ded30c1e6 100644
--- a/app/code/Magento/CatalogInventory/Observer/DisplayProductStatusInfoObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/DisplayProductStatusInfoObserver.php
@@ -12,19 +12,16 @@
 
 /**
  * Catalog inventory module observer
- * @since 2.0.0
  */
 class DisplayProductStatusInfoObserver implements ObserverInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @param StockConfigurationInterface $stockConfiguration
-     * @since 2.0.0
      */
     public function __construct(StockConfigurationInterface $stockConfiguration)
     {
@@ -36,7 +33,6 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php b/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
index b2b8fa0885c39..e72b5d2ff210e 100644
--- a/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
+++ b/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\CatalogInventory\Observer\ItemsForReindex
  *
- * @since 2.0.0
  */
 class ItemsForReindex
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $itemsForReindex;
 
     /**
      * @param array $items
      * @return void
-     * @since 2.0.0
      */
     public function setItems(array $items)
     {
@@ -31,7 +28,6 @@ public function setItems(array $items)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -40,7 +36,6 @@ public function getItems()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function clear()
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/ProductQty.php b/app/code/Magento/CatalogInventory/Observer/ProductQty.php
index fac21a01b955d..0a9a3783bc800 100644
--- a/app/code/Magento/CatalogInventory/Observer/ProductQty.php
+++ b/app/code/Magento/CatalogInventory/Observer/ProductQty.php
@@ -10,7 +10,6 @@
 
 /**
  * Prepare array with information about used product qty and product stock item
- * @since 2.0.0
  */
 class ProductQty
 {
@@ -19,7 +18,6 @@ class ProductQty
      *
      * @param array $relatedItems
      * @return array
-     * @since 2.0.0
      */
     public function getProductQty($relatedItems)
     {
@@ -47,7 +45,6 @@ public function getProductQty($relatedItems)
      * @param QuoteItem $quoteItem
      * @param array &$items
      * @return void
-     * @since 2.0.0
      */
     protected function _addItemToQtyArray(QuoteItem $quoteItem, &$items)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/QuantityValidatorObserver.php b/app/code/Magento/CatalogInventory/Observer/QuantityValidatorObserver.php
index 3205960c06c8c..0a59e4271bb67 100644
--- a/app/code/Magento/CatalogInventory/Observer/QuantityValidatorObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/QuantityValidatorObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogInventory\Observer\QuantityValidatorObserver
  *
- * @since 2.0.0
  */
 class QuantityValidatorObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator $quantityValidator
-     * @since 2.0.0
      */
     protected $quantityValidator;
 
     /**
      * @param \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator $quantityValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator $quantityValidator
@@ -35,7 +32,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php
index 4ca2d27af4e85..140e7adf77f30 100644
--- a/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\CatalogInventory\Observer\ReindexQuoteInventoryObserver
  *
- * @since 2.0.0
  */
 class ReindexQuoteInventoryObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $stockIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $priceIndexer;
 
     /**
      * @var \Magento\CatalogInventory\Observer\ItemsForReindex
-     * @since 2.0.0
      */
     protected $itemsForReindex;
 
@@ -38,7 +34,6 @@ class ReindexQuoteInventoryObserver implements ObserverInterface
      * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      * @param ItemsForReindex $itemsForReindex
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
@@ -55,7 +50,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
index 57cfeec531459..93a50cc9a7a4d 100644
--- a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
@@ -12,31 +12,26 @@
 
 /**
  * Catalog inventory module observer
- * @since 2.0.0
  */
 class RevertQuoteInventoryObserver implements ObserverInterface
 {
     /**
      * @var ProductQty
-     * @since 2.0.0
      */
     protected $productQty;
 
     /**
      * @var StockManagementInterface
-     * @since 2.0.0
      */
     protected $stockManagement;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.0.0
      */
     protected $stockIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.0.0
      */
     protected $priceIndexer;
 
@@ -46,7 +41,6 @@ class RevertQuoteInventoryObserver implements ObserverInterface
      * @param StockManagementInterface $stockManagement
      * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
-     * @since 2.0.0
      */
     public function __construct(
         ProductQty $productQty,
@@ -65,7 +59,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
index f659f40ac2092..16e1f6b76a088 100644
--- a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
@@ -21,19 +21,16 @@
  * @see StockItemInterface when you want to change the stock data
  * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
  * @see StockItemRepositoryInterface::save as extension point for customization of saving process
- * @since 2.0.0
  */
 class SaveInventoryDataObserver implements ObserverInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.0.0
      */
     private $stockConfiguration;
 
     /**
      * @var StockRegistryInterface
-     * @since 2.0.0
      */
     private $stockRegistry;
 
@@ -45,7 +42,6 @@ class SaveInventoryDataObserver implements ObserverInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $paramListToCheck = [
         'use_config_min_qty' => [
@@ -82,7 +78,6 @@ class SaveInventoryDataObserver implements ObserverInterface
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockRegistryInterface $stockRegistry
      * @param StockItemValidator $stockItemValidator
-     * @since 2.0.0
      */
     public function __construct(
         StockConfigurationInterface $stockConfiguration,
@@ -102,7 +97,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
index 5af3a2cdd0c90..6fbec08e4805b 100644
--- a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
@@ -12,25 +12,21 @@
 
 /**
  * Catalog inventory module observer
- * @since 2.0.0
  */
 class SubtractQuoteInventoryObserver implements ObserverInterface
 {
     /**
      * @var StockManagementInterface
-     * @since 2.0.0
      */
     protected $stockManagement;
 
     /**
      * @var ProductQty
-     * @since 2.0.0
      */
     protected $productQty;
 
     /**
      * @var \Magento\CatalogInventory\Observer\ItemsForReindex
-     * @since 2.0.0
      */
     protected $itemsForReindex;
 
@@ -39,7 +35,6 @@ class SubtractQuoteInventoryObserver implements ObserverInterface
      * @param StockManagementInterface $stockManagement
      * @param ProductQty $productQty
      * @param ItemsForReindex $itemsForReindex
-     * @since 2.0.0
      */
     public function __construct(
         StockManagementInterface $stockManagement,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php b/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
index a48b1bba4afe7..47ee6512920d8 100644
--- a/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
@@ -11,19 +11,16 @@
 
 /**
  * Catalog inventory module observer
- * @since 2.0.0
  */
 class UpdateItemsStockUponConfigChangeObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock
-     * @since 2.0.0
      */
     protected $resourceStock;
 
     /**
      * @param \Magento\CatalogInventory\Model\ResourceModel\Stock $resourceStock
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogInventory\Model\ResourceModel\Stock $resourceStock)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\CatalogInventory\Model\ResourceModel\Stock
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallData.php b/app/code/Magento/CatalogInventory/Setup/InstallData.php
index 0639e5c7c67bd..6fd1745574266 100644
--- a/app/code/Magento/CatalogInventory/Setup/InstallData.php
+++ b/app/code/Magento/CatalogInventory/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -39,7 +36,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
index ab095c82d8561..5479b69f8314f 100644
--- a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
index 7f5f35bfeea6f..d2d84eb0a18c0 100644
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
+++ b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
@@ -18,25 +18,25 @@
 /**
  * Upgrade Data script
  * @codeCoverageIgnore
- * @since 2.2.0
+ * @since 2.1.3
  */
 class UpgradeData implements UpgradeDataInterface
 {
     /**
      * @var StockConfigurationInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $configuration;
 
     /**
      * @var AbstractProcessor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $indexerProcessor;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
@@ -58,7 +58,7 @@ class UpgradeData implements UpgradeDataInterface
      * @param AbstractProcessor $indexerProcessor
      * @param FieldDataConverterFactory $fieldDataConverterFactory
      * @param QueryModifierFactory $queryModifierFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         StockConfigurationInterface $configuration,
@@ -76,7 +76,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -94,7 +94,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     /**
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function upgradeCatalogInventoryStockItem($setup)
     {
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFieldToCollection.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFieldToCollection.php
index fffe53dbac1a7..0afbb072ea986 100644
--- a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFieldToCollection.php
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFieldToCollection.php
@@ -10,13 +10,11 @@
 
 /**
  * Class AddQuantityFieldToCollection
- * @since 2.0.0
  */
 class AddQuantityFieldToCollection implements AddFieldToCollectionInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addField(Collection $collection, $field, $alias = null)
     {
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFilterToCollection.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFilterToCollection.php
index b7750d09e04f7..c7a6012ba8bd7 100644
--- a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFilterToCollection.php
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFilterToCollection.php
@@ -11,13 +11,11 @@
 
 /**
  * Class AddQuantityFilterToCollection
- * @since 2.0.0
  */
 class AddQuantityFilterToCollection implements AddFilterToCollectionInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addFilter(Collection $collection, $field, $condition = null)
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
index 6b9c7f16c50d5..ba0ac0f53a430 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Catalog extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index 28d58d7b80f8b..5c659f5cd5f33 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tab\Conditions
  *
- * @since 2.0.0
  */
 class Conditions extends Generic implements TabInterface
 {
     /**
      * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
-     * @since 2.0.0
      */
     protected $_rendererFieldset;
 
     /**
      * @var \Magento\Rule\Block\Conditions
-     * @since 2.0.0
      */
     protected $_conditions;
 
@@ -36,7 +33,6 @@ class Conditions extends Generic implements TabInterface
      * @param \Magento\Rule\Block\Conditions $conditions
      * @param \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -68,7 +63,6 @@ public function getTabLabel()
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -80,7 +74,6 @@ public function getTabTitle()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -92,7 +85,6 @@ public function canShowTab()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -137,7 +129,6 @@ public function isAjaxLoaded()
 
     /**
      * @return Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
index 752a0a1745a11..e62191185ecc9 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
@@ -17,31 +17,26 @@
 /**
  * Class \Magento\CatalogRule\Block\Adminhtml\Promo\Widget\Chooser\Sku
  *
- * @since 2.0.0
  */
 class Sku extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_catalogType;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_cpCollection;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected $_cpCollectionInstance;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
-     * @since 2.0.0
      */
     protected $_eavAttSetCollection;
 
@@ -52,7 +47,6 @@ class Sku extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $cpCollection
      * @param \Magento\Catalog\Model\Product\Type $catalogType
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -96,7 +89,6 @@ protected function _construct()
     /**
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -121,7 +113,6 @@ protected function _addColumnFilterToCollection($column)
      * Prepare Catalog Product Collection for attribute SKU in Promo Conditions SKU chooser
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -142,7 +133,6 @@ protected function _prepareCollection()
      * Get catalog product resource collection instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected function _getCpCollectionInstance()
     {
@@ -156,7 +146,6 @@ protected function _getCpCollectionInstance()
      * Define Cooser Grid Columns and filters
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -218,7 +207,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -230,7 +218,6 @@ public function getGridUrl()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
index 8c4c8b7bfacf6..9510549ae421d 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
@@ -19,7 +19,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
  *
- * @since 2.0.0
  */
 abstract class Catalog extends Action
 {
@@ -35,7 +34,6 @@ abstract class Catalog extends Action
      *
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_dirtyRulesNoticeMessage;
 
@@ -43,7 +41,6 @@ abstract class Catalog extends Action
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -51,7 +48,6 @@ abstract class Catalog extends Action
      * Date filter instance
      *
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $_dateFilter;
 
@@ -61,7 +57,6 @@ abstract class Catalog extends Action
      * @param Context $context
      * @param Registry $coreRegistry
      * @param Date $dateFilter
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $coreRegistry, Date $dateFilter)
     {
@@ -74,7 +69,6 @@ public function __construct(Context $context, Registry $coreRegistry, Date $date
      * Init action
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -94,7 +88,6 @@ protected function _initAction()
      * @param string $dirtyRulesNoticeMessage
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setDirtyRulesNoticeMessage($dirtyRulesNoticeMessage)
     {
@@ -105,7 +98,6 @@ public function setDirtyRulesNoticeMessage($dirtyRulesNoticeMessage)
      * Get dirty rules notice message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDirtyRulesNoticeMessage()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
index 8949c6b97047d..6a734902640e9 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\ApplyRules
  *
- * @since 2.0.0
  */
 class ApplyRules extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
@@ -20,7 +19,6 @@ class ApplyRules extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
      * Apply all active catalog price rules
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php
index 6b03607969b3d..8ea897f6d1e03 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
index 29e0976f5f28c..b0aab15be12d3 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
index 02c98b4380ba5..cf44d8ac1faf0 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
index a4354fb8ed59b..b4dc88663ff22 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
index 9689800120b09..c6a0fa9fc0daf 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php
index f55aa72b36d56..f14ec21ec2d37 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\NewActionHtml
  *
- * @since 2.0.0
  */
 class NewActionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
index b2525730a7853..a30363712279a 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog\NewConditionHtml
  *
- * @since 2.0.0
  */
 class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 8d13a46a3999f..6d2b11d4ec687 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
@@ -44,7 +43,6 @@ public function __construct(
     /**
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php
index dbd47389ed4f0..329a245d02aee 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
@@ -22,7 +21,6 @@ class Index extends \Magento\Backend\App\Action
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget.php
index fc3196cb3ccec..bba4733210170 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
  *
- * @since 2.0.0
  */
 abstract class Widget extends Action
 {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
index 7ab3a76e2ab72..4d181559adf81 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget\CategoriesJson
  *
- * @since 2.0.0
  */
 class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
 {
@@ -21,14 +20,12 @@ class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Wid
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param Context $context
      * @param Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $coreRegistry)
     {
@@ -40,7 +37,6 @@ public function __construct(Context $context, Registry $coreRegistry)
      * Initialize category object in registry
      *
      * @return Category
-     * @since 2.0.0
      */
     protected function _initCategory()
     {
@@ -75,7 +71,6 @@ protected function _initCategory()
      * Get tree node (Ajax version)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php
index 4a7233c739b43..6fb8f75f535d0 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
 {
@@ -17,7 +16,6 @@ class Chooser extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
      * Prepare block for chooser
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php b/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
index ad495103488a7..7830a216e85bd 100644
--- a/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
+++ b/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\CatalogRule\Cron\DailyCatalogUpdate
  *
- * @since 2.0.0
  */
 class DailyCatalogUpdate
 {
     /**
      * @var \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProductProcessor;
 
     /**
      * @param \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\CatalogRule\Model\Indexer\Rule\RuleProductP
      * we should generate data for interval -1 day ... +1 day
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogRule/Helper/Data.php b/app/code/Magento/CatalogRule/Helper/Data.php
index 01ecf23edd0e0..72d35ae40df15 100644
--- a/app/code/Magento/CatalogRule/Helper/Data.php
+++ b/app/code/Magento/CatalogRule/Helper/Data.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogRule\Helper\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -23,7 +22,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param  int $ruleAmount
      * @param  float $price
      * @return float|int
-     * @since 2.0.0
      */
     public function calcPriceRule($actionOperator, $ruleAmount, $price)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Flag.php b/app/code/Magento/CatalogRule/Model/Flag.php
index 98bb61e775ce7..df52fa0b69e9d 100644
--- a/app/code/Magento/CatalogRule/Model/Flag.php
+++ b/app/code/Magento/CatalogRule/Model/Flag.php
@@ -8,7 +8,6 @@
 
 /**
  * Flag indicates that some rules have changed but changes have not been applied yet.
- * @since 2.0.0
  */
 class Flag extends \Magento\Framework\Flag
 {
@@ -16,7 +15,6 @@ class Flag extends \Magento\Framework\Flag
      * Flag code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_flagCode = 'catalog_rules_dirty';
 }
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
index 219e8e4786db8..98b1da56b6471 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\CatalogRule\Model\Indexer\AbstractIndexer
  *
- * @since 2.0.0
  */
 abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
 {
     /**
      * @var IndexBuilder
-     * @since 2.0.0
      */
     protected $indexBuilder;
 
@@ -27,26 +25,24 @@ abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInt
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $cacheManager;
 
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $cacheContext;
 
     /**
      * @param IndexBuilder $indexBuilder
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         IndexBuilder $indexBuilder,
@@ -61,7 +57,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -72,7 +67,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -87,7 +81,6 @@ public function executeFull()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -104,7 +97,6 @@ public function getIdentities()
      * @param int[] $ids
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -121,7 +113,6 @@ public function executeList(array $ids)
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     abstract protected function doExecuteList($ids);
 
@@ -131,7 +122,6 @@ abstract protected function doExecuteList($ids);
      * @param int $id
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -149,15 +139,14 @@ public function executeRow($id)
      * @param int $id
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     abstract protected function doExecuteRow($id);
 
     /**
      * @return \Magento\Framework\App\CacheInterface|mixed
      *
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     private function getCacheManager()
     {
@@ -173,8 +162,8 @@ private function getCacheManager()
      * Get cache context
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     protected function getCacheContext()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 678e679022107..45c52b637630a 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class IndexBuilder
 {
@@ -37,79 +36,66 @@ class IndexBuilder
      *
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var RuleCollectionFactory
-     * @since 2.0.0
      */
     protected $ruleCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateFormat;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var Product[]
-     * @since 2.0.0
      */
     protected $loadedProducts;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $batchCount;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -174,7 +160,6 @@ class IndexBuilder
      * @param \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor|null $pricesPersistor
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,
@@ -236,7 +221,6 @@ public function __construct(
      * @param int $id
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function reindexById($id)
     {
@@ -250,7 +234,6 @@ public function reindexById($id)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function reindexByIds(array $ids)
     {
@@ -269,7 +252,6 @@ public function reindexByIds(array $ids)
      *
      * @param array $ids
      * @return void
-     * @since 2.0.0
      */
     protected function doReindexByIds($ids)
     {
@@ -288,7 +270,6 @@ protected function doReindexByIds($ids)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function reindexFull()
     {
@@ -306,7 +287,6 @@ public function reindexFull()
      * Full reindex Template method
      *
      * @return void
-     * @since 2.0.0
      */
     protected function doReindexFull()
     {
@@ -339,7 +319,6 @@ protected function doReindexFull()
      *
      * @param array $productIds
      * @return void
-     * @since 2.0.0
      */
     protected function cleanByIds($productIds)
     {
@@ -369,7 +348,6 @@ protected function cleanByIds($productIds)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function applyRule(Rule $rule, $product)
     {
@@ -438,7 +416,6 @@ protected function applyRule(Rule $rule, $product)
     /**
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     protected function getTable($tableName)
     {
@@ -450,7 +427,6 @@ protected function getTable($tableName)
      * @return $this
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct::execute
-     * @since 2.0.0
      */
     protected function updateRuleProductData(Rule $rule)
     {
@@ -478,7 +454,6 @@ protected function updateRuleProductData(Rule $rule)
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::execute
      * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
-     * @since 2.0.0
      */
     protected function applyAllRules(Product $product = null)
     {
@@ -493,7 +468,6 @@ protected function applyAllRules(Product $product = null)
      * @return $this
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
-     * @since 2.0.0
      */
     protected function updateCatalogRuleGroupWebsiteData()
     {
@@ -505,7 +479,6 @@ protected function updateCatalogRuleGroupWebsiteData()
      * Clean rule price index
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function deleteOldData()
     {
@@ -519,7 +492,6 @@ protected function deleteOldData()
      * @return float
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator::calculate
-     * @since 2.0.0
      */
     protected function calcRuleProductPrice($ruleData, $productData = null)
     {
@@ -533,7 +505,6 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder::build
-     * @since 2.0.0
      */
     protected function getRuleProductsStmt($websiteId, Product $product = null)
     {
@@ -546,7 +517,6 @@ protected function getRuleProductsStmt($websiteId, Product $product = null)
      * @throws \Exception
      * @deprecated 2.2.0
      * @see \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor::execute
-     * @since 2.0.0
      */
     protected function saveRuleProductPrices($arrData)
     {
@@ -558,7 +528,6 @@ protected function saveRuleProductPrices($arrData)
      * Get active rules
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getActiveRules()
     {
@@ -569,7 +538,6 @@ protected function getActiveRules()
      * Get active rules
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllRules()
     {
@@ -579,7 +547,6 @@ protected function getAllRules()
     /**
      * @param int $productId
      * @return Product
-     * @since 2.0.0
      */
     protected function getProduct($productId)
     {
@@ -592,7 +559,6 @@ protected function getProduct($productId)
     /**
      * @param \Exception $e
      * @return void
-     * @since 2.0.0
      */
     protected function critical($e)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php
index 5259b0bd54d1f..684bbab73859b 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\CatalogRule\Model\Indexer\Product\ProductRuleIndexer
  *
- * @since 2.0.0
  */
 class ProductRuleIndexer extends AbstractIndexer
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doExecuteList($ids)
     {
@@ -26,7 +24,6 @@ protected function doExecuteList($ids)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doExecuteRow($id)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleProcessor.php b/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleProcessor.php
index 2b5025f883735..ea0c946576695 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleProcessor.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleProcessor.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogRule\Model\Indexer\Product\ProductRuleProcessor
  *
- * @since 2.0.0
  */
 class ProductRuleProcessor extends AbstractProcessor
 {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php
index 6771f15506be0..ffadc11d5b8ce 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogRule\Model\Indexer\Rule\RuleProductIndexer
  *
- * @since 2.0.0
  */
 class RuleProductIndexer extends AbstractIndexer
 {
@@ -18,7 +17,6 @@ class RuleProductIndexer extends AbstractIndexer
      * {@inheritdoc}
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function doExecuteList($ids)
     {
@@ -30,7 +28,6 @@ protected function doExecuteList($ids)
      * {@inheritdoc}
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function doExecuteRow($id)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductProcessor.php b/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductProcessor.php
index 371c7a4c60fa5..d9d5116b7a077 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductProcessor.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductProcessor.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor
  *
- * @since 2.0.0
  */
 class RuleProductProcessor extends AbstractProcessor
 {
diff --git a/app/code/Magento/CatalogRule/Model/Product/PriceModifier.php b/app/code/Magento/CatalogRule/Model/Product/PriceModifier.php
index 80c5669aa99ff..73ab3924b5b7e 100644
--- a/app/code/Magento/CatalogRule/Model/Product/PriceModifier.php
+++ b/app/code/Magento/CatalogRule/Model/Product/PriceModifier.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\CatalogRule\Model\Product\PriceModifier
  *
- * @since 2.0.0
  */
 class PriceModifier implements PriceModifierInterface
 {
     /**
      * @var \Magento\CatalogRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @param RuleFactory $ruleFactory
-     * @since 2.0.0
      */
     public function __construct(RuleFactory $ruleFactory)
     {
@@ -39,7 +36,6 @@ public function __construct(RuleFactory $ruleFactory)
      * @param mixed $price
      * @param Product $product
      * @return mixed
-     * @since 2.0.0
      */
     public function modifyPrice($price, Product $product)
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Grid/Collection.php
index 1345ec8f696a5..0e82ea9c8017d 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Grid/Collection.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\CatalogRule\Model\ResourceModel\Grid\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\CatalogRule\Model\ResourceModel\Rule\Collection
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
index 32fc89c7ff914..48b73f042349a 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -14,49 +14,49 @@
 /**
  * Class \Magento\CatalogRule\Model\ResourceModel\Product\LinkedProductSelectBuilderByCatalogRulePrice
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $resource;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $customerSession;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $dateTime;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $localeDate;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $metadataPool;
 
     /**
      * @var BaseSelectProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $baseSelectProcessor;
 
@@ -68,7 +68,7 @@ class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelec
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface $baseSelectProcessor
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -91,7 +91,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function build($productId)
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
index 9aa94c08a4bb0..40c20fc706cc8 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
 {
@@ -28,7 +27,6 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -36,7 +34,6 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
      * Catalog rule data
      *
      * @var \Magento\CatalogRule\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogRuleData = null;
 
@@ -44,43 +41,36 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
     /**
      * @var \Magento\Catalog\Model\Product\ConditionFactory
-     * @since 2.0.0
      */
     protected $_conditionFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -104,7 +94,6 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
      * @param PriceCurrencyInterface $priceCurrency
      * @param null $connectionName
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -137,7 +126,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -147,7 +135,6 @@ protected function _construct()
     /**
      * @param \Magento\Framework\Model\AbstractModel $rule
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $rule)
     {
@@ -172,7 +159,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $rule)
      * @param int $gId
      * @param int $pId
      * @return float|false
-     * @since 2.0.0
      */
     public function getRulePrice($date, $wId, $gId, $pId)
     {
@@ -193,7 +179,6 @@ public function getRulePrice($date, $wId, $gId, $pId)
      * @param int $customerGroupId
      * @param array $productIds
      * @return array
-     * @since 2.0.0
      */
     public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGroupId, $productIds)
     {
@@ -216,7 +201,6 @@ public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGro
      * @param int $customerGroupId
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function getRulesFromProduct($date, $websiteId, $customerGroupId, $productId)
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
index 89f2d1c74f765..656c569016664 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CatalogRule\Model\ResourceModel\Rule\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      * Store associated with rule entities information map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_associatedEntitiesMap;
 
@@ -59,7 +57,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +69,6 @@ protected function _construct()
      * @param string $attributeCode
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function addAttributeInConditionFilter($attributeCode)
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
index 055a042522a02..ef4b4512265ae 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -23,7 +22,6 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -41,7 +39,6 @@ protected function _construct()
      * @param array $updateFields       the array of fields for compare with rule price and update
      * @param string $websiteDate
      * @return \Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price
-     * @since 2.0.0
      */
     public function applyPriceRuleToIndexTable(
         \Magento\Framework\DB\Select $select,
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price/Collection.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price/Collection.php
index bcee1508eb302..4df44e5df729f 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price/Collection.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price/Collection.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
     /**
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getProductIds()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 28aee013008ca..8ec23142a0b7a 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -24,7 +24,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, IdentityInterface
 {
@@ -32,7 +31,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'catalogrule_rule';
 
@@ -42,7 +40,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * In observe method you can use $observer->getEvent()->getRule() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'rule';
 
@@ -50,7 +47,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Store matched product Ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productIds;
 
@@ -58,7 +54,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Limitation for products collection
      *
      * @var int|array|null
-     * @since 2.0.0
      */
     protected $_productsFilter = null;
 
@@ -66,7 +61,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Store current date at "Y-m-d H:i:s" format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_now;
 
@@ -74,7 +68,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Cached data of prices calculated by price rules
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_priceRulesData = [];
 
@@ -82,73 +75,61 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * Catalog rule data
      *
      * @var \Magento\CatalogRule\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogRuleData;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypesList;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_relatedCacheTypes;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Framework\Model\ResourceModel\Iterator
-     * @since 2.0.0
      */
     protected $_resourceIterator;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\CatalogRule\Model\Rule\Condition\CombineFactory
-     * @since 2.0.0
      */
     protected $_combineFactory;
 
     /**
      * @var \Magento\CatalogRule\Model\Rule\Action\CollectionFactory
-     * @since 2.0.0
      */
     protected $_actionCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
-     * @since 2.0.0
      */
     protected $_ruleProductProcessor;
 
@@ -185,7 +166,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -242,7 +222,6 @@ public function __construct(
      * Init resource model and id field
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -255,7 +234,6 @@ protected function _construct()
      * Getter for rule conditions collection
      *
      * @return \Magento\Rule\Model\Condition\Combine
-     * @since 2.0.0
      */
     public function getConditionsInstance()
     {
@@ -266,7 +244,6 @@ public function getConditionsInstance()
      * Getter for rule actions collection
      *
      * @return \Magento\CatalogRule\Model\Rule\Action\Collection
-     * @since 2.0.0
      */
     public function getActionsInstance()
     {
@@ -277,7 +254,6 @@ public function getActionsInstance()
      * Get catalog rule customer group Ids
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getCustomerGroupIds()
     {
@@ -292,7 +268,6 @@ public function getCustomerGroupIds()
      * Retrieve current date for current rule
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNow()
     {
@@ -308,7 +283,6 @@ public function getNow()
      * @param string $now
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setNow($now)
     {
@@ -319,7 +293,6 @@ public function setNow($now)
      * Get array of product ids which are matched by rule
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMatchingProductIds()
     {
@@ -355,7 +328,6 @@ public function getMatchingProductIds()
      *
      * @param array $args
      * @return void
-     * @since 2.0.0
      */
     public function callbackValidateProduct($args)
     {
@@ -376,7 +348,6 @@ public function callbackValidateProduct($args)
      * Prepare website map
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getWebsitesMap()
     {
@@ -394,7 +365,6 @@ protected function _getWebsitesMap()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateData(\Magento\Framework\DataObject $dataObject)
     {
@@ -417,7 +387,6 @@ public function validateData(\Magento\Framework\DataObject $dataObject)
      * @param string|int|float $discount
      *
      * @return array Validation errors
-     * @since 2.0.0
      */
     protected function validateDiscount($action, $discount)
     {
@@ -448,7 +417,6 @@ protected function validateDiscount($action, $discount)
      * @param float $price
      * @return float|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function calcProductPriceRule(Product $product, $price)
     {
@@ -502,7 +470,6 @@ public function calcProductPriceRule(Product $product, $price)
      * @param array $customerGroupId
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     protected function _getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $productId)
     {
@@ -515,7 +482,6 @@ protected function _getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $
      * @param  int|array $productIds
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setProductsFilter($productIds)
     {
@@ -527,7 +493,6 @@ public function setProductsFilter($productIds)
      *
      * @return array|int|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getProductsFilter()
     {
@@ -538,7 +503,6 @@ public function getProductsFilter()
      * Invalidate related cache types
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _invalidateCache()
     {
@@ -552,7 +516,6 @@ protected function _invalidateCache()
      * {@inheritdoc}
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -582,7 +545,6 @@ public function reindex()
      * {@inheritdoc}
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -594,7 +556,6 @@ public function afterDelete()
      * Check if rule behavior changed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRuleBehaviorChanged()
     {
@@ -615,7 +576,6 @@ public function isRuleBehaviorChanged()
      * @param array $array2
      *
      * @return array
-     * @since 2.0.0
      */
     protected function dataDiff($array1, $array2)
     {
@@ -868,7 +828,7 @@ private function getRuleConditionConverter()
 
     /**
      * @inheritDoc
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Action/Collection.php b/app/code/Magento/CatalogRule/Model/Rule/Action/Collection.php
index 56a874afef053..9237ba54d3efc 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Action/Collection.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Action/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Rule\Model\Action\Collection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Rule\Model\Action\Collection
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Rule\Model\ActionFactory $actionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -30,7 +28,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Action/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Action/Product.php
index 865cc8ac54283..5092d319bc1d9 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Action/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Action/Product.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\CatalogRule\Model\Rule\Action\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Rule\Model\Action\AbstractAction
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -24,7 +22,6 @@ public function loadAttributeOptions()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadOperatorOptions()
     {
@@ -41,7 +38,6 @@ public function loadOperatorOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Combine.php
index b3e8770206301..9b19096857662 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Combine.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Combine.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\CatalogRule\Model\Rule\Condition\Combine
  *
- * @since 2.0.0
  */
 class Combine extends \Magento\Rule\Model\Condition\Combine
 {
     /**
      * @var \Magento\CatalogRule\Model\Rule\Condition\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -26,7 +24,6 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
      * @param \Magento\Rule\Model\Condition\Context $context
      * @param \Magento\CatalogRule\Model\Rule\Condition\ProductFactory $conditionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
@@ -69,7 +65,6 @@ public function getNewChildSelectOptions()
     /**
      * @param array $productCollection
      * @return $this
-     * @since 2.0.0
      */
     public function collectValidatedAttributes($productCollection)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
index 79c235efcde48..51cb6638af48b 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -11,7 +11,6 @@
 
 /**
  * @method string getAttribute() Returns attribute code
- * @since 2.0.0
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
 {
@@ -20,7 +19,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -48,7 +46,6 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
      * @param \Magento\Framework\Model\AbstractModel $model
      * @param mixed $oldAttrValue
      * @return void
-     * @since 2.0.0
      */
     protected function _restoreOldAttrValue(\Magento\Framework\Model\AbstractModel $model, $oldAttrValue)
     {
@@ -65,7 +62,6 @@ protected function _restoreOldAttrValue(\Magento\Framework\Model\AbstractModel $
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _setAttributeValue(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -98,7 +94,6 @@ protected function _setAttributeValue(\Magento\Framework\Model\AbstractModel $mo
      * @param mixed $value
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\Model\AbstractModel $model
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareDatetimeValue($value, \Magento\Framework\Model\AbstractModel $model)
     {
@@ -116,7 +111,6 @@ protected function _prepareDatetimeValue($value, \Magento\Framework\Model\Abstra
      * @param mixed $value
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\Model\AbstractModel $model
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareMultiselectValue($value, \Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php
index d833a03a5b3bd..ecc7a0f6db0dd 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Job.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php
@@ -26,13 +26,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Job extends \Magento\Framework\DataObject
 {
     /**
      * @var RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProcessor;
 
@@ -40,7 +38,6 @@ class Job extends \Magento\Framework\DataObject
      * Basic object initialization
      *
      * @param RuleProductProcessor $ruleProcessor
-     * @since 2.0.0
      */
     public function __construct(RuleProductProcessor $ruleProcessor)
     {
@@ -52,7 +49,6 @@ public function __construct(RuleProductProcessor $ruleProcessor)
      *
      * @return \Magento\CatalogRule\Model\Rule\Job
      * @api
-     * @since 2.0.0
      */
     public function applyAll()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php b/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
index ab01480bb1ec3..07c1093cc0eff 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
@@ -33,7 +33,6 @@
 /**
  * Class \Magento\CatalogRule\Model\Rule\Product\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Model\AbstractModel
 {
@@ -41,7 +40,6 @@ class Price extends \Magento\Framework\Model\AbstractModel
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +57,6 @@ protected function _construct()
      * @param array $updateFields       the array fields for compare with rule price and update
      * @param string $websiteDate
      * @return $this
-     * @since 2.0.0
      */
     public function applyPriceRuleToIndexTable(
         Select $select,
diff --git a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
index 956ba4abba834..75a208e87100b 100644
--- a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
@@ -20,43 +20,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PrepareCatalogProductCollectionPricesObserver implements ObserverInterface
 {
     /**
      * @var CustomerModelSession
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @since 2.0.0
      */
     protected $resourceRuleFactory;
 
     /**
      * @var \Magento\CatalogRule\Observer\RulePricesStorage
-     * @since 2.0.0
      */
     protected $rulePricesStorage;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -67,7 +60,6 @@ class PrepareCatalogProductCollectionPricesObserver implements ObserverInterface
      * @param TimezoneInterface $localeDate
      * @param CustomerModelSession $customerSession
      * @param GroupManagementInterface $groupManagement
-     * @since 2.0.0
      */
     public function __construct(
         RulePricesStorage $rulePricesStorage,
@@ -90,7 +82,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php b/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
index d12b0d0b8246b..d653e3955ec43 100644
--- a/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
@@ -20,7 +20,6 @@
 /**
  * Class \Magento\CatalogRule\Observer\ProcessAdminFinalPriceObserver
  *
- * @since 2.0.0
  */
 class ProcessAdminFinalPriceObserver implements ObserverInterface
 {
@@ -28,25 +27,21 @@ class ProcessAdminFinalPriceObserver implements ObserverInterface
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @since 2.0.0
      */
     protected $resourceRuleFactory;
 
     /**
      * @var \Magento\CatalogRule\Observer\RulePricesStorage
-     * @since 2.0.0
      */
     protected $rulePricesStorage;
 
@@ -55,7 +50,6 @@ class ProcessAdminFinalPriceObserver implements ObserverInterface
      * @param Registry $coreRegistry
      * @param \Magento\CatalogRule\Model\ResourceModel\RuleFactory $resourceRuleFactory
      * @param TimezoneInterface $localeDate
-     * @since 2.0.0
      */
     public function __construct(
         RulePricesStorage $rulePricesStorage,
@@ -74,7 +68,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php b/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
index bdbf7f7f8b99e..defc58bea1183 100644
--- a/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
@@ -20,37 +20,31 @@
 /**
  * Class \Magento\CatalogRule\Observer\ProcessFrontFinalPriceObserver
  *
- * @since 2.0.0
  */
 class ProcessFrontFinalPriceObserver implements ObserverInterface
 {
     /**
      * @var CustomerModelSession
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @since 2.0.0
      */
     protected $resourceRuleFactory;
 
     /**
      * @var \Magento\CatalogRule\Observer\RulePricesStorage
-     * @since 2.0.0
      */
     protected $rulePricesStorage;
 
@@ -60,7 +54,6 @@ class ProcessFrontFinalPriceObserver implements ObserverInterface
      * @param StoreManagerInterface $storeManager
      * @param TimezoneInterface $localeDate
      * @param CustomerModelSession $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         RulePricesStorage $rulePricesStorage,
@@ -81,7 +74,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
index c5b07593a4cde..7653772fec13c 100644
--- a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
+++ b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CatalogRule\Observer\RulePricesStorage
  *
- * @since 2.0.0
  */
 class RulePricesStorage
 {
@@ -18,14 +17,12 @@ class RulePricesStorage
      * Prices collected per website, customer group, date and product
      *
      * @var array
-     * @since 2.0.0
      */
     private $rulePrices = [];
 
     /**
      * @param string $id
      * @return false|float
-     * @since 2.0.0
      */
     public function getRulePrice($id)
     {
@@ -35,7 +32,6 @@ public function getRulePrice($id)
     /**
      * @param string $id
      * @return bool
-     * @since 2.0.0
      */
     public function hasRulePrice($id)
     {
@@ -46,7 +42,6 @@ public function hasRulePrice($id)
      * @param string $id
      * @param float $price
      * @return void
-     * @since 2.0.0
      */
     public function setRulePrice($id, $price)
     {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
index fca4fcd3f9419..55c83175807fa 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\Category
  *
- * @since 2.0.0
  */
 class Category
 {
     /**
      * @var ProductRuleProcessor
-     * @since 2.0.0
      */
     protected $productRuleProcessor;
 
     /**
      * @param ProductRuleProcessor $productRuleProcessor
-     * @since 2.0.0
      */
     public function __construct(
         ProductRuleProcessor $productRuleProcessor
@@ -36,7 +33,6 @@ public function __construct(
      * @return \Magento\Catalog\Model\Category
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(
         \Magento\Catalog\Model\Category $subject,
@@ -56,7 +52,6 @@ public function afterSave(
      * @return \Magento\Catalog\Model\Category
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(
         \Magento\Catalog\Model\Category $subject,
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/CustomerGroup.php b/app/code/Magento/CatalogRule/Plugin/Indexer/CustomerGroup.php
index a009b556d9a5b..363814b2d5987 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/CustomerGroup.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/CustomerGroup.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\CustomerGroup
  *
- * @since 2.0.0
  */
 class CustomerGroup
 {
     /**
      * @var RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProductProcessor;
 
     /**
      * @param RuleProductProcessor $ruleProductProcessor
-     * @since 2.0.0
      */
     public function __construct(RuleProductProcessor $ruleProductProcessor)
     {
@@ -36,7 +33,6 @@ public function __construct(RuleProductProcessor $ruleProductProcessor)
      * @return Group
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(
         Group $subject,
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/ImportExport.php b/app/code/Magento/CatalogRule/Plugin/Indexer/ImportExport.php
index c1bfb6f22e6dd..95c9a1cebe448 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/ImportExport.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/ImportExport.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\ImportExport
  *
- * @since 2.0.0
  */
 class ImportExport
 {
     /**
      * @var RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProductProcessor;
 
     /**
      * @param RuleProductProcessor $ruleProductProcessor
-     * @since 2.0.0
      */
     public function __construct(RuleProductProcessor $ruleProductProcessor)
     {
@@ -38,7 +35,6 @@ public function __construct(RuleProductProcessor $ruleProductProcessor)
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterImportSource(Import $subject, $result)
     {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
index ce7cc4ad0bc52..927a25df413d1 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
@@ -15,25 +15,21 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\Product\Attribute
  *
- * @since 2.0.0
  */
 class Attribute
 {
     /**
      * @var RuleCollectionFactory
-     * @since 2.0.0
      */
     protected $ruleCollectionFactory;
 
     /**
      * @var RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProductProcessor;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -41,7 +37,6 @@ class Attribute
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param RuleProductProcessor $ruleProductProcessor
      * @param ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,
@@ -59,7 +54,6 @@ public function __construct(
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject,
@@ -77,7 +71,6 @@ public function afterSave(
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject,
@@ -95,7 +88,6 @@ public function afterDelete(
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     protected function checkCatalogRulesAvailability($attributeCode)
     {
@@ -133,7 +125,6 @@ protected function checkCatalogRulesAvailability($attributeCode)
      * @param Combine $combine
      * @param string $attributeCode
      * @return void
-     * @since 2.0.0
      */
     protected function removeAttributeFromConditions(Combine $combine, $attributeCode)
     {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRules.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRules.php
index 59bea5b1f365b..5050eb91b15d9 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRules.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRules.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\Product\Save\ApplyRules
  *
- * @since 2.0.0
  */
 class ApplyRules
 {
     /**
      * @var ProductRuleProcessor
-     * @since 2.0.0
      */
     protected $productRuleProcessor;
 
     /**
      * @param ProductRuleProcessor $productRuleProcessor
-     * @since 2.0.0
      */
     public function __construct(ProductRuleProcessor $productRuleProcessor)
     {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
index 68a520c824d8f..60580607c2278 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
@@ -10,19 +10,19 @@
 
 /**
  * Plugin for Magento\Catalog\Model\Product
- * @since 2.1.0
+ * @since 2.0.1
  */
 class ApplyRulesAfterReindex
 {
     /**
      * @var ProductRuleProcessor
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $productRuleProcessor;
 
     /**
      * @param ProductRuleProcessor $productRuleProcessor
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(ProductRuleProcessor $productRuleProcessor)
     {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Website.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Website.php
index eeb73dc2cbf9c..e60f7c906bd2d 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Website.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Website.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Indexer\Website
  *
- * @since 2.0.0
  */
 class Website
 {
     /**
      * @var RuleProductProcessor
-     * @since 2.0.0
      */
     protected $ruleProductProcessor;
 
     /**
      * @param RuleProductProcessor $ruleProductProcessor
-     * @since 2.0.0
      */
     public function __construct(RuleProductProcessor $ruleProductProcessor)
     {
@@ -37,7 +34,6 @@ public function __construct(RuleProductProcessor $ruleProductProcessor)
      * @return \Magento\Store\Model\Website
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(
         \Magento\Store\Model\Website $subject,
diff --git a/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php b/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
index 1ea30f9e0554c..da6426a1824d9 100644
--- a/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
+++ b/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogRule\Plugin\Model\Product\Action
  *
- * @since 2.0.0
  */
 class Action
 {
     /**
      * @var ProductRuleProcessor
-     * @since 2.0.0
      */
     protected $productRuleProcessor;
 
     /**
      * @param ProductRuleProcessor $productRuleProcessor
-     * @since 2.0.0
      */
     public function __construct(ProductRuleProcessor $productRuleProcessor)
     {
@@ -38,7 +35,6 @@ public function __construct(ProductRuleProcessor $productRuleProcessor)
      *
      * @SuppressWarnings(PHPMD.UnusedFormatParameter)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterUpdateAttributes(ProductAction $object, ProductAction $result)
     {
diff --git a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
index 666def8255c87..e0b26f4480cf9 100644
--- a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
@@ -19,7 +19,6 @@
 
 /**
  * Class CatalogRulePrice
- * @since 2.0.0
  */
 class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterface
 {
@@ -30,32 +29,28 @@ class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterfa
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Store\Model\StoreManager
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     protected $resourceRuleFactory;
 
     /**
      * @var \Magento\CatalogRule\Model\ResourceModel\Rule
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $ruleResource;
 
@@ -68,7 +63,6 @@ class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterfa
      * @param StoreManager $storeManager
      * @param Session $customerSession
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -91,7 +85,6 @@ public function __construct(
      * Returns catalog rule value
      *
      * @return float|boolean
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -118,8 +111,8 @@ public function getValue()
 
     /**
      * @return Rule
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getRuleResource()
     {
diff --git a/app/code/Magento/CatalogRule/Setup/InstallData.php b/app/code/Magento/CatalogRule/Setup/InstallData.php
index 7011181a83dc6..47591f838d185 100644
--- a/app/code/Magento/CatalogRule/Setup/InstallData.php
+++ b/app/code/Magento/CatalogRule/Setup/InstallData.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogRule/Setup/InstallSchema.php b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
index 48775fd51d781..a12856d92422a 100644
--- a/app/code/Magento/CatalogRule/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
index b366053bf5725..bf9dce287eee0 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider
  *
- * @since 2.0.0
  */
 class ConfigurableProductsProvider
 {
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     private $resource;
 
@@ -27,7 +25,6 @@ class ConfigurableProductsProvider
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     /**
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function getIds(array $ids)
     {
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
index 4089532204f08..9c66719334639 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
@@ -11,26 +11,22 @@
 
 /**
  * Class ReindexProduct. Add configurable sub-products to reindex
- * @since 2.0.0
  */
 class ProductRuleReindex
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.0.0
      */
     private $configurable;
 
     /**
      * @var \Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider
-     * @since 2.0.0
      */
     private $configurableProductsProvider;
 
     /**
      * @param Configurable $configurable
      * @param ConfigurableProductsProvider $configurableProductsProvider
-     * @since 2.0.0
      */
     public function __construct(
         Configurable $configurable,
@@ -46,7 +42,6 @@ public function __construct(
      * @param int $id
      *
      * @return void
-     * @since 2.0.0
      */
     public function aroundExecuteRow(
         \Magento\CatalogRule\Model\Indexer\Product\ProductRuleIndexer $subject,
@@ -66,7 +61,6 @@ public function aroundExecuteRow(
      * @param array $ids
      *
      * @return void
-     * @since 2.0.0
      */
     public function aroundExecuteList(
         \Magento\CatalogRule\Model\Indexer\Product\ProductRuleIndexer $subject,
@@ -86,7 +80,6 @@ public function aroundExecuteList(
      * @param \Magento\CatalogRule\Model\Indexer\Product\ProductRuleIndexer $subject
      *
      * @return array
-     * @since 2.0.0
      */
     private function reindexSubProducts(
         array $configurableIds,
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
index e4dbd98733ae9..80cf8548b5de4 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
@@ -11,19 +11,16 @@
 
 /**
  * Add configurable sub products to catalog rule indexer on full reindex
- * @since 2.0.0
  */
 class ConfigurableProductHandler
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.0.0
      */
     private $configurable;
 
     /**
      * @var \Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider
-     * @since 2.0.0
      */
     private $configurableProductsProvider;
 
@@ -36,7 +33,6 @@ class ConfigurableProductHandler
     /**
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurable
      * @param ConfigurableProductsProvider $configurableProductsProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurable,
@@ -51,7 +47,6 @@ public function __construct(
      * @param array $productIds
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetMatchingProductIds(\Magento\CatalogRule\Model\Rule $rule, array $productIds)
     {
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
index 368a745815189..f194a0f885760 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
@@ -13,19 +13,16 @@
 
 /**
  * Class Validation. Call validate method for configurable product instead simple product
- * @since 2.0.0
  */
 class Validation
 {
     /**
      * @var Configurable
-     * @since 2.0.0
      */
     private $configurable;
 
     /**
      * @param Configurable $configurableType
-     * @since 2.0.0
      */
     public function __construct(Configurable $configurableType)
     {
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
index b68d845f173d5..27f7370f41704 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
@@ -12,7 +12,7 @@
 /**
  * Class \Magento\CatalogRuleConfigurable\Plugin\ConfigurableProduct\Model\ResourceModel\AddCatalogRulePrice
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class AddCatalogRulePrice
 {
@@ -24,7 +24,7 @@ class AddCatalogRulePrice
 
     /**
      * @param \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessorFactory $catalogRuleCollectionFactory
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessorFactory $catalogRuleCollectionFactory
@@ -37,7 +37,7 @@ public function __construct(
      * @param bool $printQuery
      * @param bool $logQuery
      * @return array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index 4f05f6043f397..574f0ed264c5d 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -22,7 +22,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends Template
 {
@@ -30,7 +29,6 @@ class Form extends Template
      * Currency factory
      *
      * @var CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -38,7 +36,6 @@ class Form extends Template
      * Catalog search advanced
      *
      * @var Advanced
-     * @since 2.0.0
      */
     protected $_catalogSearchAdvanced;
 
@@ -47,7 +44,6 @@ class Form extends Template
      * @param Advanced $catalogSearchAdvanced
      * @param CurrencyFactory $currencyFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -62,7 +58,6 @@ public function __construct(
 
     /**
      * @return AbstractBlock
-     * @since 2.0.0
      */
     public function _prepareLayout()
     {
@@ -87,7 +82,6 @@ public function _prepareLayout()
      * Retrieve collection of product searchable attributes
      *
      * @return DbCollection
-     * @since 2.0.0
      */
     public function getSearchableAttributes()
     {
@@ -100,7 +94,6 @@ public function getSearchableAttributes()
      *
      * @param AbstractAttribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeLabel($attribute)
     {
@@ -112,7 +105,6 @@ public function getAttributeLabel($attribute)
      *
      * @param AbstractAttribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeValidationClass($attribute)
     {
@@ -125,7 +117,6 @@ public function getAttributeValidationClass($attribute)
      * @param AbstractAttribute $attribute
      * @param string|null $part
      * @return mixed|string
-     * @since 2.0.0
      */
     public function getAttributeValue($attribute, $part = null)
     {
@@ -145,7 +136,6 @@ public function getAttributeValue($attribute, $part = null)
      * Retrieve the list of available currencies
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableCurrencies()
     {
@@ -175,7 +165,6 @@ public function getAvailableCurrencies()
      * Count available currencies
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrencyCount()
     {
@@ -187,7 +176,6 @@ public function getCurrencyCount()
      *
      * @param AbstractAttribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getCurrency($attribute)
     {
@@ -208,7 +196,6 @@ public function getCurrency($attribute)
      *
      * @param AbstractAttribute $attribute
      * @return  string
-     * @since 2.0.0
      */
     public function getAttributeInputType($attribute)
     {
@@ -242,7 +229,6 @@ public function getAttributeInputType($attribute)
      *
      * @param AbstractAttribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSelectElement($attribute)
     {
@@ -281,7 +267,6 @@ public function getAttributeSelectElement($attribute)
      *
      * @param AbstractAttribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeYesNoElement($attribute)
     {
@@ -309,7 +294,6 @@ public function getAttributeYesNoElement($attribute)
 
     /**
      * @return BlockInterface
-     * @since 2.0.0
      */
     protected function _getSelectBlock()
     {
@@ -323,7 +307,6 @@ protected function _getSelectBlock()
 
     /**
      * @return BlockInterface|mixed
-     * @since 2.0.0
      */
     protected function _getDateBlock()
     {
@@ -339,7 +322,6 @@ protected function _getDateBlock()
      * Retrieve search form action url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSearchPostUrl()
     {
@@ -352,7 +334,6 @@ public function getSearchPostUrl()
      * @param AbstractAttribute $attribute
      * @param string $part
      * @return string
-     * @since 2.0.0
      */
     public function getDateInput($attribute, $part = 'from')
     {
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
index 0271663565936..83cc8891c4fff 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
@@ -17,7 +17,6 @@
  * Advanced search result
  *
  * @api
- * @since 2.0.0
  */
 class Result extends Template
 {
@@ -25,7 +24,6 @@ class Result extends Template
      * Url factory
      *
      * @var UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
@@ -33,7 +31,6 @@ class Result extends Template
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
@@ -41,7 +38,6 @@ class Result extends Template
      * Catalog search advanced
      *
      * @var Advanced
-     * @since 2.0.0
      */
     protected $_catalogSearchAdvanced;
 
@@ -51,7 +47,6 @@ class Result extends Template
      * @param LayerResolver $layerResolver
      * @param UrlFactory $urlFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -68,7 +63,6 @@ public function __construct(
 
     /**
      * @return AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -108,7 +102,6 @@ private function getPageTitle()
      * Set order options
      *
      * @return void
-     * @since 2.0.0
      */
     public function setListOrders()
     {
@@ -125,7 +118,6 @@ public function setListOrders()
      * Set view mode options
      *
      * @return void
-     * @since 2.0.0
      */
     public function setListModes()
     {
@@ -134,7 +126,6 @@ public function setListModes()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function setListCollection()
     {
@@ -143,7 +134,6 @@ public function setListCollection()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
@@ -152,7 +142,6 @@ protected function _getProductCollection()
 
     /**
      * @return Advanced
-     * @since 2.0.0
      */
     public function getSearchModel()
     {
@@ -161,7 +150,6 @@ public function getSearchModel()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getResultCount()
     {
@@ -174,7 +162,6 @@ public function getResultCount()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getProductListHtml()
     {
@@ -183,7 +170,6 @@ public function getProductListHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormUrl()
     {
@@ -197,7 +183,6 @@ public function getFormUrl()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSearchCriterias()
     {
diff --git a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
index 7a47bccf101c9..caabec6cbf8b0 100644
--- a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
+++ b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
@@ -12,19 +12,16 @@
 
 /**
  * Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
- * @since 2.0.0
  */
 class FrontTabPlugin
 {
     /**
      * @var Weight
-     * @since 2.0.0
      */
     private $weightSource;
 
     /**
      * @param Weight $weightSource
-     * @since 2.0.0
      */
     public function __construct(Weight $weightSource)
     {
diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php
index 4186724948b3f..2a4e38038fb88 100644
--- a/app/code/Magento/CatalogSearch/Block/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Result.php
@@ -17,7 +17,6 @@
  * Product search result block
  *
  * @api
- * @since 2.0.0
  */
 class Result extends Template
 {
@@ -25,7 +24,6 @@ class Result extends Template
      * Catalog Product collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $productCollection;
 
@@ -33,7 +31,6 @@ class Result extends Template
      * Catalog search data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $catalogSearchData;
 
@@ -41,13 +38,11 @@ class Result extends Template
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $catalogLayer;
 
     /**
      * @var QueryFactory
-     * @since 2.0.0
      */
     private $queryFactory;
 
@@ -57,7 +52,6 @@ class Result extends Template
      * @param Data $catalogSearchData
      * @param QueryFactory $queryFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      * Retrieve query model object
      *
      * @return \Magento\Search\Model\Query
-     * @since 2.0.0
      */
     protected function _getQuery()
     {
@@ -87,7 +80,6 @@ protected function _getQuery()
      * Prepare layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -116,7 +108,6 @@ protected function _prepareLayout()
      * Retrieve additional blocks html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalHtml()
     {
@@ -127,7 +118,6 @@ public function getAdditionalHtml()
      * Retrieve search list toolbar block
      *
      * @return ListProduct
-     * @since 2.0.0
      */
     public function getListBlock()
     {
@@ -138,7 +128,6 @@ public function getListBlock()
      * Set search available list orders
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setListOrders()
     {
@@ -163,7 +152,6 @@ public function setListOrders()
      * Set available view mode
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setListModes()
     {
@@ -176,7 +164,6 @@ public function setListModes()
      * Retrieve Search result list HTML output
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductListHtml()
     {
@@ -187,7 +174,6 @@ public function getProductListHtml()
      * Retrieve loaded category collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     protected function _getProductCollection()
     {
@@ -202,7 +188,6 @@ protected function _getProductCollection()
      * Get search query text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSearchQueryText()
     {
@@ -213,7 +198,6 @@ public function getSearchQueryText()
      * Retrieve search result count
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResultCount()
     {
@@ -229,7 +213,6 @@ public function getResultCount()
      * Retrieve No Result or Minimum query length Text
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getNoResultText()
     {
@@ -243,7 +226,6 @@ public function getNoResultText()
      * Retrieve Note messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNoteMessages()
     {
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
index 8cd23b16ddaed..9226108040bcb 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\CatalogSearch\Controller\Advanced\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index 4533e57945a2b..7c9471d573cc7 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogSearch\Controller\Advanced\Result
  *
- * @since 2.0.0
  */
 class Result extends \Magento\Framework\App\Action\Action
 {
@@ -22,7 +21,6 @@ class Result extends \Magento\Framework\App\Action\Action
      * Url factory
      *
      * @var UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
@@ -30,7 +28,6 @@ class Result extends \Magento\Framework\App\Action\Action
      * Catalog search advanced
      *
      * @var ModelAdvanced
-     * @since 2.0.0
      */
     protected $_catalogSearchAdvanced;
 
@@ -40,7 +37,6 @@ class Result extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param ModelAdvanced $catalogSearchAdvanced
      * @param UrlFactory $urlFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -54,7 +50,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 4816b3edf3bb4..eaec501a128c8 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\CatalogSearch\Controller\Result\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
@@ -24,19 +23,16 @@ class Index extends \Magento\Framework\App\Action\Action
      * Catalog session
      *
      * @var Session
-     * @since 2.0.0
      */
     protected $_catalogSession;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var QueryFactory
-     * @since 2.0.0
      */
     private $_queryFactory;
 
@@ -44,7 +40,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * Catalog Layer Resolver
      *
      * @var Resolver
-     * @since 2.0.0
      */
     private $layerResolver;
 
@@ -54,7 +49,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param StoreManagerInterface $storeManager
      * @param QueryFactory $queryFactory
      * @param Resolver $layerResolver
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -74,7 +68,6 @@ public function __construct(
      * Display search result
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogSearch/Helper/Data.php b/app/code/Magento/CatalogSearch/Helper/Data.php
index 43dbddb3c14e9..4f14edc8c772d 100644
--- a/app/code/Magento/CatalogSearch/Helper/Data.php
+++ b/app/code/Magento/CatalogSearch/Helper/Data.php
@@ -9,7 +9,6 @@
  * Catalog search helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Search\Helper\Data
 {
@@ -17,7 +16,6 @@ class Data extends \Magento\Search\Helper\Data
      * Retrieve advanced search URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdvancedSearchUrl()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
index 25af0d36e0a5b..a2242ff0f355b 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -20,37 +20,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DataProvider implements DataProviderInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.0.0
      */
     private $scopeResolver;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     private $customerSession;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
@@ -59,7 +53,6 @@ class DataProvider implements DataProviderInterface
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
      * @param Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Config $eavConfig,
@@ -76,7 +69,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataSet(
         BucketInterface $bucket,
@@ -133,7 +125,6 @@ public function getDataSet(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute(Select $select)
     {
@@ -142,7 +133,6 @@ public function execute(Select $select)
 
     /**
      * @return Select
-     * @since 2.0.0
      */
     private function getSelect()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index f42bcf5234939..ed4d255ba49d1 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -20,43 +20,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DataProvider implements DataProviderInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var Range
-     * @since 2.0.0
      */
     private $range;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     private $customerSession;
 
     /**
      * @var MysqlDataProviderInterface
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @var IntervalFactory
-     * @since 2.0.0
      */
     private $intervalFactory;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
@@ -73,7 +66,6 @@ class DataProvider implements DataProviderInterface
      * @param MysqlDataProviderInterface $dataProvider
      * @param IntervalFactory $intervalFactory
      * @param StoreManager $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -94,7 +86,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRange()
     {
@@ -103,7 +94,6 @@ public function getRange()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage)
     {
@@ -131,7 +121,6 @@ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getInterval(
         BucketInterface $bucket,
@@ -145,7 +134,6 @@ public function getInterval(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAggregation(
         BucketInterface $bucket,
@@ -175,7 +163,6 @@ public function getAggregation(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepareData($range, array $dbRanges)
     {
@@ -201,7 +188,6 @@ public function prepareData($range, array $dbRanges)
 
     /**
      * @return Select
-     * @since 2.0.0
      */
     private function getSelect()
     {
@@ -211,7 +197,6 @@ private function getSelect()
     /**
      * @param Select $select
      * @return Select
-     * @since 2.0.0
      */
     private function setCustomerGroupId($select)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
index e8466c8cb336c..6b5868d7478b8 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\CatalogSearch\Model\Adapter\Mysql\Field\Resolver
  *
- * @since 2.0.0
  */
 class Resolver implements ResolverInterface
 {
     /**
      * @var AttributeCollection
-     * @since 2.0.0
      */
     private $attributeCollection;
 
     /**
      * @var FieldFactory
-     * @since 2.0.0
      */
     private $fieldFactory;
 
     /**
      * @param AttributeCollection $attributeCollection
      * @param FieldFactory $fieldFactory
-     * @since 2.0.0
      */
     public function __construct(
         AttributeCollection $attributeCollection,
@@ -44,7 +40,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolve(array $fields)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
index 18dbae554a714..fa1be66b88460 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -25,43 +25,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Preprocessor implements PreprocessorInterface
 {
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.0.0
      */
     private $scopeResolver;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $attributePrefix;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
@@ -102,7 +95,6 @@ class Preprocessor implements PreprocessorInterface
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         ConditionManager $conditionManager,
@@ -139,7 +131,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(FilterInterface $filter, $isNegation, $query)
     {
@@ -151,7 +142,6 @@ public function process(FilterInterface $filter, $isNegation, $query)
      * @param bool $isNegation
      * @param string $query
      * @return string
-     * @since 2.0.0
      */
     private function processQueryWithField(FilterInterface $filter, $isNegation, $query)
     {
@@ -229,7 +219,6 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
      * @param string $query
      * @param Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     private function processRangeNumeric(FilterInterface $filter, $query, $attribute)
     {
@@ -262,7 +251,6 @@ private function processRangeNumeric(FilterInterface $filter, $query, $attribute
      * @param FilterInterface $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function processTermSelect(FilterInterface $filter, $isNegation)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
index 1705e5082e722..42bf33964fe6d 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Adapter\Mysql\Plugin\Aggregation\Category\DataProvider
  *
- * @since 2.0.0
  */
 class DataProvider
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.0.0
      */
     private $scopeResolver;
 
@@ -36,7 +33,6 @@ class DataProvider
      * Category factory
      *
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
@@ -45,7 +41,6 @@ class DataProvider
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
      * @param Resolver $layerResolver
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -66,7 +61,6 @@ public function __construct(
      * @param Table $entityIdsTable
      * @return Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetDataSet(
         \Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider $subject,
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
index a3fb2a533b5e7..0e8cb32b4c6cd 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Options implements OptionsInterface
 {
@@ -21,13 +20,11 @@ class Options implements OptionsInterface
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(ScopeConfigInterface $scopeConfig)
     {
@@ -36,7 +33,6 @@ public function __construct(ScopeConfigInterface $scopeConfig)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
index 0b05d5d4ee2b0..28e4ac4ca7198 100644
--- a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
@@ -8,13 +8,11 @@
 /**
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Engine extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -27,7 +25,6 @@ class Engine extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      * Invalidate catalog search index if engine was changed
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index aa9a5a90906bb..6598c6e76609c 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -43,7 +43,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Advanced extends \Magento\Framework\Model\AbstractModel
 {
@@ -51,7 +50,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * User friendly search criteria list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_searchCriterias = [];
 
@@ -59,7 +57,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Product collection
      *
      * @var ProductCollection
-     * @since 2.0.0
      */
     protected $_productCollection;
 
@@ -67,7 +64,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Initialize dependencies
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -75,7 +71,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Catalog product visibility
      *
      * @var Visibility
-     * @since 2.0.0
      */
     protected $_catalogProductVisibility;
 
@@ -83,7 +78,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Attribute collection factory
      *
      * @var AttributeCollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -91,7 +85,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -99,7 +92,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Product factory
      *
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -107,7 +99,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Currency factory
      *
      * @var CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -115,7 +106,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * Advanced Collection Factory
      *
      * @var ProductCollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
@@ -135,7 +125,6 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -174,7 +163,6 @@ public function __construct(
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addFilters($values)
     {
@@ -248,7 +236,6 @@ public function addFilters($values)
      * Retrieve array of attributes used in advanced search
      *
      * @return array|\Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -274,7 +261,6 @@ public function getAttributes()
      * Retrieve advanced search product collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
@@ -295,7 +281,6 @@ public function getProductCollection()
      *
      * @param Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function prepareProductCollection($collection)
     {
@@ -314,7 +299,6 @@ public function prepareProductCollection($collection)
      * @param EntityAttribute $attribute
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     protected function addSearchCriteria($attribute, $value)
     {
@@ -333,7 +317,6 @@ protected function addSearchCriteria($attribute, $value)
      * @return  string|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function getPreparedSearchCriteria($attribute, $value)
     {
@@ -400,7 +383,6 @@ protected function getPreparedSearchCriteria($attribute, $value)
      * Returns prepared search criterias in text
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSearchCriterias()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
index c09ca9679742b..2bc63d30fa5e6 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Builder extends RequestBuilder
 {
@@ -18,7 +17,6 @@ class Builder extends RequestBuilder
      * @param array|string $attributeValue
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function bindRequestValue($attributeCode, $attributeValue)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
index 2871152893e87..28cd32c89459a 100644
--- a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\CatalogSearch\Model\Autocomplete\DataProvider
  *
- * @since 2.0.0
  */
 class DataProvider implements DataProviderInterface
 {
@@ -22,7 +21,6 @@ class DataProvider implements DataProviderInterface
      * Query factory
      *
      * @var QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory;
 
@@ -30,14 +28,12 @@ class DataProvider implements DataProviderInterface
      * Autocomplete result item factory
      *
      * @var ItemFactory
-     * @since 2.0.0
      */
     protected $itemFactory;
 
     /**
      * @param QueryFactory $queryFactory
      * @param ItemFactory $itemFactory
-     * @since 2.0.0
      */
     public function __construct(
         QueryFactory $queryFactory,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -74,7 +69,6 @@ public function getItems()
      * Retrieve suggest collection for query
      *
      * @return Collection
-     * @since 2.0.0
      */
     private function getSuggestCollection()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Fulltext.php
index 13cc2b9ee6e01..c7943508df17c 100644
--- a/app/code/Magento/CatalogSearch/Model/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Fulltext.php
@@ -23,7 +23,6 @@
  * @method \Magento\CatalogSearch\Model\Fulltext setStoreId(int $value)
  * @method string getDataIndex()
  * @method \Magento\CatalogSearch\Model\Fulltext setDataIndex(string $value)
- * @since 2.0.0
  */
 class Fulltext extends \Magento\Framework\Model\AbstractModel
 {
@@ -31,7 +30,6 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel
      * Catalog search data
      *
      * @var QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory = null;
 
@@ -39,7 +37,6 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -51,7 +48,6 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel
      * @param AbstractResource $resource
      * @param DbCollection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -69,7 +65,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      * Reset search results cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetSearchResults()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
index 9574c69f3ad88..e982f5ad73cb5 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -17,7 +17,6 @@
  * Provide functionality for Fulltext Search indexing.
  *
  * @api
- * @since 2.0.0
  */
 class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
@@ -28,43 +27,36 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
 
     /**
      * @var array index structure
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @var IndexerHandlerFactory
-     * @since 2.0.0
      */
     private $indexerHandlerFactory;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\Search\Request\DimensionFactory
-     * @since 2.0.0
      */
     private $dimensionFactory;
 
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
-     * @since 2.0.0
      */
     private $fullAction;
 
     /**
      * @var FulltextResource
-     * @since 2.0.0
      */
     private $fulltextResource;
 
     /**
      * @var \Magento\Framework\Search\Request\Config
-     * @since 2.0.0
      */
     private $searchRequestConfig;
 
@@ -90,7 +82,6 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      * @param array $data
      * @param IndexSwitcherInterface $indexSwitcher
      * @param Scope\State $indexScopeState
-     * @since 2.0.0
      */
     public function __construct(
         FullFactory $fullActionFactory,
@@ -125,7 +116,6 @@ public function __construct(
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function execute($ids)
     {
@@ -146,7 +136,6 @@ public function execute($ids)
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -174,7 +163,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -186,7 +174,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
index 47f4f96df8d01..ae7dc5479faf5 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -11,7 +11,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.1.0
+ * @since 2.0.1
  */
 class DataProvider
 {
@@ -19,7 +19,7 @@ class DataProvider
      * Searchable attributes cache
      *
      * @var \Magento\Eav\Model\Entity\Attribute[]
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $searchableAttributes;
 
@@ -27,7 +27,7 @@ class DataProvider
      * Index values separator
      *
      * @var string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $separator = ' | ';
 
@@ -35,7 +35,7 @@ class DataProvider
      * Product Type Instances cache
      *
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productTypes = [];
 
@@ -43,13 +43,13 @@ class DataProvider
      * Product Emulators cache
      *
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productEmulators = [];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productAttributeCollectionFactory;
 
@@ -57,7 +57,7 @@ class DataProvider
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $eavConfig;
 
@@ -65,7 +65,7 @@ class DataProvider
      * Catalog product type
      *
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $catalogProductType;
 
@@ -73,7 +73,7 @@ class DataProvider
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $eventManager;
 
@@ -81,25 +81,25 @@ class DataProvider
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $storeManager;
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\Engine
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $engine;
 
     /**
      * @var Resource
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $resource;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $connection;
 
@@ -124,7 +124,7 @@ class DataProvider
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(
         ResourceConnection $resource,
@@ -152,7 +152,7 @@ public function __construct(
      *
      * @param string|string[] $table
      * @return string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function getTable($table)
     {
@@ -168,7 +168,7 @@ private function getTable($table)
      * @param int $lastProductId
      * @param int $limit
      * @return array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function getSearchableProducts(
         $storeId,
@@ -206,7 +206,7 @@ public function getSearchableProducts(
      *
      * @param string $backendType
      * @return \Magento\Eav\Model\Entity\Attribute[]
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function getSearchableAttributes($backendType = null)
     {
@@ -253,7 +253,7 @@ public function getSearchableAttributes($backendType = null)
      *
      * @param int|string $attribute
      * @return \Magento\Eav\Model\Entity\Attribute
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function getSearchableAttribute($attribute)
     {
@@ -279,7 +279,7 @@ public function getSearchableAttribute($attribute)
      * @param string $field
      * @param string $backendType
      * @return \Zend_Db_Expr
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function unifyField($field, $backendType = 'varchar')
     {
@@ -298,7 +298,7 @@ private function unifyField($field, $backendType = 'varchar')
      * @param array $productIds
      * @param array $attributeTypes
      * @return array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function getProductAttributes($storeId, array $productIds, array $attributeTypes)
     {
@@ -360,7 +360,7 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
      *
      * @param string $typeId
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function getProductTypeInstance($typeId)
     {
@@ -378,7 +378,7 @@ private function getProductTypeInstance($typeId)
      * @param int $productId Product Entity Id
      * @param string $typeId Super Product Link Type
      * @return array|null
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function getProductChildIds($productId, $typeId)
     {
@@ -414,7 +414,7 @@ public function getProductChildIds($productId, $typeId)
      *
      * @param string $typeId
      * @return \Magento\Framework\DataObject
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function getProductEmulator($typeId)
     {
@@ -434,7 +434,7 @@ private function getProductEmulator($typeId)
      * @param int $storeId
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function prepareProductIndex($indexData, $productData, $storeId)
     {
@@ -498,7 +498,7 @@ public function prepareProductIndex($indexData, $productData, $storeId)
      * @param mixed $valueId
      * @param int $storeId
      * @return string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function getAttributeValue($attributeId, $valueId, $storeId)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index b07feff536044..18adc0e9982c5 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Full
 {
@@ -33,7 +32,6 @@ class Full
      * Searchable attributes cache
      *
      * @var \Magento\Eav\Model\Entity\Attribute[]
-     * @since 2.0.0
      */
     protected $searchableAttributes;
 
@@ -43,7 +41,6 @@ class Full
      * @var string
      * @deprecated 2.2.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$separator
-     * @since 2.0.0
      */
     protected $separator = ' | ';
 
@@ -52,7 +49,6 @@ class Full
      *
      * @var \DateTime[]
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $dates = [];
 
@@ -62,7 +58,6 @@ class Full
      * @var array
      * @deprecated 2.2.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$productTypes
-     * @since 2.0.0
      */
     protected $productTypes = [];
 
@@ -72,13 +67,11 @@ class Full
      * @var array
      * @deprecated 2.2.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$productEmulators
-     * @since 2.0.0
      */
     protected $productEmulators = [];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $productAttributeCollectionFactory;
 
@@ -86,7 +79,6 @@ class Full
      * Catalog product status
      *
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $catalogProductStatus;
 
@@ -94,7 +86,6 @@ class Full
      * Eav config
      *
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -104,7 +95,6 @@ class Full
      * @var \Magento\Catalog\Model\Product\Type
      * @deprecated 2.2.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$catalogProductType
-     * @since 2.0.0
      */
     protected $catalogProductType;
 
@@ -112,7 +102,6 @@ class Full
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -121,7 +110,6 @@ class Full
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -131,74 +119,63 @@ class Full
      * @var \Magento\Store\Model\StoreManagerInterface
      * @deprecated 2.2.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$storeManager
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\Engine
-     * @since 2.0.0
      */
     protected $engine;
 
     /**
      * @var \Magento\Framework\Indexer\SaveHandler\IndexerInterface
      * @deprecated 2.2.0 As part of self::cleanIndex()
-     * @since 2.0.0
      */
     protected $indexHandler;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
      * @deprecated 2.2.0 Not used anymore
-     * @since 2.0.0
      */
     protected $fulltextResource;
 
     /**
      * @var \Magento\Framework\Search\Request\Config
      * @deprecated 2.2.0 As part of self::reindexAll()
-     * @since 2.0.0
      */
     protected $searchRequestConfig;
 
     /**
      * @var \Magento\Framework\Search\Request\DimensionFactory
      * @deprecated 2.2.0 As part of self::cleanIndex()
-     * @since 2.0.0
      */
     private $dimensionFactory;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -206,13 +183,13 @@ class Full
      * @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\IndexIteratorFactory
      * @deprecated 2.2.0 DataProvider used directly without IndexIterator
      * @see self::$dataProvider
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $iteratorFactory;
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $metadataPool;
 
@@ -244,7 +221,6 @@ class Full
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param DataProvider $dataProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -298,7 +274,6 @@ public function __construct(
      * @deprecated 2.2.0 Please use \Magento\CatalogSearch\Model\Indexer\Fulltext::executeFull instead
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext::executeFull
      * @return void
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -315,7 +290,6 @@ public function reindexAll()
      *
      * @param string|string[] $table
      * @return string
-     * @since 2.0.0
      */
     protected function getTable($table)
     {
@@ -327,7 +301,6 @@ protected function getTable($table)
      *
      * @param int[] $entityIds
      * @return int[]
-     * @since 2.0.0
      */
     protected function getProductIdsFromParents(array $entityIds)
     {
@@ -360,7 +333,6 @@ protected function getProductIdsFromParents(array $entityIds)
      * @param int $storeId Store View Id
      * @param int[] $productIds Product Entity Id
      * @return \Generator
-     * @since 2.0.0
      */
     public function rebuildStoreIndex($storeId, $productIds = null)
     {
@@ -512,7 +484,6 @@ private function getChildProductsIndex($parentId, array $relatedProducts, array
      * @deprecated 2.2.0 As part of self::reindexAll()
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     protected function cleanIndex($storeId)
     {
@@ -525,7 +496,6 @@ protected function cleanIndex($storeId)
      *
      * @return \Magento\Eav\Model\Config
      * @deprecated 2.2.0 Use $self::$eavConfig directly
-     * @since 2.0.0
      */
     protected function getEavConfig()
     {
@@ -538,7 +508,6 @@ protected function getEavConfig()
      * @param string $backendType
      * @deprecated 2.2.0 see DataProvider::getSearchableAttributes()
      * @return \Magento\Eav\Model\Entity\Attribute[]
-     * @since 2.0.0
      */
     protected function getSearchableAttributes($backendType = null)
     {
@@ -551,7 +520,6 @@ protected function getSearchableAttributes($backendType = null)
      * @param int|string $attribute
      * @deprecated 2.2.0 see DataProvider::getSearchableAttributes()
      * @return \Magento\Eav\Model\Entity\Attribute
-     * @since 2.0.0
      */
     protected function getSearchableAttribute($attribute)
     {
@@ -566,7 +534,6 @@ protected function getSearchableAttribute($attribute)
      * @param string $field
      * @param string $backendType
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     protected function unifyField($field, $backendType = 'varchar')
     {
@@ -585,7 +552,6 @@ protected function unifyField($field, $backendType = 'varchar')
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::getProductTypeInstance()
      * @param string $typeId
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function getProductTypeInstance($typeId)
     {
@@ -604,7 +570,6 @@ protected function getProductTypeInstance($typeId)
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::getProductEmulator()
      * @param string $typeId
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function getProductEmulator($typeId)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
index f1a217c481bf8..7e1b8f0574574 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
@@ -13,103 +13,103 @@
  * @deprecated 2.2.0 No more used
  * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
  * @api
- * @since 2.1.0
+ * @since 2.0.1
  */
 class IndexIterator implements \Iterator
 {
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $dataProvider;
 
     /**
      * @var int
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $storeId;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $staticFields;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productIds;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $dynamicFields;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $visibility;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $allowedVisibility;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $status;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $statusIds;
 
     /**
      * @var int
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $lastProductId = 0;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $products = [];
 
     /**
      * @var null
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $current = null;
 
     /**
      * @var bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $isValid = true;
 
     /**
      * @var null
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $key = null;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productAttributes = [];
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $productRelations = [];
 
@@ -127,7 +127,7 @@ class IndexIterator implements \Iterator
      * @param array $statusIds
      *
      * @SuppressWarnings(Magento.TypeDuplication)
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(
         DataProvider $dataProvider,
@@ -155,7 +155,7 @@ public function __construct(
      * {@inheritDoc}
      *
      * @deprecated 2.2.0 Since class is deprecated
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function current()
     {
@@ -166,7 +166,7 @@ public function current()
      * {@inheritDoc}
      *
      * @deprecated 2.2.0 Since class is deprecated
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function next()
     {
@@ -265,7 +265,7 @@ public function next()
      * {@inheritDoc}
      *
      * @deprecated 2.2.0 Since class is deprecated
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function key()
     {
@@ -276,7 +276,7 @@ public function key()
      * {@inheritDoc}
      *
      * @deprecated 2.2.0 Since class is deprecated
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function valid()
     {
@@ -287,7 +287,7 @@ public function valid()
      * {@inheritDoc}
      *
      * @deprecated 2.2.0 Since class is deprecated
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function rewind()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
index ce7819efcad60..5d4096a3afab0 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
@@ -10,19 +10,16 @@
 
 /**
  * Abstract plugin for indexers
- * @since 2.0.0
  */
 abstract class AbstractPlugin
 {
     /**
      * @var IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @param IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(IndexerRegistry $indexerRegistry)
     {
@@ -34,7 +31,6 @@ public function __construct(IndexerRegistry $indexerRegistry)
      *
      * @param int $productId
      * @return void
-     * @since 2.0.0
      */
     protected function reindexRow($productId)
     {
@@ -50,7 +46,6 @@ protected function reindexRow($productId)
      *
      * @param int[] $productIds
      * @return void
-     * @since 2.0.0
      */
     protected function reindexList(array $productIds)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
index 40aa1d53d8be4..b4e943f04bd03 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute
  *
- * @since 2.0.0
  */
 class Attribute extends AbstractPlugin
 {
     /**
      * @var \Magento\Framework\Search\Request\Config
-     * @since 2.0.0
      */
     private $config;
 
@@ -41,7 +39,6 @@ class Attribute extends AbstractPlugin
     /**
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param \Magento\Framework\Search\Request\Config $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
index 8f6ed2e2f45f6..df40efc02f631 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product
  *
- * @since 2.0.0
  */
 class Product extends AbstractPlugin
 {
@@ -23,7 +22,6 @@ class Product extends AbstractPlugin
      * @param \Closure $proceed
      * @param AbstractModel $product
      * @return ResourceProduct
-     * @since 2.0.0
      */
     public function aroundSave(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
     {
@@ -37,7 +35,6 @@ public function aroundSave(ResourceProduct $productResource, \Closure $proceed,
      * @param \Closure $proceed
      * @param AbstractModel $product
      * @return ResourceProduct
-     * @since 2.0.0
      */
     public function aroundDelete(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
index fa942b6529174..edbb0f50c2e21 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
@@ -10,7 +10,6 @@
 
 /**
  * Plugin for Magento\Catalog\Model\Product\Action
- * @since 2.0.0
  */
 class Action extends AbstractIndexerPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
index ce45f4201fd17..99dffb141f39f 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
@@ -12,7 +12,6 @@
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Group
- * @since 2.0.0
  */
 class Group extends AbstractIndexerPlugin
 {
@@ -64,7 +63,6 @@ public function afterSave(StoreGroupResourceModel $subject, StoreGroupResourceMo
      * @return StoreGroupResourceModel
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(StoreGroupResourceModel $subject, StoreGroupResourceModel $result)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
index c44d3a4a25dc9..4b7ecf7fee4b8 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
@@ -12,7 +12,6 @@
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Store
- * @since 2.0.0
  */
 class View extends AbstractIndexerPlugin
 {
@@ -64,7 +63,6 @@ public function afterSave(StoreResourceModel $subject, StoreResourceModel $resul
      * @return StoreResourceModel
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(StoreResourceModel $subject, StoreResourceModel $result)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
index 839e48c51441f..9f02229334eed 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\CatalogSearch\Model\Indexer\Fulltext\Store
  *
- * @since 2.0.0
  */
 class Store implements ObserverInterface
 {
     /**
      * @var DimensionFactory
-     * @since 2.0.0
      */
     private $dimensionFactory;
 
     /**
      * @var IndexerHandlerFactory
-     * @since 2.0.0
      */
     private $indexerHandlerFactory;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $indexerConfig;
 
@@ -40,7 +36,6 @@ class Store implements ObserverInterface
      * @param DimensionFactory $dimensionFactory
      * @param ConfigInterface $indexerConfig
      * @param IndexerHandlerFactory $indexerHandlerFactory
-     * @since 2.0.0
      */
     public function __construct(
         DimensionFactory $dimensionFactory,
@@ -55,7 +50,6 @@ public function __construct(
     /**
      * @param \Magento\Store\Model\Store $store
      * @return void
-     * @since 2.0.0
      */
     private function clearIndex(\Magento\Store\Model\Store $store)
     {
@@ -71,7 +65,6 @@ private function clearIndex(\Magento\Store\Model\Store $store)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
index 09b44bd0b5d8b..f08dc7f558f93 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
@@ -16,26 +16,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IndexStructure implements IndexStructureInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var IndexScopeResolver
-     * @since 2.0.0
      */
     private $indexScopeResolver;
 
     /**
      * @param ResourceConnection $resource
      * @param IndexScopeResolverInterface $indexScopeResolver
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -49,7 +45,6 @@ public function __construct(
      * @param string $index
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function delete($index, array $dimensions = [])
     {
@@ -65,7 +60,6 @@ public function delete($index, array $dimensions = [])
      * @param array $dimensions
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function create($index, array $fields, array $dimensions = [])
     {
@@ -76,7 +70,6 @@ public function create($index, array $fields, array $dimensions = [])
      * @param string $tableName
      * @throws \Zend_Db_Exception
      * @return void
-     * @since 2.0.0
      */
     protected function createFulltextIndex($tableName)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
index 27546e14fe0c3..607197b11a609 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
@@ -15,55 +15,46 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IndexerHandler implements IndexerInterface
 {
     /**
      * @var IndexStructureInterface
-     * @since 2.0.0
      */
     private $indexStructure;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $fields;
 
     /**
      * @var Resource|Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var Batch
-     * @since 2.0.0
      */
     private $batch;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $batchSize;
 
     /**
      * @var IndexScopeResolverInterface
-     * @since 2.0.0
      */
     private $indexScopeResolver;
 
@@ -75,7 +66,6 @@ class IndexerHandler implements IndexerInterface
      * @param IndexScopeResolverInterface $indexScopeResolver
      * @param array $data
      * @param int $batchSize
-     * @since 2.0.0
      */
     public function __construct(
         IndexStructureInterface $indexStructure,
@@ -100,7 +90,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function saveIndex($dimensions, \Traversable $documents)
     {
@@ -111,7 +100,6 @@ public function saveIndex($dimensions, \Traversable $documents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteIndex($dimensions, \Traversable $documents)
     {
@@ -123,7 +111,6 @@ public function deleteIndex($dimensions, \Traversable $documents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function cleanIndex($dimensions)
     {
@@ -133,7 +120,6 @@ public function cleanIndex($dimensions)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -143,7 +129,6 @@ public function isAvailable()
     /**
      * @param Dimension[] $dimensions
      * @return string
-     * @since 2.0.0
      */
     private function getTableName($dimensions)
     {
@@ -152,7 +137,6 @@ private function getTableName($dimensions)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     private function getIndexName()
     {
@@ -163,7 +147,6 @@ private function getIndexName()
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     private function insertDocuments(array $documents, array $dimensions)
     {
@@ -181,7 +164,6 @@ private function insertDocuments(array $documents, array $dimensions)
     /**
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     private function prepareSearchableFields(array $documents)
     {
@@ -201,7 +183,6 @@ private function prepareSearchableFields(array $documents)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     private function prepareFields()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
index fd94e42f2f55c..4c613e64dd75b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IndexerHandlerFactory
 {
@@ -20,7 +19,6 @@ class IndexerHandlerFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -28,13 +26,11 @@ class IndexerHandlerFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $handlers = null;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
@@ -42,7 +38,6 @@ class IndexerHandlerFactory
      * Configuration path by which current indexer handler stored
      *
      * @var string
-     * @since 2.0.0
      */
     private $configPath;
 
@@ -53,7 +48,6 @@ class IndexerHandlerFactory
      * @param ScopeConfigInterface $scopeConfig
      * @param string $configPath
      * @param string[] $handlers
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -72,7 +66,6 @@ public function __construct(
      *
      * @param array $data
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
index 415b7803f9806..bdc65fafd2e1d 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Indexer\Mview\Action
  *
- * @since 2.0.0
  */
 class Action implements ActionInterface
 {
     /**
      * @var IndexerInterfaceFactory
-     * @since 2.0.0
      */
     private $indexerFactory;
 
     /**
      * @param IndexerInterfaceFactory $indexerFactory
-     * @since 2.0.0
      */
     public function __construct(IndexerInterfaceFactory $indexerFactory)
     {
@@ -37,7 +34,6 @@ public function __construct(IndexerInterfaceFactory $indexerFactory)
      * @param int[] $ids
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
index 9b9f89f3220b2..e2806a7aaf31b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
@@ -12,32 +12,27 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ProductFieldset implements \Magento\Framework\Indexer\FieldsetInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
     /**
      * @var Attribute[]
-     * @since 2.0.0
      */
     private $searchableAttributes;
     
     /**
      * @param Config $eavConfig
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $eavConfig,
@@ -49,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addDynamicData(array $data)
     {
@@ -67,7 +61,6 @@ public function addDynamicData(array $data)
      * Retrieve searchable attributes
      *
      * @return Attribute[]
-     * @since 2.0.0
      */
     private function getSearchableAttributes()
     {
@@ -99,7 +92,6 @@ private function getSearchableAttributes()
      * @param string $defaultSource
      * @param string $defaultHandler
      * @return array
-     * @since 2.0.0
      */
     private function convert(array $attributes, $defaultSource, $defaultHandler)
     {
@@ -121,7 +113,6 @@ private function convert(array $attributes, $defaultSource, $defaultHandler)
     /**
      * @param Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     private function getType(Attribute $attribute)
     {
@@ -143,7 +134,6 @@ private function getType(Attribute $attribute)
      * @param array $dataFields
      * @param array $searchableFields
      * @return array
-     * @since 2.0.0
      */
     private function merge(array $dataFields, array $searchableFields)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
index de8785a939e67..e6d29e17e8f1c 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Layer\Category\ItemCollectionProvider
  *
- * @since 2.0.0
  */
 class ItemCollectionProvider implements ItemCollectionProviderInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
     /**
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $collectionFactory)
     {
@@ -34,7 +31,6 @@ public function __construct(CollectionFactory $collectionFactory)
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function getCollection(\Magento\Catalog\Model\Category $category)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index c888968939e3b..7591d5ec54c7d 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -9,13 +9,11 @@
 
 /**
  * Layer attribute filter
- * @since 2.0.0
  */
 class Attribute extends AbstractFilter
 {
     /**
      * @var \Magento\Framework\Filter\StripTags
-     * @since 2.0.0
      */
     private $tagFilter;
 
@@ -26,7 +24,6 @@ class Attribute extends AbstractFilter
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Framework\Filter\StripTags $tagFilter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -52,7 +49,6 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -79,7 +75,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index ee7c11bf883c6..7c15514f211d2 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -10,19 +10,16 @@
 
 /**
  * Layer category filter
- * @since 2.0.0
  */
 class Category extends AbstractFilter
 {
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     private $escaper;
 
     /**
      * @var CategoryDataProvider
-     * @since 2.0.0
      */
     private $dataProvider;
 
@@ -35,7 +32,6 @@ class Category extends AbstractFilter
      * @param \Magento\Framework\Escaper $escaper
      * @param CategoryManagerFactory $categoryManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -63,7 +59,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\App\RequestInterface $request
      * @return  $this
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -88,7 +83,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * Get filter value for reset current filter state
      *
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getResetValue()
     {
@@ -99,7 +93,6 @@ public function getResetValue()
      * Get filter name
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -110,7 +103,6 @@ public function getName()
      * Get data array for building category filter items
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index ba8675adc9e25..e61a886a41d6f 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -9,19 +9,16 @@
 
 /**
  * Layer decimal filter
- * @since 2.0.0
  */
 class Decimal extends AbstractFilter
 {
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     private $priceCurrency;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal
-     * @since 2.0.0
      */
     private $resource;
 
@@ -33,7 +30,6 @@ class Decimal extends AbstractFilter
      * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory $filterDecimalFactory
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -61,7 +57,6 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -95,7 +90,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
@@ -143,7 +137,6 @@ protected function _getItemsData()
      * @param float|string $fromPrice
      * @param float|string $toPrice
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index e9819c80d69fa..9f54bd279d906 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -11,7 +11,6 @@
  * Layer price filter based on Search API
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Price extends AbstractFilter
 {
@@ -20,31 +19,26 @@ class Price extends AbstractFilter
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     private $priceCurrency;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     private $customerSession;
 
     /**
      * @var \Magento\Framework\Search\Dynamic\Algorithm
-     * @since 2.0.0
      */
     private $priceAlgorithm;
 
@@ -62,7 +56,6 @@ class Price extends AbstractFilter
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -94,7 +87,6 @@ public function __construct(
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -106,7 +98,6 @@ public function getResource()
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrencyRate($rate)
     {
@@ -119,7 +110,6 @@ public function setCurrencyRate($rate)
      * @param \Magento\Framework\App\RequestInterface $request
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
@@ -161,7 +151,6 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      * Retrieve active currency rate for filter
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyRate()
     {
@@ -183,7 +172,6 @@ public function getCurrencyRate()
      * @param float|string $fromPrice
      * @param float|string $toPrice
      * @return float|\Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
@@ -207,7 +195,6 @@ protected function _renderRangeLabel($fromPrice, $toPrice)
      * @return array
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getItemsData()
     {
@@ -235,7 +222,6 @@ protected function _getItemsData()
     /**
      * @param float $from
      * @return float
-     * @since 2.0.0
      */
     protected function getTo($from)
     {
@@ -250,7 +236,6 @@ protected function getTo($from)
     /**
      * @param float $from
      * @return float
-     * @since 2.0.0
      */
     protected function getFrom($from)
     {
@@ -266,7 +251,6 @@ protected function getFrom($from)
      * @param string $key
      * @param int $count
      * @return array
-     * @since 2.0.0
      */
     private function prepareData($key, $count)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
index b6d1e1f83e687..c1f08ef94e15a 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Layer\Search\Plugin\CollectionFilter
  *
- * @since 2.0.0
  */
 class CollectionFilter
 {
     /**
      * @var \Magento\Search\Model\QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory;
 
     /**
      * @param QueryFactory $queryFactory
-     * @since 2.0.0
      */
     public function __construct(QueryFactory $queryFactory)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
index 34671d74e7132..9aef8de4b16eb 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\CatalogSearch\Model\Layer\Search\StateKey
  *
- * @since 2.0.0
  */
 class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements StateKeyInterface
 {
     /**
      * @var \Magento\Search\Model\QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory;
 
@@ -26,7 +24,6 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Search\Model\QueryFactory $queryFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -40,7 +37,6 @@ public function __construct(
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return string|void
-     * @since 2.0.0
      */
     public function toString($category)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Price/Interval.php b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
index 67e9b47ce9524..1726dabf8ac2b 100644
--- a/app/code/Magento/CatalogSearch/Model/Price/Interval.php
+++ b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Price\Interval
  *
- * @since 2.0.0
  */
 class Interval implements IntervalInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\ResourceModel\Layer\Filter\Price $resource)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Catalog\Model\ResourceModel\Layer\Filter\Pr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($limit, $offset = null, $lower = null, $upper = null)
     {
@@ -41,7 +37,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadPrevious($data, $index, $lower = null)
     {
@@ -51,7 +46,6 @@ public function loadPrevious($data, $index, $lower = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadNext($data, $rightIndex, $upper = null)
     {
@@ -62,7 +56,6 @@ public function loadNext($data, $rightIndex, $upper = null)
     /**
      * @param array $prices
      * @return array
-     * @since 2.0.0
      */
     private function arrayValuesToFloat($prices)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
index 14ada5fd7ffca..9d1908404230b 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Advanced extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Advanced extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -26,7 +24,6 @@ class Advanced extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -37,7 +34,6 @@ class Advanced extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Initialize connection and define catalog product table as main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +63,6 @@ protected function _construct()
      * @param string|array $value
      * @return string|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function prepareCondition($attribute, $value)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 4015dc17fa9c3..201e07376487c 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -22,14 +22,12 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
     /**
      * List Of filters
      * @var array
-     * @since 2.0.0
      */
     private $filters = [];
 
@@ -41,7 +39,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
-     * @since 2.0.0
      */
     private $temporaryStorageFactory;
 
@@ -94,7 +91,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param MetadataPool|null $metadataPool
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -163,7 +159,6 @@ public function __construct(
      * @param array $fields
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addFieldsToFilter($fields)
     {
@@ -175,7 +170,6 @@ public function addFieldsToFilter($fields)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
@@ -216,7 +210,6 @@ protected function _renderFiltersBefore()
     /**
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     private function getAttributeCode($attributeCode)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index 3f3217947c8c6..4212912af9930 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -7,7 +7,6 @@
 
 /**
  * CatalogSearch Fulltext Index Engine resource model
- * @since 2.0.0
  */
 class Engine implements EngineInterface
 {
@@ -29,13 +28,11 @@ class Engine implements EngineInterface
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $catalogProductVisibility;
 
     /**
      * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver
-     * @since 2.0.0
      */
     private $indexScopeResolver;
 
@@ -44,7 +41,6 @@ class Engine implements EngineInterface
      *
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver $indexScopeResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
@@ -58,7 +54,6 @@ public function __construct(
      * Retrieve allowed visibility values for current engine
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getAllowedVisibility()
     {
@@ -69,7 +64,6 @@ public function getAllowedVisibility()
      * Define if current search engine supports advanced index
      *
      * @return bool
-     * @since 2.0.0
      */
     public function allowAdvancedIndex()
     {
@@ -81,7 +75,6 @@ public function allowAdvancedIndex()
      *
      * @param \Magento\Catalog\Model\Entity\Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     private function isTermFilterableAttribute($attribute)
     {
@@ -93,7 +86,6 @@ private function isTermFilterableAttribute($attribute)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function processAttributeValue($attribute, $value)
     {
@@ -116,7 +108,6 @@ public function processAttributeValue($attribute, $value)
      * @param array $index
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function prepareEntityIndex($index, $separator = ' ')
     {
@@ -129,7 +120,6 @@ public function prepareEntityIndex($index, $separator = ' ')
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isAvailable()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
index 6f45ca569bb3d..57ee65ae239c4 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface EngineInterface
 {
@@ -31,7 +30,6 @@ interface EngineInterface
      * Retrieve allowed visibility values for current engine
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedVisibility();
 
@@ -39,7 +37,6 @@ public function getAllowedVisibility();
      * Define if current search engine supports advanced index
      *
      * @return bool
-     * @since 2.0.0
      */
     public function allowAdvancedIndex();
 
@@ -49,7 +46,6 @@ public function allowAdvancedIndex();
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function processAttributeValue($attribute, $value);
 
@@ -59,7 +55,6 @@ public function processAttributeValue($attribute, $value);
      * @param array $index
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function prepareEntityIndex($index, $separator = ' ');
 }
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
index 78d7183ab2687..1940b7590ea2e 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class EngineProvider
 {
@@ -21,19 +20,16 @@ class EngineProvider
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\EngineInterface
-     * @since 2.0.0
      */
     protected $engine;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -41,7 +37,6 @@ class EngineProvider
      * Pool of existing engines
      *
      * @var array
-     * @since 2.0.0
      */
     private $enginePool;
 
@@ -49,7 +44,6 @@ class EngineProvider
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $engines
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -65,7 +59,6 @@ public function __construct(
      * Get engine singleton
      *
      * @return EngineInterface
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 597b2d40b92ea..4ea44e60a780a 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -13,7 +13,6 @@
  * CatalogSearch Fulltext Index resource model
  *
  * @api
- * @since 2.0.0
  */
 class Fulltext extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Fulltext extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -38,7 +36,6 @@ class Fulltext extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param string $connectionName
      * @param MetadataPool $metadataPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +62,6 @@ protected function _construct()
      * Reset search results
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetSearchResults()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index c2937065db840..97a29ae324817 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -23,14 +23,12 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
     /**
      * @var  QueryResponse
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $queryResponse;
 
@@ -39,45 +37,38 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      *
      * @var \Magento\Search\Model\QueryFactory
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $queryFactory = null;
 
     /**
      * @var \Magento\Framework\Search\Request\Builder
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $requestBuilder;
 
     /**
      * @var \Magento\Search\Model\SearchEngine
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $searchEngine;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $queryText;
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     private $order = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $searchRequestName;
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
-     * @since 2.0.0
      */
     private $temporaryStorageFactory;
 
@@ -144,7 +135,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param MetadataPool|null $metadataPool
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -290,7 +280,6 @@ public function setFilterBuilder(\Magento\Framework\Api\FilterBuilder $object)
      * @param string $field
      * @param null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -324,7 +313,6 @@ public function addFieldToFilter($field, $condition = null)
      *
      * @param string $query
      * @return $this
-     * @since 2.0.0
      */
     public function addSearchFilter($query)
     {
@@ -334,7 +322,6 @@ public function addSearchFilter($query)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
@@ -389,7 +376,6 @@ protected function _renderFiltersBefore()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderFilters()
     {
@@ -403,7 +389,6 @@ protected function _renderFilters()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
@@ -418,7 +403,6 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      * Stub method for compatibility with other search engines
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setGeneralDefaultQuery()
     {
@@ -431,7 +415,6 @@ public function setGeneralDefaultQuery()
      * @param string $field
      * @return array
      * @throws StateException
-     * @since 2.0.0
      */
     public function getFacetedData($field)
     {
@@ -458,7 +441,6 @@ public function getFacetedData($field)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return $this
-     * @since 2.0.0
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
@@ -471,7 +453,6 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      *
      * @param array $visibility
      * @return $this
-     * @since 2.0.0
      */
     public function setVisibility($visibility)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index 27a8c68a4cec0..3caf275ebfbff 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements \Magento\Search\Model\SearchCollectionInterface
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Attribute collection
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesCollection;
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Search query
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_searchQuery;
 
@@ -37,7 +34,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Attribute collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -66,7 +62,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -121,7 +116,6 @@ public function __construct(
      *
      * @param string $query
      * @return $this
-     * @since 2.0.0
      */
     public function addSearchFilter($query)
     {
@@ -137,7 +131,6 @@ public function addSearchFilter($query)
      *
      * @param string $query
      * @return $this
-     * @since 2.0.0
      */
     public function addBackendSearchFilter($query)
     {
@@ -153,7 +146,6 @@ public function addBackendSearchFilter($query)
      * Retrieve collection of all attributes
      *
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     protected function _getAttributesCollection()
     {
@@ -172,7 +164,6 @@ protected function _getAttributesCollection()
      *
      * @param \Magento\Catalog\Model\Entity\Attribute $attribute
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isAttributeTextAndSearchable($attribute)
     {
@@ -194,7 +185,6 @@ protected function _isAttributeTextAndSearchable($attribute)
      *
      * @param \Magento\Catalog\Model\Entity\Attribute $attribute
      * @return boolean
-     * @since 2.0.0
      */
     protected function _hasAttributeOptionsAndSearchable($attribute)
     {
@@ -212,7 +202,6 @@ protected function _hasAttributeOptionsAndSearchable($attribute)
      * @param mixed $query
      * @param bool $searchOnlyInCurrentStore Search only in current store or in all stores
      * @return string
-     * @since 2.0.0
      */
     protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = true)
     {
@@ -293,7 +282,6 @@ protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = tr
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getSearchInOptionSql($query)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
index 76f48380052bb..b7d3e03a22fd8 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
@@ -11,7 +11,6 @@
  * Search model for backend search
  *
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Catalog extends \Magento\Framework\DataObject
 {
@@ -19,7 +18,6 @@ class Catalog extends \Magento\Framework\DataObject
      * Catalog search data
      *
      * @var \Magento\Search\Model\QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory = null;
 
@@ -27,7 +25,6 @@ class Catalog extends \Magento\Framework\DataObject
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -35,7 +32,6 @@ class Catalog extends \Magento\Framework\DataObject
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
@@ -43,7 +39,6 @@ class Catalog extends \Magento\Framework\DataObject
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param QueryFactory $queryFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Helper\Data $adminhtmlData,
@@ -59,7 +54,6 @@ public function __construct(
      * Load search results
      *
      * @return $this
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index b2aab413e92eb..92c614df46c04 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -26,7 +26,6 @@
 /**
  * Build base Query for Index
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class IndexBuilder implements IndexBuilderInterface
 {
@@ -68,7 +67,6 @@ class IndexBuilder implements IndexBuilderInterface
      * @param FilterMapper|null $filterMapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -104,7 +102,6 @@ public function __construct(
      * @throws \DomainException
      * @throws \InvalidArgumentException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function build(RequestInterface $request)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
index c332f87093a74..752b17b550c55 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogSearch\Model\Search\ReaderPlugin
  *
- * @since 2.0.0
  */
 class ReaderPlugin
 {
     /**
      * @var \Magento\CatalogSearch\Model\Search\RequestGenerator
-     * @since 2.0.0
      */
     private $requestGenerator;
 
     /**
      * @param \Magento\CatalogSearch\Model\Search\RequestGenerator $requestGenerator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogSearch\Model\Search\RequestGenerator $requestGenerator
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index b198ccd34c6c5..f597c0fc709ed 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RequestGenerator
 {
@@ -27,7 +26,6 @@ class RequestGenerator
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $productAttributeCollectionFactory;
 
@@ -40,7 +38,6 @@ class RequestGenerator
     /**
      * @param CollectionFactory $productAttributeCollectionFactory
      * @param GeneratorResolver $generatorResolver
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $productAttributeCollectionFactory,
@@ -55,7 +52,6 @@ public function __construct(
      * Generate dynamic fields requests
      *
      * @return array
-     * @since 2.0.0
      */
     public function generate()
     {
@@ -75,7 +71,6 @@ public function generate()
      * @param string $container
      * @param bool $useFulltext
      * @return array
-     * @since 2.0.0
      */
     private function generateRequest($attributeType, $container, $useFulltext)
     {
@@ -120,7 +115,6 @@ private function generateRequest($attributeType, $container, $useFulltext)
      * Retrieve searchable attributes
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected function getSearchableAttributes()
     {
@@ -139,7 +133,6 @@ protected function getSearchableAttributes()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function generateAdvancedSearchRequest()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
index ab0c22794e21f..db5f811874b33 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
@@ -24,7 +24,6 @@
  * which will apply them to the Select
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class TableMapper
 {
@@ -57,7 +56,6 @@ class TableMapper
      * @param AliasResolver $aliasResolver
      * @param FiltersExtractor $filtersExtractor
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         AppResource $resource,
@@ -89,7 +87,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return Select
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function addTables(Select $select, RequestInterface $request)
     {
@@ -116,7 +113,6 @@ public function addTables(Select $select, RequestInterface $request)
      *
      * @param FilterInterface $filter
      * @return string
-     * @since 2.0.0
      */
     public function getMappingAlias(FilterInterface $filter)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Source/Weight.php b/app/code/Magento/CatalogSearch/Model/Source/Weight.php
index 019a95bf957df..5c80e4faa7147 100644
--- a/app/code/Magento/CatalogSearch/Model/Source/Weight.php
+++ b/app/code/Magento/CatalogSearch/Model/Source/Weight.php
@@ -8,7 +8,6 @@
 /**
  * Attribute weight options
  * @api
- * @since 2.0.0
  */
 class Weight implements \Magento\Framework\Data\OptionSourceInterface
 {
@@ -24,7 +23,6 @@ class Weight implements \Magento\Framework\Data\OptionSourceInterface
      * Retrieve search weights as options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -39,7 +37,6 @@ public function getOptions()
      * Retrieve search weights array
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getValues()
     {
diff --git a/app/code/Magento/CatalogSearch/Setup/InstallData.php b/app/code/Magento/CatalogSearch/Setup/InstallData.php
index e980cb6cdec39..02b4dbf153196 100644
--- a/app/code/Magento/CatalogSearch/Setup/InstallData.php
+++ b/app/code/Magento/CatalogSearch/Setup/InstallData.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\CatalogSearch\Setup\InstallData
  *
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * @var IndexerInterfaceFactory
-     * @since 2.0.0
      */
     private $indexerFactory;
 
     /**
      * @param IndexerInterfaceFactory $indexerFactory
      * @param ProductAttributeRepositoryInterface $attributeRepository
-     * @since 2.0.0
      */
     public function __construct(
         IndexerInterfaceFactory $indexerFactory,
@@ -44,7 +41,6 @@ public function __construct(
      * @param ModuleContextInterface $context
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -56,7 +52,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
     /**
      * @param string $indexerId
      * @return \Magento\Framework\Indexer\IndexerInterface
-     * @since 2.0.0
      */
     private function getIndexer($indexerId)
     {
@@ -67,7 +62,6 @@ private function getIndexer($indexerId)
      * @param string $attributeCode
      * @param int $weight
      * @return void
-     * @since 2.0.0
      */
     private function setWeight($attributeCode, $weight)
     {
diff --git a/app/code/Magento/CatalogSearch/Setup/InstallSchema.php b/app/code/Magento/CatalogSearch/Setup/InstallSchema.php
index 84e9298fc06a1..4953e72fa8124 100644
--- a/app/code/Magento/CatalogSearch/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogSearch/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
index 81b7e231dab7b..23ae0dec08431 100644
--- a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
@@ -10,7 +10,6 @@
 /**
  * Renderer for URL key input
  * Allows to manage and overwrite URL Rewrites History save settings
- * @since 2.0.0
  */
 class UrlKeyRenderer extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
@@ -18,7 +17,6 @@ class UrlKeyRenderer extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fiel
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Factory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
@@ -26,7 +24,6 @@ class UrlKeyRenderer extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fiel
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/CanonicalUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/CanonicalUrlRewriteGenerator.php
index e29f59f9aa4c7..ce6241ef7a415 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/CanonicalUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/CanonicalUrlRewriteGenerator.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class CanonicalUrlRewriteGenerator
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
-     * @since 2.0.0
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
@@ -48,7 +44,6 @@ public function __construct(
      * @param int $storeId
      * @param \Magento\Catalog\Model\Category $category
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, Category $category)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenCategoriesProvider.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenCategoriesProvider.php
index 7b25bfc608629..a28d642640ac2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenCategoriesProvider.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenCategoriesProvider.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
  *
- * @since 2.0.0
  */
 class ChildrenCategoriesProvider
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $childrenIds = [];
 
@@ -24,7 +22,6 @@ class ChildrenCategoriesProvider
      * @param \Magento\Catalog\Model\Category $category
      * @param boolean $recursive
      * @return \Magento\Catalog\Model\Category[]
-     * @since 2.0.0
      */
     public function getChildren(Category $category, $recursive = false)
     {
@@ -39,7 +36,6 @@ public function getChildren(Category $category, $recursive = false)
      * @param \Magento\Catalog\Model\Category $category
      * @param boolean $recursive
      * @return int[]
-     * @since 2.0.0
      */
     public function getChildrenIds(Category $category, $recursive = false)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
index ccfb52b59e651..94be65c98ca52 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class ChildrenUrlRewriteGenerator
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
-     * @since 2.0.0
      */
     protected $childrenCategoriesProvider;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory
-     * @since 2.0.0
      */
     protected $categoryUrlRewriteGeneratorFactory;
 
@@ -40,7 +37,6 @@ class ChildrenUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-     * @since 2.0.0
      */
     public function __construct(
         ChildrenCategoriesProvider $childrenCategoriesProvider,
@@ -62,7 +58,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, Category $category, $rootCategoryId = null)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
index 08d9e6b0648a3..4e76443d4e833 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator
  *
- * @since 2.0.0
  */
 class CurrentUrlRewritesRegenerator
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
@@ -36,14 +33,12 @@ class CurrentUrlRewritesRegenerator
     /**
      * @var \Magento\Catalog\Model\Category
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $category;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $urlFinder;
 
@@ -65,7 +60,6 @@ class CurrentUrlRewritesRegenerator
      * @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder
      * @param \Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder|null $urlRewriteFinder
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
@@ -95,7 +89,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, \Magento\Catalog\Model\Category $category, $rootCategoryId = null)
     {
@@ -123,7 +116,6 @@ public function generate($storeId, \Magento\Catalog\Model\Category $category, $r
      * @param int $storeId
      * @param \Magento\Catalog\Model\Category|null $category
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForAutogenerated($url, $storeId, \Magento\Catalog\Model\Category $category = null)
     {
@@ -149,7 +141,6 @@ protected function generateForAutogenerated($url, $storeId, \Magento\Catalog\Mod
      * @param int $storeId
      * @param \Magento\Catalog\Model\Category|null $category
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForCustom($url, $storeId, \Magento\Catalog\Model\Category $category = null)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
index c497f9cb1e4b8..c5a12f4548328 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move
  *
- * @since 2.0.0
  */
 class Move
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
@@ -31,7 +29,6 @@ class Move
     /**
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
-     * @since 2.0.0
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
@@ -70,7 +67,6 @@ public function afterChangeParent(
     /**
      * @param Category $category
      * @return void
-     * @since 2.0.0
      */
     protected function updateUrlPathForChildren($category)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php
index 15832fd947e7c..d7681b93fe8f8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove
  *
- * @since 2.0.0
  */
 class Remove
 {
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $productUrlRewriteGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
-     * @since 2.0.0
      */
     protected $childrenCategoriesProvider;
 
@@ -43,7 +39,6 @@ class Remove
      * @param \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist,
@@ -67,7 +62,6 @@ public function __construct(
      * @param \Magento\Catalog\Api\Data\CategoryInterface $category
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDelete(
         \Magento\Catalog\Model\ResourceModel\Category $subject,
@@ -88,7 +82,6 @@ public function aroundDelete(
      *
      * @param int $categoryId
      * @return void
-     * @since 2.0.0
      */
     protected function deleteRewritesForCategory($categoryId)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
index e60ae576df00e..d672eaca4b30f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage
  *
- * @since 2.0.0
  */
 class Storage
 {
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     private $urlFinder;
 
@@ -33,7 +31,6 @@ class Storage
     /**
      * @param UrlFinderInterface $urlFinder
      * @param Product $productResource
-     * @since 2.0.0
      */
     public function __construct(
         UrlFinderInterface $urlFinder,
@@ -73,7 +70,6 @@ public function afterReplace(StorageInterface $object, array $result, array $url
      * @param array $data
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeDeleteByData(StorageInterface $object, array $data)
     {
@@ -83,7 +79,6 @@ public function beforeDeleteByData(StorageInterface $object, array $data)
     /**
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urls
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function filterUrls(array $urls)
     {
@@ -109,7 +104,6 @@ protected function filterUrls(array $urls)
     /**
      * @param UrlRewrite $url
      * @return bool
-     * @since 2.0.0
      */
     protected function isCorrectUrl(UrlRewrite $url)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index 3cc3190414675..fb6b461b8f684 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -17,43 +17,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Group
 {
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $productUrlRewriteGenerator;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -64,7 +57,6 @@ class Group
      * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         UrlPersistInterface $urlPersist,
@@ -124,7 +116,6 @@ public function afterSave(
      * @param int $websiteId
      * @param int $originWebsiteId
      * @return array
-     * @since 2.0.0
      */
     protected function generateProductUrls($websiteId, $originWebsiteId)
     {
@@ -153,7 +144,6 @@ protected function generateProductUrls($websiteId, $originWebsiteId)
      * @param int $rootCategoryId
      * @param array $storeIds
      * @return array
-     * @since 2.0.0
      */
     protected function generateCategoryUrls($rootCategoryId, $storeIds)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
index cae98cd9ced0d..20f7a4a14571d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
@@ -20,43 +20,37 @@
  * @see \Magento\Store\Model\ResourceModel\Store
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @package Magento\CatalogUrlRewrite\Model\Category\Plugin\Store
- * @since 2.0.0
  */
 class View
 {
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $categoryFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $productUrlRewriteGenerator;
 
     /**
      * @var AbstractModel
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $origStore;
 
@@ -66,7 +60,6 @@ class View
      * @param ProductFactory $productFactory
      * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
-     * @since 2.0.0
      */
     public function __construct(
         UrlPersistInterface $urlPersist,
@@ -87,7 +80,7 @@ public function __construct(
      * @param AbstractModel $store
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function beforeSave(
         \Magento\Store\Model\ResourceModel\Store $object,
@@ -103,7 +96,7 @@ public function beforeSave(
      * @param \Magento\Store\Model\ResourceModel\Store $store
      * @return \Magento\Store\Model\ResourceModel\Store
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function afterSave(
         \Magento\Store\Model\ResourceModel\Store $object,
@@ -136,7 +129,6 @@ public function afterSave(
      * @param int $originWebsiteId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function generateProductUrls($websiteId, $originWebsiteId, $storeId)
     {
@@ -164,7 +156,6 @@ protected function generateProductUrls($websiteId, $originWebsiteId, $storeId)
      * @param int $rootCategoryId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function generateCategoryUrls($rootCategoryId, $storeId)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Product.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Product.php
index 1494bd4a79c00..178a9a2ffe9c4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Product.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Product.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Category\Product
  *
- * @since 2.0.0
  */
 class Product extends AbstractModel
 {
@@ -18,7 +17,6 @@ class Product extends AbstractModel
      * Model construct that should be used for object initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index a894a0c42faa8..84c16fb6d089f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
  *
- * @since 2.0.0
  */
 class CategoryUrlPathGenerator
 {
@@ -29,25 +28,21 @@ class CategoryUrlPathGenerator
      * Cache for category rewrite suffix
      *
      * @var array
-     * @since 2.0.0
      */
     protected $categoryUrlSuffix = [];
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -55,7 +50,6 @@ class CategoryUrlPathGenerator
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CategoryRepositoryInterface $categoryRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -72,7 +66,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPath($category)
     {
@@ -99,7 +92,6 @@ public function getUrlPath($category)
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return bool
-     * @since 2.0.0
      */
     protected function isNeedToGenerateUrlPathForParent($category)
     {
@@ -112,7 +104,6 @@ protected function isNeedToGenerateUrlPathForParent($category)
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPathWithSuffix($category, $storeId = null)
     {
@@ -127,7 +118,6 @@ public function getUrlPathWithSuffix($category, $storeId = null)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     protected function getCategoryUrlSuffix($storeId = null)
     {
@@ -149,7 +139,6 @@ protected function getCategoryUrlSuffix($storeId = null)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return string
-     * @since 2.0.0
      */
     public function getCanonicalUrlPath($category)
     {
@@ -161,7 +150,6 @@ public function getCanonicalUrlPath($category)
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return string
-     * @since 2.0.0
      */
     public function getUrlKey($category)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
index 41b0eae2ab988..fadea672cb3c6 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class CategoryUrlRewriteGenerator
 {
@@ -27,32 +26,27 @@ class CategoryUrlRewriteGenerator
 
     /**
      * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
-     * @since 2.0.0
      */
     protected $storeViewService;
 
     /**
      * @var \Magento\Catalog\Model\Category
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $category;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $canonicalUrlRewriteGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator
-     * @since 2.0.0
      */
     protected $currentUrlRewritesRegenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $childrenUrlRewriteGenerator;
 
@@ -64,7 +58,6 @@ class CategoryUrlRewriteGenerator
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $overrideStoreUrls;
 
@@ -75,7 +68,6 @@ class CategoryUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-     * @since 2.0.0
      */
     public function __construct(
         CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator,
@@ -101,7 +93,6 @@ public function __construct(
      * @param bool $overrideStoreUrls
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($category, $overrideStoreUrls = false, $rootCategoryId = null)
     {
@@ -124,7 +115,6 @@ public function generate($category, $overrideStoreUrls = false, $rootCategoryId
      * @param bool $overrideStoreUrls
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForGlobalScope(
         Category $category = null,
@@ -150,7 +140,6 @@ protected function generateForGlobalScope(
      * @param int $categoryId
      * @param bool $overrideStoreUrls
      * @return bool
-     * @since 2.0.0
      */
     protected function isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreUrls = false)
     {
@@ -167,7 +156,6 @@ protected function isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreU
      * @param int $storeId
      * @param \Magento\Catalog\Model\Category|null $category
      * @return void
-     * @since 2.0.0
      */
     protected function updateCategoryUrlForStore($storeId, Category $category = null)
     {
@@ -185,7 +173,6 @@ protected function updateCategoryUrlForStore($storeId, Category $category = null
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isGlobalScope($storeId)
     {
@@ -199,7 +186,6 @@ protected function isGlobalScope($storeId)
      * @param \Magento\Catalog\Model\Category|null $category
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForSpecificStoreView($storeId, Category $category = null, $rootCategoryId = null)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
index 18317ea5a4c64..ef704710d95a1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\ObjectRegistry
  *
- * @since 2.0.0
  */
 class ObjectRegistry
 {
@@ -16,13 +15,11 @@ class ObjectRegistry
      * Key is id of entity, value is entity
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $entitiesMap;
 
     /**
      * @param \Magento\Framework\DataObject[] $entities
-     * @since 2.0.0
      */
     public function __construct($entities)
     {
@@ -35,7 +32,6 @@ public function __construct($entities)
     /**
      * @param int $entityId
      * @return \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function get($entityId)
     {
@@ -44,7 +40,6 @@ public function get($entityId)
 
     /**
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getList()
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php
index 883ca2f8b3c44..c3489415d6f8e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class CanonicalUrlRewriteGenerator
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @param ProductUrlPathGenerator $productUrlPathGenerator
      * @param UrlRewriteFactory $urlRewriteFactory
-     * @since 2.0.0
      */
     public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, UrlRewriteFactory $urlRewriteFactory)
     {
@@ -47,7 +43,6 @@ public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, Ur
      * @param int $storeId
      * @param Product $product
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, Product $product)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
index 5f6c082559162..583f0a35d02f9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CategoriesUrlRewriteGenerator.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class CategoriesUrlRewriteGenerator
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @param ProductUrlPathGenerator $productUrlPathGenerator
      * @param UrlRewriteFactory $urlRewriteFactory
-     * @since 2.0.0
      */
     public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, UrlRewriteFactory $urlRewriteFactory)
     {
@@ -49,7 +45,6 @@ public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, Ur
      * @param Product $product
      * @param ObjectRegistry $productCategories
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, Product $product, ObjectRegistry $productCategories)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 6c696e556dd06..d78065ac741b2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -21,40 +21,34 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CurrentUrlRewritesRegenerator
 {
     /**
      * @var Product
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var ObjectRegistry
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $productCategories;
 
     /**
      * @var UrlFinderInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $urlFinder;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
@@ -89,7 +83,6 @@ class CurrentUrlRewritesRegenerator
      * @param UrlRewriteFinder|null $urlRewriteFinder
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param CategoryRepository|null $categoryRepository
-     * @since 2.0.0
      */
     public function __construct(
         UrlFinderInterface $urlFinder,
@@ -119,7 +112,6 @@ public function __construct(
      * @param ObjectRegistry $productCategories
      * @param int|null $rootCategoryId
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($storeId, Product $product, ObjectRegistry $productCategories, $rootCategoryId = null)
     {
@@ -199,7 +191,6 @@ public function generateAnchor(
      * @param Category|null $category
      * @param Product|null $product
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForAutogenerated($url, $storeId, $category, $product = null)
     {
@@ -228,7 +219,6 @@ protected function generateForAutogenerated($url, $storeId, $category, $product
      * @param Category|null $category
      * @param Product|null $product
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForCustom($url, $storeId, $category, $product = null)
     {
@@ -255,7 +245,6 @@ protected function generateForCustom($url, $storeId, $category, $product = null)
      * @param UrlRewrite $url
      * @param ObjectRegistry|null $productCategories
      * @return Category|null|bool
-     * @since 2.0.0
      */
     protected function retrieveCategoryFromMetadata($url, ObjectRegistry $productCategories = null)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index e7333ad4dc3a8..7ce1eefbff2c1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
  *
- * @since 2.0.0
  */
 class ProductUrlPathGenerator
 {
@@ -20,31 +19,26 @@ class ProductUrlPathGenerator
      * Cache for product rewrite suffix
      *
      * @var array
-     * @since 2.0.0
      */
     protected $productUrlSuffix = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -53,7 +47,6 @@ class ProductUrlPathGenerator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -74,7 +67,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPath($product, $category = null)
     {
@@ -94,7 +86,6 @@ public function getUrlPath($product, $category = null)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     protected function prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $product)
     {
@@ -110,7 +101,6 @@ protected function prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $p
      * @param int $storeId
      * @param \Magento\Catalog\Model\Category $category
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPathWithSuffix($product, $storeId, $category = null)
     {
@@ -123,7 +113,6 @@ public function getUrlPathWithSuffix($product, $storeId, $category = null)
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Category|null $category
      * @return string
-     * @since 2.0.0
      */
     public function getCanonicalUrlPath($product, $category = null)
     {
@@ -136,7 +125,6 @@ public function getCanonicalUrlPath($product, $category = null)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getUrlKey($product)
     {
@@ -148,7 +136,6 @@ public function getUrlKey($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     protected function prepareProductUrlKey(\Magento\Catalog\Model\Product $product)
     {
@@ -161,7 +148,6 @@ protected function prepareProductUrlKey(\Magento\Catalog\Model\Product $product)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     protected function getProductUrlSuffix($storeId = null)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index df09845545d78..c60dab84ec2bc 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -17,7 +17,6 @@
  * Class ProductUrlRewriteGenerator
  * @package Magento\CatalogUrlRewrite\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ProductUrlRewriteGenerator
 {
@@ -29,56 +28,48 @@ class ProductUrlRewriteGenerator
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
-     * @since 2.0.0
      */
     protected $storeViewService;
 
     /**
      * @var \Magento\Catalog\Model\Product
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator
-     * @since 2.0.0
      */
     protected $currentUrlRewritesRegenerator;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $categoriesUrlRewriteGenerator;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $canonicalUrlRewriteGenerator;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory
-     * @since 2.0.0
      */
     protected $objectRegistryFactory;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry
-     * @since 2.0.0
      */
     protected $productCategories;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -95,7 +86,6 @@ class ProductUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator,
@@ -136,7 +126,6 @@ private function getProductScopeRewriteGenerator()
      * @param \Magento\Catalog\Model\Product $product
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate(Product $product, $rootCategoryId = null)
     {
@@ -163,7 +152,6 @@ public function generate(Product $product, $rootCategoryId = null)
      * @deprecated 2.2.0
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isGlobalScope($storeId)
     {
@@ -178,7 +166,6 @@ protected function isGlobalScope($storeId)
      * @param \Magento\Catalog\Model\Product|null $product
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForGlobalScope($productCategories, $product = null, $rootCategoryId = null)
     {
@@ -198,7 +185,6 @@ protected function generateForGlobalScope($productCategories, $product = null, $
      * @param Product|null $product
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForSpecificStoreView(
         $storeId,
@@ -215,7 +201,6 @@ protected function generateForSpecificStoreView(
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isCategoryProperForGenerating($category, $storeId)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
index fecc4934975b1..acc910e43a8dc 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product
  *
- * @since 2.0.0
  */
 class Product extends AbstractDb
 {
@@ -29,7 +28,6 @@ class Product extends AbstractDb
      * Primary key auto increment flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPkAutoIncrement = false;
 
@@ -37,7 +35,6 @@ class Product extends AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -47,7 +44,6 @@ protected function _construct()
     /**
      * @param array $insertData
      * @return int
-     * @since 2.0.0
      */
     public function saveMultiple(array $insertData)
     {
@@ -68,7 +64,6 @@ public function saveMultiple(array $insertData)
      *
      * @param array $removeData
      * @return int
-     * @since 2.0.0
      */
     public function removeMultiple(array $removeData)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/ProductCollection.php b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/ProductCollection.php
index c3d25adee47ba..de49c60f277bb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/ProductCollection.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/ProductCollection.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\ResourceModel\Category\ProductCollection
  *
- * @since 2.0.0
  */
 class ProductCollection extends AbstractCollection
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
index dee8fefb814b8..15a28d54b9e52 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Model\Storage\DbStorage
  *
- * @since 2.0.0
  */
 class DbStorage extends BaseDbStorage
 {
     /**
      * @param array $data
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function prepareSelect(array $data)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 41991d49d22a6..07fc9f4c52d66 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -28,7 +28,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AfterImportDataObserver implements ObserverInterface
 {
@@ -39,115 +38,97 @@ class AfterImportDataObserver implements ObserverInterface
 
     /**
      * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
-     * @since 2.0.0
      */
     protected $storeViewService;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $productsWithStores;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $products = [];
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory
-     * @since 2.0.0
      */
     protected $objectRegistryFactory;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry
-     * @since 2.0.0
      */
     protected $productCategories;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $urlFinder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
-     * @since 2.0.0
      */
     protected $import;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $catalogProductFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $acceptableCategories;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $websitesToStoreIds;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $storesCache = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $categoryCache = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $websiteCache = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $vitalForGenerationFields = [
         'sku',
@@ -191,7 +172,6 @@ class AfterImportDataObserver implements ObserverInterface
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param CategoryCollectionFactory|null $categoryCollectionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $catalogProductFactory,
@@ -228,7 +208,6 @@ public function __construct(
      * @param Observer $observer
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
@@ -251,7 +230,6 @@ public function execute(Observer $observer)
      *
      * @return ImportExport
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _populateForUrlGeneration($rowData)
     {
@@ -296,7 +274,6 @@ protected function _populateForUrlGeneration($rowData)
      * @param \Magento\Catalog\Model\Product $product
      * @param array $rowData
      * @return void
-     * @since 2.0.0
      */
     protected function setStoreToProduct(\Magento\Catalog\Model\Product $product, array $rowData)
     {
@@ -315,7 +292,6 @@ protected function setStoreToProduct(\Magento\Catalog\Model\Product $product, ar
      * @param \Magento\Catalog\Model\Product $product
      * @param string $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function addProductToImport($product, $storeId)
     {
@@ -334,7 +310,6 @@ protected function addProductToImport($product, $storeId)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     protected function populateGlobalProduct($product)
     {
@@ -353,7 +328,6 @@ protected function populateGlobalProduct($product)
      * Generate product url rewrites
      *
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateUrls()
     {
@@ -374,7 +348,6 @@ protected function generateUrls()
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isGlobalScope($storeId)
     {
@@ -385,7 +358,6 @@ protected function isGlobalScope($storeId)
      * Generate list based on store view
      *
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     protected function canonicalUrlRewriteGenerate()
     {
@@ -410,7 +382,6 @@ protected function canonicalUrlRewriteGenerate()
      * Generate list based on categories.
      *
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     protected function categoriesUrlRewriteGenerate()
     {
@@ -440,7 +411,6 @@ protected function categoriesUrlRewriteGenerate()
      * Generate list based on current rewrites
      *
      * @return UrlRewrite[]
-     * @since 2.0.0
      */
     protected function currentUrlRewritesRegenerate()
     {
@@ -473,7 +443,6 @@ protected function currentUrlRewritesRegenerate()
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
-     * @since 2.0.0
      */
     protected function generateForAutogenerated($url, $category)
     {
@@ -508,7 +477,6 @@ protected function generateForAutogenerated($url, $category)
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
-     * @since 2.0.0
      */
     protected function generateForCustom($url, $category)
     {
@@ -541,7 +509,6 @@ protected function generateForCustom($url, $category)
     /**
      * @param UrlRewrite $url
      * @return Category|null|bool
-     * @since 2.0.0
      */
     protected function retrieveCategoryFromMetadata($url)
     {
@@ -557,7 +524,6 @@ protected function retrieveCategoryFromMetadata($url)
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isCategoryProperForGenerating($category, $storeId)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
index d3e6c422530f3..973334b80c729 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
@@ -19,31 +19,26 @@
 
 /**
  * Generates Category Url Rewrites after move/save and Products Url Rewrites assigned to the category that's being saved
- * @since 2.0.0
  */
 class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler
-     * @since 2.0.0
      */
     protected $urlRewriteHandler;
 
@@ -73,7 +68,6 @@ class CategoryProcessUrlRewriteMovingObserver implements ObserverInterface
      * @param UrlRewriteBunchReplacer $urlRewriteBunchReplacer
      * @param \Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool $databaseMapPool
      * @param string[] $dataUrlRewriteClassNames
-     * @since 2.0.0
      */
     public function __construct(
         CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
@@ -99,7 +93,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index 8419bcf08a196..7ff7b93f3baea 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -15,13 +15,11 @@
 
 /**
  * Generates Category Url Rewrites after save and Products Url Rewrites assigned to the category that's being saved
- * @since 2.0.0
  */
 class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
-     * @since 2.0.0
      */
     private $categoryUrlRewriteGenerator;
 
@@ -33,7 +31,6 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
 
     /**
      * @var \Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler
-     * @since 2.0.0
      */
     private $urlRewriteHandler;
 
@@ -55,7 +52,6 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
      * @param UrlRewriteBunchReplacer $urlRewriteBunchReplacer
      * @param DatabaseMapPool $databaseMapPool
      * @param string[] $dataUrlRewriteClassNames
-     * @since 2.0.0
      */
     public function __construct(
         CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
@@ -80,7 +76,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
index 54a87e6246d56..8d2a84b960497 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\CategorySaveRewritesHistorySetterObserver
  *
- * @since 2.0.0
  */
 class CategorySaveRewritesHistorySetterObserver implements ObserverInterface
 {
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index e7030fecb3caf..c5c3c788dfd35 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -16,25 +16,21 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver
  *
- * @since 2.0.0
  */
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
-     * @since 2.0.0
      */
     protected $childrenCategoriesProvider;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
-     * @since 2.0.0
      */
     protected $storeViewService;
 
@@ -42,7 +38,6 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
-     * @since 2.0.0
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
@@ -58,7 +53,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -84,7 +78,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     /**
      * @param Category $category
      * @return void
-     * @since 2.0.0
      */
     protected function updateUrlPathForChildren(Category $category)
     {
@@ -116,7 +109,6 @@ protected function updateUrlPathForChildren(Category $category)
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     protected function isGlobalScope($storeId)
     {
@@ -126,7 +118,6 @@ protected function isGlobalScope($storeId)
     /**
      * @param Category $category
      * @return void
-     * @since 2.0.0
      */
     protected function updateUrlPathForCategory(Category $category)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
index b138e04dcdff3..33c75cc609486 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
@@ -14,19 +14,16 @@
 
 /**
  * Class ClearProductUrlsObserver
- * @since 2.0.0
  */
 class ClearProductUrlsObserver implements ObserverInterface
 {
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @param UrlPersistInterface $urlPersist
-     * @since 2.0.0
      */
     public function __construct(
         UrlPersistInterface $urlPersist
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
index 9c4c9360c4127..7525fdaa073e2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteRemovingObserver
  *
- * @since 2.0.0
  */
 class ProductProcessUrlRewriteRemovingObserver implements ObserverInterface
 {
     /**
      * @var UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @param UrlPersistInterface $urlPersist
-     * @since 2.0.0
      */
     public function __construct(
         UrlPersistInterface $urlPersist
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
index fadd6b40cf88d..e46c579d02939 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver
  *
- * @since 2.0.0
  */
 class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
 {
     /**
      * @var ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     private $productUrlRewriteGenerator;
 
     /**
      * @var UrlPersistInterface
-     * @since 2.0.0
      */
     private $urlPersist;
 
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
-     * @since 2.0.0
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
@@ -47,7 +43,6 @@ public function __construct(
      * Generate urls for UrlRewrite and save it in storage
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index 5d9dbf47484d3..597403b7f312d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -17,31 +17,26 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\ProductToWebsiteChangeObserver
  *
- * @since 2.0.0
  */
 class ProductToWebsiteChangeObserver implements ObserverInterface
 {
     /**
      * @var ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $productUrlRewriteGenerator;
 
     /**
      * @var UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -50,7 +45,6 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
      * @param UrlPersistInterface $urlPersist
      * @param ProductRepositoryInterface $productRepository
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
@@ -69,7 +63,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
index 6424740016a77..b0c4145a608ed 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver
  *
- * @since 2.0.0
  */
 class ProductUrlKeyAutogeneratorObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @param ProductUrlPathGenerator $productUrlPathGenerator
-     * @since 2.0.0
      */
     public function __construct(ProductUrlPathGenerator $productUrlPathGenerator)
     {
@@ -35,7 +32,6 @@ public function __construct(ProductUrlPathGenerator $productUrlPathGenerator)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 452fc18ee7fea..6f271fdc05bff 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -8,43 +8,36 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler
  *
- * @since 2.0.0
  */
 class UrlRewriteHandler
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
-     * @since 2.0.0
      */
     protected $childrenCategoriesProvider;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $productUrlRewriteGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $isSkippedProduct;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
@@ -75,7 +68,6 @@ class UrlRewriteHandler
      * @param \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider,
@@ -112,7 +104,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Category $category
      * @return array
-     * @since 2.0.0
      */
     public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $category)
     {
@@ -166,7 +157,6 @@ public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $cate
      * @param bool $saveRewriteHistory
      * @param int|null $rootCategoryId
      * @return array
-     * @since 2.0.0
      */
     private function getCategoryProductsUrlRewrites(
         \Magento\Catalog\Model\Category $category,
@@ -206,7 +196,6 @@ private function getCategoryProductsUrlRewrites(
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return void
-     * @since 2.0.0
      */
     public function deleteCategoryRewritesForChildren(\Magento\Catalog\Model\Category $category)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index 4613cf3afbd18..4c6de9c85a498 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Attributes
- * @since 2.0.0
  */
 class Attributes
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
index 81e23c43d372f..d918bb2e0651b 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
  *
- * @since 2.0.0
  */
 class Attributes
 {
@@ -16,7 +15,6 @@ class Attributes
      * @param \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes $subject
      * @param \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes $result
      * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
-     * @since 2.0.0
      */
     public function afterSetForm(
         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes $subject,
diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index df541598d0c01..ca9e4ae7eadde 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CatalogUrlRewrite\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper
  *
- * @since 2.0.0
  */
 class Helper
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request
@@ -33,7 +30,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $result
      * @return \Magento\Catalog\Model\Product
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterInitialize(
         \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $subject,
diff --git a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
index 52d164070014e..8d0d4cb1c9f49 100644
--- a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
+++ b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
@@ -12,19 +12,16 @@
 
 /**
  * Store view service
- * @since 2.0.0
  */
 class StoreViewService
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -37,7 +34,6 @@ class StoreViewService
     /**
      * @param Config $eavConfig
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(
         Config $eavConfig,
@@ -55,7 +51,6 @@ public function __construct(
      * @param string $entityType
      * @throws \InvalidArgumentException
      * @return bool
-     * @since 2.0.0
      */
     public function doesEntityHaveOverriddenUrlKeyForStore($storeId, $entityId, $entityType)
     {
@@ -70,7 +65,6 @@ public function doesEntityHaveOverriddenUrlKeyForStore($storeId, $entityId, $ent
      * @param string $entityType
      * @throws \InvalidArgumentException
      * @return bool
-     * @since 2.0.0
      */
     public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $entityType)
     {
@@ -86,7 +80,6 @@ public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $en
      * @param mixed $attributeName
      * @throws \InvalidArgumentException
      * @return bool
-     * @since 2.0.0
      */
     protected function doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, $attributeName)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php b/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php
index 87c3db6c68aad..bbc5f497843b0 100644
--- a/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php
+++ b/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -39,7 +36,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php b/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
index 23900b93dcce2..44ccdab247a9e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index d33839a1b1d61..2116fc846d0a6 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -16,7 +16,6 @@
  * Catalog Products List widget block
  * Class ProductsList
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
 {
@@ -46,13 +45,11 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * Instance of pager block
      *
      * @var \Magento\Catalog\Block\Product\Widget\Html\Pager
-     * @since 2.0.0
      */
     protected $pager;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -60,7 +57,6 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $catalogProductVisibility;
 
@@ -68,25 +64,21 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
     /**
      * @var \Magento\Rule\Model\Condition\Sql\Builder
-     * @since 2.0.0
      */
     protected $sqlBuilder;
 
     /**
      * @var \Magento\CatalogWidget\Model\Rule
-     * @since 2.0.0
      */
     protected $rule;
 
     /**
      * @var \Magento\Widget\Helper\Conditions
-     * @since 2.0.0
      */
     protected $conditionsHelper;
 
@@ -114,7 +106,6 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
      * @param Json|null $json
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -142,7 +133,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -163,7 +153,6 @@ protected function _construct()
      * Get key pieces for caching block content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -187,7 +176,6 @@ public function getCacheKeyInfo()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getProductPriceHtml(
         \Magento\Catalog\Model\Product $product,
@@ -224,7 +212,6 @@ public function getProductPriceHtml(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -236,7 +223,6 @@ protected function _beforeToHtml()
      * Prepare and return product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function createCollection()
     {
@@ -264,7 +250,6 @@ public function createCollection()
 
     /**
      * @return \Magento\Rule\Model\Condition\Combine
-     * @since 2.0.0
      */
     protected function getConditions()
     {
@@ -284,7 +269,6 @@ protected function getConditions()
      * Retrieve how many products should be displayed
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductsCount()
     {
@@ -303,7 +287,6 @@ public function getProductsCount()
      * Retrieve how many products should be displayed
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductsPerPage()
     {
@@ -317,7 +300,6 @@ public function getProductsPerPage()
      * Return flag whether pager need to be shown or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showPager()
     {
@@ -331,7 +313,6 @@ public function showPager()
      * Retrieve how many products should be displayed on page
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getPageSize()
     {
@@ -342,7 +323,6 @@ protected function getPageSize()
      * Render pagination HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPagerHtml()
     {
@@ -372,7 +352,6 @@ public function getPagerHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -392,7 +371,6 @@ public function getIdentities()
      * Get value of widgets' title parameter
      *
      * @return mixed|string
-     * @since 2.0.0
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
index a387fc75fcc8a..04ae7c6a2d750 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
@@ -15,49 +15,41 @@
 
 /**
  * Class Conditions
- * @since 2.0.0
  */
 class Conditions extends Template implements RendererInterface
 {
     /**
      * @var \Magento\Rule\Block\Conditions
-     * @since 2.0.0
      */
     protected $conditions;
 
     /**
      * @var \Magento\CatalogWidget\Model\Rule
-     * @since 2.0.0
      */
     protected $rule;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Factory
-     * @since 2.0.0
      */
     protected $elementFactory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var AbstractElement
-     * @since 2.0.0
      */
     protected $element;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Text
-     * @since 2.0.0
      */
     protected $input;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/widget/conditions.phtml';
 
@@ -68,7 +60,6 @@ class Conditions extends Template implements RendererInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -87,7 +78,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -106,7 +96,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -117,7 +106,6 @@ public function render(AbstractElement $element)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNewChildUrl()
     {
@@ -128,7 +116,6 @@ public function getNewChildUrl()
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -137,7 +124,6 @@ public function getElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -146,7 +132,6 @@ public function getHtmlId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getInputHtml()
     {
diff --git a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget.php b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget.php
index eb06f6ab9330e..35c990749aeb2 100644
--- a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget.php
+++ b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Widget
- * @since 2.0.0
  */
 abstract class Widget extends Action
 {
diff --git a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php
index 1cedc17c3d21d..11aada8588f1c 100644
--- a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php
+++ b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php
@@ -9,20 +9,17 @@
 
 /**
  * Class Conditions
- * @since 2.0.0
  */
 class Conditions extends \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget
 {
     /**
      * @var \Magento\CatalogWidget\Model\Rule
-     * @since 2.0.0
      */
     protected $rule;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\CatalogWidget\Model\Rule $rule
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogWidget/Model/Rule.php b/app/code/Magento/CatalogWidget/Model/Rule.php
index a6bfc4eb39490..9523177ec2ee7 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule.php
@@ -12,13 +12,11 @@
  * Rule for catalog widget
  *
  * @api
- * @since 2.0.0
  */
 class Rule extends \Magento\Rule\Model\AbstractModel
 {
     /**
      * @var Rule\Condition\CombineFactory
-     * @since 2.0.0
      */
     protected $conditionsFactory;
 
@@ -38,7 +36,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      *
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -70,7 +67,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConditionsInstance()
     {
@@ -79,7 +75,6 @@ public function getConditionsInstance()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionsInstance()
     {
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
index ee466910f0e40..0691d658f31f4 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
@@ -7,19 +7,16 @@
 
 /**
  * Combination of product conditions
- * @since 2.0.0
  */
 class Combine extends \Magento\Rule\Model\Condition\Combine
 {
     /**
      * @var \Magento\CatalogWidget\Model\Rule\Condition\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $elementName = 'parameters';
 
@@ -34,7 +31,6 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
      * @param \Magento\CatalogWidget\Model\Rule\Condition\ProductFactory $conditionFactory
      * @param array $data
      * @param array $excludedAttributes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
@@ -83,7 +78,6 @@ public function getNewChildSelectOptions()
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
      * @return $this
-     * @since 2.0.0
      */
     public function collectValidatedAttributes($productCollection)
     {
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 14c56744ff619..f190dd075dd61 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -14,19 +14,16 @@
 /**
  * Class Product
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $elementName = 'parameters';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $joinedAttributes = [];
 
@@ -34,7 +31,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -51,7 +47,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
      * @param array $data
      * @param ProductCategoryList $categoryList
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -83,7 +78,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -107,7 +101,6 @@ public function loadAttributeOptions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _addSpecialAttributes(array &$attributes)
     {
@@ -120,7 +113,6 @@ protected function _addSpecialAttributes(array &$attributes)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function addToCollection($collection)
     {
@@ -153,7 +145,6 @@ public function addToCollection($collection)
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     protected function addGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
@@ -187,7 +178,6 @@ protected function addGlobalAttribute(
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     protected function addNotGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
@@ -222,7 +212,6 @@ protected function addNotGlobalAttribute(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMappedSqlField()
     {
diff --git a/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php b/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
index 18d3897aa64ee..d97492f31a79d 100644
--- a/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
+++ b/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
@@ -8,14 +8,12 @@
 /**
  * Interface AgreementsValidatorInterface
  * @api
- * @since 2.0.0
  */
 interface AgreementsValidatorInterface
 {
     /**
      * @param array $agreementIds
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($agreementIds = []);
 }
diff --git a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
index 4ee29f065f536..45e885d0dbd46 100644
--- a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface PaymentDetailsInterface
  * @api
- * @since 2.0.0
  */
 interface PaymentDetailsInterface
 {
@@ -23,27 +22,23 @@ interface PaymentDetailsInterface
 
     /**
      * @return \Magento\Quote\Api\Data\PaymentMethodInterface[]
-     * @since 2.0.0
      */
     public function getPaymentMethods();
 
     /**
      * @param \Magento\Quote\Api\Data\PaymentMethodInterface[] $paymentMethods
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentMethods($paymentMethods);
 
     /**
      * @return \Magento\Quote\Api\Data\TotalsInterface
-     * @since 2.0.0
      */
     public function getTotals();
 
     /**
      * @param \Magento\Quote\Api\Data\TotalsInterface $totals
      * @return $this
-     * @since 2.0.0
      */
     public function setTotals($totals);
 
@@ -51,7 +46,6 @@ public function setTotals($totals);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -60,7 +54,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php b/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
index 62842e01b28f3..e4032066a6f10 100644
--- a/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ShippingInformationInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingInformationInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -29,7 +28,6 @@ interface ShippingInformationInterface extends \Magento\Framework\Api\CustomAttr
      * Returns shipping address
      *
      * @return \Magento\Quote\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     public function getShippingAddress();
 
@@ -38,7 +36,6 @@ public function getShippingAddress();
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $address);
 
@@ -46,7 +43,6 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
      * Returns billing address
      *
      * @return \Magento\Quote\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress();
 
@@ -55,7 +51,6 @@ public function getBillingAddress();
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address);
 
@@ -63,7 +58,6 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $addr
      * Returns shipping method code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShippingMethodCode();
 
@@ -72,7 +66,6 @@ public function getShippingMethodCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingMethodCode($code);
 
@@ -80,7 +73,6 @@ public function setShippingMethodCode($code);
      * Returns carrier code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShippingCarrierCode();
 
@@ -89,7 +81,6 @@ public function getShippingCarrierCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingCarrierCode($code);
 
@@ -97,7 +88,6 @@ public function setShippingCarrierCode($code);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Checkout\Api\Data\ShippingInformationExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -106,7 +96,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Checkout\Api\Data\ShippingInformationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\ShippingInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php b/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
index 4b961197ea648..a9dd05856b72f 100644
--- a/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface TotalsInformationInterface
  * @api
- * @since 2.0.0
  */
 interface TotalsInformationInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -27,7 +26,6 @@ interface TotalsInformationInterface extends \Magento\Framework\Api\CustomAttrib
      * Returns address
      *
      * @return \Magento\Quote\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     public function getAddress();
 
@@ -36,7 +34,6 @@ public function getAddress();
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Api\Data\AddressInterface $address);
 
@@ -44,7 +41,6 @@ public function setAddress(\Magento\Quote\Api\Data\AddressInterface $address);
      * Returns shipping method code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getShippingMethodCode();
 
@@ -53,7 +49,6 @@ public function getShippingMethodCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingMethodCode($code);
 
@@ -61,7 +56,6 @@ public function setShippingMethodCode($code);
      * Returns carrier code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getShippingCarrierCode();
 
@@ -70,7 +64,6 @@ public function getShippingCarrierCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingCarrierCode($code);
 
@@ -78,7 +71,6 @@ public function setShippingCarrierCode($code);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Checkout\Api\Data\TotalsInformationExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -87,7 +79,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Checkout\Api\Data\TotalsInformationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\TotalsInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
index 97f51608633ef..63296081ab97c 100644
--- a/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing guest payment information
  * @api
- * @since 2.0.0
  */
 interface GuestPaymentInformationManagementInterface
 {
@@ -21,7 +20,6 @@ interface GuestPaymentInformationManagementInterface
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -39,7 +37,6 @@ public function savePaymentInformationAndPlaceOrder(
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function savePaymentInformation(
         $cartId,
@@ -53,7 +50,6 @@ public function savePaymentInformation(
      *
      * @param string $cartId
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
-     * @since 2.0.0
      */
     public function getPaymentInformation($cartId);
 }
diff --git a/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
index f751b0fc918b8..def7442ad4672 100644
--- a/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing guest shipping address information
  * @api
- * @since 2.0.0
  */
 interface GuestShippingInformationManagementInterface
 {
@@ -16,7 +15,6 @@ interface GuestShippingInformationManagementInterface
      * @param string $cartId
      * @param \Magento\Checkout\Api\Data\ShippingInformationInterface $addressInformation
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
-     * @since 2.0.0
      */
     public function saveAddressInformation(
         $cartId,
diff --git a/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
index d45b4d497ddbd..d2d7dfad609cb 100644
--- a/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for guest quote totals calculation
  * @api
- * @since 2.0.0
  */
 interface GuestTotalsInformationManagementInterface
 {
@@ -18,7 +17,6 @@ interface GuestTotalsInformationManagementInterface
      * @param string $cartId
      * @param \Magento\Checkout\Api\Data\TotalsInformationInterface $addressInformation
      * @return \Magento\Quote\Api\Data\TotalsInterface
-     * @since 2.0.0
      */
     public function calculate(
         $cartId,
diff --git a/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php b/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
index 785e675a34f52..f80deca1acc5a 100644
--- a/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing quote payment information
  * @api
- * @since 2.0.0
  */
 interface PaymentInformationManagementInterface
 {
@@ -20,7 +19,6 @@ interface PaymentInformationManagementInterface
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -36,7 +34,6 @@ public function savePaymentInformationAndPlaceOrder(
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function savePaymentInformation(
         $cartId,
@@ -49,7 +46,6 @@ public function savePaymentInformation(
      *
      * @param int $cartId
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
-     * @since 2.0.0
      */
     public function getPaymentInformation($cartId);
 }
diff --git a/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php b/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
index 4178902b41a78..0d22e1485c099 100644
--- a/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing customer shipping address information
  * @api
- * @since 2.0.0
  */
 interface ShippingInformationManagementInterface
 {
@@ -16,7 +15,6 @@ interface ShippingInformationManagementInterface
      * @param int $cartId
      * @param \Magento\Checkout\Api\Data\ShippingInformationInterface $addressInformation
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
-     * @since 2.0.0
      */
     public function saveAddressInformation(
         $cartId,
diff --git a/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php b/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
index c35507a00b521..60fd254eb199e 100644
--- a/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for quote totals calculation
  * @api
- * @since 2.0.0
  */
 interface TotalsInformationManagementInterface
 {
@@ -18,7 +17,6 @@ interface TotalsInformationManagementInterface
      * @param int $cartId
      * @param \Magento\Checkout\Api\Data\TotalsInformationInterface $addressInformation
      * @return \Magento\Quote\Api\Data\TotalsInterface
-     * @since 2.0.0
      */
     public function calculate(
         $cartId,
diff --git a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
index 0e32f1bed95c1..9164a9fd9963b 100644
--- a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
+++ b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
@@ -15,7 +15,6 @@
  *
  * @package Magento\Checkout\Block\Adminhtml
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CartTab extends TabWrapper
 {
@@ -23,13 +22,11 @@ class CartTab extends TabWrapper
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAjaxLoaded = true;
 
@@ -39,7 +36,6 @@ class CartTab extends TabWrapper
      * @param Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $registry, array $data = [])
     {
@@ -49,7 +45,6 @@ public function __construct(Context $context, Registry $registry, array $data =
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -60,7 +55,6 @@ public function canShowTab()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -71,7 +65,6 @@ public function getTabLabel()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 0cdd9f71405be..c348bd62f1c64 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -11,25 +11,21 @@
  * Shopping cart block
  *
  * @api
- * @since 2.0.0
  */
 class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Url
-     * @since 2.0.0
      */
     protected $_catalogUrlBuilder;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $_cartHelper;
 
@@ -42,7 +38,6 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      *
      * @codeCoverageIgnore
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +72,6 @@ protected function _construct()
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function prepareItemUrls()
     {
@@ -119,7 +112,6 @@ public function prepareItemUrls()
     /**
      * @codeCoverageIgnore
      * @return bool
-     * @since 2.0.0
      */
     public function hasError()
     {
@@ -129,7 +121,6 @@ public function hasError()
     /**
      * @codeCoverageIgnore
      * @return int
-     * @since 2.0.0
      */
     public function getItemsSummaryQty()
     {
@@ -139,7 +130,6 @@ public function getItemsSummaryQty()
     /**
      * @codeCoverageIgnore
      * @return bool
-     * @since 2.0.0
      */
     public function isWishlistActive()
     {
@@ -159,7 +149,6 @@ public function isWishlistActive()
     /**
      * @codeCoverageIgnore
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutUrl()
     {
@@ -168,7 +157,6 @@ public function getCheckoutUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getContinueShoppingUrl()
     {
@@ -187,7 +175,6 @@ public function getContinueShoppingUrl()
      * @return bool
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsVirtual()
     {
@@ -199,7 +186,6 @@ public function getIsVirtual()
      *
      * @param string $alias Container block alias in layout
      * @return array
-     * @since 2.0.0
      */
     public function getMethods($alias)
     {
@@ -216,7 +202,6 @@ public function getMethods($alias)
      * @param string $name Block name in layout
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getMethodHtml($name)
     {
@@ -231,7 +216,6 @@ public function getMethodHtml($name)
      * Return customer quote items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -245,7 +229,6 @@ public function getItems()
     /**
      * @codeCoverageIgnore
      * @return int
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/AbstractCart.php b/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
index 0ba13fa015a9f..f5adf416e9a27 100644
--- a/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
+++ b/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
@@ -9,7 +9,6 @@
 
 /**
  * Shopping cart abstract block
- * @since 2.0.0
  */
 class AbstractCart extends \Magento\Framework\View\Element\Template
 {
@@ -20,19 +19,16 @@ class AbstractCart extends \Magento\Framework\View\Element\Template
 
     /**
      * @var Quote|null
-     * @since 2.0.0
      */
     protected $_quote = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_totals;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_itemRenders = [];
 
@@ -40,13 +36,11 @@ class AbstractCart extends \Magento\Framework\View\Element\Template
      * TODO: MAGETWO-34827: unused object?
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -56,7 +50,6 @@ class AbstractCart extends \Magento\Framework\View\Element\Template
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -74,7 +67,6 @@ public function __construct(
      * Retrieve renderer list
      *
      * @return \Magento\Framework\View\Element\RendererList
-     * @since 2.0.0
      */
     protected function _getRendererList()
     {
@@ -91,7 +83,6 @@ protected function _getRendererList()
      * @param string|null $type
      * @return \Magento\Framework\View\Element\Template
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getItemRenderer($type = null)
     {
@@ -111,7 +102,6 @@ public function getItemRenderer($type = null)
      * Get active quote
      *
      * @return Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -126,7 +116,6 @@ public function getQuote()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -138,7 +127,6 @@ public function getItems()
      *
      * @param   \Magento\Quote\Model\Quote\Item $item
      * @return  string
-     * @since 2.0.0
      */
     public function getItemHtml(\Magento\Quote\Model\Quote\Item $item)
     {
@@ -149,7 +137,6 @@ public function getItemHtml(\Magento\Quote\Model\Quote\Item $item)
     /**
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -158,7 +145,6 @@ public function getTotals()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsCache()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Additional/Info.php b/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
index 5461f0031c38a..196992cbaf9c8 100644
--- a/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
+++ b/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Quote\Model\Quote\Item\AbstractItem
-     * @since 2.0.0
      */
     protected $_item;
 
@@ -22,7 +20,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -33,7 +30,6 @@ public function setItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     /**
      * @return \Magento\Quote\Model\Quote\Item\AbstractItem
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php b/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
index 3613240789dfd..f798f1891b2fc 100644
--- a/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
+++ b/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Checkout\Block\Cart\CartTotalsProcessor
  *
- * @since 2.0.0
  */
 class CartTotalsProcessor extends AbstractTotalsProcessor implements LayoutProcessorInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process($jsLayout)
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Coupon.php b/app/code/Magento/Checkout/Block/Cart/Coupon.php
index 0afb7f40d3831..e485eaf64c832 100644
--- a/app/code/Magento/Checkout/Block/Cart/Coupon.php
+++ b/app/code/Magento/Checkout/Block/Cart/Coupon.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Coupon extends \Magento\Checkout\Block\Cart\AbstractCart
 {
@@ -17,7 +16,6 @@ class Coupon extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -32,7 +30,6 @@ public function __construct(
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCouponCode()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index 9c9fe48ac4ab8..06be50d05aefc 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -20,37 +19,31 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
      * Items quantity will be capped to this value
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxItemCount = 4;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var StockHelper
-     * @since 2.0.0
      */
     protected $stockHelper;
 
     /**
      * @var \Magento\Catalog\Model\Product\LinkFactory
-     * @since 2.0.0
      */
     protected $_productLinkFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\RelatedProducts
-     * @since 2.0.0
      */
     protected $_itemRelationsList;
 
@@ -65,7 +58,6 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
      *
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -92,7 +84,6 @@ public function __construct(
      * Get crosssell items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -143,7 +134,6 @@ public function getItems()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemCount()
     {
@@ -154,7 +144,6 @@ public function getItemCount()
      * Get ids of products that are in cart
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCartProductIds()
     {
@@ -177,7 +166,6 @@ protected function _getCartProductIds()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getLastAddedProductId()
     {
@@ -189,7 +177,6 @@ protected function _getLastAddedProductId()
      *
      * @return \Magento\Quote\Model\Quote
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -200,7 +187,6 @@ public function getQuote()
      * Get crosssell products collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     protected function _getCollection()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Configure.php b/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
index c5ccfd3f51787..086518a312f71 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @module     Checkout
- * @since 2.0.0
  */
 class Configure extends \Magento\Framework\View\Element\Template
 {
@@ -19,7 +18,6 @@ class Configure extends \Magento\Framework\View\Element\Template
      * Configure product view blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 4ef3ca2cf583a..57ca4b7b2e606 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -21,26 +21,22 @@
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setProductName(string)
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Renderer extends \Magento\Framework\View\Element\Template implements
     \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var AbstractItem
-     * @since 2.0.0
      */
     protected $_item;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_productUrl;
 
@@ -48,7 +44,6 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * Whether qty will be converted to number
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_strictQtyMode = true;
 
@@ -56,7 +51,6 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * Check, whether product URL rendering should be ignored
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_ignoreProductUrl = false;
 
@@ -64,43 +58,36 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * Catalog product configuration
      *
      * @var \Magento\Catalog\Helper\Product\Configuration
-     * @since 2.0.0
      */
     protected $_productConfig = null;
 
     /**
      * @var \Magento\Framework\Url\Helper\Data
-     * @since 2.0.0
      */
     protected $_urlHelper;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder
-     * @since 2.0.0
      */
     protected $imageBuilder;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     public $moduleManager;
 
     /**
      * @var InterpretationStrategyInterface
-     * @since 2.0.0
      */
     private $messageInterpretationStrategy;
 
@@ -117,7 +104,6 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -149,7 +135,6 @@ public function __construct(
      * @param AbstractItem $item
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setItem(AbstractItem $item)
     {
@@ -162,7 +147,6 @@ public function setItem(AbstractItem $item)
      *
      * @return AbstractItem
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -174,7 +158,6 @@ public function getItem()
      *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -186,7 +169,6 @@ public function getProduct()
      *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getProductForThumbnail()
     {
@@ -197,7 +179,6 @@ public function getProductForThumbnail()
      * @param string $productUrl
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function overrideProductUrl($productUrl)
     {
@@ -209,7 +190,6 @@ public function overrideProductUrl($productUrl)
      * Check Product has URL
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasProductUrl()
     {
@@ -244,7 +224,6 @@ public function hasProductUrl()
      * Retrieve URL to item Product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl()
     {
@@ -268,7 +247,6 @@ public function getProductUrl()
      * Get item product name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductName()
     {
@@ -282,7 +260,6 @@ public function getProductName()
      * Get product customize options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductOptions()
     {
@@ -296,7 +273,6 @@ public function getProductOptions()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOptionList()
     {
@@ -307,7 +283,6 @@ public function getOptionList()
      * Get quote item qty
      *
      * @return float|int
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -322,7 +297,6 @@ public function getQty()
      *
      * @return \Magento\Checkout\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutSession()
     {
@@ -337,7 +311,6 @@ public function getCheckoutSession()
      * type => type of a message
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -388,7 +361,6 @@ public function getMessages()
      *          )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormatedOptionValue($optionValue)
     {
@@ -406,7 +378,6 @@ public function getFormatedOptionValue($optionValue)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isProductVisible()
     {
@@ -418,7 +389,6 @@ public function isProductVisible()
      *
      * @return AbstractBlock
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getProductAdditionalInformationBlock()
     {
@@ -431,7 +401,6 @@ public function getProductAdditionalInformationBlock()
      * @param bool $strict
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setQtyMode($strict)
     {
@@ -445,7 +414,6 @@ public function setQtyMode($strict)
      * @param bool $ignore
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIgnoreProductUrl($ignore = true)
     {
@@ -457,7 +425,6 @@ public function setIgnoreProductUrl($ignore = true)
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -473,7 +440,6 @@ public function getIdentities()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
     {
@@ -499,7 +465,6 @@ public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
     /**
      * @return \Magento\Framework\Pricing\Render
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getPriceRender()
     {
@@ -512,7 +477,6 @@ protected function getPriceRender()
      * @param float $amount
      * @param bool $format
      * @return float
-     * @since 2.0.0
      */
     public function convertPrice($amount, $format = false)
     {
@@ -526,7 +490,6 @@ public function convertPrice($amount, $format = false)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getUnitPriceHtml(AbstractItem $item)
     {
@@ -541,7 +504,6 @@ public function getUnitPriceHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowTotalHtml(AbstractItem $item)
     {
@@ -556,7 +518,6 @@ public function getRowTotalHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getSidebarItemPriceHtml(AbstractItem $item)
     {
@@ -571,7 +532,6 @@ public function getSidebarItemPriceHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getUnitPriceExclTaxHtml(AbstractItem $item)
     {
@@ -586,7 +546,6 @@ public function getUnitPriceExclTaxHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getUnitPriceInclTaxHtml(AbstractItem $item)
     {
@@ -601,7 +560,6 @@ public function getUnitPriceInclTaxHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowTotalExclTaxHtml(AbstractItem $item)
     {
@@ -616,7 +574,6 @@ public function getRowTotalExclTaxHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowTotalInclTaxHtml(AbstractItem $item)
     {
@@ -631,7 +588,6 @@ public function getRowTotalInclTaxHtml(AbstractItem $item)
      *
      * @param AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getActions(AbstractItem $item)
     {
@@ -652,7 +608,6 @@ public function getActions(AbstractItem $item)
      * @param string $imageId
      * @param array $attributes
      * @return \Magento\Catalog\Block\Product\Image
-     * @since 2.0.0
      */
     public function getImage($product, $imageId, $attributes = [])
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
index b03a11d632661..3be4f76d8d67e 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Actions extends Text
 {
     /**
      * @var AbstractItem
-     * @since 2.0.0
      */
     protected $item;
 
@@ -26,7 +24,6 @@ class Actions extends Text
      *
      * @return AbstractItem
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -39,7 +36,6 @@ public function getItem()
      * @param AbstractItem $item
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setItem(AbstractItem $item)
     {
@@ -51,7 +47,6 @@ public function setItem(AbstractItem $item)
      * Render html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
index 5f261ba569306..4542f19c4670a 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends Generic
 {
@@ -15,7 +14,6 @@ class Edit extends Generic
      * Get item configure url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigureUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php
index 39f7c02916273..9ce68d0fc0102 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Generic
  *
- * @since 2.0.0
  */
 class Generic extends Template
 {
     /**
      * @var AbstractItem
-     * @since 2.0.0
      */
     protected $item;
 
@@ -26,7 +24,6 @@ class Generic extends Template
      *
      * @return AbstractItem
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -39,7 +36,6 @@ public function getItem()
      * @param AbstractItem $item
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setItem(AbstractItem $item)
     {
@@ -52,7 +48,6 @@ public function setItem(AbstractItem $item)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isProductVisibleInSiteVisibility()
     {
@@ -64,7 +59,6 @@ public function isProductVisibleInSiteVisibility()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isVirtual()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
index 6df6204535e27..d50eeb1b0a263 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Remove extends Generic
 {
     /**
      * @var Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
@@ -25,7 +23,6 @@ class Remove extends Generic
      * @param Cart $cartHelper
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getDeletePostJson()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
index 975e3a458d624..19bfc8a54b7fe 100644
--- a/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Checkout\Block\Cart\LayoutProcessor
  *
- * @since 2.0.0
  */
 class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
 {
     /**
      * @var \Magento\Checkout\Block\Checkout\AttributeMerger
-     * @since 2.0.0
      */
     protected $merger;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     protected $countryCollection;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     protected $regionCollection;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     protected $defaultShippingAddress = null;
 
@@ -48,7 +43,6 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
      * @param \Magento\Directory\Model\ResourceModel\Region\Collection $regionCollection
      * @param \Magento\Directory\Model\TopDestinationCountries $topDestinationCountries
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Block\Checkout\AttributeMerger $merger,
@@ -69,7 +63,6 @@ public function __construct(
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function isCityActive()
     {
@@ -81,7 +74,6 @@ protected function isCityActive()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function isStateActive()
     {
@@ -94,7 +86,6 @@ protected function isStateActive()
      * @param array $jsLayout
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function process($jsLayout)
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
index a1d65c58ce2b1..abc1ce4e31010 100644
--- a/app/code/Magento/Checkout/Block/Cart/Link.php
+++ b/app/code/Magento/Checkout/Block/Cart/Link.php
@@ -9,19 +9,16 @@
  * "My Cart" link
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $_cartHelper;
 
@@ -31,7 +28,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -57,7 +52,6 @@ public function getLabel()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -68,7 +62,6 @@ public function getHref()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -82,7 +75,6 @@ protected function _toHtml()
      * Count items in cart
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getItemCount()
     {
@@ -95,7 +87,6 @@ protected function _getItemCount()
      *
      * @param int $count
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _createLabel($count)
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 2c6ac730904ed..5de0677d03625 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -8,19 +8,16 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
 {
     /**
      * @var \Magento\Checkout\Model\CompositeConfigProvider
-     * @since 2.0.0
      */
     protected $configProvider;
 
     /**
      * @var array|\Magento\Checkout\Block\Checkout\LayoutProcessorInterface[]
-     * @since 2.0.0
      */
     protected $layoutProcessors;
 
@@ -39,7 +36,6 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -63,7 +59,6 @@ public function __construct(
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutConfig()
     {
@@ -74,7 +69,6 @@ public function getCheckoutConfig()
      * Retrieve serialized JS layout configuration ready to use in template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -89,7 +83,6 @@ public function getJsLayout()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 58a7b164067ac..5c0452aa15a68 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -11,7 +11,6 @@
  * Cart sidebar block
  *
  * @api
- * @since 2.0.0
  */
 class Sidebar extends AbstractCart
 {
@@ -27,7 +26,6 @@ class Sidebar extends AbstractCart
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
@@ -46,7 +44,6 @@ class Sidebar extends AbstractCart
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -74,7 +71,6 @@ public function __construct(
      * Returns minicart config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -102,7 +98,6 @@ public function getSerializedConfig()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getImageHtmlTemplate()
     {
@@ -116,7 +111,6 @@ public function getImageHtmlTemplate()
      *
      * @codeCoverageIgnore
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutUrl()
     {
@@ -128,7 +122,6 @@ public function getCheckoutUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getShoppingCartUrl()
     {
@@ -140,7 +133,6 @@ public function getShoppingCartUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getUpdateItemQtyUrl()
     {
@@ -152,7 +144,6 @@ public function getUpdateItemQtyUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRemoveItemUrl()
     {
@@ -165,7 +156,6 @@ public function getRemoveItemUrl()
      * @return bool
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsNeedToDisplaySideBar()
     {
@@ -179,7 +169,6 @@ public function getIsNeedToDisplaySideBar()
      * Return totals from custom quote if needed
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsCache()
     {
@@ -195,7 +184,6 @@ public function getTotalsCache()
      *
      * @codeCoverageIgnore
      * @return string
-     * @since 2.0.0
      */
     public function getTotalsHtml()
     {
@@ -207,7 +195,6 @@ public function getTotalsHtml()
      *
      * @codeCoverageIgnore
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -218,7 +205,7 @@ public function getBaseUrl()
      * Return max visible item count for minicart
      *
      * @return int
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private function getMiniCartMaxItemsCount()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index 5d3febdbd458a..d3d3adbe40f38 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -10,37 +10,31 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_totalRenderers;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultRenderer = \Magento\Checkout\Block\Total\DefaultTotal::class;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = null;
 
     /**
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
     /**
      * @var LayoutProcessorInterface[]
-     * @since 2.0.0
      */
     protected $layoutProcessors;
 
@@ -52,7 +46,6 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param array $layoutProcessors
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -70,7 +63,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -82,7 +74,6 @@ public function getJsLayout()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -96,7 +87,6 @@ public function getTotals()
      * @param array $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setTotals($value)
     {
@@ -107,7 +97,6 @@ public function setTotals($value)
     /**
      * @param string $code
      * @return BlockInterface
-     * @since 2.0.0
      */
     protected function _getTotalRenderer($code)
     {
@@ -135,7 +124,6 @@ protected function _getTotalRenderer($code)
      * @param int|null $area
      * @param int $colspan
      * @return string
-     * @since 2.0.0
      */
     public function renderTotal($total, $area = null, $colspan = 1)
     {
@@ -160,7 +148,6 @@ public function renderTotal($total, $area = null, $colspan = 1)
      * @param   null|string $area
      * @param   int $colspan
      * @return  string
-     * @since 2.0.0
      */
     public function renderTotals($area = null, $colspan = 1)
     {
@@ -178,7 +165,6 @@ public function renderTotals($area = null, $colspan = 1)
      * Check if we have display grand total in base currency
      *
      * @return bool
-     * @since 2.0.0
      */
     public function needDisplayBaseGrandtotal()
     {
@@ -193,7 +179,6 @@ public function needDisplayBaseGrandtotal()
      * Get formated in base currency base grand total value
      *
      * @return string
-     * @since 2.0.0
      */
     public function displayBaseGrandtotal()
     {
@@ -209,7 +194,6 @@ public function displayBaseGrandtotal()
      * Get active or custom quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
index 9853a7449ba00..9b6691870f1d5 100644
--- a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
+++ b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
@@ -12,19 +12,16 @@
  * Shopping cart validation messages block
  *
  * @api
- * @since 2.0.0
  */
 class ValidationMessages extends \Magento\Framework\View\Element\Messages
 {
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $currency;
 
@@ -44,7 +41,6 @@ class ValidationMessages extends \Magento\Framework\View\Element\Messages
      * @param \Magento\Framework\Locale\CurrencyInterface $currency
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -70,7 +66,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -86,7 +81,6 @@ protected function _prepareLayout()
      * Validate minimum amount and display notice in error
      *
      * @return void
-     * @since 2.0.0
      */
     protected function validateMinimumAmount()
     {
@@ -115,7 +109,6 @@ private function getMinimumAmountErrorMessage()
      * Add quote messages
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addQuoteMessages()
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 0758fde75fc4f..0de05f37c709d 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Checkout\Block\Checkout\AttributeMerger
  *
- * @since 2.0.0
  */
 class AttributeMerger
 {
@@ -21,7 +20,6 @@ class AttributeMerger
      * Map form element
      *
      * @var array
-     * @since 2.0.0
      */
     protected $formElementMap = [
         'checkbox'    => 'Magento_Ui/js/form/element/select',
@@ -37,7 +35,6 @@ class AttributeMerger
      * Map template
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateMap = [
         'image' => 'media',
@@ -48,7 +45,6 @@ class AttributeMerger
      * Map input_validation and validation rule from js
      *
      * @var array
-     * @since 2.0.0
      */
     protected $inputValidationMap = [
         'alpha' => 'validate-alpha',
@@ -61,31 +57,26 @@ class AttributeMerger
 
     /**
      * @var AddressHelper
-     * @since 2.0.0
      */
     private $addressHelper;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     private $customerSession;
 
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     private $customerRepository;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     private $customer;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     private $directoryHelper;
 
@@ -93,7 +84,6 @@ class AttributeMerger
      * List of codes of countries that must be shown on the top of country list
      *
      * @var array
-     * @since 2.0.0
      */
     private $topCountryCodes;
 
@@ -102,7 +92,6 @@ class AttributeMerger
      * @param Session $customerSession
      * @param CustomerRepository $customerRepository
      * @param DirectoryHelper $directoryHelper
-     * @since 2.0.0
      */
     public function __construct(
         AddressHelper $addressHelper,
@@ -125,7 +114,6 @@ public function __construct(
      * @param string $dataScopePrefix
      * @param array $fields
      * @return array
-     * @since 2.0.0
      */
     public function merge($elements, $providerName, $dataScopePrefix, array $fields = [])
     {
@@ -156,7 +144,6 @@ public function merge($elements, $providerName, $dataScopePrefix, array $fields
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function getFieldConfig(
         $attributeCode,
@@ -241,7 +228,6 @@ protected function getFieldConfig(
      * @param array $mainSource
      * @param array $additionalSource
      * @return array
-     * @since 2.0.0
      */
     protected function mergeConfigurationNode($nodeName, array $mainSource, array $additionalSource)
     {
@@ -257,7 +243,6 @@ protected function mergeConfigurationNode($nodeName, array $mainSource, array $a
      * @param array $attributeConfig
      * @param array $additionalConfig field configuration provided via layout XML
      * @return bool
-     * @since 2.0.0
      */
     protected function isFieldVisible($attributeCode, array $attributeConfig, array $additionalConfig = [])
     {
@@ -281,7 +266,6 @@ protected function isFieldVisible($attributeCode, array $attributeConfig, array
      * @param string $providerName name of the storage container used by UI component
      * @param string $dataScopePrefix
      * @return array
-     * @since 2.0.0
      */
     protected function getMultilineFieldConfig($attributeCode, array $attributeConfig, $providerName, $dataScopePrefix)
     {
@@ -332,7 +316,6 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
     /**
      * @param string $attributeCode
      * @return null|string
-     * @since 2.0.0
      */
     protected function getDefaultValue($attributeCode)
     {
@@ -369,7 +352,6 @@ protected function getDefaultValue($attributeCode)
 
     /**
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-     * @since 2.0.0
      */
     protected function getCustomer()
     {
@@ -390,7 +372,6 @@ protected function getCustomer()
      * @param array $attributeConfig
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function getFieldOptions($attributeCode, array $attributeConfig)
     {
@@ -403,7 +384,6 @@ protected function getFieldOptions($attributeCode, array $attributeConfig)
      * @param array $countryOptions
      * @return array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function orderCountryOptions(array $countryOptions)
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index e05b42b877428..55125353cd77b 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -11,37 +11,33 @@
 
 /**
  * Class LayoutProcessor
- * @since 2.0.0
  */
 class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
 {
     /**
      * @var \Magento\Customer\Model\AttributeMetadataDataProvider
-     * @since 2.0.0
      */
     private $attributeMetadataDataProvider;
 
     /**
      * @var \Magento\Ui\Component\Form\AttributeMapper
-     * @since 2.0.0
      */
     protected $attributeMapper;
 
     /**
      * @var AttributeMerger
-     * @since 2.0.0
      */
     protected $merger;
 
     /**
      * @var \Magento\Customer\Model\Options
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private $options;
 
     /**
      * @var Data
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private $checkoutDataHelper;
 
@@ -61,7 +57,6 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
      * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
      * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
      * @param AttributeMerger $merger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider,
@@ -74,9 +69,9 @@ public function __construct(
     }
 
     /**
-     * @deprecated 2.1.0
+     * @deprecated 2.0.12
      * @return \Magento\Customer\Model\Options
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private function getOptions()
     {
@@ -88,7 +83,7 @@ private function getOptions()
 
     /**
      * @return array
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private function getAddressAttributes()
     {
@@ -119,7 +114,7 @@ private function getAddressAttributes()
      * @param array $elements address attributes
      * @param array $attributesToConvert fields and their callbacks
      * @return array
-     * @since 2.1.0
+     * @since 2.0.12
      */
     private function convertElementsToSelect($elements, $attributesToConvert)
     {
@@ -151,7 +146,6 @@ private function convertElementsToSelect($elements, $attributesToConvert)
      *
      * @param array $jsLayout
      * @return array
-     * @since 2.0.0
      */
     public function process($jsLayout)
     {
@@ -223,7 +217,7 @@ private function processShippingChildrenComponents($shippingRatesLayout)
      * @param array $paymentLayout
      * @param array $elements
      * @return array
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private function processPaymentChildrenComponents(array $paymentLayout, array $elements)
     {
@@ -263,7 +257,6 @@ private function processPaymentChildrenComponents(array $paymentLayout, array $e
      * @param array $configuration list of payment components
      * @param array $elements attributes that must be displayed in address form
      * @return array
-     * @since 2.0.0
      */
     private function processPaymentConfiguration(array &$configuration, array $elements)
     {
@@ -287,7 +280,7 @@ private function processPaymentConfiguration(array &$configuration, array $eleme
      * @param string $paymentCode
      * @param array $elements
      * @return array
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private function getBillingAddressComponent($paymentCode, $elements)
     {
@@ -362,8 +355,8 @@ private function getBillingAddressComponent($paymentCode, $elements)
      * Get checkout data helper instance
      *
      * @return Data
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.4
+     * @since 2.1.4
      */
     private function getCheckoutDataHelper()
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
index 446ddc65e026b..ad14f2a45426d 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
@@ -13,7 +13,6 @@
  * @see \Magento\Checkout\Block\Onepage
  *
  * @api
- * @since 2.0.0
  */
 interface LayoutProcessorInterface
 {
@@ -22,7 +21,6 @@ interface LayoutProcessorInterface
      *
      * @param array $jsLayout
      * @return array
-     * @since 2.0.0
      */
     public function process($jsLayout);
 }
diff --git a/app/code/Magento/Checkout/Block/Checkout/TotalsProcessor.php b/app/code/Magento/Checkout/Block/Checkout/TotalsProcessor.php
index cd923c16c6d28..1cfbbeb5d9f69 100644
--- a/app/code/Magento/Checkout/Block/Checkout/TotalsProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/TotalsProcessor.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Checkout\Block\Checkout\TotalsProcessor
  *
- * @since 2.0.0
  */
 class TotalsProcessor extends AbstractTotalsProcessor implements LayoutProcessorInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process($jsLayout)
     {
diff --git a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
index 683bf4cf8b150..2210b1cd9243e 100644
--- a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
@@ -12,13 +12,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Renderer extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var AbstractItem
-     * @since 2.0.0
      */
     protected $item;
 
@@ -27,7 +25,6 @@ class Renderer extends \Magento\Framework\View\Element\Template
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -39,7 +36,6 @@ public function setItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
      * Get quote item
      *
      * @return AbstractItem
-     * @since 2.0.0
      */
     public function getItem()
     {
diff --git a/app/code/Magento/Checkout/Block/Link.php b/app/code/Magento/Checkout/Block/Link.php
index 22b2babdca54e..cb2fb3309b83c 100644
--- a/app/code/Magento/Checkout/Block/Link.php
+++ b/app/code/Magento/Checkout/Block/Link.php
@@ -9,19 +9,16 @@
  * "Checkout" link
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $_checkoutHelper;
 
@@ -31,7 +28,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -58,7 +53,6 @@ public function getHref()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 495266b8a39d6..a5b82c817d96f 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -9,37 +9,31 @@
  * Onepage checkout block
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Onepage extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout;
 
     /**
      * @var \Magento\Checkout\Model\CompositeConfigProvider
-     * @since 2.0.0
      */
     protected $configProvider;
 
     /**
      * @var array|\Magento\Checkout\Block\Checkout\LayoutProcessorInterface[]
-     * @since 2.0.0
      */
     protected $layoutProcessors;
 
@@ -57,7 +51,6 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -79,7 +72,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -94,7 +86,6 @@ public function getJsLayout()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFormKey()
     {
@@ -106,7 +97,6 @@ public function getFormKey()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutConfig()
     {
@@ -118,7 +108,6 @@ public function getCheckoutConfig()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Failure.php b/app/code/Magento/Checkout/Block/Onepage/Failure.php
index 072e2377f48b3..46e56d24a7fa0 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Failure.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Failure extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -21,7 +19,6 @@ class Failure extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -35,7 +32,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRealOrderId()
     {
@@ -46,7 +42,6 @@ public function getRealOrderId()
      *  Payment custom error message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
@@ -58,7 +53,6 @@ public function getErrorMessage()
      * Continue shopping URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContinueShoppingUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Link.php b/app/code/Magento/Checkout/Block/Onepage/Link.php
index 7eedbfecb199b..b8f3926baa58a 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Link.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Link.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $_checkoutHelper;
 
@@ -31,7 +28,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutUrl()
     {
@@ -56,7 +51,6 @@ public function getCheckoutUrl()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled()
     {
@@ -65,7 +59,6 @@ public function isDisabled()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPossibleOnepageCheckout()
     {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Success.php b/app/code/Magento/Checkout/Block/Onepage/Success.php
index 31744274b8447..ae3c403538c7b 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Success.php
@@ -12,25 +12,21 @@
  * One page checkout success page
  *
  * @api
- * @since 2.0.0
  */
 class Success extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -40,7 +36,6 @@ class Success extends \Magento\Framework\View\Element\Template
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Render additional order information lines and return result html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalInfoHtml()
     {
@@ -71,7 +65,6 @@ public function getAdditionalInfoHtml()
      * Initialize data and prepare it for output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -83,7 +76,6 @@ protected function _beforeToHtml()
      * Prepares block data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareBlockData()
     {
@@ -112,7 +104,6 @@ protected function prepareBlockData()
      *
      * @param Order $order
      * @return bool
-     * @since 2.0.0
      */
     protected function isVisible(Order $order)
     {
@@ -127,7 +118,6 @@ protected function isVisible(Order $order)
      *
      * @param Order $order
      * @return bool
-     * @since 2.0.0
      */
     protected function canViewOrder(Order $order)
     {
diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
index 308a9f084be11..6b3774f7e38f8 100644
--- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -24,7 +22,6 @@ class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Dispatch shortcuts container event
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Checkout/Block/Registration.php b/app/code/Magento/Checkout/Block/Registration.php
index 02558312c6087..91ec85c1db0ed 100644
--- a/app/code/Magento/Checkout/Block/Registration.php
+++ b/app/code/Magento/Checkout/Block/Registration.php
@@ -9,43 +9,36 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Registration extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     protected $registration;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Validator
-     * @since 2.0.0
      */
     protected $addressValidator;
 
@@ -59,7 +52,6 @@ class Registration extends \Magento\Framework\View\Element\Template
      * @param \Magento\Sales\Model\Order\Address\Validator $addressValidator
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -85,7 +77,6 @@ public function __construct(
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEmailAddress()
     {
@@ -97,7 +88,6 @@ public function getEmailAddress()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCreateAccountUrl()
     {
@@ -106,7 +96,6 @@ public function getCreateAccountUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -124,7 +113,6 @@ public function toHtml()
      * Validate order addresses
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function validateAddresses()
     {
diff --git a/app/code/Magento/Checkout/Block/Shipping/Price.php b/app/code/Magento/Checkout/Block/Shipping/Price.php
index 8bb9b975c0bba..c5d19219393cf 100644
--- a/app/code/Magento/Checkout/Block/Shipping/Price.php
+++ b/app/code/Magento/Checkout/Block/Shipping/Price.php
@@ -12,19 +12,16 @@
 /**
  * Class Price
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Price extends AbstractCart
 {
     /**
      * @var Rate
-     * @since 2.0.0
      */
     protected $shippingRate;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -34,7 +31,6 @@ class Price extends AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param Rate $shippingRate
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingRate(Rate $shippingRate)
     {
@@ -64,7 +59,6 @@ public function setShippingRate(Rate $shippingRate)
      * Return shipping rate
      *
      * @return Rate
-     * @since 2.0.0
      */
     public function getShippingRate()
     {
@@ -75,7 +69,6 @@ public function getShippingRate()
      * Get Shipping Price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPrice()
     {
diff --git a/app/code/Magento/Checkout/Block/Success.php b/app/code/Magento/Checkout/Block/Success.php
index 82c403f5e929a..40017d7e3be13 100644
--- a/app/code/Magento/Checkout/Block/Success.php
+++ b/app/code/Magento/Checkout/Block/Success.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Checkout\Block\Success
  *
- * @since 2.0.0
  */
 class Success extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
@@ -23,7 +21,6 @@ class Success extends \Magento\Framework\View\Element\Template
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRealOrderId()
     {
diff --git a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
index 6b1a25efb3c9a..ef113ad73fcc1 100644
--- a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
+++ b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
@@ -7,25 +7,21 @@
 
 /**
  * Default Total Row Renderer
- * @since 2.0.0
  */
 class DefaultTotal extends \Magento\Checkout\Block\Cart\Totals
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Checkout::total/default.phtml';
 
     /**
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +33,6 @@ protected function _construct()
      * Get style assigned to total object
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStyle()
     {
@@ -47,7 +42,6 @@ public function getStyle()
     /**
      * @param float $total
      * @return $this
-     * @since 2.0.0
      */
     public function setTotal($total)
     {
@@ -60,7 +54,6 @@ public function setTotal($total)
 
     /**
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
diff --git a/app/code/Magento/Checkout/Controller/Account/Create.php b/app/code/Magento/Checkout/Controller/Account/Create.php
index 1c32bd5c27424..f20c1c082e7d3 100644
--- a/app/code/Magento/Checkout/Controller/Account/Create.php
+++ b/app/code/Magento/Checkout/Controller/Account/Create.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Checkout\Controller\Account\Create
  *
- * @since 2.0.0
  */
 class Create extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Sales\Api\OrderCustomerManagementInterface
-     * @since 2.0.0
      */
     protected $orderCustomerService;
 
@@ -39,7 +35,6 @@ class Create extends \Magento\Framework\App\Action\Action
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Api\OrderCustomerManagementInterface $orderCustomerService
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * @throws NoSuchEntityException
      * @throws \Exception
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
index 3ce548c639cc2..d985a7cd53cab 100644
--- a/app/code/Magento/Checkout/Controller/Action.php
+++ b/app/code/Magento/Checkout/Controller/Action.php
@@ -11,25 +11,21 @@
 
 /**
  * Controller for onepage checkouts
- * @since 2.0.0
  */
 abstract class Action extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
@@ -39,7 +35,6 @@ abstract class Action extends \Magento\Framework\App\Action\Action
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * @param bool $redirect - stop dispatch and redirect?
      * @param bool $addErrors - add error messages?
      * @return bool|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     protected function _preDispatchValidateCustomer($redirect = true, $addErrors = true)
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 2e8bb848d56b0..f6c59562ee942 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -10,37 +10,31 @@
 
 /**
  * Shopping cart controller
- * @since 2.0.0
  */
 abstract class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $cart;
 
@@ -52,7 +46,6 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param CustomerCart $cart
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -76,7 +69,6 @@ public function __construct(
      * @param null|string $backUrl
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     protected function _goBack($backUrl = null)
     {
@@ -94,7 +86,6 @@ protected function _goBack($backUrl = null)
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     protected function _isInternalUrl($url)
     {
@@ -118,7 +109,6 @@ protected function _isInternalUrl($url)
      * @param null $defaultUrl
      *
      * @return mixed|null|string
-     * @since 2.0.0
      */
     protected function getBackUrl($defaultUrl = null)
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index a6437d179b4c9..8831b92f3ec86 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -12,13 +12,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Add extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -31,7 +29,6 @@ class Add extends \Magento\Checkout\Controller\Cart
      * @param CustomerCart $cart
      * @param ProductRepositoryInterface $productRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -57,7 +54,6 @@ public function __construct(
      * Initialize product instance from request data
      *
      * @return \Magento\Catalog\Model\Product|false
-     * @since 2.0.0
      */
     protected function _initProduct()
     {
@@ -80,7 +76,6 @@ protected function _initProduct()
      *
      * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -170,7 +165,6 @@ public function execute()
      * @param string $backUrl
      * @param \Magento\Catalog\Model\Product $product
      * @return $this|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     protected function goBack($backUrl = null, $product = null)
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index 6de768a9311ba..ad09ba84eab32 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\Addgroup
  *
- * @since 2.0.0
  */
 class Addgroup extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 4c8053c29f5d8..132fbf7d199a0 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -11,13 +11,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configure extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -29,7 +27,6 @@ class Configure extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Framework\App\Action\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Action to reconfigure cart item
      *
      * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 6da65d052eb71..56215814d2cf6 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -7,7 +7,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CouponPost extends \Magento\Checkout\Controller\Cart
 {
@@ -15,7 +14,6 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * Sales quote repository
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -23,7 +21,6 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * Coupon factory
      *
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $couponFactory;
 
@@ -37,7 +34,6 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\SalesRule\Model\CouponFactory $couponFactory
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index 506c98cc1e8ed..4c4d0897b9cb3 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Checkout\Controller\Cart
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Checkout\Controller\Cart
      * Delete shopping cart item action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index d73ff3cb25be2..e03ace3af0305 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\EstimatePost
  *
- * @since 2.0.0
  */
 class EstimatePost extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -30,7 +28,6 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
      * @param CustomerCart $cart
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Framework\App\Action\Context $context,
@@ -56,7 +53,6 @@ public function __construct(
      * Initialize shipping information
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
index 70348bdbd2495..43fb7dd22b11b 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\EstimateUpdatePost
  *
- * @since 2.0.0
  */
 class EstimateUpdatePost extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index f0bdbfdc37fe8..9e383d2da8548 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Checkout\Controller\Cart
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -29,7 +27,6 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * Shopping cart display action
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 510e74449400b..4b8deff615301 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\UpdateItemOptions
  *
- * @since 2.0.0
  */
 class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
 {
@@ -19,7 +18,6 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
      * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 83e070c9732f4..35bda1c1cbae2 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Checkout\Controller\Cart\UpdatePost
  *
- * @since 2.0.0
  */
 class UpdatePost extends \Magento\Checkout\Controller\Cart
 {
@@ -17,7 +16,6 @@ class UpdatePost extends \Magento\Checkout\Controller\Cart
      * Empty customer's shopping cart
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _emptyShoppingCart()
     {
@@ -34,7 +32,6 @@ protected function _emptyShoppingCart()
      * Update customer's shopping cart
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _updateShoppingCart()
     {
@@ -72,7 +69,6 @@ protected function _updateShoppingCart()
      * Update shopping cart data action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Express/RedirectLoginInterface.php b/app/code/Magento/Checkout/Controller/Express/RedirectLoginInterface.php
index a7db78705145a..a5777766c3949 100644
--- a/app/code/Magento/Checkout/Controller/Express/RedirectLoginInterface.php
+++ b/app/code/Magento/Checkout/Controller/Express/RedirectLoginInterface.php
@@ -8,35 +8,30 @@
 /**
  * Interface \Magento\Checkout\Controller\Express\RedirectLoginInterface
  *
- * @since 2.0.0
  */
 interface RedirectLoginInterface
 {
     /**
      * Returns a list of action flags [flag_key] => boolean
      * @return array
-     * @since 2.0.0
      */
     public function getActionFlagList();
 
     /**
      * Returns before_auth_url redirect parameter for customer session
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerBeforeAuthUrl();
 
     /**
      * Returns login url parameter for redirect
      * @return string|null
-     * @since 2.0.0
      */
     public function getLoginUrl();
 
     /**
      * Returns action name which requires redirect
      * @return string|null
-     * @since 2.0.0
      */
     public function getRedirectActionName();
 
@@ -44,7 +39,6 @@ public function getRedirectActionName();
      * Retrieve response object
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function getResponse();
 }
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
index dd0736b1d8ba7..440c76986c07f 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Checkout\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Checkout\Controller\Onepage
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Checkout\Controller\Onepage
      * Checkout page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Noroute/Index.php b/app/code/Magento/Checkout/Controller/Noroute/Index.php
index 853b68447d8c9..629b86aab4a6e 100644
--- a/app/code/Magento/Checkout/Controller/Noroute/Index.php
+++ b/app/code/Magento/Checkout/Controller/Noroute/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Checkout\Controller\Noroute\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
@@ -21,7 +20,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @throws NotFoundException
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 8151538949354..49deeed7fb9ca 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -12,13 +12,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Onepage extends Action
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_sectionUpdateFunctions = [
         'payment-method' => '_getPaymentMethodsHtml',
@@ -28,7 +26,6 @@ abstract class Onepage extends Action
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
@@ -36,61 +33,51 @@ abstract class Onepage extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $_translateInline;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -112,7 +99,6 @@ abstract class Onepage extends Action
      *
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -154,7 +140,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
      * @throws \Magento\Framework\Exception\NotFoundException
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -178,7 +163,6 @@ public function dispatch(RequestInterface $request)
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     protected function _ajaxRedirectResponse()
     {
@@ -192,7 +176,6 @@ protected function _ajaxRedirectResponse()
      * Validate ajax request and redirect on failure
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _expireAjax()
     {
@@ -216,7 +199,6 @@ protected function _expireAjax()
      *
      * @param string $handle
      * @return string
-     * @since 2.0.0
      */
     protected function _getHtmlByHandle($handle)
     {
@@ -234,7 +216,6 @@ protected function _getHtmlByHandle($handle)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getShippingMethodsHtml()
     {
@@ -246,7 +227,6 @@ protected function _getShippingMethodsHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getPaymentMethodsHtml()
     {
@@ -258,7 +238,6 @@ protected function _getPaymentMethodsHtml()
      *
      * @param string $checkoutStep
      * @return mixed
-     * @since 2.0.0
      */
     protected function getProgressHtml($checkoutStep = '')
     {
@@ -276,7 +255,6 @@ protected function getProgressHtml($checkoutStep = '')
      *
      * @return \Magento\Checkout\Model\Type\Onepage
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOnepage()
     {
@@ -287,7 +265,6 @@ public function getOnepage()
      * Check can page show for unregistered users
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _canShowForUnregisteredUsers()
     {
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Failure.php b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
index e1336f40d3f39..d1e7217c26960 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Checkout\Controller\Onepage\Failure
  *
- * @since 2.0.0
  */
 class Failure extends \Magento\Checkout\Controller\Onepage
 {
     /**
      * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 9c6604978e5f3..f75ad7fb9d1b0 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Checkout\Controller\Onepage\SaveOrder
  *
- * @since 2.0.0
  */
 class SaveOrder extends \Magento\Checkout\Controller\Onepage
 {
@@ -21,7 +20,6 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index d2be70ce27036..c14224448ce69 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Checkout\Controller\Onepage\Success
  *
- * @since 2.0.0
  */
 class Success extends \Magento\Checkout\Controller\Onepage
 {
@@ -17,7 +16,6 @@ class Success extends \Magento\Checkout\Controller\Onepage
      * Order success action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
index fc735fac5994d..3dc2bed118802 100644
--- a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
+++ b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Checkout\Controller\ShippingRates\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     protected $result;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -33,7 +30,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param \Magento\Checkout\Model\Session $session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @throws Action\NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
index 96e88c068175c..dd1c89552d763 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
@@ -8,37 +8,32 @@
 /**
  * Class \Magento\Checkout\Controller\Sidebar\RemoveItem
  *
- * @since 2.0.0
  */
 class RemoveItem extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Checkout\Model\Sidebar
-     * @since 2.0.0
      */
     protected $sidebar;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.1.0
+     * @since 2.0.10
      */
     private $formKeyValidator;
 
@@ -48,7 +43,6 @@ class RemoveItem extends \Magento\Framework\App\Action\Action
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -91,7 +84,6 @@ public function execute()
      *
      * @param string $error
      * @return \Magento\Framework\App\Response\Http
-     * @since 2.0.0
      */
     protected function jsonResponse($error = '')
     {
@@ -104,8 +96,8 @@ protected function jsonResponse($error = '')
 
     /**
      * @return \Magento\Framework\Data\Form\FormKey\Validator
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.10
+     * @since 2.0.10
      */
     private function getFormKeyValidator()
     {
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
index c1308a8396cd1..bfec366647ae4 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
@@ -16,25 +16,21 @@
 /**
  * Class \Magento\Checkout\Controller\Sidebar\UpdateItemQty
  *
- * @since 2.0.0
  */
 class UpdateItemQty extends Action
 {
     /**
      * @var Sidebar
-     * @since 2.0.0
      */
     protected $sidebar;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -44,7 +40,6 @@ class UpdateItemQty extends Action
      * @param LoggerInterface $logger
      * @param Data $jsonHelper
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +55,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -84,7 +78,6 @@ public function execute()
      *
      * @param string $error
      * @return Http
-     * @since 2.0.0
      */
     protected function jsonResponse($error = '')
     {
diff --git a/app/code/Magento/Checkout/CustomerData/AbstractItem.php b/app/code/Magento/Checkout/CustomerData/AbstractItem.php
index 81ad832bda032..9c2e3a32ef901 100644
--- a/app/code/Magento/Checkout/CustomerData/AbstractItem.php
+++ b/app/code/Magento/Checkout/CustomerData/AbstractItem.php
@@ -12,19 +12,16 @@
  * Abstract item
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractItem implements ItemInterface
 {
     /**
      * @var Item
-     * @since 2.0.0
      */
     protected $item;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemData(Item $item)
     {
@@ -39,7 +36,6 @@ public function getItemData(Item $item)
      * Get item data. Template method
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function doGetItemData();
 }
diff --git a/app/code/Magento/Checkout/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
index ce140b0bb68c9..96ea0e366a276 100644
--- a/app/code/Magento/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
@@ -10,55 +10,46 @@
 
 /**
  * Cart source
- * @since 2.0.0
  */
 class Cart extends \Magento\Framework\DataObject implements SectionSourceInterface
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $checkoutCart;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Url
-     * @since 2.0.0
      */
     protected $catalogUrl;
 
     /**
      * @var \Magento\Quote\Model\Quote|null
-     * @since 2.0.0
      */
     protected $quote = null;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $checkoutHelper;
 
     /**
      * @var ItemPoolInterface
-     * @since 2.0.0
      */
     protected $itemPoolInterface;
 
     /**
      * @var int|float
-     * @since 2.0.0
      */
     protected $summeryCount;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -71,7 +62,6 @@ class Cart extends \Magento\Framework\DataObject implements SectionSourceInterfa
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -93,7 +83,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
@@ -115,7 +104,6 @@ public function getSectionData()
      * Get active quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function getQuote()
     {
@@ -129,7 +117,6 @@ protected function getQuote()
      * Get shopping cart items qty based on configuration (summary qty or items qty)
      *
      * @return int|float
-     * @since 2.0.0
      */
     protected function getSummaryCount()
     {
@@ -143,7 +130,6 @@ protected function getSummaryCount()
      * Check if one page checkout is available
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isPossibleOnepageCheckout()
     {
@@ -154,7 +140,6 @@ protected function isPossibleOnepageCheckout()
      * Get array of last added items
      *
      * @return \Magento\Quote\Model\Quote\Item[]
-     * @since 2.0.0
      */
     protected function getRecentItems()
     {
@@ -186,7 +171,6 @@ protected function getRecentItems()
      * Return customer quote items
      *
      * @return \Magento\Quote\Model\Quote\Item[]
-     * @since 2.0.0
      */
     protected function getAllQuoteItems()
     {
@@ -200,7 +184,6 @@ protected function getAllQuoteItems()
      * Check if guest checkout is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGuestCheckoutAllowed()
     {
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
index f9a6b07273063..6e917366c9cd2 100644
--- a/app/code/Magento/Checkout/CustomerData/DefaultItem.php
+++ b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -8,37 +8,31 @@
 
 /**
  * Default item
- * @since 2.0.0
  */
 class DefaultItem extends AbstractItem
 {
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpHelper;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
-     * @since 2.0.0
      */
     protected $configurationPool;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $checkoutHelper;
 
@@ -49,7 +43,6 @@ class DefaultItem extends AbstractItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Image $imageHelper,
@@ -67,7 +60,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doGetItemData()
     {
@@ -101,7 +93,6 @@ protected function doGetItemData()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getOptionList()
     {
@@ -111,7 +102,6 @@ protected function getOptionList()
     /**
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getProductForThumbnail()
     {
@@ -121,7 +111,6 @@ protected function getProductForThumbnail()
     /**
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getProduct()
     {
@@ -132,7 +121,6 @@ protected function getProduct()
      * Get item configure url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getConfigureUrl()
     {
@@ -146,7 +134,6 @@ protected function getConfigureUrl()
      * Check Product has URL
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function hasProductUrl()
     {
@@ -178,7 +165,6 @@ protected function hasProductUrl()
      * Retrieve URL to item Product
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getProductUrl()
     {
diff --git a/app/code/Magento/Checkout/CustomerData/DirectoryData.php b/app/code/Magento/Checkout/CustomerData/DirectoryData.php
index f6cfe06c19fc6..8e8bae3cf1a12 100644
--- a/app/code/Magento/Checkout/CustomerData/DirectoryData.php
+++ b/app/code/Magento/Checkout/CustomerData/DirectoryData.php
@@ -10,20 +10,17 @@
 
 /**
  * Cart source
- * @since 2.0.0
  */
 class DirectoryData implements SectionSourceInterface
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Helper\Data $directoryHelper)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Directory\Helper\Data $directoryHelper)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
diff --git a/app/code/Magento/Checkout/CustomerData/ItemInterface.php b/app/code/Magento/Checkout/CustomerData/ItemInterface.php
index 518e8f543a553..fb8bd831f1ccd 100644
--- a/app/code/Magento/Checkout/CustomerData/ItemInterface.php
+++ b/app/code/Magento/Checkout/CustomerData/ItemInterface.php
@@ -12,7 +12,6 @@
  * Item interface
  *
  * @api
- * @since 2.0.0
  */
 interface ItemInterface
 {
@@ -21,7 +20,6 @@ interface ItemInterface
      *
      * @param Item $item
      * @return array
-     * @since 2.0.0
      */
     public function getItemData(Item $item);
 }
diff --git a/app/code/Magento/Checkout/CustomerData/ItemPool.php b/app/code/Magento/Checkout/CustomerData/ItemPool.php
index fdc58c2f19ce7..50b20712e2a30 100644
--- a/app/code/Magento/Checkout/CustomerData/ItemPool.php
+++ b/app/code/Magento/Checkout/CustomerData/ItemPool.php
@@ -12,7 +12,6 @@
 
 /**
  * Item pool
- * @since 2.0.0
  */
 class ItemPool implements ItemPoolInterface
 {
@@ -20,7 +19,6 @@ class ItemPool implements ItemPoolInterface
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -28,7 +26,6 @@ class ItemPool implements ItemPoolInterface
      * Default item id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $defaultItemId;
 
@@ -36,7 +33,6 @@ class ItemPool implements ItemPoolInterface
      * Item map. Key is item type, value is item object id in di
      *
      * @var array
-     * @since 2.0.0
      */
     protected $itemMap;
 
@@ -47,7 +43,6 @@ class ItemPool implements ItemPoolInterface
      * @param string $defaultItemId
      * @param array $itemMap
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -62,7 +57,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemData(Item $item)
     {
@@ -75,7 +69,6 @@ public function getItemData(Item $item)
      * @param string $type
      * @return ItemInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function get($type)
     {
diff --git a/app/code/Magento/Checkout/CustomerData/ItemPoolInterface.php b/app/code/Magento/Checkout/CustomerData/ItemPoolInterface.php
index fb0d5b5cf65b1..95c62a7436e52 100644
--- a/app/code/Magento/Checkout/CustomerData/ItemPoolInterface.php
+++ b/app/code/Magento/Checkout/CustomerData/ItemPoolInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Item pool interface
- * @since 2.0.0
  */
 interface ItemPoolInterface
 {
@@ -19,7 +18,6 @@ interface ItemPoolInterface
      *
      * @param Item $item
      * @return array
-     * @since 2.0.0
      */
     public function getItemData(Item $item);
 }
diff --git a/app/code/Magento/Checkout/Exception.php b/app/code/Magento/Checkout/Exception.php
index 3037801cddae2..4957e6be9b5da 100644
--- a/app/code/Magento/Checkout/Exception.php
+++ b/app/code/Magento/Checkout/Exception.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Exception extends \Magento\Framework\Exception\LocalizedException
 {
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index e9c7d2da4ecaf..34c06cbf3e882 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -9,7 +9,6 @@
  * Shopping cart helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Cart extends \Magento\Framework\Url\Helper\Data
 {
@@ -30,13 +29,11 @@ class Cart extends \Magento\Framework\Url\Helper\Data
 
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $_checkoutCart;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -45,7 +42,6 @@ class Cart extends \Magento\Framework\Url\Helper\Data
      * @param \Magento\Checkout\Model\Cart $checkoutCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      *
      * @return \Magento\Checkout\Model\Cart
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCart()
     {
@@ -75,7 +70,6 @@ public function getCart()
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return  string
-     * @since 2.0.0
      */
     public function getAddUrl($product, $additional = [])
     {
@@ -117,7 +111,6 @@ public function getAddUrl($product, $additional = [])
      *
      * @param   \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return  string
-     * @since 2.0.0
      */
     public function getRemoveUrl($item)
     {
@@ -133,7 +126,6 @@ public function getRemoveUrl($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getDeletePostJson($item)
     {
@@ -151,7 +143,6 @@ public function getDeletePostJson($item)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCartUrl()
     {
@@ -163,7 +154,6 @@ public function getCartUrl()
      *
      * @return \Magento\Quote\Model\Quote
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -175,7 +165,6 @@ public function getQuote()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
@@ -187,7 +176,6 @@ public function getItemsCount()
      *
      * @return int|float
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemsQty()
     {
@@ -199,7 +187,6 @@ public function getItemsQty()
      *
      * @return int|float
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSummaryCount()
     {
@@ -212,7 +199,6 @@ public function getSummaryCount()
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsVirtualQuote()
     {
@@ -226,7 +212,6 @@ public function getIsVirtualQuote()
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getShouldRedirectToCart($store = null)
     {
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 1b756107b99b6..1a76253a772af 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -15,7 +15,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,37 +24,31 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -68,7 +61,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param PriceCurrencyInterface $priceCurrency
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -93,7 +85,6 @@ public function __construct(
      *
      * @return \Magento\Checkout\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -105,7 +96,6 @@ public function getCheckout()
      *
      * @return \Magento\Quote\Model\Quote
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -115,7 +105,6 @@ public function getQuote()
     /**
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -131,7 +120,6 @@ public function formatPrice($price)
      * @param float $price
      * @param bool $format
      * @return float
-     * @since 2.0.0
      */
     public function convertPrice($price, $format = true)
     {
@@ -144,7 +132,6 @@ public function convertPrice($price, $format = true)
      * Get onepage checkout availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canOnepageCheckout()
     {
@@ -159,7 +146,6 @@ public function canOnepageCheckout()
      *
      * @param   \Magento\Framework\DataObject $item
      * @return  float
-     * @since 2.0.0
      */
     public function getPriceInclTax($item)
     {
@@ -177,7 +163,6 @@ public function getPriceInclTax($item)
      *
      * @param   \Magento\Framework\DataObject $item
      * @return  float
-     * @since 2.0.0
      */
     public function getSubtotalInclTax($item)
     {
@@ -191,7 +176,6 @@ public function getSubtotalInclTax($item)
     /**
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getBasePriceInclTax($item)
     {
@@ -204,7 +188,6 @@ public function getBasePriceInclTax($item)
     /**
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax($item)
     {
@@ -221,7 +204,6 @@ public function getBaseSubtotalInclTax($item)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'onepage')
     {
@@ -348,7 +330,6 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
      * @param string $configPath
      * @param null|string|bool|int|Store $storeId
      * @return array|false
-     * @since 2.0.0
      */
     protected function _getEmails($configPath, $storeId)
     {
@@ -370,7 +351,6 @@ protected function _getEmails($configPath, $storeId)
      * @param \Magento\Quote\Model\Quote $quote
      * @param int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store = null)
     {
@@ -402,7 +382,6 @@ public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isContextCheckout()
     {
@@ -414,7 +393,6 @@ public function isContextCheckout()
      *
      * @return boolean
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isCustomerMustBeLogged()
     {
@@ -428,7 +406,7 @@ public function isCustomerMustBeLogged()
      * Checks if display billing address on payment method is available, otherwise
      * billing address should be display on payment page
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function isDisplayBillingOnPaymentMethodAvailable()
     {
diff --git a/app/code/Magento/Checkout/Helper/ExpressRedirect.php b/app/code/Magento/Checkout/Helper/ExpressRedirect.php
index 04fc25aee770d..2b6c1d82c3b09 100644
--- a/app/code/Magento/Checkout/Helper/ExpressRedirect.php
+++ b/app/code/Magento/Checkout/Helper/ExpressRedirect.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Checkout\Helper\ExpressRedirect
  *
- * @since 2.0.0
  */
 class ExpressRedirect extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -30,7 +27,6 @@ class ExpressRedirect extends \Magento\Framework\App\Helper\AbstractHelper
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -40,7 +36,6 @@ class ExpressRedirect extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\App\Helper\Context $context
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ActionFlag $actionFlag,
@@ -60,7 +55,6 @@ public function __construct(
      * @param RedirectLoginInterface $expressRedirect
      * @param string|null $customerBeforeAuthUrlDefault
      * @return void
-     * @since 2.0.0
      */
     public function redirectLogin(RedirectLoginInterface $expressRedirect, $customerBeforeAuthUrlDefault = null)
     {
diff --git a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
index 23a99628a768e..f336d149ba2d4 100644
--- a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
+++ b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
@@ -10,7 +10,7 @@
 /**
  * BillingAddressDisplayOptions gets list of configuration options for billing address displaying on
  * the Payment step on checkout
- * @since 2.2.0
+ * @since 2.1.4
  */
 class BillingAddressDisplayOptions implements ArrayInterface
 {
@@ -22,7 +22,7 @@ class BillingAddressDisplayOptions implements ArrayInterface
      *  ['label' => 'Payment Method', 'value' => 0],
      *  ['label' => 'Payment Page', 'value' => 1]
      * ]
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Checkout/Model/AgreementsValidator.php b/app/code/Magento/Checkout/Model/AgreementsValidator.php
index d470b4074037a..aa0072b823cc5 100644
--- a/app/code/Magento/Checkout/Model/AgreementsValidator.php
+++ b/app/code/Magento/Checkout/Model/AgreementsValidator.php
@@ -7,7 +7,6 @@
 
 /**
  * Class AgreementsValidator
- * @since 2.0.0
  */
 class AgreementsValidator implements \Magento\Checkout\Api\AgreementsValidatorInterface
 {
@@ -19,7 +18,6 @@ class AgreementsValidator implements \Magento\Checkout\Api\AgreementsValidatorIn
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isValid($agreementIds = [])
     {
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index aefcb9a39ad36..6b16cc14b9ede 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -16,7 +16,6 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Cart extends DataObject implements CartInterface
 {
@@ -24,7 +23,6 @@ class Cart extends DataObject implements CartInterface
      * Shopping cart items summary quantity(s)
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $_summaryQty;
 
@@ -32,7 +30,6 @@ class Cart extends DataObject implements CartInterface
      * List of product ids in shopping cart
      *
      * @var int[]|null
-     * @since 2.0.0
      */
     protected $_productIds;
 
@@ -40,7 +37,6 @@ class Cart extends DataObject implements CartInterface
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -48,67 +44,57 @@ class Cart extends DataObject implements CartInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Checkout\Model\ResourceModel\Cart
-     * @since 2.0.0
      */
     protected $_resourceCart;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Checkout\Model\Cart\RequestInfoFilterInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $requestInfoFilter;
 
@@ -127,7 +113,6 @@ class Cart extends DataObject implements CartInterface
      * @param array $data
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -162,7 +147,6 @@ public function __construct(
      *
      * @return \Magento\Checkout\Model\ResourceModel\Cart
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -174,7 +158,6 @@ protected function _getResource()
      *
      * @return Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutSession()
     {
@@ -186,7 +169,6 @@ public function getCheckoutSession()
      *
      * @return \Magento\Customer\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCustomerSession()
     {
@@ -197,7 +179,6 @@ public function getCustomerSession()
      * List of shopping cart items
      *
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection|array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -211,7 +192,6 @@ public function getItems()
      * Retrieve array of cart product ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQuoteProductIds()
     {
@@ -230,7 +210,6 @@ public function getQuoteProductIds()
      * Get quote object associated with cart. By default it is current customer session quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -246,7 +225,6 @@ public function getQuote()
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -258,7 +236,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * Reinitialize cart quote state
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function reinitializeState()
     {
@@ -280,7 +257,6 @@ protected function reinitializeState()
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @param true|null $qtyFlag if is null set product qty like in order
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderItem($orderItem, $qtyFlag = null)
     {
@@ -315,7 +291,6 @@ public function addOrderItem($orderItem, $qtyFlag = null)
      * @param   Product|int|string $productInfo
      * @return  Product
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getProduct($productInfo)
     {
@@ -348,7 +323,6 @@ protected function _getProduct($productInfo)
      * @param   \Magento\Framework\DataObject|int|array $requestInfo
      * @return  \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getProductRequest($requestInfo)
     {
@@ -376,7 +350,6 @@ protected function _getProductRequest($requestInfo)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addProduct($productInfo, $requestInfo = null)
     {
@@ -438,7 +411,6 @@ public function addProduct($productInfo, $requestInfo = null)
      *
      * @param  int[] $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function addProductsByIds($productIds)
     {
@@ -482,7 +454,6 @@ public function addProductsByIds($productIds)
      *
      * @param   array $data
      * @return  array
-     * @since 2.0.0
      */
     public function suggestItemsQty($data)
     {
@@ -523,7 +494,6 @@ public function suggestItemsQty($data)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function updateItems($data)
     {
@@ -583,7 +553,6 @@ public function updateItems($data)
      * @param  int $itemId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function removeItem($itemId)
     {
@@ -595,7 +564,6 @@ public function removeItem($itemId)
      * Save cart
      *
      * @return $this
-     * @since 2.0.0
      */
     public function save()
     {
@@ -619,7 +587,6 @@ public function save()
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function saveQuote()
     {
@@ -631,7 +598,6 @@ public function saveQuote()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function truncate()
     {
@@ -641,7 +607,6 @@ public function truncate()
 
     /**
      * @return int[]
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -661,7 +626,6 @@ public function getProductIds()
      * Get shopping cart items summary (includes config settings)
      *
      * @return int|float
-     * @since 2.0.0
      */
     public function getSummaryQty()
     {
@@ -690,7 +654,6 @@ public function getSummaryQty()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
@@ -702,7 +665,6 @@ public function getItemsCount()
      *
      * @return int|float
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItemsQty()
     {
@@ -722,7 +684,6 @@ public function getItemsQty()
      *
      * @see \Magento\Quote\Model\Quote::updateItem()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
     {
@@ -775,9 +736,9 @@ public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
     /**
      * Getter for RequestInfoFilter
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.2
      * @return \Magento\Checkout\Model\Cart\RequestInfoFilterInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getRequestInfoFilter()
     {
diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
index 65deddeb5c050..e12b04f90c269 100644
--- a/app/code/Magento/Checkout/Model/Cart/CartInterface.php
+++ b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
@@ -13,7 +13,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 interface CartInterface
 {
@@ -23,7 +22,6 @@ interface CartInterface
      * @param int|\Magento\Catalog\Model\Product $productInfo
      * @param array|float|int|\Magento\Framework\DataObject|null $requestInfo
      * @return $this
-     * @since 2.0.0
      */
     public function addProduct($productInfo, $requestInfo = null);
 
@@ -32,7 +30,6 @@ public function addProduct($productInfo, $requestInfo = null);
      *
      * @return $this
      * @abstract
-     * @since 2.0.0
      */
     public function saveQuote();
 
@@ -42,7 +39,6 @@ public function saveQuote();
      * @param Quote $quote
      * @return $this
      * @abstract
-     * @since 2.0.0
      */
     public function setQuote(Quote $quote);
 
@@ -51,7 +47,6 @@ public function setQuote(Quote $quote);
      *
      * @return Quote
      * @abstract
-     * @since 2.0.0
      */
     public function getQuote();
 }
diff --git a/app/code/Magento/Checkout/Model/Cart/CollectQuote.php b/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
index 0ef9f04827bba..c3d8222b96427 100644
--- a/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
+++ b/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
@@ -8,43 +8,36 @@
 /**
  * Class \Magento\Checkout\Model\Cart\CollectQuote
  *
- * @since 2.0.0
  */
 class CollectQuote
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $estimatedAddressFactory;
 
     /**
      * @var \Magento\Quote\Api\ShippingMethodManagementInterface
-     * @since 2.0.0
      */
     protected $shippingMethodManager;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -56,7 +49,6 @@ class CollectQuote
      * @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
@@ -77,7 +69,6 @@ public function __construct(
     /**
      * @param \Magento\Quote\Model\Quote $quote
      * @return void
-     * @since 2.0.0
      */
     public function collect(\Magento\Quote\Model\Quote $quote)
     {
diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
index a1b98556ee0af..d8d0003d8ca7e 100644
--- a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -8,19 +8,16 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class ImageProvider
 {
     /**
      * @var \Magento\Quote\Api\CartItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $itemRepository;
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
-     * @since 2.0.0
      */
     protected $itemPool;
 
@@ -28,7 +25,6 @@ class ImageProvider
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository
      * @param \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getImages($cartId)
     {
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
index ff0ee73d758d2..a76a9f8525823 100644
--- a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
@@ -8,19 +8,19 @@
 
 /**
  * Class RequestInfoFilter used for filtering data from a request
- * @since 2.2.0
+ * @since 2.1.2
  */
 class RequestInfoFilter implements RequestInfoFilterInterface
 {
     /**
      * @var array $params
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $filterList;
 
     /**
      * @param array $filterList
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         array $filterList = []
@@ -33,7 +33,7 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $params
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function filter(\Magento\Framework\DataObject $params)
     {
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
index a66c26a3e177f..a988c9a0f9e7e 100644
--- a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
@@ -9,19 +9,19 @@
 /**
  * Class RequestInfoFilterComposite
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class RequestInfoFilterComposite implements RequestInfoFilterInterface
 {
     /**
      * @var RequestInfoFilter[] $params
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $filters = [];
 
     /**
      * @param RequestInfoFilter[] $filters
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         $filters = []
@@ -34,7 +34,7 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $params
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function filter(\Magento\Framework\DataObject $params)
     {
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
index 2f875cb9a483d..ac2840f758f01 100644
--- a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface RequestInfoFilterInterface used by composite and leafs to implement filtering
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface RequestInfoFilterInterface
 {
@@ -18,7 +18,7 @@ interface RequestInfoFilterInterface
      *
      * @param \Magento\Framework\DataObject $params
      * @return RequestInfoFilterInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function filter(\Magento\Framework\DataObject $params);
 }
diff --git a/app/code/Magento/Checkout/Model/CompositeConfigProvider.php b/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
index 2754c5f048be1..3577b1a145403 100644
--- a/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
@@ -10,20 +10,17 @@
  *
  * @see \Magento\Checkout\Model\ConfigProviderInterface
  * @api
- * @since 2.0.0
  */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var ConfigProviderInterface[]
-     * @since 2.0.0
      */
     private $configProviders;
 
     /**
      * @param ConfigProviderInterface[] $configProviders
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         array $configProviders
@@ -33,7 +30,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php
index b0661722b1c33..eef6442760a18 100644
--- a/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php
+++ b/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Checkout\Model\Config\Source\Cart\Summary
  *
- * @since 2.0.0
  */
 class Summary implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
index 35bc951ca217a..9e15027e26927 100644
--- a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
+++ b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ConfigProviderInterface
  * @api
- * @since 2.0.0
  */
 interface ConfigProviderInterface
 {
@@ -16,7 +15,6 @@ interface ConfigProviderInterface
      * Retrieve assoc array of checkout configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfig();
 }
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index 9f3c8cfa8cfdb..dcf655682ed47 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -26,163 +26,136 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class DefaultConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var CheckoutHelper
-     * @since 2.0.0
      */
     private $checkoutHelper;
 
     /**
      * @var CheckoutSession
-     * @since 2.0.0
      */
     private $checkoutSession;
 
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     private $customerRepository;
 
     /**
      * @var CustomerSession
-     * @since 2.0.0
      */
     private $customerSession;
 
     /**
      * @var CustomerUrlManager
-     * @since 2.0.0
      */
     private $customerUrlManager;
 
     /**
      * @var HttpContext
-     * @since 2.0.0
      */
     private $httpContext;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     private $quoteRepository;
 
     /**
      * @var QuoteItemRepository
-     * @since 2.0.0
      */
     private $quoteItemRepository;
 
     /**
      * @var ShippingMethodManager
-     * @since 2.0.0
      */
     private $shippingMethodManager;
 
     /**
      * @var ConfigurationPool
-     * @since 2.0.0
      */
     private $configurationPool;
 
     /**
      * @param QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var LocaleFormat
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     protected $addressConfig;
 
     /**
      * @var FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     protected $viewConfig;
 
     /**
      * @var \Magento\Directory\Model\Country\Postcode\ConfigInterface
-     * @since 2.0.0
      */
     protected $postCodesConfig;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var Cart\ImageProvider
-     * @since 2.0.0
      */
     protected $imageProvider;
 
     /**
      * @var CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartTotalRepository;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Shipping\Model\Config
-     * @since 2.0.0
      */
     protected $shippingMethodConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -215,7 +188,6 @@ class DefaultConfigProvider implements ConfigProviderInterface
      * @param UrlInterface $urlBuilder
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         CheckoutHelper $checkoutHelper,
@@ -275,7 +247,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -331,7 +302,6 @@ public function getConfig()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function isAutocompleteEnabled()
     {
@@ -345,7 +315,6 @@ private function isAutocompleteEnabled()
      * Retrieve customer data
      *
      * @return array
-     * @since 2.0.0
      */
     private function getCustomerData()
     {
@@ -365,7 +334,6 @@ private function getCustomerData()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     private function getCustomerAddressInline($address)
     {
@@ -380,7 +348,6 @@ private function getCustomerAddressInline($address)
      * Retrieve quote data
      *
      * @return array
-     * @since 2.0.0
      */
     private function getQuoteData()
     {
@@ -406,7 +373,6 @@ private function getQuoteData()
      * Retrieve quote item data
      *
      * @return array
-     * @since 2.0.0
      */
     private function getQuoteItemData()
     {
@@ -431,7 +397,6 @@ private function getQuoteItemData()
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     protected function getFormattedOptionValue($item)
     {
@@ -456,7 +421,6 @@ protected function getFormattedOptionValue($item)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRegisterUrl()
     {
@@ -468,7 +432,6 @@ public function getRegisterUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutUrl()
     {
@@ -480,7 +443,6 @@ public function getCheckoutUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function pageNotFoundUrl()
     {
@@ -503,7 +465,6 @@ public function getDefaultSuccessPageUrl()
      * Retrieve selected shipping method
      *
      * @return array|null
-     * @since 2.0.0
      */
     private function getSelectedShippingMethod()
     {
@@ -525,7 +486,6 @@ private function getSelectedShippingMethod()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function getStoreCode()
     {
@@ -537,7 +497,6 @@ private function getStoreCode()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function isGuestCheckoutAllowed()
     {
@@ -549,7 +508,6 @@ private function isGuestCheckoutAllowed()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function isCustomerLoggedIn()
     {
@@ -561,7 +519,6 @@ private function isCustomerLoggedIn()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function isCustomerLoginRequired()
     {
@@ -573,7 +530,6 @@ private function isCustomerLoginRequired()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function getForgotPasswordUrl()
     {
@@ -585,7 +541,6 @@ private function getForgotPasswordUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getStaticBaseUrl()
     {
@@ -595,7 +550,6 @@ protected function getStaticBaseUrl()
     /**
      * Return quote totals data
      * @return array
-     * @since 2.0.0
      */
     private function getTotalsData()
     {
@@ -627,7 +581,6 @@ private function getTotalsData()
     /**
      * Returns active carriers codes
      * @return array
-     * @since 2.0.0
      */
     private function getActiveCarriers()
     {
@@ -641,7 +594,6 @@ private function getActiveCarriers()
     /**
      * Returns origin country code
      * @return string
-     * @since 2.0.0
      */
     private function getOriginCountryCode()
     {
@@ -655,7 +607,6 @@ private function getOriginCountryCode()
     /**
      * Returns array of payment methods
      * @return array
-     * @since 2.0.0
      */
     private function getPaymentMethods()
     {
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 6f283ac09ec35..ab22afb2b4b24 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -11,44 +11,37 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPaymentInformationManagementInterface
 {
 
     /**
      * @var \Magento\Quote\Api\GuestBillingAddressManagementInterface
-     * @since 2.0.0
      */
     protected $billingAddressManagement;
 
     /**
      * @var \Magento\Quote\Api\GuestPaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
     /**
      * @var \Magento\Quote\Api\GuestCartManagementInterface
-     * @since 2.0.0
      */
     protected $cartManagement;
 
     /**
      * @var \Magento\Checkout\Api\PaymentInformationManagementInterface
-     * @since 2.0.0
      */
     protected $paymentInformationManagement;
 
     /**
      * @var \Magento\Quote\Model\QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartRepository;
 
@@ -66,7 +59,6 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement,
@@ -86,7 +78,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -114,7 +105,6 @@ public function savePaymentInformationAndPlaceOrder(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function savePaymentInformation(
         $cartId,
@@ -136,7 +126,6 @@ public function savePaymentInformation(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getPaymentInformation($cartId)
     {
diff --git a/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php b/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
index e4f160bb4edf1..7411b026289b7 100644
--- a/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Checkout\Model\GuestShippingInformationManagement
  *
- * @since 2.0.0
  */
 class GuestShippingInformationManagement implements \Magento\Checkout\Api\GuestShippingInformationManagementInterface
 {
     /**
      * @var \Magento\Quote\Model\QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var \Magento\Checkout\Api\ShippingInformationManagementInterface
-     * @since 2.0.0
      */
     protected $shippingInformationManagement;
 
@@ -28,7 +25,6 @@ class GuestShippingInformationManagement implements \Magento\Checkout\Api\GuestS
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param \Magento\Checkout\Api\ShippingInformationManagementInterface $shippingInformationManagement
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function saveAddressInformation(
         $cartId,
diff --git a/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php b/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
index 923b06e19476f..3e71323e13cd5 100644
--- a/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Checkout\Model\GuestTotalsInformationManagement
  *
- * @since 2.0.0
  */
 class GuestTotalsInformationManagement implements \Magento\Checkout\Api\GuestTotalsInformationManagementInterface
 {
     /**
      * @var \Magento\Quote\Model\QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var \Magento\Checkout\Api\TotalsInformationManagementInterface
-     * @since 2.0.0
      */
     protected $totalsInformationManagement;
 
@@ -28,7 +25,6 @@ class GuestTotalsInformationManagement implements \Magento\Checkout\Api\GuestTot
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param \Magento\Checkout\Api\TotalsInformationManagementInterface $totalsInformationManagement
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function calculate(
         $cartId,
diff --git a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
index c285b5fd65a5f..12a8838a7e9ed 100644
--- a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
+++ b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
@@ -14,7 +14,6 @@
  * Abstract class provides sorting routing to sort total information based on configuration settings.
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractTotalsProcessor
 {
@@ -22,14 +21,12 @@ abstract class AbstractTotalsProcessor
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig
@@ -40,7 +37,6 @@ public function __construct(
     /**
      * @param array $totals
      * @return array
-     * @since 2.0.0
      */
     public function sortTotals($totals)
     {
diff --git a/app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php
index 50c4e041fe8f9..de36bf658c59d 100644
--- a/app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php
@@ -9,19 +9,16 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -29,7 +26,6 @@ class DepersonalizePlugin
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -45,7 +41,6 @@ public function __construct(
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
     {
diff --git a/app/code/Magento/Checkout/Model/PaymentDetails.php b/app/code/Magento/Checkout/Model/PaymentDetails.php
index 804c14f7555c7..803f93da2b845 100644
--- a/app/code/Magento/Checkout/Model/PaymentDetails.php
+++ b/app/code/Magento/Checkout/Model/PaymentDetails.php
@@ -7,14 +7,12 @@
 
 /**
  * @codeCoverageIgnoreStart
- * @since 2.0.0
  */
 class PaymentDetails extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Checkout\Api\Data\PaymentDetailsInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPaymentMethods()
     {
@@ -23,7 +21,6 @@ public function getPaymentMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPaymentMethods($paymentMethods)
     {
@@ -32,7 +29,6 @@ public function setPaymentMethods($paymentMethods)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -41,7 +37,6 @@ public function getTotals()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotals($totals)
     {
@@ -52,7 +47,6 @@ public function setTotals($totals)
      * {@inheritdoc}
      *
      * @return \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -64,7 +58,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\PaymentDetailsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 9499008919236..5ef30c5f37611 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -9,38 +9,32 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInformationManagementInterface
 {
     /**
      * @var \Magento\Quote\Api\BillingAddressManagementInterface
      * @deprecated 2.2.0 This call was substituted to eliminate extra quote::save call
-     * @since 2.0.0
      */
     protected $billingAddressManagement;
 
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
-     * @since 2.0.0
      */
     protected $cartManagement;
 
     /**
      * @var PaymentDetailsFactory
-     * @since 2.0.0
      */
     protected $paymentDetailsFactory;
 
     /**
      * @var \Magento\Quote\Api\CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartTotalsRepository;
 
@@ -63,7 +57,6 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      * @param PaymentDetailsFactory $paymentDetailsFactory
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement,
@@ -81,7 +74,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -108,7 +100,6 @@ public function savePaymentInformationAndPlaceOrder(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function savePaymentInformation(
         $cartId,
@@ -136,7 +127,6 @@ public function savePaymentInformation(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getPaymentInformation($cartId)
     {
diff --git a/app/code/Magento/Checkout/Model/ResourceModel/Cart.php b/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
index 3c0cd717e62c6..add1966b819a1 100644
--- a/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
+++ b/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
@@ -9,7 +9,6 @@
  * Resource model for Checkout Cart
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Cart extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Cart extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param int $quoteId
      * @return array
-     * @since 2.0.0
      */
     public function fetchItemsSummary($quoteId)
     {
@@ -51,7 +48,6 @@ public function fetchItemsSummary($quoteId)
      *
      * @param int $quoteId
      * @return array
-     * @since 2.0.0
      */
     public function fetchItems($quoteId)
     {
@@ -72,7 +68,6 @@ public function fetchItems($quoteId)
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function addExcludeProductFilter($collection, $quoteId)
     {
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 2fd912aa07e2c..31513d25a9ce1 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -12,7 +12,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
@@ -25,7 +24,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Quote instance
      *
      * @var Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -33,7 +31,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Customer Data Object
      *
      * @var CustomerInterface|null
-     * @since 2.0.0
      */
     protected $_customer;
 
@@ -41,7 +38,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Whether load only active quote
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_loadInactive = false;
 
@@ -49,67 +45,56 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Loaded order instance
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $_remoteAddress;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @param QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @param bool
-     * @since 2.0.0
      */
     protected $isQuoteMasked;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -133,7 +118,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -183,7 +167,6 @@ public function __construct(
      * @param CustomerInterface|null $customer
      * @return \Magento\Checkout\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setCustomerData($customer)
     {
@@ -196,7 +179,6 @@ public function setCustomerData($customer)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function hasQuote()
     {
@@ -209,7 +191,6 @@ public function hasQuote()
      * @param bool $load
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setLoadInactive($load = true)
     {
@@ -223,7 +204,6 @@ public function setLoadInactive($load = true)
      * @return Quote
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -307,7 +287,6 @@ public function getQuote()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getQuoteIdKey()
     {
@@ -318,7 +297,6 @@ protected function _getQuoteIdKey()
      * @param int $quoteId
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setQuoteId($quoteId)
     {
@@ -328,7 +306,6 @@ public function setQuoteId($quoteId)
     /**
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getQuoteId()
     {
@@ -339,7 +316,6 @@ public function getQuoteId()
      * Load data for customer quote and merge with current quote
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadCustomerQuote()
     {
@@ -385,7 +361,6 @@ public function loadCustomerQuote()
      * @param array|string $data
      * @param bool|string|null $value
      * @return $this
-     * @since 2.0.0
      */
     public function setStepData($step, $data, $value = null)
     {
@@ -411,7 +386,6 @@ public function setStepData($step, $data, $value = null)
      * @param string|null $step
      * @param string|null $data
      * @return array|string|bool
-     * @since 2.0.0
      */
     public function getStepData($step = null, $data = null)
     {
@@ -436,7 +410,6 @@ public function getStepData($step = null, $data = null)
      * Unset all data associated with object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearQuote()
     {
@@ -451,7 +424,6 @@ public function clearQuote()
      * Unset all session data and quote
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearStorage()
     {
@@ -464,7 +436,6 @@ public function clearStorage()
      * Clear misc checkout parameters
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearHelperData()
     {
@@ -474,7 +445,6 @@ public function clearHelperData()
     /**
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function resetCheckout()
     {
@@ -485,7 +455,6 @@ public function resetCheckout()
     /**
      * @param Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function replaceQuote($quote)
     {
@@ -498,7 +467,6 @@ public function replaceQuote($quote)
      * Get order instance based on last order ID
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getLastRealOrder()
     {
@@ -517,7 +485,6 @@ public function getLastRealOrder()
      * Restore last active quote
      *
      * @return bool True if quote restored successfully, false otherwise
-     * @since 2.0.0
      */
     public function restoreQuote()
     {
@@ -541,7 +508,6 @@ public function restoreQuote()
      * @param $isQuoteMasked bool
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function setIsQuoteMasked($isQuoteMasked)
     {
@@ -551,7 +517,6 @@ protected function setIsQuoteMasked($isQuoteMasked)
     /**
      * @return bool|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function isQuoteMasked()
     {
diff --git a/app/code/Magento/Checkout/Model/Session/SuccessValidator.php b/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
index d1b343995b600..5858dcba8b902 100644
--- a/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
+++ b/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
@@ -9,20 +9,17 @@
  * Test if checkout session valid for success action
  *
  * @api
- * @since 2.0.0
  */
 class SuccessValidator
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession
@@ -32,7 +29,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isValid()
     {
diff --git a/app/code/Magento/Checkout/Model/ShippingInformation.php b/app/code/Magento/Checkout/Model/ShippingInformation.php
index d4e3adab5c6df..ee0cd3ecedf07 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformation.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformation.php
@@ -10,13 +10,11 @@
 
 /**
  * @codeCoverageIgnoreStart
- * @since 2.0.0
  */
 class ShippingInformation extends AbstractExtensibleModel implements ShippingInformationInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -25,7 +23,6 @@ public function getShippingAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -34,7 +31,6 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -43,7 +39,6 @@ public function getBillingAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -52,7 +47,6 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $addr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingMethodCode()
     {
@@ -61,7 +55,6 @@ public function getShippingMethodCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingMethodCode($code)
     {
@@ -70,7 +63,6 @@ public function setShippingMethodCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingCarrierCode()
     {
@@ -79,7 +71,6 @@ public function getShippingCarrierCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingCarrierCode($code)
     {
@@ -88,7 +79,6 @@ public function setShippingCarrierCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -97,7 +87,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\ShippingInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index 61ad14f93c036..d0fb4a1508b0d 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -19,65 +19,55 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
 {
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
     /**
      * @var PaymentDetailsFactory
-     * @since 2.0.0
      */
     protected $paymentDetailsFactory;
 
     /**
      * @var \Magento\Quote\Api\CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartTotalsRepository;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var QuoteAddressValidator
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $addressValidator;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -115,7 +105,6 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
      * @param ShippingAssignmentFactory|null $shippingAssignmentFactory,
      * @param ShippingFactory|null $shippingFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
@@ -150,7 +139,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function saveAddressInformation(
         $cartId,
@@ -209,7 +197,6 @@ public function saveAddressInformation(
      * @throws InputException
      * @throws NoSuchEntityException
      * @return void
-     * @since 2.0.0
      */
     protected function validateQuote(\Magento\Quote\Model\Quote $quote)
     {
diff --git a/app/code/Magento/Checkout/Model/Sidebar.php b/app/code/Magento/Checkout/Model/Sidebar.php
index 31c41377d585a..76271e5612381 100644
--- a/app/code/Magento/Checkout/Model/Sidebar.php
+++ b/app/code/Magento/Checkout/Model/Sidebar.php
@@ -14,31 +14,26 @@
 
 /**
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Sidebar
 {
     /**
      * @var Cart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @var HelperData
-     * @since 2.0.0
      */
     protected $helperData;
 
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $resolver;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $summaryQty;
 
@@ -47,7 +42,6 @@ class Sidebar
      * @param HelperData $helperData
      * @param ResolverInterface $resolver
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Cart $cart,
@@ -64,7 +58,6 @@ public function __construct(
      *
      * @param string $error
      * @return array
-     * @since 2.0.0
      */
     public function getResponseData($error = '')
     {
@@ -87,7 +80,6 @@ public function getResponseData($error = '')
      * @param int $itemId
      * @throws LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function checkQuoteItem($itemId)
     {
@@ -103,7 +95,6 @@ public function checkQuoteItem($itemId)
      *
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function removeQuoteItem($itemId)
     {
@@ -119,7 +110,6 @@ public function removeQuoteItem($itemId)
      * @param int $itemQty
      * @throws LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function updateQuoteItem($itemId, $itemQty)
     {
@@ -133,7 +123,6 @@ public function updateQuoteItem($itemId, $itemQty)
      *
      * @param int $itemQty
      * @return int|array
-     * @since 2.0.0
      */
     protected function normalize($itemQty)
     {
@@ -150,7 +139,6 @@ protected function normalize($itemQty)
      * Retrieve summary qty
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getSummaryQty()
     {
@@ -164,7 +152,6 @@ protected function getSummaryQty()
      * Retrieve summary qty text
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSummaryText()
     {
@@ -175,7 +162,6 @@ protected function getSummaryText()
      * Retrieve subtotal block html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSubtotalHtml()
     {
diff --git a/app/code/Magento/Checkout/Model/TotalsInformation.php b/app/code/Magento/Checkout/Model/TotalsInformation.php
index f6c6b2910a70c..49b118f499184 100644
--- a/app/code/Magento/Checkout/Model/TotalsInformation.php
+++ b/app/code/Magento/Checkout/Model/TotalsInformation.php
@@ -10,13 +10,11 @@
 
 /**
  * @codeCoverageIgnoreStart
- * @since 2.0.0
  */
 class TotalsInformation extends AbstractExtensibleModel implements TotalsInformationInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -25,7 +23,6 @@ public function getAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -34,7 +31,6 @@ public function setAddress(\Magento\Quote\Api\Data\AddressInterface $address)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingMethodCode()
     {
@@ -43,7 +39,6 @@ public function getShippingMethodCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingMethodCode($code)
     {
@@ -52,7 +47,6 @@ public function setShippingMethodCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingCarrierCode()
     {
@@ -61,7 +55,6 @@ public function getShippingCarrierCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingCarrierCode($code)
     {
@@ -70,7 +63,6 @@ public function setShippingCarrierCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -79,7 +71,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Checkout\Api\Data\TotalsInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Checkout/Model/TotalsInformationManagement.php b/app/code/Magento/Checkout/Model/TotalsInformationManagement.php
index 27099a86d531b..efb638d299864 100644
--- a/app/code/Magento/Checkout/Model/TotalsInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/TotalsInformationManagement.php
@@ -7,7 +7,6 @@
 
 /**
  * Class TotalsInformationManagement
- * @since 2.0.0
  */
 class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInformationManagementInterface
 {
@@ -15,7 +14,6 @@ class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInforma
      * Cart total repository.
      *
      * @var \Magento\Quote\Api\CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartTotalRepository;
 
@@ -23,7 +21,6 @@ class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInforma
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartRepository;
 
@@ -31,7 +28,6 @@ class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInforma
      * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalRepository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function calculate(
         $cartId,
@@ -70,7 +65,6 @@ public function calculate(
      * @param \Magento\Quote\Model\Quote $quote
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function validateQuote(\Magento\Quote\Model\Quote $quote)
     {
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index b967e0ad40914..bc6eb07b51a41 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -18,7 +18,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Onepage
 {
@@ -33,31 +32,26 @@ class Onepage
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote = null;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -65,7 +59,6 @@ class Onepage
      * Customer url
      *
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -73,127 +66,106 @@ class Onepage
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
-     * @since 2.0.0
      */
     protected $_customrAddrFactory;
 
     /**
      * @var \Magento\Customer\Model\FormFactory
-     * @since 2.0.0
      */
     protected $_customerFormFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
     /**
      * @var CustomerDataFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $extensibleDataObjectConverter;
 
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
-     * @since 2.0.0
      */
     protected $quoteManagement;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -227,7 +199,6 @@ class Onepage
      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -292,7 +263,6 @@ public function __construct(
      *
      * @return \Magento\Checkout\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -303,7 +273,6 @@ public function getCheckout()
      * Quote object getter
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -319,7 +288,6 @@ public function getQuote()
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -332,7 +300,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      *
      * @return \Magento\Customer\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCustomerSession()
     {
@@ -344,7 +311,6 @@ public function getCustomerSession()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function initCheckout()
     {
@@ -379,7 +345,6 @@ public function initCheckout()
      * Get quote checkout method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutMethod()
     {
@@ -401,7 +366,6 @@ public function getCheckoutMethod()
      *
      * @param   string $method
      * @return  array
-     * @since 2.0.0
      */
     public function saveCheckoutMethod($method)
     {
@@ -418,7 +382,6 @@ public function saveCheckoutMethod($method)
      * Check whether checkout method is "register"
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isCheckoutMethodRegister()
     {
@@ -433,7 +396,6 @@ protected function isCheckoutMethodRegister()
      * @return  array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function saveShipping($data, $customerAddressId)
     {
@@ -513,7 +475,6 @@ public function saveShipping($data, $customerAddressId)
      *
      * @param   string $shippingMethod
      * @return  array
-     * @since 2.0.0
      */
     public function saveShippingMethod($shippingMethod)
     {
@@ -540,7 +501,6 @@ public function saveShippingMethod($shippingMethod)
      *
      * @param   array $data
      * @return  array
-     * @since 2.0.0
      */
     public function savePayment($data)
     {
@@ -577,7 +537,6 @@ public function savePayment($data)
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function validate()
     {
@@ -598,7 +557,6 @@ protected function validate()
      * Prepare quote for guest checkout order submit
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareGuestQuote()
     {
@@ -614,7 +572,6 @@ protected function _prepareGuestQuote()
      * Prepare quote for customer registration and customer order submit
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareNewCustomerQuote()
     {
@@ -659,7 +616,6 @@ protected function _prepareNewCustomerQuote()
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCustomerQuote()
     {
@@ -703,7 +659,6 @@ protected function _prepareCustomerQuote()
      * Involve new customer to system
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _involveNewCustomer()
     {
@@ -729,7 +684,6 @@ protected function _involveNewCustomer()
      * Create order based on checkout type. Create customer if necessary.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveOrder()
     {
@@ -806,7 +760,6 @@ public function saveOrder()
      * @param int $websiteId
      * @return false|\Magento\Customer\Model\Customer
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _customerEmailExists($email, $websiteId = null)
     {
@@ -817,7 +770,6 @@ protected function _customerEmailExists($email, $websiteId = null)
      * Get last order increment id by order id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastOrderId()
     {
diff --git a/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php b/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
index d76e474f4674b..9534a86133890 100644
--- a/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
+++ b/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Checkout\Observer\LoadCustomerQuoteObserver
  *
- * @since 2.0.0
  */
 class LoadCustomerQuoteObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -30,7 +27,6 @@ class LoadCustomerQuoteObserver implements ObserverInterface
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -44,7 +40,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
index 237bd44e24fbc..1b7b4d2b291ee 100644
--- a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
+++ b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
@@ -10,20 +10,17 @@
 /**
  * Class \Magento\Checkout\Observer\SalesQuoteSaveAfterObserver
  *
- * @since 2.0.0
  */
 class SalesQuoteSaveAfterObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Checkout/Observer/UnsetAllObserver.php b/app/code/Magento/Checkout/Observer/UnsetAllObserver.php
index f548f9f8d1c3b..6ce06df133b91 100644
--- a/app/code/Magento/Checkout/Observer/UnsetAllObserver.php
+++ b/app/code/Magento/Checkout/Observer/UnsetAllObserver.php
@@ -10,20 +10,17 @@
 /**
  * Class \Magento\Checkout\Observer\UnsetAllObserver
  *
- * @since 2.0.0
  */
 class UnsetAllObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Checkout/Setup/InstallData.php b/app/code/Magento/Checkout/Setup/InstallData.php
index 44e1082c9a452..38879e06d65ac 100644
--- a/app/code/Magento/Checkout/Setup/InstallData.php
+++ b/app/code/Magento/Checkout/Setup/InstallData.php
@@ -15,7 +15,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -23,7 +22,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -31,7 +29,6 @@ class InstallData implements InstallDataInterface
      * Customer address
      *
      * @var Address
-     * @since 2.0.0
      */
     private $customerAddress;
 
@@ -40,7 +37,6 @@ class InstallData implements InstallDataInterface
      *
      * @param EavSetupFactory $eavSetupFactory
      * @param Address $customerAddress
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory, Address $customerAddress)
     {
@@ -53,7 +49,6 @@ public function __construct(EavSetupFactory $eavSetupFactory, Address $customerA
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
index 6640115c272e3..ea4756bc10e98 100644
--- a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CheckoutAgreementsRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface CheckoutAgreementsRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface CheckoutAgreementsRepositoryInterface
      * @param int $id
      * @param int $storeId
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface
-     * @since 2.0.0
      */
     public function get($id, $storeId = null);
 
@@ -26,7 +24,6 @@ public function get($id, $storeId = null);
      * Lists active checkout agreements.
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
-     * @since 2.0.0
      */
     public function getList();
 
@@ -38,7 +35,6 @@ public function getList();
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException If there is a problem with the input
      * @throws \Magento\Framework\Exception\NoSuchEntityException If a ID is sent but the entity does not exist
-     * @since 2.0.0
      */
     public function save(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $data, $storeId = null);
 
@@ -48,7 +44,6 @@ public function save(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $da
      * @param \Magento\CheckoutAgreements\Api\Data\AgreementInterface $data
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotDeleteException If there is a problem with the input
-     * @since 2.0.0
      */
     public function delete(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $data);
 
@@ -59,7 +54,6 @@ public function delete(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If a ID is sent but the entity does not exist
      * @throws \Magento\Framework\Exception\CouldNotDeleteException If there is a problem with the input
-     * @since 2.0.0
      */
     public function deleteById($id);
 }
diff --git a/app/code/Magento/CheckoutAgreements/Api/Data/AgreementInterface.php b/app/code/Magento/CheckoutAgreements/Api/Data/AgreementInterface.php
index 5568fe1f4ed04..20eddb5164140 100644
--- a/app/code/Magento/CheckoutAgreements/Api/Data/AgreementInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Api/Data/AgreementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface AgreementInterface
  * @api
- * @since 2.0.0
  */
 interface AgreementInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -29,7 +28,6 @@ interface AgreementInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Returns the agreement ID.
      *
      * @return int Agreement ID.
-     * @since 2.0.0
      */
     public function getAgreementId();
 
@@ -38,7 +36,6 @@ public function getAgreementId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setAgreementId($id);
 
@@ -46,7 +43,6 @@ public function setAgreementId($id);
      * Returns the agreement name.
      *
      * @return string Agreement name.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -55,7 +51,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -63,7 +58,6 @@ public function setName($name);
      * Returns the agreement content.
      *
      * @return string Agreement content.
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -72,7 +66,6 @@ public function getContent();
      *
      * @param string $content
      * @return $this
-     * @since 2.0.0
      */
     public function setContent($content);
 
@@ -80,7 +73,6 @@ public function setContent($content);
      * Returns the agreement content height, which is an optional CSS property.
      *
      * @return string|null Agreement content height. Otherwise, null.
-     * @since 2.0.0
      */
     public function getContentHeight();
 
@@ -89,7 +81,6 @@ public function getContentHeight();
      *
      * @param string|null $height
      * @return $this
-     * @since 2.0.0
      */
     public function setContentHeight($height);
 
@@ -97,7 +88,6 @@ public function setContentHeight($height);
      * Returns the agreement checkbox text.
      *
      * @return string Agreement checkbox text.
-     * @since 2.0.0
      */
     public function getCheckboxText();
 
@@ -106,7 +96,6 @@ public function getCheckboxText();
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function setCheckboxText($text);
 
@@ -115,7 +104,6 @@ public function setCheckboxText($text);
      *
      * @return bool Agreement status.
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -124,7 +112,6 @@ public function getIsActive();
      *
      * @param bool $status
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($status);
 
@@ -134,7 +121,6 @@ public function setIsActive($status);
      * @return bool * true - HTML.
      * * false - plain text.
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsHtml();
 
@@ -145,7 +131,6 @@ public function getIsHtml();
      *
      * @param bool $isHtml
      * @return $this
-     * @since 2.0.0
      */
     public function setIsHtml($isHtml);
 
@@ -153,7 +138,6 @@ public function setIsHtml($isHtml);
      * Returns the agreement applied mode.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMode();
 
@@ -162,7 +146,6 @@ public function getMode();
      *
      * @param int $mode
      * @return $this
-     * @since 2.0.0
      */
     public function setMode($mode);
 
@@ -170,7 +153,6 @@ public function setMode($mode);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -179,7 +161,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement.php
index 4a49c5e148edb..e7130922fdef7 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement.php
@@ -7,13 +7,11 @@
 
 /**
  * Admin tax rule content block
- * @since 2.0.0
  */
 class Agreement extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
index 40512110207ff..5f903a9b096a7 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -16,7 +15,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Init class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +54,6 @@ protected function _construct()
      * Get Header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
index 92a8a737c4064..098aa8c942005 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @var \Magento\CheckoutAgreements\Model\AgreementModeOptions
-     * @since 2.0.0
      */
     protected $agreementModeOptions;
 
@@ -32,7 +29,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\CheckoutAgreements\Model\AgreementModeOptions $agreementModeOptions
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      * Init class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +59,6 @@ protected function _construct()
     /**
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
index 46900df629496..6822a5a38a2dd 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -24,7 +22,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
     /**
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -62,7 +57,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -120,7 +114,6 @@ protected function _prepareColumns()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -133,7 +126,6 @@ protected function _afterLoadCollection()
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _filterStoreCondition($collection, $column)
     {
@@ -148,7 +140,6 @@ protected function _filterStoreCondition($collection, $column)
      * @param \Magento\Framework\DataObject $row
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Block/Agreements.php b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
index 17ce1f58e5675..68af59da18d5a 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Agreements.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Agreements extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
-     * @since 2.0.0
      */
     protected $_agreementCollectionFactory;
 
@@ -25,7 +23,6 @@ class Agreements extends \Magento\Framework\View\Element\Template
      * @param \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $agreementCollectionFactory
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getAgreements()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
index 72984a0729004..e109cfbe9954e 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
  *
- * @since 2.0.0
  */
 abstract class Agreement extends \Magento\Backend\App\Action
 {
@@ -23,7 +22,6 @@ abstract class Agreement extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -31,7 +29,6 @@ abstract class Agreement extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Initialize action
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
index 24dc34fb54dac..0b460851ca021 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
index 9fb3491915764..8ba5d72f872ca 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
 {
     /**
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
index 183d965c28263..8ec93a6a74500 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
index 5590a6fc0c18d..db38d3d3adfb2 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
 {
     /**
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
index 6af18a1ba31b8..633f54e2c4281 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/Agreement.php b/app/code/Magento/CheckoutAgreements/Model/Agreement.php
index 4e252c02fcc64..ae34f2fa8d9b8 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Agreement.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CheckoutAgreements\Model\Agreement
  *
- * @since 2.0.0
  */
 class Agreement extends \Magento\Framework\Model\AbstractExtensibleModel implements AgreementInterface
 {
@@ -18,14 +17,12 @@ class Agreement extends \Magento\Framework\Model\AbstractExtensibleModel impleme
      * Allowed CSS units for height field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allowedCssUnits = ['px', 'pc', 'pt', 'ex', 'em', 'mm', 'cm', 'in', '%'];
 
     /**
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +32,6 @@ protected function _construct()
     /**
      * @param \Magento\Framework\DataObject $agreementData
      * @return array|bool
-     * @since 2.0.0
      */
     public function validateData($agreementData)
     {
@@ -55,7 +51,6 @@ public function validateData($agreementData)
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -77,7 +72,6 @@ public function beforeSave()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getAgreementId()
     {
@@ -86,7 +80,6 @@ public function getAgreementId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setAgreementId($id)
     {
@@ -95,7 +88,6 @@ public function setAgreementId($id)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -104,7 +96,6 @@ public function getName()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -113,7 +104,6 @@ public function setName($name)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -122,7 +112,6 @@ public function getContent()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -131,7 +120,6 @@ public function setContent($content)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getContentHeight()
     {
@@ -140,7 +128,6 @@ public function getContentHeight()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setContentHeight($height)
     {
@@ -149,7 +136,6 @@ public function setContentHeight($height)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getCheckboxText()
     {
@@ -158,7 +144,6 @@ public function getCheckboxText()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setCheckboxText($text)
     {
@@ -167,7 +152,6 @@ public function setCheckboxText($text)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -176,7 +160,6 @@ public function getIsActive()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setIsActive($status)
     {
@@ -185,7 +168,6 @@ public function setIsActive($status)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getIsHtml()
     {
@@ -194,7 +176,6 @@ public function getIsHtml()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setIsHtml($isHtml)
     {
@@ -203,7 +184,6 @@ public function setIsHtml($isHtml)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -212,7 +192,6 @@ public function getMode()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setMode($mode)
     {
@@ -223,7 +202,6 @@ public function setMode($mode)
      * {@inheritdoc}
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -235,7 +213,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\CheckoutAgreements\Api\Data\AgreementExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementModeOptions.php b/app/code/Magento/CheckoutAgreements/Model/AgreementModeOptions.php
index 84f4c62a3f249..cecf72ed2817e 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementModeOptions.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementModeOptions.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CheckoutAgreements\Model\AgreementModeOptions
  *
- * @since 2.0.0
  */
 class AgreementModeOptions
 {
@@ -20,7 +19,6 @@ class AgreementModeOptions
      * Return list of agreement mode options array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsArray()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
index cf01778fd8466..331307292e40a 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
@@ -10,25 +10,21 @@
 
 /**
  * Configuration provider for GiftMessage rendering on "Shipping Method" step of checkout.
- * @since 2.0.0
  */
 class AgreementsConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfiguration;
 
     /**
      * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
-     * @since 2.0.0
      */
     protected $checkoutAgreementsRepository;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -37,7 +33,6 @@ class AgreementsConfigProvider implements ConfigProviderInterface
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
      * @param \Magento\Framework\Escaper $escaper
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
@@ -51,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -64,7 +58,6 @@ public function getConfig()
      * Returns agreements config
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAgreementsConfig()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
index aa6bb2fc8fe19..5c79b7f3091e0 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
@@ -10,7 +10,6 @@
 
 /**
  * Provide Agreements stored in db
- * @since 2.0.0
  */
 class AgreementsProvider implements AgreementsProviderInterface
 {
@@ -21,19 +20,16 @@ class AgreementsProvider implements AgreementsProviderInterface
 
     /**
      * @var AgreementCollectionFactory
-     * @since 2.0.0
      */
     protected $agreementCollectionFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -42,7 +38,6 @@ class AgreementsProvider implements AgreementsProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         AgreementCollectionFactory $agreementCollectionFactory,
@@ -58,7 +53,6 @@ public function __construct(
      * Get list of required Agreement Ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getRequiredAgreementIds()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProviderInterface.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProviderInterface.php
index ab80e937894d0..eac3e44dc0de8 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProviderInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProviderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface AgreementsProviderInterface
- * @since 2.0.0
  */
 interface AgreementsProviderInterface
 {
@@ -15,7 +14,6 @@ interface AgreementsProviderInterface
      * Get list of Required Agreement Ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getRequiredAgreementIds();
 }
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
index aa5847f116a30..8d25ba88c0f82 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
@@ -7,20 +7,17 @@
 
 /**
  * Class AgreementsValidator
- * @since 2.0.0
  */
 class AgreementsValidator implements \Magento\Checkout\Api\AgreementsValidatorInterface
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\AgreementsProviderInterface[]
-     * @since 2.0.0
      */
     protected $agreementsProviders;
 
     /**
      * @param AgreementsProviderInterface[] $list
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($list = null)
     {
@@ -32,7 +29,6 @@ public function __construct($list = null)
      *
      * @param int[] $agreementIds
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($agreementIds = [])
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
index c2fabcdba3104..8ec73a33a5a3b 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
@@ -10,25 +10,21 @@
 
 /**
  * Class Validation
- * @since 2.0.0
  */
 class Validation
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfiguration;
 
     /**
      * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
-     * @since 2.0.0
      */
     protected $checkoutAgreementsRepository;
 
     /**
      * @var \Magento\Checkout\Api\AgreementsValidatorInterface
-     * @since 2.0.0
      */
     protected $agreementsValidator;
 
@@ -36,7 +32,6 @@ class Validation
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
@@ -55,7 +50,6 @@ public function __construct(
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSavePaymentInformationAndPlaceOrder(
         \Magento\Checkout\Api\PaymentInformationManagementInterface $subject,
@@ -75,7 +69,6 @@ public function beforeSavePaymentInformationAndPlaceOrder(
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSavePaymentInformation(
         \Magento\Checkout\Api\PaymentInformationManagementInterface $subject,
@@ -92,7 +85,6 @@ public function beforeSavePaymentInformation(
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
-     * @since 2.0.0
      */
     protected function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $paymentMethod)
     {
@@ -110,7 +102,6 @@ protected function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $
     /**
      * Verify if agreement validation needed
      * @return bool
-     * @since 2.0.0
      */
     protected function isAgreementEnabled()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index cdd96bd141abf..9fb4d4c59e200 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -21,7 +21,6 @@
  * Checkout agreement repository.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterface
 {
@@ -29,7 +28,6 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * Collection factory.
      *
      * @var AgreementCollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
@@ -37,7 +35,6 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * Store manager.
      *
      * @var  \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -45,25 +42,21 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * Scope config.
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var AgreementResource
-     * @since 2.0.0
      */
     private $resourceModel;
 
     /**
      * @var AgreementFactory
-     * @since 2.0.0
      */
     private $agreementFactory;
 
     /**
      * @var JoinProcessorInterface
-     * @since 2.0.0
      */
     private $extensionAttributesJoinProcessor;
 
@@ -77,7 +70,6 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * @param AgreementFactory $agreementFactory
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         AgreementCollectionFactory $collectionFactory,
@@ -99,7 +91,6 @@ public function __construct(
      * {@inheritdoc}
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[] Array of checkout agreement data objects.
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -122,7 +113,6 @@ public function getList()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $data, $storeId = null)
     {
@@ -147,7 +137,6 @@ public function save(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $da
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $data)
     {
@@ -163,7 +152,6 @@ public function delete(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -174,7 +162,6 @@ public function deleteById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($id, $storeId = null)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement.php
index c523664461eb9..be8860f7b0c68 100644
--- a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement.php
@@ -7,13 +7,11 @@
 
 /**
  * Resource Model for Checkout Agreement
- * @since 2.0.0
  */
 class Agreement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
@@ -22,7 +20,6 @@ class Agreement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param string $connectionName
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -72,7 +67,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -97,7 +91,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -122,7 +115,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Collection.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Collection.php
index b22a18e0765b0..19ef958a1747c 100644
--- a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Collection.php
+++ b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * Resource Model for Agreement Collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_map = [
         'fields' => [
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Is store filter with admin store
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isStoreFilterWithAdmin = true;
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -48,7 +44,6 @@ protected function _construct()
      *
      * @param int|\Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($store)
     {
@@ -91,7 +86,6 @@ public function addStoreFilter($store)
      * @param bool $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIsStoreFilterWithAdmin($value)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
index 345d5ce81ad23..8e043ecd78d5b 100644
--- a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
+++ b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php b/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php
index 41d8b2ebccea5..ee1efcefa386d 100644
--- a/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php
+++ b/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php
@@ -21,13 +21,11 @@
  *
  * Upgrade processing order:
  * - UpgradeSchema(Runs if version in module.xml is greater than installed version)
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
index ea583fe793973..3f7e3e85336a3 100644
--- a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * CMS block CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface BlockRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface BlockRepositoryInterface
      * @param \Magento\Cms\Api\Data\BlockInterface $block
      * @return \Magento\Cms\Api\Data\BlockInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(Data\BlockInterface $block);
 
@@ -30,7 +28,6 @@ public function save(Data\BlockInterface $block);
      * @param int $blockId
      * @return \Magento\Cms\Api\Data\BlockInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($blockId);
 
@@ -40,7 +37,6 @@ public function getById($blockId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Cms\Api\Data\BlockSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -50,7 +46,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Cms\Api\Data\BlockInterface $block
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(Data\BlockInterface $block);
 
@@ -61,7 +56,6 @@ public function delete(Data\BlockInterface $block);
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($blockId);
 }
diff --git a/app/code/Magento/Cms/Api/Data/BlockInterface.php b/app/code/Magento/Cms/Api/Data/BlockInterface.php
index f10807e7533ab..d950d2d9249f9 100644
--- a/app/code/Magento/Cms/Api/Data/BlockInterface.php
+++ b/app/code/Magento/Cms/Api/Data/BlockInterface.php
@@ -8,7 +8,6 @@
 /**
  * CMS block interface.
  * @api
- * @since 2.0.0
  */
 interface BlockInterface
 {
@@ -28,7 +27,6 @@ interface BlockInterface
      * Get ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -36,7 +34,6 @@ public function getId();
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier();
 
@@ -44,7 +41,6 @@ public function getIdentifier();
      * Get title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -52,7 +48,6 @@ public function getTitle();
      * Get content
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -60,7 +55,6 @@ public function getContent();
      * Get creation time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreationTime();
 
@@ -68,7 +62,6 @@ public function getCreationTime();
      * Get update time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdateTime();
 
@@ -76,7 +69,6 @@ public function getUpdateTime();
      * Is active
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isActive();
 
@@ -85,7 +77,6 @@ public function isActive();
      *
      * @param int $id
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -94,7 +85,6 @@ public function setId($id);
      *
      * @param string $identifier
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setIdentifier($identifier);
 
@@ -103,7 +93,6 @@ public function setIdentifier($identifier);
      *
      * @param string $title
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -112,7 +101,6 @@ public function setTitle($title);
      *
      * @param string $content
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setContent($content);
 
@@ -121,7 +109,6 @@ public function setContent($content);
      *
      * @param string $creationTime
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setCreationTime($creationTime);
 
@@ -130,7 +117,6 @@ public function setCreationTime($creationTime);
      *
      * @param string $updateTime
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setUpdateTime($updateTime);
 
@@ -139,7 +125,6 @@ public function setUpdateTime($updateTime);
      *
      * @param bool|int $isActive
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 }
diff --git a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
index e720dba24a278..021b1b117beda 100644
--- a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
+++ b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface for cms block search results.
  * @api
- * @since 2.0.0
  */
 interface BlockSearchResultsInterface extends SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface BlockSearchResultsInterface extends SearchResultsInterface
      * Get blocks list.
      *
      * @return \Magento\Cms\Api\Data\BlockInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Cms\Api\Data\BlockInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php
index 8e6f4a7891131..d79734c28b2d5 100644
--- a/app/code/Magento/Cms/Api/Data/PageInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageInterface.php
@@ -8,7 +8,6 @@
 /**
  * CMS page interface.
  * @api
- * @since 2.0.0
  */
 interface PageInterface
 {
@@ -40,7 +39,6 @@ interface PageInterface
      * Get ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -48,7 +46,6 @@ public function getId();
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier();
 
@@ -56,7 +53,6 @@ public function getIdentifier();
      * Get title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -64,7 +60,6 @@ public function getTitle();
      * Get page layout
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPageLayout();
 
@@ -80,7 +75,6 @@ public function getMetaTitle();
      * Get meta keywords
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMetaKeywords();
 
@@ -88,7 +82,6 @@ public function getMetaKeywords();
      * Get meta description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMetaDescription();
 
@@ -96,7 +89,6 @@ public function getMetaDescription();
      * Get content heading
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getContentHeading();
 
@@ -104,7 +96,6 @@ public function getContentHeading();
      * Get content
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -112,7 +103,6 @@ public function getContent();
      * Get creation time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreationTime();
 
@@ -120,7 +110,6 @@ public function getCreationTime();
      * Get update time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdateTime();
 
@@ -128,7 +117,6 @@ public function getUpdateTime();
      * Get sort order
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -136,7 +124,6 @@ public function getSortOrder();
      * Get layout update xml
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLayoutUpdateXml();
 
@@ -144,7 +131,6 @@ public function getLayoutUpdateXml();
      * Get custom theme
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomTheme();
 
@@ -152,7 +138,6 @@ public function getCustomTheme();
      * Get custom root template
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomRootTemplate();
 
@@ -160,7 +145,6 @@ public function getCustomRootTemplate();
      * Get custom layout update xml
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomLayoutUpdateXml();
 
@@ -168,7 +152,6 @@ public function getCustomLayoutUpdateXml();
      * Get custom theme from
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomThemeFrom();
 
@@ -176,7 +159,6 @@ public function getCustomThemeFrom();
      * Get custom theme to
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomThemeTo();
 
@@ -184,7 +166,6 @@ public function getCustomThemeTo();
      * Is active
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isActive();
 
@@ -193,7 +174,6 @@ public function isActive();
      *
      * @param int $id
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -202,7 +182,6 @@ public function setId($id);
      *
      * @param string $identifier
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setIdentifier($identifier);
 
@@ -211,7 +190,6 @@ public function setIdentifier($identifier);
      *
      * @param string $title
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -220,7 +198,6 @@ public function setTitle($title);
      *
      * @param string $pageLayout
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setPageLayout($pageLayout);
 
@@ -238,7 +215,6 @@ public function setMetaTitle($metaTitle);
      *
      * @param string $metaKeywords
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setMetaKeywords($metaKeywords);
 
@@ -247,7 +223,6 @@ public function setMetaKeywords($metaKeywords);
      *
      * @param string $metaDescription
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setMetaDescription($metaDescription);
 
@@ -256,7 +231,6 @@ public function setMetaDescription($metaDescription);
      *
      * @param string $contentHeading
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setContentHeading($contentHeading);
 
@@ -265,7 +239,6 @@ public function setContentHeading($contentHeading);
      *
      * @param string $content
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setContent($content);
 
@@ -274,7 +247,6 @@ public function setContent($content);
      *
      * @param string $creationTime
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCreationTime($creationTime);
 
@@ -283,7 +255,6 @@ public function setCreationTime($creationTime);
      *
      * @param string $updateTime
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setUpdateTime($updateTime);
 
@@ -292,7 +263,6 @@ public function setUpdateTime($updateTime);
      *
      * @param string $sortOrder
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -301,7 +271,6 @@ public function setSortOrder($sortOrder);
      *
      * @param string $layoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setLayoutUpdateXml($layoutUpdateXml);
 
@@ -310,7 +279,6 @@ public function setLayoutUpdateXml($layoutUpdateXml);
      *
      * @param string $customTheme
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomTheme($customTheme);
 
@@ -319,7 +287,6 @@ public function setCustomTheme($customTheme);
      *
      * @param string $customRootTemplate
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomRootTemplate($customRootTemplate);
 
@@ -328,7 +295,6 @@ public function setCustomRootTemplate($customRootTemplate);
      *
      * @param string $customLayoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomLayoutUpdateXml($customLayoutUpdateXml);
 
@@ -337,7 +303,6 @@ public function setCustomLayoutUpdateXml($customLayoutUpdateXml);
      *
      * @param string $customThemeFrom
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomThemeFrom($customThemeFrom);
 
@@ -346,7 +311,6 @@ public function setCustomThemeFrom($customThemeFrom);
      *
      * @param string $customThemeTo
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomThemeTo($customThemeTo);
 
@@ -355,7 +319,6 @@ public function setCustomThemeTo($customThemeTo);
      *
      * @param int|bool $isActive
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 }
diff --git a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
index cc019584cc5f6..0aad50a521a76 100644
--- a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface for cms page search results.
  * @api
- * @since 2.0.0
  */
 interface PageSearchResultsInterface extends SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface PageSearchResultsInterface extends SearchResultsInterface
      * Get pages list.
      *
      * @return \Magento\Cms\Api\Data\PageInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Cms\Api\Data\PageInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Cms/Api/PageRepositoryInterface.php b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
index 6de9fef9cd6a9..9c4ca3b7f25c1 100644
--- a/app/code/Magento/Cms/Api/PageRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * CMS page CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface PageRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface PageRepositoryInterface
      * @param \Magento\Cms\Api\Data\PageInterface $page
      * @return \Magento\Cms\Api\Data\PageInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page);
 
@@ -30,7 +28,6 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page);
      * @param int $pageId
      * @return \Magento\Cms\Api\Data\PageInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($pageId);
 
@@ -40,7 +37,6 @@ public function getById($pageId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Cms\Api\Data\PageSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -50,7 +46,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Cms\Api\Data\PageInterface $page
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Cms\Api\Data\PageInterface $page);
 
@@ -61,7 +56,6 @@ public function delete(\Magento\Cms\Api\Data\PageInterface $page);
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($pageId);
 }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block.php b/app/code/Magento/Cms/Block/Adminhtml/Block.php
index 0121416d8d7d4..28d3ae00b13a8 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block.php
@@ -7,13 +7,11 @@
 
 /**
  * Adminhtml cms blocks content block
- * @since 2.0.0
  */
 class Block extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
index 3bb8bc45591ea..86976f6c912e8 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
@@ -7,19 +7,16 @@
 
 /**
  * CMS block chooser for Wysiwyg CMS widget
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Cms\Model\BlockFactory
-     * @since 2.0.0
      */
     protected $_blockFactory;
 
     /**
      * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -29,7 +26,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Cms\Model\BlockFactory $blockFactory
      * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Block construction, prepare grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -63,7 +58,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element Form Element
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function prepareElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -99,7 +93,6 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Grid Row JS Callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowClickCallback()
     {
@@ -127,7 +120,6 @@ function (grid, event) {
      * Prepare Cms static blocks collection
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -139,7 +131,6 @@ protected function _prepareCollection()
      * Prepare columns for Cms blocks grid
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -172,7 +163,6 @@ protected function _prepareColumns()
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page.php b/app/code/Magento/Cms/Block/Adminhtml/Page.php
index 7e0400c214a2f..ed23752680b9d 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page.php
@@ -7,7 +7,6 @@
 
 /**
  * Adminhtml cms pages content block
- * @since 2.0.0
  */
 class Page extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -15,7 +14,6 @@ class Page extends \Magento\Backend\Block\Widget\Grid\Container
      * Block constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +35,6 @@ protected function _construct()
      *
      * @param string $resourceId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowedAction($resourceId)
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index e2888dd2c349d..b6a1898289e5f 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -7,25 +7,21 @@
 
 /**
  * Adminhtml cms pages grid
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Cms\Model\ResourceModel\Page\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_cmsPage;
 
     /**
      * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
-     * @since 2.0.0
      */
     protected $pageLayoutBuilder;
 
@@ -36,7 +32,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Cms\Model\ResourceModel\Page\CollectionFactory $collectionFactory
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +62,6 @@ protected function _construct()
      * Prepare collection
      *
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -84,7 +77,6 @@ protected function _prepareCollection()
      * Prepare columns
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -171,7 +163,6 @@ protected function _prepareColumns()
      * After load collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -186,7 +177,6 @@ protected function _afterLoadCollection()
      * @param \Magento\Framework\DataObject $column
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _filterStoreCondition($collection, \Magento\Framework\DataObject $column)
     {
@@ -202,7 +192,6 @@ protected function _filterStoreCondition($collection, \Magento\Framework\DataObj
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
index 5f644f3db2926..5167496150b7f 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action
  *
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var Action\UrlBuilder
-     * @since 2.0.0
      */
     protected $actionUrlBuilder;
 
@@ -22,7 +20,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param Action\UrlBuilder $actionUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
index 5bf73fb54fa0f..a48534c1611ea 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action\UrlBuilder
  *
- * @since 2.0.0
  */
 class UrlBuilder
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $frontendUrlBuilder;
 
     /**
      * @param \Magento\Framework\UrlInterface $frontendUrlBuilder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
      * @param string $scope
      * @param string $store
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($routePath, $scope, $store)
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
index 7ceefbefa0c16..32d36a1869958 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -9,31 +9,26 @@
  * CMS page chooser for Wysiwyg CMS widget
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_cmsPage;
 
     /**
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
     /**
      * @var \Magento\Cms\Model\ResourceModel\Page\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
-     * @since 2.0.0
      */
     protected $pageLayoutBuilder;
 
@@ -45,7 +40,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Cms\Model\ResourceModel\Page\CollectionFactory $collectionFactory
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -67,7 +61,6 @@ public function __construct(
      * Block construction, prepare grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -82,7 +75,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element Form Element
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function prepareElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -118,7 +110,6 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Grid Row JS Callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowClickCallback()
     {
@@ -146,7 +137,6 @@ function (grid, event) {
      * Prepare pages collection
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -162,7 +152,6 @@ protected function _prepareCollection()
      * Prepare columns for pages grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -227,7 +216,6 @@ protected function _prepareColumns()
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
index 79ca0511ef196..4c9f6fbcd11e0 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
@@ -9,13 +9,11 @@
  * Wysiwyg Images content block
  *
  * @api
- * @since 2.0.0
  */
 class Content extends \Magento\Backend\Block\Widget\Container
 {
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -23,7 +21,6 @@ class Content extends \Magento\Backend\Block\Widget\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Block construction
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +79,6 @@ protected function _construct()
      * Files action source URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentsUrl()
     {
@@ -94,7 +89,6 @@ public function getContentsUrl()
      * Javascript setup object for filebrowser instance
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilebrowserSetupObject()
     {
@@ -123,7 +117,6 @@ public function getFilebrowserSetupObject()
      * New directory action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewfolderUrl()
     {
@@ -134,7 +127,6 @@ public function getNewfolderUrl()
      * Delete directory action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDeletefolderUrl()
     {
@@ -145,7 +137,6 @@ protected function getDeletefolderUrl()
      * Description goes here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteFilesUrl()
     {
@@ -156,7 +147,6 @@ public function getDeleteFilesUrl()
      * New directory action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOnInsertUrl()
     {
@@ -167,7 +157,6 @@ public function getOnInsertUrl()
      * Target element ID getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTargetElementId()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
index 5d8e20707fdc9..377c1821ad4ff 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
@@ -9,7 +9,6 @@
  * Directory contents block for Wysiwyg Images
  *
  * @api
- * @since 2.0.0
  */
 class Files extends \Magento\Backend\Block\Template
 {
@@ -17,19 +16,16 @@ class Files extends \Magento\Backend\Block\Template
      * Files collection object
      *
      * @var \Magento\Framework\Data\Collection\Filesystem
-     * @since 2.0.0
      */
     protected $_filesCollection;
 
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
-     * @since 2.0.0
      */
     protected $_imageStorage;
 
     /**
      * @var \Magento\Cms\Helper\Wysiwyg\Images
-     * @since 2.0.0
      */
     protected $_imageHelper;
 
@@ -38,7 +34,6 @@ class Files extends \Magento\Backend\Block\Template
      * @param \Magento\Cms\Model\Wysiwyg\Images\Storage $imageStorage
      * @param \Magento\Cms\Helper\Wysiwyg\Images $imageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
      * Prepared Files collection for current directory
      *
      * @return \Magento\Framework\Data\Collection\Filesystem
-     * @since 2.0.0
      */
     public function getFiles()
     {
@@ -73,7 +67,6 @@ public function getFiles()
      * Files collection count getter
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFilesCount()
     {
@@ -85,7 +78,6 @@ public function getFilesCount()
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileId(\Magento\Framework\DataObject $file)
     {
@@ -97,7 +89,6 @@ public function getFileId(\Magento\Framework\DataObject $file)
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileThumbUrl(\Magento\Framework\DataObject $file)
     {
@@ -109,7 +100,6 @@ public function getFileThumbUrl(\Magento\Framework\DataObject $file)
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileName(\Magento\Framework\DataObject $file)
     {
@@ -121,7 +111,6 @@ public function getFileName(\Magento\Framework\DataObject $file)
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileWidth(\Magento\Framework\DataObject $file)
     {
@@ -133,7 +122,6 @@ public function getFileWidth(\Magento\Framework\DataObject $file)
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileHeight(\Magento\Framework\DataObject $file)
     {
@@ -145,7 +133,6 @@ public function getFileHeight(\Magento\Framework\DataObject $file)
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
-     * @since 2.0.0
      */
     public function getFileShortName(\Magento\Framework\DataObject $file)
     {
@@ -156,7 +143,6 @@ public function getFileShortName(\Magento\Framework\DataObject $file)
      * Get image width
      *
      * @return int
-     * @since 2.0.0
      */
     public function getImagesWidth()
     {
@@ -167,7 +153,6 @@ public function getImagesWidth()
      * Get image height
      *
      * @return int
-     * @since 2.0.0
      */
     public function getImagesHeight()
     {
@@ -177,7 +162,6 @@ public function getImagesHeight()
     /**
      * Return current media type based on request or data
      * @return string
-     * @since 2.0.0
      */
     protected function _getMediaType()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
index d64781815c790..51a1f8662a012 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
@@ -9,7 +9,6 @@
  * New directory block for Wysiwyg Images
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Newfolder extends \Magento\Backend\Block\Template
 {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
index 1241ff8f9626a..58e0b41850adb 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
@@ -9,13 +9,11 @@
  * Uploader block for Wysiwyg Images
  *
  * @api
- * @since 2.0.0
  */
 class Uploader extends \Magento\Backend\Block\Media\Uploader
 {
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
-     * @since 2.0.0
      */
     protected $_imagesStorage;
 
@@ -24,7 +22,6 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
      * @param \Magento\Framework\File\Size $fileSize
      * @param \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +60,6 @@ protected function _construct()
      * Return current media type based on request or data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getMediaType()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 9a8441cb5728b..6749fa9df111d 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -9,7 +9,6 @@
  * Directory tree renderer for Cms Wysiwyg Images
  *
  * @api
- * @since 2.0.0
  */
 class Tree extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Tree extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Tree extends \Magento\Backend\Block\Template
      * Cms wysiwyg images
      *
      * @var \Magento\Cms\Helper\Wysiwyg\Images
-     * @since 2.0.0
      */
     protected $_cmsWysiwygImages = null;
 
@@ -42,7 +39,6 @@ class Tree extends \Magento\Backend\Block\Template
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      * Json tree builder
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeJson()
     {
@@ -88,7 +83,6 @@ public function getTreeJson()
      * Json source URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeLoaderUrl()
     {
@@ -99,7 +93,6 @@ public function getTreeLoaderUrl()
      * Root node name of tree
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getRootNodeName()
     {
@@ -110,7 +103,6 @@ public function getRootNodeName()
      * Return tree node full path based on current path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeCurrentPath()
     {
@@ -132,7 +124,6 @@ public function getTreeCurrentPath()
      * Get tree widget options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTreeWidgetOptions()
     {
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index 815751b8f8df0..d0d75ea691195 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -10,13 +10,11 @@
 
 /**
  * Cms block content block
- * @since 2.0.0
  */
 class Block extends AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
-     * @since 2.0.0
      */
     protected $_filterProvider;
 
@@ -24,7 +22,6 @@ class Block extends AbstractBlock implements \Magento\Framework\DataObject\Ident
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -32,7 +29,6 @@ class Block extends AbstractBlock implements \Magento\Framework\DataObject\Ident
      * Block factory
      *
      * @var \Magento\Cms\Model\BlockFactory
-     * @since 2.0.0
      */
     protected $_blockFactory;
 
@@ -44,7 +40,6 @@ class Block extends AbstractBlock implements \Magento\Framework\DataObject\Ident
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Cms\Model\BlockFactory $blockFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Prepare Content HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -85,7 +79,6 @@ protected function _toHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Cms/Block/Page.php b/app/code/Magento/Cms/Block/Page.php
index 5d8fd03700103..adbb1251c2d4c 100644
--- a/app/code/Magento/Cms/Block/Page.php
+++ b/app/code/Magento/Cms/Block/Page.php
@@ -11,20 +11,17 @@
  * Cms page content block
  *
  * @api
- * @since 2.0.0
  */
 class Page extends \Magento\Framework\View\Element\AbstractBlock implements
     \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
-     * @since 2.0.0
      */
     protected $_filterProvider;
 
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_page;
 
@@ -32,7 +29,6 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -40,13 +36,11 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
      * Page factory
      *
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
@@ -60,7 +54,6 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -84,7 +77,6 @@ public function __construct(
      * Retrieve Page instance
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     public function getPage()
     {
@@ -105,7 +97,6 @@ public function getPage()
      * Prepare global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -132,7 +123,6 @@ protected function _prepareLayout()
      * @param \Magento\Cms\Model\Page $page
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)
     {
@@ -173,7 +163,6 @@ protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)
      * Prepare HTML content
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -185,7 +174,6 @@ protected function _toHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Cms/Block/Widget/Block.php b/app/code/Magento/Cms/Block/Widget/Block.php
index 1f5552025e056..d8bd483fae5e4 100644
--- a/app/code/Magento/Cms/Block/Widget/Block.php
+++ b/app/code/Magento/Cms/Block/Widget/Block.php
@@ -9,13 +9,11 @@
  * Cms Static Block Widget
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Block extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
-     * @since 2.0.0
      */
     protected $_filterProvider;
 
@@ -23,7 +21,6 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      * Storage for used widgets
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_widgetUsageMap = [];
 
@@ -31,7 +28,6 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      * Block factory
      *
      * @var \Magento\Cms\Model\BlockFactory
-     * @since 2.0.0
      */
     protected $_blockFactory;
 
@@ -40,7 +36,6 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
      * @param \Magento\Cms\Model\BlockFactory $blockFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
      * Prevent blocks recursion if needed
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Cms/Block/Widget/Page/Link.php b/app/code/Magento/Cms/Block/Widget/Page/Link.php
index 9f5f9c4067b1f..baa0306084da7 100644
--- a/app/code/Magento/Cms/Block/Widget/Page/Link.php
+++ b/app/code/Magento/Cms/Block/Widget/Page/Link.php
@@ -7,7 +7,6 @@
 
 /**
  * Widget to display link to CMS page
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento\Widget\Block\BlockInterface
 {
@@ -15,7 +14,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Prepared href attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_href;
 
@@ -23,7 +21,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Prepared title attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_title;
 
@@ -31,13 +28,11 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Prepared anchor text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_anchorText;
 
     /**
      * @var \Magento\Cms\Model\ResourceModel\Page
-     * @since 2.0.0
      */
     protected $_resourcePage;
 
@@ -45,7 +40,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * Cms page
      *
      * @var \Magento\Cms\Helper\Page
-     * @since 2.0.0
      */
     protected $_cmsPage;
 
@@ -54,7 +48,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
      * @param \Magento\Cms\Model\ResourceModel\Page $resourcePage
      * @param \Magento\Cms\Helper\Page $cmsPage
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -72,7 +65,6 @@ public function __construct(
      * or retrieve such using passed page id.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -93,7 +85,6 @@ public function getHref()
      * as parameter or retrieve page title from DB using passed identifier or page id.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -119,7 +110,6 @@ public function getTitle()
      * if title will be blank string, page identifier will be used.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block.php b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
index 8bea721049f5a..2f7088eb27a9d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block
  *
- * @since 2.0.0
  */
 abstract class Block extends \Magento\Backend\App\Action
 {
@@ -23,14 +22,12 @@ abstract class Block extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      *
      * @param \Magento\Backend\Model\View\Result\Page $resultPage
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function initPage($resultPage)
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
index e353f48073d22..96e08b1f74a86 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Cms\Controller\Adminhtml\Block
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Cms\Controller\Adminhtml\Block
      * Delete action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index 3e37ff04fc579..4f823402424d6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Cms\Controller\Adminhtml\Block
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -22,7 +20,6 @@ class Edit extends \Magento\Cms\Controller\Adminhtml\Block
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index 0b7d2ec9dcc01..fb3b961e21290 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Cms\Controller\Adminhtml\Block
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -23,7 +21,6 @@ class Index extends \Magento\Cms\Controller\Adminhtml\Block
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
index 75adc11458bad..b34868571a687 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\InlineEdit
  *
- * @since 2.0.0
  */
 class InlineEdit extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Cms\Api\BlockRepositoryInterface
-     * @since 2.0.0
      */
     protected $blockRepository;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $jsonFactory;
 
@@ -33,7 +30,6 @@ class InlineEdit extends \Magento\Backend\App\Action
      * @param Context $context
      * @param BlockRepository $blockRepository
      * @param JsonFactory $jsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -91,7 +86,6 @@ public function execute()
      * @param BlockInterface $block
      * @param string $errorText
      * @return string
-     * @since 2.0.0
      */
     protected function getErrorWithBlockId(BlockInterface $block, $errorText)
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index b07a97a81a713..c606c7180046e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -13,19 +13,16 @@
 
 /**
  * Class MassDelete
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Backend\App\Action
 {
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -33,7 +30,6 @@ class MassDelete extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -47,7 +43,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
index d83deafe2d41a..6b3cc87abbfe9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -23,7 +21,6 @@ class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Create new CMS block
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 2b676c95fdc61..3683ffa0df525 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Cms\Controller\Adminhtml\Block
 {
@@ -45,7 +44,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
index 1e8bdbb428b56..d969d9b2b7e12 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Block\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -33,7 +30,6 @@ class Chooser extends \Magento\Backend\App\Action
      * @param Context $context
      * @param LayoutFactory $layoutFactory
      * @param RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, LayoutFactory $layoutFactory, RawFactory $resultRawFactory)
     {
@@ -46,7 +42,6 @@ public function __construct(Context $context, LayoutFactory $layoutFactory, RawF
      * Chooser Source action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index 4e295c1d41f94..974828280b719 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Backend\App\Action
 {
@@ -24,7 +23,6 @@ class Delete extends \Magento\Backend\App\Action
      * Delete action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index 798911dab33a0..3768b3ecd8feb 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\App\Action
 {
@@ -26,13 +25,11 @@ class Edit extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -40,7 +37,6 @@ class Edit extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Init actions
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -74,7 +69,6 @@ protected function _initAction()
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index f02d590b95551..164247a7d46c6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
@@ -25,14 +24,12 @@ class Index extends \Magento\Backend\App\Action
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
index 2bdc4a628b7af..6d75f490d42dc 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
@@ -14,7 +14,6 @@
  * Cms page grid inline edit controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InlineEdit extends \Magento\Backend\App\Action
 {
@@ -25,19 +24,16 @@ class InlineEdit extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Cms\Controller\Adminhtml\Page\PostDataProcessor
-     * @since 2.0.0
      */
     protected $dataProcessor;
 
     /**
      * @var \Magento\Cms\Api\PageRepositoryInterface
-     * @since 2.0.0
      */
     protected $pageRepository;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $jsonFactory;
 
@@ -46,7 +42,6 @@ class InlineEdit extends \Magento\Backend\App\Action
      * @param PostDataProcessor $dataProcessor
      * @param PageRepository $pageRepository
      * @param JsonFactory $jsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -114,7 +108,6 @@ public function execute()
      *
      * @param array $postData
      * @return array
-     * @since 2.0.0
      */
     protected function filterPost($postData = [])
     {
@@ -134,7 +127,6 @@ protected function filterPost($postData = [])
      * @param bool $error
      * @param array $messages
      * @return void
-     * @since 2.0.0
      */
     protected function validatePost(array $pageData, \Magento\Cms\Model\Page $page, &$error, array &$messages)
     {
@@ -152,7 +144,6 @@ protected function validatePost(array $pageData, \Magento\Cms\Model\Page $page,
      * @param PageInterface $page
      * @param string $errorText
      * @return string
-     * @since 2.0.0
      */
     protected function getErrorWithPageId(PageInterface $page, $errorText)
     {
@@ -166,7 +157,6 @@ protected function getErrorWithPageId(PageInterface $page, $errorText)
      * @param array $extendedPageData
      * @param array $pageData
      * @return $this
-     * @since 2.0.0
      */
     public function setCmsPageData(\Magento\Cms\Model\Page $page, array $extendedPageData, array $pageData)
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index 027104c5727ea..a711f20d65639 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -12,7 +12,6 @@
 
 /**
  * Class MassDelete
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Backend\App\Action
 {
@@ -25,13 +24,11 @@ class MassDelete extends \Magento\Backend\App\Action
 
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -39,7 +36,6 @@ class MassDelete extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -53,7 +49,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index 2cf648c17f8ba..9402ae9283a0f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -12,19 +12,16 @@
 
 /**
  * Class MassDisable
- * @since 2.0.0
  */
 class MassDisable extends \Magento\Backend\App\Action
 {
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -32,7 +29,6 @@ class MassDisable extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -46,7 +42,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 34d37d32c2560..0cbec4da8dfba 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -12,19 +12,16 @@
 
 /**
  * Class MassEnable
- * @since 2.0.0
  */
 class MassEnable extends \Magento\Backend\App\Action
 {
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -32,7 +29,6 @@ class MassEnable extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -46,7 +42,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 6e214c379a1df..74fd47b99f66d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Backend\App\Action
 {
@@ -22,14 +21,12 @@ class NewAction extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Forward to edit
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index c6b4f6ad8bee6..bce396b3d6b92 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\PostDataProcessor
  *
- * @since 2.0.0
  */
 class PostDataProcessor
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $dateFilter;
 
     /**
      * @var \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
-     * @since 2.0.0
      */
     protected $validatorFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -35,7 +31,6 @@ class PostDataProcessor
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
@@ -52,7 +47,6 @@ public function __construct(
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function filter($data)
     {
@@ -72,7 +66,6 @@ public function filter($data)
      *
      * @param array $data
      * @return bool     Return FALSE if someone item is invalid
-     * @since 2.0.0
      */
     public function validate($data)
     {
@@ -100,7 +93,6 @@ public function validate($data)
      *
      * @param array $data
      * @return bool
-     * @since 2.0.0
      */
     public function validateRequireEntry(array $data)
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 9a14987aa0ef4..4a6ef6779814f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\App\Action
 {
@@ -27,7 +26,6 @@ class Save extends \Magento\Backend\App\Action
 
     /**
      * @var PostDataProcessor
-     * @since 2.0.0
      */
     protected $dataProcessor;
 
@@ -56,7 +54,6 @@ class Save extends \Magento\Backend\App\Action
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
      *
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -80,7 +77,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index 138126085e278..08fe5cd451ae5 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Page\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -31,7 +28,6 @@ class Chooser extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Chooser Source action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index 40d3405772173..137a9f54f91f6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
  *
- * @since 2.0.0
  */
 class Directive extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -31,7 +28,6 @@ class Directive extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Template directives callback
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php
index 9c4247d22e9dd..5dedc7a1a8395 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php
@@ -9,7 +9,6 @@
  * Images manage controller for Cms WYSIWYG editor
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Images extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ abstract class Images extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Init storage
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -55,7 +51,6 @@ protected function _initAction()
      * Register storage model and return it
      *
      * @return \Magento\Cms\Model\Wysiwyg\Images\Storage
-     * @since 2.0.0
      */
     public function getStorage()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
index 8cc32477d9374..76199ba3f3085 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Contents
  *
- * @since 2.0.0
  */
 class Contents extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -30,7 +27,6 @@ class Contents extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Save current path in session
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveSessionCurrentPath()
     {
@@ -61,7 +56,6 @@ protected function _saveSessionCurrentPath()
      * Contents action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
index 3956ee7646fac..fbce0ebddc230 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles
  *
- * @since 2.0.0
  */
 class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -32,7 +29,6 @@ class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Delete file from media storage
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index 55d6b8f8a0f01..6225ad92b52d7 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFolder
  *
- * @since 2.0.0
  */
 class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -30,7 +27,6 @@ class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Delete folder action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
index 28ede0bed6b67..63a1d88c4b9da 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -23,7 +21,6 @@ class Index extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
index f207cae13bfa1..3ff26bda0d76f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\NewFolder
  *
- * @since 2.0.0
  */
 class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -23,7 +21,6 @@ class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * New folder action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 75be6587afbac..9cd96333691bc 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\OnInsert
  *
- * @since 2.0.0
  */
 class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -23,7 +21,6 @@ class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Fire when select image
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
index 98a8e036a6848..ba35f4794ce44 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Thumbnail
  *
- * @since 2.0.0
  */
 class Thumbnail extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -25,7 +23,6 @@ class Thumbnail extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Generate image thumbnail on the fly
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
index e028d5f3c1a7c..2c62cf77b3883 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\TreeJson
  *
- * @since 2.0.0
  */
 class TreeJson extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -30,7 +27,6 @@ class TreeJson extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Tree json action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 96b936fb8918e..b433d7ee7f389 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload
  *
- * @since 2.0.0
  */
 class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -23,7 +21,6 @@ class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Files upload processing
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultIndex.php b/app/code/Magento/Cms/Controller/Index/DefaultIndex.php
index 890660cee2348..1c0bacec9ceea 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultIndex.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultIndex.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Cms\Controller\Index\DefaultIndex
  *
- * @since 2.0.0
  */
 class DefaultIndex extends DefaultNoRoute
 {
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
index a5590814d7b6b..e3c0e0b3c6584 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -8,20 +8,17 @@
 /**
  * Class \Magento\Cms\Controller\Index\DefaultNoRoute
  *
- * @since 2.0.0
  */
 class DefaultNoRoute extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -33,7 +30,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index cb7716c3badbf..3fcae3bf351d9 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Cms\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * @param string|null $coreRoute
      * @return \Magento\Framework\Controller\Result\Forward
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($coreRoute = null)
     {
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 7d358b82a43e2..45fae0ff4fd9f 100644
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Cms\Controller\Noroute\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Render CMS 404 Not found page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
index 0eef72d9428be..1538d312bd9b6 100644
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Cms\Controller\Page\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * View CMS page action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
index 5bb409322a3db..7d8e5aaa53897 100644
--- a/app/code/Magento/Cms/Controller/Router.php
+++ b/app/code/Magento/Cms/Controller/Router.php
@@ -7,13 +7,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Router implements \Magento\Framework\App\RouterInterface
 {
     /**
      * @var \Magento\Framework\App\ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
@@ -21,7 +19,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -29,7 +26,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -37,7 +33,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Page factory
      *
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
@@ -45,7 +40,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Config primary
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -53,7 +47,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Url
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -61,7 +54,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * Response
      *
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
@@ -72,7 +64,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ActionFactory $actionFactory,
@@ -95,7 +86,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ActionInterface|null
-     * @since 2.0.0
      */
     public function match(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 37e8438cd2b94..bf51c5f0210e9 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -12,7 +12,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  * @SuppressWarnings(PHPMD.NPathComplexity)
- * @since 2.0.0
  */
 class Page extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -35,25 +34,21 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * Design package instance
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_page;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -61,7 +56,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -69,19 +63,16 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * Page factory
      *
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -98,7 +89,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -128,7 +118,6 @@ public function __construct(
      * @param Action $action
      * @param null $pageId
      * @return \Magento\Framework\View\Result\Page|bool
-     * @since 2.0.0
      */
     public function prepareResultPage(Action $action, $pageId = null)
     {
@@ -193,7 +182,6 @@ public function prepareResultPage(Action $action, $pageId = null)
      *
      * @param string $pageId
      * @return string
-     * @since 2.0.0
      */
     public function getPageUrl($pageId = null)
     {
@@ -219,7 +207,6 @@ public function getPageUrl($pageId = null)
      * @param bool $inRange
      * @param \Magento\Framework\View\Result\Page $resultPage
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     protected function setLayoutType($inRange, $resultPage)
     {
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index 619c1d81d219a..f830910ca1e4f 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -9,21 +9,18 @@
 
 /**
  * Wysiwyg Images Helper
- * @since 2.0.0
  */
 class Images extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Current directory path
      * @var string
-     * @since 2.0.0
      */
     protected $_currentPath;
 
     /**
      * Current directory URL
      * @var string
-     * @since 2.0.0
      */
     protected $_currentUrl;
 
@@ -31,13 +28,11 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * Currenty selected store ID if applicable
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId = null;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
@@ -45,7 +40,6 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData;
 
@@ -53,7 +47,6 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -64,7 +57,6 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Backend\Helper\Data $backendData
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -85,7 +77,6 @@ public function __construct(
      *
      * @param int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($store)
     {
@@ -97,7 +88,6 @@ public function setStoreId($store)
      * Images Storage root directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStorageRoot()
     {
@@ -108,7 +98,6 @@ public function getStorageRoot()
      * Images Storage base URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -119,7 +108,6 @@ public function getBaseUrl()
      * Ext Tree node key name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeNodeName()
     {
@@ -131,7 +119,6 @@ public function getTreeNodeName()
      *
      * @param string $path Path to file/directory
      * @return string
-     * @since 2.0.0
      */
     public function convertPathToId($path)
     {
@@ -144,7 +131,6 @@ public function convertPathToId($path)
      *
      * @param string $id
      * @return string
-     * @since 2.0.0
      */
     public function convertIdToPath($id)
     {
@@ -159,7 +145,6 @@ public function convertIdToPath($id)
      * Check whether using static URLs is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUsingStaticUrlsAllowed()
     {
@@ -178,7 +163,6 @@ public function isUsingStaticUrlsAllowed()
      * @param string $filename Filename transferred via Ajax
      * @param bool $renderAsTag Leave image HTML as is or transform it to controller directive
      * @return string
-     * @since 2.0.0
      */
     public function getImageHtmlDeclaration($filename, $renderAsTag = false)
     {
@@ -205,7 +189,6 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCurrentPath()
     {
@@ -236,7 +219,6 @@ public function getCurrentPath()
      * Return URL based on current selected directory or root directory for startup
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentUrl()
     {
@@ -257,7 +239,6 @@ public function getCurrentUrl()
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function idEncode($string)
     {
@@ -269,7 +250,6 @@ public function idEncode($string)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function idDecode($string)
     {
@@ -283,7 +263,6 @@ public function idDecode($string)
      * @param string $filename
      * @param int $maxLength Maximum filename
      * @return string Truncated filename
-     * @since 2.0.0
      */
     public function getShortFilename($filename, $maxLength = 20)
     {
diff --git a/app/code/Magento/Cms/Model/Block.php b/app/code/Magento/Cms/Model/Block.php
index 1445e1e9e6c25..2fa80f602e966 100644
--- a/app/code/Magento/Cms/Model/Block.php
+++ b/app/code/Magento/Cms/Model/Block.php
@@ -17,7 +17,6 @@
  * @method ResourceCmsBlock getResource()
  * @method Block setStoreId(array $storeId)
  * @method array getStoreId()
- * @since 2.0.0
  */
 class Block extends AbstractModel implements BlockInterface, IdentityInterface
 {
@@ -34,23 +33,18 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
 
     /**#@-*/
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_cacheTag = self::CACHE_TAG;
 
     /**
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'cms_block';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +56,6 @@ protected function _construct()
      *
      * @return AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -79,7 +72,6 @@ public function beforeSave()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -90,7 +82,6 @@ public function getIdentities()
      * Retrieve block id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -101,7 +92,6 @@ public function getId()
      * Retrieve block identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier()
     {
@@ -112,7 +102,6 @@ public function getIdentifier()
      * Retrieve block title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -123,7 +112,6 @@ public function getTitle()
      * Retrieve block content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -134,7 +122,6 @@ public function getContent()
      * Retrieve block creation time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreationTime()
     {
@@ -145,7 +132,6 @@ public function getCreationTime()
      * Retrieve block update time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateTime()
     {
@@ -156,7 +142,6 @@ public function getUpdateTime()
      * Is active
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isActive()
     {
@@ -168,7 +153,6 @@ public function isActive()
      *
      * @param int $id
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -180,7 +164,6 @@ public function setId($id)
      *
      * @param string $identifier
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setIdentifier($identifier)
     {
@@ -192,7 +175,6 @@ public function setIdentifier($identifier)
      *
      * @param string $title
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -204,7 +186,6 @@ public function setTitle($title)
      *
      * @param string $content
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -216,7 +197,6 @@ public function setContent($content)
      *
      * @param string $creationTime
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setCreationTime($creationTime)
     {
@@ -228,7 +208,6 @@ public function setCreationTime($creationTime)
      *
      * @param string $updateTime
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setUpdateTime($updateTime)
     {
@@ -240,7 +219,6 @@ public function setUpdateTime($updateTime)
      *
      * @param bool|int $isActive
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
@@ -251,7 +229,6 @@ public function setIsActive($isActive)
      * Receive page store ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getStores()
     {
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index e2e2b39e158aa..0bb9a688907d3 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -20,55 +20,46 @@
 /**
  * Class BlockRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BlockRepository implements BlockRepositoryInterface
 {
     /**
      * @var ResourceBlock
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var BlockFactory
-     * @since 2.0.0
      */
     protected $blockFactory;
 
     /**
      * @var BlockCollectionFactory
-     * @since 2.0.0
      */
     protected $blockCollectionFactory;
 
     /**
      * @var Data\BlockSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Cms\Api\Data\BlockInterfaceFactory
-     * @since 2.0.0
      */
     protected $dataBlockFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -88,7 +79,6 @@ class BlockRepository implements BlockRepositoryInterface
      * @param DataObjectProcessor $dataObjectProcessor
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         ResourceBlock $resource,
@@ -118,7 +108,6 @@ public function __construct(
      * @param \Magento\Cms\Api\Data\BlockInterface $block
      * @return Block
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(Data\BlockInterface $block)
     {
@@ -140,7 +129,6 @@ public function save(Data\BlockInterface $block)
      * @param string $blockId
      * @return Block
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($blockId)
     {
@@ -159,7 +147,6 @@ public function getById($blockId)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria
      * @return \Magento\Cms\Api\Data\BlockSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria)
     {
@@ -182,7 +169,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
      * @param \Magento\Cms\Api\Data\BlockInterface $block
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(Data\BlockInterface $block)
     {
@@ -201,7 +187,6 @@ public function delete(Data\BlockInterface $block)
      * @return bool
      * @throws CouldNotDeleteException
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function deleteById($blockId)
     {
diff --git a/app/code/Magento/Cms/Model/Config/Source/Page.php b/app/code/Magento/Cms/Model/Config/Source/Page.php
index 954009b7d83a4..9ac1208308126 100644
--- a/app/code/Magento/Cms/Model/Config/Source/Page.php
+++ b/app/code/Magento/Cms/Model/Config/Source/Page.php
@@ -9,25 +9,21 @@
 
 /**
  * Class Page
- * @since 2.0.0
  */
 class Page implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $collectionFactory
@@ -39,7 +35,6 @@ public function __construct(
      * To option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php
index bdaf73384865b..763b93f520527 100644
--- a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php
+++ b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php
@@ -7,13 +7,11 @@
 
 /**
  * Configuration source model for Wysiwyg toggling
- * @since 2.0.0
  */
 class Enabled implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 6ee071ed24da4..1c1a19fd1a3e6 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -22,7 +22,6 @@
  * @method Page setStoreId(array $storeId)
  * @method array getStoreId()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Page extends AbstractModel implements PageInterface, IdentityInterface
 {
@@ -45,7 +44,6 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheTag = self::CACHE_TAG;
 
@@ -53,7 +51,6 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'cms_page';
 
@@ -67,7 +64,6 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +76,6 @@ protected function _construct()
      * @param int|null $id
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function load($id, $field = null)
     {
@@ -94,7 +89,6 @@ public function load($id, $field = null)
      * Load No-Route Page
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     public function noRoutePage()
     {
@@ -105,7 +99,6 @@ public function noRoutePage()
      * Receive page store ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -119,7 +112,6 @@ public function getStores()
      * @param string $identifier
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function checkIdentifier($identifier, $storeId)
     {
@@ -131,7 +123,6 @@ public function checkIdentifier($identifier, $storeId)
      * Available event cms_page_get_available_statuses to customize statuses.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableStatuses()
     {
@@ -142,7 +133,6 @@ public function getAvailableStatuses()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -153,7 +143,6 @@ public function getIdentities()
      * Get ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -164,7 +153,6 @@ public function getId()
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier()
     {
@@ -175,7 +163,6 @@ public function getIdentifier()
      * Get title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -186,7 +173,6 @@ public function getTitle()
      * Get page layout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageLayout()
     {
@@ -208,7 +194,6 @@ public function getMetaTitle()
      * Get meta keywords
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMetaKeywords()
     {
@@ -219,7 +204,6 @@ public function getMetaKeywords()
      * Get meta description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMetaDescription()
     {
@@ -230,7 +214,6 @@ public function getMetaDescription()
      * Get content heading
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentHeading()
     {
@@ -241,7 +224,6 @@ public function getContentHeading()
      * Get content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -252,7 +234,6 @@ public function getContent()
      * Get creation time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreationTime()
     {
@@ -263,7 +244,6 @@ public function getCreationTime()
      * Get update time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateTime()
     {
@@ -274,7 +254,6 @@ public function getUpdateTime()
      * Get sort order
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -285,7 +264,6 @@ public function getSortOrder()
      * Get layout update xml
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLayoutUpdateXml()
     {
@@ -296,7 +274,6 @@ public function getLayoutUpdateXml()
      * Get custom theme
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomTheme()
     {
@@ -307,7 +284,6 @@ public function getCustomTheme()
      * Get custom root template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomRootTemplate()
     {
@@ -318,7 +294,6 @@ public function getCustomRootTemplate()
      * Get custom layout update xml
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomLayoutUpdateXml()
     {
@@ -329,7 +304,6 @@ public function getCustomLayoutUpdateXml()
      * Get custom theme from
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomThemeFrom()
     {
@@ -340,7 +314,6 @@ public function getCustomThemeFrom()
      * Get custom theme to
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomThemeTo()
     {
@@ -351,7 +324,6 @@ public function getCustomThemeTo()
      * Is active
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isActive()
     {
@@ -363,7 +335,6 @@ public function isActive()
      *
      * @param int $id
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -375,7 +346,6 @@ public function setId($id)
      *
      * @param string $identifier
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setIdentifier($identifier)
     {
@@ -387,7 +357,6 @@ public function setIdentifier($identifier)
      *
      * @param string $title
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -399,7 +368,6 @@ public function setTitle($title)
      *
      * @param string $pageLayout
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setPageLayout($pageLayout)
     {
@@ -423,7 +391,6 @@ public function setMetaTitle($metaTitle)
      *
      * @param string $metaKeywords
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setMetaKeywords($metaKeywords)
     {
@@ -435,7 +402,6 @@ public function setMetaKeywords($metaKeywords)
      *
      * @param string $metaDescription
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setMetaDescription($metaDescription)
     {
@@ -447,7 +413,6 @@ public function setMetaDescription($metaDescription)
      *
      * @param string $contentHeading
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setContentHeading($contentHeading)
     {
@@ -459,7 +424,6 @@ public function setContentHeading($contentHeading)
      *
      * @param string $content
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -471,7 +435,6 @@ public function setContent($content)
      *
      * @param string $creationTime
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCreationTime($creationTime)
     {
@@ -483,7 +446,6 @@ public function setCreationTime($creationTime)
      *
      * @param string $updateTime
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setUpdateTime($updateTime)
     {
@@ -495,7 +457,6 @@ public function setUpdateTime($updateTime)
      *
      * @param string $sortOrder
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -507,7 +468,6 @@ public function setSortOrder($sortOrder)
      *
      * @param string $layoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setLayoutUpdateXml($layoutUpdateXml)
     {
@@ -519,7 +479,6 @@ public function setLayoutUpdateXml($layoutUpdateXml)
      *
      * @param string $customTheme
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomTheme($customTheme)
     {
@@ -531,7 +490,6 @@ public function setCustomTheme($customTheme)
      *
      * @param string $customRootTemplate
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomRootTemplate($customRootTemplate)
     {
@@ -543,7 +501,6 @@ public function setCustomRootTemplate($customRootTemplate)
      *
      * @param string $customLayoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomLayoutUpdateXml($customLayoutUpdateXml)
     {
@@ -555,7 +512,6 @@ public function setCustomLayoutUpdateXml($customLayoutUpdateXml)
      *
      * @param string $customThemeFrom
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomThemeFrom($customThemeFrom)
     {
@@ -567,7 +523,6 @@ public function setCustomThemeFrom($customThemeFrom)
      *
      * @param string $customThemeTo
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setCustomThemeTo($customThemeTo)
     {
@@ -579,7 +534,6 @@ public function setCustomThemeTo($customThemeTo)
      *
      * @param int|bool $isActive
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/CustomLayout.php b/app/code/Magento/Cms/Model/Page/Source/CustomLayout.php
index 5c7c4aa001c43..f66e695a67647 100644
--- a/app/code/Magento/Cms/Model/Page/Source/CustomLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/CustomLayout.php
@@ -7,13 +7,11 @@
 
 /**
  * Custom layout source
- * @since 2.0.0
  */
 class CustomLayout extends PageLayout
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/IsActive.php b/app/code/Magento/Cms/Model/Page/Source/IsActive.php
index db9958abfe6c8..19d6719a5d1f3 100644
--- a/app/code/Magento/Cms/Model/Page/Source/IsActive.php
+++ b/app/code/Magento/Cms/Model/Page/Source/IsActive.php
@@ -9,13 +9,11 @@
 
 /**
  * Class IsActive
- * @since 2.0.0
  */
 class IsActive implements OptionSourceInterface
 {
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $cmsPage;
 
@@ -23,7 +21,6 @@ class IsActive implements OptionSourceInterface
      * Constructor
      *
      * @param \Magento\Cms\Model\Page $cmsPage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Cms\Model\Page $cmsPage)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Cms\Model\Page $cmsPage)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/IsActiveFilter.php b/app/code/Magento/Cms/Model/Page/Source/IsActiveFilter.php
index eb12bb681b901..de74e1128f1ea 100644
--- a/app/code/Magento/Cms/Model/Page/Source/IsActiveFilter.php
+++ b/app/code/Magento/Cms/Model/Page/Source/IsActiveFilter.php
@@ -7,13 +7,11 @@
 
 /**
  * Is active filter source
- * @since 2.0.0
  */
 class IsActiveFilter extends IsActive
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
index c71cfeb27c5e3..fb759348759b2 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
@@ -10,19 +10,16 @@
 
 /**
  * Class PageLayout
- * @since 2.0.0
  */
 class PageLayout implements OptionSourceInterface
 {
     /**
      * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
-     * @since 2.0.0
      */
     protected $pageLayoutBuilder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
@@ -30,7 +27,6 @@ class PageLayout implements OptionSourceInterface
      * Constructor
      *
      * @param BuilderInterface $pageLayoutBuilder
-     * @since 2.0.0
      */
     public function __construct(BuilderInterface $pageLayoutBuilder)
     {
@@ -41,7 +37,6 @@ public function __construct(BuilderInterface $pageLayoutBuilder)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayoutFilter.php b/app/code/Magento/Cms/Model/Page/Source/PageLayoutFilter.php
index 491a13637d359..dfa6ac76948cb 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayoutFilter.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayoutFilter.php
@@ -7,13 +7,11 @@
 
 /**
  * Page layout filter source
- * @since 2.0.0
  */
 class PageLayoutFilter extends PageLayout
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/Page/Source/Theme.php b/app/code/Magento/Cms/Model/Page/Source/Theme.php
index 1980cd7369aee..63d7b4af3131c 100644
--- a/app/code/Magento/Cms/Model/Page/Source/Theme.php
+++ b/app/code/Magento/Cms/Model/Page/Source/Theme.php
@@ -10,13 +10,11 @@
 
 /**
  * Class Theme
- * @since 2.0.0
  */
 class Theme implements OptionSourceInterface
 {
     /**
      * @var \Magento\Framework\View\Design\Theme\Label\ListInterface
-     * @since 2.0.0
      */
     protected $themeList;
 
@@ -24,7 +22,6 @@ class Theme implements OptionSourceInterface
      * Constructor
      *
      * @param ListInterface $themeList
-     * @since 2.0.0
      */
     public function __construct(ListInterface $themeList)
     {
@@ -35,7 +32,6 @@ public function __construct(ListInterface $themeList)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 8cc5418034d5d..fd53c0d56c1b4 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -20,55 +20,46 @@
 /**
  * Class PageRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PageRepository implements PageRepositoryInterface
 {
     /**
      * @var ResourcePage
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $pageFactory;
 
     /**
      * @var PageCollectionFactory
-     * @since 2.0.0
      */
     protected $pageCollectionFactory;
 
     /**
      * @var Data\PageSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Cms\Api\Data\PageInterfaceFactory
-     * @since 2.0.0
      */
     protected $dataPageFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -88,7 +79,6 @@ class PageRepository implements PageRepositoryInterface
      * @param DataObjectProcessor $dataObjectProcessor
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         ResourcePage $resource,
@@ -118,7 +108,6 @@ public function __construct(
      * @param \Magento\Cms\Api\Data\PageInterface $page
      * @return Page
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
@@ -143,7 +132,6 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
      * @param string $pageId
      * @return Page
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($pageId)
     {
@@ -162,7 +150,6 @@ public function getById($pageId)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria
      * @return \Magento\Cms\Api\Data\PageSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria)
     {
@@ -185,7 +172,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
      * @param \Magento\Cms\Api\Data\PageInterface $page
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(\Magento\Cms\Api\Data\PageInterface $page)
     {
@@ -207,7 +193,6 @@ public function delete(\Magento\Cms\Api\Data\PageInterface $page)
      * @return bool
      * @throws CouldNotDeleteException
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function deleteById($pageId)
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
index 37a5ce9eac2ee..4535b1bd1f9dd 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
@@ -9,7 +9,6 @@
 
 /**
  * Abstract collection of CMS pages and blocks
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -36,7 +34,6 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -59,7 +56,6 @@ public function __construct(
      * @param string $tableName
      * @param string|null $linkField
      * @return void
-     * @since 2.0.0
      */
     protected function performAfterLoad($tableName, $linkField)
     {
@@ -103,7 +99,6 @@ protected function performAfterLoad($tableName, $linkField)
      * @param array|string $field
      * @param string|int|array|null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -120,7 +115,6 @@ public function addFieldToFilter($field, $condition = null)
      * @param int|array|Store $store
      * @param bool $withAdmin
      * @return $this
-     * @since 2.0.0
      */
     abstract public function addStoreFilter($store, $withAdmin = true);
 
@@ -130,7 +124,6 @@ abstract public function addStoreFilter($store, $withAdmin = true);
      * @param int|array|Store $store
      * @param bool $withAdmin
      * @return void
-     * @since 2.0.0
      */
     protected function performAddStoreFilter($store, $withAdmin = true)
     {
@@ -155,7 +148,6 @@ protected function performAddStoreFilter($store, $withAdmin = true)
      * @param string $tableName
      * @param string|null $linkField
      * @return void
-     * @since 2.0.0
      */
     protected function joinStoreRelationTable($tableName, $linkField)
     {
@@ -177,7 +169,6 @@ protected function joinStoreRelationTable($tableName, $linkField)
      * Extra GROUP BY strip added.
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index 1efa18cac9738..797edd7ee1cf9 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -19,7 +19,6 @@
 /**
  * CMS block model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Block extends AbstractDb
 {
@@ -27,7 +26,6 @@ class Block extends AbstractDb
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -49,7 +47,6 @@ class Block extends AbstractDb
      * @param EntityManager $entityManager
      * @param MetadataPool $metadataPool
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -68,7 +65,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -90,7 +86,6 @@ public function getConnection()
      * @param AbstractModel $object
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -138,7 +133,6 @@ private function getBlockId(AbstractModel $object, $value, $field = null)
      * @param mixed $value
      * @param string $field field to load by (defaults to model id)
      * @return $this
-     * @since 2.0.0
      */
     public function load(AbstractModel $object, $value, $field = null)
     {
@@ -156,7 +150,6 @@ public function load(AbstractModel $object, $value, $field = null)
      * @param mixed $value
      * @param \Magento\Cms\Model\Block|AbstractModel $object
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -188,7 +181,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param AbstractModel $object
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsUniqueBlockToStores(AbstractModel $object)
     {
@@ -227,7 +219,6 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
      *
      * @param int $id
      * @return array
-     * @since 2.0.0
      */
     public function lookupStoreIds($id)
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
index a3377535ccabd..3c586a56d90cc 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
@@ -10,13 +10,11 @@
 
 /**
  * CMS Block Collection
- * @since 2.0.0
  */
 class Collection extends AbstractCollection
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'block_id';
 
@@ -24,7 +22,6 @@ class Collection extends AbstractCollection
      * Perform operations after collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -39,7 +36,6 @@ protected function _afterLoad()
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
      * Returns pairs block_id - title
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -65,7 +60,6 @@ public function toOptionArray()
      * @param int|array|\Magento\Store\Model\Store $store
      * @param bool $withAdmin
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($store, $withAdmin = true)
     {
@@ -78,7 +72,6 @@ public function addStoreFilter($store, $withAdmin = true)
      * Join store relation table if there is store filter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
index 80f2ae22fc6ca..f45d9ee223106 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
@@ -11,13 +11,11 @@
 
 /**
  * Collection for displaying grid of cms blocks
- * @since 2.0.0
  */
 class Collection extends BlockCollection implements SearchResultInterface
 {
     /**
      * @var AggregationInterface
-     * @since 2.0.0
      */
     protected $aggregations;
 
@@ -37,7 +35,6 @@ class Collection extends BlockCollection implements SearchResultInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -72,7 +69,6 @@ public function __construct(
 
     /**
      * @return AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations()
     {
@@ -82,7 +78,6 @@ public function getAggregations()
     /**
      * @param AggregationInterface $aggregations
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregations($aggregations)
     {
@@ -93,7 +88,6 @@ public function setAggregations($aggregations)
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface|null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -106,7 +100,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
     {
@@ -117,7 +110,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -130,7 +122,6 @@ public function getTotalCount()
      * @param int $totalCount
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -143,7 +134,6 @@ public function setTotalCount($totalCount)
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page.php b/app/code/Magento/Cms/Model/ResourceModel/Page.php
index 1330a632c736d..9808e8a23e1cb 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page.php
@@ -22,7 +22,6 @@
 /**
  * Cms page mysql resource
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Page extends AbstractDb
 {
@@ -30,7 +29,6 @@ class Page extends AbstractDb
      * Store model
      *
      * @var null|Store
-     * @since 2.0.0
      */
     protected $_store = null;
 
@@ -38,13 +36,11 @@ class Page extends AbstractDb
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -67,7 +63,6 @@ class Page extends AbstractDb
      * @param EntityManager $entityManager
      * @param MetadataPool $metadataPool
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -88,7 +83,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -110,7 +104,6 @@ public function getConnection()
      * @param AbstractModel $object
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -177,7 +170,6 @@ private function getPageId(AbstractModel $object, $value, $field = null)
      * @param mixed $value
      * @param string $field field to load by (defaults to model id)
      * @return $this
-     * @since 2.0.0
      */
     public function load(AbstractModel $object, $value, $field = null)
     {
@@ -195,7 +187,6 @@ public function load(AbstractModel $object, $value, $field = null)
      * @param mixed $value
      * @param CmsPage|AbstractModel $object
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -230,7 +221,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param int|array $store
      * @param int $isActive
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadByIdentifierSelect($identifier, $store, $isActive = null)
     {
@@ -259,7 +249,6 @@ protected function _getLoadByIdentifierSelect($identifier, $store, $isActive = n
      *
      * @param AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     protected function isNumericPageIdentifier(AbstractModel $object)
     {
@@ -271,7 +260,6 @@ protected function isNumericPageIdentifier(AbstractModel $object)
      *
      * @param AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidPageIdentifier(AbstractModel $object)
     {
@@ -285,7 +273,6 @@ protected function isValidPageIdentifier(AbstractModel $object)
      * @param string $identifier
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function checkIdentifier($identifier, $storeId)
     {
@@ -306,7 +293,6 @@ public function checkIdentifier($identifier, $storeId)
      *
      * @param string $identifier
      * @return string|false
-     * @since 2.0.0
      */
     public function getCmsPageTitleByIdentifier($identifier)
     {
@@ -329,7 +315,6 @@ public function getCmsPageTitleByIdentifier($identifier)
      *
      * @param string $id
      * @return string|false
-     * @since 2.0.0
      */
     public function getCmsPageTitleById($id)
     {
@@ -348,7 +333,6 @@ public function getCmsPageTitleById($id)
      *
      * @param string $id
      * @return string|false
-     * @since 2.0.0
      */
     public function getCmsPageIdentifierById($id)
     {
@@ -367,7 +351,6 @@ public function getCmsPageIdentifierById($id)
      *
      * @param int $pageId
      * @return array
-     * @since 2.0.0
      */
     public function lookupStoreIds($pageId)
     {
@@ -393,7 +376,6 @@ public function lookupStoreIds($pageId)
      *
      * @param Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -405,7 +387,6 @@ public function setStore($store)
      * Retrieve store model
      *
      * @return Store
-     * @since 2.0.0
      */
     public function getStore()
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
index c26f6f45a9a11..7250eeaa47c0e 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
@@ -10,13 +10,11 @@
 
 /**
  * CMS page collection
- * @since 2.0.0
  */
 class Collection extends AbstractCollection
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'page_id';
 
@@ -24,7 +22,6 @@ class Collection extends AbstractCollection
      * Load data for preview flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_previewFlag;
 
@@ -32,7 +29,6 @@ class Collection extends AbstractCollection
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +42,6 @@ protected function _construct()
      * and pairs identifier|page_id - title for non-unique after first
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionIdArray()
     {
@@ -75,7 +70,6 @@ public function toOptionIdArray()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstStoreFlag($flag = false)
     {
@@ -89,7 +83,6 @@ public function setFirstStoreFlag($flag = false)
      * @param int|array|\Magento\Store\Model\Store $store
      * @param bool $withAdmin
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($store, $withAdmin = true)
     {
@@ -103,7 +96,6 @@ public function addStoreFilter($store, $withAdmin = true)
      * Perform operations after collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -118,7 +110,6 @@ protected function _afterLoad()
      * Perform operations before rendering filters
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
index 2f81ad039ed74..c5c43c3120dcc 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
@@ -12,13 +12,11 @@
 /**
  * Class Collection
  * Collection for displaying grid of sales documents
- * @since 2.0.0
  */
 class Collection extends PageCollection implements SearchResultInterface
 {
     /**
      * @var AggregationInterface
-     * @since 2.0.0
      */
     protected $aggregations;
 
@@ -38,7 +36,6 @@ class Collection extends PageCollection implements SearchResultInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -73,7 +70,6 @@ public function __construct(
 
     /**
      * @return AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations()
     {
@@ -83,7 +79,6 @@ public function getAggregations()
     /**
      * @param AggregationInterface $aggregations
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregations($aggregations)
     {
@@ -94,7 +89,6 @@ public function setAggregations($aggregations)
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface|null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -107,7 +101,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
     {
@@ -118,7 +111,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -131,7 +123,6 @@ public function getTotalCount()
      * @param int $totalCount
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -144,7 +135,6 @@ public function setTotalCount($totalCount)
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
diff --git a/app/code/Magento/Cms/Model/Template/Filter.php b/app/code/Magento/Cms/Model/Template/Filter.php
index 4a282de533e68..2dcbfbc4ab598 100644
--- a/app/code/Magento/Cms/Model/Template/Filter.php
+++ b/app/code/Magento/Cms/Model/Template/Filter.php
@@ -7,7 +7,6 @@
 
 /**
  * Cms Template Filter Model
- * @since 2.0.0
  */
 class Filter extends \Magento\Email\Model\Template\Filter
 {
@@ -15,7 +14,6 @@ class Filter extends \Magento\Email\Model\Template\Filter
      * Whether to allow SID in store directive: AUTO
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useSessionInUrl;
 
@@ -24,7 +22,6 @@ class Filter extends \Magento\Email\Model\Template\Filter
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionInUrl($flag)
     {
@@ -37,7 +34,6 @@ public function setUseSessionInUrl($flag)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function mediaDirective($construction)
     {
diff --git a/app/code/Magento/Cms/Model/Template/FilterProvider.php b/app/code/Magento/Cms/Model/Template/FilterProvider.php
index 089d2607537db..02e337003f45c 100644
--- a/app/code/Magento/Cms/Model/Template/FilterProvider.php
+++ b/app/code/Magento/Cms/Model/Template/FilterProvider.php
@@ -9,31 +9,26 @@
 
 /**
  * Filter provider model
- * @since 2.0.0
  */
 class FilterProvider
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_pageFilter;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockFilter;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_instanceList;
 
@@ -41,7 +36,6 @@ class FilterProvider
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $pageFilter
      * @param string $blockFilter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -57,7 +51,6 @@ public function __construct(
      * @param string $instanceName
      * @return \Magento\Framework\Filter\Template
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _getFilterInstance($instanceName)
     {
@@ -75,7 +68,6 @@ protected function _getFilterInstance($instanceName)
 
     /**
      * @return \Magento\Framework\Filter\Template
-     * @since 2.0.0
      */
     public function getBlockFilter()
     {
@@ -84,7 +76,6 @@ public function getBlockFilter()
 
     /**
      * @return \Magento\Framework\Filter\Template
-     * @since 2.0.0
      */
     public function getPageFilter()
     {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 912604a90637a..6776aad2b4098 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -13,7 +13,6 @@
  * Wysiwyg Config for Editor HTML Element
  *
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\DataObject implements ConfigInterface
 {
@@ -49,25 +48,21 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Variable\Model\Variable\Config
-     * @since 2.0.0
      */
     protected $_variableConfig;
 
     /**
      * @var \Magento\Widget\Model\Widget\Config
-     * @since 2.0.0
      */
     protected $_widgetConfig;
 
@@ -75,7 +70,6 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -83,25 +77,21 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_windowSize;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -124,7 +114,6 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      * @param array $windowSize
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\UrlInterface $backendUrl,
@@ -167,7 +156,6 @@ public function __construct(
      *
      * @param array|\Magento\Framework\DataObject $data Object constructor params to override default config values
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig($data = [])
     {
@@ -232,7 +220,6 @@ public function getConfig($data = [])
      * Return path for skin images placeholder
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSkinImagePlaceholderPath()
     {
@@ -245,7 +232,6 @@ public function getSkinImagePlaceholderPath()
      * Check whether Wysiwyg is enabled or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -261,7 +247,6 @@ public function isEnabled()
      * Check whether Wysiwyg is loaded on demand or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index c222829bbe3fd..f879f2edcafb2 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Storage extends \Magento\Framework\DataObject
 {
@@ -30,7 +29,6 @@ class Storage extends \Magento\Framework\DataObject
      * Config object
      *
      * @var \Magento\Framework\App\Config\Element
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -38,25 +36,21 @@ class Storage extends \Magento\Framework\DataObject
      * Config object as array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configAsArray;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var \Magento\Framework\Image\AdapterFactory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -64,7 +58,6 @@ class Storage extends \Magento\Framework\DataObject
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
@@ -72,37 +65,31 @@ class Storage extends \Magento\Framework\DataObject
      * Cms wysiwyg images
      *
      * @var \Magento\Cms\Helper\Wysiwyg\Images
-     * @since 2.0.0
      */
     protected $_cmsWysiwygImages = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_resizeParameters;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_extensions;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_dirs;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -110,7 +97,6 @@ class Storage extends \Magento\Framework\DataObject
      * Directory database factory
      *
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_directoryDatabaseFactory;
 
@@ -118,7 +104,6 @@ class Storage extends \Magento\Framework\DataObject
      * Storage database factory
      *
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_storageDatabaseFactory;
 
@@ -126,7 +111,6 @@ class Storage extends \Magento\Framework\DataObject
      * Storage file factory
      *
      * @var \Magento\MediaStorage\Model\File\Storage\FileFactory
-     * @since 2.0.0
      */
     protected $_storageFileFactory;
 
@@ -134,7 +118,6 @@ class Storage extends \Magento\Framework\DataObject
      * Storage collection factory
      *
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storageCollectionFactory;
 
@@ -142,7 +125,6 @@ class Storage extends \Magento\Framework\DataObject
      * Uploader factory
      *
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
@@ -167,7 +149,6 @@ class Storage extends \Magento\Framework\DataObject
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
@@ -210,7 +191,6 @@ public function __construct(
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     protected function createSubDirectories($path)
     {
@@ -229,7 +209,6 @@ protected function createSubDirectories($path)
      * Prepare and get conditions for exclude directories
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getConditionsForExcludeDirs()
     {
@@ -257,7 +236,6 @@ protected function getConditionsForExcludeDirs()
      * @param \Magento\Framework\Data\Collection\Filesystem $collection
      * @param array $conditions
      * @return \Magento\Framework\Data\Collection\Filesystem
-     * @since 2.0.0
      */
     protected function removeItemFromCollection($collection, $conditions)
     {
@@ -281,7 +259,6 @@ protected function removeItemFromCollection($collection, $conditions)
      *
      * @param string $path Parent directory path
      * @return \Magento\Framework\Data\Collection\Filesystem
-     * @since 2.0.0
      */
     public function getDirsCollection($path)
     {
@@ -303,7 +280,6 @@ public function getDirsCollection($path)
      * @param string $path Parent directory path
      * @param string $type Type of storage, e.g. image, media etc.
      * @return \Magento\Framework\Data\Collection\Filesystem
-     * @since 2.0.0
      */
     public function getFilesCollection($path, $type = null)
     {
@@ -370,7 +346,6 @@ public function getFilesCollection($path, $type = null)
      *
      * @param string $path Path to the directory
      * @return \Magento\Cms\Model\Wysiwyg\Images\Storage\Collection
-     * @since 2.0.0
      */
     public function getCollection($path = null)
     {
@@ -389,7 +364,6 @@ public function getCollection($path = null)
      * @param string $path Parent directory path
      * @return array New directory info
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createDirectory($name, $path)
     {
@@ -437,7 +411,6 @@ public function createDirectory($name, $path)
      * @param string $path Target dir
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteDirectory($path)
     {
@@ -458,7 +431,6 @@ public function deleteDirectory($path)
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     protected function _deleteByPath($path)
     {
@@ -474,7 +446,6 @@ protected function _deleteByPath($path)
      *
      * @param string $target File path to be deleted
      * @return $this
-     * @since 2.0.0
      */
     public function deleteFile($target)
     {
@@ -502,7 +473,6 @@ public function deleteFile($target)
      * @param string $type Type of storage, e.g. image, media etc.
      * @return array File info Array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function uploadFile($targetPath, $type = null)
     {
@@ -540,7 +510,6 @@ public function uploadFile($targetPath, $type = null)
      * @param  string $filePath original file path
      * @param  bool $checkFile OPTIONAL is it necessary to check file availability
      * @return string|false
-     * @since 2.0.0
      */
     public function getThumbnailPath($filePath, $checkFile = false)
     {
@@ -563,7 +532,6 @@ public function getThumbnailPath($filePath, $checkFile = false)
      * @param  string $filePath original file path
      * @param  bool $checkFile OPTIONAL is it necessary to check file availability
      * @return string|false
-     * @since 2.0.0
      */
     public function getThumbnailUrl($filePath, $checkFile = false)
     {
@@ -593,7 +561,6 @@ public function getThumbnailUrl($filePath, $checkFile = false)
      * @param string $source Image path to be resized
      * @param bool $keepRation Keep aspect ratio or not
      * @return bool|string Resized filepath or false if errors were occurred
-     * @since 2.0.0
      */
     public function resizeFile($source, $keepRation = true)
     {
@@ -627,7 +594,6 @@ public function resizeFile($source, $keepRation = true)
      *
      * @param string $filename File basename
      * @return bool|string Thumbnail path or false for errors
-     * @since 2.0.0
      */
     public function resizeOnTheFly($filename)
     {
@@ -643,7 +609,6 @@ public function resizeOnTheFly($filename)
      *
      * @param bool|string $filePath Path to the file
      * @return string
-     * @since 2.0.0
      */
     public function getThumbsPath($filePath = false)
     {
@@ -661,7 +626,6 @@ public function getThumbsPath($filePath = false)
      * Storage session
      *
      * @return \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -673,7 +637,6 @@ public function getSession()
      *
      * @param string $type Type of storage, e.g. image, media etc.
      * @return array Array of allowed file extensions
-     * @since 2.0.0
      */
     public function getAllowedExtensions($type = null)
     {
@@ -690,7 +653,6 @@ public function getAllowedExtensions($type = null)
      * Thumbnail root directory getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThumbnailRoot()
     {
@@ -702,7 +664,6 @@ public function getThumbnailRoot()
      *
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     public function isImage($filename)
     {
@@ -717,7 +678,6 @@ public function isImage($filename)
      * Get resize width
      *
      * @return int
-     * @since 2.0.0
      */
     public function getResizeWidth()
     {
@@ -728,7 +688,6 @@ public function getResizeWidth()
      * Get resize height
      *
      * @return int
-     * @since 2.0.0
      */
     public function getResizeHeight()
     {
@@ -739,7 +698,6 @@ public function getResizeHeight()
      * Get cms wysiwyg images helper
      *
      * @return Images|null
-     * @since 2.0.0
      */
     public function getCmsWysiwygImages()
     {
@@ -752,7 +710,6 @@ public function getCmsWysiwygImages()
      * @param string $path
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validatePath($path)
     {
@@ -774,7 +731,6 @@ protected function _validatePath($path)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _sanitizePath($path)
     {
@@ -786,7 +742,6 @@ protected function _sanitizePath($path)
      *
      * @param string $path
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _getRelativePathToRoot($path)
     {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index 72c98ddc93c53..88d440cfa84ae 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -12,20 +12,17 @@
  * Wysiwyg Images storage collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection\Filesystem
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -40,7 +37,6 @@ public function __construct(
      *
      * @param string $filename
      * @return array
-     * @since 2.0.0
      */
     protected function _generateRow($filename)
     {
diff --git a/app/code/Magento/Cms/Observer/NoCookiesObserver.php b/app/code/Magento/Cms/Observer/NoCookiesObserver.php
index 9b47991fef7c8..b87d89351456c 100644
--- a/app/code/Magento/Cms/Observer/NoCookiesObserver.php
+++ b/app/code/Magento/Cms/Observer/NoCookiesObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Cms\Observer\NoCookiesObserver
  *
- * @since 2.0.0
  */
 class NoCookiesObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class NoCookiesObserver implements ObserverInterface
      * Cms page
      *
      * @var \Magento\Cms\Helper\Page
-     * @since 2.0.0
      */
     protected $_cmsPage;
 
@@ -26,14 +24,12 @@ class NoCookiesObserver implements ObserverInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Cms\Helper\Page $cmsPage
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Cms\Helper\Page $cmsPage,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return self
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Cms/Observer/NoRouteObserver.php b/app/code/Magento/Cms/Observer/NoRouteObserver.php
index f8a083581ad2f..a4a014ea4c9d7 100644
--- a/app/code/Magento/Cms/Observer/NoRouteObserver.php
+++ b/app/code/Magento/Cms/Observer/NoRouteObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Cms\Observer\NoRouteObserver
  *
- * @since 2.0.0
  */
 class NoRouteObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class NoRouteObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return self
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Cms/Setup/InstallData.php b/app/code/Magento/Cms/Setup/InstallData.php
index 57cf053e236c7..57e9aadd691d4 100644
--- a/app/code/Magento/Cms/Setup/InstallData.php
+++ b/app/code/Magento/Cms/Setup/InstallData.php
@@ -15,7 +15,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -23,7 +22,6 @@ class InstallData implements InstallDataInterface
      * Page factory
      *
      * @var PageFactory
-     * @since 2.0.0
      */
     private $pageFactory;
 
@@ -31,7 +29,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param PageFactory $pageFactory
-     * @since 2.0.0
      */
     public function __construct(PageFactory $pageFactory)
     {
@@ -41,7 +38,6 @@ public function __construct(PageFactory $pageFactory)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -387,7 +383,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
      * Create page
      *
      * @return Page
-     * @since 2.0.0
      */
     public function createPage()
     {
diff --git a/app/code/Magento/Cms/Setup/InstallSchema.php b/app/code/Magento/Cms/Setup/InstallSchema.php
index d050a8e024cc1..038f1620963be 100644
--- a/app/code/Magento/Cms/Setup/InstallSchema.php
+++ b/app/code/Magento/Cms/Setup/InstallSchema.php
@@ -13,14 +13,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
index ffe13e7262bb8..0c9b8128a46f6 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -14,7 +14,6 @@
 
 /**
  * Class BlockActions
- * @since 2.0.0
  */
 class BlockActions extends Column
 {
@@ -27,7 +26,6 @@ class BlockActions extends Column
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -45,7 +43,6 @@ class BlockActions extends Column
      * @param UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -63,7 +60,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/Cms/Options.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/Cms/Options.php
index 352c6b6a49cc9..300877bc9c855 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/Cms/Options.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/Cms/Options.php
@@ -9,7 +9,6 @@
 
 /**
  * Store Options for Cms Pages and Blocks
- * @since 2.0.0
  */
 class Options extends StoreOptions
 {
@@ -22,7 +21,6 @@ class Options extends StoreOptions
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
index fecf010370811..7fba7358dd214 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
@@ -15,7 +15,6 @@
 
 /**
  * Class PageActions
- * @since 2.0.0
  */
 class PageActions extends Column
 {
@@ -25,19 +24,16 @@ class PageActions extends Column
 
     /**
      * @var \Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action\UrlBuilder
-     * @since 2.0.0
      */
     protected $actionUrlBuilder;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $editUrl;
 
@@ -55,7 +51,6 @@ class PageActions extends Column
      * @param array $components
      * @param array $data
      * @param string $editUrl
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -77,7 +72,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlPathGenerator.php b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlPathGenerator.php
index bbb61b187ef14..2825b927ae412 100644
--- a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlPathGenerator.php
+++ b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlPathGenerator.php
@@ -9,18 +9,15 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CmsPageUrlPathGenerator
 {
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager
@@ -32,7 +29,6 @@ public function __construct(
      * @param PageInterface $cmsPage
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPath(PageInterface $cmsPage)
     {
@@ -44,7 +40,6 @@ public function getUrlPath(PageInterface $cmsPage)
      *
      * @param PageInterface $cmsPage
      * @return string
-     * @since 2.0.0
      */
     public function getCanonicalUrlPath(PageInterface $cmsPage)
     {
@@ -56,7 +51,6 @@ public function getCanonicalUrlPath(PageInterface $cmsPage)
      *
      * @param PageInterface $cmsPage
      * @return string
-     * @since 2.0.0
      */
     public function generateUrlKey(PageInterface $cmsPage)
     {
diff --git a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
index e37c61de35167..2aea8b7f0e6ec 100644
--- a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
+++ b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator
  *
- * @since 2.0.0
  */
 class CmsPageUrlRewriteGenerator
 {
@@ -22,13 +21,11 @@ class CmsPageUrlRewriteGenerator
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator
-     * @since 2.0.0
      */
     protected $cmsPageUrlPathGenerator;
 
@@ -36,13 +33,11 @@ class CmsPageUrlRewriteGenerator
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $cmsPage;
 
@@ -50,7 +45,6 @@ class CmsPageUrlRewriteGenerator
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
      * @param \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -65,7 +59,6 @@ public function __construct(
     /**
      * @param \Magento\Cms\Model\Page $cmsPage
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function generate($cmsPage)
     {
@@ -81,7 +74,6 @@ public function generate($cmsPage)
      * Generate list of urls for default store
      *
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForAllStores()
     {
@@ -97,7 +89,6 @@ protected function generateForAllStores()
      *
      * @param int[] $storeIds
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     protected function generateForSpecificStores($storeIds)
     {
@@ -118,7 +109,6 @@ protected function generateForSpecificStores($storeIds)
      * @param int $storeId
      * @param int $redirectType
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-     * @since 2.0.0
      */
     protected function createUrlRewrite($storeId, $redirectType = 0)
     {
diff --git a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
index 826a95dfe250d..4b57e8fa7737b 100644
--- a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\CmsUrlRewrite\Observer\ProcessUrlRewriteSavingObserver
  *
- * @since 2.0.0
  */
 class ProcessUrlRewriteSavingObserver implements ObserverInterface
 {
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator
-     * @since 2.0.0
      */
     protected $cmsPageUrlRewriteGenerator;
 
     /**
      * @var UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @param \Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
-     * @since 2.0.0
      */
     public function __construct(CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator, UrlPersistInterface $urlPersist)
     {
@@ -46,7 +42,6 @@ public function __construct(CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerat
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
index 0d14388f6536d..c7e4e41416814 100644
--- a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
+++ b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
@@ -16,26 +16,22 @@
  * Before save and around delete plugin for \Magento\Cms\Model\ResourceModel\Page:
  * - autogenerates url_key if the merchant didn't fill this field
  * - remove all url rewrites for cms page on delete
- * @since 2.0.0
  */
 class Page
 {
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator
-     * @since 2.0.0
      */
     protected $cmsPageUrlPathGenerator;
 
     /**
      * @var UrlPersistInterface
-     * @since 2.0.0
      */
     protected $urlPersist;
 
     /**
      * @param CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
      * @param UrlPersistInterface $urlPersist
-     * @since 2.0.0
      */
     public function __construct(
         CmsPageUrlPathGenerator $cmsPageUrlPathGenerator,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(
         \Magento\Cms\Model\ResourceModel\Page $subject,
diff --git a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
index 5f411600f2f7e..f1411defe033f 100644
--- a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
+++ b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
@@ -13,7 +13,7 @@
 
 /**
  * Class DumpConfigSourceAggregated aggregates configurations from all available sources
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DumpConfigSourceAggregated implements DumpConfigSourceInterface
 {
@@ -37,19 +37,19 @@ class DumpConfigSourceAggregated implements DumpConfigSourceInterface
 
     /**
      * @var ConfigSourceInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $sources;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $excludedFields;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data;
 
@@ -88,7 +88,7 @@ class DumpConfigSourceAggregated implements DumpConfigSourceInterface
      * @param TypePool|null $typePool
      * @param array $rules Rules for filtration the configuration data.
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ExcludeList $excludeList,
@@ -106,7 +106,7 @@ public function __construct(
      *
      * @param string $path
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -137,7 +137,7 @@ public function get($path = '')
      * @param string $path
      * @param array $data
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function filterChain($path, &$data)
     {
@@ -192,7 +192,7 @@ private function isExcludedPath($path)
      *
      * @param string $path
      * @return null|string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function filterPath($path)
     {
@@ -216,7 +216,7 @@ private function filterPath($path)
      * Sort sources ASC from higher priority to lower
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function sortSources()
     {
@@ -228,7 +228,7 @@ private function sortSources()
     /**
      * Retrieves list of field paths were excluded from config dump
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExcludedFields()
     {
diff --git a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php
index bea8037b182c7..89afc2e1dd54a 100644
--- a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php
+++ b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface DumpConfigSourceInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface DumpConfigSourceInterface extends ConfigSourceInterface
 {
@@ -18,7 +18,7 @@ interface DumpConfigSourceInterface extends ConfigSourceInterface
      * Retrieves list of field paths were excluded from config dump
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExcludedFields();
 }
diff --git a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
index f5222112e4e23..b7771671ea3cb 100644
--- a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
@@ -13,19 +13,19 @@
  * Class for retrieving initial configuration from modules
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ModularConfigSource implements ConfigSourceInterface
 {
     /**
      * @var Reader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $reader;
 
     /**
      * @param Reader $reader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(Reader $reader)
     {
@@ -37,7 +37,7 @@ public function __construct(Reader $reader)
      *
      * @param string $path Format is scope type and scope code separated by slash: e.g. "type/code"
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
diff --git a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
index 29ad05250faf6..7f46fe98f03d7 100644
--- a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
@@ -16,25 +16,25 @@
  * Class for retrieving runtime configuration from database.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RuntimeConfigSource implements ConfigSourceInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $collectionFactory;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
     /**
      * @var ScopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeCodeResolver;
 
@@ -42,7 +42,7 @@ class RuntimeConfigSource implements ConfigSourceInterface
      * @param CollectionFactory $collectionFactory
      * @param ScopeCodeResolver $scopeCodeResolver
      * @param Converter $converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         CollectionFactory $collectionFactory,
@@ -59,7 +59,7 @@ public function __construct(
      *
      * @param string $path Format is scope type and scope code separated by slash: e.g. "type/code"
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -74,7 +74,7 @@ public function get($path = '')
      * * scope/key/key *
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function loadConfig()
     {
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 067e79834ba42..97db92e5828ed 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -12,7 +12,7 @@
 /**
  * System configuration type
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class System implements ConfigTypeInterface
 {
@@ -22,43 +22,43 @@ class System implements ConfigTypeInterface
 
     /**
      * @var \Magento\Framework\App\Config\ConfigSourceInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $source;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data = [];
 
     /**
      * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $postProcessor;
 
     /**
      * @var \Magento\Framework\App\Config\Spi\PreProcessorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $preProcessor;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $cache;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $cachingNestedLevel;
 
     /**
      * @var \Magento\Store\Model\Config\Processor\Fallback
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fallback;
 
@@ -102,7 +102,7 @@ class System implements ConfigTypeInterface
      * @param int $cachingNestedLevel
      * @param string $configType
      * @param Reader $reader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\App\Config\ConfigSourceInterface $source,
@@ -142,7 +142,7 @@ public function __construct(
      * '{scopeType}/{scopeCode}/some/config/variable' - will return value of the config variable in the specified scope
      *
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -307,7 +307,7 @@ private function getDataByPathParts($data, $pathParts)
      * - All records in cache storage tagged with CACHE_TAG
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Dwstree.php b/app/code/Magento/Config/Block/System/Config/Dwstree.php
index 1b62eedf735b7..fbe9de76f7c74 100644
--- a/app/code/Magento/Config/Block/System/Config/Dwstree.php
+++ b/app/code/Magento/Config/Block/System/Config/Dwstree.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Config\Block\System\Config\Dwstree
  *
- * @since 2.0.0
  */
 class Dwstree extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function initTabs()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Edit.php b/app/code/Magento/Config/Block/System/Config/Edit.php
index 02d49b405f4f9..10b724781e1f7 100644
--- a/app/code/Magento/Config/Block/System/Config/Edit.php
+++ b/app/code/Magento/Config/Block/System/Config/Edit.php
@@ -14,7 +14,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
@@ -24,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * Form block class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockName;
 
@@ -32,7 +30,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * Block template File
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Config::system/config/edit.phtml';
 
@@ -40,7 +37,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * Configuration structure
      *
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
@@ -48,7 +44,6 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Config\Model\Config\Structure $configStructure
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Prepare layout object
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -97,7 +91,6 @@ protected function _prepareLayout()
      * Retrieve rendered save buttons
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -108,7 +101,6 @@ public function getSaveButtonHtml()
      * Retrieve config save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index f46a7f4105041..84294d436513a 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -19,7 +19,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -33,7 +32,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Config data array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configData;
 
@@ -41,7 +39,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Backend config data instance
      *
      * @var \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     protected $_configDataObject;
 
@@ -49,7 +46,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Default fieldset rendering block
      *
      * @var \Magento\Config\Block\System\Config\Form\Fieldset
-     * @since 2.0.0
      */
     protected $_fieldsetRenderer;
 
@@ -57,7 +53,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Default field rendering block
      *
      * @var \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     protected $_fieldRenderer;
 
@@ -65,7 +60,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * List of fieldset
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fieldsets = [];
 
@@ -73,7 +67,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Translated scope labels
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_scopeLabels = [];
 
@@ -81,7 +74,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Backend Config model factory
      *
      * @var \Magento\Config\Model\Config\Factory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
@@ -89,7 +81,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Magento\Framework\Data\FormFactory
      *
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
@@ -97,7 +88,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * System config structure
      *
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
@@ -105,7 +95,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Form fieldset factory
      *
      * @var \Magento\Config\Block\System\Config\Form\Fieldset\Factory
-     * @since 2.0.0
      */
     protected $_fieldsetFactory;
 
@@ -113,19 +102,18 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Form field factory
      *
      * @var \Magento\Config\Block\System\Config\Form\Field\Factory
-     * @since 2.0.0
      */
     protected $_fieldFactory;
 
     /**
      * @var SettingChecker
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $settingChecker;
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $appConfig;
 
@@ -147,7 +135,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
      * @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -173,9 +160,9 @@ public function __construct(
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return SettingChecker
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getSettingChecker()
     {
@@ -189,7 +176,6 @@ private function getSettingChecker()
      * Initialize objects required to render config form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initObjects()
     {
@@ -213,7 +199,6 @@ protected function _initObjects()
      * Initialize form
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initForm()
     {
@@ -240,7 +225,6 @@ public function initForm()
      * @param \Magento\Config\Model\Config\Structure\Element\Section $section
      * @param \Magento\Framework\Data\Form\AbstractForm $form
      * @return void
-     * @since 2.0.0
      */
     protected function _initGroup(
         \Magento\Config\Model\Config\Structure\Element\Group $group,
@@ -290,7 +274,6 @@ protected function _initGroup(
      * Return dependency block object
      *
      * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
-     * @since 2.0.0
      */
     protected function _getDependence()
     {
@@ -309,7 +292,6 @@ protected function _getDependence()
      * @param string $fieldPrefix
      * @param string $labelPrefix
      * @return $this
-     * @since 2.0.0
      */
     public function initFields(
         \Magento\Framework\Data\Form\Element\Fieldset $fieldset,
@@ -357,7 +339,6 @@ public function initFields(
      * @param string $fieldPrefix
      * @param string $labelPrefix
      * @return void
-     * @since 2.0.0
      */
     protected function _initElement(
         \Magento\Config\Model\Config\Structure\Element\Field $field,
@@ -475,7 +456,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
      * Retrieve Scope string code
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getStringScopeCode()
     {
@@ -503,7 +484,6 @@ private function getStringScopeCode()
      * @param string $elementId
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     protected function _populateDependenciesBlock(array $dependencies, $elementId, $elementName)
     {
@@ -531,7 +511,6 @@ protected function _populateDependenciesBlock(array $dependencies, $elementId, $
      * @param string $fieldPrefix
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     protected function _generateElementName($elementPath, $fieldPrefix = '', $separator = '/')
     {
@@ -550,7 +529,6 @@ protected function _generateElementName($elementPath, $fieldPrefix = '', $separa
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _generateElementId($path)
     {
@@ -562,7 +540,6 @@ protected function _generateElementId($path)
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfigValue($path)
     {
@@ -571,7 +548,6 @@ public function getConfigValue($path)
 
     /**
      * @return \Magento\Backend\Block\Widget\Form|\Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -584,7 +560,6 @@ protected function _beforeToHtml()
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function _afterToHtml($html)
     {
@@ -600,7 +575,6 @@ protected function _afterToHtml($html)
      *
      * @param int $fieldValue
      * @return boolean
-     * @since 2.0.0
      */
     public function canUseDefaultValue($fieldValue)
     {
@@ -618,7 +592,6 @@ public function canUseDefaultValue($fieldValue)
      *
      * @param int $fieldValue
      * @return boolean
-     * @since 2.0.0
      */
     public function canUseWebsiteValue($fieldValue)
     {
@@ -647,7 +620,6 @@ public function isCanRestoreToDefault($fieldValue)
      * Retrieve current scope
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScope()
     {
@@ -671,7 +643,6 @@ public function getScope()
      *
      * @param \Magento\Config\Model\Config\Structure\Element\Field $field
      * @return string
-     * @since 2.0.0
      */
     public function getScopeLabel(\Magento\Config\Model\Config\Structure\Element\Field $field)
     {
@@ -690,7 +661,6 @@ public function getScopeLabel(\Magento\Config\Model\Config\Structure\Element\Fie
      * Get current scope code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScopeCode()
     {
@@ -713,7 +683,6 @@ public function getScopeCode()
      * Get current scope code
      *
      * @return int|string
-     * @since 2.0.0
      */
     public function getScopeId()
     {
@@ -735,7 +704,6 @@ public function getScopeId()
      * Get additional element types
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -756,7 +724,6 @@ protected function _getAdditionalElementTypes()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
-     * @since 2.0.0
      */
     public function getSectionCode()
     {
@@ -768,7 +735,6 @@ public function getSectionCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
-     * @since 2.0.0
      */
     public function getWebsiteCode()
     {
@@ -780,7 +746,6 @@ public function getWebsiteCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCode()
     {
@@ -792,7 +757,6 @@ public function getStoreCode()
      *
      * @param \Magento\Config\Model\Config\Structure\Element\Field $field
      * @return string
-     * @since 2.0.0
      */
     protected function _getSharedCssClass(\Magento\Config\Model\Config\Structure\Element\Field $field)
     {
@@ -810,7 +774,6 @@ protected function _getSharedCssClass(\Magento\Config\Model\Config\Structure\Ele
      * @param \Magento\Config\Model\Config\Structure\Element\Field $field
      * @param string $fieldPrefix
      * @return string
-     * @since 2.0.0
      */
     protected function _getRequiresCssClass(\Magento\Config\Model\Config\Structure\Element\Field $field, $fieldPrefix)
     {
@@ -829,9 +792,9 @@ protected function _getRequiresCssClass(\Magento\Config\Model\Config\Structure\E
     /**
      * Retrieve Deployment Configuration object.
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfig()
     {
@@ -846,7 +809,7 @@ private function getAppConfig()
      *
      * @param string $path
      * @return null|string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfigDataValue($path)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field.php b/app/code/Magento/Config/Block/System/Config/Form/Field.php
index 21684e76df3a0..9a77289f39768 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field.php
@@ -14,7 +14,6 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Field extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
@@ -23,7 +22,6 @@ class Field extends \Magento\Backend\Block\Template implements \Magento\Framewor
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -35,7 +33,6 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -67,7 +64,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _renderValue(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -92,7 +88,6 @@ protected function _renderValue(\Magento\Framework\Data\Form\Element\AbstractEle
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _renderInheritCheckbox(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -123,7 +118,6 @@ protected function _renderInheritCheckbox(\Magento\Framework\Data\Form\Element\A
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return bool
-     * @since 2.0.0
      */
     protected function _isInheritCheckboxRequired(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -137,7 +131,6 @@ protected function _isInheritCheckboxRequired(\Magento\Framework\Data\Form\Eleme
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getInheritCheckboxLabel(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -156,7 +149,6 @@ protected function _getInheritCheckboxLabel(\Magento\Framework\Data\Form\Element
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _renderScopeLabel(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -173,7 +165,6 @@ protected function _renderScopeLabel(\Magento\Framework\Data\Form\Element\Abstra
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _renderHint(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -191,7 +182,6 @@ protected function _renderHint(\Magento\Framework\Data\Form\Element\AbstractElem
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function _decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
index 54055ad688479..63dbb2b80e334 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
@@ -10,13 +10,11 @@
 
 /**
  * Backend system config datetime field renderer
- * @since 2.0.0
  */
 class Datetime extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -24,7 +22,6 @@ class Datetime extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Backend\Block\Template\Context $context
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * @param AbstractElement $element
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Factory.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Factory.php
index 7c8eda844e93e..ea9816a68cc6e 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Factory.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Factory.php
@@ -10,19 +10,16 @@
  * Magento\Config\Block\System\Config\Form\Field Class Factory
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
index b34b3fdc60b7f..1be1f8e79bf59 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -13,7 +13,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -21,7 +20,6 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Grid columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columns = [];
 
@@ -29,7 +27,6 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Enable the "Add after" button or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addAfter = true;
 
@@ -37,7 +34,6 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Label of add button
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_addButtonLabel;
 
@@ -45,7 +41,6 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Rows cache
      *
      * @var array|null
-     * @since 2.0.0
      */
     private $_arrayRowsCache;
 
@@ -53,13 +48,11 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Indication whether block is prepared to render or no
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPreparedToRender = false;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Config::system/config/form/field/array.phtml';
 
@@ -67,7 +60,6 @@ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Fo
      * Check if columns are defined, set template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +75,6 @@ protected function _construct()
      * @param string $name
      * @param array $params
      * @return void
-     * @since 2.0.0
      */
     public function addColumn($name, $params)
     {
@@ -106,7 +97,6 @@ public function addColumn($name, $params)
      * @param string $paramName
      * @param string|bool $defaultValue
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
@@ -118,7 +108,6 @@ protected function _getParam($params, $paramName, $defaultValue = null)
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -135,7 +124,6 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * @param \Magento\Framework\DataObject $row
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
     {
@@ -148,7 +136,6 @@ protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
      * Each row will be instance of \Magento\Framework\DataObject
      *
      * @return array
-     * @since 2.0.0
      */
     public function getArrayRows()
     {
@@ -181,7 +168,6 @@ public function getArrayRows()
      * @param string $rowId
      * @param string $columnName
      * @return string
-     * @since 2.0.0
      */
     protected function _getCellInputElementId($rowId, $columnName)
     {
@@ -193,7 +179,6 @@ protected function _getCellInputElementId($rowId, $columnName)
      *
      * @param string $columnName
      * @return string
-     * @since 2.0.0
      */
     protected function _getCellInputElementName($columnName)
     {
@@ -206,7 +191,6 @@ protected function _getCellInputElementName($columnName)
      * @param string $columnName
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function renderCellTemplate($columnName)
     {
@@ -253,7 +237,6 @@ public function renderCellTemplate($columnName)
      * Prepare to render
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareToRender()
     {
@@ -265,7 +248,6 @@ protected function _prepareToRender()
      *
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -283,7 +265,6 @@ protected function _toHtml()
      * Returns true if the addAfter directive is set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAddAfter()
     {
@@ -294,7 +275,6 @@ public function isAddAfter()
      * Returns columns array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColumns()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/File.php b/app/code/Magento/Config/Block/System/Config/Form/Field/File.php
index 4ae94b682579e..d0e333e7796ad 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/File.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/File.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Config\Block\System\Config\Form\Field\File
  *
- * @since 2.0.0
  */
 class File extends \Magento\Framework\Data\Form\Element\File
 {
@@ -22,7 +21,6 @@ class File extends \Magento\Framework\Data\Form\Element\File
      * Get element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -35,7 +33,6 @@ public function getElementHtml()
      * Get html for additional delete checkbox field
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckbox()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php
index 1f0f89daa6cc2..d0d25df28482a 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Heading extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
@@ -23,7 +22,6 @@ class Heading extends \Magento\Backend\Block\AbstractBlock implements
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
index 3704fe4b2aa00..e1d4a713b8b10 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
@@ -13,7 +13,6 @@
  * Class Image Field
  * @method getFieldConfig()
  * @method setFieldConfig()
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
@@ -21,7 +20,6 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
      * Get image preview url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
index 805ed2ea0f223..ce7667ed1918d 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
@@ -11,13 +11,11 @@
 /**
  * Backend system config datetime field renderer
  * @api
- * @since 2.0.0
  */
 class Notification extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -25,7 +23,6 @@ class Notification extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Backend\Block\Template\Context $context
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
index 21e4004ef79dd..04c1a19a5f332 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
@@ -8,19 +8,16 @@
 /**
  * Backend system config array field renderer
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Regexceptions extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
 {
     /**
      * @var \Magento\Framework\Data\Form\Element\Factory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\LabelFactory
-     * @since 2.0.0
      */
     protected $_labelFactory;
 
@@ -29,7 +26,6 @@ class Regexceptions extends \Magento\Config\Block\System\Config\Form\Field\Field
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Initialise form fields
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +57,6 @@ protected function _construct()
      *
      * @param string $columnName
      * @return string
-     * @since 2.0.0
      */
     public function renderCellTemplate($columnName)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
index 4a081d4eac6b6..88278d6264241 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific
  *
- * @since 2.0.0
  */
 class Allowspecific extends \Magento\Framework\Data\Form\Element\Select
 {
@@ -24,7 +23,6 @@ class Allowspecific extends \Magento\Framework\Data\Form\Element\Select
      * Add additional Javascript code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
@@ -58,7 +56,6 @@ public function getAfterElementHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -71,7 +68,6 @@ public function getHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _getSpecificCountryElementId()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
index 814ca5a047528..db34ec2d91775 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -13,20 +13,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\View\Helper\Js
-     * @since 2.0.0
      */
     protected $_jsHelper;
 
@@ -34,7 +31,6 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
      * Whether is collapsed by default
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isCollapsedDefault = false;
 
@@ -43,7 +39,6 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -100,7 +94,6 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getHeaderHtml($element)
     {
@@ -146,7 +139,6 @@ protected function _getHeaderHtml($element)
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getFrontendClass($element)
     {
@@ -160,7 +152,6 @@ protected function _getFrontendClass($element)
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getHeaderTitleHtml($element)
     {
@@ -181,7 +172,6 @@ protected function _getHeaderTitleHtml($element)
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getHeaderCommentHtml($element)
     {
@@ -192,7 +182,6 @@ protected function _getHeaderCommentHtml($element)
      * Return full css class name for form fieldset
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFieldsetCss()
     {
@@ -208,7 +197,6 @@ protected function _getFieldsetCss()
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getFooterHtml($element)
     {
@@ -239,7 +227,6 @@ protected function _getFooterHtml($element)
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getExtraJs($element)
     {
@@ -253,7 +240,6 @@ protected function _getExtraJs($element)
      *
      * @param AbstractElement $element
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCollapseState($element)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php
index e3ea3352a296a..51884cc0b73dd 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php
@@ -10,19 +10,16 @@
  * Magento\Config\Block\System\Config\Form\Fieldset Class Factory
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Config\Block\System\Config\Form\Fieldset
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
index c50fa9d40a714..0522a03817f65 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -12,35 +12,30 @@
  * @method \Magento\Config\Block\System\Config\Form getForm()
  * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
  * @api
- * @since 2.0.0
  */
 class DisableOutput extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
     /**
      * @var \Magento\Framework\DataObject
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_dummyElement;
 
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_fieldRenderer;
 
     /**
      * @var array
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_values;
 
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_moduleList;
 
@@ -50,7 +45,6 @@ class DisableOutput extends \Magento\Config\Block\System\Config\Form\Fieldset
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -97,7 +90,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     /**
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getDummyElement()
     {
@@ -110,7 +102,6 @@ protected function _getDummyElement()
     /**
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     protected function _getFieldRenderer()
     {
@@ -125,7 +116,6 @@ protected function _getFieldRenderer()
     /**
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return array
-     * @since 2.0.0
      */
     protected function _getValues()
     {
@@ -143,7 +133,6 @@ protected function _getValues()
      * @param string $moduleName
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getFieldHtml($fieldset, $moduleName)
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Tabs.php b/app/code/Magento/Config/Block/System/Config/Tabs.php
index 34e57fc222f4a..05d80363e96bd 100644
--- a/app/code/Magento/Config/Block/System/Config/Tabs.php
+++ b/app/code/Magento/Config/Block/System/Config/Tabs.php
@@ -16,7 +16,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget
 {
@@ -24,7 +23,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Tabs
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Iterator
-     * @since 2.0.0
      */
     protected $_tabs;
 
@@ -32,7 +30,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Block template filename
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Config::system/config/tabs.phtml';
 
@@ -40,7 +37,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Currently selected section id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentSectionId;
 
@@ -48,7 +44,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Current website code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_websiteCode;
 
@@ -56,13 +51,11 @@ class Tabs extends \Magento\Backend\Block\Widget
      * Current store code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_storeCode;
 
     /**
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendHelper;
 
@@ -71,7 +64,6 @@ class Tabs extends \Magento\Backend\Block\Widget
      * @param \Magento\Config\Model\Config\Structure $configStructure
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +86,6 @@ public function __construct(
      * Get all tabs
      *
      * @return \Magento\Config\Model\Config\Structure\Element\Iterator
-     * @since 2.0.0
      */
     public function getTabs()
     {
@@ -106,7 +97,6 @@ public function getTabs()
      *
      * @param \Magento\Config\Model\Config\Structure\Element\Section $section
      * @return string
-     * @since 2.0.0
      */
     public function getSectionUrl(\Magento\Config\Model\Config\Structure\Element\Section $section)
     {
@@ -118,7 +108,6 @@ public function getSectionUrl(\Magento\Config\Model\Config\Structure\Element\Sec
      *
      * @param \Magento\Config\Model\Config\Structure\Element\Section $section
      * @return bool
-     * @since 2.0.0
      */
     public function isSectionActive(\Magento\Config\Model\Config\Structure\Element\Section $section)
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
index 18b1d3bc465f1..dc7acf249b1c3 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
@@ -11,7 +11,6 @@
 /**
  * System Configuration Abstract Controller
  * @api
- * @since 2.0.0
  */
 abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
 {
@@ -24,13 +23,11 @@ abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
     /**
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_sectionChecker;
 
@@ -38,7 +35,6 @@ abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Config\Model\Config\Structure $configStructure
      * @param mixed $sectionChecker - deprecated
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -74,7 +69,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      * Check is allow modify system configuration
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
@@ -88,7 +82,6 @@ protected function _isAllowed()
      *
      * @param array $configState
      * @return bool
-     * @since 2.0.0
      */
     protected function _saveState($configState = [])
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/AbstractScopeConfig.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/AbstractScopeConfig.php
index 26b40669aec3e..258c74651c4d9 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/AbstractScopeConfig.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/AbstractScopeConfig.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractScopeConfig extends \Magento\Config\Controller\Adminhtml\System\AbstractConfig
 {
     /**
      * @var \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     protected $_backendConfig;
 
@@ -25,7 +23,6 @@ abstract class AbstractScopeConfig extends \Magento\Config\Controller\Adminhtml\
      * @param \Magento\Config\Model\Config\Structure $configStructure
      * @param ConfigSectionChecker $sectionChecker
      * @param \Magento\Config\Model\Config $backendConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param string $sectionId
      * @return bool
-     * @since 2.0.0
      */
     protected function isSectionAllowed($sectionId)
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
index 958268d1e32ee..174da5825468d 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Config\Controller\Adminhtml\System\Config\Edit
  *
- * @since 2.0.0
  */
 class Edit extends AbstractScopeConfig
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -25,7 +23,6 @@ class Edit extends AbstractScopeConfig
      * @param \Magento\Config\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Config\Model\Config $backendConfig
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Edit configuration section
      *
      * @return \Magento\Framework\App\ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
index e2988034f0236..bfcb59618f237 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Config\Controller\Adminhtml\System\Config\Index
  *
- * @since 2.0.0
  */
 class Index extends AbstractScopeConfig
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -25,7 +23,6 @@ class Index extends AbstractScopeConfig
      * @param \Magento\Config\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Config\Model\Config $backendConfig
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
index c1720106c199f..7f7d461ea090d 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
@@ -12,7 +12,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends AbstractConfig
 {
@@ -20,19 +19,16 @@ class Save extends AbstractConfig
      * Backend Config Model Factory
      *
      * @var \Magento\Config\Model\Config\Factory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -43,7 +39,6 @@ class Save extends AbstractConfig
      * @param \Magento\Config\Model\Config\Factory $configFactory
      * @param \Magento\Framework\Cache\FrontendInterface $cache
      * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Get groups for save
      *
      * @return array|null
-     * @since 2.0.0
      */
     protected function _getGroupsForSave()
     {
@@ -94,7 +88,6 @@ protected function _getGroupsForSave()
      *
      * @param mixed $group
      * @return array
-     * @since 2.0.0
      */
     protected function _processNestedGroups($group)
     {
@@ -124,7 +117,6 @@ protected function _processNestedGroups($group)
      * Custom save logic for section
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _saveSection()
     {
@@ -138,7 +130,6 @@ protected function _saveSection()
      * Advanced save procedure
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _saveAdvanced()
     {
@@ -149,7 +140,6 @@ protected function _saveAdvanced()
      * Save configuration
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
index 7b21579983104..df82b84f76386 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Config\Controller\Adminhtml\System\Config\State
  *
- * @since 2.0.0
  */
 class State extends AbstractScopeConfig
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -25,7 +23,6 @@ class State extends AbstractScopeConfig
      * @param \Magento\Config\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Config\Model\Config $backendConfig
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Save fieldset state through AJAX
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php b/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
index cd72111bfdce9..0ce515a71f728 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
@@ -11,19 +11,16 @@
 /**
  * @deprecated 2.2.0 - unused class.
  * @see \Magento\Config\Model\Config\Structure\Element\Section::isAllowed()
- * @since 2.0.0
  */
 class ConfigSectionChecker
 {
     /**
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
     /**
      * @param \Magento\Config\Model\Config\Structure $configStructure
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure $configStructure)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Config\Model\Config\Structure $configStruct
      * @throws \Exception
      * @return bool
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function isSectionAllowed($sectionId)
     {
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 674452d7a9041..04db969efa5ff 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -12,7 +12,6 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\DataObject
 {
@@ -20,7 +19,6 @@ class Config extends \Magento\Framework\DataObject
      * Config data for sections
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configData;
 
@@ -28,7 +26,6 @@ class Config extends \Magento\Framework\DataObject
      * Event dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -36,7 +33,6 @@ class Config extends \Magento\Framework\DataObject
      * System configuration structure
      *
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
@@ -44,7 +40,6 @@ class Config extends \Magento\Framework\DataObject
      * Application config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_appConfig;
 
@@ -52,7 +47,6 @@ class Config extends \Magento\Framework\DataObject
      * Global factory
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_objectFactory;
 
@@ -60,7 +54,6 @@ class Config extends \Magento\Framework\DataObject
      * TransactionFactory
      *
      * @var \Magento\Framework\DB\TransactionFactory
-     * @since 2.0.0
      */
     protected $_transactionFactory;
 
@@ -68,7 +61,6 @@ class Config extends \Magento\Framework\DataObject
      * Config data loader
      *
      * @var \Magento\Config\Model\Config\Loader
-     * @since 2.0.0
      */
     protected $_configLoader;
 
@@ -76,13 +68,11 @@ class Config extends \Magento\Framework\DataObject
      * Config data factory
      *
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -95,7 +85,6 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -123,7 +112,6 @@ public function __construct(
      *
      * @throws \Exception
      * @return $this
-     * @since 2.0.0
      */
     public function save()
     {
@@ -194,7 +182,6 @@ public function save()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _processGroup(
         $groupId,
@@ -331,7 +318,6 @@ protected function _processGroup(
      * Load config data for section
      *
      * @return array
-     * @since 2.0.0
      */
     public function load()
     {
@@ -349,7 +335,6 @@ public function load()
      * @param bool $full Simple config structure or not
      * @param array $oldConfig Config data to extend
      * @return array
-     * @since 2.0.0
      */
     public function extendConfig($path, $full = true, $oldConfig = [])
     {
@@ -367,7 +352,6 @@ public function extendConfig($path, $full = true, $oldConfig = [])
      * @param mixed $value
      * @return void
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function setDataByPath($path, $value)
     {
@@ -400,7 +384,6 @@ public function setDataByPath($path, $value)
      * Get scope name and scopeId
      * @todo refactor to scope resolver
      * @return void
-     * @since 2.0.0
      */
     private function initScope()
     {
@@ -439,7 +422,6 @@ private function initScope()
      *
      * @param bool $full Simple config structure or not
      * @return array
-     * @since 2.0.0
      */
     protected function _getConfig($full = true)
     {
@@ -457,7 +439,6 @@ protected function _getConfig($full = true)
      * @param \Magento\Config\Model\Config\Structure\Element\Field $fieldConfig
      * @param \Magento\Framework\App\Config\ValueInterface $dataObject
      * @return void
-     * @since 2.0.0
      */
     protected function _checkSingleStoreMode(
         \Magento\Config\Model\Config\Structure\Element\Field $fieldConfig,
@@ -484,7 +465,6 @@ protected function _checkSingleStoreMode(
      * @param null|bool &$inherit
      * @param null|array $configData
      * @return \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     public function getConfigDataValue($path, &$inherit = null, $configData = null)
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
index b11197aad0ef6..ddb20cf8f8c23 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Custom extends \Magento\Framework\App\Config\Value
 {
@@ -56,7 +55,6 @@ class Custom extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\Storage\WriterInterface
-     * @since 2.0.0
      */
     protected $_configWriter;
 
@@ -69,7 +67,6 @@ class Custom extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -89,7 +86,6 @@ public function __construct(
      * Validate value before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -107,7 +103,6 @@ public function beforeSave()
      * Change secure/unsecure base_url after use_custom_url was modified
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php
index 93b8b482cb385..c3e4761440d12 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Custompath extends \Magento\Framework\App\Config\Value
 {
@@ -21,7 +20,6 @@ class Custompath extends \Magento\Framework\App\Config\Value
      * Check whether redirect should be set
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php
index 5c23433ddfcf5..10de98a200c47 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Expirationperiod extends \Magento\Framework\App\Config\Value
 {
@@ -21,7 +20,6 @@ class Expirationperiod extends \Magento\Framework\App\Config\Value
      * Validate expiration period value before saving
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
index 28a164c0f2f04..60856fd1da263 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
@@ -14,19 +14,16 @@
 
 /**
  * @deprecated 2.2.0 robots.txt file is no longer stored in filesystem. It generates as response on request.
- * @since 2.0.0
  */
 class Robots extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_file;
 
@@ -40,7 +37,6 @@ class Robots extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param DocumentRoot $documentRoot
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      * Return content of default robot.txt
      *
      * @return bool|string
-     * @since 2.0.0
      */
     protected function _getDefaultValue()
     {
@@ -78,7 +73,6 @@ protected function _getDefaultValue()
      * Load default content from robots.txt if customer does not define own
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -93,7 +87,6 @@ protected function _afterLoad()
      * Check and process robots file
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
index 5a15b75d7062f..7828c2af54897 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Usecustom extends \Magento\Framework\App\Config\Value
 {
@@ -19,7 +18,6 @@ class Usecustom extends \Magento\Framework\App\Config\Value
      * Writer of configuration storage
      *
      * @var \Magento\Framework\App\Config\Storage\WriterInterface
-     * @since 2.0.0
      */
     protected $_configWriter;
 
@@ -32,7 +30,6 @@ class Usecustom extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -72,7 +68,6 @@ public function beforeSave()
      * Delete custom admin url from configuration if "Use Custom Admin Url" option disabled
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usesecretkey.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usesecretkey.php
index 21f7a0fe4a9c0..1e1154f3b39bb 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Usesecretkey.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Usesecretkey.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Usesecretkey extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
@@ -30,7 +28,6 @@ class Usesecretkey extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
index 7609eb37f05b7..3bdb6dae9c19a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Baseurl extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\View\Asset\MergeService
-     * @since 2.0.0
      */
     protected $_mergeService;
 
@@ -35,7 +33,6 @@ class Baseurl extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,7 +53,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -79,7 +75,6 @@ public function beforeSave()
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     private function _validateUnsecure($value)
     {
@@ -106,7 +101,6 @@ private function _validateUnsecure($value)
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     private function _validateSecure($value)
     {
@@ -135,7 +129,6 @@ private function _validateSecure($value)
      * @param string $value
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function _assertValuesOrUrl(array $values, $value)
     {
@@ -153,7 +146,6 @@ private function _assertValuesOrUrl(array $values, $value)
      * @param string $value
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function _assertStartsWithValuesOrUrl(array $values, $value)
     {
@@ -176,7 +168,6 @@ private function _assertStartsWithValuesOrUrl(array $values, $value)
      * @param string $value
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function _assertStartsWithValuesOrUrlOrEmpty(array $values, $value)
     {
@@ -198,7 +189,6 @@ private function _assertStartsWithValuesOrUrlOrEmpty(array $values, $value)
      * @param string $value
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function _validateFullyQualifiedUrl($value)
     {
@@ -212,7 +202,6 @@ private function _validateFullyQualifiedUrl($value)
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     private function _isFullyQualifiedUrl($value)
     {
@@ -223,7 +212,6 @@ private function _isFullyQualifiedUrl($value)
      * Clean compiled JS/CSS when updating url configuration settings
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Cache.php b/app/code/Magento/Config/Model/Config/Backend/Cache.php
index cbe12a8e3f0ef..b85dd3dbb551a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Cache.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Cache.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cache extends \Magento\Framework\App\Config\Value
 {
@@ -20,7 +19,6 @@ class Cache extends \Magento\Framework\App\Config\Value
      * Cache tags to clean
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cacheTags = [];
 
@@ -28,7 +26,6 @@ class Cache extends \Magento\Framework\App\Config\Value
      * Clean cache, value was changed
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index 6d4ac3979d2eb..8cf6ce11af0bf 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
 {
@@ -23,7 +22,6 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
      * Retrieve allowed currencies for current scope
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAllowedCurrencies()
     {
@@ -45,7 +43,6 @@ protected function _getAllowedCurrencies()
      * Retrieve Installed Currencies
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getInstalledCurrencies()
     {
@@ -62,7 +59,6 @@ protected function _getInstalledCurrencies()
      * Retrieve Base Currency value for current scope
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrencyBase()
     {
@@ -81,7 +77,6 @@ protected function _getCurrencyBase()
      * Retrieve Default display Currency value for current scope
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrencyDefault()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
index 81bacebd1ed90..c6ae90926e0cc 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Allow extends AbstractCurrency
 {
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -31,7 +29,6 @@ class Allow extends AbstractCurrency
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Base.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Base.php
index 658955405a403..e250f99d3e38c 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Base.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Base.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Base extends AbstractCurrency
 {
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     private $currencyFactory;
 
@@ -31,7 +29,6 @@ class Base extends AbstractCurrency
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -52,7 +49,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
index d8175e35bed6d..7259fbaa19082 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cron extends \Magento\Framework\App\Config\Value
 {
@@ -19,7 +18,6 @@ class Cron extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
@@ -32,7 +30,6 @@ class Cron extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -51,7 +48,6 @@ public function __construct(
     /**
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/DefaultCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/DefaultCurrency.php
index 9e09ec8edf2f6..23a30ec63b696 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/DefaultCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/DefaultCurrency.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DefaultCurrency extends AbstractCurrency
 {
@@ -22,7 +21,6 @@ class DefaultCurrency extends AbstractCurrency
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Datashare.php b/app/code/Magento/Config/Model/Config/Backend/Datashare.php
index cfd80e751a096..4115a0201ff90 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Datashare.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Datashare.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Datashare extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Design/Exception.php b/app/code/Magento/Config/Model/Config/Backend/Design/Exception.php
index db495b1a451d9..4b2d8be9abf1f 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Design/Exception.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Design/Exception.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Exception extends \Magento\Config\Model\Config\Backend\Serialized\ArraySerialized
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'core_config_backend_design_exception';
 }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Address.php b/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
index 938c4f18b8ddc..b1819635526f9 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
@@ -13,14 +13,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Address extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
index 4fc7dd3483be2..bac9a6f4e2add 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
@@ -13,7 +13,6 @@
 
 /**
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Logo extends \Magento\Config\Model\Config\Backend\Image
 {
@@ -26,7 +25,6 @@ class Logo extends \Magento\Config\Model\Config\Backend\Image
      * Upload max file size in kilobytes
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxFileSize = 2048;
 
@@ -34,7 +32,6 @@ class Logo extends \Magento\Config\Model\Config\Backend\Image
      * Return path to directory for upload file
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getUploadDir()
     {
@@ -45,7 +42,6 @@ protected function _getUploadDir()
      * Makes a decision about whether to add info about the scope
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _addWhetherScopeInfo()
     {
@@ -73,7 +69,6 @@ protected function getTmpFileName()
      * Save changes and delete file if "delete" option passed
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Sender.php b/app/code/Magento/Config/Model/Config/Backend/Email/Sender.php
index 5c5374a9989f6..d552b6b0e0f57 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Email/Sender.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Email/Sender.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Sender extends \Magento\Framework\App\Config\Value
 {
@@ -22,7 +21,6 @@ class Sender extends \Magento\Framework\App\Config\Value
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
index ab3df7db19258..3ca980527dd91 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
@@ -12,14 +12,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Encrypted extends \Magento\Framework\App\Config\Value implements
     \Magento\Framework\App\Config\Data\ProcessorInterface
 {
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
@@ -32,7 +30,6 @@ class Encrypted extends \Magento\Framework\App\Config\Value implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -52,7 +49,6 @@ public function __construct(
      * Magic method called during class serialization
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -64,7 +60,6 @@ public function __sleep()
      * Magic method called during class un-serialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -78,7 +73,6 @@ public function __wakeup()
      * Decrypt value after loading
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -92,7 +86,6 @@ protected function _afterLoad()
      * Encrypt value before saving
      *
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -113,7 +106,6 @@ public function beforeSave()
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function processValue($value)
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/File.php b/app/code/Magento/Config/Model/Config/Backend/File.php
index 186752d73c5e0..c70a1e73b92f2 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File.php
@@ -16,13 +16,11 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @api
- * @since 2.0.0
  */
 class File extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface
-     * @since 2.0.0
      */
     protected $_requestData;
 
@@ -30,25 +28,21 @@ class File extends \Magento\Framework\App\Config\Value
      * Upload max file size in kilobytes
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxFileSize = 0;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
     /**
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
@@ -63,7 +57,6 @@ class File extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -89,7 +82,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -154,7 +146,6 @@ protected function getFileData()
      * @param  string $filePath Path to temporary uploaded file
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateMaxSize($filePath)
     {
@@ -173,7 +164,6 @@ public function validateMaxSize($filePath)
      * Makes a decision about whether to add info about the scope.
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _addWhetherScopeInfo()
     {
@@ -187,7 +177,6 @@ protected function _addWhetherScopeInfo()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getUploadDir()
     {
@@ -236,7 +225,6 @@ protected function getUploadDirPath($uploadDir)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _prependScopeInfo($path)
     {
@@ -254,7 +242,6 @@ protected function _prependScopeInfo($path)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _appendScopeInfo($path)
     {
@@ -269,7 +256,6 @@ protected function _appendScopeInfo($path)
      * Getter for allowed extensions of uploaded files
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php b/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php
index f42f3c45a53c9..d14bd933aba35 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Config\Model\Config\Backend\File\RequestData
  *
- * @since 2.0.0
  */
 class RequestData implements \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface
 {
@@ -17,7 +16,6 @@ class RequestData implements \Magento\Config\Model\Config\Backend\File\RequestDa
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getTmpName($path)
     {
@@ -29,7 +27,6 @@ public function getTmpName($path)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getName($path)
     {
@@ -42,7 +39,6 @@ public function getName($path)
      * @param string $paramName
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _getParam($paramName, $path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/File/RequestData/RequestDataInterface.php b/app/code/Magento/Config/Model/Config/Backend/File/RequestData/RequestDataInterface.php
index c3660c1c179b0..9783ce29dd920 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File/RequestData/RequestDataInterface.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File/RequestData/RequestDataInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RequestDataInterface
 {
@@ -20,7 +19,6 @@ interface RequestDataInterface
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getTmpName($path);
 
@@ -29,7 +27,6 @@ public function getTmpName($path);
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getName($path);
 }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Filename.php b/app/code/Magento/Config/Model/Config/Backend/Filename.php
index 923da4c5bd536..f95039837fc0c 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Filename.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Filename.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Filename extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image.php b/app/code/Magento/Config/Model/Config/Backend/Image.php
index f2670e7bca173..90ec3dc0e7cf8 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Image extends File
 {
@@ -19,7 +18,6 @@ class Image extends File
      * Getter for allowed extensions of uploaded files
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php b/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php
index d484570be9a2f..9ae1e2332f2d4 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Adapter extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Image\AdapterFactory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
@@ -32,7 +30,6 @@ class Adapter extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      *
      * @throws \Magento\Framework\Exception\LocalizedException If some of adapter dependencies was not loaded
      * @return \Magento\Config\Model\Config\Backend\File
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Favicon.php b/app/code/Magento/Config/Model/Config/Backend/Image/Favicon.php
index cde902f8e0de2..a8a5eb306d83f 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Favicon.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Favicon.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Favicon extends \Magento\Config\Model\Config\Backend\Image
 {
@@ -26,7 +25,6 @@ class Favicon extends \Magento\Config\Model\Config\Backend\Image
      *
      * @return string
      * @throw \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getUploadDir()
     {
@@ -37,7 +35,6 @@ protected function _getUploadDir()
      * Makes a decision about whether to add info about the scope.
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _addWhetherScopeInfo()
     {
@@ -48,7 +45,6 @@ protected function _addWhetherScopeInfo()
      * Getter for allowed extensions of uploaded files.
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php
index 8966400c730e3..cef7c484eeae2 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Logo extends \Magento\Config\Model\Config\Backend\Image
 {
@@ -26,7 +25,6 @@ class Logo extends \Magento\Config\Model\Config\Backend\Image
      *
      * @return string
      * @throw \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getUploadDir()
     {
@@ -37,7 +35,6 @@ protected function _getUploadDir()
      * Makes a decision about whether to add info about the scope.
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _addWhetherScopeInfo()
     {
@@ -48,7 +45,6 @@ protected function _addWhetherScopeInfo()
      * Getter for allowed extensions of uploaded files.
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
index a1481227e0b7e..82f599b9acfe6 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Pdf extends \Magento\Config\Model\Config\Backend\Image
 {
     /**
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale.php b/app/code/Magento/Config/Model/Config/Backend/Locale.php
index 18b706405f134..30b30f1899a98 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Locale.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Locale.php
@@ -13,31 +13,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Locale extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_configsFactory;
 
     /**
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
     /**
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -55,7 +50,6 @@ class Locale extends \Magento\Framework\App\Config\Value
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -80,7 +74,6 @@ public function __construct(
     /**
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php b/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
index 64da246a837b0..533ede0117efb 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
@@ -13,14 +13,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Timezone extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
index 8203a591c1630..952ac7bffab4e 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cron extends \Magento\Framework\App\Config\Value
 {
@@ -21,13 +20,11 @@ class Cron extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_runModelPath = '';
 
@@ -41,7 +38,6 @@ class Cron extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param string $runModelPath
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Secure.php b/app/code/Magento/Config/Model/Config/Backend/Secure.php
index 8331aa73ec2be..82e9d4180570d 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Secure.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Secure.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Secure extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\View\Asset\MergeService
-     * @since 2.0.0
      */
     protected $_mergeService;
 
@@ -26,7 +24,6 @@ class Secure extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Clean compiled JS/CSS when updating configuration settings
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
index 59912a538d3bb..59507dbc20e9a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Serialized extends \Magento\Framework\App\Config\Value
 {
@@ -49,7 +48,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -61,7 +59,6 @@ protected function _afterLoad()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized/ArraySerialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized/ArraySerialized.php
index e23a14f60047c..66a2cf77f368a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized/ArraySerialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized/ArraySerialized.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ArraySerialized extends \Magento\Config\Model\Config\Backend\Serialized
 {
@@ -20,7 +19,6 @@ class ArraySerialized extends \Magento\Config\Model\Config\Backend\Serialized
      * Unset array element with '__empty' key
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Store.php b/app/code/Magento/Config/Model/Config/Backend/Store.php
index 758258279aa60..16a4d2b709e58 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Store.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Store.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\App\Config\MutableScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_mutableConfig;
 
@@ -30,7 +28,6 @@ class Store extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Translate.php b/app/code/Magento/Config/Model/Config/Backend/Translate.php
index 5ea72aa54ce9e..91df75e0b694c 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Translate.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Translate.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Translate extends \Magento\Framework\App\Config\Value
 {
@@ -26,7 +25,6 @@ class Translate extends \Magento\Framework\App\Config\Value
      * Set status 'invalidate' for blocks and other output caches
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Config/Model/Config/BackendClone/Factory.php b/app/code/Magento/Config/Model/Config/BackendClone/Factory.php
index 719ac268054f8..1f4bd9c532f4f 100644
--- a/app/code/Magento/Config/Model/Config/BackendClone/Factory.php
+++ b/app/code/Magento/Config/Model/Config/BackendClone/Factory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $cloneModel
      * @return mixed
-     * @since 2.0.0
      */
     public function create($cloneModel)
     {
diff --git a/app/code/Magento/Config/Model/Config/BackendFactory.php b/app/code/Magento/Config/Model/Config/BackendFactory.php
index 760421fbb9786..3ed57ae65302c 100644
--- a/app/code/Magento/Config/Model/Config/BackendFactory.php
+++ b/app/code/Magento/Config/Model/Config/BackendFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class BackendFactory
 {
@@ -15,13 +14,11 @@ class BackendFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectmanager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectmanager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectman
      * @param array $arguments The object arguments
      * @return \Magento\Framework\App\Config\ValueInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($modelName, array $arguments = [])
     {
diff --git a/app/code/Magento/Config/Model/Config/CommentFactory.php b/app/code/Magento/Config/Model/Config/CommentFactory.php
index 8a03259463ae0..d4cb2f9f0de1b 100644
--- a/app/code/Magento/Config/Model/Config/CommentFactory.php
+++ b/app/code/Magento/Config/Model/Config/CommentFactory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CommentFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @return CommentInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($type)
     {
diff --git a/app/code/Magento/Config/Model/Config/CommentInterface.php b/app/code/Magento/Config/Model/Config/CommentInterface.php
index e4dc7b9c9d82b..42dba3a07ee1b 100644
--- a/app/code/Magento/Config/Model/Config/CommentInterface.php
+++ b/app/code/Magento/Config/Model/Config/CommentInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CommentInterface
 {
@@ -19,7 +18,6 @@ interface CommentInterface
      * Retrieve element comment by element value
      * @param string $elementValue
      * @return string
-     * @since 2.0.0
      */
     public function getCommentText($elementValue);
 }
diff --git a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
index c084828f22ecd..2adad8d7594bc 100644
--- a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
+++ b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
@@ -16,7 +16,6 @@
 /**
  * Class IncludeElement
  * @api
- * @since 2.0.0
  */
 class IncludeElement implements ElementInterface
 {
@@ -24,13 +23,11 @@ class IncludeElement implements ElementInterface
 
     /**
      * @var Reader
-     * @since 2.0.0
      */
     protected $moduleReader;
 
     /**
      * @var Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
@@ -39,7 +36,6 @@ class IncludeElement implements ElementInterface
      *
      * @param Reader $moduleReader
      * @param Filesystem\Directory\ReadFactory $readFactory
-     * @since 2.0.0
      */
     public function __construct(Reader $moduleReader, Filesystem\Directory\ReadFactory $readFactory)
     {
@@ -55,7 +51,6 @@ public function __construct(Reader $moduleReader, Filesystem\Directory\ReadFacto
      * @param DataObject $processedObject
      * @param DataObject $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(
         CompilerInterface $compiler,
@@ -86,7 +81,6 @@ public function compile(
      *
      * @param \DOMElement $node
      * @return \DOMElement[]
-     * @since 2.0.0
      */
     protected function getChildNodes(\DOMElement $node)
     {
@@ -104,7 +98,6 @@ protected function getChildNodes(\DOMElement $node)
      * @param string $includePath
      * @return string
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function getContent($includePath)
     {
diff --git a/app/code/Magento/Config/Model/Config/Export/Comment.php b/app/code/Magento/Config/Model/Config/Export/Comment.php
index 51979ee70a7b9..48e004a741f24 100644
--- a/app/code/Magento/Config/Model/Config/Export/Comment.php
+++ b/app/code/Magento/Config/Model/Config/Export/Comment.php
@@ -15,19 +15,19 @@
 /**
  * Class Comment. Is used to retrieve comment for config dump file
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Comment implements CommentInterface
 {
     /**
      * @var PlaceholderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $placeholder;
 
     /**
      * @var DumpConfigSourceInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $source;
 
@@ -43,7 +43,7 @@ class Comment implements CommentInterface
      * @param PlaceholderFactory $placeholderFactory
      * @param DumpConfigSourceInterface $source
      * @param TypePool|null $typePool The checker for config type
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         PlaceholderFactory $placeholderFactory,
@@ -62,7 +62,7 @@ public function __construct(
      * a list with descriptions of these fields will be added to the comments.
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get()
     {
diff --git a/app/code/Magento/Config/Model/Config/Export/ExcludeList.php b/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
index 9c81fd37561f8..d8c6590f6401a 100644
--- a/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
+++ b/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
@@ -11,19 +11,19 @@
  * @deprecated 2.2.0 because in Magento since version 2.2.0 there are several
  * types for configuration fields that require special processing.
  * @see \Magento\Config\Model\Config\TypePool
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ExcludeList
 {
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $configs;
 
     /**
      * @param array $configs
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $configs = [])
     {
@@ -36,7 +36,7 @@ public function __construct(array $configs = [])
      * @param string $path
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isPresent($path)
     {
@@ -48,7 +48,7 @@ public function isPresent($path)
      *
      * @return array
      * @deprecated 2.2.0
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get()
     {
diff --git a/app/code/Magento/Config/Model/Config/Factory.php b/app/code/Magento/Config/Model/Config/Factory.php
index 9edee9dee4614..b480c670c4919 100644
--- a/app/code/Magento/Config/Model/Config/Factory.php
+++ b/app/code/Magento/Config/Model/Config/Factory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Config/Model/Config/Loader.php b/app/code/Magento/Config/Model/Config/Loader.php
index 87d49e1800e27..93dd79c0d7685 100644
--- a/app/code/Magento/Config/Model/Config/Loader.php
+++ b/app/code/Magento/Config/Model/Config/Loader.php
@@ -14,7 +14,6 @@
  *
  * @package Magento\Config\Model\Config
  * @api
- * @since 2.0.0
  */
 class Loader
 {
@@ -22,13 +21,11 @@ class Loader
      * Config data factory
      *
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ValueFactory $configValueFactory)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Framework\App\Config\ValueFactory $configVa
      * @param string $scopeId
      * @param bool $full
      * @return array
-     * @since 2.0.0
      */
     public function getConfigByPath($path, $scope, $scopeId, $full = true)
     {
diff --git a/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php b/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
index 5c50f10cfee7d..0387b79c93701 100644
--- a/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
+++ b/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
@@ -13,32 +13,32 @@
 /**
  * Allows to extract configurations from environment variables.
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class EnvironmentPlaceholder implements PreProcessorInterface
 {
     /**
      * @var PlaceholderFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $placeholderFactory;
 
     /**
      * @var ArrayManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $arrayManager;
 
     /**
      * @var PlaceholderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $placeholder;
 
     /**
      * @param PlaceholderFactory $placeholderFactory
      * @param ArrayManager $arrayManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         PlaceholderFactory $placeholderFactory,
@@ -54,7 +54,7 @@ public function __construct(
      * If environment variable is matching the desired rule - it's being used as value.
      *
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $config)
     {
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
index d791c901574e6..17e31c1200ead 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
+++ b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
@@ -15,25 +15,25 @@
 /**
  * Class for checking settings that defined in config file
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class SettingChecker
 {
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * @var PlaceholderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $placeholder;
 
     /**
      * @var ScopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeCodeResolver;
 
@@ -41,7 +41,7 @@ class SettingChecker
      * @param DeploymentConfig $config
      * @param PlaceholderFactory $placeholderFactory
      * @param ScopeCodeResolver $scopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         DeploymentConfig $config,
@@ -60,7 +60,7 @@ public function __construct(
      * @param string $scope
      * @param string|null $scopeCode
      * @return boolean
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isReadOnly($path, $scope, $scopeCode = null)
     {
@@ -85,7 +85,7 @@ public function isReadOnly($path, $scope, $scopeCode = null)
      * @param string $scopeCode
      * @param string|null $scopeCode
      * @return string|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getPlaceholderValue($path, $scope, $scopeCode = null)
     {
@@ -97,7 +97,7 @@ public function getPlaceholderValue($path, $scope, $scopeCode = null)
      *
      * @param string $placeholder
      * @return string|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getEnvValue($placeholder)
     {
@@ -114,7 +114,7 @@ public function getEnvValue($placeholder)
      * @param string $scope
      * @param string $scopeCode
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function resolvePath($scope, $scopeCode)
     {
diff --git a/app/code/Magento/Config/Model/Config/SchemaLocator.php b/app/code/Magento/Config/Model/Config/SchemaLocator.php
index fc7906293220b..3d42dc01de81a 100644
--- a/app/code/Magento/Config/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Config/Model/Config/SchemaLocator.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -19,7 +18,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -27,13 +25,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -46,7 +42,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -57,7 +52,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Config/Model/Config/ScopeDefiner.php b/app/code/Magento/Config/Model/Config/ScopeDefiner.php
index 7b3ca1d8e2086..f5a07f181390a 100644
--- a/app/code/Magento/Config/Model/Config/ScopeDefiner.php
+++ b/app/code/Magento/Config/Model/Config/ScopeDefiner.php
@@ -11,7 +11,6 @@
 /**
  * System configuration scope
  * @api
- * @since 2.0.0
  */
 class ScopeDefiner
 {
@@ -19,13 +18,11 @@ class ScopeDefiner
      * Request object
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\RequestInterface $request)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\App\RequestInterface $request)
      * Retrieve current config scope
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScope()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Admin/Page.php b/app/code/Magento/Config/Model/Config/Source/Admin/Page.php
index 37024ce13c8f5..9adc75e9fd43c 100644
--- a/app/code/Magento/Config/Model/Config/Source/Admin/Page.php
+++ b/app/code/Magento/Config/Model/Config/Source/Admin/Page.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Page implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,20 +16,17 @@ class Page implements \Magento\Framework\Option\ArrayInterface
      * Menu model
      *
      * @var \Magento\Backend\Model\Menu
-     * @since 2.0.0
      */
     protected $_menu;
 
     /**
      * @var \Magento\Backend\Model\Menu\Filter\IteratorFactory
-     * @since 2.0.0
      */
     protected $_iteratorFactory;
 
     /**
      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
      * @param \Magento\Backend\Model\Menu\Config $menuConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -56,7 +51,6 @@ public function toOptionArray()
      *
      * @param \Magento\Backend\Model\Menu $menu menu model
      * @return \Magento\Backend\Model\Menu\Filter\Iterator
-     * @since 2.0.0
      */
     protected function _getMenuIterator(\Magento\Backend\Model\Menu $menu)
     {
@@ -70,7 +64,6 @@ protected function _getMenuIterator(\Magento\Backend\Model\Menu $menu)
      * @param \Magento\Backend\Model\Menu $menu
      * @param int $level
      * @return void
-     * @since 2.0.0
      */
     protected function _createOptions(&$optionArray, \Magento\Backend\Model\Menu $menu, $level = 0)
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Date/Short.php b/app/code/Magento/Config/Model/Config/Source/Date/Short.php
index 5f25a6effbcaa..f40e6655e788c 100644
--- a/app/code/Magento/Config/Model/Config/Source/Date/Short.php
+++ b/app/code/Magento/Config/Model/Config/Source/Date/Short.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Short implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Design/Robots.php b/app/code/Magento/Config/Model/Config/Source/Design/Robots.php
index ded416e824264..3e9bb0f2e5be0 100644
--- a/app/code/Magento/Config/Model/Config/Source/Design/Robots.php
+++ b/app/code/Magento/Config/Model/Config/Source/Design/Robots.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Robots implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php b/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php
index 68cbf24a38b9b..76acff87f127e 100644
--- a/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php
+++ b/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Dbautoup implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
index 9641b605f2298..582a41abe3d21 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Identity implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,7 +14,6 @@ class Identity implements \Magento\Framework\Option\ArrayInterface
      * Email Identity options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = null;
 
@@ -23,13 +21,11 @@ class Identity implements \Magento\Framework\Option\ArrayInterface
      * Configuration structure
      *
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
     /**
      * @param \Magento\Config\Model\Config\Structure $configStructure
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure $configStructure)
     {
@@ -40,7 +36,6 @@ public function __construct(\Magento\Config\Model\Config\Structure $configStruct
      * Retrieve list of options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Method.php b/app/code/Magento/Config/Model/Config/Source/Email/Method.php
index 15b893c24c13f..609724737a9b5 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Method.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Method.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Method implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php b/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php
index a31a744eea014..6ec1b181cdebd 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Smtpauth implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
index d12c84d79578e..687c65f18c73b 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Template extends \Magento\Framework\DataObject implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     private $_coreRegistry;
 
     /**
      * @var \Magento\Email\Model\Template\Config
-     * @since 2.0.0
      */
     private $_emailConfig;
 
     /**
      * @var \Magento\Email\Model\ResourceModel\Template\CollectionFactory
-     * @since 2.0.0
      */
     protected $_templatesFactory;
 
@@ -34,7 +30,6 @@ class Template extends \Magento\Framework\DataObject implements \Magento\Framewo
      * @param \Magento\Email\Model\ResourceModel\Template\CollectionFactory $templatesFactory
      * @param \Magento\Email\Model\Template\Config $emailConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $coreRegistry,
@@ -52,7 +47,6 @@ public function __construct(
      * Generate list of email templates
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Enabledisable.php b/app/code/Magento/Config/Model/Config/Source/Enabledisable.php
index d4e4e78bad924..f9ce4e1b9bc89 100644
--- a/app/code/Magento/Config/Model/Config/Source/Enabledisable.php
+++ b/app/code/Magento/Config/Model/Config/Source/Enabledisable.php
@@ -8,7 +8,6 @@
 /**
  * Source model for element with enable and disable variants.
  * @api
- * @since 2.0.0
  */
 class Enabledisable implements \Magento\Framework\Option\ArrayInterface
 {
@@ -24,7 +23,6 @@ class Enabledisable implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php b/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php
index f99c880bbb7a2..836a936131475 100644
--- a/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php
+++ b/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Adapter implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Image\Adapter\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @param \Magento\Framework\Image\Adapter\ConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Image\Adapter\ConfigInterface $config)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Framework\Image\Adapter\ConfigInterface $co
      * Return hash of image adapter codes and labels
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale.php b/app/code/Magento/Config/Model/Config/Source/Locale.php
index 9c97bae439bbf..5137e4c75bd4c 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Locale implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Country.php b/app/code/Magento/Config/Model/Config/Source/Locale/Country.php
index 4af7aa614639e..320151226e71a 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Country.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Country.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Country implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
index 8a7258598b6fa..9606c4b0fac1e 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
@@ -11,25 +11,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Currency implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -38,7 +34,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php
index 63f9133e7b684..811b6e999d39c 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class All implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -35,7 +31,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
     /**
      * @param bool $isMultiselect
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false)
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php b/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php
index f76d2feec0117..2807fd4c05097 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Timezone implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * Timezones that works incorrect with php_intl extension
-     * @since 2.0.0
      */
     protected $ignoredTimezones = [
         'Antarctica/Troll',
@@ -28,13 +26,11 @@ class Timezone implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php
index 7c7b82c9e5f31..afe037d9da9f5 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Weekdaycodes implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php
index a114ded96d0da..13037bcbf1beb 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Weekdays implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
index 3809232db3b58..defa9a46a513d 100644
--- a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
+++ b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Nooptreq implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php
index 28fd73615eef0..5922216ce06d4 100644
--- a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php
+++ b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Scope implements \Magento\Framework\Option\ArrayInterface
 {
@@ -21,7 +20,6 @@ class Scope implements \Magento\Framework\Option\ArrayInterface
      * Scope filter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Store.php b/app/code/Magento/Config/Model/Config/Source/Store.php
index afc28582b31c1..0c05e380f9279 100644
--- a/app/code/Magento/Config/Model/Config/Source/Store.php
+++ b/app/code/Magento/Config/Model/Config/Source/Store.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Store implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storesFactory;
 
     /**
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storesFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\ResourceModel\Store\CollectionFactory $storesFactory)
     {
@@ -34,7 +30,6 @@ public function __construct(\Magento\Store\Model\ResourceModel\Store\CollectionF
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php b/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php
index 83950f5ca7990..3a41481f2cdbb 100644
--- a/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php
+++ b/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Protocol implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php b/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php
index 8db5d95d0cf46..5d771eeb87974 100644
--- a/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php
+++ b/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Redirect implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Website.php b/app/code/Magento/Config/Model/Config/Source/Website.php
index 6cf299632736f..9664dde93989f 100644
--- a/app/code/Magento/Config/Model/Config/Source/Website.php
+++ b/app/code/Magento/Config/Model/Config/Source/Website.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Website implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -34,7 +30,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Website/AdminOptionHash.php b/app/code/Magento/Config/Model/Config/Source/Website/AdminOptionHash.php
index fa294bd36dd72..a0ff7861129ee 100644
--- a/app/code/Magento/Config/Model/Config/Source/Website/AdminOptionHash.php
+++ b/app/code/Magento/Config/Model/Config/Source/Website/AdminOptionHash.php
@@ -12,14 +12,12 @@
  *
  * This class is needed until the layout file supports supplying arguments to an option model.
  * @api
- * @since 2.0.0
  */
 class AdminOptionHash extends OptionHash
 {
     /**
      * @param Store $systemStore
      * @param bool $withDefaultWebsite
-     * @since 2.0.0
      */
     public function __construct(Store $systemStore, $withDefaultWebsite = true)
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php b/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php
index 1de97c949fa4c..89bc20bfe6a7f 100644
--- a/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php
+++ b/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class OptionHash implements ArrayInterface
 {
@@ -18,20 +17,17 @@ class OptionHash implements ArrayInterface
      * System Store Model
      *
      * @var Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @var bool True if the default website (Admin) should be included
-     * @since 2.0.0
      */
     protected $_withDefaultWebsite;
 
     /**
      * @param Store $systemStore
      * @param bool $withDefaultWebsite
-     * @since 2.0.0
      */
     public function __construct(Store $systemStore, $withDefaultWebsite = false)
     {
@@ -43,7 +39,6 @@ public function __construct(Store $systemStore, $withDefaultWebsite = false)
      * Return websites array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Yesno.php b/app/code/Magento/Config/Model/Config/Source/Yesno.php
index 8eee0676a60d4..79797493aa308 100644
--- a/app/code/Magento/Config/Model/Config/Source/Yesno.php
+++ b/app/code/Magento/Config/Model/Config/Source/Yesno.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Yesno implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,7 +14,6 @@ class Yesno implements \Magento\Framework\Option\ArrayInterface
      * Options getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -26,7 +24,6 @@ public function toOptionArray()
      * Get options in "key-value" format
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php b/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php
index 7021a7df9c5a1..5f40dd44def17 100644
--- a/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php
+++ b/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Yesnocustom implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,7 +19,6 @@ class Yesnocustom implements \Magento\Framework\Option\ArrayInterface
      * Options getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Config/Model/Config/SourceFactory.php b/app/code/Magento/Config/Model/Config/SourceFactory.php
index b8c183b84ad17..b195648e5b331 100644
--- a/app/code/Magento/Config/Model/Config/SourceFactory.php
+++ b/app/code/Magento/Config/Model/Config/SourceFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SourceFactory
 {
@@ -15,13 +14,11 @@ class SourceFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $modelName
      * @return \Magento\Framework\Option\ArrayInterface
-     * @since 2.0.0
      */
     public function create($modelName)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index 8fd7a1b74e2f8..9eefa0bba5502 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -42,7 +42,6 @@
  * - the configuration path section/group/field
  *
  * @api
- * @since 2.0.0
  */
 class Structure implements \Magento\Config\Model\Config\Structure\SearchInterface
 {
@@ -55,7 +54,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * Configuration structure represented as tree
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
@@ -63,7 +61,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * Config tab iterator
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Iterator\Tab
-     * @since 2.0.0
      */
     protected $_tabIterator;
 
@@ -71,7 +68,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * Pool of config element flyweight objects
      *
      * @var \Magento\Config\Model\Config\Structure\Element\FlyweightFactory
-     * @since 2.0.0
      */
     protected $_flyweightFactory;
 
@@ -79,7 +75,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * Provider of current config scope
      *
      * @var ScopeDefiner
-     * @since 2.0.0
      */
     protected $_scopeDefiner;
 
@@ -87,7 +82,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * List of cached elements
      *
      * @var \Magento\Config\Model\Config\Structure\ElementInterface[]
-     * @since 2.0.0
      */
     protected $_elements;
 
@@ -123,7 +117,6 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
      * @param \Magento\Config\Model\Config\Structure\Element\Iterator\Tab $tabIterator
      * @param \Magento\Config\Model\Config\Structure\Element\FlyweightFactory $flyweightFactory
      * @param ScopeDefiner $scopeDefiner
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Config\Model\Config\Structure\Data $structureData,
@@ -141,7 +134,6 @@ public function __construct(
      * Retrieve tab iterator
      *
      * @return \Magento\Config\Model\Config\Structure\Element\Iterator
-     * @since 2.0.0
      */
     public function getTabs()
     {
@@ -182,7 +174,6 @@ public function getSectionList()
      *
      * @param string $path The structure path
      * @return \Magento\Config\Model\Config\Structure\ElementInterface|null
-     * @since 2.0.0
      */
     public function getElement($path)
     {
@@ -212,7 +203,6 @@ public function getElementByConfigPath($path)
      *
      * @return Structure\ElementInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getFirstSection()
     {
@@ -233,7 +223,6 @@ public function getFirstSection()
      *
      * @param string[] $pathParts
      * @return \Magento\Config\Model\Config\Structure\ElementInterface|null
-     * @since 2.0.0
      */
     public function getElementByPathParts(array $pathParts)
     {
@@ -265,7 +254,6 @@ public function getElementByPathParts(array $pathParts)
      *
      * @param string[] $pathParts
      * @return array
-     * @since 2.0.0
      */
     protected function _createEmptyElement(array $pathParts)
     {
@@ -289,7 +277,6 @@ protected function _createEmptyElement(array $pathParts)
      * @param string $attributeName
      * @param mixed $attributeValue
      * @return array
-     * @since 2.0.0
      */
     public function getFieldPathsByAttribute($attributeName, $attributeValue)
     {
@@ -324,7 +311,6 @@ public function getFieldPathsByAttribute($attributeName, $attributeValue)
      * @param string $attributeName
      * @param mixed $attributeValue
      * @return array
-     * @since 2.0.0
      */
     protected function _getGroupFieldPathsByAttribute(array $fields, $parentPath, $attributeName, $attributeValue)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
index 08a8a15f32183..2cc016560628a 100644
--- a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractElement implements ElementInterface
 {
@@ -19,7 +18,6 @@ abstract class AbstractElement implements ElementInterface
      * Element data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
@@ -27,7 +25,6 @@ abstract class AbstractElement implements ElementInterface
      * Current configuration scope
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_scope;
 
@@ -35,13 +32,11 @@ abstract class AbstractElement implements ElementInterface
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
@@ -54,7 +49,6 @@ abstract class AbstractElement implements ElementInterface
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(StoreManagerInterface $storeManager, \Magento\Framework\Module\Manager $moduleManager)
     {
@@ -67,7 +61,6 @@ public function __construct(StoreManagerInterface $storeManager, \Magento\Framew
      *
      * @param string $code
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     protected function _getTranslatedAttribute($code)
     {
@@ -83,7 +76,6 @@ protected function _getTranslatedAttribute($code)
      * @param array $data
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setData(array $data, $scope)
     {
@@ -95,7 +87,6 @@ public function setData(array $data, $scope)
      * Retrieve flyweight data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -106,7 +97,6 @@ public function getData()
      * Retrieve element id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -117,7 +107,6 @@ public function getId()
      * Retrieve element label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -128,7 +117,6 @@ public function getLabel()
      * Retrieve element label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -139,7 +127,6 @@ public function getComment()
      * Retrieve frontend model class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendModel()
     {
@@ -151,7 +138,6 @@ public function getFrontendModel()
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttribute($key)
     {
@@ -162,7 +148,6 @@ public function getAttribute($key)
      * Check whether element should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
@@ -193,7 +178,6 @@ public function isVisible()
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     protected function _hasVisibilityValue($key)
     {
@@ -204,7 +188,6 @@ protected function _hasVisibilityValue($key)
      * Retrieve css class of a tab
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -217,7 +200,6 @@ public function getClass()
      * @param string $fieldId
      * @param string $fieldPrefix
      * @return string
-     * @since 2.0.0
      */
     protected function _getPath($fieldId, $fieldPrefix = '')
     {
@@ -230,7 +212,6 @@ protected function _getPath($fieldId, $fieldPrefix = '')
      *
      * @param string $fieldPrefix
      * @return string
-     * @since 2.0.0
      */
     public function getPath($fieldPrefix = '')
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractMapper.php b/app/code/Magento/Config/Model/Config/Structure/AbstractMapper.php
index f3e5969ef7238..e4f4838c82573 100644
--- a/app/code/Magento/Config/Model/Config/Structure/AbstractMapper.php
+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractMapper.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractMapper implements MapperInterface
 {
@@ -21,7 +20,6 @@ abstract class AbstractMapper implements MapperInterface
      * @param string $key
      * @param array $target
      * @return bool
-     * @since 2.0.0
      */
     protected function _hasValue($key, $target)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Converter.php b/app/code/Magento/Config/Model/Config/Structure/Converter.php
index a70290bae39ee..caf898a7c3e39 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Converter.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Converter.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var \Magento\Config\Model\Config\Structure\Mapper\Factory
-     * @since 2.0.0
      */
     protected $_mapperFactory;
 
@@ -21,7 +19,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * Mapper type list
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_mapperList = [
         \Magento\Config\Model\Config\Structure\Mapper\Factory::MAPPER_EXTENDS,
@@ -38,7 +35,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * E.G. first element makes all 'tab' nodes be renamed to 'tabs' in system node.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_nameMap = [
         'system' => ['tab' => 'tabs', 'section' => 'sections'],
@@ -49,7 +45,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
 
     /**
      * @param \Magento\Config\Model\Config\Structure\Mapper\Factory $mapperFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure\Mapper\Factory $mapperFactory)
     {
@@ -61,7 +56,6 @@ public function __construct(\Magento\Config\Model\Config\Structure\Mapper\Factor
      *
      * @param \DOMNode $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -83,7 +77,6 @@ public function convert($source)
      * @return array|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _convertDOMDocument(\DOMNode $root)
     {
@@ -164,7 +157,6 @@ protected function _convertDOMDocument(\DOMNode $root)
      * @param array $result
      * @param string $childName
      * @return array
-     * @since 2.0.0
      */
     protected function _addProcessedNode($convertedChild, $result, $childName)
     {
@@ -181,7 +173,6 @@ protected function _addProcessedNode($convertedChild, $result, $childName)
      *
      * @param \DOMNode $root
      * @return array
-     * @since 2.0.0
      */
     protected function _processAttributes(\DOMNode $root)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Data.php b/app/code/Magento/Config/Model/Config/Structure/Data.php
index 351495a249246..3714d5128d2d0 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Data.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Data.php
@@ -10,7 +10,6 @@
 /**
  * Provides configuration
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data\Scoped
 {
@@ -22,7 +21,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Reader $reader,
@@ -39,7 +37,6 @@ public function __construct(
      *
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
index fc62bc711deb8..197a8f2232f21 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractComposite extends \Magento\Config\Model\Config\Structure\AbstractElement
 {
@@ -15,7 +14,6 @@ abstract class AbstractComposite extends \Magento\Config\Model\Config\Structure\
      * Child elements iterator
      *
      * @var Iterator
-     * @since 2.0.0
      */
     protected $_childrenIterator;
 
@@ -23,7 +21,6 @@ abstract class AbstractComposite extends \Magento\Config\Model\Config\Structure\
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Iterator $childrenIterator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -40,7 +37,6 @@ public function __construct(
      * @param array $data
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setData(array $data, $scope)
     {
@@ -58,7 +54,6 @@ public function setData(array $data, $scope)
      * Check whether element has visible child elements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -72,7 +67,6 @@ public function hasChildren()
      * Retrieve children iterator
      *
      * @return \Magento\Config\Model\Config\Structure\Element\Iterator
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -83,7 +77,6 @@ public function getChildren()
      * Check whether element is visible
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
index ce9586482b57c..74576411b089f 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Field
 {
@@ -15,7 +14,6 @@ class Field
      * Values for dependence
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_values;
 
@@ -23,7 +21,6 @@ class Field
      * Id of the dependent field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_id;
 
@@ -31,14 +28,12 @@ class Field
      * Whether dependence is for negative comparison
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isNegative = false;
 
     /**
      * @param array $fieldData
      * @param string $fieldPrefix
-     * @since 2.0.0
      */
     public function __construct(array $fieldData = [], $fieldPrefix = "")
     {
@@ -64,7 +59,6 @@ public function __construct(array $fieldData = [], $fieldPrefix = "")
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     public function isValueSatisfy($value)
     {
@@ -75,7 +69,6 @@ public function isValueSatisfy($value)
      * Get id of the dependent field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -86,7 +79,6 @@ public function getId()
      * Get values for dependence
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -97,7 +89,6 @@ public function getValues()
      * Get negative indication of dependency
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNegative()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/FieldFactory.php b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/FieldFactory.php
index 989901b639a71..8a227bace0ed1 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/FieldFactory.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/FieldFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FieldFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return Field
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Mapper.php b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Mapper.php
index f4d6aaf0f8ac8..676e74f6c9be9 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Mapper.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Mapper.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Mapper
 {
@@ -15,7 +14,6 @@ class Mapper
      * Field locator model
      *
      * @var \Magento\Config\Model\Config\Structure\SearchInterface
-     * @since 2.0.0
      */
     protected $_fieldLocator;
 
@@ -23,13 +21,11 @@ class Mapper
      * Dependency Field model
      *
      * @var FieldFactory
-     * @since 2.0.0
      */
     protected $_fieldFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -37,7 +33,6 @@ class Mapper
      * @param \Magento\Config\Model\Config\Structure\SearchInterface $fieldLocator
      * @param FieldFactory $fieldFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Config\Model\Config\Structure\SearchInterface $fieldLocator,
@@ -56,7 +51,6 @@ public function __construct(
      * @param string $storeCode
      * @param string $fieldPrefix
      * @return array
-     * @since 2.0.0
      */
     public function getDependencies($dependencies, $storeCode, $fieldPrefix = '')
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
index ac9e035203f13..5a093bb056fe4 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
 {
@@ -22,7 +21,6 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      * Backend model factory
      *
      * @var \Magento\Config\Model\Config\BackendFactory
-     * @since 2.0.0
      */
     protected $_backendFactory;
 
@@ -30,7 +28,6 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      * Source model factory
      *
      * @var \Magento\Config\Model\Config\SourceFactory
-     * @since 2.0.0
      */
     protected $_sourceFactory;
 
@@ -38,14 +35,12 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      * Comment model factory
      *
      * @var \Magento\Config\Model\Config\CommentFactory
-     * @since 2.0.0
      */
     protected $_commentFactory;
 
     /**
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Dependency\Mapper
-     * @since 2.0.0
      */
     protected $_dependencyMapper;
 
@@ -53,7 +48,6 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      * Block factory
      *
      * @var \Magento\Framework\View\Element\BlockFactory
-     * @since 2.0.0
      */
     protected $_blockFactory;
 
@@ -65,7 +59,6 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      * @param \Magento\Config\Model\Config\CommentFactory $commentFactory
      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
      * @param Dependency\Mapper $dependencyMapper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -89,7 +82,6 @@ public function __construct(
      *
      * @param string $labelPrefix
      * @return string
-     * @since 2.0.0
      */
     public function getLabel($labelPrefix = '')
     {
@@ -105,7 +97,6 @@ public function getLabel($labelPrefix = '')
      * Retrieve field hint
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHint()
     {
@@ -117,7 +108,6 @@ public function getHint()
      *
      * @param string $currentValue
      * @return string
-     * @since 2.0.0
      */
     public function getComment($currentValue = '')
     {
@@ -139,7 +129,6 @@ public function getComment($currentValue = '')
      * Retrieve tooltip text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTooltip()
     {
@@ -155,7 +144,6 @@ public function getTooltip()
      * Retrieve field type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -168,7 +156,6 @@ public function getType()
      * @param string $fieldPrefix
      * @param string $elementType
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getRequiredElements($fieldPrefix = '', $elementType = 'group')
     {
@@ -190,7 +177,6 @@ protected function _getRequiredElements($fieldPrefix = '', $elementType = 'group
      *
      * @param string $fieldPrefix
      * @return string[]
-     * @since 2.0.0
      */
     public function getRequiredGroups($fieldPrefix = '')
     {
@@ -202,7 +188,6 @@ public function getRequiredGroups($fieldPrefix = '')
      *
      * @param string $fieldPrefix
      * @return string[]
-     * @since 2.0.0
      */
     public function getRequiredFields($fieldPrefix = '')
     {
@@ -213,7 +198,6 @@ public function getRequiredFields($fieldPrefix = '')
      * Retrieve frontend css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendClass()
     {
@@ -224,7 +208,6 @@ public function getFrontendClass()
      * Check whether field has backend model
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasBackendModel()
     {
@@ -235,7 +218,6 @@ public function hasBackendModel()
      * Retrieve backend model
      *
      * @return \Magento\Framework\App\Config\ValueInterface
-     * @since 2.0.0
      */
     public function getBackendModel()
     {
@@ -246,7 +228,6 @@ public function getBackendModel()
      * Retrieve field section id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSectionId()
     {
@@ -258,7 +239,6 @@ public function getSectionId()
      * Retrieve field group path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroupPath()
     {
@@ -269,7 +249,6 @@ public function getGroupPath()
      * Retrieve config path
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getConfigPath()
     {
@@ -280,7 +259,6 @@ public function getConfigPath()
      * Check whether field should be shown in default scope
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showInDefault()
     {
@@ -291,7 +269,6 @@ public function showInDefault()
      * Check whether field should be shown in website scope
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showInWebsite()
     {
@@ -302,7 +279,6 @@ public function showInWebsite()
      * Check whether field should be shown in store scope
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showInStore()
     {
@@ -325,7 +301,6 @@ public function canRestore()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $formField
      * @return void
-     * @since 2.0.0
      */
     public function populateInput($formField)
     {
@@ -342,7 +317,6 @@ public function populateInput($formField)
      * Check whether field has validation class
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasValidation()
     {
@@ -353,7 +327,6 @@ public function hasValidation()
      * Retrieve field validation class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidation()
     {
@@ -364,7 +337,6 @@ public function getValidation()
      * Check whether field can be empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canBeEmpty()
     {
@@ -375,7 +347,6 @@ public function canBeEmpty()
      * Check whether field has source model
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasSourceModel()
     {
@@ -386,7 +357,6 @@ public function hasSourceModel()
      * Check whether field has options or source model
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
@@ -397,7 +367,6 @@ public function hasOptions()
      * Retrieve static options or source model option list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -418,7 +387,6 @@ public function getOptions()
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function _getStaticOptions(array $options)
     {
@@ -434,7 +402,6 @@ protected function _getStaticOptions(array $options)
      *
      * @param string $label an option label that should be translated
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     private function _translateLabel($label)
     {
@@ -446,7 +413,6 @@ private function _translateLabel($label)
      *
      * @param string $value an option value that may contain a placeholder for a constant value
      * @return mixed|string the value after being replaced by the constant if needed
-     * @since 2.0.0
      */
     private function _fillInConstantPlaceholders($value)
     {
@@ -461,7 +427,6 @@ private function _fillInConstantPlaceholders($value)
      *
      * @param string $sourceModel Source model class name or class::method
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptionsFromSourceModel($sourceModel)
     {
@@ -500,7 +465,6 @@ protected function _getOptionsFromSourceModel($sourceModel)
      * @param string $fieldPrefix
      * @param string $storeCode
      * @return array
-     * @since 2.0.0
      */
     public function getDependencies($fieldPrefix, $storeCode)
     {
@@ -520,7 +484,6 @@ public function getDependencies($fieldPrefix, $storeCode)
      * Check whether element should be displayed for advanced users
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAdvanced()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/FlyweightFactory.php b/app/code/Magento/Config/Model/Config/Structure/Element/FlyweightFactory.php
index 9f91c5ad8bae5..cb8cdaaa0c60c 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/FlyweightFactory.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/FlyweightFactory.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FlyweightFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -21,7 +19,6 @@ class FlyweightFactory
      * Map of flyweight types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_flyweightMap = [
         'section' => \Magento\Config\Model\Config\Structure\Element\Section::class,
@@ -31,7 +28,6 @@ class FlyweightFactory
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $type
      * @return \Magento\Config\Model\Config\Structure\ElementInterface
-     * @since 2.0.0
      */
     public function create($type)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
index 66ed512521790..e6eaeeb9615f0 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Group extends AbstractComposite
 {
@@ -18,14 +17,12 @@ class Group extends AbstractComposite
      * Group clone model factory
      *
      * @var \Magento\Config\Model\Config\BackendClone\Factory
-     * @since 2.0.0
      */
     protected $_cloneModelFactory;
 
     /**
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Dependency\Mapper
-     * @since 2.0.0
      */
     protected $_dependencyMapper;
 
@@ -35,7 +32,6 @@ class Group extends AbstractComposite
      * @param Iterator\Field $childrenIterator
      * @param \Magento\Config\Model\Config\BackendClone\Factory $cloneModelFactory
      * @param Dependency\Mapper $dependencyMapper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -53,7 +49,6 @@ public function __construct(
      * Should group fields be cloned
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldCloneFields()
     {
@@ -65,7 +60,6 @@ public function shouldCloneFields()
      *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCloneModel()
     {
@@ -82,7 +76,6 @@ public function getCloneModel()
      *
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @return void
-     * @since 2.0.0
      */
     public function populateFieldset(\Magento\Framework\Data\Form\Element\Fieldset $fieldset)
     {
@@ -99,7 +92,6 @@ public function populateFieldset(\Magento\Framework\Data\Form\Element\Fieldset $
      * Check whether group should be expanded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isExpanded()
     {
@@ -110,7 +102,6 @@ public function isExpanded()
      * Retrieve group fieldset css
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldsetCss()
     {
@@ -122,7 +113,6 @@ public function getFieldsetCss()
      *
      * @param string $storeCode
      * @return array
-     * @since 2.0.0
      */
     public function getDependencies($storeCode)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php b/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php
index 1348bf729ce7c..499d91557e512 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group implements
     \Magento\Framework\ObjectManager\NoninterceptableInterface
@@ -15,19 +14,16 @@ class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group impleme
     /**
      * Object manager
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Group
-     * @since 2.0.0
      */
     protected $_subject;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManger
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManger)
     {
@@ -38,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Retrieve subject
      *
      * @return \Magento\Config\Model\Config\Structure\Element\Group
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -56,7 +51,6 @@ protected function _getSubject()
      * @param array $data
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setData(array $data, $scope)
     {
@@ -67,7 +61,6 @@ public function setData(array $data, $scope)
      * Retrieve element id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -78,7 +71,6 @@ public function getId()
      * Retrieve element label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -89,7 +81,6 @@ public function getLabel()
      * Retrieve element label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -100,7 +91,6 @@ public function getComment()
      * Retrieve frontend model class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendModel()
     {
@@ -112,7 +102,6 @@ public function getFrontendModel()
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttribute($key)
     {
@@ -123,7 +112,6 @@ public function getAttribute($key)
      * Check whether section is allowed for current user
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -136,7 +124,6 @@ public function isAllowed()
      * @param string $websiteCode
      * @param string $storeCode
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible($websiteCode = '', $storeCode = '')
     {
@@ -147,7 +134,6 @@ public function isVisible($websiteCode = '', $storeCode = '')
      * Retrieve css class of a tab
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -158,7 +144,6 @@ public function getClass()
      * Check whether element has visible child elements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -169,7 +154,6 @@ public function hasChildren()
      * Retrieve children iterator
      *
      * @return \Magento\Config\Model\Config\Structure\Element\Iterator
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -180,7 +164,6 @@ public function getChildren()
      * Should group fields be cloned
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldCloneFields()
     {
@@ -191,7 +174,6 @@ public function shouldCloneFields()
      * Retrieve clone model
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getCloneModel()
     {
@@ -203,7 +185,6 @@ public function getCloneModel()
      *
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @return void
-     * @since 2.0.0
      */
     public function populateFieldset(\Magento\Framework\Data\Form\Element\Fieldset $fieldset)
     {
@@ -214,7 +195,6 @@ public function populateFieldset(\Magento\Framework\Data\Form\Element\Fieldset $
      * Retrieve element data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -226,7 +206,6 @@ public function getData()
      *
      * @param string $fieldPrefix
      * @return string
-     * @since 2.0.0
      */
     public function getPath($fieldPrefix = '')
     {
@@ -237,7 +216,6 @@ public function getPath($fieldPrefix = '')
      * Check whether element should be expanded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isExpanded()
     {
@@ -248,7 +226,6 @@ public function isExpanded()
      * Retrieve fieldset css
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldsetCss()
     {
@@ -260,7 +237,6 @@ public function getFieldsetCss()
      *
      * @param string $storeCode
      * @return array
-     * @since 2.0.0
      */
     public function getDependencies($storeCode)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php
index bd841ee4b2144..2678c43be3c6d 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Iterator implements \Iterator
 {
@@ -15,7 +14,6 @@ class Iterator implements \Iterator
      * List of element data
      *
      * @var \Magento\Config\Model\Config\Structure\ElementInterface[]
-     * @since 2.0.0
      */
     protected $_elements;
 
@@ -23,7 +21,6 @@ class Iterator implements \Iterator
      * Config structure element flyweight
      *
      * @var \Magento\Config\Model\Config\Structure\AbstractElement
-     * @since 2.0.0
      */
     protected $_flyweight;
 
@@ -31,7 +28,6 @@ class Iterator implements \Iterator
      * Configuration scope
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_scope;
 
@@ -39,13 +35,11 @@ class Iterator implements \Iterator
      * Last element id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_lastId;
 
     /**
      * @param \Magento\Config\Model\Config\Structure\AbstractElement $element
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure\AbstractElement $element)
     {
@@ -58,7 +52,6 @@ public function __construct(\Magento\Config\Model\Config\Structure\AbstractEleme
      * @param array $elements
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setElements(array $elements, $scope)
     {
@@ -74,7 +67,6 @@ public function setElements(array $elements, $scope)
      * Return the current element
      *
      * @return \Magento\Config\Model\Config\Structure\ElementInterface
-     * @since 2.0.0
      */
     public function current()
     {
@@ -85,7 +77,6 @@ public function current()
      * Move forward to next element
      *
      * @return void Any returned value is ignored.
-     * @since 2.0.0
      */
     public function next()
     {
@@ -103,7 +94,6 @@ public function next()
      *
      * @param array $element
      * @return void
-     * @since 2.0.0
      */
     protected function _initFlyweight(array $element)
     {
@@ -114,7 +104,6 @@ protected function _initFlyweight(array $element)
      * Return the key of the current element
      *
      * @return void
-     * @since 2.0.0
      */
     public function key()
     {
@@ -126,7 +115,6 @@ public function key()
      *
      * @return bool The return value will be casted to boolean and then evaluated.
      * Returns true on success or false on failure.
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -137,7 +125,6 @@ public function valid()
      * Rewind the \Iterator to the first element
      *
      * @return void Any returned value is ignored.
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -155,7 +142,6 @@ public function rewind()
      *
      * @param \Magento\Config\Model\Config\Structure\ElementInterface $element
      * @return bool
-     * @since 2.0.0
      */
     public function isLast(\Magento\Config\Model\Config\Structure\ElementInterface $element)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Field.php
index be43dec6216ca..c5f6f8a20bc41 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Field.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Field.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Field extends \Magento\Config\Model\Config\Structure\Element\Iterator
 {
@@ -15,7 +14,6 @@ class Field extends \Magento\Config\Model\Config\Structure\Element\Iterator
      * Group flyweight
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Group
-     * @since 2.0.0
      */
     protected $_groupFlyweight;
 
@@ -23,14 +21,12 @@ class Field extends \Magento\Config\Model\Config\Structure\Element\Iterator
      * Field element flyweight
      *
      * @var \Magento\Config\Model\Config\Structure\Element\Field
-     * @since 2.0.0
      */
     protected $_fieldFlyweight;
 
     /**
      * @param \Magento\Config\Model\Config\Structure\Element\Group $groupFlyweight
      * @param \Magento\Config\Model\Config\Structure\Element\Field $fieldFlyweight
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Config\Model\Config\Structure\Element\Group $groupFlyweight,
@@ -46,7 +42,6 @@ public function __construct(
      * @param array $element
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _initFlyweight(array $element)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Group.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Group.php
index 559397aba19a5..c1b6f16ecdcf2 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Group.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Group.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Group extends \Magento\Config\Model\Config\Structure\Element\Iterator
 {
     /**
      * @param \Magento\Config\Model\Config\Structure\Element\Group $element
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure\Element\Group $element)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Section.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Section.php
index e2882cdc0fd9a..1cfd865a4c3f6 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Section.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Section.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Section extends \Magento\Config\Model\Config\Structure\Element\Iterator
 {
     /**
      * @param \Magento\Config\Model\Config\Structure\Element\Section $element
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure\Element\Section $element)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Tab.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Tab.php
index 1f677823242fc..eb63e0622e205 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Tab.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator/Tab.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tab extends \Magento\Config\Model\Config\Structure\Element\Iterator
 {
     /**
      * @param \Magento\Config\Model\Config\Structure\Element\Tab $element
-     * @since 2.0.0
      */
     public function __construct(\Magento\Config\Model\Config\Structure\Element\Tab $element)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
index 28c080257bde2..4f748c194374b 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Section extends AbstractComposite
 {
@@ -15,7 +14,6 @@ class Section extends AbstractComposite
      * Authorization service
      *
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
@@ -24,7 +22,6 @@ class Section extends AbstractComposite
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Iterator $childrenIterator
      * @param \Magento\Framework\AuthorizationInterface $authorization
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -40,7 +37,6 @@ public function __construct(
      * Retrieve section header css
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCss()
     {
@@ -51,7 +47,6 @@ public function getHeaderCss()
      * Check whether section is allowed for current user
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -62,7 +57,6 @@ public function isAllowed()
      * Check whether element should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Tab.php b/app/code/Magento/Config/Model/Config/Structure/Element/Tab.php
index 33909cee033dd..a6a745a61573f 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Tab.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Tab.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tab extends AbstractComposite
 {
@@ -15,7 +14,6 @@ class Tab extends AbstractComposite
      * Check whether tab is visible
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php b/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
index 3c0c44ce43dae..dc03fd2a6ed09 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ElementInterface
 {
@@ -17,7 +16,6 @@ interface ElementInterface
      * @param array $data
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setData(array $data, $scope);
 
@@ -25,7 +23,6 @@ public function setData(array $data, $scope);
      * Retrieve element configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 
@@ -33,7 +30,6 @@ public function getData();
      * Retrieve element id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId();
 
@@ -41,7 +37,6 @@ public function getId();
      * Retrieve element label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -49,7 +44,6 @@ public function getLabel();
      * Check whether element is visible
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible();
 
@@ -58,7 +52,6 @@ public function isVisible();
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttribute($key);
 }
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Attribute/Inheritance.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Attribute/Inheritance.php
index 5b403e990c74d..6a44b0fc8984e 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Attribute/Inheritance.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Attribute/Inheritance.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Inheritance implements \Magento\Config\Model\Config\Structure\MapperInterface
 {
@@ -20,7 +19,6 @@ class Inheritance implements \Magento\Config\Model\Config\Structure\MapperInterf
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Dependencies.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Dependencies.php
index 2b8fff9b158c9..5c2f5059885b9 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Dependencies.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Dependencies.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Dependencies extends \Magento\Config\Model\Config\Structure\AbstractMapper
 {
@@ -19,13 +18,11 @@ class Dependencies extends \Magento\Config\Model\Config\Structure\AbstractMapper
      * Class that can convert relative paths from "depends" node to absolute
      *
      * @var \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter
-     * @since 2.0.0
      */
     protected $_pathConverter;
 
     /**
      * @param \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter $pathConverted
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter $pathConverted
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
@@ -55,7 +51,6 @@ public function map(array $data)
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     protected function _processConfig($config)
     {
@@ -74,7 +69,6 @@ protected function _processConfig($config)
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     protected function _processDepends($config)
     {
@@ -95,7 +89,6 @@ protected function _processDepends($config)
      * @param array $config
      * @return string[]
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getDependPath($field, $config)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/ExtendsMapper.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/ExtendsMapper.php
index 767896479a459..8851891cb3103 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/ExtendsMapper.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/ExtendsMapper.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ExtendsMapper extends \Magento\Config\Model\Config\Structure\AbstractMapper
 {
@@ -19,7 +18,6 @@ class ExtendsMapper extends \Magento\Config\Model\Config\Structure\AbstractMappe
      * System configuration array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_systemConfiguration;
 
@@ -27,7 +25,6 @@ class ExtendsMapper extends \Magento\Config\Model\Config\Structure\AbstractMappe
      * List of already extended notes (used to break circular extends)
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_extendedNodesList = [];
 
@@ -35,13 +32,11 @@ class ExtendsMapper extends \Magento\Config\Model\Config\Structure\AbstractMappe
      * Class that can convert relative paths from "extends" node to absolute
      *
      * @var \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter
-     * @since 2.0.0
      */
     protected $_pathConverter;
 
     /**
      * @param \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter $pathConverted
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Config\Model\Config\Structure\Mapper\Helper\RelativePathConverter $pathConverted
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
@@ -76,7 +70,6 @@ public function map(array $data)
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     protected function _traverseAndExtend($path)
     {
@@ -102,7 +95,6 @@ protected function _traverseAndExtend($path)
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     protected function _getDataByPath($path)
     {
@@ -126,7 +118,6 @@ protected function _getDataByPath($path)
      * @param string $extendSourceNode
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _extendNode($path, $extendSourceNode)
     {
@@ -164,7 +155,6 @@ protected function _extendNode($path, $extendSourceNode)
      * @param array $arr1
      * @param array $arr2
      * @return array
-     * @since 2.0.0
      */
     protected function _mergeData($arr1, $arr2)
     {
@@ -185,7 +175,6 @@ protected function _mergeData($arr1, $arr2)
      * @param string $path
      * @param array $newData
      * @return void
-     * @since 2.0.0
      */
     protected function _replaceData($path, $newData)
     {
@@ -207,7 +196,6 @@ protected function _replaceData($path, $newData)
      *
      * @param string $path
      * @return string[]
-     * @since 2.0.0
      */
     protected function _transformPathToKeysList($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
index 4998974174628..9707b9870289b 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
@@ -29,13 +28,11 @@ class Factory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_typeMap = [
         self::MAPPER_SORTING => \Magento\Config\Model\Config\Structure\Mapper\Sorting::class,
@@ -49,7 +46,6 @@ class Factory
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -62,7 +58,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @return \Magento\Config\Model\Config\Structure\MapperInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function create($type)
     {
@@ -85,7 +80,6 @@ public function create($type)
      * @param string $type
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getMapperClassNameByType($type)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php
index 8a0f750d78b69..324fbb0dce244 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RelativePathConverter
 {
@@ -22,7 +21,6 @@ class RelativePathConverter
      * @param string $relativePath
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($nodePath, $relativePath)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Ignore.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Ignore.php
index df7032faac96a..7399b00a9f97b 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Ignore.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Ignore.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Ignore implements \Magento\Config\Model\Config\Structure\MapperInterface
 {
@@ -20,7 +19,6 @@ class Ignore implements \Magento\Config\Model\Config\Structure\MapperInterface
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Path.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Path.php
index da3829c1d8208..b200849769467 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Path.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Path.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Path extends \Magento\Config\Model\Config\Structure\AbstractMapper
 {
@@ -20,7 +19,6 @@ class Path extends \Magento\Config\Model\Config\Structure\AbstractMapper
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
@@ -42,7 +40,6 @@ public function map(array $data)
      * @param array $elementConfig
      * @param array $parentConfig
      * @return array
-     * @since 2.0.0
      */
     protected function _processConfig(array $elementConfig, array $parentConfig)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
index 1c7fc5308f66a..e6085b416e041 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Sorting extends \Magento\Config\Model\Config\Structure\AbstractMapper
 {
@@ -20,7 +19,6 @@ class Sorting extends \Magento\Config\Model\Config\Structure\AbstractMapper
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data)
     {
@@ -33,7 +31,6 @@ public function map(array $data)
     /**
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function _processConfig($data)
     {
@@ -52,7 +49,6 @@ protected function _processConfig($data)
      * @param array $elementA
      * @param array $elementB
      * @return int
-     * @since 2.0.0
      */
     protected function _cmp($elementA, $elementB)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/MapperInterface.php b/app/code/Magento/Config/Model/Config/Structure/MapperInterface.php
index 18819b6658089..d72fe18738477 100644
--- a/app/code/Magento/Config/Model/Config/Structure/MapperInterface.php
+++ b/app/code/Magento/Config/Model/Config/Structure/MapperInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface MapperInterface
 {
@@ -20,7 +19,6 @@ interface MapperInterface
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function map(array $data);
 }
diff --git a/app/code/Magento/Config/Model/Config/Structure/Reader.php b/app/code/Magento/Config/Model/Config/Structure/Reader.php
index 53648a59c4c65..a271da897336a 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Reader.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Reader.php
@@ -15,7 +15,6 @@
 /**
  * Class Reader
  * @api
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -23,7 +22,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/system/tab' => 'id',
@@ -36,7 +34,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
 
     /**
      * @var CompilerInterface
-     * @since 2.0.0
      */
     protected $compiler;
 
@@ -52,7 +49,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -84,7 +80,6 @@ public function __construct(
      * @param array $fileList
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _readFiles($fileList)
     {
@@ -129,7 +124,6 @@ protected function _readFiles($fileList)
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     protected function processingDocument($content)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php b/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php
index cdd350786bfe0..9c8a4f704a234 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Proxy implements
     \Magento\Config\Model\Config\Structure\SearchInterface,
@@ -16,19 +15,16 @@ class Proxy implements
     /**
      * Object manager
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_subject;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -39,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Retrieve subject
      *
      * @return \Magento\Config\Model\Config\Structure\SearchInterface
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -54,7 +49,6 @@ protected function _getSubject()
      *
      * @param string $path
      * @return \Magento\Config\Model\Config\Structure\ElementInterface|null
-     * @since 2.0.0
      */
     public function getElement($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/SearchInterface.php b/app/code/Magento/Config/Model/Config/Structure/SearchInterface.php
index b18d414d9c9b7..36f2fa601e229 100644
--- a/app/code/Magento/Config/Model/Config/Structure/SearchInterface.php
+++ b/app/code/Magento/Config/Model/Config/Structure/SearchInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface SearchInterface
 {
@@ -16,7 +15,6 @@ interface SearchInterface
      *
      * @param string $path
      * @return ElementInterface|null
-     * @since 2.0.0
      */
     public function getElement($path);
 }
diff --git a/app/code/Magento/Config/Model/Placeholder/Environment.php b/app/code/Magento/Config/Model/Placeholder/Environment.php
index cc3fead686c31..896de1d34e5da 100644
--- a/app/code/Magento/Config/Model/Placeholder/Environment.php
+++ b/app/code/Magento/Config/Model/Placeholder/Environment.php
@@ -11,7 +11,7 @@
 /**
  * Class is used to work with placeholders for environment variables names based on config paths
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Environment implements PlaceholderInterface
 {
@@ -22,13 +22,13 @@ class Environment implements PlaceholderInterface
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
     /**
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(DeploymentConfig $deploymentConfig)
     {
@@ -39,7 +39,7 @@ public function __construct(DeploymentConfig $deploymentConfig)
      * Generates placeholder like CONFIG__DEFAULT__TEST__TEST_VALUE
      *
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function generate($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {
@@ -61,7 +61,7 @@ public function generate($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function restore($template)
     {
@@ -74,7 +74,7 @@ public function restore($template)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isApplicable($placeholder)
     {
diff --git a/app/code/Magento/Config/Model/Placeholder/PlaceholderFactory.php b/app/code/Magento/Config/Model/Placeholder/PlaceholderFactory.php
index 258eee9be4b26..03f7a2f5e3dfb 100644
--- a/app/code/Magento/Config/Model/Placeholder/PlaceholderFactory.php
+++ b/app/code/Magento/Config/Model/Placeholder/PlaceholderFactory.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PlaceholderFactory
 {
@@ -21,20 +21,20 @@ class PlaceholderFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $objectManager;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $types;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param array $types
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(ObjectManagerInterface $objectManager, array $types = [])
     {
@@ -48,7 +48,7 @@ public function __construct(ObjectManagerInterface $objectManager, array $types
      * @param string $type
      * @return PlaceholderInterface
      * @throws LocalizedException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function create($type)
     {
diff --git a/app/code/Magento/Config/Model/Placeholder/PlaceholderInterface.php b/app/code/Magento/Config/Model/Placeholder/PlaceholderInterface.php
index 5d41902ffd239..9d3c199b09a8f 100644
--- a/app/code/Magento/Config/Model/Placeholder/PlaceholderInterface.php
+++ b/app/code/Magento/Config/Model/Placeholder/PlaceholderInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface PlaceholderInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PlaceholderInterface
 {
@@ -21,7 +21,7 @@ interface PlaceholderInterface
      * @param string $scopeType
      * @param string $scopeCode
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function generate($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
 
@@ -30,7 +30,7 @@ public function generate($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
      *
      * @param string $template
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function restore($template);
 
@@ -39,7 +39,7 @@ public function restore($template);
      *
      * @param string $placeholder
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isApplicable($placeholder);
 }
diff --git a/app/code/Magento/Config/Model/ResourceModel/Config.php b/app/code/Magento/Config/Model/ResourceModel/Config.php
index d9a593b327d27..9a534fc2260bc 100644
--- a/app/code/Magento/Config/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Config/Model/ResourceModel/Config.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     \Magento\Framework\App\Config\ConfigResource\ConfigInterface
@@ -19,7 +18,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -34,7 +32,6 @@ protected function _construct()
      * @param string $scope
      * @param int $scopeId
      * @return $this
-     * @since 2.0.0
      */
     public function saveConfig($path, $value, $scope, $scopeId)
     {
@@ -71,7 +68,6 @@ public function saveConfig($path, $value, $scope, $scopeId)
      * @param string $scope
      * @param int $scopeId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteConfig($path, $scope, $scopeId)
     {
diff --git a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php
index 4a9a8f604b6f6..b19c3d4529904 100644
--- a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php
+++ b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -50,7 +47,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -84,7 +80,6 @@ protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
      * @param string $scopeCode
      * @param int|array $scopeIds
      * @return void
-     * @since 2.0.0
      */
     public function clearScopeData($scopeCode, $scopeIds)
     {
diff --git a/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php b/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php
index 110bba9bddc49..a57b520ddb896 100644
--- a/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php
+++ b/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param int $scopeId
      * @param string $section
      * @return $this
-     * @since 2.0.0
      */
     public function addScopeFilter($scope, $scopeId, $section)
     {
@@ -50,7 +47,6 @@ public function addScopeFilter($scope, $scopeId, $section)
      *
      * @param string $section
      * @return $this
-     * @since 2.0.0
      */
     public function addPathFilter($section)
     {
@@ -63,7 +59,6 @@ public function addPathFilter($section)
      *
      * @param int|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function addValueFilter($value)
     {
diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
index b4291b2a3323f..583bedc3bb72b 100644
--- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Config\Observer\Config\Backend\Admin\AfterCustomUrlChangedObserver
  *
- * @since 2.0.0
  */
 class AfterCustomUrlChangedObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
      * Backend data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData;
 
@@ -26,19 +24,16 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
@@ -47,7 +42,6 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Helper\Data $backendData,
@@ -68,7 +62,6 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Config/Setup/InstallData.php b/app/code/Magento/Config/Setup/InstallData.php
index 71bae02528136..37b8c72851712 100644
--- a/app/code/Magento/Config/Setup/InstallData.php
+++ b/app/code/Magento/Config/Setup/InstallData.php
@@ -13,13 +13,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Config/Setup/InstallSchema.php b/app/code/Magento/Config/Setup/InstallSchema.php
index f0254331c8dd3..2fd267f0dacc7 100644
--- a/app/code/Magento/Config/Setup/InstallSchema.php
+++ b/app/code/Magento/Config/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Export/Product/Type/Configurable.php
index a65c1114169d7..0859d8e9d59fe 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/Product/Type/Configurable.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ConfigurableImportExport\Model\Export\Product\Type\Configurable
  *
- * @since 2.0.0
  */
 class Configurable extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
 {
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 2d2cc99c00d6c..3d224d1a268f0 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\ConfigurableImportExport\Model\Export\RowCustomizer
  *
- * @since 2.0.0
  */
 class RowCustomizer implements RowCustomizerInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $configurableData = [];
 
@@ -30,7 +28,6 @@ class RowCustomizer implements RowCustomizerInterface
      * @param ProductCollection $collection
      * @param int[] $productIds
      * @return void
-     * @since 2.0.0
      */
     public function prepareData($collection, $productIds)
     {
@@ -75,7 +72,6 @@ public function prepareData($collection, $productIds)
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     public function addHeaderColumns($columns)
     {
@@ -98,7 +94,6 @@ public function addHeaderColumns($columns)
      * @param array $dataRow
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function addData($dataRow, $productId)
     {
@@ -114,7 +109,6 @@ public function addData($dataRow, $productId)
      * @param array $additionalRowsCount
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     public function getAdditionalRowsCount($additionalRowsCount, $productId)
     {
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index 355c15ae8ef6f..aa309553238a0 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
@@ -39,7 +38,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [
         self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super',
@@ -52,7 +50,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [
         '_super_products_sku',
@@ -70,7 +67,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * product_n (underscore) attribute_id_n => product_super_attr_id_n
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productSuperAttrs = [];
 
@@ -90,7 +86,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_skuSuperAttributeValues = [];
 
@@ -110,7 +105,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_skuSuperData = [];
 
@@ -118,7 +112,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Super attributes codes in a form of code => TRUE array pairs.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_superAttributes = [];
 
@@ -126,25 +119,21 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * All super attributes values combinations for each attribute set.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_superAttrValuesCombs = null;
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $_productTypesConfig;
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -153,7 +142,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -161,7 +149,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of product collection factory.
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productColFac;
 
@@ -169,7 +156,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Product data.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productData;
 
@@ -177,7 +163,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Product super data.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productSuperData;
 
@@ -185,7 +170,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Simple product ids to delete.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_simpleIdsToDelete;
 
@@ -193,7 +177,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Super attributes data.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_superAttributesData;
 
@@ -201,7 +184,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Next attribute id.
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_nextAttrId;
 
@@ -222,7 +204,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $_productColFac
      * @param MetadataPool $metadataPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
@@ -248,7 +229,6 @@ public function __construct(
      * @param array $attrParams Refined attribute parameters.
      * @param mixed $attribute
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
     {
@@ -265,7 +245,6 @@ protected function _addAttributeParams($attrSetName, array $attrParams, $attribu
      * @param int $productId
      * @param int $attributeId
      * @return array|null
-     * @since 2.0.0
      */
     protected function _getSuperAttributeId($productId, $attributeId)
     {
@@ -281,7 +260,6 @@ protected function _getSuperAttributeId($productId, $attributeId)
      *
      * @param string $attrCode
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAttributeRequiredCheckNeeded($attrCode)
     {
@@ -294,7 +272,6 @@ protected function _isAttributeRequiredCheckNeeded($attrCode)
      *
      * @param string $attrCode
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAttributeSuper($attrCode)
     {
@@ -307,7 +284,6 @@ protected function _isAttributeSuper($attrCode)
      * @param array $rowData
      * @param int $rowNum
      * @return bool
-     * @since 2.0.0
      */
     protected function _isParticularAttributesValid(array $rowData, $rowNum)
     {
@@ -337,7 +313,6 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
      * @param array $oldSku - present variations list
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _loadSkuSuperAttributeValues($bunch, $newSku, $oldSku)
     {
@@ -391,7 +366,6 @@ protected function _loadSkuSuperAttributeValues($bunch, $newSku, $oldSku)
      *
      * @param array $bunch
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadSkuSuperDataForBunch(array $bunch)
     {
@@ -442,7 +416,6 @@ protected function _loadSkuSuperDataForBunch(array $bunch)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _processSuperData()
     {
@@ -501,7 +474,6 @@ protected function _processSuperData()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _parseVariations($rowData)
     {
@@ -553,7 +525,6 @@ protected function _parseVariations($rowData)
      * @param array $rowData
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _parseVariationLabels($rowData)
     {
@@ -583,7 +554,6 @@ protected function _parseVariationLabels($rowData)
      * Delete unnecessary links.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteData()
     {
@@ -607,7 +577,6 @@ protected function _deleteData()
      *
      * @return $this
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     protected function _insertData()
     {
@@ -643,7 +612,6 @@ protected function _insertData()
      * Get new supper attribute id.
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getNextAttrId()
     {
@@ -660,7 +628,6 @@ protected function _getNextAttrId()
      *
      * @param array $rowData
      * @return $this
-     * @since 2.0.0
      */
     protected function _collectSuperData($rowData)
     {
@@ -710,7 +677,6 @@ protected function _collectSuperData($rowData)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _collectAssocIds($data)
     {
@@ -744,7 +710,6 @@ protected function _collectAssocIds($data)
      * @param integer|string $productId
      * @param array $variationLabels
      * @return $this
-     * @since 2.0.0
      */
     protected function _collectSuperDataLabels($data, $productSuperAttrId, $productId, $variationLabels)
     {
@@ -771,7 +736,6 @@ protected function _collectSuperDataLabels($data, $productSuperAttrId, $productI
      * @throws \Exception
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function saveData()
     {
@@ -833,7 +797,6 @@ public function saveData()
      *
      * @param array $bunch
      * @return bool
-     * @since 2.0.0
      */
     protected function configurableInBunch($bunch)
     {
@@ -857,7 +820,6 @@ protected function configurableInBunch($bunch)
      * @param bool $isNewProduct Optional
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Api/ConfigurableProductManagementInterface.php b/app/code/Magento/ConfigurableProduct/Api/ConfigurableProductManagementInterface.php
index 6b9eeedb9149a..f5917ea2c0498 100644
--- a/app/code/Magento/ConfigurableProduct/Api/ConfigurableProductManagementInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/ConfigurableProductManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface ConfigurableProductManagementInterface
  * @api
- * @since 2.0.0
  */
 interface ConfigurableProductManagementInterface
 {
@@ -19,7 +18,6 @@ interface ConfigurableProductManagementInterface
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param \Magento\ConfigurableProduct\Api\Data\OptionInterface[] $options
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.0.0
      */
     public function generateVariation(\Magento\Catalog\Api\Data\ProductInterface $product, $options);
 
@@ -28,7 +26,6 @@ public function generateVariation(\Magento\Catalog\Api\Data\ProductInterface $pr
      *
      * @param int|null $status
      * @return int
-     * @since 2.0.0
      */
     public function getCount($status = null);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Api/Data/ConfigurableItemOptionValueInterface.php b/app/code/Magento/ConfigurableProduct/Api/Data/ConfigurableItemOptionValueInterface.php
index 430715808e92d..91c7128d1e57d 100644
--- a/app/code/Magento/ConfigurableProduct/Api/Data/ConfigurableItemOptionValueInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/Data/ConfigurableItemOptionValueInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ConfigurableItemOptionValueInterface
  * @api
- * @since 2.0.0
  */
 interface ConfigurableItemOptionValueInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -25,7 +24,6 @@ interface ConfigurableItemOptionValueInterface extends \Magento\Framework\Api\Ex
      * Get option SKU
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOptionId();
 
@@ -34,7 +32,6 @@ public function getOptionId();
      *
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setOptionId($value);
 
@@ -42,7 +39,6 @@ public function setOptionId($value);
      * Get item id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOptionValue();
 
@@ -51,7 +47,6 @@ public function getOptionValue();
      *
      * @param int|null $value
      * @return void
-     * @since 2.0.0
      */
     public function setOptionValue($value);
 
@@ -59,7 +54,6 @@ public function setOptionValue($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -68,7 +62,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/ConfigurableProduct/Api/Data/OptionInterface.php b/app/code/Magento/ConfigurableProduct/Api/Data/OptionInterface.php
index eebea9a9d0a7c..99f1cf9aa9df4 100644
--- a/app/code/Magento/ConfigurableProduct/Api/Data/OptionInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/Data/OptionInterface.php
@@ -9,85 +9,72 @@
 /**
  * Interface OptionInterface
  * @api
- * @since 2.0.0
  */
 interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeId();
 
     /**
      * @param string $attributeId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeId($attributeId);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getLabel();
 
     /**
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getPosition();
 
     /**
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
     /**
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsUseDefault();
 
     /**
      * @param bool $isUseDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUseDefault($isUseDefault);
 
     /**
      * @return \Magento\ConfigurableProduct\Api\Data\OptionValueInterface[]|null
-     * @since 2.0.0
      */
     public function getValues();
 
     /**
      * @param \Magento\ConfigurableProduct\Api\Data\OptionValueInterface[] $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues(array $values = null);
 
@@ -95,7 +82,6 @@ public function setValues(array $values = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -104,7 +90,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
@@ -112,14 +97,12 @@ public function setExtensionAttributes(
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId();
 
     /**
      * @param int|null $value
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($value);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Api/Data/OptionValueInterface.php b/app/code/Magento/ConfigurableProduct/Api/Data/OptionValueInterface.php
index 634b629bf3182..0cf3dd414f256 100644
--- a/app/code/Magento/ConfigurableProduct/Api/Data/OptionValueInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/Data/OptionValueInterface.php
@@ -9,20 +9,17 @@
 /**
  * Interface OptionValueInterface
  * @api
- * @since 2.0.0
  */
 interface OptionValueInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getValueIndex();
 
     /**
      * @param int $valueIndex
      * @return $this
-     * @since 2.0.0
      */
     public function setValueIndex($valueIndex);
 
@@ -30,7 +27,6 @@ public function setValueIndex($valueIndex);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -39,7 +35,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php b/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php
index 849c8aaa26597..63a471b1f6d3d 100644
--- a/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php
@@ -10,7 +10,6 @@
  * Manage children products of configurable product
  *
  * @api
- * @since 2.0.0
  */
 interface LinkManagementInterface
 {
@@ -19,7 +18,6 @@ interface LinkManagementInterface
      *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.0.0
      */
     public function getChildren($sku);
 
@@ -27,7 +25,6 @@ public function getChildren($sku);
      * @param  string $sku
      * @param  string $childSku
      * @return bool
-     * @since 2.0.0
      */
     public function addChild($sku, $childSku);
 
@@ -39,7 +36,6 @@ public function addChild($sku, $childSku);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function removeChild($sku, $childSku);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Api/OptionRepositoryInterface.php b/app/code/Magento/ConfigurableProduct/Api/OptionRepositoryInterface.php
index 52af1f4dbe0c7..5188d94adb1da 100644
--- a/app/code/Magento/ConfigurableProduct/Api/OptionRepositoryInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Api/OptionRepositoryInterface.php
@@ -10,7 +10,6 @@
  * Manage options of configurable product
  *
  * @api
- * @since 2.0.0
  */
 interface OptionRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface OptionRepositoryInterface
      * @return \Magento\ConfigurableProduct\Api\Data\OptionInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function get($sku, $id);
 
@@ -33,7 +31,6 @@ public function get($sku, $id);
      * @return \Magento\ConfigurableProduct\Api\Data\OptionInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getList($sku);
 
@@ -42,7 +39,6 @@ public function getList($sku);
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionInterface $option
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\ConfigurableProduct\Api\Data\OptionInterface $option);
 
@@ -54,7 +50,6 @@ public function delete(\Magento\ConfigurableProduct\Api\Data\OptionInterface $op
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function deleteById($sku, $id);
 
@@ -67,7 +62,6 @@ public function deleteById($sku, $id);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function save($sku, \Magento\ConfigurableProduct\Api\Data\OptionInterface $option);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
index 8a60a68ac7f95..106ebb50e2baf 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
 {
@@ -21,7 +20,6 @@ class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
      * Adding product form elements for editing attribute
      *
      * @return \Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\Edit\Tab\Variations\Main
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
index 81407974b6db8..33ea66b222420 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
@@ -9,13 +9,11 @@
  * New product attribute created on product edit page
  *
  * @api
- * @since 2.0.0
  */
 class Created extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/attribute/new/created.phtml';
 
@@ -23,25 +21,21 @@ class Created extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $_setFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -52,7 +46,6 @@ class Created extends \Magento\Backend\Block\Widget
      * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -73,7 +66,6 @@ public function __construct(
      * Retrieve list of product attributes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getGroupAttributes()
     {
@@ -93,7 +85,6 @@ protected function _getGroupAttributes()
      * Retrieve HTML for 'Close' button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCloseButtonHtml()
     {
@@ -104,7 +95,6 @@ public function getCloseButtonHtml()
      * Retrieve attributes data as JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributesBlockJson()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index bcf5769c2d448..f2ca1a3fc1941 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable
 {
@@ -17,7 +16,6 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -39,7 +37,6 @@ public function getProduct()
      * Retrieve current store
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getCurrentStore()
     {
@@ -50,7 +47,6 @@ public function getCurrentStore()
      * Returns additional values for js config, con be overridden by descendants
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalConfig()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/AttributeSet/Form.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/AttributeSet/Form.php
index 414e218900eb6..63bc6359ce2f3 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/AttributeSet/Form.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/AttributeSet/Form.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $attributeSetRepository;
 
     /**
      * @var \Magento\Catalog\Model\Product\AttributeSet\Options
-     * @since 2.0.0
      */
     protected $attributeSetOptions;
 
@@ -34,7 +31,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Catalog\Api\AttributeSetRepositoryInterface $attributeSetRepository
      * @param \Magento\Catalog\Model\Product\AttributeSet\Options $attributeSetOptions
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Prepares attribute set form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -129,7 +124,6 @@ protected function _prepareForm()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getCurrentAttributeSetName()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
index 313e833a9afcd..9c15329f8edf4 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
@@ -12,13 +12,11 @@
 
 /**
  * Adminhtml catalog super product configurable tab
- * @since 2.0.0
  */
 class Config extends Widget implements TabInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'catalog/product/edit/super/config.phtml';
 
@@ -26,7 +24,6 @@ class Config extends Widget implements TabInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -41,7 +38,6 @@ class Config extends Widget implements TabInterface
      * @param \Magento\Framework\Registry $coreRegistry
      * @param Configurable $configurableType
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Initialize block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -74,7 +69,6 @@ protected function _construct()
      * Retrieve Tab class (for loading)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -85,7 +79,6 @@ public function getTabClass()
      * Retrieve currently edited product object
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -96,7 +89,6 @@ public function getProduct()
      * Retrieve Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -107,7 +99,6 @@ public function getTabLabel()
      * Retrieve Tab title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -118,7 +109,6 @@ public function getTabTitle()
      * Can show tab flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -129,7 +119,6 @@ public function canShowTab()
      * Check is a hidden tab
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -140,7 +129,6 @@ public function isHidden()
      * Get parent tab code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTab()
     {
@@ -159,7 +147,6 @@ public function isHasVariations()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
index 49658127ba632..8bb035e6749b1 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
@@ -15,55 +15,46 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Matrix extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.0.0
      */
     protected $_configurableType;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix
-     * @since 2.0.0
      */
     protected $variationMatrix;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $image;
 
     /**
      * @var null|array
-     * @since 2.0.0
      */
     private $productMatrix;
 
     /**
      * @var null|array
-     * @since 2.0.0
      */
     private $productAttributes;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $localeCurrency;
 
@@ -83,7 +74,6 @@ class Matrix extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param LocatorInterface $locator
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -108,7 +98,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencySymbol()
     {
@@ -119,7 +108,6 @@ public function getCurrencySymbol()
      * Retrieve currently edited product object
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -130,7 +118,6 @@ public function getProduct()
      * Retrieve all possible attribute values combinations
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVariations()
     {
@@ -186,7 +173,6 @@ public function getConfigurableModal()
      *
      * @param string $id
      * @return string
-     * @since 2.0.0
      */
     public function getEditProductUrl($id)
     {
@@ -197,7 +183,6 @@ public function getEditProductUrl($id)
      * Retrieve attributes data
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributes()
     {
@@ -227,7 +212,6 @@ protected function getAttributes()
      * Get used product attributes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getUsedAttributes()
     {
@@ -238,7 +222,6 @@ protected function getUsedAttributes()
      * Retrieve actual list of associated products, array key is obtained from varying attributes values
      *
      * @return Product[]
-     * @since 2.0.0
      */
     protected function getAssociatedProducts()
     {
@@ -259,7 +242,6 @@ protected function getAssociatedProducts()
      * - previously saved in database relations are not considered)
      *
      * @return Product[]
-     * @since 2.0.0
      */
     protected function _getAssociatedProducts()
     {
@@ -284,7 +266,6 @@ protected function _getAssociatedProducts()
      * Get url to upload files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImageUploadUrl()
     {
@@ -294,7 +275,6 @@ public function getImageUploadUrl()
     /**
      * @param Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getProductStockQty(Product $product)
     {
@@ -304,7 +284,6 @@ public function getProductStockQty(Product $product)
     /**
      * @param array $initData
      * @return string
-     * @since 2.0.0
      */
     public function getVariationWizard($initData)
     {
@@ -319,7 +298,6 @@ public function getVariationWizard($initData)
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getProductMatrix()
     {
@@ -331,7 +309,6 @@ public function getProductMatrix()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getProductAttributes()
     {
@@ -345,7 +322,6 @@ public function getProductAttributes()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return void
      * TODO: move to class
-     * @since 2.0.0
      */
     protected function prepareVariations()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/AttributeValues.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/AttributeValues.php
index 3201ef87edc7b..d0695c67c6409 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/AttributeValues.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/AttributeValues.php
@@ -9,13 +9,11 @@
  * Adminhtml block for fieldset of configurable product
  *
  * @api
- * @since 2.0.0
  */
 class AttributeValues extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCaption()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
index 333e32dafbac8..d53345e772098 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
@@ -17,25 +17,23 @@
  * Adminhtml block for fieldset of configurable product
  *
  * @api
- * @since 2.0.0
  */
 class Bulk extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
 {
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $image;
 
     /**
      * @var ProductFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $productFactory;
 
     /**
      * @var Config
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $catalogProductMediaConfig;
 
@@ -44,7 +42,6 @@ class Bulk extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
      * @param Image $image
      * @param Config $catalogProductMediaConfig
      * @param ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCaption()
     {
@@ -69,7 +65,6 @@ public function getCaption()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNoImageUrl()
     {
@@ -80,7 +75,6 @@ public function getNoImageUrl()
      * Get image types data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getImageTypes()
     {
@@ -100,7 +94,6 @@ public function getImageTypes()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMediaAttributes()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/SelectAttributes.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/SelectAttributes.php
index bba83c492ce3f..54e974f7674e5 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/SelectAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/SelectAttributes.php
@@ -9,7 +9,6 @@
  * Adminhtml block for fieldset of configurable product
  *
  * @api
- * @since 2.0.0
  */
 class SelectAttributes extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
 {
@@ -17,14 +16,12 @@ class SelectAttributes extends \Magento\Ui\Block\Component\StepsWizard\StepAbstr
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param string $dataProvider
      * @return string
-     * @since 2.0.0
      */
     public function getAddNewAttributeButton($dataProvider = '')
     {
@@ -80,7 +76,6 @@ public function getAddNewAttributeButton($dataProvider = '')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCaption()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Summary.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Summary.php
index 8172a1f3ae8e2..81cbae0b483b6 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Summary.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Summary.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Summary extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCaption()
     {
@@ -24,7 +22,6 @@ public function getCaption()
      * Get url to upload files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImageUploadUrl()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 23eca2510501a..1d512d6e829a8 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -13,7 +13,6 @@
  * Shopping cart item render block for configurable products.
  *
  * @api
- * @since 2.0.0
  */
 class Configurable extends Renderer implements IdentityInterface
 {
@@ -26,7 +25,6 @@ class Configurable extends Renderer implements IdentityInterface
      * Get item configurable child product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getChildProduct()
     {
@@ -40,7 +38,6 @@ public function getChildProduct()
      * Get item product name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductName()
     {
@@ -51,7 +48,6 @@ public function getProductName()
      * Get list of all options for product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionList()
     {
@@ -60,7 +56,6 @@ public function getOptionList()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductForThumbnail()
     {
@@ -85,7 +80,6 @@ public function getProductForThumbnail()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php b/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
index 44a66513a977d..0af3f0251eea4 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
@@ -11,7 +11,7 @@
 
 /**
  * Provides a serialized media gallery data for configurable product options.
- * @since 2.1.0
+ * @since 2.2.0
  */
 class Gallery
 {
@@ -23,7 +23,7 @@ class Gallery
 
     /**
      * @param Json $json
-     * @since 2.1.0
+     * @since 2.2.0
      */
     public function __construct(
         Json $json
@@ -35,7 +35,7 @@ public function __construct(
      * @param \Magento\Catalog\Block\Product\View\Gallery $subject
      * @param string $result
      * @return string
-     * @since 2.1.0
+     * @since 2.2.0
      */
     public function afterGetOptionsMediaGalleryDataJson(
         \Magento\Catalog\Block\Product\View\Gallery $subject,
@@ -59,7 +59,7 @@ public function afterGetOptionsMediaGalleryDataJson(
     /**
      * @param Product $product
      * @return array
-     * @since 2.1.0
+     * @since 2.2.0
      */
     private function getProductGallery($product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AssociatedSelector/Renderer/Id.php b/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AssociatedSelector/Renderer/Id.php
index 6bfd769a99dcb..c4745d1c62e81 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AssociatedSelector/Renderer/Id.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AssociatedSelector/Renderer/Id.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Id extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_productHelper;
 
@@ -23,7 +21,6 @@ class Id extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRend
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AttributeSelector.php b/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AttributeSelector.php
index 9e878c22ec49d..a9fdecbb92910 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AttributeSelector.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/Configurable/AttributeSelector.php
@@ -11,7 +11,6 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @api
- * @since 2.0.0
  */
 class AttributeSelector extends \Magento\Backend\Block\Template
 {
@@ -19,7 +18,6 @@ class AttributeSelector extends \Magento\Backend\Block\Template
      * Attribute set creation action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSetCreationUrl()
     {
@@ -30,7 +28,6 @@ public function getAttributeSetCreationUrl()
      * Get options for suggest widget
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSuggestWidgetOptions()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index aa288a20c1557..2bf68f050797a 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -17,7 +17,6 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
 {
@@ -25,7 +24,6 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $catalogProduct = null;
 
@@ -33,7 +31,6 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * Current customer
      *
      * @var CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -41,31 +38,26 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * Prices
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_prices = [];
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
     /**
      * @var \Magento\ConfigurableProduct\Helper\Data $imageHelper
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var ConfigurableAttributeData
-     * @since 2.0.0
      */
     protected $configurableAttributeData;
 
@@ -87,7 +79,6 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param array $data
      * @param Format|null $localeFormat
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -133,7 +124,6 @@ public function getCacheKeyInfo()
      * Get allowed attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowAttributes()
     {
@@ -144,7 +134,6 @@ public function getAllowAttributes()
      * Check if allowed attributes have options
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
@@ -164,7 +153,6 @@ public function hasOptions()
      * Get Allowed Products
      *
      * @return \Magento\Catalog\Model\Product[]
-     * @since 2.0.0
      */
     public function getAllowProducts()
     {
@@ -186,7 +174,6 @@ public function getAllowProducts()
      * Retrieve current store
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getCurrentStore()
     {
@@ -197,7 +184,6 @@ public function getCurrentStore()
      * Returns additional values for js config, con be overridden by descendants
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalConfig()
     {
@@ -208,7 +194,6 @@ protected function _getAdditionalConfig()
      * Composes configuration for js
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
@@ -284,7 +269,6 @@ protected function getOptionImages()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getOptionPrices()
     {
@@ -333,7 +317,6 @@ protected function getOptionPrices()
      * @deprecated 2.2.0 Will be removed in major release
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     protected function _registerJsPrice($price)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Stockqty/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Stockqty/Type/Configurable.php
index b9b4c8a88c990..be4be3c8ad876 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Stockqty/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Stockqty/Type/Configurable.php
@@ -11,7 +11,6 @@
  * Product stock qty block for configurable product type
  *
  * @api
- * @since 2.0.0
  */
 class Configurable extends \Magento\CatalogInventory\Block\Stockqty\Composite
 {
@@ -19,7 +18,6 @@ class Configurable extends \Magento\CatalogInventory\Block\Stockqty\Composite
      * Retrieve child products
      *
      * @return Product[]
-     * @since 2.0.0
      */
     protected function _getChildProducts()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
index 9b95844dbf98f..b3ab86e1322bf 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\AddAttribute
  *
- * @since 2.0.0
  */
 class AddAttribute extends Action
 {
     /**
      * @var \Magento\Catalog\Controller\Adminhtml\Product\Builder
-     * @since 2.0.0
      */
     protected $productBuilder;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
index 1787f9a0da908..0734c27addb58 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Associated\Grid
  *
- * @since 2.0.0
  */
 class Grid extends Action
 {
     /**
      * @var LayoutFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param LayoutFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
index ff1fb920f6e41..a6c03a20e783f 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute\CreateOptions
  *
- * @since 2.0.0
  */
 class CreateOptions extends Action
 {
@@ -25,13 +24,11 @@ class CreateOptions extends Action
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-     * @since 2.0.0
      */
     protected $attributeFactory;
 
@@ -39,7 +36,6 @@ class CreateOptions extends Action
      * @param Action\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param AttributeFactory $attributeFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Search for attributes by part of attribute's label in admin store
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -70,7 +65,6 @@ public function execute()
      *   when full set of operations for attribute options during
      *   product creation will be implemented: edit labels, remove, reorder.
      * Currently only addition of options to end and removal of just added option is supported.
-     * @since 2.0.0
      */
     protected function saveAttributeOptions()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
index 5000bbbd4c126..7bf6b6fb8eb45 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute\GetAttributes
  *
- * @since 2.0.0
  */
 class GetAttributes extends Action
 {
@@ -27,13 +26,11 @@ class GetAttributes extends Action
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -42,7 +39,6 @@ class GetAttributes extends Action
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param AttributesListInterface $attributesList
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -60,7 +56,6 @@ public function __construct(
      * Get attributes
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
index 773037ef9e99d..deb4486de020f 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute\SuggestConfigurableAttributes
  *
- * @since 2.0.0
  */
 class SuggestConfigurableAttributes extends Action
 {
@@ -25,13 +24,11 @@ class SuggestConfigurableAttributes extends Action
 
     /**
      * @var \Magento\ConfigurableProduct\Model\SuggestedAttributeList
-     * @since 2.0.0
      */
     protected $attributeList;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -39,7 +36,6 @@ class SuggestConfigurableAttributes extends Action
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -48,7 +44,6 @@ class SuggestConfigurableAttributes extends Action
      * @param SuggestedAttributeList $attributeList
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -66,7 +61,6 @@ public function __construct(
      * Search for attributes by part of attribute's label in admin store
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
index 18f7f2dd21e43..be32b90c4162f 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Builder\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.0.0
      */
     protected $configurableType;
 
     /**
      * @param ProductFactory $productFactory
      * @param Type\Configurable $configurableType
-     * @since 2.0.0
      */
     public function __construct(ProductFactory $productFactory, Type\Configurable $configurableType)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
index 9039e83699121..a0a785397469b 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
@@ -19,19 +19,16 @@
  * Class Configurable
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configurable
 {
     /**
      * @var VariationHandler
-     * @since 2.0.0
      */
     private $variationHandler;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
@@ -65,7 +62,6 @@ class Configurable
      * @param VariationHandler $variationHandler
      * @param RequestInterface $request
      * @param Factory $optionsFactory
-     * @since 2.0.0
      */
     public function __construct(
         VariationHandler $variationHandler,
@@ -86,7 +82,6 @@ public function __construct(
      * @throws \InvalidArgumentException
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterInitialize(Helper $subject, ProductInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
index a182b6ad0bfab..a5afaeea7861b 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Initialization\Helper\Plugin\UpdateConfigurations
  *
- * @since 2.0.0
  */
 class UpdateConfigurations
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\VariationHandler
-     * @since 2.0.0
      */
     protected $variationHandler;
 
@@ -54,7 +50,6 @@ class UpdateConfigurations
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\ConfigurableProduct\Model\Product\VariationHandler $variationHandler
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -74,7 +69,6 @@ public function __construct(
      *
      * @return \Magento\Catalog\Model\Product
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterInitialize(
         \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $subject,
diff --git a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
index 8238432d9f685..0a4fc20578ed9 100644
--- a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
+++ b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
@@ -11,13 +11,11 @@
 
 /**
  * Configurable item
- * @since 2.0.0
  */
 class ConfigurableItem extends DefaultItem
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -28,7 +26,6 @@ class ConfigurableItem extends DefaultItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Image $imageHelper,
@@ -50,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getProductForThumbnail()
     {
@@ -75,7 +71,6 @@ protected function getProductForThumbnail()
      * Get item configurable child product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function getChildProduct()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index 727265654b474..8e22548babf5e 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -12,7 +12,6 @@
  * Class Data
  * Helper class for getting options
  * @api
- * @since 2.0.0
  */
 class Data
 {
@@ -20,13 +19,11 @@ class Data
      * Catalog Image Helper
      *
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Helper\Image $imageHelper)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Catalog\Helper\Image $imageHelper)
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Catalog\Model\Product\Image[]|null
-     * @since 2.0.0
      */
     public function getGalleryImages(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
@@ -76,7 +72,6 @@ public function getGalleryImages(\Magento\Catalog\Api\Data\ProductInterface $pro
      * @param \Magento\Catalog\Model\Product $currentProduct
      * @param array $allowedProducts
      * @return array
-     * @since 2.0.0
      */
     public function getOptions($currentProduct, $allowedProducts)
     {
@@ -102,7 +97,6 @@ public function getOptions($currentProduct, $allowedProducts)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getAllowAttributes($product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Product/Configuration/Plugin.php b/app/code/Magento/ConfigurableProduct/Helper/Product/Configuration/Plugin.php
index 287efda94dd3a..1f2caf33ddca7 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Product/Configuration/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Product/Configuration/Plugin.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Helper\Product\Configuration\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
@@ -22,7 +21,6 @@ class Plugin
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetOptions(
         \Magento\Catalog\Helper\Product\Configuration $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Attribute/LockValidator.php b/app/code/Magento/ConfigurableProduct/Model/Attribute/LockValidator.php
index b741532c87a6d..1bcdf4ac166fe 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Attribute/LockValidator.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Attribute/LockValidator.php
@@ -13,13 +13,11 @@
 
 /**
  * Class LockValidator
- * @since 2.0.0
  */
 class LockValidator implements LockValidatorInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -33,7 +31,6 @@ class LockValidator implements LockValidatorInterface
      * Constructor
      *
      * @param ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource
@@ -48,7 +45,6 @@ public function __construct(
      * @param null $attributeSet
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $object, $attributeSet = null)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributesList.php b/app/code/Magento/ConfigurableProduct/Model/AttributesList.php
index fda77f5b398ef..01086b3be7d19 100644
--- a/app/code/Magento/ConfigurableProduct/Model/AttributesList.php
+++ b/app/code/Magento/ConfigurableProduct/Model/AttributesList.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\AttributesList
  *
- * @since 2.0.0
  */
 class AttributesList implements AttributesListInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
@@ -33,7 +30,6 @@ public function __construct(
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes($ids)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributesListInterface.php b/app/code/Magento/ConfigurableProduct/Model/AttributesListInterface.php
index 34ac568db7695..ff96aa65d3b92 100644
--- a/app/code/Magento/ConfigurableProduct/Model/AttributesListInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Model/AttributesListInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AttributesListInterface
 {
@@ -16,7 +15,6 @@ interface AttributesListInterface
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes($ids);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeData.php b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeData.php
index a2ec4cc6ea552..2bbcfb51c3e0d 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeData.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeData.php
@@ -12,7 +12,6 @@
 /**
  * Class ConfigurableAttributeData
  * @api
- * @since 2.0.0
  */
 class ConfigurableAttributeData
 {
@@ -22,7 +21,6 @@ class ConfigurableAttributeData
      * @param Product $product
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesData(Product $product, array $options = [])
     {
@@ -53,7 +51,6 @@ public function getAttributesData(Product $product, array $options = [])
      * @param Attribute $attribute
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributeOptionsData($attribute, $config)
     {
@@ -75,7 +72,6 @@ protected function getAttributeOptionsData($attribute, $config)
      * @param int $attributeId
      * @param Product $product
      * @return mixed|null
-     * @since 2.0.0
      */
     protected function getAttributeConfigValue($attributeId, $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
index a43e4cb8cbb05..300c00db12cfe 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler
  *
- * @since 2.0.0
  */
 class ConfigurableAttributeHandler
 {
@@ -16,13 +15,11 @@ class ConfigurableAttributeHandler
      * Attribute collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeColFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeColFactory
@@ -34,7 +31,6 @@ public function __construct(
      * Retrieve list of attributes applicable for configurable product
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getApplicableAttributes()
     {
@@ -55,7 +51,6 @@ public function getApplicableAttributes()
     /**
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeApplicable($attribute)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php b/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
index 958f816ecccff..6dda82af30709 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ConfigurableProductManagement
  *
- * @since 2.0.0
  */
 class ConfigurableProductManagement implements \Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @since 2.0.0
      */
     private $attributeRepository;
 
     /**
      * @var ProductVariationsBuilder
-     * @since 2.0.0
      */
     private $productVariationBuilder;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $productsFactory;
 
@@ -40,7 +36,6 @@ class ConfigurableProductManagement implements \Magento\ConfigurableProduct\Api\
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
      * @param ProductVariationsBuilder $productVariationBuilder
      * @param CollectionFactory $productsFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generateVariation(ProductInterface $product, $options)
     {
@@ -65,7 +59,6 @@ public function generateVariation(ProductInterface $product, $options)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount($status = null)
     {
@@ -89,7 +82,6 @@ public function getCount($status = null)
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionInterface[] $options
      * @return array
-     * @since 2.0.0
      */
     private function getAttributesForMatrix($options)
     {
@@ -115,7 +107,6 @@ private function getAttributesForMatrix($options)
      *
      * @param \Magento\Framework\DataObject $object
      * @return array
-     * @since 2.0.0
      */
     private function objectToArray(\Magento\Framework\DataObject $object)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Entity/Product/Attribute/Group/AttributeMapper/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Entity/Product/Attribute/Group/AttributeMapper/Plugin.php
index 387374ce434e6..fc1efa4816372 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Entity/Product/Attribute/Group/AttributeMapper/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Entity/Product/Attribute/Group/AttributeMapper/Plugin.php
@@ -13,32 +13,27 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Entity\Product\Attribute\Group\AttributeMapper\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\AttributeFactory
-     * @since 2.0.0
      */
     protected $attributeFactory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $configurableAttributes;
 
     /**
      * @param AttributeFactory $attributeFactory
      * @param Registry $registry
-     * @since 2.0.0
      */
     public function __construct(AttributeFactory $attributeFactory, Registry $registry)
     {
@@ -55,7 +50,6 @@ public function __construct(AttributeFactory $attributeFactory, Registry $regist
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundMap(
         \Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index c46c53152712f..1ef58bb981406 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -13,43 +13,38 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\LinkManagement
  *
- * @since 2.0.0
  */
 class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     private $productRepository;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductInterfaceFactory
-     * @since 2.0.0
      */
     private $productFactory;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.0.0
      */
     private $configurableType;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
     /**
      * @var \Magento\ConfigurableProduct\Helper\Product\Options\Factory;
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $optionsFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $attributeFactory;
 
@@ -61,7 +56,6 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurableType
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -80,7 +74,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildren($sku)
     {
@@ -120,7 +113,6 @@ public function getChildren($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addChild($sku, $childSku)
     {
@@ -159,7 +151,6 @@ public function addChild($sku, $childSku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removeChild($sku, $childSku)
     {
@@ -192,8 +183,8 @@ public function removeChild($sku, $childSku)
      *
      * @return \Magento\ConfigurableProduct\Helper\Product\Options\Factory
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.2
+     * @since 2.1.2
      */
     private function getOptionsFactory()
     {
@@ -209,7 +200,7 @@ private function getOptionsFactory()
      *
      * @param int[] $attributeIds
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getConfigurableAttributesData($attributeIds)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index 52c17b6791fbe..994cb0c49bd7c 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -22,55 +22,46 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\ConfigurableProduct\Api\Data\OptionValueInterfaceFactory
-     * @since 2.0.0
      */
     protected $optionValueFactory;
 
     /**
      * @var Product\Type\Configurable
-     * @since 2.0.0
      */
     protected $configurableType;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute
-     * @since 2.0.0
      */
     protected $optionResource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @since 2.0.0
      */
     protected $productAttributeRepository;
 
     /**
      * @var ConfigurableType\AttributeFactory
-     * @since 2.0.0
      */
     protected $configurableAttributeFactory;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.0.0
      */
     private $configurableTypeResource;
 
@@ -98,7 +89,6 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
      * @param Loader $optionLoader
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -124,7 +114,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($sku, $id)
     {
@@ -142,7 +131,6 @@ public function get($sku, $id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
@@ -153,7 +141,6 @@ public function getList($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(OptionInterface $option)
     {
@@ -180,7 +167,6 @@ public function delete(OptionInterface $option)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($sku, $id)
     {
@@ -197,7 +183,6 @@ public function deleteById($sku, $id)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function save($sku, OptionInterface $option)
     {
@@ -245,7 +230,6 @@ public function save($sku, OptionInterface $option)
      * @param string $sku
      * @return ProductInterface
      * @throws InputException
-     * @since 2.0.0
      */
     private function getProduct($sku)
     {
@@ -264,7 +248,6 @@ private function getProduct($sku)
      * @param int $id
      * @return ProductInterface
      * @throws InputException
-     * @since 2.0.0
      */
     private function getProductById($id)
     {
@@ -284,7 +267,6 @@ private function getProductById($id)
      * @return void
      * @throws InputException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validateNewOptionData(OptionInterface $option)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Order/Admin/Item/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Order/Admin/Item/Plugin/Configurable.php
index bda42552641fd..e6d4ac1072aec 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Order/Admin/Item/Plugin/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Order/Admin/Item/Plugin/Configurable.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Order\Admin\Item\Plugin\Configurable
  *
- * @since 2.0.0
  */
 class Configurable
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\ProductFactory $productFactory)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Catalog\Model\ProductFactory $productFactor
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetSku(
         \Magento\Sales\Model\Order\Admin\Item $subject,
@@ -60,7 +56,6 @@ public function aroundGetSku(
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetName(
         \Magento\Sales\Model\Order\Admin\Item $subject,
@@ -84,7 +79,6 @@ public function aroundGetName(
      *
      * @return int
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetProductId(
         \Magento\Sales\Model\Order\Admin\Item $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php
index 21241f6ee20e5..da9f1316c6bd7 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php
@@ -11,7 +11,6 @@
  * Class PriceBackend
  *
  *  Make price validation optional for configurable product
- * @since 2.0.0
  */
 class PriceBackend
 {
@@ -21,7 +20,6 @@ class PriceBackend
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $object
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundValidate(
         \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php
index 81573657ab785..23a90e94eb38b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php
@@ -9,7 +9,7 @@
 
 /**
  * Add parent invalidation tags
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Configurable implements StrategyInterface
 {
@@ -17,13 +17,13 @@ class Configurable implements StrategyInterface
      *  Configurable product type resource
      *
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $catalogProductTypeConfigurable;
 
     /**
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $catalogProductTypeConfigurable
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $catalogProductTypeConfigurable
@@ -33,7 +33,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTags($object)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/CartConfiguration/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/CartConfiguration/Plugin/Configurable.php
index cc43609c59fc9..aa1a5c5cf35ff 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/CartConfiguration/Plugin/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/CartConfiguration/Plugin/Configurable.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Product\CartConfiguration\Plugin\Configurable
  *
- * @since 2.0.0
  */
 class Configurable
 {
@@ -24,7 +23,6 @@ class Configurable
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsProductConfigured(
         \Magento\Catalog\Model\Product\CartConfiguration $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Collection/SalableProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Collection/SalableProcessor.php
index 807d3d9063433..4d2568def89cd 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Collection/SalableProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Collection/SalableProcessor.php
@@ -13,19 +13,19 @@
 /**
  * This class is responsible for adding additional filters for products collection
  * to check if the product from this collection available to buy.
- * @since 2.2.0
+ * @since 2.1.6
  */
 class SalableProcessor
 {
     /**
      * @var StatusFactory
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $stockStatusFactory;
 
     /**
      * @param StatusFactory $stockStatusFactory
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function __construct(StatusFactory $stockStatusFactory)
     {
@@ -42,7 +42,7 @@ public function __construct(StatusFactory $stockStatusFactory)
      *
      * @param Collection $collection
      * @return Collection
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function process(Collection $collection)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 5c901cbb9af4a..9fe997bb02c06 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -24,7 +24,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
 {
@@ -53,7 +52,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Used Attributes
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_usedAttributes = '_cache_instance_used_attributes';
 
@@ -61,7 +59,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for configurable attributes
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configurableAttributes = '_cache_instance_configurable_attributes';
 
@@ -69,7 +66,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Used product ids
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_usedProductIds = '_cache_instance_product_ids';
 
@@ -77,7 +73,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for used products
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_usedProducts = '_cache_instance_products';
 
@@ -93,7 +88,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is composite
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = true;
 
@@ -101,13 +95,11 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is configurable
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canConfigure = true;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -115,7 +107,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Catalog product type configurable
      *
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.0.0
      */
     protected $_catalogProductTypeConfigurable;
 
@@ -124,7 +115,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      *
      * @var
      * \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attributeCollectionFactory;
 
@@ -132,7 +122,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product collection factory
      *
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
@@ -148,7 +137,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Eav attribute factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
-     * @since 2.0.0
      */
     protected $_eavAttributeFactory;
 
@@ -162,13 +150,12 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $cache;
 
@@ -192,7 +179,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $customerSession;
 
@@ -200,7 +187,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product factory
      *
      * @var ProductInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $productFactory;
 
@@ -208,7 +195,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Collection salable processor
      *
      * @var SalableProcessor
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $salableProcessor;
 
@@ -236,7 +223,6 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param ProductInterfaceFactory $productFactory
      * @param SalableProcessor $salableProcessor
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -291,9 +277,9 @@ public function __construct(
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getCache()
     {
@@ -304,9 +290,9 @@ private function getCache()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @return \Magento\Customer\Model\Session
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getCustomerSession()
     {
@@ -320,7 +306,6 @@ private function getCustomerSession()
      * Return relation info about used products
      *
      * @return \Magento\Framework\DataObject Object with information data
-     * @since 2.0.0
      */
     public function getRelationInfo()
     {
@@ -344,7 +329,6 @@ public function getRelationInfo()
      * @param  array|int $parentId
      * @param  bool $required
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -356,7 +340,6 @@ public function getChildrenIds($parentId, $required = true)
      *
      * @param  int|array $childId
      * @return array
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -368,7 +351,6 @@ public function getParentIdsByChild($childId)
      *
      * @param  \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function canUseAttribute(\Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute)
     {
@@ -385,7 +367,6 @@ public function canUseAttribute(\Magento\Catalog\Model\ResourceModel\Eav\Attribu
      * @param   \Magento\Catalog\Model\Product $product
      * @return  \Magento\ConfigurableProduct\Model\Product\Type\Configurable
      * @deprecated 2.1.0 use \Magento\ConfigurableProduct\Model\Product\Type\Configurable::setUsedProductAttributes instead
-     * @since 2.0.0
      */
     public function setUsedProductAttributeIds($ids, $product)
     {
@@ -411,7 +392,7 @@ public function setUsedProductAttributeIds($ids, $product)
      * @param ProductInterface $product
      * @param array $ids
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function setUsedProductAttributes(ProductInterface $product, array $ids)
     {
@@ -431,7 +412,6 @@ public function setUsedProductAttributes(ProductInterface $product, array $ids)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getUsedProductAttributeIds($product)
     {
@@ -450,7 +430,6 @@ public function getUsedProductAttributeIds($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getUsedProductAttributes($product)
     {
@@ -475,7 +454,6 @@ public function getUsedProductAttributes($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute[]
-     * @since 2.0.0
      */
     public function getConfigurableAttributes($product)
     {
@@ -498,7 +476,6 @@ public function getConfigurableAttributes($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function resetConfigurableAttributes($product)
     {
@@ -511,7 +488,6 @@ public function resetConfigurableAttributes($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getConfigurableAttributesAsArray($product)
     {
@@ -545,7 +521,6 @@ public function getConfigurableAttributesAsArray($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
-     * @since 2.0.0
      */
     public function getConfigurableAttributeCollection(\Magento\Catalog\Model\Product $product)
     {
@@ -555,10 +530,9 @@ public function getConfigurableAttributeCollection(\Magento\Catalog\Model\Produc
     /**
      * Retrieve subproducts identifiers
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getUsedProductIds($product)
     {
@@ -576,7 +550,7 @@ public function getUsedProductIds($product)
      * Retrieve GalleryReadHandler
      *
      * @return GalleryReadHandler
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @since 2.1.0
      */
     protected function getGalleryReadHandler()
@@ -593,7 +567,6 @@ protected function getGalleryReadHandler()
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
-     * @since 2.0.0
      */
     public function getUsedProductCollection($product)
     {
@@ -615,7 +588,6 @@ public function getUsedProductCollection($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($product)
     {
@@ -654,7 +626,6 @@ public function beforeSave($product)
      * @return $this
      * @throws \InvalidArgumentException
      * @deprecated 2.1.0 the \Magento\ConfigurableProduct\Model\Product\SaveHandler::execute should be used instead
-     * @since 2.0.0
      */
     public function save($product)
     {
@@ -755,7 +726,6 @@ private function saveRelatedProducts(ProductInterface $product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isSalable($product)
     {
@@ -778,7 +748,6 @@ public function isSalable($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSalable($product)
     {
@@ -794,7 +763,6 @@ public function getIsSalable($product)
      * @param  array $attributesInfo
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
      */
     public function getProductByAttributes($attributesInfo, $product)
     {
@@ -831,7 +799,6 @@ public function getProductByAttributes($attributesInfo, $product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedAttributesInfo($product)
     {
@@ -886,7 +853,6 @@ public function getSelectedAttributesInfo($product)
      * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -983,7 +949,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
      * @param  \Magento\Catalog\Model\Product $product
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function checkProductBuyState($product)
     {
@@ -1010,7 +975,6 @@ public function checkProductBuyState($product)
      * Retrieve message for specify option(s)
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSpecifyOptionMessage()
     {
@@ -1023,7 +987,6 @@ public function getSpecifyOptionMessage()
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions($product)
     {
@@ -1045,7 +1008,6 @@ public function getOrderOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual($product)
     {
@@ -1063,7 +1025,6 @@ public function isVirtual($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions($product)
     {
@@ -1085,7 +1046,6 @@ public function hasOptions($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getWeight($product)
     {
@@ -1108,7 +1068,6 @@ public function getWeight($product)
      * @param  \Magento\Catalog\Model\Product|null $product
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function assignProductToOption($optionProduct, $option, $product)
     {
@@ -1126,7 +1085,6 @@ public function assignProductToOption($optionProduct, $option, $product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getProductsToPurchaseByReqGroups($product)
     {
@@ -1138,7 +1096,6 @@ public function getProductsToPurchaseByReqGroups($product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getSku($product)
     {
@@ -1164,7 +1121,6 @@ public function getSku($product)
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processBuyRequest($product, $buyRequest)
     {
@@ -1181,7 +1137,6 @@ public function processBuyRequest($product, $buyRequest)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getConfigurableOptions($product)
     {
@@ -1195,7 +1150,6 @@ public function getConfigurableOptions($product)
      * Delete data specific for Configurable product type
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
@@ -1213,7 +1167,6 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAttributeById($attributeId, $product)
     {
@@ -1225,7 +1178,6 @@ public function getAttributeById($attributeId, $product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.0.0
      */
     public function setImageFromChildProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -1291,7 +1243,6 @@ public function isPossibleBuyFromList($product)
      * @param  \Magento\Catalog\Model\Product $product
      * @param  array $requiredAttributeIds
      * @return ProductInterface[]
-     * @since 2.0.0
      */
     public function getUsedProducts($product, $requiredAttributeIds = null)
     {
@@ -1318,7 +1269,7 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
      * @param array|null $requiredAttributeIds
      * @return ProductInterface[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getSalableUsedProducts(\Magento\Catalog\Model\Product $product, $requiredAttributeIds = null)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
index 2b17a7afaee3e..574434494429b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
@@ -16,7 +16,6 @@
  * @method Attribute getResource()
  * @method Attribute setProductAttribute(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $value)
  * @method \Magento\Eav\Model\Entity\Attribute\AbstractAttribute getProductAttribute()
- * @since 2.0.0
  */
 class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\ConfigurableProduct\Api\Data\OptionInterface
@@ -75,7 +74,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -86,7 +84,6 @@ protected function _construct()
      * Get attribute options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -95,7 +92,6 @@ public function getOptions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -112,7 +108,6 @@ public function getLabel()
      * After save process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -127,7 +122,6 @@ public function afterSave()
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute  $attribute
      * @return void
-     * @since 2.0.0
      */
     public function loadByProductAndAttribute($product, $attribute)
     {
@@ -147,7 +141,6 @@ public function loadByProductAndAttribute($product, $attribute)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function deleteByProduct($product)
     {
@@ -158,7 +151,6 @@ public function deleteByProduct($product)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeId()
     {
@@ -168,7 +160,6 @@ public function getAttributeId()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -178,7 +169,6 @@ public function getPosition()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsUseDefault()
     {
@@ -188,7 +178,6 @@ public function getIsUseDefault()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -200,7 +189,6 @@ public function getValues()
     /**
      * @param string $attributeId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeId($attributeId)
     {
@@ -210,7 +198,6 @@ public function setAttributeId($attributeId)
     /**
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -220,7 +207,6 @@ public function setLabel($label)
     /**
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -230,7 +216,6 @@ public function setPosition($position)
     /**
      * @param bool $isUseDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUseDefault($isUseDefault)
     {
@@ -240,7 +225,6 @@ public function setIsUseDefault($isUseDefault)
     /**
      * @param \Magento\ConfigurableProduct\Api\Data\OptionValueInterface[] $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues(array $values = null)
     {
@@ -251,7 +235,6 @@ public function setValues(array $values = null)
      * {@inheritdoc}
      *
      * @return \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -263,7 +246,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
@@ -273,7 +255,6 @@ public function setExtensionAttributes(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -282,7 +263,6 @@ public function getProductId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductId($value)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
index 91ae75fa33ffc..856e2ac163aef 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
@@ -10,7 +10,6 @@
 /**
  * Class OptionValue
  *
- * @since 2.0.0
  */
 class OptionValue extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\ConfigurableProduct\Api\Data\OptionValueInterface
@@ -25,7 +24,6 @@ class OptionValue extends \Magento\Framework\Model\AbstractExtensibleModel imple
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValueIndex()
     {
@@ -35,7 +33,6 @@ public function getValueIndex()
     /**
      * @param int $valueIndex
      * @return $this
-     * @since 2.0.0
      */
     public function setValueIndex($valueIndex)
     {
@@ -46,7 +43,6 @@ public function setValueIndex($valueIndex)
      * {@inheritdoc}
      *
      * @return \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -58,7 +54,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\OptionValueExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index bdd43d0e5b551..34769a2e37f42 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
@@ -20,7 +19,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param   float $qty
      * @param   \Magento\Catalog\Model\Product $product
      * @return  float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty, $product)
     {
@@ -42,7 +40,6 @@ public function getFinalPrice($qty, $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPrice($product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
index 33e138c42261c..b751791812893 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Product\Type\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -38,7 +35,6 @@ public function __construct(Manager $moduleManager)
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetOptionArray(\Magento\Catalog\Model\Product\Type $subject, array $result)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
index 9788495bdd982..113aecc8c353d 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class VariationMatrix
 {
@@ -16,7 +15,6 @@ class VariationMatrix
      *
      * @param array $usedProductAttributes
      * @return array
-     * @since 2.0.0
      */
     public function getVariations($usedProductAttributes)
     {
@@ -56,7 +54,6 @@ public function getVariations($usedProductAttributes)
      *
      * @param array $usedProductAttributes
      * @return array
-     * @since 2.0.0
      */
     private function combineVariationalAttributes($usedProductAttributes)
     {
@@ -85,7 +82,6 @@ private function combineVariationalAttributes($usedProductAttributes)
      * @param array $variationalAttributes
      * @param array $currentVariation
      * @return void
-     * @since 2.0.0
      */
     private function incrementVariationalIndex($attributesCount, $variationalAttributes, &$currentVariation)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/TypeTransitionManager/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/TypeTransitionManager/Plugin/Configurable.php
index b7c53c3b9d6c9..fb4d3442d93b8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/TypeTransitionManager/Plugin/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/TypeTransitionManager/Plugin/Configurable.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Product\TypeTransitionManager\Plugin\Configurable
  *
- * @since 2.0.0
  */
 class Configurable
 {
@@ -21,13 +20,11 @@ class Configurable
      * Request instance
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request)
     {
@@ -42,7 +39,6 @@ public function __construct(RequestInterface $request)
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundProcessProduct(
         \Magento\Catalog\Model\Product\TypeTransitionManager $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
index 7210737a3b251..3dcb8c0ef216c 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
@@ -14,25 +14,21 @@
 
 /**
  * Configurable product validation
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Framework\Event\Manager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -40,7 +36,6 @@ class Plugin
      * @param Manager $eventManager
      * @param ProductFactory $productFactory
      * @param Data $jsonHelper
-     * @since 2.0.0
      */
     public function __construct(
         Manager $eventManager,
@@ -116,7 +111,6 @@ public function afterValidate(
      * @param array $products
      * @param RequestInterface $request
      * @return array
-     * @since 2.0.0
      */
     protected function _validateProductVariations(Product $parentProduct, array $products, RequestInterface $request)
     {
@@ -161,7 +155,6 @@ protected function _validateProductVariations(Product $parentProduct, array $pro
     /**
      * @param Product $product
      * @return array
-     * @since 2.0.0
      */
     protected function getRequiredDataFromProduct(Product $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
index b94bf3d65b0fc..9cfd189726e6f 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
@@ -12,7 +12,6 @@
  * Variation Handler
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class VariationHandler
 {
@@ -24,38 +23,33 @@ class VariationHandler
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.0.0
      */
     protected $configurableProduct;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $attributeSetFactory;
 
     /**
      * @var \Magento\Eav\Model\EntityFactory
-     * @since 2.0.0
      */
     protected $entityFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributes;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -66,7 +60,6 @@ class VariationHandler
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\Catalog\Model\Product\Gallery\Processor $mediaGalleryProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Type\Configurable $configurableProduct,
@@ -91,7 +84,6 @@ public function __construct(
      * @param array $productsData
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function generateSimpleProducts($parentProduct, $productsData)
     {
@@ -125,7 +117,6 @@ public function generateSimpleProducts($parentProduct, $productsData)
      * @deprecated 2.1.0 since 2.1.0
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function prepareAttributeSetToBeBaseForNewVariations(\Magento\Catalog\Model\Product $product)
     {
@@ -171,7 +162,6 @@ public function prepareAttributeSet(\Magento\Catalog\Model\Product $product)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      *
      * @return void
-     * @since 2.0.0
      */
     protected function fillSimpleProductData(
         \Magento\Catalog\Model\Product $product,
@@ -232,7 +222,6 @@ protected function fillSimpleProductData(
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function duplicateImagesForVariations($productsData)
     {
@@ -274,7 +263,6 @@ public function duplicateImagesForVariations($productsData)
      * @param array $productData
      *
      * @return array
-     * @since 2.0.0
      */
     public function processMediaGallery($product, $productData)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ProductOptionProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ProductOptionProcessor.php
index 59e67ab01a065..8498e776f66e4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ProductOptionProcessor.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ProductOptionProcessor
  *
- * @since 2.0.0
  */
 class ProductOptionProcessor implements ProductOptionProcessorInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var ConfigurableItemOptionValueFactory
-     * @since 2.0.0
      */
     protected $itemOptionValueFactory;
 
     /**
      * @param DataObjectFactory $objectFactory
      * @param ConfigurableItemOptionValueFactory $itemOptionValueFactory
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(ProductOptionInterface $productOption)
     {
@@ -71,7 +66,6 @@ public function convertToBuyRequest(ProductOptionInterface $productOption)
      *
      * @param ProductOptionInterface $productOption
      * @return array
-     * @since 2.0.0
      */
     protected function getConfigurableItemOptions(ProductOptionInterface $productOption)
     {
@@ -87,7 +81,6 @@ protected function getConfigurableItemOptions(ProductOptionInterface $productOpt
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToProductOption(DataObject $request)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ProductVariationsBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ProductVariationsBuilder.php
index f8e61d217b3b2..a649f21f368de 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ProductVariationsBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ProductVariationsBuilder.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ProductVariationsBuilder
  *
- * @since 2.0.0
  */
 class ProductVariationsBuilder
 {
     /**
      * @var \Magento\Framework\Api\AttributeValueFactory
-     * @since 2.0.0
      */
     private $customAttributeFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix
-     * @since 2.0.0
      */
     private $variationMatrix;
 
@@ -35,7 +31,6 @@ class ProductVariationsBuilder
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param Product\Type\VariationMatrix $variationMatrix
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
@@ -53,7 +48,6 @@ public function __construct(
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param array $attributes
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.0.0
      */
     public function create(\Magento\Catalog\Api\Data\ProductInterface $product, $attributes)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 19244d2c6bcb9..2a55cda832584 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Quote\Item\CartItemProcessor
  *
- * @since 2.0.0
  */
 class CartItemProcessor implements CartItemProcessorInterface
 {
     /**
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\ProductOptionFactory
-     * @since 2.0.0
      */
     protected $productOptionFactory;
 
     /**
      * @var \Magento\Quote\Api\Data\ProductOptionExtensionFactory
-     * @since 2.0.0
      */
     protected $extensionFactory;
 
     /**
      * @var \Magento\ConfigurableProduct\Model\Quote\Item\ConfigurableItemOptionValueFactory
-     * @since 2.0.0
      */
     protected $itemOptionValueFactory;
 
@@ -53,7 +48,6 @@ class CartItemProcessor implements CartItemProcessorInterface
      * @param \Magento\Quote\Api\Data\ProductOptionExtensionFactory $extensionFactory
      * @param \Magento\ConfigurableProduct\Model\Quote\Item\ConfigurableItemOptionValueFactory $itemOptionValueFactory
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DataObject\Factory $objectFactory,
@@ -71,7 +65,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -91,7 +84,6 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function processOptions(CartItemInterface $cartItem)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
index c666ce6ead9ed..46639ce68dea6 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
@@ -10,7 +10,6 @@
 
 /**
  * Class ConfigurableItemOptionValue
- * @since 2.0.0
  */
 class ConfigurableItemOptionValue extends AbstractExtensibleModel implements ConfigurableItemOptionValueInterface
 {
@@ -18,7 +17,6 @@ class ConfigurableItemOptionValue extends AbstractExtensibleModel implements Con
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptionId()
     {
@@ -27,7 +25,6 @@ public function getOptionId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOptionId($value)
     {
@@ -36,7 +33,6 @@ public function setOptionId($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptionValue()
     {
@@ -45,7 +41,6 @@ public function getOptionValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOptionValue($value)
     {
@@ -56,7 +51,6 @@ public function setOptionValue($value)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -68,7 +62,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProduct.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProduct.php
index b23ca5a3090c7..d28ce8adec4c3 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProduct.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProduct.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\Quote\Item\QuantityValidator\Initializer\Option\Plugin\ConfigurableProduct
  *
- * @since 2.0.0
  */
 class ConfigurableProduct
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php
index ed56f2f7ac037..35c208544d816 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php
@@ -20,7 +20,6 @@
  * Stock indexer for configurable product.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configurable extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
@@ -60,7 +59,6 @@ public function __construct(
      * @param int|array $entityIds
      * @param bool $usePrimaryTable use primary or temporary index table
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 3095f324bdfe1..b0fab05dbd7d4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -15,13 +15,12 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
 {
     /**
      * @var StoreResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeResolver;
 
@@ -35,7 +34,7 @@ class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param string|null $connectionName
      * @param StoreResolverInterface|null $storeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,7 +54,6 @@ public function __construct(
     /**
      * @param null|int|array $entityIds
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
-     * @since 2.0.0
      */
     protected function reindex($entityIds = null)
     {
@@ -72,7 +70,6 @@ protected function reindex($entityIds = null)
      * Retrieve table name for custom option temporary aggregation data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getConfigurableOptionAggregateTable()
     {
@@ -83,7 +80,6 @@ protected function _getConfigurableOptionAggregateTable()
      * Retrieve table name for custom option prices data
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getConfigurableOptionPriceTable()
     {
@@ -94,7 +90,6 @@ protected function _getConfigurableOptionPriceTable()
      * Prepare table structure for custom option temporary aggregation data
      *
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
-     * @since 2.0.0
      */
     protected function _prepareConfigurableOptionAggregateTable()
     {
@@ -106,7 +101,6 @@ protected function _prepareConfigurableOptionAggregateTable()
      * Prepare table structure for custom option prices data
      *
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
-     * @since 2.0.0
      */
     protected function _prepareConfigurableOptionPriceTable()
     {
@@ -120,7 +114,6 @@ protected function _prepareConfigurableOptionPriceTable()
      *
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _applyConfigurableOption()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
index 1197aa0b98644..aa02365a73b5b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
@@ -21,7 +21,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
  *
- * @since 2.0.0
  */
 class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -41,7 +40,7 @@ class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $scopeResolver;
 
@@ -58,7 +57,6 @@ class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param ScopeResolverInterface $scopeResolver
      * @param AttributeOptionProviderInterface $attributeOptionProvider
      * @param OptionProvider $optionProvider
-     * @since 2.0.0
      */
     public function __construct(
         DbContext $context,
@@ -80,7 +78,6 @@ public function __construct(
      * Init resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -113,7 +110,6 @@ public function getEntityIdByAttribute(OptionInterface $option)
      * @param ProductModel $mainProduct the parent id
      * @param array $productIds the children id array
      * @return $this
-     * @since 2.0.0
      */
     public function saveProducts($mainProduct, array $productIds)
     {
@@ -159,7 +155,6 @@ public function saveProducts($mainProduct, array $productIds)
      * @param bool $required
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -192,7 +187,6 @@ public function getChildrenIds($parentId, $required = true)
      *
      * @param int|array $childId
      * @return string[]
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -219,7 +213,6 @@ public function getParentIdsByChild($childId)
      * @param ProductModel $product
      * @param array $attributes
      * @return array
-     * @since 2.0.0
      */
     public function getConfigurableOptions($product, $attributes)
     {
@@ -238,7 +231,7 @@ public function getConfigurableOptions($product, $attributes)
      * @param AbstractAttribute $superAttribute
      * @param int $productId
      * @return array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getAttributeOptions(AbstractAttribute $superAttribute, $productId)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
index ee34e2ac4ce4d..5c206832ca3b3 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute
  *
- * @since 2.0.0
  */
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -22,7 +21,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Label table name cache
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_labelTable;
 
@@ -30,7 +28,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -38,7 +35,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -47,7 +43,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Inititalize connection and define tables
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +71,6 @@ protected function _construct()
      *
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function saveLabel($attribute)
     {
@@ -121,7 +114,6 @@ public function saveLabel($attribute)
      *
      * @param int $setId The specific attribute set
      * @return array
-     * @since 2.0.0
      */
     public function getUsedAttributes($setId)
     {
@@ -158,7 +150,6 @@ public function getUsedAttributes($setId)
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdByProductIdAndAttributeId($attribute, $productId, $attributeId)
     {
@@ -180,7 +171,6 @@ public function getIdByProductIdAndAttributeId($attribute, $productId, $attribut
      *
      * @param mixed $productId
      * @return void
-     * @since 2.0.0
      */
     public function deleteAttributesByProductId($productId)
     {
@@ -197,7 +187,6 @@ public function deleteAttributesByProductId($productId)
     /**
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -211,7 +200,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param ConfigurableAttribute $object
      * @return $this
-     * @since 2.0.0
      */
     protected function loadLabel(ConfigurableAttribute $object)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 9923f10e0b82f..669085468f548 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -19,13 +19,12 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $configurableResource;
 
@@ -33,7 +32,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Configurable attributes label table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_labelTable;
 
@@ -41,7 +39,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -49,7 +46,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -57,7 +53,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Catalog product type configurable
      *
      * @var Configurable
-     * @since 2.0.0
      */
     protected $_productTypeConfigurable;
 
@@ -65,7 +60,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -87,7 +81,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param ConfigurableResource $configurableResource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -112,7 +105,6 @@ public function __construct(
      * Initialize connection and define table names
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -128,7 +120,6 @@ protected function _construct()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProductFilter($product)
     {
@@ -141,7 +132,6 @@ public function setProductFilter($product)
      * Get product type
      *
      * @return Configurable
-     * @since 2.0.0
      */
     private function getProductType()
     {
@@ -153,7 +143,6 @@ private function getProductType()
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByPosition($dir = self::SORT_ORDER_ASC)
     {
@@ -165,7 +154,6 @@ public function orderByPosition($dir = self::SORT_ORDER_ASC)
      * Retrieve Store Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -176,7 +164,6 @@ public function getStoreId()
      * After load collection process
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -197,7 +184,6 @@ protected function _afterLoad()
      * Add product attributes to collection items
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addProductAttributes()
     {
@@ -215,8 +201,7 @@ protected function _addProductAttributes()
      * Add Associated Product Filters (From Product Type Instance)
      *
      * @return $this
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     public function _addAssociatedProductFilters()
     {
@@ -231,7 +216,6 @@ public function _addAssociatedProductFilters()
      * Load attribute labels
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadLabels()
     {
@@ -273,7 +257,6 @@ protected function _loadLabels()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function loadOptions()
     {
@@ -312,7 +295,6 @@ protected function loadOptions()
      * @param \Magento\Catalog\Model\Product[] $usedProducts
      * @param AbstractAttribute $productAttribute
      * @return array
-     * @since 2.0.0
      */
     protected function getIncludedOptions(array $usedProducts, AbstractAttribute $productAttribute)
     {
@@ -328,7 +310,6 @@ protected function getIncludedOptions(array $usedProducts, AbstractAttribute $pr
      * Retrieve product instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     private function getProduct()
     {
@@ -337,7 +318,7 @@ private function getProduct()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -356,7 +337,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
@@ -387,9 +368,9 @@ private function getMetadataPool()
     /**
      * Get Configurable Resource
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      * @return ConfigurableResource
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getConfigurableResource()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index 22247e14eee6b..71700d183b3a7 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -20,7 +19,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Link table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_linkTable;
 
@@ -28,7 +26,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Assign link table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +36,6 @@ protected function _construct()
     /**
      * Init select
      * @return $this|\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -59,7 +55,6 @@ protected function _initSelect()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProductFilter($product)
     {
@@ -74,7 +69,6 @@ public function setProductFilter($product)
      * Return alvays false if magento run admin
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabledFlat()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Setup/PropertyMapper.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Setup/PropertyMapper.php
index 4486cdcd658c3..2f113fcbc5fd5 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Setup/PropertyMapper.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Setup/PropertyMapper.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\ResourceModel\Setup\PropertyMapper
  *
- * @since 2.0.0
  */
 class PropertyMapper extends PropertyMapperAbstract
 {
@@ -25,7 +24,6 @@ class PropertyMapper extends PropertyMapperAbstract
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @return array
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
index c7083db69fa3a..259765a093b18 100644
--- a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
+++ b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\ConfigurableProduct\Model\SuggestedAttributeList
  *
- * @since 2.0.0
  */
 class SuggestedAttributeList
 {
     /**
      * @var ConfigurableAttributeHandler
-     * @since 2.0.0
      */
     protected $configurableAttributeHandler;
 
@@ -24,14 +22,12 @@ class SuggestedAttributeList
      * Catalog resource helper
      *
      * @var \Magento\Catalog\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @param ConfigurableAttributeHandler $configurableAttributeHandler
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler $configurableAttributeHandler,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param string $labelPart
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getSuggestedAttributes($labelPart)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Product.php
index f26b7074458cc..f4826e76be228 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Product.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Product.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Product
  *
- * @since 2.0.0
  */
 class Product
 {
@@ -23,7 +22,6 @@ class Product
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(
         \Magento\Catalog\Model\ResourceModel\Product $subject,
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
index 1095337d439d0..146cced35f651 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
@@ -16,19 +16,19 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProvider
  *
- * @since 2.2.0
+ * @since 2.1.1
  */
 class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterface
 {
     /**
      * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $configurable;
 
     /**
      * @var ProductInterface[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $products;
 
@@ -39,7 +39,7 @@ class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterfac
      * @param CollectionFactory $collectionFactory
      * @param RequestSafetyInterface $requestSafety
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         Configurable $configurable,
@@ -53,7 +53,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getProducts(ProductInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProviderInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProviderInterface.php
index a82721c36ffa8..6891c06d11a6c 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProviderInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProviderInterface.php
@@ -11,14 +11,14 @@
 /**
  * Provide configurable sub-products for price calculation
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 interface ConfigurableOptionsProviderInterface
 {
     /**
      * @param ProductInterface $product
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getProducts(\Magento\Catalog\Api\Data\ProductInterface $product);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
index 395cd57baec1c..3ad18fa54c8b9 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -13,33 +13,29 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Price\ConfigurablePriceResolver
  *
- * @since 2.0.0
  */
 class ConfigurablePriceResolver implements PriceResolverInterface
 {
     /**
      * @var \Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface
-     * @since 2.0.0
      */
     protected $priceResolver;
 
     /**
      * @var PriceCurrencyInterface
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     protected $priceCurrency;
 
     /**
      * @var Configurable
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     protected $configurable;
 
     /**
      * @var LowestPriceOptionsProviderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $lowestPriceOptionsProvider;
 
@@ -48,7 +44,6 @@ class ConfigurablePriceResolver implements PriceResolverInterface
      * @param Configurable $configurable
      * @param PriceCurrencyInterface $priceCurrency
      * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-     * @since 2.0.0
      */
     public function __construct(
         PriceResolverInterface $priceResolver,
@@ -67,7 +62,6 @@ public function __construct(
      * @param \Magento\Framework\Pricing\SaleableInterface|\Magento\Catalog\Model\Product $product
      * @return float
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
index 90ed50739ab90..38980252ff36e 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
@@ -12,7 +12,6 @@
 
 /**
  * Class RegularPrice
- * @since 2.0.0
  */
 class ConfigurableRegularPrice extends AbstractPrice implements ConfigurableRegularPriceInterface
 {
@@ -23,37 +22,33 @@ class ConfigurableRegularPrice extends AbstractPrice implements ConfigurableRegu
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $maxRegularAmount;
 
     /**
      * @var \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected $minRegularAmount;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $values = [];
 
     /**
      * @var \Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface
-     * @since 2.0.0
      */
     protected $priceResolver;
 
     /**
      * @var ConfigurableOptionsProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $configurableOptionsProvider;
 
     /**
      * @var LowestPriceOptionsProviderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $lowestPriceOptionsProvider;
 
@@ -64,7 +59,6 @@ class ConfigurableRegularPrice extends AbstractPrice implements ConfigurableRegu
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param PriceResolverInterface $priceResolver
      * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Pricing\SaleableInterface $saleableItem,
@@ -82,7 +76,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -95,7 +88,6 @@ public function getValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -104,7 +96,6 @@ public function getAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMaxRegularAmount()
     {
@@ -118,7 +109,6 @@ public function getMaxRegularAmount()
      * Get max regular amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected function doGetMaxRegularAmount()
     {
@@ -134,7 +124,6 @@ protected function doGetMaxRegularAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMinRegularAmount()
     {
@@ -148,7 +137,6 @@ public function getMinRegularAmount()
      * Get min regular amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected function doGetMinRegularAmount()
     {
@@ -166,7 +154,6 @@ protected function doGetMinRegularAmount()
      * Get children simple products
      *
      * @return Product[]
-     * @since 2.0.0
      */
     protected function getUsedProducts()
     {
@@ -175,8 +162,8 @@ protected function getUsedProducts()
 
     /**
      * @return \Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getConfigurableOptionsProvider()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
index 0e74de3d5e1ff..2f45285070a82 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
@@ -12,7 +12,6 @@
 /**
  * Configurable regular price interface
  * @api
- * @since 2.0.0
  */
 interface ConfigurableRegularPriceInterface extends BasePriceProviderInterface
 {
@@ -20,7 +19,6 @@ interface ConfigurableRegularPriceInterface extends BasePriceProviderInterface
      * Get max regular amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMaxRegularAmount();
 
@@ -28,7 +26,6 @@ public function getMaxRegularAmount();
      * Get min regular amount
      *
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getMinRegularAmount();
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php
index 9c3055d094e49..60a03ceecdae4 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Price\FinalPrice
  *
- * @since 2.0.0
  */
 class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice
 {
     /**
      * @var \Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface
-     * @since 2.0.0
      */
     protected $priceResolver;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $values = [];
 
@@ -31,7 +28,6 @@ class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice
      * @param \Magento\Framework\Pricing\Adjustment\CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param PriceResolverInterface $priceResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Pricing\SaleableInterface $saleableItem,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php
index a1db77e1f7cba..2d571df38e1ed 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php
@@ -11,14 +11,12 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Price\FinalPriceResolver
  *
- * @since 2.0.0
  */
 class FinalPriceResolver implements PriceResolverInterface
 {
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface $product
      * @return float
-     * @since 2.0.0
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
index 8a8cf5f044230..cf4edc6882a7e 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
@@ -12,25 +12,25 @@
 
 /**
  * Retrieve list of products where each product contains lower price than others at least for one possible price type
- * @since 2.2.0
+ * @since 2.1.3
  */
 class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resource;
 
     /**
      * @var LinkedProductSelectBuilderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $linkedProductSelectBuilder;
 
     /**
      * @var CollectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $collectionFactory;
 
@@ -46,7 +46,7 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
      * @param ResourceConnection $resourceConnection
      * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
      * @param CollectionFactory $collectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ResourceConnection $resourceConnection,
@@ -60,7 +60,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getProducts(ProductInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php
index 4d10410891ea5..87a73faaa269f 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php
@@ -10,14 +10,14 @@
 /**
  * Retrieve list of products where each product contains lower price than others at least for one possible price type
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface LowestPriceOptionsProviderInterface
 {
     /**
      * @param ProductInterface $product
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getProducts(\Magento\Catalog\Api\Data\ProductInterface $product);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/PriceResolverInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/PriceResolverInterface.php
index 9dd8ac754c38e..600903f7ece1c 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/PriceResolverInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/PriceResolverInterface.php
@@ -8,14 +8,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface PriceResolverInterface
 {
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface $product
      * @return float
-     * @since 2.0.0
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/RegularPriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/RegularPriceResolver.php
index 9d97110fead29..03df99cfdbf41 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/RegularPriceResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/RegularPriceResolver.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Price\RegularPriceResolver
  *
- * @since 2.0.0
  */
 class RegularPriceResolver implements PriceResolverInterface
 {
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface $product
      * @return float
-     * @since 2.0.0
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php b/app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
index 5e451991d055e..fda7381ef07ae 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
@@ -20,13 +20,13 @@
 /**
  * Class \Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class FinalPriceBox extends \Magento\Catalog\Pricing\Render\FinalPriceBox
 {
     /**
      * @var LowestPriceOptionsProviderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $lowestPriceOptionsProvider;
 
@@ -41,7 +41,7 @@ class FinalPriceBox extends \Magento\Catalog\Pricing\Render\FinalPriceBox
      * @param SalableResolverInterface|null $salableResolver
      * @param MinimalPriceCalculatorInterface|null $minimalPriceCalculator
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Context $context,
@@ -71,7 +71,7 @@ public function __construct(
      * Define if the special price should be shown
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function hasSpecialPrice()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
index 14b41a97861fa..7bc56569dea44 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
@@ -15,7 +15,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -23,7 +22,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -31,7 +29,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -40,7 +37,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
index 5c01fbfef523b..75157b9655eaa 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php
index 945d2c701e037..d9dcf89f44789 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Repository extends \Magento\Catalog\Ui\Component\Listing\Attribute\AbstractRepository
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -21,7 +19,6 @@ class Repository extends \Magento\Catalog\Ui\Component\Listing\Attribute\Abstrac
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function buildSearchCriteria()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns.php
index e40151e14d11e..890df06bbbc4a 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns
  *
- * @since 2.0.0
  */
 class Columns extends \Magento\Ui\Component\Listing\Columns
 {
     /**
      * @var \Magento\Catalog\Ui\Component\Listing\Attribute\RepositoryInterface
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
@@ -24,7 +22,6 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
      * @param \Magento\Catalog\Ui\Component\Listing\Attribute\RepositoryInterface $attributeRepository
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\UiComponent\ContextInterface $context,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Filters.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Filters.php
index fa895f1f62d8c..e4219f3d35d20 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Filters.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Filters.php
@@ -12,26 +12,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Filters implements ObserverInterface
 {
     /**
      * @var FilterFactory
-     * @since 2.0.0
      */
     protected $filterFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $attributeCollectionFactory;
 
     /**
      * @param FilterFactory $filterFactory
      * @param CollectionFactory $attributeCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         FilterFactory $filterFactory,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function update(UiComponentInterface $component)
     {
@@ -64,7 +59,6 @@ public function update(UiComponentInterface $component)
     /**
      * @param array $attributeCodes
      * @return mixed
-     * @since 2.0.0
      */
     protected function getAttributes($attributeCodes)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Attributes.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Attributes.php
index eb0d77750644d..da4f4b1931dfb 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Attributes.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Attributes.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\ConfigurableProduct\Ui\DataProvider\Attributes
  *
- * @since 2.0.0
  */
 class Attributes extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     protected $collection;
 
@@ -26,7 +24,6 @@ class Attributes extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler $configurableAttributeHandler
      * @param array $meta
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -43,7 +40,6 @@ public function __construct(
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -52,7 +48,6 @@ public function getCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/app/code/Magento/Contact/Block/ContactForm.php b/app/code/Magento/Contact/Block/ContactForm.php
index 82312f13350ba..d0369df10d211 100644
--- a/app/code/Magento/Contact/Block/ContactForm.php
+++ b/app/code/Magento/Contact/Block/ContactForm.php
@@ -11,14 +11,12 @@
  * Main contact form block
  *
  * @api
- * @since 2.0.0
  */
 class ContactForm extends Template
 {
     /**
      * @param Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Template\Context $context, array $data = [])
     {
@@ -30,7 +28,6 @@ public function __construct(Template\Context $context, array $data = [])
      * Returns action url for contact form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormAction()
     {
diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php
index 619b0a7c95686..887c194b60aa2 100644
--- a/app/code/Magento/Contact/Controller/Index.php
+++ b/app/code/Magento/Contact/Controller/Index.php
@@ -12,7 +12,6 @@
 
 /**
  * Contact module base controller
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Framework\App\Action\Action
 {
@@ -45,7 +44,6 @@ abstract class Index extends \Magento\Framework\App\Action\Action
     /**
      * @param Context $context
      * @param ConfigInterface $contactsConfig
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -61,7 +59,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
      * @throws \Magento\Framework\Exception\NotFoundException
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/app/code/Magento/Contact/Controller/Index/Index.php b/app/code/Magento/Contact/Controller/Index/Index.php
index 476174636ff31..57404358bef24 100644
--- a/app/code/Magento/Contact/Controller/Index/Index.php
+++ b/app/code/Magento/Contact/Controller/Index/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Contact\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Contact\Controller\Index
 {
@@ -19,7 +18,6 @@ class Index extends \Magento\Contact\Controller\Index
      * Show Contact Us page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index 6017979992745..eeb1e3aee245d 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -19,7 +19,6 @@
 /**
  * Class \Magento\Contact\Controller\Index\Post
  *
- * @since 2.0.0
  */
 class Post extends \Magento\Contact\Controller\Index
 {
@@ -73,7 +72,6 @@ public function __construct(
      * Post user question
      *
      * @return Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
index e4f730c2062e9..3841225a86358 100644
--- a/app/code/Magento/Contact/Helper/Data.php
+++ b/app/code/Magento/Contact/Helper/Data.php
@@ -17,7 +17,6 @@
  *
  * @deprecated 2.2.0
  * @see \Magento\Contact\Model\ConfigInterface
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -27,13 +26,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -53,7 +50,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerViewHelper $customerViewHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -70,7 +66,6 @@ public function __construct(
      *
      * @return string|null
      * @deprecated 2.2.0 use \Magento\Contact\Api\ConfigInterface::isEnabled() instead
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -84,7 +79,6 @@ public function isEnabled()
      * Get user name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserName()
     {
@@ -103,7 +97,6 @@ public function getUserName()
      * Get user email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserEmail()
     {
diff --git a/app/code/Magento/Contact/Model/System/Config/Backend/Links.php b/app/code/Magento/Contact/Model/System/Config/Backend/Links.php
index 28f88689cbf68..63073626fa8e0 100644
--- a/app/code/Magento/Contact/Model/System/Config/Backend/Links.php
+++ b/app/code/Magento/Contact/Model/System/Config/Backend/Links.php
@@ -9,7 +9,6 @@
 
 /**
  * Cache cleaner backend model
- * @since 2.0.0
  */
 class Links extends Cache implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -17,7 +16,6 @@ class Links extends Cache implements \Magento\Framework\DataObject\IdentityInter
      * Cache tags to clean
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_cacheTags = [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG];
 
@@ -25,7 +23,6 @@ class Links extends Cache implements \Magento\Framework\DataObject\IdentityInter
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Cookie/Block/Html/Notices.php b/app/code/Magento/Cookie/Block/Html/Notices.php
index 931180578f9ae..ab9505a3a5880 100644
--- a/app/code/Magento/Cookie/Block/Html/Notices.php
+++ b/app/code/Magento/Cookie/Block/Html/Notices.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Notices extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Notices extends \Magento\Framework\View\Element\Template
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getPrivacyPolicyLink()
     {
diff --git a/app/code/Magento/Cookie/Block/RequireCookie.php b/app/code/Magento/Cookie/Block/RequireCookie.php
index 2507e6d532120..b57adcd5cdbc6 100644
--- a/app/code/Magento/Cookie/Block/RequireCookie.php
+++ b/app/code/Magento/Cookie/Block/RequireCookie.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RequireCookie extends \Magento\Framework\View\Element\Template
 {
@@ -19,7 +18,6 @@ class RequireCookie extends \Magento\Framework\View\Element\Template
      * Retrieve script options encoded to json
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScriptOptions()
     {
diff --git a/app/code/Magento/Cookie/Controller/Index/NoCookies.php b/app/code/Magento/Cookie/Controller/Index/NoCookies.php
index 40a54d9447dfd..df17c00bdfa0e 100644
--- a/app/code/Magento/Cookie/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cookie/Controller/Index/NoCookies.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Cookie\Controller\Index\NoCookies
  *
- * @since 2.0.0
  */
 class NoCookies extends \Magento\Framework\App\Action\Action
 {
@@ -17,7 +16,6 @@ class NoCookies extends \Magento\Framework\App\Action\Action
      * No cookies action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
index 9e89a3f45cc56..2a781b43e3fdd 100644
--- a/app/code/Magento/Cookie/Helper/Cookie.php
+++ b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -8,7 +8,6 @@
 /**
  * Cookie helper
  * @api
- * @since 2.0.0
  */
 class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -29,13 +28,11 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_currentStore;
 
     /**
      * @var \Magento\Store\Model\Website
-     * @since 2.0.0
      */
     protected $_website;
 
@@ -45,7 +42,6 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
      * @param array $data
      *
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -70,7 +66,6 @@ public function __construct(
      * Check if cookie restriction notice should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUserNotAllowSaveCookie()
     {
@@ -98,7 +93,6 @@ public function isCookieRestrictionModeEnabled()
      * Return serialized list of accepted save cookie website
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAcceptedSaveCookiesWebsiteIds()
     {
@@ -111,7 +105,6 @@ public function getAcceptedSaveCookiesWebsiteIds()
      * Get accepted save cookies websites
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAcceptedSaveCookiesWebsites()
     {
@@ -127,7 +120,6 @@ protected function _getAcceptedSaveCookiesWebsites()
      * Get cookie restriction lifetime (in seconds)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCookieRestrictionLifetime()
     {
diff --git a/app/code/Magento/Cookie/Model/Config/Backend/Cookie.php b/app/code/Magento/Cookie/Model/Config/Backend/Cookie.php
index 4298b3a7b4f20..280f78ecc8919 100644
--- a/app/code/Magento/Cookie/Model/Config/Backend/Cookie.php
+++ b/app/code/Magento/Cookie/Model/Config/Backend/Cookie.php
@@ -8,13 +8,11 @@
 
 /**
  * Config Cookie Restriction mode backend
- * @since 2.0.0
  */
 class Cookie extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'adminhtml_system_config_backend_cookie';
 }
diff --git a/app/code/Magento/Cookie/Model/Config/Backend/Domain.php b/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
index da5c918002e35..d0c2ec0e749d0 100644
--- a/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
+++ b/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
@@ -7,13 +7,11 @@
 
 /**
  * Backend model for domain config value
- * @since 2.0.0
  */
 class Domain extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Session\Config\Validator\CookieDomainValidator
-     * @since 2.0.0
      */
     protected $configValidator;
 
@@ -27,7 +25,6 @@ class Domain extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Cookie/Model/Config/Backend/Lifetime.php b/app/code/Magento/Cookie/Model/Config/Backend/Lifetime.php
index e406a1f2e3e27..5f092e786f448 100644
--- a/app/code/Magento/Cookie/Model/Config/Backend/Lifetime.php
+++ b/app/code/Magento/Cookie/Model/Config/Backend/Lifetime.php
@@ -7,13 +7,11 @@
 
 /**
  * Backend model for domain config value
- * @since 2.0.0
  */
 class Lifetime extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Session\Config\Validator\CookieLifetimeValidator
-     * @since 2.0.0
      */
     protected $configValidator;
 
@@ -27,7 +25,6 @@ class Lifetime extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Cookie/Model/Config/Backend/Path.php b/app/code/Magento/Cookie/Model/Config/Backend/Path.php
index e4aaf4a2fbf49..916a5e81ebc89 100644
--- a/app/code/Magento/Cookie/Model/Config/Backend/Path.php
+++ b/app/code/Magento/Cookie/Model/Config/Backend/Path.php
@@ -7,13 +7,11 @@
 
 /**
  * Backend model for domain config value
- * @since 2.0.0
  */
 class Path extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Session\Config\Validator\CookiePathValidator
-     * @since 2.0.0
      */
     protected $configValidator;
 
@@ -27,7 +25,6 @@ class Path extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Cron/Console/Command/CronCommand.php b/app/code/Magento/Cron/Console/Command/CronCommand.php
index 0ff4545fbe7f5..78bbb2329f8dc 100644
--- a/app/code/Magento/Cron/Console/Command/CronCommand.php
+++ b/app/code/Magento/Cron/Console/Command/CronCommand.php
@@ -19,7 +19,6 @@
 
 /**
  * Command for executing cron jobs
- * @since 2.0.0
  */
 class CronCommand extends Command
 {
@@ -32,7 +31,6 @@ class CronCommand extends Command
      * Object manager factory
      *
      * @var ObjectManagerFactory
-     * @since 2.0.0
      */
     private $objectManagerFactory;
 
@@ -40,7 +38,6 @@ class CronCommand extends Command
      * Constructor
      *
      * @param ObjectManagerFactory $objectManagerFactory
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerFactory $objectManagerFactory)
     {
@@ -50,7 +47,6 @@ public function __construct(ObjectManagerFactory $objectManagerFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -76,7 +72,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php b/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
index 2f3f73a2e28ac..5c32c4663c22c 100644
--- a/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
+++ b/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Cron\Model\Backend\Config\Structure\Converter
  *
- * @since 2.0.0
  */
 class Converter
 {
     /**
      * @var \Magento\Cron\Model\Groups\Config\Data
-     * @since 2.0.0
      */
     protected $groupsConfig;
 
     /**
      * @param \Magento\Cron\Model\Groups\Config\Data $groupsConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Cron\Model\Groups\Config\Data $groupsConfig)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Cron\Model\Groups\Config\Data $groupsConfig
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function afterConvert(\Magento\Config\Model\Config\Structure\Converter $subject, array $result)
     {
diff --git a/app/code/Magento/Cron/Model/Config.php b/app/code/Magento/Cron/Model/Config.php
index dbcb2321fc1f9..3aa1aadd8c049 100644
--- a/app/code/Magento/Cron/Model/Config.php
+++ b/app/code/Magento/Cron/Model/Config.php
@@ -7,7 +7,6 @@
 
 /**
  * Configuration entry point for client using
- * @since 2.0.0
  */
 class Config implements \Magento\Cron\Model\ConfigInterface
 {
@@ -15,7 +14,6 @@ class Config implements \Magento\Cron\Model\ConfigInterface
      * Cron config data
      *
      * @var \Magento\Cron\Model\Config\Data
-     * @since 2.0.0
      */
     protected $_configData;
 
@@ -23,7 +21,6 @@ class Config implements \Magento\Cron\Model\ConfigInterface
      * Initialize needed parameters
      *
      * @param \Magento\Cron\Model\Config\Data $configData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Cron\Model\Config\Data $configData)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Cron\Model\Config\Data $configData)
      * Return cron full cron jobs
      *
      * @return array
-     * @since 2.0.0
      */
     public function getJobs()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
index a3357ecdcd4ce..ddc09288f75bb 100644
--- a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
+++ b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Cron\Model\Config\Backend\Product\Alert
  *
- * @since 2.0.0
  */
 class Alert extends \Magento\Framework\App\Config\Value
 {
@@ -30,13 +29,11 @@ class Alert extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_runModelPath = '';
 
@@ -50,7 +47,6 @@ class Alert extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param string $runModelPath
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -73,7 +69,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
index 9cd788579f1e2..2495e833a7c9f 100644
--- a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
+++ b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Cron\Model\Config\Backend\Sitemap
  *
- * @since 2.0.0
  */
 class Sitemap extends \Magento\Framework\App\Config\Value
 {
@@ -30,13 +29,11 @@ class Sitemap extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_runModelPath = '';
 
@@ -50,7 +47,6 @@ class Sitemap extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param string $runModelPath
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -71,7 +67,6 @@ public function __construct(
     /**
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Converter/Db.php b/app/code/Magento/Cron/Model/Config/Converter/Db.php
index 5215ab2947d16..232ca8604774c 100644
--- a/app/code/Magento/Cron/Model/Config/Converter/Db.php
+++ b/app/code/Magento/Cron/Model/Config/Converter/Db.php
@@ -7,7 +7,6 @@
 
 /**
  * Convert data incoming from data base storage
- * @since 2.0.0
  */
 class Db implements \Magento\Framework\Config\ConverterInterface
 {
@@ -16,7 +15,6 @@ class Db implements \Magento\Framework\Config\ConverterInterface
      *
      * @param array $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -33,7 +31,6 @@ public function convert($source)
      *
      * @param array $jobs
      * @return array
-     * @since 2.0.0
      */
     protected function _extractParams(array $cronTab)
     {
@@ -61,7 +58,6 @@ protected function _extractParams(array $cronTab)
      * @param string $jobName
      * @param array  $result
      * @return void
-     * @since 2.0.0
      */
     protected function _processConfigParam(array $jobConfig, $jobName, array &$result)
     {
@@ -77,7 +73,6 @@ protected function _processConfigParam(array $jobConfig, $jobName, array &$resul
      * @param string $jobName
      * @param array  $result
      * @return void
-     * @since 2.0.0
      */
     protected function _processScheduleParam(array $jobConfig, $jobName, array &$result)
     {
@@ -93,7 +88,6 @@ protected function _processScheduleParam(array $jobConfig, $jobName, array &$res
      * @param string $jobName
      * @param array  $result
      * @return void
-     * @since 2.0.0
      */
     protected function _processRunModel(array $jobConfig, $jobName, array &$result)
     {
diff --git a/app/code/Magento/Cron/Model/Config/Converter/Xml.php b/app/code/Magento/Cron/Model/Config/Converter/Xml.php
index 34de79d5ab230..810788cfb7570 100644
--- a/app/code/Magento/Cron/Model/Config/Converter/Xml.php
+++ b/app/code/Magento/Cron/Model/Config/Converter/Xml.php
@@ -7,7 +7,6 @@
 
 /**
  * Converts cron parameters from XML files
- * @since 2.0.0
  */
 class Xml implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Xml implements \Magento\Framework\Config\ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -61,7 +59,6 @@ public function convert($source)
      * @param \DOMElement $jobConfig
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function convertCronConfig(\DOMElement $jobConfig)
     {
@@ -83,7 +80,6 @@ protected function convertCronConfig(\DOMElement $jobConfig)
      *
      * @param \DOMElement $jobConfig
      * @return array
-     * @since 2.0.0
      */
     protected function convertCronSchedule(\DOMElement $jobConfig)
     {
@@ -107,7 +103,6 @@ protected function convertCronSchedule(\DOMElement $jobConfig)
      *
      * @param \DOMElement $jobConfig
      * @return array
-     * @since 2.0.0
      */
     protected function convertCronConfigPath(\DOMElement $jobConfig)
     {
diff --git a/app/code/Magento/Cron/Model/Config/Data.php b/app/code/Magento/Cron/Model/Config/Data.php
index 6ff8ffeda9db8..4452744c046f0 100644
--- a/app/code/Magento/Cron/Model/Config/Data.php
+++ b/app/code/Magento/Cron/Model/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides cron configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -21,7 +20,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param Reader\Db $dbReader
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Cron\Model\Config\Reader\Xml $reader,
@@ -38,7 +36,6 @@ public function __construct(
      * Merge cron jobs and return
      *
      * @return array
-     * @since 2.0.0
      */
     public function getJobs()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Reader/Db.php b/app/code/Magento/Cron/Model/Config/Reader/Db.php
index 1e5971a28ce00..5cdf857ed2ea8 100644
--- a/app/code/Magento/Cron/Model/Config/Reader/Db.php
+++ b/app/code/Magento/Cron/Model/Config/Reader/Db.php
@@ -9,7 +9,6 @@
 
 /**
  * Reader for cron parameters from data base storage
- * @since 2.0.0
  */
 class Db
 {
@@ -17,13 +16,11 @@ class Db
      * Converter instance
      *
      * @var \Magento\Cron\Model\Config\Converter\Db
-     * @since 2.0.0
      */
     protected $_converter;
 
     /**
      * @var \Magento\Framework\App\Config\Scope\ReaderInterface
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -38,7 +35,6 @@ class Db
      *
      * @param Config $config
      * @param \Magento\Cron\Model\Config\Converter\Db $converter
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -52,7 +48,6 @@ public function __construct(
      * Return converted data
      *
      * @return array
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Reader/Xml.php b/app/code/Magento/Cron/Model/Config/Reader/Xml.php
index ece60e183bd99..22deb223fa149 100644
--- a/app/code/Magento/Cron/Model/Config/Reader/Xml.php
+++ b/app/code/Magento/Cron/Model/Config/Reader/Xml.php
@@ -7,7 +7,6 @@
 
 /**
  * Reader for XML files
- * @since 2.0.0
  */
 class Xml extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -15,7 +14,6 @@ class Xml extends \Magento\Framework\Config\Reader\Filesystem
      * Mapping XML name nodes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/group' => 'id', '/config/group/job' => 'name'];
 
@@ -28,7 +26,6 @@ class Xml extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Cron/Model/Config/SchemaLocator.php b/app/code/Magento/Cron/Model/Config/SchemaLocator.php
index dc521a0338073..23378fcc05e5c 100644
--- a/app/code/Magento/Cron/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Cron/Model/Config/SchemaLocator.php
@@ -9,7 +9,6 @@
 
 /**
  * Cron locator
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -17,7 +16,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
@@ -25,13 +23,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -53,7 +48,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Cron/Model/Config/Source/Frequency.php b/app/code/Magento/Cron/Model/Config/Source/Frequency.php
index 6ed88e03e685a..ebff0459f9be9 100644
--- a/app/code/Magento/Cron/Model/Config/Source/Frequency.php
+++ b/app/code/Magento/Cron/Model/Config/Source/Frequency.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Cron\Model\Config\Source\Frequency
  *
- * @since 2.0.0
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_options;
 
@@ -26,7 +24,6 @@ class Frequency implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Cron/Model/ConfigInterface.php b/app/code/Magento/Cron/Model/ConfigInterface.php
index 78458c6dc80d2..904a748f000b8 100644
--- a/app/code/Magento/Cron/Model/ConfigInterface.php
+++ b/app/code/Magento/Cron/Model/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Interface \Magento\Cron\Model\ConfigInterface
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Return list of cron jobs
      *
      * @return array
-     * @since 2.0.0
      */
     public function getJobs();
 }
diff --git a/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php b/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
index 2a126c10ede6c..208bb4176c99c 100644
--- a/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
+++ b/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
@@ -7,7 +7,6 @@
 
 /**
  * Converts cron parameters from XML files
- * @since 2.0.0
  */
 class Xml implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Xml implements \Magento\Framework\Config\ConverterInterface
      * @param mixed $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Cron/Model/Groups/Config/Data.php b/app/code/Magento/Cron/Model/Groups/Config/Data.php
index 70553e6713ca5..574cf1b0876c1 100644
--- a/app/code/Magento/Cron/Model/Groups/Config/Data.php
+++ b/app/code/Magento/Cron/Model/Groups/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides cron groups configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Cron\Model\Groups\Config\Reader\Xml $reader,
@@ -36,7 +34,6 @@ public function __construct(
      *
      * @param string $groupId
      * @return array
-     * @since 2.0.0
      */
     public function getByGroupId($groupId)
     {
diff --git a/app/code/Magento/Cron/Model/Groups/Config/Reader/Xml.php b/app/code/Magento/Cron/Model/Groups/Config/Reader/Xml.php
index d58e67ffe2faf..6346093a73ba1 100644
--- a/app/code/Magento/Cron/Model/Groups/Config/Reader/Xml.php
+++ b/app/code/Magento/Cron/Model/Groups/Config/Reader/Xml.php
@@ -7,7 +7,6 @@
 
 /**
  * Reader for XML files
- * @since 2.0.0
  */
 class Xml extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -15,7 +14,6 @@ class Xml extends \Magento\Framework\Config\Reader\Filesystem
      * Mapping XML name nodes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/group' => 'id'];
 
@@ -28,7 +26,6 @@ class Xml extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Cron/Model/Groups/Config/SchemaLocator.php b/app/code/Magento/Cron/Model/Groups/Config/SchemaLocator.php
index 188348bd60c13..b76c1cf242c39 100644
--- a/app/code/Magento/Cron/Model/Groups/Config/SchemaLocator.php
+++ b/app/code/Magento/Cron/Model/Groups/Config/SchemaLocator.php
@@ -9,7 +9,6 @@
 
 /**
  * Cron locator
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -17,7 +16,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
@@ -25,13 +23,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -54,7 +49,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
index 836bf8a54bbf2..2bf6e30b898ea 100644
--- a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
+++ b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
@@ -9,7 +9,6 @@
  * Schedule resource
  *
  * @api
- * @since 2.0.0
  */
 class Schedule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Schedule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -34,7 +32,6 @@ public function _construct()
      * @param string $newStatus
      * @param string $currentStatus
      * @return bool
-     * @since 2.0.0
      */
     public function trySetJobStatusAtomic($scheduleId, $newStatus, $currentStatus)
     {
diff --git a/app/code/Magento/Cron/Model/ResourceModel/Schedule/Collection.php b/app/code/Magento/Cron/Model/ResourceModel/Schedule/Collection.php
index 901cec8f46c67..32a8aa3c2d9d4 100644
--- a/app/code/Magento/Cron/Model/ResourceModel/Schedule/Collection.php
+++ b/app/code/Magento/Cron/Model/ResourceModel/Schedule/Collection.php
@@ -9,7 +9,6 @@
  * Schedules Collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 80b6d4132be80..df9586143aa9a 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -31,7 +31,6 @@
  * @method \Magento\Cron\Model\Schedule setCronExprArr(array $value)
  *
  * @api
- * @since 2.0.0
  */
 class Schedule extends \Magento\Framework\Model\AbstractModel
 {
@@ -51,7 +50,6 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -65,7 +63,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -76,7 +73,6 @@ public function _construct()
      * @param string $expr
      * @return $this
      * @throws \Magento\Framework\Exception\CronException
-     * @since 2.0.0
      */
     public function setCronExpr($expr)
     {
@@ -95,7 +91,6 @@ public function setCronExpr($expr)
      * Supports $this->setCronExpr('* 0-5,10-59/5 2-10,15-25 january-june/2 mon-fri')
      *
      * @return bool
-     * @since 2.0.0
      */
     public function trySchedule()
     {
@@ -124,7 +119,6 @@ public function trySchedule()
      * @throws \Magento\Framework\Exception\CronException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function matchCronExpression($expr, $num)
     {
@@ -187,7 +181,6 @@ public function matchCronExpression($expr, $num)
     /**
      * @param int|string $value
      * @return bool|int|string
-     * @since 2.0.0
      */
     public function getNumeric($value)
     {
@@ -235,7 +228,6 @@ public function getNumeric($value)
      * Returns true if status was changed and false otherwise.
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function tryLockJob()
     {
diff --git a/app/code/Magento/Cron/Model/System/Config/Initial/Converter.php b/app/code/Magento/Cron/Model/System/Config/Initial/Converter.php
index bfbe632f9fcb2..71a0074fd9eb9 100644
--- a/app/code/Magento/Cron/Model/System/Config/Initial/Converter.php
+++ b/app/code/Magento/Cron/Model/System/Config/Initial/Converter.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Cron\Model\System\Config\Initial\Converter
  *
- * @since 2.0.0
  */
 class Converter
 {
     /**
      * @var \Magento\Cron\Model\Groups\Config\Data
-     * @since 2.0.0
      */
     protected $groupsConfig;
 
     /**
      * @param \Magento\Cron\Model\Groups\Config\Data $groupsConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Cron\Model\Groups\Config\Data $groupsConfig)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Cron\Model\Groups\Config\Data $groupsConfig
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterConvert(\Magento\Framework\App\Config\Initial\Converter $subject, array $result)
     {
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
index 00eb5cb6abfb5..1a96656b881a2 100644
--- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -16,7 +16,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ProcessCronQueueObserver implements ObserverInterface
 {
@@ -59,49 +58,41 @@ class ProcessCronQueueObserver implements ObserverInterface
 
     /**
      * @var \Magento\Cron\Model\ResourceModel\Schedule\Collection
-     * @since 2.0.0
      */
     protected $_pendingSchedules;
 
     /**
      * @var \Magento\Cron\Model\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\App\ObjectManager
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var ScheduleFactory
-     * @since 2.0.0
      */
     protected $_scheduleFactory;
 
     /**
      * @var \Magento\Framework\App\Console\Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\ShellInterface
-     * @since 2.0.0
      */
     protected $_shell;
 
@@ -154,7 +145,6 @@ class ProcessCronQueueObserver implements ObserverInterface
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\App\State $state
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -192,7 +182,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -277,7 +266,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      * @param string $groupId
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId)
     {
@@ -323,7 +311,6 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
      * Return job collection from data base with status 'pending'
      *
      * @return \Magento\Cron\Model\ResourceModel\Schedule\Collection
-     * @since 2.0.0
      */
     protected function _getPendingSchedules()
     {
@@ -341,7 +328,6 @@ protected function _getPendingSchedules()
      *
      * @param string $groupId
      * @return $this
-     * @since 2.0.0
      */
     protected function _generate($groupId)
     {
@@ -393,7 +379,6 @@ protected function _generate($groupId)
      * @param   array $exists
      * @param   string $groupId
      * @return  $this
-     * @since 2.0.0
      */
     protected function _generateJobs($jobs, $exists, $groupId)
     {
@@ -414,7 +399,6 @@ protected function _generateJobs($jobs, $exists, $groupId)
      *
      * @param string $groupId
      * @return $this
-     * @since 2.0.0
      */
     protected function _cleanup($groupId)
     {
@@ -483,7 +467,6 @@ protected function _cleanup($groupId)
     /**
      * @param array $jobConfig
      * @return mixed
-     * @since 2.0.0
      */
     protected function getConfigSchedule($jobConfig)
     {
@@ -501,7 +484,6 @@ protected function getConfigSchedule($jobConfig)
      * @param int $timeInterval
      * @param array $exists
      * @return void
-     * @since 2.0.0
      */
     protected function saveSchedule($jobCode, $cronExpression, $timeInterval, $exists)
     {
@@ -533,7 +515,6 @@ protected function saveSchedule($jobCode, $cronExpression, $timeInterval, $exist
      * @param string $cronExpression
      * @param int $time
      * @return Schedule
-     * @since 2.0.0
      */
     protected function generateSchedule($jobCode, $cronExpression, $time)
     {
@@ -550,7 +531,6 @@ protected function generateSchedule($jobCode, $cronExpression, $time)
     /**
      * @param string $groupId
      * @return int
-     * @since 2.0.0
      */
     protected function getScheduleTimeInterval($groupId)
     {
diff --git a/app/code/Magento/Cron/Setup/InstallSchema.php b/app/code/Magento/Cron/Setup/InstallSchema.php
index c3e31ff844027..921080e11cb71 100644
--- a/app/code/Magento/Cron/Setup/InstallSchema.php
+++ b/app/code/Magento/Cron/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index 309eab3e97ec5..683c317d2ec74 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Currency extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'system/currency/rates.phtml';
 
@@ -27,7 +25,6 @@ class Currency extends \Magento\Backend\Block\Template
      * Prepare layout
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -78,7 +75,6 @@ protected function _prepareLayout()
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -90,7 +86,6 @@ public function getHeader()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -102,7 +97,6 @@ public function getSaveButtonHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getResetButtonHtml()
     {
@@ -114,7 +108,6 @@ public function getResetButtonHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getImportButtonHtml()
     {
@@ -126,7 +119,6 @@ public function getImportButtonHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getServicesHtml()
     {
@@ -138,7 +130,6 @@ public function getServicesHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRatesMatrixHtml()
     {
@@ -150,7 +141,6 @@ public function getRatesMatrixHtml()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getImportFormAction()
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
index 2b110f9d36549..a1536739f2de4 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Matrix
  *
- * @since 2.0.0
  */
 class Matrix extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'system/currency/rate/matrix.phtml';
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_dirCurrencyFactory;
 
@@ -34,7 +31,6 @@ class Matrix extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Directory\Model\CurrencyFactory $dirCurrencyFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Prepare layout
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -93,7 +88,6 @@ protected function _prepareLayout()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRatesFormAction()
     {
@@ -105,7 +99,6 @@ public function getRatesFormAction()
      *
      * @param array $array
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRates($array)
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
index c2307a89c526c..194feaf928061 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Services
  *
- * @since 2.0.0
  */
 class Services extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'system/currency/rate/services.phtml';
 
     /**
      * @var \Magento\Directory\Model\Currency\Import\Source\ServiceFactory
-     * @since 2.0.0
      */
     protected $_srcCurrencyFactory;
 
@@ -34,7 +31,6 @@ class Services extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Create import services form select element
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index c30ac876f55c4..f44502f164356 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Currencysymbol extends \Magento\Backend\Block\Widget\Form
 {
     /**
      * @var \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory
-     * @since 2.0.0
      */
     protected $_symbolSystemFactory;
 
@@ -27,7 +25,6 @@ class Currencysymbol extends \Magento\Backend\Block\Widget\Form
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolSystemFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Constructor. Initialization required variables for class instance.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +50,6 @@ protected function _construct()
      * Custom currency symbol properties
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_symbolsData = [];
 
@@ -62,7 +57,6 @@ protected function _construct()
      * Prepares layout
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -86,7 +80,6 @@ protected function _prepareLayout()
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -98,7 +91,6 @@ public function getHeader()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFormActionUrl()
     {
@@ -110,7 +102,6 @@ public function getFormActionUrl()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -122,7 +113,6 @@ public function getWebsiteId()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -133,7 +123,6 @@ public function getStoreId()
      * Returns Custom currency symbol properties
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencySymbolsData()
     {
@@ -148,7 +137,6 @@ public function getCurrencySymbolsData()
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getInheritText()
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
index f2f05845338f1..d4b8859b9e235 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Currency extends \Magento\Backend\App\Action
 {
@@ -28,14 +27,12 @@ abstract class Currency extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
index 632ace80b1f31..7264f3b9e91a9 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\FetchRates
  *
- * @since 2.0.0
  */
 class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
 {
@@ -20,7 +19,6 @@ class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Cur
      * Fetch rates action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
index e0e8ee5791bc1..76e39853daffb 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
      * Currency management main page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
index 43a99f038a86a..27d3a26e1dfc4 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\SaveRates
  *
- * @since 2.0.0
  */
 class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
 {
@@ -18,7 +17,6 @@ class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Curr
      * Save rates action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
index 55a73d9d4deb2..c97b97ef841c3 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Currencysymbol extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
index 4afc5267c4690..16dbd27f4cdb0 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
      * Show Currency Symbols Management dialog
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
index 0d535830cd509..94ba328f590af 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
 {
@@ -17,7 +16,6 @@ class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencys
      * Save custom Currency symbol
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index 7503b0ec97a81..b02ebfe8cbf7e 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Currencysymbol
 {
@@ -23,7 +22,6 @@ class Currencysymbol
      * Custom currency symbol properties
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_symbolsData = [];
 
@@ -31,7 +29,6 @@ class Currencysymbol
      * Store id
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -39,7 +36,6 @@ class Currencysymbol
      * Website id
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_websiteId;
 
@@ -47,7 +43,6 @@ class Currencysymbol
      * Cache types which should be invalidated
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_cacheTypes = [
         \Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER,
@@ -77,43 +72,36 @@ class Currencysymbol
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
     /**
      * @var \Magento\Config\Model\Config\Factory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\App\Config\ReinitableConfigInterface
-     * @since 2.0.0
      */
     protected $_coreConfig;
 
@@ -121,7 +109,6 @@ class Currencysymbol
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -141,7 +128,6 @@ class Currencysymbol
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -169,7 +155,6 @@ public function __construct(
      * Return currency symbol properties array based on config values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencySymbolsData()
     {
@@ -204,7 +189,6 @@ public function getCurrencySymbolsData()
      *
      * @param  $symbols array
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrencySymbolsData($symbols = [])
     {
@@ -252,7 +236,6 @@ public function setCurrencySymbolsData($symbols = [])
      *
      * @param string $code
      * @return string|false
-     * @since 2.0.0
      */
     public function getCurrencySymbol($code)
     {
@@ -268,7 +251,6 @@ public function getCurrencySymbol($code)
      * Clear translate cache
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function clearCache()
     {
@@ -285,7 +267,6 @@ protected function clearCache()
      * @param string $configPath
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function _unserializeStoreConfig($configPath, $storeId = null)
     {
@@ -306,7 +287,6 @@ protected function _unserializeStoreConfig($configPath, $storeId = null)
      * Return allowed currencies
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllowedCurrencies()
     {
diff --git a/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php b/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
index 53e1be208450a..315d263d45b3d 100644
--- a/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
+++ b/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\CurrencySymbol\Observer\CurrencyDisplayOptions
  *
- * @since 2.0.0
  */
 class CurrencyDisplayOptions implements ObserverInterface
 {
     /**
      * @var \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory
-     * @since 2.0.0
      */
     protected $symbolFactory;
 
     /**
      * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\CurrencySymbol\Model\System\CurrencysymbolF
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -51,7 +47,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      *
      * @param string $baseCode
      * @return array
-     * @since 2.0.0
      */
     protected function getCurrencyOptions($baseCode)
     {
diff --git a/app/code/Magento/Customer/Api/AccountManagementInterface.php b/app/code/Magento/Customer/Api/AccountManagementInterface.php
index a5cf09f0783d0..52b711d988c6e 100644
--- a/app/code/Magento/Customer/Api/AccountManagementInterface.php
+++ b/app/code/Magento/Customer/Api/AccountManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface for managing customers accounts.
  * @api
- * @since 2.0.0
  */
 interface AccountManagementInterface
 {
@@ -31,7 +30,6 @@ interface AccountManagementInterface
      * @param string $redirectUrl
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createAccount(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -51,7 +49,6 @@ public function createAccount(
      * @throws \Magento\Framework\Exception\InputException If bad input is provided
      * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createAccountWithPasswordHash(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -65,7 +62,6 @@ public function createAccountWithPasswordHash(
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return \Magento\Customer\Api\Data\ValidationResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer);
 
@@ -77,7 +73,6 @@ public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer)
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isReadonly($customerId);
 
@@ -88,7 +83,6 @@ public function isReadonly($customerId);
      * @param string $confirmationKey
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function activate($email, $confirmationKey);
 
@@ -100,7 +94,6 @@ public function activate($email, $confirmationKey);
      * @param string $confirmationKey
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function activateById($customerId, $confirmationKey);
 
@@ -111,7 +104,6 @@ public function activateById($customerId, $confirmationKey);
      * @param string $password
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function authenticate($email, $password);
 
@@ -123,7 +115,6 @@ public function authenticate($email, $password);
      * @param string $newPassword
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function changePassword($email, $currentPassword, $newPassword);
 
@@ -135,7 +126,6 @@ public function changePassword($email, $currentPassword, $newPassword);
      * @param string $newPassword
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function changePasswordById($customerId, $currentPassword, $newPassword);
 
@@ -147,7 +137,6 @@ public function changePasswordById($customerId, $currentPassword, $newPassword);
      * @param int $websiteId
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function initiatePasswordReset($email, $template, $websiteId = null);
 
@@ -159,7 +148,6 @@ public function initiatePasswordReset($email, $template, $websiteId = null);
      * @param string $newPassword
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function resetPassword($email, $resetToken, $newPassword);
 
@@ -174,7 +162,6 @@ public function resetPassword($email, $resetToken, $newPassword);
      * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken);
 
@@ -184,7 +171,6 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
      * @param int $customerId
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getConfirmationStatus($customerId);
 
@@ -196,7 +182,6 @@ public function getConfirmationStatus($customerId);
      * @param string $redirectUrl
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function resendConfirmation($email, $websiteId, $redirectUrl = '');
 
@@ -207,7 +192,6 @@ public function resendConfirmation($email, $websiteId, $redirectUrl = '');
      * @param int $websiteId If not set, will use the current websiteId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isEmailAvailable($customerEmail, $websiteId = null);
 
@@ -218,7 +202,6 @@ public function isEmailAvailable($customerEmail, $websiteId = null);
      * @param int $storeId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isCustomerInStore($customerWebsiteId, $storeId);
 
@@ -229,7 +212,6 @@ public function isCustomerInStore($customerWebsiteId, $storeId);
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDefaultBillingAddress($customerId);
 
@@ -240,7 +222,6 @@ public function getDefaultBillingAddress($customerId);
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDefaultShippingAddress($customerId);
 
@@ -249,7 +230,6 @@ public function getDefaultShippingAddress($customerId);
      *
      * @param string $password
      * @return string
-     * @since 2.0.0
      */
     public function getPasswordHash($password);
 }
diff --git a/app/code/Magento/Customer/Api/AddressMetadataInterface.php b/app/code/Magento/Customer/Api/AddressMetadataInterface.php
index 597b6c9eedc96..4c4c213e9f18b 100644
--- a/app/code/Magento/Customer/Api/AddressMetadataInterface.php
+++ b/app/code/Magento/Customer/Api/AddressMetadataInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for retrieval information about customer address attributes metadata.
  * @api
- * @since 2.0.0
  */
 interface AddressMetadataInterface extends MetadataInterface
 {
diff --git a/app/code/Magento/Customer/Api/AddressMetadataManagementInterface.php b/app/code/Magento/Customer/Api/AddressMetadataManagementInterface.php
index 3515096080332..6110a12cfc933 100644
--- a/app/code/Magento/Customer/Api/AddressMetadataManagementInterface.php
+++ b/app/code/Magento/Customer/Api/AddressMetadataManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing customer address attributes metadata.
  * @api
- * @since 2.0.0
  */
 interface AddressMetadataManagementInterface extends MetadataManagementInterface
 {
diff --git a/app/code/Magento/Customer/Api/AddressRepositoryInterface.php b/app/code/Magento/Customer/Api/AddressRepositoryInterface.php
index 0024cdde8128c..1aea658be443d 100644
--- a/app/code/Magento/Customer/Api/AddressRepositoryInterface.php
+++ b/app/code/Magento/Customer/Api/AddressRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Customer address CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface AddressRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface AddressRepositoryInterface
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\AddressInterface $address);
 
@@ -29,7 +27,6 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address);
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($addressId);
 
@@ -39,7 +36,6 @@ public function getById($addressId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Customer\Api\Data\AddressSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -49,7 +45,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Customer\Api\Data\AddressInterface $address);
 
@@ -60,7 +55,6 @@ public function delete(\Magento\Customer\Api\Data\AddressInterface $address);
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($addressId);
 }
diff --git a/app/code/Magento/Customer/Api/CustomerManagementInterface.php b/app/code/Magento/Customer/Api/CustomerManagementInterface.php
index 97788cf44c844..137b3545a4144 100644
--- a/app/code/Magento/Customer/Api/CustomerManagementInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerManagementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CustomerManagementInterface
 {
@@ -15,7 +14,6 @@ interface CustomerManagementInterface
      * Provide the number of customer count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount();
 }
diff --git a/app/code/Magento/Customer/Api/CustomerMetadataInterface.php b/app/code/Magento/Customer/Api/CustomerMetadataInterface.php
index 67dfd90bf10c1..1067358de09fe 100644
--- a/app/code/Magento/Customer/Api/CustomerMetadataInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerMetadataInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for retrieval information about customer attributes metadata.
  * @api
- * @since 2.0.0
  */
 interface CustomerMetadataInterface extends MetadataInterface
 {
diff --git a/app/code/Magento/Customer/Api/CustomerMetadataManagementInterface.php b/app/code/Magento/Customer/Api/CustomerMetadataManagementInterface.php
index d27d42db6bc65..a3ce83f44552a 100644
--- a/app/code/Magento/Customer/Api/CustomerMetadataManagementInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerMetadataManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface for managing customer attributes metadata.
  * @api
- * @since 2.0.0
  */
 interface CustomerMetadataManagementInterface extends MetadataManagementInterface
 {
diff --git a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
index 4495a4215dd6b..2af3dc777d3f9 100644
--- a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Customer CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface CustomerRepositoryInterface
 {
@@ -23,7 +22,6 @@ interface CustomerRepositoryInterface
      * @throws \Magento\Framework\Exception\InputException If bad input is provided
      * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null);
 
@@ -35,7 +33,6 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function get($email, $websiteId = null);
 
@@ -46,7 +43,6 @@ public function get($email, $websiteId = null);
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($customerId);
 
@@ -60,7 +56,6 @@ public function getById($customerId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -70,7 +65,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer);
 
@@ -81,7 +75,6 @@ public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer);
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($customerId);
 }
diff --git a/app/code/Magento/Customer/Api/Data/AddressInterface.php b/app/code/Magento/Customer/Api/Data/AddressInterface.php
index 299ebb2a8875b..0cdd54c4789c3 100644
--- a/app/code/Magento/Customer/Api/Data/AddressInterface.php
+++ b/app/code/Magento/Customer/Api/Data/AddressInterface.php
@@ -10,7 +10,6 @@
 /**
  * Customer address interface.
  * @api
- * @since 2.0.0
  */
 interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -42,7 +41,6 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn
      * Get ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -51,7 +49,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -59,7 +56,6 @@ public function setId($id);
      * Get customer ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -68,7 +64,6 @@ public function getCustomerId();
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId);
 
@@ -76,7 +71,6 @@ public function setCustomerId($customerId);
      * Get region
      *
      * @return \Magento\Customer\Api\Data\RegionInterface|null
-     * @since 2.0.0
      */
     public function getRegion();
 
@@ -85,7 +79,6 @@ public function getRegion();
      *
      * @param \Magento\Customer\Api\Data\RegionInterface $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion(RegionInterface $region = null);
 
@@ -93,7 +86,6 @@ public function setRegion(RegionInterface $region = null);
      * Get region ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getRegionId();
 
@@ -102,7 +94,6 @@ public function getRegionId();
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId);
 
@@ -110,7 +101,6 @@ public function setRegionId($regionId);
      * Two-letter country code in ISO_3166-2 format
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCountryId();
 
@@ -119,7 +109,6 @@ public function getCountryId();
      *
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($countryId);
 
@@ -127,7 +116,6 @@ public function setCountryId($countryId);
      * Get street
      *
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getStreet();
 
@@ -136,7 +124,6 @@ public function getStreet();
      *
      * @param string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreet(array $street);
 
@@ -144,7 +131,6 @@ public function setStreet(array $street);
      * Get company
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCompany();
 
@@ -153,7 +139,6 @@ public function getCompany();
      *
      * @param string $company
      * @return $this
-     * @since 2.0.0
      */
     public function setCompany($company);
 
@@ -161,7 +146,6 @@ public function setCompany($company);
      * Get telephone number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTelephone();
 
@@ -170,7 +154,6 @@ public function getTelephone();
      *
      * @param string $telephone
      * @return $this
-     * @since 2.0.0
      */
     public function setTelephone($telephone);
 
@@ -178,7 +161,6 @@ public function setTelephone($telephone);
      * Get fax number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFax();
 
@@ -187,7 +169,6 @@ public function getFax();
      *
      * @param string $fax
      * @return $this
-     * @since 2.0.0
      */
     public function setFax($fax);
 
@@ -195,7 +176,6 @@ public function setFax($fax);
      * Get postcode
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPostcode();
 
@@ -204,7 +184,6 @@ public function getPostcode();
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode);
 
@@ -212,7 +191,6 @@ public function setPostcode($postcode);
      * Get city name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCity();
 
@@ -221,7 +199,6 @@ public function getCity();
      *
      * @param string $city
      * @return $this
-     * @since 2.0.0
      */
     public function setCity($city);
 
@@ -229,7 +206,6 @@ public function setCity($city);
      * Get first name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFirstname();
 
@@ -238,7 +214,6 @@ public function getFirstname();
      *
      * @param string $firstName
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstName);
 
@@ -246,7 +221,6 @@ public function setFirstname($firstName);
      * Get last name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLastname();
 
@@ -255,7 +229,6 @@ public function getLastname();
      *
      * @param string $lastName
      * @return $this
-     * @since 2.0.0
      */
     public function setLastname($lastName);
 
@@ -263,7 +236,6 @@ public function setLastname($lastName);
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename();
 
@@ -272,7 +244,6 @@ public function getMiddlename();
      *
      * @param string $middleName
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middleName);
 
@@ -280,7 +251,6 @@ public function setMiddlename($middleName);
      * Get prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -289,7 +259,6 @@ public function getPrefix();
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix);
 
@@ -297,7 +266,6 @@ public function setPrefix($prefix);
      * Get suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -306,7 +274,6 @@ public function getSuffix();
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix);
 
@@ -314,7 +281,6 @@ public function setSuffix($suffix);
      * Get Vat id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getVatId();
 
@@ -323,7 +289,6 @@ public function getVatId();
      *
      * @param string $vatId
      * @return $this
-     * @since 2.0.0
      */
     public function setVatId($vatId);
 
@@ -331,7 +296,6 @@ public function setVatId($vatId);
      * Get if this address is default shipping address.
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isDefaultShipping();
 
@@ -340,7 +304,6 @@ public function isDefaultShipping();
      *
      * @param bool $isDefaultShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefaultShipping($isDefaultShipping);
 
@@ -348,7 +311,6 @@ public function setIsDefaultShipping($isDefaultShipping);
      * Get if this address is default billing address
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isDefaultBilling();
 
@@ -357,7 +319,6 @@ public function isDefaultBilling();
      *
      * @param bool $isDefaultBilling
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefaultBilling($isDefaultBilling);
 
@@ -365,7 +326,6 @@ public function setIsDefaultBilling($isDefaultBilling);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Customer\Api\Data\AddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -374,7 +334,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php
index a24c5dc4af29b..db2300ab7194b 100644
--- a/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php
+++ b/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for customer address search results.
  * @api
- * @since 2.0.0
  */
 interface AddressSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface AddressSearchResultsInterface extends \Magento\Framework\Api\SearchRes
      * Get customer addresses list.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Customer\Api\Data\AddressInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php b/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php
index a0c9e61deae74..2c234af8ff625 100644
--- a/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php
+++ b/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php
@@ -9,7 +9,6 @@
 /**
  * Customer attribute metadata interface.
  * @api
- * @since 2.0.0
  */
 interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObjectInterface
 {
@@ -43,7 +42,6 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje
      * Frontend HTML for input element.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendInput();
 
@@ -52,7 +50,6 @@ public function getFrontendInput();
      *
      * @param string $frontendInput
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendInput($frontendInput);
 
@@ -60,7 +57,6 @@ public function setFrontendInput($frontendInput);
      * Get template used for input (e.g. "date")
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInputFilter();
 
@@ -69,7 +65,6 @@ public function getInputFilter();
      *
      * @param string $inputFilter
      * @return $this
-     * @since 2.0.0
      */
     public function setInputFilter($inputFilter);
 
@@ -77,7 +72,6 @@ public function setInputFilter($inputFilter);
      * Get label of the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel();
 
@@ -86,7 +80,6 @@ public function getStoreLabel();
      *
      * @param string $storeLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabel($storeLabel);
 
@@ -94,7 +87,6 @@ public function setStoreLabel($storeLabel);
      * Retrieve validation rules.
      *
      * @return \Magento\Customer\Api\Data\ValidationRuleInterface[]
-     * @since 2.0.0
      */
     public function getValidationRules();
 
@@ -103,7 +95,6 @@ public function getValidationRules();
      *
      * @param \Magento\Customer\Api\Data\ValidationRuleInterface[] $validationRules
      * @return $this
-     * @since 2.0.0
      */
     public function setValidationRules(array $validationRules);
 
@@ -111,7 +102,6 @@ public function setValidationRules(array $validationRules);
      * Number of lines of the attribute value.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMultilineCount();
 
@@ -120,7 +110,6 @@ public function getMultilineCount();
      *
      * @param int $multilineCount
      * @return $this
-     * @since 2.0.0
      */
     public function setMultilineCount($multilineCount);
 
@@ -128,7 +117,6 @@ public function setMultilineCount($multilineCount);
      * Whether attribute is visible on frontend.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible();
 
@@ -137,7 +125,6 @@ public function isVisible();
      *
      * @param bool $isVisible
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisible($isVisible);
 
@@ -145,7 +132,6 @@ public function setIsVisible($isVisible);
      * Whether attribute is required.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired();
 
@@ -154,7 +140,6 @@ public function isRequired();
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRequired($isRequired);
 
@@ -162,7 +147,6 @@ public function setIsRequired($isRequired);
      * Get data model for attribute.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDataModel();
 
@@ -171,7 +155,6 @@ public function getDataModel();
      *
      * @param string $dataModel
      * @return $this
-     * @since 2.0.0
      */
     public function setDataModel($dataModel);
 
@@ -179,7 +162,6 @@ public function setDataModel($dataModel);
      * Return options of the attribute (key => value pairs for select)
      *
      * @return \Magento\Customer\Api\Data\OptionInterface[]
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -188,7 +170,6 @@ public function getOptions();
      *
      * @param \Magento\Customer\Api\Data\OptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null);
 
@@ -196,7 +177,6 @@ public function setOptions(array $options = null);
      * Get class which is used to display the attribute on frontend.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendClass();
 
@@ -205,7 +185,6 @@ public function getFrontendClass();
      *
      * @param string $frontendClass
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendClass($frontendClass);
 
@@ -213,7 +192,6 @@ public function setFrontendClass($frontendClass);
      * Whether current attribute has been defined by a user.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUserDefined();
 
@@ -222,7 +200,6 @@ public function isUserDefined();
      *
      * @param bool $isUserDefined
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUserDefined($isUserDefined);
 
@@ -230,7 +207,6 @@ public function setIsUserDefined($isUserDefined);
      * Get attributes sort order.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -239,7 +215,6 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -247,7 +222,6 @@ public function setSortOrder($sortOrder);
      * Get label which supposed to be displayed on frontend.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendLabel();
 
@@ -256,7 +230,6 @@ public function getFrontendLabel();
      *
      * @param string $frontendLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendLabel($frontendLabel);
 
@@ -264,7 +237,6 @@ public function setFrontendLabel($frontendLabel);
      * Get the note attribute for the element.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNote();
 
@@ -273,7 +245,6 @@ public function getNote();
      *
      * @param string $note
      * @return $this
-     * @since 2.0.0
      */
     public function setNote($note);
 
@@ -281,7 +252,6 @@ public function setNote($note);
      * Whether this is a system attribute.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSystem();
 
@@ -290,7 +260,6 @@ public function isSystem();
      *
      * @param bool $isSystem
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSystem($isSystem);
 
@@ -298,7 +267,6 @@ public function setIsSystem($isSystem);
      * Get backend type.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackendType();
 
@@ -307,7 +275,6 @@ public function getBackendType();
      *
      * @param string $backendType
      * @return $this
-     * @since 2.0.0
      */
     public function setBackendType($backendType);
 
@@ -315,7 +282,6 @@ public function setBackendType($backendType);
      * Whether it is used in customer grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsUsedInGrid();
 
@@ -323,7 +289,6 @@ public function getIsUsedInGrid();
      * Whether it is visible in customer grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsVisibleInGrid();
 
@@ -331,7 +296,6 @@ public function getIsVisibleInGrid();
      * Whether it is filterable in customer grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsFilterableInGrid();
 
@@ -339,7 +303,6 @@ public function getIsFilterableInGrid();
      * Whether it is searchable in customer grid
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsSearchableInGrid();
 
@@ -348,7 +311,6 @@ public function getIsSearchableInGrid();
      *
      * @param bool $isUsedInGrid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUsedInGrid($isUsedInGrid);
 
@@ -357,7 +319,6 @@ public function setIsUsedInGrid($isUsedInGrid);
      *
      * @param bool $isVisibleInGrid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleInGrid($isVisibleInGrid);
 
@@ -366,7 +327,6 @@ public function setIsVisibleInGrid($isVisibleInGrid);
      *
      * @param bool $isFilterableInGrid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFilterableInGrid($isFilterableInGrid);
 
@@ -375,7 +335,6 @@ public function setIsFilterableInGrid($isFilterableInGrid);
      *
      * @param bool $isSearchableInGrid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSearchableInGrid($isSearchableInGrid);
 }
diff --git a/app/code/Magento/Customer/Api/Data/CustomerInterface.php b/app/code/Magento/Customer/Api/Data/CustomerInterface.php
index 7b6a46b769599..e6a93c714e078 100644
--- a/app/code/Magento/Customer/Api/Data/CustomerInterface.php
+++ b/app/code/Magento/Customer/Api/Data/CustomerInterface.php
@@ -8,7 +8,6 @@
 /**
  * Customer interface.
  * @api
- * @since 2.0.0
  */
 interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -42,7 +41,6 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -51,7 +49,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -59,7 +56,6 @@ public function setId($id);
      * Get group id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getGroupId();
 
@@ -68,7 +64,6 @@ public function getGroupId();
      *
      * @param int $groupId
      * @return $this
-     * @since 2.0.0
      */
     public function setGroupId($groupId);
 
@@ -76,7 +71,6 @@ public function setGroupId($groupId);
      * Get default billing address id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultBilling();
 
@@ -85,7 +79,6 @@ public function getDefaultBilling();
      *
      * @param string $defaultBilling
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultBilling($defaultBilling);
 
@@ -93,7 +86,6 @@ public function setDefaultBilling($defaultBilling);
      * Get default shipping address id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultShipping();
 
@@ -102,7 +94,6 @@ public function getDefaultShipping();
      *
      * @param string $defaultShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultShipping($defaultShipping);
 
@@ -110,7 +101,6 @@ public function setDefaultShipping($defaultShipping);
      * Get confirmation
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfirmation();
 
@@ -119,7 +109,6 @@ public function getConfirmation();
      *
      * @param string $confirmation
      * @return $this
-     * @since 2.0.0
      */
     public function setConfirmation($confirmation);
 
@@ -127,7 +116,6 @@ public function setConfirmation($confirmation);
      * Get created at time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -136,7 +124,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -144,7 +131,6 @@ public function setCreatedAt($createdAt);
      * Get updated at time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -153,7 +139,6 @@ public function getUpdatedAt();
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt);
 
@@ -161,7 +146,6 @@ public function setUpdatedAt($updatedAt);
      * Get created in area
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedIn();
 
@@ -170,7 +154,6 @@ public function getCreatedIn();
      *
      * @param string $createdIn
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedIn($createdIn);
 
@@ -178,7 +161,6 @@ public function setCreatedIn($createdIn);
      * Get date of birth
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDob();
 
@@ -187,7 +169,6 @@ public function getDob();
      *
      * @param string $dob
      * @return $this
-     * @since 2.0.0
      */
     public function setDob($dob);
 
@@ -195,7 +176,6 @@ public function setDob($dob);
      * Get email address
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail();
 
@@ -204,7 +184,6 @@ public function getEmail();
      *
      * @param string $email
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($email);
 
@@ -212,7 +191,6 @@ public function setEmail($email);
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname();
 
@@ -221,7 +199,6 @@ public function getFirstname();
      *
      * @param string $firstname
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstname);
 
@@ -229,7 +206,6 @@ public function setFirstname($firstname);
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname();
 
@@ -238,7 +214,6 @@ public function getLastname();
      *
      * @param string $lastname
      * @return $this
-     * @since 2.0.0
      */
     public function setLastname($lastname);
 
@@ -246,7 +221,6 @@ public function setLastname($lastname);
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename();
 
@@ -255,7 +229,6 @@ public function getMiddlename();
      *
      * @param string $middlename
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middlename);
 
@@ -263,7 +236,6 @@ public function setMiddlename($middlename);
      * Get prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -272,7 +244,6 @@ public function getPrefix();
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix);
 
@@ -280,7 +251,6 @@ public function setPrefix($prefix);
      * Get suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -289,7 +259,6 @@ public function getSuffix();
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix);
 
@@ -297,7 +266,6 @@ public function setSuffix($suffix);
      * Get gender
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getGender();
 
@@ -306,7 +274,6 @@ public function getGender();
      *
      * @param int $gender
      * @return $this
-     * @since 2.0.0
      */
     public function setGender($gender);
 
@@ -314,7 +281,6 @@ public function setGender($gender);
      * Get store id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -323,7 +289,6 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -331,7 +296,6 @@ public function setStoreId($storeId);
      * Get tax Vat
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxvat();
 
@@ -340,7 +304,6 @@ public function getTaxvat();
      *
      * @param string $taxvat
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxvat($taxvat);
 
@@ -348,7 +311,6 @@ public function setTaxvat($taxvat);
      * Get website id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
@@ -357,7 +319,6 @@ public function getWebsiteId();
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 
@@ -365,7 +326,6 @@ public function setWebsiteId($websiteId);
      * Get customer addresses.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|null
-     * @since 2.0.0
      */
     public function getAddresses();
 
@@ -374,7 +334,6 @@ public function getAddresses();
      *
      * @param \Magento\Customer\Api\Data\AddressInterface[] $addresses
      * @return $this
-     * @since 2.0.0
      */
     public function setAddresses(array $addresses = null);
 
@@ -382,7 +341,6 @@ public function setAddresses(array $addresses = null);
      * Get disable auto group change flag.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getDisableAutoGroupChange();
 
@@ -391,7 +349,6 @@ public function getDisableAutoGroupChange();
      *
      * @param int $disableAutoGroupChange
      * @return $this
-     * @since 2.0.0
      */
     public function setDisableAutoGroupChange($disableAutoGroupChange);
 
@@ -399,7 +356,6 @@ public function setDisableAutoGroupChange($disableAutoGroupChange);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Customer\Api\Data\CustomerExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -408,7 +364,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Customer\Api\Data\CustomerExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\CustomerExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php
index 2cb7da1da7578..dcf507f47c6d3 100644
--- a/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php
+++ b/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for customer search results.
  * @api
- * @since 2.0.0
  */
 interface CustomerSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface CustomerSearchResultsInterface extends \Magento\Framework\Api\SearchRe
      * Get customers list.
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/GroupInterface.php b/app/code/Magento/Customer/Api/Data/GroupInterface.php
index 3fb51fd3aa81b..dcd71c78d5867 100644
--- a/app/code/Magento/Customer/Api/Data/GroupInterface.php
+++ b/app/code/Magento/Customer/Api/Data/GroupInterface.php
@@ -12,7 +12,6 @@
 /**
  * Customer group interface.
  * @api
- * @since 2.0.0
  */
 interface GroupInterface extends ExtensibleDataInterface
 {
@@ -32,7 +31,6 @@ interface GroupInterface extends ExtensibleDataInterface
      * Get id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -41,7 +39,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -49,7 +46,6 @@ public function setId($id);
      * Get code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -58,7 +54,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -66,7 +61,6 @@ public function setCode($code);
      * Get tax class id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTaxClassId();
 
@@ -75,7 +69,6 @@ public function getTaxClassId();
      *
      * @param int $taxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassId($taxClassId);
 
@@ -83,7 +76,6 @@ public function setTaxClassId($taxClassId);
      * Get tax class name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxClassName();
 
@@ -92,7 +84,6 @@ public function getTaxClassName();
      *
      * @param string $taxClassName
      * @return string|null
-     * @since 2.0.0
      */
     public function setTaxClassName($taxClassName);
 
@@ -100,7 +91,6 @@ public function setTaxClassName($taxClassName);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Customer\Api\Data\GroupExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -109,7 +99,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Customer\Api\Data\GroupExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\GroupExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php
index 7d6e8049dfb5e..8d862bb660c68 100644
--- a/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php
+++ b/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for customer groups search results.
  * @api
- * @since 2.0.0
  */
 interface GroupSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface GroupSearchResultsInterface extends \Magento\Framework\Api\SearchResul
      * Get customer groups list.
      *
      * @return \Magento\Customer\Api\Data\GroupInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      * @api
      * @param \Magento\Customer\Api\Data\GroupInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/OptionInterface.php b/app/code/Magento/Customer/Api/Data/OptionInterface.php
index ee5dad63dd488..41a14f8288f4e 100644
--- a/app/code/Magento/Customer/Api/Data/OptionInterface.php
+++ b/app/code/Magento/Customer/Api/Data/OptionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Option interface.
  * @api
- * @since 2.0.0
  */
 interface OptionInterface
 {
@@ -26,7 +25,6 @@ interface OptionInterface
      * Get option label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -35,7 +33,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -43,7 +40,6 @@ public function setLabel($label);
      * Get option value
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -52,7 +48,6 @@ public function getValue();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -60,7 +55,6 @@ public function setValue($value);
      * Get nested options
      *
      * @return \Magento\Customer\Api\Data\OptionInterface[]|null
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -69,7 +63,6 @@ public function getOptions();
      *
      * @param \Magento\Customer\Api\Data\OptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null);
 }
diff --git a/app/code/Magento/Customer/Api/Data/RegionInterface.php b/app/code/Magento/Customer/Api/Data/RegionInterface.php
index 2a55b8c78eb44..f64276e79536a 100644
--- a/app/code/Magento/Customer/Api/Data/RegionInterface.php
+++ b/app/code/Magento/Customer/Api/Data/RegionInterface.php
@@ -11,7 +11,6 @@
 /**
  * Customer address region interface.
  * @api
- * @since 2.0.0
  */
 interface RegionInterface extends ExtensibleDataInterface
 {
@@ -27,7 +26,6 @@ interface RegionInterface extends ExtensibleDataInterface
      * Get region code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode();
 
@@ -36,7 +34,6 @@ public function getRegionCode();
      *
      * @param string $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode);
 
@@ -44,7 +41,6 @@ public function setRegionCode($regionCode);
      * Get region
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion();
 
@@ -53,7 +49,6 @@ public function getRegion();
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region);
 
@@ -61,7 +56,6 @@ public function setRegion($region);
      * Get region id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId();
 
@@ -70,7 +64,6 @@ public function getRegionId();
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId);
 
@@ -78,7 +71,6 @@ public function setRegionId($regionId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Customer\Api\Data\RegionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -87,7 +79,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Customer\Api\Data\RegionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\RegionExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php b/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php
index e3ef435daf45e..ea51fd5bcf0bc 100644
--- a/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php
+++ b/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php
@@ -10,7 +10,6 @@
 /**
  * Validation results interface.
  * @api
- * @since 2.0.0
  */
 interface ValidationResultsInterface
 {
@@ -25,7 +24,6 @@ interface ValidationResultsInterface
      * Check if the provided data is valid.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid();
 
@@ -34,7 +32,6 @@ public function isValid();
      *
      * @param bool $isValid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsValid($isValid);
 
@@ -42,7 +39,6 @@ public function setIsValid($isValid);
      * Get error messages as array in case of validation failure, else return empty array.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getMessages();
 
@@ -51,7 +47,6 @@ public function getMessages();
      *
      * @param string[] $messages
      * @return string[]
-     * @since 2.0.0
      */
     public function setMessages(array $messages);
 }
diff --git a/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php b/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php
index dc4208cc13c1b..b9f19cb676907 100644
--- a/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php
+++ b/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php
@@ -10,7 +10,6 @@
 /**
  * Validation rule interface.
  * @api
- * @since 2.0.0
  */
 interface ValidationRuleInterface
 {
@@ -25,7 +24,6 @@ interface ValidationRuleInterface
      * Get validation rule name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -34,7 +32,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -42,7 +39,6 @@ public function setName($name);
      * Get validation rule value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -51,7 +47,6 @@ public function getValue();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 }
diff --git a/app/code/Magento/Customer/Api/GroupManagementInterface.php b/app/code/Magento/Customer/Api/GroupManagementInterface.php
index faebc6e77860a..5534f58f24ab8 100644
--- a/app/code/Magento/Customer/Api/GroupManagementInterface.php
+++ b/app/code/Magento/Customer/Api/GroupManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for managing customer groups.
  * @api
- * @since 2.0.0
  */
 interface GroupManagementInterface
 {
@@ -20,7 +19,6 @@ interface GroupManagementInterface
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isReadonly($id);
 
@@ -31,7 +29,6 @@ public function isReadonly($id);
      * @return \Magento\Customer\Api\Data\GroupInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDefaultGroup($storeId = null);
 
@@ -41,7 +38,6 @@ public function getDefaultGroup($storeId = null);
      * @return \Magento\Customer\Api\Data\GroupInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getNotLoggedInGroup();
 
@@ -50,7 +46,6 @@ public function getNotLoggedInGroup();
      *
      * @return \Magento\Customer\Api\Data\GroupInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getLoggedInGroups();
 
@@ -59,7 +54,6 @@ public function getLoggedInGroups();
      *
      * @return \Magento\Customer\Api\Data\GroupInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAllCustomersGroup();
 }
diff --git a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
index 2f9ad4d0af8b4..3a72fc1bcb03c 100644
--- a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
+++ b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Customer group CRUD interface
  * @api
- * @since 2.0.0
  */
 interface GroupRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface GroupRepositoryInterface
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
      *      If saving customer group with customer group code that is used by an existing customer group
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\GroupInterface $group);
 
@@ -33,7 +31,6 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group);
      * @return \Magento\Customer\Api\Data\GroupInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $groupId is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($id);
 
@@ -50,7 +47,6 @@ public function getById($id);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Customer\Api\Data\GroupSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -61,7 +57,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool true on success
      * @throws \Magento\Framework\Exception\StateException If customer group cannot be deleted
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Customer\Api\Data\GroupInterface $group);
 
@@ -73,7 +68,6 @@ public function delete(\Magento\Customer\Api\Data\GroupInterface $group);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException If customer group cannot be deleted
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($id);
 }
diff --git a/app/code/Magento/Customer/Api/MetadataInterface.php b/app/code/Magento/Customer/Api/MetadataInterface.php
index 85717c433f1f0..9a8016283b17c 100644
--- a/app/code/Magento/Customer/Api/MetadataInterface.php
+++ b/app/code/Magento/Customer/Api/MetadataInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for getting attributes metadata. Note that this interface should not be used directly, use its children.
  * @api
- * @since 2.0.0
  */
 interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterface
 {
@@ -19,7 +18,6 @@ interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterf
      * @param string $formCode
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttributes($formCode);
 
@@ -30,7 +28,6 @@ public function getAttributes($formCode);
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttributeMetadata($attributeCode);
 
@@ -39,7 +36,6 @@ public function getAttributeMetadata($attributeCode);
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAllAttributesMetadata();
 
@@ -49,7 +45,6 @@ public function getAllAttributesMetadata();
      * @param string $dataInterfaceName
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataInterfaceName = '');
 }
diff --git a/app/code/Magento/Customer/Api/MetadataManagementInterface.php b/app/code/Magento/Customer/Api/MetadataManagementInterface.php
index 399892d9b55b0..7cd447497847a 100644
--- a/app/code/Magento/Customer/Api/MetadataManagementInterface.php
+++ b/app/code/Magento/Customer/Api/MetadataManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface for managing attributes metadata.
  * @api
- * @since 2.0.0
  */
 interface MetadataManagementInterface
 {
@@ -21,7 +20,6 @@ interface MetadataManagementInterface
      * @param AttributeMetadataInterface $attribute
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function canBeSearchableInGrid(AttributeMetadataInterface $attribute);
 
@@ -32,7 +30,6 @@ public function canBeSearchableInGrid(AttributeMetadataInterface $attribute);
      * @param AttributeMetadataInterface $attribute
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function canBeFilterableInGrid(AttributeMetadataInterface $attribute);
 }
diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 2e187b3cbb1c7..0d05d39ca04a2 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AuthenticationPopup extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout;
 
@@ -31,7 +29,6 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -57,7 +53,6 @@ public function getJsLayout()
      * Returns popup config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -100,7 +95,6 @@ private function isAutocompleteEnabled()
      * Return base url.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -111,7 +105,6 @@ public function getBaseUrl()
      * Get customer register url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerRegisterUrlUrl()
     {
@@ -122,7 +115,6 @@ public function getCustomerRegisterUrlUrl()
      * Get customer forgot password url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerForgotPasswordUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
index 6791cda0d2542..56c3e5072b4be 100644
--- a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
+++ b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class AuthorizationLink extends \Magento\Framework\View\Element\Html\Link implements SortLinkInterface
 {
@@ -21,19 +20,16 @@ class AuthorizationLink extends \Magento\Framework\View\Element\Html\Link implem
      * Customer session
      *
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
@@ -43,7 +39,6 @@ class AuthorizationLink extends \Magento\Framework\View\Element\Html\Link implem
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -71,7 +65,6 @@ public function getHref()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -82,7 +75,6 @@ public function getLabel()
      * Retrieve params for post request
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostParams()
     {
@@ -93,7 +85,6 @@ public function getPostParams()
      * Is logged in
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLoggedIn()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Customer.php b/app/code/Magento/Customer/Block/Account/Customer.php
index fe3de556dcb14..e74428436320a 100644
--- a/app/code/Magento/Customer/Block/Account/Customer.php
+++ b/app/code/Magento/Customer/Block/Account/Customer.php
@@ -9,25 +9,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_viewHelper;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -35,7 +31,6 @@ class Customer extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +45,6 @@ public function __construct(
      * Checking customer login status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function customerLoggedIn()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index ffbfac75a8da7..6a08ef8530a6c 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -12,37 +12,31 @@
  * Customer dashboard block
  *
  * @api
- * @since 2.0.0
  */
 class Dashboard extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     protected $subscription;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $subscriberFactory;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -55,7 +49,6 @@ class Dashboard extends \Magento\Framework\View\Element\Template
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -76,7 +69,6 @@ public function __construct(
      * Return the Customer given the customer Id stored in the session.
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -87,7 +79,6 @@ public function getCustomer()
      * Retrieve the Url for editing the customer's account.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAccountUrl()
     {
@@ -98,7 +89,6 @@ public function getAccountUrl()
      * Retrieve the Url for customer addresses.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddressesUrl()
     {
@@ -110,7 +100,6 @@ public function getAddressesUrl()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getAddressEditUrl($address)
     {
@@ -124,7 +113,6 @@ public function getAddressEditUrl($address)
      * Retrieve the Url for customer orders.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrdersUrl()
     {
@@ -135,7 +123,6 @@ public function getOrdersUrl()
      * Retrieve the Url for customer reviews.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsUrl()
     {
@@ -146,7 +133,6 @@ public function getReviewsUrl()
      * Retrieve the Url for managing customer wishlist.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWishlistUrl()
     {
@@ -157,7 +143,6 @@ public function getWishlistUrl()
      * Retrieve the subscription object (i.e. the subscriber).
      *
      * @return \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     public function getSubscriptionObject()
     {
@@ -173,7 +158,6 @@ public function getSubscriptionObject()
      * Retrieve the Url for managing newsletter subscriptions.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getManageNewsletterUrl()
     {
@@ -184,7 +168,6 @@ public function getManageNewsletterUrl()
      * Retrieve subscription text, either subscribed or not.
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSubscriptionText()
     {
@@ -199,7 +182,6 @@ public function getSubscriptionText()
      * Retrieve the customer's primary addresses (i.e. default billing and shipping).
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
-     * @since 2.0.0
      */
     public function getPrimaryAddresses()
     {
@@ -231,7 +213,6 @@ public function getPrimaryAddresses()
      * \Magento\Customer\Block\Address\Book - Because of secure Url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -246,7 +227,6 @@ public function getBackUrl()
      * Create an instance of a subscriber.
      *
      * @return \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     protected function _createSubscriber()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
index b1e421cc07b55..fb5590399187d 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
@@ -13,31 +13,26 @@
  * Class to manage customer dashboard addresses section
  *
  * @api
- * @since 2.0.0
  */
 class Address extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     protected $_addressConfig;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomerAddress
-     * @since 2.0.0
      */
     protected $currentCustomerAddress;
 
     /**
      * @var Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -48,7 +43,6 @@ class Address extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param Mapper $addressMapper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Get the logged in customer
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -84,7 +77,6 @@ public function getCustomer()
      * HTML for Shipping Address
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getPrimaryShippingAddressHtml()
     {
@@ -105,7 +97,6 @@ public function getPrimaryShippingAddressHtml()
      * HTML for Billing Address
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getPrimaryBillingAddressHtml()
     {
@@ -124,7 +115,6 @@ public function getPrimaryBillingAddressHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrimaryShippingAddressEditUrl()
     {
@@ -142,7 +132,6 @@ public function getPrimaryShippingAddressEditUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrimaryBillingAddressEditUrl()
     {
@@ -160,7 +149,6 @@ public function getPrimaryBillingAddressEditUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddressBookUrl()
     {
@@ -172,7 +160,6 @@ public function getAddressBookUrl()
      *
      * @param AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     protected function _getAddressHtml($address)
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
index 1fce6793d0148..df70b2b2750f0 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
@@ -11,7 +11,6 @@
  * Dashboard Customer Info
  *
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
@@ -19,25 +18,21 @@ class Info extends \Magento\Framework\View\Element\Template
      * Cached subscription object
      *
      * @var \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     protected $_subscription;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_helperView;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -49,7 +44,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      * @param \Magento\Customer\Helper\View $helperView
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -68,7 +62,6 @@ public function __construct(
      * Returns the Magento Customer Model for this block
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -83,7 +76,6 @@ public function getCustomer()
      * Get the full name of a customer
      *
      * @return string full name
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -92,7 +84,6 @@ public function getName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getChangePasswordUrl()
     {
@@ -103,7 +94,6 @@ public function getChangePasswordUrl()
      * Get Customer Subscription Object Information
      *
      * @return \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     public function getSubscriptionObject()
     {
@@ -123,7 +113,6 @@ public function getSubscriptionObject()
      * @return bool
      *
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSubscribed()
     {
@@ -134,7 +123,6 @@ public function getIsSubscribed()
      * Newsletter module availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNewsletterEnabled()
     {
@@ -145,7 +133,6 @@ public function isNewsletterEnabled()
 
     /**
      * @return \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     protected function _createSubscriber()
     {
@@ -154,7 +141,6 @@ protected function _createSubscriber()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Forgotpassword.php b/app/code/Magento/Customer/Block/Account/Forgotpassword.php
index 33ec3099d6a14..8b39f3cf54a9e 100644
--- a/app/code/Magento/Customer/Block/Account/Forgotpassword.php
+++ b/app/code/Magento/Customer/Block/Account/Forgotpassword.php
@@ -12,13 +12,11 @@
  * Customer account navigation sidebar
  *
  * @api
- * @since 2.0.0
  */
 class Forgotpassword extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var Url
-     * @since 2.0.0
      */
     protected $customerUrl;
 
@@ -26,7 +24,6 @@ class Forgotpassword extends \Magento\Framework\View\Element\Template
      * @param Template\Context $context
      * @param Url $customerUrl
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Get login URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoginUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Link.php b/app/code/Magento/Customer/Block/Account/Link.php
index 9031ca2e18a26..2f9312b46a05f 100644
--- a/app/code/Magento/Customer/Block/Account/Link.php
+++ b/app/code/Magento/Customer/Block/Account/Link.php
@@ -12,13 +12,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link implements SortLinkInterface
 {
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -26,7 +24,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements SortLink
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
diff --git a/app/code/Magento/Customer/Block/Account/RegisterLink.php b/app/code/Magento/Customer/Block/Account/RegisterLink.php
index 2a2ba788603a7..b8250160c8585 100644
--- a/app/code/Magento/Customer/Block/Account/RegisterLink.php
+++ b/app/code/Magento/Customer/Block/Account/RegisterLink.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class RegisterLink extends \Magento\Framework\View\Element\Html\Link
 {
@@ -20,19 +19,16 @@ class RegisterLink extends \Magento\Framework\View\Element\Html\Link
      * Customer session
      *
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     protected $_registration;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -42,7 +38,6 @@ class RegisterLink extends \Magento\Framework\View\Element\Html\Link
      * @param \Magento\Customer\Model\Registration $registration
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,7 +54,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -68,7 +62,6 @@ public function getHref()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Resetpassword.php b/app/code/Magento/Customer/Block/Account/Resetpassword.php
index dadd4fe681f36..46ab3c9e1a383 100644
--- a/app/code/Magento/Customer/Block/Account/Resetpassword.php
+++ b/app/code/Magento/Customer/Block/Account/Resetpassword.php
@@ -11,7 +11,6 @@
  * Customer reset password form
  *
  * @api
- * @since 2.0.0
  */
 class Resetpassword extends \Magento\Framework\View\Element\Template
 {
@@ -19,7 +18,6 @@ class Resetpassword extends \Magento\Framework\View\Element\Template
      * Check if autocomplete is disabled on storefront
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAutocompleteDisabled()
     {
diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 97e0e668913e8..927dd86256a60 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -14,37 +14,31 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Book extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     protected $_addressConfig;
 
     /**
      * @var Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -56,7 +50,6 @@ class Book extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param Mapper $addressMapper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -77,7 +70,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -87,7 +79,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddAddressUrl()
     {
@@ -96,7 +87,6 @@ public function getAddAddressUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -108,7 +98,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -118,7 +107,6 @@ public function getDeleteUrl()
     /**
      * @param int $addressId
      * @return string
-     * @since 2.0.0
      */
     public function getAddressEditUrl($addressId)
     {
@@ -127,7 +115,6 @@ public function getAddressEditUrl($addressId)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasPrimaryAddress()
     {
@@ -136,7 +123,6 @@ public function hasPrimaryAddress()
 
     /**
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
-     * @since 2.0.0
      */
     public function getAdditionalAddresses()
     {
@@ -159,7 +145,6 @@ public function getAdditionalAddresses()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $address = null)
     {
@@ -173,7 +158,6 @@ public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $addr
 
     /**
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -191,7 +175,6 @@ public function getCustomer()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getDefaultBilling()
     {
@@ -206,7 +189,6 @@ public function getDefaultBilling()
     /**
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     public function getAddressById($addressId)
     {
@@ -219,7 +201,6 @@ public function getAddressById($addressId)
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getDefaultShipping()
     {
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index b9c932d669fed..56922cfc8e4d2 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -12,43 +12,36 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Edit extends \Magento\Directory\Block\Data
 {
     /**
      * @var \Magento\Customer\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     protected $_address = null;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $_addressRepository;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -69,7 +62,6 @@ class Edit extends \Magento\Directory\Block\Data
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -105,7 +97,6 @@ public function __construct(
      * Prepare the layout of the address edit block.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -154,7 +145,6 @@ protected function _prepareLayout()
      * Generate name block html.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNameBlockHtml()
     {
@@ -169,7 +159,6 @@ public function getNameBlockHtml()
      * Return the title, either editing an existing address, or adding a new one.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -188,7 +177,6 @@ public function getTitle()
      * Return the Url to go back.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -207,7 +195,6 @@ public function getBackUrl()
      * Return the Url for saving.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -221,7 +208,6 @@ public function getSaveUrl()
      * Return the associated address.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -233,7 +219,6 @@ public function getAddress()
      *
      * @param int $lineNumber
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine($lineNumber)
     {
@@ -245,7 +230,6 @@ public function getStreetLine($lineNumber)
      * Return the country Id.
      *
      * @return int|null|string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -259,7 +243,6 @@ public function getCountryId()
      * Return the name of the region for the address being edited.
      *
      * @return string region name
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -271,7 +254,6 @@ public function getRegion()
      * Return the id of the region being edited.
      *
      * @return int region id
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -283,7 +265,6 @@ public function getRegionId()
      * Retrieve the number of addresses associated with the customer given a customer Id.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerAddressCount()
     {
@@ -294,7 +275,6 @@ public function getCustomerAddressCount()
      * Determine if the address can be set as the default billing address.
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function canSetAsDefaultBilling()
     {
@@ -308,7 +288,6 @@ public function canSetAsDefaultBilling()
      * Determine if the address can be set as the default shipping address.
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function canSetAsDefaultShipping()
     {
@@ -322,7 +301,6 @@ public function canSetAsDefaultShipping()
      * Is the address the default billing address?
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDefaultBilling()
     {
@@ -333,7 +311,6 @@ public function isDefaultBilling()
      * Is the address the default shipping address?
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDefaultShipping()
     {
@@ -344,7 +321,6 @@ public function isDefaultShipping()
      * Retrieve the Customer Data using the customer Id from the customer session.
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -355,7 +331,6 @@ public function getCustomer()
      * Return back button Url, either to customer address or account.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonUrl()
     {
@@ -371,7 +346,6 @@ public function getBackButtonUrl()
      *
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php b/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
index 36bbf6eb44209..a8622d98948df 100644
--- a/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
@@ -12,7 +12,6 @@
 
 /**
  * Address format renderer default
- * @since 2.0.0
  */
 class DefaultRenderer extends AbstractBlock implements RendererInterface
 {
@@ -20,31 +19,26 @@ class DefaultRenderer extends AbstractBlock implements RendererInterface
      * Format type object
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var ElementFactory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
     /**
      * @var \Magento\Customer\Api\AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $_addressMetadataService;
 
     /**
      * @var Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -57,7 +51,6 @@ class DefaultRenderer extends AbstractBlock implements RendererInterface
      * @param \Magento\Customer\Api\AddressMetadataInterface $metadataService
      * @param Mapper $addressMapper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -79,7 +72,6 @@ public function __construct(
      * Retrieve format type object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -91,7 +83,6 @@ public function getType()
      *
      * @param  \Magento\Framework\DataObject $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType(\Magento\Framework\DataObject $type)
     {
@@ -103,7 +94,6 @@ public function setType(\Magento\Framework\DataObject $type)
      * @param AddressModelInterface|null $address
      * @return string
      * All new code should use renderArray based on Metadata service
-     * @since 2.0.0
      */
     public function getFormat(AddressModelInterface $address = null)
     {
@@ -120,7 +110,6 @@ public function getFormat(AddressModelInterface $address = null)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function render(AddressModelInterface $address, $format = null)
     {
@@ -130,7 +119,6 @@ public function render(AddressModelInterface $address, $format = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFormatArray($addressAttributes = null)
     {
@@ -149,7 +137,6 @@ public function getFormatArray($addressAttributes = null)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function renderArray($addressAttributes, $format = null)
     {
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
index f2ea668233448..2f867d928bab0 100644
--- a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
+++ b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
@@ -12,7 +12,6 @@
  * Address renderer interface
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -21,7 +20,6 @@ interface RendererInterface
      *
      * @param \Magento\Framework\DataObject $type
      * @return void
-     * @since 2.0.0
      */
     public function setType(\Magento\Framework\DataObject $type);
 
@@ -29,7 +27,6 @@ public function setType(\Magento\Framework\DataObject $type);
      * Retrieve format type object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getType();
 
@@ -40,7 +37,6 @@ public function getType();
      * @param string|null $format
      * @return mixed
      * All new code should use renderArray based on Metadata service
-     * @since 2.0.0
      */
     public function render(AddressModelInterface $address, $format = null);
 
@@ -49,7 +45,6 @@ public function render(AddressModelInterface $address, $format = null);
      *
      * @param null|array $addressAttributes
      * @return Format
-     * @since 2.0.0
      */
     public function getFormatArray($addressAttributes = null);
 
@@ -59,7 +54,6 @@ public function getFormatArray($addressAttributes = null);
      * @param array $addressAttributes
      * @param Format|null $format
      * @return string
-     * @since 2.0.0
      */
     public function renderArray($addressAttributes, $format = null);
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
index bc85f44311bd4..94dc9523e409c 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
@@ -12,7 +12,6 @@
 /**
  * @deprecated 2.2.0 for UiComponent replacement
  * @see app/code/Magento/Customer/view/base/ui_component/customer_form.xml
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -20,19 +19,16 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -40,7 +36,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Customer view helper
      *
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_viewHelper;
 
@@ -53,7 +48,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Helper\View $viewHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -72,7 +66,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -141,7 +134,6 @@ protected function _construct()
      * Retrieve the Url for creating an order.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateOrderUrl()
     {
@@ -152,7 +144,6 @@ public function getCreateOrderUrl()
      * Return the customer Id.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -164,7 +155,6 @@ public function getCustomerId()
      * Retrieve the header text, either the name of an existing customer or 'New Customer'.
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -181,7 +171,6 @@ public function getHeaderText()
      * Prepare form Html. Add block for configurable product modification interface.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -196,7 +185,6 @@ public function getFormHtml()
      * Retrieve customer validation Url.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -207,7 +195,6 @@ public function getValidationUrl()
      * Prepare the layout.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -235,7 +222,6 @@ protected function _prepareLayout()
      * Retrieve the save and continue edit Url.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSaveAndContinueUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/BackButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/BackButton.php
index 7739716bfbe4c..11ca201dcdb4c 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/BackButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/BackButton.php
@@ -9,13 +9,11 @@
 
 /**
  * Class BackButton
- * @since 2.0.0
  */
 class BackButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
@@ -31,7 +29,6 @@ public function getButtonData()
      * Get URL for back (reset) button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
index b07bc8005e172..e1bb6feb23698 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php
@@ -11,13 +11,11 @@
 /**
  * Class DeleteButton
  * @package Magento\Customer\Block\Adminhtml\Edit
- * @since 2.0.0
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -27,7 +25,6 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param AccountManagementInterface $customerAccountManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
@@ -64,7 +60,6 @@ public function getButtonData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php
index 1a564c8f20d21..16ab68dc33210 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php
@@ -9,7 +9,6 @@
 
 /**
  * Adminhtml customer edit form block
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,13 +16,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Customer Repository.
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $_customerRepository;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $_extensibleDataObjectConverter;
 
@@ -36,7 +33,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Prepare the form.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/GenericButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/GenericButton.php
index b0964f5838275..8ef3d1b67ee54 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/GenericButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/GenericButton.php
@@ -10,7 +10,6 @@
 /**
  * Class GenericButton
  * @package Magento\Customer\Block\Adminhtml\Edit
- * @since 2.0.0
  */
 class GenericButton
 {
@@ -18,7 +17,6 @@ class GenericButton
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -26,7 +24,6 @@ class GenericButton
      * Registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -35,7 +32,6 @@ class GenericButton
      *
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Return the customer Id.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -62,7 +57,6 @@ public function getCustomerId()
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
index ce49d48346dd0..180cb3d66ea35 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
@@ -10,13 +10,11 @@
 /**
  * Class InvalidateTokenButton
  * @package Magento\Customer\Block\Adminhtml\Edit
- * @since 2.0.0
  */
 class InvalidateTokenButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
@@ -36,7 +34,6 @@ public function getButtonData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getInvalidateTokenUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/OrderButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/OrderButton.php
index a4a43fabc422f..c1aa3b2a035f8 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/OrderButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/OrderButton.php
@@ -9,13 +9,11 @@
 
 /**
  * Class OrderButton
- * @since 2.0.0
  */
 class OrderButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $authorization;
 
@@ -24,7 +22,6 @@ class OrderButton extends GenericButton implements ButtonProviderInterface
      *
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
@@ -57,7 +53,6 @@ public function getButtonData()
      * Retrieve the Url for creating an order.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateOrderUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
index 194bb7352d9d3..9a025211c9b0a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
@@ -7,14 +7,12 @@
 
 /**
  * Customer address region field renderer
- * @since 2.0.0
  */
 class Region extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
@@ -22,7 +20,6 @@ class Region extends \Magento\Backend\Block\AbstractBlock implements
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * @return string
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetButton.php
index bc5322a7f26c1..d2308cb8d0174 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetButton.php
@@ -9,13 +9,11 @@
 
 /**
  * Class ResetButton
- * @since 2.0.0
  */
 class ResetButton implements ButtonProviderInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
index e8c1e6918b058..f2d1dd9f0a853 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
@@ -9,13 +9,11 @@
 
 /**
  * Class ResetPasswordButton
- * @since 2.0.0
  */
 class ResetPasswordButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
@@ -34,7 +32,6 @@ public function getButtonData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getResetPasswordUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveAndContinueButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveAndContinueButton.php
index 0d9d6d57c901d..33afd130a38b7 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveAndContinueButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveAndContinueButton.php
@@ -10,13 +10,11 @@
 
 /**
  * Class SaveAndContinueButton
- * @since 2.0.0
  */
 class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -26,7 +24,6 @@ class SaveAndContinueButton extends GenericButton implements ButtonProviderInter
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param AccountManagementInterface $customerAccountManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveButton.php
index 5b509218fc06c..4b97801a778c4 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/SaveButton.php
@@ -11,13 +11,11 @@
 /**
  * Class SaveButton
  * @package Magento\Customer\Block\Adminhtml\Edit
- * @since 2.0.0
  */
 class SaveButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -27,7 +25,6 @@ class SaveButton extends GenericButton implements ButtonProviderInterface
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param AccountManagementInterface $customerAccountManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
index 5228520f8aa33..b469b7576ceed 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -13,7 +13,6 @@
  * Adminhtml customer orders grid block
  *
  * @api
- * @since 2.0.0
  */
 class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -21,37 +20,31 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_dataCollectionFactory;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $quote = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_parentTemplate;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -63,7 +56,6 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +75,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -97,7 +88,6 @@ protected function _construct()
      * Prepare grid
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareGrid()
     {
@@ -109,7 +99,6 @@ protected function _prepareGrid()
      * Prepare collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -130,7 +119,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -205,7 +193,6 @@ protected function _prepareColumns()
      * Gets customer assigned to this block
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -214,7 +201,6 @@ public function getCustomerId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -225,7 +211,6 @@ public function getGridUrl()
      * Gets grid parent html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridParentHtml()
     {
@@ -235,7 +220,6 @@ public function getGridParentHtml()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -246,7 +230,6 @@ public function getRowUrl($row)
      * Get the quote of the cart
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function getQuote()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Carts.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Carts.php
index ced850e3a4845..217704c39bb63 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Carts.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Carts.php
@@ -9,25 +9,21 @@
  * Obtain all carts contents for specified client
  *
  * @api
- * @since 2.0.0
  */
 class Carts extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Customer\Model\Config\Share
-     * @since 2.0.0
      */
     protected $_shareConfig;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -37,7 +33,6 @@ class Carts extends \Magento\Backend\Block\Template
      * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerDataFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array                                            $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Add shopping cart grid of each website
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -82,7 +76,6 @@ protected function _prepareLayout()
      * Just get child blocks html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -92,7 +85,6 @@ protected function _toHtml()
 
     /**
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function _getCustomer()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/GenericMetadata.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/GenericMetadata.php
index 1bec783c5dc1e..8ecae1c868610 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/GenericMetadata.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/GenericMetadata.php
@@ -11,13 +11,11 @@
  * Generic block that uses customer metatdata attributes.
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class GenericMetadata extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
@@ -27,7 +25,6 @@ class GenericMetadata extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @param array $exclude attributes that should be skipped
      * @return void
-     * @since 2.0.0
      */
     protected function _setFieldset($attributes, $fieldset, $exclude = [])
     {
@@ -87,7 +83,6 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @param AttributeMetadataInterface $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function _applyTypeSpecificConfigCustomer(
         $inputType,
@@ -116,7 +111,6 @@ protected function _applyTypeSpecificConfigCustomer(
     /**
      * @param AttributeMetadataInterface $attribute
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributeOptionsArray(AttributeMetadataInterface $attribute)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index 429301a0ef5dd..bb1a37b352f92 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -11,25 +11,21 @@
 
 /**
  * Customer account form block
- * @since 2.0.0
  */
 class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements TabInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'tab/newsletter.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -37,7 +33,6 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -50,7 +45,6 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      * @param AccountManagementInterface $customerAccountManagement
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -80,7 +73,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -91,7 +83,6 @@ public function getTabTitle()
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -102,7 +93,6 @@ public function getTabClass()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -113,7 +103,6 @@ public function getTabUrl()
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded()
     {
@@ -124,7 +113,6 @@ public function isAjaxLoaded()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -135,7 +123,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -147,7 +134,6 @@ public function isHidden()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function initForm()
     {
@@ -223,7 +209,6 @@ protected function updateFromSession(\Magento\Framework\Data\Form $form, $custom
      * Retrieve the date when the subscriber status changed.
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getStatusChangedDate()
     {
@@ -241,7 +226,6 @@ public function getStatusChangedDate()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
index 3987aace4bc2b..4f3d23eae32bc 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
@@ -9,7 +9,6 @@
  * Adminhtml newsletter queue grid block
  *
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -17,13 +16,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry|null
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -33,7 +30,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -65,7 +60,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -74,7 +68,6 @@ public function getGridUrl()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -90,7 +83,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Filter/Status.php
index c45fd6a1321fe..568ce56f27805 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Filter/Status.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Filter/Status.php
@@ -9,19 +9,16 @@
 
 /**
  * Adminhtml newsletter subscribers grid website filter
- * @since 2.0.0
  */
 class Status extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_statuses;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +35,6 @@ protected function _construct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -52,7 +48,6 @@ protected function _getOptions()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
index b6fbddf69a42d..43d9af36a5652 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
@@ -7,7 +7,6 @@
 
 /**
  * Adminhtml newsletter queue grid block action item renderer
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -15,7 +14,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -23,7 +21,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -63,7 +59,6 @@ public function render(\Magento\Framework\DataObject $row)
     /**
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getEscapedValue($value)
     {
@@ -73,7 +68,6 @@ protected function _getEscapedValue($value)
     /**
      * @param array $actions
      * @return string
-     * @since 2.0.0
      */
     protected function _actionsToHtml(array $actions)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
index 33115db3d3e67..fba213e9a21a4 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
@@ -7,13 +7,11 @@
 
 /**
  * Adminhtml newsletter queue grid block status item renderer
- * @since 2.0.0
  */
 class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_statuses;
 
@@ -21,7 +19,6 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * Constructor for Grid Renderer Status
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +35,6 @@ protected function _construct()
     /**
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -48,7 +44,6 @@ public function render(\Magento\Framework\DataObject $row)
     /**
      * @param string $status
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public static function getStatus($status)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
index 2c6d3b0d65b71..c3163e8c07536 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
@@ -11,7 +11,6 @@
  * Adminhtml customer orders grid block
  *
  * @api
- * @since 2.0.0
  */
 class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -19,7 +18,6 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
      * Sales reorder
      *
      * @var \Magento\Sales\Helper\Reorder
-     * @since 2.0.0
      */
     protected $_salesReorder = null;
 
@@ -27,13 +25,11 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var  \Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -44,7 +40,6 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Sales\Helper\Reorder $salesReorder
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +70,6 @@ protected function _construct()
      * Apply various selection filters to prepare the sales order grid collection.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -109,7 +102,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -162,7 +154,6 @@ protected function _prepareColumns()
      *
      * @param \Magento\Sales\Model\Order|\Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -171,7 +162,6 @@ public function getRowUrl($row)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
index dc029f9be1c54..02f6b18ad70e2 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Reviews extends \Magento\Review\Block\Adminhtml\Grid
 {
@@ -15,7 +14,6 @@ class Reviews extends \Magento\Review\Block\Adminhtml\Grid
      * Hide grid mass action elements
      *
      * @return \Magento\Customer\Block\Adminhtml\Edit\Tab\Reviews
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -26,7 +24,6 @@ protected function _prepareMassaction()
      * Determine ajax url for grid refresh
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
index 74681e089c457..9e4a9f0add5a5 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
@@ -10,7 +10,6 @@
 
 /**
  * Customer account form block
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Template implements TabInterface
 {
@@ -18,7 +17,6 @@ class View extends \Magento\Backend\Block\Template implements TabInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -26,7 +24,6 @@ class View extends \Magento\Backend\Block\Template implements TabInterface
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -48,7 +44,6 @@ public function getCustomerId()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -57,7 +52,6 @@ public function getTabLabel()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -66,7 +60,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -78,7 +71,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -92,7 +84,6 @@ public function isHidden()
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -103,7 +94,6 @@ public function getTabClass()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -114,7 +104,6 @@ public function getTabUrl()
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
index 87e65c1ed9cd4..6e3f6f77fcbaa 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
@@ -14,7 +14,6 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  *
  * @api
- * @since 2.0.0
  */
 class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -22,31 +21,26 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_dataCollectionFactory;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $quote = null;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -58,7 +52,6 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -78,7 +71,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -95,7 +87,6 @@ protected function _construct()
      * Prepare the cart collection.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -115,7 +106,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -154,7 +144,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -163,7 +152,6 @@ public function getRowUrl($row)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHeadersVisibility()
     {
@@ -174,7 +162,6 @@ public function getHeadersVisibility()
      * Get quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function getQuote()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
index 688dbab3ebfba..f372d79258590 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
@@ -9,7 +9,6 @@
 
 /**
  * Adminhtml customers wishlist grid item renderer for name/options cell
- * @since 2.0.0
  */
 class Item extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,13 +16,11 @@ class Item extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Catalog product configuration
      *
      * @var \Magento\Catalog\Helper\Product\Configuration|null
-     * @since 2.0.0
      */
     protected $_productConfig = null;
 
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
-     * @since 2.0.0
      */
     protected $_productConfigPool;
 
@@ -34,7 +31,6 @@ class Item extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $productConfigPool
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param Product $product
      * @return \Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface
-     * @since 2.0.0
      */
     protected function _getProductHelper($product)
     {
@@ -86,7 +81,6 @@ protected function _getProductHelper($product)
      * Returns product associated with this block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -97,7 +91,6 @@ public function getProduct()
      * Returns list of options and their values for product configuration
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getOptionList()
     {
@@ -112,7 +105,6 @@ protected function getOptionList()
      *
      * @param \Magento\Wishlist\Model\Item\Option $option
      * @return array
-     * @since 2.0.0
      */
     protected function getFormattedOptionValue($option)
     {
@@ -125,7 +117,6 @@ protected function getFormattedOptionValue($option)
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface|\Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $item)
     {
@@ -141,7 +132,6 @@ public function render(\Magento\Framework\DataObject $item)
      * @param Product $product
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     protected function _renderItemOptions(Product $product, array $options)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 0218ed844d331..0e75b16ba1278 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -15,7 +15,6 @@
  * Adminhtml customer view personal information sales block.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PersonalInfo extends \Magento\Backend\Block\Template
 {
@@ -30,7 +29,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Customer
      *
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $customer;
 
@@ -38,7 +36,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Customer log
      *
      * @var \Magento\Customer\Model\Log
-     * @since 2.0.0
      */
     protected $customerLog;
 
@@ -46,7 +43,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Customer logger
      *
      * @var \Magento\Customer\Model\Logger
-     * @since 2.0.0
      */
     protected $customerLogger;
 
@@ -62,7 +58,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Account management
      *
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
@@ -70,7 +65,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Customer group repository
      *
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
@@ -78,7 +72,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Customer data factory
      *
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
@@ -86,7 +79,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Address helper
      *
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $addressHelper;
 
@@ -94,7 +86,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Date time
      *
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -102,7 +93,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
@@ -110,7 +100,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Address mapper
      *
      * @var Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -118,7 +107,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * Data object helper
      *
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -135,7 +123,6 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * @param \Magento\Customer\Model\Logger $customerLogger
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -200,7 +187,6 @@ public function getCustomerRegistry()
      * Retrieve customer object
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -220,7 +206,6 @@ public function getCustomer()
      * Retrieve customer id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -231,7 +216,6 @@ public function getCustomerId()
      * Retrieves customer log model
      *
      * @return \Magento\Customer\Model\Log
-     * @since 2.0.0
      */
     protected function getCustomerLog()
     {
@@ -248,7 +232,6 @@ protected function getCustomerLog()
      * Returns customer's created date in the assigned store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCreateDate()
     {
@@ -270,7 +253,6 @@ public function getStoreCreateDate()
      * Retrieve store default timezone from configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCreateDateTimezone()
     {
@@ -285,7 +267,6 @@ public function getStoreCreateDateTimezone()
      * Get customer creation date
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateDate()
     {
@@ -300,7 +281,6 @@ public function getCreateDate()
      * Check if account is confirmed
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getIsConfirmedStatus()
     {
@@ -320,7 +300,6 @@ public function getIsConfirmedStatus()
      * Retrieve store
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getCreatedInStore()
     {
@@ -333,7 +312,6 @@ public function getCreatedInStore()
      * Retrieve billing address html
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getBillingAddressHtml()
     {
@@ -358,7 +336,6 @@ public function getBillingAddressHtml()
      * Retrieve group name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGroupName()
     {
@@ -377,7 +354,6 @@ public function getGroupName()
      *
      * @param int $groupId
      * @return \Magento\Customer\Api\Data\GroupInterface|null
-     * @since 2.0.0
      */
     private function getGroup($groupId)
     {
@@ -393,7 +369,6 @@ private function getGroup($groupId)
      * Returns timezone of the store to which customer assigned.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLastLoginDateTimezone()
     {
@@ -416,7 +391,6 @@ public function getStoreLastLoginDateTimezone()
      * In all other cases customer considered 'Online'.
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getCurrentStatus()
     {
@@ -450,7 +424,6 @@ public function getCurrentStatus()
      * Get customer last login date.
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getLastLoginDate()
     {
@@ -467,7 +440,6 @@ public function getLastLoginDate()
      * Returns customer last login date in store's timezone.
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getStoreLastLoginDate()
     {
@@ -485,7 +457,6 @@ public function getStoreLastLoginDate()
      * Returns interval that shows how long customer will be considered 'Online'.
      *
      * @return int Interval in minutes
-     * @since 2.0.0
      */
     protected function getOnlineMinutesInterval()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 4c441f85c7ed0..76c33f143e671 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -11,7 +11,6 @@
 
 /**
  * Adminhtml customer view sales block
- * @since 2.0.0
  */
 class Sales extends \Magento\Backend\Block\Template
 {
@@ -19,19 +18,16 @@ class Sales extends \Magento\Backend\Block\Template
      * Sales entity collection
      *
      * @var \Magento\Sales\Model\ResourceModel\Sale\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_groupedCollection;
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $_websiteCounts;
 
@@ -39,7 +35,6 @@ class Sales extends \Magento\Backend\Block\Template
      * Currency model
      *
      * @var Currency
-     * @since 2.0.0
      */
     protected $_currency;
 
@@ -47,19 +42,16 @@ class Sales extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Sale\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -71,7 +63,6 @@ class Sales extends \Magento\Backend\Block\Template
      * @param \Magento\Sales\Model\ResourceModel\Sale\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -90,7 +81,6 @@ public function __construct(
      * Initialize the sales grid.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -102,7 +92,6 @@ protected function _construct()
      * Execute before toHtml() code.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeToHtml()
     {
@@ -155,7 +144,6 @@ public function _beforeToHtml()
      *
      * @param int $websiteId
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteCount($websiteId)
     {
@@ -164,7 +152,6 @@ public function getWebsiteCount($websiteId)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRows()
     {
@@ -173,7 +160,6 @@ public function getRows()
 
     /**
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -186,7 +172,6 @@ public function getTotals()
      * @param float $price
      * @param null|int $websiteId
      * @return string
-     * @since 2.0.0
      */
     public function formatCurrency($price, $websiteId = null)
     {
@@ -197,7 +182,6 @@ public function formatCurrency($price, $websiteId = null)
      * Is single store mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Wishlist.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Wishlist.php
index 8e36f5c7d5244..cb3b88bc0c654 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Wishlist.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Wishlist.php
@@ -11,7 +11,6 @@
  * Adminhtml customer view wishlist block
  *
  * @api
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -19,7 +18,6 @@ class Wishlist extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry.
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Wishlist extends \Magento\Backend\Block\Widget\Grid\Extended
      * Wishlist item collection factory.
      *
      * @var \Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -39,7 +36,6 @@ class Wishlist extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Initial settings.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +68,6 @@ protected function _construct()
      * Prepare collection.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -92,7 +86,6 @@ protected function _prepareCollection()
      * Prepare columns.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -141,7 +134,6 @@ protected function _prepareColumns()
      * @return bool
      *
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getHeadersVisibility()
     {
@@ -150,7 +142,6 @@ public function getHeadersVisibility()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
index 7a7203f6b9280..d0b47886dca7e 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
@@ -7,7 +7,6 @@
 
 /**
  * Adminhtml customers wishlist grid item renderer for item visibility
- * @since 2.0.0
  */
 class Description extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -16,7 +15,6 @@ class Description extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php
index 5479e969ad06b..cc7ed670aebc3 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php
@@ -14,14 +14,12 @@
 /**
  * Class \Magento\Customer\Block\Adminhtml\Form\Element\Boolean
  *
- * @since 2.0.0
  */
 class Boolean extends \Magento\Framework\Data\Form\Element\Select
 {
     /**
      * Prepare default SELECT values
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
index 1e0278736eed3..7e254b3227752 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
@@ -9,13 +9,11 @@
  * Customer Widget Form File Element Block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class File extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -23,13 +21,11 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -41,7 +37,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -63,7 +58,6 @@ public function __construct(
      * Return Form Element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -89,7 +83,6 @@ public function getElementHtml()
      * Return Delete File CheckBox HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckboxHtml()
     {
@@ -121,7 +114,6 @@ protected function _getDeleteCheckboxHtml()
      * Return Delete CheckBox SPAN Class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckboxSpanClass()
     {
@@ -132,7 +124,6 @@ protected function _getDeleteCheckboxSpanClass()
      * Return Delete CheckBox Label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getDeleteCheckboxLabel()
     {
@@ -143,7 +134,6 @@ protected function _getDeleteCheckboxLabel()
      * Return File preview link HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getPreviewHtml()
     {
@@ -168,7 +158,6 @@ protected function _getPreviewHtml()
      * Return Hidden element with current value
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getHiddenInput()
     {
@@ -187,7 +176,6 @@ protected function _getHiddenInput()
      * Return Preview/Download URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getPreviewUrl()
     {
@@ -204,7 +192,6 @@ protected function _getPreviewUrl()
      * @param array $attributes
      * @param bool $closed
      * @return string
-     * @since 2.0.0
      */
     protected function _drawElementHtml($element, array $attributes, $closed = true)
     {
@@ -221,7 +208,6 @@ protected function _drawElementHtml($element, array $attributes, $closed = true)
      *
      * @param int|null $index
      * @return string|false
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
index 01757f89b4347..cb2ab303c0d52 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Block\Adminhtml\Form\Element\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Customer\Block\Adminhtml\Form\Element\File
 {
@@ -22,7 +21,6 @@ class Image extends \Magento\Customer\Block\Adminhtml\Form\Element\File
      * Return Delete CheckBox Label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getDeleteCheckboxLabel()
     {
@@ -33,7 +31,6 @@ protected function _getDeleteCheckboxLabel()
      * Return Delete CheckBox SPAN Class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckboxSpanClass()
     {
@@ -44,7 +41,6 @@ protected function _getDeleteCheckboxSpanClass()
      * Return File preview link HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getPreviewHtml()
     {
@@ -76,7 +72,6 @@ protected function _getPreviewHtml()
      * Return Image URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getPreviewUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php
index 0da0a3bc12e39..64fe7c8b6188a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php
@@ -9,13 +9,11 @@
  * Country customer grid column filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -24,7 +22,6 @@ class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
index 17680b097f719..bd6e8b69a29ea 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
@@ -9,7 +9,6 @@
  * Adminhtml customers wishlist grid item action renderer for few action controls in one cell
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -18,7 +17,6 @@ class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Act
      *
      * @param  \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -50,7 +48,6 @@ public function render(\Magento\Framework\DataObject $row)
      * @param  array $action
      * @param  \Magento\Framework\DataObject $row
      * @return string|false
-     * @since 2.0.0
      */
     protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group.php b/app/code/Magento/Customer/Block/Adminhtml/Group.php
index 43788918f461c..2b7eefb67d30f 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Group extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -21,7 +20,6 @@ class Group extends \Magento\Backend\Block\Widget\Grid\Container
      * Modify header & button labels
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * Redefine header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
index e4e68cb9adfc5..be2d143e7f864 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
@@ -11,7 +11,6 @@
 
 /**
  * Customer group edit block
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -19,19 +18,16 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -43,7 +39,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param GroupRepositoryInterface $groupRepository
      * @param GroupManagementInterface $groupManagement
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Update Save and Delete buttons. Remove Delete button if group can't be deleted.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -85,7 +79,6 @@ protected function _construct()
      * Retrieve the header text, either editing an existing group or creating a new one.
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -102,7 +95,6 @@ public function getHeaderText()
      * Retrieve CSS classes added to the header.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
index 020bd27d7cce0..1a57ab7c7b6a5 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
@@ -9,31 +9,26 @@
 
 /**
  * Adminhtml customer groups edit form
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Tax\Model\TaxClass\Source\Customer
-     * @since 2.0.0
      */
     protected $_taxCustomer;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $_groupRepository;
 
     /**
      * @var \Magento\Customer\Api\Data\GroupInterfaceFactory
-     * @since 2.0.0
      */
     protected $groupDataFactory;
 
@@ -46,7 +41,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
      * @param \Magento\Customer\Api\Data\GroupInterfaceFactory $groupDataFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Prepare form for render
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index fc55fde058c24..4a0d0f66425bb 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -11,7 +11,6 @@
  * VAT ID element renderer
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
 {
@@ -19,19 +18,16 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
      * Validate button block
      *
      * @var null|\Magento\Backend\Block\Widget\Button
-     * @since 2.0.0
      */
     protected $_validateButton = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'sales/order/create/address/form/renderer/vat.phtml';
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -39,7 +35,6 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Retrieve validate button block
      *
      * @return \Magento\Backend\Block\Widget\Button
-     * @since 2.0.0
      */
     public function getValidateButton()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
index 8c6e0b87eab1d..20532d297e8ff 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Block\Adminhtml\System\Config\Validatevat
  *
- * @since 2.0.0
  */
 class Validatevat extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -22,7 +21,6 @@ class Validatevat extends \Magento\Config\Block\System\Config\Form\Field
      * Merchant Country Field Name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_merchantCountry = 'general_store_information_country_id';
 
@@ -30,7 +28,6 @@ class Validatevat extends \Magento\Config\Block\System\Config\Form\Field
      * Merchant VAT Number Field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_merchantVatNumber = 'general_store_information_merchant_vat_number';
 
@@ -38,7 +35,6 @@ class Validatevat extends \Magento\Config\Block\System\Config\Form\Field
      * Validate VAT Button Label
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_vatButtonLabel = 'Validate VAT Number';
 
@@ -47,7 +43,6 @@ class Validatevat extends \Magento\Config\Block\System\Config\Form\Field
      *
      * @param string $countryField
      * @return \Magento\Customer\Block\Adminhtml\System\Config\Validatevat
-     * @since 2.0.0
      */
     public function setMerchantCountryField($countryField)
     {
@@ -59,7 +54,6 @@ public function setMerchantCountryField($countryField)
      * Get Merchant Country Field Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantCountryField()
     {
@@ -71,7 +65,6 @@ public function getMerchantCountryField()
      *
      * @param string $vatNumberField
      * @return \Magento\Customer\Block\Adminhtml\System\Config\Validatevat
-     * @since 2.0.0
      */
     public function setMerchantVatNumberField($vatNumberField)
     {
@@ -83,7 +76,6 @@ public function setMerchantVatNumberField($vatNumberField)
      * Get Merchant VAT Number Field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantVatNumberField()
     {
@@ -95,7 +87,6 @@ public function getMerchantVatNumberField()
      *
      * @param string $vatButtonLabel
      * @return \Magento\Customer\Block\Adminhtml\System\Config\Validatevat
-     * @since 2.0.0
      */
     public function setVatButtonLabel($vatButtonLabel)
     {
@@ -107,7 +98,6 @@ public function setVatButtonLabel($vatButtonLabel)
      * Set template to itself
      *
      * @return \Magento\Customer\Block\Adminhtml\System\Config\Validatevat
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -123,7 +113,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -136,7 +125,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 9a396996f121d..bc93e9776715f 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CustomerData extends \Magento\Framework\View\Element\Template
 {
@@ -21,7 +20,6 @@ class CustomerData extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      * @param array $expirableSectionNames
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -35,7 +33,6 @@ public function __construct(
     /**
      * Get CookieLifeTime
      * @return null|string scopeCode
-     * @since 2.0.0
      */
     public function getCookieLifeTime()
     {
@@ -50,7 +47,6 @@ public function getCookieLifeTime()
      *
      * @param string $route
      * @return string Customer data url.
-     * @since 2.0.0
      */
     public function getCustomerDataUrl($route)
     {
diff --git a/app/code/Magento/Customer/Block/Form/Edit.php b/app/code/Magento/Customer/Block/Form/Edit.php
index fc1a6496b75be..8182f31431279 100644
--- a/app/code/Magento/Customer/Block/Form/Edit.php
+++ b/app/code/Magento/Customer/Block/Form/Edit.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Edit extends \Magento\Customer\Block\Account\Dashboard
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Customer\Block\Account\Dashboard
      * Retrieve form data
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getFormData()
     {
@@ -44,7 +42,6 @@ protected function getFormData()
      * @param \Magento\Customer\Model\Metadata\Form $form
      * @param null $scope
      * @return \Magento\Customer\Block\Form\Register
-     * @since 2.0.0
      */
     public function restoreSessionData(\Magento\Customer\Model\Metadata\Form $form, $scope = null)
     {
@@ -64,7 +61,6 @@ public function restoreSessionData(\Magento\Customer\Model\Metadata\Form $form,
      * @return bool
      *
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getChangePassword()
     {
diff --git a/app/code/Magento/Customer/Block/Form/Login.php b/app/code/Magento/Customer/Block/Form/Login.php
index a20d93820d586..8cf7bd6114870 100644
--- a/app/code/Magento/Customer/Block/Form/Login.php
+++ b/app/code/Magento/Customer/Block/Form/Login.php
@@ -10,25 +10,21 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Login extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_username = -1;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -37,7 +33,6 @@ class Login extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -65,7 +59,6 @@ protected function _prepareLayout()
      * Retrieve form posting url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -76,7 +69,6 @@ public function getPostActionUrl()
      * Retrieve password forgotten url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getForgotPasswordUrl()
     {
@@ -87,7 +79,6 @@ public function getForgotPasswordUrl()
      * Retrieve username for form field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUsername()
     {
@@ -101,7 +92,6 @@ public function getUsername()
      * Check if autocomplete is disabled on storefront
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAutocompleteDisabled()
     {
diff --git a/app/code/Magento/Customer/Block/Form/Login/Info.php b/app/code/Magento/Customer/Block/Form/Login/Info.php
index 4f904988dc0e2..5fae2879383ba 100644
--- a/app/code/Magento/Customer/Block/Form/Login/Info.php
+++ b/app/code/Magento/Customer/Block/Form/Login/Info.php
@@ -9,13 +9,11 @@
  * Customer login info block
  *
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -23,7 +21,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * Checkout data
      *
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $checkoutData;
 
@@ -31,7 +28,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * Core url
      *
      * @var \Magento\Framework\Url\Helper\Data
-     * @since 2.0.0
      */
     protected $coreUrl;
 
@@ -39,7 +35,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * Registration
      *
      * @var \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     protected $registration;
 
@@ -50,7 +45,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * @param \Magento\Checkout\Helper\Data $checkoutData
      * @param \Magento\Framework\Url\Helper\Data $coreUrl
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Return registration
      *
      * @return \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     public function getRegistration()
     {
@@ -82,7 +75,6 @@ public function getRegistration()
      * Retrieve create new account url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateAccountUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index b6c7a30d60b2b..bb68fe2e12bd3 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -12,25 +12,21 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Register extends \Magento\Directory\Block\Data
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -49,7 +45,6 @@ class Register extends \Magento\Directory\Block\Data
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -83,7 +78,6 @@ public function __construct(
      *
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -92,7 +86,6 @@ public function getConfig($path)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -104,7 +97,6 @@ protected function _prepareLayout()
      * Retrieve form posting url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -115,7 +107,6 @@ public function getPostActionUrl()
      * Retrieve back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -130,7 +121,6 @@ public function getBackUrl()
      * Retrieve form data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getFormData()
     {
@@ -154,7 +144,6 @@ public function getFormData()
      * Retrieve customer country identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -169,7 +158,6 @@ public function getCountryId()
      * Retrieve customer region identifier
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -185,7 +173,6 @@ public function getRegion()
      * Newsletter module availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNewsletterEnabled()
     {
@@ -199,7 +186,6 @@ public function isNewsletterEnabled()
      * @param \Magento\Customer\Model\Metadata\Form $form
      * @param string|null $scope
      * @return $this
-     * @since 2.0.0
      */
     public function restoreSessionData(\Magento\Customer\Model\Metadata\Form $form, $scope = null)
     {
diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php
index a1587ee325b09..3ac3258dfe0de 100644
--- a/app/code/Magento/Customer/Block/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Newsletter.php
@@ -13,20 +13,17 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Newsletter extends \Magento\Customer\Block\Account\Dashboard
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'form/newsletter.phtml';
 
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSubscribed()
     {
@@ -37,7 +34,6 @@ public function getIsSubscribed()
      * Return the save action Url.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAction()
     {
diff --git a/app/code/Magento/Customer/Block/SectionConfig.php b/app/code/Magento/Customer/Block/SectionConfig.php
index 0c80e92824295..ba259a7dbcc3b 100644
--- a/app/code/Magento/Customer/Block/SectionConfig.php
+++ b/app/code/Magento/Customer/Block/SectionConfig.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SectionConfig extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Config\DataInterface
-     * @since 2.0.0
      */
     protected $sectionConfig;
 
@@ -22,7 +20,6 @@ class SectionConfig extends \Magento\Framework\View\Element\Template
      * Sections that do not have server side providers
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $clientSideSections;
 
@@ -31,7 +28,6 @@ class SectionConfig extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Config\DataInterface $sectionConfig
      * @param array $data
      * @param string[] $clientSideSections
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Get list of sections for invalidation
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSections()
     {
@@ -58,7 +53,6 @@ public function getSections()
     /**
      * Get list of client side sections
      * @return string[]
-     * @since 2.0.0
      */
     public function getClientSideSections()
     {
diff --git a/app/code/Magento/Customer/Block/Widget/AbstractWidget.php b/app/code/Magento/Customer/Block/Widget/AbstractWidget.php
index 96d699d5ebe04..c16e1c7721e09 100644
--- a/app/code/Magento/Customer/Block/Widget/AbstractWidget.php
+++ b/app/code/Magento/Customer/Block/Widget/AbstractWidget.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Customer\Block\Widget\AbstractWidget
  *
- * @since 2.0.0
  */
 class AbstractWidget extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $customerMetadata;
 
     /**
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $_addressHelper;
 
@@ -32,7 +29,6 @@ class AbstractWidget extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Helper\Address $addressHelper
      * @param CustomerMetadataInterface $customerMetadata
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
     /**
      * @param string $key
      * @return null|string
-     * @since 2.0.0
      */
     public function getConfig($key)
     {
@@ -58,7 +53,6 @@ public function getConfig($key)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldIdFormat()
     {
@@ -70,7 +64,6 @@ public function getFieldIdFormat()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldNameFormat()
     {
@@ -83,7 +76,6 @@ public function getFieldNameFormat()
     /**
      * @param string $field
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId($field)
     {
@@ -93,7 +85,6 @@ public function getFieldId($field)
     /**
      * @param string $field
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName($field)
     {
@@ -105,7 +96,6 @@ public function getFieldName($field)
      *
      * @param string $attributeCode
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface|null
-     * @since 2.0.0
      */
     protected function _getAttribute($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 33a70e266288e..b9d860b5ae3d5 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -12,7 +12,6 @@
  * Class Dob
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Dob extends AbstractWidget
 {
@@ -27,13 +26,11 @@ class Dob extends AbstractWidget
      * Date inputs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dateInputs = [];
 
     /**
      * @var \Magento\Framework\View\Element\Html\Date
-     * @since 2.0.0
      */
     protected $dateElement;
 
@@ -50,7 +47,6 @@ class Dob extends AbstractWidget
      * @param \Magento\Framework\View\Element\Html\Date $dateElement
      * @param \Magento\Framework\Data\Form\FilterFactory $filterFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -77,7 +72,6 @@ public function _construct()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -87,7 +81,6 @@ public function isEnabled()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired()
     {
@@ -98,7 +91,6 @@ public function isRequired()
     /**
      * @param string $date
      * @return $this
-     * @since 2.0.0
      */
     public function setDate($date)
     {
@@ -146,7 +138,6 @@ protected function applyOutputFilter($value)
 
     /**
      * @return string|bool
-     * @since 2.0.0
      */
     public function getDay()
     {
@@ -155,7 +146,6 @@ public function getDay()
 
     /**
      * @return string|bool
-     * @since 2.0.0
      */
     public function getMonth()
     {
@@ -164,7 +154,6 @@ public function getMonth()
 
     /**
      * @return string|bool
-     * @since 2.0.0
      */
     public function getYear()
     {
@@ -175,7 +164,6 @@ public function getYear()
      * Return label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -186,7 +174,6 @@ public function getLabel()
      * Create correct date field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldHtml()
     {
@@ -211,7 +198,6 @@ public function getFieldHtml()
      * Return id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -243,7 +229,6 @@ public function getHtmlExtraParams()
      * Returns format which will be applied for DOB in javascript
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDateFormat()
     {
@@ -256,7 +241,6 @@ public function getDateFormat()
      * @param string $code
      * @param string $html
      * @return void
-     * @since 2.0.0
      */
     public function setDateInput($code, $html)
     {
@@ -269,7 +253,6 @@ public function setDateInput($code, $html)
      * @param bool $stripNonInputChars
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSortedDateInputs($stripNonInputChars = true)
     {
@@ -291,7 +274,6 @@ public function getSortedDateInputs($stripNonInputChars = true)
      * Return minimal date range value
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMinDateRange()
     {
@@ -313,7 +295,6 @@ public function getMinDateRange()
      * Return maximal date range value
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMaxDateRange()
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Gender.php b/app/code/Magento/Customer/Block/Widget/Gender.php
index ae597e48005ba..1d3730e6c6d58 100644
--- a/app/code/Magento/Customer/Block/Widget/Gender.php
+++ b/app/code/Magento/Customer/Block/Widget/Gender.php
@@ -14,19 +14,16 @@
  * Block to render customer's gender attribute
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Gender extends AbstractWidget
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -39,7 +36,6 @@ class Gender extends AbstractWidget
      * @param CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Model\Session $customerSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Initialize block
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -70,7 +65,6 @@ public function _construct()
     /**
      * Check if gender attribute enabled in system
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -80,7 +74,6 @@ public function isEnabled()
     /**
      * Check if gender attribute marked as required
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired()
     {
@@ -91,7 +84,6 @@ public function isRequired()
      * Get current customer from session
      *
      * @return CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -101,7 +93,6 @@ public function getCustomer()
     /**
      * Returns options from gender attribute
      * @return OptionInterface[]
-     * @since 2.0.0
      */
     public function getGenderOptions()
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
index a095f30858f2d..ecd09319cd85e 100644
--- a/app/code/Magento/Customer/Block/Widget/Name.php
+++ b/app/code/Magento/Customer/Block/Widget/Name.php
@@ -19,19 +19,16 @@
  * @method Name setObject(CustomerInterface $customer)
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Name extends AbstractWidget
 {
     /**
      * @var AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $addressMetadata;
 
     /**
      * @var Options
-     * @since 2.0.0
      */
     protected $options;
 
@@ -42,7 +39,6 @@ class Name extends AbstractWidget
      * @param Options $options
      * @param AddressMetadataInterface $addressMetadata
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +56,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -75,7 +70,6 @@ public function _construct()
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     protected function _showConfig($key)
     {
@@ -86,7 +80,6 @@ protected function _showConfig($key)
      * Can show prefix
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showPrefix()
     {
@@ -97,7 +90,6 @@ public function showPrefix()
      * Define if prefix attribute is required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPrefixRequired()
     {
@@ -108,7 +100,6 @@ public function isPrefixRequired()
      * Retrieve name prefix drop-down options
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getPrefixOptions()
     {
@@ -125,7 +116,6 @@ public function getPrefixOptions()
      * Define if middle name attribute can be shown
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showMiddlename()
     {
@@ -136,7 +126,6 @@ public function showMiddlename()
      * Define if middlename attribute is required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMiddlenameRequired()
     {
@@ -147,7 +136,6 @@ public function isMiddlenameRequired()
      * Define if suffix attribute can be shown
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showSuffix()
     {
@@ -158,7 +146,6 @@ public function showSuffix()
      * Define if suffix attribute is required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSuffixRequired()
     {
@@ -169,7 +156,6 @@ public function isSuffixRequired()
      * Retrieve name suffix drop-down options
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getSuffixOptions()
     {
@@ -185,7 +171,6 @@ public function getSuffixOptions()
      * Class name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClassName()
     {
@@ -199,7 +184,6 @@ public function getClassName()
      * Container class name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContainerClassName()
     {
@@ -212,7 +196,6 @@ public function getContainerClassName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getAttribute($attributeCode)
     {
@@ -241,7 +224,6 @@ protected function _getAttribute($attributeCode)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel($attributeCode)
     {
@@ -254,7 +236,6 @@ public function getStoreLabel($attributeCode)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeValidationClass($attributeCode)
     {
@@ -264,7 +245,6 @@ public function getAttributeValidationClass($attributeCode)
     /**
      * @param string $attributeCode
      * @return bool
-     * @since 2.0.0
      */
     private function _isAttributeRequired($attributeCode)
     {
@@ -275,7 +255,6 @@ private function _isAttributeRequired($attributeCode)
     /**
      * @param string $attributeCode
      * @return bool
-     * @since 2.0.0
      */
     private function _isAttributeVisible($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Taxvat.php b/app/code/Magento/Customer/Block/Widget/Taxvat.php
index 31396119d8ae7..e695681ad4a6c 100644
--- a/app/code/Magento/Customer/Block/Widget/Taxvat.php
+++ b/app/code/Magento/Customer/Block/Widget/Taxvat.php
@@ -12,7 +12,6 @@
  * Customer Value Added Tax Widget
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Taxvat extends AbstractWidget
 {
@@ -23,7 +22,6 @@ class Taxvat extends AbstractWidget
      * @param \Magento\Customer\Helper\Address $addressHelper
      * @param CustomerMetadataInterface $customerMetadata
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -39,7 +37,6 @@ public function __construct(
      * Sets the template
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -51,7 +48,6 @@ public function _construct()
      * Get is enabled.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -62,7 +58,6 @@ public function isEnabled()
      * Get is required.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired()
     {
diff --git a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
index 640866986b9d2..0714571564717 100644
--- a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
+++ b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
@@ -16,32 +16,27 @@
 /**
  * Class \Magento\Customer\Console\Command\UpgradeHashAlgorithmCommand
  *
- * @since 2.0.0
  */
 class UpgradeHashAlgorithmCommand extends Command
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $customerCollectionFactory;
 
     /**
      * @var Collection
-     * @since 2.0.0
      */
     private $collection;
 
     /**
      * @var Encryptor
-     * @since 2.0.0
      */
     private $encryptor;
 
     /**
      * @param CollectionFactory $customerCollectionFactory
      * @param Encryptor $encryptor
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $customerCollectionFactory,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -64,7 +58,6 @@ protected function configure()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Customer/Controller/AbstractAccount.php b/app/code/Magento/Customer/Controller/AbstractAccount.php
index 626421d181ff2..21611329ed9bc 100644
--- a/app/code/Magento/Customer/Controller/AbstractAccount.php
+++ b/app/code/Magento/Customer/Controller/AbstractAccount.php
@@ -12,7 +12,6 @@
  * Class AbstractAccount
  * @package Magento\Customer\Controller
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractAccount extends Action implements AccountInterface
 {
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 5690d18eb2a2d..998d0315854ef 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -23,49 +23,41 @@
  * Class Confirm
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Confirm extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $addressHelper;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlModel;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -90,7 +82,6 @@ class Confirm extends \Magento\Customer\Controller\AbstractAccount
      * @param CustomerRepositoryInterface $customerRepository
      * @param Address $addressHelper
      * @param UrlFactory $urlFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -150,7 +141,6 @@ private function getCookieMetadataFactory()
      * Confirm customer account by id and confirmation key
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -194,7 +184,6 @@ public function execute()
      * Retrieve success message
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSuccessMessage()
     {
@@ -224,7 +213,6 @@ protected function getSuccessMessage()
      * Retrieve success redirect URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSuccessRedirect()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index 839d923762e85..df0e6452c5a3e 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -16,31 +16,26 @@
 /**
  * Class \Magento\Customer\Controller\Account\Confirmation
  *
- * @since 2.0.0
  */
 class Confirmation extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -50,7 +45,6 @@ class Confirmation extends \Magento\Customer\Controller\AbstractAccount
      * @param PageFactory $resultPageFactory
      * @param StoreManagerInterface $storeManager
      * @param AccountManagementInterface $customerAccountManagement
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      * Send confirmation link to specified email
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php
index 7d0184bfef38e..59bb8b7253743 100644
--- a/app/code/Magento/Customer/Controller/Account/Create.php
+++ b/app/code/Magento/Customer/Controller/Account/Create.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Customer\Controller\Account\Create
  *
- * @since 2.0.0
  */
 class Create extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     protected $registration;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -41,7 +37,6 @@ class Create extends \Magento\Customer\Controller\AbstractAccount
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
      * @param Registration $registration
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      * Customer register form page
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
index 1766c3f59b218..1e6216a7db9d9 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Customer\Controller\Account\CreatePassword
  *
- * @since 2.0.0
  */
 class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -41,7 +37,6 @@ class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
      * @param AccountManagementInterface $accountManagement
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      * Resetting password handler
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 5035fd6c9bcf6..72152f856c112 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -30,97 +30,81 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CreatePost extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $addressHelper;
 
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $formFactory;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $subscriberFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\RegionInterfaceFactory
-     * @since 2.0.0
      */
     protected $regionDataFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var \Magento\Customer\Model\Registration
-     * @since 2.0.0
      */
     protected $registration;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $customerUrl;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var \Magento\Customer\Model\CustomerExtractor
-     * @since 2.0.0
      */
     protected $customerExtractor;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlModel;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var AccountRedirect
-     * @since 2.0.0
      */
     private $accountRedirect;
 
@@ -157,7 +141,6 @@ class CreatePost extends \Magento\Customer\Controller\AbstractAccount
      * @param AccountRedirect $accountRedirect
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -237,7 +220,6 @@ private function getCookieMetadataFactory()
      * Add address to customer during create account
      *
      * @return AddressInterface|null
-     * @since 2.0.0
      */
     protected function extractAddress()
     {
@@ -290,7 +272,6 @@ protected function extractAddress()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -398,7 +379,6 @@ public function execute()
      * @param string $confirmation
      * @return void
      * @throws InputException
-     * @since 2.0.0
      */
     protected function checkPasswordConfirmation($password, $confirmation)
     {
@@ -411,7 +391,6 @@ protected function checkPasswordConfirmation($password, $confirmation)
      * Retrieve success message
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSuccessMessage()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php
index b2ad138cf283e..30a899001eaf8 100644
--- a/app/code/Magento/Customer/Controller/Account/Edit.php
+++ b/app/code/Magento/Customer/Controller/Account/Edit.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Customer\Controller\Account\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -49,7 +44,6 @@ class Edit extends \Magento\Customer\Controller\AbstractAccount
      * @param PageFactory $resultPageFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Forgot customer account information page
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index d20fe4cd45897..61e46be66413e 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -24,7 +24,6 @@
 /**
  * Class EditPost
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class EditPost extends \Magento\Customer\Controller\AbstractAccount
 {
@@ -35,31 +34,26 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
     /**
      * @var CustomerExtractor
-     * @since 2.0.0
      */
     protected $customerExtractor;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -77,7 +71,7 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
 
     /**
      * @var Mapper
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerMapper;
 
@@ -88,7 +82,6 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
      * @param CustomerRepositoryInterface $customerRepository
      * @param Validator $formKeyValidator
      * @param CustomerExtractor $customerExtractor
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -146,7 +139,6 @@ private function getEmailNotification()
      * Change customer email or password action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -225,7 +217,7 @@ private function dispatchSuccessEvent(\Magento\Customer\Api\Data\CustomerInterfa
      * @param int $customerId
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private function getCustomerDataObject($customerId)
     {
@@ -238,7 +230,7 @@ private function getCustomerDataObject($customerId)
      * @param \Magento\Framework\App\RequestInterface $inputData
      * @param \Magento\Customer\Api\Data\CustomerInterface $currentCustomerData
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private function populateNewCustomerDataObject(
         \Magento\Framework\App\RequestInterface $inputData,
@@ -267,7 +259,6 @@ private function populateNewCustomerDataObject(
      * @param string $email
      * @return boolean
      * @throws InvalidEmailOrPasswordException|InputException
-     * @since 2.0.0
      */
     protected function changeCustomerPassword($email)
     {
@@ -315,8 +306,8 @@ private function processChangeEmailRequest(\Magento\Customer\Api\Data\CustomerIn
      *
      * @return Mapper
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getCustomerMapper()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
index 9b4c67ffb418b..d9c881faeaf45 100644
--- a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
+++ b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Customer\Controller\Account\ForgotPassword
  *
- * @since 2.0.0
  */
 class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -33,7 +30,6 @@ class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount
      * @param Context $context
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Forgot customer password page
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
index d098770b3a2de..fe92032b1b75e 100644
--- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
@@ -17,25 +17,21 @@
 /**
  * ForgotPasswordPost controller
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -44,7 +40,6 @@ class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount
      * @param Session $customerSession
      * @param AccountManagementInterface $customerAccountManagement
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Forgot customer password action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -106,7 +100,6 @@ public function execute()
      *
      * @param string $email
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function getSuccessMessage($email)
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
index 06903a7a782c7..af439977f5414 100644
--- a/app/code/Magento/Customer/Controller/Account/Index.php
+++ b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Customer\Controller\Account\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Default customer account page
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php
index a20246257c271..feb8807399d66 100644
--- a/app/code/Magento/Customer/Controller/Account/Login.php
+++ b/app/code/Magento/Customer/Controller/Account/Login.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Customer\Controller\Account\Login
  *
- * @since 2.0.0
  */
 class Login extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -33,7 +30,6 @@ class Login extends \Magento\Customer\Controller\AbstractAccount
      * @param Context $context
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Customer login form page
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index 4facdcb38a435..ccce84dfc8c4b 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -19,37 +19,32 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class LoginPost extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
     /**
      * @var AccountRedirect
-     * @since 2.0.0
      */
     protected $accountRedirect;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $scopeConfig;
 
@@ -72,7 +67,6 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount
      * @param CustomerUrl $customerHelperData
      * @param Validator $formKeyValidator
      * @param AccountRedirect $accountRedirect
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -94,8 +88,8 @@ public function __construct(
      * Get scope config
      *
      * @return ScopeConfigInterface
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.11
+     * @since 2.0.11
      */
     private function getScopeConfig()
     {
@@ -147,7 +141,6 @@ private function getCookieMetadataFactory()
      *
      * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php
index 988283a009cb1..c32401c6f703b 100644
--- a/app/code/Magento/Customer/Controller/Account/Logout.php
+++ b/app/code/Magento/Customer/Controller/Account/Logout.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\Customer\Controller\Account\Logout
  *
- * @since 2.0.0
  */
 class Logout extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -40,7 +38,6 @@ class Logout extends \Magento\Customer\Controller\AbstractAccount
     /**
      * @param Context $context
      * @param Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -84,7 +81,6 @@ private function getCookieMetadataFactory()
      * Customer logout action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
index 34c73d672c30d..adc82aa8f7220 100644
--- a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
+++ b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Customer\Controller\Account\LogoutSuccess
  *
- * @since 2.0.0
  */
 class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Logout success page
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index 2622b6ce7ffb2..f4329663c8c2a 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -17,25 +17,21 @@
 /**
  * Class \Magento\Customer\Controller\Account\ResetPasswordPost
  *
- * @since 2.0.0
  */
 class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -51,7 +47,6 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
      * @param AccountManagementInterface $accountManagement
      * @param CustomerRepositoryInterface $customerRepository
      * @param CredentialsValidator|null $credentialsValidator
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -74,7 +69,6 @@ public function __construct(
      * Used to handle data received from reset forgotten password form
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/AccountInterface.php b/app/code/Magento/Customer/Controller/AccountInterface.php
index d25bfeaa4db6d..11b75976480c4 100644
--- a/app/code/Magento/Customer/Controller/AccountInterface.php
+++ b/app/code/Magento/Customer/Controller/AccountInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Customer\Controller\AccountInterface
  *
- * @since 2.0.0
  */
 interface AccountInterface extends ActionInterface
 {
diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php
index 20f326aa7b707..23e8f04d241db 100644
--- a/app/code/Magento/Customer/Controller/Address.php
+++ b/app/code/Magento/Customer/Controller/Address.php
@@ -11,67 +11,56 @@
  * Customer address controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Address extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $_addressRepository;
 
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\RegionInterfaceFactory
-     * @since 2.0.0
      */
     protected $regionDataFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $_dataProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -88,7 +77,6 @@ abstract class Address extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -120,7 +108,6 @@ public function __construct(
      * Retrieve customer session object
      *
      * @return \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -132,7 +119,6 @@ protected function _getSession()
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -146,7 +132,6 @@ public function dispatch(RequestInterface $request)
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     protected function _buildUrl($route = '', $params = [])
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index 2ae10db6de316..cd5ed795eb3be 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Customer\Controller\Address\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Customer\Controller\Address
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php
index e8ebbee3ef040..2de8a52403797 100644
--- a/app/code/Magento/Customer/Controller/Address/Edit.php
+++ b/app/code/Magento/Customer/Controller/Address/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Address\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Customer\Controller\Address
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Customer\Controller\Address
      * Customer address edit action
      *
      * @return \Magento\Framework\Controller\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php
index ab7b690159f76..6628acfa5098c 100644
--- a/app/code/Magento/Customer/Controller/Address/Form.php
+++ b/app/code/Magento/Customer/Controller/Address/Form.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Address\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Customer\Controller\Address
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Customer\Controller\Address
      * Address book form
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index 666221d7564cb..a571a3a304ce0 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -25,25 +25,22 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class FormPost extends \Magento\Customer\Controller\Address
 {
     /**
      * @var RegionFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
     /**
      * @var HelperData
-     * @since 2.0.0
      */
     protected $helperData;
 
     /**
      * @var Mapper
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerAddressMapper;
 
@@ -62,7 +59,6 @@ class FormPost extends \Magento\Customer\Controller\Address
      * @param RegionFactory $regionFactory
      * @param HelperData $helperData
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -100,7 +96,6 @@ public function __construct(
      * Extract address from request
      *
      * @return \Magento\Customer\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     protected function _extractAddress()
     {
@@ -135,7 +130,6 @@ protected function _extractAddress()
      *
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function getExistingAddressData()
     {
@@ -156,7 +150,6 @@ protected function getExistingAddressData()
      * @param array $attributeValues
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function updateRegionData(&$attributeValues)
     {
@@ -187,7 +180,6 @@ protected function updateRegionData(&$attributeValues)
      * Process address form save
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -233,8 +225,8 @@ public function execute()
      *
      * @return Mapper
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getCustomerAddressMapper()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index 89e09a575dc54..ad04c7bd5c71b 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -10,13 +10,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Index extends \Magento\Customer\Controller\Address
 {
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -34,7 +32,6 @@ class Index extends \Magento\Customer\Controller\Address
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -70,7 +67,6 @@ public function __construct(
      * Customer addresses list
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php
index 05b63ced8e551..a2e2058d09460 100644
--- a/app/code/Magento/Customer/Controller/Address/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Address/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Customer\Controller\Address\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Customer\Controller\Address
 {
     /**
      * @return \Magento\Framework\Controller\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index 1409a6871f9da..c0ea38de809db 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -12,7 +12,6 @@
  * Catalog composite product configuration controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Cart extends \Magento\Backend\App\Action
 {
@@ -27,7 +26,6 @@ abstract class Cart extends \Magento\Backend\App\Action
      * Customer we're working with
      *
      * @var int id of the customer
-     * @since 2.0.0
      */
     protected $_customerId;
 
@@ -35,7 +33,6 @@ abstract class Cart extends \Magento\Backend\App\Action
      * Quote we're working with
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote = null;
 
@@ -43,19 +40,16 @@ abstract class Cart extends \Magento\Backend\App\Action
      * Quote item we're working with
      *
      * @var \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     protected $_quoteItem = null;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -63,7 +57,6 @@ abstract class Cart extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -80,7 +73,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initData()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php
index 4c8c689557f7d..b6acc3ad8523b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Cart\Product\Composite\Cart\Configure
  *
- * @since 2.0.0
  */
 class Configure extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Composite\Cart
 {
@@ -17,7 +16,6 @@ class Configure extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Comp
      * Ajax handler to response configuration fieldset of composite product in customer's cart
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php
index 8975cc4764182..1e93294cd9bfd 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Cart\Product\Composite\Cart\Update
  *
- * @since 2.0.0
  */
 class Update extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Composite\Cart
 {
@@ -17,7 +16,6 @@ class Update extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Composi
      * IFrame handler for submitted configuration for quote item
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
index 76c8ce7ddb05e..7337d005a7323 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
@@ -24,13 +24,11 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
 {
     /**
      * @var CustomerTokenServiceInterface
-     * @since 2.0.0
      */
     protected $tokenService;
 
@@ -63,7 +61,6 @@ class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
      * @param CustomerTokenServiceInterface $tokenService
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -127,7 +124,6 @@ public function __construct(
      * Reset customer's tokens handler
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
index e8b6ac1a5f1c8..810cc6e3b6517 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
@@ -17,7 +17,7 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\File\Address\Upload
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Upload extends Action
 {
@@ -30,19 +30,19 @@ class Upload extends Action
 
     /**
      * @var FileUploaderFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileUploaderFactory;
 
     /**
      * @var AddressMetadataInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $addressMetadataService;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $logger;
 
@@ -51,7 +51,7 @@ class Upload extends Action
      * @param FileUploaderFactory $fileUploaderFactory
      * @param AddressMetadataInterface $addressMetadataService
      * @param LoggerInterface $logger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Context $context,
@@ -67,7 +67,7 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute()
     {
@@ -121,7 +121,7 @@ public function execute()
      * NOTE: This conversion is required to use \Magento\Framework\File\Uploader::_setUploadFileId($fileId) method.
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function convertFilesArray()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
index 1d830597d1ffc..438496fe43c08 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
@@ -17,7 +17,7 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\File\Customer\Upload
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Upload extends Action
 {
@@ -30,19 +30,19 @@ class Upload extends Action
 
     /**
      * @var FileUploaderFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileUploaderFactory;
 
     /**
      * @var CustomerMetadataInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerMetadataService;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $logger;
 
@@ -51,7 +51,7 @@ class Upload extends Action
      * @param FileUploaderFactory $fileUploaderFactory
      * @param CustomerMetadataInterface $customerMetadataService
      * @param LoggerInterface $logger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Context $context,
@@ -67,7 +67,7 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group.php b/app/code/Magento/Customer/Controller/Adminhtml/Group.php
index 079b70208ea76..136945195abb6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group.php
@@ -10,7 +10,6 @@
 
 /**
  * Customer groups controller
- * @since 2.0.0
  */
 abstract class Group extends \Magento\Backend\App\Action
 {
@@ -25,31 +24,26 @@ abstract class Group extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var GroupInterfaceFactory
-     * @since 2.0.0
      */
     protected $groupDataFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -62,7 +56,6 @@ abstract class Group extends \Magento\Backend\App\Action
      * @param GroupInterfaceFactory $groupDataFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
index f2e6711394c53..73fc4a60a4ffb 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Group\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -19,7 +18,6 @@ class Delete extends \Magento\Customer\Controller\Adminhtml\Group
      * Delete customer group.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
index 48c659e242306..3434cd830ee35 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Group\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Customer\Controller\Adminhtml\Group
      * Edit customer group action. Forward to new action.
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
index d1434d377f921..6b3bcb9fc997b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Group\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Customer\Controller\Adminhtml\Group
      * Customer groups list.
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
index 55827f27d0705..5cfbb73b325b7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Group\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -19,7 +18,6 @@ class NewAction extends \Magento\Customer\Controller\Adminhtml\Group
      * Initialize current group and set it in the registry.
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _initGroup()
     {
@@ -33,7 +31,6 @@ protected function _initGroup()
      * Edit or create customer group.
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
index b51f94636f18c..c0bee84760c90 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Group\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Customer\Controller\Adminhtml\Group
 {
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
@@ -32,7 +30,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Group
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      *
      * @param array $customerGroupData
      * @return void
-     * @since 2.0.0
      */
     protected function storeCustomerGroupDataToSession($customerGroupData)
     {
@@ -74,7 +70,6 @@ protected function storeCustomerGroupDataToSession($customerGroupData)
      * Create or save customer group.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index e35071ad4c129..e3d8c215e1001 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -23,7 +23,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -37,7 +36,6 @@ abstract class Index extends \Magento\Backend\App\Action
     /**
      * @var \Magento\Framework\Validator
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_validator;
 
@@ -45,151 +43,127 @@ abstract class Index extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_customerFactory = null;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_addressFactory = null;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $_customerRepository;
 
     /**
      * @var  \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_viewHelper;
 
     /**
      * @var \Magento\Framework\Math\Random
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_random;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $_objectFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_extensibleDataObjectConverter;
 
     /**
      * @var Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var \Magento\Customer\Model\Customer\Mapper
-     * @since 2.0.0
      */
     protected $customerMapper;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -222,7 +196,6 @@ abstract class Index extends \Magento\Backend\App\Action
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -282,7 +255,6 @@ public function __construct(
      * Customer initialization
      *
      * @return string customer id
-     * @since 2.0.0
      */
     protected function initCurrentCustomer()
     {
@@ -300,7 +272,6 @@ protected function initCurrentCustomer()
      *
      * @param \Magento\Backend\Model\View\Result\Page $resultPage
      * @return void
-     * @since 2.0.0
      */
     protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Result\Page $resultPage)
     {
@@ -314,7 +285,6 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _addSessionErrorMessages($messages)
     {
@@ -337,7 +307,6 @@ protected function _addSessionErrorMessages($messages)
      * @param int[] $customerIds Array of customer Ids to perform the action upon
      * @return int Number of customers successfully acted upon
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function actUponMultipleCustomers(callable $singleAction, $customerIds)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index 3d1bbab8038e8..ebab2a42a02ec 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -15,7 +15,6 @@
 
 /**
  * Class AbstractMassStatus
- * @since 2.0.0
  */
 abstract class AbstractMassAction extends \Magento\Backend\App\Action
 {
@@ -28,19 +27,16 @@ abstract class AbstractMassAction extends \Magento\Backend\App\Action
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $redirectUrl = '*/*/index';
 
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -48,7 +44,6 @@ abstract class AbstractMassAction extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -62,7 +57,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -82,7 +76,6 @@ public function execute()
      * TODO: Technical dept referer url should be implement as a part of Action configuration in in appropriate way
      *
      * @return null|string
-     * @since 2.0.0
      */
     protected function getComponentRefererUrl()
     {
@@ -94,7 +87,6 @@ protected function getComponentRefererUrl()
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     abstract protected function massAction(AbstractCollection $collection);
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index 4a415406c3021..632034a4c3924 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -17,7 +17,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Cart extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -121,7 +120,6 @@ public function __construct(
      * Handle and then get cart grid contents
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php
index db4a2016d7f9a..4a546bc0c6001 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Carts
  *
- * @since 2.0.0
  */
 class Carts extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class Carts extends \Magento\Customer\Controller\Adminhtml\Index
      * Get shopping carts from all websites for specified client
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
index 7aef6d0228773..4a85b41c1f4cc 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -18,7 +17,6 @@ class Delete extends \Magento\Customer\Controller\Adminhtml\Index
      * Delete customer action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
index 7581cba8b912b..c2ed714c189f9 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -22,7 +21,6 @@ class Edit extends \Magento\Customer\Controller\Adminhtml\Index
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
index 62a460f89300e..599395f86c6e7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\Customer\Controller\Adminhtml\Index
      * Customers list action
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 6eb416ab7b971..5386303487bef 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InlineEdit extends \Magento\Backend\App\Action
 {
@@ -27,37 +26,31 @@ class InlineEdit extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     private $customer;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Customer\Model\Customer\Mapper
-     * @since 2.0.0
      */
     protected $customerMapper;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -74,7 +67,6 @@ class InlineEdit extends \Magento\Backend\App\Action
      * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -112,7 +104,6 @@ private function getEmailNotification()
 
     /**
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -152,7 +143,6 @@ public function execute()
      * @param array $data
      * @param null $isCustomerData
      * @return array
-     * @since 2.0.0
      */
     protected function getData(array $data, $isCustomerData = null)
     {
@@ -178,7 +168,6 @@ protected function getData(array $data, $isCustomerData = null)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function updateCustomer(array $data)
     {
@@ -199,7 +188,6 @@ protected function updateCustomer(array $data)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function updateDefaultBilling(array $data)
     {
@@ -222,7 +210,6 @@ protected function updateDefaultBilling(array $data)
      *
      * @param CustomerInterface $customer
      * @return void
-     * @since 2.0.0
      */
     protected function saveCustomer(CustomerInterface $customer)
     {
@@ -245,7 +232,6 @@ protected function saveCustomer(CustomerInterface $customer)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function processAddressData(array $data)
     {
@@ -261,7 +247,6 @@ protected function processAddressData(array $data)
      * Get array with errors
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getErrorMessages()
     {
@@ -276,7 +261,6 @@ protected function getErrorMessages()
      * Check if errors exists
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isErrorExists()
     {
@@ -288,7 +272,6 @@ protected function isErrorExists()
      *
      * @param CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     protected function setCustomer(CustomerInterface $customer)
     {
@@ -300,7 +283,6 @@ protected function setCustomer(CustomerInterface $customer)
      * Receive customer
      *
      * @return CustomerInterface
-     * @since 2.0.0
      */
     protected function getCustomer()
     {
@@ -312,7 +294,6 @@ protected function getCustomer()
      *
      * @param string $errorText
      * @return string
-     * @since 2.0.0
      */
     protected function getErrorWithCustomerId($errorText)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php
index b1703474e1053..d507d2b016c17 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\LastOrders
  *
- * @since 2.0.0
  */
 class LastOrders extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class LastOrders extends \Magento\Customer\Controller\Adminhtml\Index
      * Customer last orders grid for ajax
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
index fcaf4eaf41863..762b872b97b6d 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
@@ -14,13 +14,11 @@
 
 /**
  * Class MassAssignGroup
- * @since 2.0.0
  */
 class MassAssignGroup extends AbstractMassAction
 {
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -29,7 +27,6 @@ class MassAssignGroup extends AbstractMassAction
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
index 309f68a2b3185..453585c881a05 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
@@ -14,13 +14,11 @@
 
 /**
  * Class MassDelete
- * @since 2.0.0
  */
 class MassDelete extends AbstractMassAction
 {
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -29,7 +27,6 @@ class MassDelete extends AbstractMassAction
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -44,7 +41,6 @@ public function __construct(
     /**
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
index c48f04b5c6d03..25c56ac60c14b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
@@ -15,19 +15,16 @@
 
 /**
  * Class MassSubscribe
- * @since 2.0.0
  */
 class MassSubscribe extends AbstractMassAction
 {
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var SubscriberFactory
-     * @since 2.0.0
      */
     protected $subscriberFactory;
 
@@ -37,7 +34,6 @@ class MassSubscribe extends AbstractMassAction
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param SubscriberFactory $subscriberFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
index 2f1bd83e73b6e..4b40722ba9ab2 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
@@ -15,19 +15,16 @@
 
 /**
  * Class MassUnsubscribe
- * @since 2.0.0
  */
 class MassUnsubscribe extends AbstractMassAction
 {
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var SubscriberFactory
-     * @since 2.0.0
      */
     protected $subscriberFactory;
 
@@ -37,7 +34,6 @@ class MassUnsubscribe extends AbstractMassAction
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param SubscriberFactory $subscriberFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
index 642d9444cb934..33bc50d284861 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class NewAction extends \Magento\Customer\Controller\Adminhtml\Index
      * Create new customer action
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php
index dfd82e1c18189..753813d085015 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Newsletter
  *
- * @since 2.0.0
  */
 class Newsletter extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class Newsletter extends \Magento\Customer\Controller\Adminhtml\Index
      * Customer newsletter grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php
index d836304d65760..584e4081ffe7a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Orders
  *
- * @since 2.0.0
  */
 class Orders extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class Orders extends \Magento\Customer\Controller\Adminhtml\Index
      * Customer orders grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php
index 8962e7eefdc15..f9bbf4406b56c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\ProductReviews
  *
- * @since 2.0.0
  */
 class ProductReviews extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class ProductReviews extends \Magento\Customer\Controller\Adminhtml\Index
      * Get customer's product reviews list
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
index b16e1229a91d5..323f741173356 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\ResetPassword
  *
- * @since 2.0.0
  */
 class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -19,7 +18,6 @@ class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index
      * Reset password handler
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index a7779dd55455c..3ca8f5651087f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -30,7 +29,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
      * Reformat customer account data to be compatible with customer service interface
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _extractCustomerData()
     {
@@ -70,7 +68,6 @@ protected function _extractCustomerData()
      * @param string[] $additionalAttributes The list of attribute codes to skip filtration for
      * @param string $scope scope of the request
      * @return array
-     * @since 2.0.0
      */
     protected function _extractData(
         $formCode,
@@ -115,7 +112,6 @@ protected function _extractData(
      * @param array $addressIdList
      * @param array $extractedCustomerData
      * @return array
-     * @since 2.0.0
      */
     protected function saveDefaultFlags(array $addressIdList, array & $extractedCustomerData)
     {
@@ -157,7 +153,6 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
      *
      * @param array $extractedCustomerData
      * @return array
-     * @since 2.0.0
      */
     protected function _extractCustomerAddressData(array & $extractedCustomerData)
     {
@@ -182,7 +177,6 @@ protected function _extractCustomerAddressData(array & $extractedCustomerData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -333,7 +327,7 @@ private function getEmailNotification()
      * @param string $formCode
      * @param string $scope
      * @return Form
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getMetadataForm($entityType, $formCode, $scope)
     {
@@ -370,7 +364,7 @@ private function getMetadataForm($entityType, $formCode, $scope)
      * Retrieve current customer ID
      *
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getCurrentCustomerId()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
index 97d4b10a41be4..34b41a85e9bb2 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -20,7 +19,6 @@ class Validate extends \Magento\Customer\Controller\Adminhtml\Index
      *
      * @param \Magento\Framework\DataObject $response
      * @return CustomerInterface|null
-     * @since 2.0.0
      */
     protected function _validateCustomer($response)
     {
@@ -80,7 +78,6 @@ protected function _validateCustomer($response)
      *
      * @param \Magento\Framework\DataObject $response
      * @return void
-     * @since 2.0.0
      */
     protected function _validateCustomerAddress($response)
     {
@@ -114,7 +111,6 @@ protected function _validateCustomerAddress($response)
      * AJAX customer validation action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php
index 5f3a9a02d36ee..67b819159ccdb 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\ViewCart
  *
- * @since 2.0.0
  */
 class ViewCart extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class ViewCart extends \Magento\Customer\Controller\Adminhtml\Index
      * Get shopping cart to view only
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php
index 47077d3087b2f..652ab38e01062 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\ViewWishlist
  *
- * @since 2.0.0
  */
 class ViewWishlist extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class ViewWishlist extends \Magento\Customer\Controller\Adminhtml\Index
      * Customer last view wishlist for ajax
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 9b8e0d2adfa0c..711fab9e608bf 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -18,19 +18,16 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
@@ -64,7 +61,6 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -133,7 +129,6 @@ public function __construct(
      * @throws NotFoundException
      *
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
index d196eca47acd2..71c74b17a2075 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Index\Wishlist
  *
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Customer\Controller\Adminhtml\Index
 {
@@ -16,7 +15,6 @@ class Wishlist extends \Magento\Customer\Controller\Adminhtml\Index
      * Wishlist Action
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
index b39fe2098321a..7e44112856b7d 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Online\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
@@ -25,14 +24,12 @@ class Index extends \Magento\Backend\App\Action
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Index action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php
index c9fdf63e1f0a0..87fcfc09ffbb6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php
@@ -9,7 +9,6 @@
  * VAT validation controller
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Validatevat extends \Magento\Backend\App\Action
 {
@@ -17,7 +16,6 @@ abstract class Validatevat extends \Magento\Backend\App\Action
      * Perform customer VAT ID validation
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _validate()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php
index fc898dc09aef5..5c1a8a5b6dbc6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php
@@ -10,20 +10,17 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\System\Config\Validatevat\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Customer\Controller\Adminhtml\System\Config\Validatevat
 {
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      * Check whether vat is valid
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php
index 773e6a6271ec3..7e1801986895c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\System\Config\Validatevat\ValidateAdvanced
  *
- * @since 2.0.0
  */
 class ValidateAdvanced extends \Magento\Customer\Controller\Adminhtml\System\Config\Validatevat
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Retrieve validation result as JSON
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
index e85d8f4c685f8..2e38ba8de25f6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
@@ -9,7 +9,6 @@
 
 /**
  * Catalog composite product configuration controller
- * @since 2.0.0
  */
 abstract class Wishlist extends \Magento\Backend\App\Action
 {
@@ -24,7 +23,6 @@ abstract class Wishlist extends \Magento\Backend\App\Action
      * Wishlist we're working with.
      *
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $_wishlist = null;
 
@@ -32,7 +30,6 @@ abstract class Wishlist extends \Magento\Backend\App\Action
      * Wishlist item we're working with.
      *
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $_wishlistItem = null;
 
@@ -41,7 +38,6 @@ abstract class Wishlist extends \Magento\Backend\App\Action
      *
      * @return $this
      * @throws CoreException
-     * @since 2.0.0
      */
     protected function _initData()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php
index 6ef4705baff28..360704e16c8e3 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Composite\Wishlist\Configure
  *
- * @since 2.0.0
  */
 class Configure extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Composite\Wishlist
 {
@@ -19,7 +18,6 @@ class Configure extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\
      * Ajax handler to response configuration fieldset of composite product in customer's wishlist.
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php
index ec1a8764d0800..04c96f1a48803 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Composite\Wishlist\Update
  *
- * @since 2.0.0
  */
 class Update extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Composite\Wishlist
 {
@@ -19,7 +18,6 @@ class Update extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Com
      * IFrame handler for submitted configuration for wishlist item.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
index 726a7ff272b1e..249fa5bdc43db 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Login.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -20,49 +20,43 @@
  * @method \Magento\Framework\App\RequestInterface getRequest()
  * @method \Magento\Framework\App\Response\Http getResponse()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Login extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data $helper
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var AccountRedirect
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $accountRedirect;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $scopeConfig;
 
@@ -75,7 +69,6 @@ class Login extends \Magento\Framework\App\Action\Action
      * @param AccountManagementInterface $customerAccountManagement
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -97,9 +90,9 @@ public function __construct(
      * Get account redirect.
      * For release backward compatibility.
      *
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @return AccountRedirect
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function getAccountRedirect()
     {
@@ -112,10 +105,10 @@ protected function getAccountRedirect()
     /**
      * Account redirect setter for unit tests.
      *
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @param AccountRedirect $value
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function setAccountRedirect($value)
     {
@@ -123,9 +116,9 @@ public function setAccountRedirect($value)
     }
 
     /**
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @return ScopeConfigInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function getScopeConfig()
     {
@@ -136,10 +129,10 @@ protected function getScopeConfig()
     }
 
     /**
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @param ScopeConfigInterface $value
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function setScopeConfig($value)
     {
@@ -153,7 +146,6 @@ public function setScopeConfig($value)
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Ajax/Logout.php b/app/code/Magento/Customer/Controller/Ajax/Logout.php
index 92ed78a9a6f65..0edd41e3632b1 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Logout.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Logout.php
@@ -12,19 +12,16 @@
  *
  * @method \Magento\Framework\App\RequestInterface getRequest()
  * @method \Magento\Framework\App\Response\Http getResponse()
- * @since 2.0.0
  */
 class Logout extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
@@ -34,7 +31,6 @@ class Logout extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Customer logout action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Plugin/Account.php b/app/code/Magento/Customer/Controller/Plugin/Account.php
index f5fcd731c941d..5cd3968cf8184 100644
--- a/app/code/Magento/Customer/Controller/Plugin/Account.php
+++ b/app/code/Magento/Customer/Controller/Plugin/Account.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\Customer\Controller\Plugin\Account
  *
- * @since 2.0.0
  */
 class Account
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $allowedActions = [];
 
     /**
      * @param Session $customerSession
      * @param array $allowedActions List of actions that are allowed for not authorized users
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
diff --git a/app/code/Magento/Customer/Controller/RegistryConstants.php b/app/code/Magento/Customer/Controller/RegistryConstants.php
index 444801f5890b3..b56acc634f4c6 100644
--- a/app/code/Magento/Customer/Controller/RegistryConstants.php
+++ b/app/code/Magento/Customer/Controller/RegistryConstants.php
@@ -8,7 +8,6 @@
 /**
  * Declarations of core registry keys used by the Customer module
  *
- * @since 2.0.0
  */
 class RegistryConstants
 {
diff --git a/app/code/Magento/Customer/Controller/Review.php b/app/code/Magento/Customer/Controller/Review.php
index 5713ca8662b17..2bb7a478ba984 100644
--- a/app/code/Magento/Customer/Controller/Review.php
+++ b/app/code/Magento/Customer/Controller/Review.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\Customer\Controller\Review
  *
- * @since 2.0.0
  */
 class Review extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Review/Index.php b/app/code/Magento/Customer/Controller/Review/Index.php
index 4b427d85c48bd..a4aefac7eba02 100644
--- a/app/code/Magento/Customer/Controller/Review/Index.php
+++ b/app/code/Magento/Customer/Controller/Review/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Review\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Customer\Controller\Review
 {
diff --git a/app/code/Magento/Customer/Controller/Review/View.php b/app/code/Magento/Customer/Controller/Review/View.php
index a25dcba0ff288..16802ea9e048d 100644
--- a/app/code/Magento/Customer/Controller/Review/View.php
+++ b/app/code/Magento/Customer/Controller/Review/View.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Customer\Controller\Review\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Customer\Controller\Review
 {
diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php
index 724bd65bf859d..ad9ede972610d 100644
--- a/app/code/Magento/Customer/Controller/Section/Load.php
+++ b/app/code/Magento/Customer/Controller/Section/Load.php
@@ -12,32 +12,28 @@
 
 /**
  * Customer section controller
- * @since 2.0.0
  */
 class Load extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var Identifier
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $sectionIdentifier;
 
     /**
      * @var SectionPoolInterface
-     * @since 2.0.0
      */
     protected $sectionPool;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $escaper;
 
@@ -47,7 +43,6 @@ class Load extends \Magento\Framework\App\Action\Action
      * @param Identifier $sectionIdentifier
      * @param SectionPoolInterface $sectionPool
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -65,7 +60,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/CustomerData/Customer.php b/app/code/Magento/Customer/CustomerData/Customer.php
index 7adb04669f272..0520c00510a7e 100644
--- a/app/code/Magento/Customer/CustomerData/Customer.php
+++ b/app/code/Magento/Customer/CustomerData/Customer.php
@@ -11,13 +11,11 @@
 
 /**
  * Customer section
- * @since 2.0.0
  */
 class Customer implements SectionSourceInterface
 {
     /**
      * @var CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -30,7 +28,6 @@ class Customer implements SectionSourceInterface
     /**
      * @param CurrentCustomer $currentCustomer
      * @param View $customerViewHelper
-     * @since 2.0.0
      */
     public function __construct(
         CurrentCustomer $currentCustomer,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
diff --git a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderInterface.php b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderInterface.php
index 90878180d4df5..41453d658e2f5 100644
--- a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderInterface.php
+++ b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderInterface.php
@@ -10,7 +10,6 @@
  * Js layout data provider interface
  *
  * @api
- * @since 2.0.0
  */
 interface JsLayoutDataProviderInterface
 {
@@ -18,7 +17,6 @@ interface JsLayoutDataProviderInterface
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 }
diff --git a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPool.php b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPool.php
index 98ccaa4f1a99e..a2d7462d41c6f 100644
--- a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPool.php
+++ b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPool.php
@@ -10,7 +10,6 @@
  * Js layout data provider pool
  *
  * @api
- * @since 2.0.0
  */
 class JsLayoutDataProviderPool implements JsLayoutDataProviderPoolInterface
 {
@@ -18,7 +17,6 @@ class JsLayoutDataProviderPool implements JsLayoutDataProviderPoolInterface
      * Js layout data providers
      *
      * @var JsLayoutDataProviderInterface[]
-     * @since 2.0.0
      */
     protected $jsLayoutDataProviders;
 
@@ -26,7 +24,6 @@ class JsLayoutDataProviderPool implements JsLayoutDataProviderPoolInterface
      * Construct
      *
      * @param JsLayoutDataProviderInterface[] $jsLayoutDataProviders
-     * @since 2.0.0
      */
     public function __construct(
         array $jsLayoutDataProviders = []
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPoolInterface.php b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPoolInterface.php
index b371dff76fe5d..5c96fa2d3d855 100644
--- a/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPoolInterface.php
+++ b/app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPoolInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Js layout data provider pool interface
- * @since 2.0.0
  */
 interface JsLayoutDataProviderPoolInterface
 {
@@ -16,7 +15,6 @@ interface JsLayoutDataProviderPoolInterface
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 }
diff --git a/app/code/Magento/Customer/CustomerData/SchemaLocator.php b/app/code/Magento/Customer/CustomerData/SchemaLocator.php
index 2e1c1617b1f82..47af08b595570 100644
--- a/app/code/Magento/Customer/CustomerData/SchemaLocator.php
+++ b/app/code/Magento/Customer/CustomerData/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\CustomerData\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,13 +17,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -42,7 +38,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Customer/CustomerData/Section/Identifier.php b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
index 6ce9c9668e81e..2a770925d1c37 100644
--- a/app/code/Magento/Customer/CustomerData/Section/Identifier.php
+++ b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
@@ -7,7 +7,6 @@
 
 /**
  * Customer section identifier
- * @since 2.0.0
  */
 class Identifier
 {
@@ -19,25 +18,21 @@ class Identifier
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $markId;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @var \Magento\Framework\Session\Config\ConfigInterface
-     * @since 2.0.0
      */
     protected $sessionConfig;
 
     /**
      * @param \Magento\Framework\Stdlib\Cookie\PhpCookieManager $cookieManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\Cookie\PhpCookieManager $cookieManager
@@ -50,7 +45,6 @@ public function __construct(
      *
      * @param bool $forceUpdate
      * @return int
-     * @since 2.0.0
      */
     public function initMark($forceUpdate)
     {
@@ -76,7 +70,6 @@ public function initMark($forceUpdate)
      * @param null $sectionNames
      * @param bool $updateIds
      * @return array
-     * @since 2.0.0
      */
     public function markSections(array $sectionsData, $sectionNames = null, $updateIds = false)
     {
diff --git a/app/code/Magento/Customer/CustomerData/SectionConfigConverter.php b/app/code/Magento/Customer/CustomerData/SectionConfigConverter.php
index 412aa33d0f3a5..079aabaf84db0 100644
--- a/app/code/Magento/Customer/CustomerData/SectionConfigConverter.php
+++ b/app/code/Magento/Customer/CustomerData/SectionConfigConverter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\CustomerData\SectionConfigConverter
  *
- * @since 2.0.0
  */
 class SectionConfigConverter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class SectionConfigConverter implements \Magento\Framework\Config\ConverterInter
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Customer/CustomerData/SectionPool.php b/app/code/Magento/Customer/CustomerData/SectionPool.php
index 6ddab696ebc0a..b4e9853b24fb7 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPool.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPool.php
@@ -12,7 +12,6 @@
  * Section pool
  *
  * @api
- * @since 2.0.0
  */
 class SectionPool implements SectionPoolInterface
 {
@@ -20,7 +19,6 @@ class SectionPool implements SectionPoolInterface
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -28,13 +26,11 @@ class SectionPool implements SectionPoolInterface
      * Section map. Key is section name, value is section source object class
      *
      * @var array
-     * @since 2.0.0
      */
     protected $sectionSourceMap;
 
     /**
      * @var \Magento\Customer\CustomerData\Section\Identifier
-     * @since 2.0.0
      */
     protected $identifier;
 
@@ -44,7 +40,6 @@ class SectionPool implements SectionPoolInterface
      * @param ObjectManagerInterface $objectManager
      * @param \Magento\Customer\CustomerData\Section\Identifier $identifier
      * @param array $sectionSourceMap
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionsData(array $sectionNames = null, $updateIds = false)
     {
@@ -73,7 +67,6 @@ public function getSectionsData(array $sectionNames = null, $updateIds = false)
      * @param array $sectionNames
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getSectionDataByNames($sectionNames)
     {
@@ -91,7 +84,6 @@ protected function getSectionDataByNames($sectionNames)
      * Get all section sources
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllSectionData()
     {
@@ -108,7 +100,6 @@ protected function getAllSectionData()
      * @param string $name
      * @return SectionSourceInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function get($name)
     {
diff --git a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
index da086ba3a3e22..c308804fd0f8d 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Section pool interface
- * @since 2.0.0
  */
 interface SectionPoolInterface
 {
@@ -17,7 +16,6 @@ interface SectionPoolInterface
      * @param array $sectionNames
      * @param bool $updateIds
      * @return array
-     * @since 2.0.0
      */
     public function getSectionsData(array $sectionNames = null, $updateIds = false);
 }
diff --git a/app/code/Magento/Customer/CustomerData/SectionSourceInterface.php b/app/code/Magento/Customer/CustomerData/SectionSourceInterface.php
index f5eca29cbdb86..f53a4ae4de65b 100644
--- a/app/code/Magento/Customer/CustomerData/SectionSourceInterface.php
+++ b/app/code/Magento/Customer/CustomerData/SectionSourceInterface.php
@@ -9,7 +9,6 @@
  * Section source interface
  *
  * @api Use to define data sections in customer data which are transported from backend to frontend local storage
- * @since 2.0.0
  */
 interface SectionSourceInterface
 {
@@ -17,7 +16,6 @@ interface SectionSourceInterface
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSectionData();
 }
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 4d46b96a383da..aec92a9e11015 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -16,7 +16,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -44,7 +43,6 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * Array of Customer Address Attributes
      *
      * @var AttributeMetadataInterface[]
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -52,7 +50,6 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * Customer address config node per website
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_config = [];
 
@@ -60,25 +57,21 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * Customer Number of Lines in a Street Address per website
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_streetLines = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_formatTemplate = [];
 
     /**
      * @var \Magento\Framework\View\Element\BlockFactory
-     * @since 2.0.0
      */
     protected $_blockFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -86,19 +79,16 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * @var CustomerMetadataInterface
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $_customerMetadataService;
 
     /**
      * @var \Magento\Customer\Api\AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $_addressMetadataService;
 
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     protected $_addressConfig;
 
@@ -109,7 +99,6 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * @param CustomerMetadataInterface $customerMetadataService
      * @param AddressMetadataInterface $addressMetadataService
      * @param \Magento\Customer\Model\Address\Config $addressConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -131,7 +120,6 @@ public function __construct(
      * Addresses url
      *
      * @return void
-     * @since 2.0.0
      */
     public function getBookUrl()
     {
@@ -139,7 +127,6 @@ public function getBookUrl()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function getEditUrl()
     {
@@ -147,7 +134,6 @@ public function getEditUrl()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -155,7 +141,6 @@ public function getDeleteUrl()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -164,7 +149,6 @@ public function getCreateUrl()
     /**
      * @param string $renderer
      * @return \Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     public function getRenderer($renderer)
     {
@@ -181,7 +165,6 @@ public function getRenderer($renderer)
      * @param string $key
      * @param \Magento\Store\Model\Store|int|string $store
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($key, $store = null)
     {
@@ -202,7 +185,6 @@ public function getConfig($key, $store = null)
      *
      * @param \Magento\Store\Model\Store|int|string $store
      * @return int
-     * @since 2.0.0
      */
     public function getStreetLines($store = null)
     {
@@ -223,7 +205,6 @@ public function getStreetLines($store = null)
     /**
      * @param string $code
      * @return Format|string
-     * @since 2.0.0
      */
     public function getFormat($code)
     {
@@ -236,7 +217,6 @@ public function getFormat($code)
      *
      * @param string $code
      * @return \Magento\Customer\Block\Address\Renderer\RendererInterface|null
-     * @since 2.0.0
      */
     public function getFormatTypeRenderer($code)
     {
@@ -252,7 +232,6 @@ public function getFormatTypeRenderer($code)
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     public function canShowConfig($key)
     {
@@ -266,7 +245,6 @@ public function canShowConfig($key)
      * @return string
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getAttributeValidationClass($attributeCode)
     {
@@ -300,7 +278,6 @@ public function getAttributeValidationClass($attributeCode)
      * @param string[] $origStreets
      * @param int $toCount
      * @return string[]
-     * @since 2.0.0
      */
     public function convertStreetLines($origStreets, $toCount)
     {
@@ -332,7 +309,6 @@ public function convertStreetLines($origStreets, $toCount)
      *
      * @param \Magento\Store\Model\Store|string|int $store
      * @return bool
-     * @since 2.0.0
      */
     public function isVatValidationEnabled($store = null)
     {
@@ -347,7 +323,6 @@ public function isVatValidationEnabled($store = null)
      * Retrieve disable auto group assign default value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisableAutoGroupAssignDefaultValue()
     {
@@ -362,7 +337,6 @@ public function isDisableAutoGroupAssignDefaultValue()
      *
      * @param \Magento\Store\Model\Store|string|int $store
      * @return bool
-     * @since 2.0.0
      */
     public function hasValidateOnEachTransaction($store = null)
     {
@@ -378,7 +352,6 @@ public function hasValidateOnEachTransaction($store = null)
      *
      * @param \Magento\Store\Model\Store|string|int|null $store
      * @return string
-     * @since 2.0.0
      */
     public function getTaxCalculationAddressType($store = null)
     {
@@ -393,7 +366,6 @@ public function getTaxCalculationAddressType($store = null)
      * Check if VAT ID address attribute has to be shown on frontend (on Customer Address management forms)
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isVatAttributeVisible()
     {
diff --git a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
index 3102877beddc5..e6082de1da4e7 100644
--- a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
+++ b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
@@ -15,49 +15,41 @@
 
 /**
  * Class CurrentCustomer
- * @since 2.0.0
  */
 class CurrentCustomer
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     protected $view;
 
@@ -69,7 +61,6 @@ class CurrentCustomer
      * @param RequestInterface $request
      * @param ModuleManager $moduleManager
      * @param ViewInterface $view
-     * @since 2.0.0
      */
     public function __construct(
         CustomerSession $customerSession,
@@ -93,7 +84,6 @@ public function __construct(
      * Returns customer Data with customer group only
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function getDepersonalizedCustomer()
     {
@@ -106,7 +96,6 @@ protected function getDepersonalizedCustomer()
      * Returns customer Data from service
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function getCustomerFromService()
     {
@@ -117,7 +106,6 @@ protected function getCustomerFromService()
      * Returns current customer according to session and context
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -136,7 +124,6 @@ public function getCustomer()
      * Returns customer id from session
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -148,7 +135,6 @@ public function getCustomerId()
      *
      * @param int|null $customerId
      * @return void
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
diff --git a/app/code/Magento/Customer/Helper/Session/CurrentCustomerAddress.php b/app/code/Magento/Customer/Helper/Session/CurrentCustomerAddress.php
index b7515003cb163..603eb90e39864 100644
--- a/app/code/Magento/Customer/Helper/Session/CurrentCustomerAddress.php
+++ b/app/code/Magento/Customer/Helper/Session/CurrentCustomerAddress.php
@@ -10,26 +10,22 @@
 
 /**
  * Class CurrentCustomerAddress
- * @since 2.0.0
  */
 class CurrentCustomerAddress
 {
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @param CurrentCustomer $currentCustomer
      * @param AccountManagementInterface $accountManagement
-     * @since 2.0.0
      */
     public function __construct(
         CurrentCustomer $currentCustomer,
@@ -43,7 +39,6 @@ public function __construct(
      * Returns default billing address form current customer
      *
      * @return AddressInterface|null
-     * @since 2.0.0
      */
     public function getDefaultBillingAddress()
     {
@@ -54,7 +49,6 @@ public function getDefaultBillingAddress()
      * Returns default shipping address for current customer
      *
      * @return AddressInterface|null
-     * @since 2.0.0
      */
     public function getDefaultShippingAddress()
     {
diff --git a/app/code/Magento/Customer/Helper/View.php b/app/code/Magento/Customer/Helper/View.php
index 7e6d43e738487..a47930abb6d0e 100644
--- a/app/code/Magento/Customer/Helper/View.php
+++ b/app/code/Magento/Customer/Helper/View.php
@@ -11,13 +11,11 @@
 
 /**
  * Customer helper for view.
- * @since 2.0.0
  */
 class View extends \Magento\Framework\App\Helper\AbstractHelper implements CustomerNameGenerationInterface
 {
     /**
      * @var CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $_customerMetadataService;
 
@@ -26,7 +24,6 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper implements Custo
      *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param CustomerMetadataInterface $customerMetadataService
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerName(CustomerInterface $customerData)
     {
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
index af7adb171e242..35c388a4c6b86 100644
--- a/app/code/Magento/Customer/Model/Account/Redirect.php
+++ b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -22,7 +22,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Redirect
 {
@@ -31,38 +30,32 @@ class Redirect
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
     /**
      * @var CustomerUrl
-     * @since 2.0.0
      */
     protected $customerUrl;
 
     /**
      * @deprecated 2.2.0
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
@@ -74,7 +67,7 @@ class Redirect
 
     /**
      * @var CookieManagerInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $cookieManager;
 
@@ -94,7 +87,6 @@ class Redirect
      * @param CustomerUrl $customerUrl
      * @param ResultFactory $resultFactory
      * @param HostChecker|null $hostChecker
-     * @since 2.0.0
      */
     public function __construct(
         RequestInterface $request,
@@ -122,7 +114,6 @@ public function __construct(
      * Retrieve redirect
      *
      * @return ResultRedirect|ResultForward
-     * @since 2.0.0
      */
     public function getRedirect()
     {
@@ -147,7 +138,6 @@ public function getRedirect()
      * Update last customer id, if required
      *
      * @return void
-     * @since 2.0.0
      */
     protected function updateLastCustomerId()
     {
@@ -165,7 +155,6 @@ protected function updateLastCustomerId()
      * Prepare redirect URL
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareRedirectUrl()
     {
@@ -206,7 +195,6 @@ protected function prepareRedirectUrl()
      * Redirect customer to the last page visited after logging in.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processLoggedCustomer()
     {
@@ -235,7 +223,6 @@ protected function processLoggedCustomer()
      *
      * @param string $url
      * @return void
-     * @since 2.0.0
      */
     private function applyRedirect($url)
     {
@@ -245,9 +232,9 @@ private function applyRedirect($url)
     /**
      * Get Cookie manager. For release backward compatibility.
      *
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @return CookieManagerInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected function getCookieManager()
     {
@@ -260,10 +247,10 @@ protected function getCookieManager()
     /**
      * Set cookie manager. For unit tests.
      *
-     * @deprecated 2.1.0
+     * @deprecated 2.0.11
      * @param object $value
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function setCookieManager($value)
     {
@@ -274,7 +261,7 @@ public function setCookieManager($value)
      * Get redirect route from cookie for case of successful login/registration
      *
      * @return null|string
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function getRedirectCookie()
     {
@@ -286,7 +273,7 @@ public function getRedirectCookie()
      *
      * @param string $route
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function setRedirectCookie($route)
     {
@@ -297,7 +284,7 @@ public function setRedirectCookie($route)
      * Clear cookie with requested route
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function clearRedirectCookie()
     {
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index caf08624022ea..41438b05c827e 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -54,7 +54,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class AccountManagement implements AccountManagementInterface
 {
@@ -161,139 +160,116 @@ class AccountManagement implements AccountManagementInterface
 
     /**
      * @var CustomerFactory
-     * @since 2.0.0
      */
     private $customerFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\ValidationResultsInterfaceFactory
-     * @since 2.0.0
      */
     private $validationResultsDataFactory;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     private $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @var Random
-     * @since 2.0.0
      */
     private $mathRandom;
 
     /**
      * @var Validator
-     * @since 2.0.0
      */
     private $validator;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     private $addressRepository;
 
     /**
      * @var CustomerMetadataInterface
-     * @since 2.0.0
      */
     private $customerMetadataService;
 
     /**
      * @var PsrLogger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Encryptor
-     * @since 2.0.0
      */
     private $encryptor;
 
     /**
      * @var CustomerRegistry
-     * @since 2.0.0
      */
     private $customerRegistry;
 
     /**
      * @var ConfigShare
-     * @since 2.0.0
      */
     private $configShare;
 
     /**
      * @var StringHelper
-     * @since 2.0.0
      */
     protected $stringHelper;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     private $customerRepository;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var TransportBuilder
-     * @since 2.0.0
      */
     private $transportBuilder;
 
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataProcessor;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var CustomerViewHelper
-     * @since 2.0.0
      */
     protected $customerViewHelper;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $extensibleDataObjectConverter;
 
     /**
      * @var CustomerModel
-     * @since 2.0.0
      */
     protected $customerModel;
 
@@ -347,7 +323,6 @@ class AccountManagement implements AccountManagementInterface
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param CredentialsValidator|null $credentialsValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         CustomerFactory $customerFactory,
@@ -422,7 +397,6 @@ private function getAuthentication()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
     {
@@ -446,7 +420,6 @@ public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function activate($email, $confirmationKey)
     {
@@ -456,7 +429,6 @@ public function activate($email, $confirmationKey)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function activateById($customerId, $confirmationKey)
     {
@@ -472,7 +444,6 @@ public function activateById($customerId, $confirmationKey)
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
      * @throws \Magento\Framework\Exception\State\InputMismatchException
-     * @since 2.0.0
      */
     private function activateCustomer($customer, $confirmationKey)
     {
@@ -493,7 +464,6 @@ private function activateCustomer($customer, $confirmationKey)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function authenticate($username, $password)
     {
@@ -529,7 +499,6 @@ public function authenticate($username, $password)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken)
     {
@@ -539,7 +508,6 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function initiatePasswordReset($email, $template, $websiteId = null)
     {
@@ -578,7 +546,6 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resetPassword($email, $resetToken, $newPassword)
     {
@@ -601,7 +568,6 @@ public function resetPassword($email, $resetToken, $newPassword)
      * @param string $password
      * @return void
      * @throws InputException
-     * @since 2.0.0
      */
     protected function checkPasswordStrength($password)
     {
@@ -685,7 +651,6 @@ protected function getMinPasswordLength()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfirmationStatus($customerId)
     {
@@ -702,7 +667,6 @@ public function getConfirmationStatus($customerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
     {
@@ -725,7 +689,6 @@ public function createAccount(CustomerInterface $customer, $password = null, $re
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function createAccountWithPasswordHash(CustomerInterface $customer, $hash, $redirectUrl = '')
     {
@@ -802,7 +765,6 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultBillingAddress($customerId)
     {
@@ -812,7 +774,6 @@ public function getDefaultBillingAddress($customerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultShippingAddress($customerId)
     {
@@ -826,7 +787,6 @@ public function getDefaultShippingAddress($customerId)
      * @param CustomerInterface $customer
      * @param string $redirectUrl
      * @return void
-     * @since 2.0.0
      */
     protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl)
     {
@@ -847,7 +807,6 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function changePassword($email, $currentPassword, $newPassword)
     {
@@ -861,7 +820,6 @@ public function changePassword($email, $currentPassword, $newPassword)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function changePasswordById($customerId, $currentPassword, $newPassword)
     {
@@ -883,7 +841,6 @@ public function changePasswordById($customerId, $currentPassword, $newPassword)
      * @throws InputException
      * @throws InvalidEmailOrPasswordException
      * @throws UserLockedException
-     * @since 2.0.0
      */
     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
     {
@@ -908,7 +865,6 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
      *
      * @param string $password
      * @return string
-     * @since 2.0.0
      */
     protected function createPasswordHash($password)
     {
@@ -929,7 +885,6 @@ private function getEavValidator()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate(CustomerInterface $customer)
     {
@@ -957,7 +912,6 @@ public function validate(CustomerInterface $customer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isEmailAvailable($customerEmail, $websiteId = null)
     {
@@ -974,7 +928,6 @@ public function isEmailAvailable($customerEmail, $websiteId = null)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function isCustomerInStore($customerWebsiteId, $storeId)
     {
@@ -1000,7 +953,6 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
      * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
      * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
-     * @since 2.0.0
      */
     private function validateResetPasswordToken($customerId, $resetPasswordLinkToken)
     {
@@ -1035,7 +987,6 @@ private function validateResetPasswordToken($customerId, $resetPasswordLinkToken
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function isReadonly($customerId)
     {
@@ -1054,7 +1005,6 @@ public function isReadonly($customerId)
      * @return $this
      * @throws LocalizedException
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function sendNewAccountEmail(
         $customer,
@@ -1094,7 +1044,6 @@ protected function sendNewAccountEmail(
      * @param CustomerInterface $customer
      * @return $this
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function sendPasswordResetNotificationEmail($customer)
     {
@@ -1108,7 +1057,6 @@ protected function sendPasswordResetNotificationEmail($customer)
      * @param int|string|null $defaultStoreId
      * @return int
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function getWebsiteStoreId($customer, $defaultStoreId = null)
     {
@@ -1123,7 +1071,6 @@ protected function getWebsiteStoreId($customer, $defaultStoreId = null)
     /**
      * @return array
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function getTemplateTypes()
     {
@@ -1156,7 +1103,6 @@ protected function getTemplateTypes()
      * @param string $email
      * @return $this
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function sendEmailTemplate(
         $customer,
@@ -1188,7 +1134,6 @@ protected function sendEmailTemplate(
      *
      * @param CustomerInterface $customer
      * @return bool
-     * @since 2.0.0
      */
     protected function isConfirmationRequired($customer)
     {
@@ -1208,7 +1153,6 @@ protected function isConfirmationRequired($customer)
      *
      * @param CustomerInterface $customer
      * @return bool
-     * @since 2.0.0
      */
     protected function canSkipConfirmation($customer)
     {
@@ -1233,7 +1177,6 @@ protected function canSkipConfirmation($customer)
      * @param string $rpToken
      * @param string $rpTokenCreatedAt
      * @return bool
-     * @since 2.0.0
      */
     public function isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)
     {
@@ -1266,7 +1209,6 @@ public function isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)
      * @param string $passwordLinkToken
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
     {
@@ -1293,7 +1235,6 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
      * @param CustomerInterface $customer
      * @return $this
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function sendPasswordReminderEmail($customer)
     {
@@ -1321,7 +1262,6 @@ public function sendPasswordReminderEmail($customer)
      * @param CustomerInterface $customer
      * @return $this
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function sendPasswordResetConfirmationEmail($customer)
     {
@@ -1349,7 +1289,6 @@ public function sendPasswordResetConfirmationEmail($customer)
      * @param CustomerInterface $customer
      * @param int $addressId
      * @return AddressInterface|null
-     * @since 2.0.0
      */
     protected function getAddressById(CustomerInterface $customer, $addressId)
     {
@@ -1367,7 +1306,6 @@ protected function getAddressById(CustomerInterface $customer, $addressId)
      * @param CustomerInterface $customer
      * @return Data\CustomerSecure
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function getFullCustomerObject($customer)
     {
@@ -1386,7 +1324,6 @@ protected function getFullCustomerObject($customer)
      *
      * @param string $password
      * @return string
-     * @since 2.0.0
      */
     public function getPasswordHash($password)
     {
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 6dd8391da7e6f..4bbc820e291c0 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -18,7 +18,6 @@
  * @method int getParentId() getParentId()
  * @method \Magento\Customer\Model\Address setParentId() setParentId(int $parentId)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\Customer\Model\Address\AbstractAddress
 {
@@ -26,37 +25,32 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
      * Customer entity
      *
      * @var Customer
-     * @since 2.0.0
      */
     protected $_customer;
 
     /**
      * @var CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Customer\Model\Address\CustomAttributeListInterface
-     * @since 2.1.0
+     * @since 2.0.5
      */
     private $attributeList;
 
@@ -82,7 +76,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -130,7 +123,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -143,7 +135,6 @@ protected function _construct()
      * @param AddressInterface $address
      * @return $this
      * Use Api/RepositoryInterface for the operations in the Data Interfaces. Don't rely on Address Model
-     * @since 2.0.0
      */
     public function updateData(AddressInterface $address)
     {
@@ -178,7 +169,6 @@ public function updateData(AddressInterface $address)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -197,7 +187,6 @@ public function getDataModel($defaultBillingAddressId = null, $defaultShippingAd
      * Retrieve address customer identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -209,7 +198,6 @@ public function getCustomerId()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -222,7 +210,6 @@ public function setCustomerId($id)
      * Retrieve address customer
      *
      * @return Customer|false
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -240,7 +227,6 @@ public function getCustomer()
      *
      * @param Customer $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomer(Customer $customer)
     {
@@ -253,7 +239,6 @@ public function setCustomer(Customer $customer)
      * Retrieve address entity attributes
      *
      * @return Attribute[]
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -269,7 +254,6 @@ public function getAttributes()
      * Get attributes created by default
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDefaultAttributeCodes()
     {
@@ -278,7 +262,6 @@ public function getDefaultAttributeCodes()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -289,7 +272,6 @@ public function __clone()
      * Return Entity Type instance
      *
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -300,7 +282,6 @@ public function getEntityType()
      * Return Region ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -312,7 +293,6 @@ public function getRegionId()
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId)
     {
@@ -322,7 +302,6 @@ public function setRegionId($regionId)
 
     /**
      * @return Customer
-     * @since 2.0.0
      */
     protected function _createCustomer()
     {
@@ -333,7 +312,6 @@ protected function _createCustomer()
      * Return Entity Type ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -344,7 +322,6 @@ public function getEntityTypeId()
      * Processing object after save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -359,7 +336,6 @@ public function afterSave()
      * Init indexing process after customer delete
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -371,7 +347,6 @@ public function afterDeleteCommit()
      * Init indexing process after customer save
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindex()
     {
@@ -382,7 +357,7 @@ public function reindex()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.5
      */
     protected function getCustomAttributesCodes()
     {
@@ -392,8 +367,8 @@ protected function getCustomAttributesCodes()
     /**
      * Get new AttributeList dependency for application code.
      * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.5
+     * @since 2.0.5
      */
     private function getAttributeList()
     {
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 0d52b3c7ba2be..212ebddfeec3d 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -32,7 +32,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class AbstractAddress extends AbstractExtensibleModel implements AddressModelInterface
 {
@@ -47,7 +46,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * Prefix of model events
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'customer_address';
 
@@ -55,7 +53,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * Name of event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'customer_address';
 
@@ -63,7 +60,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * Directory country models
      *
      * @var \Magento\Directory\Model\Country[]
-     * @since 2.0.0
      */
     protected static $_countryModels = [];
 
@@ -71,7 +67,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * Directory region models
      *
      * @var \Magento\Directory\Model\Region[]
-     * @since 2.0.0
      */
     protected static $_regionModels = [];
 
@@ -79,55 +74,46 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * Directory data
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryData = null;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $_addressConfig;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
     /**
      * @var AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
     /**
      * @var AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var RegionInterfaceFactory
-     * @since 2.0.0
      */
     protected $regionDataFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -149,7 +135,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -194,7 +179,6 @@ public function __construct(
      * Get full customer name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -218,7 +202,6 @@ public function getName()
      * Retrieve street field of an address
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getStreet()
     {
@@ -233,7 +216,6 @@ public function getStreet()
      *
      * @param int $number
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine($number)
     {
@@ -245,7 +227,6 @@ public function getStreetLine($number)
      * Retrieve text of street lines, concatenated using LF symbol
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetFull()
     {
@@ -258,7 +239,6 @@ public function getStreetFull()
      *
      * @param string|string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreetFull($street)
     {
@@ -270,7 +250,6 @@ public function setStreetFull($street)
      *
      * @param string|string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreet($street)
     {
@@ -284,7 +263,6 @@ public function setStreet($street)
      * @param array|string $key
      * @param null $value
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -300,7 +278,6 @@ public function setData($key, $value = null)
      * Check that address can have multiline attribute by this code (as street or some custom attribute)
      * @param string $code
      * @return bool
-     * @since 2.0.0
      */
     protected function isAddressMultilineAttribute($code)
     {
@@ -312,7 +289,6 @@ protected function isAddressMultilineAttribute($code)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function _implodeArrayField(array $data)
     {
@@ -329,7 +305,6 @@ protected function _implodeArrayField(array $data)
      *
      * @param string[]|string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _implodeArrayValues($value)
     {
@@ -353,7 +328,6 @@ protected function _implodeArrayValues($value)
      * To be used in controllers for views data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function explodeStreetAddress()
     {
@@ -368,7 +342,6 @@ public function explodeStreetAddress()
      * Retrieve region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -395,7 +368,6 @@ public function getRegion()
      * Return 2 letter state code if available, otherwise full region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode()
     {
@@ -418,7 +390,6 @@ public function getRegionCode()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -441,7 +412,6 @@ public function getRegionId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCountry()
     {
@@ -453,7 +423,6 @@ public function getCountry()
      * Retrieve country model
      *
      * @return \Magento\Directory\Model\Country
-     * @since 2.0.0
      */
     public function getCountryModel()
     {
@@ -471,7 +440,6 @@ public function getCountryModel()
      *
      * @param int|null $regionId
      * @return \Magento\Directory\Model\Region
-     * @since 2.0.0
      */
     public function getRegionModel($regionId = null)
     {
@@ -499,7 +467,6 @@ public function getRegionModel($regionId = null)
      *
      * @param string $type
      * @return string|null
-     * @since 2.0.0
      */
     public function format($type)
     {
@@ -514,7 +481,6 @@ public function format($type)
      * Retrieve address config object
      *
      * @return Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -523,7 +489,6 @@ public function getConfig()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -541,7 +506,6 @@ public function beforeSave()
      * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
      * the instance of Api/Data/AddressInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -600,7 +564,6 @@ public function getDataModel($defaultBillingAddressId = null, $defaultShippingAd
      * @return bool|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -673,7 +636,6 @@ public function validate()
 
     /**
      * @return \Magento\Directory\Model\Region
-     * @since 2.0.0
      */
     protected function _createRegionInstance()
     {
@@ -682,7 +644,6 @@ protected function _createRegionInstance()
 
     /**
      * @return \Magento\Directory\Model\Country
-     * @since 2.0.0
      */
     protected function _createCountryInstance()
     {
diff --git a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
index 9fcf21858793b..1b2a62591a1f8 100644
--- a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
+++ b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
@@ -10,7 +10,6 @@
  * Interface AddressInterface
  *
  * @api
- * @since 2.0.0
  */
 interface AddressModelInterface
 {
@@ -19,7 +18,6 @@ interface AddressModelInterface
      *
      * @param int $number
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine($number);
 
@@ -29,7 +27,6 @@ public function getStreetLine($number);
      * To be used in controllers for views data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function explodeStreetAddress();
 }
diff --git a/app/code/Magento/Customer/Model/Address/Config.php b/app/code/Magento/Customer/Model/Address/Config.php
index 0bb40acc7a568..e4bd1a54aa380 100644
--- a/app/code/Magento/Customer/Model/Address/Config.php
+++ b/app/code/Magento/Customer/Model/Address/Config.php
@@ -12,7 +12,6 @@
 
 /**
  * Customer address configuration
- * @since 2.0.0
  */
 class Config extends ConfigData
 {
@@ -26,7 +25,6 @@ class Config extends ConfigData
      * Customer address templates per store
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_types = [];
 
@@ -34,7 +32,6 @@ class Config extends ConfigData
      * Current store instance
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store = null;
 
@@ -42,25 +39,21 @@ class Config extends ConfigData
      * Default types per store, used for invalid code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultTypes = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $_addressHelper;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -74,7 +67,6 @@ class Config extends ConfigData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Address\Config\Reader $reader,
@@ -96,7 +88,6 @@ public function __construct(
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -108,7 +99,6 @@ public function setStore($store)
      * Retrieve store
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -122,7 +112,6 @@ public function getStore()
      * Retrieve address formats
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormats()
     {
@@ -163,7 +152,6 @@ public function getFormats()
      * Retrieve default address format
      *
      * @return DataObject
-     * @since 2.0.0
      */
     protected function _getDefaultFormat()
     {
@@ -191,7 +179,6 @@ protected function _getDefaultFormat()
      *
      * @param string $typeCode
      * @return DataObject
-     * @since 2.0.0
      */
     public function getFormatByCode($typeCode)
     {
diff --git a/app/code/Magento/Customer/Model/Address/Config/Converter.php b/app/code/Magento/Customer/Model/Address/Config/Converter.php
index 0b1693890a7cd..b2dd97d8431aa 100644
--- a/app/code/Magento/Customer/Model/Address/Config/Converter.php
+++ b/app/code/Magento/Customer/Model/Address/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Address\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Customer/Model/Address/Config/Reader.php b/app/code/Magento/Customer/Model/Address/Config/Reader.php
index 96ba46a831799..34bdccbf4c1dd 100644
--- a/app/code/Magento/Customer/Model/Address/Config/Reader.php
+++ b/app/code/Magento/Customer/Model/Address/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Address\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -19,7 +18,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param Converter $converter
      * @param SchemaLocator $schemaLocator
      * @param \Magento\Framework\Config\ValidationStateInterface $validationState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Customer/Model/Address/Config/SchemaLocator.php b/app/code/Magento/Customer/Model/Address/Config/SchemaLocator.php
index 0f1ab25adca5a..ca33fca032e3f 100644
--- a/app/code/Magento/Customer/Model/Address/Config/SchemaLocator.php
+++ b/app/code/Magento/Customer/Model/Address/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Model\Address\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,13 +19,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     private $_schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -44,7 +40,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Customer/Model/Address/CustomAttributeList.php b/app/code/Magento/Customer/Model/Address/CustomAttributeList.php
index 14c9aa4c4722b..2c9853985770b 100644
--- a/app/code/Magento/Customer/Model/Address/CustomAttributeList.php
+++ b/app/code/Magento/Customer/Model/Address/CustomAttributeList.php
@@ -8,13 +8,13 @@
 /**
  * Class \Magento\Customer\Model\Address\CustomAttributeList
  *
- * @since 2.1.0
+ * @since 2.0.5
  */
 class CustomAttributeList implements CustomAttributeListInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.5
      */
     public function getAttributes()
     {
diff --git a/app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php b/app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php
index 3d90272818267..c1573a48a1b4a 100644
--- a/app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php
+++ b/app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.1.0
+ * @since 2.0.5
  */
 interface CustomAttributeListInterface
 {
@@ -15,7 +15,7 @@ interface CustomAttributeListInterface
      * Retrieve list of customer addresses custom attributes
      *
      * @return array
-     * @since 2.1.0
+     * @since 2.0.5
      */
     public function getAttributes();
 }
diff --git a/app/code/Magento/Customer/Model/Address/Form.php b/app/code/Magento/Customer/Model/Address/Form.php
index 69a8359eef08c..5d298f38bda56 100644
--- a/app/code/Magento/Customer/Model/Address/Form.php
+++ b/app/code/Magento/Customer/Model/Address/Form.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Address\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Customer\Model\Form
 {
@@ -22,7 +21,6 @@ class Form extends \Magento\Customer\Model\Form
      * Current EAV entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = 'customer_address';
 }
diff --git a/app/code/Magento/Customer/Model/Address/Mapper.php b/app/code/Magento/Customer/Model/Address/Mapper.php
index a8f1433b7d64b..f1128b5d37def 100644
--- a/app/code/Magento/Customer/Model/Address/Mapper.php
+++ b/app/code/Magento/Customer/Model/Address/Mapper.php
@@ -13,19 +13,16 @@
 
 /**
  * Class Mapper converts Address Service Data Object to an array
- * @since 2.0.0
  */
 class Mapper
 {
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     private $extensibleDataObjectConverter;
 
     /**
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
-     * @since 2.0.0
      */
     public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectConverter)
     {
@@ -39,7 +36,6 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      * @return array
      * TODO:: Add concrete type of AddressInterface for $addressDataObject parameter once
      * all references have been refactored.
-     * @since 2.0.0
      */
     public function toFlatArray($addressDataObject)
     {
diff --git a/app/code/Magento/Customer/Model/AddressRegistry.php b/app/code/Magento/Customer/Model/AddressRegistry.php
index e6f11a5328359..1fed9d5b6b545 100644
--- a/app/code/Magento/Customer/Model/AddressRegistry.php
+++ b/app/code/Magento/Customer/Model/AddressRegistry.php
@@ -10,25 +10,21 @@
 
 /**
  * Registry for Address models
- * @since 2.0.0
  */
 class AddressRegistry
 {
     /**
      * @var Address[]
-     * @since 2.0.0
      */
     protected $registry = [];
 
     /**
      * @var AddressFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @param AddressFactory $addressFactory
-     * @since 2.0.0
      */
     public function __construct(AddressFactory $addressFactory)
     {
@@ -41,7 +37,6 @@ public function __construct(AddressFactory $addressFactory)
      * @param int $addressId
      * @return Address
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieve($addressId)
     {
@@ -62,7 +57,6 @@ public function retrieve($addressId)
      *
      * @param int $addressId
      * @return void
-     * @since 2.0.0
      */
     public function remove($addressId)
     {
@@ -74,7 +68,6 @@ public function remove($addressId)
      *
      * @param Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function push(Address $address)
     {
diff --git a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
index 9b1a560901009..ca371276a5754 100644
--- a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
@@ -15,26 +15,22 @@
 
 /**
  * Class ContextPlugin
- * @since 2.0.0
  */
 class ContextPlugin
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var HttpContext
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @param Session $customerSession
      * @param HttpContext $httpContext
-     * @since 2.0.0
      */
     public function __construct(Session $customerSession, HttpContext $httpContext)
     {
diff --git a/app/code/Magento/Customer/Model/Attribute.php b/app/code/Magento/Customer/Model/Attribute.php
index 3a48110fb5977..353ac029f340a 100644
--- a/app/code/Magento/Customer/Model/Attribute.php
+++ b/app/code/Magento/Customer/Model/Attribute.php
@@ -14,7 +14,6 @@
  *
  * @method int getSortOrder()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\Attribute
 {
@@ -27,7 +26,6 @@ class Attribute extends \Magento\Eav\Model\Attribute
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'customer_entity_attribute';
 
@@ -35,13 +33,11 @@ class Attribute extends \Magento\Eav\Model\Attribute
      * Prefix of model events object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'attribute';
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -76,7 +72,6 @@ class Attribute extends \Magento\Eav\Model\Attribute
      * @param array|null $data
      * @param \Magento\Customer\Model\Metadata\AttributeMetadataCache|null $attributeMetadataCache
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -131,7 +126,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -140,7 +134,6 @@ protected function _construct()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -167,7 +160,6 @@ public function afterDelete()
      * Init indexing process after customer delete
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -181,7 +173,6 @@ public function afterDeleteCommit()
      * Init indexing process after customer save
      *
      * @return void
-     * @since 2.0.0
      */
     public function invalidate()
     {
@@ -194,7 +185,6 @@ public function invalidate()
      * Check whether attribute is searchable in admin grid and it is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canBeSearchableInGrid()
     {
@@ -205,7 +195,6 @@ public function canBeSearchableInGrid()
      * Check whether attribute is filterable in admin grid and it is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canBeFilterableInGrid()
     {
@@ -215,7 +204,7 @@ public function canBeFilterableInGrid()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -228,7 +217,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php b/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
index 49d8dd2ef2290..c62d724178378 100644
--- a/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
+++ b/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
@@ -9,7 +9,6 @@
  * Boolean customer attribute backend model
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      *
      * @param \Magento\Customer\Model\Customer $customer
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($customer)
     {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php
index becf31cc09b9d..44f429f050884 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\AbstractData
  *
- * @since 2.0.0
  */
 abstract class AbstractData extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php b/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php
index 78d186164eaa3..86146b974ce43 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Boolean
  *
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Attribute\Data\Boolean
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Date.php b/app/code/Magento/Customer/Model/Attribute/Data/Date.php
index f6d3a347d3c21..7734f8ea21d7e 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Date.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Date.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Date
  *
- * @since 2.0.0
  */
 class Date extends \Magento\Eav\Model\Attribute\Data\Date
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/File.php b/app/code/Magento/Customer/Model/Attribute/Data/File.php
index e5982a8414ca9..40797961ba9a6 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/File.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\File
  *
- * @since 2.0.0
  */
 class File extends \Magento\Eav\Model\Attribute\Data\File
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php b/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php
index 12d7bb253afc4..ce0cfda881b44 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Hidden
  *
- * @since 2.0.0
  */
 class Hidden extends \Magento\Eav\Model\Attribute\Data\Hidden
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Image.php b/app/code/Magento/Customer/Model/Attribute/Data/Image.php
index 64904bb156fa9..83bed44c11b73 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Image.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Image.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Eav\Model\Attribute\Data\Image
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Multiline.php b/app/code/Magento/Customer/Model/Attribute/Data/Multiline.php
index b358e49208369..384fc316858cd 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Multiline.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Multiline.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Multiline
  *
- * @since 2.0.0
  */
 class Multiline extends \Magento\Eav\Model\Attribute\Data\Multiline
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php b/app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php
index 60b594ba69a32..2e3bf1ca32a95 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Multiselect
  *
- * @since 2.0.0
  */
 class Multiselect extends \Magento\Eav\Model\Attribute\Data\Multiselect
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index 59af21139557b..380b8a4d3446f 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -15,13 +15,11 @@
 /**
  * Customer Address Postal/Zip Code Attribute Data Model
  * This Data Model Has to Be Set Up in additional EAV attribute table
- * @since 2.0.0
  */
 class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -30,7 +28,6 @@ class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
      * @param PsrLogger $logger
      * @param ResolverInterface $localeResolver
      * @param DirectoryHelper $directoryHelper
-     * @since 2.0.0
      */
     public function __construct(
         MagentoTimezone $localeDate,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array|string $value
      * @return array|bool
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -75,7 +71,6 @@ public function validateValue($value)
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -88,7 +83,6 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -103,7 +97,6 @@ public function compactValue($value)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -116,7 +109,6 @@ public function restoreValue($value)
      * @param string $format
      * @return string|array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function outputValue($format = AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Select.php b/app/code/Magento/Customer/Model/Attribute/Data/Select.php
index 8eeb90a6ad446..26d42ca7d0ca0 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Select.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Select.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Select
  *
- * @since 2.0.0
  */
 class Select extends \Magento\Eav\Model\Attribute\Data\Select
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Text.php b/app/code/Magento/Customer/Model/Attribute/Data/Text.php
index 8cec496424852..1753b32ad84c3 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Text.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Text
  *
- * @since 2.0.0
  */
 class Text extends \Magento\Eav\Model\Attribute\Data\Text
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Textarea.php b/app/code/Magento/Customer/Model/Attribute/Data/Textarea.php
index 09994d70d2665..ffc4adb1db792 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Textarea.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Textarea.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Attribute\Data\Textarea
  *
- * @since 2.0.0
  */
 class Textarea extends \Magento\Eav\Model\Attribute\Data\Textarea
 {
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataConverter.php b/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
index 6740ba0758f6c..44d104659e069 100644
--- a/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
+++ b/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
@@ -12,31 +12,26 @@
 
 /**
  * Converter for AttributeMetadata
- * @since 2.0.0
  */
 class AttributeMetadataConverter
 {
     /**
      * @var OptionInterfaceFactory
-     * @since 2.0.0
      */
     private $optionFactory;
 
     /**
      * @var ValidationRuleInterfaceFactory
-     * @since 2.0.0
      */
     private $validationRuleFactory;
 
     /**
      * @var AttributeMetadataInterfaceFactory
-     * @since 2.0.0
      */
     private $attributeMetadataFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -47,7 +42,6 @@ class AttributeMetadataConverter
      * @param ValidationRuleInterfaceFactory $validationRuleFactory
      * @param AttributeMetadataInterfaceFactory $attributeMetadataFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         OptionInterfaceFactory $optionFactory,
@@ -66,7 +60,6 @@ public function __construct(
      *
      * @param \Magento\Customer\Model\Attribute $attribute
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface
-     * @since 2.0.0
      */
     public function createMetadataAttribute($attribute)
     {
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataDataProvider.php b/app/code/Magento/Customer/Model/AttributeMetadataDataProvider.php
index b4ff74bb0cdf6..a5c052ee67a58 100644
--- a/app/code/Magento/Customer/Model/AttributeMetadataDataProvider.php
+++ b/app/code/Magento/Customer/Model/AttributeMetadataDataProvider.php
@@ -10,25 +10,21 @@
 
 /**
  * Attribute Metadata data provider class
- * @since 2.0.0
  */
 class AttributeMetadataDataProvider
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Form\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     private $attrFormCollectionFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManager
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -38,7 +34,6 @@ class AttributeMetadataDataProvider
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Customer\Model\ResourceModel\Form\Attribute\CollectionFactory $attrFormCollectionFactory
      * @param \Magento\Store\Model\StoreManager $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
@@ -56,7 +51,6 @@ public function __construct(
      * @param string $entityType
      * @param string $attributeCode
      * @return false|AbstractAttribute
-     * @since 2.0.0
      */
     public function getAttribute($entityType, $attributeCode)
     {
@@ -70,7 +64,6 @@ public function getAttribute($entityType, $attributeCode)
      * @param int $attributeSetId
      * @param string|null $storeId
      * @return array Attribute codes
-     * @since 2.0.0
      */
     public function getAllAttributeCodes($entityType, $attributeSetId = 0, $storeId = null)
     {
@@ -92,7 +85,6 @@ public function getAllAttributeCodes($entityType, $attributeSetId = 0, $storeId
      * @param string $entityType
      * @param string $formCode
      * @return \Magento\Customer\Model\ResourceModel\Form\Attribute\Collection
-     * @since 2.0.0
      */
     public function loadAttributesCollection($entityType, $formCode)
     {
diff --git a/app/code/Magento/Customer/Model/Authentication.php b/app/code/Magento/Customer/Model/Authentication.php
index 9526567d5b438..1065bed92092d 100644
--- a/app/code/Magento/Customer/Model/Authentication.php
+++ b/app/code/Magento/Customer/Model/Authentication.php
@@ -64,7 +64,7 @@ class Authentication implements AuthenticationInterface
 
     /**
      * @var CustomerAuthUpdate
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $customerAuthUpdate;
 
@@ -195,8 +195,8 @@ public function authenticate($customerId, $password)
      * Get customer authentication update model
      *
      * @return \Magento\Customer\Model\CustomerAuthUpdate
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getCustomerAuthUpdate()
     {
diff --git a/app/code/Magento/Customer/Model/Authorization/CustomerSessionUserContext.php b/app/code/Magento/Customer/Model/Authorization/CustomerSessionUserContext.php
index d3ecec5fc8e03..c74060f2562ba 100644
--- a/app/code/Magento/Customer/Model/Authorization/CustomerSessionUserContext.php
+++ b/app/code/Magento/Customer/Model/Authorization/CustomerSessionUserContext.php
@@ -11,13 +11,11 @@
 
 /**
  * Session-based customer user context
- * @since 2.0.0
  */
 class CustomerSessionUserContext implements UserContextInterface
 {
     /**
      * @var CustomerSession
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -25,7 +23,6 @@ class CustomerSessionUserContext implements UserContextInterface
      * Initialize dependencies.
      *
      * @param CustomerSession $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         CustomerSession $customerSession
@@ -35,7 +32,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -44,7 +40,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
diff --git a/app/code/Magento/Customer/Model/Backend/Customer.php b/app/code/Magento/Customer/Model/Backend/Customer.php
index 2409f5af1b237..816b8d73914b1 100644
--- a/app/code/Magento/Customer/Model/Backend/Customer.php
+++ b/app/code/Magento/Customer/Model/Backend/Customer.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Model\Backend\Customer
  *
- * @since 2.0.0
  */
 class Customer extends \Magento\Customer\Model\Customer
 {
@@ -16,7 +15,6 @@ class Customer extends \Magento\Customer\Model\Customer
      * Get store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
diff --git a/app/code/Magento/Customer/Model/Cart/ConfigPlugin.php b/app/code/Magento/Customer/Model/Cart/ConfigPlugin.php
index 13dd498bfb020..94952c277f4cd 100644
--- a/app/code/Magento/Customer/Model/Cart/ConfigPlugin.php
+++ b/app/code/Magento/Customer/Model/Cart/ConfigPlugin.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Customer\Model\Cart\ConfigPlugin
  *
- * @since 2.0.0
  */
 class ConfigPlugin
 {
     /**
      * @var ConfigProvider
-     * @since 2.0.0
      */
     protected $configProvider;
 
     /**
      * @param ConfigProvider $configProvider
-     * @since 2.0.0
      */
     public function __construct(
         ConfigProvider $configProvider
@@ -36,7 +33,6 @@ public function __construct(
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetConfig(\Magento\Checkout\Block\Cart\Sidebar $subject, array $result)
     {
diff --git a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
index 8ed4ac0948fd7..e68df76f3cbc0 100644
--- a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
@@ -16,25 +16,21 @@
 /**
  * Class \Magento\Customer\Model\Checkout\ConfigProvider
  *
- * @since 2.0.0
  */
 class ConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -42,7 +38,6 @@ class ConfigProvider implements ConfigProviderInterface
      * @param UrlInterface $urlBuilder
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         UrlInterface $urlBuilder,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -72,7 +66,6 @@ public function getConfig()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function isAutocompleteEnabled()
     {
@@ -86,7 +79,6 @@ protected function isAutocompleteEnabled()
      * Returns URL to login controller action
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getLoginUrl()
     {
@@ -97,7 +89,6 @@ protected function getLoginUrl()
      * Whether redirect to login page is required
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isRedirectRequired()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index fe958b605bd13..fc0fa3ebc073d 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -11,19 +11,16 @@
  * Line count config model for customer address street attribute
  *
  * @method string getWebsiteCode()
- * @since 2.0.0
  */
 class Street extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -37,7 +34,6 @@ class Street extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Actions after save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -87,7 +82,6 @@ public function afterSave()
      * Processing object after delete data
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php b/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
index f843fe24f7b74..a1ca482be5f75 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Customer\Model\Config\Backend\CreateAccount\DisableAutoGroupAssignDefault
  *
- * @since 2.0.0
  */
 class DisableAutoGroupAssignDefault extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -27,7 +25,6 @@ class DisableAutoGroupAssignDefault extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Save EAV default value after save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php b/app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php
index 409e74cffe598..eb816fdd8362a 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php
@@ -9,7 +9,6 @@
  * Customer Reset Password Link Expiration period backend model
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Expirationperiod extends \Magento\Framework\App\Config\Value
 {
@@ -17,7 +16,6 @@ class Expirationperiod extends \Magento\Framework\App\Config\Value
      * Validate expiration period value before saving
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Address.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Address.php
index 556983985f2a1..e461643a23beb 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Address.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Address.php
@@ -11,7 +11,6 @@
  * Customer Show Address Model
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Address extends Customer
 {
@@ -19,7 +18,6 @@ class Address extends Customer
      * Retrieve attribute objects
      *
      * @return AbstractAttribute[]
-     * @since 2.0.0
      */
     protected function _getAttributeObjects()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
index 35fa30c5bcd5a..102a78d5ea3d2 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
@@ -11,19 +11,16 @@
  * Customer Show Customer Model
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -37,7 +34,6 @@ class Customer extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Retrieve attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributeCode()
     {
@@ -70,7 +65,6 @@ protected function _getAttributeCode()
      * Retrieve attribute objects
      *
      * @return AbstractAttribute[]
-     * @since 2.0.0
      */
     protected function _getAttributeObjects()
     {
@@ -81,7 +75,6 @@ protected function _getAttributeObjects()
      * Actions after save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -126,7 +119,6 @@ public function afterSave()
      * Processing object after delete data
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php
index b26477e4ccf22..e5dda28afa095 100644
--- a/app/code/Magento/Customer/Model/Config/Share.php
+++ b/app/code/Magento/Customer/Model/Config/Share.php
@@ -9,7 +9,6 @@
  * Customer sharing config model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Share extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Option\ArrayInterface
 {
@@ -29,13 +28,11 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $_customerResource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -51,7 +48,6 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -73,7 +69,6 @@ public function __construct(
      * Check whether current customers sharing scope is global
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGlobalScope()
     {
@@ -84,7 +79,6 @@ public function isGlobalScope()
      * Check whether current customers sharing scope is website
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWebsiteScope()
     {
@@ -98,7 +92,6 @@ public function isWebsiteScope()
      * Get possible sharing configuration options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -110,7 +103,6 @@ public function toOptionArray()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -134,7 +126,6 @@ public function beforeSave()
      *
      * @param int $websiteId the ID to use if website scope is on
      * @return int[]
-     * @since 2.0.0
      */
     public function getSharedWebsiteIds($websiteId)
     {
diff --git a/app/code/Magento/Customer/Model/Config/Source/Address/Type.php b/app/code/Magento/Customer/Model/Config/Source/Address/Type.php
index 6bf396f33206e..359c9298c804a 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Address/Type.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Address/Type.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Config\Source\Address\Type
  *
- * @since 2.0.0
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class Type implements \Magento\Framework\Option\ArrayInterface
      * Retrieve possible customer address types
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Source/Group.php b/app/code/Magento/Customer/Model/Config/Source/Group.php
index 751f263dc9f00..0efd97b527de6 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Group.php
@@ -12,27 +12,23 @@
 /**
  * Class \Magento\Customer\Model\Config\Source\Group
  *
- * @since 2.0.0
  */
 class Group implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @deprecated 2.2.0
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\Framework\Convert\DataObject
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -46,7 +42,6 @@ class Group implements \Magento\Framework\Option\ArrayInterface
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\Convert\DataObject $converter
      * @param GroupSourceLoggedInOnlyInterface $groupSourceForLoggedInCustomers
-     * @since 2.0.0
      */
     public function __construct(
         GroupManagementInterface $groupManagement,
@@ -61,7 +56,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
index 3e348554bbdb2..2e3b2c5b920ef 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Model\Config\Source\Group\Multiselect
  *
- * @since 2.0.0
  */
 class Multiselect implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,21 +19,18 @@ class Multiselect implements \Magento\Framework\Option\ArrayInterface
      * Customer groups options array
      *
      * @var null|array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @deprecated 2.2.0
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @deprecated 2.2.0
      * @var \Magento\Framework\Convert\DataObject
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -48,7 +44,6 @@ class Multiselect implements \Magento\Framework\Option\ArrayInterface
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\Convert\DataObject $converter
      * @param GroupSourceLoggedInOnlyInterface|null $groupSourceLoggedInOnly
-     * @since 2.0.0
      */
     public function __construct(
         GroupManagementInterface $groupManagement,
@@ -65,7 +60,6 @@ public function __construct(
      * Retrieve customer groups as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Customer/Model/Context.php b/app/code/Magento/Customer/Model/Context.php
index 8dcdd8d02d5ab..0a8abfa62fbaf 100644
--- a/app/code/Magento/Customer/Model/Context.php
+++ b/app/code/Magento/Customer/Model/Context.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Model\Context
  *
- * @since 2.0.0
  */
 class Context
 {
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index ccdf3f92b3a5b..c0991233327bb 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -40,7 +40,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\Model\AbstractModel
 {
@@ -84,7 +83,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Model event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'customer';
 
@@ -92,7 +90,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Name of the event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'customer';
 
@@ -100,7 +97,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * List of errors
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -108,7 +104,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Assoc array of customer attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -116,7 +111,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Customer addresses collection
      *
      * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     protected $_addressesCollection;
 
@@ -124,7 +118,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Is model deletable
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isDeleteable = true;
 
@@ -132,103 +125,86 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Is model readonly
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isReadonly = false;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var Share
-     * @since 2.0.0
      */
     protected $_configShare;
 
     /**
      * @var AddressFactory
-     * @since 2.0.0
      */
     protected $_addressFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_addressesFactory;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $_groupRepository;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -255,7 +231,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -307,7 +282,6 @@ public function __construct(
      * Initialize customer model
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -318,7 +292,6 @@ public function _construct()
      * Retrieve customer model with customer data
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getDataModel()
     {
@@ -344,7 +317,6 @@ public function getDataModel()
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function updateData($customer)
     {
@@ -386,7 +358,6 @@ public function updateData($customer)
      * Retrieve customer sharing configuration model
      *
      * @return Share
-     * @since 2.0.0
      */
     public function getSharingConfig()
     {
@@ -401,7 +372,6 @@ public function getSharingConfig()
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      * Use \Magento\Customer\Api\AccountManagementInterface::authenticate
-     * @since 2.0.0
      */
     public function authenticate($login, $password)
     {
@@ -429,7 +399,6 @@ public function authenticate($login, $password)
      *
      * @param   string $customerEmail
      * @return  $this
-     * @since 2.0.0
      */
     public function loadByEmail($customerEmail)
     {
@@ -442,7 +411,6 @@ public function loadByEmail($customerEmail)
      *
      * @param   string $newPassword
      * @return  $this
-     * @since 2.0.0
      */
     public function changePassword($newPassword)
     {
@@ -454,7 +422,6 @@ public function changePassword($newPassword)
      * Get full customer name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -479,7 +446,6 @@ public function getName()
      *
      * @param   Address $address
      * @return  $this
-     * @since 2.0.0
      */
     public function addAddress(Address $address)
     {
@@ -492,7 +458,6 @@ public function addAddress(Address $address)
      *
      * @param   int $addressId
      * @return  Address
-     * @since 2.0.0
      */
     public function getAddressById($addressId)
     {
@@ -504,7 +469,6 @@ public function getAddressById($addressId)
      *
      * @param int $addressId
      * @return Address
-     * @since 2.0.0
      */
     public function getAddressItemById($addressId)
     {
@@ -515,7 +479,6 @@ public function getAddressItemById($addressId)
      * Retrieve not loaded address collection
      *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     public function getAddressCollection()
     {
@@ -526,7 +489,6 @@ public function getAddressCollection()
      * Customer addresses collection
      *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     public function getAddressesCollection()
     {
@@ -548,7 +510,6 @@ public function getAddressesCollection()
      * Retrieve customer address array
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getAddresses()
     {
@@ -559,7 +520,6 @@ public function getAddresses()
      * Retrieve all customer attributes
      *
      * @return Attribute[]
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -574,7 +534,6 @@ public function getAttributes()
      *
      * @param   string $attributeCode
      * @return  \Magento\Customer\Model\ResourceModel\Attribute | null
-     * @since 2.0.0
      */
     public function getAttribute($attributeCode)
     {
@@ -590,7 +549,6 @@ public function getAttribute($attributeCode)
      *
      * @param string $password
      * @return $this
-     * @since 2.0.0
      */
     public function setPassword($password)
     {
@@ -605,7 +563,6 @@ public function setPassword($password)
      * @param string $password
      * @param bool|int|string $salt
      * @return string
-     * @since 2.0.0
      */
     public function hashPassword($password, $salt = true)
     {
@@ -617,7 +574,6 @@ public function hashPassword($password, $salt = true)
      *
      * @param string $password
      * @return boolean
-     * @since 2.0.0
      */
     public function validatePassword($password)
     {
@@ -633,7 +589,6 @@ public function validatePassword($password)
      *
      * @param   string $password
      * @return  string
-     * @since 2.0.0
      */
     public function encryptPassword($password)
     {
@@ -645,7 +600,6 @@ public function encryptPassword($password)
      *
      * @param   string $password
      * @return  string
-     * @since 2.0.0
      */
     public function decryptPassword($password)
     {
@@ -657,7 +611,6 @@ public function decryptPassword($password)
      *
      * @param   string $attributeCode address type attribute code
      * @return  Address|false
-     * @since 2.0.0
      */
     public function getPrimaryAddress($attributeCode)
     {
@@ -670,7 +623,6 @@ public function getPrimaryAddress($attributeCode)
      * Get customer default billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getPrimaryBillingAddress()
     {
@@ -681,7 +633,6 @@ public function getPrimaryBillingAddress()
      * Get customer default billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getDefaultBillingAddress()
     {
@@ -692,7 +643,6 @@ public function getDefaultBillingAddress()
      * Get default customer shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getPrimaryShippingAddress()
     {
@@ -703,7 +653,6 @@ public function getPrimaryShippingAddress()
      * Get default customer shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getDefaultShippingAddress()
     {
@@ -714,7 +663,6 @@ public function getDefaultShippingAddress()
      * Retrieve ids of default addresses
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPrimaryAddressIds()
     {
@@ -732,7 +680,6 @@ public function getPrimaryAddressIds()
      * Retrieve all customer default addresses
      *
      * @return Address[]
-     * @since 2.0.0
      */
     public function getPrimaryAddresses()
     {
@@ -759,7 +706,6 @@ public function getPrimaryAddresses()
      * Retrieve not default addresses
      *
      * @return Address[]
-     * @since 2.0.0
      */
     public function getAdditionalAddresses()
     {
@@ -778,7 +724,6 @@ public function getAdditionalAddresses()
      *
      * @param Address $address
      * @return boolean
-     * @since 2.0.0
      */
     public function isAddressPrimary(Address $address)
     {
@@ -796,7 +741,6 @@ public function isAddressPrimary(Address $address)
      * @param string $storeId
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeId = '0')
     {
@@ -826,7 +770,6 @@ public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeI
      * Check if accounts confirmation is required in config
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isConfirmationRequired()
     {
@@ -847,7 +790,6 @@ public function isConfirmationRequired()
      * Generate random confirmation key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRandomConfirmationKey()
     {
@@ -858,7 +800,6 @@ public function getRandomConfirmationKey()
      * Send email with new customer password
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendPasswordReminderEmail()
     {
@@ -880,7 +821,6 @@ public function sendPasswordReminderEmail()
      * @param array $templateParams
      * @param int|null $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function _sendEmailTemplate($template, $sender, $templateParams = [], $storeId = null)
     {
@@ -906,7 +846,6 @@ protected function _sendEmailTemplate($template, $sender, $templateParams = [],
      * Send email with reset password confirmation link
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendPasswordResetConfirmationEmail()
     {
@@ -929,7 +868,6 @@ public function sendPasswordResetConfirmationEmail()
      * Retrieve customer group identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getGroupId()
     {
@@ -949,7 +887,6 @@ public function getGroupId()
      * Retrieve customer tax class identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTaxClassId()
     {
@@ -964,7 +901,6 @@ public function getTaxClassId()
      * Retrieve store where customer was created
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -975,7 +911,6 @@ public function getStore()
      * Retrieve shared store ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSharedStoreIds()
     {
@@ -999,7 +934,6 @@ public function getSharedStoreIds()
      * Retrieve shared website ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getSharedWebsiteIds()
     {
@@ -1023,7 +957,6 @@ public function getSharedWebsiteIds()
      *
      * @param \Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore(\Magento\Store\Model\Store $store)
     {
@@ -1037,7 +970,6 @@ public function setStore(\Magento\Store\Model\Store $store)
      *
      * @deprecated 2.1.0
      * @return bool
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -1048,7 +980,6 @@ public function validate()
      * Unset subscription
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unsetSubscription()
     {
@@ -1062,7 +993,6 @@ public function unsetSubscription()
      * Clean all addresses
      *
      * @return void
-     * @since 2.0.0
      */
     public function cleanAllAddresses()
     {
@@ -1074,7 +1004,6 @@ public function cleanAllAddresses()
      *
      * @param mixed $error
      * @return $this
-     * @since 2.0.0
      */
     public function addError($error)
     {
@@ -1086,7 +1015,6 @@ public function addError($error)
      * Retrieve errors
      *
      * @return array
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -1097,7 +1025,6 @@ public function getErrors()
      * Reset errors array
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetErrors()
     {
@@ -1109,7 +1036,6 @@ public function resetErrors()
      * Prepare customer for delete
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -1121,7 +1047,6 @@ public function beforeDelete()
      * Processing object after save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -1136,7 +1061,6 @@ public function afterSave()
      * Init indexing process after customer delete
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -1148,7 +1072,6 @@ public function afterDeleteCommit()
      * Init indexing process after customer save
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindex()
     {
@@ -1161,7 +1084,6 @@ public function reindex()
      * Get customer created at date timestamp
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCreatedAtTimestamp()
     {
@@ -1176,7 +1098,6 @@ public function getCreatedAtTimestamp()
      * Reset all model data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -1191,7 +1112,6 @@ public function reset()
      * Checks model is deletable
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isDeleteable()
     {
@@ -1203,7 +1123,6 @@ public function isDeleteable()
      *
      * @param boolean $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDeleteable($value)
     {
@@ -1215,7 +1134,6 @@ public function setIsDeleteable($value)
      * Checks model is readonly
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -1227,7 +1145,6 @@ public function isReadonly()
      *
      * @param boolean $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIsReadonly($value)
     {
@@ -1239,7 +1156,6 @@ public function setIsReadonly($value)
      * Check whether confirmation may be skipped when registering using certain email address
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function canSkipConfirmation()
     {
@@ -1262,7 +1178,6 @@ protected function canSkipConfirmation()
      * Clone current object
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -1279,7 +1194,6 @@ public function __clone()
      * Return Entity Type instance
      *
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -1292,7 +1206,6 @@ public function getEntityType()
      * @param int|string|null $defaultStoreId
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getWebsiteStoreId($defaultStoreId = null)
     {
@@ -1312,7 +1225,6 @@ protected function _getWebsiteStoreId($defaultStoreId = null)
      * @param string $passwordLinkToken
      * @return $this
      * @throws \Magento\Framework\Exception\AuthenticationException
-     * @since 2.0.0
      */
     public function changeResetPasswordLinkToken($passwordLinkToken)
     {
@@ -1329,7 +1241,6 @@ public function changeResetPasswordLinkToken($passwordLinkToken)
      * Check if current reset password link token is expired
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isResetPasswordLinkTokenExpired()
     {
@@ -1360,7 +1271,6 @@ public function isResetPasswordLinkTokenExpired()
      * Retrieve customer reset password link expiration period in days
      *
      * @return int
-     * @since 2.0.0
      */
     public function getResetPasswordLinkExpirationPeriod()
     {
@@ -1372,7 +1282,6 @@ public function getResetPasswordLinkExpirationPeriod()
 
     /**
      * @return Address
-     * @since 2.0.0
      */
     protected function _createAddressInstance()
     {
@@ -1381,7 +1290,6 @@ protected function _createAddressInstance()
 
     /**
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     protected function _createAddressCollection()
     {
@@ -1390,7 +1298,6 @@ protected function _createAddressCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getTemplateTypes()
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Billing.php
index 5f12428f095b8..8aefd506194fc 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Billing.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Billing.php
@@ -9,14 +9,12 @@
  * Customer default billing address backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Billing extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -29,7 +27,6 @@ public function beforeSave($object)
     /**
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
index 6c506970162f4..a7542540a211c 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -10,7 +10,6 @@
 /**
  * @deprecated 2.2.0
  * Customer password attribute backend
- * @since 2.0.0
  */
 class Password extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -23,13 +22,11 @@ class Password extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacke
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\StringUtils $string)
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Framework\Stdlib\StringUtils $string)
      * @param \Magento\Framework\DataObject $object
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -70,7 +66,6 @@ public function beforeSave($object)
      * @deprecated 2.2.0
      * @param \Magento\Framework\DataObject $object
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Shipping.php
index 0684b9b882a3e..5fcb5189c0740 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Shipping.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Shipping.php
@@ -9,14 +9,12 @@
  * Customer default shipping address backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -29,7 +27,6 @@ public function beforeSave($object)
     /**
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
index 0f085299cb93d..34374e1bfbf60 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -9,19 +9,16 @@
  * Store attribute backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
index 20b8b26834902..94152b054d688 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -9,19 +9,16 @@
  * Website attribute backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
index 10bcf1fe85cf5..e70fc30d7a528 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
@@ -11,19 +11,16 @@
  * Customer group attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Group extends \Magento\Eav\Model\Entity\Attribute\Source\Table implements GroupSourceLoggedInOnlyInterface
 {
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @var \Magento\Framework\Convert\DataObject
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -32,7 +29,6 @@ class Group extends \Magento\Eav\Model\Entity\Attribute\Source\Table implements
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\Convert\DataObject $converter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
index 53fa816f0d227..1845ba36d46c1 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
@@ -9,19 +9,16 @@
  * Customer store attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_store;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storesFactory;
 
@@ -30,7 +27,6 @@ class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param \Magento\Store\Model\System\Store $store
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -65,7 +60,6 @@ public function getAllOptions()
     /**
      * @param string $value
      * @return array|string
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -102,7 +96,6 @@ public function getOptionText($value)
 
     /**
      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     protected function _createStoresCollection()
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
index ff722081ba15c..d670ed73db654 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
@@ -9,13 +9,11 @@
  * Customer website attribute source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Website extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -23,7 +21,6 @@ class Website extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param \Magento\Store\Model\System\Store $store
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -50,7 +46,6 @@ public function getAllOptions()
     /**
      * @param int|string $value
      * @return string|false
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
index 201221ee4dbb9..7cb797a4292f4 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -33,7 +33,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
@@ -44,25 +43,21 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 
     /**
      * @var Collection
-     * @since 2.0.0
      */
     protected $collection;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var FilterPool
-     * @since 2.0.0
      */
     protected $filterPool;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $loadedData;
 
@@ -74,14 +69,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 
     /**
      * @var \Magento\Customer\Model\Config\Share
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shareConfig;
 
     /**
      * EAV attribute properties to fetch from meta storage
      * @var array
-     * @since 2.0.0
      */
     protected $metaProperties = [
         'dataType' => 'frontend_input',
@@ -98,7 +92,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * Form element mapping
      *
      * @var array
-     * @since 2.0.0
      */
     protected $formElement = [
         'text' => 'input',
@@ -108,7 +101,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 
     /**
      * @var EavValidationRules
-     * @since 2.0.0
      */
     protected $eavValidationRules;
 
@@ -120,7 +112,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 
     /**
      * @var FileProcessorFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileProcessorFactory;
 
@@ -128,7 +120,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * File types allowed for file_uploader UI component
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileUploaderTypes = [
         'image',
@@ -163,7 +155,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param array $data
      * @param bool $allowToShowHiddenAttributes
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -201,7 +192,7 @@ public function __construct(
      *
      * @return SessionManagerInterface
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @since 2.1.0
      */
     protected function getSession()
@@ -218,7 +209,6 @@ protected function getSession()
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -264,7 +254,7 @@ public function getData()
      * @param Customer|Address $entity
      * @param array $entityData
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function overrideFileUploaderData($entity, array &$entityData)
     {
@@ -289,7 +279,7 @@ private function overrideFileUploaderData($entity, array &$entityData)
      * @param array $customerData
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getFileUploaderData(
         Type $entityType,
@@ -333,7 +323,6 @@ private function getFileUploaderData(
      * @param Type $entityType
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getAttributesMeta(Type $entityType)
     {
@@ -442,9 +431,9 @@ private function getCountryWithWebsiteSource()
     /**
      * Retrieve Customer Config Share
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return \Magento\Customer\Model\Config\Share
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getShareConfig()
     {
@@ -460,7 +449,7 @@ private function getShareConfig()
      *
      * @param array $meta
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function processWebsiteMeta(&$meta)
     {
@@ -485,7 +474,7 @@ private function processWebsiteMeta(&$meta)
      * @param AbstractAttribute $attribute
      * @param array $config
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function overrideFileUploaderMetadata(
         Type $entityType,
@@ -537,7 +526,7 @@ private function overrideFileUploaderMetadata(
      * @param string $name
      * @param mixed $default
      * @return mixed
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getMetadataValue($config, $name, $default = null)
     {
@@ -550,7 +539,7 @@ private function getMetadataValue($config, $name, $default = null)
      *
      * @param string $entityTypeCode
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getFileUploadUrl($entityTypeCode)
     {
@@ -597,7 +586,6 @@ private function processFrontendInput(AttributeInterface $attribute, array &$met
      * @param array $addresses
      * @param array $customer
      * @return void
-     * @since 2.0.0
      */
     protected function prepareAddressData($addressId, array &$addresses, array $customer)
     {
@@ -621,8 +609,8 @@ protected function prepareAddressData($addressId, array &$addresses, array $cust
      *
      * @return FileProcessorFactory
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getFileProcessorFactory()
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Mapper.php b/app/code/Magento/Customer/Model/Customer/Mapper.php
index aaf48d74b2f64..6512e6ca897d3 100644
--- a/app/code/Magento/Customer/Model/Customer/Mapper.php
+++ b/app/code/Magento/Customer/Model/Customer/Mapper.php
@@ -14,19 +14,16 @@
 
 /**
  * Class Mapper converts Address Service Data Object to an array
- * @since 2.0.0
  */
 class Mapper
 {
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     private $extensibleDataObjectConverter;
 
     /**
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
-     * @since 2.0.0
      */
     public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectConverter)
     {
@@ -38,7 +35,6 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      *
      * @param CustomerInterface $customer
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray(CustomerInterface $customer)
     {
diff --git a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
index 7f44ac442233e..29b14494bc250 100644
--- a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
+++ b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
@@ -8,26 +8,26 @@
 
 /**
  * Customer Authentication update model.
- * @since 2.2.0
+ * @since 2.1.1
  */
 class CustomerAuthUpdate
 {
     /**
      * @var \Magento\Customer\Model\CustomerRegistry
-     * @since 2.2.0
+     * @since 2.1.1
      */
     protected $customerRegistry;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.2.0
+     * @since 2.1.1
      */
     protected $customerResourceModel;
 
     /**
      * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
      * @param \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Customer\Model\CustomerRegistry $customerRegistry,
@@ -42,7 +42,7 @@ public function __construct(
      *
      * @param int $customerId
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function saveAuth($customerId)
     {
diff --git a/app/code/Magento/Customer/Model/CustomerExtractor.php b/app/code/Magento/Customer/Model/CustomerExtractor.php
index d1a21cfa9f300..32565c869b9b6 100644
--- a/app/code/Magento/Customer/Model/CustomerExtractor.php
+++ b/app/code/Magento/Customer/Model/CustomerExtractor.php
@@ -14,37 +14,31 @@
 /**
  * Class \Magento\Customer\Model\CustomerExtractor
  *
- * @since 2.0.0
  */
 class CustomerExtractor
 {
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $formFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $customerGroupManagement;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -54,7 +48,6 @@ class CustomerExtractor
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GroupManagementInterface $customerGroupManagement
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Metadata\FormFactory $formFactory,
@@ -75,7 +68,6 @@ public function __construct(
      * @param RequestInterface $request
      * @param array $attributeValues
      * @return CustomerInterface
-     * @since 2.0.0
      */
     public function extract(
         $formCode,
diff --git a/app/code/Magento/Customer/Model/CustomerManagement.php b/app/code/Magento/Customer/Model/CustomerManagement.php
index d41253a82724f..d6ff1e696ef0d 100644
--- a/app/code/Magento/Customer/Model/CustomerManagement.php
+++ b/app/code/Magento/Customer/Model/CustomerManagement.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Customer\Model\CustomerManagement
  *
- * @since 2.0.0
  */
 class CustomerManagement implements CustomerManagementInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $customersFactory;
 
     /**
      * @param CollectionFactory $customersFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $customersFactory)
     {
@@ -32,7 +29,6 @@ public function __construct(CollectionFactory $customersFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
index 2d9d754e5540e..b89cce8957487 100644
--- a/app/code/Magento/Customer/Model/CustomerRegistry.php
+++ b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -13,7 +13,6 @@
 
 /**
  * Registry for \Magento\Customer\Model\Customer
- * @since 2.0.0
  */
 class CustomerRegistry
 {
@@ -21,37 +20,31 @@ class CustomerRegistry
 
     /**
      * @var CustomerFactory
-     * @since 2.0.0
      */
     private $customerFactory;
 
     /**
      * @var CustomerSecureFactory
-     * @since 2.0.0
      */
     private $customerSecureFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $customerRegistryById = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $customerRegistryByEmail = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $customerSecureRegistryById = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -61,7 +54,6 @@ class CustomerRegistry
      * @param CustomerFactory $customerFactory
      * @param CustomerSecureFactory $customerSecureFactory
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         CustomerFactory $customerFactory,
@@ -79,7 +71,6 @@ public function __construct(
      * @param string $customerId
      * @return Customer
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieve($customerId)
     {
@@ -106,7 +97,6 @@ public function retrieve($customerId)
      * @param string|null $websiteId Optional website ID, if not set, will use the current websiteId
      * @return Customer
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieveByEmail($customerEmail, $websiteId = null)
     {
@@ -152,7 +142,6 @@ public function retrieveByEmail($customerEmail, $websiteId = null)
      * @param int $customerId
      * @return CustomerSecure
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieveSecureData($customerId)
     {
@@ -180,7 +169,6 @@ public function retrieveSecureData($customerId)
      *
      * @param int $customerId
      * @return void
-     * @since 2.0.0
      */
     public function remove($customerId)
     {
@@ -200,7 +188,6 @@ public function remove($customerId)
      * @param string $customerEmail Customers email address
      * @param string|null $websiteId Optional website ID, if not set, will use the current websiteId
      * @return void
-     * @since 2.0.0
      */
     public function removeByEmail($customerEmail, $websiteId = null)
     {
@@ -223,7 +210,6 @@ public function removeByEmail($customerEmail, $websiteId = null)
      * @param string $customerEmail
      * @param string $websiteId
      * @return string
-     * @since 2.0.0
      */
     protected function getEmailKey($customerEmail, $websiteId)
     {
@@ -235,7 +221,6 @@ protected function getEmailKey($customerEmail, $websiteId)
      *
      * @param Customer $customer
      * @return $this
-     * @since 2.0.0
      */
     public function push(Customer $customer)
     {
diff --git a/app/code/Magento/Customer/Model/Data/Address.php b/app/code/Magento/Customer/Model/Data/Address.php
index 99b1652e39fee..6c0eb1991c3bd 100644
--- a/app/code/Magento/Customer/Model/Data/Address.php
+++ b/app/code/Magento/Customer/Model/Data/Address.php
@@ -15,14 +15,12 @@
  *
  *
  * @api
- * @since 2.0.0
  */
 class Address extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Customer\Api\Data\AddressInterface
 {
     /**
      * @var \Magento\Customer\Api\AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
@@ -31,7 +29,6 @@ class Address extends \Magento\Framework\Api\AbstractExtensibleObject implements
      * @param AttributeValueFactory $attributeValueFactory
      * @param \Magento\Customer\Api\AddressMetadataInterface $metadataService
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -59,7 +55,6 @@ protected function getCustomAttributesCodes()
      * Get id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -70,7 +65,6 @@ public function getId()
      * Get region
      *
      * @return \Magento\Customer\Api\Data\RegionInterface|null
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -81,7 +75,6 @@ public function getRegion()
      * Get region ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -92,7 +85,6 @@ public function getRegionId()
      * Get country id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -103,7 +95,6 @@ public function getCountryId()
      * Get street
      *
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getStreet()
     {
@@ -114,7 +105,6 @@ public function getStreet()
      * Get company
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCompany()
     {
@@ -125,7 +115,6 @@ public function getCompany()
      * Get telephone number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTelephone()
     {
@@ -136,7 +125,6 @@ public function getTelephone()
      * Get fax number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFax()
     {
@@ -147,7 +135,6 @@ public function getFax()
      * Get postcode
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -158,7 +145,6 @@ public function getPostcode()
      * Get city name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCity()
     {
@@ -169,7 +155,6 @@ public function getCity()
      * Get first name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -180,7 +165,6 @@ public function getFirstname()
      * Get last name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -191,7 +175,6 @@ public function getLastname()
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -202,7 +185,6 @@ public function getMiddlename()
      * Get prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -213,7 +195,6 @@ public function getPrefix()
      * Get suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -224,7 +205,6 @@ public function getSuffix()
      * Get Vat id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getVatId()
     {
@@ -235,7 +215,6 @@ public function getVatId()
      * Get customer id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -246,7 +225,6 @@ public function getCustomerId()
      * Get if this address is default shipping address.
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isDefaultShipping()
     {
@@ -257,7 +235,6 @@ public function isDefaultShipping()
      * Get if this address is default billing address
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function isDefaultBilling()
     {
@@ -269,7 +246,6 @@ public function isDefaultBilling()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -281,7 +257,6 @@ public function setId($id)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -293,7 +268,6 @@ public function setCustomerId($customerId)
      *
      * @param \Magento\Customer\Api\Data\RegionInterface $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion(RegionInterface $region = null)
     {
@@ -305,7 +279,6 @@ public function setRegion(RegionInterface $region = null)
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId)
     {
@@ -317,7 +290,6 @@ public function setRegionId($regionId)
      *
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($countryId)
     {
@@ -329,7 +301,6 @@ public function setCountryId($countryId)
      *
      * @param string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreet(array $street)
     {
@@ -341,7 +312,6 @@ public function setStreet(array $street)
      *
      * @param string $company
      * @return $this
-     * @since 2.0.0
      */
     public function setCompany($company)
     {
@@ -353,7 +323,6 @@ public function setCompany($company)
      *
      * @param string $telephone
      * @return $this
-     * @since 2.0.0
      */
     public function setTelephone($telephone)
     {
@@ -365,7 +334,6 @@ public function setTelephone($telephone)
      *
      * @param string $fax
      * @return $this
-     * @since 2.0.0
      */
     public function setFax($fax)
     {
@@ -377,7 +345,6 @@ public function setFax($fax)
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode)
     {
@@ -389,7 +356,6 @@ public function setPostcode($postcode)
      *
      * @param string $city
      * @return $this
-     * @since 2.0.0
      */
     public function setCity($city)
     {
@@ -401,7 +367,6 @@ public function setCity($city)
      *
      * @param string $firstName
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstName)
     {
@@ -413,7 +378,6 @@ public function setFirstname($firstName)
      *
      * @param string $lastName
      * @return $this
-     * @since 2.0.0
      */
     public function setLastname($lastName)
     {
@@ -425,7 +389,6 @@ public function setLastname($lastName)
      *
      * @param string $middleName
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middleName)
     {
@@ -437,7 +400,6 @@ public function setMiddlename($middleName)
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -449,7 +411,6 @@ public function setPrefix($prefix)
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -461,7 +422,6 @@ public function setSuffix($suffix)
      *
      * @param string $vatId
      * @return $this
-     * @since 2.0.0
      */
     public function setVatId($vatId)
     {
@@ -473,7 +433,6 @@ public function setVatId($vatId)
      *
      * @param bool $isDefaultShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefaultShipping($isDefaultShipping)
     {
@@ -485,7 +444,6 @@ public function setIsDefaultShipping($isDefaultShipping)
      *
      * @param bool $isDefaultBilling
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefaultBilling($isDefaultBilling)
     {
@@ -496,7 +454,6 @@ public function setIsDefaultBilling($isDefaultBilling)
      * {@inheritdoc}
      *
      * @return \Magento\Customer\Api\Data\AddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -508,7 +465,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Customer/Model/Data/AttributeMetadata.php b/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
index f0e88a3772c79..d262d0c933327 100644
--- a/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
+++ b/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
@@ -10,7 +10,6 @@
 
 /**
  * Customer attribute metadata class.
- * @since 2.0.0
  */
 class AttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Customer\Api\Data\AttributeMetadataInterface,
@@ -18,7 +17,6 @@ class AttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject impl
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -27,7 +25,6 @@ public function getAttributeCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendInput()
     {
@@ -36,7 +33,6 @@ public function getFrontendInput()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getInputFilter()
     {
@@ -45,7 +41,6 @@ public function getInputFilter()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreLabel()
     {
@@ -54,7 +49,6 @@ public function getStoreLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValidationRules()
     {
@@ -63,7 +57,6 @@ public function getValidationRules()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMultilineCount()
     {
@@ -72,7 +65,6 @@ public function getMultilineCount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isVisible()
     {
@@ -81,7 +73,6 @@ public function isVisible()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isRequired()
     {
@@ -90,7 +81,6 @@ public function isRequired()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataModel()
     {
@@ -99,7 +89,6 @@ public function getDataModel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -108,7 +97,6 @@ public function getOptions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendClass()
     {
@@ -117,7 +105,6 @@ public function getFrontendClass()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isUserDefined()
     {
@@ -126,7 +113,6 @@ public function isUserDefined()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -135,7 +121,6 @@ public function getSortOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendLabel()
     {
@@ -144,7 +129,6 @@ public function getFrontendLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNote()
     {
@@ -153,7 +137,6 @@ public function getNote()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isSystem()
     {
@@ -162,7 +145,6 @@ public function isSystem()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBackendType()
     {
@@ -174,7 +156,6 @@ public function getBackendType()
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode)
     {
@@ -186,7 +167,6 @@ public function setAttributeCode($attributeCode)
      *
      * @param string $frontendInput
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendInput($frontendInput)
     {
@@ -198,7 +178,6 @@ public function setFrontendInput($frontendInput)
      *
      * @param string $inputFilter
      * @return $this
-     * @since 2.0.0
      */
     public function setInputFilter($inputFilter)
     {
@@ -210,7 +189,6 @@ public function setInputFilter($inputFilter)
      *
      * @param string $storeLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabel($storeLabel)
     {
@@ -222,7 +200,6 @@ public function setStoreLabel($storeLabel)
      *
      * @param \Magento\Customer\Api\Data\ValidationRuleInterface[] $validationRules
      * @return $this
-     * @since 2.0.0
      */
     public function setValidationRules(array $validationRules)
     {
@@ -234,7 +211,6 @@ public function setValidationRules(array $validationRules)
      *
      * @param int $multilineCount
      * @return $this
-     * @since 2.0.0
      */
     public function setMultilineCount($multilineCount)
     {
@@ -246,7 +222,6 @@ public function setMultilineCount($multilineCount)
      *
      * @param bool $isVisible
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisible($isVisible)
     {
@@ -258,7 +233,6 @@ public function setIsVisible($isVisible)
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRequired($isRequired)
     {
@@ -270,7 +244,6 @@ public function setIsRequired($isRequired)
      *
      * @param string $dataModel
      * @return $this
-     * @since 2.0.0
      */
     public function setDataModel($dataModel)
     {
@@ -282,7 +255,6 @@ public function setDataModel($dataModel)
      *
      * @param \Magento\Customer\Api\Data\OptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null)
     {
@@ -294,7 +266,6 @@ public function setOptions(array $options = null)
      *
      * @param string $frontendClass
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendClass($frontendClass)
     {
@@ -306,7 +277,6 @@ public function setFrontendClass($frontendClass)
      *
      * @param bool $isUserDefined
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUserDefined($isUserDefined)
     {
@@ -318,7 +288,6 @@ public function setIsUserDefined($isUserDefined)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -330,7 +299,6 @@ public function setSortOrder($sortOrder)
      *
      * @param string $frontendLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendLabel($frontendLabel)
     {
@@ -342,7 +310,6 @@ public function setFrontendLabel($frontendLabel)
      *
      * @param string $note
      * @return $this
-     * @since 2.0.0
      */
     public function setNote($note)
     {
@@ -354,7 +321,6 @@ public function setNote($note)
      *
      * @param bool $isSystem
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSystem($isSystem)
     {
@@ -366,7 +332,6 @@ public function setIsSystem($isSystem)
      *
      * @param string $backendType
      * @return $this
-     * @since 2.0.0
      */
     public function setBackendType($backendType)
     {
@@ -375,7 +340,6 @@ public function setBackendType($backendType)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getIsUsedInGrid()
     {
@@ -384,7 +348,6 @@ public function getIsUsedInGrid()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getIsVisibleInGrid()
     {
@@ -393,7 +356,6 @@ public function getIsVisibleInGrid()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getIsFilterableInGrid()
     {
@@ -402,7 +364,6 @@ public function getIsFilterableInGrid()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getIsSearchableInGrid()
     {
@@ -411,7 +372,6 @@ public function getIsSearchableInGrid()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setIsUsedInGrid($isUsedInGrid)
     {
@@ -420,7 +380,6 @@ public function setIsUsedInGrid($isUsedInGrid)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setIsVisibleInGrid($isVisibleInGrid)
     {
@@ -429,7 +388,6 @@ public function setIsVisibleInGrid($isVisibleInGrid)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setIsFilterableInGrid($isFilterableInGrid)
     {
@@ -438,7 +396,6 @@ public function setIsFilterableInGrid($isFilterableInGrid)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setIsSearchableInGrid($isSearchableInGrid)
     {
diff --git a/app/code/Magento/Customer/Model/Data/Customer.php b/app/code/Magento/Customer/Model/Data/Customer.php
index 98e25293028a8..7a135904f6663 100644
--- a/app/code/Magento/Customer/Model/Data/Customer.php
+++ b/app/code/Magento/Customer/Model/Data/Customer.php
@@ -11,14 +11,12 @@
 /**
  * Class Customer
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Customer\Api\Data\CustomerInterface
 {
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $metadataService;
 
@@ -29,7 +27,6 @@ class Customer extends \Magento\Framework\Api\AbstractExtensibleObject implement
      * @param AttributeValueFactory $attributeValueFactory
      * @param \Magento\Customer\Api\CustomerMetadataInterface $metadataService
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
@@ -43,7 +40,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -55,7 +51,6 @@ protected function getCustomAttributesCodes()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultBilling()
     {
@@ -66,7 +61,6 @@ public function getDefaultBilling()
      * Get default shipping address id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultShipping()
     {
@@ -77,7 +71,6 @@ public function getDefaultShipping()
      * Get confirmation
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfirmation()
     {
@@ -88,7 +81,6 @@ public function getConfirmation()
      * Get created at time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -99,7 +91,6 @@ public function getCreatedAt()
      * Get created in area
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedIn()
     {
@@ -110,7 +101,6 @@ public function getCreatedIn()
      * Get updated at time
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -121,7 +111,6 @@ public function getUpdatedAt()
      * Get date of birth
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDob()
     {
@@ -132,7 +121,6 @@ public function getDob()
      * Get email address
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -143,7 +131,6 @@ public function getEmail()
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -154,7 +141,6 @@ public function getFirstname()
      * Get gender
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGender()
     {
@@ -165,7 +151,6 @@ public function getGender()
      * Get group id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGroupId()
     {
@@ -176,7 +161,6 @@ public function getGroupId()
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -187,7 +171,6 @@ public function getId()
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -198,7 +181,6 @@ public function getLastname()
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -209,7 +191,6 @@ public function getMiddlename()
      * Get prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -220,7 +201,6 @@ public function getPrefix()
      * Get store id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -231,7 +211,6 @@ public function getStoreId()
      * Get suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -242,7 +221,6 @@ public function getSuffix()
      * Get tax Vat.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxvat()
     {
@@ -253,7 +231,6 @@ public function getTaxvat()
      * Get website id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -264,7 +241,6 @@ public function getWebsiteId()
      * Get addresses
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|null
-     * @since 2.0.0
      */
     public function getAddresses()
     {
@@ -275,7 +251,6 @@ public function getAddresses()
      * Get disable auto group change flag.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getDisableAutoGroupChange()
     {
@@ -287,7 +262,6 @@ public function getDisableAutoGroupChange()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -299,7 +273,6 @@ public function setId($id)
      *
      * @param int $groupId
      * @return $this
-     * @since 2.0.0
      */
     public function setGroupId($groupId)
     {
@@ -311,7 +284,6 @@ public function setGroupId($groupId)
      *
      * @param string $defaultBilling
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultBilling($defaultBilling)
     {
@@ -323,7 +295,6 @@ public function setDefaultBilling($defaultBilling)
      *
      * @param string $defaultShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultShipping($defaultShipping)
     {
@@ -335,7 +306,6 @@ public function setDefaultShipping($defaultShipping)
      *
      * @param string $confirmation
      * @return $this
-     * @since 2.0.0
      */
     public function setConfirmation($confirmation)
     {
@@ -347,7 +317,6 @@ public function setConfirmation($confirmation)
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -359,7 +328,6 @@ public function setCreatedAt($createdAt)
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -371,7 +339,6 @@ public function setUpdatedAt($updatedAt)
      *
      * @param string $createdIn
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedIn($createdIn)
     {
@@ -383,7 +350,6 @@ public function setCreatedIn($createdIn)
      *
      * @param string $dob
      * @return $this
-     * @since 2.0.0
      */
     public function setDob($dob)
     {
@@ -395,7 +361,6 @@ public function setDob($dob)
      *
      * @param string $email
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($email)
     {
@@ -407,7 +372,6 @@ public function setEmail($email)
      *
      * @param string $firstname
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstname)
     {
@@ -419,7 +383,6 @@ public function setFirstname($firstname)
      *
      * @param string $lastname
      * @return string
-     * @since 2.0.0
      */
     public function setLastname($lastname)
     {
@@ -431,7 +394,6 @@ public function setLastname($lastname)
      *
      * @param string $middlename
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middlename)
     {
@@ -443,7 +405,6 @@ public function setMiddlename($middlename)
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -455,7 +416,6 @@ public function setPrefix($prefix)
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -467,7 +427,6 @@ public function setSuffix($suffix)
      *
      * @param string $gender
      * @return $this
-     * @since 2.0.0
      */
     public function setGender($gender)
     {
@@ -479,7 +438,6 @@ public function setGender($gender)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -491,7 +449,6 @@ public function setStoreId($storeId)
      *
      * @param string $taxvat
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxvat($taxvat)
     {
@@ -503,7 +460,6 @@ public function setTaxvat($taxvat)
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -515,7 +471,6 @@ public function setWebsiteId($websiteId)
      *
      * @param \Magento\Customer\Api\Data\AddressInterface[] $addresses
      * @return $this
-     * @since 2.0.0
      */
     public function setAddresses(array $addresses = null)
     {
@@ -527,7 +482,6 @@ public function setAddresses(array $addresses = null)
      *
      * @param int $disableAutoGroupChange
      * @return $this
-     * @since 2.0.0
      */
     public function setDisableAutoGroupChange($disableAutoGroupChange)
     {
@@ -538,7 +492,6 @@ public function setDisableAutoGroupChange($disableAutoGroupChange)
      * {@inheritdoc}
      *
      * @return \Magento\Customer\Api\Data\CustomerExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -550,7 +503,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Customer\Api\Data\CustomerExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\CustomerExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Customer/Model/Data/CustomerSecure.php b/app/code/Magento/Customer/Model/Data/CustomerSecure.php
index b8b6a8e003a12..173533e8da4d5 100644
--- a/app/code/Magento/Customer/Model/Data/CustomerSecure.php
+++ b/app/code/Magento/Customer/Model/Data/CustomerSecure.php
@@ -17,7 +17,6 @@
  * @method setRpTokenCreatedAt(string $rpTokenCreatedAt)
  * @method setPasswordHash(string $hashedPassword)
  * @method setDeleteable(bool $deleteable)
- * @since 2.0.0
  */
 class CustomerSecure extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Customer/Model/Data/Group.php b/app/code/Magento/Customer/Model/Data/Group.php
index 3a136acefd558..73eb74ba1b770 100644
--- a/app/code/Magento/Customer/Model/Data/Group.php
+++ b/app/code/Magento/Customer/Model/Data/Group.php
@@ -8,7 +8,6 @@
 
 /**
  * Customer Group data model.
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Customer\Api\Data\GroupInterface
@@ -17,7 +16,6 @@ class Group extends \Magento\Framework\Api\AbstractExtensibleObject implements
      * Get ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -28,7 +26,6 @@ public function getId()
      * Get code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -39,7 +36,6 @@ public function getCode()
      * Get tax class ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTaxClassId()
     {
@@ -50,7 +46,6 @@ public function getTaxClassId()
      * Get tax class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxClassName()
     {
@@ -62,7 +57,6 @@ public function getTaxClassName()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -74,7 +68,6 @@ public function setId($id)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -86,7 +79,6 @@ public function setCode($code)
      *
      * @param int $taxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassId($taxClassId)
     {
@@ -98,7 +90,6 @@ public function setTaxClassId($taxClassId)
      *
      * @param string $taxClassName
      * @return string|null
-     * @since 2.0.0
      */
     public function setTaxClassName($taxClassName)
     {
@@ -109,7 +100,6 @@ public function setTaxClassName($taxClassName)
      * {@inheritdoc}
      *
      * @return \Magento\Customer\Api\Data\GroupExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -121,7 +111,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Customer\Api\Data\GroupExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\GroupExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Customer/Model/Data/Option.php b/app/code/Magento/Customer/Model/Data/Option.php
index fdd5e8e99389b..03d59557129d5 100644
--- a/app/code/Magento/Customer/Model/Data/Option.php
+++ b/app/code/Magento/Customer/Model/Data/Option.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Option
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Customer\Api\Data\OptionInterface
@@ -19,7 +18,6 @@ class Option extends \Magento\Framework\Api\AbstractSimpleObject implements
      * Get option label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -30,7 +28,6 @@ public function getLabel()
      * Get option value
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -41,7 +38,6 @@ public function getValue()
      * Get nested options
      *
      * @return \Magento\Customer\Api\Data\OptionInterface[]|null
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -53,7 +49,6 @@ public function getOptions()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -65,7 +60,6 @@ public function setLabel($label)
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -77,7 +71,6 @@ public function setValue($value)
      *
      * @param \Magento\Customer\Api\Data\OptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null)
     {
diff --git a/app/code/Magento/Customer/Model/Data/Region.php b/app/code/Magento/Customer/Model/Data/Region.php
index 0a778ba47297c..54cbcc13e1a2f 100644
--- a/app/code/Magento/Customer/Model/Data/Region.php
+++ b/app/code/Magento/Customer/Model/Data/Region.php
@@ -8,7 +8,6 @@
 /**
  * Data Model implementing Address Region interface
  *
- * @since 2.0.0
  */
 class Region extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Customer\Api\Data\RegionInterface
@@ -17,7 +16,6 @@ class Region extends \Magento\Framework\Api\AbstractExtensibleObject implements
      * Get region code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode()
     {
@@ -28,7 +26,6 @@ public function getRegionCode()
      * Get region
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -39,7 +36,6 @@ public function getRegion()
      * Get region id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -51,7 +47,6 @@ public function getRegionId()
      *
      * @param string $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode)
     {
@@ -63,7 +58,6 @@ public function setRegionCode($regionCode)
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region)
     {
@@ -75,7 +69,6 @@ public function setRegion($region)
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId)
     {
@@ -86,7 +79,6 @@ public function setRegionId($regionId)
      * {@inheritdoc}
      *
      * @return \Magento\Customer\Api\Data\RegionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -98,7 +90,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Customer\Api\Data\RegionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Customer\Api\Data\RegionExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Customer/Model/Data/ValidationResults.php b/app/code/Magento/Customer/Model/Data/ValidationResults.php
index afeb17fafa961..4a9d9a7344e1a 100644
--- a/app/code/Magento/Customer/Model/Data/ValidationResults.php
+++ b/app/code/Magento/Customer/Model/Data/ValidationResults.php
@@ -9,14 +9,12 @@
 
 /**
  * Validation results data model.
- * @since 2.0.0
  */
 class ValidationResults extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Customer\Api\Data\ValidationResultsInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -25,7 +23,6 @@ public function isValid()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -37,7 +34,6 @@ public function getMessages()
      *
      * @param bool $isValid
      * @return $this
-     * @since 2.0.0
      */
     public function setIsValid($isValid)
     {
@@ -49,7 +45,6 @@ public function setIsValid($isValid)
      *
      * @param string[] $messages
      * @return string[]
-     * @since 2.0.0
      */
     public function setMessages(array $messages)
     {
diff --git a/app/code/Magento/Customer/Model/Data/ValidationRule.php b/app/code/Magento/Customer/Model/Data/ValidationRule.php
index 787b4ea8c44f9..c141477bed657 100644
--- a/app/code/Magento/Customer/Model/Data/ValidationRule.php
+++ b/app/code/Magento/Customer/Model/Data/ValidationRule.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Customer\Model\Data\ValidationRule
  *
- * @since 2.0.0
  */
 class ValidationRule extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Customer\Api\Data\ValidationRuleInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -26,7 +24,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -38,7 +35,6 @@ public function getValue()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -50,7 +46,6 @@ public function setName($name)
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index 450dcfcfcdd18..6346ec4874c08 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -8,7 +8,7 @@
 /**
  * Class \Magento\Customer\Model\FileProcessor
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class FileProcessor
 {
@@ -19,43 +19,43 @@ class FileProcessor
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $mediaDirectory;
 
     /**
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $uploaderFactory;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $urlBuilder;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $urlEncoder;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $entityTypeCode;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $allowedExtensions = [];
 
     /**
      * @var \Magento\Framework\File\Mime
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $mime;
 
@@ -67,7 +67,7 @@ class FileProcessor
      * @param string $entityTypeCode
      * @param \Magento\Framework\File\Mime $mime
      * @param array $allowedExtensions
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -92,7 +92,7 @@ public function __construct(
      *
      * @param string $fileName
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getBase64EncodedData($fileName)
     {
@@ -109,7 +109,7 @@ public function getBase64EncodedData($fileName)
      *
      * @param string $fileName
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getStat($fileName)
     {
@@ -124,7 +124,7 @@ public function getStat($fileName)
      *
      * @param string $fileName
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getMimeType($fileName)
     {
@@ -140,7 +140,7 @@ public function getMimeType($fileName)
      *
      * @param string $fileName
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isExist($fileName)
     {
@@ -156,7 +156,7 @@ public function isExist($fileName)
      * @param string $filePath
      * @param string $type
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getViewUrl($filePath, $type)
     {
@@ -184,7 +184,7 @@ public function getViewUrl($filePath, $type)
      * @param string $fileId
      * @return \string[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function saveTemporaryFile($fileId)
     {
@@ -215,7 +215,7 @@ public function saveTemporaryFile($fileId)
      * @param string $fileName
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function moveTemporaryFile($fileName)
     {
@@ -260,7 +260,7 @@ public function moveTemporaryFile($fileName)
      *
      * @param string $fileName
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function removeUploadedFile($fileName)
     {
diff --git a/app/code/Magento/Customer/Model/FileUploader.php b/app/code/Magento/Customer/Model/FileUploader.php
index 6887cb1e753f8..e59ceba4b2ada 100644
--- a/app/code/Magento/Customer/Model/FileUploader.php
+++ b/app/code/Magento/Customer/Model/FileUploader.php
@@ -15,49 +15,49 @@
 /**
  * Class \Magento\Customer\Model\FileUploader
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class FileUploader
 {
     /**
      * @var CustomerMetadataInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerMetadataService;
 
     /**
      * @var AddressMetadataInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $addressMetadataService;
 
     /**
      * @var ElementFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $elementFactory;
 
     /**
      * @var FileProcessorFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileProcessorFactory;
 
     /**
      * @var AttributeMetadataInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributeMetadata;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $entityTypeCode;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scope;
 
@@ -69,7 +69,7 @@ class FileUploader
      * @param AttributeMetadataInterface $attributeMetadata
      * @param string $entityTypeCode
      * @param string $scope
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         CustomerMetadataInterface $customerMetadataService,
@@ -93,7 +93,7 @@ public function __construct(
      * Validate uploaded file
      *
      * @return array|bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate()
     {
@@ -112,7 +112,7 @@ public function validate()
      *
      * @return \string[]
      * @throws LocalizedException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function upload()
     {
@@ -139,7 +139,7 @@ public function upload()
      * Get attribute code
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAttributeCode()
     {
@@ -150,7 +150,7 @@ private function getAttributeCode()
      * Retrieve data from global $_FILES array
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getData()
     {
@@ -168,7 +168,7 @@ private function getData()
      * Get allowed extensions
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAllowedExtensions()
     {
diff --git a/app/code/Magento/Customer/Model/Form.php b/app/code/Magento/Customer/Model/Form.php
index a5733149245fb..90713a9ce1c53 100644
--- a/app/code/Magento/Customer/Model/Form.php
+++ b/app/code/Magento/Customer/Model/Form.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Eav\Model\Form
 {
@@ -27,7 +26,6 @@ class Form extends \Magento\Eav\Model\Form
      * Current module pathname
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName = 'Magento_Customer';
 
@@ -35,7 +33,6 @@ class Form extends \Magento\Eav\Model\Form
      * Current EAV entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = 'customer';
 
@@ -44,7 +41,6 @@ class Form extends \Magento\Eav\Model\Form
      * exclude 'created_at'
      *
      * @return \Magento\Customer\Model\ResourceModel\Form\Attribute\Collection
-     * @since 2.0.0
      */
     protected function _getFormAttributeCollection()
     {
diff --git a/app/code/Magento/Customer/Model/Group.php b/app/code/Magento/Customer/Model/Group.php
index 0b282230da232..74f773fd02853 100644
--- a/app/code/Magento/Customer/Model/Group.php
+++ b/app/code/Magento/Customer/Model/Group.php
@@ -15,7 +15,6 @@
  * @method \Magento\Customer\Model\Group setCustomerGroupCode(string $value)
  * @method \Magento\Customer\Model\Group setTaxClassId(int $value)
  * @method Group setTaxClassName(string $value)
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\AbstractModel
 {
@@ -31,7 +30,6 @@ class Group extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'customer_group';
 
@@ -41,25 +39,21 @@ class Group extends \Magento\Framework\Model\AbstractModel
      * In observe method you can use $observer->getEvent()->getObject() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'object';
 
     /**
      * @var \Magento\Store\Model\StoresConfig
-     * @since 2.0.0
      */
     protected $_storesConfig;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Tax\Model\ClassModelFactory
-     * @since 2.0.0
      */
     protected $classModelFactory;
 
@@ -75,7 +69,6 @@ class Group extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -101,7 +94,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -113,7 +105,6 @@ protected function _construct()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($value)
     {
@@ -124,7 +115,6 @@ public function setCode($value)
      * Alias for getCustomerGroupCode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -135,7 +125,6 @@ public function getCode()
      * Get tax class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxClassName()
     {
@@ -154,7 +143,6 @@ public function getTaxClassName()
      * Determine if this group is used as the create account default group
      *
      * @return bool
-     * @since 2.0.0
      */
     public function usesAsDefault()
     {
@@ -171,7 +159,6 @@ public function usesAsDefault()
      * Prepare data before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -183,7 +170,6 @@ public function beforeSave()
      * Prepare customer group data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareData()
     {
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 622ade201decf..47d7d7ad1ac41 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -19,7 +19,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
 {
@@ -33,43 +32,36 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var GroupInterfaceFactory
-     * @since 2.0.0
      */
     protected $groupDataFactory;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -81,7 +73,6 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      * @param GroupInterfaceFactory $groupDataFactory
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -103,7 +94,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isReadonly($groupId)
     {
@@ -118,7 +108,6 @@ public function isReadonly($groupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultGroup($storeId = null)
     {
@@ -145,7 +134,6 @@ public function getDefaultGroup($storeId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNotLoggedInGroup()
     {
@@ -154,7 +142,6 @@ public function getNotLoggedInGroup()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLoggedInGroups()
     {
@@ -177,7 +164,6 @@ public function getLoggedInGroups()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllCustomersGroup()
     {
diff --git a/app/code/Magento/Customer/Model/GroupRegistry.php b/app/code/Magento/Customer/Model/GroupRegistry.php
index d96685f61503b..adf902b31b109 100644
--- a/app/code/Magento/Customer/Model/GroupRegistry.php
+++ b/app/code/Magento/Customer/Model/GroupRegistry.php
@@ -11,25 +11,21 @@
 
 /**
  * Registry for Customer Group models
- * @since 2.0.0
  */
 class GroupRegistry
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $registry = [];
 
     /**
      * @var GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @param GroupFactory $groupFactory
-     * @since 2.0.0
      */
     public function __construct(GroupFactory $groupFactory)
     {
@@ -42,7 +38,6 @@ public function __construct(GroupFactory $groupFactory)
      * @param int $groupId
      * @return Group
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieve($groupId)
     {
@@ -63,7 +58,6 @@ public function retrieve($groupId)
      *
      * @param int $groupId
      * @return void
-     * @since 2.0.0
      */
     public function remove($groupId)
     {
diff --git a/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php b/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
index 134aa32542de1..4c9c1336911ce 100644
--- a/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Model\Indexer\Address\AttributeProvider
  *
- * @since 2.0.0
  */
 class AttributeProvider extends \Magento\Customer\Model\Indexer\AttributeProvider
 {
@@ -23,7 +22,6 @@ class AttributeProvider extends \Magento\Customer\Model\Indexer\AttributeProvide
 
     /**
      * @param Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         Config $eavConfig
diff --git a/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php b/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
index 881210f2a614b..5ca2f02538fd2 100644
--- a/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
+++ b/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Customer\Model\Indexer\Attribute\Filter
  *
- * @since 2.0.0
  */
 class Filter
 {
     /**
      * @var resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver
-     * @since 2.0.0
      */
     protected $flatScopeResolver;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -40,7 +36,6 @@ class Filter
      * @param ResourceConnection $resource
      * @param FlatScopeResolver $flatScopeResolver
      * @param IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -55,7 +50,6 @@ public function __construct(
     /**
      * @param array $attributes
      * @return array
-     * @since 2.0.0
      */
     public function filter(array $attributes)
     {
diff --git a/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php b/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
index c5f59cfbe971a..5ef86fb0aaa5e 100644
--- a/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Customer\Model\Indexer\AttributeProvider
  *
- * @since 2.0.0
  */
 class AttributeProvider implements FieldsetInterface
 {
@@ -24,19 +23,16 @@ class AttributeProvider implements FieldsetInterface
 
     /**
      * @var Attribute[]
-     * @since 2.0.0
      */
     protected $attributes;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @param Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         Config $eavConfig
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function addDynamicData(array $data)
     {
@@ -62,7 +57,6 @@ public function addDynamicData(array $data)
      * Retrieve all attributes
      *
      * @return Attribute[]
-     * @since 2.0.0
      */
     private function getAttributes()
     {
@@ -89,7 +83,6 @@ private function getAttributes()
      * @param Attribute[] $attributes
      * @param array $fieldset
      * @return array
-     * @since 2.0.0
      */
     protected function convert(array $attributes, array $fieldset)
     {
@@ -125,7 +118,6 @@ protected function convert(array $attributes, array $fieldset)
      *
      * @param Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function getType(Attribute $attribute)
     {
@@ -146,7 +138,6 @@ protected function getType(Attribute $attribute)
      * @param array $dataFields
      * @param array $searchableFields
      * @return array
-     * @since 2.0.0
      */
     protected function merge(array $dataFields, array $searchableFields)
     {
diff --git a/app/code/Magento/Customer/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Customer/Model/Layout/DepersonalizePlugin.php
index 30955e23655a7..2bb9934933839 100644
--- a/app/code/Magento/Customer/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Customer/Model/Layout/DepersonalizePlugin.php
@@ -11,49 +11,41 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $visitor;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $customerGroupId;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $formKey;
 
@@ -63,7 +55,6 @@ class DepersonalizePlugin
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
      * @param \Magento\Customer\Model\Visitor $visitor
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -84,7 +75,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @return array
-     * @since 2.0.0
      */
     public function beforeGenerateXml(\Magento\Framework\View\LayoutInterface $subject)
     {
@@ -101,7 +91,6 @@ public function beforeGenerateXml(\Magento\Framework\View\LayoutInterface $subje
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
     {
diff --git a/app/code/Magento/Customer/Model/Log.php b/app/code/Magento/Customer/Model/Log.php
index e988d6580c434..054a58d24ae0b 100644
--- a/app/code/Magento/Customer/Model/Log.php
+++ b/app/code/Magento/Customer/Model/Log.php
@@ -9,7 +9,6 @@
  * Customer log model.
  *
  * Contains customer log data.
- * @since 2.0.0
  */
 class Log
 {
@@ -17,7 +16,6 @@ class Log
      * Customer ID.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $customerId;
 
@@ -25,7 +23,6 @@ class Log
      * Date and time of customer's last login.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $lastLoginAt;
 
@@ -33,7 +30,6 @@ class Log
      * Date and time of customer's last logout.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $lastVisitAt;
 
@@ -41,7 +37,6 @@ class Log
      * Date and time of customer's last visit.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $lastLogoutAt;
 
@@ -50,7 +45,6 @@ class Log
      * @param string $lastLoginAt
      * @param string $lastVisitAt
      * @param string $lastLogoutAt
-     * @since 2.0.0
      */
     public function __construct($customerId = null, $lastLoginAt = null, $lastVisitAt = null, $lastLogoutAt = null)
     {
@@ -64,7 +58,6 @@ public function __construct($customerId = null, $lastLoginAt = null, $lastVisitA
      * Retrieve customer id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -75,7 +68,6 @@ public function getCustomerId()
      * Retrieve last login date as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastLoginAt()
     {
@@ -86,7 +78,6 @@ public function getLastLoginAt()
      * Retrieve last visit date as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastVisitAt()
     {
@@ -97,7 +88,6 @@ public function getLastVisitAt()
      * Retrieve last logout date as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastLogoutAt()
     {
diff --git a/app/code/Magento/Customer/Model/Logger.php b/app/code/Magento/Customer/Model/Logger.php
index f3dfdd2e1454d..0b7241f9048d0 100644
--- a/app/code/Magento/Customer/Model/Logger.php
+++ b/app/code/Magento/Customer/Model/Logger.php
@@ -11,7 +11,6 @@
  * Customer log data logger.
  *
  * Saves and retrieves customer log data.
- * @since 2.0.0
  */
 class Logger
 {
@@ -19,20 +18,17 @@ class Logger
      * Resource instance.
      *
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Customer\Model\LogFactory
-     * @since 2.0.0
      */
     protected $logFactory;
 
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Customer\Model\LogFactory $logFactory
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -49,7 +45,6 @@ public function __construct(
      * @param array $data
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function log($customerId, array $data)
     {
@@ -76,7 +71,6 @@ public function log($customerId, array $data)
      *
      * @param int $customerId
      * @return Log
-     * @since 2.0.0
      */
     public function get($customerId = null)
     {
@@ -97,7 +91,6 @@ public function get($customerId = null)
      *
      * @param int $customerId
      * @return array
-     * @since 2.0.0
      */
     protected function loadLogData($customerId)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/AddressCachedMetadata.php b/app/code/Magento/Customer/Model/Metadata/AddressCachedMetadata.php
index cf8858b21c2bf..4b31600744869 100644
--- a/app/code/Magento/Customer/Model/Metadata/AddressCachedMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/AddressCachedMetadata.php
@@ -9,13 +9,12 @@
 
 /**
  * Cached customer address attribute metadata
- * @since 2.0.0
  */
 class AddressCachedMetadata extends CachedMetadata implements AddressMetadataInterface
 {
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.9
      */
     protected $entityType = 'customer_address';
 
@@ -24,7 +23,6 @@ class AddressCachedMetadata extends CachedMetadata implements AddressMetadataInt
      *
      * @param AddressMetadata $metadata
      * @param AttributeMetadataCache|null $attributeMetadataCache
-     * @since 2.0.0
      */
     public function __construct(
         AddressMetadata $metadata,
diff --git a/app/code/Magento/Customer/Model/Metadata/AddressMetadata.php b/app/code/Magento/Customer/Model/Metadata/AddressMetadata.php
index 7819459374cd8..d18cf0a0a4e7e 100644
--- a/app/code/Magento/Customer/Model/Metadata/AddressMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/AddressMetadata.php
@@ -15,32 +15,27 @@
 
 /**
  * Service to fetch customer address related custom attributes
- * @since 2.0.0
  */
 class AddressMetadata implements AddressMetadataInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $addressDataObjectMethods;
 
     /**
      * @var AttributeMetadataConverter
-     * @since 2.0.0
      */
     private $attributeMetadataConverter;
 
     /**
      * @var AttributeMetadataDataProvider
-     * @since 2.0.0
      */
     private $attributeMetadataDataProvider;
 
     /**
      * @param AttributeMetadataConverter $attributeMetadataConverter
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
-     * @since 2.0.0
      */
     public function __construct(
         AttributeMetadataConverter $attributeMetadataConverter,
@@ -52,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributes($formCode)
     {
@@ -73,7 +67,6 @@ public function getAttributes($formCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeMetadata($attributeCode)
     {
@@ -100,7 +93,6 @@ public function getAttributeMetadata($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllAttributesMetadata()
     {
@@ -125,7 +117,6 @@ public function getAllAttributesMetadata()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = AddressMetadataInterface::DATA_INTERFACE_NAME)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/AddressMetadataManagement.php b/app/code/Magento/Customer/Model/Metadata/AddressMetadataManagement.php
index 98877fc299cb4..b393996bcdb51 100644
--- a/app/code/Magento/Customer/Model/Metadata/AddressMetadataManagement.php
+++ b/app/code/Magento/Customer/Model/Metadata/AddressMetadataManagement.php
@@ -10,19 +10,16 @@
 
 /**
  * Service to manage customer address related custom attributes
- * @since 2.0.0
  */
 class AddressMetadataManagement implements AddressMetadataManagementInterface
 {
     /**
      * @var AttributeResolver
-     * @since 2.0.0
      */
     protected $attributeResolver;
 
     /**
      * @param AttributeResolver $attributeResolver
-     * @since 2.0.0
      */
     public function __construct(
         AttributeResolver $attributeResolver
@@ -32,7 +29,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canBeSearchableInGrid(AttributeMetadataInterface $attribute)
     {
@@ -42,7 +38,6 @@ public function canBeSearchableInGrid(AttributeMetadataInterface $attribute)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canBeFilterableInGrid(AttributeMetadataInterface $attribute)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php b/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
index adde058f880d8..62d4f2860d9a4 100644
--- a/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
+++ b/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Customer\Model\Metadata\AttributeResolver
  *
- * @since 2.0.0
  */
 class AttributeResolver
 {
     /**
      * @var AttributeMetadataDataProvider
-     * @since 2.0.0
      */
     protected $attributeMetadataDataProvider;
 
     /**
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
-     * @since 2.0.0
      */
     public function __construct(
         AttributeMetadataDataProvider $attributeMetadataDataProvider
@@ -40,7 +37,6 @@ public function __construct(
      * @param AttributeMetadataInterface $attribute
      * @return Attribute
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function getModelByAttribute($entityType, AttributeMetadataInterface $attribute)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/CachedMetadata.php b/app/code/Magento/Customer/Model/Metadata/CachedMetadata.php
index 993e55f495f53..905798173dca5 100644
--- a/app/code/Magento/Customer/Model/Metadata/CachedMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CachedMetadata.php
@@ -10,7 +10,6 @@
 
 /**
  * Cached attribute metadata service
- * @since 2.0.0
  */
 class CachedMetadata implements MetadataInterface
 {
@@ -18,7 +17,7 @@ class CachedMetadata implements MetadataInterface
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.9
      */
     protected $entityType = 'none';
 
@@ -30,7 +29,6 @@ class CachedMetadata implements MetadataInterface
 
     /**
      * @var MetadataInterface
-     * @since 2.0.0
      */
     protected $metadata;
 
@@ -39,7 +37,6 @@ class CachedMetadata implements MetadataInterface
      *
      * @param MetadataInterface $metadata
      * @param AttributeMetadataCache|null $attributeMetadataCache
-     * @since 2.0.0
      */
     public function __construct(
         MetadataInterface $metadata,
@@ -52,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributes($formCode)
     {
@@ -67,7 +63,6 @@ public function getAttributes($formCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeMetadata($attributeCode)
     {
@@ -82,7 +77,6 @@ public function getAttributeMetadata($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllAttributesMetadata()
     {
@@ -97,7 +91,6 @@ public function getAllAttributesMetadata()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php
index 43eece24a96e7..23fbeb653e6ad 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php
@@ -9,13 +9,12 @@
 
 /**
  * Cached customer attribute metadata service
- * @since 2.0.0
  */
 class CustomerCachedMetadata extends CachedMetadata implements CustomerMetadataInterface
 {
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.9
      */
     protected $entityType = 'customer';
 
@@ -24,7 +23,6 @@ class CustomerCachedMetadata extends CachedMetadata implements CustomerMetadataI
      *
      * @param CustomerMetadata $metadata
      * @param AttributeMetadataCache|null $attributeMetadataCache
-     * @since 2.0.0
      */
     public function __construct(
         CustomerMetadata $metadata,
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
index c28dd4999aac3..7ed806e657e82 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
@@ -15,32 +15,27 @@
 
 /**
  * Service to fetch customer related custom attributes
- * @since 2.0.0
  */
 class CustomerMetadata implements CustomerMetadataInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $customerDataObjectMethods;
 
     /**
      * @var AttributeMetadataConverter
-     * @since 2.0.0
      */
     private $attributeMetadataConverter;
 
     /**
      * @var AttributeMetadataDataProvider
-     * @since 2.0.0
      */
     private $attributeMetadataDataProvider;
 
     /**
      * @param AttributeMetadataConverter $attributeMetadataConverter
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
-     * @since 2.0.0
      */
     public function __construct(
         AttributeMetadataConverter $attributeMetadataConverter,
@@ -52,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributes($formCode)
     {
@@ -74,7 +68,6 @@ public function getAttributes($formCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeMetadata($attributeCode)
     {
@@ -100,7 +93,6 @@ public function getAttributeMetadata($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllAttributesMetadata()
     {
@@ -125,7 +117,6 @@ public function getAllAttributesMetadata()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_INTERFACE_NAME)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadataManagement.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadataManagement.php
index cc1cb55d16124..4b7c3ad4c7061 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadataManagement.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadataManagement.php
@@ -10,19 +10,16 @@
 
 /**
  * Service to manage customer related custom attributes
- * @since 2.0.0
  */
 class CustomerMetadataManagement implements CustomerMetadataManagementInterface
 {
     /**
      * @var AttributeResolver
-     * @since 2.0.0
      */
     protected $attributeResolver;
 
     /**
      * @param AttributeResolver $attributeResolver
-     * @since 2.0.0
      */
     public function __construct(
         AttributeResolver $attributeResolver
@@ -32,7 +29,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canBeSearchableInGrid(AttributeMetadataInterface $attribute)
     {
@@ -42,7 +38,6 @@ public function canBeSearchableInGrid(AttributeMetadataInterface $attribute)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canBeFilterableInGrid(AttributeMetadataInterface $attribute)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
index 88faf175dd92d..1e8bc56923b4e 100644
--- a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
+++ b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Model\Metadata\ElementFactory
  *
- * @since 2.0.0
  */
 class ElementFactory
 {
@@ -25,22 +24,17 @@ class ElementFactory
 
     // available only for multiply attributes
 
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
-     */
+    // available only for multiply attributes
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_string;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -58,7 +52,6 @@ public function __construct(
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @return \Magento\Customer\Model\Metadata\Form\AbstractData
-     * @since 2.0.0
      */
     public function create(
         \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
diff --git a/app/code/Magento/Customer/Model/Metadata/Form.php b/app/code/Magento/Customer/Model/Metadata/Form.php
index a93662c7991d7..59fd92b24e010 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form
 {
@@ -23,51 +22,41 @@ class Form
 
     /**#@-*/
 
-    /**
-     * @var CustomerMetadataInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_customerMetadataService;
 
     /**
      * @var AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $_addressMetadataService;
 
     /**
      * @var ElementFactory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_entityType;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formCode;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_ignoreInvisible = true;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_filterAttributes = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isAjax = false;
 
@@ -75,37 +64,31 @@ class Form
      * Attribute values
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeValues = [];
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_httpRequest;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_modulesReader;
 
     /**
      * @var \Magento\Framework\Validator\ConfigFactory
-     * @since 2.0.0
      */
     protected $_validatorConfigFactory;
 
     /**
      * @var \Magento\Framework\Validator
-     * @since 2.0.0
      */
     protected $_validator;
 
     /**
      * @var \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -124,7 +107,6 @@ class Form
      * @param bool $isAjax
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         CustomerMetadataInterface $customerMetadataService,
@@ -159,7 +141,6 @@ public function __construct(
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
      * @throws \LogicException For undefined entity type
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -180,7 +161,6 @@ public function getAttributes()
      *
      * @param string $attributeCode
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface|false
-     * @since 2.0.0
      */
     public function getAttribute($attributeCode)
     {
@@ -195,7 +175,6 @@ public function getAttribute($attributeCode)
      * Retrieve user defined attributes
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     * @since 2.0.0
      */
     public function getUserAttributes()
     {
@@ -212,7 +191,6 @@ public function getUserAttributes()
      * Retrieve system required attributes
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     * @since 2.0.0
      */
     public function getSystemAttributes()
     {
@@ -229,7 +207,6 @@ public function getSystemAttributes()
      * Retrieve filtered attributes
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     * @since 2.0.0
      */
     public function getAllowedAttributes()
     {
@@ -253,7 +230,6 @@ public function getAllowedAttributes()
      * @param string $scope the request scope
      * @param boolean $scopeOnly search value only in scope or search value in global too
      * @return array
-     * @since 2.0.0
      */
     public function extractData(\Magento\Framework\App\RequestInterface $request, $scope = null, $scopeOnly = true)
     {
@@ -272,7 +248,6 @@ public function extractData(\Magento\Framework\App\RequestInterface $request, $s
      *
      * @param array $data
      * @return array attribute values
-     * @since 2.0.0
      */
     public function compactData(array $data)
     {
@@ -294,7 +269,6 @@ public function compactData(array $data)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function restoreData(array $data)
     {
@@ -315,7 +289,6 @@ public function restoreData(array $data)
      *
      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
      * @return \Magento\Eav\Model\Attribute\Data\AbstractData
-     * @since 2.0.0
      */
     protected function _getAttributeDataModel($attribute)
     {
@@ -335,7 +308,6 @@ protected function _getAttributeDataModel($attribute)
      *
      * @param array $data
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function prepareRequest(array $data)
     {
@@ -350,7 +322,6 @@ public function prepareRequest(array $data)
      *
      * @param array $data
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     protected function _getValidator(array $data)
     {
@@ -384,7 +355,6 @@ protected function _getValidator(array $data)
      *
      * @param array $data
      * @return boolean|array
-     * @since 2.0.0
      */
     public function validateData(array $data)
     {
@@ -404,7 +374,6 @@ public function validateData(array $data)
      *
      * @param string $format
      * @return array
-     * @since 2.0.0
      */
     public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
@@ -421,7 +390,6 @@ public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OU
      *
      * @param bool $ignoreInvisible
      * @return void
-     * @since 2.0.0
      */
     public function setInvisibleIgnored($ignoreInvisible)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index 47d48477ae25e..f28cce0ea2ae1 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractData
 {
@@ -23,7 +22,6 @@ abstract class AbstractData
      * Request Scope name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_requestScope;
 
@@ -31,7 +29,6 @@ abstract class AbstractData
      * Scope visibility flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_requestScopeOnly = true;
 
@@ -39,7 +36,6 @@ abstract class AbstractData
      * Is AJAX request flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isAjax = false;
 
@@ -48,7 +44,6 @@ abstract class AbstractData
      * Needed for depends attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_extractedData = [];
 
@@ -56,43 +51,36 @@ abstract class AbstractData
      * Date filter format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_dateFilterFormat;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Customer\Api\Data\AttributeMetadataInterface
-     * @since 2.0.0
      */
     protected $_attribute;
 
     /**
      * @var string|int|bool
-     * @since 2.0.0
      */
     protected $_value;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_entityTypeCode;
 
@@ -104,7 +92,6 @@ abstract class AbstractData
      * @param string|int|bool $value
      * @param string $entityTypeCode
      * @param bool $isAjax
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -129,7 +116,6 @@ public function __construct(
      *
      * @return \Magento\Customer\Api\Data\AttributeMetadataInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -144,7 +130,6 @@ public function getAttribute()
      *
      * @param string $scope
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestScope($scope)
     {
@@ -158,7 +143,6 @@ public function setRequestScope($scope)
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestScopeOnly($flag)
     {
@@ -171,7 +155,6 @@ public function setRequestScopeOnly($flag)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setExtractedData(array $data)
     {
@@ -184,7 +167,6 @@ public function setExtractedData(array $data)
      *
      * @param string $index
      * @return array|null
-     * @since 2.0.0
      */
     public function getExtractedData($index = null)
     {
@@ -202,7 +184,6 @@ public function getExtractedData($index = null)
      *
      * @param string $value
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _applyInputFilter($value)
     {
@@ -222,7 +203,6 @@ protected function _applyInputFilter($value)
      * Return Data Form Input/Output Filter
      *
      * @return \Magento\Framework\Data\Form\Filter\FilterInterface|false
-     * @since 2.0.0
      */
     protected function _getFormFilter()
     {
@@ -244,7 +224,6 @@ protected function _getFormFilter()
      *
      * @param string|null|false $format
      * @return $this|string
-     * @since 2.0.0
      */
     protected function _dateFilterFormat($format = null)
     {
@@ -269,7 +248,6 @@ protected function _dateFilterFormat($format = null)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _applyOutputFilter($value)
     {
@@ -288,7 +266,6 @@ protected function _applyOutputFilter($value)
      * @return array|true
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _validateInputRule($value)
     {
@@ -466,7 +443,6 @@ protected function _validateInputRule($value)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAjaxRequest()
     {
@@ -478,7 +454,6 @@ public function getIsAjaxRequest()
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getRequestValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -518,7 +493,6 @@ protected function _getRequestValue(\Magento\Framework\App\RequestInterface $req
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     abstract public function extractValue(\Magento\Framework\App\RequestInterface $request);
 
@@ -528,7 +502,6 @@ abstract public function extractValue(\Magento\Framework\App\RequestInterface $r
      * @param array|string|null $value
      * @return array|bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     abstract public function validateValue($value);
 
@@ -537,7 +510,6 @@ abstract public function validateValue($value);
      *
      * @param array|string $value
      * @return array|string|bool
-     * @since 2.0.0
      */
     abstract public function compactValue($value);
 
@@ -546,7 +518,6 @@ abstract public function compactValue($value);
      *
      * @param array|string $value
      * @return array|string|bool
-     * @since 2.0.0
      */
     abstract public function restoreValue($value);
 
@@ -555,7 +526,6 @@ abstract public function restoreValue($value);
      *
      * @param string $format
      * @return string|array
-     * @since 2.0.0
      */
     abstract public function outputValue(
         $format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php b/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
index 457d640986142..4a06bdfecb8c1 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Boolean
  *
- * @since 2.0.0
  */
 class Boolean extends Select
 {
@@ -19,7 +18,6 @@ class Boolean extends Select
      *
      * @param int $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getOptionText($value)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Date.php b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
index daf25a1827cb5..82adaf68fdda4 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Date.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Date
  *
- * @since 2.0.0
  */
 class Date extends AbstractData
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -30,7 +28,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -103,7 +100,6 @@ public function validateValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -118,7 +114,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -127,7 +122,6 @@ public function restoreValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index 8f832bd60ea42..b2ea3e871c577 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -16,7 +16,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class File extends AbstractData
 {
@@ -24,7 +23,6 @@ class File extends AbstractData
      * Validator for check not protected extensions
      *
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_validatorNotProtectedExtensions;
 
@@ -32,38 +30,34 @@ class File extends AbstractData
      * Core data
      *
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_fileValidator;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_fileSystem;
 
     /**
      * @var UploaderFactory
-     * @since 2.0.0
      */
     private $uploaderFactory;
 
     /**
      * @var FileProcessor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $fileProcessor;
 
     /**
      * @var FileProcessorFactory
      * @deprecated 2.2.0
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $fileProcessorFactory;
 
@@ -83,7 +77,6 @@ class File extends AbstractData
      * @param UploaderFactory $uploaderFactory
      * @param \Magento\Customer\Model\FileProcessorFactory|null $fileProcessorFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -112,7 +105,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -175,7 +167,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
      *
      * @param array $value
      * @return string[]
-     * @since 2.0.0
      */
     protected function _validateByRules($value)
     {
@@ -226,7 +217,6 @@ protected function _validateByRules($value)
      *
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     protected function _isUploadedFile($filename)
     {
@@ -247,7 +237,6 @@ protected function _isUploadedFile($filename)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -289,7 +278,6 @@ public function validateValue($value)
      * {@inheritdoc}
      *
      * @return ImageContentInterface|array|string|null
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -320,7 +308,7 @@ public function compactValue($value)
      *
      * @param array $value
      * @return string|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function processUiComponentValue(array $value)
     {
@@ -333,7 +321,7 @@ protected function processUiComponentValue(array $value)
      *
      * @param string $value
      * @return bool|int|string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function processInputFieldValue($value)
     {
@@ -375,7 +363,6 @@ protected function processInputFieldValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -384,7 +371,6 @@ public function restoreValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
@@ -404,8 +390,8 @@ public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFa
      * Get file processor
      *
      * @return FileProcessor
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     protected function getFileProcessor()
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php b/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
index 806f1c2ca1036..45bac07c0a623 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Hidden
  *
- * @since 2.0.0
  */
 class Hidden extends Text
 {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
index b6481a6ff0c2f..4d5c7d1802d84 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
@@ -17,13 +17,12 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Image extends File
 {
     /**
      * @var ImageContentInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $imageContentFactory;
 
@@ -87,7 +86,6 @@ public function __construct(
      * @return string[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _validateByRules($value)
     {
@@ -154,7 +152,7 @@ protected function _validateByRules($value)
      *
      * @param array $value
      * @return bool|int|ImageContentInterface|string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function processUiComponentValue(array $value)
     {
@@ -176,7 +174,7 @@ protected function processUiComponentValue(array $value)
      *
      * @param array $value
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function processCustomerAddressValue(array $value)
     {
@@ -189,7 +187,7 @@ protected function processCustomerAddressValue(array $value)
      *
      * @param array $value
      * @return bool|int|ImageContentInterface|string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function processCustomerValue(array $value)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
index 8e5966dbf12ea..27f3381e4e813 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Multiline
  *
- * @since 2.0.0
  */
 class Multiline extends Text
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -32,7 +30,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -78,7 +75,6 @@ public function validateValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -90,7 +86,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -99,7 +94,6 @@ public function restoreValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php
index 777781cc7c9ae..cf38c6c85df69 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Multiselect
  *
- * @since 2.0.0
  */
 class Multiselect extends Select
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -32,7 +30,6 @@ public function extractValue(RequestInterface $request)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -48,7 +45,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
index f4efbd22d323b..6f751558d29c9 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
@@ -14,13 +14,11 @@
 
 /**
  * Customer Address Postal/Zip Code Attribute Data Model
- * @since 2.0.0
  */
 class Postcode extends AbstractData
 {
     /**
      * @var DirectoryHelper
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -33,7 +31,6 @@ class Postcode extends AbstractData
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @param DirectoryHelper $directoryHelper
-     * @since 2.0.0
      */
     public function __construct(
         MagentoTimezone $localeDate,
@@ -63,7 +60,6 @@ public function __construct(
      *
      * @param array|null|string $value
      * @return array|bool
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -87,7 +83,6 @@ public function validateValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -96,7 +91,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -105,7 +99,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -114,7 +107,6 @@ public function restoreValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Select.php b/app/code/Magento/Customer/Model/Metadata/Form/Select.php
index fb366e2aaba46..6813199a24823 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Select.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Select.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Select
  *
- * @since 2.0.0
  */
 class Select extends AbstractData
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -28,7 +26,6 @@ public function extractValue(RequestInterface $request)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -58,7 +55,6 @@ public function validateValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -67,7 +63,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -79,7 +74,6 @@ public function restoreValue($value)
      *
      * @param string|int $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getOptionText($value)
     {
@@ -96,7 +90,6 @@ protected function _getOptionText($value)
      *
      * @param string $format
      * @return string
-     * @since 2.0.0
      */
     public function outputValue($format = ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index 8dfb6d34e6cb6..9ddef5d563664 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Text
  *
- * @since 2.0.0
  */
 class Text extends AbstractData
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_string;
 
@@ -31,7 +29,6 @@ class Text extends AbstractData
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @param \Magento\Framework\Stdlib\StringUtils $stringHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -49,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -60,7 +56,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -115,7 +110,6 @@ public function validateValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -124,7 +118,6 @@ public function compactValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -133,7 +126,6 @@ public function restoreValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php
index 3eeaf5ccade29..90a56f818229f 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Form\Textarea
  *
- * @since 2.0.0
  */
 class Textarea extends Text
 {
diff --git a/app/code/Magento/Customer/Model/Metadata/FormFactory.php b/app/code/Magento/Customer/Model/Metadata/FormFactory.php
index 35c2c5cb2e92f..9e552a16623e7 100644
--- a/app/code/Magento/Customer/Model/Metadata/FormFactory.php
+++ b/app/code/Magento/Customer/Model/Metadata/FormFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Customer\Model\Metadata\FormFactory
  *
- * @since 2.0.0
  */
 class FormFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param bool $ignoreInvisible
      * @param array $filterAttributes
      * @return \Magento\Customer\Model\Metadata\Form
-     * @since 2.0.0
      */
     public function create(
         $entityType,
diff --git a/app/code/Magento/Customer/Model/Metadata/Validator.php b/app/code/Magento/Customer/Model/Metadata/Validator.php
index 557fc18d84cef..06ad344162c61 100644
--- a/app/code/Magento/Customer/Model/Metadata/Validator.php
+++ b/app/code/Magento/Customer/Model/Metadata/Validator.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Customer\Model\Metadata\Validator
  *
- * @since 2.0.0
  */
 class Validator extends \Magento\Eav\Model\Validator\Attribute\Data
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_entityType;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_entityData;
 
     /**
      * @param ElementFactory $attrDataFactory
-     * @since 2.0.0
      */
     public function __construct(ElementFactory $attrDataFactory)
     {
@@ -39,7 +35,6 @@ public function __construct(ElementFactory $attrDataFactory)
      *
      * @param \Magento\Framework\DataObject|array $entityData Data set from the Model attributes
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($entityData)
     {
@@ -56,7 +51,6 @@ public function isValid($entityData)
      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface[] $attributes
      * @param string                                                   $entityType
      * @return bool
-     * @since 2.0.0
      */
     public function validateData(array $data, array $attributes, $entityType)
     {
@@ -86,7 +80,6 @@ public function validateData(array $data, array $attributes, $entityType)
      *
      * @param string $entityType
      * @return void
-     * @since 2.0.0
      */
     public function setEntityType($entityType)
     {
diff --git a/app/code/Magento/Customer/Model/Observer/Grid.php b/app/code/Magento/Customer/Model/Observer/Grid.php
index 2116ebefd7e91..214a245f8a7e1 100644
--- a/app/code/Magento/Customer/Model/Observer/Grid.php
+++ b/app/code/Magento/Customer/Model/Observer/Grid.php
@@ -9,19 +9,16 @@
 
 /**
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Grid
 {
     /**
      * @var CustomerGrid
-     * @since 2.0.0
      */
     protected $customerGrid;
 
     /**
      * @param CustomerGrid $grid
-     * @since 2.0.0
      */
     public function __construct(
         CustomerGrid $grid
@@ -33,7 +30,6 @@ public function __construct(
      * @return void
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function syncCustomerGrid()
     {
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index 68eb4c8997432..6cfecbdb325a4 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Customer\Model\Options
  *
- * @since 2.0.0
  */
 class Options
 {
@@ -19,20 +18,17 @@ class Options
      * Customer address
      *
      * @var AddressHelper
-     * @since 2.0.0
      */
     protected $addressHelper;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @param AddressHelper $addressHelper
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         AddressHelper $addressHelper,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param null $store
      * @return array|bool
-     * @since 2.0.0
      */
     public function getNamePrefixOptions($store = null)
     {
@@ -59,7 +54,6 @@ public function getNamePrefixOptions($store = null)
      *
      * @param null $store
      * @return array|bool
-     * @since 2.0.0
      */
     public function getNameSuffixOptions($store = null)
     {
@@ -71,7 +65,6 @@ public function getNameSuffixOptions($store = null)
      *
      * @param string $options
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _prepareNamePrefixSuffixOptions($options)
     {
diff --git a/app/code/Magento/Customer/Model/Plugin/AllowedCountries.php b/app/code/Magento/Customer/Model/Plugin/AllowedCountries.php
index 036f4a47ce63e..5c6e7e9688f53 100644
--- a/app/code/Magento/Customer/Model/Plugin/AllowedCountries.php
+++ b/app/code/Magento/Customer/Model/Plugin/AllowedCountries.php
@@ -13,26 +13,26 @@
 
 /**
  * Class AllowedCountries
- * @since 2.2.0
+ * @since 2.1.3
  */
 class AllowedCountries
 {
     /**
      * @var \Magento\Customer\Model\Config\Share
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shareConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
     /**
      * @param Share $share
      * @param StoreManagerInterface $storeManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Share $share,
@@ -50,7 +50,7 @@ public function __construct(
      * @param string $scope
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function beforeGetAllowedCountries(
         \Magento\Directory\Model\AllowedCountries $subject,
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index bde173158c3a5..9eb9ffb806c9f 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -13,13 +13,11 @@
  * Plugin around \Magento\Framework\Authorization::isAllowed
  *
  * Plugin to allow customer users to access resources with self permission
- * @since 2.0.0
  */
 class CustomerAuthorization
 {
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
@@ -27,7 +25,6 @@ class CustomerAuthorization
      * Inject dependencies.
      *
      * @param UserContextInterface $userContext
-     * @since 2.0.0
      */
     public function __construct(UserContextInterface $userContext)
     {
@@ -45,7 +42,6 @@ public function __construct(UserContextInterface $userContext)
      * @return bool true If resource permission is self, to allow
      * customer access without further checks in parent method
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsAllowed(
         \Magento\Framework\Authorization $subject,
diff --git a/app/code/Magento/Customer/Model/Registration.php b/app/code/Magento/Customer/Model/Registration.php
index d0d51cd4fc4a6..effede4dc7c73 100644
--- a/app/code/Magento/Customer/Model/Registration.php
+++ b/app/code/Magento/Customer/Model/Registration.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Registration
 {
@@ -15,7 +14,6 @@ class Registration
      * Check whether customers registration is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
diff --git a/app/code/Magento/Customer/Model/Renderer/Region.php b/app/code/Magento/Customer/Model/Renderer/Region.php
index f73871987c41b..5c7fcd38d6c52 100644
--- a/app/code/Magento/Customer/Model/Renderer/Region.php
+++ b/app/code/Magento/Customer/Model/Renderer/Region.php
@@ -11,7 +11,6 @@
  * Region field renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
@@ -24,7 +23,6 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_regionCollections;
 
@@ -32,13 +30,11 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
      * Adminhtml data
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper = null;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
@@ -46,7 +42,6 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CountryFactory $countryFactory,
@@ -63,7 +58,6 @@ public function __construct(
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
index e1457b057bffc..fa6410e526f2d 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address.php
@@ -16,19 +16,16 @@
  * Class Address
  * @package Magento\Customer\Model\ResourceModel
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
 {
     /**
      * @var \Magento\Framework\Validator\Factory
-     * @since 2.0.0
      */
     protected $_validatorFactory;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -39,7 +36,6 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Resource initialization.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -70,7 +65,6 @@ protected function _construct()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -85,7 +79,6 @@ public function getEntityType()
      *
      * @param \Magento\Framework\DataObject $address
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\DataObject $address)
     {
@@ -102,7 +95,6 @@ protected function _beforeSave(\Magento\Framework\DataObject $address)
      * @param \Magento\Framework\DataObject $address
      * @return void
      * @throws \Magento\Framework\Validator\Exception When validation failed
-     * @since 2.0.0
      */
     protected function _validate($address)
     {
@@ -119,7 +111,6 @@ protected function _validate($address)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($object)
     {
@@ -151,7 +142,6 @@ private function getCustomerRegistry()
     /**
      * @param \Magento\Customer\Model\Address $address
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\DataObject $address)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Backend/Region.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Backend/Region.php
index 9f80833977184..6b30e518a3bbf 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Backend/Region.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Backend/Region.php
@@ -9,19 +9,16 @@
  * Address region attribute backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Region extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @param \Magento\Directory\Model\RegionFactory $regionFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\RegionFactory $regionFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Directory\Model\RegionFactory $regionFactor
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -50,7 +46,6 @@ public function beforeSave($object)
 
     /**
      * @return \Magento\Directory\Model\Region
-     * @since 2.0.0
      */
     protected function _createRegionInstance()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Collection.php
index fe51773dcb85f..8479190612eaf 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Attribute\Collection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Attribute\Collect
      * Default attribute entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = 'customer_address';
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
index b7079dedf79fb..24e7385cf42ee 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
@@ -17,13 +17,11 @@
 /**
  * Class Country.
  * @package Magento\Customer\Model\ResourceModel\Address\Attribute\Source
- * @since 2.0.0
  */
 class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_countriesFactory;
 
@@ -37,7 +35,6 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countriesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -52,7 +49,6 @@ public function __construct(
      * Retrieve all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -66,7 +62,6 @@ public function getAllOptions()
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     protected function _createCountriesCollection()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
index d72ecfe01c5de..45c5bd49b954b 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -18,37 +18,37 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CountryWithWebsites extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $countriesFactory;
 
     /**
      * @var \Magento\Directory\Model\AllowedCountries
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $allowedCountriesReader;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $options;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
     /**
      * @var Share
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shareConfig;
 
@@ -60,7 +60,7 @@ class CountryWithWebsites extends \Magento\Eav\Model\Entity\Attribute\Source\Tab
      * @param AllowedCountries $allowedCountriesReader
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Share $shareConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -81,7 +81,7 @@ public function __construct(
      * Retrieve all options
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAllOptions()
     {
@@ -121,7 +121,7 @@ public function getAllOptions()
      * Create Countries Collection with all countries
      *
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function createCountriesCollection()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
index 42203e3f1c7cb..18f96b76a7a4b 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region
  *
- * @since 2.0.0
  */
 class Region extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regionsFactory;
 
@@ -28,7 +26,6 @@ class Region extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionsFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -43,7 +40,6 @@ public function __construct(
      * Retrieve all region options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -55,7 +51,6 @@ public function getAllOptions()
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     protected function _createRegionsCollection()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Collection.php
index 1631d43d12a7f..47ac6d60652d6 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\Abs
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param \Magento\Customer\Model\Customer|array $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerFilter($customer)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
index 7815584c4adcb..d473a4dc01891 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
@@ -11,19 +11,16 @@
 
 /**
  * Class represents save operations for customer address relations
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Customer\Model\CustomerFactory $customerFactory)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Customer\Model\CustomerFactory $customerFac
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -69,7 +65,6 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     protected function isAddressDefault(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
index bd499f8166d0c..7e9b2b74ef051 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterface
 {
@@ -25,49 +24,41 @@ class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterf
      * Directory data
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryData;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Model\AddressRegistry
-     * @since 2.0.0
      */
     protected $addressRegistry;
 
     /**
      * @var \Magento\Customer\Model\CustomerRegistry
-     * @since 2.0.0
      */
     protected $customerRegistry;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Address
-     * @since 2.0.0
      */
     protected $addressResourceModel;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressSearchResultsFactory;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
-     * @since 2.0.0
      */
     protected $addressCollectionFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -87,7 +78,6 @@ class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterf
      * @param \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressCollectionFactory
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\AddressFactory $addressFactory,
@@ -117,7 +107,6 @@ public function __construct(
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -173,7 +162,6 @@ private function updateAddressCollection(CustomerModel $customer, CustomerAddres
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($addressId)
     {
@@ -187,7 +175,6 @@ public function getById($addressId)
      * @param SearchCriteriaInterface $searchCriteria
      * @return \Magento\Customer\Api\Data\AddressSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -223,7 +210,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      * @param Collection $collection
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
     {
@@ -245,7 +231,6 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -265,7 +250,6 @@ public function delete(\Magento\Customer\Api\Data\AddressInterface $address)
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($addressId)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Attribute.php b/app/code/Magento/Customer/Model/ResourceModel/Attribute.php
index d5b17f87f5a3d..856b4898015cd 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Attribute.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Attribute
  *
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\ResourceModel\Attribute
 {
@@ -25,7 +24,6 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Attribute
      * If realization doesn't demand this functionality, let this function just return null
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getEavWebsiteTable()
     {
@@ -38,7 +36,6 @@ protected function _getEavWebsiteTable()
      * Get table, where dependency between form name and attribute ids is stored
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getFormAttributeTable()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
index 27fee881b0dbe..a9af8a0f7814b 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Attribute\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\ResourceModel\Attribute\Collection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Attribute\Collection
      * Default attribute entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = 'customer';
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Attribute\Collection
      * Default attribute entity type code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getEntityTypeCode()
     {
@@ -44,7 +41,6 @@ protected function _getEntityTypeCode()
      * If realization doesn't demand this functionality, let this function just return null
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getEavWebsiteTable()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 8e3a41f3a7b4a..a61fb1b6f9aa6 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -15,13 +15,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
 {
     /**
      * @var \Magento\Framework\Validator\Factory
-     * @since 2.0.0
      */
     protected $_validatorFactory;
 
@@ -29,19 +27,16 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -60,7 +55,6 @@ class Customer extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -85,7 +79,6 @@ public function __construct(
      * Retrieve customer entity default attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getDefaultAttributes()
     {
@@ -106,7 +99,6 @@ protected function _getDefaultAttributes()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\DataObject $customer)
     {
@@ -169,7 +161,6 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
      * @param \Magento\Customer\Model\Customer $customer
      * @return void
      * @throws \Magento\Framework\Validator\Exception
-     * @since 2.0.0
      */
     protected function _validate($customer)
     {
@@ -203,7 +194,6 @@ private function getNotificationStorage()
      *
      * @param \Magento\Framework\DataObject $customer
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\DataObject $customer)
     {
@@ -220,7 +210,6 @@ protected function _afterSave(\Magento\Framework\DataObject $customer)
      * @param \Magento\Framework\DataObject $object
      * @param string|int $rowId
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadRowSelect($object, $rowId)
     {
@@ -239,7 +228,6 @@ protected function _getLoadRowSelect($object, $rowId)
      * @param string $email
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadByEmail(\Magento\Customer\Model\Customer $customer, $email)
     {
@@ -278,7 +266,6 @@ public function loadByEmail(\Magento\Customer\Model\Customer $customer, $email)
      * @param \Magento\Customer\Model\Customer $customer
      * @param string $newPassword
      * @return $this
-     * @since 2.0.0
      */
     public function changePassword(\Magento\Customer\Model\Customer $customer, $newPassword)
     {
@@ -290,7 +277,6 @@ public function changePassword(\Magento\Customer\Model\Customer $customer, $newP
      * Check whether there are email duplicates of customers in global scope
      *
      * @return bool
-     * @since 2.0.0
      */
     public function findEmailDuplicates()
     {
@@ -317,7 +303,6 @@ public function findEmailDuplicates()
      *
      * @param int $customerId
      * @return bool
-     * @since 2.0.0
      */
     public function checkCustomerId($customerId)
     {
@@ -344,7 +329,6 @@ public function checkCustomerId($customerId)
      *
      * @param int $customerId
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId($customerId)
     {
@@ -365,7 +349,6 @@ public function getWebsiteId($customerId)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function setNewIncrementId(\Magento\Framework\DataObject $object)
     {
@@ -387,7 +370,6 @@ public function setNewIncrementId(\Magento\Framework\DataObject $object)
      * @param \Magento\Customer\Model\Customer $customer
      * @param string $passwordLinkToken
      * @return $this
-     * @since 2.0.0
      */
     public function changeResetPasswordLinkToken(\Magento\Customer\Model\Customer $customer, $passwordLinkToken)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Collection.php
index 4dcf523b642d6..af8980a129d3e 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Collection.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\AbstractCollection
 {
@@ -21,13 +20,11 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\Abs
 
     /**
      * @var \Magento\Framework\DataObject\Copy\Config
-     * @since 2.0.0
      */
     protected $_fieldsetConfig;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_modelName;
 
@@ -47,7 +44,6 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\Abs
      * @param string $modelName
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -85,7 +81,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -96,7 +91,6 @@ protected function _construct()
      * Group result by customer email
      *
      * @return $this
-     * @since 2.0.0
      */
     public function groupByEmail()
     {
@@ -116,7 +110,6 @@ public function groupByEmail()
      * Add Name to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addNameToSelect()
     {
@@ -166,7 +159,6 @@ public function addNameToSelect()
      * Get SQL for get record count
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -182,7 +174,6 @@ public function getSelectCountSql()
      * @param int $limit
      * @param int $offset
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
index 3ec6cda4585ca..d87d41af1b3c9 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
@@ -12,25 +12,21 @@
 
 /**
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Grid
 {
     /**
      * @var resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver
-     * @since 2.0.0
      */
     protected $flatScopeResolver;
 
@@ -38,7 +34,6 @@ class Grid
      * @param ResourceConnection $resource
      * @param IndexerRegistry $indexerRegistry
      * @param FlatScopeResolver $flatScopeResolver
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -56,7 +51,6 @@ public function __construct(
      * @return void
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function syncCustomerGrid()
     {
@@ -73,7 +67,6 @@ public function syncCustomerGrid()
      * @return array
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function getCustomerIdsForReindex()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
index 6cb61eb4511fb..e55c5d443c9d1 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
@@ -8,7 +8,6 @@
 
 /**
  * Class Relation
- * @since 2.0.0
  */
 class Relation implements \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface
 {
@@ -18,7 +17,6 @@ class Relation implements \Magento\Framework\Model\ResourceModel\Db\VersionContr
      * @param \Magento\Framework\Model\AbstractModel $customer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $customer)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index f73bd689e6800..41d663a0f8aff 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -15,85 +15,71 @@
 /**
  * Customer repository.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInterface
 {
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var \Magento\Customer\Model\Data\CustomerSecureFactory
-     * @since 2.0.0
      */
     protected $customerSecureFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerRegistry
-     * @since 2.0.0
      */
     protected $customerRegistry;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\AddressRepository
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $customerResourceModel;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $customerMetadata;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $extensibleDataObjectConverter;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var ImageProcessorInterface
-     * @since 2.0.0
      */
     protected $imageProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -119,7 +105,6 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\CustomerFactory $customerFactory,
@@ -157,7 +142,6 @@ public function __construct(
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
     {
@@ -291,7 +275,6 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($email, $websiteId = null)
     {
@@ -301,7 +284,6 @@ public function get($email, $websiteId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($customerId)
     {
@@ -311,7 +293,6 @@ public function getById($customerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -352,7 +333,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -361,7 +341,6 @@ public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($customerId)
     {
@@ -379,7 +358,6 @@ public function deleteById($customerId)
      * @param \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute.php b/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute.php
index b01f5d4d61362..5623e8e6ddf23 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute.php
@@ -9,7 +9,6 @@
  * Customer Form Attribute Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\ResourceModel\Form\Attribute
 {
@@ -17,7 +16,6 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Form\Attribute
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute/Collection.php
index abcde1a5a0e52..f51f8cd85db4f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Form/Attribute/Collection.php
@@ -9,7 +9,6 @@
  * Customer Form Attribute Resource Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\ResourceModel\Form\Attribute\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Form\Attribute\Collect
      * Current module pathname
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName = 'Magento_Customer';
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Form\Attribute\Collect
      * Current EAV entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = 'customer';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Form\Attribute\Collect
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -48,7 +44,6 @@ protected function _construct()
      * If realization doesn't demand this functionality, let this function just return null
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getEavWebsiteTable()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
index 90f5595502b21..9f8386e060f09 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -15,7 +15,7 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.11
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group.php b/app/code/Magento/Customer/Model/ResourceModel/Group.php
index c96ac70c484b0..593a70de78c5c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group.php
@@ -12,7 +12,6 @@
  * Customer group resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb
 {
@@ -20,13 +19,11 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Abs
      * Group Management
      *
      * @var \Magento\Customer\Api\GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customersFactory;
 
@@ -37,7 +34,6 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Abs
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
      * @param Customer\CollectionFactory $customersFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +62,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -82,7 +76,6 @@ protected function _initUniqueFields()
      * @param  \Magento\Framework\Model\AbstractModel $group
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $group)
     {
@@ -99,7 +92,6 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $group)
      *
      * @param \Magento\Framework\Model\AbstractModel $group
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $group)
     {
@@ -119,7 +111,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $group)
 
     /**
      * @return \Magento\Customer\Model\ResourceModel\Customer\Collection
-     * @since 2.0.0
      */
     protected function _createCustomersCollection()
     {
@@ -131,7 +122,6 @@ protected function _createCustomersCollection()
      *
      * @param \Magento\Framework\Model\AbstractModel $group
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $group)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
index 75b523125d2bd..48710c46a5f1d 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
@@ -9,7 +9,6 @@
  * Customer group collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param array $indexes
      * @return $this
-     * @since 2.0.0
      */
     public function setIgnoreIdFilter($indexes)
     {
@@ -43,7 +40,6 @@ public function setIgnoreIdFilter($indexes)
      * Set real groups filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRealGroupsFilter()
     {
@@ -54,7 +50,6 @@ public function setRealGroupsFilter()
      * Add tax class
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addTaxClass()
     {
@@ -69,7 +64,6 @@ public function addTaxClass()
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -80,7 +74,6 @@ public function toOptionArray()
      * Retrieve option hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
index 152061c78e59b..05c25dc3e0add 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Group\Grid\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Group\Collection
 {
     /**
      * Resource initialization
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
index 3279230e315bc..c0afd353fa7a7 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
@@ -19,19 +19,16 @@
 
 /**
  * Customer group collection backed by services
- * @since 2.0.0
  */
 class ServiceCollection extends AbstractServiceCollection
 {
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var SimpleDataObjectConverter
-     * @since 2.0.0
      */
     protected $simpleDataObjectConverter;
 
@@ -42,7 +39,6 @@ class ServiceCollection extends AbstractServiceCollection
      * @param SortOrderBuilder $sortOrderBuilder
      * @param GroupRepositoryInterface $groupRepository
      * @param SimpleDataObjectConverter $simpleDataObjectConverter
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -64,7 +60,6 @@ public function __construct(
      * @param bool $logQuery
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
index 9e21dff2db96e..b3dcbdae887e7 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -22,7 +22,6 @@
  * Customer group CRUD class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GroupRepository implements \Magento\Customer\Api\GroupRepositoryInterface
 {
@@ -33,49 +32,41 @@ class GroupRepository implements \Magento\Customer\Api\GroupRepositoryInterface
 
     /**
      * @var \Magento\Customer\Model\GroupRegistry
-     * @since 2.0.0
      */
     protected $groupRegistry;
 
     /**
      * @var \Magento\Customer\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\GroupInterfaceFactory
-     * @since 2.0.0
      */
     protected $groupDataFactory;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Group
-     * @since 2.0.0
      */
     protected $groupResourceModel;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Customer\Api\Data\GroupSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     private $taxClassRepository;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -95,7 +86,6 @@ class GroupRepository implements \Magento\Customer\Api\GroupRepositoryInterface
      * @param \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassRepositoryInterface
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\GroupRegistry $groupRegistry,
@@ -121,7 +111,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Customer\Api\Data\GroupInterface $group)
     {
@@ -173,7 +162,6 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($id)
     {
@@ -188,7 +176,6 @@ public function getById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -234,7 +221,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      * @param Collection $collection
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
     {
@@ -256,7 +242,6 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
      * @deprecated 2.2.0
      * @param string $field a field name that should be translated to a DB column name.
      * @return string
-     * @since 2.0.0
      */
     protected function translateField($field)
     {
@@ -279,7 +264,6 @@ protected function translateField($field)
      * @return bool true on success
      * @throws \Magento\Framework\Exception\StateException If customer group cannot be deleted
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(GroupInterface $group)
     {
@@ -294,7 +278,6 @@ public function delete(GroupInterface $group)
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException If customer group cannot be deleted
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -318,7 +301,6 @@ public function deleteById($id)
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function _validate($group)
     {
@@ -339,7 +321,6 @@ private function _validate($group)
      * @param \Magento\Customer\Api\Data\GroupInterface $group The original group parameters
      * @return void
      * @throws InputException Thrown if the tax class model is invalid
-     * @since 2.0.0
      */
     protected function _verifyTaxClassModel($taxClassId, $group)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
index d67fb3fcac147..0262bf30dc827 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
@@ -17,7 +17,6 @@
  * Flat customer online grid collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends SearchResult
 {
@@ -28,13 +27,11 @@ class Collection extends SearchResult
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $date;
 
     /**
      * @var Visitor
-     * @since 2.0.0
      */
     protected $visitorModel;
 
@@ -47,7 +44,6 @@ class Collection extends SearchResult
      * @param string $resourceModel
      * @param Visitor $visitorModel
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -68,7 +64,6 @@ public function __construct(
      * Init collection select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -98,7 +93,6 @@ protected function _initSelect()
      * @param string|array $field
      * @param string|int|array|null $condition
      * @return \Magento\Cms\Model\ResourceModel\Block\Collection
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Setup/PropertyMapper.php b/app/code/Magento/Customer/Model/ResourceModel/Setup/PropertyMapper.php
index 8958763c9b5f9..6820babdac3f0 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Setup/PropertyMapper.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Setup/PropertyMapper.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Setup\PropertyMapper
  *
- * @since 2.0.0
  */
 class PropertyMapper extends PropertyMapperAbstract
 {
@@ -24,7 +23,6 @@ class PropertyMapper extends PropertyMapperAbstract
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Visitor.php b/app/code/Magento/Customer/Model/ResourceModel/Visitor.php
index d00417716f846..c3a82307ba465 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Visitor.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Visitor.php
@@ -9,19 +9,16 @@
 /**
  * Class Visitor
  * @package Magento\Customer\Model\ResourceModel
- * @since 2.0.0
  */
 class Visitor extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $date;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -30,7 +27,6 @@ class Visitor extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +54,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $visitor
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $visitor)
     {
@@ -75,7 +69,6 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $v
      *
      * @param \Magento\Customer\Model\Visitor $object
      * @return $this
-     * @since 2.0.0
      */
     public function clean(\Magento\Customer\Model\Visitor $object)
     {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Visitor/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Visitor/Collection.php
index 04722472611f2..e7230cf45b17f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Visitor/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Visitor/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Customer\Model\ResourceModel\Visitor\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
index 319dde2432bee..b8a02c4d1f19a 100644
--- a/app/code/Magento/Customer/Model/Session.php
+++ b/app/code/Magento/Customer/Model/Session.php
@@ -17,7 +17,6 @@
  * @api
  * @method string getNoReferer()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
@@ -25,13 +24,11 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Customer object
      *
      * @var CustomerData
-     * @since 2.0.0
      */
     protected $_customer;
 
     /**
      * @var ResourceCustomer
-     * @since 2.0.0
      */
     protected $_customerResource;
 
@@ -39,7 +36,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Customer model
      *
      * @var Customer
-     * @since 2.0.0
      */
     protected $_customerModel;
 
@@ -47,7 +43,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Flag with customer id validations result
      *
      * @var bool|null
-     * @since 2.0.0
      */
     protected $_isCustomerIdChecked = null;
 
@@ -55,7 +50,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Customer URL
      *
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -63,61 +57,51 @@ class Session extends \Magento\Framework\Session\SessionManager
      * Core url
      *
      * @var \Magento\Framework\Url\Helper\Data|null
-     * @since 2.0.0
      */
     protected $_coreUrl = null;
 
     /**
      * @var Share
-     * @since 2.0.0
      */
     protected $_configShare;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var  CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Framework\UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $_httpContext;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
     /**
      * @var \Magento\Framework\App\Response\Http
-     * @since 2.0.0
      */
     protected $response;
 
@@ -145,7 +129,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param \Magento\Framework\App\Response\Http $response
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -200,7 +183,6 @@ public function __construct(
      * Retrieve customer sharing configuration model
      *
      * @return Share
-     * @since 2.0.0
      */
     public function getCustomerConfigShare()
     {
@@ -212,7 +194,6 @@ public function getCustomerConfigShare()
      *
      * @param   CustomerData $customer
      * @return  $this
-     * @since 2.0.0
      */
     public function setCustomerData(CustomerData $customer)
     {
@@ -234,7 +215,6 @@ public function setCustomerData(CustomerData $customer)
      * Retrieve customer model object
      *
      * @return CustomerData
-     * @since 2.0.0
      */
     public function getCustomerData()
     {
@@ -249,7 +229,6 @@ public function getCustomerData()
      * Returns Customer data object with the customer information
      *
      * @return CustomerData
-     * @since 2.0.0
      */
     public function getCustomerDataObject()
     {
@@ -262,7 +241,6 @@ public function getCustomerDataObject()
      *
      * @param CustomerData $customerData
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerDataObject(CustomerData $customerData)
     {
@@ -277,7 +255,6 @@ public function setCustomerDataObject(CustomerData $customerData)
      * @param   Customer $customerModel
      * @return  $this
      * use setCustomerId() instead
-     * @since 2.0.0
      */
     public function setCustomer(Customer $customerModel)
     {
@@ -306,7 +283,6 @@ public function setCustomer(Customer $customerModel)
      *
      * @return Customer
      * use getCustomerId() instead
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -322,7 +298,6 @@ public function getCustomer()
      *
      * @param int|null $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -335,7 +310,6 @@ public function setCustomerId($id)
      *
      * @api
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -349,7 +323,6 @@ public function getCustomerId()
      * Retrieve customer id from current session
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -361,7 +334,6 @@ public function getId()
      *
      * @param int|null $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setId($customerId)
     {
@@ -373,7 +345,6 @@ public function setId($customerId)
      *
      * @param int|null $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($id)
     {
@@ -386,7 +357,6 @@ public function setCustomerGroupId($id)
      * If customer is not logged in system, 'not logged in' group id will be returned
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -406,7 +376,6 @@ public function getCustomerGroupId()
      *
      * @api
      * @return bool
-     * @since 2.0.0
      */
     public function isLoggedIn()
     {
@@ -420,7 +389,6 @@ public function isLoggedIn()
      *
      * @param int $customerId
      * @return bool
-     * @since 2.0.0
      */
     public function checkCustomerId($customerId)
     {
@@ -440,7 +408,6 @@ public function checkCustomerId($customerId)
     /**
      * @param Customer $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerAsLoggedIn($customer)
     {
@@ -454,7 +421,6 @@ public function setCustomerAsLoggedIn($customer)
     /**
      * @param CustomerData $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerDataAsLoggedIn($customer)
     {
@@ -476,7 +442,6 @@ public function setCustomerDataAsLoggedIn($customer)
      * @api
      * @param   int $customerId
      * @return  bool
-     * @since 2.0.0
      */
     public function loginById($customerId)
     {
@@ -494,7 +459,6 @@ public function loginById($customerId)
      *
      * @api
      * @return $this
-     * @since 2.0.0
      */
     public function logout()
     {
@@ -511,7 +475,6 @@ public function logout()
      *
      * @param   bool|null $loginUrl
      * @return  bool
-     * @since 2.0.0
      */
     public function authenticate($loginUrl = null)
     {
@@ -544,7 +507,6 @@ public function authenticate($loginUrl = null)
      * @param string $key
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     protected function _setAuthUrl($key, $url)
     {
@@ -558,7 +520,6 @@ protected function _setAuthUrl($key, $url)
      * Logout without dispatching event
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _logout()
     {
@@ -575,7 +536,6 @@ protected function _logout()
      *
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     public function setBeforeAuthUrl($url)
     {
@@ -587,7 +547,6 @@ public function setBeforeAuthUrl($url)
      *
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     public function setAfterAuthUrl($url)
     {
@@ -598,7 +557,6 @@ public function setAfterAuthUrl($url)
      * Reset core session hosts after reseting session ID
      *
      * @return $this
-     * @since 2.0.0
      */
     public function regenerateId()
     {
@@ -609,7 +567,6 @@ public function regenerateId()
 
     /**
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _createUrl()
     {
diff --git a/app/code/Magento/Customer/Model/Session/Storage.php b/app/code/Magento/Customer/Model/Session/Storage.php
index 1a803b71046e3..d7c6134ee95f3 100644
--- a/app/code/Magento/Customer/Model/Session/Storage.php
+++ b/app/code/Magento/Customer/Model/Session/Storage.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Customer\Model\Session\Storage
  *
- * @since 2.0.0
  */
 class Storage extends \Magento\Framework\Session\Storage
 {
@@ -19,7 +18,6 @@ class Storage extends \Magento\Framework\Session\Storage
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $namespace
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Config\Share $configShare,
diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index b8abce9c03b31..8d50b1fd29bbf 100644
--- a/app/code/Magento/Customer/Model/Url.php
+++ b/app/code/Magento/Customer/Model/Url.php
@@ -13,7 +13,6 @@
 
 /**
  * Customer url model
- * @since 2.0.0
  */
 class Url
 {
@@ -34,31 +33,26 @@ class Url
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -82,7 +76,6 @@ class Url
      * @param EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface|null $urlDecoder
      * @param \Magento\Framework\Url\HostChecker|null $hostChecker
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
@@ -108,7 +101,6 @@ public function __construct(
      * Retrieve customer login url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoginUrl()
     {
@@ -119,7 +111,6 @@ public function getLoginUrl()
      * Retrieve parameters of customer login url
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLoginUrlParams()
     {
@@ -147,7 +138,6 @@ public function getLoginUrlParams()
      * Retrieve customer login POST URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoginPostUrl()
     {
@@ -165,7 +155,6 @@ public function getLoginPostUrl()
      * Retrieve customer logout url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLogoutUrl()
     {
@@ -176,7 +165,6 @@ public function getLogoutUrl()
      * Retrieve customer dashboard url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDashboardUrl()
     {
@@ -187,7 +175,6 @@ public function getDashboardUrl()
      * Retrieve customer account page url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAccountUrl()
     {
@@ -198,7 +185,6 @@ public function getAccountUrl()
      * Retrieve customer register form url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegisterUrl()
     {
@@ -209,7 +195,6 @@ public function getRegisterUrl()
      * Retrieve customer register form post url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegisterPostUrl()
     {
@@ -220,7 +205,6 @@ public function getRegisterPostUrl()
      * Retrieve customer account edit form url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEditUrl()
     {
@@ -231,7 +215,6 @@ public function getEditUrl()
      * Retrieve customer edit POST URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEditPostUrl()
     {
@@ -242,7 +225,6 @@ public function getEditPostUrl()
      * Retrieve url of forgot password page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getForgotPasswordUrl()
     {
@@ -254,7 +236,6 @@ public function getForgotPasswordUrl()
      *
      * @param string $email
      * @return string
-     * @since 2.0.0
      */
     public function getEmailConfirmationUrl($email = null)
     {
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 89e2e3fc2eb56..9822e2ad1b80e 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -15,7 +15,6 @@
 
 /**
  * Customer VAT model
- * @since 2.0.0
  */
 class Vat
 {
@@ -59,20 +58,17 @@ class Vat
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var PsrLogger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param PsrLogger $logger
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -87,7 +83,6 @@ public function __construct(
      *
      * @param Store|string|int|null $store
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantCountryCode($store = null)
     {
@@ -103,7 +98,6 @@ public function getMerchantCountryCode($store = null)
      *
      * @param Store|string|int|null $store
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantVatNumber($store = null)
     {
@@ -121,7 +115,6 @@ public function getMerchantVatNumber($store = null)
      * @param DataObject $vatValidationResult
      * @param \Magento\Store\Model\Store|string|int $store
      * @return null|int
-     * @since 2.0.0
      */
     public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatValidationResult, $store = null)
     {
@@ -165,7 +158,6 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
      * @param string $requesterVatNumber
      *
      * @return DataObject
-     * @since 2.0.0
      */
     public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode = '', $requesterVatNumber = '')
     {
@@ -223,7 +215,6 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
      *
      * @param boolean $trace
      * @return \SoapClient
-     * @since 2.0.0
      */
     protected function createVatNumberValidationSoapClient($trace = false)
     {
@@ -241,7 +232,6 @@ protected function createVatNumberValidationSoapClient($trace = false)
      * @return boolean
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function canCheckVatNumber($countryCode, $vatNumber, $requesterCountryCode, $requesterVatNumber)
     {
@@ -265,7 +255,6 @@ public function canCheckVatNumber($countryCode, $vatNumber, $requesterCountryCod
      * @param DataObject $vatValidationResult
      * @param Store|string|int|null $store
      * @return null|string
-     * @since 2.0.0
      */
     public function getCustomerVatClass($customerCountryCode, $vatValidationResult, $store = null)
     {
@@ -298,7 +287,6 @@ public function getCustomerVatClass($customerCountryCode, $vatValidationResult,
      * @param string $countryCode
      * @param null|int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isCountryInEU($countryCode, $storeId = null)
     {
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 0ecbd57b0ef9e..b4bad240bc825 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -12,7 +12,6 @@
  * Class Visitor
  * @package Magento\Customer\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Visitor extends \Magento\Framework\Model\AbstractModel
 {
@@ -26,25 +25,21 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $ignoredUserAgents;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\HTTP\Header
-     * @since 2.0.0
      */
     protected $httpHeader;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $skipRequestLogging = false;
 
@@ -52,7 +47,6 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      * Ignored Modules
      *
      * @var array
-     * @since 2.0.0
      */
     protected $ignores;
 
@@ -60,19 +54,16 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
@@ -91,7 +82,6 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -121,7 +111,6 @@ public function __construct(
      * Object initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -139,7 +128,6 @@ protected function _construct()
      *
      * @param bool $skipRequestLogging
      * @return \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function setSkipRequestLogging($skipRequestLogging)
     {
@@ -154,7 +142,6 @@ public function setSkipRequestLogging($skipRequestLogging)
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function initByRequest($observer)
     {
@@ -184,7 +171,6 @@ public function initByRequest($observer)
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function saveByRequest($observer)
     {
@@ -207,7 +193,6 @@ public function saveByRequest($observer)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return bool
-     * @since 2.0.0
      */
     public function isModuleIgnored($observer)
     {
@@ -227,7 +212,6 @@ public function isModuleIgnored($observer)
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function bindCustomerLogin($observer)
     {
@@ -248,7 +232,6 @@ public function bindCustomerLogin($observer)
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function bindCustomerLogout($observer)
     {
@@ -263,7 +246,6 @@ public function bindCustomerLogout($observer)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function bindQuoteCreate($observer)
     {
@@ -281,7 +263,6 @@ public function bindQuoteCreate($observer)
      * Destroy binding of checkout quote
      * @param \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     public function bindQuoteDestroy($observer)
     {
@@ -296,7 +277,6 @@ public function bindQuoteDestroy($observer)
      * Return clean time in seconds for visitor's outdated records
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCleanTime()
     {
@@ -310,7 +290,6 @@ public function getCleanTime()
      * Clean visitor's outdated records
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -322,7 +301,6 @@ public function clean()
      * Retrieve Online Interval (in minutes)
      *
      * @return int Minutes Interval
-     * @since 2.0.0
      */
     public function getOnlineInterval()
     {
diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index 7d7b4e312d555..06a4c4ae70924 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -25,7 +25,6 @@
 /**
  * Customer Observer Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AfterAddressSaveObserver implements ObserverInterface
 {
@@ -36,49 +35,41 @@ class AfterAddressSaveObserver implements ObserverInterface
 
     /**
      * @var HelperAddress
-     * @since 2.0.0
      */
     protected $_customerAddress;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var Vat
-     * @since 2.0.0
      */
     protected $_customerVat;
 
     /**
      * @var GroupManagementInterface
-     * @since 2.0.0
      */
     protected $_groupManagement;
 
     /**
      * @var AppState
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -98,7 +89,6 @@ class AfterAddressSaveObserver implements ObserverInterface
      * @param Escaper $escaper
      * @param AppState $appState
      * @param CustomerSession $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Vat $customerVat,
@@ -128,7 +118,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -195,7 +184,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      *
      * @param Address $address
      * @return bool
-     * @since 2.0.0
      */
     protected function _canProcessAddress($address)
     {
@@ -221,7 +209,6 @@ protected function _canProcessAddress($address)
      *
      * @param Address $address
      * @return bool
-     * @since 2.0.0
      */
     protected function _isDefaultBilling($address)
     {
@@ -235,7 +222,6 @@ protected function _isDefaultBilling($address)
      *
      * @param Address $address
      * @return bool
-     * @since 2.0.0
      */
     protected function _isDefaultShipping($address)
     {
@@ -250,7 +236,6 @@ protected function _isDefaultShipping($address)
      * @param Address $customerAddress
      * @param DataObject $validationResult
      * @return $this
-     * @since 2.0.0
      */
     protected function addValidMessage($customerAddress, $validationResult)
     {
@@ -281,7 +266,6 @@ protected function addValidMessage($customerAddress, $validationResult)
      *
      * @param Address $customerAddress
      * @return $this
-     * @since 2.0.0
      */
     protected function addInvalidMessage($customerAddress)
     {
@@ -307,7 +291,6 @@ protected function addInvalidMessage($customerAddress)
      *
      * @param Address $customerAddress
      * @return $this
-     * @since 2.0.0
      */
     protected function addErrorMessage($customerAddress)
     {
diff --git a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
index 3ba8d3507d836..a24b27543a5cc 100644
--- a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
@@ -14,7 +14,6 @@
 
 /**
  * Customer Observer Model
- * @since 2.0.0
  */
 class BeforeAddressSaveObserver implements ObserverInterface
 {
@@ -25,20 +24,17 @@ class BeforeAddressSaveObserver implements ObserverInterface
 
     /**
      * @var HelperAddress
-     * @since 2.0.0
      */
     protected $_customerAddress;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @param HelperAddress $customerAddress
      * @param Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         HelperAddress $customerAddress,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php b/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
index 7a45a367d8d9a..0228921a1c280 100644
--- a/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
+++ b/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
@@ -12,7 +12,6 @@
 
 /**
  * Customer log observer.
- * @since 2.0.0
  */
 class LogLastLoginAtObserver implements ObserverInterface
 {
@@ -20,13 +19,11 @@ class LogLastLoginAtObserver implements ObserverInterface
      * Logger of customer's log data.
      *
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(Logger $logger)
     {
@@ -38,7 +35,6 @@ public function __construct(Logger $logger)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php b/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
index 5c7c2d278206d..535128e6a4b0a 100644
--- a/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
+++ b/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
@@ -12,7 +12,6 @@
 
 /**
  * Customer log observer.
- * @since 2.0.0
  */
 class LogLastLogoutAtObserver implements ObserverInterface
 {
@@ -20,13 +19,11 @@ class LogLastLogoutAtObserver implements ObserverInterface
      * Logger of customer's log data.
      *
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(Logger $logger)
     {
@@ -38,7 +35,6 @@ public function __construct(Logger $logger)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
index d18753b872100..2a2ed5a38f566 100644
--- a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
+++ b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Customer\Observer\UpgradeCustomerPasswordObserver
  *
- * @since 2.0.0
  */
 class UpgradeCustomerPasswordObserver implements ObserverInterface
 {
@@ -22,19 +21,16 @@ class UpgradeCustomerPasswordObserver implements ObserverInterface
      * Encryption model
      *
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
     /**
      * @var CustomerRegistry
-     * @since 2.0.0
      */
     private $customerRegistry;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     private $customerRepository;
 
@@ -42,7 +38,6 @@ class UpgradeCustomerPasswordObserver implements ObserverInterface
      * @param EncryptorInterface $encryptor
      * @param CustomerRegistry $customerRegistry
      * @param CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         EncryptorInterface $encryptor,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/AbstractVisitorObserver.php b/app/code/Magento/Customer/Observer/Visitor/AbstractVisitorObserver.php
index 6372f6ee6cccd..e405d586ffcfe 100644
--- a/app/code/Magento/Customer/Observer/Visitor/AbstractVisitorObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/AbstractVisitorObserver.php
@@ -12,13 +12,11 @@
 
 /**
  * Abstract Visitor Observer
- * @since 2.0.0
  */
 abstract class AbstractVisitorObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $visitor;
 
@@ -26,7 +24,6 @@ abstract class AbstractVisitorObserver implements ObserverInterface
      * Constructor
      *
      * @param Visitor $visitor
-     * @since 2.0.0
      */
     public function __construct(Visitor $visitor)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/BindCustomerLoginObserver.php b/app/code/Magento/Customer/Observer/Visitor/BindCustomerLoginObserver.php
index 9b542befb5eea..8d344b3d6ae0d 100644
--- a/app/code/Magento/Customer/Observer/Visitor/BindCustomerLoginObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/BindCustomerLoginObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class BindCustomerLoginObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class BindCustomerLoginObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/BindCustomerLogoutObserver.php b/app/code/Magento/Customer/Observer/Visitor/BindCustomerLogoutObserver.php
index fbd2717af625a..2a60e41701fca 100644
--- a/app/code/Magento/Customer/Observer/Visitor/BindCustomerLogoutObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/BindCustomerLogoutObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class BindCustomerLogoutObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class BindCustomerLogoutObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/BindQuoteCreateObserver.php b/app/code/Magento/Customer/Observer/Visitor/BindQuoteCreateObserver.php
index 352f74533716c..bbffea1da6f0e 100644
--- a/app/code/Magento/Customer/Observer/Visitor/BindQuoteCreateObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/BindQuoteCreateObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class BindQuoteCreateObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class BindQuoteCreateObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/BindQuoteDestroyObserver.php b/app/code/Magento/Customer/Observer/Visitor/BindQuoteDestroyObserver.php
index f9d267d09632e..410895efa766d 100644
--- a/app/code/Magento/Customer/Observer/Visitor/BindQuoteDestroyObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/BindQuoteDestroyObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class BindQuoteDestroyObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class BindQuoteDestroyObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php b/app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php
index 5c3ebda92854f..165c411a46336 100644
--- a/app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class InitByRequestObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class InitByRequestObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Observer/Visitor/SaveByRequestObserver.php b/app/code/Magento/Customer/Observer/Visitor/SaveByRequestObserver.php
index 1af476856c8cf..1516ed38a90c1 100644
--- a/app/code/Magento/Customer/Observer/Visitor/SaveByRequestObserver.php
+++ b/app/code/Magento/Customer/Observer/Visitor/SaveByRequestObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Visitor Observer
- * @since 2.0.0
  */
 class SaveByRequestObserver extends AbstractVisitorObserver
 {
@@ -19,7 +18,6 @@ class SaveByRequestObserver extends AbstractVisitorObserver
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
index b33c9f2261465..b1f07e4872fd8 100644
--- a/app/code/Magento/Customer/Setup/CustomerSetup.php
+++ b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -17,7 +17,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CustomerSetup extends EavSetup
 {
@@ -25,7 +24,6 @@ class CustomerSetup extends EavSetup
      * EAV configuration
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -37,7 +35,6 @@ class CustomerSetup extends EavSetup
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
      * @param Config $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -56,7 +53,6 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function installCustomerForms()
     {
@@ -126,7 +122,6 @@ public function installCustomerForms()
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getDefaultEntities()
     {
@@ -489,7 +484,6 @@ public function getDefaultEntities()
      * Gets EAV configuration
      *
      * @return Config
-     * @since 2.0.0
      */
     public function getEavConfig()
     {
diff --git a/app/code/Magento/Customer/Setup/InstallData.php b/app/code/Magento/Customer/Setup/InstallData.php
index d6d408a16cd6f..0bc4b19db9d1c 100644
--- a/app/code/Magento/Customer/Setup/InstallData.php
+++ b/app/code/Magento/Customer/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * Customer setup factory
      *
      * @var CustomerSetupFactory
-     * @since 2.0.0
      */
     private $customerSetupFactory;
 
@@ -29,7 +27,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param CustomerSetupFactory $customerSetupFactory
-     * @since 2.0.0
      */
     public function __construct(CustomerSetupFactory $customerSetupFactory)
     {
@@ -39,7 +36,6 @@ public function __construct(CustomerSetupFactory $customerSetupFactory)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Customer/Setup/InstallSchema.php b/app/code/Magento/Customer/Setup/InstallSchema.php
index 68e3c0f091d73..64257ea992be5 100644
--- a/app/code/Magento/Customer/Setup/InstallSchema.php
+++ b/app/code/Magento/Customer/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php
index 94881db36254c..277597f18571b 100644
--- a/app/code/Magento/Customer/Setup/UpgradeData.php
+++ b/app/code/Magento/Customer/Setup/UpgradeData.php
@@ -23,7 +23,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -31,31 +30,28 @@ class UpgradeData implements UpgradeDataInterface
      * Customer setup factory
      *
      * @var CustomerSetupFactory
-     * @since 2.0.0
      */
     protected $customerSetupFactory;
 
     /**
      * @var AllowedCountries
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $allowedCountriesReader;
 
     /**
      * @var IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
@@ -70,7 +66,6 @@ class UpgradeData implements UpgradeDataInterface
      * @param IndexerRegistry $indexerRegistry
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param FieldDataConverterFactory|null $fieldDataConverterFactory
-     * @since 2.0.0
      */
     public function __construct(
         CustomerSetupFactory $customerSetupFactory,
@@ -91,7 +86,6 @@ public function __construct(
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -177,9 +171,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     /**
      * Retrieve Store Manager
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getStoreManager()
     {
@@ -193,9 +187,9 @@ private function getStoreManager()
     /**
      * Retrieve Allowed Countries Reader
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return AllowedCountries
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAllowedCountriesReader()
     {
@@ -213,7 +207,7 @@ private function getAllowedCountriesReader()
      * @param array $newCountries
      * @param string $identifier
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function mergeAllowedCountries(array $countries, array $newCountries, $identifier)
     {
@@ -233,7 +227,7 @@ private function mergeAllowedCountries(array $countries, array $newCountries, $i
      * @param string $scope
      * @param int $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAllowedCountries($scope, $scopeCode)
     {
@@ -246,7 +240,7 @@ private function getAllowedCountries($scope, $scopeCode)
      *
      * @param SetupInterface $setup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function migrateStoresAllowedCountriesToWebsite(SetupInterface $setup)
     {
@@ -299,7 +293,6 @@ private function migrateStoresAllowedCountriesToWebsite(SetupInterface $setup)
      * @param array $entityAttributes
      * @param CustomerSetup $customerSetup
      * @return void
-     * @since 2.0.0
      */
     protected function upgradeAttributes(array $entityAttributes, CustomerSetup $customerSetup)
     {
@@ -317,7 +310,6 @@ protected function upgradeAttributes(array $entityAttributes, CustomerSetup $cus
     /**
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function upgradeHash($setup)
     {
diff --git a/app/code/Magento/Customer/Setup/UpgradeSchema.php b/app/code/Magento/Customer/Setup/UpgradeSchema.php
index d69a8afcc91d4..1108e3887b7d7 100755
--- a/app/code/Magento/Customer/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Customer/Setup/UpgradeSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/ColumnFactory.php b/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
index 4bd416c24866a..7e90dd65bc8ab 100644
--- a/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Customer\Ui\Component\ColumnFactory
  *
- * @since 2.0.0
  */
 class ColumnFactory
 {
     /**
      * @var \Magento\Framework\View\Element\UiComponentFactory
-     * @since 2.0.0
      */
     protected $componentFactory;
 
     /**
      * @var \Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater
-     * @since 2.0.0
      */
     protected $inlineEditUpdater;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsComponentMap = [
         'text' => 'Magento_Ui/js/grid/columns/column',
@@ -40,7 +36,6 @@ class ColumnFactory
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $dataTypeMap = [
         'default' => 'text',
@@ -54,7 +49,6 @@ class ColumnFactory
     /**
      * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
      * @param InlineEditUpdater $inlineEditor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\UiComponentFactory $componentFactory,
@@ -70,7 +64,6 @@ public function __construct(
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @param array $config
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-     * @since 2.0.0
      */
     public function create(array $attributeData, $columnName, $context, array $config = [])
     {
@@ -114,7 +107,6 @@ public function create(array $attributeData, $columnName, $context, array $confi
     /**
      * @param string $dataType
      * @return string
-     * @since 2.0.0
      */
     protected function getJsComponent($dataType)
     {
@@ -124,7 +116,6 @@ protected function getJsComponent($dataType)
     /**
      * @param string $frontendType
      * @return string
-     * @since 2.0.0
      */
     protected function getDataType($frontendType)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider.php b/app/code/Magento/Customer/Ui/Component/DataProvider.php
index 914fe1dd304e4..622399725090c 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\Customer\Ui\Component\DataProvider
  *
- * @since 2.0.0
  */
 class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
 {
     /**
      * @var AttributeRepository
-     * @since 2.0.0
      */
     private $attributeRepository;
 
@@ -37,7 +35,6 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      * @param array $meta
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -67,7 +64,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/app/code/Magento/Customer/Ui/Component/FilterFactory.php b/app/code/Magento/Customer/Ui/Component/FilterFactory.php
index 15e100cc2c98e..a386fea04a8a4 100644
--- a/app/code/Magento/Customer/Ui/Component/FilterFactory.php
+++ b/app/code/Magento/Customer/Ui/Component/FilterFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Customer\Ui\Component\FilterFactory
  *
- * @since 2.0.0
  */
 class FilterFactory
 {
     /**
      * @var \Magento\Framework\View\Element\UiComponentFactory
-     * @since 2.0.0
      */
     protected $componentFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $filterMap = [
         'default' => 'filterInput',
@@ -34,7 +31,6 @@ class FilterFactory
 
     /**
      * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Element\UiComponentFactory $componentFactory)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      * @param array $attributeData
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-     * @since 2.0.0
      */
     public function create(array $attributeData, $context)
     {
@@ -74,7 +69,6 @@ public function create(array $attributeData, $context)
     /**
      * @param string $frontendInput
      * @return string
-     * @since 2.0.0
      */
     protected function getFilterType($frontendInput)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
index 4261d39bba68c..ae7137fa67a1c 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Customer\Ui\Component\Listing\AttributeRepository
  *
- * @since 2.0.0
  */
 class AttributeRepository
 {
@@ -24,37 +23,31 @@ class AttributeRepository
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $attributes;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $customerMetadata;
 
     /**
      * @var \Magento\Customer\Api\AddressMetadataInterface
-     * @since 2.0.0
      */
     protected $addressMetadata;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataManagementInterface
-     * @since 2.0.0
      */
     protected $customerMetadataManagement;
 
     /**
      * @var \Magento\Customer\Api\AddressMetadataManagementInterface
-     * @since 2.0.0
      */
     protected $addressMetadataManagement;
 
     /**
      * @var \Magento\Customer\Model\Indexer\Attribute\Filter
-     * @since 2.0.0
      */
     protected $attributeFilter;
 
@@ -64,7 +57,6 @@ class AttributeRepository
      * @param CustomerMetadataInterface $customerMetadata
      * @param AddressMetadataInterface $addressMetadata
      * @param Filter $attributeFiltering
-     * @since 2.0.0
      */
     public function __construct(
         CustomerMetadataManagementInterface $customerMetadataManagement,
@@ -82,7 +74,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -110,7 +101,6 @@ public function getList()
      * @param string $entityTypeCode
      * @param MetadataManagementInterface $management
      * @return array
-     * @since 2.0.0
      */
     protected function getListForEntity(array $metadata, $entityTypeCode, MetadataManagementInterface $management)
     {
@@ -145,7 +135,6 @@ protected function getListForEntity(array $metadata, $entityTypeCode, MetadataMa
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function getOptionArray(array $options)
     {
@@ -159,7 +148,6 @@ protected function getOptionArray(array $options)
     /**
      * @param string $code
      * @return []
-     * @since 2.0.0
      */
     public function getMetadataByCode($code)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
index 04f7fb88591a1..b7cf8e8c95899 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
@@ -14,13 +14,11 @@
  * Class ProductActions
  *
  * @api
- * @since 2.0.0
  */
 class Actions extends Column
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -30,7 +28,6 @@ class Actions extends Column
      * @param UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
index 1f2bbf98388c5..d0b9f5d901036 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Customer\Ui\Component\Listing\Column\AttributeColumn
  *
- * @since 2.0.0
  */
 class AttributeColumn extends Column
 {
     /**
      * @var \Magento\Customer\Ui\Component\Listing\AttributeRepository
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
@@ -30,7 +28,6 @@ class AttributeColumn extends Column
      * @param AttributeRepository $attributeRepository
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
index 85280579b9f25..f521a95e1e616 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -30,7 +27,6 @@ class Options implements OptionSourceInterface
      * Constructor
      *
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $collectionFactory)
     {
@@ -41,7 +37,6 @@ public function __construct(CollectionFactory $collectionFactory)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
index 983efd36904ca..41e10713f1610 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater
  *
- * @since 2.0.0
  */
 class InlineEditUpdater
 {
     /**
      * @var \Magento\Customer\Ui\Component\Listing\Column\ValidationRules
-     * @since 2.0.0
      */
     protected $validationRules;
 
@@ -24,7 +22,6 @@ class InlineEditUpdater
      * List of frontend inputs that should be editable in grid
      *
      * @var array
-     * @since 2.0.0
      */
     protected $editableFields = [
         'text',
@@ -35,7 +32,6 @@ class InlineEditUpdater
 
     /**
      * @param ValidationRules $validationRules
-     * @since 2.0.0
      */
     public function __construct(
         ValidationRules $validationRules
@@ -51,7 +47,6 @@ public function __construct(
      * @param array $validationRules
      * @param bool|false $isRequired
      * @return UiComponentInterface
-     * @since 2.0.0
      */
     public function applyEditing(
         UiComponentInterface $column,
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
index 8623e23071b8d..9af6159651d8d 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Type
- * @since 2.0.0
  */
 class Type extends Column
 {
@@ -19,7 +18,6 @@ class Type extends Column
      *
      * @param array $dataSource
      * @return void
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type/Options.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type/Options.php
index 13a11d4435bb5..2bba26167ad72 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type/Options.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type/Options.php
@@ -9,13 +9,11 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
@@ -23,7 +21,6 @@ class Options implements OptionSourceInterface
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
index 5a13c6491787f..4b67e9a56eee7 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Customer\Ui\Component\Listing\Column\ValidationRules
  *
- * @since 2.0.0
  */
 class ValidationRules
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $inputValidationMap = [
         'alpha' => 'validate-alpha',
@@ -32,7 +30,6 @@ class ValidationRules
      * @param boolean $isRequired
      * @param array $validationRules
      * @return array
-     * @since 2.0.0
      */
     public function getValidationRules($isRequired, $validationRules)
     {
@@ -62,7 +59,6 @@ public function getValidationRules($isRequired, $validationRules)
      *
      * @param ValidationRuleInterface $rule
      * @return string
-     * @since 2.0.0
      */
     protected function getValidationClass(ValidationRuleInterface $rule)
     {
@@ -77,7 +73,6 @@ protected function getValidationClass(ValidationRuleInterface $rule)
      *
      * @param ValidationRuleInterface $rule
      * @return bool|string
-     * @since 2.0.0
      */
     protected function getRuleValue(ValidationRuleInterface $rule)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Columns.php b/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
index 08416339975cc..54d4dbfafffa7 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Customer\Ui\Component\Listing\Columns
  *
- * @since 2.0.0
  */
 class Columns extends \Magento\Ui\Component\Listing\Columns
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $columnSortOrder;
 
     /**
      * @var \Magento\Customer\Ui\Component\Listing\AttributeRepository
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
     /**
      * @var \Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater
-     * @since 2.0.0
      */
     protected $inlineEditUpdater;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $filterMap = [
         'default' => 'text',
@@ -56,7 +51,6 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
      * @param InlineEditUpdater $inlineEditor
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -74,7 +68,6 @@ public function __construct(
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function getDefaultSortOrder()
     {
@@ -92,7 +85,6 @@ protected function getDefaultSortOrder()
      * Update actions column sort order
      *
      * @return void
-     * @since 2.0.0
      */
     protected function updateActionColumnSortOrder()
     {
@@ -107,7 +99,6 @@ protected function updateActionColumnSortOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -129,7 +120,6 @@ public function prepare()
      * @param array $attributeData
      * @param string $columnName
      * @return void
-     * @since 2.0.0
      */
     public function addColumn(array $attributeData, $columnName)
     {
@@ -146,7 +136,6 @@ public function addColumn(array $attributeData, $columnName)
      * @param array $attributeData
      * @param string $newAttributeCode
      * @return void
-     * @since 2.0.0
      */
     public function updateColumn(array $attributeData, $newAttributeCode)
     {
@@ -195,7 +184,6 @@ public function updateColumn(array $attributeData, $newAttributeCode)
      * @param UiComponentInterface $component
      * @param array $attributeData
      * @return void
-     * @since 2.0.0
      */
     public function addOptions(UiComponentInterface $component, array $attributeData)
     {
@@ -213,7 +201,6 @@ public function addOptions(UiComponentInterface $component, array $attributeData
      *
      * @param string $frontendInput
      * @return string
-     * @since 2.0.0
      */
     protected function getFilterType($frontendInput)
     {
diff --git a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
index fc13893467ad6..ad2af528a89c5 100644
--- a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
+++ b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
@@ -12,19 +12,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements JsonSerializable
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -32,13 +29,11 @@ class Options implements JsonSerializable
      * Additional options params
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -46,7 +41,6 @@ class Options implements JsonSerializable
      * Base URL for subactions
      *
      * @var string
-     * @since 2.0.0
      */
     protected $urlPath;
 
@@ -54,7 +48,6 @@ class Options implements JsonSerializable
      * Param name for subactions
      *
      * @var string
-     * @since 2.0.0
      */
     protected $paramName;
 
@@ -62,7 +55,6 @@ class Options implements JsonSerializable
      * Additional params for subactions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $additionalData = [];
 
@@ -72,7 +64,6 @@ class Options implements JsonSerializable
      * @param CollectionFactory $collectionFactory
      * @param UrlInterface $urlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $collectionFactory,
@@ -88,7 +79,6 @@ public function __construct(
      * Get action options
      *
      * @return array
-     * @since 2.0.0
      */
     public function jsonSerialize()
     {
@@ -124,7 +114,6 @@ public function jsonSerialize()
      * Prepare addition data for subactions
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareData()
     {
diff --git a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php
index a36cd2a8cd179..0af48d12d2f0c 100644
--- a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php
+++ b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php
@@ -10,13 +10,11 @@
 
 /**
  * Class Index
- * @since 2.0.0
  */
 class ExportCsv extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
@@ -25,7 +23,6 @@ class ExportCsv extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Export customer grid to CSV format
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php
index 103fe6582ec3b..f24453ee4d293 100644
--- a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php
+++ b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php
@@ -10,13 +10,11 @@
 
 /**
  * Class Index
- * @since 2.0.0
  */
 class ExportXml extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
@@ -25,7 +23,6 @@ class ExportXml extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Export customer grid to XML format
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index 08aed9f4693c7..ab1c84d3233b4 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 {
@@ -52,19 +51,13 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     /**#@-*/
 
-    /**
-     * Permanent entity columns
-     *
-     * @var string[]
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_permanentAttributes = [self::COLUMN_WEBSITE, self::COLUMN_EMAIL, self::COLUMN_ADDRESS_ID];
 
     /**
      * Default addresses column names to appropriate customer attribute code
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_defaultAddressAttributeMapping = [
         self::COLUMN_NAME_DEFAULT_BILLING => 'default_billing',
@@ -75,7 +68,6 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Customers whose addresses are exported
      *
      * @var \Magento\Customer\Model\ResourceModel\Customer\Collection
-     * @since 2.0.0
      */
     protected $_customerCollection;
 
@@ -83,7 +75,6 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Customer addresses collection
      *
      * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     protected $_addressCollection;
 
@@ -91,7 +82,6 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Customers whose address are exported
      *
      * @var Customer
-     * @since 2.0.0
      */
     protected $_customerEntity;
 
@@ -108,7 +98,6 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customers = [];
 
@@ -124,7 +113,6 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * @param \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressColFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -168,7 +156,6 @@ public function __construct(
      * Initialize existent customers data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initCustomers()
     {
@@ -192,7 +179,6 @@ protected function _initCustomers()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getHeaderColumns()
     {
@@ -207,7 +193,6 @@ protected function _getHeaderColumns()
      * Get customers collection
      *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     protected function _getEntityCollection()
     {
@@ -218,7 +203,6 @@ protected function _getEntityCollection()
      * Export process
      *
      * @return string
-     * @since 2.0.0
      */
     public function export()
     {
@@ -239,7 +223,6 @@ public function export()
      *
      * @param \Magento\Customer\Model\Address $item
      * @return void
-     * @since 2.0.0
      */
     public function exportItem($item)
     {
@@ -268,7 +251,6 @@ public function exportItem($item)
      *
      * @param array $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $parameters)
     {
@@ -283,7 +265,6 @@ public function setParameters(array $parameters)
      * EAV entity type code getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index c767018ccec6d..f4864c140ce17 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @method \Magento\Customer\Model\ResourceModel\Attribute\Collection getAttributeCollection() getAttributeCollection()
- * @since 2.0.0
  */
 class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 {
@@ -43,12 +42,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     /**#@-*/
 
-    /**
-     * Overridden attributes parameters.
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_attributeOverrides = [
         'created_at' => ['backend_type' => 'datetime'],
         'reward_update_notification' => ['source_model' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class],
@@ -59,7 +53,6 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Array of attributes codes which are disabled for export
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_disabledAttributes = ['default_billing', 'default_shipping'];
 
@@ -67,7 +60,6 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = ['group_id', 'website_id', 'store_id'];
 
@@ -75,7 +67,6 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [self::COLUMN_EMAIL, self::COLUMN_WEBSITE, self::COLUMN_STORE];
 
@@ -83,7 +74,6 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Customers whose data is exported
      *
      * @var \Magento\Customer\Model\ResourceModel\Customer\Collection
-     * @since 2.0.0
      */
     protected $_customerCollection;
 
@@ -96,7 +86,6 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerColFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -129,7 +118,6 @@ public function __construct(
      * Export process.
      *
      * @return string
-     * @since 2.0.0
      */
     public function export()
     {
@@ -147,7 +135,6 @@ public function export()
      * Get customers collection
      *
      * @return \Magento\Customer\Model\ResourceModel\Customer\Collection
-     * @since 2.0.0
      */
     protected function _getEntityCollection()
     {
@@ -156,7 +143,6 @@ protected function _getEntityCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getHeaderColumns()
     {
@@ -169,7 +155,6 @@ protected function _getHeaderColumns()
      *
      * @param \Magento\Customer\Model\Customer $item
      * @return void
-     * @since 2.0.0
      */
     public function exportItem($item)
     {
@@ -185,7 +170,6 @@ public function exportItem($item)
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
@@ -207,7 +191,6 @@ public function filterAttributeCollection(\Magento\Framework\Data\Collection $co
      * EAV entity type code getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -218,7 +201,6 @@ public function getEntityTypeCode()
      * Retrieve list of overridden attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOverriddenAttributes()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index c6b4b7539dc5f..eef52b1d88d4d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entity\AbstractEav
 {
@@ -51,14 +50,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
 
     /**#@-*/
 
-    /**
-     * Array of attribute codes which will be ignored in validation and import procedures.
-     * For example, when entity attribute has own validation and import procedures
-     * or just to deny this attribute processing.
-     *
-     * @var string[]
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_ignoredAttributes = ['website_id', 'store_id',
         self::COLUMN_DEFAULT_BILLING, self::COLUMN_DEFAULT_SHIPPING];
 
@@ -66,13 +58,11 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      * Customer collection wrapper
      *
      * @var Storage
-     * @since 2.0.0
      */
     protected $_customerStorage;
 
     /**
      * @var \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\StorageFactory
-     * @since 2.0.0
      */
     protected $_storageFactory;
 
@@ -80,13 +70,11 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      * If we should check column names
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needColumnCheck = true;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $masterAttributeCode = '_email';
 
@@ -103,7 +91,6 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      * @param \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\StorageFactory $storageFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -150,7 +137,6 @@ public function __construct(
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _initCustomers(array $data)
     {
@@ -172,7 +158,6 @@ protected function _initCustomers(array $data)
      * @param string $email
      * @param string $websiteCode
      * @return bool|int
-     * @since 2.0.0
      */
     protected function _getCustomerId($email, $websiteCode)
     {
@@ -191,7 +176,6 @@ protected function _getCustomerId($email, $websiteCode)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function validateRow(array $rowData, $rowNumber)
     {
@@ -216,7 +200,6 @@ public function validateRow(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return null
-     * @since 2.0.0
      */
     abstract protected function _validateRowForUpdate(array $rowData, $rowNumber);
 
@@ -226,7 +209,6 @@ abstract protected function _validateRowForUpdate(array $rowData, $rowNumber);
      * @param array $rowData
      * @param int $rowNumber
      * @return null
-     * @since 2.0.0
      */
     abstract protected function _validateRowForDelete(array $rowData, $rowNumber);
 
@@ -236,7 +218,6 @@ abstract protected function _validateRowForDelete(array $rowData, $rowNumber);
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkUniqueKey(array $rowData, $rowNumber)
     {
@@ -261,7 +242,6 @@ protected function _checkUniqueKey(array $rowData, $rowNumber)
      * Get customer storage
      *
      * @return Storage
-     * @since 2.0.0
      */
     public function getCustomerStorage()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 7def55135a332..e8f4007548041 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends AbstractCustomer
 {
@@ -69,12 +68,7 @@ class Address extends AbstractCustomer
 
     /**#@-*/
 
-    /**
-     * Default addresses column names to appropriate customer attribute code
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected static $_defaultAddressAttributeMapping = [
         self::COLUMN_DEFAULT_BILLING => 'default_billing',
         self::COLUMN_DEFAULT_SHIPPING => 'default_shipping',
@@ -84,7 +78,6 @@ class Address extends AbstractCustomer
      * Permanent entity columns
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [self::COLUMN_WEBSITE, self::COLUMN_EMAIL, self::COLUMN_ADDRESS_ID];
 
@@ -99,7 +92,6 @@ class Address extends AbstractCustomer
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_addresses = [];
 
@@ -107,7 +99,6 @@ class Address extends AbstractCustomer
      * Attributes with index (not label) value
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [self::COLUMN_COUNTRY_ID];
 
@@ -115,7 +106,6 @@ class Address extends AbstractCustomer
      * Customer entity DB table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTable;
 
@@ -134,7 +124,6 @@ class Address extends AbstractCustomer
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_countryRegions = [];
 
@@ -142,7 +131,6 @@ class Address extends AbstractCustomer
      * Region ID to region default name pairs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_regions = [];
 
@@ -150,7 +138,6 @@ class Address extends AbstractCustomer
      * Column names that holds values with particular meaning
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [
         self::COLUMN_ACTION,
@@ -165,7 +152,6 @@ class Address extends AbstractCustomer
      * Customer entity
      *
      * @var \Magento\Customer\Model\Customer
-     * @since 2.0.0
      */
     protected $_customerEntity;
 
@@ -173,7 +159,6 @@ class Address extends AbstractCustomer
      * Entity ID incremented value
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_nextEntityId;
 
@@ -181,7 +166,6 @@ class Address extends AbstractCustomer
      * Array of region parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_regionParameters;
 
@@ -189,7 +173,6 @@ class Address extends AbstractCustomer
      * Address attributes collection
      *
      * @var \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_attributeCollection;
 
@@ -197,7 +180,6 @@ class Address extends AbstractCustomer
      * Collection of existent addresses
      *
      * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-     * @since 2.0.0
      */
     protected $_addressCollection;
 
@@ -205,37 +187,31 @@ class Address extends AbstractCustomer
      * Store imported row primary keys
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importedRowPks = [];
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
-     * @since 2.0.0
      */
     protected $_addressFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -243,7 +219,6 @@ class Address extends AbstractCustomer
      * Customer attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customerAttributes = [];
 
@@ -251,7 +226,6 @@ class Address extends AbstractCustomer
      * Valid column names
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [
         "region_id", "vat_is_valid", "vat_request_date", "vat_request_id", "vat_request_success"
@@ -285,7 +259,6 @@ class Address extends AbstractCustomer
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -363,7 +336,6 @@ public function __construct(
      * Customer entity getter
      *
      * @return \Magento\Customer\Model\Customer
-     * @since 2.0.0
      */
     protected function _getCustomerEntity()
     {
@@ -377,7 +349,6 @@ protected function _getCustomerEntity()
      * Get next address entity ID
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getNextEntityId()
     {
@@ -394,7 +365,6 @@ protected function _getNextEntityId()
      * Initialize existent addresses data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAddresses()
     {
@@ -416,7 +386,6 @@ protected function _initAddresses()
      * Initialize country regions hash for clever recognition
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initCountryRegions()
     {
@@ -438,7 +407,6 @@ protected function _initCountryRegions()
      * @abstract
      * @return boolean
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -496,7 +464,6 @@ protected function _importData()
      * @param array $newAttributes
      * @param array $attributes
      * @return array
-     * @since 2.0.0
      */
     protected function _mergeEntityAttributes(array $newAttributes, array $attributes)
     {
@@ -517,7 +484,6 @@ protected function _mergeEntityAttributes(array $newAttributes, array $attribute
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareDataForUpdate(array $rowData)
     {
@@ -623,7 +589,6 @@ protected function _prepareDataForUpdate(array $rowData)
      * @param array $addRows Rows for insert
      * @param array $updateRows Rows for update
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveAddressEntities(array $addRows, array $updateRows)
     {
@@ -645,7 +610,6 @@ protected function _saveAddressEntities(array $addRows, array $updateRows)
      *
      * @param array $attributesData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveAddressAttributes(array $attributesData)
     {
@@ -671,7 +635,6 @@ protected function _saveAddressAttributes(array $attributesData)
      * @param array $defaults
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _saveCustomerDefaults(array $defaults)
     {
@@ -692,7 +655,6 @@ protected function _saveCustomerDefaults(array $defaults)
      *
      * @param array $entityRowIds Row IDs for delete
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteAddressEntities(array $entityRowIds)
     {
@@ -707,7 +669,6 @@ protected function _deleteAddressEntities(array $entityRowIds)
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -719,7 +680,6 @@ public function getEntityTypeCode()
      *
      * @static
      * @return array
-     * @since 2.0.0
      */
     public static function getDefaultAddressAttributeMapping()
     {
@@ -731,7 +691,6 @@ public static function getDefaultAddressAttributeMapping()
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _isOptionalAddressEmpty(array $rowData)
     {
@@ -761,7 +720,6 @@ protected function _isOptionalAddressEmpty(array $rowData)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _validateRowForUpdate(array $rowData, $rowNumber)
     {
@@ -839,7 +797,6 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return void
-     * @since 2.0.0
      */
     protected function _validateRowForDelete(array $rowData, $rowNumber)
     {
@@ -867,7 +824,6 @@ protected function _validateRowForDelete(array $rowData, $rowNumber)
      * @param int $customerId
      * @param int $addressId
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkRowDuplicate($customerId, $addressId)
     {
@@ -888,7 +844,6 @@ protected function _checkRowDuplicate($customerId, $addressId)
      *
      * @param array $customerAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerAttributes($customerAttributes)
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index de9f8cf9d6b48..99cb1fcfbfcd6 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Customer extends AbstractCustomer
 {
@@ -77,7 +76,6 @@ class Customer extends AbstractCustomer
      * Customers information from import file
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_newCustomers = [];
 
@@ -87,7 +85,6 @@ class Customer extends AbstractCustomer
      * or just to deny this attribute processing.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_ignoredAttributes = ['website_id', 'store_id'];
 
@@ -95,7 +92,6 @@ class Customer extends AbstractCustomer
      * Customer entity DB table name.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTable;
 
@@ -103,7 +99,6 @@ class Customer extends AbstractCustomer
      * Customer model
      *
      * @var \Magento\Customer\Model\Customer
-     * @since 2.0.0
      */
     protected $_customerModel;
 
@@ -111,7 +106,6 @@ class Customer extends AbstractCustomer
      * Id of next customer entity row
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_nextEntityId;
 
@@ -119,19 +113,16 @@ class Customer extends AbstractCustomer
      * Address attributes collection
      *
      * @var \Magento\Customer\Model\ResourceModel\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_attributeCollection;
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $masterAttributeCode = 'email';
 
@@ -139,7 +130,6 @@ class Customer extends AbstractCustomer
      * Valid column names
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [
         self::COLUMN_DEFAULT_BILLING,
@@ -149,7 +139,6 @@ class Customer extends AbstractCustomer
 
     /**
      * Customer fields in file
-     * @since 2.0.0
      */
     protected $customerFields = [
         CustomerInterface::GROUP_ID,
@@ -189,7 +178,6 @@ class Customer extends AbstractCustomer
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -269,7 +257,6 @@ public function __construct(
      * @param array $entitiesToCreate Rows for insert
      * @param array $entitiesToUpdate Rows for update
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveCustomerEntities(array $entitiesToCreate, array $entitiesToUpdate)
     {
@@ -293,7 +280,6 @@ protected function _saveCustomerEntities(array $entitiesToCreate, array $entitie
      *
      * @param array $attributesData
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveCustomerAttributes(array $attributesData)
     {
@@ -319,7 +305,6 @@ protected function _saveCustomerAttributes(array $attributesData)
      *
      * @param array $entitiesToDelete customers id list
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteCustomerEntities(array $entitiesToDelete)
     {
@@ -333,7 +318,6 @@ protected function _deleteCustomerEntities(array $entitiesToDelete)
      * Retrieve next customer entity id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getNextEntityId()
     {
@@ -350,7 +334,6 @@ protected function _getNextEntityId()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareDataForUpdate(array $rowData)
     {
@@ -445,7 +428,6 @@ protected function _prepareDataForUpdate(array $rowData)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -506,7 +488,6 @@ protected function _importData()
      * EAV entity type code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -521,7 +502,6 @@ public function getEntityTypeCode()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _validateRowForUpdate(array $rowData, $rowNumber)
     {
@@ -568,7 +548,6 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return void
-     * @since 2.0.0
      */
     protected function _validateRowForDelete(array $rowData, $rowNumber)
     {
@@ -583,7 +562,6 @@ protected function _validateRowForDelete(array $rowData, $rowNumber)
      * Entity table name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTable()
     {
@@ -592,7 +570,6 @@ public function getEntityTable()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getValidColumnNames()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
index d9d7d89289716..c10ba026fd624 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
@@ -11,7 +11,6 @@
  * Import entity customer combined model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntity
 {
@@ -54,13 +53,11 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
 
     /**
      * @var \Magento\CustomerImportExport\Model\Import\Customer
-     * @since 2.0.0
      */
     protected $_customerEntity;
 
     /**
      * @var \Magento\CustomerImportExport\Model\Import\Address
-     * @since 2.0.0
      */
     protected $_addressEntity;
 
@@ -68,7 +65,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Column names that holds values with particular meaning
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [
         Customer::COLUMN_WEBSITE,
@@ -81,7 +77,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Permanent entity columns
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [
         Customer::COLUMN_EMAIL,
@@ -92,7 +87,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Customer attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customerAttributes = [];
 
@@ -100,7 +94,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Address attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_addressAttributes = [];
 
@@ -108,7 +101,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Website code of current customer row
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentWebsiteCode;
 
@@ -116,7 +108,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Email of current customer
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentEmail;
 
@@ -124,7 +115,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Next customer entity ID
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_nextCustomerId;
 
@@ -132,7 +122,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * DB data source models
      *
      * @var \Magento\ImportExport\Model\ResourceModel\Import\Data[]
-     * @since 2.0.0
      */
     protected $_dataSourceModels;
 
@@ -140,7 +129,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * If we should check column names
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needColumnCheck = true;
 
@@ -148,7 +136,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * Valid column names
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [
         Customer::COLUMN_DEFAULT_BILLING,
@@ -158,7 +145,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $masterAttributeCode = 'email';
 
@@ -176,7 +162,6 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -251,7 +236,6 @@ public function __construct(
      * Collect customer attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initCustomerAttributes()
     {
@@ -267,7 +251,6 @@ protected function _initCustomerAttributes()
      * Collect address attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAddressAttributes()
     {
@@ -283,7 +266,6 @@ protected function _initAddressAttributes()
      * Import data rows
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _importData()
     {
@@ -299,7 +281,6 @@ protected function _importData()
      * Imported entity type code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -312,7 +293,6 @@ public function getEntityTypeCode()
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function validateRow(array $rowData, $rowNumber)
     {
@@ -361,7 +341,6 @@ public function validateRow(array $rowData, $rowNumber)
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateAddressRow(array $rowData, $rowNumber)
     {
@@ -388,7 +367,6 @@ protected function _validateAddressRow(array $rowData, $rowNumber)
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareAddressRowData(array $rowData)
     {
@@ -417,7 +395,6 @@ protected function _prepareAddressRowData(array $rowData)
      *
      * @param array $rowData
      * @return int
-     * @since 2.0.0
      */
     protected function _getRowScope(array $rowData)
     {
@@ -434,7 +411,6 @@ protected function _getRowScope(array $rowData)
      *
      * @param array $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $parameters)
     {
@@ -455,7 +431,6 @@ public function setParameters(array $parameters)
      *
      * @param \Magento\ImportExport\Model\Import\AbstractSource $source
      * @return \Magento\ImportExport\Model\Import\AbstractEntity
-     * @since 2.0.0
      */
     public function setSource(\Magento\ImportExport\Model\Import\AbstractSource $source)
     {
@@ -469,7 +444,6 @@ public function setSource(\Magento\ImportExport\Model\Import\AbstractSource $sou
      * Returns number of checked entities
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -482,7 +456,6 @@ public function getProcessedEntitiesCount()
      *
      * @param string $attributeCode
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeParticular($attributeCode)
     {
@@ -498,7 +471,6 @@ public function isAttributeParticular($attributeCode)
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRowForDb(array $rowData)
     {
@@ -513,7 +485,6 @@ protected function _prepareRowForDb(array $rowData)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getValidColumnNames()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
index 5ef2ff47db247..ed82fd5a0db90 100644
--- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage
  *
- * @since 2.0.0
  */
 class Storage
 {
@@ -16,7 +15,6 @@ class Storage
      * Flag to not load collection more than one time
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCollectionLoaded = false;
 
@@ -24,7 +22,6 @@ class Storage
      * Customer collection
      *
      * @var \Magento\Customer\Model\ResourceModel\Customer\Collection
-     * @since 2.0.0
      */
     protected $_customerCollection;
 
@@ -39,7 +36,6 @@ class Storage
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customerIds = [];
 
@@ -47,7 +43,6 @@ class Storage
      * Number of items to fetch from db in one query
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pageSize;
 
@@ -55,7 +50,6 @@ class Storage
      * Collection by pages iterator
      *
      * @var \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator
-     * @since 2.0.0
      */
     protected $_byPagesIterator;
 
@@ -63,7 +57,6 @@ class Storage
      * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $collectionFactory
      * @param \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory $colIteratorFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $collectionFactory,
@@ -83,7 +76,6 @@ public function __construct(
      * Load needed data from customer collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function load()
     {
@@ -108,7 +100,6 @@ public function load()
      *
      * @param \Magento\Framework\DataObject|\Magento\Customer\Model\Customer $customer
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomer(\Magento\Framework\DataObject $customer)
     {
@@ -127,7 +118,6 @@ public function addCustomer(\Magento\Framework\DataObject $customer)
      * @param string $email
      * @param int $websiteId
      * @return bool|int
-     * @since 2.0.0
      */
     public function getCustomerId($email, $websiteId)
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php
index ce6d12bf03037..62845a9bbe301 100644
--- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\ImportExport\Model\ResourceModel\Import\Data
 {
@@ -18,7 +17,6 @@ class Data extends \Magento\ImportExport\Model\ResourceModel\Import\Data
      * Entity type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityType = CustomerComposite::COMPONENT_ENTITY_CUSTOMER;
 
@@ -26,7 +24,6 @@ class Data extends \Magento\ImportExport\Model\ResourceModel\Import\Data
      * Customer attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customerAttributes = [];
 
@@ -37,7 +34,6 @@ class Data extends \Magento\ImportExport\Model\ResourceModel\Import\Data
      * @param \Magento\Framework\Json\Helper\Data $coreHelper
      * @param string $connectionName
      * @param array $arguments
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Get next bunch of validated rows.
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getNextBunch()
     {
@@ -84,7 +79,6 @@ public function getNextBunch()
      *
      * @param array $rowData
      * @return array|null
-     * @since 2.0.0
      */
     protected function _prepareRow(array $rowData)
     {
@@ -105,7 +99,6 @@ protected function _prepareRow(array $rowData)
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareAddressRowData(array $rowData)
     {
diff --git a/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php b/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
index 80115afef5602..1ab3c648dc80b 100644
--- a/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
@@ -17,19 +17,19 @@
 
 /**
  * Command for dump application state
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ApplicationDumpCommand extends Command
 {
     /**
      * @var Writer
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $writer;
 
     /**
      * @var ConfigSourceInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $sources;
 
@@ -45,7 +45,7 @@ class ApplicationDumpCommand extends Command
      * @param Writer $writer
      * @param array $sources
      * @param Hash $configHash
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Writer $writer,
@@ -60,7 +60,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function configure()
     {
@@ -76,7 +76,7 @@ protected function configure()
      * @param OutputInterface $output
      * @return boolean
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
index 4b5209e260c4d..c4485656fb884 100644
--- a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
@@ -17,7 +17,6 @@
 
 /**
  * Command to set application mode
- * @since 2.0.0
  */
 class SetModeCommand extends Command
 {
@@ -35,7 +34,6 @@ class SetModeCommand extends Command
      * Object manager factory
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -43,7 +41,6 @@ class SetModeCommand extends Command
      * Inject dependencies
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -53,7 +50,6 @@ public function __construct(ObjectManagerInterface $objectManager)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -80,7 +76,6 @@ protected function configure()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php b/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
index 2a7dcecb0e65c..b28051e603f6c 100644
--- a/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Command to show application mode
- * @since 2.0.0
  */
 class ShowModeCommand extends Command
 {
@@ -22,7 +21,6 @@ class ShowModeCommand extends Command
      * Object manager factory
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -30,7 +28,6 @@ class ShowModeCommand extends Command
      * Inject dependencies
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -40,7 +37,6 @@ public function __construct(ObjectManagerInterface $objectManager)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -52,7 +48,6 @@ protected function configure()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 7c8600b80519b..705196d75925d 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -18,7 +18,6 @@
  * Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Filesystem
 {
@@ -53,55 +52,46 @@ class Filesystem
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig\Writer
-     * @since 2.0.0
      */
     private $writer;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig\Reader
-     * @since 2.0.0
      */
     private $reader;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var \Magento\Framework\App\Filesystem\DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
     /**
      * @var \Magento\Framework\Filesystem\Driver\File
-     * @since 2.0.0
      */
     private $driverFile;
 
     /**
      * @var \Magento\Store\Model\Config\StoreView
-     * @since 2.0.0
      */
     private $storeView;
 
     /**
      * @var \Magento\Framework\ShellInterface
-     * @since 2.0.0
      */
     private $shell;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $functionCallPath;
 
@@ -120,7 +110,6 @@ class Filesystem
      * @param \Magento\Framework\Filesystem\Driver\File $driverFile
      * @param \Magento\Store\Model\Config\StoreView $storeView
      * @param \Magento\Framework\ShellInterface $shell
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\DeploymentConfig\Writer $writer,
@@ -149,7 +138,6 @@ public function __construct(
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     public function regenerateStatic(
         OutputInterface $output
@@ -176,7 +164,6 @@ public function regenerateStatic(
      * @param OutputInterface $output
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function deployStaticContent(
         OutputInterface $output
@@ -253,7 +240,6 @@ private function getUserCollection()
      * @param OutputInterface $output
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function compile(OutputInterface $output)
     {
@@ -288,7 +274,6 @@ protected function compile(OutputInterface $output)
      *
      * @param array $directoryCodeList
      * @return void
-     * @since 2.0.0
      */
     public function cleanupFilesystem($directoryCodeList)
     {
@@ -325,14 +310,13 @@ public function cleanupFilesystem($directoryCodeList)
      * @param int $dirPermissions
      * @param int $filePermissions
      * @return void
-     * @deprecated 2.1.0 As magento2 doesn't control indirectly
+     * @deprecated 2.0.6 As magento2 doesn't control indirectly
      * the access permissions to the files and directories anymore.
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-     * @since 2.0.0
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -351,14 +335,13 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * Change permissions on static resources
      *
      * @return void
-     * @deprecated 2.1.0 As magento2 doesn't control indirectly the access permissions to the files
+     * @deprecated 2.0.6 As magento2 doesn't control indirectly the access permissions to the files
      * and directories anymore.
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
-     * @since 2.0.0
      */
     public function lockStaticResources()
     {
diff --git a/app/code/Magento/Deploy/Model/Mode.php b/app/code/Magento/Deploy/Model/Mode.php
index 30e002de3a17a..75de873f71e44 100644
--- a/app/code/Magento/Deploy/Model/Mode.php
+++ b/app/code/Magento/Deploy/Model/Mode.php
@@ -21,37 +21,31 @@
  *
  * @SuppressWarnings("PMD.CouplingBetweenObjects")
  * @SuppressWarnings("PMD.ExcessiveParameterList")
- * @since 2.0.0
  */
 class Mode
 {
     /**
      * @var InputInterface
-     * @since 2.0.0
      */
     private $input;
 
     /**
      * @var OutputInterface
-     * @since 2.0.0
      */
     protected $output;
 
     /**
      * @var Writer
-     * @since 2.0.0
      */
     private $writer;
 
     /**
      * @var Reader
-     * @since 2.0.0
      */
     private $reader;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -62,7 +56,6 @@ class Mode
      * @param Reader $reader
      * @param MaintenanceMode $maintenanceMode
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         InputInterface $input,
@@ -85,7 +78,6 @@ public function __construct(
      *
      * @throws LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function enableProductionMode()
     {
@@ -108,7 +100,6 @@ public function enableProductionMode()
      * Only lock static resource locations and set store mode, without handling static content
      *
      * @return void
-     * @since 2.0.0
      */
     public function enableProductionModeMinimal()
     {
@@ -119,7 +110,6 @@ public function enableProductionModeMinimal()
      * Enable Developer mode
      *
      * @return void
-     * @since 2.0.0
      */
     public function enableDeveloperMode()
     {
@@ -140,7 +130,6 @@ public function enableDeveloperMode()
      *
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -153,7 +142,6 @@ public function getMode()
      *
      * @param string $mode
      * @return void
-     * @since 2.0.0
      */
     protected function setStoreMode($mode)
     {
@@ -170,7 +158,6 @@ protected function setStoreMode($mode)
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     protected function enableMaintenanceMode(OutputInterface $output)
     {
@@ -183,7 +170,6 @@ protected function enableMaintenanceMode(OutputInterface $output)
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     protected function disableMaintenanceMode(OutputInterface $output)
     {
diff --git a/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php b/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
index c3c9d20afda28..f26f0d5e79325 100644
--- a/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
+++ b/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
@@ -14,7 +14,6 @@
  * Class DevTestsRunCommand
  *
  * Runs tests (unit, static, integration, etc.)
- * @since 2.0.0
  */
 class DevTestsRunCommand extends Command
 {
@@ -32,7 +31,6 @@ class DevTestsRunCommand extends Command
      * Maps types (from user input) to phpunit test names
      *
      * @var array
-     * @since 2.0.0
      */
     private $types;
 
@@ -40,13 +38,11 @@ class DevTestsRunCommand extends Command
      * Maps phpunit test names to directory and target name
      *
      * @var array
-     * @since 2.0.0
      */
     private $commands;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -70,7 +66,6 @@ protected function configure()
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int Non zero if invalid type, 0 otherwise
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -118,7 +113,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Fills in arrays that link test types to php unit tests and directories.
      *
      * @return void
-     * @since 2.0.0
      */
     private function setupTestInfo()
     {
diff --git a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
index c7c6ecf726abd..25519e5c83054 100644
--- a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
+++ b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
@@ -19,7 +19,6 @@
  * Class SourceThemeDeployCommand
  *
  * Collects and publishes source files for theme
- * @since 2.0.0
  */
 class SourceThemeDeployCommand extends Command
 {
@@ -50,19 +49,16 @@ class SourceThemeDeployCommand extends Command
 
     /**
      * @var Locale
-     * @since 2.0.0
      */
     private $validator;
 
     /**
      * @var Publisher
-     * @since 2.0.0
      */
     private $assetPublisher;
 
     /**
      * @var Repository
-     * @since 2.0.0
      */
     private $assetRepository;
 
@@ -72,7 +68,6 @@ class SourceThemeDeployCommand extends Command
      * @param Locale $validator
      * @param Publisher $assetPublisher
      * @param Repository $assetRepository
-     * @since 2.0.0
      */
     public function __construct(
         Locale $validator,
@@ -87,7 +82,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -137,7 +131,6 @@ protected function configure()
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
index 62fcbc00fc9c4..dd305d3ddd292 100644
--- a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
+++ b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
@@ -19,7 +19,6 @@
  * @SuppressWarnings(PMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class XmlCatalogGenerateCommand extends Command
 {
@@ -35,13 +34,11 @@ class XmlCatalogGenerateCommand extends Command
 
     /**
      * @var \Magento\Framework\App\Utility\Files
-     * @since 2.0.0
      */
     private $filesUtility;
 
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     private $urnResolver;
 
@@ -55,7 +52,6 @@ class XmlCatalogGenerateCommand extends Command
      * Supported formats
      *
      * @var \Magento\Developer\Model\XmlCatalog\Format\FormatInterface[]
-     * @since 2.0.0
      */
     private $formats;
 
@@ -64,7 +60,6 @@ class XmlCatalogGenerateCommand extends Command
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param \Magento\Developer\Model\XmlCatalog\Format\FormatInterface[] $formats
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Utility\Files $filesUtility,
@@ -81,7 +76,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -111,7 +105,6 @@ protected function configure()
      *
      * @param OutputInterface $output
      * @return array
-     * @since 2.0.0
      */
     private function getUrnDictionary(OutputInterface $output)
     {
@@ -148,7 +141,6 @@ private function getUrnDictionary(OutputInterface $output)
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -168,7 +160,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      *
      * @param string $format
      * @return \Magento\Developer\Model\XmlCatalog\Format\FormatInterface|false
-     * @since 2.0.0
      */
     private function getFormatters($format)
     {
@@ -183,7 +174,6 @@ private function getFormatters($format)
      * Get registered formatter aliases
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedFormats()
     {
diff --git a/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php b/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
index b653fff844334..16d3449530247 100644
--- a/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
+++ b/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
@@ -18,7 +18,6 @@
 /**
  * Class XmlConverterCommand
  * Converts XML file using XSL style sheets
- * @since 2.0.0
  */
 class XmlConverterCommand extends Command
 {
@@ -39,19 +38,16 @@ class XmlConverterCommand extends Command
 
     /**
      * @var Formatter
-     * @since 2.0.0
      */
     private $formatter;
 
     /**
      * @var DomDocumentFactory
-     * @since 2.0.0
      */
     private $domFactory;
 
     /**
      * @var XsltProcessorFactory
-     * @since 2.0.0
      */
     private $xsltProcessorFactory;
 
@@ -61,7 +57,6 @@ class XmlConverterCommand extends Command
      * @param Formatter $formatter
      * @param DomDocumentFactory $domFactory
      * @param XsltProcessorFactory $xsltProcessorFactory
-     * @since 2.0.0
      */
     public function __construct(
         Formatter $formatter,
@@ -77,7 +72,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -108,7 +102,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Developer/Helper/Data.php b/app/code/Magento/Developer/Helper/Data.php
index 4cd27b9ff4fee..77166be709cbd 100644
--- a/app/code/Magento/Developer/Helper/Data.php
+++ b/app/code/Magento/Developer/Helper/Data.php
@@ -9,7 +9,6 @@
  * Developer config data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -23,7 +22,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param string|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDevAllowed($storeId = null)
     {
diff --git a/app/code/Magento/Developer/Model/Config/Backend/AllowedIps.php b/app/code/Magento/Developer/Model/Config/Backend/AllowedIps.php
index d70a3f51c644c..e11ff0c760153 100644
--- a/app/code/Magento/Developer/Model/Config/Backend/AllowedIps.php
+++ b/app/code/Magento/Developer/Model/Config/Backend/AllowedIps.php
@@ -7,13 +7,11 @@
 
 /**
  * Backend model for validating ip addresses entered in Developer Client Restrictions
- * @since 2.0.0
  */
 class AllowedIps extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     private $messageManager;
 
@@ -21,7 +19,6 @@ class AllowedIps extends \Magento\Framework\App\Config\Value
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -37,7 +34,6 @@ class AllowedIps extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Validate ip addresses before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php b/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php
index 21094bf8f13c6..74bdcf9e127be 100644
--- a/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php
+++ b/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php
@@ -11,7 +11,6 @@
  * Class WorkflowType
  *
  * @api
- * @since 2.0.0
  */
 class WorkflowType implements ArrayInterface
 {
@@ -34,7 +33,6 @@ class WorkflowType implements ArrayInterface
      * Return list of Workflow types
      *
      * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php b/app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php
index c1ac77efd5f98..493886ba3367f 100644
--- a/app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php
+++ b/app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php
@@ -17,25 +17,21 @@
 
 /**
  * Decorator for publishing of related assets
- * @since 2.0.0
  */
 class PublicationDecorator extends RelatedGenerator
 {
     /**
      * @var Publisher
-     * @since 2.0.0
      */
     private $assetPublisher;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $hasRelatedPublishing;
 
@@ -53,7 +49,6 @@ class PublicationDecorator extends RelatedGenerator
      * @param Publisher $assetPublisher
      * @param ScopeConfigInterface $scopeConfig
      * @param bool $hasRelatedPublishing
-     * @since 2.0.0
      */
     public function __construct(
         Repository $assetRepository,
@@ -70,7 +65,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function generateRelatedFile($relatedFileId, LocalInterface $asset)
     {
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
index 5a696f30a3bd0..f3ce9ec2b2ef9 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
@@ -14,26 +14,22 @@
  * Decorates block with block and template hints
  *
  * @api
- * @since 2.0.0
  */
 class DebugHints implements \Magento\Framework\View\TemplateEngineInterface
 {
     /**
      * @var \Magento\Framework\View\TemplateEngineInterface
-     * @since 2.0.0
      */
     private $_subject;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $_showBlockHints;
 
     /**
      * @param \Magento\Framework\View\TemplateEngineInterface $subject
      * @param bool $showBlockHints Whether to include block into the debugging information or not
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\TemplateEngineInterface $subject, $showBlockHints)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\View\TemplateEngineInterface $sub
      * Insert debugging hints into the rendered block contents
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\View\Element\BlockInterface $block, $templateFile, array $dictionary = [])
     {
@@ -63,7 +58,6 @@ public function render(\Magento\Framework\View\Element\BlockInterface $block, $t
      * @param string $blockHtml
      * @param string $templateFile
      * @return string
-     * @since 2.0.0
      */
     protected function _renderTemplateHints($blockHtml, $templateFile)
     {
@@ -81,7 +75,6 @@ protected function _renderTemplateHints($blockHtml, $templateFile)
      * @param string $blockHtml
      * @param \Magento\Framework\View\Element\BlockInterface $block
      * @return string
-     * @since 2.0.0
      */
     protected function _renderBlockHints($blockHtml, \Magento\Framework\View\Element\BlockInterface $block)
     {
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index a69d6e37f02fb..3e40aab6cdbd0 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Developer\Model\TemplateEngine\Plugin\DebugHints
  *
- * @since 2.0.0
  */
 class DebugHints
 {
@@ -29,25 +28,21 @@ class DebugHints
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var DevHelper
-     * @since 2.0.0
      */
     protected $devHelper;
 
     /**
      * @var DebugHintsFactory
-     * @since 2.0.0
      */
     protected $debugHintsFactory;
 
@@ -59,7 +54,6 @@ class DebugHints
      *     dev/debug/template_hints_admin
      *
      * @var string
-     * @since 2.0.0
      */
     protected $debugHintsPath;
 
@@ -69,7 +63,6 @@ class DebugHints
      * @param DevHelper $devHelper
      * @param DebugHintsFactory $debugHintsFactory
      * @param string $debugHintsPath
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -93,7 +86,6 @@ public function __construct(
      *
      * @return TemplateEngineInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterCreate(
         TemplateEngineFactory $subject,
diff --git a/app/code/Magento/Developer/Model/Tools/Formatter.php b/app/code/Magento/Developer/Model/Tools/Formatter.php
index 949a2bc2707fd..9adfdaef6e1c7 100644
--- a/app/code/Magento/Developer/Model/Tools/Formatter.php
+++ b/app/code/Magento/Developer/Model/Tools/Formatter.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Developer\Model\Tools\Formatter
  *
- * @since 2.0.0
  */
 class Formatter
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $_indent;
 
     /**
      * @param string $indent
-     * @since 2.0.0
      */
     public function __construct($indent = "    ")
     {
@@ -33,7 +30,6 @@ public function __construct($indent = "    ")
      *
      * @param string $xmlString
      * @return string
-     * @since 2.0.0
      */
     public function format($xmlString)
     {
diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
index e4858d2086e5f..8db85504c843d 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
@@ -17,37 +17,31 @@
  * Class FrontendCompilation
  *
  * @api
- * @since 2.0.0
  */
 class FrontendCompilation implements PreProcessorInterface
 {
     /**
      * @var AlternativeSourceInterface
-     * @since 2.0.0
      */
     private $alternativeSource;
 
     /**
      * @var AssetBuilder
-     * @since 2.0.0
      */
     private $assetBuilder;
 
     /**
      * @var LockerProcessInterface
-     * @since 2.0.0
      */
     private $lockerProcess;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $lockName;
 
     /**
      * @var Source
-     * @since 2.0.0
      */
     private $assetSource;
 
@@ -59,7 +53,6 @@ class FrontendCompilation implements PreProcessorInterface
      * @param AlternativeSourceInterface $alternativeSource
      * @param LockerProcessInterface $lockerProcess
      * @param string $lockName
-     * @since 2.0.0
      */
     public function __construct(
         Source $assetSource,
@@ -80,7 +73,6 @@ public function __construct(
      *
      * @param PreProcessor\Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(PreProcessor\Chain $chain)
     {
@@ -110,7 +102,6 @@ public function process(PreProcessor\Chain $chain)
      * @param string $module
      * @param FallbackContext $context
      * @return array
-     * @since 2.0.0
      */
     private function processContent($path, $content, $module, FallbackContext $context)
     {
diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/PreprocessorStrategy.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/PreprocessorStrategy.php
index 4ffd707e833b3..02c4bbcae3c9d 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/PreprocessorStrategy.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/PreprocessorStrategy.php
@@ -17,25 +17,21 @@
  * Selection of the strategy for assets pre-processing
  *
  * @api
- * @since 2.0.0
  */
 class PreprocessorStrategy implements PreProcessorInterface
 {
     /**
      * @var FrontendCompilation
-     * @since 2.0.0
      */
     private $frontendCompilation;
 
     /**
      * @var AlternativeSourceInterface
-     * @since 2.0.0
      */
     private $alternativeSource;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
@@ -51,7 +47,6 @@ class PreprocessorStrategy implements PreProcessorInterface
      * @param AlternativeSourceInterface $alternativeSource
      * @param FrontendCompilation $frontendCompilation
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         AlternativeSourceInterface $alternativeSource,
@@ -68,7 +63,6 @@ public function __construct(
      *
      * @param PreProcessor\Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(PreProcessor\Chain $chain)
     {
diff --git a/app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php b/app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php
index c77d908d084cb..2eef86fccd172 100644
--- a/app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php
+++ b/app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php
@@ -9,7 +9,6 @@
 
 /**
  * Page config Renderer model
- * @since 2.0.0
  */
 class Renderer extends Config\Renderer
 {
@@ -21,7 +20,6 @@ class Renderer extends Config\Renderer
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
@@ -33,7 +31,6 @@ class Renderer extends Config\Renderer
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(
         Config $pageConfig,
@@ -60,7 +57,6 @@ public function __construct(
      * @param string $contentType
      * @param string $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function addDefaultAttributes($contentType, $attributes)
     {
@@ -86,7 +82,6 @@ protected function addDefaultAttributes($contentType, $attributes)
      * @param array $resultGroups
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderAssets($resultGroups = [])
     {
@@ -99,7 +94,6 @@ public function renderAssets($resultGroups = [])
      * @param array $resultGroups
      *
      * @return mixed
-     * @since 2.0.0
      */
     private function renderLessJsScripts($resultGroups)
     {
diff --git a/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php b/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
index 5a4013511de2c..e09fc59411d53 100644
--- a/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
+++ b/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
@@ -13,7 +13,6 @@
  * Factory class for \Magento\Framework\View\Page\Config\RendererInterface
  *
  * @api
- * @since 2.0.0
  */
 class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactory
 {
@@ -21,13 +20,11 @@ class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactor
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -35,7 +32,6 @@ class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactor
      * Renderer Types
      *
      * @var array
-     * @since 2.0.0
      */
     private $rendererTypes;
 
@@ -45,7 +41,6 @@ class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactor
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $rendererTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -63,7 +58,6 @@ public function __construct(
      * @param array $data
      *
      * @return \Magento\Framework\View\Page\Config\RendererInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php b/app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php
index 88500bdbc8b44..20c736f9c5645 100644
--- a/app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php
+++ b/app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php
@@ -10,7 +10,6 @@
  * Interface FormatInterface is implemented by custom URN catalog generators
  *
  * @api
- * @since 2.0.0
  */
 interface FormatInterface
 {
@@ -20,7 +19,6 @@ interface FormatInterface
      * @param string[] $dictionary
      * @param string $configFile absolute path to the file to write the catalog
      * @return void
-     * @since 2.0.0
      */
     public function generateCatalog(array $dictionary, $configFile);
 }
diff --git a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
index e42088592261b..30684b7177c99 100644
--- a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
+++ b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
@@ -14,26 +14,22 @@
 
 /**
  * Class PhpStorm generates URN catalog for PhpStorm 9
- * @since 2.0.0
  */
 class PhpStorm implements FormatInterface
 {
     /**
      * @var ReadInterface
-     * @since 2.0.0
      */
     private $currentDirRead;
 
     /**
      * @var \Magento\Framework\Filesystem\File\WriteFactory
-     * @since 2.0.0
      */
     private $fileWriteFactory;
 
     /**
      * @param ReadFactory $readFactory
      * @param \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory
-     * @since 2.0.0
      */
     public function __construct(
         ReadFactory $readFactory,
@@ -49,7 +45,6 @@ public function __construct(
      * @param string[] $dictionary
      * @param string $configFilePath relative path to the PhpStorm misc.xml
      * @return void
-     * @since 2.0.0
      */
     public function generateCatalog(array $dictionary, $configFilePath)
     {
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
index 0dd1906d3bc4c..deeb769c808fa 100644
--- a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
+++ b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -13,7 +13,6 @@
 
 /**
  * Frontend model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Unitofmeasure extends Field
 {
@@ -21,13 +20,11 @@ class Unitofmeasure extends Field
      * Carrier helper
      *
      * @var Helper\Carrier
-     * @since 2.0.0
      */
     protected $carrierHelper;
 
     /**
      * @var Model\Carrier
-     * @since 2.0.0
      */
     protected $carrierDhl;
 
@@ -36,7 +33,6 @@ class Unitofmeasure extends Field
      * @param Model\Carrier $carrierDhl
      * @param Helper\Carrier $carrierHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Define params and variables
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -99,7 +94,6 @@ public function _construct()
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Dhl/Model/AbstractDhl.php b/app/code/Magento/Dhl/Model/AbstractDhl.php
index 0462e30b00569..b4a3e8cc08319 100644
--- a/app/code/Magento/Dhl/Model/AbstractDhl.php
+++ b/app/code/Magento/Dhl/Model/AbstractDhl.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Dhl\Model\AbstractDhl
  *
- * @since 2.0.0
  */
 abstract class AbstractDhl extends AbstractCarrierOnline
 {
@@ -33,7 +32,6 @@ abstract class AbstractDhl extends AbstractCarrierOnline
      * Get shipping date
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getShipDate()
     {
@@ -46,7 +44,6 @@ protected function _getShipDate()
      * @param string[] $shippingDays
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     protected function _determineShippingDay($shippingDays, $date)
     {
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 8c477033ce3d9..d34f938df320f 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shipping\Model\Carrier\CarrierInterface
 {
@@ -47,7 +46,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Container types that could be customized
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customizableContainerTypes = [self::DHL_CONTENT_TYPE_NON_DOC];
 
@@ -60,7 +58,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Rate request data
      *
      * @var RateRequest|null
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -68,7 +65,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Rate result data
      *
      * @var Result|null
-     * @since 2.0.0
      */
     protected $_result;
 
@@ -76,7 +72,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Countries parameters data
      *
      * @var \Magento\Shipping\Model\Simplexml\Element|null
-     * @since 2.0.0
      */
     protected $_countryParams;
 
@@ -84,7 +79,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Errors placeholder
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -92,7 +86,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Dhl rates result
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates = [];
 
@@ -100,7 +93,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Carrier's code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::CODE;
 
@@ -108,7 +100,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Free Method config path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_freeMethod = 'free_method_nondoc';
 
@@ -116,7 +107,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Max weight without fee
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxWeight = 70;
 
@@ -124,7 +114,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Flag if response is for shipping label creating
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isShippingLabelFlag = false;
 
@@ -132,7 +121,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Request variables array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_requestVariables = [
         'id' => ['code' => 'dhl_id', 'setCode' => 'id'],
@@ -150,7 +138,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Flag that shows if shipping is domestic
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDomestic = false;
 
@@ -158,7 +145,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Core string
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -166,49 +152,41 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * Carrier helper
      *
      * @var \Magento\Shipping\Helper\Carrier
-     * @since 2.0.0
      */
     protected $_carrierHelper;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_configReader;
 
     /**
      * @var \Magento\Framework\Math\Division
-     * @since 2.0.0
      */
     protected $mathDivision;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory
-     * @since 2.0.0
      */
     protected $_httpClientFactory;
 
@@ -247,7 +225,6 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -314,7 +291,6 @@ public function __construct(
      * @param string|int $origValue
      * @param string $pathToValue
      * @return string|int|null
-     * @since 2.0.0
      */
     protected function _getDefaultValue($origValue, $pathToValue)
     {
@@ -334,7 +310,6 @@ protected function _getDefaultValue($origValue, $pathToValue)
      *
      * @param RateRequest $request
      * @return bool|Result|Error
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -372,7 +347,6 @@ public function collectRates(RateRequest $request)
      *
      * @param string $freeMethod
      * @return void
-     * @since 2.0.0
      */
     protected function _setFreeMethodRequest($freeMethod)
     {
@@ -386,7 +360,6 @@ protected function _setFreeMethodRequest($freeMethod)
      * Returns request result
      *
      * @return Result|null
-     * @since 2.0.0
      */
     public function getResult()
     {
@@ -398,7 +371,6 @@ public function getResult()
      *
      * @param \Magento\Framework\DataObject $requestObject
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _addParams(\Magento\Framework\DataObject $requestObject)
     {
@@ -421,7 +393,6 @@ protected function _addParams(\Magento\Framework\DataObject $requestObject)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function setRequest(\Magento\Framework\DataObject $request)
     {
@@ -526,7 +497,6 @@ public function setRequest(\Magento\Framework\DataObject $request)
      *
      * @return string[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
@@ -563,7 +533,6 @@ public function getAllowedMethods()
      * @param string $type
      * @param string $code
      * @return array|bool
-     * @since 2.0.0
      */
     public function getCode($type, $code = '')
     {
@@ -608,7 +577,6 @@ public function getCode($type, $code = '')
      *
      * @param string $doc Package content type (doc/non-doc) see DHL_CONTENT_TYPE_* constants
      * @return array
-     * @since 2.0.0
      */
     public function getDhlProducts($doc)
     {
@@ -669,7 +637,6 @@ public function getDhlProducts($doc)
      * @param string $code One-symbol code (see getDhlProducts())
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getDhlProductTitle($code)
     {
@@ -686,7 +653,6 @@ public function getDhlProductTitle($code)
      * @param bool $maxWeight
      * @param string|bool $configWeightUnit
      * @return float
-     * @since 2.0.0
      */
     protected function _getWeight($weight, $maxWeight = false, $configWeightUnit = false)
     {
@@ -720,7 +686,6 @@ protected function _getWeight($weight, $maxWeight = false, $configWeightUnit = f
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getAllItems()
     {
@@ -812,7 +777,6 @@ protected function _getAllItems()
      * @param \Magento\Shipping\Model\Simplexml\Element $nodeBkgDetails
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBkgDetails)
     {
@@ -885,7 +849,6 @@ protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBk
      * @param float $dimension
      * @param string|bool $configWeightUnit
      * @return float
-     * @since 2.0.0
      */
     protected function _getDimension($dimension, $configWeightUnit = false)
     {
@@ -922,7 +885,6 @@ protected function _getDimension($dimension, $configWeightUnit = false)
      *
      * @param \Magento\Shipping\Model\Simplexml\Element $nodePiece
      * @return void
-     * @since 2.0.0
      */
     protected function _addDimension($nodePiece)
     {
@@ -943,7 +905,6 @@ protected function _addDimension($nodePiece)
      * Get shipping quotes
      *
      * @return \Magento\Framework\Model\AbstractModel|Result
-     * @since 2.0.0
      */
     protected function _getQuotes()
     {
@@ -991,7 +952,6 @@ protected function _getQuotes()
      *
      * @param string $request
      * @return string
-     * @since 2.0.0
      */
     protected function _getQuotesFromServer($request)
     {
@@ -1007,7 +967,6 @@ protected function _getQuotesFromServer($request)
      * Build quotes request XML object
      *
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     protected function _buildQuotesRequestXml()
     {
@@ -1070,7 +1029,6 @@ protected function _buildQuotesRequestXml()
      * @param \SimpleXMLElement $requestXml
      * @param string $date
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     protected function _setQuotesRequestXmlDate(\SimpleXMLElement $requestXml, $date)
     {
@@ -1087,7 +1045,6 @@ protected function _setQuotesRequestXmlDate(\SimpleXMLElement $requestXml, $date
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _parseResponse($response)
     {
@@ -1178,7 +1135,6 @@ protected function _parseResponse($response)
      * @param \SimpleXMLElement $shipmentDetails
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _addRate(\SimpleXMLElement $shipmentDetails)
     {
@@ -1253,7 +1209,6 @@ protected function _addRate(\SimpleXMLElement $shipmentDetails)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getDimensionUnit()
     {
@@ -1273,7 +1228,6 @@ protected function _getDimensionUnit()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getWeightUnit()
     {
@@ -1295,7 +1249,6 @@ protected function _getWeightUnit()
      * @return \Magento\Framework\DataObject
      *
      * @see $countryCode ISO 3166 Codes (Countries) A2
-     * @since 2.0.0
      */
     protected function getCountryParams($countryCode)
     {
@@ -1316,7 +1269,6 @@ protected function getCountryParams($countryCode)
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1332,7 +1284,6 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|\Magento\Framework\DataObject|boolean
-     * @since 2.0.0
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
     {
@@ -1367,7 +1318,6 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1383,7 +1333,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
      * @param \Magento\Framework\DataObject $request
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _mapRequestToShipment(\Magento\Framework\DataObject $request)
     {
@@ -1427,7 +1376,6 @@ protected function _mapRequestToShipment(\Magento\Framework\DataObject $request)
      *
      * @param string $dimensionUnit
      * @return int
-     * @since 2.0.0
      */
     protected function _getMinDimension($dimensionUnit)
     {
@@ -1442,7 +1390,6 @@ protected function _getMinDimension($dimensionUnit)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _doRequest()
     {
@@ -1637,7 +1584,6 @@ protected function _doRequest()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
     {
@@ -1741,7 +1687,6 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
      *
      * @param string|string[] $trackings
      * @return Result|null
-     * @since 2.0.0
      */
     public function getTracking($trackings)
     {
@@ -1758,7 +1703,6 @@ public function getTracking($trackings)
      *
      * @param string[] $trackings
      * @return void
-     * @since 2.0.0
      */
     protected function _getXMLTracking($trackings)
     {
@@ -1830,7 +1774,6 @@ protected function _getXMLTracking($trackings)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _parseXmlTrackingResponse($trackings, $response)
     {
@@ -1923,7 +1866,6 @@ protected function _parseXmlTrackingResponse($trackings, $response)
      * @param string $handlingType
      * @param float $handlingFee
      * @return float
-     * @since 2.0.0
      */
     protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
     {
@@ -1940,7 +1882,6 @@ protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
      * @param \Magento\Shipping\Model\Shipment\Request $request
      * @return array|\Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function requestToShipment($request)
     {
@@ -1972,7 +1913,6 @@ public function requestToShipment($request)
      * @param string $origCountryCode
      * @param string $destCountryCode
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkDomesticStatus($origCountryCode, $destCountryCode)
     {
@@ -1999,7 +1939,6 @@ protected function _checkDomesticStatus($origCountryCode, $destCountryCode)
      * @param \SimpleXMLElement $xml
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _prepareShippingLabelContent(\SimpleXMLElement $xml)
     {
@@ -2023,7 +1962,6 @@ protected function _prepareShippingLabelContent(\SimpleXMLElement $xml)
      * @param string $destCountryId
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isDutiable($origCountryId, $destCountryId)
     {
diff --git a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 0bcfcad024d84..0b9096659ac39 100644
--- a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -8,19 +8,16 @@
 
 /**
  * Checkout cart shipping block plugin
- * @since 2.0.0
  */
 class Shipping
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * @param bool $result
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterIsStateActive(\Magento\Checkout\Block\Cart\LayoutProcessor $subject, $result)
     {
@@ -47,7 +43,6 @@ public function afterIsStateActive(\Magento\Checkout\Block\Cart\LayoutProcessor
      * @param bool $result
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterIsCityActive(\Magento\Checkout\Block\Cart\LayoutProcessor $subject, $result)
     {
diff --git a/app/code/Magento/Dhl/Model/Source/Contenttype.php b/app/code/Magento/Dhl/Model/Source/Contenttype.php
index 32c36fe12a377..9c36ef1d54872 100644
--- a/app/code/Magento/Dhl/Model/Source/Contenttype.php
+++ b/app/code/Magento/Dhl/Model/Source/Contenttype.php
@@ -7,13 +7,11 @@
 
 /**
  * Source model for DHL Content Type
- * @since 2.0.0
  */
 class Contenttype implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php b/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
index a3feffe3ea50d..3ff4b33692574 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods
- * @since 2.0.0
  */
 abstract class AbstractMethod extends \Magento\Dhl\Model\Source\Method\Generic
 {
@@ -15,7 +14,6 @@ abstract class AbstractMethod extends \Magento\Dhl\Model\Source\Method\Generic
      * Carrier Product Type Indicator
      *
      * @var string $_contentType
-     * @since 2.0.0
      */
     protected $_contentType;
 
@@ -23,13 +21,11 @@ abstract class AbstractMethod extends \Magento\Dhl\Model\Source\Method\Generic
      * Show 'none' in methods list or not;
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_noneMethod = false;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Doc.php b/app/code/Magento/Dhl/Model/Source/Method/Doc.php
index f7a7e56747832..d333c1a82cde5 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Doc.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Doc.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Doc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
 {
@@ -15,7 +14,6 @@ class Doc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Carrier Product Type Indicator
      *
      * @var string $_contentType
-     * @since 2.0.0
      */
     protected $_contentType = \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_DOC;
 }
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Freedoc.php b/app/code/Magento/Dhl/Model/Source/Method/Freedoc.php
index 6faca2c292309..238400f796ea5 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Freedoc.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Freedoc.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Freedoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
 {
@@ -15,7 +14,6 @@ class Freedoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Carrier Product Type Indicator
      *
      * @var string $_contentType
-     * @since 2.0.0
      */
     protected $_contentType = \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_DOC;
 
@@ -23,7 +21,6 @@ class Freedoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Show 'none' in methods list or not;
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_noneMethod = true;
 }
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Freenondoc.php b/app/code/Magento/Dhl/Model/Source/Method/Freenondoc.php
index 66e8fcde6552a..cf720694dd54a 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Freenondoc.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Freenondoc.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Freenondoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
 {
@@ -15,7 +14,6 @@ class Freenondoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Carrier Product Type Indicator
      *
      * @var string $_contentType
-     * @since 2.0.0
      */
     protected $_contentType = \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_NON_DOC;
 
@@ -23,7 +21,6 @@ class Freenondoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Show 'none' in methods list or not;
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_noneMethod = true;
 }
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Generic.php b/app/code/Magento/Dhl/Model/Source/Method/Generic.php
index af63f9e9c9909..aeadbddfcfb71 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Generic.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Generic.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Dhl\Model\Source\Method\Generic
  *
- * @since 2.0.0
  */
 class Generic
 {
     /**
      * @var \Magento\Dhl\Model\Carrier
-     * @since 2.0.0
      */
     protected $_shippingDhl;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = '';
 
     /**
      * @param \Magento\Dhl\Model\Carrier $shippingDhl
-     * @since 2.0.0
      */
     public function __construct(\Magento\Dhl\Model\Carrier $shippingDhl)
     {
@@ -37,7 +33,6 @@ public function __construct(\Magento\Dhl\Model\Carrier $shippingDhl)
      * Returns array to be used in multiselect on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Nondoc.php b/app/code/Magento/Dhl/Model/Source/Method/Nondoc.php
index e85d842800194..afc3cc0f641a5 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Nondoc.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Nondoc.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Nondoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
 {
@@ -15,7 +14,6 @@ class Nondoc extends \Magento\Dhl\Model\Source\Method\AbstractMethod
      * Carrier Product Type Indicator
      *
      * @var string $_contentType
-     * @since 2.0.0
      */
     protected $_contentType = \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_NON_DOC;
 }
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Size.php b/app/code/Magento/Dhl/Model/Source/Method/Size.php
index 8978ef116ac54..8d422e2ce97c6 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Size.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Size.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Size extends \Magento\Dhl\Model\Source\Method\Generic
 {
@@ -15,7 +14,6 @@ class Size extends \Magento\Dhl\Model\Source\Method\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'size';
 }
diff --git a/app/code/Magento/Dhl/Model/Source/Method/Unitofmeasure.php b/app/code/Magento/Dhl/Model/Source/Method/Unitofmeasure.php
index 333bfa73c382a..7c41b270f250c 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/Unitofmeasure.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/Unitofmeasure.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for DHL shipping methods for documentation
- * @since 2.0.0
  */
 class Unitofmeasure extends \Magento\Dhl\Model\Source\Method\Generic
 {
@@ -15,7 +14,6 @@ class Unitofmeasure extends \Magento\Dhl\Model\Source\Method\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'unit_of_measure';
 }
diff --git a/app/code/Magento/Dhl/Setup/InstallData.php b/app/code/Magento/Dhl/Setup/InstallData.php
index ca2cd0fbe7a27..48f359aa63659 100644
--- a/app/code/Magento/Dhl/Setup/InstallData.php
+++ b/app/code/Magento/Dhl/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * Locale list
      *
      * @var ResolverInterface
-     * @since 2.0.0
      */
     private $localeResolver;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param ResolverInterface $localeResolver
-     * @since 2.0.0
      */
     public function __construct(ResolverInterface $localeResolver)
     {
@@ -39,7 +36,6 @@ public function __construct(ResolverInterface $localeResolver)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Directory/Api/CountryInformationAcquirerInterface.php b/app/code/Magento/Directory/Api/CountryInformationAcquirerInterface.php
index 08cd7524bf8e3..512f53dac3779 100644
--- a/app/code/Magento/Directory/Api/CountryInformationAcquirerInterface.php
+++ b/app/code/Magento/Directory/Api/CountryInformationAcquirerInterface.php
@@ -9,7 +9,6 @@
  * Country information acquirer interface
  *
  * @api
- * @since 2.0.0
  */
 interface CountryInformationAcquirerInterface
 {
@@ -17,7 +16,6 @@ interface CountryInformationAcquirerInterface
      * Get all countries and regions information for the store.
      *
      * @return \Magento\Directory\Api\Data\CountryInformationInterface[]
-     * @since 2.0.0
      */
     public function getCountriesInfo();
 
@@ -27,7 +25,6 @@ public function getCountriesInfo();
      * @param string $countryId
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Directory\Api\Data\CountryInformationInterface
-     * @since 2.0.0
      */
     public function getCountryInfo($countryId);
 }
diff --git a/app/code/Magento/Directory/Api/CurrencyInformationAcquirerInterface.php b/app/code/Magento/Directory/Api/CurrencyInformationAcquirerInterface.php
index 9d6c0676e23d1..5679ba6680357 100644
--- a/app/code/Magento/Directory/Api/CurrencyInformationAcquirerInterface.php
+++ b/app/code/Magento/Directory/Api/CurrencyInformationAcquirerInterface.php
@@ -9,7 +9,6 @@
  * Currency information acquirer interface
  *
  * @api
- * @since 2.0.0
  */
 interface CurrencyInformationAcquirerInterface
 {
@@ -17,7 +16,6 @@ interface CurrencyInformationAcquirerInterface
      * Get currency information for the store.
      *
      * @return \Magento\Directory\Api\Data\CurrencyInformationInterface
-     * @since 2.0.0
      */
     public function getCurrencyInfo();
 }
diff --git a/app/code/Magento/Directory/Api/Data/CountryInformationInterface.php b/app/code/Magento/Directory/Api/Data/CountryInformationInterface.php
index 30c0cb9ff3c59..978ec1246eeb9 100644
--- a/app/code/Magento/Directory/Api/Data/CountryInformationInterface.php
+++ b/app/code/Magento/Directory/Api/Data/CountryInformationInterface.php
@@ -9,7 +9,6 @@
  * Country Information interface.
  *
  * @api
- * @since 2.0.0
  */
 interface CountryInformationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface CountryInformationInterface extends \Magento\Framework\Api\ExtensibleD
      * Get the country id for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId();
 
@@ -26,7 +24,6 @@ public function getId();
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -34,7 +31,6 @@ public function setId($id);
      * Get the country 2 letter abbreviation for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTwoLetterAbbreviation();
 
@@ -43,7 +39,6 @@ public function getTwoLetterAbbreviation();
      *
      * @param string $abbreviation
      * @return $this
-     * @since 2.0.0
      */
     public function setTwoLetterAbbreviation($abbreviation);
 
@@ -51,7 +46,6 @@ public function setTwoLetterAbbreviation($abbreviation);
      * Get the country 3 letter abbreviation for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThreeLetterAbbreviation();
 
@@ -60,7 +54,6 @@ public function getThreeLetterAbbreviation();
      *
      * @param string $abbreviation
      * @return $this
-     * @since 2.0.0
      */
     public function setThreeLetterAbbreviation($abbreviation);
 
@@ -68,7 +61,6 @@ public function setThreeLetterAbbreviation($abbreviation);
      * Get the country full name (in store locale) for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullNameLocale();
 
@@ -77,7 +69,6 @@ public function getFullNameLocale();
      *
      * @param string $fullNameLocale
      * @return $this
-     * @since 2.0.0
      */
     public function setFullNameLocale($fullNameLocale);
 
@@ -85,7 +76,6 @@ public function setFullNameLocale($fullNameLocale);
      * Get the country full name (in English) for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullNameEnglish();
 
@@ -94,7 +84,6 @@ public function getFullNameEnglish();
      *
      * @param string $fullNameEnglish
      * @return $this
-     * @since 2.0.0
      */
     public function setFullNameEnglish($fullNameEnglish);
 
@@ -102,7 +91,6 @@ public function setFullNameEnglish($fullNameEnglish);
      * Get the available regions for the store.
      *
      * @return \Magento\Directory\Api\Data\RegionInformationInterface[]|null
-     * @since 2.0.0
      */
     public function getAvailableRegions();
 
@@ -111,7 +99,6 @@ public function getAvailableRegions();
      *
      * @param \Magento\Directory\Api\Data\RegionInformationInterface[] $availableRegions
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableRegions($availableRegions);
 
@@ -119,7 +106,6 @@ public function setAvailableRegions($availableRegions);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Directory\Api\Data\CountryInformationExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -128,7 +114,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Directory\Api\Data\CountryInformationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\CountryInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Api/Data/CurrencyInformationInterface.php b/app/code/Magento/Directory/Api/Data/CurrencyInformationInterface.php
index f8b8a751d5b0b..68a917573b7c8 100644
--- a/app/code/Magento/Directory/Api/Data/CurrencyInformationInterface.php
+++ b/app/code/Magento/Directory/Api/Data/CurrencyInformationInterface.php
@@ -9,7 +9,6 @@
  * Currency Information interface.
  *
  * @api
- * @since 2.0.0
  */
 interface CurrencyInformationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface CurrencyInformationInterface extends \Magento\Framework\Api\Extensible
      * Get the base currency code for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -26,7 +24,6 @@ public function getBaseCurrencyCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code);
 
@@ -34,7 +31,6 @@ public function setBaseCurrencyCode($code);
      * Get the currency symbol of the base currency for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencySymbol();
 
@@ -43,7 +39,6 @@ public function getBaseCurrencySymbol();
      *
      * @param string $symbol
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencySymbol($symbol);
 
@@ -51,7 +46,6 @@ public function setBaseCurrencySymbol($symbol);
      * Get the default display currency code for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencyCode();
 
@@ -60,7 +54,6 @@ public function getDefaultDisplayCurrencyCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencyCode($code);
 
@@ -68,7 +61,6 @@ public function setDefaultDisplayCurrencyCode($code);
      * Get the currency symbol of the default display currency for the store.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencySymbol();
 
@@ -77,7 +69,6 @@ public function getDefaultDisplayCurrencySymbol();
      *
      * @param string $symbol
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencySymbol($symbol);
 
@@ -85,7 +76,6 @@ public function setDefaultDisplayCurrencySymbol($symbol);
      * Get the list of allowed currency codes for the store.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAvailableCurrencyCodes();
 
@@ -94,7 +84,6 @@ public function getAvailableCurrencyCodes();
      *
      * @param string[] $codes
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableCurrencyCodes(array $codes = null);
 
@@ -102,7 +91,6 @@ public function setAvailableCurrencyCodes(array $codes = null);
      * Get the list of exchange rate information for the store.
      *
      * @return \Magento\Directory\Api\Data\ExchangeRateInterface[]
-     * @since 2.0.0
      */
     public function getExchangeRates();
 
@@ -111,7 +99,6 @@ public function getExchangeRates();
      *
      * @param \Magento\Directory\Api\Data\ExchangeRateInterface[] $exchangeRates
      * @return $this
-     * @since 2.0.0
      */
     public function setExchangeRates(array $exchangeRates = null);
 
@@ -119,7 +106,6 @@ public function setExchangeRates(array $exchangeRates = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Directory\Api\Data\CurrencyInformationExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -128,7 +114,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Directory\Api\Data\CurrencyInformationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\CurrencyInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Api/Data/ExchangeRateInterface.php b/app/code/Magento/Directory/Api/Data/ExchangeRateInterface.php
index 98543bd78cdad..f9d414b197403 100644
--- a/app/code/Magento/Directory/Api/Data/ExchangeRateInterface.php
+++ b/app/code/Magento/Directory/Api/Data/ExchangeRateInterface.php
@@ -9,7 +9,6 @@
  * Exchange Rate interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ExchangeRateInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface ExchangeRateInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get the currency code associated with the exchange rate.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyTo();
 
@@ -26,7 +24,6 @@ public function getCurrencyTo();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrencyTo($code);
 
@@ -34,7 +31,6 @@ public function setCurrencyTo($code);
      * Get the exchange rate for the associated currency and the store's base currency.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRate();
 
@@ -43,7 +39,6 @@ public function getRate();
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setRate($rate);
 
@@ -51,7 +46,6 @@ public function setRate($rate);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Directory\Api\Data\ExchangeRateExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -60,7 +54,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Directory\Api\Data\ExchangeRateExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\ExchangeRateExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Api/Data/RegionInformationInterface.php b/app/code/Magento/Directory/Api/Data/RegionInformationInterface.php
index c2d9eb8a25d6d..37993e5a3784f 100644
--- a/app/code/Magento/Directory/Api/Data/RegionInformationInterface.php
+++ b/app/code/Magento/Directory/Api/Data/RegionInformationInterface.php
@@ -10,7 +10,6 @@
  * Region Information interface.
  *
  * @api
- * @since 2.0.0
  */
 interface RegionInformationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface RegionInformationInterface extends \Magento\Framework\Api\ExtensibleDa
      * Get region id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId();
 
@@ -27,7 +25,6 @@ public function getId();
      *
      * @param string $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setId($regionId);
 
@@ -35,7 +32,6 @@ public function setId($regionId);
      * Get region code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -44,7 +40,6 @@ public function getCode();
      *
      * @param string $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($regionCode);
 
@@ -52,7 +47,6 @@ public function setCode($regionCode);
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -61,7 +55,6 @@ public function getName();
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setName($regionName);
 
@@ -69,7 +62,6 @@ public function setName($regionName);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Directory\Api\Data\RegionInformationExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -78,7 +70,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Directory\Api\Data\RegionInformationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\RegionInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index b5bfdbebffa4d..e8606dceaa7ad 100644
--- a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\Directory\Block\Adminhtml\Frontend\Currency\Base
  *
- * @since 2.0.0
  */
 class Base extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Region/Updater.php
index 35174dd48b9f3..ef6e29f6294f2 100644
--- a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Region/Updater.php
+++ b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Region/Updater.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Directory\Block\Adminhtml\Frontend\Region\Updater
  *
- * @since 2.0.0
  */
 class Updater extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
@@ -24,7 +22,6 @@ class Updater extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Directory/Block/Currency.php b/app/code/Magento/Directory/Block/Currency.php
index 9f06312d212c8..75002734124fe 100644
--- a/app/code/Magento/Directory/Block/Currency.php
+++ b/app/code/Magento/Directory/Block/Currency.php
@@ -13,25 +13,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Currency extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -41,7 +37,6 @@ class Currency extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Return 0 if only one currency
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrencyCount()
     {
@@ -74,7 +68,6 @@ public function getCurrencyCount()
      * Return empty array if only one currency
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencies()
     {
@@ -107,7 +100,6 @@ public function getCurrencies()
      * Retrieve Currency Swith URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSwitchUrl()
     {
@@ -119,7 +111,6 @@ public function getSwitchUrl()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getSwitchCurrencyPostData($code)
     {
@@ -130,7 +121,6 @@ public function getSwitchCurrencyPostData($code)
      * Retrieve Current Currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentCurrencyCode()
     {
@@ -144,7 +134,6 @@ public function getCurrentCurrencyCode()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCode()
     {
diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
index 1200ecb3e4697..58dc298be3719 100644
--- a/app/code/Magento/Directory/Block/Data.php
+++ b/app/code/Magento/Directory/Block/Data.php
@@ -7,37 +7,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regionCollectionFactory;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_countryCollectionFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -55,7 +49,6 @@ class Data extends \Magento\Framework\View\Element\Template
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -76,7 +69,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLoadrRegionUrl()
     {
@@ -85,7 +77,6 @@ public function getLoadrRegionUrl()
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     public function getCountryCollection()
     {
@@ -102,7 +93,6 @@ public function getCountryCollection()
      * Retrieve list of top destinations countries
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getTopDestinations()
     {
@@ -119,7 +109,6 @@ protected function getTopDestinations()
      * @param string $id
      * @param string $title
      * @return string
-     * @since 2.0.0
      */
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country')
     {
@@ -159,7 +148,6 @@ public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     public function getRegionCollection()
     {
@@ -174,7 +162,6 @@ public function getRegionCollection()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRegionHtmlSelect()
     {
@@ -208,7 +195,6 @@ public function getRegionHtmlSelect()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -221,7 +207,6 @@ public function getCountryId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRegionsJs()
     {
diff --git a/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php b/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php
index 474d443881077..ad24ad2e2016b 100644
--- a/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php
+++ b/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Directory\Controller\Adminhtml\Json\CountryRegion
  *
- * @since 2.0.0
  */
 class CountryRegion extends \Magento\Backend\App\Action
 {
@@ -17,7 +16,6 @@ class CountryRegion extends \Magento\Backend\App\Action
      * Return JSON-encoded array of country regions
      *
      * @return string
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
index 33cf5a3e3880a..0a03626d04016 100644
--- a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
+++ b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Directory\Controller\Currency\SwitchAction
  *
- * @since 2.0.0
  */
 class SwitchAction extends \Magento\Framework\App\Action\Action
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index e2c23331c4b12..a695b3fe31313 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -12,7 +12,6 @@
  * Directory data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -54,7 +53,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Country collection
      *
      * @var \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     protected $_countryCollection;
 
@@ -62,7 +60,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Region collection
      *
      * @var \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     protected $_regionCollection;
 
@@ -70,7 +67,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Json representation of regions data
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_regionJson;
 
@@ -78,7 +74,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Currency cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_currencyCache = [];
 
@@ -86,37 +81,31 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * ISO2 country codes which have optional Zip/Postal pre-configured
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optZipCountries = null;
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regCollectionFactory;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -128,7 +117,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -152,7 +140,6 @@ public function __construct(
      * Retrieve region collection
      *
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     public function getRegionCollection()
     {
@@ -168,7 +155,6 @@ public function getRegionCollection()
      *
      * @param null|int|string|\Magento\Store\Model\Store $store
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     public function getCountryCollection($store = null)
     {
@@ -182,7 +168,6 @@ public function getCountryCollection($store = null)
      * Retrieve regions data json
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionJson()
     {
@@ -213,7 +198,6 @@ public function getRegionJson()
      * @param string $to
      * @return float
      * @SuppressWarnings(PHPMD.ShortVariable)
-     * @since 2.0.0
      */
     public function currencyConvert($amount, $from, $to = null)
     {
@@ -232,7 +216,6 @@ public function currencyConvert($amount, $from, $to = null)
      *
      * @param bool $asJson
      * @return array|string
-     * @since 2.0.0
      */
     public function getCountriesWithOptionalZip($asJson = false)
     {
@@ -256,7 +239,6 @@ public function getCountriesWithOptionalZip($asJson = false)
      *
      * @param string $countryCode
      * @return boolean
-     * @since 2.0.0
      */
     public function isZipCodeOptional($countryCode)
     {
@@ -269,7 +251,6 @@ public function isZipCodeOptional($countryCode)
      *
      * @param boolean $asJson
      * @return array
-     * @since 2.0.0
      */
     public function getCountriesWithStatesRequired($asJson = false)
     {
@@ -290,7 +271,6 @@ public function getCountriesWithStatesRequired($asJson = false)
      * Return, whether non-required state should be shown
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShowNonRequiredState()
     {
@@ -305,7 +285,6 @@ public function isShowNonRequiredState()
      *
      * @param string $countryId
      * @return bool
-     * @since 2.0.0
      */
     public function isRegionRequired($countryId)
     {
@@ -320,7 +299,6 @@ public function isRegionRequired($countryId)
      * Retrieve application base currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -332,7 +310,6 @@ public function getBaseCurrencyCode()
      *
      * @param \Magento\Store\Model\Store|string|int $store
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultCountry($store = null)
     {
@@ -347,7 +324,6 @@ public function getDefaultCountry($store = null)
      * Retrieve regions data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRegionData()
     {
@@ -380,7 +356,6 @@ public function getRegionData()
      * Retrieve list of codes of the most used countries
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTopCountryCodes()
     {
@@ -395,7 +370,6 @@ public function getTopCountryCodes()
      * Retrieve weight unit
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWeightUnit()
     {
diff --git a/app/code/Magento/Directory/Model/AllowedCountries.php b/app/code/Magento/Directory/Model/AllowedCountries.php
index ddbbabf53e5d6..4b838d36e8481 100644
--- a/app/code/Magento/Directory/Model/AllowedCountries.php
+++ b/app/code/Magento/Directory/Model/AllowedCountries.php
@@ -14,7 +14,7 @@
  * Provider of allowed countries based on configuration settings
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class AllowedCountries
 {
@@ -22,13 +22,13 @@ class AllowedCountries
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
@@ -36,7 +36,7 @@ class AllowedCountries
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -52,7 +52,7 @@ public function __construct(
      * @param string | null $scopeCode
      * @param string $scope
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAllowedCountries(
         $scope = ScopeInterface::SCOPE_WEBSITE,
@@ -86,7 +86,7 @@ public function getAllowedCountries(
      * @throws \InvalidArgumentException
      * @param string $scope
      * @return array|int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getDefaultScopeCode($scope)
     {
@@ -111,7 +111,7 @@ private function getDefaultScopeCode($scope)
      *
      * @param array $allowedCountries
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function makeCountriesUnique(array $allowedCountries)
     {
@@ -124,7 +124,7 @@ public function makeCountriesUnique(array $allowedCountries)
      * @param string $scope
      * @param int $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getCountriesFromConfig($scope, $scopeCode)
     {
@@ -143,7 +143,7 @@ public function getCountriesFromConfig($scope, $scopeCode)
      *
      * @param string $scope
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getSingleScope($scope)
     {
diff --git a/app/code/Magento/Directory/Model/Config/Source/Allregion.php b/app/code/Magento/Directory/Model/Config/Source/Allregion.php
index 7ff28c309a9e2..a35da92ef9282 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Allregion.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Allregion.php
@@ -9,38 +9,32 @@
  * Options provider for regions list
  *
  * @api
- * @since 2.0.0
  */
 class Allregion implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_countries;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_countryCollectionFactory;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regionCollectionFactory;
 
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory,
@@ -53,7 +47,6 @@ public function __construct(
     /**
      * @param bool $isMultiselect
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false)
     {
@@ -92,7 +85,6 @@ public function toOptionArray($isMultiselect = false)
      * @param string $a
      * @param string $b
      * @return int
-     * @since 2.0.0
      */
     public function sortRegionCountries($a, $b)
     {
diff --git a/app/code/Magento/Directory/Model/Config/Source/Country.php b/app/code/Magento/Directory/Model/Config/Source/Country.php
index f23060f766553..144a51e8d2b26 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Country.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Country.php
@@ -9,7 +9,6 @@
  * Options provider for countries list
  *
  * @api
- * @since 2.0.0
  */
 class Country implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,13 +16,11 @@ class Country implements \Magento\Framework\Option\ArrayInterface
      * Countries
      *
      * @var \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     protected $_countryCollection;
 
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Directory\Model\ResourceModel\Country\Colle
      * Options array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
@@ -44,7 +40,6 @@ public function __construct(\Magento\Directory\Model\ResourceModel\Country\Colle
      * @param boolean $isMultiselect
      * @param string|array $foregroundCountries
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false, $foregroundCountries = '')
     {
diff --git a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
index 5a87abe24967e..159b2b6c609d4 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
@@ -11,14 +11,12 @@
  * @api
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Full extends \Magento\Directory\Model\Config\Source\Country implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @param bool $isMultiselect
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false)
     {
diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 5a2c0b6bdb435..ea43a2f427d5c 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -9,13 +9,11 @@
  * Options provider for weight units list
  *
  * @api
- * @since 2.0.0
  */
 class WeightUnit implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
index b5cf0289c4a8e..aa52948064d1b 100644
--- a/app/code/Magento/Directory/Model/Country.php
+++ b/app/code/Magento/Directory/Model/Country.php
@@ -17,31 +17,26 @@
  * @method \Magento\Directory\Model\Country setCountryId(string $value)
  *
  * @api
- * @since 2.0.0
  */
 class Country extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     public static $_format = [];
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
     /**
      * @var \Magento\Directory\Model\Country\FormatFactory
-     * @since 2.0.0
      */
     protected $_formatFactory;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regionCollectionFactory;
 
@@ -54,7 +49,6 @@ class Country extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -74,7 +68,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -86,7 +79,6 @@ protected function _construct()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode($code)
     {
@@ -98,7 +90,6 @@ public function loadByCode($code)
      * Get regions
      *
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     public function getRegions()
     {
@@ -107,7 +98,6 @@ public function getRegions()
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     public function getLoadedRegionCollection()
     {
@@ -118,7 +108,6 @@ public function getLoadedRegionCollection()
 
     /**
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     public function getRegionCollection()
     {
@@ -131,7 +120,6 @@ public function getRegionCollection()
      * @param \Magento\Framework\DataObject $address
      * @param bool $html
      * @return string
-     * @since 2.0.0
      */
     public function formatAddress(\Magento\Framework\DataObject $address, $html = false)
     {
@@ -173,7 +161,6 @@ public function formatAddress(\Magento\Framework\DataObject $address, $html = fa
      * Retrieve country formats
      *
      * @return \Magento\Directory\Model\ResourceModel\Country\Format\Collection
-     * @since 2.0.0
      */
     public function getFormats()
     {
@@ -195,7 +182,6 @@ public function getFormats()
      *
      * @param string $type
      * @return \Magento\Directory\Model\Country\Format|null
-     * @since 2.0.0
      */
     public function getFormat($type)
     {
@@ -213,7 +199,6 @@ public function getFormat($type)
      * Get country name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName($locale = null)
     {
diff --git a/app/code/Magento/Directory/Model/Country/Format.php b/app/code/Magento/Directory/Model/Country/Format.php
index d777ee6361ecb..655c048e5c2b2 100644
--- a/app/code/Magento/Directory/Model/Country/Format.php
+++ b/app/code/Magento/Directory/Model/Country/Format.php
@@ -18,13 +18,11 @@
  * @method \Magento\Directory\Model\Country\Format setFormat(string $value)
  *
  * @api
- * @since 2.0.0
  */
 class Format extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config.php b/app/code/Magento/Directory/Model/Country/Postcode/Config.php
index 356e516793d92..2667503fbe9c9 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Config.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Config.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Directory\Model\Country\Postcode\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var Config\Data
-     * @since 2.0.0
      */
     protected $dataStorage;
 
     /**
      * @param Config\Data $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\Country\Postcode\Config\Data $dataStorage)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Directory\Model\Country\Postcode\Config\Dat
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPostCodes()
     {
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config/Converter.php b/app/code/Magento/Directory/Model/Country/Postcode/Config/Converter.php
index 6260c5400ef6e..d598126f2c02f 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Config/Converter.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Config/Converter.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Directory\Model\Country\Postcode\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var \Magento\Framework\Stdlib\BooleanUtils
-     * @since 2.0.0
      */
     protected $booleanUtils;
 
     /**
      * @param \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\BooleanUtils $booleanUtils)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Stdlib\BooleanUtils $booleanUtils
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config/Data.php b/app/code/Magento/Directory/Model/Country/Postcode/Config/Data.php
index 9d036345de801..2c283297d855e 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Config/Data.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides country postcodes configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\Country\Postcode\Config\Reader $reader,
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php b/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php
index 09d9b5e7d5bfe..a46bae4450be1 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Directory\Model\Country\Postcode\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $_idAttributes = [
         '/config/zip' => 'countryCode',
@@ -34,7 +33,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config/SchemaLocator.php b/app/code/Magento/Directory/Model/Country/Postcode/Config/SchemaLocator.php
index dcb3034a187cf..e2edcf5cdc5f9 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Config/SchemaLocator.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Directory\Model\Country\Postcode\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,13 +17,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for both individual and merged configs
      *
      * @var string
-     * @since 2.0.0
      */
     private $schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -42,7 +38,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php b/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
index 13be088db141b..d0f66106e44e0 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Configured postcode validation patterns
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -15,7 +14,6 @@ interface ConfigInterface
      * Returns array of postcodes validation patterns
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPostCodes();
 }
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Validator.php b/app/code/Magento/Directory/Model/Country/Postcode/Validator.php
index 08d4cb0ebef2b..a96940607fbda 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/Validator.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/Validator.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Directory\Model\Country\Postcode\Validator
  *
- * @since 2.0.0
  */
 class Validator implements ValidatorInterface
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $postCodesConfig;
 
     /**
      * @param ConfigInterface $postCodesConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\Country\Postcode\ConfigInterface $postCodesConfig)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Directory\Model\Country\Postcode\ConfigInte
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate($postcode, $countryId)
     {
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/ValidatorInterface.php b/app/code/Magento/Directory/Model/Country/Postcode/ValidatorInterface.php
index 0f8aee903c7c3..e5af9e6725992 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/ValidatorInterface.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/ValidatorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Directory\Model\Country\Postcode\ValidatorInterface
  *
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -19,7 +18,6 @@ interface ValidatorInterface
      * @param string $countryId
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validate($postcode, $countryId);
 }
diff --git a/app/code/Magento/Directory/Model/CountryInformationAcquirer.php b/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
index c8529ac1aa76a..4eaa18d9672d1 100644
--- a/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
+++ b/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
@@ -9,37 +9,31 @@
 
 /**
  * Currency information acquirer class
- * @since 2.0.0
  */
 class CountryInformationAcquirer implements \Magento\Directory\Api\CountryInformationAcquirerInterface
 {
     /**
      * @var \Magento\Directory\Model\Data\CountryInformationFactory
-     * @since 2.0.0
      */
     protected $countryInformationFactory;
 
     /**
      * @var \Magento\Directory\Model\Data\RegionInformationFactory
-     * @since 2.0.0
      */
     protected $regionInformationFactory;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -49,7 +43,6 @@ class CountryInformationAcquirer implements \Magento\Directory\Api\CountryInform
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\Data\CountryInformationFactory $countryInformationFactory,
@@ -67,7 +60,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCountriesInfo()
     {
@@ -94,7 +86,6 @@ public function getCountriesInfo()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCountryInfo($countryId)
     {
@@ -128,7 +119,6 @@ public function getCountryInfo($countryId)
      * @param array $regions
      * @param string $storeLocale
      * @return \Magento\Directory\Model\Data\CountryInformation
-     * @since 2.0.0
      */
     protected function setCountryInfo($country, $regions, $storeLocale)
     {
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index e1700318c86b6..efa7442deb274 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -15,7 +15,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Currency extends \Magento\Framework\Model\AbstractModel
 {
@@ -30,7 +29,6 @@ class Currency extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $_filter;
 
@@ -38,37 +36,31 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * Currency Rates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
     /**
      * @var \Magento\Directory\Model\Currency\FilterFactory
-     * @since 2.0.0
      */
     protected $_currencyFilterFactory;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -84,7 +76,6 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -114,7 +105,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -125,7 +115,6 @@ protected function _construct()
      * Get currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -136,7 +125,6 @@ public function getCode()
      * Get currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyCode()
     {
@@ -147,7 +135,6 @@ public function getCurrencyCode()
      * Currency Rates getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRates()
     {
@@ -159,7 +146,6 @@ public function getRates()
      *
      * @param array $rates Currency Rates
      * @return $this
-     * @since 2.0.0
      */
     public function setRates(array $rates)
     {
@@ -174,7 +160,6 @@ public function setRates(array $rates)
      * @param   string $field
      * @return  $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function load($id, $field = null)
     {
@@ -188,7 +173,6 @@ public function load($id, $field = null)
      *
      * @param mixed $toCurrency
      * @return float
-     * @since 2.0.0
      */
     public function getRate($toCurrency)
     {
@@ -206,7 +190,6 @@ public function getRate($toCurrency)
      *
      * @param mixed $toCurrency
      * @return float
-     * @since 2.0.0
      */
     public function getAnyRate($toCurrency)
     {
@@ -226,7 +209,6 @@ public function getAnyRate($toCurrency)
      * @param   mixed $toCurrency
      * @return  float
      * @throws \Exception
-     * @since 2.0.0
      */
     public function convert($price, $toCurrency = null)
     {
@@ -265,7 +247,6 @@ private function getCurrencyCodeFromToCurrency($toCurrency)
      * Get currency filter
      *
      * @return Filter
-     * @since 2.0.0
      */
     public function getFilter()
     {
@@ -284,7 +265,6 @@ public function getFilter()
      * @param bool $includeContainer
      * @param bool $addBrackets
      * @return string
-     * @since 2.0.0
      */
     public function format($price, $options = [], $includeContainer = true, $addBrackets = false)
     {
@@ -300,7 +280,6 @@ public function format($price, $options = [], $includeContainer = true, $addBrac
      * @param   bool $includeContainer
      * @param   bool $addBrackets
      * @return  string
-     * @since 2.0.0
      */
     public function formatPrecision(
         $price,
@@ -325,7 +304,6 @@ public function formatPrecision(
      * @param float $price
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     public function formatTxt($price, $options = [])
     {
@@ -346,7 +324,6 @@ public function formatTxt($price, $options = [])
      * Return currency symbol for current locale and currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencySymbol()
     {
@@ -355,7 +332,6 @@ public function getCurrencySymbol()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOutputFormat()
     {
@@ -368,7 +344,6 @@ public function getOutputFormat()
      * Retrieve allowed currencies according to config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfigAllowCurrencies()
     {
@@ -391,7 +366,6 @@ public function getConfigAllowCurrencies()
      * Retrieve default currencies according to config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfigDefaultCurrencies()
     {
@@ -401,7 +375,6 @@ public function getConfigDefaultCurrencies()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getConfigBaseCurrencies()
     {
@@ -415,7 +388,6 @@ public function getConfigBaseCurrencies()
      * @param string $currency
      * @param array|null $toCurrencies
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencyRates($currency, $toCurrencies = null)
     {
@@ -431,7 +403,6 @@ public function getCurrencyRates($currency, $toCurrencies = null)
      *
      * @param array $rates
      * @return $this
-     * @since 2.0.0
      */
     public function saveRates($rates)
     {
diff --git a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
index 2ddab882d3573..bfecbc83a6e1f 100644
--- a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
+++ b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Directory\Model\Currency\DefaultLocator
  *
- * @since 2.0.0
  */
 class DefaultLocator
 {
@@ -16,7 +15,6 @@ class DefaultLocator
      * Config object
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_configuration;
 
@@ -24,14 +22,12 @@ class DefaultLocator
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $configuration,
@@ -46,7 +42,6 @@ public function __construct(
      * @todo: Refactor to ScopeDefiner
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultCurrency(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Filter.php b/app/code/Magento/Directory/Model/Currency/Filter.php
index 26a12c7bd4f7d..d379403ae2a95 100644
--- a/app/code/Magento/Directory/Model/Currency/Filter.php
+++ b/app/code/Magento/Directory/Model/Currency/Filter.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Directory\Model\Currency\Filter
  *
- * @since 2.0.0
  */
 class Filter implements \Zend_Filter_Interface
 {
@@ -22,7 +21,6 @@ class Filter implements \Zend_Filter_Interface
      * Rate value
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_rate;
 
@@ -30,25 +28,21 @@ class Filter implements \Zend_Filter_Interface
      * Currency object
      *
      * @var \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_currency;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -56,7 +50,6 @@ class Filter implements \Zend_Filter_Interface
      * Price currency
      *
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -67,7 +60,6 @@ class Filter implements \Zend_Filter_Interface
      * @param PriceCurrencyInterface $priceCurrency
      * @param string $code
      * @param int $rate
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
@@ -89,7 +81,6 @@ public function __construct(
      *
      * @param float $rate
      * @return void
-     * @since 2.0.0
      */
     public function setRate($rate)
     {
@@ -101,7 +92,6 @@ public function setRate($rate)
      *
      * @param float $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/AbstractImport.php b/app/code/Magento/Directory/Model/Currency/Import/AbstractImport.php
index 91757c1b20ed0..22c64b6f775de 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/AbstractImport.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/AbstractImport.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractImport implements \Magento\Directory\Model\Currency\Import\ImportInterface
 {
@@ -19,19 +18,16 @@ abstract class AbstractImport implements \Magento\Directory\Model\Currency\Impor
      * Messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = [];
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\CurrencyFactory $currencyFactory)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Directory\Model\CurrencyFactory $currencyFa
      * Retrieve currency codes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCurrencyCodes()
     {
@@ -53,7 +48,6 @@ protected function _getCurrencyCodes()
      * Retrieve default currency codes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultCurrencyCodes()
     {
@@ -66,7 +60,6 @@ protected function _getDefaultCurrencyCodes()
      * @param   string $currencyFrom
      * @param   string $currencyTo
      * @return  float
-     * @since 2.0.0
      */
     abstract protected function _convert($currencyFrom, $currencyTo);
 
@@ -75,7 +68,6 @@ abstract protected function _convert($currencyFrom, $currencyTo);
      *
      * @param   array $rates
      * @return  \Magento\Directory\Model\Currency\Import\AbstractImport
-     * @since 2.0.0
      */
     protected function _saveRates($rates)
     {
@@ -89,7 +81,6 @@ protected function _saveRates($rates)
      * Import rates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function importRates()
     {
@@ -100,7 +91,6 @@ public function importRates()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function fetchRates()
     {
@@ -132,7 +122,6 @@ public function fetchRates()
     /**
      * @param float|int $number
      * @return float|int
-     * @since 2.0.0
      */
     protected function _numberFormat($number)
     {
@@ -141,7 +130,6 @@ protected function _numberFormat($number)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Config.php b/app/code/Magento/Directory/Model/Currency/Import/Config.php
index 94e7183d6baa2..d447daa9f6d93 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Config.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Config.php
@@ -9,13 +9,11 @@
  * Configured currency import services
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_servicesConfig;
 
@@ -24,7 +22,6 @@ class Config
      *
      * @param array $servicesConfig
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $servicesConfig)
     {
@@ -46,7 +43,6 @@ public function __construct(array $servicesConfig)
      * Retrieve unique names of all available currency import services
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableServices()
     {
@@ -58,7 +54,6 @@ public function getAvailableServices()
      *
      * @param string $serviceName
      * @return string|null
-     * @since 2.0.0
      */
     public function getServiceClass($serviceName)
     {
@@ -73,7 +68,6 @@ public function getServiceClass($serviceName)
      *
      * @param string $serviceName
      * @return \Magento\Framework\Phrase|null
-     * @since 2.0.0
      */
     public function getServiceLabel($serviceName)
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Factory.php b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
index 9f9072c0dcc6f..58cf11a71ee38 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Factory.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
@@ -12,26 +12,22 @@
  * Factory for currency import services
  *
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Directory\Model\Currency\Import\Config
-     * @since 2.0.0
      */
     protected $_serviceConfig;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Directory\Model\Currency\Import\Config $serviceConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -49,7 +45,6 @@ public function __construct(
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
      * @return \Magento\Directory\Model\Currency\Import\ImportInterface
-     * @since 2.0.0
      */
     public function create($serviceName, array $data = [])
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/ImportInterface.php b/app/code/Magento/Directory/Model/Currency/Import/ImportInterface.php
index 16a96d76eed11..b581a784a3761 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/ImportInterface.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/ImportInterface.php
@@ -10,7 +10,6 @@
  * Import currency model interface
  *
  * @api
- * @since 2.0.0
  */
 interface ImportInterface
 {
@@ -18,7 +17,6 @@ interface ImportInterface
      * Import rates
      *
      * @return \Magento\Directory\Model\Currency\Import\AbstractImport
-     * @since 2.0.0
      */
     public function importRates();
 
@@ -26,7 +24,6 @@ public function importRates();
      * Fetch rates
      *
      * @return array
-     * @since 2.0.0
      */
     public function fetchRates();
 
@@ -34,7 +31,6 @@ public function fetchRates();
      * Return messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages();
 }
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
index 280f690742736..e1a176331dff4 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Directory\Model\Currency\Import\Source\Service
  *
- * @since 2.0.0
  */
 class Service implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Directory\Model\Currency\Import\Config
-     * @since 2.0.0
      */
     private $_importConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_options;
 
     /**
      * @param \Magento\Directory\Model\Currency\Import\Config $importConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\Currency\Import\Config $importConfig)
     {
@@ -35,7 +31,6 @@ public function __construct(\Magento\Directory\Model\Currency\Import\Config $imp
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
index 8ed60c0b4bdeb..b135cfd3a2c3f 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -7,7 +7,6 @@
 
 /**
  * Currency rate import model (From www.webservicex.net)
- * @since 2.0.0
  */
 class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImport
 {
@@ -39,7 +38,6 @@ class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImpor
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\HTTP\ZendClientFactory|null $zendClientFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -57,7 +55,6 @@ public function __construct(
      * @param string $currencyTo
      * @param int $retry
      * @return float|null
-     * @since 2.0.0
      */
     protected function _convert($currencyFrom, $currencyTo, $retry = 0)
     {
diff --git a/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php b/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
index 661febba1ee25..8bd9f37d7082d 100644
--- a/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
+++ b/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
@@ -7,25 +7,21 @@
 
 /**
  * Currency information acquirer class
- * @since 2.0.0
  */
 class CurrencyInformationAcquirer implements \Magento\Directory\Api\CurrencyInformationAcquirerInterface
 {
     /**
      * @var \Magento\Directory\Model\Data\CurrencyInformationFactory
-     * @since 2.0.0
      */
     protected $currencyInformationFactory;
 
     /**
      * @var \Magento\Directory\Model\Data\ExchangeRateFactory
-     * @since 2.0.0
      */
     protected $exchangeRateFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
     
@@ -33,7 +29,6 @@ class CurrencyInformationAcquirer implements \Magento\Directory\Api\CurrencyInfo
      * @param \Magento\Directory\Model\Data\CurrencyInformationFactory $currencyInformationFactory
      * @param \Magento\Directory\Model\Data\ExchangeRateFactory $exchangeRateFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\Data\CurrencyInformationFactory $currencyInformationFactory,
@@ -47,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCurrencyInfo()
     {
diff --git a/app/code/Magento/Directory/Model/Data/CountryInformation.php b/app/code/Magento/Directory/Model/Data/CountryInformation.php
index f3bfd64c306d7..a20a8f0c3c4d6 100644
--- a/app/code/Magento/Directory/Model/Data/CountryInformation.php
+++ b/app/code/Magento/Directory/Model/Data/CountryInformation.php
@@ -10,7 +10,6 @@
  * Class Country Information
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CountryInformation extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Directory\Api\Data\CountryInformationInterface
@@ -24,7 +23,6 @@ class CountryInformation extends \Magento\Framework\Api\AbstractExtensibleObject
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -33,7 +31,6 @@ public function getId()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -42,7 +39,6 @@ public function setId($id)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getTwoLetterAbbreviation()
     {
@@ -51,7 +47,6 @@ public function getTwoLetterAbbreviation()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setTwoLetterAbbreviation($abbreviation)
     {
@@ -60,7 +55,6 @@ public function setTwoLetterAbbreviation($abbreviation)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getThreeLetterAbbreviation()
     {
@@ -69,7 +63,6 @@ public function getThreeLetterAbbreviation()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setThreeLetterAbbreviation($abbreviation)
     {
@@ -78,7 +71,6 @@ public function setThreeLetterAbbreviation($abbreviation)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getFullNameLocale()
     {
@@ -87,7 +79,6 @@ public function getFullNameLocale()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setFullNameLocale($fullNameLocale)
     {
@@ -96,7 +87,6 @@ public function setFullNameLocale($fullNameLocale)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getFullNameEnglish()
     {
@@ -105,7 +95,6 @@ public function getFullNameEnglish()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setFullNameEnglish($fullNameEnglish)
     {
@@ -114,7 +103,6 @@ public function setFullNameEnglish($fullNameEnglish)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getAvailableRegions()
     {
@@ -123,7 +111,6 @@ public function getAvailableRegions()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setAvailableRegions($availableRegions)
     {
@@ -132,7 +119,6 @@ public function setAvailableRegions($availableRegions)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -141,7 +127,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\CountryInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Model/Data/CurrencyInformation.php b/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
index 30d02165b2d2b..8bbbdc1164b7f 100644
--- a/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
+++ b/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
@@ -11,7 +11,6 @@
  * Class Currency Information
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CurrencyInformation extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Directory\Api\Data\CurrencyInformationInterface
@@ -25,7 +24,6 @@ class CurrencyInformation extends \Magento\Framework\Api\AbstractExtensibleObjec
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -34,7 +32,6 @@ public function getBaseCurrencyCode()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code)
     {
@@ -43,7 +40,6 @@ public function setBaseCurrencyCode($code)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getBaseCurrencySymbol()
     {
@@ -52,7 +48,6 @@ public function getBaseCurrencySymbol()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setBaseCurrencySymbol($symbol)
     {
@@ -61,7 +56,6 @@ public function setBaseCurrencySymbol($symbol)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencyCode()
     {
@@ -70,7 +64,6 @@ public function getDefaultDisplayCurrencyCode()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencyCode($code)
     {
@@ -79,7 +72,6 @@ public function setDefaultDisplayCurrencyCode($code)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencySymbol()
     {
@@ -88,7 +80,6 @@ public function getDefaultDisplayCurrencySymbol()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencySymbol($symbol)
     {
@@ -97,7 +88,6 @@ public function setDefaultDisplayCurrencySymbol($symbol)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getAvailableCurrencyCodes()
     {
@@ -106,7 +96,6 @@ public function getAvailableCurrencyCodes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setAvailableCurrencyCodes(array $codes = null)
     {
@@ -115,7 +104,6 @@ public function setAvailableCurrencyCodes(array $codes = null)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExchangeRates()
     {
@@ -124,7 +112,6 @@ public function getExchangeRates()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExchangeRates(array $exchangeRates = null)
     {
@@ -133,7 +120,6 @@ public function setExchangeRates(array $exchangeRates = null)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -142,7 +128,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\CurrencyInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Model/Data/ExchangeRate.php b/app/code/Magento/Directory/Model/Data/ExchangeRate.php
index 83307ef7a0182..35aee75f10481 100644
--- a/app/code/Magento/Directory/Model/Data/ExchangeRate.php
+++ b/app/code/Magento/Directory/Model/Data/ExchangeRate.php
@@ -11,7 +11,6 @@
  * Class Exchange Rate
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ExchangeRate extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Directory\Api\Data\ExchangeRateInterface
@@ -21,7 +20,6 @@ class ExchangeRate extends \Magento\Framework\Api\AbstractExtensibleObject imple
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getCurrencyTo()
     {
@@ -30,7 +28,6 @@ public function getCurrencyTo()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setCurrencyTo($code)
     {
@@ -39,7 +36,6 @@ public function setCurrencyTo($code)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getRate()
     {
@@ -48,7 +44,6 @@ public function getRate()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setRate($rate)
     {
@@ -57,7 +52,6 @@ public function setRate($rate)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExchangeRates()
     {
@@ -66,7 +60,6 @@ public function getExchangeRates()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExchangeRates(array $exchangeRates = null)
     {
@@ -75,7 +68,6 @@ public function setExchangeRates(array $exchangeRates = null)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -84,7 +76,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\ExchangeRateExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Model/Data/RegionInformation.php b/app/code/Magento/Directory/Model/Data/RegionInformation.php
index d70695cea7ef9..9c88c04d0d6fb 100644
--- a/app/code/Magento/Directory/Model/Data/RegionInformation.php
+++ b/app/code/Magento/Directory/Model/Data/RegionInformation.php
@@ -10,7 +10,6 @@
  * Class Region Information
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class RegionInformation extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Directory\Api\Data\RegionInformationInterface
@@ -21,7 +20,6 @@ class RegionInformation extends \Magento\Framework\Api\AbstractExtensibleObject
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -30,7 +28,6 @@ public function getId()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setId($regionId)
     {
@@ -39,7 +36,6 @@ public function setId($regionId)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -48,7 +44,6 @@ public function getCode()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setCode($regionCode)
     {
@@ -57,7 +52,6 @@ public function setCode($regionCode)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -66,7 +60,6 @@ public function getName()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setName($regionName)
     {
@@ -75,7 +68,6 @@ public function setName($regionName)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -84,7 +76,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Directory\Api\Data\RegionInformationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index 9ead330f17ba4..2fb7ea987bf29 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Directory\Model\Observer
  *
- * @since 2.0.0
  */
 class Observer
 {
@@ -32,7 +31,6 @@ class Observer
 
     /**
      * @var \Magento\Directory\Model\Currency\Import\Factory
-     * @since 2.0.0
      */
     protected $_importFactory;
 
@@ -40,31 +38,26 @@ class Observer
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -75,7 +68,6 @@ class Observer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\Currency\Import\Factory $importFactory,
@@ -98,7 +90,6 @@ public function __construct(
      * @return void
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function scheduledUpdateCurrencyRates($schedule)
     {
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index bc88b3212d7d5..a211242d377f3 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -12,25 +12,21 @@
 
 /**
  * Class PriceCurrency model for convert and format price value
- * @since 2.0.0
  */
 class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var CurrencyFactory
-     * @since 2.0.0
      */
     protected $currencyFactory;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -38,7 +34,6 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CurrencyFactory $currencyFactory
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -52,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($amount, $scope = null, $currency = null)
     {
@@ -65,7 +59,6 @@ public function convert($amount, $scope = null, $currency = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
@@ -76,7 +69,6 @@ public function convertAndRound($amount, $scope = null, $currency = null, $preci
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function format(
         $amount,
@@ -91,7 +83,6 @@ public function format(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertAndFormat(
         $amount,
@@ -107,7 +98,6 @@ public function convertAndFormat(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCurrency($scope = null, $currency = null)
     {
@@ -131,7 +121,6 @@ public function getCurrency($scope = null, $currency = null)
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencySymbol($scope = null, $currency = null)
     {
@@ -143,7 +132,6 @@ public function getCurrencySymbol($scope = null, $currency = null)
      *
      * @param null|string|bool|int|ScopeInterface $scope
      * @return Store
-     * @since 2.0.0
      */
     protected function getStore($scope = null)
     {
@@ -164,7 +152,6 @@ protected function getStore($scope = null)
      *
      * @param float $price
      * @return float
-     * @since 2.0.0
      */
     public function round($price)
     {
diff --git a/app/code/Magento/Directory/Model/Region.php b/app/code/Magento/Directory/Model/Region.php
index aad3c50f0b20c..ac03c2f2b0103 100644
--- a/app/code/Magento/Directory/Model/Region.php
+++ b/app/code/Magento/Directory/Model/Region.php
@@ -20,13 +20,11 @@
  * @method \Magento\Directory\Model\Region setDefaultName(string $value)
  *
  * @api
- * @since 2.0.0
  */
 class Region extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +37,6 @@ protected function _construct()
      * If name is not declared, then default_name is used
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -56,7 +53,6 @@ public function getName()
      * @param string $code
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode($code, $countryId)
     {
@@ -72,7 +68,6 @@ public function loadByCode($code, $countryId)
      * @param string $name
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByName($name, $countryId)
     {
diff --git a/app/code/Magento/Directory/Model/RegionFactory.php b/app/code/Magento/Directory/Model/RegionFactory.php
index 362bcf0d5bfc7..7fbdf25f2c578 100644
--- a/app/code/Magento/Directory/Model/RegionFactory.php
+++ b/app/code/Magento/Directory/Model/RegionFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RegionFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return \Magento\Directory\Model\Region
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country.php b/app/code/Magento/Directory/Model/ResourceModel/Country.php
index b96a0738c6365..f09e4a2d06bb5 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country.php
@@ -9,7 +9,6 @@
  * Country Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * @param string $code
      * @return \Magento\Directory\Model\ResourceModel\Country
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadByCode(\Magento\Directory\Model\Country $country, $code)
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index 80c163d3abd86..fd17a408de9bf 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -18,7 +18,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -26,7 +25,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Locale model
      *
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_localeLists;
 
@@ -34,13 +32,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
@@ -48,25 +44,22 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Array utils object
      *
      * @var \Magento\Framework\Stdlib\ArrayUtils
-     * @since 2.0.0
      */
     protected $_arrayUtils;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $helperData;
 
     /**
      * @var AllowedCountries
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $allowedCountriesReader;
 
@@ -93,7 +86,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -124,7 +116,6 @@ public function __construct(
      * Foreground countries
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_foregroundCountries = [];
 
@@ -151,7 +142,6 @@ private function addForegroundCountriesToOptionArray($emptyLabel, $options)
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -161,9 +151,9 @@ protected function _construct()
     /**
      * Return Allowed Countries reader
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return \Magento\Directory\Model\AllowedCountries
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAllowedCountriesReader()
     {
@@ -179,7 +169,6 @@ private function getAllowedCountriesReader()
      *
      * @param null|int|string|\Magento\Store\Model\Store $store
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     public function loadByStore($store = null)
     {
@@ -198,7 +187,6 @@ public function loadByStore($store = null)
      *
      * @param string $countryId
      * @return \Magento\Directory\Model\ResourceModel\Country|null
-     * @since 2.0.0
      */
     public function getItemById($countryId)
     {
@@ -219,7 +207,6 @@ public function getItemById($countryId)
      * @param string|string[] $countryCode
      * @param string|string[] $iso
      * @return $this
-     * @since 2.0.0
      */
     public function addCountryCodeFilter($countryCode, $iso = ['iso3', 'iso2'])
     {
@@ -254,7 +241,6 @@ public function addCountryCodeFilter($countryCode, $iso = ['iso3', 'iso2'])
      *
      * @param string|string[] $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function addCountryIdFilter($countryId)
     {
@@ -273,7 +259,6 @@ public function addCountryIdFilter($countryId)
      *
      * @param string|boolean $emptyLabel
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($emptyLabel = ' ')
     {
@@ -318,7 +303,6 @@ public function toOptionArray($emptyLabel = ' ')
      *
      * @param string|array $foregroundCountries
      * @return $this
-     * @since 2.0.0
      */
     public function setForegroundCountries($foregroundCountries)
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Format.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Format.php
index 1a93c2b931868..98474327157ba 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Format.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Format.php
@@ -9,7 +9,6 @@
  * Directory country format resource model
  *
  * @api
- * @since 2.0.0
  */
 class Format extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Format extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return \Magento\Directory\Model\ResourceModel\Country\Format
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php
index 196f77638daa1..f48c50a8aa879 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php
@@ -9,7 +9,6 @@
  * Country formats collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      *
      * @param string|\Magento\Directory\Model\Country $country
      * @return \Magento\Directory\Model\ResourceModel\Country\Format\Collection
-     * @since 2.0.0
      */
     public function setCountryFilter($country)
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
index df96c1e3132df..e4b44e5e725c2 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
@@ -10,7 +10,6 @@
  * Currency Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Currency rate table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currencyRateTable;
 
@@ -26,7 +24,6 @@ class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Currency rate cache array
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_rateCache;
 
@@ -34,7 +31,6 @@ class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main and currency rate tables
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -48,7 +44,6 @@ protected function _construct()
      * @param \Magento\Directory\Model\Currency|string $currencyFrom
      * @param \Magento\Directory\Model\Currency|string $currencyTo
      * @return float
-     * @since 2.0.0
      */
     public function getRate($currencyFrom, $currencyTo)
     {
@@ -88,7 +83,6 @@ public function getRate($currencyFrom, $currencyTo)
      * @param \Magento\Directory\Model\Currency|string $currencyFrom
      * @param \Magento\Directory\Model\Currency|string $currencyTo
      * @return float
-     * @since 2.0.0
      */
     public function getAnyRate($currencyFrom, $currencyTo)
     {
@@ -140,7 +134,6 @@ public function getAnyRate($currencyFrom, $currencyTo)
      * @param array $rates
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveRates($rates)
     {
@@ -171,7 +164,6 @@ public function saveRates($rates)
      * @param string $path
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getConfigCurrencies($model, $path)
     {
@@ -194,7 +186,6 @@ public function getConfigCurrencies($model, $path)
      * @param string|array $currency
      * @param array $toCurrencies
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencyRates($currency, $toCurrencies = null)
     {
@@ -216,7 +207,6 @@ public function getCurrencyRates($currency, $toCurrencies = null)
      * @param string $code
      * @param array $toCurrencies
      * @return array
-     * @since 2.0.0
      */
     protected function _getRatesByCode($code, $toCurrencies = null)
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Region.php b/app/code/Magento/Directory/Model/ResourceModel/Region.php
index f3a83f67d2664..5b43a420d939d 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Region.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Region.php
@@ -12,7 +12,6 @@
  * Region Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Region extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,13 +19,11 @@ class Region extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Table with localized region names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_regionNameTable;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -34,7 +31,6 @@ class Region extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Define main and locale region name tables
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +59,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -106,7 +100,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param string $value
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadByCountry($object, $countryId, $value, $field)
     {
@@ -145,7 +138,6 @@ protected function _loadByCountry($object, $countryId, $value, $field)
      * @param string $countryId
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode(\Magento\Directory\Model\Region $region, $regionCode, $countryId)
     {
@@ -159,7 +151,6 @@ public function loadByCode(\Magento\Directory\Model\Region $region, $regionCode,
      * @param string $regionName
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByName(\Magento\Directory\Model\Region $region, $regionName, $countryId)
     {
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
index fd469722d9072..48826e7520856 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Locale region name table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_regionNameTable;
 
@@ -32,13 +30,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Country table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_countryTable;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -56,7 +52,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -76,7 +71,6 @@ public function __construct(
      * Define main, country, locale region name tables
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -93,7 +87,6 @@ protected function _construct()
      * Initialize select object
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -151,7 +144,6 @@ public function addAllowedCountriesFilter($store = null)
      *
      * @param string|array $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function addCountryFilter($countryId)
     {
@@ -170,7 +162,6 @@ public function addCountryFilter($countryId)
      *
      * @param string $countryCode
      * @return $this
-     * @since 2.0.0
      */
     public function addCountryCodeFilter($countryCode)
     {
@@ -190,7 +181,6 @@ public function addCountryCodeFilter($countryCode)
      *
      * @param string|array $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function addRegionCodeFilter($regionCode)
     {
@@ -209,7 +199,6 @@ public function addRegionCodeFilter($regionCode)
      *
      * @param string|array $regionName
      * @return $this
-     * @since 2.0.0
      */
     public function addRegionNameFilter($regionName)
     {
@@ -228,7 +217,6 @@ public function addRegionNameFilter($regionName)
      *
      * @param string|array $region
      * @return $this
-     * @since 2.0.0
      */
     public function addRegionCodeOrNameFilter($region)
     {
@@ -246,7 +234,6 @@ public function addRegionCodeOrNameFilter($region)
      * Convert collection items to select options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Directory/Setup/InstallData.php b/app/code/Magento/Directory/Setup/InstallData.php
index 09c4406cdccc5..06dcb70bf934f 100644
--- a/app/code/Magento/Directory/Setup/InstallData.php
+++ b/app/code/Magento/Directory/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * Directory data
      *
      * @var Data
-     * @since 2.0.0
      */
     private $directoryData;
 
@@ -29,7 +27,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param Data $directoryData
-     * @since 2.0.0
      */
     public function __construct(Data $directoryData)
     {
@@ -39,7 +36,6 @@ public function __construct(Data $directoryData)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Directory/Setup/InstallSchema.php b/app/code/Magento/Directory/Setup/InstallSchema.php
index 6698641f16279..af35806e3ce5c 100644
--- a/app/code/Magento/Directory/Setup/InstallSchema.php
+++ b/app/code/Magento/Directory/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Downloadable/Api/Data/DownloadableOptionInterface.php b/app/code/Magento/Downloadable/Api/Data/DownloadableOptionInterface.php
index 9d28d1349ec03..a83828faf2e1b 100644
--- a/app/code/Magento/Downloadable/Api/Data/DownloadableOptionInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/DownloadableOptionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Downloadable Option
  * @api
- * @since 2.0.0
  */
 interface DownloadableOptionInterface
 {
@@ -18,7 +17,6 @@ interface DownloadableOptionInterface
      * Returns the list of downloadable links
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getDownloadableLinks();
 
@@ -27,7 +25,6 @@ public function getDownloadableLinks();
      *
      * @param int[] $downloadableLinks
      * @return $this
-     * @since 2.0.0
      */
     public function setDownloadableLinks($downloadableLinks);
 }
diff --git a/app/code/Magento/Downloadable/Api/Data/File/ContentInterface.php b/app/code/Magento/Downloadable/Api/Data/File/ContentInterface.php
index b1fbc1fde604c..3bb75bba1e87c 100644
--- a/app/code/Magento/Downloadable/Api/Data/File/ContentInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/File/ContentInterface.php
@@ -8,7 +8,6 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 interface ContentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -16,7 +15,6 @@ interface ContentInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
      * Retrieve data (base64 encoded content)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileData();
 
@@ -25,7 +23,6 @@ public function getFileData();
      *
      * @param string $fileData
      * @return $this
-     * @since 2.0.0
      */
     public function setFileData($fileData);
 
@@ -33,7 +30,6 @@ public function setFileData($fileData);
      * Retrieve file name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -42,7 +38,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -50,7 +45,6 @@ public function setName($name);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -59,7 +53,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Downloadable\Api\Data\File\ContentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Downloadable/Api/Data/File/ContentUploaderInterface.php b/app/code/Magento/Downloadable/Api/Data/File/ContentUploaderInterface.php
index 326d77b564c6a..4b100d99b0367 100644
--- a/app/code/Magento/Downloadable/Api/Data/File/ContentUploaderInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/File/ContentUploaderInterface.php
@@ -8,7 +8,6 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 interface ContentUploaderInterface
 {
@@ -19,7 +18,6 @@ interface ContentUploaderInterface
      * @param string $contentType
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function upload(ContentInterface $fileContent, $contentType);
 }
diff --git a/app/code/Magento/Downloadable/Api/Data/LinkInterface.php b/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
index 7dd66f9f53700..1dfddd369e622 100644
--- a/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
@@ -8,46 +8,39 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int|null Sample(or link) id
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
     /**
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
     /**
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -58,14 +51,12 @@ public function setSortOrder($sortOrder);
      * 2 -- Use config default value
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsShareable();
 
     /**
      * @param int $isShareable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsShareable($isShareable);
 
@@ -73,7 +64,6 @@ public function setIsShareable($isShareable);
      * Link price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -82,7 +72,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -91,7 +80,6 @@ public function setPrice($price);
      * Null for unlimited downloads
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getNumberOfDownloads();
 
@@ -101,20 +89,17 @@ public function getNumberOfDownloads();
      *
      * @param int $numberOfDownloads
      * @return $this
-     * @since 2.0.0
      */
     public function setNumberOfDownloads($numberOfDownloads);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLinkType();
 
     /**
      * @param string $linkType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkType($linkType);
 
@@ -122,7 +107,6 @@ public function setLinkType($linkType);
      * Return file path or null when type is 'url'
      *
      * @return string|null relative file path
-     * @since 2.0.0
      */
     public function getLinkFile();
 
@@ -131,7 +115,6 @@ public function getLinkFile();
      *
      * @param string $linkFile
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkFile($linkFile);
 
@@ -139,7 +122,6 @@ public function setLinkFile($linkFile);
      * Return file content
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentInterface|null
-     * @since 2.0.0
      */
     public function getLinkFileContent();
 
@@ -148,7 +130,6 @@ public function getLinkFileContent();
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $linkFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkFileContent(\Magento\Downloadable\Api\Data\File\ContentInterface $linkFileContent = null);
 
@@ -156,7 +137,6 @@ public function setLinkFileContent(\Magento\Downloadable\Api\Data\File\ContentIn
      * Return link url or null when type is 'file'
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLinkUrl();
 
@@ -165,20 +145,17 @@ public function getLinkUrl();
      *
      * @param string $linkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkUrl($linkUrl);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSampleType();
 
     /**
      * @param string $sampleType
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleType($sampleType);
 
@@ -186,7 +163,6 @@ public function setSampleType($sampleType);
      * Return file path or null when type is 'url'
      *
      * @return string|null relative file path
-     * @since 2.0.0
      */
     public function getSampleFile();
 
@@ -195,7 +171,6 @@ public function getSampleFile();
      *
      * @param string $sampleFile
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFile($sampleFile);
 
@@ -203,7 +178,6 @@ public function setSampleFile($sampleFile);
      * Return sample file content when type is 'file'
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentInterface|null relative file path
-     * @since 2.0.0
      */
     public function getSampleFileContent();
 
@@ -212,7 +186,6 @@ public function getSampleFileContent();
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFileContent(
         \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent = null
@@ -222,7 +195,6 @@ public function setSampleFileContent(
      * Return URL or NULL when type is 'file'
      *
      * @return string|null file URL
-     * @since 2.0.0
      */
     public function getSampleUrl();
 
@@ -231,7 +203,6 @@ public function getSampleUrl();
      *
      * @param string $sampleUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleUrl($sampleUrl);
 
@@ -239,7 +210,6 @@ public function setSampleUrl($sampleUrl);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Downloadable\Api\Data\LinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -248,7 +218,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Downloadable\Api\Data\LinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Downloadable\Api\Data\LinkExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Downloadable/Api/Data/SampleInterface.php b/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
index 8c1e08f3975e7..26adfcea569e3 100644
--- a/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
@@ -10,7 +10,6 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 interface SampleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface SampleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Product sample id
      *
      * @return int|null Sample(or link) id
-     * @since 2.0.0
      */
     public function getId();
 
@@ -27,7 +25,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -35,7 +32,6 @@ public function setId($id);
      * Sample title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -44,7 +40,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -52,7 +47,6 @@ public function setTitle($title);
      * Sort order index for sample
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -61,20 +55,17 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSampleType();
 
     /**
      * @param string $sampleType
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleType($sampleType);
 
@@ -82,7 +73,6 @@ public function setSampleType($sampleType);
      * Return file path or null when type is 'url'
      *
      * @return string|null relative file path
-     * @since 2.0.0
      */
     public function getSampleFile();
 
@@ -91,7 +81,6 @@ public function getSampleFile();
      *
      * @param string $sampleFile
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFile($sampleFile);
 
@@ -99,7 +88,6 @@ public function setSampleFile($sampleFile);
      * Retrieve sample file content
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentInterface|null
-     * @since 2.0.0
      */
     public function getSampleFileContent();
 
@@ -108,7 +96,6 @@ public function getSampleFileContent();
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFileContent(ContentInterface $sampleFileContent = null);
 
@@ -116,7 +103,6 @@ public function setSampleFileContent(ContentInterface $sampleFileContent = null)
      * Return URL or NULL when type is 'file'
      *
      * @return string|null file URL
-     * @since 2.0.0
      */
     public function getSampleUrl();
 
@@ -125,7 +111,6 @@ public function getSampleUrl();
      *
      * @param string $sampleUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleUrl($sampleUrl);
 
@@ -133,7 +118,6 @@ public function setSampleUrl($sampleUrl);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Downloadable\Api\Data\SampleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -142,7 +126,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Downloadable\Api\Data\SampleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Downloadable\Api\Data\SampleExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php b/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
index 2bb1beb7b0b10..12750911df206 100644
--- a/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
+++ b/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
@@ -12,7 +12,6 @@
  * Interface LinkRepositoryInterface
  * @package Magento\Downloadable\Api
  * @api
- * @since 2.0.0
  */
 interface LinkRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface LinkRepositoryInterface
      *
      * @param string $sku
      * @return \Magento\Downloadable\Api\Data\LinkInterface[]
-     * @since 2.0.0
      */
     public function getList($sku);
 
@@ -30,7 +28,6 @@ public function getList($sku);
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Downloadable\Api\Data\LinkInterface[]
-     * @since 2.0.0
      */
     public function getLinksByProduct(ProductInterface $product);
 
@@ -41,7 +38,6 @@ public function getLinksByProduct(ProductInterface $product);
      * @param \Magento\Downloadable\Api\Data\LinkInterface $link
      * @param bool $isGlobalScopeContent
      * @return int
-     * @since 2.0.0
      */
     public function save($sku, LinkInterface $link, $isGlobalScopeContent = true);
 
@@ -50,7 +46,6 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = true);
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function delete($id);
 }
diff --git a/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php b/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php
index dc40bee39d123..462d3d17721f2 100644
--- a/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php
+++ b/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface SampleRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface SampleRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface SampleRepositoryInterface
      *
      * @param string $sku
      * @return \Magento\Downloadable\Api\Data\SampleInterface[]
-     * @since 2.0.0
      */
     public function getList($sku);
 
@@ -28,7 +26,6 @@ public function getList($sku);
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Downloadable\Api\Data\SampleInterface[]
-     * @since 2.0.0
      */
     public function getSamplesByProduct(\Magento\Catalog\Api\Data\ProductInterface $product);
 
@@ -39,7 +36,6 @@ public function getSamplesByProduct(\Magento\Catalog\Api\Data\ProductInterface $
      * @param \Magento\Downloadable\Api\Data\SampleInterface $sample
      * @param bool $isGlobalScopeContent
      * @return int
-     * @since 2.0.0
      */
     public function save(
         $sku,
@@ -52,7 +48,6 @@ public function save(
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function delete($id);
 }
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
index 3c1fa466e8339..f0d258c922805 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Downloadable extends \Magento\Downloadable\Block\Catalog\Product\Links
 {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 0d3be04c70480..4019def9e0cd0 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -15,7 +15,6 @@
  * Adminhtml catalog product downloadable items tab and form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Downloadable extends Widget implements TabInterface
 {
@@ -23,19 +22,16 @@ class Downloadable extends Widget implements TabInterface
      * Reference to product objects that is being edited
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product = null;
 
     /**
      * @var \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     protected $_config = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/downloadable.phtml';
 
@@ -43,7 +39,6 @@ class Downloadable extends Widget implements TabInterface
      * Accordion block id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $blockId = 'downloadableInfo';
 
@@ -51,7 +46,6 @@ class Downloadable extends Widget implements TabInterface
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -59,7 +53,6 @@ class Downloadable extends Widget implements TabInterface
      * @param Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -74,7 +67,6 @@ public function __construct(
      * Get parent tab code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTab()
     {
@@ -85,7 +77,6 @@ public function getParentTab()
      * Check is readonly block
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -96,7 +87,6 @@ public function isReadonly()
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -107,7 +97,6 @@ public function getProduct()
      * Get tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -118,7 +107,6 @@ public function getTabLabel()
      * Get tab title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -129,7 +117,6 @@ public function getTabTitle()
      * Check if tab can be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -140,7 +127,6 @@ public function canShowTab()
      * Check if tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -149,7 +135,6 @@ public function isHidden()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGroupCode()
     {
@@ -160,7 +145,6 @@ public function getGroupCode()
      * Get downloadable tab content id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentTabId()
     {
@@ -169,7 +153,6 @@ public function getContentTabId()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isDownloadable()
     {
@@ -178,7 +161,6 @@ public function isDownloadable()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index e8754fdb829a7..fab33673e182d 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Links extends \Magento\Backend\Block\Template
 {
@@ -18,7 +17,6 @@ class Links extends \Magento\Backend\Block\Template
      * Block config data
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -26,13 +24,11 @@ class Links extends \Magento\Backend\Block\Template
      * Purchased Separately Attribute cache
      *
      * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     protected $_purchasedSeparatelyAttribute = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/downloadable/links.phtml';
 
@@ -40,7 +36,6 @@ class Links extends \Magento\Backend\Block\Template
      * Downloadable file
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $_downloadableFile = null;
 
@@ -48,7 +43,6 @@ class Links extends \Magento\Backend\Block\Template
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
@@ -56,37 +50,31 @@ class Links extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected $_link;
 
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $_sourceModel;
 
     /**
      * @var \Magento\Backend\Model\UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -102,7 +90,6 @@ class Links extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Model\UrlFactory $urlFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -131,7 +118,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -145,7 +131,6 @@ protected function _construct()
      * Get product that is being edited
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -156,7 +141,6 @@ public function getProduct()
      * Retrieve Purchased Separately Attribute object
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     public function getPurchasedSeparatelyAttribute()
     {
@@ -176,7 +160,6 @@ public function getPurchasedSeparatelyAttribute()
      * Get Links can be purchased separately value for current product
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isProductLinksCanBePurchasedSeparately()
     {
@@ -187,7 +170,6 @@ public function isProductLinksCanBePurchasedSeparately()
      * Retrieve Add button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -208,7 +190,6 @@ public function getAddButtonHtml()
      * Retrieve default links title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
@@ -225,7 +206,6 @@ public function getLinksTitle()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUsedDefault()
     {
@@ -237,7 +217,6 @@ public function getUsedDefault()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsPriceWebsiteScope()
     {
@@ -257,7 +236,6 @@ public function getIsPriceWebsiteScope()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getLinkData()
     {
@@ -350,7 +328,6 @@ public function getLinkData()
      *
      * @param float $value
      * @return string
-     * @since 2.0.0
      */
     public function getPriceValue($value)
     {
@@ -361,7 +338,6 @@ public function getPriceValue($value)
      * Retrieve max downloads value from config
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConfigMaxDownloads()
     {
@@ -375,7 +351,6 @@ public function getConfigMaxDownloads()
      * Prepare block Layout
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -395,7 +370,6 @@ protected function _prepareLayout()
      * Retrieve Upload button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUploadButtonHtml()
     {
@@ -407,7 +381,6 @@ public function getUploadButtonHtml()
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getFileFieldName($type)
     {
@@ -419,7 +392,6 @@ public function getFileFieldName($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getUploadUrl($type)
     {
@@ -434,7 +406,6 @@ public function getUploadUrl($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getConfigJson($type = 'links')
     {
@@ -452,7 +423,6 @@ public function getConfigJson($type = 'links')
      * Retrieve config object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -465,7 +435,6 @@ public function getConfig()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
@@ -475,7 +444,6 @@ public function isSingleStoreMode()
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode($storeId)
     {
@@ -485,7 +453,6 @@ public function getBaseCurrencyCode($storeId)
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencySymbol($storeId)
     {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 75e072045a187..8b808c6020c5b 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -9,7 +9,6 @@
  * Adminhtml catalog product downloadable items tab links section
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Samples extends \Magento\Backend\Block\Widget
 {
@@ -17,13 +16,11 @@ class Samples extends \Magento\Backend\Block\Widget
      * Block config data
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'product/edit/downloadable/samples.phtml';
 
@@ -31,7 +28,6 @@ class Samples extends \Magento\Backend\Block\Widget
      * Downloadable file
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $_downloadableFile = null;
 
@@ -39,7 +35,6 @@ class Samples extends \Magento\Backend\Block\Widget
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
@@ -47,25 +42,21 @@ class Samples extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected $_sampleModel;
 
     /**
      * @var \Magento\Backend\Model\UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -78,7 +69,6 @@ class Samples extends \Magento\Backend\Block\Widget
      * @param \Magento\Downloadable\Model\Sample $sampleModel
      * @param \Magento\Backend\Model\UrlFactory $urlFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -104,7 +94,6 @@ public function __construct(
      * Get model of the product that is being edited
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -115,7 +104,6 @@ public function getProduct()
      * Check block is readonly
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -126,7 +114,6 @@ public function isReadonly()
      * Retrieve Add Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
@@ -147,7 +134,6 @@ public function getAddButtonHtml()
      * Retrieve samples array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSampleData()
     {
@@ -204,7 +190,6 @@ public function getSampleData()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUsedDefault()
     {
@@ -215,7 +200,6 @@ public function getUsedDefault()
      * Retrieve Default samples title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSamplesTitle()
     {
@@ -231,7 +215,6 @@ public function getSamplesTitle()
      * Prepare layout
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -251,7 +234,6 @@ protected function _prepareLayout()
      * Retrieve Upload button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUploadButtonHtml()
     {
@@ -262,7 +244,6 @@ public function getUploadButtonHtml()
      * Retrieve config json
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigJson()
     {
@@ -284,7 +265,6 @@ public function getConfigJson()
      * Retrieve config object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -299,7 +279,6 @@ public function getConfig()
      * Get is single store mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index 866b1a1fd37e3..a9f630dcb625f 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -16,25 +16,21 @@
  * Sales Order downloadable items name column renderer
  *
  * @api
- * @since 2.0.0
  */
 class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
 {
     /**
      * @var Purchased|null
-     * @since 2.0.0
      */
     protected $_purchased = null;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -47,7 +43,6 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
      * @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -66,7 +61,6 @@ public function __construct(
 
     /**
      * @return Purchased
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -81,7 +75,6 @@ public function getLinks()
 
     /**
      * @return null|string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 3bcc17ea6c02b..d82ad61ae4649 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -14,19 +14,16 @@
  * Downloadable Product Links part block
  *
  * @api
- * @since 2.0.0
  */
 class Links extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     protected $encoder;
 
@@ -35,7 +32,6 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param EncoderInterface $encoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLinksPurchasedSeparately()
     {
@@ -63,7 +58,6 @@ public function getLinksPurchasedSeparately()
     /**
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLinkSelectionRequired()
     {
@@ -72,7 +66,6 @@ public function getLinkSelectionRequired()
 
     /**
      * @return boolean
-     * @since 2.0.0
      */
     public function hasLinks()
     {
@@ -81,7 +74,6 @@ public function hasLinks()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -93,7 +85,6 @@ public function getLinks()
      *
      * @param float $price
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyPrice($price)
     {
@@ -103,7 +94,6 @@ public function getCurrencyPrice($price)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
@@ -125,7 +115,6 @@ public function getJsonConfig()
     /**
      * @param Link $link
      * @return string
-     * @since 2.0.0
      */
     public function getLinkSampleUrl($link)
     {
@@ -137,7 +126,6 @@ public function getLinkSampleUrl($link)
      * Return title of links section
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
@@ -155,7 +143,6 @@ public function getLinksTitle()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsOpenInNewWindow()
     {
@@ -171,7 +158,6 @@ public function getIsOpenInNewWindow()
      * @param Link $link
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsLinkChecked($link)
     {
@@ -188,7 +174,6 @@ public function getIsLinkChecked($link)
      *
      * @param Link $link
      * @return string
-     * @since 2.0.0
      */
     public function getLinkCheckedValue($link)
     {
@@ -198,7 +183,6 @@ public function getLinkCheckedValue($link)
     /**
      * @param Link $link
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     protected function getLinkAmount($link)
     {
@@ -208,7 +192,6 @@ protected function getLinkAmount($link)
     /**
      * @param Link $link
      * @return string
-     * @since 2.0.0
      */
     public function getLinkPrice(Link $link)
     {
@@ -223,7 +206,6 @@ public function getLinkPrice(Link $link)
      * Get LinkPrice Type
      *
      * @return \Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     protected function getPriceType()
     {
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index 2e3eb64187c82..53355a53b65e9 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -14,7 +14,6 @@
  * Downloadable Product Samples part block
  *
  * @api
- * @since 2.0.0
  */
 class Samples extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -22,7 +21,6 @@ class Samples extends \Magento\Catalog\Block\Product\AbstractProduct
      * Enter description here...
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function hasSamples()
     {
@@ -33,7 +31,6 @@ public function hasSamples()
      * Get downloadable product samples
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSamples()
     {
@@ -43,7 +40,6 @@ public function getSamples()
     /**
      * @param Sample $sample
      * @return string
-     * @since 2.0.0
      */
     public function getSampleUrl($sample)
     {
@@ -54,7 +50,6 @@ public function getSampleUrl($sample)
      * Return title of samples section
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSamplesTitle()
     {
@@ -69,7 +64,6 @@ public function getSamplesTitle()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsOpenInNewWindow()
     {
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php
index 94c7cc693e742..faa04744f78f2 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Type extends \Magento\Catalog\Block\Product\View\Type\Virtual
 {
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
index acb1272d06e11..f6b6b55ea0947 100644
--- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
 {
@@ -24,7 +23,6 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * Downloadable catalog product configuration
      *
      * @var \Magento\Downloadable\Helper\Catalog\Product\Configuration
-     * @since 2.0.0
      */
     protected $_downloadableProductConfiguration = null;
 
@@ -41,7 +39,6 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -75,7 +72,6 @@ public function __construct(
      * Retrieves item links options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -89,7 +85,6 @@ public function getLinks()
      * Return title of links section
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
@@ -100,7 +95,6 @@ public function getLinksTitle()
      * Get list of all options for product
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionList()
     {
@@ -111,7 +105,6 @@ public function getOptionList()
      * Get list of all options for product
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getOption($item)
     {
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Success.php b/app/code/Magento/Downloadable/Block/Checkout/Success.php
index f0e768d37820d..3b94632e57bca 100644
--- a/app/code/Magento/Downloadable/Block/Checkout/Success.php
+++ b/app/code/Magento/Downloadable/Block/Checkout/Success.php
@@ -15,13 +15,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Success extends \Magento\Checkout\Block\Onepage\Success
 {
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -32,7 +30,6 @@ class Success extends \Magento\Checkout\Block\Onepage\Success
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +53,6 @@ public function __construct(
      * Return true if order(s) has one or more downloadable products
      *
      * @return bool
-     * @since 2.0.0
      */
     private function orderHasDownloadableProducts()
     {
@@ -70,7 +66,6 @@ private function orderHasDownloadableProducts()
      * Prepares block data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareBlockData()
     {
@@ -87,7 +82,6 @@ protected function prepareBlockData()
      * Return url to list of ordered downloadable products of customer
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDownloadableProductsUrl()
     {
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index 61e7d824c409e..28cc817d964e9 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -14,25 +14,21 @@
  * Block to display downloadable links bought by customer
  *
  * @api
- * @since 2.0.0
  */
 class ListProducts extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\CollectionFactory
-     * @since 2.0.0
      */
     protected $_linksFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -42,7 +38,6 @@ class ListProducts extends \Magento\Framework\View\Element\Template
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\CollectionFactory $linksFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -94,7 +88,6 @@ protected function _construct()
      * Enter description here...
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -119,7 +112,6 @@ protected function _prepareLayout()
      *
      * @param integer $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getOrderViewUrl($orderId)
     {
@@ -130,7 +122,6 @@ public function getOrderViewUrl($orderId)
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -145,7 +136,6 @@ public function getBackUrl()
      *
      * @param Item $item
      * @return \Magento\Framework\Phrase|int
-     * @since 2.0.0
      */
     public function getRemainingDownloads($item)
     {
@@ -161,7 +151,6 @@ public function getRemainingDownloads($item)
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getDownloadUrl($item)
     {
@@ -173,7 +162,6 @@ public function getDownloadUrl($item)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsOpenInNewWindow()
     {
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index 9280fc44070a7..280dbd69fcb54 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -17,25 +17,21 @@
  * Downlaodable Sales Order Email items renderer
  *
  * @api
- * @since 2.0.0
  */
 class Downloadable extends \Magento\Sales\Block\Order\Email\Items\DefaultItems
 {
     /**
      * @var Purchased
-     * @since 2.0.0
      */
     protected $_purchased;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -51,7 +47,6 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\DefaultItems
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param \Magento\Framework\Url $frontendUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      * Enter description here...
      *
      * @return Purchased
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -89,7 +83,6 @@ public function getLinks()
 
     /**
      * @return null|string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
@@ -102,7 +95,6 @@ public function getLinksTitle()
     /**
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getPurchasedLinkUrl($item)
     {
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 1ed9da5dcfba8..4e3379af8e6f7 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -17,25 +17,21 @@
  * Downloadable Sales Order Email items renderer
  *
  * @api
- * @since 2.0.0
  */
 class Downloadable extends \Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder
 {
     /**
      * @var \Magento\Downloadable\Model\Link\Purchased
-     * @since 2.0.0
      */
     protected $_purchased;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -50,7 +46,6 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\Order\DefaultO
      * @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      * Enter description here...
      *
      * @return \Magento\Downloadable\Model\Link\Purchased
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -83,7 +77,6 @@ public function getLinks()
 
     /**
      * @return null|string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
@@ -96,7 +89,6 @@ public function getLinksTitle()
     /**
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getPurchasedLinkUrl($item)
     {
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index c560b3cdbdd98..d0995681367b5 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -16,25 +16,21 @@
  * Downloadable order item render block
  *
  * @api
- * @since 2.0.0
  */
 class Downloadable extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
 {
     /**
      * @var Purchased
-     * @since 2.0.0
      */
     protected $_purchasedLinks;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -45,7 +41,6 @@ class Downloadable extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRende
      * @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * @return Purchased
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -81,7 +75,6 @@ public function getLinks()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
index ace4e5524f420..4480005b8e683 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
@@ -9,7 +9,6 @@
  * Downloadable File upload controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class File extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
index 0e9dad9b2d1c9..4d7cfd1306f78 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\File\Upload
  *
- * @since 2.0.0
  */
 class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File
 {
     /**
      * @var \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected $_link;
 
     /**
      * @var \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected $_sample;
 
@@ -31,19 +28,16 @@ class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Fil
      * Downloadable file helper.
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $_fileHelper;
 
     /**
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     private $uploaderFactory;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     private $storageDatabase;
 
@@ -57,7 +51,6 @@ class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Fil
      * @param \Magento\Downloadable\Helper\File $fileHelper
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $storageDatabase
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -79,7 +72,6 @@ public function __construct(
      * Upload file controller action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AddAttributeToTemplate.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AddAttributeToTemplate.php
index e46f406bac7f8..db1054ad4b3f0 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AddAttributeToTemplate.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AddAttributeToTemplate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\AddAttributeToTemplate
  *
- * @since 2.0.0
  */
 class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product\AddAttributeToTemplate
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsPriceGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsPriceGrid.php
index 928d4b5cbc78a..f27f2023da5a0 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsPriceGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsPriceGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\AlertsPriceGrid
  *
- * @since 2.0.0
  */
 class AlertsPriceGrid extends \Magento\Catalog\Controller\Adminhtml\Product\AlertsPriceGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsStockGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsStockGrid.php
index 0624bcab49adf..1b74743df8229 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsStockGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/AlertsStockGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\AlertsStockGrid
  *
- * @since 2.0.0
  */
 class AlertsStockGrid extends \Magento\Catalog\Controller\Adminhtml\Product\AlertsStockGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Categories.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Categories.php
index e7a68c6f7050e..b50d94332ea7a 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Categories.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Categories.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Categories
  *
- * @since 2.0.0
  */
 class Categories extends \Magento\Catalog\Controller\Adminhtml\Product\Categories
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
index eb232ea36abf1..6e8e451bfd8f2 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Crosssell
  *
- * @since 2.0.0
  */
 class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
index 3e4eecd2d7b42..58d2dc625dffa 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\CrosssellGrid
  *
- * @since 2.0.0
  */
 class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CustomOptions.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CustomOptions.php
index a959a13606c4f..dbbc7845bc7b0 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CustomOptions.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CustomOptions.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\CustomOptions
  *
- * @since 2.0.0
  */
 class CustomOptions extends \Magento\Catalog\Controller\Adminhtml\Product\CustomOptions
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Duplicate.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Duplicate.php
index 4a4e138db6aff..3ef6bd8f9d55d 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Duplicate.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Duplicate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Duplicate
  *
- * @since 2.0.0
  */
 class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product\Duplicate
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Edit.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Edit.php
index 9ab368f9fd7ce..2bb9f595fc970 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Edit.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
index fb87e5bfa4d85..0ec2a678b34bf 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
      * Load downloadable tab fieldsets
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Grid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Grid.php
index 383314a7636a2..c264c06182c39 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Grid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Controller\Adminhtml\Product\Grid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/GridOnly.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/GridOnly.php
index f4fe960773072..119eafb43d1d1 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/GridOnly.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/GridOnly.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\GridOnly
  *
- * @since 2.0.0
  */
 class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product\GridOnly
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Index.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Index.php
index 67b64d5a70ebc..d185aa26b3fc0 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Index.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Index
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
index c35863042c99f..a3cd3deae343d 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Link
  *
- * @since 2.0.0
  */
 class Link extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
     /**
      * @return \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected function _createLink()
     {
@@ -26,7 +24,6 @@ protected function _createLink()
 
     /**
      * @return \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected function _getLink()
     {
@@ -39,7 +36,6 @@ protected function _getLink()
      * @param string $resource
      * @param string $resourceType
      * @return void
-     * @since 2.0.0
      */
     protected function _processDownload($resource, $resourceType)
     {
@@ -84,7 +80,6 @@ protected function _processDownload($resource, $resourceType)
      * Download link action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassDelete.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassDelete.php
index f49c0e0c097aa..d1240a98ce1e5 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassDelete.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassDelete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product\MassDelete
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassStatus.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassStatus.php
index 614dec38ed8d0..2e1adb080f112 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassStatus.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/MassStatus.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\MassStatus
  *
- * @since 2.0.0
  */
 class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product\MassStatus
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/NewAction.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/NewAction.php
index 37cff003835bb..506b4cba884ae 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/NewAction.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\NewAction
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Options.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Options.php
index 91d4495035cc5..fa413f727cfe5 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Options.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Options.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Options
  *
- * @since 2.0.0
  */
 class Options extends \Magento\Catalog\Controller\Adminhtml\Product\Options
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/OptionsImportGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/OptionsImportGrid.php
index 2bf86620a1465..ad11241f8b1e1 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/OptionsImportGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/OptionsImportGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\OptionsImportGrid
  *
- * @since 2.0.0
  */
 class OptionsImportGrid extends \Magento\Catalog\Controller\Adminhtml\Product\OptionsImportGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
index 499d3f1461c9b..5a4a0796acf41 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Related
  *
- * @since 2.0.0
  */
 class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
index 2f7abaf418b8e..634311737bdfb 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\RelatedGrid
  *
- * @since 2.0.0
  */
 class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
index 1764b911bb543..5e599fed51c46 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Sample
  *
- * @since 2.0.0
  */
 class Sample extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Link
 {
     /**
      * @return \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected function _createLink()
     {
@@ -26,7 +24,6 @@ protected function _createLink()
 
     /**
      * @return \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected function _getLink()
     {
@@ -37,7 +34,6 @@ protected function _getLink()
      * Download sample action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Save.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Save.php
index 436bf50c7bd5c..5fd4e09f64810 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Save.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Save
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/ShowUpdateResult.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/ShowUpdateResult.php
index 779bd54e8e067..9e4d9d8aa6608 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/ShowUpdateResult.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/ShowUpdateResult.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product\ShowUpdateResult
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/SuggestAttributes.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/SuggestAttributes.php
index 5ff3be6b79007..440a7ad631c80 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/SuggestAttributes.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/SuggestAttributes.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\SuggestAttributes
  *
- * @since 2.0.0
  */
 class SuggestAttributes extends \Magento\Catalog\Controller\Adminhtml\Product\SuggestAttributes
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
index 97a05803a7d43..5c98be38e0059 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Upsell
  *
- * @since 2.0.0
  */
 class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
index 02332fba47609..96fd43015d65a 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\UpsellGrid
  *
- * @since 2.0.0
  */
 class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Validate.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Validate.php
index 433cdd1d6c9a7..87157db959bf7 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Validate.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Validate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Validate
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Wysiwyg.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Wysiwyg.php
index 812b635f18ed5..8ee2bfca4b34c 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Wysiwyg.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Wysiwyg.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Wysiwyg
  *
- * @since 2.0.0
  */
 class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product\Wysiwyg
 {
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
index 1ea8c3fa199d2..e6cc426098073 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Downloadable\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Downloadable
  *
- * @since 2.0.0
  */
 class Downloadable
 {
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -56,7 +54,6 @@ class Downloadable
      * @param SampleBuilder $sampleBuilder
      * @param SampleInterfaceFactory $sampleFactory
      * @param LinkInterfaceFactory $linkFactory
-     * @since 2.0.0
      */
     public function __construct(
         RequestInterface $request,
@@ -81,7 +78,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function afterInitialize(
         \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $subject,
diff --git a/app/code/Magento/Downloadable/Controller/Customer/Products.php b/app/code/Magento/Downloadable/Controller/Customer/Products.php
index 81016de7b5bd5..ab634715c71c1 100644
--- a/app/code/Magento/Downloadable/Controller/Customer/Products.php
+++ b/app/code/Magento/Downloadable/Controller/Customer/Products.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Downloadable\Controller\Customer\Products
  *
- * @since 2.0.0
  */
 class Products extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Action\Context $context, \Magento\Customer\Model\Session $customerSession)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Framework\App\Action\Context $context, \Mag
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -56,7 +52,6 @@ public function dispatch(RequestInterface $request)
      * Display downloadable links bought by customer
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php
index 470dec2e6e7e8..b2cf89c1af980 100644
--- a/app/code/Magento/Downloadable/Controller/Download.php
+++ b/app/code/Magento/Downloadable/Controller/Download.php
@@ -11,7 +11,6 @@
  * Download controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Download extends \Magento\Framework\App\Action\Action
 {
@@ -21,7 +20,6 @@ abstract class Download extends \Magento\Framework\App\Action\Action
      * @param string $path         Path to resource
      * @param string $resourceType Type of resource (see Magento\Downloadable\Helper\Download::LINK_TYPE_* constants)
      * @return void
-     * @since 2.0.0
      */
     protected function _processDownload($path, $resourceType)
     {
@@ -66,7 +64,6 @@ protected function _processDownload($path, $resourceType)
      * Get link model
      *
      * @return \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected function _getLink()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index a9886c1e07f71..50d4e005148cb 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Download\Link
  *
- * @since 2.0.0
  */
 class Link extends \Magento\Downloadable\Controller\Download
 {
@@ -21,7 +20,6 @@ class Link extends \Magento\Downloadable\Controller\Download
      * Return customer session object
      *
      * @return \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected function _getCustomerSession()
     {
@@ -36,7 +34,6 @@ protected function _getCustomerSession()
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index 9f2e8f90632b5..2826381281fcb 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Download\LinkSample
  *
- * @since 2.0.0
  */
 class LinkSample extends \Magento\Downloadable\Controller\Download
 {
@@ -21,7 +20,6 @@ class LinkSample extends \Magento\Downloadable\Controller\Download
      *
      * @return ResponseInterface
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index 8716ab130a66c..aaa9eba697942 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Downloadable\Controller\Download\Sample
  *
- * @since 2.0.0
  */
 class Sample extends \Magento\Downloadable\Controller\Download
 {
@@ -21,7 +20,6 @@ class Sample extends \Magento\Downloadable\Controller\Download
      *
      * @return ResponseInterface
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 6b881389d96f0..6387bf5521e37 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -12,7 +12,6 @@
  * Helper for fetching properties by product configurational item
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Configuration extends \Magento\Framework\App\Helper\AbstractHelper implements
     \Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface
@@ -21,14 +20,12 @@ class Configuration extends \Magento\Framework\App\Helper\AbstractHelper impleme
      * Catalog product configuration
      *
      * @var \Magento\Catalog\Helper\Product\Configuration
-     * @since 2.0.0
      */
     protected $productConfig = null;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getLinks(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item)
     {
@@ -66,7 +62,6 @@ public function getLinks(\Magento\Catalog\Model\Product\Configuration\Item\ItemI
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle($product)
     {
@@ -82,7 +77,6 @@ public function getLinksTitle($product)
      *
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptions(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item)
     {
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index 19cac93ac0563..96aa5bdfeffd7 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -11,7 +11,6 @@
  * Downloadable helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -21,7 +20,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Downloadable\Model\Link|Item $link
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsShareable($link)
     {
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 2c64dc1ccac5b..910eaa42f0e84 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -15,7 +15,6 @@
 /**
  * Downloadable Products Download Helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Download extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -38,7 +37,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Type of link
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_linkType = self::LINK_TYPE_FILE;
 
@@ -46,7 +44,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Resource file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceFile = null;
 
@@ -54,7 +51,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Resource open handle
      *
      * @var \Magento\Framework\Filesystem\File\ReadInterface
-     * @since 2.0.0
      */
     protected $_handle = null;
 
@@ -62,7 +58,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Remote server headers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_urlHeaders = [];
 
@@ -70,7 +65,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * MIME Content-type for a file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_contentType = 'application/octet-stream';
 
@@ -78,7 +72,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * File name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_fileName = 'download';
 
@@ -86,7 +79,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb;
 
@@ -94,32 +86,27 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * Downloadable file
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $_downloadableFile;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     protected $fileReadFactory;
 
     /**
      * Working Directory (valid for LINK_TYPE_FILE only).
      * @var \Magento\Framework\Filesystem\Directory\Read
-     * @since 2.0.0
      */
     protected $_workingDirectory;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -130,7 +117,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      * @param Filesystem $filesystem
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param Filesystem\File\ReadFactory $fileReadFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -153,7 +139,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
      * @throws CoreException|\Exception
-     * @since 2.0.0
      */
     protected function _getHandle()
     {
@@ -189,7 +174,6 @@ protected function _getHandle()
      * Retrieve file size in bytes
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFileSize()
     {
@@ -200,7 +184,6 @@ public function getFileSize()
      * Return MIME type of a file.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -226,7 +209,6 @@ public function getContentType()
      * Return name of the file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilename()
     {
@@ -261,7 +243,6 @@ public function getFilename()
      * @param string $linkType
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setResource($resourceFile, $linkType = self::LINK_TYPE_FILE)
     {
@@ -284,7 +265,6 @@ public function setResource($resourceFile, $linkType = self::LINK_TYPE_FILE)
      * Output file contents
      *
      * @return void
-     * @since 2.0.0
      */
     public function output()
     {
@@ -301,7 +281,6 @@ public function output()
      * @param mixed $store
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getContentDisposition($store = null)
     {
diff --git a/app/code/Magento/Downloadable/Helper/File.php b/app/code/Magento/Downloadable/Helper/File.php
index 7c5c4b9606a14..27f236dda035f 100644
--- a/app/code/Magento/Downloadable/Helper/File.php
+++ b/app/code/Magento/Downloadable/Helper/File.php
@@ -11,7 +11,6 @@
  * Downloadable Products File Helper
  *
  * @api
- * @since 2.0.0
  */
 class File extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -19,7 +18,6 @@ class File extends \Magento\Framework\App\Helper\AbstractHelper
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDatabase = null;
 
@@ -27,7 +25,6 @@ class File extends \Magento\Framework\App\Helper\AbstractHelper
      * Filesystem object.
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -35,7 +32,6 @@ class File extends \Magento\Framework\App\Helper\AbstractHelper
      * Media Directory object (writable).
      *
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
@@ -44,7 +40,6 @@ class File extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase
      * @param \Magento\Framework\Filesystem $filesystem
      * @param array $mimeTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -68,7 +63,6 @@ public function __construct(
      * @param string $tmpPath
      * @param \Magento\MediaStorage\Model\File\Uploader $uploader
      * @return array
-     * @since 2.0.0
      */
     public function uploadFromTmp($tmpPath, \Magento\MediaStorage\Model\File\Uploader $uploader)
     {
@@ -87,7 +81,6 @@ public function uploadFromTmp($tmpPath, \Magento\MediaStorage\Model\File\Uploade
      * @param string $file
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function moveFileFromTmp($baseTmpPath, $basePath, $file)
     {
@@ -111,7 +104,6 @@ public function moveFileFromTmp($baseTmpPath, $basePath, $file)
      * Check if file exist in filesystem and try to re-create it from database record if negative.
      * @param string $file
      * @return bool|int
-     * @since 2.0.0
      */
     public function ensureFileInFilesystem($file)
     {
@@ -130,7 +122,6 @@ public function ensureFileInFilesystem($file)
      * @param string $basePath
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     protected function _moveFileFromTmp($baseTmpPath, $basePath, $file)
     {
@@ -163,7 +154,6 @@ protected function _moveFileFromTmp($baseTmpPath, $basePath, $file)
      * @param string $path
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getFilePath($path, $file)
     {
@@ -178,7 +168,6 @@ public function getFilePath($path, $file)
      *
      * @param string $pathFile
      * @return string
-     * @since 2.0.0
      */
     public function getFileFromPathFile($pathFile)
     {
@@ -191,7 +180,6 @@ public function getFileFromPathFile($pathFile)
      * Get filesize in bytes.
      * @param string $file
      * @return int
-     * @since 2.0.0
      */
     public function getFileSize($file)
     {
@@ -201,7 +189,6 @@ public function getFileSize($file)
     /**
      * @param string $filePath
      * @return string
-     * @since 2.0.0
      */
     public function getFileType($filePath)
     {
@@ -212,7 +199,6 @@ public function getFileType($filePath)
     /**
      * @param string $ext
      * @return string
-     * @since 2.0.0
      */
     protected function _getFileTypeByExt($ext)
     {
@@ -225,7 +211,6 @@ protected function _getFileTypeByExt($ext)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllFileTypes()
     {
@@ -234,7 +219,6 @@ public function getAllFileTypes()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllMineTypes()
     {
@@ -243,7 +227,6 @@ public function getAllMineTypes()
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_mimeTypes = [
         'x123' => 'application/vnd.lotus-1-2-3',
diff --git a/app/code/Magento/Downloadable/Model/ComponentInterface.php b/app/code/Magento/Downloadable/Model/ComponentInterface.php
index f6ec36255ba4f..6d28d01455fdc 100644
--- a/app/code/Magento/Downloadable/Model/ComponentInterface.php
+++ b/app/code/Magento/Downloadable/Model/ComponentInterface.php
@@ -9,7 +9,6 @@
  * Downloadable component interface
  *
  * @api
- * @since 2.0.0
  */
 interface ComponentInterface
 {
@@ -17,7 +16,6 @@ interface ComponentInterface
      * Retrieve Base files path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBasePath();
 
@@ -25,7 +23,6 @@ public function getBasePath();
      * Retrieve base temporary path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseTmpPath();
 
@@ -35,7 +32,6 @@ public function getBaseTmpPath();
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId);
 }
diff --git a/app/code/Magento/Downloadable/Model/DownloadableOption.php b/app/code/Magento/Downloadable/Model/DownloadableOption.php
index 38f315f363057..5bff3159a27cd 100644
--- a/app/code/Magento/Downloadable/Model/DownloadableOption.php
+++ b/app/code/Magento/Downloadable/Model/DownloadableOption.php
@@ -11,7 +11,6 @@
 /**
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class DownloadableOption extends AbstractExtensibleModel implements DownloadableOptionInterface
 {
@@ -19,7 +18,6 @@ class DownloadableOption extends AbstractExtensibleModel implements Downloadable
      * Returns the list of downloadable links
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getDownloadableLinks()
     {
@@ -31,7 +29,6 @@ public function getDownloadableLinks()
      *
      * @param int[] $downloadableLinks
      * @return $this
-     * @since 2.0.0
      */
     public function setDownloadableLinks($downloadableLinks)
     {
@@ -42,7 +39,6 @@ public function setDownloadableLinks($downloadableLinks)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Downloadable\Api\Data\DownloadableOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -54,7 +50,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Downloadable\Api\Data\DownloadableOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Downloadable\Api\Data\DownloadableOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Downloadable/Model/File/Content.php b/app/code/Magento/Downloadable/Model/File/Content.php
index 2a4133c30fecd..59765c95925aa 100644
--- a/app/code/Magento/Downloadable/Model/File/Content.php
+++ b/app/code/Magento/Downloadable/Model/File/Content.php
@@ -9,7 +9,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Content extends \Magento\Framework\Model\AbstractExtensibleModel implements ContentInterface
 {
@@ -19,7 +18,6 @@ class Content extends \Magento\Framework\Model\AbstractExtensibleModel implement
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFileData()
     {
@@ -29,7 +27,6 @@ public function getFileData()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -42,7 +39,6 @@ public function getName()
      * @param string $fileData
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setFileData($fileData)
     {
@@ -55,7 +51,6 @@ public function setFileData($fileData)
      * @param string $name
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -66,7 +61,6 @@ public function setName($name)
      * {@inheritdoc}
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -78,7 +72,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Downloadable\Api\Data\File\ContentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Downloadable/Model/File/ContentUploader.php b/app/code/Magento/Downloadable/Model/File/ContentUploader.php
index b18516bf89f34..a825a04525a0f 100644
--- a/app/code/Magento/Downloadable/Model/File/ContentUploader.php
+++ b/app/code/Magento/Downloadable/Model/File/ContentUploader.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Downloadable\Model\File\ContentUploader
  *
- * @since 2.0.0
  */
 class ContentUploader extends Uploader implements \Magento\Downloadable\Api\Data\File\ContentUploaderInterface
 {
@@ -31,31 +30,26 @@ class ContentUploader extends Uploader implements \Magento\Downloadable\Api\Data
      * Filename prefix for temporary files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $filePrefix = 'magento_api';
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $systemTmpDirectory;
 
     /**
      * @var LinkConfig
-     * @since 2.0.0
      */
     protected $linkConfig;
 
     /**
      * @var SampleConfig
-     * @since 2.0.0
      */
     protected $sampleConfig;
 
@@ -66,7 +60,6 @@ class ContentUploader extends Uploader implements \Magento\Downloadable\Api\Data
      * @param Filesystem $filesystem
      * @param LinkConfig $linkConfig
      * @param SampleConfig $sampleConfig
-     * @since 2.0.0
      */
     public function __construct(
         Database $coreFileStorageDb,
@@ -90,7 +83,6 @@ public function __construct(
      *
      * @param ContentInterface $fileContent
      * @return array
-     * @since 2.0.0
      */
     protected function decodeContent(ContentInterface $fileContent)
     {
@@ -110,7 +102,6 @@ protected function decodeContent(ContentInterface $fileContent)
      * Generate temporary file name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getTmpFileName()
     {
@@ -119,7 +110,6 @@ protected function getTmpFileName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upload(ContentInterface $fileContent, $contentType)
     {
@@ -143,7 +133,6 @@ public function upload(ContentInterface $fileContent, $contentType)
      * @param string $contentType
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getDestinationDirectory($contentType)
     {
diff --git a/app/code/Magento/Downloadable/Model/File/ContentValidator.php b/app/code/Magento/Downloadable/Model/File/ContentValidator.php
index b0a9f4b54d923..2dcd1ef80cc35 100644
--- a/app/code/Magento/Downloadable/Model/File/ContentValidator.php
+++ b/app/code/Magento/Downloadable/Model/File/ContentValidator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Downloadable\Model\File\ContentValidator
  *
- * @since 2.0.0
  */
 class ContentValidator
 {
@@ -21,7 +20,6 @@ class ContentValidator
      * @param ContentInterface $fileContent
      * @throws InputException
      * @return bool
-     * @since 2.0.0
      */
     public function isValid(ContentInterface $fileContent)
     {
@@ -41,7 +39,6 @@ public function isValid(ContentInterface $fileContent)
      *
      * @param string $fileName
      * @return bool
-     * @since 2.0.0
      */
     protected function isFileNameValid($fileName)
     {
diff --git a/app/code/Magento/Downloadable/Model/Link.php b/app/code/Magento/Downloadable/Model/Link.php
index 96accd0af21cf..f61c1e771c284 100644
--- a/app/code/Magento/Downloadable/Model/Link.php
+++ b/app/code/Magento/Downloadable/Model/Link.php
@@ -17,7 +17,6 @@
  * @method Link setProductId(int $value)
  *
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements ComponentInterface, LinkInterface
 {
@@ -61,7 +60,6 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements C
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -87,7 +85,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -97,7 +94,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -109,7 +105,6 @@ public function afterSave()
      * Retrieve base temporary path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseTmpPath()
     {
@@ -120,7 +115,6 @@ public function getBaseTmpPath()
      * Retrieve Base files path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBasePath()
     {
@@ -131,7 +125,6 @@ public function getBasePath()
      * Retrieve base sample temporary path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseSampleTmpPath()
     {
@@ -142,7 +135,6 @@ public function getBaseSampleTmpPath()
      * Retrieve base sample path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseSamplePath()
     {
@@ -155,7 +147,6 @@ public function getBaseSamplePath()
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -165,7 +156,6 @@ public function getSearchableData($productId, $storeId)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -175,7 +165,6 @@ public function getTitle()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -185,7 +174,6 @@ public function getPrice()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsShareable()
     {
@@ -195,7 +183,6 @@ public function getIsShareable()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -205,7 +192,6 @@ public function getSortOrder()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getNumberOfDownloads()
     {
@@ -215,7 +201,6 @@ public function getNumberOfDownloads()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getLinkType()
     {
@@ -225,7 +210,6 @@ public function getLinkType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getLinkFile()
     {
@@ -236,7 +220,6 @@ public function getLinkFile()
      * Return file content
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentInterface|null
-     * @since 2.0.0
      */
     public function getLinkFileContent()
     {
@@ -246,7 +229,6 @@ public function getLinkFileContent()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getLinkUrl()
     {
@@ -256,7 +238,6 @@ public function getLinkUrl()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleType()
     {
@@ -266,7 +247,6 @@ public function getSampleType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleFile()
     {
@@ -277,7 +257,6 @@ public function getSampleFile()
      * Return sample file content when type is 'file'
      *
      * @return \Magento\Downloadable\Api\Data\File\ContentInterface|null relative file path
-     * @since 2.0.0
      */
     public function getSampleFileContent()
     {
@@ -287,7 +266,6 @@ public function getSampleFileContent()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleUrl()
     {
@@ -299,7 +277,6 @@ public function getSampleUrl()
     /**
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -309,7 +286,6 @@ public function setTitle($title)
     /**
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -319,7 +295,6 @@ public function setSortOrder($sortOrder)
     /**
      * @param int $isShareable
      * @return $this
-     * @since 2.0.0
      */
     public function setIsShareable($isShareable)
     {
@@ -331,7 +306,6 @@ public function setIsShareable($isShareable)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -344,7 +318,6 @@ public function setPrice($price)
      *
      * @param int $numberOfDownloads
      * @return $this
-     * @since 2.0.0
      */
     public function setNumberOfDownloads($numberOfDownloads)
     {
@@ -354,7 +327,6 @@ public function setNumberOfDownloads($numberOfDownloads)
     /**
      * @param string $linkType
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkType($linkType)
     {
@@ -366,7 +338,6 @@ public function setLinkType($linkType)
      *
      * @param string $linkFile
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkFile($linkFile)
     {
@@ -378,7 +349,6 @@ public function setLinkFile($linkFile)
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $linkFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkFileContent(\Magento\Downloadable\Api\Data\File\ContentInterface $linkFileContent = null)
     {
@@ -390,7 +360,6 @@ public function setLinkFileContent(\Magento\Downloadable\Api\Data\File\ContentIn
      *
      * @param string $linkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setLinkUrl($linkUrl)
     {
@@ -400,7 +369,6 @@ public function setLinkUrl($linkUrl)
     /**
      * @param string $sampleType
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleType($sampleType)
     {
@@ -412,7 +380,6 @@ public function setSampleType($sampleType)
      *
      * @param string $sampleFile
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFile($sampleFile)
     {
@@ -424,7 +391,6 @@ public function setSampleFile($sampleFile)
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFileContent(
         \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent = null
@@ -437,7 +403,6 @@ public function setSampleFileContent(
      *
      * @param string $sampleUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleUrl($sampleUrl)
     {
@@ -448,7 +413,6 @@ public function setSampleUrl($sampleUrl)
      * {@inheritdoc}
      *
      * @return \Magento\Downloadable\Api\Data\LinkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -460,7 +424,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Downloadable\Api\Data\LinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Downloadable\Api\Data\LinkExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Downloadable/Model/Link/ContentValidator.php b/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
index bdc32b6af4c8a..409b10aba8433 100644
--- a/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
+++ b/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Downloadable\Model\Link\ContentValidator
  *
- * @since 2.0.0
  */
 class ContentValidator
 {
     /**
      * @var FileContentValidator
-     * @since 2.0.0
      */
     protected $fileContentValidator;
 
     /**
      * @var UrlValidator
-     * @since 2.0.0
      */
     protected $urlValidator;
 
     /**
      * @param FileContentValidator $fileContentValidator
      * @param UrlValidator $urlValidator
-     * @since 2.0.0
      */
     public function __construct(
         FileContentValidator $fileContentValidator,
@@ -50,7 +46,6 @@ public function __construct(
      * @param bool $validateSampleContent
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     public function isValid(LinkInterface $link, $validateLinkContent = true, $validateSampleContent = true)
     {
@@ -81,7 +76,6 @@ public function isValid(LinkInterface $link, $validateLinkContent = true, $valid
      * @param LinkInterface $link
      * @throws InputException
      * @return void
-     * @since 2.0.0
      */
     protected function validateLinkResource(LinkInterface $link)
     {
@@ -104,7 +98,6 @@ protected function validateLinkResource(LinkInterface $link)
      * @param LinkInterface $link
      * @throws InputException
      * @return void
-     * @since 2.0.0
      */
     protected function validateSampleResource(LinkInterface $link)
     {
diff --git a/app/code/Magento/Downloadable/Model/Link/Purchased.php b/app/code/Magento/Downloadable/Model/Link/Purchased.php
index ddafc36be01f7..7710cdc0f378c 100644
--- a/app/code/Magento/Downloadable/Model/Link/Purchased.php
+++ b/app/code/Magento/Downloadable/Model/Link/Purchased.php
@@ -31,7 +31,6 @@
  * @method \Magento\Downloadable\Model\Link\Purchased setLinkSectionTitle(string $value)
  *
  * @api
- * @since 2.0.0
  */
 class Purchased extends \Magento\Framework\Model\AbstractModel
 {
@@ -39,7 +38,6 @@ class Purchased extends \Magento\Framework\Model\AbstractModel
      * Enter description here...
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -51,7 +49,6 @@ protected function _construct()
      * Check order id
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php b/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
index e120ac395eae9..0c667df4b72d3 100644
--- a/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
+++ b/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
@@ -44,7 +44,6 @@
  * @method Item setUpdatedAt($value)
  *
  * @api
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\AbstractModel
 {
@@ -64,7 +63,6 @@ class Item extends \Magento\Framework\Model\AbstractModel
      * Enter description here...
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +75,6 @@ protected function _construct()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index a23db9fe6c989..e3eb36155f2ca 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -20,31 +20,26 @@
 /**
  * Class LinkRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class LinkRepository implements \Magento\Downloadable\Api\LinkRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Downloadable\Api\Data\LinkInterfaceFactory
-     * @since 2.0.0
      */
     protected $linkDataObjectFactory;
 
     /**
      * @var \Magento\Downloadable\Model\LinkFactory
-     * @since 2.0.0
      */
     protected $linkFactory;
 
     /**
      * @var \Magento\Downloadable\Model\Link\ContentValidator
-     * @since 2.0.0
      */
     protected $contentValidator;
 
@@ -56,13 +51,11 @@ class LinkRepository implements \Magento\Downloadable\Api\LinkRepositoryInterfac
 
     /**
      * @var ContentUploaderInterface
-     * @since 2.0.0
      */
     protected $fileContentUploader;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -86,7 +79,6 @@ class LinkRepository implements \Magento\Downloadable\Api\LinkRepositoryInterfac
      * @param Link\ContentValidator $contentValidator
      * @param EncoderInterface $jsonEncoder
      * @param ContentUploaderInterface $fileContentUploader
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -108,7 +100,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
@@ -120,7 +111,6 @@ public function getList($sku)
     /**
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return array
-     * @since 2.0.0
      */
     public function getLinksByProduct(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
@@ -138,7 +128,6 @@ public function getLinksByProduct(\Magento\Catalog\Api\Data\ProductInterface $pr
      *
      * @param \Magento\Downloadable\Model\Link $resourceData
      * @return \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected function buildLink($resourceData)
     {
@@ -161,7 +150,6 @@ protected function buildLink($resourceData)
      * @param \Magento\Downloadable\Model\Link $resourceData
      * @param \Magento\Downloadable\Api\Data\LinkInterface $dataObject
      * @return null
-     * @since 2.0.0
      */
     protected function setBasicFields($resourceData, $dataObject)
     {
@@ -183,7 +171,6 @@ protected function setBasicFields($resourceData, $dataObject)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save($sku, LinkInterface $link, $isGlobalScopeContent = true)
     {
@@ -216,7 +203,6 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = true)
      * @param LinkInterface $link
      * @param bool $isGlobalScopeContent
      * @return int
-     * @since 2.0.0
      */
     protected function saveLink(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -291,7 +277,6 @@ protected function saveLink(
      * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function updateLink(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -337,7 +322,6 @@ protected function updateLink(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($id)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
index 967643bf44edd..42ecb8e7d8e13 100644
--- a/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Downloadable\Model\Product\CartConfiguration\Plugin\Downloadable
  *
- * @since 2.0.0
  */
 class Downloadable
 {
@@ -24,7 +23,6 @@ class Downloadable
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsProductConfigured(
         \Magento\Catalog\Model\Product\CartConfiguration $subject,
diff --git a/app/code/Magento/Downloadable/Model/Product/CopyConstructor/Downloadable.php b/app/code/Magento/Downloadable/Model/Product/CopyConstructor/Downloadable.php
index 62d167de02807..3faeb3a302908 100644
--- a/app/code/Magento/Downloadable/Model/Product/CopyConstructor/Downloadable.php
+++ b/app/code/Magento/Downloadable/Model/Product/CopyConstructor/Downloadable.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Downloadable\Model\Product\CopyConstructor\Downloadable
  *
- * @since 2.0.0
  */
 class Downloadable implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Json\Helper\Data $jsonHelper)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Json\Helper\Data $jsonHelper)
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/Price.php b/app/code/Magento/Downloadable/Model/Product/Price.php
index d55fffe20b9f3..85ceff2e6e3a4 100644
--- a/app/code/Magento/Downloadable/Model/Product/Price.php
+++ b/app/code/Magento/Downloadable/Model/Product/Price.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Downloadable\Model\Product\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
@@ -24,7 +23,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param integer $qty
      * @param \Magento\Catalog\Model\Product $product
      * @return float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty, $product)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 7777b5019aac9..748c15537b0f6 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Type extends \Magento\Catalog\Model\Product\Type\Virtual
 {
@@ -23,55 +22,46 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
      * Downloadable file
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $_downloadableFile = null;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\SampleFactory
-     * @since 2.0.0
      */
     protected $_sampleResFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link
-     * @since 2.0.0
      */
     protected $_linkResource;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory
-     * @since 2.0.0
      */
     protected $_linksFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Sample\CollectionFactory
-     * @since 2.0.0
      */
     protected $_samplesFactory;
 
     /**
      * @var \Magento\Downloadable\Model\SampleFactory
-     * @since 2.0.0
      */
     protected $_sampleFactory;
 
     /**
      * @var \Magento\Downloadable\Model\LinkFactory
-     * @since 2.0.0
      */
     protected $_linkFactory;
 
     /**
      * @var TypeHandler\TypeHandlerInterface
-     * @since 2.0.0
      */
     private $typeHandler;
 
     /**
      * @var JoinProcessorInterface
-     * @since 2.0.0
      */
     private $extensionAttributesJoinProcessor;
 
@@ -97,7 +87,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -146,7 +135,6 @@ public function __construct(
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Downloadable\Model\Link[]
-     * @since 2.0.0
      */
     public function getLinks($product)
     {
@@ -176,7 +164,6 @@ public function getLinks($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return boolean
-     * @since 2.0.0
      */
     public function hasLinks($product)
     {
@@ -192,7 +179,6 @@ public function hasLinks($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return boolean
-     * @since 2.0.0
      */
     public function hasOptions($product)
     {
@@ -204,7 +190,6 @@ public function hasOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function hasRequiredOptions($product)
     {
@@ -217,7 +202,6 @@ public function hasRequiredOptions($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLinkSelectionRequired($product)
     {
@@ -229,7 +213,6 @@ public function getLinkSelectionRequired($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Downloadable\Model\ResourceModel\Sample\Collection
-     * @since 2.0.0
      */
     public function getSamples($product)
     {
@@ -251,7 +234,6 @@ public function getSamples($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return boolean
-     * @since 2.0.0
      */
     public function hasSamples($product)
     {
@@ -264,7 +246,6 @@ public function hasSamples($product)
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function checkProductBuyState($product)
     {
@@ -296,7 +277,6 @@ public function checkProductBuyState($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions($product)
     {
@@ -324,7 +304,6 @@ public function getOrderOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($product)
     {
@@ -348,7 +327,6 @@ public function getSearchableData($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isSalable($product)
     {
@@ -362,7 +340,6 @@ public function isSalable($product)
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processBuyRequest($product, $buyRequest)
     {
@@ -379,7 +356,6 @@ public function processBuyRequest($product, $buyRequest)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function canConfigure($product)
     {
@@ -390,7 +366,6 @@ public function canConfigure($product)
      * Check that product of this type has weight
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasWeight()
     {
@@ -402,7 +377,6 @@ public function hasWeight()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
@@ -439,7 +413,6 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -483,7 +456,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
     /**
      * @return \Magento\Downloadable\Model\Link
-     * @since 2.0.0
      */
     protected function _createLink()
     {
@@ -492,7 +464,6 @@ protected function _createLink()
 
     /**
      * @return \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected function _createSample()
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
index 261033b04734e..6a0f31c547f39 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
@@ -15,7 +15,6 @@
 
 /**
  * Class AbstractTypeHandler
- * @since 2.0.0
  */
 abstract class AbstractTypeHandler
 {
@@ -25,19 +24,16 @@ abstract class AbstractTypeHandler
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $deletedItems = [];
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var File
-     * @since 2.0.0
      */
     protected $downloadableFile;
 
@@ -50,7 +46,6 @@ abstract class AbstractTypeHandler
     /**
      * @param Data $jsonHelper
      * @param File $downloadableFile
-     * @since 2.0.0
      */
     public function __construct(
         Data $jsonHelper,
@@ -62,13 +57,11 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     abstract public function getDataKey();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     abstract public function getIdentifierKey();
 
@@ -76,7 +69,6 @@ abstract public function getIdentifierKey();
      * @param Product $product
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function save(Product $product, array $data)
     {
@@ -96,7 +88,6 @@ public function save(Product $product, array $data)
 
     /**
      * @return ComponentInterface
-     * @since 2.0.0
      */
     abstract protected function createItem();
 
@@ -105,7 +96,6 @@ abstract protected function createItem();
      * @param array $data
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     abstract protected function setDataToModel(
         ComponentInterface $model,
@@ -117,14 +107,12 @@ abstract protected function setDataToModel(
      * @param ComponentInterface $model
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     abstract protected function linkToProduct(ComponentInterface $model, Product $product);
 
     /**
      * @param array $item
      * @return array
-     * @since 2.0.0
      */
     protected function prepareItem(array $item)
     {
@@ -137,14 +125,12 @@ protected function prepareItem(array $item)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     abstract protected function processDelete();
 
     /**
      * @param array $item
      * @return bool
-     * @since 2.0.0
      */
     protected function isDelete(array $item)
     {
@@ -154,7 +140,6 @@ protected function isDelete(array $item)
     /**
      * @param array $item
      * @return array
-     * @since 2.0.0
      */
     protected function getFiles(array $item)
     {
@@ -169,7 +154,6 @@ protected function getFiles(array $item)
      * @param ComponentInterface $model
      * @param array $files
      * @return void
-     * @since 2.0.0
      */
     abstract protected function setFiles(ComponentInterface $model, array $files);
 
@@ -177,7 +161,6 @@ abstract protected function setFiles(ComponentInterface $model, array $files);
      * @param Product $product
      * @param array $item
      * @return array
-     * @since 2.0.0
      */
     protected function saveItem(Product $product, array $item)
     {
@@ -195,7 +178,6 @@ protected function saveItem(Product $product, array $item)
     /**
      * @param array $item
      * @return void
-     * @since 2.0.0
      */
     protected function addToDeleteQueue(array $item)
     {
@@ -208,7 +190,6 @@ protected function addToDeleteQueue(array $item)
      * Clear type state
      *
      * @return void
-     * @since 2.0.0
      */
     protected function clear()
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/Link.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/Link.php
index 721fa9e45f614..58cf909c9e98d 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/Link.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/Link.php
@@ -12,25 +12,21 @@
 /**
  * Class Link
  * @api
- * @since 2.0.0
  */
 class Link extends AbstractTypeHandler
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $sampleItem = [];
 
     /**
      * @var \Magento\Downloadable\Model\ComponentInterfaceFactory
-     * @since 2.0.0
      */
     private $linkFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link
-     * @since 2.0.0
      */
     private $linkResource;
 
@@ -39,7 +35,6 @@ class Link extends AbstractTypeHandler
      * @param \Magento\Downloadable\Helper\File $downloadableFile
      * @param \Magento\Downloadable\Model\LinkFactory $linkFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link $linkResource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataKey()
     {
@@ -63,7 +57,6 @@ public function getDataKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIdentifierKey()
     {
@@ -72,7 +65,6 @@ public function getIdentifierKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(Product $product, array $data)
     {
@@ -84,7 +76,6 @@ public function save(Product $product, array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function clear()
     {
@@ -94,7 +85,6 @@ protected function clear()
 
     /**
      * @return ComponentInterface
-     * @since 2.0.0
      */
     protected function createItem()
     {
@@ -106,7 +96,6 @@ protected function createItem()
      * @param array $data
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function setDataToModel(ComponentInterface $model, array $data, Product $product)
     {
@@ -137,7 +126,6 @@ protected function setDataToModel(ComponentInterface $model, array $data, Produc
      * @param ComponentInterface $model
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function linkToProduct(ComponentInterface $model, Product $product)
     {
@@ -146,7 +134,6 @@ protected function linkToProduct(ComponentInterface $model, Product $product)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function processDelete()
     {
@@ -157,7 +144,6 @@ protected function processDelete()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function saveItem(Product $product, array $item)
     {
@@ -172,7 +158,6 @@ protected function saveItem(Product $product, array $item)
      * @param ComponentInterface $model
      * @param array $files
      * @return void
-     * @since 2.0.0
      */
     protected function setFiles(ComponentInterface $model, array $files)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/Sample.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/Sample.php
index a79d3fd281cdb..d316da149ee62 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/Sample.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/Sample.php
@@ -12,7 +12,6 @@
 /**
  * Class Sample
  * @api
- * @since 2.0.0
  */
 class Sample extends AbstractTypeHandler
 {
@@ -21,13 +20,11 @@ class Sample extends AbstractTypeHandler
 
     /**
      * @var \Magento\Downloadable\Model\SampleFactory
-     * @since 2.0.0
      */
     private $sampleFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\SampleFactory
-     * @since 2.0.0
      */
     private $sampleResourceFactory;
 
@@ -36,7 +33,6 @@ class Sample extends AbstractTypeHandler
      * @param \Magento\Downloadable\Helper\File $downloadableFile
      * @param \Magento\Downloadable\Model\SampleFactory $sampleFactory
      * @param \Magento\Downloadable\Model\ResourceModel\SampleFactory $sampleResourceFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -51,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataKey()
     {
@@ -60,7 +55,6 @@ public function getDataKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIdentifierKey()
     {
@@ -69,7 +63,6 @@ public function getIdentifierKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function processDelete()
     {
@@ -80,7 +73,6 @@ protected function processDelete()
 
     /**
      * @return ComponentInterface
-     * @since 2.0.0
      */
     protected function createItem()
     {
@@ -92,7 +84,6 @@ protected function createItem()
      * @param array $data
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function setDataToModel(ComponentInterface $model, array $data, Product $product)
     {
@@ -115,7 +106,6 @@ protected function setDataToModel(ComponentInterface $model, array $data, Produc
      * @param array $files
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function setFiles(ComponentInterface $model, array $files)
     {
@@ -134,7 +124,6 @@ protected function setFiles(ComponentInterface $model, array $files)
      * @param ComponentInterface $model
      * @param Product $product
      * @return void
-     * @since 2.0.0
      */
     protected function linkToProduct(ComponentInterface $model, Product $product)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandler.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandler.php
index 3ac7c9e10aaf7..9ebb85b12c681 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandler.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandler.php
@@ -9,20 +9,17 @@
 
 /**
  * Class TypeHandler
- * @since 2.0.0
  */
 class TypeHandler implements TypeHandlerInterface
 {
 
     /**
      * @var \Magento\Downloadable\Model\Product\TypeHandler\TypeHandlerInterface[]
-     * @since 2.0.0
      */
     private $handlers;
 
     /**
      * @param \Magento\Downloadable\Model\Product\TypeHandler\TypeHandlerInterface[] $handlers
-     * @since 2.0.0
      */
     public function __construct(array $handlers)
     {
@@ -31,7 +28,6 @@ public function __construct(array $handlers)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(Product $product, array $data)
     {
@@ -42,7 +38,6 @@ public function save(Product $product, array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isCanHandle(array $data)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandlerInterface.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandlerInterface.php
index 71d1753824d30..8f15269419d16 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandlerInterface.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/TypeHandlerInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface TypeHandlerInterface
  * @api
- * @since 2.0.0
  */
 interface TypeHandlerInterface
 {
@@ -18,14 +17,12 @@ interface TypeHandlerInterface
      * @param Product $product
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function save(Product $product, array $data);
 
     /**
      * @param array $data
      * @return bool
-     * @since 2.0.0
      */
     public function isCanHandle(array $data);
 }
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
index 4b23ecfc1e3c0..2838e8a34daa2 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
@@ -11,7 +11,6 @@
 
 /**
  * Plugin for product type transition manager
- * @since 2.0.0
  */
 class Downloadable
 {
@@ -19,20 +18,17 @@ class Downloadable
      * Request instance
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Catalog\Model\Product\Edit\WeightResolver
-     * @since 2.0.0
      */
     protected $weightResolver;
 
     /**
      * @param RequestInterface $request
      * @param WeightResolver $weightResolver
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request, WeightResolver $weightResolver)
     {
@@ -48,7 +44,6 @@ public function __construct(RequestInterface $request, WeightResolver $weightRes
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundProcessProduct(
         \Magento\Catalog\Model\Product\TypeTransitionManager $subject,
diff --git a/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php b/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
index f716aa2158294..47fbf424ab54f 100644
--- a/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
@@ -15,25 +15,21 @@
 /**
  * Class \Magento\Downloadable\Model\ProductOptionProcessor
  *
- * @since 2.0.0
  */
 class ProductOptionProcessor implements ProductOptionProcessorInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var DownloadableOptionFactory
-     * @since 2.0.0
      */
     protected $downloadableOptionFactory;
 
@@ -41,7 +37,6 @@ class ProductOptionProcessor implements ProductOptionProcessorInterface
      * @param DataObjectFactory $objectFactory
      * @param DataObjectHelper $dataObjectHelper
      * @param DownloadableOptionFactory $downloadableOptionFactory
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -55,7 +50,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(ProductOptionInterface $productOption)
     {
@@ -75,7 +69,6 @@ public function convertToBuyRequest(ProductOptionInterface $productOption)
      *
      * @param ProductOptionInterface $productOption
      * @return array
-     * @since 2.0.0
      */
     protected function getDownloadableLinks(ProductOptionInterface $productOption)
     {
@@ -92,7 +85,6 @@ protected function getDownloadableLinks(ProductOptionInterface $productOption)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToProductOption(DataObject $request)
     {
diff --git a/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
index d916075ccce34..37011cc7f33ac 100644
--- a/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
@@ -12,37 +12,31 @@
 /**
  * Class \Magento\Downloadable\Model\Quote\Item\CartItemProcessor
  *
- * @since 2.0.0
  */
 class CartItemProcessor implements CartItemProcessorInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     private $objectFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
     /**
      * @var \Magento\Downloadable\Model\DownloadableOptionFactory
-     * @since 2.0.0
      */
     private $downloadableOptionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\ProductOptionFactory
-     * @since 2.0.0
      */
     private $productOptionFactory;
 
     /**
      * @var \Magento\Quote\Api\Data\ProductOptionExtensionFactory
-     * @since 2.0.0
      */
     private $extensionFactory;
 
@@ -52,7 +46,6 @@ class CartItemProcessor implements CartItemProcessorInterface
      * @param \Magento\Downloadable\Model\DownloadableOptionFactory $downloadableOptionFactory
      * @param \Magento\Quote\Model\Quote\ProductOptionFactory $productOptionFactory
      * @param \Magento\Quote\Api\Data\ProductOptionExtensionFactory $extensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -70,7 +63,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -93,7 +85,6 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
      *
      * @param CartItemInterface $cartItem
      * @return CartItemInterface
-     * @since 2.0.0
      */
     public function processOptions(CartItemInterface $cartItem)
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
index 7c63323f3cfaa..dd83c28b43dff 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
@@ -11,14 +11,12 @@
  * Downloadable products Price indexer resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
 {
     /**
      * @param null|int|array $entityIds
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
-     * @since 2.0.0
      */
     protected function reindex($entityIds = null)
     {
@@ -38,7 +36,6 @@ protected function reindex($entityIds = null)
      * @see _prepareDefaultFinalPriceTable()
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDownloadableLinkPriceTable()
     {
@@ -49,7 +46,6 @@ protected function _getDownloadableLinkPriceTable()
      * Prepare downloadable links price temporary index table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareDownloadableLinkPriceTable()
     {
@@ -61,7 +57,6 @@ protected function _prepareDownloadableLinkPriceTable()
      * Calculate and apply Downloadable links price to index
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyDownloadableLink()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
index 99bba528c0a99..010eeda458089 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link.php
@@ -13,7 +13,6 @@
  * Downloadable Product  Samples resource model
  *
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -27,25 +26,21 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_configuration;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -56,7 +51,6 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -77,7 +71,6 @@ public function __construct(
      * Initialize connection and define resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -90,7 +83,6 @@ protected function _construct()
      * @param \Magento\Downloadable\Model\Link $linkObject
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function saveItemTitleAndPrice($linkObject)
     {
@@ -181,7 +173,6 @@ public function saveItemTitleAndPrice($linkObject)
      *
      * @param \Magento\Downloadable\Model\Link|array|int $items
      * @return $this
-     * @since 2.0.0
      */
     public function deleteItems($items)
     {
@@ -205,7 +196,6 @@ public function deleteItems($items)
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -239,7 +229,6 @@ public function getSearchableData($productId, $storeId)
 
     /**
      * @return \Magento\Directory\Model\Currency
-     * @since 2.0.0
      */
     protected function _createCurrency()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
index 584500cadc16d..3588eab8b096d 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
@@ -11,7 +11,6 @@
  * Downloadable links resource collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -55,7 +54,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +65,6 @@ protected function _construct()
      *
      * @param \Magento\Catalog\Model\Product|array|integer|null $product
      * @return $this
-     * @since 2.0.0
      */
     public function addProductToFilter($product)
     {
@@ -96,7 +93,6 @@ public function addProductToFilter($product)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addTitleToResult($storeId = 0)
     {
@@ -123,7 +119,6 @@ public function addTitleToResult($storeId = 0)
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function addPriceToResult($websiteId)
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php
index 74b76e66578b1..87dfd332bfa8d 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php
@@ -9,7 +9,6 @@
  * Downloadable Product link purchased resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Purchased extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Purchased extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Magento class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Collection.php
index d03a27d4f0e8b..59d25db161269 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Collection.php
@@ -9,7 +9,6 @@
  * Downloadable links purchased resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Add purchased items to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addPurchasedItemsToResult()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php
index d74504ef7a2a6..cef73ac33c539 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php
@@ -9,7 +9,6 @@
  * Downloadable Product link purchased items resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Magento class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item/Collection.php
index 91eb6c47c5907..43e74fffc0edb 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item/Collection.php
@@ -9,7 +9,6 @@
  * Downloadable links purchased items resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Sample.php b/app/code/Magento/Downloadable/Model/ResourceModel/Sample.php
index a4cb4fcd85377..52ea238ad2c27 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Sample.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Sample.php
@@ -11,7 +11,6 @@
  * Downloadable Product  Samples resource model
  *
  * @api
- * @since 2.0.0
  */
 class Sample extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -40,7 +39,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +50,6 @@ protected function _construct()
      *
      * @param \Magento\Downloadable\Model\Sample $sampleObject
      * @return $this
-     * @since 2.0.0
      */
     public function saveItemTitle($sampleObject)
     {
@@ -94,7 +91,6 @@ public function saveItemTitle($sampleObject)
      *
      * @param \Magento\Downloadable\Model\Sample|array|int $items
      * @return $this
-     * @since 2.0.0
      */
     public function deleteItems($items)
     {
@@ -115,7 +111,6 @@ public function deleteItems($items)
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Sample/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Sample/Collection.php
index 9ce746b237b5c..7a3d9c5b1b67f 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Sample/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Sample/Collection.php
@@ -11,7 +11,6 @@
  * Downloadable samples resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -55,7 +54,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -70,7 +68,6 @@ protected function _construct()
      *
      * @param \Magento\Catalog\Model\Product|array|int|null $product
      * @return $this
-     * @since 2.0.0
      */
     public function addProductToFilter($product)
     {
@@ -99,7 +96,6 @@ public function addProductToFilter($product)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addTitleToResult($storeId = 0)
     {
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 1ca5b6f57171b..37de85d230949 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -11,7 +11,6 @@
 /**
  * Order Downloadable Pdf Items renderer
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
 {
@@ -19,7 +18,6 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
      * Downloadable links purchased model
      *
      * @var \Magento\Downloadable\Model\Link\Purchased
-     * @since 2.0.0
      */
     protected $_purchasedLinks = null;
 
@@ -27,19 +25,16 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -56,7 +51,6 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -90,7 +84,6 @@ public function __construct(
      * Return Purchased link for order item
      *
      * @return \Magento\Downloadable\Model\Link\Purchased
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -108,7 +101,6 @@ public function getLinks()
      * Return Links Section Title for order item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinksTitle()
     {
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
index ba06f54557c39..df362a64754c7 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -8,13 +8,11 @@
 /**
  * Order Creditmemo Downloadable Pdf Items renderer
  * @api
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -32,7 +30,6 @@ class Creditmemo extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Abstr
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -68,7 +65,6 @@ public function __construct(
      * Draw item line
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
index 2125689c1af1b..ffcbb69877014 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -8,13 +8,11 @@
 /**
  * Order Invoice Downloadable Pdf Items renderer
  * @api
- * @since 2.0.0
  */
 class Invoice extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -32,7 +30,6 @@ class Invoice extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Abstract
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -69,7 +66,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Downloadable/Model/Sample.php b/app/code/Magento/Downloadable/Model/Sample.php
index 8d4ace15a2723..bfd223a92dc67 100644
--- a/app/code/Magento/Downloadable/Model/Sample.php
+++ b/app/code/Magento/Downloadable/Model/Sample.php
@@ -15,7 +15,6 @@
  * @method int getProductId()
  *
  * @api
- * @since 2.0.0
  */
 class Sample extends \Magento\Framework\Model\AbstractExtensibleModel implements ComponentInterface, SampleInterface
 {
@@ -40,7 +39,6 @@ class Sample extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -66,7 +64,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +75,6 @@ protected function _construct()
      * After save process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -90,7 +86,6 @@ public function afterSave()
      * Retrieve sample URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -105,7 +100,6 @@ public function getUrl()
      * Retrieve base tmp path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseTmpPath()
     {
@@ -116,7 +110,6 @@ public function getBaseTmpPath()
      * Retrieve sample files path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBasePath()
     {
@@ -129,7 +122,6 @@ public function getBasePath()
      * @param int $productId
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getSearchableData($productId, $storeId)
     {
@@ -139,7 +131,6 @@ public function getSearchableData($productId, $storeId)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -149,7 +140,6 @@ public function getTitle()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -159,7 +149,6 @@ public function getSortOrder()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleType()
     {
@@ -169,7 +158,6 @@ public function getSampleType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleFile()
     {
@@ -179,7 +167,6 @@ public function getSampleFile()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleFileContent()
     {
@@ -189,7 +176,6 @@ public function getSampleFileContent()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSampleUrl()
     {
@@ -201,7 +187,6 @@ public function getSampleUrl()
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -213,7 +198,6 @@ public function setTitle($title)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -223,7 +207,6 @@ public function setSortOrder($sortOrder)
     /**
      * @param string $sampleType
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleType($sampleType)
     {
@@ -235,7 +218,6 @@ public function setSampleType($sampleType)
      *
      * @param string $sampleFile
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFile($sampleFile)
     {
@@ -247,7 +229,6 @@ public function setSampleFile($sampleFile)
      *
      * @param \Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleFileContent(\Magento\Downloadable\Api\Data\File\ContentInterface $sampleFileContent = null)
     {
@@ -259,7 +240,6 @@ public function setSampleFileContent(\Magento\Downloadable\Api\Data\File\Content
      *
      * @param string $sampleUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSampleUrl($sampleUrl)
     {
@@ -270,7 +250,6 @@ public function setSampleUrl($sampleUrl)
      * {@inheritdoc}
      *
      * @return \Magento\Downloadable\Api\Data\SampleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -282,7 +261,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Downloadable\Api\Data\SampleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Downloadable\Api\Data\SampleExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php b/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
index c8d85393e93c4..6c99229b82ef7 100644
--- a/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
+++ b/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Downloadable\Model\Sample\ContentValidator
  *
- * @since 2.0.0
  */
 class ContentValidator
 {
     /**
      * @var UrlValidator
-     * @since 2.0.0
      */
     protected $urlValidator;
 
     /**
      * @var FileContentValidator
-     * @since 2.0.0
      */
     protected $fileContentValidator;
 
     /**
      * @param FileContentValidator $fileContentValidator
      * @param UrlValidator $urlValidator
-     * @since 2.0.0
      */
     public function __construct(
         FileContentValidator $fileContentValidator,
@@ -49,7 +45,6 @@ public function __construct(
      * @param bool $validateSampleContent
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     public function isValid(SampleInterface $sample, $validateSampleContent = true)
     {
@@ -69,7 +64,6 @@ public function isValid(SampleInterface $sample, $validateSampleContent = true)
      * @param SampleInterface $sample
      * @throws InputException
      * @return void
-     * @since 2.0.0
      */
     protected function validateSampleResource(SampleInterface $sample)
     {
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index e486c54dce258..7656e7f57b55f 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -23,25 +23,21 @@
 /**
  * Class SampleRepository
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var ContentValidator
-     * @since 2.0.0
      */
     protected $contentValidator;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     protected $downloadableType;
 
@@ -53,19 +49,16 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
 
     /**
      * @var SampleInterfaceFactory
-     * @since 2.0.0
      */
     protected $sampleDataObjectFactory;
 
     /**
      * @var ContentUploaderInterface
-     * @since 2.0.0
      */
     protected $fileContentUploader;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -89,7 +82,6 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
      * @param ContentUploaderInterface $fileContentUploader
      * @param EncoderInterface $jsonEncoder
      * @param SampleFactory $sampleFactory
-     * @since 2.0.0
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
@@ -111,7 +103,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($sku)
     {
@@ -125,7 +116,6 @@ public function getList($sku)
      *
      * @param \Magento\Downloadable\Model\Sample $resourceData
      * @return \Magento\Downloadable\Model\Sample
-     * @since 2.0.0
      */
     protected function buildSample($resourceData)
     {
@@ -140,7 +130,6 @@ protected function buildSample($resourceData)
      * @param \Magento\Downloadable\Model\Link|\Magento\Downloadable\Model\Sample $resourceData
      * @param \Magento\Downloadable\Api\Data\LinkInterface|\Magento\Downloadable\Api\Data\SampleInterface $dataObject
      * @return null
-     * @since 2.0.0
      */
     protected function setBasicFields($resourceData, $dataObject)
     {
@@ -163,7 +152,6 @@ protected function setBasicFields($resourceData, $dataObject)
      *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Downloadable\Api\Data\SampleInterface[]
-     * @since 2.0.0
      */
     public function getSamplesByProduct(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
@@ -185,7 +173,6 @@ public function getSamplesByProduct(\Magento\Catalog\Api\Data\ProductInterface $
      * @return int
      * @throws InputException
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function save(
         $sku,
@@ -224,7 +211,6 @@ public function save(
      * @param SampleInterface $sample
      * @param bool $isGlobalScopeContent
      * @return int
-     * @since 2.0.0
      */
     protected function saveSample(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -277,7 +263,6 @@ protected function saveSample(
      * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function updateSample(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -326,7 +311,6 @@ protected function updateSample(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($id)
     {
diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php
index c6dfbd71d2ec6..10354f6df10ab 100644
--- a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php
+++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php
@@ -9,13 +9,11 @@
  * Downloadable Content Disposition Source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Contentdisposition implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php
index a523896ec85fb..176c4337d0ce9 100644
--- a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php
+++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php
@@ -9,13 +9,11 @@
  * Downloadable Order Item Status Source
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Downloadable/Observer/InitOptionRendererObserver.php b/app/code/Magento/Downloadable/Observer/InitOptionRendererObserver.php
index 2d2c79ceadb7c..87f7026c67bdb 100644
--- a/app/code/Magento/Downloadable/Observer/InitOptionRendererObserver.php
+++ b/app/code/Magento/Downloadable/Observer/InitOptionRendererObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Downloadable\Observer\InitOptionRendererObserver
  *
- * @since 2.0.0
  */
 class InitOptionRendererObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class InitOptionRendererObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 93d865deb0234..25649336388cc 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver
  *
- * @since 2.0.0
  */
 class IsAllowedGuestCheckoutObserver implements ObserverInterface
 {
@@ -24,13 +23,11 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 31e0a6c685f50..64305cfce9b08 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SaveDownloadableOrderItemObserver implements ObserverInterface
 {
@@ -18,37 +17,31 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Downloadable\Model\Link\PurchasedFactory
-     * @since 2.0.0
      */
     protected $_purchasedFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Downloadable\Model\Link\Purchased\ItemFactory
-     * @since 2.0.0
      */
     protected $_itemFactory;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
@@ -59,7 +52,6 @@ class SaveDownloadableOrderItemObserver implements ObserverInterface
      * @param \Magento\Downloadable\Model\Link\Purchased\ItemFactory $itemFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param \Magento\Framework\DataObject\Copy $objectCopyService
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -84,7 +76,6 @@ public function __construct(
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -175,7 +166,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
     /**
      * @return \Magento\Downloadable\Model\Link\Purchased
-     * @since 2.0.0
      */
     protected function _createPurchasedModel()
     {
@@ -184,7 +174,6 @@ protected function _createPurchasedModel()
 
     /**
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _createProductModel()
     {
@@ -193,7 +182,6 @@ protected function _createProductModel()
 
     /**
      * @return \Magento\Downloadable\Model\Link\Purchased\Item
-     * @since 2.0.0
      */
     protected function _createPurchasedItemModel()
     {
@@ -202,7 +190,6 @@ protected function _createPurchasedItemModel()
 
     /**
      * @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
-     * @since 2.0.0
      */
     protected function _createItemsCollection()
     {
diff --git a/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php b/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
index 1ee7ba23a944d..d419da98eb79f 100644
--- a/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Downloadable\Observer\SetHasDownloadableProductsObserver
  *
- * @since 2.0.0
  */
 class SetHasDownloadableProductsObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
index eb71beea75ecb..ad2891a30d28d 100644
--- a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Downloadable\Observer\SetLinkStatusObserver
  *
- * @since 2.0.0
  */
 class SetLinkStatusObserver implements ObserverInterface
 {
@@ -19,20 +18,17 @@ class SetLinkStatusObserver implements ObserverInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemsFactory;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -50,7 +46,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -155,7 +150,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
     /**
      * @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
-     * @since 2.0.0
      */
     protected function _createItemsCollection()
     {
diff --git a/app/code/Magento/Downloadable/Pricing/Price/LinkPrice.php b/app/code/Magento/Downloadable/Pricing/Price/LinkPrice.php
index eb69c36b168ed..668d0d91da254 100644
--- a/app/code/Magento/Downloadable/Pricing/Price/LinkPrice.php
+++ b/app/code/Magento/Downloadable/Pricing/Price/LinkPrice.php
@@ -12,7 +12,6 @@
 /**
  * Class LinkPrice Model
  *
- * @since 2.0.0
  */
 class LinkPrice extends RegularPrice implements LinkPriceInterface
 {
@@ -24,7 +23,6 @@ class LinkPrice extends RegularPrice implements LinkPriceInterface
     /**
      * @param Link $link
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getLinkAmount(Link $link)
     {
diff --git a/app/code/Magento/Downloadable/Pricing/Price/LinkPriceInterface.php b/app/code/Magento/Downloadable/Pricing/Price/LinkPriceInterface.php
index 7f2064e1282a2..7663546c9e3f2 100644
--- a/app/code/Magento/Downloadable/Pricing/Price/LinkPriceInterface.php
+++ b/app/code/Magento/Downloadable/Pricing/Price/LinkPriceInterface.php
@@ -10,14 +10,12 @@
 
 /**
  * Class LinkPrice Model
- * @since 2.0.0
  */
 interface LinkPriceInterface
 {
     /**
      * @param Link $link
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getLinkAmount(Link $link);
 }
diff --git a/app/code/Magento/Downloadable/Setup/InstallData.php b/app/code/Magento/Downloadable/Setup/InstallData.php
index e07b0ef760a79..e015f3a23c191 100644
--- a/app/code/Magento/Downloadable/Setup/InstallData.php
+++ b/app/code/Magento/Downloadable/Setup/InstallData.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -22,7 +21,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -30,7 +28,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -40,7 +37,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Downloadable/Setup/InstallSchema.php b/app/code/Magento/Downloadable/Setup/InstallSchema.php
index 77bd11e797e64..e3540bf7a2b70 100644
--- a/app/code/Magento/Downloadable/Setup/InstallSchema.php
+++ b/app/code/Magento/Downloadable/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/DownloadableImportExport/Helper/Data.php b/app/code/Magento/DownloadableImportExport/Helper/Data.php
index cb9d374c87dcd..fa4f7d656cdbe 100644
--- a/app/code/Magento/DownloadableImportExport/Helper/Data.php
+++ b/app/code/Magento/DownloadableImportExport/Helper/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Data
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -18,7 +17,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     public function isRowDownloadableEmptyOptions(array $rowData)
     {
@@ -34,7 +32,6 @@ public function isRowDownloadableEmptyOptions(array $rowData)
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     public function isRowDownloadableNoValid(array $rowData)
     {
@@ -50,7 +47,6 @@ public function isRowDownloadableNoValid(array $rowData)
      * @param array $option
      * @param array $existingOptions
      * @return array
-     * @since 2.0.0
      */
     public function fillExistOptions(array $base, array $option, array $existingOptions)
     {
@@ -75,7 +71,6 @@ public function fillExistOptions(array $base, array $option, array $existingOpti
      * @param array $base
      * @param array $replacement
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataForSave(array $base, array $replacement)
     {
@@ -91,7 +86,6 @@ public function prepareDataForSave(array $base, array $replacement)
      *
      * @param string $option
      * @return string
-     * @since 2.0.0
      */
     public function getTypeByValue($option)
     {
diff --git a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
index 58dfa5672d48e..d6752e027d42b 100644
--- a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
+++ b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Uploader
- * @since 2.0.0
  */
 class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -17,7 +16,6 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
      * Media files uploader
      *
      * @var \Magento\CatalogImportExport\Model\Import\Uploader
-     * @since 2.0.0
      */
     protected $fileUploader;
 
@@ -25,13 +23,11 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
      * File helper downloadable product
      *
      * @var \Magento\Downloadable\Helper\File
-     * @since 2.0.0
      */
     protected $fileHelper;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
@@ -39,7 +35,6 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
      * Entity model parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $parameters = [];
 
@@ -51,7 +46,6 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\CatalogImportExport\Model\Import\UploaderFactory $uploaderFactory
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -77,7 +71,6 @@ public function __construct(
      * @param array $parameters
      * @return \Magento\CatalogImportExport\Model\Import\Uploader
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getUploader($type, $parameters)
     {
@@ -113,7 +106,6 @@ public function getUploader($type, $parameters)
      * Get all allowed extensions
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllowedExtensions()
     {
diff --git a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
index 6b0274409cff2..06df8b12351be 100644
--- a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
+++ b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
@@ -15,7 +15,6 @@
  * Class Downloadable
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
@@ -106,7 +105,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [
         self::ERROR_OPTIONS_NOT_FOUND => 'Options for downloadable products not found',
@@ -120,7 +118,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Entity model parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $parameters = [];
 
@@ -128,7 +125,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Ids products
      *
      * @var array
-     * @since 2.0.0
      */
     protected $productIds = [];
 
@@ -136,7 +132,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Array of cached options.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $cachedOptions = [
         'link' => [],
@@ -147,7 +142,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of empty sample
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataSample = [
         'sample_id' => null,
@@ -162,7 +156,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of empty sample title
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataSampleTitle = [
         'sample_id' => null,
@@ -174,7 +167,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of empty link
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataLink = [
         'link_id' => null,
@@ -194,7 +186,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of empty link title
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataLinkTitle = [
         'link_id' => null,
@@ -206,7 +197,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Instance of empty link price
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataLinkPrice = [
         'price_id' => null,
@@ -219,7 +209,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Option link mapping.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $optionLinkMapping = [
         'sortorder' => 'sort_order',
@@ -233,7 +222,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Option sample mapping.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $optionSampleMapping = [
         'sortorder' => 'sort_order',
@@ -243,19 +231,16 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
 
     /**
      * Num row parsing file
-     * @since 2.0.0
      */
     protected $rowNum;
 
     /**
      * @var \Magento\DownloadableImportExport\Helper\Uploader
-     * @since 2.0.0
      */
     protected $uploaderHelper;
 
     /**
      * @var \Magento\DownloadableImportExport\Helper\Data
-     * @since 2.0.0
      */
     protected $downloadableHelper;
 
@@ -269,7 +254,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * @param \Magento\DownloadableImportExport\Helper\Uploader $uploaderHelper
      * @param \Magento\DownloadableImportExport\Helper\Data $downloadableHelper
      * @param MetadataPool $metadataPool
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
@@ -291,7 +275,6 @@ public function __construct(
      * Save product type specific data.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     public function saveData()
     {
@@ -326,7 +309,6 @@ public function saveData()
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
     {
@@ -351,7 +333,6 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function isRowValidSample(array $rowData)
     {
@@ -374,7 +355,6 @@ protected function isRowValidSample(array $rowData)
      *
      * @param array $rowData
      * @return bool
-     * @since 2.0.0
      */
     protected function isRowValidLink(array $rowData)
     {
@@ -399,7 +379,6 @@ protected function isRowValidLink(array $rowData)
      *
      * @param array $options
      * @return bool
-     * @since 2.0.0
      */
     protected function isTitle(array $options)
     {
@@ -419,7 +398,6 @@ protected function isTitle(array $options)
      * @param array $rowData
      * @param bool $withDefaultValue
      * @return array
-     * @since 2.0.0
      */
     public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDefaultValue = true)
     {
@@ -433,7 +411,6 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function addAdditionalAttributes(array $rowData)
     {
@@ -455,7 +432,6 @@ protected function addAdditionalAttributes(array $rowData)
      * @param string $attribute
      * @param mixed $defaultValue
      * @return string
-     * @since 2.0.0
      */
     protected function linksAdditionalAttributes(array $rowData, $attribute, $defaultValue)
     {
@@ -481,7 +457,6 @@ protected function linksAdditionalAttributes(array $rowData, $attribute, $defaul
      *
      * @param array $rowData
      * @return string
-     * @since 2.0.0
      */
     protected function sampleGroupTitle(array $rowData)
     {
@@ -508,7 +483,6 @@ protected function sampleGroupTitle(array $rowData)
      * @param array $rowData
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     protected function parseOptions(array $rowData, $entityId)
     {
@@ -534,7 +508,6 @@ protected function parseOptions(array $rowData, $entityId)
      * @param array $base
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function fillDataSample(array $base, array $options)
     {
@@ -571,7 +544,6 @@ protected function fillDataSample(array $base, array $options)
      * @param array $base
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function fillDataLink(array $base, array $options)
     {
@@ -600,7 +572,6 @@ protected function fillDataLink(array $base, array $options)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function fillDataTitleLink(array $options)
     {
@@ -648,7 +619,6 @@ protected function fillDataTitleLink(array $options)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function uploadSampleFiles(array $options)
     {
@@ -667,7 +637,6 @@ protected function uploadSampleFiles(array $options)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function uploadLinkFiles(array $options)
     {
@@ -688,7 +657,6 @@ protected function uploadLinkFiles(array $options)
      * Save options in base
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function saveOptions()
     {
@@ -706,7 +674,6 @@ protected function saveOptions()
      * Save sample options
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function saveSampleOptions()
     {
@@ -728,7 +695,6 @@ protected function saveSampleOptions()
      * Save link options
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function saveLinkOptions()
     {
@@ -758,7 +724,6 @@ protected function saveLinkOptions()
      * @param string $rowCol
      * @param int $entityId
      * @return array
-     * @since 2.0.0
      */
     protected function prepareSampleData($rowCol, $entityId = null)
     {
@@ -783,7 +748,6 @@ protected function prepareSampleData($rowCol, $entityId = null)
      * @param string $rowCol
      * @param string $entityId
      * @return array
-     * @since 2.0.0
      */
     protected function prepareLinkData($rowCol, $entityId = null)
     {
@@ -807,7 +771,6 @@ protected function prepareLinkData($rowCol, $entityId = null)
      *
      * @param array $values
      * @return array
-     * @since 2.0.0
      */
     protected function parseLinkOption(array $values)
     {
@@ -841,7 +804,6 @@ protected function parseLinkOption(array $values)
      *
      * @param array $values
      * @return array
-     * @since 2.0.0
      */
     protected function parseSampleOption($values)
     {
@@ -871,7 +833,6 @@ protected function parseSampleOption($values)
      * @param string $type
      * @param bool $renameFileOff
      * @return string
-     * @since 2.0.0
      */
     protected function uploadDownloadableFiles($fileName, $type = 'links', $renameFileOff = false)
     {
@@ -888,7 +849,6 @@ protected function uploadDownloadableFiles($fileName, $type = 'links', $renameFi
      * Clear cached values between bunches
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-     * @since 2.0.0
      */
     protected function clear()
     {
diff --git a/app/code/Magento/Eav/Api/AttributeGroupRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeGroupRepositoryInterface.php
index e3fb220fef35d..80b5ba0400be3 100644
--- a/app/code/Magento/Eav/Api/AttributeGroupRepositoryInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeGroupRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeGroupRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeGroupRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface AttributeGroupRepositoryInterface
      * @return \Magento\Eav\Api\Data\AttributeGroupInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
 
@@ -30,7 +28,6 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
      * @param int $groupId
      * @return \Magento\Eav\Api\Data\AttributeGroupInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($groupId);
 
@@ -40,7 +37,6 @@ public function get($groupId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -51,7 +47,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function deleteById($groupId);
 
@@ -62,7 +57,6 @@ public function deleteById($groupId);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group);
 }
diff --git a/app/code/Magento/Eav/Api/AttributeManagementInterface.php b/app/code/Magento/Eav/Api/AttributeManagementInterface.php
index b3883ca17b287..bf6f30ec62bdf 100644
--- a/app/code/Magento/Eav/Api/AttributeManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeManagementInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeManagementInterface
 {
@@ -24,7 +23,6 @@ interface AttributeManagementInterface
      * @return int
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder);
 
@@ -37,7 +35,6 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
      * @return bool
-     * @since 2.0.0
      */
     public function unassign($attributeSetId, $attributeCode);
 
@@ -48,7 +45,6 @@ public function unassign($attributeSetId, $attributeCode);
      * @param string $attributeSetId
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $attributeSetId is not found
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-     * @since 2.0.0
      */
     public function getAttributes($entityTypeCode, $attributeSetId);
 }
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index a65755a88e618..1bc3dae64b3c9 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface AttributeOptionManagementInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeOptionManagementInterface
 {
@@ -21,7 +20,6 @@ interface AttributeOptionManagementInterface
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function add($entityType, $attributeCode, $option);
 
@@ -35,7 +33,6 @@ public function add($entityType, $attributeCode, $option);
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return bool
-     * @since 2.0.0
      */
     public function delete($entityType, $attributeCode, $optionId);
 
@@ -47,7 +44,6 @@ public function delete($entityType, $attributeCode, $optionId);
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      * @return \Magento\Eav\Api\Data\AttributeOptionInterface[]
-     * @since 2.0.0
      */
     public function getItems($entityType, $attributeCode);
 }
diff --git a/app/code/Magento/Eav/Api/AttributeRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeRepositoryInterface.php
index ac99de3ce3436..77d1d22db668c 100644
--- a/app/code/Magento/Eav/Api/AttributeRepositoryInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface AttributeRepositoryInterface
      * @param string $entityTypeCode
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Eav\Api\Data\AttributeSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -30,7 +28,6 @@ public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaIn
      * @param string $attributeCode
      * @return \Magento\Eav\Api\Data\AttributeInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($entityTypeCode, $attributeCode);
 
@@ -40,7 +37,6 @@ public function get($entityTypeCode, $attributeCode);
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @return string
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute);
 
@@ -50,7 +46,6 @@ public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute);
      * @param Data\AttributeInterface $attribute
      * @return bool True if the entity was deleted
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function delete(Data\AttributeInterface $attribute);
 
@@ -61,7 +56,6 @@ public function delete(Data\AttributeInterface $attribute);
      * @return bool True if the entity was deleted
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     public function deleteById($attributeId);
 }
diff --git a/app/code/Magento/Eav/Api/AttributeSetManagementInterface.php b/app/code/Magento/Eav/Api/AttributeSetManagementInterface.php
index 9bae20d745ae6..58be6e827b48f 100644
--- a/app/code/Magento/Eav/Api/AttributeSetManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeSetManagementInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeSetManagementInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeSetManagementInterface
 {
@@ -22,7 +21,6 @@ interface AttributeSetManagementInterface
      * @return \Magento\Eav\Api\Data\AttributeSetInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function create(
         $entityTypeCode,
diff --git a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
index 1325468f3920d..beb1a2ad3eb68 100644
--- a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeSetRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeSetRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface AttributeSetRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Eav\Api\Data\AttributeSetSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -32,7 +30,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param int $attributeSetId
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $attributeSetId is not found
      * @return \Magento\Eav\Api\Data\AttributeSetInterface
-     * @since 2.0.0
      */
     public function get($attributeSetId);
 
@@ -44,7 +41,6 @@ public function get($attributeSetId);
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException If attribute set is not found
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
 
@@ -55,7 +51,6 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($attributeSetId);
 
@@ -66,7 +61,6 @@ public function deleteById($attributeSetId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeFrontendLabelInterface.php b/app/code/Magento/Eav/Api/Data/AttributeFrontendLabelInterface.php
index 469bb1bd66e93..babdf64e1f14f 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeFrontendLabelInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeFrontendLabelInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeFrontendLabelInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeFrontendLabelInterface extends AttributeOptionLabelInterface
 {
diff --git a/app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php b/app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php
index a9fce1c94d2ce..7d602c7edc310 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface AttributeGroupInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeGroupInterface extends ExtensibleDataInterface
 {
@@ -24,7 +23,6 @@ interface AttributeGroupInterface extends ExtensibleDataInterface
      * Retrieve id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeGroupId();
 
@@ -33,7 +31,6 @@ public function getAttributeGroupId();
      *
      * @param string $attributeGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeGroupId($attributeGroupId);
 
@@ -41,7 +38,6 @@ public function setAttributeGroupId($attributeGroupId);
      * Retrieve name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeGroupName();
 
@@ -50,7 +46,6 @@ public function getAttributeGroupName();
      *
      * @param string $attributeGroupName
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeGroupName($attributeGroupName);
 
@@ -58,7 +53,6 @@ public function setAttributeGroupName($attributeGroupName);
      * Retrieve attribute set id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAttributeSetId();
 
@@ -67,7 +61,6 @@ public function getAttributeSetId();
      *
      * @param int $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId);
 
@@ -75,7 +68,6 @@ public function setAttributeSetId($attributeSetId);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -84,7 +76,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php
index af0fcf87a38bf..6e9101d39fa98 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeGroupSearchResultsInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeGroupSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface AttributeGroupSearchResultsInterface extends \Magento\Framework\Api\Se
      * Get attribute sets list.
      *
      * @return \Magento\Eav\Api\Data\AttributeGroupInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Eav\Api\Data\AttributeGroupInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 279d73267c7ce..55edf8f4600a7 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -51,7 +50,6 @@ interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesData
      * Retrieve id of the attribute.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAttributeId();
 
@@ -60,7 +58,6 @@ public function getAttributeId();
      *
      * @param int $attributeId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeId($attributeId);
 
@@ -68,7 +65,6 @@ public function setAttributeId($attributeId);
      * Retrieve code of the attribute.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode();
 
@@ -77,7 +73,6 @@ public function getAttributeCode();
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode);
 
@@ -85,7 +80,6 @@ public function setAttributeCode($attributeCode);
      * Frontend HTML for input element.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendInput();
 
@@ -94,7 +88,6 @@ public function getFrontendInput();
      *
      * @param string $frontendInput
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendInput($frontendInput);
 
@@ -102,7 +95,6 @@ public function setFrontendInput($frontendInput);
      * Retrieve entity type id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeId();
 
@@ -111,7 +103,6 @@ public function getEntityTypeId();
      *
      * @param string $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypeId($entityTypeId);
 
@@ -120,7 +111,6 @@ public function setEntityTypeId($entityTypeId);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsRequired();
 
@@ -129,7 +119,6 @@ public function getIsRequired();
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRequired($isRequired);
 
@@ -137,7 +126,6 @@ public function setIsRequired($isRequired);
      * Return options of the attribute (key => value pairs for select)
      *
      * @return \Magento\Eav\Api\Data\AttributeOptionInterface[]|null
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -146,7 +134,6 @@ public function getOptions();
      *
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null);
 
@@ -154,7 +141,6 @@ public function setOptions(array $options = null);
      * Whether current attribute has been defined by a user.
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsUserDefined();
 
@@ -163,7 +149,6 @@ public function getIsUserDefined();
      *
      * @param bool $isUserDefined
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUserDefined($isUserDefined);
 
@@ -171,7 +156,6 @@ public function setIsUserDefined($isUserDefined);
      * Return frontend label for default store
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultFrontendLabel();
 
@@ -180,7 +164,6 @@ public function getDefaultFrontendLabel();
      *
      * @param string $defaultFrontendLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultFrontendLabel($defaultFrontendLabel);
 
@@ -188,7 +171,6 @@ public function setDefaultFrontendLabel($defaultFrontendLabel);
      * Return frontend label for each store
      *
      * @return \Magento\Eav\Api\Data\AttributeFrontendLabelInterface[]
-     * @since 2.0.0
      */
     public function getFrontendLabels();
 
@@ -197,7 +179,6 @@ public function getFrontendLabels();
      *
      * @param \Magento\Eav\Api\Data\AttributeFrontendLabelInterface[] $frontendLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendLabels(array $frontendLabels = null);
 
@@ -205,7 +186,6 @@ public function setFrontendLabels(array $frontendLabels = null);
      * Get the note attribute for the element.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getNote();
 
@@ -214,7 +194,6 @@ public function getNote();
      *
      * @param string $note
      * @return $this
-     * @since 2.0.0
      */
     public function setNote($note);
 
@@ -222,7 +201,6 @@ public function setNote($note);
      * Get backend type.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBackendType();
 
@@ -231,7 +209,6 @@ public function getBackendType();
      *
      * @param string $backendType
      * @return $this
-     * @since 2.0.0
      */
     public function setBackendType($backendType);
 
@@ -239,7 +216,6 @@ public function setBackendType($backendType);
      * Get backend model
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBackendModel();
 
@@ -248,7 +224,6 @@ public function getBackendModel();
      *
      * @param string $backendModel
      * @return $this
-     * @since 2.0.0
      */
     public function setBackendModel($backendModel);
 
@@ -256,7 +231,6 @@ public function setBackendModel($backendModel);
      * Get source model
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSourceModel();
 
@@ -265,7 +239,6 @@ public function getSourceModel();
      *
      * @param string $sourceModel
      * @return $this
-     * @since 2.0.0
      */
     public function setSourceModel($sourceModel);
 
@@ -273,7 +246,6 @@ public function setSourceModel($sourceModel);
      * Get default value for the element.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultValue();
 
@@ -282,7 +254,6 @@ public function getDefaultValue();
      *
      * @param string $defaultValue
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultValue($defaultValue);
 
@@ -290,7 +261,6 @@ public function setDefaultValue($defaultValue);
      * Whether this is a unique attribute
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getIsUnique();
 
@@ -299,7 +269,6 @@ public function getIsUnique();
      *
      * @param string $isUnique
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUnique($isUnique);
 
@@ -307,7 +276,6 @@ public function setIsUnique($isUnique);
      * Retrieve frontend class of attribute
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFrontendClass();
 
@@ -316,7 +284,6 @@ public function getFrontendClass();
      *
      * @param string $frontendClass
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendClass($frontendClass);
 
@@ -324,7 +291,6 @@ public function setFrontendClass($frontendClass);
      * Retrieve validation rules.
      *
      * @return \Magento\Eav\Api\Data\AttributeValidationRuleInterface[]|null
-     * @since 2.0.0
      */
     public function getValidationRules();
 
@@ -333,13 +299,11 @@ public function getValidationRules();
      *
      * @param \Magento\Eav\Api\Data\AttributeValidationRuleInterface[] $validationRules
      * @return $this
-     * @since 2.0.0
      */
     public function setValidationRules(array $validationRules = null);
 
     /**
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeOptionInterface.php b/app/code/Magento/Eav/Api/Data/AttributeOptionInterface.php
index 1fb9ee83f4c32..c42f04cccea9d 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeOptionInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeOptionInterface.php
@@ -10,7 +10,6 @@
  * Created from:
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 interface AttributeOptionInterface
 {
@@ -31,7 +30,6 @@ interface AttributeOptionInterface
      * Get option label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -40,7 +38,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 
@@ -48,7 +45,6 @@ public function setLabel($label);
      * Get option value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -57,7 +53,6 @@ public function getValue();
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -65,7 +60,6 @@ public function setValue($value);
      * Get option order
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -74,7 +68,6 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -82,7 +75,6 @@ public function setSortOrder($sortOrder);
      * is default
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getIsDefault();
 
@@ -91,7 +83,6 @@ public function getIsDefault();
      *
      * @param bool $isDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefault($isDefault);
 
@@ -99,7 +90,6 @@ public function setIsDefault($isDefault);
      * Get option label for store scopes
      *
      * @return \Magento\Eav\Api\Data\AttributeOptionLabelInterface[]|null
-     * @since 2.0.0
      */
     public function getStoreLabels();
 
@@ -108,7 +98,6 @@ public function getStoreLabels();
      *
      * @param \Magento\Eav\Api\Data\AttributeOptionLabelInterface[] $storeLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabels(array $storeLabels = null);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeOptionLabelInterface.php b/app/code/Magento/Eav/Api/Data/AttributeOptionLabelInterface.php
index 6ec5c73e266d2..b215c90e000f2 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeOptionLabelInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeOptionLabelInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeOptionLabelInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeOptionLabelInterface
 {
@@ -21,7 +20,6 @@ interface AttributeOptionLabelInterface
      * Get store id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -30,7 +28,6 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -38,7 +35,6 @@ public function setStoreId($storeId);
      * Get option label
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getLabel();
 
@@ -47,7 +43,6 @@ public function getLabel();
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php
index dab55bf7c0ab5..0724e92b1ccce 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeSearchResultsInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface AttributeSearchResultsInterface extends \Magento\Framework\Api\SearchR
      * Get attributes list.
      *
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Eav\Api\Data\AttributeInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeSetInterface.php b/app/code/Magento/Eav/Api/Data/AttributeSetInterface.php
index 331604bd241a3..6233af6b9cb89 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeSetInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeSetInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface AttributeSetInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeSetInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -16,7 +15,6 @@ interface AttributeSetInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get attribute set ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAttributeSetId();
 
@@ -25,7 +23,6 @@ public function getAttributeSetId();
      *
      * @param int $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId);
 
@@ -33,7 +30,6 @@ public function setAttributeSetId($attributeSetId);
      * Get attribute set name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSetName();
 
@@ -42,7 +38,6 @@ public function getAttributeSetName();
      *
      * @param string $attributeSetName
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetName($attributeSetName);
 
@@ -50,7 +45,6 @@ public function setAttributeSetName($attributeSetName);
      * Get attribute set sort order index
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -59,7 +53,6 @@ public function getSortOrder();
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -67,7 +60,6 @@ public function setSortOrder($sortOrder);
      * Get attribute set entity type id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEntityTypeId();
 
@@ -76,7 +68,6 @@ public function getEntityTypeId();
      *
      * @param int $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypeId($entityTypeId);
 
@@ -84,7 +75,6 @@ public function setEntityTypeId($entityTypeId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -93,7 +83,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeSetExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php
index 1f98e05e1d16d..b3d5fe59e30ed 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeSetSearchResultsInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeSetSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface AttributeSetSearchResultsInterface extends \Magento\Framework\Api\Sear
      * Get attribute sets list.
      *
      * @return \Magento\Eav\Api\Data\AttributeSetInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Eav\Api\Data\AttributeSetInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeValidationRuleInterface.php b/app/code/Magento/Eav/Api/Data/AttributeValidationRuleInterface.php
index 877c65640469d..4783ad5dd058d 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeValidationRuleInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeValidationRuleInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface AttributeValidationRuleInterface
  * @api
- * @since 2.0.0
  */
 interface AttributeValidationRuleInterface extends \Magento\Framework\DataObject\KeyValueObjectInterface
 {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 9491fdb92be06..3ddfe494c7fbc 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -9,7 +9,6 @@
  * Eav Attribute Block with additional js scripts in template
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Js extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Js extends \Magento\Backend\Block\Template
      * Js template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'attribute/edit/js.phtml';
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index f27a25df71602..86abab2eed13c 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
  *
- * @since 2.0.0
  */
 abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -26,7 +25,6 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
      * Attribute instance
      *
      * @var Attribute
-     * @since 2.0.0
      */
     protected $_attribute = null;
 
@@ -34,25 +32,21 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
      * Eav data
      *
      * @var \Magento\Eav\Helper\Data
-     * @since 2.0.0
      */
     protected $_eavData = null;
 
     /**
      * @var \Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker
-     * @since 2.0.0
      */
     protected $propertyLocker;
 
     /**
      * @var \Magento\Config\Model\Config\Source\YesnoFactory
-     * @since 2.0.0
      */
     protected $_yesnoFactory;
 
     /**
      * @var \Magento\Eav\Model\Adminhtml\System\Config\Source\InputtypeFactory
-     * @since 2.0.0
      */
     protected $_inputTypeFactory;
 
@@ -66,7 +60,6 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker $propertyLocker
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -91,7 +84,6 @@ public function __construct(
      * @param Attribute $attribute
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeObject($attribute)
     {
@@ -103,7 +95,6 @@ public function setAttributeObject($attribute)
      * Return attribute object
      *
      * @return Attribute
-     * @since 2.0.0
      */
     public function getAttributeObject()
     {
@@ -118,7 +109,6 @@ public function getAttributeObject()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -284,7 +274,6 @@ protected function _prepareForm()
      * Initialize form fileds values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
@@ -302,7 +291,6 @@ protected function _initFormValues()
      *
      * @param   string $html
      * @return  string
-     * @since 2.0.0
      */
     protected function _afterToHtml($html)
     {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
index 47fbb0ff270d6..6570ba0dce1be 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 abstract class AbstractOptions extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -18,7 +17,6 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\AbstractB
      * Preparing layout, adding buttons
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -30,7 +28,6 @@ protected function _prepareLayout()
     /**
      * {@inheritdoc}
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
index 9734f973796c1..47c3b0523f4db 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Labels extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Catalog::catalog/product/attribute/labels.phtml';
 
@@ -31,7 +28,6 @@ class Labels extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      * Retrieve stores collection with default store
      *
      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -60,7 +55,6 @@ public function getStores()
      * Retrieve frontend labels of attribute for each store
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLabelValues()
     {
@@ -79,7 +73,6 @@ public function getLabelValues()
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     private function getAttributeObject()
     {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
index d6428bab15efc..cb3ed559b139f 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
@@ -15,31 +15,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Options extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attrOptionCollectionFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Catalog::catalog/product/attribute/options.phtml';
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
@@ -49,7 +44,6 @@ class Options extends \Magento\Backend\Block\Template
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Option labels and position for such attributes are kept in source model and thus cannot be overridden
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canManageOptionDefaultOnly()
     {
@@ -83,7 +76,6 @@ public function canManageOptionDefaultOnly()
      * Retrieve stores collection with default store
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -117,7 +109,6 @@ public function getStoresSortedBySortOrder()
      * Retrieve attribute option values if attribute input type select or multiselect
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionValues()
     {
@@ -141,7 +132,6 @@ public function getOptionValues()
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param array|\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $optionCollection
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareOptionValues(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
@@ -182,7 +172,6 @@ protected function _prepareOptionValues(
      *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return array|\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection
-     * @since 2.0.0
      */
     protected function _getOptionValuesCollection(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
@@ -211,7 +200,6 @@ protected function _getOptionValuesCollection(\Magento\Eav\Model\Entity\Attribut
      * @param array $defaultValues
      * @param string $valuePrefix
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareSystemAttributeOptionValues($option, $inputType, $defaultValues, $valuePrefix = '')
     {
@@ -250,7 +238,6 @@ protected function _prepareSystemAttributeOptionValues($option, $inputType, $def
      * @param string $inputType
      * @param array $defaultValues
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareUserDefinedAttributeOptionValues($option, $inputType, $defaultValues)
     {
@@ -279,7 +266,6 @@ protected function _prepareUserDefinedAttributeOptionValues($option, $inputType,
      *
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getStoreOptionValues($storeId)
     {
@@ -305,7 +291,6 @@ public function getStoreOptionValues($storeId)
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getAttributeObject()
     {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
index 5db3d1d3f1a87..56fd3523a4c65 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
@@ -11,7 +11,6 @@
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 abstract class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -19,13 +18,11 @@ abstract class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Block Module
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_module = 'adminhtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +36,6 @@ protected function _construct()
      * Prepare default grid column
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -104,7 +100,6 @@ protected function _prepareColumns()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
index 4f9908e653d30..b8d1be2019064 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
@@ -12,19 +12,16 @@
  * Disable form fields
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class PropertyLocker
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $attributeConfig;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -32,7 +29,6 @@ class PropertyLocker
      * @param Registry $registry
      * @param Config $attributeConfig
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         Registry $registry,
@@ -45,7 +41,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\Data\Form $form
      * @return void
-     * @since 2.0.0
      */
     public function lock(\Magento\Framework\Data\Form $form)
     {
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index f51673820e9bc..76886517e258b 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -8,7 +8,6 @@
 
 /**
  * Eav data helper
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -21,25 +20,21 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesLockedFields = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_entityTypeFrontendClasses = [];
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\Config
-     * @since 2.0.0
      */
     protected $_attributeConfig;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -48,7 +43,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Eav\Model\Entity\Attribute\Config $attributeConfig
      * @param \Magento\Eav\Model\Config $eavConfig
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -64,7 +58,6 @@ public function __construct(
      * Return default frontend classes value label array
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultFrontendClasses()
     {
@@ -84,7 +77,6 @@ protected function _getDefaultFrontendClasses()
      *
      * @param string $entityTypeCode
      * @return array
-     * @since 2.0.0
      */
     public function getFrontendClasses($entityTypeCode)
     {
@@ -102,7 +94,6 @@ public function getFrontendClasses($entityTypeCode)
      *
      * @param string $entityTypeCode
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeLockedFields($entityTypeCode)
     {
@@ -124,7 +115,6 @@ public function getAttributeLockedFields($entityTypeCode)
      * Get input types validator data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInputTypesValidatorData()
     {
@@ -145,7 +135,6 @@ public function getInputTypesValidatorData()
      *      'attribute_table' => $attributeTable
      *      'backend_type' => $backendType
      * ]</pre>
-     * @since 2.0.0
      */
     public function getAttributeMetadata($entityTypeCode, $attributeCode)
     {
diff --git a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
index ad7f31e91ea56..159e40cf8a971 100644
--- a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
+++ b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
  *
- * @since 2.0.0
  */
 class Inputtype implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class Inputtype implements \Magento\Framework\Option\ArrayInterface
      * Return array of options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
index 251e9bb34fd4f..ee8fdd7c3f987 100644
--- a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
+++ b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
@@ -9,7 +9,6 @@
  * Validator for check input type value
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Validator extends \Zend_Validate_InArray
 {
@@ -17,14 +16,12 @@ class Validator extends \Zend_Validate_InArray
      * Eav data
      *
      * @var \Magento\Eav\Helper\Data
-     * @since 2.0.0
      */
     protected $_eavData = null;
 
     /**
      * @param \Magento\Eav\Helper\Data $eavData
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Eav\Helper\Data $eavData)
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Eav\Helper\Data $eavData)
      * Initialize message templates with translating
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessageTemplates()
     {
@@ -61,7 +57,6 @@ protected function _initMessageTemplates()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function addInputType($type)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute.php b/app/code/Magento/Eav/Model/Attribute.php
index fc8d0127a561c..16d8d9f6aafa0 100644
--- a/app/code/Magento/Eav/Model/Attribute.php
+++ b/app/code/Magento/Eav/Model/Attribute.php
@@ -19,7 +19,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\Entity\Attribute
 {
@@ -30,10 +29,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
     //const MODULE_NAME = 'Magento_Eav';
 
     /**
-     * Prefix of model events object
-     *
-     * @var string
-     * @since 2.0.0
+     * Name of the module
+     * Override it
      */
     protected $_eventObject = 'attribute';
 
@@ -41,7 +38,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * Active Website instance
      *
      * @var Website
-     * @since 2.0.0
      */
     protected $_website;
 
@@ -51,7 +47,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * @param Website|int $website
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setWebsite($website)
     {
@@ -63,7 +58,6 @@ public function setWebsite($website)
      * Return active website instance
      *
      * @return Website
-     * @since 2.0.0
      */
     public function getWebsite()
     {
@@ -78,7 +72,6 @@ public function getWebsite()
      * Processing object after save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -90,7 +83,6 @@ public function afterSave()
      * Return forms in which the attribute
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUsedInForms()
     {
@@ -106,7 +98,6 @@ public function getUsedInForms()
      * Return validate rules
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValidateRules()
     {
@@ -124,7 +115,6 @@ public function getValidateRules()
      *
      * @param array|string $rules
      * @return $this
-     * @since 2.0.0
      */
     public function setValidateRules($rules)
     {
@@ -143,7 +133,6 @@ public function setValidateRules($rules)
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getScopeValue($key)
     {
@@ -159,7 +148,6 @@ protected function _getScopeValue($key)
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsRequired()
     {
@@ -171,7 +159,6 @@ public function getIsRequired()
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsVisible()
     {
@@ -183,7 +170,6 @@ public function getIsVisible()
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
@@ -195,7 +181,6 @@ public function getDefaultValue()
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMultilineCount()
     {
@@ -204,7 +189,6 @@ public function getMultilineCount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index dae18c66f8ca6..9b27502b7b28e 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -18,7 +18,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractData
 {
@@ -26,7 +25,6 @@ abstract class AbstractData
      * Attribute instance
      *
      * @var \Magento\Eav\Model\Attribute
-     * @since 2.0.0
      */
     protected $_attribute;
 
@@ -34,7 +32,6 @@ abstract class AbstractData
      * Entity instance
      *
      * @var \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -42,7 +39,6 @@ abstract class AbstractData
      * Request Scope name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_requestScope;
 
@@ -50,7 +46,6 @@ abstract class AbstractData
      * Scope visibility flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_requestScopeOnly = true;
 
@@ -58,7 +53,6 @@ abstract class AbstractData
      * Is AJAX request flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isAjax = false;
 
@@ -67,7 +61,6 @@ abstract class AbstractData
      * Needed for depends attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_extractedData = [];
 
@@ -75,25 +68,21 @@ abstract class AbstractData
      * Date filter format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_dateFilterFormat;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -102,7 +91,6 @@ abstract class AbstractData
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -120,7 +108,6 @@ public function __construct(
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttribute(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
@@ -133,7 +120,6 @@ public function setAttribute(\Magento\Eav\Model\Entity\Attribute\AbstractAttribu
      *
      * @throws CoreException
      * @return \Magento\Eav\Model\Attribute
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -149,7 +135,6 @@ public function getAttribute()
      * @param string $scope
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setRequestScope($scope)
     {
@@ -164,7 +149,6 @@ public function setRequestScope($scope)
      * @param bool $flag
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setRequestScopeOnly($flag)
     {
@@ -178,7 +162,6 @@ public function setRequestScopeOnly($flag)
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntity(\Magento\Framework\Model\AbstractModel $entity)
     {
@@ -191,7 +174,6 @@ public function setEntity(\Magento\Framework\Model\AbstractModel $entity)
      *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws CoreException
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -207,7 +189,6 @@ public function getEntity()
      * @param array $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setExtractedData(array $data)
     {
@@ -220,7 +201,6 @@ public function setExtractedData(array $data)
      *
      * @param string $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getExtractedData($index = null)
     {
@@ -238,7 +218,6 @@ public function getExtractedData($index = null)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _applyInputFilter($value)
     {
@@ -258,7 +237,6 @@ protected function _applyInputFilter($value)
      * Return Data Form Input/Output Filter
      *
      * @return \Magento\Framework\Data\Form\Filter\FilterInterface|false
-     * @since 2.0.0
      */
     protected function _getFormFilter()
     {
@@ -280,7 +258,6 @@ protected function _getFormFilter()
      *
      * @param string|null|false $format
      * @return $this|string
-     * @since 2.0.0
      */
     protected function _dateFilterFormat($format = null)
     {
@@ -305,7 +282,6 @@ protected function _dateFilterFormat($format = null)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _applyOutputFilter($value)
     {
@@ -324,7 +300,6 @@ protected function _applyOutputFilter($value)
      * @return string|true
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _validateInputRule($value)
     {
@@ -503,7 +478,6 @@ protected function _validateInputRule($value)
      * @param bool $flag
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIsAjaxRequest($flag = true)
     {
@@ -517,7 +491,6 @@ public function setIsAjaxRequest($flag = true)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsAjaxRequest()
     {
@@ -529,7 +502,6 @@ public function getIsAjaxRequest()
      *
      * @param RequestInterface $request
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getRequestValue(RequestInterface $request)
     {
@@ -569,7 +541,6 @@ protected function _getRequestValue(RequestInterface $request)
      *
      * @param RequestInterface $request
      * @return array|string|bool
-     * @since 2.0.0
      */
     abstract public function extractValue(RequestInterface $request);
 
@@ -579,7 +550,6 @@ abstract public function extractValue(RequestInterface $request);
      * @param array|string $value
      * @throws CoreException
      * @return bool
-     * @since 2.0.0
      */
     abstract public function validateValue($value);
 
@@ -588,7 +558,6 @@ abstract public function validateValue($value);
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     abstract public function compactValue($value);
 
@@ -597,7 +566,6 @@ abstract public function compactValue($value);
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     abstract public function restoreValue($value);
 
@@ -606,7 +574,6 @@ abstract public function restoreValue($value);
      *
      * @param string $format
      * @return string|array
-     * @since 2.0.0
      */
     abstract public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT);
 }
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Boolean.php b/app/code/Magento/Eav/Model/Attribute/Data/Boolean.php
index c71172414cb02..1ffce236f0443 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Boolean.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Boolean.php
@@ -9,7 +9,6 @@
  * EAV Entity Attribute Boolean Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Attribute\Data\Select
 {
@@ -18,7 +17,6 @@ class Boolean extends \Magento\Eav\Model\Attribute\Data\Select
      *
      * @param int $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getOptionText($value)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Date.php b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
index 51c745cff3a3a..a48885925733f 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Date.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
@@ -11,7 +11,6 @@
  * EAV Entity Attribute Date Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Date extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
@@ -20,7 +19,6 @@ class Date extends \Magento\Eav\Model\Attribute\Data\AbstractData
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -36,7 +34,6 @@ public function extractValue(RequestInterface $request)
      * @return bool|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -107,7 +104,6 @@ public function validateValue($value)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -126,7 +122,6 @@ public function compactValue($value)
      * @param array|string $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -138,7 +133,6 @@ public function restoreValue($value)
      *
      * @param string $format
      * @return string|array
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 73d9d58fdc12f..1c6a7dee956c7 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -12,7 +12,6 @@
  * EAV Entity Attribute File Data Model
  *
  * @api
- * @since 2.0.0
  */
 class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
@@ -20,25 +19,21 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
      * Validator for check not protected extensions
      *
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_validatorNotProtectedExtensions;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_fileValidator;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
@@ -50,7 +45,6 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator
      * @param \Magento\Framework\Filesystem $filesystem
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -72,7 +66,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return array|string|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -131,7 +124,6 @@ public function extractValue(RequestInterface $request)
      *
      * @param array $value
      * @return string[]
-     * @since 2.0.0
      */
     protected function _validateByRules($value)
     {
@@ -175,7 +167,6 @@ protected function _validateByRules($value)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -219,7 +210,6 @@ public function validateValue($value)
      * @param array|string $value
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -275,7 +265,6 @@ public function compactValue($value)
      *
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -287,7 +276,6 @@ public function restoreValue($value)
      *
      * @param string $format
      * @return string|array
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Hidden.php b/app/code/Magento/Eav/Model/Attribute/Data/Hidden.php
index 6fc66fab3b2c8..a413bd110176e 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Hidden.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Hidden.php
@@ -9,7 +9,6 @@
  * EAV Entity Attribute Hidden text Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Hidden extends \Magento\Eav\Model\Attribute\Data\Text
 {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Image.php b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
index 3865fca0a5135..d04b7e9b940cf 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Image.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
@@ -9,7 +9,6 @@
  * EAV Entity Attribute Image File Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Image extends \Magento\Eav\Model\Attribute\Data\File
 {
@@ -21,7 +20,6 @@ class Image extends \Magento\Eav\Model\Attribute\Data\File
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _validateByRules($value)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
index d356cc27082dc..0eaa98c93067c 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
@@ -11,7 +11,6 @@
  * EAV Entity Attribute Multiply line Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Multiline extends \Magento\Eav\Model\Attribute\Data\Text
 {
@@ -20,7 +19,6 @@ class Multiline extends \Magento\Eav\Model\Attribute\Data\Text
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -39,7 +37,6 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return bool|array
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -76,7 +73,6 @@ public function validateValue($value)
      *
      * @param bool|string|array $value
      * @return array list of lines represented by given value
-     * @since 2.0.0
      */
     protected function processValue($value)
     {
@@ -97,7 +93,6 @@ protected function processValue($value)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -113,7 +108,6 @@ public function compactValue($value)
      * @param array|string $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -125,7 +119,6 @@ public function restoreValue($value)
      *
      * @param string $format
      * @return array|string
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php b/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
index 62a01b69c83cd..1a84d5c1cbdc4 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
@@ -11,7 +11,6 @@
  * EAV Entity Attribute Multiply select Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Multiselect extends \Magento\Eav\Model\Attribute\Data\Select
 {
@@ -20,7 +19,6 @@ class Multiselect extends \Magento\Eav\Model\Attribute\Data\Select
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -36,7 +34,6 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -51,7 +48,6 @@ public function compactValue($value)
      *
      * @param string $format
      * @return array|string
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Select.php b/app/code/Magento/Eav/Model/Attribute/Data/Select.php
index bac5217d6e0b8..92aa09e7ccac6 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Select.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Select.php
@@ -11,7 +11,6 @@
  * EAV Entity Attribute Select Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Select extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
@@ -20,7 +19,6 @@ class Select extends \Magento\Eav\Model\Attribute\Data\AbstractData
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -33,7 +31,6 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return bool|array
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -66,7 +63,6 @@ public function validateValue($value)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -82,7 +78,6 @@ public function compactValue($value)
      * @param array|string $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -94,7 +89,6 @@ public function restoreValue($value)
      *
      * @param int $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getOptionText($value)
     {
@@ -106,7 +100,6 @@ protected function _getOptionText($value)
      *
      * @param string $format
      * @return string|array
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 241738c735f01..646216a4cc31a 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -11,13 +11,11 @@
  * EAV Entity Attribute Text Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_string;
 
@@ -27,7 +25,6 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\StringUtils $stringHelper
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -44,7 +41,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return array|string
-     * @since 2.0.0
      */
     public function extractValue(RequestInterface $request)
     {
@@ -60,7 +56,6 @@ public function extractValue(RequestInterface $request)
      * @return bool|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateValue($value)
     {
@@ -112,7 +107,6 @@ public function validateValue($value)
      *
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function compactValue($value)
     {
@@ -128,7 +122,6 @@ public function compactValue($value)
      * @param array|string $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function restoreValue($value)
     {
@@ -141,7 +134,6 @@ public function restoreValue($value)
      * @param string $format
      * @return string|array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Textarea.php b/app/code/Magento/Eav/Model/Attribute/Data/Textarea.php
index 9501e32f0894e..453182bc16eba 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Textarea.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Textarea.php
@@ -9,7 +9,6 @@
  * EAV Entity Attribute Text Area Data Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Textarea extends \Magento\Eav\Model\Attribute\Data\Text
 {
diff --git a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
index 6a7520f35c0fc..f4b4cc552ef4b 100644
--- a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
+++ b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
@@ -12,43 +12,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GroupRepository implements \Magento\Eav\Api\AttributeGroupRepositoryInterface
 {
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group
-     * @since 2.0.0
      */
     protected $groupResource;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     protected $setRepository;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory
-     * @since 2.0.0
      */
     protected $groupListFactory;
 
     /**
      * @var \Magento\Eav\Api\Data\AttributeGroupSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -67,7 +60,6 @@ class GroupRepository implements \Magento\Eav\Api\AttributeGroupRepositoryInterf
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group $groupResource,
@@ -89,7 +81,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {
@@ -124,7 +115,6 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -154,7 +144,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($groupId)
     {
@@ -169,7 +158,6 @@ public function get($groupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {
@@ -189,7 +177,6 @@ public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($groupId)
     {
@@ -202,7 +189,6 @@ public function deleteById($groupId)
     /**
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
-     * @since 2.0.0
      */
     protected function retrieveAttributeSetIdFromSearchCriteria(
         \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Eav/Model/AttributeDataFactory.php b/app/code/Magento/Eav/Model/AttributeDataFactory.php
index 611b146ede18b..e5844b093e347 100644
--- a/app/code/Magento/Eav/Model/AttributeDataFactory.php
+++ b/app/code/Magento/Eav/Model/AttributeDataFactory.php
@@ -10,7 +10,6 @@
  * EAV Entity Attribute Data Factory
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class AttributeDataFactory
 {
@@ -23,23 +22,16 @@ class AttributeDataFactory
 
     // available only for multiply attributes
 
-    /**
-     * Array of attribute data models by input type
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    // available only for multiply attributes
     protected $_dataModels = [];
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -47,7 +39,6 @@ class AttributeDataFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -64,7 +55,6 @@ public function __construct(
      * @param \Magento\Eav\Model\Attribute $attribute
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return \Magento\Eav\Model\Attribute\Data\AbstractData
-     * @since 2.0.0
      */
     public function create(\Magento\Eav\Model\Attribute $attribute, \Magento\Framework\Model\AbstractModel $entity)
     {
diff --git a/app/code/Magento/Eav/Model/AttributeFactory.php b/app/code/Magento/Eav/Model/AttributeFactory.php
index 94d6dbd7ee6c8..d58934e49f104 100644
--- a/app/code/Magento/Eav/Model/AttributeFactory.php
+++ b/app/code/Magento/Eav/Model/AttributeFactory.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class AttributeFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function createAttribute($className, $arguments = [])
     {
diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index ccc5e5578dee0..06dff152fc6f8 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -12,50 +12,42 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     protected $setRepository;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
      * @deprecated 2.2.0 please use instead \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $attributeCollection;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Eav\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $entityTypeFactory;
 
     /**
      * @var \Magento\Eav\Api\AttributeGroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var AttributeRepository
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
-     * @since 2.0.0
      */
     protected $attributeResource;
 
@@ -76,7 +68,6 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
      * @param \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute $attributeResource
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory|null $attributeCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Api\AttributeSetRepositoryInterface $setRepository,
@@ -101,7 +92,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder)
     {
@@ -139,7 +129,6 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function unassign($attributeSetId, $attributeCode)
     {
@@ -171,7 +160,6 @@ public function unassign($attributeSetId, $attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributes($entityType, $attributeSetId)
     {
diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
index cf04c6ef53ae4..81b4e6e076dde 100644
--- a/app/code/Magento/Eav/Model/AttributeRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeRepository.php
@@ -13,43 +13,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AttributeRepository implements \Magento\Eav\Api\AttributeRepositoryInterface
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
-     * @since 2.0.0
      */
     protected $eavResource;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $attributeCollectionFactory;
 
     /**
      * @var \Magento\Eav\Api\Data\AttributeSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $attributeFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -68,7 +61,6 @@ class AttributeRepository implements \Magento\Eav\Api\AttributeRepositoryInterfa
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
@@ -90,7 +82,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute)
     {
@@ -104,7 +95,6 @@ public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -158,7 +148,6 @@ public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaIn
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($entityTypeCode, $attributeCode)
     {
@@ -174,7 +163,6 @@ public function get($entityTypeCode, $attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Eav\Api\Data\AttributeInterface $attribute)
     {
@@ -188,7 +176,6 @@ public function delete(\Magento\Eav\Api\Data\AttributeInterface $attribute)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($attributeId)
     {
diff --git a/app/code/Magento/Eav/Model/AttributeSetManagement.php b/app/code/Magento/Eav/Model/AttributeSetManagement.php
index b834f6dc00051..d820c84c85fa7 100644
--- a/app/code/Magento/Eav/Model/AttributeSetManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeSetManagement.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Eav\Model\AttributeSetManagement
  *
- * @since 2.0.0
  */
 class AttributeSetManagement implements AttributeSetManagementInterface
 {
     /**
      * @var EavConfig
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var AttributeSetRepositoryInterface
-     * @since 2.0.0
      */
     private $repository;
 
@@ -34,7 +31,6 @@ class AttributeSetManagement implements AttributeSetManagementInterface
      * @param Config $eavConfig
      * @param AttributeSetRepositoryInterface $repository
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         EavConfig $eavConfig,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create($entityTypeCode, AttributeSetInterface $attributeSet, $skeletonId)
     {
diff --git a/app/code/Magento/Eav/Model/AttributeSetRepository.php b/app/code/Magento/Eav/Model/AttributeSetRepository.php
index 040083c9a28ea..9ff5f028c487f 100644
--- a/app/code/Magento/Eav/Model/AttributeSetRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeSetRepository.php
@@ -19,43 +19,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AttributeSetRepository implements AttributeSetRepositoryInterface
 {
     /**
      * @var AttributeSetResource
-     * @since 2.0.0
      */
     private $attributeSetResource;
 
     /**
      * @var AttributeSetFactory
-     * @since 2.0.0
      */
     private $attributeSetFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $collectionFactory;
 
     /**
      * @var EavConfig
-     * @since 2.0.0
      */
     private $eavConfig;
 
     /**
      * @var \Magento\Eav\Api\Data\AttributeSetSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     private $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -74,7 +67,6 @@ class AttributeSetRepository implements AttributeSetRepositoryInterface
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         AttributeSetResource $attributeSetResource,
@@ -96,7 +88,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(AttributeSetInterface $attributeSet)
     {
@@ -110,7 +101,6 @@ public function save(AttributeSetInterface $attributeSet)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -134,7 +124,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @deprecated 2.2.0
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
-     * @since 2.0.0
      */
     protected function getEntityTypeCode(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -150,7 +139,6 @@ protected function getEntityTypeCode(\Magento\Framework\Api\SearchCriteriaInterf
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($attributeSetId)
     {
@@ -166,7 +154,6 @@ public function get($attributeSetId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(AttributeSetInterface $attributeSet)
     {
@@ -182,7 +169,6 @@ public function delete(AttributeSetInterface $attributeSet)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($attributeSetId)
     {
diff --git a/app/code/Magento/Eav/Model/Cache/Type.php b/app/code/Magento/Eav/Model/Cache/Type.php
index cf80b0126d8e8..97efa03c88b4b 100644
--- a/app/code/Magento/Eav/Model/Cache/Type.php
+++ b/app/code/Magento/Eav/Model/Cache/Type.php
@@ -9,7 +9,6 @@
  * System / Cache Management / Cache type "EAV types and attributes"
  *
  * @todo utilize the class for all manipulations with the cache type
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -26,7 +25,6 @@ class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index 749ae0310612f..6f9ea2e4e9a89 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -13,7 +13,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Config
 {
@@ -25,19 +24,13 @@ class Config
     const ATTRIBUTES_CODES_CACHE_ID = 'EAV_ENTITY_ATTRIBUTES_CODES';
     /**#@-*/
 
-    /**
-     * Entity types data
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_entityTypeData;
 
     /**
      * Attributes data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeData;
 
@@ -45,7 +38,6 @@ class Config
      * Attribute codes cache array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeCodes;
 
@@ -55,7 +47,6 @@ class Config
      * array ($objectId => $object)
      *
      * @var \Magento\Eav\Model\Entity\Type[]
-     * @since 2.0.0
      */
     protected $_objects;
 
@@ -80,7 +71,6 @@ class Config
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_references;
 
@@ -88,37 +78,31 @@ class Config
      * Cache flag
      *
      * @var bool|null
-     * @since 2.0.0
      */
     protected $_isCacheEnabled = null;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     protected $_cacheState;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $_entityTypeFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Type\CollectionFactory
-     * @since 2.0.0
      */
     protected $entityTypeCollectionFactory;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
@@ -150,7 +134,6 @@ class Config
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param SerializerInterface $serializer
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
@@ -173,7 +156,6 @@ public function __construct(
      *
      * @return \Magento\Framework\App\CacheInterface
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCache()
     {
@@ -184,7 +166,6 @@ public function getCache()
      * Reset object state
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -209,7 +190,6 @@ public function clear()
      *
      * @param   mixed $id
      * @return  mixed
-     * @since 2.0.0
      */
     protected function _load($id)
     {
@@ -235,7 +215,6 @@ private function loadAttributes($entityTypeCode)
      * @param   mixed $id
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _save($obj, $id)
     {
@@ -263,7 +242,6 @@ private function saveAttribute(AbstractAttribute $attribute, $entityTypeCode, $a
      * @param   string $code
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _addEntityTypeReference($id, $code)
     {
@@ -276,7 +254,6 @@ protected function _addEntityTypeReference($id, $code)
      *
      * @param   int $id
      * @return  string
-     * @since 2.0.0
      */
     protected function _getEntityTypeReference($id)
     {
@@ -290,7 +267,6 @@ protected function _getEntityTypeReference($id)
      * @param   string $code
      * @param   string $entityTypeCode
      * @return $this
-     * @since 2.0.0
      */
     protected function _addAttributeReference($id, $code, $entityTypeCode)
     {
@@ -304,7 +280,6 @@ protected function _addAttributeReference($id, $code, $entityTypeCode)
      * @param   int $id
      * @param   string $entityTypeCode
      * @return  string|null
-     * @since 2.0.0
      */
     protected function _getAttributeReference($id, $entityTypeCode)
     {
@@ -320,7 +295,6 @@ protected function _getAttributeReference($id, $entityTypeCode)
      * @param   string $code
      * @return  string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getEntityKey($code)
     {
@@ -334,7 +308,6 @@ protected function _getEntityKey($code)
      * @param   string $attributeCode
      * @return  string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getAttributeKey($entityTypeCode, $attributeCode)
     {
@@ -347,7 +320,6 @@ protected function _getAttributeKey($entityTypeCode, $attributeCode)
      * Check EAV cache availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCacheEnabled()
     {
@@ -361,7 +333,6 @@ public function isCacheEnabled()
      * Initialize all entity types data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initEntityTypes()
     {
@@ -413,7 +384,6 @@ protected function _initEntityTypes()
      * @param int|string|Type $code
      * @return Type
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getEntityType($code)
     {
@@ -455,7 +425,6 @@ public function getEntityType($code)
      *
      * @param string $entityType
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributes($entityType)
     {
@@ -524,7 +493,6 @@ public function getAttributes($entityType)
      * @param   mixed $code
      * @return  AbstractAttribute
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAttribute($entityType, $code)
     {
@@ -583,7 +551,6 @@ private function createAttribute($model)
      * @param mixed $entityType
      * @param \Magento\Framework\DataObject $object
      * @return string[]
-     * @since 2.0.0
      */
     public function getEntityAttributeCodes($entityType, $object = null)
     {
@@ -664,7 +631,6 @@ public function getEntityAttributes($entityType, $object = null)
      * @param string $entityType
      * @param array $attributeData
      * @return AbstractAttribute
-     * @since 2.0.0
      */
     protected function _createAttribute($entityType, $attributeData)
     {
@@ -705,7 +671,6 @@ protected function _createAttribute($entityType, $attributeData)
      *
      * @param array $attributeData
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateAttributeData($attributeData = null)
     {
@@ -728,7 +693,6 @@ protected function _validateAttributeData($attributeData = null)
      * @param string|Type $entityType
      * @param array $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function importAttributesData($entityType, array $attributes)
     {
diff --git a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
index 74bb9a2eb2328..48594494561ed 100644
--- a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
+++ b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
@@ -15,25 +15,21 @@
 
 /**
  * Class to locate types for Eav custom attributes
- * @since 2.0.0
  */
 class EavCustomAttributeTypeLocator implements CustomAttributeTypeLocatorInterface
 {
     /**
      * @var AttributeRepositoryInterface
-     * @since 2.0.0
      */
     private $attributeRepository;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $serviceEntityTypeMap;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $serviceBackendModelDataInterfaceMap;
 
@@ -73,7 +69,6 @@ class EavCustomAttributeTypeLocator implements CustomAttributeTypeLocatorInterfa
      *                             ]
      * ]
      * </pre>
-     * @since 2.0.0
      */
     public function __construct(
         AttributeRepositoryInterface $attributeRepository,
@@ -88,7 +83,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType($attributeCode, $serviceClass)
     {
@@ -114,7 +108,6 @@ public function getType($attributeCode, $serviceClass)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllServiceDataInterfaces()
     {
diff --git a/app/code/Magento/Eav/Model/Entity.php b/app/code/Magento/Eav/Model/Entity.php
index 7e5c19d7e329c..a0848d999423c 100644
--- a/app/code/Magento/Eav/Model/Entity.php
+++ b/app/code/Magento/Eav/Model/Entity.php
@@ -8,7 +8,6 @@
 /**
  * EAV entity model
  *
- * @since 2.0.0
  */
 class Entity extends \Magento\Eav\Model\Entity\AbstractEntity
 {
@@ -30,7 +29,6 @@ class Entity extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param Entity\Context $context
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Eav\Model\Entity\Context $context, $data = [])
     {
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 2098295edb463..d10f450bf52d1 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -31,7 +31,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEntity extends AbstractResource implements EntityInterface, DefaultAttributesProvider
 {
@@ -45,7 +44,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Connection name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $connectionName;
 
@@ -53,7 +51,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity type configuration
      *
      * @var Type
-     * @since 2.0.0
      */
     protected $_type;
 
@@ -61,7 +58,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Attributes array by attribute name
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesByCode = [];
 
@@ -69,7 +65,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Two-dimensional array by table name and attribute name
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesByTable = [];
 
@@ -77,7 +72,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Attributes that are static fields in entity table
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_staticAttributes = [];
 
@@ -85,7 +79,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTable;
 
@@ -93,7 +86,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Describe data for tables
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_describeTable = [];
 
@@ -101,7 +93,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity table identification field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityIdField;
 
@@ -117,7 +108,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity values table identification field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_valueEntityIdField;
 
@@ -125,7 +115,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity value table prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_valueTablePrefix;
 
@@ -133,7 +122,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity table string
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTablePrefix;
 
@@ -141,7 +129,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Partial load flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPartialLoad = false;
 
@@ -149,7 +136,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Partial save flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPartialSave = false;
 
@@ -157,7 +143,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Attribute set id which used for get sorted attributes
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_sortingSetId = null;
 
@@ -165,7 +150,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity attribute values per backend table to delete
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeValuesToDelete = [];
 
@@ -173,7 +157,6 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * Entity attribute values per backend table to save
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeValuesToSave = [];
 
@@ -182,62 +165,52 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      * The table name as key
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_attributeBackendTables = [];
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\Set
-     * @since 2.0.0
      */
     protected $_attrSetEntity;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
     /**
      * @var TransactionManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var ObjectRelationProcessor
-     * @since 2.0.0
      */
     protected $objectRelationProcessor;
 
     /**
      * @param Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, $data = [])
     {
@@ -264,7 +237,6 @@ public function __construct(Context $context, $data = [])
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|string $connection
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setConnection($connection)
     {
@@ -276,7 +248,6 @@ public function setConnection($connection)
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -287,7 +258,6 @@ protected function _construct()
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -299,7 +269,6 @@ public function getConnection()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -312,7 +281,6 @@ public function getIdFieldName()
      * @param string $alias
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTable($alias)
     {
@@ -326,7 +294,6 @@ public function getTable($alias)
      *
      * @param string|Type $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -339,7 +306,6 @@ public function setType($type)
      *
      * @return Type
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -353,7 +319,6 @@ public function getEntityType()
      * Get entity type name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -364,7 +329,6 @@ public function getType()
      * Get entity type id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTypeId()
     {
@@ -380,7 +344,6 @@ public function getTypeId()
      * @param array|string|null $attributes
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function unsetAttributes($attributes = null)
     {
@@ -415,7 +378,6 @@ public function unsetAttributes($attributes = null)
      * Get EAV config model
      *
      * @return \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected function _getConfig()
     {
@@ -432,7 +394,6 @@ protected function _getConfig()
      * @param string|int|Element $attribute
      * @return AbstractAttribute|false
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getAttribute($attribute)
     {
@@ -494,7 +455,6 @@ public function getAttribute($attribute)
      *
      * @param AbstractAttribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute(AbstractAttribute $attribute)
     {
@@ -517,7 +477,6 @@ public function addAttribute(AbstractAttribute $attribute)
      *
      * @param bool $flag
      * @return bool
-     * @since 2.0.0
      */
     public function isPartialLoad($flag = null)
     {
@@ -533,7 +492,6 @@ public function isPartialLoad($flag = null)
      *
      * @param bool $flag
      * @return bool
-     * @since 2.0.0
      */
     public function isPartialSave($flag = null)
     {
@@ -549,7 +507,6 @@ public function isPartialSave($flag = null)
      *
      * @param null|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function loadAllAttributes($object = null)
     {
@@ -561,7 +518,6 @@ public function loadAllAttributes($object = null)
      *
      * @param int $setId
      * @return array
-     * @since 2.0.0
      */
     public function getSortedAttributes($setId = null)
     {
@@ -591,7 +547,6 @@ public function getSortedAttributes($setId = null)
      * @param Attribute $firstAttribute
      * @param Attribute $secondAttribute
      * @return int
-     * @since 2.0.0
      */
     public function attributesCompare($firstAttribute, $secondAttribute)
     {
@@ -614,7 +569,6 @@ public function attributesCompare($firstAttribute, $secondAttribute)
      * @param   AbstractAttribute $attribute
      * @return  bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isApplicableAttribute($object, $attribute)
     {
@@ -637,7 +591,6 @@ protected function _isApplicableAttribute($object, $attribute)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function walkAttributes($partMethod, array $args = [], $collectExceptionMessages = null)
     {
@@ -721,7 +674,6 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
      * @param array $args array of arguments
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isCallableAttributeInstance($instance, $method, $args)
     {
@@ -736,7 +688,6 @@ protected function _isCallableAttributeInstance($instance, $method, $args)
      * Get attributes by name array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesByCode()
     {
@@ -747,7 +698,6 @@ public function getAttributesByCode()
      * Get attributes by table and name array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributesByTable()
     {
@@ -758,7 +708,6 @@ public function getAttributesByTable()
      * Get entity table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTable()
     {
@@ -797,7 +746,6 @@ public function getLinkField()
      * Get entity id field name in entity table
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityIdField()
     {
@@ -815,7 +763,6 @@ public function getEntityIdField()
      * Get default entity id field name in attribute values tables
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueEntityIdField()
     {
@@ -826,7 +773,6 @@ public function getValueEntityIdField()
      * Get prefix for value tables
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueTablePrefix()
     {
@@ -850,7 +796,6 @@ public function getValueTablePrefix()
      * Get entity table prefix for value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTablePrefix()
     {
@@ -874,7 +819,6 @@ public function getEntityTablePrefix()
      * @see \Magento\Eav\Model\Entity\AbstractEntity::getAttribute for $attribute format
      * @param int|string|AbstractAttribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeStatic($attribute)
     {
@@ -888,7 +832,6 @@ public function isAttributeStatic($attribute)
      * @param \Magento\Framework\DataObject $object
      * @throws \Magento\Eav\Model\Entity\Attribute\Exception
      * @return true|array
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -914,7 +857,6 @@ public function validate($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function setNewIncrementId(\Magento\Framework\DataObject $object)
     {
@@ -937,7 +879,6 @@ public function setNewIncrementId(\Magento\Framework\DataObject $object)
      * @param AbstractAttribute $attribute
      * @param \Magento\Framework\DataObject $object
      * @return bool
-     * @since 2.0.0
      */
     public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
     {
@@ -993,7 +934,6 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
      * Retrieve default source model
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultAttributeSourceModel()
     {
@@ -1007,7 +947,6 @@ public function getDefaultAttributeSourceModel()
      * @param   int $entityId
      * @param   array|null $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function load($object, $entityId, $attributes = [])
     {
@@ -1055,7 +994,6 @@ protected function loadAttributesMetadata($attributes)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadModelAttributes($object)
     {
@@ -1097,7 +1035,6 @@ protected function _loadModelAttributes($object)
      *
      * @param  array $selects
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _prepareLoadSelect(array $selects)
     {
@@ -1111,7 +1048,6 @@ protected function _prepareLoadSelect(array $selects)
      * @param   string|int $rowId
      * @return  \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getLoadRowSelect($object, $rowId)
     {
@@ -1131,7 +1067,6 @@ protected function _getLoadRowSelect($object, $rowId)
      * @param   \Magento\Framework\DataObject $object
      * @param   string $table
      * @return  \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadAttributesSelect($object, $table)
     {
@@ -1152,7 +1087,6 @@ protected function _getLoadAttributesSelect($object, $table)
      * @param   \Magento\Framework\DataObject $object
      * @param   array $valueRow
      * @return $this
-     * @since 2.0.0
      */
     protected function _setAttributeValue($object, $valueRow)
     {
@@ -1173,7 +1107,6 @@ protected function _setAttributeValue($object, $valueRow)
      * @return $this
      * @throws \Exception
      * @throws AlreadyExistsException
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -1243,7 +1176,6 @@ protected function processSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getOrigObject($object)
     {
@@ -1262,7 +1194,6 @@ protected function _getOrigObject($object)
      * @param AbstractAttribute $attribute
      * @param AbstractEntity $object
      * @return void
-     * @since 2.0.0
      */
     private function _aggregateDeleteData(&$delete, $attribute, $object)
     {
@@ -1286,7 +1217,6 @@ private function _aggregateDeleteData(&$delete, $attribute, $object)
      * @return  array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _collectSaveData($newObject)
     {
@@ -1393,7 +1323,6 @@ protected function _collectSaveData($newObject)
      * @param array $origData
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _canUpdateAttribute(AbstractAttribute $attribute, $v, array &$origData)
     {
@@ -1405,7 +1334,6 @@ protected function _canUpdateAttribute(AbstractAttribute $attribute, $v, array &
      *
      * @param string $field
      * @return array
-     * @since 2.0.0
      */
     protected function _getStaticFieldProperties($field)
     {
@@ -1428,7 +1356,6 @@ protected function _getStaticFieldProperties($field)
      * @param string $key
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareStaticValue($key, $value)
     {
@@ -1452,7 +1379,6 @@ protected function _prepareStaticValue($key, $value)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _processSaveData($saveData)
     {
@@ -1548,7 +1474,6 @@ protected function _processSaveData($saveData)
      * @param   AbstractAttribute $attribute
      * @param   mixed $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _insertAttribute($object, $attribute, $value)
     {
@@ -1564,7 +1489,6 @@ protected function _insertAttribute($object, $attribute, $value)
      * @param   mixed $value
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
@@ -1580,7 +1504,6 @@ protected function _updateAttribute($object, $attribute, $valueId, $value)
      * @param AbstractAttribute $attribute
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveAttribute($object, $attribute, $value)
     {
@@ -1610,7 +1533,6 @@ protected function _saveAttribute($object, $attribute, $value)
      * Save and delete collected attribute values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _processAttributeValues()
     {
@@ -1636,7 +1558,6 @@ protected function _processAttributeValues()
      * @param mixed $value
      * @param AbstractAttribute $attribute
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareValueForSave($value, AbstractAttribute $attribute)
     {
@@ -1662,7 +1583,6 @@ protected function _prepareValueForSave($value, AbstractAttribute $attribute)
      * @param   array $info
      * @return  \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _deleteAttributes($object, $table, $info)
     {
@@ -1692,7 +1612,6 @@ protected function _deleteAttributes($object, $table, $info)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function saveAttribute(\Magento\Framework\DataObject $object, $attributeCode)
     {
@@ -1744,7 +1663,6 @@ public function saveAttribute(\Magento\Framework\DataObject $object, $attributeC
      * @param \Magento\Framework\DataObject $object
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributeRow($entity, $object, $attribute)
     {
@@ -1767,7 +1685,6 @@ protected function getAttributeRow($entity, $object, $attribute)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function delete($object)
     {
@@ -1842,7 +1759,6 @@ protected function evaluateDelete($object, $id, $connection)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\DataObject $object)
     {
@@ -1857,7 +1773,6 @@ protected function _afterLoad(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\DataObject $object)
     {
@@ -1870,7 +1785,6 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\DataObject $object)
     {
@@ -1883,7 +1797,6 @@ protected function _afterSave(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeDelete(\Magento\Framework\DataObject $object)
     {
@@ -1896,7 +1809,6 @@ protected function _beforeDelete(\Magento\Framework\DataObject $object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\DataObject $object)
     {
@@ -1908,7 +1820,6 @@ protected function _afterDelete(\Magento\Framework\DataObject $object)
      * Retrieve Default attribute model
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultAttributeModel()
     {
@@ -1919,7 +1830,6 @@ protected function _getDefaultAttributeModel()
      * Retrieve default entity attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getDefaultAttributes()
     {
@@ -1930,7 +1840,6 @@ protected function _getDefaultAttributes()
      * Retrieve default entity static attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDefaultAttributes()
     {
@@ -1946,7 +1855,6 @@ public function getDefaultAttributes()
      * @param AbstractAttribute $attribute
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAttributeValueEmpty(AbstractAttribute $attribute, $value)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index d0c2b3bf50f08..63de55c7e5d39 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -16,7 +16,6 @@
  * @method \Magento\Eav\Model\Entity\Attribute setOption($value)
  * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute implements
     \Magento\Framework\DataObject\IdentityInterface
@@ -35,7 +34,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'eav_entity_attribute';
 
@@ -45,37 +43,31 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * In observe method you can use $observer->getEvent()->getAttribute() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'attribute';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheTag = self::CACHE_TAG;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Catalog\Model\Product\ReservedAttributeList
-     * @since 2.0.0
      */
     protected $reservedAttributeList;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -101,7 +93,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -151,7 +142,6 @@ public function __construct(
      * Retrieve default attribute backend model by attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultBackendModel()
     {
@@ -179,7 +169,6 @@ protected function _getDefaultBackendModel()
      * Retrieve default attribute source model
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultSourceModel()
     {
@@ -194,7 +183,6 @@ protected function _getDefaultSourceModel()
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function deleteEntity()
     {
@@ -205,7 +193,6 @@ public function deleteEntity()
      * Load entity_attribute_id into $this by $this->attribute_set_id
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadEntityAttributeIdBySet()
     {
@@ -231,7 +218,6 @@ public function loadEntityAttributeIdBySet()
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -309,7 +295,6 @@ public function beforeSave()
      * Save additional data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -319,7 +304,7 @@ public function afterSave()
 
     /**
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function afterDelete()
     {
@@ -332,7 +317,6 @@ public function afterDelete()
      * @param string $type frontend_input field value
      * @return string backend_type field value
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getBackendTypeByInput($type)
     {
@@ -377,7 +361,6 @@ public function getBackendTypeByInput($type)
      * @param string $type frontend_input field name
      * @return string default_value field value
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getDefaultValueByInput($type)
     {
@@ -423,7 +406,6 @@ public function getDefaultValueByInput($type)
      * @param string $type
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeCodesByFrontendType($type)
     {
@@ -434,7 +416,6 @@ public function getAttributeCodesByFrontendType($type)
      * Return array of labels of stores
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getStoreLabels()
     {
@@ -450,7 +431,6 @@ public function getStoreLabels()
      *
      * @param int|null $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel($storeId = null)
     {
@@ -471,7 +451,6 @@ public function getStoreLabel($storeId = null)
      *
      * @param int $setId
      * @return float
-     * @since 2.0.0
      */
     public function getSortWeight($setId)
     {
@@ -489,7 +468,6 @@ public function getSortWeight($setId)
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -498,7 +476,7 @@ public function getIdentities()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -511,7 +489,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 79ae95a5a4681..4ac86ad1aeaf8 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     AttributeInterface,
@@ -34,7 +33,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Attribute name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_name;
 
@@ -42,7 +40,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Entity instance
      *
      * @var \Magento\Eav\Model\Entity\AbstractEntity
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -50,7 +47,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Backend instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * @since 2.0.0
      */
     protected $_backend;
 
@@ -58,7 +54,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Frontend instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
-     * @since 2.0.0
      */
     protected $_frontend;
 
@@ -66,7 +61,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Source instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -74,7 +68,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Attribute id cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeIdCache = [];
 
@@ -82,55 +75,46 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Attribute data table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_dataTable = null;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $_eavTypeFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
     /**
      * @var \Magento\Eav\Api\Data\AttributeOptionInterfaceFactory
-     * @since 2.0.0
      */
     protected $optionDataFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -175,7 +159,6 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -234,7 +217,6 @@ protected function getSerializer()
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -248,7 +230,6 @@ protected function _construct()
      * @param  string $code
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function loadByCode($entityType, $code)
     {
@@ -276,7 +257,6 @@ public function loadByCode($entityType, $code)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -289,7 +269,6 @@ public function getName()
      * @param   int $data
      * @return  $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeId($data)
     {
@@ -301,7 +280,6 @@ public function setAttributeId($data)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeId()
     {
@@ -312,7 +290,6 @@ public function getAttributeId()
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeCode($data)
     {
@@ -322,7 +299,6 @@ public function setAttributeCode($data)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -333,7 +309,6 @@ public function getAttributeCode()
      * @param array $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeModel($data)
     {
@@ -343,7 +318,6 @@ public function setAttributeModel($data)
     /**
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeModel()
     {
@@ -354,7 +328,6 @@ public function getAttributeModel()
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setBackendType($data)
     {
@@ -364,7 +337,6 @@ public function setBackendType($data)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBackendType()
     {
@@ -375,7 +347,6 @@ public function getBackendType()
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setBackendModel($data)
     {
@@ -385,7 +356,6 @@ public function setBackendModel($data)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBackendModel()
     {
@@ -396,7 +366,6 @@ public function getBackendModel()
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setBackendTable($data)
     {
@@ -407,7 +376,6 @@ public function setBackendTable($data)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -417,7 +385,6 @@ public function getIsVisibleOnFront()
     /**
      * @return string|int|bool|float
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
@@ -430,7 +397,6 @@ public function getDefaultValue()
      * @param string $defaultValue
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setDefaultValue($defaultValue)
     {
@@ -440,7 +406,6 @@ public function setDefaultValue($defaultValue)
     /**
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeSetId()
     {
@@ -451,7 +416,6 @@ public function getAttributeSetId()
      * @param int $id
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeSetId($id)
     {
@@ -463,7 +427,6 @@ public function setAttributeSetId($id)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -474,7 +437,6 @@ public function getEntityTypeId()
      * @param int|string $id
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntityTypeId($id)
     {
@@ -487,7 +449,6 @@ public function setEntityTypeId($id)
      * @param string $type
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntityType($type)
     {
@@ -501,7 +462,6 @@ public function setEntityType($type)
      *
      * @param \Magento\Eav\Model\Entity\AbstractEntity $entity exclude this entity
      * @return string
-     * @since 2.0.0
      */
     public function getAlias($entity = null)
     {
@@ -520,7 +480,6 @@ public function getAlias($entity = null)
      * @param   string $name
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -532,7 +491,6 @@ public function setName($name)
      *
      * @return \Magento\Eav\Model\Entity\Type
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -545,7 +503,6 @@ public function getEntityType()
      * @param \Magento\Eav\Model\Entity\AbstractEntity $entity
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntity($entity)
     {
@@ -558,7 +515,6 @@ public function setEntity($entity)
      * Retrieve entity instance
      *
      * @return \Magento\Eav\Model\Entity\AbstractEntity
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -574,7 +530,6 @@ public function getEntity()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntityIdField()
     {
@@ -586,7 +541,6 @@ public function getEntityIdField()
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getBackend()
     {
@@ -608,7 +562,6 @@ public function getBackend()
      * Retrieve frontend instance
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
-     * @since 2.0.0
      */
     public function getFrontend()
     {
@@ -627,7 +580,6 @@ public function getFrontend()
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -655,7 +607,6 @@ public function getSource()
      * Whether possible attribute values are retrieved from finite source
      *
      * @return bool
-     * @since 2.0.0
      */
     public function usesSource()
     {
@@ -667,7 +618,6 @@ public function usesSource()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getDefaultBackendModel()
     {
@@ -677,7 +627,6 @@ protected function _getDefaultBackendModel()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getDefaultFrontendModel()
     {
@@ -687,7 +636,6 @@ protected function _getDefaultFrontendModel()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getDefaultSourceModel()
     {
@@ -699,7 +647,6 @@ protected function _getDefaultSourceModel()
      *
      * @param array|null|bool|int|float|string $value
      * @return bool
-     * @since 2.0.0
      */
     public function isValueEmpty($value)
     {
@@ -737,7 +684,6 @@ private function isInEmptyStringTypes()
      *
      * @param int|int[] $setId
      * @return bool
-     * @since 2.0.0
      */
     public function isInSet($setId)
     {
@@ -762,7 +708,6 @@ public function isInSet($setId)
      * @param int $setId
      * @param int $groupId
      * @return bool
-     * @since 2.0.0
      */
     public function isInGroup($setId, $groupId)
     {
@@ -780,7 +725,6 @@ public function isInGroup($setId, $groupId)
      * @param string $entityType
      * @param string $code
      * @return int
-     * @since 2.0.0
      */
     public function getIdByCode($entityType, $code)
     {
@@ -796,7 +740,6 @@ public function getIdByCode($entityType, $code)
      * Check if attribute is static
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStatic()
     {
@@ -807,7 +750,6 @@ public function isStatic()
      * Get attribute backend table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackendTable()
     {
@@ -831,7 +773,6 @@ public function getBackendTable()
      * Retrieve flat columns definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -848,7 +789,6 @@ public function getFlatColumns()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function _getFlatColumnsDdlDefinition()
     {
@@ -934,7 +874,6 @@ public function _getFlatColumnsDdlDefinition()
      * @deprecated 2.2.0
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getFlatColumnsOldDefinition()
     {
@@ -1011,7 +950,6 @@ protected function _getFlatColumnsOldDefinition()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -1083,7 +1021,6 @@ public function getFlatIndexes()
      *
      * @param int $store
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store = null)
     {
@@ -1109,7 +1046,6 @@ public function getFlatUpdateSelect($store = null)
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUnique()
     {
@@ -1121,7 +1057,6 @@ public function getIsUnique()
      *
      * @param string $isUnique
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUnique($isUnique)
     {
@@ -1130,7 +1065,6 @@ public function setIsUnique($isUnique)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendClass()
     {
@@ -1142,7 +1076,6 @@ public function getFrontendClass()
      *
      * @param string $frontendClass
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendClass($frontendClass)
     {
@@ -1151,7 +1084,6 @@ public function setFrontendClass($frontendClass)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendInput()
     {
@@ -1160,7 +1092,6 @@ public function getFrontendInput()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFrontendInput($frontendInput)
     {
@@ -1169,7 +1100,6 @@ public function setFrontendInput($frontendInput)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsRequired()
     {
@@ -1178,7 +1108,6 @@ public function getIsRequired()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsRequired($isRequired)
     {
@@ -1189,7 +1118,6 @@ public function setIsRequired($isRequired)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -1206,7 +1134,6 @@ public function getOptions()
      *
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface[] $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = null)
     {
@@ -1232,7 +1159,6 @@ public function setOptions(array $options = null)
      *
      * @param array $options
      * @return \Magento\Eav\Api\Data\AttributeOptionInterface[]
-     * @since 2.0.0
      */
     protected function convertToObjects(array $options)
     {
@@ -1254,7 +1180,6 @@ protected function convertToObjects(array $options)
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsUserDefined()
     {
@@ -1266,7 +1191,6 @@ public function getIsUserDefined()
      *
      * @param bool $isUserDefined
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUserDefined($isUserDefined)
     {
@@ -1275,7 +1199,6 @@ public function setIsUserDefined($isUserDefined)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultFrontendLabel()
     {
@@ -1287,7 +1210,6 @@ public function getDefaultFrontendLabel()
      *
      * @param string $defaultFrontendLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultFrontendLabel($defaultFrontendLabel)
     {
@@ -1296,7 +1218,6 @@ public function setDefaultFrontendLabel($defaultFrontendLabel)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrontendLabels()
     {
@@ -1308,7 +1229,6 @@ public function getFrontendLabels()
      *
      * @param \Magento\Eav\Api\Data\AttributeFrontendLabelInterface[] $frontendLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setFrontendLabels(array $frontendLabels = null)
     {
@@ -1317,7 +1237,6 @@ public function setFrontendLabels(array $frontendLabels = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNote()
     {
@@ -1329,7 +1248,6 @@ public function getNote()
      *
      * @param string $note
      * @return $this
-     * @since 2.0.0
      */
     public function setNote($note)
     {
@@ -1338,7 +1256,6 @@ public function setNote($note)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSourceModel()
     {
@@ -1350,7 +1267,6 @@ public function getSourceModel()
      *
      * @param string $sourceModel
      * @return $this
-     * @since 2.0.0
      */
     public function setSourceModel($sourceModel)
     {
@@ -1361,7 +1277,6 @@ public function setSourceModel($sourceModel)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValidationRules()
     {
@@ -1381,7 +1296,6 @@ public function getValidationRules()
      * @param \Magento\Eav\Api\Data\AttributeValidationRuleInterface[] $validationRules
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setValidationRules(array $validationRules = null)
     {
@@ -1393,7 +1307,6 @@ public function setValidationRules(array $validationRules = null)
      *
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1406,7 +1319,6 @@ public function getExtensionAttributes()
      * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes)
     {
@@ -1415,7 +1327,7 @@ public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeExtensionI
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -1440,7 +1352,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AttributeInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/AttributeInterface.php
index 9d1b82e6a2ffc..f6ec8024ce235 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AttributeInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AttributeInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Eav\Model\Entity\Attribute\AttributeInterface
  *
- * @since 2.0.0
  */
 interface AttributeInterface
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
index 893d91bcd4d03..4a9fa32d06ad2 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Backend\BackendInterface
 {
@@ -20,7 +19,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * Reference to the attribute instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     protected $_attribute;
 
@@ -28,7 +26,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * PK value_id for loaded entity (for faster updates)
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_valueId;
 
@@ -36,7 +33,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * PK value_ids for each loaded entity
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_valueIds = [];
 
@@ -44,7 +40,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * Table name for this attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_table;
 
@@ -52,7 +47,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * Name of the entity_id field for the value table of this attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityIdField;
 
@@ -60,7 +54,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * Default value for the attribute
      *
      * @var mixed
-     * @since 2.0.0
      */
     protected $_defaultValue = null;
 
@@ -70,7 +63,6 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttribute($attribute)
     {
@@ -83,7 +75,6 @@ public function setAttribute($attribute)
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -95,7 +86,6 @@ public function getAttribute()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -107,7 +97,6 @@ public function getType()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isStatic()
     {
@@ -118,7 +107,6 @@ public function isStatic()
      * Get table name for the values of the attribute
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTable()
     {
@@ -141,7 +129,6 @@ public function getTable()
      * Get entity_id field in the attribute values tables
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityIdField()
     {
@@ -162,7 +149,6 @@ public function getEntityIdField()
      * @param int $valueId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setValueId($valueId)
     {
@@ -176,7 +162,6 @@ public function setValueId($valueId)
      * @param \Magento\Framework\DataObject $entity
      * @param int $valueId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityValueId($entity, $valueId)
     {
@@ -193,7 +178,6 @@ public function setEntityValueId($entity, $valueId)
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getValueId()
     {
@@ -205,7 +189,6 @@ public function getValueId()
      *
      * @param \Magento\Framework\DataObject $entity
      * @return int
-     * @since 2.0.0
      */
     public function getEntityValueId($entity)
     {
@@ -220,7 +203,6 @@ public function getEntityValueId($entity)
      * Retrieve default value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
@@ -242,7 +224,6 @@ public function getDefaultValue()
      * @return bool
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -282,7 +263,6 @@ public function validate($object)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
@@ -294,7 +274,6 @@ public function afterLoad($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -313,7 +292,6 @@ public function beforeSave($object)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
@@ -327,7 +305,6 @@ public function afterSave($object)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function beforeDelete($object)
     {
@@ -341,7 +318,6 @@ public function beforeDelete($object)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function afterDelete($object)
     {
@@ -353,7 +329,6 @@ public function afterDelete($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return array
-     * @since 2.0.0
      */
     public function getAffectedFields($object)
     {
@@ -370,7 +345,6 @@ public function getAffectedFields($object)
      *
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isScalar()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
index dc10e62e3fb06..4afbf774ed311 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
@@ -9,7 +9,6 @@
  * Backend model for attribute with multiple values
  *
  * @api
- * @since 2.0.0
  */
 class ArrayBackend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class ArrayBackend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractB
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -39,7 +37,6 @@ public function beforeSave($object)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/BackendInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/BackendInterface.php
index 591157925e483..7a0cc147e34af 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/BackendInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/BackendInterface.php
@@ -11,79 +11,67 @@
  * Backend is responsible for saving the values of the attribute
  * and performing pre and post actions
  *
- * @since 2.0.0
  */
 interface BackendInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTable();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isStatic();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEntityIdField();
 
     /**
      * @param int $valueId
      * @return $this
-     * @since 2.0.0
      */
     public function setValueId($valueId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getValueId();
 
     /**
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad($object);
 
     /**
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object);
 
     /**
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave($object);
 
     /**
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete($object);
 
     /**
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete($object);
 
@@ -92,7 +80,6 @@ public function afterDelete($object);
      *
      * @param \Magento\Framework\DataObject $entity
      * @return int
-     * @since 2.0.0
      */
     public function getEntityValueId($entity);
 
@@ -102,7 +89,6 @@ public function getEntityValueId($entity);
      * @param \Magento\Framework\DataObject $entity
      * @param int $valueId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityValueId($entity, $valueId);
 
@@ -110,7 +96,6 @@ public function setEntityValueId($entity, $valueId);
      * Whether an attribute is represented by a scalar value that can be stored in a generic way
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScalar();
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
index 9b85e1487f06e..860545866e19a 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
@@ -10,20 +10,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Datetime extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface
      * @param \Magento\Framework\DataObject $object
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -71,7 +67,6 @@ public function beforeSave($object)
      *
      * @param string|int|\DateTimeInterface $date
      * @return string
-     * @since 2.0.0
      */
     public function formatDate($date)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/DefaultBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/DefaultBackend.php
index f719552861bf5..5b2ea18aeec5c 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/DefaultBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/DefaultBackend.php
@@ -9,7 +9,6 @@
  * Entity/Attribute/Model - attribute backend default
  *
  * @api
- * @since 2.0.0
  */
 class DefaultBackend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Increment.php
index 4b80d6ed81afb..32153de3c12c2 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Increment.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Increment.php
@@ -9,7 +9,6 @@
  * Entity/Attribute/Model - attribute backend default
  *
  * @api
- * @since 2.0.0
  */
 class Increment extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Increment extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBack
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
index 1bc938a94c3c9..2cc8157166376 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -7,20 +7,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Created.php
index fa86b3c7e0e96..c259e57fb9556 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Created.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Created.php
@@ -9,13 +9,11 @@
  * Entity/Attribute/Model - attribute backend default
  *
  * @api
- * @since 2.0.0
  */
 class Created extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -23,7 +21,6 @@ class Created extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @codeCoverageIgnore
      * @deprecated 2.1.0 Remove unused dependency
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\DateTime\DateTime $dateTime)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\Stdlib\DateTime\DateTime $dateTim
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Updated.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
index bbd9498fd1231..172c0364724cd 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
@@ -8,13 +8,11 @@
 /**
  * Entity/Attribute/Model - attribute backend default
  * @api
- * @since 2.0.0
  */
 class Updated extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -22,7 +20,6 @@ class Updated extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @codeCoverageIgnore
      * @deprecated 2.1.0 Remove unused dependency
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\DateTime $dateTime)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\Stdlib\DateTime $dateTime)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Config.php b/app/code/Magento/Eav/Model/Entity/Attribute/Config.php
index ea94d1ef7ed89..c2b1e81bcb26a 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Config.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Config.php
@@ -11,7 +11,6 @@
  * Provides EAV attributes configuration
  *
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data
 {
@@ -22,7 +21,6 @@ class Config extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Attribute\Config\Reader $reader,
@@ -38,7 +36,6 @@ public function __construct(
      *
      * @param AbstractAttribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getLockedFields(AbstractAttribute $attribute)
     {
@@ -62,7 +59,6 @@ public function getLockedFields(AbstractAttribute $attribute)
      *
      * @param string $entityCode
      * @return array
-     * @since 2.0.0
      */
     public function getEntityAttributesLockedFields($entityCode)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Config/Converter.php b/app/code/Magento/Eav/Model/Entity/Attribute/Config/Converter.php
index ed5b7259400a6..993804ec52cb9 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Config/Converter.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Attribute\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param mixed $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Config/Reader.php b/app/code/Magento/Eav/Model/Entity/Attribute/Config/Reader.php
index 5fb01116c1147..259485c03ce33 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Config/Reader.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Attribute\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * Xml merging attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/entity' => 'type',
@@ -32,7 +30,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param \Magento\Eav\Model\Entity\Attribute\Config\SchemaLocator $schemaLocator
      * @param \Magento\Framework\Config\ValidationStateInterface $validationState
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Config/SchemaLocator.php b/app/code/Magento/Eav/Model/Entity/Attribute/Config/SchemaLocator.php
index f2f31620fc8c6..e5379fb637345 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Config/SchemaLocator.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Attribute\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,14 +19,12 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Schema file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      *
      * @return string|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -51,7 +47,6 @@ public function getSchema()
      *
      * @return string|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Exception.php b/app/code/Magento/Eav/Model/Entity/Attribute/Exception.php
index 1aa5e66c2de06..559cce22bb2c7 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Exception.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Exception.php
@@ -9,7 +9,6 @@
  * EAV entity attribute exception
  *
  * @api
- * @since 2.0.0
  */
 class Exception extends \Magento\Framework\Exception\LocalizedException
 {
@@ -17,7 +16,6 @@ class Exception extends \Magento\Framework\Exception\LocalizedException
      * Eav entity attribute
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_attributeCode;
 
@@ -26,7 +24,6 @@ class Exception extends \Magento\Framework\Exception\LocalizedException
      * attribute|backend|frontend|source
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_part;
 
@@ -36,7 +33,6 @@ class Exception extends \Magento\Framework\Exception\LocalizedException
      * @param string $attribute
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeCode($attribute)
     {
@@ -50,7 +46,6 @@ public function setAttributeCode($attribute)
      * @param string $part
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setPart($part)
     {
@@ -63,7 +58,6 @@ public function setPart($part)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -75,7 +69,6 @@ public function getAttributeCode()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getPart()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index eecfae8a39f38..8004799b6cbdc 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -21,7 +21,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\Frontend\FrontendInterface
 {
@@ -35,7 +34,7 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
 
     /**
      * @var CacheInterface
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $cache;
 
@@ -53,7 +52,7 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $cacheTags;
 
@@ -61,13 +60,11 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
      * Reference to the attribute instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     protected $_attribute;
 
     /**
      * @var BooleanFactory
-     * @since 2.0.0
      */
     protected $_attrBooleanFactory;
 
@@ -80,7 +77,6 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
      * @param Serializer $serializer
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         BooleanFactory $attrBooleanFactory,
@@ -103,7 +99,6 @@ public function __construct(
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttribute($attribute)
     {
@@ -116,7 +111,6 @@ public function setAttribute($attribute)
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -128,7 +122,6 @@ public function getAttribute()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getInputType()
     {
@@ -139,7 +132,6 @@ public function getInputType()
      * Retrieve label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -155,7 +147,6 @@ public function getLabel()
      * Retrieve localized label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLocalizedLabel()
     {
@@ -167,7 +158,6 @@ public function getLocalizedLabel()
      *
      * @param \Magento\Framework\DataObject $object
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue(\Magento\Framework\DataObject $object)
     {
@@ -201,7 +191,6 @@ public function getValue(\Magento\Framework\DataObject $object)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isVisible()
     {
@@ -212,7 +201,6 @@ public function isVisible()
      * Retrieve frontend class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -240,7 +228,6 @@ public function getClass()
      * Return validate class by attribute input validation rule
      *
      * @return string|false
-     * @since 2.0.0
      */
     protected function _getInputValidateClass()
     {
@@ -306,7 +293,6 @@ private function getTextLengthValidateClasses()
      * @param string $fieldName
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getConfigField($fieldName)
     {
@@ -317,7 +303,6 @@ public function getConfigField($fieldName)
      * Get select options in case it's select box and options source is defined
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectOptions()
     {
@@ -343,7 +328,6 @@ public function getSelectOptions()
      *
      * @param int $optionId
      * @return mixed|bool
-     * @since 2.0.0
      */
     public function getOption($optionId)
     {
@@ -359,7 +343,6 @@ public function getOption($optionId)
      *
      * @return string|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getInputRendererClass()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index 8a789464afb8b..6e84ca7c07354 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Datetime extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -24,7 +22,6 @@ class Datetime extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFron
      * @param \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory,
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $object
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue(\Magento\Framework\DataObject $object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontend.php
index 1bd85f35bb676..fe577091ca67e 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontend.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DefaultFrontend extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/FrontendInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/FrontendInterface.php
index 72cd2bcfd1bf9..b46ead5be6047 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/FrontendInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/FrontendInterface.php
@@ -11,7 +11,6 @@
  * Frontend is providing the user interface for the attribute
  *
  * @api
- * @since 2.0.0
  */
 interface FrontendInterface
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/FrontendLabel.php b/app/code/Magento/Eav/Model/Entity/Attribute/FrontendLabel.php
index 94e36b1d6358e..86741def706ac 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/FrontendLabel.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/FrontendLabel.php
@@ -8,7 +8,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class FrontendLabel extends OptionLabel implements
     \Magento\Eav\Api\Data\AttributeFrontendLabelInterface
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 583adc48fefff..004faf3ee9a6f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -19,14 +19,12 @@
  * @method \Magento\Eav\Model\Entity\Attribute\Group setAttributeGroupCode(string $value)
  * @method string getTabGroupCode()
  * @method \Magento\Eav\Model\Entity\Attribute\Group setTabGroupCode(string $value)
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Eav\Api\Data\AttributeGroupInterface
 {
     /**
      * @var \Magento\Framework\Filter\Translit
-     * @since 2.0.0
      */
     private $translitFilter;
 
@@ -39,7 +37,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -68,7 +65,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +76,6 @@ protected function _construct()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function itemExists()
     {
@@ -92,7 +87,6 @@ public function itemExists()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function deleteGroups()
     {
@@ -103,7 +97,6 @@ public function deleteGroups()
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -131,7 +124,6 @@ public function beforeSave()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnoreStart
-     * @since 2.0.0
      */
     public function getAttributeGroupId()
     {
@@ -140,7 +132,6 @@ public function getAttributeGroupId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeGroupName()
     {
@@ -149,7 +140,6 @@ public function getAttributeGroupName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeSetId()
     {
@@ -158,7 +148,6 @@ public function getAttributeSetId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAttributeGroupId($attributeGroupId)
     {
@@ -167,7 +156,6 @@ public function setAttributeGroupId($attributeGroupId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAttributeGroupName($attributeGroupName)
     {
@@ -176,7 +164,6 @@ public function setAttributeGroupName($attributeGroupName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -187,7 +174,6 @@ public function setAttributeSetId($attributeSetId)
      * {@inheritdoc}
      *
      * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -199,7 +185,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
index ff27011a2c437..9346d5382fe48 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
@@ -18,7 +18,6 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Option extends AbstractModel implements AttributeOptionInterface
 {
@@ -26,7 +25,6 @@ class Option extends AbstractModel implements AttributeOptionInterface
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -35,7 +33,6 @@ public function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -44,7 +41,6 @@ public function getLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -53,7 +49,6 @@ public function getValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -62,7 +57,6 @@ public function getSortOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsDefault()
     {
@@ -71,7 +65,6 @@ public function getIsDefault()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreLabels()
     {
@@ -83,7 +76,6 @@ public function getStoreLabels()
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
@@ -95,7 +87,6 @@ public function setLabel($label)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -107,7 +98,6 @@ public function setValue($value)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -119,7 +109,6 @@ public function setSortOrder($sortOrder)
      *
      * @param bool $isDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setIsDefault($isDefault)
     {
@@ -131,7 +120,6 @@ public function setIsDefault($isDefault)
      *
      * @param \Magento\Eav\Api\Data\AttributeOptionLabelInterface[] $storeLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabels(array $storeLabels = null)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionLabel.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionLabel.php
index 64ee36a7d5e51..506dc0df893ce 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionLabel.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionLabel.php
@@ -12,13 +12,11 @@
  * Entity attribute option label model
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class OptionLabel extends AbstractModel implements AttributeOptionLabelInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -27,7 +25,6 @@ public function getLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -39,7 +36,6 @@ public function getStoreId()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -51,7 +47,6 @@ public function setStoreId($storeId)
      *
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setLabel($label)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index 3944319becc30..a1f45e1c65c2b 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Eav\Model\Entity\Attribute\OptionManagement
  *
- * @since 2.0.0
  */
 class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInterface
 {
     /**
      * @var \Magento\Eav\Model\AttributeRepository
-     * @since 2.0.0
      */
     protected $attributeRepository;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
-     * @since 2.0.0
      */
     protected $resourceModel;
 
@@ -33,7 +30,6 @@ class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInte
      * @param \Magento\Eav\Model\AttributeRepository $attributeRepository
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\AttributeRepository $attributeRepository,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function add($entityType, $attributeCode, $option)
     {
@@ -85,7 +80,6 @@ public function add($entityType, $attributeCode, $option)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($entityType, $attributeCode, $optionId)
     {
@@ -117,7 +111,6 @@ public function delete($entityType, $attributeCode, $optionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems($entityType, $attributeCode)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/ScopedAttributeInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/ScopedAttributeInterface.php
index 9e3d8848c0dd5..08cb128e550bf 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/ScopedAttributeInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/ScopedAttributeInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ScopedAttributeInterface
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
index 5c04e3b97a71d..bf42b327a8864 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
@@ -25,7 +25,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Eav\Api\Data\AttributeSetInterface
@@ -39,43 +38,33 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
     const KEY_ENTITY_TYPE_ID = 'entity_type_id';
     /**#@-*/
 
-    /**
-     * Resource instance
-     *
-     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_resource;
 
     /**
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'eav_entity_attribute_set';
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\GroupFactory
-     * @since 2.0.0
      */
     protected $_attrGroupFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
-     * @since 2.0.0
      */
     protected $_resourceAttribute;
 
@@ -93,7 +82,6 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -128,7 +116,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -140,7 +127,6 @@ protected function _construct()
      *
      * @param int $skeletonId
      * @return $this
-     * @since 2.0.0
      */
     public function initFromSkeleton($skeletonId)
     {
@@ -186,7 +172,6 @@ public function initFromSkeleton($skeletonId)
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function organizeData($data)
     {
@@ -266,7 +251,6 @@ public function organizeData($data)
     /**
      * @param array $group
      * @return Group
-     * @since 2.0.0
      */
     private function initGroupModel($group)
     {
@@ -294,7 +278,6 @@ private function initGroupModel($group)
      *
      * @return bool
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -318,7 +301,6 @@ public function validate()
      * @param int $setId
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addSetInfo($entityType, array $attributes, $setId = null)
     {
@@ -373,7 +355,6 @@ public function addSetInfo($entityType, array $attributes, $setId = null)
      *
      * @param int $setId
      * @return int|null
-     * @since 2.0.0
      */
     public function getDefaultGroupId($setId = null)
     {
@@ -388,7 +369,6 @@ public function getDefaultGroupId($setId = null)
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -398,7 +378,6 @@ protected function _getResource()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnoreStart
-     * @since 2.0.0
      */
     public function getAttributeSetId()
     {
@@ -407,7 +386,6 @@ public function getAttributeSetId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeSetName()
     {
@@ -416,7 +394,6 @@ public function getAttributeSetName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -425,7 +402,6 @@ public function getSortOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -437,7 +413,6 @@ public function getEntityTypeId()
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -449,7 +424,6 @@ public function setName($name)
      *
      * @param int $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -461,7 +435,6 @@ public function setAttributeSetId($attributeSetId)
      *
      * @param string $attributeSetName
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetName($attributeSetName)
     {
@@ -473,7 +446,6 @@ public function setAttributeSetName($attributeSetName)
      *
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -485,7 +457,6 @@ public function setSortOrder($sortOrder)
      *
      * @param int $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypeId($entityTypeId)
     {
@@ -496,7 +467,6 @@ public function setEntityTypeId($entityTypeId)
      * {@inheritdoc}
      *
      * @return \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -508,7 +478,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeSetExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index e210ac24a79a1..36fa30a3a99db 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractSource implements
     \Magento\Eav\Model\Entity\Attribute\Source\SourceInterface,
@@ -21,7 +20,6 @@ abstract class AbstractSource implements
      * Reference to the attribute instance
      *
      * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     protected $_attribute;
 
@@ -29,7 +27,6 @@ abstract class AbstractSource implements
      * Options array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = null;
 
@@ -39,7 +36,6 @@ abstract class AbstractSource implements
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttribute($attribute)
     {
@@ -52,7 +48,6 @@ public function setAttribute($attribute)
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAttribute()
     {
@@ -64,7 +59,6 @@ public function getAttribute()
      *
      * @param  string|int $value
      * @return string|bool
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -87,7 +81,6 @@ public function getOptionText($value)
     /**
      * @param string $value
      * @return null|string
-     * @since 2.0.0
      */
     public function getOptionId($value)
     {
@@ -107,7 +100,6 @@ public function getOptionId($value)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
     {
@@ -119,7 +111,6 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
      *
      * @codeCoverageIgnore
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -131,7 +122,6 @@ public function getFlatColumns()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -145,7 +135,6 @@ public function getFlatIndexes()
      * @return \Magento\Framework\DB\Select|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
@@ -158,7 +147,6 @@ public function getFlatUpdateSelect($store)
      * @param string|int $value
      * @return string|bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIndexOptionText($value)
     {
@@ -170,7 +158,6 @@ public function getIndexOptionText($value)
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php
index dc2eed82b559f..a1c78c2dfc324 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -20,14 +19,12 @@ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_eavAttrEntity;
 
     /**
      * @param \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory $eavAttrEntity
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory $eavAttrEntity
@@ -39,7 +36,6 @@ public function __construct(
      * Retrieve all options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -56,7 +52,6 @@ public function getAllOptions()
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionArray()
     {
@@ -72,7 +67,6 @@ public function getOptionArray()
      *
      * @param string|int $value
      * @return string|false
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -89,7 +83,6 @@ public function getOptionText($value)
      * Retrieve flat column definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -112,7 +105,6 @@ public function getFlatColumns()
      * Retrieve Indexes(s) for Flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -129,7 +121,6 @@ public function getFlatIndexes()
      *
      * @param int $store
      * @return \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
@@ -141,7 +132,6 @@ public function getFlatUpdateSelect($store)
      *
      * @param  string|int $value
      * @return string|bool
-     * @since 2.0.0
      */
     public function getIndexOptionText($value)
     {
@@ -162,7 +152,6 @@ public function getIndexOptionText($value)
      * @param string $dir
      *
      * @return \Magento\Eav\Model\Entity\Attribute\Source\Boolean
-     * @since 2.0.0
      */
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\DB\Select::SQL_ASC)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Config.php
index c36ea5d25f481..3768c2cb49db9 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Config.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Config.php
@@ -11,20 +11,17 @@
  * this class should be abstract, but kept usual for legacy purposes
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Config extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsData;
 
     /**
      * @param array $options
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(array $options)
     {
@@ -36,7 +33,6 @@ public function __construct(array $options)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/SourceInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/SourceInterface.php
index 392845ead24a3..c85eaceae1d19 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/SourceInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/SourceInterface.php
@@ -11,7 +11,6 @@
  * Source is providing the selection options for user interface
  *
  * @api
- * @since 2.0.0
  */
 interface SourceInterface
 {
@@ -19,7 +18,6 @@ interface SourceInterface
      * Retrieve All options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions();
 
@@ -28,7 +26,6 @@ public function getAllOptions();
      *
      * @param string $value
      * @return mixed
-     * @since 2.0.0
      */
     public function getOptionText($value);
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
index 7e39eae8ab051..876f13675e3ba 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
@@ -9,13 +9,11 @@
  * Customer store_id attribute source
  *
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storeCollectionFactory;
 
@@ -24,7 +22,6 @@ class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -39,7 +36,6 @@ public function __construct(
      * Retrieve Full Option values array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index 481971a64c2e7..8256038491db1 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Table extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -18,19 +17,16 @@ class Table extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Default values for option cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsDefault = [];
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_attrOptionCollectionFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory
-     * @since 2.0.0
      */
     protected $_attrOptionFactory;
 
@@ -44,7 +40,6 @@ class Table extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
@@ -60,7 +55,6 @@ public function __construct(
      * @param bool $withEmpty       Add empty option to array
      * @param bool $defaultValues
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
@@ -117,7 +111,6 @@ private function getStoreManager()
      * @param string|array $ids
      * @param bool $withEmpty Add empty option to array
      * @return array
-     * @since 2.0.0
      */
     public function getSpecificOptions($ids, $withEmpty = true)
     {
@@ -137,7 +130,7 @@ public function getSpecificOptions($ids, $withEmpty = true)
     /**
      * @param array $options
      * @return array
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private function addEmptyOption(array $options)
     {
@@ -150,7 +143,6 @@ private function addEmptyOption(array $options)
      *
      * @param string|integer $value
      * @return array|string|bool
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -187,7 +179,6 @@ public function getOptionText($value)
      * @param string $dir
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\DB\Select::SQL_ASC)
     {
@@ -229,7 +220,6 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
      * Retrieve Column(s) for Flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -266,7 +256,6 @@ public function getFlatColumns()
      * Retrieve Indexes for Flat
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatIndexes()
     {
@@ -293,7 +282,6 @@ public function getFlatIndexes()
      *
      * @param int $store
      * @return \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/ValidationRule.php b/app/code/Magento/Eav/Model/Entity/Attribute/ValidationRule.php
index adb32aeedbc71..3e60688cfe9d7 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/ValidationRule.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/ValidationRule.php
@@ -8,14 +8,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ValidationRule extends \Magento\Framework\Model\AbstractModel implements
     \Magento\Eav\Api\Data\AttributeValidationRuleInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getKey()
     {
@@ -24,7 +22,6 @@ public function getKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -36,7 +33,6 @@ public function getValue()
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function setKey($key)
     {
@@ -48,7 +44,6 @@ public function setKey($key)
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 2371847b7007e..bf48353447cf1 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface
 {
@@ -30,7 +29,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Array of items with item id key
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_itemsById = [];
 
@@ -38,7 +36,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Entity static fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_staticFields = [];
 
@@ -46,7 +43,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Entity object to define collection's attributes
      *
      * @var \Magento\Eav\Model\Entity\AbstractEntity
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -54,7 +50,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Entity types to be fetched for objects in collection
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectEntityTypes = [];
 
@@ -62,7 +57,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Attributes to be fetched for objects in collection
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectAttributes = [];
 
@@ -70,7 +64,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Attributes to be filtered order sorted by
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filterAttributes = [];
 
@@ -78,7 +71,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Joined entities
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_joinEntities = [];
 
@@ -86,7 +78,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Joined attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_joinAttributes = [];
 
@@ -94,7 +85,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Joined fields data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_joinFields = [];
 
@@ -102,7 +92,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Cast map for attribute order
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_castToIntMap = ['validate-digits'];
 
@@ -110,37 +99,31 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Eav\Model\EntityFactory
-     * @since 2.0.0
      */
     protected $_eavEntityFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
@@ -157,7 +140,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * @param mixed $connection
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -188,7 +170,6 @@ public function __construct(
      * Initialize collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -200,7 +181,6 @@ protected function _construct()
      * @param string $table
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTable($table)
     {
@@ -211,7 +191,6 @@ public function getTable($table)
      * Prepare static entity fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareStaticFields()
     {
@@ -225,7 +204,6 @@ protected function _prepareStaticFields()
      * Init select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -243,7 +221,6 @@ protected function _initSelect()
      * @param string $model
      * @param string $entityModel
      * @return $this
-     * @since 2.0.0
      */
     protected function _init($model, $entityModel)
     {
@@ -260,7 +237,6 @@ protected function _init($model, $entityModel)
      * @param \Magento\Eav\Model\Entity\AbstractEntity $entity
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function setEntity($entity)
     {
@@ -279,7 +255,6 @@ public function setEntity($entity)
      *
      * @return \Magento\Eav\Model\Entity\AbstractEntity
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -294,7 +269,6 @@ public function getEntity()
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -306,7 +280,6 @@ public function getResource()
      *
      * @param   \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function setObject($object = null)
     {
@@ -324,7 +297,6 @@ public function setObject($object = null)
      * @param \Magento\Framework\DataObject $object
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function addItem(\Magento\Framework\DataObject $object)
     {
@@ -339,7 +311,6 @@ public function addItem(\Magento\Framework\DataObject $object)
      *
      * @param   string $attributeCode
      * @return  \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     * @since 2.0.0
      */
     public function getAttribute($attributeCode)
     {
@@ -367,7 +338,6 @@ public function getAttribute($attributeCode)
      *
      * @see self::_getConditionSql for $condition
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
     {
@@ -419,7 +389,6 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
      * @param mixed $condition
      * @return $this|AbstractDb
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addFieldToFilter($attribute, $condition = null)
     {
@@ -432,7 +401,6 @@ public function addFieldToFilter($attribute, $condition = null)
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -479,7 +447,6 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
      *
      * @param string $field
      * @return string|Zend_Db_Expr
-     * @since 2.0.0
      */
     protected function _prepareOrderExpression($field)
     {
@@ -503,7 +470,6 @@ protected function _prepareOrderExpression($field)
      * @param bool|string $joinType flag for joining attribute
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function addAttributeToSelect($attribute, $joinType = false)
     {
@@ -542,7 +508,6 @@ public function addAttributeToSelect($attribute, $joinType = false)
      * @param string $prefix
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addEntityTypeToSelect($entityType, $prefix)
     {
@@ -555,7 +520,6 @@ public function addEntityTypeToSelect($entityType, $prefix)
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function addStaticField($field)
     {
@@ -578,7 +542,6 @@ public function addStaticField($field)
      * @param string $attribute
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function addExpressionAttributeToSelect($alias, $expression, $attribute)
     {
@@ -622,7 +585,6 @@ public function addExpressionAttributeToSelect($alias, $expression, $attribute)
      *
      * @param string|array $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function groupByAttribute($attribute)
     {
@@ -684,7 +646,6 @@ public function groupByAttribute($attribute)
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinType = 'inner', $storeId = null)
     {
@@ -773,7 +734,6 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
      * @param string $joinType 'left'
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function joinField($alias, $table, $field, $bind, $cond = null, $joinType = 'inner')
     {
@@ -837,7 +797,6 @@ public function joinField($alias, $table, $field, $bind, $cond = null, $joinType
      * @return $this
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function joinTable($table, $bind, $fields = null, $cond = null, $joinType = 'inner')
     {
@@ -902,7 +861,6 @@ public function joinTable($table, $bind, $fields = null, $cond = null, $joinType
      *
      * @param string $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function removeAttributeToSelect($attribute = null)
     {
@@ -921,7 +879,6 @@ public function removeAttributeToSelect($attribute = null)
      * @param integer $pageSize
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setPage($pageNum, $pageSize)
     {
@@ -935,7 +892,6 @@ public function setPage($pageNum, $pageSize)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -981,7 +937,6 @@ public function load($printQuery = false, $logQuery = false)
      * @param null $limit
      * @param null $offset
      * @return Select
-     * @since 2.0.0
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
@@ -1002,7 +957,6 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
      * @param null|int|string $limit
      * @param null|int|string $offset
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds($limit = null, $offset = null)
     {
@@ -1013,7 +967,6 @@ public function getAllIds($limit = null, $offset = null)
      * Retrieve all ids sql
      *
      * @return Select
-     * @since 2.0.0
      */
     public function getAllIdsSql()
     {
@@ -1034,7 +987,6 @@ public function getAllIdsSql()
      * @todo make batch save directly from collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function save()
     {
@@ -1050,7 +1002,6 @@ public function save()
      * @todo make batch delete directly from collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function delete()
     {
@@ -1068,7 +1019,6 @@ public function delete()
      *
      * @param array $arr
      * @return $this
-     * @since 2.0.0
      */
     public function importFromArray($arr)
     {
@@ -1089,7 +1039,6 @@ public function importFromArray($arr)
      * Get collection data as a 2D array
      *
      * @return array
-     * @since 2.0.0
      */
     public function exportToArray()
     {
@@ -1106,7 +1055,6 @@ public function exportToArray()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRowIdFieldName()
     {
@@ -1117,7 +1065,6 @@ public function getRowIdFieldName()
      * Id field name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -1133,7 +1080,6 @@ public function getIdFieldName()
      *
      * @param string $fieldName
      * @return $this
-     * @since 2.0.0
      */
     public function setRowIdFieldName($fieldName)
     {
@@ -1147,7 +1093,6 @@ public function setRowIdFieldName($fieldName)
      * @param bool $logQuery
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function _loadEntities($printQuery = false, $logQuery = false)
     {
@@ -1195,7 +1140,6 @@ public function _loadEntities($printQuery = false, $logQuery = false)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function _loadAttributes($printQuery = false, $logQuery = false)
     {
@@ -1259,7 +1203,6 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
      * @param string $table
      * @param string[] $attributeIds
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {
@@ -1303,7 +1246,6 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
      * @return Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _addLoadAttributesSelectValues($select, $table, $type)
     {
@@ -1319,7 +1261,6 @@ protected function _addLoadAttributesSelectValues($select, $table, $type)
      * @param array $valueInfo
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _setItemAttributeValue($valueInfo)
     {
@@ -1349,7 +1290,6 @@ protected function _setItemAttributeValue($valueInfo)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributeTableAlias($attributeCode)
     {
@@ -1362,7 +1302,6 @@ protected function _getAttributeTableAlias($attributeCode)
      * @param string $attributeCode
      * @return string
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _getAttributeFieldName($attributeCode)
     {
@@ -1404,7 +1343,6 @@ protected function _getAttributeFieldName($attributeCode)
      * @return $this
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _addAttributeJoin($attributeCode, $joinType = 'inner')
     {
@@ -1500,7 +1438,6 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
      * @param   string $fieldCode
      * @param   string $fieldAlias
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $condition, $fieldCode, $fieldAlias)
     {
@@ -1521,7 +1458,6 @@ protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $con
      * @return string
      *
      * @see self::_getConditionSql
-     * @since 2.0.0
      */
     protected function _getAttributeConditionSql($attribute, $condition, $joinType = 'inner')
     {
@@ -1564,7 +1500,6 @@ protected function _getAttributeConditionSql($attribute, $condition, $joinType =
      * @param string|array $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -1582,7 +1517,6 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
      *
      * @param array $arrAttributes
      * @return array
-     * @since 2.0.0
      */
     public function toArray($arrAttributes = [])
     {
@@ -1597,7 +1531,6 @@ public function toArray($arrAttributes = [])
      * Treat "order by" items as attributes to sort
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderOrders()
     {
@@ -1615,7 +1548,6 @@ protected function _renderOrders()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -1626,7 +1558,6 @@ protected function _afterLoad()
      * Reset collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _reset()
     {
@@ -1647,7 +1578,6 @@ protected function _reset()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getLoadedIds()
     {
@@ -1657,7 +1587,6 @@ public function getLoadedIds()
     /**
      * Clear collection
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -1668,7 +1597,6 @@ public function clear()
     /**
      * Remove all items from collection
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllItems()
     {
@@ -1681,7 +1609,6 @@ public function removeAllItems()
      *
      * @param mixed $key
      * @return $this
-     * @since 2.0.0
      */
     public function removeItemByKey($key)
     {
@@ -1696,7 +1623,6 @@ public function removeItemByKey($key)
      * validated by db adapter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainTable()
     {
@@ -1712,7 +1638,6 @@ public function getMainTable()
      * @return $this|\Magento\Framework\Data\Collection\AbstractDb
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addFieldToSelect($field, $alias = null)
     {
@@ -1725,7 +1650,6 @@ public function addFieldToSelect($field, $alias = null)
      * @param string $field
      * @return $this|\Magento\Framework\Data\Collection\AbstractDb
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function removeFieldFromSelect($field)
     {
@@ -1737,7 +1661,6 @@ public function removeFieldFromSelect($field)
      *
      * @return $this|\Magento\Framework\Data\Collection\AbstractDb
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function removeAllFieldsFromSelect()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
index 6e1a57ea8c89a..176085081e5e6 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
@@ -8,13 +8,11 @@
 /**
  * Class Abstract Collection
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
 {
     /**
      * @var \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot
-     * @since 2.0.0
      */
     protected $entitySnapshot;
 
@@ -32,7 +30,6 @@ abstract class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\A
      * @param mixed $connection
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -65,7 +62,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function fetchItem()
     {
@@ -79,7 +75,6 @@ public function fetchItem()
     /**
      * @inheritdoc
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Context.php b/app/code/Magento/Eav/Model/Entity/Context.php
index 4094dd898a862..40eb71f1aeebd 100644
--- a/app/code/Magento/Eav/Model/Entity/Context.php
+++ b/app/code/Magento/Eav/Model/Entity/Context.php
@@ -18,55 +18,46 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var Attribute\Set
-     * @since 2.0.0
      */
     protected $attributeSetEntity;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $resourceHelper;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $universalFactory;
 
     /**
      * @var \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor
-     * @since 2.0.0
      */
     protected $objectRelationProcessor;
 
@@ -79,7 +70,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface $transactionManager
      * @param \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor $objectRelationProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -103,7 +93,6 @@ public function __construct(
 
     /**
      * @return \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     public function getEavConfig()
     {
@@ -112,7 +101,6 @@ public function getEavConfig()
 
     /**
      * @return \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -121,7 +109,6 @@ public function getResource()
 
     /**
      * @return Attribute\Set
-     * @since 2.0.0
      */
     public function getAttributeSetEntity()
     {
@@ -130,7 +117,6 @@ public function getAttributeSetEntity()
 
     /**
      * @return \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     public function getLocaleFormat()
     {
@@ -139,7 +125,6 @@ public function getLocaleFormat()
 
     /**
      * @return \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     public function getResourceHelper()
     {
@@ -148,7 +133,6 @@ public function getResourceHelper()
 
     /**
      * @return \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     public function getUniversalFactory()
     {
@@ -157,7 +141,6 @@ public function getUniversalFactory()
 
     /**
      * @return \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor
-     * @since 2.0.0
      */
     public function getObjectRelationProcessor()
     {
@@ -166,7 +149,6 @@ public function getObjectRelationProcessor()
 
     /**
      * @return \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface
-     * @since 2.0.0
      */
     public function getTransactionManager()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/EntityInterface.php b/app/code/Magento/Eav/Model/Entity/EntityInterface.php
index baaca8e74ccc8..95192087e00b9 100644
--- a/app/code/Magento/Eav/Model/Entity/EntityInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/EntityInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface EntityInterface
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/AbstractIncrement.php b/app/code/Magento/Eav/Model/Entity/Increment/AbstractIncrement.php
index 8d1f301eebc57..35e7bf6ea5eff 100644
--- a/app/code/Magento/Eav/Model/Entity/Increment/AbstractIncrement.php
+++ b/app/code/Magento/Eav/Model/Entity/Increment/AbstractIncrement.php
@@ -13,7 +13,6 @@
  * - last_id
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractIncrement extends \Magento\Framework\DataObject implements
     \Magento\Eav\Model\Entity\Increment\IncrementInterface
@@ -22,7 +21,6 @@ abstract class AbstractIncrement extends \Magento\Framework\DataObject implement
      * Get pad length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPadLength()
     {
@@ -37,7 +35,6 @@ public function getPadLength()
      * Get pad char
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPadChar()
     {
@@ -53,7 +50,6 @@ public function getPadChar()
      *
      * @param mixed $id
      * @return string
-     * @since 2.0.0
      */
     public function format($id)
     {
@@ -68,7 +64,6 @@ public function format($id)
      * @param mixed $id
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function frontendFormat($id)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php b/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php
index 397ab3ebb93ca..82afcece7f29c 100644
--- a/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php
+++ b/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Increment\Alphanum
  *
- * @since 2.0.0
  */
 class Alphanum extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement
 {
@@ -27,7 +26,6 @@ class Alphanum extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAllowedChars()
     {
@@ -39,7 +37,6 @@ public function getAllowedChars()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getNextId()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/IncrementInterface.php b/app/code/Magento/Eav/Model/Entity/Increment/IncrementInterface.php
index 5d945c93b24ac..fbf4a16f47368 100644
--- a/app/code/Magento/Eav/Model/Entity/Increment/IncrementInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Increment/IncrementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface IncrementInterface
 {
@@ -15,7 +14,6 @@ interface IncrementInterface
      * Get next id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getNextId();
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php b/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php
index 12df6840fa26c..01b605ded066d 100644
--- a/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php
+++ b/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php
@@ -15,7 +15,6 @@
  * - last_id
  *
  * @api
- * @since 2.0.0
  */
 class NumericValue extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement
 {
@@ -23,7 +22,6 @@ class NumericValue extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement
      * Get next id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextId()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/Context.php b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
index 3caea1d035488..adfb05c5cc2b3 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/Context.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
@@ -18,13 +18,11 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\Module\Setup\Context
 {
     /**
      * @var PropertyMapperInterface
-     * @since 2.0.0
      */
     protected $attributeMapper;
 
@@ -40,7 +38,6 @@ class Context extends \Magento\Framework\Module\Setup\Context
      * @param \Magento\Framework\Filesystem $filesystem
      * @param PropertyMapperInterface $attributeMapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -70,7 +67,6 @@ public function __construct(
 
     /**
      * @return PropertyMapperInterface
-     * @since 2.0.0
      */
     public function getAttributeMapper()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php
index 3381756eacabe..0b2ea5c89ad28 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Setup\PropertyMapper
  *
- * @since 2.0.0
  */
 class PropertyMapper extends PropertyMapperAbstract
 {
@@ -23,7 +22,6 @@ class PropertyMapper extends PropertyMapperAbstract
      * @param int $entityTypeId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper/Composite.php b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper/Composite.php
index e046d27dfca0d..707424ada7930 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper/Composite.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper/Composite.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Eav\Model\Entity\Setup\PropertyMapper\Composite
  *
- * @since 2.0.0
  */
 class Composite implements PropertyMapperInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $propertyMappers;
 
@@ -33,7 +30,6 @@ class Composite implements PropertyMapperInterface
      * @param ObjectManagerInterface $objectManager
      * @param array $propertyMappers
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, array $propertyMappers = [])
     {
@@ -48,7 +44,6 @@ public function __construct(ObjectManagerInterface $objectManager, array $proper
      * @param int $entityTypeId
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperAbstract.php b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperAbstract.php
index 514d65cdd603f..df46ecfa782cb 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperAbstract.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperAbstract.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Eav\Model\Entity\Setup\PropertyMapperAbstract
  *
- * @since 2.0.0
  */
 abstract class PropertyMapperAbstract implements PropertyMapperInterface
 {
@@ -21,7 +20,6 @@ abstract class PropertyMapperAbstract implements PropertyMapperInterface
      * @param string $key
      * @param string $default
      * @return string
-     * @since 2.0.0
      */
     protected function _getValue($array, $key, $default = null)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperInterface.php b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperInterface.php
index a181ba0f87c70..b2bb727d6bc88 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapperInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Eav\Model\Entity\Setup\PropertyMapperInterface
  *
- * @since 2.0.0
  */
 interface PropertyMapperInterface
 {
@@ -20,7 +19,6 @@ interface PropertyMapperInterface
      * @param array $input
      * @param int $entityTypeId
      * @return array
-     * @since 2.0.0
      */
     public function map(array $input, $entityTypeId);
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Store.php b/app/code/Magento/Eav/Model/Entity/Store.php
index de9a10d1a94a7..b2b6a3a70d659 100644
--- a/app/code/Magento/Eav/Model/Entity/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Store.php
@@ -17,7 +17,6 @@
  * @method \Magento\Eav\Model\Entity\Store setIncrementPrefix(string $value)
  * @method string getIncrementLastId()
  * @method \Magento\Eav\Model\Entity\Store setIncrementLastId(string $value)
- * @since 2.0.0
  */
 class Store extends \Magento\Framework\Model\AbstractModel
 {
@@ -26,7 +25,6 @@ class Store extends \Magento\Framework\Model\AbstractModel
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +38,6 @@ protected function _construct()
      * @param int $storeId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function loadByEntityStore($entityTypeId, $storeId)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 1e19355e18753..e8f2a30804efd 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -36,7 +36,6 @@
  * @method \Magento\Eav\Model\Entity\Type setEntityAttributeCollection(string $value)
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractModel
 {
@@ -44,7 +43,6 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * Collection of attributes
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -52,7 +50,6 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * Array of attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesBySet = [];
 
@@ -60,31 +57,26 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * Collection of sets
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
-     * @since 2.0.0
      */
     protected $_sets;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
-     * @since 2.0.0
      */
     protected $_attSetFactory;
 
     /**
      * @var \Magento\Eav\Model\Entity\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
@@ -99,7 +91,6 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -124,7 +115,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -136,7 +126,6 @@ protected function _construct()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode($code)
     {
@@ -150,7 +139,6 @@ public function loadByCode($code)
      *
      * @param   int $setId
      * @return  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function getAttributeCollection($setId = null)
     {
@@ -177,7 +165,6 @@ public function getAttributeCollection($setId = null)
      * Init and retrieve attribute collection
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     protected function _getAttributeCollection()
     {
@@ -194,7 +181,6 @@ protected function _getAttributeCollection()
      * Retrieve entity tpe sets collection
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
-     * @since 2.0.0
      */
     public function getAttributeSetCollection()
     {
@@ -212,7 +198,6 @@ public function getAttributeSetCollection()
      * @param int $storeId
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function fetchNewIncrementId($storeId = null)
     {
@@ -281,7 +266,6 @@ public function fetchNewIncrementId($storeId = null)
      * Retrieve entity id field
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getEntityIdField()
     {
@@ -292,7 +276,6 @@ public function getEntityIdField()
      * Retrieve entity table name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getEntityTable()
     {
@@ -307,7 +290,6 @@ public function getEntityTable()
      * Retrieve entity table prefix name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getValueTablePrefix()
     {
@@ -323,7 +305,6 @@ public function getValueTablePrefix()
      * Retrieve entity table prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTablePrefix()
     {
@@ -340,7 +321,6 @@ public function getEntityTablePrefix()
      * Get default attribute set identifier for etity type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultAttributeSetId()
     {
@@ -351,7 +331,6 @@ public function getDefaultAttributeSetId()
      * Retrieve entity type id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -362,7 +341,6 @@ public function getEntityTypeId()
      * Retrieve entity type code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -373,7 +351,6 @@ public function getEntityTypeCode()
      * Get attribute model code for entity type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeModel()
     {
@@ -388,7 +365,6 @@ public function getAttributeModel()
      * Retrieve resource entity object
      *
      * @return \Magento\Framework\Model\ResourceModel\AbstractResource
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -399,7 +375,6 @@ public function getEntity()
      * Return attribute collection. If not specify return default
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityAttributeCollection()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/VersionControl/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/VersionControl/AbstractEntity.php
index 2857bc3b99d55..7b44749273e4a 100644
--- a/app/code/Magento/Eav/Model/Entity/VersionControl/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/VersionControl/AbstractEntity.php
@@ -7,19 +7,16 @@
 
 /**
  * Class AbstractEntity
- * @since 2.0.0
  */
 abstract class AbstractEntity extends \Magento\Eav\Model\Entity\AbstractEntity
 {
     /**
      * @var \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot
-     * @since 2.0.0
      */
     protected $entitySnapshot;
 
     /**
      * @var \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite
-     * @since 2.0.0
      */
     protected $entityRelationComposite;
 
@@ -29,7 +26,6 @@ abstract class AbstractEntity extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\DataObject $object)
     {
@@ -55,7 +50,6 @@ protected function _afterLoad(\Magento\Framework\DataObject $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -118,7 +112,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function isModified(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/VersionControl/Metadata.php b/app/code/Magento/Eav/Model/Entity/VersionControl/Metadata.php
index babccdf39aab5..b994d793ed04c 100644
--- a/app/code/Magento/Eav/Model/Entity/VersionControl/Metadata.php
+++ b/app/code/Magento/Eav/Model/Entity/VersionControl/Metadata.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Metadata represents a list of entity fields that are applicable for persistence operations
- * @since 2.0.0
  */
 class Metadata extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Metadata
 {
@@ -16,7 +15,6 @@ class Metadata extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\
      *
      * @param \Magento\Framework\DataObject $entity
      * @return array
-     * @since 2.0.0
      */
     public function getFields(\Magento\Framework\DataObject $entity)
     {
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index bfe99fbc512b6..08a86f350ec5e 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -13,7 +13,6 @@
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Form
 {
@@ -21,7 +20,6 @@ abstract class Form
      * Current module path name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName = '';
 
@@ -29,7 +27,6 @@ abstract class Form
      * Current EAV entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = '';
 
@@ -37,7 +34,6 @@ abstract class Form
      * Current store instance
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -45,7 +41,6 @@ abstract class Form
      * Current entity type instance
      *
      * @var \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     protected $_entityType;
 
@@ -53,7 +48,6 @@ abstract class Form
      * Current entity instance
      *
      * @var \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -61,7 +55,6 @@ abstract class Form
      * Current form code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_formCode;
 
@@ -69,7 +62,6 @@ abstract class Form
      * Array of form attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes;
 
@@ -77,7 +69,6 @@ abstract class Form
      * Array of form system attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_systemAttributes;
 
@@ -85,7 +76,6 @@ abstract class Form
      * Array of form user defined attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_userAttributes;
 
@@ -93,7 +83,6 @@ abstract class Form
      * Array of form attributes that is not omitted
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedAttributes = null;
 
@@ -101,7 +90,6 @@ abstract class Form
      * Is AJAX request flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isAjax = false;
 
@@ -109,55 +97,46 @@ abstract class Form
      * Whether the invisible form fields need to be filtered/ignored
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_ignoreInvisible = true;
 
     /**
      * @var \Magento\Framework\Validator
-     * @since 2.0.0
      */
     protected $_validator = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_modulesReader;
 
     /**
      * @var \Magento\Eav\Model\AttributeDataFactory
-     * @since 2.0.0
      */
     protected $_attrDataFactory;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @since 2.0.0
      */
     protected $_universalFactory;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $_httpRequest;
 
     /**
      * @var \Magento\Framework\Validator\ConfigFactory
-     * @since 2.0.0
      */
     protected $_validatorConfigFactory;
 
@@ -171,7 +150,6 @@ abstract class Form
      * @param \Magento\Framework\Validator\ConfigFactory $validatorConfigFactory
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -203,7 +181,6 @@ public function __construct(
      * Get EAV Entity Form Attribute Collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getFormAttributeCollection()
     {
@@ -216,7 +193,6 @@ protected function _getFormAttributeCollection()
      * Get EAV Entity Form Attribute Collection with applied filters
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Attribute\Collection
-     * @since 2.0.0
      */
     protected function _getFilteredFormAttributeCollection()
     {
@@ -235,7 +211,6 @@ protected function _getFilteredFormAttributeCollection()
      * @param \Magento\Store\Model\Store|string|int $store
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -248,7 +223,6 @@ public function setStore($store)
      *
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return $this
-     * @since 2.0.0
      */
     public function setEntity(\Magento\Framework\Model\AbstractModel $entity)
     {
@@ -264,7 +238,6 @@ public function setEntity(\Magento\Framework\Model\AbstractModel $entity)
      *
      * @param \Magento\Eav\Model\Entity\Type|string|int $entityType
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityType($entityType)
     {
@@ -277,7 +250,6 @@ public function setEntityType($entityType)
      *
      * @param string $formCode
      * @return $this
-     * @since 2.0.0
      */
     public function setFormCode($formCode)
     {
@@ -289,7 +261,6 @@ public function setFormCode($formCode)
      * Return current store instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -304,7 +275,6 @@ public function getStore()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string
-     * @since 2.0.0
      */
     public function getFormCode()
     {
@@ -319,7 +289,6 @@ public function getFormCode()
      * Return EAV entity type if entity type is not defined
      *
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -334,7 +303,6 @@ public function getEntityType()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -348,7 +316,6 @@ public function getEntity()
      * Return array of form attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -376,7 +343,6 @@ public function getAttributes()
      *
      * @param string $attributeCode
      * @return \Magento\Eav\Model\Entity\Attribute|bool
-     * @since 2.0.0
      */
     public function getAttribute($attributeCode)
     {
@@ -391,7 +357,6 @@ public function getAttribute($attributeCode)
      * Return array of form user defined attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUserAttributes()
     {
@@ -406,7 +371,6 @@ public function getUserAttributes()
      * Return array of form system attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSystemAttributes()
     {
@@ -421,7 +385,6 @@ public function getSystemAttributes()
      * Get not omitted attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedAttributes()
     {
@@ -437,7 +400,6 @@ public function getAllowedAttributes()
      *
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return \Magento\Eav\Model\Attribute\Data\AbstractData
-     * @since 2.0.0
      */
     protected function _getAttributeDataModel(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -452,7 +414,6 @@ protected function _getAttributeDataModel(\Magento\Eav\Model\Entity\Attribute $a
      *
      * @param array $data
      * @return RequestInterface
-     * @since 2.0.0
      */
     public function prepareRequest(array $data)
     {
@@ -469,7 +430,6 @@ public function prepareRequest(array $data)
      * @param string $scope the request scope
      * @param bool $scopeOnly search value only in scope or search value in global too
      * @return array
-     * @since 2.0.0
      */
     public function extractData(RequestInterface $request, $scope = null, $scopeOnly = true)
     {
@@ -489,7 +449,6 @@ public function extractData(RequestInterface $request, $scope = null, $scopeOnly
      *
      * @param array $data
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     protected function _getValidator(array $data)
     {
@@ -517,7 +476,6 @@ protected function _getValidator(array $data)
      *
      * @param array $data
      * @return bool|array
-     * @since 2.0.0
      */
     public function validateData(array $data)
     {
@@ -537,7 +495,6 @@ public function validateData(array $data)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function compactData(array $data)
     {
@@ -559,7 +516,6 @@ public function compactData(array $data)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function restoreData(array $data)
     {
@@ -580,7 +536,6 @@ public function restoreData(array $data)
      *
      * @param string $format
      * @return array
-     * @since 2.0.0
      */
     public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
@@ -598,7 +553,6 @@ public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OU
      * Restore entity original data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetEntityData()
     {
@@ -615,7 +569,6 @@ public function resetEntityData()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsAjaxRequest($flag = true)
     {
@@ -628,7 +581,6 @@ public function setIsAjaxRequest($flag = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAjaxRequest()
     {
@@ -639,7 +591,6 @@ public function getIsAjaxRequest()
      * Set default attribute values for new entity
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initDefaultValues()
     {
@@ -660,7 +611,6 @@ public function initDefaultValues()
      *
      * @param mixed $setValue
      * @return bool|$this
-     * @since 2.0.0
      */
     public function ignoreInvisible($setValue = null)
     {
@@ -676,7 +626,6 @@ public function ignoreInvisible($setValue = null)
      *
      * @param \Magento\Eav\Model\Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAttributeOmitted($attribute)
     {
diff --git a/app/code/Magento/Eav/Model/Form/Element.php b/app/code/Magento/Eav/Model/Form/Element.php
index 15e5030663b00..9b6c65df08b43 100644
--- a/app/code/Magento/Eav/Model/Form/Element.php
+++ b/app/code/Magento/Eav/Model/Form/Element.php
@@ -20,7 +20,6 @@
  * @method \Magento\Eav\Model\Form\Element setAttributeId(int $value)
  * @method int getSortOrder()
  * @method \Magento\Eav\Model\Form\Element setSortOrder(int $value)
- * @since 2.0.0
  */
 class Element extends \Magento\Framework\Model\AbstractModel
 {
@@ -28,13 +27,11 @@ class Element extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'eav_form_element';
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -46,7 +43,6 @@ class Element extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -65,7 +61,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +72,6 @@ protected function _construct()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Element
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -89,7 +83,6 @@ protected function _getResource()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Element\Collection
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -101,7 +94,6 @@ public function getCollection()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -119,7 +111,6 @@ public function beforeSave()
      * Retrieve EAV Attribute instance
      *
      * @return \Magento\Eav\Model\Entity\Attribute
-     * @since 2.0.0
      */
     public function getAttribute()
     {
diff --git a/app/code/Magento/Eav/Model/Form/Factory.php b/app/code/Magento/Eav/Model/Form/Factory.php
index c30e3b47d9b54..7acb4a3b0859f 100644
--- a/app/code/Magento/Eav/Model/Form/Factory.php
+++ b/app/code/Magento/Eav/Model/Form/Factory.php
@@ -8,20 +8,17 @@
 /**
  * EAV form object factory
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @throws \InvalidArgumentException
      * @return \Magento\Eav\Model\Form
-     * @since 2.0.0
      */
     public function create($form, array $data = [])
     {
diff --git a/app/code/Magento/Eav/Model/Form/Fieldset.php b/app/code/Magento/Eav/Model/Form/Fieldset.php
index 5d3a237d3e3fd..fd94996085832 100644
--- a/app/code/Magento/Eav/Model/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Form/Fieldset.php
@@ -16,7 +16,6 @@
  * @method \Magento\Eav\Model\Form\Fieldset setCode(string $value)
  * @method int getSortOrder()
  * @method \Magento\Eav\Model\Form\Fieldset setSortOrder(int $value)
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Framework\Model\AbstractModel
 {
@@ -24,13 +23,11 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'eav_form_fieldset';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -42,7 +39,6 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +68,6 @@ protected function _construct()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Fieldset
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -85,7 +79,6 @@ protected function _getResource()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Fieldset\Collection
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -97,7 +90,6 @@ public function getCollection()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -115,7 +107,6 @@ public function beforeSave()
      * Retrieve fieldset labels for stores
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLabels()
     {
@@ -132,7 +123,6 @@ public function getLabels()
      * @param array $labels
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setLabels(array $labels)
     {
@@ -145,7 +135,6 @@ public function setLabels(array $labels)
      * @param int $storeId
      * @param string $label
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabel($storeId, $label)
     {
@@ -159,7 +148,6 @@ public function setStoreLabel($storeId, $label)
      * Retrieve label store scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
diff --git a/app/code/Magento/Eav/Model/Form/Type.php b/app/code/Magento/Eav/Model/Form/Type.php
index 8328b09a32b50..8dbe7591d4cda 100644
--- a/app/code/Magento/Eav/Model/Form/Type.php
+++ b/app/code/Magento/Eav/Model/Form/Type.php
@@ -21,7 +21,6 @@
  * @method \Magento\Eav\Model\Form\Type setStoreId(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractModel
 {
@@ -29,19 +28,16 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'eav_form_type';
 
     /**
      * @var \Magento\Eav\Model\Form\FieldsetFactory
-     * @since 2.0.0
      */
     protected $_fieldsetFactory;
 
     /**
      * @var \Magento\Eav\Model\Form\ElementFactory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
@@ -54,7 +50,6 @@ class Type extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -75,7 +70,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -87,7 +81,6 @@ protected function _construct()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Type
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -99,7 +92,6 @@ protected function _getResource()
      *
      * @return \Magento\Eav\Model\ResourceModel\Form\Type\Collection
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -110,7 +102,6 @@ public function getCollection()
      * Retrieve assigned Eav Entity types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes()
     {
@@ -125,7 +116,6 @@ public function getEntityTypes()
      *
      * @param array $entityTypes
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypes(array $entityTypes)
     {
@@ -138,7 +128,6 @@ public function setEntityTypes(array $entityTypes)
      *
      * @param int $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityType($entityTypeId)
     {
@@ -155,7 +144,6 @@ public function addEntityType($entityTypeId)
      *
      * @param \Magento\Eav\Model\Form\Type $skeleton
      * @return $this
-     * @since 2.0.0
      */
     public function createFromSkeleton(\Magento\Eav\Model\Form\Type $skeleton)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Attribute.php
index 0c5bc42079f39..ec24695a279d5 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Attribute.php
@@ -12,7 +12,6 @@
  * EAV attribute resource model (Using Forms)
  *
  * @api
- * @since 2.0.0
  */
 abstract class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
 {
@@ -23,7 +22,6 @@ abstract class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribu
      * If realization doesn't demand this functionality, let this function just return null
      *
      * @return string|null
-     * @since 2.0.0
      */
     abstract protected function _getEavWebsiteTable();
 
@@ -33,7 +31,6 @@ abstract protected function _getEavWebsiteTable();
      * Get table, where dependency between form name and attribute ids are stored
      *
      * @return string|null
-     * @since 2.0.0
      */
     abstract protected function _getFormAttributeTable();
 
@@ -42,7 +39,6 @@ abstract protected function _getFormAttributeTable();
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -60,7 +56,6 @@ protected function _beforeSave(AbstractModel $object)
      * @param mixed $value
      * @param AbstractModel $object
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -91,7 +86,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -150,7 +144,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param \Magento\Eav\Model\Attribute $object
      * @return array
-     * @since 2.0.0
      */
     public function getScopeValues(\Magento\Eav\Model\Attribute $object)
     {
@@ -179,7 +172,6 @@ public function getScopeValues(\Magento\Eav\Model\Attribute $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return array
-     * @since 2.0.0
      */
     public function getUsedInForms(AbstractModel $object)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php
index 0487a3cff213a..88f922bcb6421 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php
@@ -11,7 +11,6 @@
  * EAV additional attribute resource collection (Using Forms)
  *
  * @api
- * @since 2.0.0
  */
 abstract class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
 {
@@ -24,7 +23,6 @@ abstract class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attrib
      * Current website scope instance
      *
      * @var Website
-     * @since 2.0.0
      */
     protected $_website;
 
@@ -32,13 +30,11 @@ abstract class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attrib
      * Attribute Entity Type Filter
      *
      * @var \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     protected $_entityType;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -52,7 +48,6 @@ abstract class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attrib
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -72,7 +67,6 @@ public function __construct(
      * Default attribute entity type code
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function _getEntityTypeCode();
 
@@ -83,7 +77,6 @@ abstract protected function _getEntityTypeCode();
      * If realization doesn't demand this functionality, let this function just return null
      *
      * @return string|null
-     * @since 2.0.0
      */
     abstract protected function _getEavWebsiteTable();
 
@@ -92,7 +85,6 @@ abstract protected function _getEavWebsiteTable();
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -103,7 +95,6 @@ public function getEntityTypeCode()
      * Return eav entity type instance
      *
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -118,7 +109,6 @@ public function getEntityType()
      *
      * @param Website|int $website
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsite($website)
     {
@@ -131,7 +121,6 @@ public function setWebsite($website)
      * Return current website scope instance
      *
      * @return Website
-     * @since 2.0.0
      */
     public function getWebsite()
     {
@@ -145,7 +134,6 @@ public function getWebsite()
      * Initialize collection select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -229,7 +217,6 @@ protected function _initSelect()
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntityTypeFilter($type)
     {
@@ -241,7 +228,6 @@ public function setEntityTypeFilter($type)
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addVisibleFilter()
     {
@@ -252,7 +238,6 @@ public function addVisibleFilter()
      * Exclude system hidden attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSystemHiddenFilter()
     {
@@ -270,7 +255,6 @@ public function addSystemHiddenFilter()
      * Exclude system hidden attributes but include password hash
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSystemHiddenFilterWithPasswordHash()
     {
@@ -292,7 +276,6 @@ public function addSystemHiddenFilterWithPasswordHash()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addExcludeHiddenFrontendFilter()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Attribute/DefaultEntityAttributes/ProviderInterface.php b/app/code/Magento/Eav/Model/ResourceModel/Attribute/DefaultEntityAttributes/ProviderInterface.php
index bda3a140b4215..02d94a7ce4dc0 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Attribute/DefaultEntityAttributes/ProviderInterface.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Attribute/DefaultEntityAttributes/ProviderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface
  *
- * @since 2.0.0
  */
 interface ProviderInterface
 {
@@ -16,7 +15,6 @@ interface ProviderInterface
      * Retrieve default entity static attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDefaultAttributes();
 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/AttributeLoader.php b/app/code/Magento/Eav/Model/ResourceModel/AttributeLoader.php
index 7112934c50e97..3a6bd16679ab7 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/AttributeLoader.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/AttributeLoader.php
@@ -11,7 +11,7 @@
 
 /**
  * Loads attributes by attribute set
- * @since 2.2.0
+ * @since 2.1.3
  */
 class AttributeLoader
 {
@@ -20,19 +20,19 @@ class AttributeLoader
 
     /**
      * @var AttributeRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributeRepository;
 
     /**
      * @var MetadataPool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $metadataPool;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $searchCriteriaBuilder;
 
@@ -42,7 +42,7 @@ class AttributeLoader
      * @param AttributeRepository $attributeRepository
      * @param MetadataPool $metadataPool
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         AttributeRepository $attributeRepository,
@@ -60,7 +60,7 @@ public function __construct(
      * @param string $entityType
      * @param int|null $attributeSetId
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAttributes($entityType, $attributeSetId = null)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Config.php b/app/code/Magento/Eav/Model/ResourceModel/Config.php
index 27f3d847cd09e..2b64550e337f6 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Config.php
@@ -9,7 +9,6 @@
  * Eav Resource Config model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of entity types
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_entityTypes = [];
 
@@ -25,7 +23,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_attributes = [];
 
@@ -34,7 +31,6 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -45,7 +41,6 @@ protected function _construct()
      * Load all entity types
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadTypes()
     {
@@ -70,7 +65,6 @@ protected function _loadTypes()
      *
      * @param int $typeId
      * @return array
-     * @since 2.0.0
      */
     protected function _loadTypeAttributes($typeId)
     {
@@ -94,7 +88,6 @@ protected function _loadTypeAttributes($typeId)
      *
      * @param string $entityType
      * @return array
-     * @since 2.0.0
      */
     public function fetchEntityTypeData($entityType)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
index b43be26f4db7a..05f42139829b9 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
@@ -51,7 +51,7 @@ class CreateHandler implements AttributeInterface
 
     /**
      * @var AttributeLoader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributeLoader;
 
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index 173ba34f2111d..55344ec03abab 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -17,7 +17,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -25,25 +24,22 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Eav Entity attributes cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_entityAttributes = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     protected $_eavEntityType;
 
     /**
      * @var Config
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $config;
 
@@ -55,7 +51,6 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param Type $eavEntityType
      * @param string $connectionName
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -73,7 +68,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -85,7 +79,6 @@ protected function _construct()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -102,7 +95,6 @@ protected function _initUniqueFields()
      * @param int $entityTypeId
      * @param string $code
      * @return bool
-     * @since 2.0.0
      */
     public function loadByCode(AbstractModel $object, $entityTypeId, $code)
     {
@@ -123,7 +115,6 @@ public function loadByCode(AbstractModel $object, $entityTypeId, $code)
      *
      * @param AbstractModel $object
      * @return int
-     * @since 2.0.0
      */
     private function _getMaxSortOrder(AbstractModel $object)
     {
@@ -153,7 +144,6 @@ private function _getMaxSortOrder(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractMode $object
      * @return $this
-     * @since 2.0.0
      */
     public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -175,7 +165,6 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
      * @param EntityAttribute|AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -204,7 +193,6 @@ protected function _beforeSave(AbstractModel $object)
      *
      * @param EntityAttribute|AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -227,7 +215,7 @@ protected function _afterSave(AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.9
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -237,8 +225,8 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @return Config
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.9
+     * @since 2.0.9
      */
     private function getConfig()
     {
@@ -253,7 +241,6 @@ private function getConfig()
      *
      * @param EntityAttribute|\Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveStoreLabels(AbstractModel $object)
     {
@@ -281,7 +268,6 @@ protected function _saveStoreLabels(AbstractModel $object)
      *
      * @param EntityAttribute|\Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveAdditionalAttributeData(AbstractModel $object)
     {
@@ -317,7 +303,6 @@ protected function _saveAdditionalAttributeData(AbstractModel $object)
      * @param null $attributeSortOrder
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function saveInSetIncluding(
         AbstractModel $object,
@@ -357,7 +342,6 @@ public function saveInSetIncluding(
      *
      * @param EntityAttribute|AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveOption(AbstractModel $object)
     {
@@ -384,7 +368,6 @@ protected function _saveOption(AbstractModel $object)
      * @param EntityAttribute|AbstractModel $object
      * @param array $option
      * @return array
-     * @since 2.0.0
      */
     protected function _processAttributeOptions($object, $option)
     {
@@ -407,7 +390,6 @@ protected function _processAttributeOptions($object, $option)
      * @param array $values
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _checkDefaultOptionValue($values)
     {
@@ -424,7 +406,6 @@ protected function _checkDefaultOptionValue($values)
      * @param int $intOptionId
      * @param array $defaultValue
      * @return void
-     * @since 2.0.0
      */
     protected function _updateDefaultValue($object, $optionId, $intOptionId, &$defaultValue)
     {
@@ -444,7 +425,6 @@ protected function _updateDefaultValue($object, $optionId, $intOptionId, &$defau
      * @param AbstractModel $object
      * @param array $defaultValue
      * @return void
-     * @since 2.0.0
      */
     protected function _saveDefaultValue($object, $defaultValue)
     {
@@ -462,7 +442,6 @@ protected function _saveDefaultValue($object, $defaultValue)
      * @param int $optionId
      * @param array $option
      * @return int|bool
-     * @since 2.0.0
      */
     protected function _updateAttributeOption($object, $optionId, $option)
     {
@@ -498,7 +477,6 @@ protected function _updateAttributeOption($object, $optionId, $option)
      * @param int $optionId
      * @param array $values
      * @return void
-     * @since 2.0.0
      */
     protected function _updateAttributeOptionValues($optionId, $values)
     {
@@ -523,7 +501,6 @@ protected function _updateAttributeOptionValues($optionId, $values)
      * @param string $entityType
      * @param string $code
      * @return int
-     * @since 2.0.0
      */
     public function getIdByCode($entityType, $code)
     {
@@ -568,7 +545,6 @@ public function getEntityAttribute($entityAttributeId)
      *
      * @param string $frontendType
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeCodesByFrontendType($frontendType)
     {
@@ -590,7 +566,6 @@ public function getAttributeCodesByFrontendType($frontendType)
      * @param AbstractAttribute $attribute
      * @param int $storeId
      * @return Select
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect(AbstractAttribute $attribute, $storeId)
     {
@@ -639,7 +614,6 @@ public function getFlatUpdateSelect(AbstractAttribute $attribute, $storeId)
      * @param string $table
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function describeTable($table)
     {
@@ -652,7 +626,6 @@ public function describeTable($table)
      * @param int $entityTypeId
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getAdditionalAttributeTable($entityTypeId)
     {
@@ -665,7 +638,6 @@ public function getAdditionalAttributeTable($entityTypeId)
      *
      * @param EntityAttribute|AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(AbstractModel $object)
     {
@@ -706,7 +678,6 @@ protected function _afterLoad(AbstractModel $object)
      *
      * @param int $attributeId
      * @return array
-     * @since 2.0.0
      */
     public function getStoreLabelsByAttributeId($attributeId)
     {
@@ -730,7 +701,6 @@ public function getStoreLabelsByAttributeId($attributeId)
      *
      * @param array $attributeIds
      * @return array
-     * @since 2.0.0
      */
     public function getValidAttributeIds($attributeIds)
     {
@@ -750,7 +720,7 @@ public function getValidAttributeIds($attributeIds)
      * Provide variables to serialize
      *
      * @return array
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -763,7 +733,7 @@ public function __sleep()
      * Restore global dependencies
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index 3256c76962111..9e925f4699689 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -20,13 +19,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Add attribute set info flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addSetInfoFlag = false;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -39,7 +36,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -59,7 +55,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -74,7 +69,6 @@ protected function _construct()
      *
      * @return string[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getLoadDataFields()
     {
@@ -95,7 +89,6 @@ protected function _getLoadDataFields()
      * Specify select columns which are used for load arrtibute values
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useLoadDataFields()
     {
@@ -110,7 +103,6 @@ public function useLoadDataFields()
      *
      * @param  Type|int $type
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityTypeFilter($type)
     {
@@ -137,7 +129,6 @@ public function setEntityTypeFilter($type)
      *
      * @param int $setId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetFilter($setId)
     {
@@ -169,7 +160,6 @@ public function setAttributeSetFilter($setId)
      * @param string $attributeSetName
      * @param string $entityTypeCode
      * @return void
-     * @since 2.0.0
      */
     public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCode)
     {
@@ -196,7 +186,6 @@ public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCod
      *
      * @param array $setIds
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetsFilter(array $setIds)
     {
@@ -217,7 +206,6 @@ public function setAttributeSetsFilter(array $setIds)
      *
      * @param int[] $setIds
      * @return $this
-     * @since 2.0.0
      */
     public function setInAllAttributeSetsFilter(array $setIds)
     {
@@ -245,7 +233,6 @@ public function setInAllAttributeSetsFilter(array $setIds)
      *
      * @param array $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributesExcludeFilter($attributes)
     {
@@ -257,7 +244,6 @@ public function setAttributesExcludeFilter($attributes)
      *
      * @param int $setId
      * @return $this
-     * @since 2.0.0
      */
     public function setExcludeSetFilter($setId)
     {
@@ -278,7 +264,6 @@ public function setExcludeSetFilter($setId)
      *
      * @param int $groupId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeGroupFilter($groupId)
     {
@@ -297,7 +282,6 @@ public function setAttributeGroupFilter($groupId)
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addAttributeGrouping()
     {
@@ -310,7 +294,6 @@ public function addAttributeGrouping()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addIsUniqueFilter()
     {
@@ -322,7 +305,6 @@ public function addIsUniqueFilter()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addIsNotUniqueFilter()
     {
@@ -333,7 +315,6 @@ public function addIsNotUniqueFilter()
      * Specify filter to select just attributes with options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addHasOptionsFilter()
     {
@@ -365,7 +346,6 @@ public function addHasOptionsFilter()
      * @param string $frontendInputType
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setFrontendInputTypeFilter($frontendInputType)
     {
@@ -378,7 +358,6 @@ public function setFrontendInputTypeFilter($frontendInputType)
      * @param bool $flag
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addSetInfo($flag = true)
     {
@@ -390,7 +369,6 @@ public function addSetInfo($flag = true)
      * Ad information about attribute sets to collection result data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addSetInfo()
     {
@@ -445,7 +423,6 @@ protected function _addSetInfo()
      * Ad information about attribute sets to collection result data
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _afterLoadData()
     {
@@ -459,7 +436,6 @@ protected function _afterLoadData()
      *
      * @param string|array $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCodeFilter($code)
     {
@@ -478,7 +454,6 @@ public function setCodeFilter($code)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreLabel($storeId)
     {
@@ -498,7 +473,6 @@ public function addStoreLabel($storeId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
index 8a9df2010e71a..bf7521f560cfd 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
@@ -11,13 +11,11 @@
  * Eav Resource Attribute Set Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registryManager;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\C
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -49,7 +46,6 @@ public function __construct(
      *  Add filter by entity type id to collection
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|$this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
index 4ef00978af0a3..a32354e2e0ad3 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
@@ -13,7 +13,6 @@
 
 /**
  * Eav Resource Entity Attribute Group
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -41,7 +40,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +51,6 @@ protected function _construct()
      *
      * @param \Magento\Eav\Model\Entity\Attribute\Group $object
      * @return bool
-     * @since 2.0.0
      */
     public function itemExists($object)
     {
@@ -78,7 +75,6 @@ public function itemExists($object)
      *
      * @param AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -93,7 +89,6 @@ protected function _beforeSave(AbstractModel $object)
      *
      * @param AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -115,7 +110,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param AbstractModel $object
      * @return int
-     * @since 2.0.0
      */
     protected function _getMaxSortOrder($object)
     {
@@ -136,7 +130,6 @@ protected function _getMaxSortOrder($object)
      *
      * @param integer $attributeSetId
      * @return $this
-     * @since 2.0.0
      */
     public function updateDefaultGroup($attributeSetId)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group/Collection.php
index 49adbd8746931..0759498617c09 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group/Collection.php
@@ -9,7 +9,6 @@
  * Eav attribute group resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      *
      * @param int $setId
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeSetFilter($setId)
     {
@@ -48,7 +45,6 @@ public function setAttributeSetFilter($setId)
      * @param string $direction
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setSortOrder($direction = self::SORT_ORDER_ASC)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
index 3a95a2be21c5d..cd2e985e57ee8 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
@@ -9,7 +9,6 @@
  * Entity attribute option resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @param \Zend_Db_Expr $valueExpr
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionValueToCollection($collection, $attribute, $valueExpr)
     {
@@ -71,7 +68,6 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
      * @param int $store
      * @param bool $hasValueField flag which require option value
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
index 4428b9a38c132..d6246c9072263 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
@@ -9,7 +9,6 @@
  * Entity attribute option collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,19 +16,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Option value table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_optionValueTable;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_coreResource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -43,7 +39,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -64,7 +59,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -81,7 +75,6 @@ protected function _construct()
      * @param int $setId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setAttributeFilter($setId)
     {
@@ -94,7 +87,6 @@ public function setAttributeFilter($setId)
      * @param int $storeId
      * @param bool $useDefaultValue
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreFilter($storeId = null, $useDefaultValue = true)
     {
@@ -143,7 +135,6 @@ public function setStoreFilter($storeId = null, $useDefaultValue = true)
      * @param int|array $optionId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIdFilter($optionId)
     {
@@ -155,7 +146,6 @@ public function setIdFilter($optionId)
      *
      * @param string $valueKey
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($valueKey = 'value')
     {
@@ -168,7 +158,6 @@ public function toOptionArray($valueKey = 'value')
      * @param string $dir direction
      * @param bool $sortAlpha sort alphabetically by values in admin
      * @return $this
-     * @since 2.0.0
      */
     public function setPositionOrder($dir = self::SORT_ORDER_ASC, $sortAlpha = false)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
index 7df6f1feb59f9..55899f9d5c4fa 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set
  *
- * @since 2.0.0
  */
 class Set extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,13 +18,11 @@ class Set extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\GroupFactory
-     * @since 2.0.0
      */
     protected $_attrGroupFactory;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
@@ -36,7 +33,6 @@ class Set extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param GroupFactory $attrGroupFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param string|null $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +61,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -104,7 +98,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @return $this
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -126,7 +119,6 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Eav\Model\Entity\Attribute\Set $object
      * @param string $attributeSetName
      * @return bool
-     * @since 2.0.0
      */
     public function validate($object, $attributeSetName)
     {
@@ -154,7 +146,6 @@ public function validate($object, $attributeSetName)
      * @param array $attributeIds
      * @param int $setId
      * @return array
-     * @since 2.0.0
      */
     public function getSetInfo(array $attributeIds, $setId = null)
     {
@@ -200,7 +191,6 @@ public function getSetInfo(array $attributeIds, $setId = null)
      *
      * @param int $setId
      * @return int|null
-     * @since 2.0.0
      */
     public function getDefaultGroupId($setId)
     {
@@ -224,7 +214,6 @@ public function getDefaultGroupId($setId)
      *
      * @param int $setId
      * @return array
-     * @since 2.0.0
      */
     protected function fetchAttributeSetData($setId = null)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set/Collection.php
index c67dba6adb3c7..d0ee7745124a7 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param int $typeId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntityTypeFilter($typeId)
     {
@@ -46,7 +43,6 @@ public function setEntityTypeFilter($typeId)
      * Convert collection items to select options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -57,7 +53,6 @@ public function toOptionArray()
      * Convert collection items to select options hash array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
index c5dc0ba9be8ae..80d8780b69b38 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
@@ -12,7 +12,6 @@
  * Eav Entity store resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Store extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Store extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param int $entityTypeId
      * @param int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function loadByEntityStore(AbstractModel $object, $entityTypeId, $storeId)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Type.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Type.php
index f8494ea2e0ab4..a5e4c4f80cced 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Type.php
@@ -9,7 +9,6 @@
  * EAV entity type resource model
  *
  * @api
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -26,7 +25,6 @@ class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +38,6 @@ protected function _construct()
      * @param string $code
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function loadByCode($object, $code)
     {
@@ -52,7 +49,6 @@ public function loadByCode($object, $code)
      *
      * @param integer $entityTypeId
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalAttributeTable($entityTypeId)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Type/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Type/Collection.php
index 4b291d9607409..bfe0010fa94a1 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Type/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Type/Collection.php
@@ -9,7 +9,6 @@
  * Eav Resource Entity Type Collection Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute.php
index af4ec52fb3c9d..d1f56d60ab062 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Eav\Model\ResourceModel\Form\Attribute
  *
- * @since 2.0.0
  */
 abstract class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -23,7 +22,6 @@ abstract class Attribute extends \Magento\Framework\Model\ResourceModel\Db\Abstr
      *
      * @param string $formCode
      * @return array
-     * @since 2.0.0
      */
     public function getFormAttributeIds($formCode)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute/Collection.php
index a7d10d142d02d..562ae02923252 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Attribute/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Current module pathname
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName = '';
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Current EAV entity type code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_entityTypeCode = '';
 
@@ -34,7 +31,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Current store instance
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -42,19 +38,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Eav Entity Type instance
      *
      * @var \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     protected $_entityType;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_eavConfig;
 
@@ -68,7 +61,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -90,7 +82,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -112,7 +103,6 @@ protected function _construct()
      *
      * @return string|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getEavWebsiteTable()
     {
@@ -125,7 +115,6 @@ protected function _getEavWebsiteTable()
      * @param \Magento\Store\Model\Store|string|int $store
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -137,7 +126,6 @@ public function setStore($store)
      * Return current store instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -153,7 +141,6 @@ public function getStore()
      * @param \Magento\Eav\Model\Entity\Type|string|int $entityType
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntityType($entityType)
     {
@@ -165,7 +152,6 @@ public function setEntityType($entityType)
      * Return current entity type instance
      *
      * @return \Magento\Eav\Model\Entity\Type
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -181,7 +167,6 @@ public function getEntityType()
      * @param string $code
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addFormCodeFilter($code)
     {
@@ -193,7 +178,6 @@ public function addFormCodeFilter($code)
      *
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($direction = self::SORT_ORDER_ASC)
     {
@@ -205,7 +189,6 @@ public function setSortOrder($direction = self::SORT_ORDER_ASC)
      * Add joins to select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Element.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Element.php
index 4ee1f2ba119ab..e137971199004 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Element.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Element.php
@@ -9,7 +9,6 @@
  * Eav Form Element Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Element extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Element extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -34,7 +32,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Eav\Model\Form\Element $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Element/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Element/Collection.php
index 384cb52a96130..79d0a0221d555 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Element/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Element/Collection.php
@@ -9,7 +9,6 @@
  * Eav Form Element Resource Collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param \Magento\Eav\Model\Form\Type|int $type
      * @return $this
-     * @since 2.0.0
      */
     public function addTypeFilter($type)
     {
@@ -46,7 +43,6 @@ public function addTypeFilter($type)
      *
      * @param \Magento\Eav\Model\Form\Fieldset|int $fieldset
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldsetFilter($fieldset)
     {
@@ -63,7 +59,6 @@ public function addFieldsetFilter($fieldset)
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|int $attribute
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeFilter($attribute)
     {
@@ -79,7 +74,6 @@ public function addAttributeFilter($attribute)
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setSortOrder()
     {
@@ -92,7 +86,6 @@ public function setSortOrder()
      * Join attribute data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinAttributeData()
     {
@@ -111,7 +104,6 @@ protected function _joinAttributeData()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset.php
index 7a2929275114c..ddf8d4c8dede9 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset.php
@@ -13,7 +13,6 @@
  * Eav Form Fieldset Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Fieldset extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +36,6 @@ protected function _construct()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -100,7 +97,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param FormFieldset $object
      * @return array
-     * @since 2.0.0
      */
     public function getLabels($object)
     {
@@ -127,7 +123,6 @@ public function getLabels($object)
      * @param mixed $value
      * @param FormFieldset $object
      * @return Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
index 1ba8bd8ae180f..07b60766166d9 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
@@ -17,13 +17,11 @@
  * Eav Form Fieldset Resource Collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -31,7 +29,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store scope ID
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -44,7 +41,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param mixed $connection
      * @param AbstractDb $resource
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -64,7 +60,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +71,6 @@ protected function _construct()
      *
      * @param Type|int $type
      * @return $this
-     * @since 2.0.0
      */
     public function addTypeFilter($type)
     {
@@ -92,7 +86,6 @@ public function addTypeFilter($type)
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setSortOrder()
     {
@@ -104,7 +97,6 @@ public function setSortOrder()
      * Retrieve label store scope
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -120,7 +112,6 @@ public function getStoreId()
      * @param int $storeId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -132,7 +123,6 @@ public function setStoreId($storeId)
      * Initialize select object
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Type.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Type.php
index 3f9d6fca0e266..8259be69ade1d 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Type.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Type.php
@@ -12,7 +12,6 @@
  * Eav Form Type Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,7 +19,6 @@ class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +35,6 @@ protected function _construct()
      * @param mixed $value
      * @param string $field field to load by (defaults to model id)
      * @return $this
-     * @since 2.0.0
      */
     public function load(AbstractModel $object, $value, $field = null)
     {
@@ -52,7 +49,6 @@ public function load(AbstractModel $object, $value, $field = null)
      *
      * @param FormType $object
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes($object)
     {
@@ -79,7 +75,6 @@ public function getEntityTypes($object)
      *
      * @param FormType|AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -119,7 +114,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|int $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getFormTypesByAttribute($attribute)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Type/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Type/Collection.php
index e5e81a6ca8e84..1a956dab6c5b5 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Type/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Type/Collection.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Eav\Model\ResourceModel\Form\Type\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -25,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +34,6 @@ protected function _construct()
      * Convert items array to array for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -48,7 +45,6 @@ public function toOptionArray()
      *
      * @param Type|int $entity
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityTypeFilter($entity)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Helper.php b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
index 436bb6f6719b0..fc63c9082332b 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
@@ -9,7 +9,6 @@
  * Eav Mysql resource helper model
  *
  * @api
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper
 {
@@ -19,7 +18,6 @@ class Helper extends \Magento\Framework\DB\Helper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'Magento_Eav')
     {
@@ -30,7 +28,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
      * Mysql column - Table DDL type pairs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ddlColumnTypes = [
         \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN => 'bool',
@@ -53,7 +50,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
      *
      * @param string $columnType
      * @return string
-     * @since 2.0.0
      */
     public function getDdlTypeByColumnType($columnType)
     {
@@ -77,7 +73,6 @@ public function getDdlTypeByColumnType($columnType)
      *
      * @param array $selects
      * @return array
-     * @since 2.0.0
      */
     public function getLoadAttributesSelectGroups($selects)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index 39f1afccb5329..111bdb926f50d 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -32,7 +32,7 @@ class ReadHandler implements AttributeInterface
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $logger;
 
diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
index 6430f0c22d55b..9eb6127de0722 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
@@ -64,7 +64,7 @@ class UpdateHandler implements AttributeInterface
 
     /**
      * @var AttributeLoader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $attributeLoader;
 
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Backend.php b/app/code/Magento/Eav/Model/Validator/Attribute/Backend.php
index f3404de78a594..8b8a55ebbb35e 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Backend.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Backend.php
@@ -9,7 +9,6 @@
  * Validation EAV entity via EAV attributes' backend models
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Backend extends \Magento\Framework\Validator\AbstractValidator
 {
@@ -19,7 +18,6 @@ class Backend extends \Magento\Framework\Validator\AbstractValidator
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function isValid($entity)
     {
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
index 47022fb61224c..71cb3fedad1be 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
@@ -16,43 +16,36 @@
 /**
  * Class \Magento\Eav\Model\Validator\Attribute\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesWhiteList = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesBlackList = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
     /**
      * @var \Magento\Eav\Model\AttributeDataFactory
-     * @since 2.0.0
      */
     protected $_attrDataFactory;
 
     /**
      * @param \Magento\Eav\Model\AttributeDataFactory $attrDataFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Eav\Model\AttributeDataFactory $attrDataFactory)
     {
@@ -64,7 +57,6 @@ public function __construct(\Magento\Eav\Model\AttributeDataFactory $attrDataFac
      *
      * @param Attribute[] $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributes(array $attributes)
     {
@@ -79,7 +71,6 @@ public function setAttributes(array $attributes)
      *
      * @param array $attributesCodes
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributesWhiteList(array $attributesCodes)
     {
@@ -94,7 +85,6 @@ public function setAttributesWhiteList(array $attributesCodes)
      *
      * @param array $attributesCodes
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributesBlackList(array $attributesCodes)
     {
@@ -107,7 +97,6 @@ public function setAttributesBlackList(array $attributesCodes)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setData(array $data)
     {
@@ -120,7 +109,6 @@ public function setData(array $data)
      *
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($entity)
     {
@@ -160,7 +148,6 @@ public function isValid($entity)
      *
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributes($entity)
     {
@@ -209,7 +196,6 @@ protected function _getAttributes($entity)
      * @param string $code
      * @param array $messages
      * @return void
-     * @since 2.0.0
      */
     protected function _addErrorMessages($code, array $messages)
     {
diff --git a/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
index 49de49c5e314b..5bafd6894b887 100644
--- a/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Eav\Plugin\Model\ResourceModel\Entity\Attribute
  *
- * @since 2.0.0
  */
 class Attribute
 {
@@ -26,7 +25,6 @@ class Attribute
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     private $cache;
 
@@ -47,7 +45,6 @@ class Attribute
      * @param StateInterface $cacheState
      * @param SerializerInterface $serializer
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         CacheInterface $cache,
@@ -65,7 +62,6 @@ public function __construct(
      * @param int $attributeId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetStoreLabelsByAttributeId(
         AttributeResource $subject,
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 9b8f96ca6dd98..890b2b4beb1e0 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class EavSetup
 {
@@ -25,7 +24,6 @@ class EavSetup
      * Cache
      *
      * @var CacheInterface
-     * @since 2.0.0
      */
     private $cache;
 
@@ -33,7 +31,6 @@ class EavSetup
      * Attribute group collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $attrGroupCollectionFactory;
 
@@ -41,7 +38,6 @@ class EavSetup
      * Attribute mapper
      *
      * @var PropertyMapperInterface
-     * @since 2.0.0
      */
     private $attributeMapper;
 
@@ -49,7 +45,6 @@ class EavSetup
      * Setup model
      *
      * @var ModuleDataSetupInterface
-     * @since 2.0.0
      */
     private $setup;
 
@@ -57,7 +52,6 @@ class EavSetup
      * General Attribute Group Name
      *
      * @var string
-     * @since 2.0.0
      */
     private $_generalGroupName = 'General';
 
@@ -65,7 +59,6 @@ class EavSetup
      * Default attribute group name to id pairs
      *
      * @var array
-     * @since 2.0.0
      */
     private $defaultGroupIdAssociations = ['general' => 1];
 
@@ -73,7 +66,6 @@ class EavSetup
      * Default attribute group name
      *
      * @var string
-     * @since 2.0.0
      */
     private $_defaultGroupName = 'Default';
 
@@ -81,7 +73,6 @@ class EavSetup
      * Default attribute set name
      *
      * @var string
-     * @since 2.0.0
      */
     private $_defaultAttributeSetName = 'Default';
 
@@ -92,7 +83,6 @@ class EavSetup
      * @param Context $context
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -110,7 +100,6 @@ public function __construct(
      * Gets setup model
      *
      * @return ModuleDataSetupInterface
-     * @since 2.0.0
      */
     public function getSetup()
     {
@@ -121,7 +110,6 @@ public function getSetup()
      * Gets attribute group collection factory
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection
-     * @since 2.0.0
      */
     public function getAttributeGroupCollectionFactory()
     {
@@ -132,7 +120,6 @@ public function getAttributeGroupCollectionFactory()
      * Clean cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cleanCache()
     {
@@ -144,7 +131,6 @@ public function cleanCache()
      * Install Default Group Ids
      *
      * @return $this
-     * @since 2.0.0
      */
     public function installDefaultGroupIds()
     {
@@ -190,7 +176,6 @@ public function installDefaultGroupIds()
      * @param string $code
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityType($code, array $params)
     {
@@ -235,7 +220,6 @@ public function addEntityType($code, array $params)
      * @param string $field
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function updateEntityType($code, $field, $value = null)
     {
@@ -255,7 +239,6 @@ public function updateEntityType($code, $field, $value = null)
      * @param int|string $id
      * @param string $field
      * @return mixed
-     * @since 2.0.0
      */
     public function getEntityType($id, $field = null)
     {
@@ -273,7 +256,6 @@ public function getEntityType($id, $field = null)
      * @param int|string $entityTypeId
      * @return int
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getEntityTypeId($entityTypeId)
     {
@@ -292,7 +274,6 @@ public function getEntityTypeId($entityTypeId)
      *
      * @param int|string $id
      * @return $this
-     * @since 2.0.0
      */
     public function removeEntityType($id)
     {
@@ -313,7 +294,6 @@ public function removeEntityType($id)
      * @param int|string $entityTypeId
      * @param int $sortOrder
      * @return int
-     * @since 2.0.0
      */
     public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
     {
@@ -340,7 +320,6 @@ public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
      * @param int $sortOrder
      * @param int $setId
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId = null)
     {
@@ -374,7 +353,6 @@ public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId
      * @param string $field
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function updateAttributeSet($entityTypeId, $id, $field, $value = null)
     {
@@ -397,7 +375,6 @@ public function updateAttributeSet($entityTypeId, $id, $field, $value = null)
      * @param int|string $id
      * @param string $field
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttributeSet($entityTypeId, $id, $field = null)
     {
@@ -418,7 +395,6 @@ public function getAttributeSet($entityTypeId, $id, $field = null)
      * @param int|string $setId
      * @return int
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getAttributeSetId($entityTypeId, $setId)
     {
@@ -438,7 +414,6 @@ public function getAttributeSetId($entityTypeId, $setId)
      * @param int|string $entityTypeId
      * @param int|string $id
      * @return $this
-     * @since 2.0.0
      */
     public function removeAttributeSet($entityTypeId, $id)
     {
@@ -456,7 +431,6 @@ public function removeAttributeSet($entityTypeId, $id)
      * @param int|string $entityType
      * @param string $attributeSet
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultSetToEntityType($entityType, $attributeSet = 'Default')
     {
@@ -471,7 +445,6 @@ public function setDefaultSetToEntityType($entityType, $attributeSet = 'Default'
      *
      * @param int|string|null $entityTypeId
      * @return array
-     * @since 2.0.0
      */
     public function getAllAttributeSetIds($entityTypeId = null)
     {
@@ -492,7 +465,6 @@ public function getAllAttributeSetIds($entityTypeId = null)
      *
      * @param string|int $entityType
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultAttributeSetId($entityType)
     {
@@ -521,7 +493,6 @@ public function getDefaultAttributeSetId($entityType)
      * @param int|string $setId
      * @param int $sortOrder
      * @return int
-     * @since 2.0.0
      */
     public function getAttributeGroupSortOrder($entityTypeId, $setId, $sortOrder = null)
     {
@@ -548,7 +519,6 @@ public function getAttributeGroupSortOrder($entityTypeId, $setId, $sortOrder = n
      * @param string $name
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = null)
     {
@@ -603,7 +573,6 @@ public function convertToAttributeGroupCode($groupName)
      * @param string $field
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function updateAttributeGroup($entityTypeId, $setId, $id, $field, $value = null)
     {
@@ -628,7 +597,6 @@ public function updateAttributeGroup($entityTypeId, $setId, $id, $field, $value
      * @param int|string $id
      * @param string $field
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttributeGroup($entityTypeId, $setId, $id, $field = null)
     {
@@ -684,7 +652,6 @@ public function getAttributeGroupByCode($entityTypeId, $setId, $code, $field = n
      * @param int|string $groupId
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getAttributeGroupId($entityTypeId, $setId, $groupId)
     {
@@ -709,7 +676,6 @@ public function getAttributeGroupId($entityTypeId, $setId, $groupId)
      * @param int|string $setId
      * @param int|string $id
      * @return $this
-     * @since 2.0.0
      */
     public function removeAttributeGroup($entityTypeId, $setId, $id)
     {
@@ -727,7 +693,6 @@ public function removeAttributeGroup($entityTypeId, $setId, $id)
      * @param string|int $entityType
      * @param int $attributeSetId
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultAttributeGroupId($entityType, $attributeSetId = null)
     {
@@ -758,7 +723,6 @@ public function getDefaultAttributeGroupId($entityType, $attributeSetId = null)
      * @param int|string $groupId
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributesNumberInGroup($entityTypeId, $setId, $groupId)
     {
@@ -788,7 +752,6 @@ public function getAttributesNumberInGroup($entityTypeId, $setId, $groupId)
      * @param string $key
      * @param string $default
      * @return string
-     * @since 2.0.0
      */
     private function _getValue($array, $key, $default = null)
     {
@@ -804,7 +767,6 @@ private function _getValue($array, $key, $default = null)
      * @param  array $data
      * @return true
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function _validateAttributeData($data)
     {
@@ -835,7 +797,6 @@ private function _validateAttributeData($data)
      * @param string $code
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -901,7 +862,6 @@ public function addAttribute($entityTypeId, $code, array $attr)
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addAttributeOption($option)
     {
@@ -968,7 +928,6 @@ public function addAttributeOption($option)
      * @param mixed $value
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function updateAttribute($entityTypeId, $id, $field, $value = null, $sortOrder = null)
     {
@@ -987,7 +946,6 @@ public function updateAttribute($entityTypeId, $id, $field, $value = null, $sort
      * @param int $sortOrder
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function _updateAttribute($entityTypeId, $id, $field, $value = null, $sortOrder = null)
     {
@@ -1045,7 +1003,6 @@ private function _updateAttribute($entityTypeId, $id, $field, $value = null, $so
      * @param mixed $value
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $value = null)
     {
@@ -1101,7 +1058,6 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
      * @param array $attribute
      *
      * @return void
-     * @since 2.0.0
      */
     private function updateCachedRow($field, $value, $attribute)
     {
@@ -1136,7 +1092,6 @@ private function updateCachedRow($field, $value, $attribute)
      * @param int|string $id
      * @param string $field
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttribute($entityTypeId, $id, $field = null)
     {
@@ -1186,7 +1141,6 @@ public function getAttribute($entityTypeId, $id, $field = null)
      * @param int|string $entityTypeId
      * @param int|string $id
      * @return int
-     * @since 2.0.0
      */
     public function getAttributeId($entityTypeId, $id)
     {
@@ -1205,7 +1159,6 @@ public function getAttributeId($entityTypeId, $id)
      * @param int|string $entityTypeId Entity Type id or Entity Type code
      * @param int|string $id Attribute id or Attribute code
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeTable($entityTypeId, $id)
     {
@@ -1246,7 +1199,6 @@ public function getAttributeTable($entityTypeId, $id)
      * @param int|string $entityTypeId
      * @param int|string $code
      * @return $this
-     * @since 2.0.0
      */
     public function removeAttribute($entityTypeId, $code)
     {
@@ -1270,7 +1222,6 @@ public function removeAttribute($entityTypeId, $code)
      * @param int|string $groupId
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function getAttributeSortOrder($entityTypeId, $setId, $groupId, $sortOrder = null)
     {
@@ -1298,7 +1249,6 @@ public function getAttributeSortOrder($entityTypeId, $setId, $groupId, $sortOrde
      * @param int|string $attributeId
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSet($entityTypeId, $setId, $groupId, $attributeId, $sortOrder = null)
     {
@@ -1348,7 +1298,6 @@ public function addAttributeToSet($entityTypeId, $setId, $groupId, $attributeId,
      * @param int|string $attributeId
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToGroup($entityType, $setId, $groupId, $attributeId, $sortOrder = null)
     {
@@ -1415,7 +1364,6 @@ public function addAttributeToGroup($entityType, $setId, $groupId, $attributeId,
      * Gets default entities and attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultEntities()
     {
@@ -1429,7 +1377,6 @@ public function getDefaultEntities()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function installEntities($entities = null)
     {
@@ -1483,7 +1430,6 @@ public function installEntities($entities = null)
      * Retrieve attribute table fields
      *
      * @return array
-     * @since 2.0.0
      */
     private function _getAttributeTableFields()
     {
@@ -1495,7 +1441,6 @@ private function _getAttributeTableFields()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     private function _insertAttribute(array $data)
     {
@@ -1528,7 +1473,6 @@ private function _insertAttribute(array $data)
      * @param int|string $entityTypeId
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     private function _insertAttributeAdditionalData($entityTypeId, array $data)
     {
diff --git a/app/code/Magento/Eav/Setup/InstallData.php b/app/code/Magento/Eav/Setup/InstallData.php
index 9304bd5dbfb90..ca2156d62ee42 100644
--- a/app/code/Magento/Eav/Setup/InstallData.php
+++ b/app/code/Magento/Eav/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -29,7 +27,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -38,7 +35,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Eav/Setup/InstallSchema.php b/app/code/Magento/Eav/Setup/InstallSchema.php
index 2da779e2318c7..98ccbcbce6f05 100644
--- a/app/code/Magento/Eav/Setup/InstallSchema.php
+++ b/app/code/Magento/Eav/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index e79c049345699..b68c7ae4e8f78 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Template extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\ContainerInterface
 {
@@ -21,19 +20,16 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe
      * Template list
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'template/list.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $toolbar;
 
@@ -42,7 +38,6 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @param \Magento\Backend\Block\Widget\Button\ToolbarInterface $toolbar
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -69,7 +63,6 @@ public function updateButton($buttonId, $key, $data)
      * Create add button and grid blocks
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -89,7 +82,6 @@ protected function _prepareLayout()
      * Get URL for create new email template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -98,7 +90,6 @@ public function getCreateUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -110,7 +101,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      * Get transactional emails page header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -119,7 +109,6 @@ public function getHeaderText()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removeButton($buttonId)
     {
@@ -131,7 +120,6 @@ public function removeButton($buttonId)
      * Get Add New Template button html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getAddButtonHtml()
     {
@@ -147,7 +135,6 @@ protected function getAddButtonHtml()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index b939f0bf18780..e1f4add630d7c 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -14,31 +14,26 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @method array getTemplateOptions()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Edit extends Widget implements ContainerInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registryManager;
 
     /**
      * @var \Magento\Backend\Model\Menu\Config
-     * @since 2.0.0
      */
     protected $_menuConfig;
 
     /**
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $_configStructure;
 
     /**
      * @var \Magento\Email\Model\Template\Config
-     * @since 2.0.0
      */
     private $_emailConfig;
 
@@ -46,31 +41,26 @@ class Edit extends Widget implements ContainerInterface
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'template/edit.phtml';
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $toolbar;
 
@@ -87,7 +77,6 @@ class Edit extends Widget implements ContainerInterface
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -114,7 +103,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -124,7 +112,6 @@ public function updateButton($buttonId, $key, $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
@@ -133,7 +120,6 @@ public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removeButton($buttonId)
     {
@@ -146,7 +132,6 @@ public function removeButton($buttonId)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -238,7 +223,6 @@ protected function _prepareLayout()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -250,7 +234,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      * Collect, sort and set template options
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -268,7 +251,6 @@ protected function _beforeToHtml()
      * Get default templates as options array
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultTemplatesAsOptionsArray()
     {
@@ -289,7 +271,6 @@ function (array $firstElement, array $secondElement) {
      * Get the html element for load button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoadButtonHtml()
     {
@@ -300,7 +281,6 @@ public function getLoadButtonHtml()
      * Return edit flag for block
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEditMode()
     {
@@ -311,7 +291,6 @@ public function getEditMode()
      * Return header text for form
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -325,7 +304,6 @@ public function getHeaderText()
      * Return form block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -336,7 +314,6 @@ public function getFormHtml()
      * Return action url for form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -347,7 +324,6 @@ public function getSaveUrl()
      * Return preview action url for form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewUrl()
     {
@@ -358,7 +334,6 @@ public function getPreviewUrl()
      * Return true if template type is text; return false otherwise
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTextType()
     {
@@ -369,7 +344,6 @@ public function isTextType()
      * Return template type from template object
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTemplateType()
     {
@@ -380,7 +354,6 @@ public function getTemplateType()
      * Return delete url for customer group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -391,7 +364,6 @@ public function getDeleteUrl()
      * Retrieve email template model
      *
      * @return \Magento\Email\Model\Template
-     * @since 2.0.0
      */
     public function getEmailTemplate()
     {
@@ -402,7 +374,6 @@ public function getEmailTemplate()
      * Load template url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoadUrl()
     {
@@ -414,7 +385,6 @@ public function getLoadUrl()
      *
      * @param bool $asJSON
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentlyUsedForPaths($asJSON = true)
     {
@@ -434,7 +404,6 @@ public function getCurrentlyUsedForPaths($asJSON = true)
      * @param array $paths
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getSystemConfigPathsParts($paths)
     {
@@ -506,7 +475,6 @@ protected function _getSystemConfigPathsParts($paths)
      * Return original template code of current template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrigTemplateCode()
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
index fd31bc8c494a9..d7da74273b6c4 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Email\Block\Adminhtml\Template\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Email\Model\Source\Variables
-     * @since 2.0.0
      */
     protected $_variables;
 
     /**
      * @var \Magento\Variable\Model\VariableFactory
-     * @since 2.0.0
      */
     protected $_variableFactory;
 
@@ -43,7 +40,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -66,7 +62,6 @@ public function __construct(
      * Add files to use dialog windows
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -81,7 +76,6 @@ protected function _prepareLayout()
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -182,7 +176,6 @@ protected function _prepareForm()
      * Return current email template model
      *
      * @return \Magento\Email\Model\Template
-     * @since 2.0.0
      */
     public function getEmailTemplate()
     {
@@ -193,7 +186,6 @@ public function getEmailTemplate()
      * Retrieve variables to insert into email
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVariables()
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php
index 641d87a6eea95..08ad4655261a3 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php
@@ -9,7 +9,6 @@
  * Adminhtml system template grid type filter
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
@@ -17,7 +16,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Email template types
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_types = [
         null => null,
@@ -29,7 +27,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -45,7 +42,6 @@ protected function _getOptions()
      * Get condition
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
index 454d3393b95e9..a2ba63d78d144 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -9,7 +9,6 @@
  * Email templates grid block action item renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -18,7 +17,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -40,7 +38,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getEscapedValue($value)
     {
@@ -52,7 +49,6 @@ protected function _getEscapedValue($value)
      *
      * @param array $actions
      * @return string
-     * @since 2.0.0
      */
     protected function _actionsToHtml(array $actions)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index b4ca80f28d935..24c39884661ca 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -9,7 +9,6 @@
  * Adminhtml system templates grid block sender item renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -18,7 +17,6 @@ class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
index d8e5141459b68..4fa069410f285 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
@@ -9,7 +9,6 @@
  * Adminhtml system templates grid block type item renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Email template types
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_types = [
         \Magento\Framework\App\TemplateTypesInterface::TYPE_HTML => 'HTML',
@@ -29,7 +27,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      *
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
index 00e0633c63be9..b9332e65768c0 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -13,25 +13,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Preview extends \Magento\Backend\Block\Widget
 {
     /**
      * @var \Magento\Framework\Filter\Input\MaliciousCode
-     * @since 2.0.0
      */
     protected $_maliciousCode;
 
     /**
      * @var \Magento\Email\Model\TemplateFactory
-     * @since 2.0.0
      */
     protected $_emailFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $profilerName = 'email_template_proccessing';
 
@@ -40,7 +36,6 @@ class Preview extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode
      * @param \Magento\Email\Model\TemplateFactory $emailFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Prepare html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -97,7 +91,6 @@ protected function _toHtml()
      * Get either default or any store view
      *
      * @return \Magento\Store\Model\Store|null
-     * @since 2.0.0
      */
     protected function getAnyStoreView()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
index 4099ae3c4f083..a987afb1b527c 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
@@ -9,7 +9,6 @@
  * System Template admin controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Template extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ abstract class Template extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      *
      * @param string $idFieldName
      * @return \Magento\Email\Model\BackendTemplate $model
-     * @since 2.0.0
      */
     protected function _initTemplate($idFieldName = 'template_id')
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
index 75b21e29b5967..13d331b274364 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\DefaultTemplate
  *
- * @since 2.0.0
  */
 class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
     /**
      * @var \Magento\Email\Model\Template\Config
-     * @since 2.0.0
      */
     private $emailConfig;
 
@@ -31,7 +29,6 @@ class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template
      * @param \Magento\Email\Model\Template\Config $emailConfig
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -50,7 +47,6 @@ public function __construct(
      *
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
index 43e5f9fea9ea0..941b6dfa19005 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Delete transactional email action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
index e5453ce93a5c9..b5cc660ac406b 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Edit transactional email action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php
index d924862be9087..8f04fcdfe98f3 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Grid action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
index 0acc0feebfe54..84b9049d7487d 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Index action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
index 1ee0a25095775..7e958f982afa1 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template
      * New transactional email action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
index f45312908af57..f4977bfd28426 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Preview
  *
- * @since 2.0.0
  */
 class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -17,7 +16,6 @@ class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Preview transactional email action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
index 36803624741cb..4d2d29d3d183a 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Email\Controller\Adminhtml\Email\Template\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Email\Controller\Adminhtml\Email\Template
 {
@@ -19,7 +18,6 @@ class Save extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Save transactional email action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 1243bf11928b1..6660cac4b6202 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -21,7 +21,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractTemplate extends AbstractModel implements TemplateTypesInterface
 {
@@ -59,7 +58,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Configuration of design package for template
      *
      * @var DataObject
-     * @since 2.0.0
      */
     private $designConfig;
 
@@ -67,7 +65,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Whether template is child of another template
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isChildTemplate = false;
 
@@ -75,7 +72,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Email template filter
      *
      * @var \Magento\Email\Model\Template\Filter
-     * @since 2.0.0
      */
     private $templateFilter;
 
@@ -83,7 +79,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Configuration of emulated design package.
      *
      * @var DataObject|boolean
-     * @since 2.0.0
      */
     private $emulatedDesignConfig = false;
 
@@ -91,7 +86,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Package area
      *
      * @var string
-     * @since 2.0.0
      */
     private $area;
 
@@ -99,7 +93,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     private $store;
 
@@ -109,13 +102,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Important as there are multiple entry points for the applyDesignConfig method.
      *
      * @var bool
-     * @since 2.0.0
      */
     private $hasDesignBeenApplied = false;
 
     /**
      * @var \Magento\Email\Model\TemplateFactory
-     * @since 2.0.0
      */
     protected $templateFactory = null;
 
@@ -123,19 +114,16 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Design package instance
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $design = null;
 
     /**
      * @var \Magento\Store\Model\App\Emulation
-     * @since 2.0.0
      */
     protected $appEmulation;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -143,13 +131,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Asset service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -157,25 +143,21 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * Scope config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Email\Model\Template\Config
-     * @since 2.0.0
      */
     protected $emailConfig;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     private $urlModel;
 
@@ -195,7 +177,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -233,7 +214,6 @@ public function __construct(
      * @param string $configPath
      * @param array $variables
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateContent($configPath, array $variables)
     {
@@ -263,7 +243,6 @@ public function getTemplateContent($configPath, array $variables)
      * Return a new instance of the template object. Used by the template directive.
      *
      * @return \Magento\Email\Model\AbstractTemplate
-     * @since 2.0.0
      */
     protected function getTemplateInstance()
     {
@@ -275,7 +254,6 @@ protected function getTemplateInstance()
      *
      * @param string $configPath
      * @return \Magento\Email\Model\AbstractTemplate
-     * @since 2.0.0
      */
     public function loadByConfigPath($configPath)
     {
@@ -295,7 +273,6 @@ public function loadByConfigPath($configPath)
      *
      * @param string $templateId
      * @return $this
-     * @since 2.0.0
      */
     public function loadDefault($templateId)
     {
@@ -345,7 +322,6 @@ public function loadDefault($templateId)
      * @param array $variables
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function getProcessedTemplate(array $variables = [])
     {
@@ -389,7 +365,6 @@ public function getProcessedTemplate(array $variables = [])
      * Get default email logo image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultEmailLogo()
     {
@@ -405,7 +380,6 @@ public function getDefaultEmailLogo()
      *
      * @param  Store|int|string $store
      * @return string
-     * @since 2.0.0
      */
     protected function getLogoUrl($store)
     {
@@ -432,7 +406,6 @@ protected function getLogoUrl($store)
      *
      * @param  Store|int|string $store
      * @return string
-     * @since 2.0.0
      */
     protected function getLogoAlt($store)
     {
@@ -457,7 +430,6 @@ protected function getLogoAlt($store)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function addEmailVariables($variables, $storeId)
     {
@@ -519,7 +491,6 @@ protected function addEmailVariables($variables, $storeId)
      * Can be called multiple times without issue.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function applyDesignConfig()
     {
@@ -545,7 +516,6 @@ protected function applyDesignConfig()
      * Revert design settings to previous
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function cancelDesignConfig()
     {
@@ -560,7 +530,6 @@ protected function cancelDesignConfig()
      * @param string $templateId
      * @return $this
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function setForcedArea($templateId)
     {
@@ -579,7 +548,6 @@ public function setForcedArea($templateId)
      * @param string $templateId
      * @param string $theme
      * @return $this
-     * @since 2.0.0
      */
     public function setForcedTheme($templateId, $theme)
     {
@@ -592,7 +560,6 @@ public function setForcedTheme($templateId, $theme)
      * Returns the design params for the template being processed
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDesignParams()
     {
@@ -610,7 +577,6 @@ public function getDesignParams()
      * Get design configuration data
      *
      * @return DataObject
-     * @since 2.0.0
      */
     public function getDesignConfig()
     {
@@ -634,7 +600,6 @@ public function getDesignConfig()
      * @param array $config
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function setDesignConfig(array $config)
     {
@@ -649,7 +614,6 @@ public function setDesignConfig(array $config)
      * Check whether template is child of another template
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isChildTemplate()
     {
@@ -661,7 +625,6 @@ public function isChildTemplate()
      *
      * @param bool $isChildTemplate
      * @return $this
-     * @since 2.0.0
      */
     public function setIsChildTemplate($isChildTemplate)
     {
@@ -674,7 +637,6 @@ public function setIsChildTemplate($isChildTemplate)
      *
      * @param \Magento\Email\Model\Template\Filter $filter
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateFilter(Template\Filter $filter)
     {
@@ -686,7 +648,6 @@ public function setTemplateFilter(Template\Filter $filter)
      * Get filter object for template processing
      *
      * @return \Magento\Email\Model\Template\Filter
-     * @since 2.0.0
      */
     public function getTemplateFilter()
     {
@@ -706,7 +667,6 @@ public function getTemplateFilter()
      * @param null|bool|int|string $storeId
      * @param string $area
      * @return void
-     * @since 2.0.0
      */
     public function emulateDesign($storeId, $area = self::DEFAULT_DESIGN_AREA)
     {
@@ -728,7 +688,6 @@ public function emulateDesign($storeId, $area = self::DEFAULT_DESIGN_AREA)
      * Revert to last design config, used before emulation
      *
      * @return void
-     * @since 2.0.0
      */
     public function revertDesign()
     {
@@ -743,7 +702,6 @@ public function revertDesign()
      * Return true if template type eq text
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isPlain()
     {
@@ -754,7 +712,6 @@ public function isPlain()
      * Getter for filter factory that is specific to the type of template being processed
      *
      * @return mixed
-     * @since 2.0.0
      */
     abstract protected function getFilterFactory();
 
@@ -762,7 +719,6 @@ abstract protected function getFilterFactory();
      * Getter for template type
      *
      * @return int|string
-     * @since 2.0.0
      */
     abstract public function getType();
 
@@ -773,7 +729,6 @@ abstract public function getType();
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getUrl(Store $store, $route = '', $params = [])
     {
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index d6bfc62701550..9e6b7914ca9fe 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -13,13 +13,11 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BackendTemplate extends Template
 {
     /**
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     private $structure;
 
@@ -42,7 +40,6 @@ class BackendTemplate extends Template
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -86,7 +83,6 @@ public function __construct(
      * Collect all system config paths where current template is currently used
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSystemConfigPathsWhereCurrentlyUsed()
     {
diff --git a/app/code/Magento/Email/Model/ResourceModel/Template.php b/app/code/Magento/Email/Model/ResourceModel/Template.php
index 22169e9596bd1..030705bf7b419 100644
--- a/app/code/Magento/Email/Model/ResourceModel/Template.php
+++ b/app/code/Magento/Email/Model/ResourceModel/Template.php
@@ -11,14 +11,12 @@
  * Template db resource
  *
  * @api
- * @since 2.0.0
  */
 class Template extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -31,7 +29,6 @@ public function __construct(
      * Initialize email template resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -43,7 +40,6 @@ protected function _construct()
      *
      * @param \Magento\Email\Model\Template $template
      * @return bool
-     * @since 2.0.0
      */
     public function checkCodeUsage(\Magento\Email\Model\Template $template)
     {
@@ -75,7 +71,6 @@ public function checkCodeUsage(\Magento\Email\Model\Template $template)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -89,7 +84,6 @@ protected function _beforeSave(AbstractModel $object)
      * @param array $paths
      * @param int|string $templateId
      * @return array
-     * @since 2.0.0
      */
     public function getSystemConfigByPathsAndTemplateId($paths, $templateId)
     {
diff --git a/app/code/Magento/Email/Model/ResourceModel/Template/Collection.php b/app/code/Magento/Email/Model/ResourceModel/Template/Collection.php
index f833a0735f185..b13f878e2bc65 100644
--- a/app/code/Magento/Email/Model/ResourceModel/Template/Collection.php
+++ b/app/code/Magento/Email/Model/ResourceModel/Template/Collection.php
@@ -9,7 +9,6 @@
  * Templates collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Template table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_templateTable;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource table
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -37,7 +34,6 @@ public function _construct()
      * Convert collection items to select options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
index f7e34c39d983b..0d2a52d5c87d9 100644
--- a/app/code/Magento/Email/Model/Source/Variables.php
+++ b/app/code/Magento/Email/Model/Source/Variables.php
@@ -9,7 +9,6 @@
 
 /**
  * Store Contact Information source model
- * @since 2.0.0
  */
 class Variables implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,13 +16,11 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
      * Assoc array of configuration variables
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configVariables = [];
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -58,7 +55,6 @@ public function __construct()
      *
      * @param bool $withGroup
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($withGroup = false)
     {
@@ -80,7 +76,6 @@ public function toOptionArray($withGroup = false)
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index 591066cc22c2f..fb84ee644ec67 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -38,7 +38,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Template extends AbstractTemplate implements \Magento\Framework\Mail\TemplateInterface
 {
@@ -60,7 +59,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * BCC list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_bcc = [];
 
@@ -68,7 +66,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * Return path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_returnPath = '';
 
@@ -76,19 +73,16 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * Reply address
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_replyTo = '';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_vars = [];
 
     /**
      * @var \Exception|null
-     * @since 2.0.0
      */
     protected $_sendingException = null;
 
@@ -96,7 +90,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * Email filter factory
      *
      * @var \Magento\Email\Model\Template\FilterFactory
-     * @since 2.0.0
      */
     private $filterFactory;
 
@@ -127,7 +120,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * @throws \RuntimeException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -170,7 +162,6 @@ public function __construct(
      * Initialize email template model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -181,7 +172,6 @@ protected function _construct()
      * Return template id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -193,7 +183,6 @@ public function getId()
      *
      * @param int $value
      * @return $this
-     * @since 2.0.0
      */
     public function setId($value)
     {
@@ -204,7 +193,6 @@ public function setId($value)
      * Return true if this template can be used for sending queue as main template
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForSend()
     {
@@ -215,7 +203,6 @@ public function isValidForSend()
      * Getter for template type
      *
      * @return int
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -232,7 +219,6 @@ public function getType()
      *
      * @return \Exception|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSendingException()
     {
@@ -245,7 +231,6 @@ public function getSendingException()
      * @param array $variables
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function getProcessedTemplateSubject(array $variables)
     {
@@ -273,7 +258,6 @@ public function getProcessedTemplateSubject(array $variables)
      * @param string|array $bcc
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addBcc($bcc)
     {
@@ -287,7 +271,6 @@ public function addBcc($bcc)
      * @param string $email
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setReturnPath($email)
     {
@@ -301,7 +284,6 @@ public function setReturnPath($email)
      * @param string $email
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setReplyTo($email)
     {
@@ -314,7 +296,6 @@ public function setReplyTo($email)
      *
      * @param string $variablesString
      * @return array
-     * @since 2.0.0
      */
     protected function _parseVariablesString($variablesString)
     {
@@ -331,7 +312,6 @@ protected function _parseVariablesString($variablesString)
      *
      * @param boolean $withGroup if true wrap variable options in group
      * @return array
-     * @since 2.0.0
      */
     public function getVariablesOptionArray($withGroup = false)
     {
@@ -353,7 +333,6 @@ public function getVariablesOptionArray($withGroup = false)
      *
      * @throws \Magento\Framework\Exception\MailException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -373,7 +352,6 @@ public function beforeSave()
      *
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function processTemplate()
     {
@@ -406,7 +384,6 @@ public function processTemplate()
      * Get processed subject
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubject()
     {
@@ -418,7 +395,6 @@ public function getSubject()
      *
      * @param array $vars
      * @return $this
-     * @since 2.0.0
      */
     public function setVars(array $vars)
     {
@@ -431,7 +407,6 @@ public function setVars(array $vars)
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options)
     {
@@ -440,7 +415,6 @@ public function setOptions(array $options)
 
     /**
      * @return \Magento\Email\Model\Template\FilterFactory
-     * @since 2.0.0
      */
     protected function getFilterFactory()
     {
@@ -451,7 +425,6 @@ protected function getFilterFactory()
      * Retrieve template variables
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getVars()
     {
diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php
index 85addf08b210a..e4fd37f8b5c74 100644
--- a/app/code/Magento/Email/Model/Template/Config.php
+++ b/app/code/Magento/Email/Model/Template/Config.php
@@ -13,43 +13,36 @@
 /**
  * Class \Magento\Email\Model\Template\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Mail\Template\ConfigInterface
 {
     /**
      * @var \Magento\Email\Model\Template\Config\Data
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_moduleReader;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $fileSystem;
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $viewFileSystem;
 
     /**
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $readDirFactory;
 
     /**
      * @var ThemePackageList
-     * @since 2.0.0
      */
     private $themePackages;
 
@@ -59,7 +52,6 @@ class Config implements \Magento\Framework\Mail\Template\ConfigInterface
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param ThemePackageList $themePackages
      * @param ReadFactory $readDirFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Email\Model\Template\Config\Data $dataStorage,
@@ -79,7 +71,6 @@ public function __construct(
      * Return list of all email templates, both default module and theme-specific templates
      *
      * @return array[]
-     * @since 2.0.0
      */
     public function getAvailableTemplates()
     {
@@ -101,7 +92,6 @@ public function getAvailableTemplates()
      *
      * @param string $templateId
      * @return array[]
-     * @since 2.0.0
      */
     public function getThemeTemplates($templateId)
     {
@@ -143,7 +133,6 @@ public function getThemeTemplates($templateId)
      *
      * @param string $templateId
      * @return array an array of array('templateId' => '...', 'theme' => '...')
-     * @since 2.0.0
      */
     public function parseTemplateIdParts($templateId)
     {
@@ -164,7 +153,6 @@ public function parseTemplateIdParts($templateId)
      *
      * @param string $templateId
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTemplateLabel($templateId)
     {
@@ -176,7 +164,6 @@ public function getTemplateLabel($templateId)
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateType($templateId)
     {
@@ -188,7 +175,6 @@ public function getTemplateType($templateId)
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateModule($templateId)
     {
@@ -200,7 +186,6 @@ public function getTemplateModule($templateId)
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateArea($templateId)
     {
@@ -213,7 +198,6 @@ public function getTemplateArea($templateId)
      * @param string $templateId
      * @param array|null $designParams
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateFilename($templateId, $designParams = [])
     {
@@ -236,7 +220,6 @@ public function getTemplateFilename($templateId, $designParams = [])
      * @param string $fieldName Name of a field value of which to return
      * @return string
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function _getInfo($templateId, $fieldName)
     {
diff --git a/app/code/Magento/Email/Model/Template/Config/Converter.php b/app/code/Magento/Email/Model/Template/Config/Converter.php
index c2794f5fae880..c31e5d73872d6 100644
--- a/app/code/Magento/Email/Model/Template/Config/Converter.php
+++ b/app/code/Magento/Email/Model/Template/Config/Converter.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Email\Model\Template\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Email/Model/Template/Config/Data.php b/app/code/Magento/Email/Model/Template/Config/Data.php
index 4156b55b5fa39..961cc6c3e3a39 100644
--- a/app/code/Magento/Email/Model/Template/Config/Data.php
+++ b/app/code/Magento/Email/Model/Template/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides email templates configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Email\Model\Template\Config\Reader $reader,
diff --git a/app/code/Magento/Email/Model/Template/Config/FileIterator.php b/app/code/Magento/Email/Model/Template/Config/FileIterator.php
index 2a44186006e00..d71542e147bc8 100644
--- a/app/code/Magento/Email/Model/Template/Config/FileIterator.php
+++ b/app/code/Magento/Email/Model/Template/Config/FileIterator.php
@@ -11,13 +11,11 @@
 
 /**
  * Class FileIterator
- * @since 2.0.0
  */
 class FileIterator extends \Magento\Framework\Config\FileIterator
 {
     /**
      * @var \Magento\Framework\Module\Dir\ReverseResolver
-     * @since 2.0.0
      */
     protected $_moduleDirResolver;
 
@@ -25,7 +23,6 @@ class FileIterator extends \Magento\Framework\Config\FileIterator
      * @param ReadFactory $readFactory
      * @param array $paths
      * @param \Magento\Framework\Module\Dir\ReverseResolver $dirResolver
-     * @since 2.0.0
      */
     public function __construct(
         ReadFactory $readFactory,
@@ -39,7 +36,6 @@ public function __construct(
     /**
      * @return string
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function current()
     {
diff --git a/app/code/Magento/Email/Model/Template/Config/FileResolver.php b/app/code/Magento/Email/Model/Template/Config/FileResolver.php
index 337079efefaae..393dd2385ba4e 100644
--- a/app/code/Magento/Email/Model/Template/Config/FileResolver.php
+++ b/app/code/Magento/Email/Model/Template/Config/FileResolver.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Email\Model\Template\Config\FileResolver
  *
- * @since 2.0.0
  */
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
     /**
      * @var \Magento\Framework\Config\FileIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
     /**
      * @var DirSearch
-     * @since 2.0.0
      */
     protected $dirSearch;
 
@@ -35,7 +32,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      *
      * @param FileIteratorFactory $iteratorFactory
      * @param DirSearch $dirSearch
-     * @since 2.0.0
      */
     public function __construct(
         FileIteratorFactory $iteratorFactory,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/app/code/Magento/Email/Model/Template/Config/Reader.php b/app/code/Magento/Email/Model/Template/Config/Reader.php
index 3a9aa97d44926..bc602030a10cb 100644
--- a/app/code/Magento/Email/Model/Template/Config/Reader.php
+++ b/app/code/Magento/Email/Model/Template/Config/Reader.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Email\Model\Template\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -21,7 +20,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/template' => 'id'];
 
@@ -34,7 +32,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Email/Model/Template/Config/SchemaLocator.php b/app/code/Magento/Email/Model/Template/Config/SchemaLocator.php
index 22b8ff236ecad..3fa77d8f2ba05 100644
--- a/app/code/Magento/Email/Model/Template/Config/SchemaLocator.php
+++ b/app/code/Magento/Email/Model/Template/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Email\Model\Template\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,13 +19,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for both individual and merged configs
      *
      * @var string
-     * @since 2.0.0
      */
     private $_schema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -44,7 +40,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Email/Model/Template/Css/Processor.php b/app/code/Magento/Email/Model/Template/Css/Processor.php
index aeb3f9be121e7..ab67dcc98e442 100644
--- a/app/code/Magento/Email/Model/Template/Css/Processor.php
+++ b/app/code/Magento/Email/Model/Template/Css/Processor.php
@@ -10,19 +10,19 @@
 
 /**
  * Class for processing css placeholders
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Processor
 {
     /**
      * @var Repository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $assetRepository;
 
     /**
      * @param Repository $assetRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(Repository $assetRepository)
     {
@@ -34,7 +34,7 @@ public function __construct(Repository $assetRepository)
      *
      * @param string $css
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process($css)
     {
@@ -56,7 +56,7 @@ public function process($css)
      *
      * @param string $placeholder
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPlaceholderValue($placeholder)
     {
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 4daf387e3a3ae..0aef7d029e9e3 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -18,7 +18,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Filter extends \Magento\Framework\Filter\Template
 {
@@ -36,7 +35,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Use absolute links flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useAbsoluteLinks = false;
 
@@ -44,7 +42,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useSessionInUrl = false;
 
@@ -52,7 +49,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Modifier Callbacks
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_modifiers = ['nl2br' => ''];
 
@@ -60,7 +56,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether template being filtered is child of another template
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isChildTemplate = false;
 
@@ -68,7 +63,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * List of CSS files to inline
      *
      * @var []
-     * @since 2.0.0
      */
     private $inlineCssFiles = [];
 
@@ -76,37 +70,31 @@ class Filter extends \Magento\Framework\Filter\Template
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $designParams = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $plainTemplateMode = false;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -115,25 +103,21 @@ class Filter extends \Magento\Framework\Filter\Template
      * Variable factory
      *
      * @var \Magento\Variable\Model\VariableFactory
-     * @since 2.0.0
      */
     protected $_variableFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $_layoutFactory;
 
@@ -141,7 +125,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Setup callbacks for filters
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -149,7 +132,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * Layout directive params
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_directiveParams;
 
@@ -157,37 +139,33 @@ class Filter extends \Magento\Framework\Filter\Template
      * App state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlModel;
 
     /**
      * @var \Pelago\Emogrifier
-     * @since 2.0.0
      */
     protected $emogrifier;
 
     /**
      * @var \Magento\Email\Model\Source\Variables
-     * @since 2.0.0
      */
     protected $configVariables;
 
     /**
      * @var \Magento\Email\Model\Template\Css\Processor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $cssProcessor;
 
     /**
      * @var ReadInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $pubDirectory;
 
@@ -208,7 +186,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param array $variables
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -247,7 +224,6 @@ public function __construct(
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseAbsoluteLinks($flag)
     {
@@ -260,7 +236,6 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionInUrl($flag)
     {
@@ -273,7 +248,6 @@ public function setUseSessionInUrl($flag)
      *
      * @param bool $plainTemplateMode
      * @return $this
-     * @since 2.0.0
      */
     public function setPlainTemplateMode($plainTemplateMode)
     {
@@ -285,7 +259,6 @@ public function setPlainTemplateMode($plainTemplateMode)
      * Check whether template is plain
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPlainTemplateMode()
     {
@@ -297,7 +270,6 @@ public function isPlainTemplateMode()
      *
      * @param bool $isChildTemplate
      * @return $this
-     * @since 2.0.0
      */
     public function setIsChildTemplate($isChildTemplate)
     {
@@ -309,7 +281,6 @@ public function setIsChildTemplate($isChildTemplate)
      * Get whether template being filtered is child of another template
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isChildTemplate()
     {
@@ -321,7 +292,6 @@ public function isChildTemplate()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -334,7 +304,6 @@ public function setStoreId($storeId)
      *
      * @param array $designParams
      * @return $this
-     * @since 2.0.0
      */
     public function setDesignParams(array $designParams)
     {
@@ -343,9 +312,9 @@ public function setDesignParams(array $designParams)
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Css\Processor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getCssProcessor()
     {
@@ -356,10 +325,10 @@ private function getCssProcessor()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @param string $dirType
      * @return ReadInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPubDirectory($dirType)
     {
@@ -373,7 +342,6 @@ private function getPubDirectory($dirType)
      * Get design parameters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDesignParams()
     {
@@ -384,7 +352,6 @@ public function getDesignParams()
      * Getter. If $_storeId is null, return design store id.
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -401,7 +368,6 @@ public function getStoreId()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function blockDirective($construction)
     {
@@ -448,7 +414,6 @@ public function blockDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function layoutDirective($construction)
     {
@@ -470,7 +435,6 @@ public function layoutDirective($construction)
      * Retrieve layout html directive callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function emulateAreaCallback()
     {
@@ -515,7 +479,6 @@ public function emulateAreaCallback()
      *
      * @param mixed $value
      * @return array
-     * @since 2.0.0
      */
     protected function _getBlockParameters($value)
     {
@@ -530,7 +493,6 @@ protected function _getBlockParameters($value)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function viewDirective($construction)
     {
@@ -544,7 +506,6 @@ public function viewDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function mediaDirective($construction)
     {
@@ -559,7 +520,6 @@ public function mediaDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function storeDirective($construction)
     {
@@ -596,7 +556,6 @@ public function storeDirective($construction)
      *
      * @param \Magento\Framework\UrlInterface $urlModel
      * @return $this
-     * @since 2.0.0
      */
     public function setUrlModel(\Magento\Framework\UrlInterface $urlModel)
     {
@@ -616,7 +575,6 @@ public function setUrlModel(\Magento\Framework\UrlInterface $urlModel)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function transDirective($construction)
     {
@@ -636,7 +594,6 @@ public function transDirective($construction)
      *
      * @param string $value raw parameters
      * @return array always a two-part array in the format [value, [param, ...]]
-     * @since 2.0.0
      */
     protected function getTransParameters($value)
     {
@@ -661,7 +618,6 @@ protected function getTransParameters($value)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function varDirective($construction)
     {
@@ -687,7 +643,6 @@ public function varDirective($construction)
      * @param string $value
      * @param string $default assumed modifier if none present
      * @return array
-     * @since 2.0.0
      */
     protected function explodeModifiers($value, $default = null)
     {
@@ -706,7 +661,6 @@ protected function explodeModifiers($value, $default = null)
      * @param string $value
      * @param string $modifiers
      * @return string
-     * @since 2.0.0
      */
     protected function applyModifiers($value, $modifiers)
     {
@@ -734,7 +688,6 @@ protected function applyModifiers($value, $modifiers)
      * @param string $value
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function modifierEscape($value, $type = 'html')
     {
@@ -764,7 +717,6 @@ public function modifierEscape($value, $type = 'html')
      * @param string[] $construction
      * @throws \Magento\Framework\Exception\MailException
      * @return string
-     * @since 2.0.0
      */
     public function protocolDirective($construction)
     {
@@ -798,7 +750,6 @@ public function protocolDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function configDirective($construction)
     {
@@ -820,7 +771,6 @@ public function configDirective($construction)
      *
      * @param string $variable
      * @return bool
-     * @since 2.0.0
      */
     private function isAvailableConfigVariable($variable)
     {
@@ -835,7 +785,6 @@ private function isAvailableConfigVariable($variable)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function customvarDirective($construction)
     {
@@ -868,7 +817,6 @@ public function customvarDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function cssDirective($construction)
     {
@@ -914,7 +862,6 @@ public function cssDirective($construction)
      * @param string[] $construction
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function inlinecssDirective($construction)
     {
@@ -948,7 +895,6 @@ public function inlinecssDirective($construction)
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     protected function addInlineCssFile($file)
     {
@@ -960,7 +906,6 @@ protected function addInlineCssFile($file)
      * Get filename of CSS file to inline
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getInlineCssFiles()
     {
@@ -973,7 +918,6 @@ protected function getInlineCssFiles()
      * @param [] $files
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function getCssFilesContent(array $files)
     {
@@ -1013,7 +957,6 @@ public function getCssFilesContent(array $files)
      * @param string $html
      * @return string
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function applyInlineCss($html)
     {
@@ -1067,7 +1010,6 @@ public function applyInlineCss($html)
      * @param string $value
      * @return string
      * @SuppressWarnings(PHPMD.ConstructorWithNameAsEnclosingClass)
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/app/code/Magento/Email/Model/Template/SenderResolver.php b/app/code/Magento/Email/Model/Template/SenderResolver.php
index 18f1954462612..c70263cec8580 100644
--- a/app/code/Magento/Email/Model/Template/SenderResolver.php
+++ b/app/code/Magento/Email/Model/Template/SenderResolver.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Email\Model\Template\SenderResolver
  *
- * @since 2.0.0
  */
 class SenderResolver implements \Magento\Framework\Mail\Template\SenderResolverInterface
 {
@@ -16,13 +15,11 @@ class SenderResolver implements \Magento\Framework\Mail\Template\SenderResolverI
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolve($sender, $scopeId = null)
     {
diff --git a/app/code/Magento/Email/Setup/InstallSchema.php b/app/code/Magento/Email/Setup/InstallSchema.php
index f92eca1ec3ce3..1193df3f8597d 100644
--- a/app/code/Magento/Email/Setup/InstallSchema.php
+++ b/app/code/Magento/Email/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Edit.php b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Edit.php
index a186ba7004f60..88be1fd50472d 100644
--- a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Edit.php
+++ b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Edit.php
@@ -9,7 +9,6 @@
  * Encryption key change edit page block
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Block module name
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_blockGroup = null;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Controller name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_controller = 'crypt_key';
 
@@ -33,7 +30,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Instantiate save button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      * Header text getter
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
index fdb30ea0e22a1..d29f14425b83d 100644
--- a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
+++ b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
@@ -9,7 +9,6 @@
  * Encryption key change form block
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Add form fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key.php
index 3b6d86fcbeb79..b9f6fc41d400d 100644
--- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key.php
+++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key.php
@@ -8,7 +8,6 @@
 
 /**
  * Encryption key changer controller
- * @since 2.0.0
  */
 abstract class Key extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
index edf0017f9d18c..8e42e0c1313c4 100644
--- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
+++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
@@ -8,7 +8,6 @@
 
 /**
  * Key Index action
- * @since 2.0.0
  */
 class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
      * Render main page with form
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php
index f8f42d99224ba..014e1fd3781ab 100644
--- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php
+++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php
@@ -9,25 +9,21 @@
 
 /**
  * Encryption Key Save Controller
- * @since 2.0.0
  */
 class Save extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
 {
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
     /**
      * @var \Magento\EncryptionKey\Model\ResourceModel\Key\Change
-     * @since 2.0.0
      */
     protected $change;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -36,7 +32,6 @@ class Save extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\EncryptionKey\Model\ResourceModel\Key\Change $change
      * @param \Magento\Framework\App\CacheInterface $cache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Process saving new encryption key
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/EncryptionKey/Model/ResourceModel/Key/Change.php b/app/code/Magento/EncryptionKey/Model/ResourceModel/Key/Change.php
index 9a08a0a25476d..93a677ea63d16 100644
--- a/app/code/Magento/EncryptionKey/Model/ResourceModel/Key/Change.php
+++ b/app/code/Magento/EncryptionKey/Model/ResourceModel/Key/Change.php
@@ -17,7 +17,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -25,7 +24,6 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Encryptor interface
      *
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
@@ -33,7 +31,6 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Filesystem directory write interface
      *
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $directory;
 
@@ -41,7 +38,6 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * System configuration structure
      *
      * @var \Magento\Config\Model\Config\Structure
-     * @since 2.0.0
      */
     protected $structure;
 
@@ -49,7 +45,6 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Configuration writer
      *
      * @var \Magento\Framework\App\DeploymentConfig\Writer
-     * @since 2.0.0
      */
     protected $writer;
 
@@ -57,7 +52,7 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Random
      *
      * @var \Magento\Framework\Math\Random
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $random;
 
@@ -69,7 +64,6 @@ class Change extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\DeploymentConfig\Writer $writer
      * @param \Magento\Framework\Math\Random $random
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -92,7 +86,6 @@ public function __construct(
      * Initialize
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -105,7 +98,6 @@ protected function _construct()
      * @param string|null $key
      * @return null|string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function changeEncryptionKey($key = null)
     {
@@ -142,7 +134,6 @@ public function changeEncryptionKey($key = null)
      * Gather all encrypted system config values and re-encrypt them
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _reEncryptSystemConfigurationValues()
     {
@@ -178,7 +169,6 @@ protected function _reEncryptSystemConfigurationValues()
      * Gather saved credit card numbers from sales order payments and re-encrypt them
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _reEncryptCreditCardNumbers()
     {
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index eb59b8a7b807b..e658fbe5aeeeb 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -22,7 +22,6 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
 {
@@ -51,7 +50,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Code of the carrier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::CODE;
 
@@ -59,7 +57,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Types of rates, order is important
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ratesOrder = [
         'RATED_ACCOUNT_PACKAGE',
@@ -76,7 +73,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Rate request data
      *
      * @var RateRequest|null
-     * @since 2.0.0
      */
     protected $_request = null;
 
@@ -84,7 +80,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Rate result data
      *
      * @var Result|null
-     * @since 2.0.0
      */
     protected $_result = null;
 
@@ -92,7 +87,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Path to wsdl file of rate service
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_rateServiceWsdl;
 
@@ -100,7 +94,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Path to wsdl file of ship service
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_shipServiceWsdl = null;
 
@@ -108,7 +101,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Path to wsdl file of track service
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_trackServiceWsdl = null;
 
@@ -116,25 +108,22 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Container types that could be customized for FedEx carrier
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customizableContainerTypes = ['YOUR_PACKAGING'];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.10
      */
     protected $_debugReplacePrivateDataKeys = [
         'Key', 'Password', 'MeterNumber',
@@ -143,14 +132,14 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
     /**
      * Version of tracking service
      * @var int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private static $trackServiceVersion = 10;
 
     /**
      * List of TrackReply errors
      * @var array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private static $trackingErrors = ['FAILURE', 'ERROR'];
 
@@ -183,7 +172,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * @param Json|null $serializer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -240,7 +228,6 @@ public function __construct(
      * @param string $wsdl
      * @param bool|int $trace
      * @return \SoapClient
-     * @since 2.0.0
      */
     protected function _createSoapClient($wsdl, $trace = false)
     {
@@ -258,7 +245,6 @@ protected function _createSoapClient($wsdl, $trace = false)
      * Create rate soap client
      *
      * @return \SoapClient
-     * @since 2.0.0
      */
     protected function _createRateSoapClient()
     {
@@ -269,7 +255,6 @@ protected function _createRateSoapClient()
      * Create ship soap client
      *
      * @return \SoapClient
-     * @since 2.0.0
      */
     protected function _createShipSoapClient()
     {
@@ -280,7 +265,6 @@ protected function _createShipSoapClient()
      * Create track soap client
      *
      * @return \SoapClient
-     * @since 2.0.0
      */
     protected function _createTrackSoapClient()
     {
@@ -292,7 +276,6 @@ protected function _createTrackSoapClient()
      *
      * @param RateRequest $request
      * @return Result|bool|null
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -314,7 +297,6 @@ public function collectRates(RateRequest $request)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function setRequest(RateRequest $request)
     {
@@ -412,7 +394,6 @@ public function setRequest(RateRequest $request)
      * Get result of request
      *
      * @return Result|null
-     * @since 2.0.0
      */
     public function getResult()
     {
@@ -426,7 +407,6 @@ public function getResult()
      * Get version of rates request
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVersionInfo()
     {
@@ -438,7 +418,6 @@ public function getVersionInfo()
      *
      * @param string $purpose
      * @return array
-     * @since 2.0.0
      */
     protected function _formRateRequest($purpose)
     {
@@ -513,7 +492,6 @@ protected function _formRateRequest($purpose)
      *
      * @param string $purpose
      * @return mixed
-     * @since 2.0.0
      */
     protected function _doRatesRequest($purpose)
     {
@@ -545,7 +523,6 @@ protected function _doRatesRequest($purpose)
      * Do remote request for and handle errors
      *
      * @return Result
-     * @since 2.0.0
      */
     protected function _getQuotes()
     {
@@ -578,7 +555,6 @@ protected function _getQuotes()
      * @param mixed $response
      * @return Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareRateResponse($response)
     {
@@ -648,7 +624,6 @@ protected function _prepareRateResponse($response)
      *
      * @param \stdClass $rate
      * @return null|float
-     * @since 2.0.0
      */
     protected function _getRateAmountOriginBased($rate)
     {
@@ -683,7 +658,6 @@ protected function _getRateAmountOriginBased($rate)
      *
      * @param string $freeMethod
      * @return void
-     * @since 2.0.0
      */
     protected function _setFreeMethodRequest($freeMethod)
     {
@@ -697,7 +671,6 @@ protected function _setFreeMethodRequest($freeMethod)
      * Get xml quotes
      *
      * @return Result
-     * @since 2.0.0
      */
     protected function _getXmlQuotes()
     {
@@ -782,7 +755,6 @@ protected function _getXmlQuotes()
      * @param mixed $response
      * @return Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _parseXmlResponse($response)
     {
@@ -853,7 +825,6 @@ protected function _parseXmlResponse($response)
      * @param string $code
      * @return array|false
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getCode($type, $code = '')
     {
@@ -1013,7 +984,6 @@ public function getCode($type, $code = '')
      * Return FeDex currency ISO code by Magento Base Currency Code
      *
      * @return string 3-digit currency code
-     * @since 2.0.0
      */
     public function getCurrencyCode()
     {
@@ -1044,7 +1014,6 @@ public function getCurrencyCode()
      *
      * @param string|string[] $trackings
      * @return Result|null
-     * @since 2.0.0
      */
     public function getTracking($trackings)
     {
@@ -1065,7 +1034,6 @@ public function getTracking($trackings)
      * Set tracking request
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setTrackingReqeust()
     {
@@ -1082,7 +1050,6 @@ protected function setTrackingReqeust()
      *
      * @param string[] $tracking
      * @return void
-     * @since 2.0.0
      */
     protected function _getXMLTracking($tracking)
     {
@@ -1135,7 +1102,6 @@ protected function _getXMLTracking($tracking)
      * @param string $trackingValue
      * @param \stdClass $response
      * @return void
-     * @since 2.0.0
      */
     protected function _parseTrackingResponse($trackingValue, $response)
     {
@@ -1182,7 +1148,6 @@ protected function _parseTrackingResponse($trackingValue, $response)
      * Get tracking response
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -1211,7 +1176,6 @@ public function getResponse()
      * Get allowed shipping methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
@@ -1228,7 +1192,6 @@ public function getAllowedMethods()
      * Return array of authenticated information
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAuthDetails()
     {
@@ -1258,7 +1221,6 @@ protected function _getAuthDetails()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1434,7 +1396,6 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1478,7 +1439,6 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     /**
      * @param array|object $trackingIds
      * @return string
-     * @since 2.0.0
      */
     private function getTrackingNumber($trackingIds)
     {
@@ -1496,7 +1456,6 @@ function ($val) {
      *
      * @param array $data
      * @return bool
-     * @since 2.0.0
      */
     public function rollBack($data)
     {
@@ -1517,7 +1476,6 @@ public function rollBack($data)
      * @param \Magento\Framework\DataObject|null $params
      * @return array|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1563,7 +1521,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
      * Return all container types of carrier
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesAll()
     {
@@ -1574,7 +1531,6 @@ public function getContainerTypesAll()
      * Return structured data of containers witch related with shipping methods
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesFilter()
     {
@@ -1587,7 +1543,6 @@ public function getContainerTypesFilter()
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1598,7 +1553,7 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * Recursive replace sensitive fields in debug data by the mask
      * @param string $data
      * @return string
-     * @since 2.1.0
+     * @since 2.0.10
      */
     protected function filterDebugData($data)
     {
@@ -1618,7 +1573,7 @@ protected function filterDebugData($data)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function processTrackingDetails(\stdClass $trackInfo)
     {
@@ -1687,7 +1642,7 @@ private function processTrackingDetails(\stdClass $trackInfo)
      * Parse delivery datetime from tracking details
      * @param \stdClass $trackInfo
      * @return \Datetime|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getDeliveryDateTime(\stdClass $trackInfo)
     {
@@ -1707,7 +1662,7 @@ private function getDeliveryDateTime(\stdClass $trackInfo)
      *
      * @param \stdClass $address
      * @return \Magento\Framework\Phrase|string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getDeliveryAddress(\stdClass $address)
     {
@@ -1735,7 +1690,7 @@ private function getDeliveryAddress(\stdClass $address)
      *
      * @param array $events
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function processTrackDetailsEvents(array $events)
     {
@@ -1769,7 +1724,7 @@ private function processTrackDetailsEvents(array $events)
      * Append error message to rate result instance
      * @param string $trackingValue
      * @param string $errorMessage
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function appendTrackingError($trackingValue, $errorMessage)
     {
diff --git a/app/code/Magento/Fedex/Model/Source/Dropoff.php b/app/code/Magento/Fedex/Model/Source/Dropoff.php
index 6432c54695123..b5becf03acb4d 100644
--- a/app/code/Magento/Fedex/Model/Source/Dropoff.php
+++ b/app/code/Magento/Fedex/Model/Source/Dropoff.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Fedex\Model\Source\Dropoff
  *
- * @since 2.0.0
  */
 class Dropoff extends \Magento\Fedex\Model\Source\Generic
 {
@@ -22,7 +21,6 @@ class Dropoff extends \Magento\Fedex\Model\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'dropoff';
 }
diff --git a/app/code/Magento/Fedex/Model/Source/Freemethod.php b/app/code/Magento/Fedex/Model/Source/Freemethod.php
index ca569fe9a926d..df6e3dbe50b1c 100644
--- a/app/code/Magento/Fedex/Model/Source/Freemethod.php
+++ b/app/code/Magento/Fedex/Model/Source/Freemethod.php
@@ -9,13 +9,11 @@
  * Fedex freemethod source implementation
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Freemethod extends \Magento\Fedex\Model\Source\Method
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Fedex/Model/Source/Generic.php b/app/code/Magento/Fedex/Model/Source/Generic.php
index 44f9dd08b8136..144bdefa53643 100644
--- a/app/code/Magento/Fedex/Model/Source/Generic.php
+++ b/app/code/Magento/Fedex/Model/Source/Generic.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Fedex\Model\Source\Generic
  *
- * @since 2.0.0
  */
 class Generic implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Fedex\Model\Carrier
-     * @since 2.0.0
      */
     protected $_shippingFedex;
 
@@ -22,13 +20,11 @@ class Generic implements \Magento\Framework\Option\ArrayInterface
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = '';
 
     /**
      * @param \Magento\Fedex\Model\Carrier $shippingFedex
-     * @since 2.0.0
      */
     public function __construct(\Magento\Fedex\Model\Carrier $shippingFedex)
     {
@@ -39,7 +35,6 @@ public function __construct(\Magento\Fedex\Model\Carrier $shippingFedex)
      * Returns array to be used in multiselect on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Fedex/Model/Source/Method.php b/app/code/Magento/Fedex/Model/Source/Method.php
index 5244c320b3836..10032b5cc9fe4 100644
--- a/app/code/Magento/Fedex/Model/Source/Method.php
+++ b/app/code/Magento/Fedex/Model/Source/Method.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Fedex\Model\Source\Method
  *
- * @since 2.0.0
  */
 class Method extends \Magento\Fedex\Model\Source\Generic
 {
@@ -22,7 +21,6 @@ class Method extends \Magento\Fedex\Model\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'method';
 }
diff --git a/app/code/Magento/Fedex/Model/Source/Packaging.php b/app/code/Magento/Fedex/Model/Source/Packaging.php
index fe1e2aa5e9146..c05885f6b98e4 100644
--- a/app/code/Magento/Fedex/Model/Source/Packaging.php
+++ b/app/code/Magento/Fedex/Model/Source/Packaging.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Fedex\Model\Source\Packaging
  *
- * @since 2.0.0
  */
 class Packaging extends \Magento\Fedex\Model\Source\Generic
 {
@@ -22,7 +21,6 @@ class Packaging extends \Magento\Fedex\Model\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'packaging';
 }
diff --git a/app/code/Magento/Fedex/Model/Source/Unitofmeasure.php b/app/code/Magento/Fedex/Model/Source/Unitofmeasure.php
index 1b5d31aca109b..1ab8eadf1eafe 100644
--- a/app/code/Magento/Fedex/Model/Source/Unitofmeasure.php
+++ b/app/code/Magento/Fedex/Model/Source/Unitofmeasure.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Fedex\Model\Source\Unitofmeasure
  *
- * @since 2.0.0
  */
 class Unitofmeasure extends Generic
 {
@@ -17,7 +16,6 @@ class Unitofmeasure extends Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'unit_of_measure';
 }
diff --git a/app/code/Magento/Fedex/Setup/InstallData.php b/app/code/Magento/Fedex/Setup/InstallData.php
index c3c7b397ba045..823cd2794290f 100644
--- a/app/code/Magento/Fedex/Setup/InstallData.php
+++ b/app/code/Magento/Fedex/Setup/InstallData.php
@@ -14,14 +14,12 @@
  * Class InstallData
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/GiftMessage/Api/CartRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/CartRepositoryInterface.php
index f59b07f476658..3b2e3cb425433 100644
--- a/app/code/Magento/GiftMessage/Api/CartRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/CartRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface CartRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface CartRepositoryInterface
      *
      * @param int $cartId The shopping cart ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -32,7 +30,6 @@ public function get($cartId);
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException You cannot add gift messages to
      * virtual products.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message could not be saved.
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage);
 }
diff --git a/app/code/Magento/GiftMessage/Api/Data/MessageInterface.php b/app/code/Magento/GiftMessage/Api/Data/MessageInterface.php
index f00834a1e9622..5db31d90e8741 100644
--- a/app/code/Magento/GiftMessage/Api/Data/MessageInterface.php
+++ b/app/code/Magento/GiftMessage/Api/Data/MessageInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface MessageInterface
  * @api
- * @since 2.0.0
  */
 interface MessageInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -26,7 +25,6 @@ interface MessageInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
      * Return the gift message ID.
      *
      * @return int|null Gift message ID. Otherwise, null.
-     * @since 2.0.0
      */
     public function getGiftMessageId();
 
@@ -35,7 +33,6 @@ public function getGiftMessageId();
      *
      * @param int|null $id
      * @return $this
-     * @since 2.0.0
      */
     public function setGiftMessageId($id);
 
@@ -43,7 +40,6 @@ public function setGiftMessageId($id);
      * Return the customer ID.
      *
      * @return int|null Customer ID. Otherwise, null.
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -52,7 +48,6 @@ public function getCustomerId();
      *
      * @param int|null $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id);
 
@@ -60,7 +55,6 @@ public function setCustomerId($id);
      * Return the sender name.
      *
      * @return string Sender name.
-     * @since 2.0.0
      */
     public function getSender();
 
@@ -69,7 +63,6 @@ public function getSender();
      *
      * @param string $sender
      * @return $this
-     * @since 2.0.0
      */
     public function setSender($sender);
 
@@ -77,7 +70,6 @@ public function setSender($sender);
      * Return the recipient name.
      *
      * @return string Recipient name.
-     * @since 2.0.0
      */
     public function getRecipient();
 
@@ -86,7 +78,6 @@ public function getRecipient();
      *
      * @param string $recipient
      * @return $this
-     * @since 2.0.0
      */
     public function setRecipient($recipient);
 
@@ -94,7 +85,6 @@ public function setRecipient($recipient);
      * Return the message text.
      *
      * @return string Message text.
-     * @since 2.0.0
      */
     public function getMessage();
 
@@ -103,7 +93,6 @@ public function getMessage();
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     public function setMessage($message);
 
@@ -111,7 +100,6 @@ public function setMessage($message);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\GiftMessage\Api\Data\MessageExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -120,7 +108,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\GiftMessage\Api\Data\MessageExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\GiftMessage\Api\Data\MessageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/GiftMessage/Api/GuestCartRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/GuestCartRepositoryInterface.php
index 0a4735daa3b36..a36f1c597980f 100644
--- a/app/code/Magento/GiftMessage/Api/GuestCartRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/GuestCartRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface GuestCartRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface GuestCartRepositoryInterface
 {
@@ -17,7 +16,6 @@ interface GuestCartRepositoryInterface
      *
      * @param string $cartId The shopping cart ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -30,7 +28,6 @@ public function get($cartId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException You cannot add gift messages to empty carts.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message could not be saved.
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage);
 }
diff --git a/app/code/Magento/GiftMessage/Api/GuestItemRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/GuestItemRepositoryInterface.php
index 61749b405c0a9..4058d79bd076a 100644
--- a/app/code/Magento/GiftMessage/Api/GuestItemRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/GuestItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface GuestItemRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface GuestItemRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface GuestItemRepositoryInterface
      * @param int $itemId The item ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified item does not exist in the cart.
-     * @since 2.0.0
      */
     public function get($cartId, $itemId);
 
@@ -33,7 +31,6 @@ public function get($cartId, $itemId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException You cannot add gift messages to empty carts.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message could not be saved.
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage, $itemId);
 }
diff --git a/app/code/Magento/GiftMessage/Api/ItemRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/ItemRepositoryInterface.php
index 6049e42fda14d..a6632b47215f5 100644
--- a/app/code/Magento/GiftMessage/Api/ItemRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/ItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ItemRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface ItemRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface ItemRepositoryInterface
      * @param int $itemId The item ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified item does not exist in the cart.
-     * @since 2.0.0
      */
     public function get($cartId, $itemId);
 
@@ -35,7 +33,6 @@ public function get($cartId, $itemId);
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException You cannot add gift messages to
      * virtual products.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message could not be saved.
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage, $itemId);
 }
diff --git a/app/code/Magento/GiftMessage/Api/OrderItemRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/OrderItemRepositoryInterface.php
index c4e195b02bed7..405c11fc06b40 100644
--- a/app/code/Magento/GiftMessage/Api/OrderItemRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/OrderItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface OrderItemRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface OrderItemRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface OrderItemRepositoryInterface
      * @param int $orderItemId The item ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($orderId, $orderItemId);
 
@@ -33,7 +31,6 @@ public function get($orderId, $orderItemId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 2.0.0
      */
     public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage);
 }
diff --git a/app/code/Magento/GiftMessage/Api/OrderRepositoryInterface.php b/app/code/Magento/GiftMessage/Api/OrderRepositoryInterface.php
index 5cd2812ebb2d2..bfd708dbb3c08 100644
--- a/app/code/Magento/GiftMessage/Api/OrderRepositoryInterface.php
+++ b/app/code/Magento/GiftMessage/Api/OrderRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface OrderRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface OrderRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface OrderRepositoryInterface
      * @param int $orderId The order ID.
      * @return \Magento\GiftMessage\Api\Data\MessageInterface Gift message.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($orderId);
 
@@ -32,7 +30,6 @@ public function get($orderId);
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage);
 }
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
index 9d17a006bf099..8e8c1c83af5f3 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Config extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
 {
@@ -18,7 +17,6 @@ class Config extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -28,7 +26,6 @@ class Config extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -45,7 +42,6 @@ public function __construct(
      * Get config value data
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getValueFromConfig()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
index 6c8a5608ba0e4..7464751ca4f92 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
     /**
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -31,7 +28,6 @@ class Form extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Indicates that block can display gift message form
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayGiftmessageForm()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
index c14b42eb7f9ff..3605d533cf57f 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Giftoptions extends \Magento\Backend\Block\Template
 {
@@ -19,7 +18,6 @@ class Giftoptions extends \Magento\Backend\Block\Template
      * Get order item object from parent block
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getItem()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
index d3766d99c419e..74aeffd977eb0 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Items extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -24,7 +22,6 @@ class Items extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      *
      * @return \Magento\Quote\Model\Quote\Item
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -51,7 +47,6 @@ public function getItem()
      * Indicates that block can display gift messages form
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canDisplayGiftMessage()
     {
@@ -67,7 +62,6 @@ public function canDisplayGiftMessage()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -84,7 +78,6 @@ public function getFormHtml()
      * Retrieve gift message for item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMessageText()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php
index f88e9e4045fbd..b1046cfb7e283 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Template
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class Form extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Indicates that block can display gift message form
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayGiftmessageForm()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
index 2c06f98a4f32b..d678e8814e8f2 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Giftoptions extends \Magento\Backend\Block\Template
 {
@@ -19,7 +18,6 @@ class Giftoptions extends \Magento\Backend\Block\Template
      * Get order item object from parent block
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getItem()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
index 5a3dc752e668b..7e0779278cb93 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Items extends \Magento\Backend\Block\Template
 {
@@ -18,13 +17,11 @@ class Items extends \Magento\Backend\Block\Template
      * Gift message array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_giftMessage = [];
 
     /**
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -32,7 +29,6 @@ class Items extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @return \Magento\Sales\Model\Order\Item
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -59,7 +54,6 @@ public function getItem()
      * Retrieve default value for giftmessage sender
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSender()
     {
@@ -78,7 +72,6 @@ public function getDefaultSender()
      * Retrieve default value for giftmessage recipient
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultRecipient()
     {
@@ -109,7 +102,6 @@ public function getDefaultRecipient()
      * @param string $name
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFieldName($name)
     {
@@ -122,7 +114,6 @@ public function getFieldName($name)
      * @param string $id
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFieldId($id)
     {
@@ -134,7 +125,6 @@ public function getFieldId($id)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFieldIdPrefix()
     {
@@ -145,7 +135,6 @@ public function getFieldIdPrefix()
      * Initialize gift message for entity
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessage()
     {
@@ -168,7 +157,6 @@ protected function _initMessage()
      * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -184,7 +172,6 @@ public function getMessage()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -199,7 +186,6 @@ public function getSaveUrl()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -210,7 +196,6 @@ public function getHtmlId()
      * Indicates that block can display giftmessages form
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canDisplayGiftmessage()
     {
@@ -221,7 +206,6 @@ public function canDisplayGiftmessage()
      * Retrieve gift message sender
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSender()
     {
@@ -232,7 +216,6 @@ public function getSender()
      * Retrieve gift message recipient
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRecipient()
     {
@@ -243,7 +226,6 @@ public function getRecipient()
      * Retrieve gift message text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMessageText()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
index 4a06e69ff54db..4adc23c411dc8 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
@@ -11,37 +11,31 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class GiftOptions extends \Magento\Backend\Block\Template
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout;
 
     /**
      * @var \Magento\Checkout\Model\CompositeConfigProvider
-     * @since 2.0.0
      */
     protected $configProvider;
 
     /**
      * @var array|\Magento\Checkout\Block\Checkout\LayoutProcessorInterface[]
-     * @since 2.0.0
      */
     protected $layoutProcessors;
 
     /**
      * @var Encoder
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -51,7 +45,6 @@ class GiftOptions extends \Magento\Backend\Block\Template
      * @param CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -70,7 +63,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -84,7 +76,6 @@ public function getJsLayout()
      * Retrieve gift message configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGiftOptionsConfigJson()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/GiftOptions.php b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/GiftOptions.php
index 44ed68b497dbc..3b06c9023ab95 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/GiftOptions.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/GiftOptions.php
@@ -11,31 +11,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class GiftOptions extends Generic
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout;
 
     /**
      * @var array|LayoutProcessorInterface[]
-     * @since 2.0.0
      */
     protected $layoutProcessors;
 
     /**
      * @var Encoder
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -44,7 +39,6 @@ class GiftOptions extends Generic
      * @param Encoder $jsonEncoder
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -63,7 +57,6 @@ public function __construct(
      * Return JS layout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
diff --git a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/ItemIdProcessor.php b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/ItemIdProcessor.php
index 8225e88ef4cf2..7eacea5eec5de 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/ItemIdProcessor.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/ItemIdProcessor.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\ItemIdProcessor
  *
- * @since 2.0.0
  */
 class ItemIdProcessor implements LayoutProcessorInterface
 {
@@ -20,7 +19,6 @@ class ItemIdProcessor implements LayoutProcessorInterface
      * @param array $jsLayout
      * @param AbstractItem $item
      * @return array
-     * @since 2.0.0
      */
     public function process($jsLayout, AbstractItem $item)
     {
diff --git a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/LayoutProcessorInterface.php b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/LayoutProcessorInterface.php
index 87fe0bd7ca721..0828d2130b118 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/LayoutProcessorInterface.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/LayoutProcessorInterface.php
@@ -15,7 +15,6 @@
  * @see \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions
  *
  * @api
- * @since 2.0.0
  */
 interface LayoutProcessorInterface
 {
@@ -25,7 +24,6 @@ interface LayoutProcessorInterface
      * @param array $jsLayout
      * @param AbstractItem $item
      * @return array
-     * @since 2.0.0
      */
     public function process($jsLayout, AbstractItem $item);
 }
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 3420d4937f0e0..9e2747cf97fc1 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -12,31 +12,26 @@
  * Gift message inline edit form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Inline extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $_entity = null;
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     protected $_type = null;
 
     /**
      * @var Message|null
-     * @since 2.0.0
      */
     protected $_giftMessage = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'inline.phtml';
 
@@ -44,25 +39,21 @@ class Inline extends \Magento\Framework\View\Element\Template
      * Gift message message
      *
      * @var \Magento\GiftMessage\Helper\Message|null
-     * @since 2.0.0
      */
     protected $_giftMessageMessage = null;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder
-     * @since 2.0.0
      */
     protected $imageBuilder;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -70,7 +61,6 @@ class Inline extends \Magento\Framework\View\Element\Template
      * Checkout type. 'onepage_checkout' and 'multishipping_address' are standard types
      *
      * @var string
-     * @since 2.0.0
      */
     protected $checkoutType;
 
@@ -81,7 +71,6 @@ class Inline extends \Magento\Framework\View\Element\Template
      * @param \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -105,7 +94,6 @@ public function __construct(
      * @param mixed $entity
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setEntity($entity)
     {
@@ -118,7 +106,6 @@ public function setEntity($entity)
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -131,7 +118,6 @@ public function getEntity()
      * @param string $type
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -144,7 +130,6 @@ public function setType($type)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -157,7 +142,6 @@ public function getType()
      * @param $type string
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setCheckoutType($type)
     {
@@ -170,7 +154,6 @@ public function setCheckoutType($type)
      *
      * @return string|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getCheckoutType()
     {
@@ -181,7 +164,6 @@ public function getCheckoutType()
      * Check if entity has gift message
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasGiftMessage()
     {
@@ -192,7 +174,6 @@ public function hasGiftMessage()
      * Init message
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessage()
     {
@@ -204,7 +185,6 @@ protected function _initMessage()
      * Get default value for From field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultFrom()
     {
@@ -219,7 +199,6 @@ public function getDefaultFrom()
      * Get default value for To field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultTo()
     {
@@ -235,7 +214,6 @@ public function getDefaultTo()
      *
      * @param mixed $entity
      * @return string
-     * @since 2.0.0
      */
     public function getMessage($entity = null)
     {
@@ -257,7 +235,6 @@ public function getMessage($entity = null)
      * Retrieve items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -284,7 +261,6 @@ public function getItems()
      * Check if gift messages for separate items are allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isItemsAvailable()
     {
@@ -295,7 +271,6 @@ public function isItemsAvailable()
      * Return items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function countItems()
     {
@@ -307,7 +282,6 @@ public function countItems()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getItemsHasMesssages()
     {
@@ -324,7 +298,6 @@ public function getItemsHasMesssages()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEntityHasMessage()
     {
@@ -337,7 +310,6 @@ public function getEntityHasMessage()
      * @param string $value
      * @param string $defaultValue
      * @return string
-     * @since 2.0.0
      */
     public function getEscaped($value, $defaultValue = '')
     {
@@ -348,7 +320,6 @@ public function getEscaped($value, $defaultValue = '')
      * Check availability of giftmessages on order level
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMessagesAvailable()
     {
@@ -360,7 +331,6 @@ public function isMessagesAvailable()
      *
      * @param \Magento\Framework\DataObject $item
      * @return bool
-     * @since 2.0.0
      */
     public function isItemMessagesAvailable($item)
     {
@@ -372,7 +342,6 @@ public function isItemMessagesAvailable($item)
      * Render HTML code referring to config settings
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -390,7 +359,6 @@ protected function _toHtml()
      * @param string $imageId
      * @param array $attributes
      * @return \Magento\Catalog\Block\Product\Image
-     * @since 2.0.0
      */
     public function getImage($product, $imageId, $attributes = [])
     {
diff --git a/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php b/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
index bbf3df1fa8dee..10f146272eed4 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
@@ -11,7 +11,6 @@
 
 /**
  * Multishipping items box plugin
- * @since 2.0.0
  */
 class ItemsBox
 {
@@ -19,7 +18,6 @@ class ItemsBox
      * Gift message helper
      *
      * @var MessageHelper
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -27,7 +25,6 @@ class ItemsBox
      * Construct
      *
      * @param MessageHelper $helper
-     * @since 2.0.0
      */
     public function __construct(MessageHelper $helper)
     {
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 8844bdea0609d..66534cf41393f 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -13,7 +13,6 @@
 /**
  * Gift Message helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Message extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -29,7 +28,6 @@ class Message extends \Magento\Framework\App\Helper\AbstractHelper
      * Next id for edit gift message block
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_nextId = 0;
 
@@ -37,31 +35,26 @@ class Message extends \Magento\Framework\App\Helper\AbstractHelper
      * Inner cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_innerCache = [];
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $_layoutFactory;
 
     /**
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $_giftMessageFactory;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -69,13 +62,11 @@ class Message extends \Magento\Framework\App\Helper\AbstractHelper
      * Pages to skip message checks
      *
      * @var array
-     * @since 2.0.0
      */
     protected $skipMessageCheck = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $_storeManager;
 
@@ -88,7 +79,6 @@ class Message extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param array $skipMessageCheck
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -118,7 +108,6 @@ public function __construct(
      * @param \Magento\Framework\DataObject $entity
      * @param bool $dontDisplayContainer
      * @return string
-     * @since 2.0.0
      */
     public function getInline($type, \Magento\Framework\DataObject $entity, $dontDisplayContainer = false)
     {
@@ -135,7 +124,6 @@ public function getInline($type, \Magento\Framework\DataObject $entity, $dontDis
     /**
      * @param string $pageType
      * @return bool
-     * @since 2.0.0
      */
     protected function skipPage($pageType)
     {
@@ -150,7 +138,6 @@ protected function skipPage($pageType)
      * @param \Magento\Store\Model\Store|int|null $store
      * @return bool|string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isMessagesAllowed($type, \Magento\Framework\DataObject $entity, $store = null)
     {
@@ -211,7 +198,6 @@ public function isMessagesAllowed($type, \Magento\Framework\DataObject $entity,
      * @param bool $productConfig
      * @param \Magento\Store\Model\Store|int|null $store
      * @return bool|string|null
-     * @since 2.0.0
      */
     protected function _getDependenceFromStoreConfig($productConfig, $store = null)
     {
@@ -231,7 +217,6 @@ protected function _getDependenceFromStoreConfig($productConfig, $store = null)
      *
      * @param \Magento\Framework\DataObject $entity
      * @return string|null
-     * @since 2.0.0
      */
     public function getEscapedGiftMessage(\Magento\Framework\DataObject $entity)
     {
@@ -247,7 +232,6 @@ public function getEscapedGiftMessage(\Magento\Framework\DataObject $entity)
      *
      * @param \Magento\Framework\DataObject $entity
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getGiftMessageForEntity(\Magento\Framework\DataObject $entity)
     {
@@ -265,7 +249,6 @@ public function getGiftMessageForEntity(\Magento\Framework\DataObject $entity)
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getCached($key)
     {
@@ -280,7 +263,6 @@ public function getCached($key)
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     public function isCached($key)
     {
@@ -293,7 +275,6 @@ public function isCached($key)
      * @param string $key
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCached($key, $value)
     {
@@ -308,7 +289,6 @@ public function setCached($key, $value)
      * @param \Magento\Store\Model\Store|int|null $store
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getAvailableForQuoteItems($quote, $store = null)
     {
@@ -327,7 +307,6 @@ public function getAvailableForQuoteItems($quote, $store = null)
      * @param \Magento\Store\Model\Store|int|null $store
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getAvailableForAddressItems($items, $store = null)
     {
@@ -344,7 +323,6 @@ public function getAvailableForAddressItems($items, $store = null)
      *
      * @param int $messageId
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getGiftMessage($messageId = null)
     {
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index d00d2c02f4a0c..eeab05f01d09f 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -13,7 +13,6 @@
 
 /**
  * Shopping cart gift message repository object for registered customer
- * @since 2.0.0
  */
 class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
 {
@@ -21,7 +20,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -29,7 +27,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * Store manager interface.
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -37,7 +34,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * Gift message manager.
      *
      * @var \Magento\GiftMessage\Model\GiftMessageManager
-     * @since 2.0.0
      */
     protected $giftMessageManager;
 
@@ -45,7 +41,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * Message helper.
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -53,7 +48,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * Message factory.
      *
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
@@ -63,7 +57,6 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -81,7 +74,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -98,7 +90,6 @@ public function get($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
     {
diff --git a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
index ac9592d14aea9..30a5bc4379ca7 100644
--- a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\GiftMessage\Model\CompositeConfigProvider
  *
- * @since 2.0.0
  */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var ConfigProviderInterface[]
-     * @since 2.0.0
      */
     private $configProviders;
 
     /**
      * @param ConfigProviderInterface[] $configProviders
-     * @since 2.0.0
      */
     public function __construct(
         array $configProviders
@@ -32,7 +29,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
index 7791bba040af7..bd64856def172 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -18,49 +18,41 @@
  * Configuration provider for GiftMessage rendering on "Checkout cart" page.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NPathComplexity)
- * @since 2.0.0
  */
 class GiftMessageConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfiguration;
 
     /**
      * @var \Magento\GiftMessage\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartRepository;
 
     /**
      * @var \Magento\GiftMessage\Api\ItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $itemRepository;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var LocaleFormat
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
@@ -73,7 +65,6 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param LocaleFormat $localeFormat
      * @param FormKey $formKey
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -97,7 +88,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -139,7 +129,6 @@ public function getConfig()
      * Check if customer is logged in
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isCustomerLoggedIn()
     {
@@ -150,7 +139,6 @@ private function isCustomerLoggedIn()
      * Retrieve store code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getStoreCode()
     {
@@ -161,7 +149,6 @@ protected function getStoreCode()
      * Check if quote is virtual
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isQuoteVirtual()
     {
@@ -172,7 +159,6 @@ protected function isQuoteVirtual()
      * Load already specified quote level gift message.
      *
      * @return \Magento\GiftMessage\Api\Data\MessageInterface|null
-     * @since 2.0.0
      */
     protected function getOrderLevelGiftMessages()
     {
@@ -184,7 +170,6 @@ protected function getOrderLevelGiftMessages()
      * Load already specified item level gift messages and related configuration.
      *
      * @return \Magento\GiftMessage\Api\Data\MessageInterface[]|null
-     * @since 2.0.0
      */
     protected function getItemLevelGiftMessages()
     {
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
index 6da5a97fb0b30..45eeafd07a2da 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\GiftMessage\Model\GiftMessageManager
  *
- * @since 2.0.0
  */
 class GiftMessageManager
 {
     /**
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
     /**
      * @param MessageFactory $messageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Model\MessageFactory $messageFactory
@@ -35,7 +32,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function add($giftMessages, $quote)
     {
@@ -107,7 +103,6 @@ public function add($giftMessages, $quote)
      * @param null|int $entityId The entity ID.
      * @return void
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message is not available.
-     * @since 2.0.0
      */
     public function setMessage(\Magento\Quote\Model\Quote $quote, $type, $giftMessage, $entityId = null)
     {
diff --git a/app/code/Magento/GiftMessage/Model/GuestCartRepository.php b/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
index c4aafe5477033..96cd8e0f6c32c 100644
--- a/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
@@ -14,26 +14,22 @@
 
 /**
  * Shopping cart gift message repository object for guest
- * @since 2.0.0
  */
 class GuestCartRepository implements GuestCartRepositoryInterface
 {
     /**
      * @var CartRepository
-     * @since 2.0.0
      */
     protected $repository;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @param CartRepository $repository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         CartRepository $repository,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -56,7 +51,6 @@ public function get($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($cartId, MessageInterface $giftMessage)
     {
diff --git a/app/code/Magento/GiftMessage/Model/GuestItemRepository.php b/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
index d4561ff545e63..79545b6d6f9c9 100644
--- a/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
@@ -14,26 +14,22 @@
 
 /**
  * Shopping cart gift message item repository object for guest
- * @since 2.0.0
  */
 class GuestItemRepository implements GuestItemRepositoryInterface
 {
     /**
      * @var ItemRepository
-     * @since 2.0.0
      */
     protected $repository;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @param ItemRepository $repository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         ItemRepository $repository,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId, $itemId)
     {
@@ -56,7 +51,6 @@ public function get($cartId, $itemId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($cartId, MessageInterface $giftMessage, $itemId)
     {
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index d11885273f530..6d369e083b135 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -14,7 +14,6 @@
 
 /**
  * Shopping cart gift message item repository object for registered customer
- * @since 2.0.0
  */
 class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
 {
@@ -22,7 +21,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -30,7 +28,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * Store manager interface.
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -38,7 +35,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * Gift message manager.
      *
      * @var \Magento\GiftMessage\Model\GiftMessageManager
-     * @since 2.0.0
      */
     protected $giftMessageManager;
 
@@ -46,7 +42,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * Message helper.
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -54,7 +49,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * Message factory.
      *
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
@@ -64,7 +58,6 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -82,7 +75,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId, $itemId)
     {
@@ -110,7 +102,6 @@ public function get($cartId, $itemId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage, $itemId)
     {
diff --git a/app/code/Magento/GiftMessage/Model/Message.php b/app/code/Magento/GiftMessage/Model/Message.php
index ed518cd540c3d..f0f76bb7ea7ef 100644
--- a/app/code/Magento/GiftMessage/Model/Message.php
+++ b/app/code/Magento/GiftMessage/Model/Message.php
@@ -15,14 +15,12 @@
  * @method \Magento\GiftMessage\Model\ResourceModel\Message getResource()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Message extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\GiftMessage\Api\Data\MessageInterface
 {
     /**
      * @var \Magento\GiftMessage\Model\TypeFactory
-     * @since 2.0.0
      */
     protected $_typeFactory;
 
@@ -35,7 +33,6 @@ class Message extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * @param \Magento\GiftMessage\Model\ResourceModel\Message $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -61,7 +58,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +69,6 @@ protected function _construct()
      *
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     public function getEntityModelByType($type)
     {
@@ -84,7 +79,6 @@ public function getEntityModelByType($type)
      * Checks if the gift message is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMessageEmpty()
     {
@@ -95,7 +89,6 @@ public function isMessageEmpty()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGiftMessageId()
     {
@@ -104,7 +97,6 @@ public function getGiftMessageId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGiftMessageId($id)
     {
@@ -113,7 +105,6 @@ public function setGiftMessageId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -122,7 +113,6 @@ public function getCustomerId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -131,7 +121,6 @@ public function setCustomerId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSender()
     {
@@ -140,7 +129,6 @@ public function getSender()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSender($sender)
     {
@@ -149,7 +137,6 @@ public function setSender($sender)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRecipient()
     {
@@ -158,7 +145,6 @@ public function getRecipient()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRecipient($recipient)
     {
@@ -167,7 +153,6 @@ public function setRecipient($recipient)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -176,7 +161,6 @@ public function getMessage()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMessage($message)
     {
@@ -187,7 +171,6 @@ public function setMessage($message)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\GiftMessage\Api\Data\MessageExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -199,7 +182,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\GiftMessage\Api\Data\MessageExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\GiftMessage\Api\Data\MessageExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
index 447830df235e9..063f814b56351 100644
--- a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
@@ -13,7 +13,6 @@
 
 /**
  * Order item gift message repository object.
- * @since 2.0.0
  */
 class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositoryInterface
 {
@@ -21,7 +20,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * Order factory.
      *
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -37,7 +35,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * Store manager interface.
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -45,7 +42,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * Gift message save model.
      *
      * @var \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected $giftMessageSaveModel;
 
@@ -53,7 +49,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * Message helper.
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -61,7 +56,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * Message factory.
      *
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
@@ -71,7 +65,6 @@ class OrderItemRepository implements \Magento\GiftMessage\Api\OrderItemRepositor
      * @param \Magento\GiftMessage\Model\Save $giftMessageSaveModel
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
@@ -89,7 +82,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($orderId, $orderItemId)
     {
@@ -114,7 +106,6 @@ public function get($orderId, $orderItemId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
     {
@@ -157,7 +148,6 @@ public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\Messa
      * @param int $orderId
      * @param int $orderItemId
      * @return \Magento\Sales\Api\Data\OrderItemInterface|bool
-     * @since 2.0.0
      */
     protected function getItemById($orderId, $orderItemId)
     {
diff --git a/app/code/Magento/GiftMessage/Model/OrderRepository.php b/app/code/Magento/GiftMessage/Model/OrderRepository.php
index 2936190fc0967..1960281367e3a 100644
--- a/app/code/Magento/GiftMessage/Model/OrderRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderRepository.php
@@ -14,7 +14,6 @@
 
 /**
  * Order gift message repository object.
- * @since 2.0.0
  */
 class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterface
 {
@@ -22,7 +21,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * Order factory.
      *
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -30,7 +28,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * Store manager interface.
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -38,7 +35,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * Gift message save model.
      *
      * @var \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected $giftMessageSaveModel;
 
@@ -46,7 +42,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * Message helper.
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -54,7 +49,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * Message factory.
      *
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
@@ -64,7 +58,6 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
      * @param \Magento\GiftMessage\Model\Save $giftMessageSaveModel
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
@@ -82,7 +75,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($orderId)
     {
@@ -105,7 +97,6 @@ public function get($orderId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
     {
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
index bb9b9ba24ee88..4b415007f021b 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
@@ -12,31 +12,26 @@
 /**
  * Class \Magento\GiftMessage\Model\Plugin\OrderGet
  *
- * @since 2.0.0
  */
 class OrderGet
 {
     /**
      * @var \Magento\GiftMessage\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $giftMessageOrderRepository;
 
     /**
      * @var \Magento\GiftMessage\Api\OrderItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $giftMessageOrderItemRepository;
 
     /**
      * @var \Magento\Sales\Api\Data\OrderExtensionFactory
-     * @since 2.0.0
      */
     protected $orderExtensionFactory;
 
     /**
      * @var \Magento\Sales\Api\Data\OrderItemExtensionFactory
-     * @since 2.0.0
      */
     protected $orderItemExtensionFactory;
 
@@ -47,7 +42,6 @@ class OrderGet
      * @param \Magento\GiftMessage\Api\OrderItemRepositoryInterface $giftMessageOrderItemRepository
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory
      * @param \Magento\Sales\Api\Data\OrderItemExtensionFactory $orderItemExtensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Api\OrderRepositoryInterface $giftMessageOrderRepository,
@@ -68,7 +62,7 @@ public function __construct(
      * @param \Magento\Sales\Api\Data\OrderInterface $resultOrder
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function afterGet(
         \Magento\Sales\Api\OrderRepositoryInterface $subject,
@@ -85,7 +79,6 @@ public function afterGet(
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.0.0
      */
     protected function getOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
     {
@@ -114,7 +107,6 @@ protected function getOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $o
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.0.0
      */
     protected function getOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
index a159ca2543f83..acad923a8d308 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\GiftMessage\Model\Plugin\OrderSave
  *
- * @since 2.0.0
  */
 class OrderSave
 {
     /**
      * @var \Magento\GiftMessage\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $giftMessageOrderRepository;
 
     /**
      * @var \Magento\GiftMessage\Api\OrderItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $giftMessageOrderItemRepository;
 
@@ -33,7 +30,6 @@ class OrderSave
      *
      * @param \Magento\GiftMessage\Api\OrderRepositoryInterface $giftMessageOrderRepository
      * @param \Magento\GiftMessage\Api\OrderItemRepositoryInterface $giftMessageOrderItemRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Api\OrderRepositoryInterface $giftMessageOrderRepository,
@@ -51,7 +47,7 @@ public function __construct(
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @throws CouldNotSaveException
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function afterSave(
         \Magento\Sales\Api\OrderRepositoryInterface $subject,
@@ -70,7 +66,6 @@ public function afterSave(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     protected function saveOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
     {
@@ -98,7 +93,6 @@ protected function saveOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     protected function saveOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php b/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
index 9c28da081cb9b..f030f8324cc1b 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\GiftMessage\Model\Plugin\QuoteItem
  *
- * @since 2.0.0
  */
 class QuoteItem
 {
     /**
      * @var MessageHelper
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @param MessageHelper $helper
-     * @since 2.0.0
      */
     public function __construct(MessageHelper $helper)
     {
diff --git a/app/code/Magento/GiftMessage/Model/ResourceModel/Message.php b/app/code/Magento/GiftMessage/Model/ResourceModel/Message.php
index d2239f7c53df0..6472a9c52952a 100644
--- a/app/code/Magento/GiftMessage/Model/ResourceModel/Message.php
+++ b/app/code/Magento/GiftMessage/Model/ResourceModel/Message.php
@@ -9,7 +9,6 @@
  * Gift Message resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/GiftMessage/Model/ResourceModel/Message/Collection.php b/app/code/Magento/GiftMessage/Model/ResourceModel/Message/Collection.php
index 406acb1a5cd9c..3c4a9fad5cca5 100644
--- a/app/code/Magento/GiftMessage/Model/ResourceModel/Message/Collection.php
+++ b/app/code/Magento/GiftMessage/Model/ResourceModel/Message/Collection.php
@@ -9,7 +9,6 @@
  * Gift Message collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/GiftMessage/Model/Save.php b/app/code/Magento/GiftMessage/Model/Save.php
index 79c0ae7d4a897..81fd6121f827e 100644
--- a/app/code/Magento/GiftMessage/Model/Save.php
+++ b/app/code/Magento/GiftMessage/Model/Save.php
@@ -9,13 +9,11 @@
  * Adminhtml giftmessage save model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Save extends \Magento\Framework\DataObject
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_saved = false;
 
@@ -23,25 +21,21 @@ class Save extends \Magento\Framework\DataObject
      * Gift message message
      *
      * @var \Magento\GiftMessage\Helper\Message|null
-     * @since 2.0.0
      */
     protected $_giftMessageMessage = null;
 
     /**
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $_messageFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -50,7 +44,6 @@ class Save extends \Magento\Framework\DataObject
      * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
      * @param \Magento\Backend\Model\Session\Quote $session
      * @param \Magento\GiftMessage\Helper\Message $giftMessageMessage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -68,7 +61,6 @@ public function __construct(
      * Save all seted giftmessages
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveAllInQuote()
     {
@@ -90,7 +82,6 @@ public function saveAllInQuote()
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSaved()
     {
@@ -99,7 +90,6 @@ public function getSaved()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function saveAllInOrder()
     {
@@ -124,7 +114,6 @@ public function saveAllInOrder()
      * @param array $giftmessage
      * @param string $entityType
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveOne($entityId, $giftmessage, $entityType)
     {
@@ -177,7 +166,6 @@ protected function _saveOne($entityId, $giftmessage, $entityType)
      * @param \Magento\Framework\DataObject $entityModel
      * @param \Magento\GiftMessage\Model\Message|null $giftmessageModel
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteOne($entityModel, $giftmessageModel = null)
     {
@@ -194,7 +182,6 @@ protected function _deleteOne($entityModel, $giftmessageModel = null)
      *
      * @param array $items
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowQuoteItems($items)
     {
@@ -207,7 +194,6 @@ public function setAllowQuoteItems($items)
      *
      * @param int $item
      * @return $this
-     * @since 2.0.0
      */
     public function addAllowQuoteItem($item)
     {
@@ -224,7 +210,6 @@ public function addAllowQuoteItem($item)
      * Retrieve allowed quote items for gift messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowQuoteItems()
     {
@@ -239,7 +224,6 @@ public function getAllowQuoteItems()
      * Retrieve allowed quote items products for gift messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowQuoteItemsProducts()
     {
@@ -260,7 +244,6 @@ public function getAllowQuoteItemsProducts()
      * @param  \Magento\Framework\DataObject $item
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAllowedQuoteItem($item)
     {
@@ -280,7 +263,6 @@ public function getIsAllowedQuoteItem($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return bool
-     * @since 2.0.0
      */
     public function isGiftMessagesAvailable($item)
     {
@@ -292,7 +274,6 @@ public function isGiftMessagesAvailable($item)
      *
      * @param mixed $products
      * @return $this
-     * @since 2.0.0
      */
     public function importAllowQuoteItemsFromProducts($products)
     {
@@ -322,7 +303,6 @@ public function importAllowQuoteItemsFromProducts($products)
     /**
      * @param mixed $items
      * @return $this
-     * @since 2.0.0
      */
     public function importAllowQuoteItemsFromItems($items)
     {
@@ -354,7 +334,6 @@ public function importAllowQuoteItemsFromItems($items)
      *
      * @param string $type
      * @return string|null
-     * @since 2.0.0
      */
     protected function getMappedType($type)
     {
@@ -376,7 +355,6 @@ protected function getMappedType($type)
      *
      * @return \Magento\Quote\Model\Quote
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _getQuote()
     {
diff --git a/app/code/Magento/GiftMessage/Model/Type/Plugin/Multishipping.php b/app/code/Magento/GiftMessage/Model/Type/Plugin/Multishipping.php
index 79a76462011c7..8c63bd3b15498 100644
--- a/app/code/Magento/GiftMessage/Model/Type/Plugin/Multishipping.php
+++ b/app/code/Magento/GiftMessage/Model/Type/Plugin/Multishipping.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\GiftMessage\Model\Type\Plugin\Multishipping
  *
- * @since 2.0.0
  */
 class Multishipping
 {
     /**
      * @var \Magento\GiftMessage\Model\GiftMessageManager
-     * @since 2.0.0
      */
     protected $message;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param \Magento\GiftMessage\Model\GiftMessageManager $message
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Model\GiftMessageManager $message,
@@ -42,7 +38,6 @@ public function __construct(
      * @param array|null $methods
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSetShippingMethods(
         \Magento\Multishipping\Model\Checkout\Type\Multishipping $subject,
diff --git a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
index 54a258da60463..931fc6d0d0bf7 100644
--- a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
+++ b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\GiftMessage\Model\Type\Plugin\Onepage
  *
- * @since 2.0.0
  */
 class Onepage
 {
     /**
      * @var \Magento\GiftMessage\Model\GiftMessageManager
-     * @since 2.0.0
      */
     protected $message;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param \Magento\GiftMessage\Model\GiftMessageManager $message
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Model\GiftMessageManager $message,
@@ -41,7 +37,6 @@ public function __construct(
      * @param \Magento\Checkout\Model\Type\Onepage $subject
      * @param array $result
      * @return $this
-     * @since 2.0.0
      */
     public function afterSaveShippingMethod(
         \Magento\Checkout\Model\Type\Onepage $subject,
diff --git a/app/code/Magento/GiftMessage/Model/TypeFactory.php b/app/code/Magento/GiftMessage/Model/TypeFactory.php
index 772fa8fd8785c..72b4aca2b62d5 100644
--- a/app/code/Magento/GiftMessage/Model/TypeFactory.php
+++ b/app/code/Magento/GiftMessage/Model/TypeFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for Eav Entity Types
- * @since 2.0.0
  */
 class TypeFactory
 {
@@ -15,7 +14,6 @@ class TypeFactory
      * Allowed types of entities for using of gift messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedEntityTypes = [
         'order' => \Magento\Sales\Model\Order::class,
@@ -31,13 +29,11 @@ class TypeFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -50,7 +46,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $eavType
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createType($eavType)
     {
diff --git a/app/code/Magento/GiftMessage/Observer/MultishippingEventCreateOrdersObserver.php b/app/code/Magento/GiftMessage/Observer/MultishippingEventCreateOrdersObserver.php
index 200f9cc711bff..f1d67c6d365d6 100644
--- a/app/code/Magento/GiftMessage/Observer/MultishippingEventCreateOrdersObserver.php
+++ b/app/code/Magento/GiftMessage/Observer/MultishippingEventCreateOrdersObserver.php
@@ -11,7 +11,6 @@
  * Gift Message Observer Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class MultishippingEventCreateOrdersObserver implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class MultishippingEventCreateOrdersObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php b/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
index 98339d6769068..ba5173e00ee32 100644
--- a/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
@@ -11,7 +11,6 @@
  * Gift Message Observer Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class SalesEventOrderItemToQuoteItemObserver implements ObserverInterface
 {
@@ -19,20 +18,17 @@ class SalesEventOrderItemToQuoteItemObserver implements ObserverInterface
      * Gift message message
      *
      * @var \Magento\GiftMessage\Helper\Message|null
-     * @since 2.0.0
      */
     protected $_giftMessageMessage = null;
 
     /**
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $_messageFactory;
 
     /**
      * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
      * @param \Magento\GiftMessage\Helper\Message $giftMessageMessage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Model\MessageFactory $messageFactory,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventOrderToQuoteObserver.php b/app/code/Magento/GiftMessage/Observer/SalesEventOrderToQuoteObserver.php
index a2b20ffdf57dc..68c0cc647402a 100644
--- a/app/code/Magento/GiftMessage/Observer/SalesEventOrderToQuoteObserver.php
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventOrderToQuoteObserver.php
@@ -11,7 +11,6 @@
  * Gift Message Observer Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class SalesEventOrderToQuoteObserver implements ObserverInterface
 {
@@ -19,20 +18,17 @@ class SalesEventOrderToQuoteObserver implements ObserverInterface
      * Gift message message
      *
      * @var \Magento\GiftMessage\Helper\Message|null
-     * @since 2.0.0
      */
     protected $_giftMessageMessage = null;
 
     /**
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $_messageFactory;
 
     /**
      * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
      * @param \Magento\GiftMessage\Helper\Message $giftMessageMessage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GiftMessage\Model\MessageFactory $messageFactory,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteSubmitBeforeObserver.php b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteSubmitBeforeObserver.php
index 168e5b78aa3e3..86d62644f8927 100644
--- a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteSubmitBeforeObserver.php
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteSubmitBeforeObserver.php
@@ -11,7 +11,6 @@
  * Gift Message Observer Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class SalesEventQuoteSubmitBeforeObserver implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class SalesEventQuoteSubmitBeforeObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GiftMessage/Setup/InstallData.php b/app/code/Magento/GiftMessage/Setup/InstallData.php
index af19e1e3e519e..75a9ac46bb89f 100644
--- a/app/code/Magento/GiftMessage/Setup/InstallData.php
+++ b/app/code/Magento/GiftMessage/Setup/InstallData.php
@@ -16,7 +16,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -24,7 +23,6 @@ class InstallData implements InstallDataInterface
      * Category setup factory
      *
      * @var CategorySetupFactory
-     * @since 2.0.0
      */
     protected $categorySetupFactory;
 
@@ -32,7 +30,6 @@ class InstallData implements InstallDataInterface
      * Quote setup factory
      *
      * @var QuoteSetupFactory
-     * @since 2.0.0
      */
     protected $quoteSetupFactory;
 
@@ -40,7 +37,6 @@ class InstallData implements InstallDataInterface
      * Sales setup factory
      *
      * @var SalesSetupFactory
-     * @since 2.0.0
      */
     protected $salesSetupFactory;
 
@@ -50,7 +46,6 @@ class InstallData implements InstallDataInterface
      * @param CategorySetupFactory $categorySetupFactory
      * @param QuoteSetupFactory $quoteSetupFactory
      * @param SalesSetupFactory $salesSetupFactory
-     * @since 2.0.0
      */
     public function __construct(
         CategorySetupFactory $categorySetupFactory,
@@ -64,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/GiftMessage/Setup/InstallSchema.php b/app/code/Magento/GiftMessage/Setup/InstallSchema.php
index a04d649c2eadd..1fa900773b011 100644
--- a/app/code/Magento/GiftMessage/Setup/InstallSchema.php
+++ b/app/code/Magento/GiftMessage/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/GoogleAdwords/Block/Code.php b/app/code/Magento/GoogleAdwords/Block/Code.php
index f7072cc9a7d2c..0ad50674b86ee 100644
--- a/app/code/Magento/GoogleAdwords/Block/Code.php
+++ b/app/code/Magento/GoogleAdwords/Block/Code.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Code extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\GoogleAdwords\Helper\Data
-     * @since 2.0.0
      */
     protected $_googleAdwordsData;
 
@@ -23,7 +21,6 @@ class Code extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\GoogleAdwords\Helper\Data $googleAdwordsData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Render block html if Google AdWords is active
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -47,7 +43,6 @@ protected function _toHtml()
 
     /**
      * @return \Magento\GoogleAdwords\Helper\Data
-     * @since 2.0.0
      */
     public function getHelper()
     {
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index 235ed8032ba4c..3a70cc77cb7d1 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -71,16 +70,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\Registry
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_registry;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -94,7 +89,6 @@ public function __construct(
      * Is Google AdWords active
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGoogleAdwordsActive()
     {
@@ -113,7 +107,6 @@ public function isGoogleAdwordsActive()
      * Retrieve language codes from config
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getLanguageCodes()
     {
@@ -125,7 +118,6 @@ public function getLanguageCodes()
      *
      * @param string $language
      * @return string
-     * @since 2.0.0
      */
     public function convertLanguageCodeToLocaleCode($language)
     {
@@ -137,7 +129,6 @@ public function convertLanguageCodeToLocaleCode($language)
      * Get conversion path to js src
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionJsSrc()
     {
@@ -148,7 +139,6 @@ public function getConversionJsSrc()
      * Get conversion img src
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionImgSrc()
     {
@@ -163,7 +153,6 @@ public function getConversionImgSrc()
      * Get Google AdWords conversion id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConversionId()
     {
@@ -177,7 +166,6 @@ public function getConversionId()
      * Get Google AdWords conversion language
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionLanguage()
     {
@@ -191,7 +179,6 @@ public function getConversionLanguage()
      * Get Google AdWords conversion format
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConversionFormat()
     {
@@ -205,7 +192,6 @@ public function getConversionFormat()
      * Get Google AdWords conversion color
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionColor()
     {
@@ -219,7 +205,6 @@ public function getConversionColor()
      * Get Google AdWords conversion label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionLabel()
     {
@@ -233,7 +218,6 @@ public function getConversionLabel()
      * Get Google AdWords conversion value type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionValueType()
     {
@@ -247,7 +231,6 @@ public function getConversionValueType()
      * Checks if conversion value is dynamic
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDynamicConversionValue()
     {
@@ -258,7 +241,6 @@ public function isDynamicConversionValue()
      * Get Google AdWords conversion value constant
      *
      * @return float
-     * @since 2.0.0
      */
     public function getConversionValueConstant()
     {
@@ -272,7 +254,6 @@ public function getConversionValueConstant()
      * Get Google AdWords conversion value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getConversionValue()
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php b/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
index bf005c800eea5..ac643369d5151 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
@@ -10,19 +10,16 @@
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractConversion extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Framework\Validator\DataObject
-     * @since 2.0.0
      */
     protected $_validatorComposite;
 
     /**
      * @var \Magento\GoogleAdwords\Model\Validator\Factory
-     * @since 2.0.0
      */
     protected $_validatorFactory;
 
@@ -36,7 +33,6 @@ abstract class AbstractConversion extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Backend/Color.php b/app/code/Magento/GoogleAdwords/Model/Config/Backend/Color.php
index db1998c4fd6ad..abe728f0f89c1 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Backend/Color.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Backend/Color.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Color extends \Magento\GoogleAdwords\Model\Config\Backend\AbstractConversion
 {
@@ -17,7 +16,6 @@ class Color extends \Magento\GoogleAdwords\Model\Config\Backend\AbstractConversi
      * Validation rule conversion color
      *
      * @return \Zend_Validate_Interface|null
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -32,7 +30,6 @@ protected function _getValidationRulesBeforeSave()
      * Get tested value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionColor()
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Backend/ConversionId.php b/app/code/Magento/GoogleAdwords/Model/Config/Backend/ConversionId.php
index 175b415a09e28..7115b2e2b4f4a 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Backend/ConversionId.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Backend/ConversionId.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ConversionId extends \Magento\GoogleAdwords\Model\Config\Backend\AbstractConversion
 {
@@ -17,7 +16,6 @@ class ConversionId extends \Magento\GoogleAdwords\Model\Config\Backend\AbstractC
      * Validation rule conversion id
      *
      * @return \Zend_Validate_Interface|null
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -32,7 +30,6 @@ protected function _getValidationRulesBeforeSave()
      * Get tested value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConversionId()
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php b/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php
index 4a4d552bd3649..e11e41067864c 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php
@@ -10,26 +10,22 @@
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
  * @api
- * @since 2.0.0
  */
 class Language implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\GoogleAdwords\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\GoogleAdwords\Model\Filter\UppercaseTitle
-     * @since 2.0.0
      */
     protected $_uppercaseFilter;
 
     /**
      * @param \Magento\GoogleAdwords\Helper\Data $helper
      * @param \Magento\GoogleAdwords\Model\Filter\UppercaseTitle $uppercaseFilter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GoogleAdwords\Helper\Data $helper,
@@ -43,7 +39,6 @@ public function __construct(
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php b/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php
index bfd7f223be789..51822a4b9f260 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ValueType implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,7 +16,6 @@ class ValueType implements \Magento\Framework\Option\ArrayInterface
      * Get conversation value type option
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Filter/UppercaseTitle.php b/app/code/Magento/GoogleAdwords/Model/Filter/UppercaseTitle.php
index f5e904a34026b..fd25bc9b7ddca 100644
--- a/app/code/Magento/GoogleAdwords/Model/Filter/UppercaseTitle.php
+++ b/app/code/Magento/GoogleAdwords/Model/Filter/UppercaseTitle.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UppercaseTitle implements \Zend_Filter_Interface
 {
@@ -18,7 +17,6 @@ class UppercaseTitle implements \Zend_Filter_Interface
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/app/code/Magento/GoogleAdwords/Model/Validator/Factory.php b/app/code/Magento/GoogleAdwords/Model/Validator/Factory.php
index 416b46273ec36..800bf89829ff4 100644
--- a/app/code/Magento/GoogleAdwords/Model/Validator/Factory.php
+++ b/app/code/Magento/GoogleAdwords/Model/Validator/Factory.php
@@ -14,19 +14,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var UniversalFactory
-     * @since 2.0.0
      */
     protected $_validatorBuilderFactory;
 
     /**
      * @param UniversalFactory $validatorBuilderFactory
-     * @since 2.0.0
      */
     public function __construct(UniversalFactory $validatorBuilderFactory)
     {
@@ -38,7 +35,6 @@ public function __construct(UniversalFactory $validatorBuilderFactory)
      *
      * @param string $currentColor
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function createColorValidator($currentColor)
     {
@@ -78,7 +74,6 @@ public function createColorValidator($currentColor)
      *
      * @param int|string $currentId
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function createConversionIdValidator($currentId)
     {
diff --git a/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php b/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
index 3afa6a9c9d72f..904827d9d5bc7 100644
--- a/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
+++ b/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\GoogleAdwords\Observer\SetConversionValueObserver
  *
- * @since 2.0.0
  */
 class SetConversionValueObserver implements ObserverInterface
 {
     /**
      * @var \Magento\GoogleAdwords\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -34,7 +31,6 @@ class SetConversionValueObserver implements ObserverInterface
      * @param \Magento\GoogleAdwords\Helper\Data $helper
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Model\ResourceModel\Order\Collection $collection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GoogleAdwords\Helper\Data $helper,
@@ -51,7 +47,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return \Magento\GoogleAdwords\Observer\SetConversionValueObserver
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index ec0e6974f74aa..78b36e7e14fe4 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -14,7 +14,6 @@
  * GoogleAnalytics Page Block
  *
  * @api
- * @since 2.0.0
  */
 class Ga extends \Magento\Framework\View\Element\Template
 {
@@ -22,13 +21,11 @@ class Ga extends \Magento\Framework\View\Element\Template
      * Google analytics data
      *
      * @var \Magento\GoogleAnalytics\Helper\Data
-     * @since 2.0.0
      */
     protected $_googleAnalyticsData = null;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_salesOrderCollection;
 
@@ -44,7 +41,6 @@ class Ga extends \Magento\Framework\View\Element\Template
      * @param \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
      * @param array $data
      * @param \Magento\Cookie\Helper\Cookie|null $cookieHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -75,7 +70,6 @@ public function getConfig($path)
      * Get a specific page name (may be customized via layout)
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPageName()
     {
@@ -91,7 +85,6 @@ public function getPageName()
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference#set
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference#gaObjectMethods
      * @deprecated 2.2.0 please use getPageTrackingData method
-     * @since 2.0.0
      */
     public function getPageTrackingCode($accountId)
     {
@@ -113,7 +106,6 @@ public function getPageTrackingCode($accountId)
      *
      * @return string|void
      * @deprecated 2.2.0 please use getOrdersTrackingData method
-     * @since 2.0.0
      */
     public function getOrdersTrackingCode()
     {
@@ -168,7 +160,6 @@ public function getOrdersTrackingCode()
      * Render GA tracking scripts
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 71b24ee7b1cd4..d35ce3b3adafe 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -12,7 +12,6 @@
  * GoogleAnalytics data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -30,7 +29,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isGoogleAnalyticsAvailable($store = null)
     {
diff --git a/app/code/Magento/GoogleAnalytics/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserver.php b/app/code/Magento/GoogleAnalytics/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserver.php
index e998b68356290..b8e91557a113e 100644
--- a/app/code/Magento/GoogleAnalytics/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserver.php
+++ b/app/code/Magento/GoogleAnalytics/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserver.php
@@ -11,7 +11,6 @@
 /**
  * Google Analytics module observer
  *
- * @since 2.0.0
  */
 class SetGoogleAnalyticsOnOrderSuccessPageViewObserver implements ObserverInterface
 {
@@ -19,19 +18,16 @@ class SetGoogleAnalyticsOnOrderSuccessPageViewObserver implements ObserverInterf
      * Google analytics data
      *
      * @var \Magento\GoogleAnalytics\Helper\Data
-     * @since 2.0.0
      */
     protected $_googleAnalyticsData = null;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -39,7 +35,6 @@ class SetGoogleAnalyticsOnOrderSuccessPageViewObserver implements ObserverInterf
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -56,7 +51,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/AbstractCode.php b/app/code/Magento/GoogleOptimizer/Block/AbstractCode.php
index e057620c8e84d..8627efa9a6733 100644
--- a/app/code/Magento/GoogleOptimizer/Block/AbstractCode.php
+++ b/app/code/Magento/GoogleOptimizer/Block/AbstractCode.php
@@ -10,31 +10,26 @@
 /**
  * Class \Magento\GoogleOptimizer\Block\AbstractCode
  *
- * @since 2.0.0
  */
 abstract class AbstractCode extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var Entity name in registry
-     * @since 2.0.0
      */
     protected $_registryName;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Magento\GoogleOptimizer\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\GoogleOptimizer\Helper\Code
-     * @since 2.0.0
      */
     protected $_codeHelper;
 
@@ -44,7 +39,6 @@ abstract class AbstractCode extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\GoogleOptimizer\Helper\Code $codeHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,7 +58,6 @@ public function __construct(
      *
      * @return \Magento\GoogleOptimizer\Model\Code
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _getGoogleExperiment()
     {
@@ -75,7 +68,6 @@ protected function _getGoogleExperiment()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -86,7 +78,6 @@ protected function _toHtml()
      * Return script code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getScriptCode()
     {
@@ -103,7 +94,6 @@ protected function _getScriptCode()
      *
      * @return mixed
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _getEntity()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/AbstractTab.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/AbstractTab.php
index dc80e3f3ed403..10cf148ddfabe 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/AbstractTab.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/AbstractTab.php
@@ -10,32 +10,27 @@
 /**
  * Class \Magento\GoogleOptimizer\Block\Adminhtml\AbstractTab
  *
- * @since 2.0.0
  */
 abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\GoogleOptimizer\Helper\Data
-     * @since 2.0.0
      */
     protected $_helperData;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Magento\GoogleOptimizer\Helper\Code
-     * @since 2.0.0
      */
     protected $_codeHelper;
 
     /**
      * @var \Magento\GoogleOptimizer\Helper\Form
-     * @since 2.0.0
      */
     protected $_formHelper;
 
@@ -47,7 +42,6 @@ abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form implements
      * @param \Magento\GoogleOptimizer\Helper\Form $formHelper
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Prepare form before rendering HTML
      *
      * @return \Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -83,7 +76,6 @@ protected function _prepareForm()
      * Get google experiment code model
      *
      * @return \Magento\GoogleOptimizer\Model\Code|null
-     * @since 2.0.0
      */
     protected function _getGoogleExperiment()
     {
@@ -98,7 +90,6 @@ protected function _getGoogleExperiment()
      * Get Entity model
      *
      * @return \Magento\Catalog\Model\AbstractModel
-     * @since 2.0.0
      */
     abstract protected function _getEntity();
 
@@ -106,7 +97,6 @@ abstract protected function _getEntity();
      * Can show tab in tabs
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -117,7 +107,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
index 72a2adeb0abf5..5a619e6093317 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GoogleOptimizer\Block\Adminhtml\Catalog\Product\Edit\Tab\Googleoptimizer
  *
- * @since 2.0.0
  */
 class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractTab
 {
@@ -19,7 +18,6 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
      *
      * @return \Magento\Catalog\Model\Product
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _getEntity()
     {
@@ -34,7 +32,6 @@ protected function _getEntity()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -45,7 +42,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
index 6cd20565cea3a..3b336cfce2b89 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
@@ -9,7 +9,6 @@
 
 /**
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractTab
 {
@@ -18,7 +17,6 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
      *
      * @return mixed
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _getEntity()
     {
@@ -33,7 +31,6 @@ protected function _getEntity()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -44,7 +41,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
index dedef8b556f5f..296795b32eb9b 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Category extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var string Entity name in registry
-     * @since 2.0.0
      */
     protected $_registryName = 'current_category';
 
@@ -26,7 +24,6 @@ class Category extends \Magento\GoogleOptimizer\Block\AbstractCode implements \M
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Page.php b/app/code/Magento/GoogleOptimizer/Block/Code/Page.php
index 9a7f01f7e8996..f575850aebc30 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Page.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Page.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Page extends \Magento\GoogleOptimizer\Block\AbstractCode
 {
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_page;
 
@@ -26,7 +24,6 @@ class Page extends \Magento\GoogleOptimizer\Block\AbstractCode
      * @param \Magento\GoogleOptimizer\Helper\Code $codeHelper
      * @param \Magento\Cms\Model\Page $page
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Get cms page entity
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected function _getEntity()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
index d78658b1c697e..d87193429c25f 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Product extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var Product name in registry
-     * @since 2.0.0
      */
     protected $_registryName = 'current_product';
 
@@ -26,7 +24,6 @@ class Product extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Ma
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Code.php b/app/code/Magento/GoogleOptimizer/Helper/Code.php
index 6d36f46448870..985c779414c2f 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Code.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Code.php
@@ -9,25 +9,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Code
 {
     /**
      * @var \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     protected $_codeModel;
 
     /**
      * @var \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     protected $_entity;
 
     /**
      * @param \Magento\GoogleOptimizer\Model\Code $code
-     * @since 2.0.0
      */
     public function __construct(\Magento\GoogleOptimizer\Model\Code $code)
     {
@@ -39,7 +35,6 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $code)
      *
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     public function getCodeObjectByEntity(\Magento\Framework\Model\AbstractModel $entity)
     {
@@ -60,7 +55,6 @@ public function getCodeObjectByEntity(\Magento\Framework\Model\AbstractModel $en
      *
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getEntityType()
     {
@@ -77,7 +71,6 @@ protected function _getEntityType()
      * Get Entity Type string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTypeString()
     {
@@ -101,7 +94,6 @@ protected function _getTypeString()
      *
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _checkEntityIsEmpty()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 0024d89cb3b16..41469e7a58127 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,20 +24,17 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_activeForCmsFlag;
 
     /**
      * @var \Magento\GoogleAnalytics\Helper\Data
-     * @since 2.0.0
      */
     protected $_analyticsHelper;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\GoogleAnalytics\Helper\Data $analyticsHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @param string $store
      * @return bool
-     * @since 2.0.0
      */
     public function isGoogleExperimentEnabled($store = null)
     {
@@ -65,7 +60,6 @@ public function isGoogleExperimentEnabled($store = null)
      *
      * @param string $store
      * @return bool
-     * @since 2.0.0
      */
     public function isGoogleExperimentActive($store = null)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Form.php b/app/code/Magento/GoogleOptimizer/Helper/Form.php
index eba987d5c6685..7b60947b6ae9f 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Form.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Form.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -23,7 +22,6 @@ class Form extends \Magento\Framework\App\Helper\AbstractHelper
      * @param ModelCode|null $experimentCodeModel
      * @param string $formName
      * @return void
-     * @since 2.0.0
      */
     public function addGoogleoptimizerFields(DataForm $form, ModelCode $experimentCodeModel = null, $formName = '')
     {
diff --git a/app/code/Magento/GoogleOptimizer/Model/Code.php b/app/code/Magento/GoogleOptimizer/Model/Code.php
index fa1ce389ecc34..972a4be32adc0 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Code.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Code.php
@@ -17,7 +17,6 @@
  * @method \Magento\GoogleOptimizer\Model\Code setExperimentScript(int $value)
  * @method string getExperimentScript()
  * @api
- * @since 2.0.0
  */
 class Code extends \Magento\Framework\Model\AbstractModel
 {
@@ -32,16 +31,12 @@ class Code extends \Magento\Framework\Model\AbstractModel
 
     /**#@-*/
 
-    /**
-     * @var bool
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_validateEntryFlag = false;
 
     /**
      * Model construct that should be used for object initialization
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -56,7 +51,6 @@ protected function _construct()
      * @param string $entityType One of self::CODE_ENTITY_TYPE_
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByEntityIdAndType($entityId, $entityType, $storeId = 0)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Model/ResourceModel/Code.php b/app/code/Magento/GoogleOptimizer/Model/ResourceModel/Code.php
index 6d586d8e2812d..204ec70a086af 100644
--- a/app/code/Magento/GoogleOptimizer/Model/ResourceModel/Code.php
+++ b/app/code/Magento/GoogleOptimizer/Model/ResourceModel/Code.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Code extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Code extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * @param string $entityType
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByEntityType($object, $entityId, $entityType, $storeId)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/AbstractSave.php b/app/code/Magento/GoogleOptimizer/Observer/AbstractSave.php
index 6adbdf422ee0b..6fd4ac988f836 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/AbstractSave.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/AbstractSave.php
@@ -12,31 +12,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractSave implements ObserverInterface
 {
     /**
      * @var \Magento\GoogleOptimizer\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     protected $_modelCode;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_params;
 
@@ -44,7 +39,6 @@ abstract class AbstractSave implements ObserverInterface
      * @param \Magento\GoogleOptimizer\Helper\Data $helper
      * @param \Magento\GoogleOptimizer\Model\Code $modelCode
      * @param \Magento\Framework\App\RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\GoogleOptimizer\Helper\Data $helper,
@@ -61,7 +55,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
@@ -79,7 +72,6 @@ public function execute(Observer $observer)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     abstract protected function _initEntity($observer);
 
@@ -87,7 +79,6 @@ abstract protected function _initEntity($observer);
      * Check is Google Experiment enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isGoogleExperimentActive()
     {
@@ -98,7 +89,6 @@ protected function _isGoogleExperimentActive()
      * Processes Save event of the entity
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _processCode()
     {
@@ -121,7 +111,6 @@ protected function _processCode()
      *
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _initRequestParams()
     {
@@ -135,7 +124,6 @@ protected function _initRequestParams()
      * Check is new model
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isNewCode()
     {
@@ -146,7 +134,6 @@ protected function _isNewCode()
      * Save code model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _saveCode()
     {
@@ -158,7 +145,6 @@ protected function _saveCode()
      * Get data for saving code model
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _getCodeData();
 
@@ -167,7 +153,6 @@ abstract protected function _getCodeData();
      *
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _loadCode()
     {
@@ -181,7 +166,6 @@ protected function _loadCode()
      * Is empty code
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isEmptyCode()
     {
@@ -193,7 +177,6 @@ protected function _isEmptyCode()
      *
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _deleteCode()
     {
@@ -202,7 +185,7 @@ protected function _deleteCode()
 
     /**
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private function isDataAvailable()
     {
@@ -212,7 +195,7 @@ private function isDataAvailable()
 
     /**
      * @return mixed
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private function getRequestData()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
index e9b67ef3dd693..d3d57f77e15aa 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\Category\DeleteCategoryGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class DeleteCategoryGoogleExperimentScriptObserver implements ObserverInterface
 {
     /**
      * @var \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     protected $_modelCode;
 
     /**
      * @param \Magento\GoogleOptimizer\Model\Code $modelCode
-     * @since 2.0.0
      */
     public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Category/SaveGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Category/SaveGoogleExperimentScriptObserver.php
index 8b48fd4e0310f..6b7ae1b267a29 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Category/SaveGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Category/SaveGoogleExperimentScriptObserver.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\Category\SaveGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observer\AbstractSave
 {
     /**
      * @var \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected $_category;
 
@@ -27,7 +25,6 @@ class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observ
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     protected function _initEntity($observer)
     {
@@ -38,7 +35,6 @@ protected function _initEntity($observer)
      * Check is Google Experiment enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isGoogleExperimentActive()
     {
@@ -49,7 +45,6 @@ protected function _isGoogleExperimentActive()
      * Get data for saving code model
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCodeData()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
index ef6f1c8caad21..7fc8ee5e5d23b 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\CmsPage\DeleteCmsGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class DeleteCmsGoogleExperimentScriptObserver implements ObserverInterface
 {
     /**
      * @var \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     protected $_modelCode;
 
     /**
      * @param \Magento\GoogleOptimizer\Model\Code $modelCode
-     * @since 2.0.0
      */
     public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/SaveGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/SaveGoogleExperimentScriptObserver.php
index da21ce66f8016..3c9b3198827f4 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/SaveGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/SaveGoogleExperimentScriptObserver.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\CmsPage\SaveGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observer\AbstractSave
 {
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_page;
 
@@ -27,7 +25,6 @@ class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observ
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     protected function _initEntity($observer)
     {
@@ -38,7 +35,6 @@ protected function _initEntity($observer)
      * Get data for saving code model
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCodeData()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
index 7b8a5ce44a43d..25cd30185f454 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\Product\DeleteProductGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class DeleteProductGoogleExperimentScriptObserver implements ObserverInterface
 {
     /**
      * @var \Magento\GoogleOptimizer\Model\Code
-     * @since 2.0.0
      */
     protected $_modelCode;
 
     /**
      * @param \Magento\GoogleOptimizer\Model\Code $modelCode
-     * @since 2.0.0
      */
     public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Product/SaveGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Product/SaveGoogleExperimentScriptObserver.php
index 51c8c3e8f6fbe..1a75c41304f08 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Product/SaveGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Product/SaveGoogleExperimentScriptObserver.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\GoogleOptimizer\Observer\Product\SaveGoogleExperimentScriptObserver
  *
- * @since 2.0.0
  */
 class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observer\AbstractSave
 {
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -27,7 +25,6 @@ class SaveGoogleExperimentScriptObserver extends \Magento\GoogleOptimizer\Observ
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     protected function _initEntity($observer)
     {
@@ -38,7 +35,6 @@ protected function _initEntity($observer)
      * Check is Google Experiment enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isGoogleExperimentActive()
     {
@@ -49,7 +45,6 @@ protected function _isGoogleExperimentActive()
      * Get data for saving code model
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCodeData()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
index a812c363d8383..44837316fed2d 100644
--- a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
+++ b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/GroupedImportExport/Model/Export/Product/Type/Grouped.php b/app/code/Magento/GroupedImportExport/Model/Export/Product/Type/Grouped.php
index 1608f76227c16..0004f07777252 100644
--- a/app/code/Magento/GroupedImportExport/Model/Export/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedImportExport/Model/Export/Product/Type/Grouped.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedImportExport\Model\Export\Product\Type\Grouped
  *
- * @since 2.0.0
  */
 class Grouped extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
 {
diff --git a/app/code/Magento/GroupedImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/GroupedImportExport/Model/Export/RowCustomizer.php
index 639c619872a02..bbca4b0fc40c8 100644
--- a/app/code/Magento/GroupedImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/GroupedImportExport/Model/Export/RowCustomizer.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedImportExport\Model\Export\RowCustomizer
  *
- * @since 2.0.0
  */
 class RowCustomizer implements RowCustomizerInterface
 {
@@ -21,7 +20,6 @@ class RowCustomizer implements RowCustomizerInterface
      * @param int $productIds
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareData($collection, $productIds)
     {
@@ -33,7 +31,6 @@ public function prepareData($collection, $productIds)
      *
      * @param array $columns
      * @return mixed
-     * @since 2.0.0
      */
     public function addHeaderColumns($columns)
     {
@@ -53,7 +50,6 @@ public function addHeaderColumns($columns)
      * @param int $productId
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addData($dataRow, $productId)
     {
@@ -67,7 +63,6 @@ public function addData($dataRow, $productId)
      * @param int $productId
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAdditionalRowsCount($additionalRowsCount, $productId)
     {
diff --git a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
index f358e405f0f9f..0b74bbadfe408 100644
--- a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\GroupedImportExport\Model\Import\Product\Type\Grouped
  *
- * @since 2.0.0
  */
 class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
@@ -26,13 +25,11 @@ class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abs
      * Column names that holds values with particular meaning.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_specialAttributes = ['_associated_sku', '_associated_default_qty', '_associated_position'];
 
     /**
      * @var Grouped\Links
-     * @since 2.0.0
      */
     protected $links;
 
@@ -50,7 +47,6 @@ class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abs
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param array $params
      * @param Grouped\Links $links
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
@@ -70,7 +66,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function saveData()
     {
diff --git a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped/Links.php b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped/Links.php
index b86e9193b5660..104e69f2f92e0 100644
--- a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped/Links.php
+++ b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped/Links.php
@@ -9,25 +9,21 @@
 
 /**
  * Processing db operations for import entity of grouped product type
- * @since 2.0.0
  */
 class Links
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Link
-     * @since 2.0.0
      */
     protected $productLink;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var \Magento\ImportExport\Model\ImportFactory
-     * @since 2.0.0
      */
     protected $importFactory;
 
@@ -35,13 +31,11 @@ class Links
      * Import model behavior
      *
      * @var string
-     * @since 2.0.0
      */
     protected $behavior;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $attributes;
 
@@ -49,7 +43,6 @@ class Links
      * @param \Magento\Catalog\Model\ResourceModel\Product\Link $productLink
      * @param ResourceConnection $resource
      * @param \Magento\ImportExport\Model\ImportFactory $importFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Link $productLink,
@@ -64,7 +57,6 @@ public function __construct(
     /**
      * @param array $linksData
      * @return void
-     * @since 2.0.0
      */
     public function saveLinksData($linksData)
     {
@@ -118,7 +110,6 @@ public function saveLinksData($linksData)
      * @param array $productIds
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function deleteOldLinks($productIds)
     {
@@ -135,7 +126,6 @@ protected function deleteOldLinks($productIds)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes()
     {
@@ -156,7 +146,6 @@ public function getAttributes()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function getLinkTypeId()
     {
@@ -167,7 +156,6 @@ protected function getLinkTypeId()
      * Retrieve model behavior
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getBehavior()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Adminhtml/Items/Column/Name/Grouped.php b/app/code/Magento/GroupedProduct/Block/Adminhtml/Items/Column/Name/Grouped.php
index 4521fe6cf8d2a..ed5314e2044b0 100644
--- a/app/code/Magento/GroupedProduct/Block/Adminhtml/Items/Column/Name/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Adminhtml/Items/Column/Name/Grouped.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grouped extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
 {
@@ -21,7 +20,6 @@ class Grouped extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
      * This method uses renderer for real product type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Adminhtml/Order/Create/Sidebar.php b/app/code/Magento/GroupedProduct/Block/Adminhtml/Order/Create/Sidebar.php
index e32395cc5183b..cfab71eebee7f 100644
--- a/app/code/Magento/GroupedProduct/Block/Adminhtml/Order/Create/Sidebar.php
+++ b/app/code/Magento/GroupedProduct/Block/Adminhtml/Order/Create/Sidebar.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\GroupedProduct\Block\Adminhtml\Order\Create\Sidebar
  *
- * @since 2.0.0
  */
 class Sidebar
 {
@@ -21,7 +20,6 @@ class Sidebar
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetItemQty(
         \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
@@ -43,7 +41,6 @@ public function aroundGetItemQty(
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsConfigurationRequired(
         \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
diff --git a/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php b/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
index 804686af5117a..e4fb6c8cbe8df 100644
--- a/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
@@ -13,13 +13,11 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Grouped extends \Magento\GroupedProduct\Block\Product\View\Type\Grouped
 {
     /**
      * @var \Magento\Framework\Pricing\Helper\Data
-     * @since 2.0.0
      */
     protected $pricingHelper;
 
@@ -28,7 +26,6 @@ class Grouped extends \Magento\GroupedProduct\Block\Product\View\Type\Grouped
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * Set current customer to tax calculation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +58,6 @@ protected function _construct()
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -84,7 +79,6 @@ public function getProduct()
      * Retrieve array of associated products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedProducts()
     {
@@ -103,7 +97,6 @@ public function getAssociatedProducts()
      * Set preconfigured values to grouped associated products
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setPreconfiguredValue()
     {
@@ -127,7 +120,6 @@ public function setPreconfiguredValue()
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanShowProductPrice($product)
     {
@@ -140,7 +132,6 @@ public function getCanShowProductPrice($product)
      * @return bool
      *
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsLastFieldset()
     {
@@ -157,7 +148,6 @@ public function getIsLastFieldset()
      *
      * @param float $price
      * @return float
-     * @since 2.0.0
      */
     public function getCurrencyPrice($price)
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index bbc1d096bba6c..108dd70d9f74e 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -13,7 +13,6 @@
  * Shopping cart item render block
  *
  * @api
- * @since 2.0.0
  */
 class Grouped extends Renderer implements IdentityInterface
 {
@@ -26,7 +25,6 @@ class Grouped extends Renderer implements IdentityInterface
      * Get item grouped product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getGroupedProduct()
     {
@@ -39,7 +37,6 @@ public function getGroupedProduct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductForThumbnail()
     {
@@ -64,7 +61,6 @@ public function getProductForThumbnail()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Order/Email/Items/Order/Grouped.php b/app/code/Magento/GroupedProduct/Block/Order/Email/Items/Order/Grouped.php
index 75a4453d2eab4..d5dff33121a95 100644
--- a/app/code/Magento/GroupedProduct/Block/Order/Email/Items/Order/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Order/Email/Items/Order/Grouped.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grouped extends \Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder
 {
@@ -19,7 +18,6 @@ class Grouped extends \Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder
      * This method uses renderer for real product type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Order/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Order/Item/Renderer/Grouped.php
index dd508a294d69c..f87b5ca3f9652 100644
--- a/app/code/Magento/GroupedProduct/Block/Order/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Order/Item/Renderer/Grouped.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grouped extends DefaultRenderer
 {
@@ -21,7 +20,6 @@ class Grouped extends DefaultRenderer
      * This method uses renderer for real product type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
index 2360ff74c7bba..120b8dbec273b 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AssociatedProducts extends \Magento\Backend\Block\Catalog\Product\Tab\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -25,7 +23,6 @@ protected function _construct()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -36,7 +33,6 @@ public function getTabLabel()
      * Get parent tab code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTab()
     {
@@ -47,7 +43,6 @@ public function getParentTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -56,7 +51,6 @@ public function isHidden()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 1f91206eeb681..7ad3bbc2adfec 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ListAssociatedProducts extends \Magento\Backend\Block\Template
 {
@@ -21,13 +20,11 @@ class ListAssociatedProducts extends \Magento\Backend\Block\Template
      * Registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -36,7 +33,6 @@ class ListAssociatedProducts extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Retrieve grouped products
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedProducts()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Product/View/Type/Grouped.php b/app/code/Magento/GroupedProduct/Block/Product/View/Type/Grouped.php
index a4a1a80d3d0f7..8b140c537db61 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/View/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/View/Type/Grouped.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grouped extends \Magento\Catalog\Block\Product\View\AbstractView
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedProducts()
     {
@@ -26,7 +24,6 @@ public function getAssociatedProducts()
      * Set preconfigured values to grouped associated products
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setPreconfiguredValue()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php b/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
index efaba1278ad5e..260963da9417c 100644
--- a/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
@@ -11,7 +11,6 @@
  * Product stock qty block for grouped product type
  *
  * @api
- * @since 2.0.0
  */
 class Grouped extends \Magento\CatalogInventory\Block\Stockqty\Composite implements IdentityInterface
 {
@@ -19,7 +18,6 @@ class Grouped extends \Magento\CatalogInventory\Block\Stockqty\Composite impleme
      * Retrieve child products
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getChildProducts()
     {
@@ -30,7 +28,6 @@ protected function _getChildProducts()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
index dd1492f0203ca..14ad6cfd687ac 100644
--- a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
+++ b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\GroupedProduct\Controller\Adminhtml\Edit\Popup
  *
- * @since 2.0.0
  */
 class Popup extends AbstractAction
 {
@@ -28,19 +27,16 @@ class Popup extends AbstractAction
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -49,7 +45,6 @@ class Popup extends AbstractAction
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ProductFactory $factory
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      * Get associated grouped products grid popup
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
index 4f05e0f00e9dd..fdb8db2e08735 100644
--- a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
+++ b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\GroupedProduct\CustomerData\GroupedItem
  *
- * @since 2.0.0
  */
 class GroupedItem extends DefaultItem
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -28,7 +26,6 @@ class GroupedItem extends DefaultItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Image $imageHelper,
@@ -50,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getProductForThumbnail()
     {
@@ -73,7 +69,6 @@ protected function getProductForThumbnail()
      * Get item grouped product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function getGroupedProduct()
     {
diff --git a/app/code/Magento/GroupedProduct/Helper/Product/Configuration/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Helper/Product/Configuration/Plugin/Grouped.php
index 8d7e079d15ae2..76b4eea952908 100644
--- a/app/code/Magento/GroupedProduct/Helper/Product/Configuration/Plugin/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Helper/Product/Configuration/Plugin/Grouped.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped
  *
- * @since 2.0.0
  */
 class Grouped
 {
@@ -21,7 +20,6 @@ class Grouped
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetOptions(
         \Magento\Catalog\Helper\Product\Configuration $subject,
diff --git a/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Creditmemo/Grouped.php b/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Creditmemo/Grouped.php
index 7a2375174f38f..02a219965012f 100644
--- a/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Creditmemo/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Creditmemo/Grouped.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Order\Pdf\Items\Creditmemo\Grouped
  *
- * @since 2.0.0
  */
 class Grouped extends \Magento\Sales\Model\Order\Pdf\Items\Creditmemo\DefaultCreditmemo
 {
@@ -18,7 +17,6 @@ class Grouped extends \Magento\Sales\Model\Order\Pdf\Items\Creditmemo\DefaultCre
      * Draw process
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Invoice/Grouped.php b/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Invoice/Grouped.php
index 3764963702005..4da7954229655 100644
--- a/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Invoice/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Order/Pdf/Items/Invoice/Grouped.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Order\Pdf\Items\Invoice\Grouped
  *
- * @since 2.0.0
  */
 class Grouped extends \Magento\Sales\Model\Order\Pdf\Items\Invoice\DefaultInvoice
 {
@@ -18,7 +17,6 @@ class Grouped extends \Magento\Sales\Model\Order\Pdf\Items\Invoice\DefaultInvoic
      * Draw process
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Cart/Configuration/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Cart/Configuration/Plugin/Grouped.php
index ecd420101c1e7..f702ae95d0dcc 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Cart/Configuration/Plugin/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Cart/Configuration/Plugin/Grouped.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\Cart\Configuration\Plugin\Grouped
  *
- * @since 2.0.0
  */
 class Grouped
 {
@@ -24,7 +23,6 @@ class Grouped
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsProductConfigured(
         \Magento\Catalog\Model\Product\CartConfiguration $subject,
diff --git a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
index 156f505594df8..c8659ec62f8c1 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
@@ -7,26 +7,22 @@
 
 /**
  * Price model for external catalogs
- * @since 2.0.0
  */
 class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\CatalogPrice
-     * @since 2.0.0
      */
     protected $commonPriceModel;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -39,7 +35,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCatalogPrice(
         \Magento\Catalog\Model\Product $product,
@@ -77,7 +72,6 @@ public function getCatalogPrice(
      * @param \Magento\Catalog\Model\Product $product
      * @return null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/CopyConstructor/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/CopyConstructor/Grouped.php
index 3c617b45ae13b..5be3bff05b752 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/CopyConstructor/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/CopyConstructor/Grouped.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\CopyConstructor\Grouped
  *
- * @since 2.0.0
  */
 class Grouped implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
@@ -17,7 +16,6 @@ class Grouped implements \Magento\Catalog\Model\Product\CopyConstructorInterface
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Collection
-     * @since 2.0.0
      */
     protected function _getGroupedLinkCollection(\Magento\Catalog\Model\Product $product)
     {
@@ -39,7 +37,6 @@ protected function _getGroupedLinkCollection(\Magento\Catalog\Model\Product $pro
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Catalog\Model\Product $duplicate
      * @return void
-     * @since 2.0.0
      */
     public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
index 81c24aa82a07d..6c87bd47a02a6 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Grouped
- * @since 2.0.0
  */
 class Grouped
 {
@@ -68,7 +67,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function beforeInitializeLinks(
         \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $subject,
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Link/CollectionProvider/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Link/CollectionProvider/Grouped.php
index 0509911614d10..31e43d2a5797d 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Link/CollectionProvider/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Link/CollectionProvider/Grouped.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped
  *
- * @since 2.0.0
  */
 class Grouped implements \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLinkedProducts(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Link/ProductEntity/Converter.php b/app/code/Magento/GroupedProduct/Model/Product/Link/ProductEntity/Converter.php
index d48210fd29cfb..fa031b7dcd7dd 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Link/ProductEntity/Converter.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Link/ProductEntity/Converter.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\Link\ProductEntity\Converter
  *
- * @since 2.0.0
  */
 class Converter implements ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index a03e2cff54310..16109f3c51ba0 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -12,7 +12,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
 {
@@ -22,7 +21,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Associated Products
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyAssociatedProducts = '_cache_instance_associated_products';
 
@@ -30,7 +28,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Associated Product Ids
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyAssociatedProductIds = '_cache_instance_associated_product_ids';
 
@@ -38,7 +35,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Status Filters
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_keyStatusFilters = '_cache_instance_status_filters';
 
@@ -46,7 +42,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is composite properties
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isComposite = true;
 
@@ -54,7 +49,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Product is possible to configure
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canConfigure = true;
 
@@ -62,7 +56,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Catalog product status
      *
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_catalogProductStatus;
 
@@ -70,7 +63,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -78,19 +70,16 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Catalog product link
      *
      * @var \Magento\GroupedProduct\Model\ResourceModel\Product\Link
-     * @since 2.0.0
      */
     protected $productLinks;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpData;
 
@@ -111,7 +100,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Msrp\Helper\Data $msrpData
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -153,7 +141,6 @@ public function __construct(
      * Return relation info about used products
      *
      * @return \Magento\Framework\DataObject Object with information data
-     * @since 2.0.0
      */
     public function getRelationInfo()
     {
@@ -181,7 +168,6 @@ public function getRelationInfo()
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $required = true)
     {
@@ -196,7 +182,6 @@ public function getChildrenIds($parentId, $required = true)
      *
      * @param int|array $childId
      * @return array
-     * @since 2.0.0
      */
     public function getParentIdsByChild($childId)
     {
@@ -211,7 +196,6 @@ public function getParentIdsByChild($childId)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedProducts($product)
     {
@@ -256,7 +240,6 @@ public function flushAssociatedProductsCache($product)
      * @param  int $status
      * @param  \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusFilter($status, $product)
     {
@@ -276,7 +259,6 @@ public function addStatusFilter($status, $product)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setSaleableStatus($product)
     {
@@ -289,7 +271,6 @@ public function setSaleableStatus($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getStatusFilters($product)
     {
@@ -307,7 +288,6 @@ public function getStatusFilters($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedProductIds($product)
     {
@@ -327,7 +307,6 @@ public function getAssociatedProductIds($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
-     * @since 2.0.0
      */
     public function getAssociatedProductCollection($product)
     {
@@ -347,7 +326,6 @@ public function getAssociatedProductCollection($product)
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $isStrictProcessMode
      * @return array|string
-     * @since 2.0.0
      */
     protected function getProductInfo(\Magento\Framework\DataObject $buyRequest, $product, $isStrictProcessMode)
     {
@@ -379,7 +357,6 @@ protected function getProductInfo(\Magento\Framework\DataObject $buyRequest, $pr
      * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -449,7 +426,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getProductsToPurchaseByReqGroups($product)
     {
@@ -463,7 +439,6 @@ public function getProductsToPurchaseByReqGroups($product)
      * @param  \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processBuyRequest($product, $buyRequest)
     {
@@ -479,7 +454,6 @@ public function processBuyRequest($product, $buyRequest)
      * Check that product of this type has weight
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasWeight()
     {
@@ -492,7 +466,6 @@ public function hasWeight()
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
@@ -500,7 +473,6 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function beforeSave($product)
     {
@@ -515,7 +487,6 @@ public function beforeSave($product)
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return int
-     * @since 2.0.0
      */
     public function getChildrenMsrp(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Backend.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Backend.php
index e442d8ad0f383..cde0db21847db 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Backend.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Backend.php
@@ -7,7 +7,6 @@
 
 /**
  * Grouped product type implementation for backend
- * @since 2.0.0
  */
 class Backend extends \Magento\GroupedProduct\Model\Product\Type\Grouped
 {
@@ -16,7 +15,6 @@ class Backend extends \Magento\GroupedProduct\Model\Product\Type\Grouped
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\GroupedProduct\Model\Product\Type\Grouped
-     * @since 2.0.0
      */
     public function setSaleableStatus($product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
index 940da1ce5aaf7..f21df8e00efa7 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\Type\Grouped\Price
  *
- * @since 2.0.0
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
@@ -20,7 +19,6 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param   float $qty
      * @param   \Magento\Catalog\Model\Product $product
      * @return  float
-     * @since 2.0.0
      */
     public function getFinalPrice($qty, $product)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
index 95be3e69afc2f..f551093fe397b 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\GroupedProduct\Model\Product\Type\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -38,7 +35,6 @@ public function __construct(Manager $moduleManager)
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetOptionArray(\Magento\Catalog\Model\Product\Type $subject, array $result)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
index dbc2cac26c116..5f00c099eac01 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
@@ -18,7 +18,6 @@
  * Stock indexer for grouped product.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Grouped extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
@@ -58,7 +57,6 @@ public function __construct(
      * @param int|array $entityIds
      * @param bool $usePrimaryTable use primary or temporary index table
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
index c371f6f180ecc..2cd1b12a33c0d 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\Grouped
  *
- * @since 2.0.0
  */
 class Grouped extends DefaultPrice implements GroupedInterface
 {
@@ -37,7 +36,6 @@ protected function reindex($entityIds = null)
      *
      * @param int|array $entityIds  the parent entity ids limitation
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareGroupedProductPriceData($entityIds = null)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedInterface.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedInterface.php
index ce23e6c9bc018..ed8ac170424fc 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedInterface.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 interface GroupedInterface
 {
@@ -15,7 +15,7 @@ interface GroupedInterface
      * Reindex for all products
      *
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function reindexAll();
 
@@ -24,7 +24,7 @@ public function reindexAll();
      *
      * @param int|array $entityIds
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function reindexEntity($entityIds);
 }
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Link.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Link.php
index 6066456ec6aea..55c88b976e1dc 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Link.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Link.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Catalog\Model\ResourceModel\Product\Link
 {
@@ -54,7 +53,6 @@ public function __construct(
      * @param int $parentId
      * @param int $typeId
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenIds($parentId, $typeId)
     {
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
index 38e95195ca915..8d1548036cd3e 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -9,7 +9,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection
 {
@@ -17,7 +16,6 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
      * Product types config
      *
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -56,7 +53,6 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -112,7 +108,6 @@ public function __construct(
      * Retrieve currently edited product model
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _getProduct()
     {
@@ -121,7 +116,6 @@ protected function _getProduct()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function _initSelect()
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php b/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
index 5eba3bdf91ff2..b2bf16a7c95f0 100644
--- a/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
+++ b/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\GroupedProduct\Model\Sales\AdminOrder\Product\Quote\Plugin\Initializer
  *
- * @since 2.0.0
  */
 class Initializer
 {
diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
index f8aad54f67121..2cfdcb7ab91c2 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\GroupedProduct\Pricing\Price\ConfiguredPrice
  *
- * @since 2.0.0
  */
 class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterface
 {
@@ -26,14 +25,12 @@ class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterf
 
     /**
      * @var null|ItemInterface
-     * @since 2.0.0
      */
     protected $item;
 
     /**
      * @param ItemInterface $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(ItemInterface $item)
     {
@@ -45,7 +42,6 @@ public function setItem(ItemInterface $item)
      * Calculate configured price
      *
      * @return float
-     * @since 2.0.0
      */
     protected function calculatePrice()
     {
@@ -76,7 +72,6 @@ protected function calculatePrice()
      * Price value of product with configured options
      *
      * @return bool|float
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
index 43bee0b265f1b..0ad0ae89fc4da 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
@@ -11,7 +11,6 @@
 
 /**
  * Final price model
- * @since 2.0.0
  */
 class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements FinalPriceInterface
 {
@@ -22,7 +21,6 @@ class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements Fi
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $minProduct;
 
@@ -30,7 +28,6 @@ class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements Fi
      * Return minimal product price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -44,7 +41,6 @@ public function getValue()
      * Returns product with minimal price
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getMinProduct()
     {
diff --git a/app/code/Magento/GroupedProduct/Setup/InstallData.php b/app/code/Magento/GroupedProduct/Setup/InstallData.php
index 89c292c0653bc..f58cd65785420 100644
--- a/app/code/Magento/GroupedProduct/Setup/InstallData.php
+++ b/app/code/Magento/GroupedProduct/Setup/InstallData.php
@@ -15,19 +15,16 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
     /**
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -36,7 +33,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
index 37e76cd4c61bb..4cb7275bafe1b 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +35,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
index 16c737dd103fd..2b74bc8ff21f2 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\ImportExport\Block\Adminhtml\Export\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\ImportExport\Model\Source\Export\EntityFactory
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @var \Magento\ImportExport\Model\Source\Export\FormatFactory
-     * @since 2.0.0
      */
     protected $_formatFactory;
 
@@ -37,7 +34,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\ImportExport\Model\Source\Export\EntityFactory $entityFactory
      * @param \Magento\ImportExport\Model\Source\Export\FormatFactory $formatFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Prepare form before rendering HTML.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index efc3363a1b865..264ac7849ed0e 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -21,7 +20,6 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
      * Helper object.
      *
      * @var \Magento\Framework\App\Helper\AbstractHelper
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -29,7 +27,6 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
      * Import export data
      *
      * @var \Magento\ImportExport\Helper\Data
-     * @since 2.0.0
      */
     protected $_importExportData = null;
 
@@ -37,7 +34,6 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
      * Local filters types base on attribute code
      *
      * @var \Magento\ImportExport\Helper\Data
-     * @since 2.0.0
      */
     protected $_filterTypeByAttrCode = [
         'updated_at' => \Magento\ImportExport\Model\Export::FILTER_TYPE_DATE,
@@ -48,7 +44,6 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Set grid parameters.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -87,7 +81,6 @@ protected function _construct()
      * @param Attribute $attribute
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getDateFromToHtmlWithValue(Attribute $attribute, $value)
     {
@@ -124,7 +117,6 @@ protected function _getDateFromToHtmlWithValue(Attribute $attribute, $value)
      * @param Attribute $attribute
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getInputHtmlWithValue(Attribute $attribute, $value)
     {
@@ -143,7 +135,6 @@ protected function _getInputHtmlWithValue(Attribute $attribute, $value)
      * @param Attribute $attribute
      * @param mixed $value
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
     {
@@ -184,7 +175,6 @@ protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
      * @param Attribute $attribute
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getNumberFromToHtmlWithValue(Attribute $attribute, $value)
     {
@@ -239,7 +229,6 @@ protected function getFromAttributePrefix(Attribute $attribute)
      * @param mixed $value
      * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
     {
@@ -282,7 +271,6 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
      * Add columns to grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -355,7 +343,6 @@ protected function _prepareColumns()
      * @param boolean $isExport
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function decorateFilter($value, Attribute $row, \Magento\Framework\DataObject $column, $isExport)
     {
@@ -396,7 +383,6 @@ public function decorateFilter($value, Attribute $row, \Magento\Framework\DataOb
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getFilterElementId($attributeCode)
     {
@@ -408,7 +394,6 @@ public function getFilterElementId($attributeCode)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getFilterElementName($attributeCode)
     {
@@ -422,7 +407,6 @@ public function getFilterElementName($attributeCode)
      * @return string|false
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -434,7 +418,6 @@ public function getRowUrl($row)
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function prepareCollection(\Magento\Framework\Data\Collection $collection)
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Form/After.php b/app/code/Magento/ImportExport/Block/Adminhtml/Form/After.php
index bdfed5c51b606..de58133c1633e 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Form/After.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Form/After.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class After extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
@@ -25,7 +23,6 @@ class After extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Get current operation
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getOperation()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 9073688b00f38..81fa9767fbaa4 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -9,7 +9,6 @@
 
 /**
  * Backup grid item renderer
- * @since 2.0.0
  */
 class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -18,7 +17,6 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      *
      * @param \Magento\Framework\DataObject $row
      * @return mixed
-     * @since 2.0.0
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
index 026a8ecf3db41..527bc5025d139 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -9,7 +9,6 @@
 
 /**
  * Backup grid item renderer
- * @since 2.0.0
  */
 class Error extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -18,7 +17,6 @@ class Error extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      *
      * @param \Magento\Framework\DataObject $row
      * @return mixed
-     * @since 2.0.0
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/History.php b/app/code/Magento/ImportExport/Block/Adminhtml/History.php
index e1b71e7dba9cb..9e124d16b464c 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/History.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/History.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class History extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class History extends \Magento\Backend\Block\Widget\Grid\Container
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
index 1ab32b95ef40f..afe618a5974ae 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -43,7 +41,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php
index d6d2f8c4b5e57..eeb2c5ac4be6e 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Before extends \Magento\Backend\Block\Template
 {
@@ -21,13 +20,11 @@ class Before extends \Magento\Backend\Block\Template
      * Basic import model
      *
      * @var \Magento\ImportExport\Model\Import
-     * @since 2.0.0
      */
     protected $_importModel;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -36,7 +33,6 @@ class Before extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\ImportExport\Model\Import $importModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Returns json-encoded entity behaviors array
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityBehaviors()
     {
@@ -68,7 +63,6 @@ public function getEntityBehaviors()
      * Returns json-encoded entity behaviors notes array
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityBehaviorsNotes()
     {
@@ -83,7 +77,6 @@ public function getEntityBehaviorsNotes()
      * Return json-encoded list of existing behaviors
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUniqueBehaviors()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 2c330fa181698..822795abb0b44 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -12,7 +12,6 @@
  * Import edit form block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -20,19 +19,16 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Basic import model
      *
      * @var \Magento\ImportExport\Model\Import
-     * @since 2.0.0
      */
     protected $_importModel;
 
     /**
      * @var \Magento\ImportExport\Model\Source\Import\EntityFactory
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @var \Magento\ImportExport\Model\Source\Import\Behavior\Factory
-     * @since 2.0.0
      */
     protected $_behaviorFactory;
 
@@ -44,7 +40,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\ImportExport\Model\Source\Import\EntityFactory $entityFactory
      * @param \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -66,7 +61,6 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -234,7 +228,6 @@ protected function _prepareForm()
      * Get download sample file html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDownloadSampleFileHtml()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index c849b1460087f..c1f509318fe66 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -11,7 +11,6 @@
  * Import frame result block.
  *
  * @api
- * @since 2.0.0
  */
 class Result extends \Magento\Backend\Block\Template
 {
@@ -26,7 +25,6 @@ class Result extends \Magento\Backend\Block\Template
      *     'addClassName'    add specified class name to element
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_actions = [
         'clear' => [],
@@ -42,13 +40,11 @@ class Result extends \Magento\Backend\Block\Template
      * Validation messages.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = ['error' => [], 'success' => [], 'notice' => []];
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -56,7 +52,6 @@ class Result extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -74,7 +69,6 @@ public function __construct(
      * @param string $elementId
      * @param mixed $value OPTIONAL
      * @return $this
-     * @since 2.0.0
      */
     public function addAction($actionName, $elementId, $value = null)
     {
@@ -99,7 +93,6 @@ public function addAction($actionName, $elementId, $value = null)
      *
      * @param string $message Error message
      * @return $this
-     * @since 2.0.0
      */
     public function addError($message)
     {
@@ -119,7 +112,6 @@ public function addError($message)
      * @param string[]|string $message Message text
      * @param bool $appendImportButton OPTIONAL Append import button to message?
      * @return $this
-     * @since 2.0.0
      */
     public function addNotice($message, $appendImportButton = false)
     {
@@ -139,7 +131,6 @@ public function addNotice($message, $appendImportButton = false)
      * @param string[]|string $message Message text
      * @param bool $appendImportButton OPTIONAL Append import button to message?
      * @return $this
-     * @since 2.0.0
      */
     public function addSuccess($message, $appendImportButton = false)
     {
@@ -157,7 +148,6 @@ public function addSuccess($message, $appendImportButton = false)
      * Import button HTML for append to message.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImportButtonHtml()
     {
@@ -176,7 +166,6 @@ public function getImportButtonHtml()
      * Import start action URL.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImportStartUrl()
     {
@@ -187,7 +176,6 @@ public function getImportStartUrl()
      * Messages getter.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -198,7 +186,6 @@ public function getMessages()
      * Messages rendered HTML getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMessagesHtml()
     {
@@ -219,7 +206,6 @@ public function getMessagesHtml()
      * Return response as JSON.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResponseJson()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
index 98b1d3c39c6a6..71ed437426226 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
@@ -9,7 +9,6 @@
 
 /**
  * Export controller
- * @since 2.0.0
  */
 abstract class Export extends Action
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index ba63a4ca55a98..1649e8ae86830 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Export\Export
  *
- * @since 2.0.0
  */
 class Export extends ExportController
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -36,7 +34,6 @@ class Export extends ExportController
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Session\SessionManagerInterface $sessionManager [optional]
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Load data with filter applying and create file for download.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
index 7bd367c2307f9..6c102b0b9d671 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Export\GetFilter
  *
- * @since 2.0.0
  */
 class GetFilter extends ExportController
 {
@@ -19,7 +18,6 @@ class GetFilter extends ExportController
      * Get grid-filter of entity attributes action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
index a9fea8a94165d..8ccc8e67cec63 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Export\Index
  *
- * @since 2.0.0
  */
 class Index extends ExportController
 {
@@ -19,7 +18,6 @@ class Index extends ExportController
      * Index action.
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History.php
index 249cf985d3719..3b28d9477d743 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/History.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History.php
@@ -9,7 +9,6 @@
 
 /**
  * History controller
- * @since 2.0.0
  */
 abstract class History extends Action
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
index 7684855bfad35..82bb1f28db1c3 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\History\Download
  *
- * @since 2.0.0
  */
 class Download extends \Magento\ImportExport\Controller\Adminhtml\History
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -25,7 +23,6 @@ class Download extends \Magento\ImportExport\Controller\Adminhtml\History
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Download backup action
      *
      * @return void|\Magento\Backend\App\Action
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
index d606512169126..20ac7e381ef26 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\History\Index
  *
- * @since 2.0.0
  */
 class Index extends HistoryController
 {
@@ -19,7 +18,6 @@ class Index extends HistoryController
      * Index action.
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
index 721e28219fc04..bd08b215f7c51 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
@@ -11,7 +11,6 @@
 
 /**
  * Import controller
- * @since 2.0.0
  */
 abstract class Import extends Action
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 563af22bdbee7..33dbba8320051 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -11,7 +11,6 @@
 
 /**
  * Download sample file controller
- * @since 2.0.0
  */
 class Download extends ImportController
 {
@@ -19,25 +18,21 @@ class Download extends ImportController
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
     /**
      * @var \Magento\Framework\Component\ComponentRegistrar
-     * @since 2.0.0
      */
     protected $componentRegistrar;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -49,7 +44,6 @@ class Download extends ImportController
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param ComponentRegistrar $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Download sample file action
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
index 545955f002b54..f5c1591ded217 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Import\Index
  *
- * @since 2.0.0
  */
 class Index extends ImportController
 {
@@ -19,7 +18,6 @@ class Index extends ImportController
      * Index action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index b64022d7838be..4b9cee66761d4 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Import\Start
  *
- * @since 2.0.0
  */
 class Start extends ImportResultController
 {
     /**
      * @var \Magento\ImportExport\Model\Import
-     * @since 2.0.0
      */
     protected $importModel;
 
@@ -34,7 +32,6 @@ class Start extends ImportResultController
      * @param \Magento\ImportExport\Helper\Report $reportHelper
      * @param \Magento\ImportExport\Model\Import $importModel
      * @param \Magento\Framework\Message\ExceptionMessageFactoryInterface $exceptionMessageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Start import process action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index 8088f96f4ed73..cca5e40f6bcea 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\ImportExport\Controller\Adminhtml\Import\Validate
  *
- * @since 2.0.0
  */
 class Validate extends ImportResultController
 {
@@ -30,7 +29,6 @@ class Validate extends ImportResultController
      * Validate uploaded files action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
index 78c95d19935fb..47210dd9805e5 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
@@ -12,7 +12,6 @@
 
 /**
  * Import controller
- * @since 2.0.0
  */
 abstract class ImportResult extends Import
 {
@@ -25,19 +24,16 @@ abstract class ImportResult extends Import
 
     /**
      * @var \Magento\ImportExport\Model\Report\ReportProcessorInterface
-     * @since 2.0.0
      */
     protected $reportProcessor;
 
     /**
      * @var \Magento\ImportExport\Model\History
-     * @since 2.0.0
      */
     protected $historyModel;
 
     /**
      * @var \Magento\ImportExport\Helper\Report
-     * @since 2.0.0
      */
     protected $reportHelper;
 
@@ -46,7 +42,6 @@ abstract class ImportResult extends Import
      * @param \Magento\ImportExport\Model\Report\ReportProcessorInterface $reportProcessor
      * @param \Magento\ImportExport\Model\History $historyModel
      * @param \Magento\ImportExport\Helper\Report $reportHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * @param \Magento\Framework\View\Element\AbstractBlock $resultBlock
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return $this
-     * @since 2.0.0
      */
     protected function addErrorMessages(
         \Magento\Framework\View\Element\AbstractBlock $resultBlock,
@@ -109,7 +103,6 @@ protected function addErrorMessages(
     /**
      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface $errorAggregator
      * @return array
-     * @since 2.0.0
      */
     protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAggregator)
     {
@@ -124,7 +117,6 @@ protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAgg
     /**
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[]
-     * @since 2.0.0
      */
     protected function getSystemExceptions(ProcessingErrorAggregatorInterface $errorAggregator)
     {
@@ -134,7 +126,6 @@ protected function getSystemExceptions(ProcessingErrorAggregatorInterface $error
     /**
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
-     * @since 2.0.0
      */
     protected function createErrorReport(ProcessingErrorAggregatorInterface $errorAggregator)
     {
@@ -152,7 +143,6 @@ protected function createErrorReport(ProcessingErrorAggregatorInterface $errorAg
     /**
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     protected function createDownloadUrlImportHistoryFile($fileName)
     {
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index 472f5afaa6553..32df84dc78037 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -12,7 +12,6 @@
  * ImportExport data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,16 +24,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\File\Size
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_fileSize;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\File\Size $fileSize
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -50,7 +45,6 @@ public function __construct(
      * Get maximum upload size message
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getMaxUploadSizeMessage()
     {
@@ -67,7 +61,6 @@ public function getMaxUploadSizeMessage()
      * Get valid path masks to files for importing/exporting
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getLocalValidPaths()
     {
@@ -79,7 +72,6 @@ public function getLocalValidPaths()
      * Retrieve size of bunch (how many entities should be involved in one import iteration)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getBunchSize()
     {
diff --git a/app/code/Magento/ImportExport/Helper/Report.php b/app/code/Magento/ImportExport/Helper/Report.php
index 5bd6c69fb1be7..d6cb5084b8acb 100644
--- a/app/code/Magento/ImportExport/Helper/Report.php
+++ b/app/code/Magento/ImportExport/Helper/Report.php
@@ -14,19 +14,16 @@
  * ImportExport history reports helper
  *
  * @api
- * @since 2.0.0
  */
 class Report extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Timezone
-     * @since 2.0.0
      */
     protected $timeZone;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $varDirectory;
 
@@ -36,7 +33,6 @@ class Report extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Timezone $timeZone
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @param string $time
      * @return string
-     * @since 2.0.0
      */
     public function getExecutionTime($time)
     {
@@ -67,7 +62,6 @@ public function getExecutionTime($time)
      *
      * @param \Magento\ImportExport\Model\Import $import
      * @return string
-     * @since 2.0.0
      */
     public function getSummaryStats(\Magento\ImportExport\Model\Import $import)
     {
@@ -85,7 +79,6 @@ public function getSummaryStats(\Magento\ImportExport\Model\Import $import)
      *
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     public function importFileExists($filename)
     {
@@ -97,7 +90,6 @@ public function importFileExists($filename)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     public function getReportOutput($filename)
     {
@@ -107,7 +99,6 @@ public function getReportOutput($filename)
     /**
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     public function getReportAbsolutePath($fileName)
     {
@@ -119,7 +110,6 @@ public function getReportAbsolutePath($fileName)
      *
      * @param string $filename
      * @return int|mixed
-     * @since 2.0.0
      */
     public function getReportSize($filename)
     {
@@ -131,7 +121,6 @@ public function getReportSize($filename)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     protected function getFilePath($filename)
     {
diff --git a/app/code/Magento/ImportExport/Model/AbstractModel.php b/app/code/Magento/ImportExport/Model/AbstractModel.php
index 71225ee2bfde3..07a766887c779 100644
--- a/app/code/Magento/ImportExport/Model/AbstractModel.php
+++ b/app/code/Magento/ImportExport/Model/AbstractModel.php
@@ -11,7 +11,6 @@
  * Operation abstract class
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractModel extends \Magento\Framework\DataObject
 {
@@ -19,7 +18,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Enable loging
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_debugMode = false;
 
@@ -27,7 +25,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Fields that should be replaced in debug with '***'
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = [];
 
@@ -35,19 +32,16 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Contains all log information
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_logTrace = [];
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_varDirectory;
 
@@ -55,7 +49,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -73,7 +66,6 @@ public function __construct(
      *
      * @param mixed $debugData
      * @return $this
-     * @since 2.0.0
      */
     public function addLogComment($debugData)
     {
@@ -94,7 +86,6 @@ public function addLogComment($debugData)
      * Return human readable debug trace.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormatedLogTrace()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index a3df9c573c4c9..488fd2ffd8075 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -14,7 +14,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Export extends \Magento\ImportExport\Model\AbstractModel
 {
@@ -42,7 +41,6 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
      * Entity adapter.
      *
      * @var \Magento\ImportExport\Model\Export\Entity\AbstractEntity
-     * @since 2.0.0
      */
     protected $_entityAdapter;
 
@@ -50,25 +48,21 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
      * Writer object instance.
      *
      * @var \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     protected $_writer;
 
     /**
      * @var \Magento\ImportExport\Model\Export\ConfigInterface
-     * @since 2.0.0
      */
     protected $_exportConfig;
 
     /**
      * @var \Magento\ImportExport\Model\Export\Entity\Factory
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @var \Magento\ImportExport\Model\Export\Adapter\Factory
-     * @since 2.0.0
      */
     protected $_exportAdapterFac;
 
@@ -79,7 +73,6 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
      * @param \Magento\ImportExport\Model\Export\Entity\Factory $entityFactory
      * @param \Magento\ImportExport\Model\Export\Adapter\Factory $exportAdapterFac
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -100,7 +93,6 @@ public function __construct(
      *
      * @return \Magento\ImportExport\Model\Export\Entity\AbstractEntity|\Magento\ImportExport\Model\Export\AbstractEntity
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getEntityAdapter()
     {
@@ -145,7 +137,6 @@ protected function _getEntityAdapter()
      *
      * @return \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getWriter()
     {
@@ -180,7 +171,6 @@ protected function _getWriter()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function export()
     {
@@ -205,7 +195,6 @@ public function export()
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
@@ -219,7 +208,6 @@ public function filterAttributeCollection(\Magento\Framework\Data\Collection $co
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -246,7 +234,6 @@ public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribut
      * @static
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -277,7 +264,6 @@ public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\At
      * MIME-type for 'Content-Type' header.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -289,7 +275,6 @@ public function getContentType()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -303,7 +288,6 @@ public function getEntity()
      * Entity attributes collection getter.
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getEntityAttributeCollection()
     {
@@ -315,7 +299,6 @@ public function getEntityAttributeCollection()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getFileFormat()
     {
@@ -329,7 +312,6 @@ public function getFileFormat()
      * Return file name for downloading.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileName()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index dd7b36e8a0a89..5c9b84ae83c42 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -15,7 +15,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 abstract class AbstractEntity
 {
@@ -33,19 +32,13 @@ abstract class AbstractEntity
 
     /**#@-*/
 
-    /**
-     * Store manager
-     *
-     * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_storeManager;
 
     /**
      * Error codes with arrays of corresponding row numbers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -53,7 +46,6 @@ abstract class AbstractEntity
      * Error counter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_errorsCount = 0;
 
@@ -61,7 +53,6 @@ abstract class AbstractEntity
      * Limit of errors after which pre-processing will exit
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_errorsLimit = 100;
 
@@ -69,7 +60,6 @@ abstract class AbstractEntity
      * Validation information about processed rows
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_invalidRows = [];
 
@@ -77,7 +67,6 @@ abstract class AbstractEntity
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [];
 
@@ -85,7 +74,6 @@ abstract class AbstractEntity
      * Parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameters = [];
 
@@ -93,7 +81,6 @@ abstract class AbstractEntity
      * Number of entities processed by validation
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedEntitiesCount = 0;
 
@@ -101,7 +88,6 @@ abstract class AbstractEntity
      * Number of rows processed by validation
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedRowsCount = 0;
 
@@ -109,7 +95,6 @@ abstract class AbstractEntity
      * Source model
      *
      * @var AbstractAdapter
-     * @since 2.0.0
      */
     protected $_writer;
 
@@ -117,7 +102,6 @@ abstract class AbstractEntity
      * Array of pairs store ID to its code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIdToCode = [];
 
@@ -125,7 +109,6 @@ abstract class AbstractEntity
      * Website ID-to-code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websiteIdToCode = [];
 
@@ -133,7 +116,6 @@ abstract class AbstractEntity
      * Disabled attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_disabledAttributes = [];
 
@@ -141,7 +123,6 @@ abstract class AbstractEntity
      * Export file name
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_fileName = null;
 
@@ -149,7 +130,6 @@ abstract class AbstractEntity
      * Address attributes collection
      *
      * @var \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected $_attributeCollection;
 
@@ -157,7 +137,6 @@ abstract class AbstractEntity
      * Number of items to fetch from db in one query
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pageSize;
 
@@ -165,7 +144,6 @@ abstract class AbstractEntity
      * Collection by pages iterator
      *
      * @var \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator
-     * @since 2.0.0
      */
     protected $_byPagesIterator;
 
@@ -173,7 +151,6 @@ abstract class AbstractEntity
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -181,7 +158,6 @@ abstract class AbstractEntity
      * Attribute code to its values. Only attributes with options and only default store values used
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeCodes = null;
 
@@ -189,7 +165,6 @@ abstract class AbstractEntity
      * Permanent entity columns
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [];
 
@@ -200,7 +175,6 @@ abstract class AbstractEntity
      * @param \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory $resourceColFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -231,7 +205,6 @@ public function __construct(
      * Initialize stores hash
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initStores()
     {
@@ -250,7 +223,6 @@ protected function _initStores()
      *
      * @param bool $withDefault
      * @return $this
-     * @since 2.0.0
      */
     protected function _initWebsites($withDefault = false)
     {
@@ -267,7 +239,6 @@ protected function _initWebsites($withDefault = false)
      * @param string $errorCode Error code or simply column name
      * @param int $errorRowNum Row number
      * @return $this
-     * @since 2.0.0
      */
     public function addRowError($errorCode, $errorRowNum)
     {
@@ -286,7 +257,6 @@ public function addRowError($errorCode, $errorRowNum)
      * @param string $errorCode Error code
      * @param string $message Message template
      * @return $this
-     * @since 2.0.0
      */
     public function addMessageTemplate($errorCode, $message)
     {
@@ -300,7 +270,6 @@ public function addMessageTemplate($errorCode, $message)
      *
      * @param string $errorCode
      * @return null|string
-     * @since 2.0.0
      */
     public function retrieveMessageTemplate($errorCode)
     {
@@ -314,7 +283,6 @@ public function retrieveMessageTemplate($errorCode)
      * Export process
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function export();
 
@@ -323,7 +291,6 @@ abstract public function export();
      *
      * @param \Magento\Framework\Model\AbstractModel $item
      * @return void
-     * @since 2.0.0
      */
     abstract public function exportItem($item);
 
@@ -332,7 +299,6 @@ abstract public function exportItem($item);
      *
      * @param \Magento\Framework\Data\Collection\AbstractDb $collection
      * @return void
-     * @since 2.0.0
      */
     protected function _exportCollectionByPages(\Magento\Framework\Data\Collection\AbstractDb $collection)
     {
@@ -343,7 +309,6 @@ protected function _exportCollectionByPages(\Magento\Framework\Data\Collection\A
      * Get attributes codes which are appropriate for export
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getExportAttributeCodes()
     {
@@ -377,7 +342,6 @@ protected function _getExportAttributeCodes()
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract public function getEntityTypeCode();
 
@@ -385,7 +349,6 @@ abstract public function getEntityTypeCode();
      * Get header columns
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _getHeaderColumns();
 
@@ -393,7 +356,6 @@ abstract protected function _getHeaderColumns();
      * Get entity collection
      *
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     abstract protected function _getEntityCollection();
 
@@ -401,7 +363,6 @@ abstract protected function _getEntityCollection();
      * Entity attributes collection getter
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getAttributeCollection()
     {
@@ -413,7 +374,6 @@ public function getAttributeCollection()
      *
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
@@ -431,7 +391,6 @@ public function filterAttributeCollection(\Magento\Framework\Data\Collection $co
      * Returns error information
      *
      * @return array
-     * @since 2.0.0
      */
     public function getErrorMessages()
     {
@@ -456,7 +415,6 @@ public function getErrorMessages()
      * Returns error counter value
      *
      * @return int
-     * @since 2.0.0
      */
     public function getErrorsCount()
     {
@@ -467,7 +425,6 @@ public function getErrorsCount()
      * Returns invalid rows count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getInvalidRowsCount()
     {
@@ -478,7 +435,6 @@ public function getInvalidRowsCount()
      * Returns number of checked entities
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -489,7 +445,6 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedRowsCount()
     {
@@ -501,7 +456,6 @@ public function getProcessedRowsCount()
      *
      * @return AbstractAdapter
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getWriter()
     {
@@ -517,7 +471,6 @@ public function getWriter()
      *
      * @param string[] $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $parameters)
     {
@@ -531,7 +484,6 @@ public function setParameters(array $parameters)
      *
      * @param AbstractAdapter $writer
      * @return $this
-     * @since 2.0.0
      */
     public function setWriter(AbstractAdapter $writer)
     {
@@ -545,7 +497,6 @@ public function setWriter(AbstractAdapter $writer)
      *
      * @param null|string $fileName
      * @return void
-     * @since 2.0.0
      */
     public function setFileName($fileName)
     {
@@ -556,7 +507,6 @@ public function setFileName($fileName)
      * Get export file name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getFileName()
     {
@@ -567,7 +517,6 @@ public function getFileName()
      * Retrieve list of disabled attributes codes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getDisabledAttributes()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
index a450d306f1f66..ac5fe5e373f39 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
@@ -12,7 +12,6 @@
  * Abstract adapter model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractAdapter
 {
@@ -20,7 +19,6 @@ abstract class AbstractAdapter
      * Destination file path.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_destination;
 
@@ -28,13 +26,11 @@ abstract class AbstractAdapter
      * Header columns names.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_headerCols = null;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directoryHandle;
 
@@ -45,7 +41,6 @@ abstract class AbstractAdapter
      * @param string|null $destination
      * @param string $destinationDirectoryCode
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -79,7 +74,6 @@ public function __construct(
      * Method called as last step of object instance creation. Can be overridden in child classes.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _init()
     {
@@ -90,7 +84,6 @@ protected function _init()
      * Get contents of export file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContents()
     {
@@ -101,7 +94,6 @@ public function getContents()
      * MIME-type for 'Content-Type' header
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -112,7 +104,6 @@ public function getContentType()
      * Return file extension for downloading
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileExtension()
     {
@@ -125,7 +116,6 @@ public function getFileExtension()
      * @param array $headerColumns
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setHeaderCols(array $headerColumns)
     {
@@ -137,7 +127,6 @@ public function setHeaderCols(array $headerColumns)
      *
      * @param array $rowData
      * @return $this
-     * @since 2.0.0
      */
     abstract public function writeRow(array $rowData);
 }
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
index 25eb8fc14b3e7..88adaeeeb7e85 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
@@ -9,7 +9,6 @@
  * Export adapter csv.
  *
  * @api
- * @since 2.0.0
  */
 class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
 {
@@ -17,7 +16,6 @@ class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      * Field delimiter.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_delimiter = ',';
 
@@ -25,7 +23,6 @@ class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      * Field enclosure character.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_enclosure = '"';
 
@@ -33,13 +30,11 @@ class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      * Source file handler.
      *
      * @var \Magento\Framework\Filesystem\File\Write
-     * @since 2.0.0
      */
     protected $_fileHandler;
 
     /**
      * {@inheritdoc }
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Filesystem $filesystem, $destination = null)
     {
@@ -51,7 +46,6 @@ public function __construct(\Magento\Framework\Filesystem $filesystem, $destinat
      * Object destructor.
      *
      * @return void
-     * @since 2.0.0
      */
     public function destruct()
     {
@@ -64,7 +58,6 @@ public function destruct()
      * Method called as last step of object instance creation. Can be overrided in child classes.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _init()
     {
@@ -76,7 +69,6 @@ protected function _init()
      * MIME-type for 'Content-Type' header.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -87,7 +79,6 @@ public function getContentType()
      * Return file extension for downloading.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileExtension()
     {
@@ -100,7 +91,6 @@ public function getFileExtension()
      * @param array $headerColumns
      * @throws \Exception
      * @return $this
-     * @since 2.0.0
      */
     public function setHeaderCols(array $headerColumns)
     {
@@ -122,7 +112,6 @@ public function setHeaderCols(array $headerColumns)
      * @param array $rowData
      * @throws \Exception
      * @return $this
-     * @since 2.0.0
      */
     public function writeRow(array $rowData)
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/Factory.php b/app/code/Magento/ImportExport/Model/Export/Adapter/Factory.php
index d22a21ddd3851..3062fab8aa308 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Adapter\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Config.php b/app/code/Magento/ImportExport/Model/Export/Config.php
index c09d87c5e267f..9e7cd6a29dc9a 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides export configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data implements \Magento\ImportExport\Model\Export\ConfigInterface
 {
@@ -20,7 +19,6 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\ImportEx
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ImportExport\Model\Export\Config\Reader $reader,
@@ -35,7 +33,6 @@ public function __construct(
      * Retrieve export entities configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntities()
     {
@@ -47,7 +44,6 @@ public function getEntities()
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes($entity)
     {
@@ -59,7 +55,6 @@ public function getEntityTypes($entity)
      * Retrieve export file formats configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFileFormats()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
index 2af1c7201b769..3bb76195227a5 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -36,7 +33,6 @@ public function __construct(Manager $moduleManager)
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Config/Reader.php b/app/code/Magento/ImportExport/Model/Export/Config/Reader.php
index feb4fef7dd2e9..ed6920173a319 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config/Reader.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/entity' => 'name',
@@ -33,7 +31,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/ImportExport/Model/Export/Config/SchemaLocator.php b/app/code/Magento/ImportExport/Model/Export/Config/SchemaLocator.php
index 60fbcc5792b80..580fde553f69a 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config/SchemaLocator.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/ConfigInterface.php b/app/code/Magento/ImportExport/Model/Export/ConfigInterface.php
index 8c52ced615a3f..f66ac70affdc9 100644
--- a/app/code/Magento/ImportExport/Model/Export/ConfigInterface.php
+++ b/app/code/Magento/ImportExport/Model/Export/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Provides export configuration
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Retrieve import entities configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntities();
 
@@ -25,7 +23,6 @@ public function getEntities();
      * Retrieve export file formats configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFileFormats();
 
@@ -34,7 +31,6 @@ public function getFileFormats();
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes($entity);
 }
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 4f0954e116fd9..0a2f09b366a5d 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -16,7 +16,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEntity
 {
@@ -24,7 +23,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
      * Attribute code to its values. Only attributes with options and only default store values used
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeValues = [];
 
@@ -32,7 +30,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
      * Entity type id.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -40,13 +37,11 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
      * Attributes with index (not label) value
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -58,7 +53,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -83,7 +77,6 @@ public function __construct(
      * Initialize attribute option values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributeValues()
     {
@@ -99,7 +92,6 @@ protected function _initAttributeValues()
      *
      * @param AbstractCollection $collection
      * @return AbstractCollection
-     * @since 2.0.0
      */
     protected function _prepareEntityCollection(AbstractCollection $collection)
     {
@@ -114,7 +106,6 @@ protected function _prepareEntityCollection(AbstractCollection $collection)
      * @param AbstractCollection $collection
      * @return AbstractCollection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function filterEntityCollection(AbstractCollection $collection)
     {
@@ -188,7 +179,6 @@ public function filterEntityCollection(AbstractCollection $collection)
      *
      * @param AbstractCollection $collection
      * @return AbstractCollection
-     * @since 2.0.0
      */
     protected function _addAttributesToCollection(AbstractCollection $collection)
     {
@@ -202,7 +192,6 @@ protected function _addAttributesToCollection(AbstractCollection $collection)
      *
      * @param AbstractAttribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeOptions(AbstractAttribute $attribute)
     {
@@ -236,7 +225,6 @@ public function getAttributeOptions(AbstractAttribute $attribute)
      * Entity type ID getter
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -249,7 +237,6 @@ public function getEntityTypeId()
      * @param \Magento\Framework\Model\AbstractModel $item export entity
      * @param array $row data row
      * @return array
-     * @since 2.0.0
      */
     protected function _addAttributeValuesToRow(\Magento\Framework\Model\AbstractModel $item, array $row = [])
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index 1a37e37f7633a..d28743a979477 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -15,7 +15,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEntity
 {
@@ -23,7 +22,6 @@ abstract class AbstractEntity
      * Attribute code to its values. Only attributes with options and only default store values used.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributeValues = [];
 
@@ -31,7 +29,6 @@ abstract class AbstractEntity
      * Attribute code to its values. Only attributes with options and only default store values used.
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $attrCodes = null;
 
@@ -39,7 +36,6 @@ abstract class AbstractEntity
      * DB connection.
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -47,7 +43,6 @@ abstract class AbstractEntity
      * Array of attributes codes which are disabled for export.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_disabledAttrs = [];
 
@@ -55,7 +50,6 @@ abstract class AbstractEntity
      * Entity type id.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -63,7 +57,6 @@ abstract class AbstractEntity
      * Error codes with arrays of corresponding row numbers.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -71,7 +64,6 @@ abstract class AbstractEntity
      * Error counter.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_errorsCount = 0;
 
@@ -79,7 +71,6 @@ abstract class AbstractEntity
      * Limit of errors after which pre-processing will exit.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_errorsLimit = 100;
 
@@ -87,7 +78,6 @@ abstract class AbstractEntity
      * Export filter data.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filter = [];
 
@@ -95,7 +85,6 @@ abstract class AbstractEntity
      * Attributes with index (not label) value.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
@@ -103,7 +92,6 @@ abstract class AbstractEntity
      * Validation failure message template definitions.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [];
 
@@ -111,7 +99,6 @@ abstract class AbstractEntity
      * Parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameters = [];
 
@@ -119,7 +106,6 @@ abstract class AbstractEntity
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [];
 
@@ -127,7 +113,6 @@ abstract class AbstractEntity
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [];
 
@@ -135,7 +120,6 @@ abstract class AbstractEntity
      * Number of entities processed by validation.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedEntitiesCount = 0;
 
@@ -143,7 +127,6 @@ abstract class AbstractEntity
      * Number of rows processed by validation.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedRowsCount = 0;
 
@@ -151,19 +134,16 @@ abstract class AbstractEntity
      * Source model.
      *
      * @var AbstractAdapter
-     * @since 2.0.0
      */
     protected $_writer;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -172,7 +152,6 @@ abstract class AbstractEntity
      * @param \Magento\Eav\Model\Config $config
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -191,7 +170,6 @@ public function __construct(
      * Initialize stores hash.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initStores()
     {
@@ -208,7 +186,6 @@ protected function _initStores()
      * Get header columns
      *
      * @return string[]
-     * @since 2.0.0
      */
     abstract protected function _getHeaderColumns();
 
@@ -217,7 +194,6 @@ abstract protected function _getHeaderColumns();
      *
      * @param bool $resetCollection
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     abstract protected function _getEntityCollection($resetCollection = false);
 
@@ -225,7 +201,6 @@ abstract protected function _getEntityCollection($resetCollection = false);
      * Get attributes codes which are appropriate for export.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getExportAttrCodes()
     {
@@ -260,7 +235,6 @@ protected function _getExportAttrCodes()
      * Initialize attribute option values.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttrValues()
     {
@@ -276,7 +250,6 @@ protected function _initAttrValues()
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
     {
@@ -348,7 +321,6 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
      * @param string $errorCode Error code or simply column name
      * @param int $errorRowNum Row number.
      * @return \Magento\ImportExport\Model\Import\AbstractSource
-     * @since 2.0.0
      */
     public function addRowError($errorCode, $errorRowNum)
     {
@@ -367,7 +339,6 @@ public function addRowError($errorCode, $errorRowNum)
      * @param string $errorCode Error code
      * @param string $message Message template
      * @return \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     * @since 2.0.0
      */
     public function addMessageTemplate($errorCode, $message)
     {
@@ -381,7 +352,6 @@ public function addMessageTemplate($errorCode, $message)
      *
      * @param string $errorCode
      * @return null|string
-     * @since 2.0.0
      */
     public function retrieveMessageTemplate($errorCode)
     {
@@ -395,7 +365,6 @@ public function retrieveMessageTemplate($errorCode)
      * Export process.
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function export();
 
@@ -404,7 +373,6 @@ abstract public function export();
      *
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection)
     {
@@ -422,7 +390,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
      * Entity attributes collection getter.
      *
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
-     * @since 2.0.0
      */
     abstract public function getAttributeCollection();
 
@@ -431,7 +398,6 @@ abstract public function getAttributeCollection();
      *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeOptions(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
@@ -465,7 +431,6 @@ public function getAttributeOptions(\Magento\Eav\Model\Entity\Attribute\Abstract
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract public function getEntityTypeCode();
 
@@ -473,7 +438,6 @@ abstract public function getEntityTypeCode();
      * Entity type ID getter.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -484,7 +448,6 @@ public function getEntityTypeId()
      * Returns error information.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getErrorMessages()
     {
@@ -507,7 +470,6 @@ public function getErrorMessages()
      * Returns error counter value.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getErrorsCount()
     {
@@ -518,7 +480,6 @@ public function getErrorsCount()
      * Returns invalid rows count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getInvalidRowsCount()
     {
@@ -529,7 +490,6 @@ public function getInvalidRowsCount()
      * Returns number of checked entities.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -540,7 +500,6 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedRowsCount()
     {
@@ -552,7 +511,6 @@ public function getProcessedRowsCount()
      *
      * @return AbstractAdapter
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getWriter()
     {
@@ -567,7 +525,6 @@ public function getWriter()
      *
      * @param array $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $parameters)
     {
@@ -581,7 +538,6 @@ public function setParameters(array $parameters)
      *
      * @param AbstractAdapter $writer
      * @return $this
-     * @since 2.0.0
      */
     public function setWriter(AbstractAdapter $writer)
     {
@@ -592,7 +548,7 @@ public function setWriter(AbstractAdapter $writer)
 
     /**
      * Clean cached values
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __destruct()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
index c13ca1fffca16..26805781c2b61 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Entity\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return AbstractEntity|\Magento\ImportExport\Model\Export\AbstractEntity
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/ImportExport/Model/Export/Factory.php b/app/code/Magento/ImportExport/Model/Export/Factory.php
index 683867bba1fa9..85c61223fd250 100644
--- a/app/code/Magento/ImportExport/Model/Export/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Export/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ImportExport\Model\Export\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return \Magento\Framework\Data\Collection
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/ImportExport/Model/History.php b/app/code/Magento/ImportExport/Model/History.php
index 8c688b738c72c..d02a38b5cf317 100644
--- a/app/code/Magento/ImportExport/Model/History.php
+++ b/app/code/Magento/ImportExport/Model/History.php
@@ -14,7 +14,6 @@
  * @method \Magento\ImportExport\Model\ResourceModel\History getResource()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class History extends \Magento\Framework\Model\AbstractModel
 {
@@ -42,7 +41,6 @@ class History extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\ImportExport\Helper\Report
-     * @since 2.0.0
      */
     protected $reportHelper;
 
@@ -56,7 +54,6 @@ class History extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\ImportExport\Helper\Report $reportHelper
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -77,7 +74,6 @@ public function __construct(
      * Initialize history resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -89,7 +85,6 @@ protected function _construct()
      *
      * @param string $filename
      * @return $this
-     * @since 2.0.0
      */
     public function addReport($filename)
     {
@@ -105,7 +100,6 @@ public function addReport($filename)
      *
      * @param string $filename
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorReportFile($filename)
     {
@@ -120,7 +114,6 @@ public function addErrorReportFile($filename)
      * @param Import $import
      * @param bool $updateSummary
      * @return $this
-     * @since 2.0.0
      */
     public function updateReport(Import $import, $updateSummary = false)
     {
@@ -143,7 +136,6 @@ public function updateReport(Import $import, $updateSummary = false)
      *
      * @param Import $import
      * @return $this
-     * @since 2.0.0
      */
     public function invalidateReport(Import $import)
     {
@@ -159,7 +151,6 @@ public function invalidateReport(Import $import)
      * Get import history report ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -170,7 +161,6 @@ public function getId()
      * Get import history report ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStartedAt()
     {
@@ -181,7 +171,6 @@ public function getStartedAt()
      * Get import history report ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -192,7 +181,6 @@ public function getUserId()
      * Get imported file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImportedFile()
     {
@@ -203,7 +191,6 @@ public function getImportedFile()
      * Get error file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getErrorFile()
     {
@@ -214,7 +201,6 @@ public function getErrorFile()
      * Get import execution time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExecutionTime()
     {
@@ -225,7 +211,6 @@ public function getExecutionTime()
      * Get import history report summary
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSummary()
     {
@@ -237,7 +222,6 @@ public function getSummary()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -249,7 +233,6 @@ public function setId($id)
      *
      * @param string $startedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setStartedAt($startedAt)
     {
@@ -261,7 +244,6 @@ public function setStartedAt($startedAt)
      *
      * @param int $userId
      * @return $this
-     * @since 2.0.0
      */
     public function setUserId($userId)
     {
@@ -273,7 +255,6 @@ public function setUserId($userId)
      *
      * @param string $importedFile
      * @return $this
-     * @since 2.0.0
      */
     public function setImportedFile($importedFile)
     {
@@ -285,7 +266,6 @@ public function setImportedFile($importedFile)
      *
      * @param string $errorFile
      * @return $this
-     * @since 2.0.0
      */
     public function setErrorFile($errorFile)
     {
@@ -297,7 +277,6 @@ public function setErrorFile($errorFile)
      *
      * @param string $executionTime
      * @return $this
-     * @since 2.0.0
      */
     public function setExecutionTime($executionTime)
     {
@@ -309,7 +288,6 @@ public function setExecutionTime($executionTime)
      *
      * @param string $summary
      * @return $this
-     * @since 2.0.0
      */
     public function setSummary($summary)
     {
@@ -318,7 +296,6 @@ public function setSummary($summary)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadLastInsertItem()
     {
@@ -331,7 +308,6 @@ public function loadLastInsertItem()
      * Retrieve admin ID
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getAdminId()
     {
@@ -346,7 +322,6 @@ protected function getAdminId()
      * Retrieve last history report ID
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getLastItemId()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 3444024057119..02bc3441b1ab8 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -21,7 +21,6 @@
  * @method string getBehavior() getBehavior()
  * @method \Magento\ImportExport\Model\Import setEntity() setEntity(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Import extends \Magento\ImportExport\Model\AbstractModel
 {
@@ -104,73 +103,58 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
 
     /**#@-*/
 
-    /**
-     * Entity adapter.
-     *
-     * @var \Magento\ImportExport\Model\Import\Entity\AbstractEntity
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_entityAdapter;
 
     /**
      * Import export data
      *
      * @var \Magento\ImportExport\Helper\Data
-     * @since 2.0.0
      */
     protected $_importExportData = null;
 
     /**
      * @var \Magento\ImportExport\Model\Import\ConfigInterface
-     * @since 2.0.0
      */
     protected $_importConfig;
 
     /**
      * @var \Magento\ImportExport\Model\Import\Entity\Factory
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\Import\Data
-     * @since 2.0.0
      */
     protected $_importData;
 
     /**
      * @var \Magento\ImportExport\Model\Export\Adapter\CsvFactory
-     * @since 2.0.0
      */
     protected $_csvFactory;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\FileTransferFactory
-     * @since 2.0.0
      */
     protected $_httpFactory;
 
     /**
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @var \Magento\ImportExport\Model\Source\Import\Behavior\Factory
-     * @since 2.0.0
      */
     protected $_behaviorFactory;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -191,7 +175,6 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param \Magento\Framework\Stdlib\DateTime\DateTime
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -231,7 +214,6 @@ public function __construct(
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\ImportExport\Model\Import\Entity\AbstractEntity|\Magento\ImportExport\Model\Import\AbstractEntity
-     * @since 2.0.0
      */
     protected function _getEntityAdapter()
     {
@@ -275,7 +257,6 @@ protected function _getEntityAdapter()
      *
      * @param string $sourceFile Full path to source file
      * @return \Magento\ImportExport\Model\Import\AbstractSource
-     * @since 2.0.0
      */
     protected function _getSourceAdapter($sourceFile)
     {
@@ -291,7 +272,6 @@ protected function _getSourceAdapter($sourceFile)
      *
      * @param ProcessingErrorAggregatorInterface $validationResult
      * @return string[]
-     * @since 2.0.0
      */
     public function getOperationResultMessages(ProcessingErrorAggregatorInterface $validationResult)
     {
@@ -336,7 +316,6 @@ public function getOperationResultMessages(ProcessingErrorAggregatorInterface $v
      *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|\Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
-     * @since 2.0.0
      */
     public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
@@ -354,7 +333,6 @@ public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\Abst
      * DB data source model getter.
      *
      * @return \Magento\ImportExport\Model\ResourceModel\Import\Data
-     * @since 2.0.0
      */
     public function getDataSourceModel()
     {
@@ -366,7 +344,6 @@ public function getDataSourceModel()
      *
      * @static
      * @return string
-     * @since 2.0.0
      */
     public static function getDefaultBehavior()
     {
@@ -378,7 +355,6 @@ public static function getDefaultBehavior()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -392,7 +368,6 @@ public function getEntity()
      * Returns number of checked entities.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -403,7 +378,6 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedRowsCount()
     {
@@ -414,7 +388,6 @@ public function getProcessedRowsCount()
      * Import/Export working directory (source files, result files, lock files etc.).
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWorkingDir()
     {
@@ -426,7 +399,6 @@ public function getWorkingDir()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function importSource()
     {
@@ -462,7 +434,6 @@ public function importSource()
     /**
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function processImport()
     {
@@ -473,7 +444,6 @@ protected function processImport()
      * Import possibility getter.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isImportAllowed()
     {
@@ -483,7 +453,6 @@ public function isImportAllowed()
     /**
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getErrorAggregator()
     {
@@ -495,7 +464,6 @@ public function getErrorAggregator()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string Source file path
-     * @since 2.0.0
      */
     public function uploadSource()
     {
@@ -559,7 +527,6 @@ public function uploadSource()
      *
      * @param string $sourceFile
      * @return $this
-     * @since 2.0.0
      */
     protected function _removeBom($sourceFile)
     {
@@ -579,7 +546,6 @@ protected function _removeBom($sourceFile)
      *
      * @param \Magento\ImportExport\Model\Import\AbstractSource $source
      * @return bool
-     * @since 2.0.0
      */
     public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource $source)
     {
@@ -619,7 +585,6 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
      * Invalidate indexes by process codes.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function invalidateIndex()
     {
@@ -654,7 +619,6 @@ public function invalidateIndex()
      *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getEntityBehaviors()
     {
@@ -687,7 +651,6 @@ public function getEntityBehaviors()
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUniqueEntityBehaviors()
     {
@@ -708,7 +671,6 @@ public function getUniqueEntityBehaviors()
      * @param string|null $entity
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isReportEntityType($entity = null)
     {
@@ -742,7 +704,6 @@ public function isReportEntityType($entity = null)
      * @param array $result
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function createHistoryReport($sourceFileRelative, $entity, $extension = null, $result = null)
     {
@@ -778,7 +739,6 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
      * Get count of created items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCreatedItemsCount()
     {
@@ -789,7 +749,6 @@ public function getCreatedItemsCount()
      * Get count of updated items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUpdatedItemsCount()
     {
@@ -800,7 +759,6 @@ public function getUpdatedItemsCount()
      * Get count of deleted items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDeletedItemsCount()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index c11bb55b6f1a0..614c8233ea3be 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -19,7 +19,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEntity
 {
@@ -65,7 +64,6 @@ abstract class AbstractEntity
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $errorMessageTemplates = [
         self::ERROR_CODE_SYSTEM_EXCEPTION => 'General system exception happened',
@@ -86,19 +84,13 @@ abstract class AbstractEntity
 
     /**#@-*/
 
-    /**
-     * DB connection
-     *
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_connection;
 
     /**
      * Has data process validation done?
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_dataValidated = false;
 
@@ -106,7 +98,6 @@ abstract class AbstractEntity
      * Valid column names
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [];
 
@@ -114,7 +105,6 @@ abstract class AbstractEntity
      * If we should check column names
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needColumnCheck = false;
 
@@ -122,13 +112,11 @@ abstract class AbstractEntity
      * DB data source model
      *
      * @var \Magento\ImportExport\Model\ResourceModel\Import\Data
-     * @since 2.0.0
      */
     protected $_dataSourceModel;
 
     /**
      * @var ProcessingErrorAggregatorInterface
-     * @since 2.0.0
      */
     protected $errorAggregator;
 
@@ -136,7 +124,6 @@ abstract class AbstractEntity
      * Flag to disable import
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_importAllowed = true;
 
@@ -144,7 +131,6 @@ abstract class AbstractEntity
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -152,7 +138,6 @@ abstract class AbstractEntity
      * Entity model parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameters = [];
 
@@ -160,7 +145,6 @@ abstract class AbstractEntity
      * Column names that holds values with particular meaning
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [self::COLUMN_ACTION];
 
@@ -168,7 +152,6 @@ abstract class AbstractEntity
      * Permanent entity columns
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [];
 
@@ -176,7 +159,6 @@ abstract class AbstractEntity
      * Number of entities processed by validation
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedEntitiesCount = 0;
 
@@ -184,7 +166,6 @@ abstract class AbstractEntity
      * Number of rows processed by validation
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedRowsCount = 0;
 
@@ -192,7 +173,6 @@ abstract class AbstractEntity
      * Need to log in import history
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $logInHistory = true;
 
@@ -204,7 +184,6 @@ abstract class AbstractEntity
      * [Row number N] => true
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_skippedRows = [];
 
@@ -212,7 +191,6 @@ abstract class AbstractEntity
      * Array of numbers of validated rows as keys and boolean TRUE as values
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_validatedRows = [];
 
@@ -220,7 +198,6 @@ abstract class AbstractEntity
      * Source model
      *
      * @var AbstractSource
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -228,7 +205,6 @@ abstract class AbstractEntity
      * Array of unique attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_uniqueAttributes = [];
 
@@ -236,7 +212,6 @@ abstract class AbstractEntity
      * List of available behaviors
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_availableBehaviors = [
         \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
@@ -248,7 +223,6 @@ abstract class AbstractEntity
      * Number of items to fetch from db in one query
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pageSize;
 
@@ -256,7 +230,6 @@ abstract class AbstractEntity
      * Maximum size of packet, that can be sent to DB
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxDataSize;
 
@@ -264,7 +237,6 @@ abstract class AbstractEntity
      * Number of items to save to the db in one query
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_bunchSize;
 
@@ -272,7 +244,6 @@ abstract class AbstractEntity
      * Code of a primary attribute which identifies the entity group if import contains of multiple rows
      *
      * @var string
-     * @since 2.0.0
      */
     protected $masterAttributeCode;
 
@@ -280,7 +251,6 @@ abstract class AbstractEntity
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -288,7 +258,6 @@ abstract class AbstractEntity
      * Count if created items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsCreated = 0;
 
@@ -296,7 +265,6 @@ abstract class AbstractEntity
      * Count if updated items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsUpdated = 0;
 
@@ -304,7 +272,6 @@ abstract class AbstractEntity
      * Count if deleted items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsDeleted = 0;
 
@@ -325,7 +292,6 @@ abstract class AbstractEntity
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @param array $data
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -370,7 +336,6 @@ public function __construct(
 
     /**
      * @return ProcessingErrorAggregatorInterface
-     * @since 2.0.0
      */
     public function getErrorAggregator()
     {
@@ -382,7 +347,6 @@ public function getErrorAggregator()
      *
      * @abstract
      * @return boolean
-     * @since 2.0.0
      */
     abstract protected function _importData();
 
@@ -391,7 +355,6 @@ abstract protected function _importData();
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract public function getEntityTypeCode();
 
@@ -400,7 +363,6 @@ abstract public function getEntityTypeCode();
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRowForDb(array $rowData)
     {
@@ -423,7 +385,6 @@ protected function _prepareRowForDb(array $rowData)
      * @param string $code
      * @param array|mixed $errors
      * @return void
-     * @since 2.0.0
      */
     protected function addErrors($code, $errors)
     {
@@ -443,7 +404,6 @@ protected function addErrors($code, $errors)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _saveValidatedBunches()
     {
@@ -552,7 +512,6 @@ private function getSerializer()
      * @param string $errorLevel
      * @param string $errorDescription
      * @return $this
-     * @since 2.0.0
      */
     public function addRowError(
         $errorCode,
@@ -581,7 +540,6 @@ public function addRowError(
      * @param string $errorCode Error code
      * @param string $message Message template
      * @return $this
-     * @since 2.0.0
      */
     public function addMessageTemplate($errorCode, $message)
     {
@@ -595,7 +553,6 @@ public function addMessageTemplate($errorCode, $message)
      *
      * @param array $rowData
      * @return string
-     * @since 2.0.0
      */
     public function getBehavior(array $rowData = null)
     {
@@ -634,7 +591,6 @@ public function getBehavior(array $rowData = null)
      * Get default import behavior
      *
      * @return string
-     * @since 2.0.0
      */
     public static function getDefaultBehavior()
     {
@@ -645,7 +601,6 @@ public static function getDefaultBehavior()
      * Returns number of checked entities
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -656,7 +611,6 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedRowsCount()
     {
@@ -668,7 +622,6 @@ public function getProcessedRowsCount()
      *
      * @return AbstractSource
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -682,7 +635,6 @@ public function getSource()
      * Import process start
      *
      * @return bool Result of operation
-     * @since 2.0.0
      */
     public function importData()
     {
@@ -694,7 +646,6 @@ public function importData()
      *
      * @param string $attributeCode
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeParticular($attributeCode)
     {
@@ -703,7 +654,6 @@ public function isAttributeParticular($attributeCode)
 
     /**
      * @return string the master attribute code to use in an import
-     * @since 2.0.0
      */
     public function getMasterAttributeCode()
     {
@@ -720,7 +670,6 @@ public function getMasterAttributeCode()
      * @param string $multiSeparator
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isAttributeValid(
         $attributeCode,
@@ -795,7 +744,6 @@ public function isAttributeValid(
      * Import possibility getter
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isImportAllowed()
     {
@@ -808,7 +756,6 @@ public function isImportAllowed()
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function isRowAllowedToImport(array $rowData, $rowNumber)
     {
@@ -819,7 +766,6 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)
      * Is import need to log in history.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNeedToLogInHistory()
     {
@@ -832,7 +778,6 @@ public function isNeedToLogInHistory()
      * @param array $rowData
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     abstract public function validateRow(array $rowData, $rowNumber);
 
@@ -841,7 +786,6 @@ abstract public function validateRow(array $rowData, $rowNumber);
      *
      * @param array $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $parameters)
     {
@@ -854,7 +798,6 @@ public function setParameters(array $parameters)
      *
      * @param AbstractSource $source
      * @return $this
-     * @since 2.0.0
      */
     public function setSource(AbstractSource $source)
     {
@@ -869,7 +812,6 @@ public function setSource(AbstractSource $source)
      *
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateData()
     {
@@ -912,7 +854,6 @@ public function validateData()
      * Get count of created items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCreatedItemsCount()
     {
@@ -923,7 +864,6 @@ public function getCreatedItemsCount()
      * Get count of updated items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUpdatedItemsCount()
     {
@@ -934,7 +874,6 @@ public function getUpdatedItemsCount()
      * Get count of deleted items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDeletedItemsCount()
     {
@@ -948,7 +887,6 @@ public function getDeletedItemsCount()
      * @param array $updated
      * @param array $deleted
      * @return $this
-     * @since 2.0.0
      */
     protected function updateItemsCounterStats(array $created = [], array $updated = [], array $deleted = [])
     {
@@ -962,7 +900,6 @@ protected function updateItemsCounterStats(array $created = [], array $updated =
      * Retrieve valid column names
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValidColumnNames()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractSource.php b/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
index cc3aaf58f5cdf..a5e5179f84ead 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
@@ -11,13 +11,11 @@
  * Data source with columns for Magento_ImportExport
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractSource implements \SeekableIterator
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_colNames = [];
 
@@ -25,7 +23,6 @@ abstract class AbstractSource implements \SeekableIterator
      * Quantity of columns
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_colQty;
 
@@ -33,7 +30,6 @@ abstract class AbstractSource implements \SeekableIterator
      * Current row
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_row = [];
 
@@ -43,13 +39,11 @@ abstract class AbstractSource implements \SeekableIterator
      * -1 means "out of bounds"
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_key = -1;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_foundWrongQuoteFlag = false;
 
@@ -58,7 +52,6 @@ abstract class AbstractSource implements \SeekableIterator
      *
      * @param array $colNames
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $colNames)
     {
@@ -76,7 +69,6 @@ public function __construct(array $colNames)
      * Column names getter.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getColNames()
     {
@@ -89,7 +81,6 @@ public function getColNames()
      * Returns the row in associative array format: array(<col_name> => <value>, ...)
      *
      * @return array
-     * @since 2.0.0
      */
     public function current()
     {
@@ -108,7 +99,6 @@ public function current()
      * Move forward to next element (\Iterator interface)
      *
      * @return void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -128,7 +118,6 @@ public function next()
      * Return array or false on error
      *
      * @return array|false
-     * @since 2.0.0
      */
     abstract protected function _getNextRow();
 
@@ -136,7 +125,6 @@ abstract protected function _getNextRow();
      * Return the key of the current element (\Iterator interface)
      *
      * @return int -1 if out of bounds, 0 or more otherwise
-     * @since 2.0.0
      */
     public function key()
     {
@@ -147,7 +135,6 @@ public function key()
      * Checks if current position is valid (\Iterator interface)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -158,7 +145,6 @@ public function valid()
      * Rewind the \Iterator to the first element (\Iterator interface)
      *
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -173,7 +159,6 @@ public function rewind()
      * @param int $position The position to seek to 0 or more
      * @return void
      * @throws \OutOfBoundsException
-     * @since 2.0.0
      */
     public function seek($position)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Adapter.php b/app/code/Magento/ImportExport/Model/Import/Adapter.php
index 156d31ef0fbb8..0242ae6096316 100644
--- a/app/code/Magento/ImportExport/Model/Import/Adapter.php
+++ b/app/code/Magento/ImportExport/Model/Import/Adapter.php
@@ -11,7 +11,6 @@
  * Import adapter model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Adapter
 {
@@ -26,7 +25,6 @@ class Adapter
      * @return AbstractSource
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public static function factory($type, $directory, $source, $options = null)
     {
@@ -60,7 +58,6 @@ public static function factory($type, $directory, $source, $options = null)
      * @param mixed $options OPTIONAL Adapter constructor options
      *
      * @return AbstractSource
-     * @since 2.0.0
      */
     public static function findAdapterFor($source, $directory, $options = null)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Config.php b/app/code/Magento/ImportExport/Model/Import/Config.php
index 66e47eca395e1..959db64936c95 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides import configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data implements \Magento\ImportExport\Model\Import\ConfigInterface
 {
@@ -20,7 +19,6 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\ImportEx
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ImportExport\Model\Import\Config\Reader $reader,
@@ -35,7 +33,6 @@ public function __construct(
      * Retrieve import entities configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntities()
     {
@@ -47,7 +44,6 @@ public function getEntities()
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes($entity)
     {
@@ -60,7 +56,6 @@ public function getEntityTypes($entity)
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedIndexers($entity)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
index 94a61c3b5e4d0..a1924fde70441 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\ImportExport\Model\Import\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -36,7 +33,6 @@ public function __construct(Manager $moduleManager)
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Config/Reader.php b/app/code/Magento/ImportExport/Model/Import/Config/Reader.php
index 1f51907a3f0a5..f24a8ef4eebcb 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config/Reader.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ImportExport\Model\Import\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/entity' => 'name',
@@ -33,7 +31,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/ImportExport/Model/Import/Config/SchemaLocator.php b/app/code/Magento/ImportExport/Model/Import/Config/SchemaLocator.php
index 57b7476865be3..053579315727f 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config/SchemaLocator.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ImportExport\Model\Import\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/ConfigInterface.php b/app/code/Magento/ImportExport/Model/Import/ConfigInterface.php
index 7f3c07cb84d8d..63c1b66f7c569 100644
--- a/app/code/Magento/ImportExport/Model/Import/ConfigInterface.php
+++ b/app/code/Magento/ImportExport/Model/Import/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Provides import configuration
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Retrieve import entities configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntities();
 
@@ -26,7 +24,6 @@ public function getEntities();
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getEntityTypes($entity);
 
@@ -35,7 +32,6 @@ public function getEntityTypes($entity);
      *
      * @param string $entity
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedIndexers($entity);
 }
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index 19fc84c0067af..ecf9edbcb1644 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -13,7 +13,6 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEntity
 {
@@ -26,7 +25,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -34,7 +32,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * Entity type id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -42,7 +39,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * Attributes with index (not label) value
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
@@ -50,7 +46,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * Website code-to-ID
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websiteCodeToId = [];
 
@@ -58,7 +53,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * All stores code-ID pairs.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeCodeToId = [];
 
@@ -73,7 +67,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      *  ...
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributes = [];
 
@@ -81,7 +74,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * Attributes collection
      *
      * @var \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected $_attributeCollection;
 
@@ -98,7 +90,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -133,7 +124,6 @@ public function __construct(
      *
      * @param string $websiteCode
      * @return int|false
-     * @since 2.0.0
      */
     public function getWebsiteId($websiteCode)
     {
@@ -149,7 +139,6 @@ public function getWebsiteId($websiteCode)
      *
      * @param bool $withDefault
      * @return $this
-     * @since 2.0.0
      */
     protected function _initWebsites($withDefault = false)
     {
@@ -165,7 +154,6 @@ protected function _initWebsites($withDefault = false)
      *
      * @param bool $withDefault
      * @return $this
-     * @since 2.0.0
      */
     protected function _initStores($withDefault = false)
     {
@@ -180,7 +168,6 @@ protected function _initStores($withDefault = false)
      * Initialize entity attributes
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAttributes()
     {
@@ -205,7 +192,6 @@ protected function _initAttributes()
      * Entity type ID getter
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -218,7 +204,6 @@ public function getEntityTypeId()
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param array $indexAttributes OPTIONAL Additional attribute codes with index values.
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeOptions(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
@@ -262,7 +247,6 @@ public function getAttributeOptions(
      * Get attribute collection
      *
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getAttributeCollection()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 30c485e562fdf..ac40228a1ce6c 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -20,7 +20,6 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractEntity
 {
@@ -49,7 +48,6 @@ abstract class AbstractEntity
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $errorMessageTemplates = [
         self::ERROR_CODE_SYSTEM_EXCEPTION => 'General system exception happened',
@@ -68,7 +66,6 @@ abstract class AbstractEntity
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [];
 
@@ -76,7 +73,6 @@ abstract class AbstractEntity
      * DB connection.
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
@@ -84,7 +80,6 @@ abstract class AbstractEntity
      * Has data process validation done?8
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_dataValidated = false;
 
@@ -92,7 +87,6 @@ abstract class AbstractEntity
      * Valid column names
      *
      * @array
-     * @since 2.0.0
      */
     protected $validColumnNames = [];
 
@@ -100,7 +94,6 @@ abstract class AbstractEntity
      * If we should check column names
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $needColumnCheck = false;
 
@@ -108,7 +101,6 @@ abstract class AbstractEntity
      * DB data source model.
      *
      * @var \Magento\ImportExport\Model\ResourceModel\Import\Data
-     * @since 2.0.0
      */
     protected $_dataSourceModel;
 
@@ -116,7 +108,6 @@ abstract class AbstractEntity
      * Entity type id.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_entityTypeId;
 
@@ -124,7 +115,6 @@ abstract class AbstractEntity
      * Error codes with arrays of corresponding row numbers.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -132,7 +122,6 @@ abstract class AbstractEntity
      * Flag to disable import.
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_importAllowed = true;
 
@@ -140,7 +129,6 @@ abstract class AbstractEntity
      * Attributes with index (not label) value.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_indexValueAttributes = [];
 
@@ -148,7 +136,6 @@ abstract class AbstractEntity
      * Entity model parameters.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameters = [];
 
@@ -156,7 +143,6 @@ abstract class AbstractEntity
      * Column names that holds values with particular meaning.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_specialAttributes = [];
 
@@ -164,7 +150,6 @@ abstract class AbstractEntity
      * Permanent entity columns.
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_permanentAttributes = [];
 
@@ -172,7 +157,6 @@ abstract class AbstractEntity
      * Number of entities processed by validation.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedEntitiesCount = 0;
 
@@ -180,7 +164,6 @@ abstract class AbstractEntity
      * Number of rows processed by validation.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_processedRowsCount = 0;
 
@@ -188,7 +171,6 @@ abstract class AbstractEntity
      * Array of numbers of validated rows as keys and boolean TRUE as values.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_validatedRows = [];
 
@@ -196,7 +178,6 @@ abstract class AbstractEntity
      * Source model.
      *
      * @var AbstractSource
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -204,7 +185,6 @@ abstract class AbstractEntity
      * Array of unique attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_uniqueAttributes = [];
 
@@ -212,7 +192,6 @@ abstract class AbstractEntity
      * Import export data
      *
      * @var \Magento\ImportExport\Helper\Data
-     * @since 2.0.0
      */
     protected $_importExportData;
 
@@ -220,7 +199,6 @@ abstract class AbstractEntity
      * Json Helper
      *
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -228,13 +206,11 @@ abstract class AbstractEntity
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\ImportExport\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -242,7 +218,6 @@ abstract class AbstractEntity
      * Count if created items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsCreated = 0;
 
@@ -250,7 +225,6 @@ abstract class AbstractEntity
      * Count if updated items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsUpdated = 0;
 
@@ -258,7 +232,6 @@ abstract class AbstractEntity
      * Count if deleted items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $countItemsDeleted = 0;
 
@@ -266,13 +239,11 @@ abstract class AbstractEntity
      * Need to log in import history
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $logInHistory = false;
 
     /**
      * @var ProcessingErrorAggregatorInterface
-     * @since 2.0.0
      */
     protected $errorAggregator;
 
@@ -302,7 +273,6 @@ abstract class AbstractEntity
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -336,7 +306,6 @@ public function __construct(
      *
      * @return AbstractSource
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getSource()
     {
@@ -351,7 +320,6 @@ protected function _getSource()
      *
      * @abstract
      * @return boolean
-     * @since 2.0.0
      */
     abstract protected function _importData();
 
@@ -361,7 +329,6 @@ abstract protected function _importData();
      * @param array $rowData
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isRowScopeDefault(array $rowData)
     {
@@ -373,7 +340,6 @@ protected function _isRowScopeDefault(array $rowData)
      *
      * @param array $rowData
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRowForDb(array $rowData)
     {
@@ -396,7 +362,6 @@ protected function _prepareRowForDb(array $rowData)
      * @param string $code
      * @param array|mixed $errors
      * @return void
-     * @since 2.0.0
      */
     protected function addErrors($code, $errors)
     {
@@ -415,7 +380,6 @@ protected function addErrors($code, $errors)
      *
      * @return $this|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _saveValidatedBunches()
     {
@@ -499,7 +463,6 @@ private function getSerializer()
      * @param string $errorLevel
      * @param string $errorDescription
      * @return $this
-     * @since 2.0.0
      */
     public function addRowError(
         $errorCode,
@@ -528,7 +491,6 @@ public function addRowError(
      * @param string $errorCode Error code
      * @param string $message Message template
      * @return $this
-     * @since 2.0.0
      */
     public function addMessageTemplate($errorCode, $message)
     {
@@ -543,7 +505,6 @@ public function addMessageTemplate($errorCode, $message)
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param array $indexValAttrs OPTIONAL Additional attributes' codes with index values.
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeOptions(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
@@ -582,7 +543,6 @@ public function getAttributeOptions(
      * Import behavior getter.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBehavior()
     {
@@ -603,7 +563,6 @@ public function getBehavior()
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract public function getEntityTypeCode();
 
@@ -611,7 +570,6 @@ abstract public function getEntityTypeCode();
      * Entity type ID getter.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityTypeId()
     {
@@ -622,7 +580,6 @@ public function getEntityTypeId()
      * Returns number of checked entities.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedEntitiesCount()
     {
@@ -633,7 +590,6 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProcessedRowsCount()
     {
@@ -645,7 +601,6 @@ public function getProcessedRowsCount()
      *
      * @return AbstractSource
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -659,7 +614,6 @@ public function getSource()
      * Import process start.
      *
      * @return bool Result of operation.
-     * @since 2.0.0
      */
     public function importData()
     {
@@ -671,7 +625,6 @@ public function importData()
      *
      * @param string $attrCode
      * @return bool
-     * @since 2.0.0
      */
     public function isAttributeParticular($attrCode)
     {
@@ -687,7 +640,6 @@ public function isAttributeParticular($attrCode)
      * @param int $rowNum
      * @return boolean
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isAttributeValid($attrCode, array $attrParams, array $rowData, $rowNum)
     {
@@ -737,7 +689,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
      * Import possibility getter.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isImportAllowed()
     {
@@ -750,7 +701,6 @@ public function isImportAllowed()
      * @param array $rowData
      * @param int $rowNum
      * @return bool
-     * @since 2.0.0
      */
     public function isRowAllowedToImport(array $rowData, $rowNum)
     {
@@ -763,7 +713,6 @@ public function isRowAllowedToImport(array $rowData, $rowNum)
      *
      * @param string $errorCode
      * @return null|string
-     * @since 2.0.0
      */
     public function retrieveMessageTemplate($errorCode)
     {
@@ -777,7 +726,6 @@ public function retrieveMessageTemplate($errorCode)
      * Is import need to log in history.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNeedToLogInHistory()
     {
@@ -790,7 +738,6 @@ public function isNeedToLogInHistory()
      * @param array $rowData
      * @param int $rowNum
      * @return boolean
-     * @since 2.0.0
      */
     abstract public function validateRow(array $rowData, $rowNum);
 
@@ -799,7 +746,6 @@ abstract public function validateRow(array $rowData, $rowNum);
      *
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters(array $params)
     {
@@ -811,7 +757,6 @@ public function setParameters(array $params)
      * Get data from outside to change behavior. I.e. for setting some default parameters etc.
      *
      * @return array $params
-     * @since 2.0.0
      */
     public function getParameters()
     {
@@ -823,7 +768,6 @@ public function getParameters()
      *
      * @param AbstractSource $source
      * @return $this
-     * @since 2.0.0
      */
     public function setSource(AbstractSource $source)
     {
@@ -839,7 +783,6 @@ public function setSource(AbstractSource $source)
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validateData()
     {
@@ -882,7 +825,6 @@ public function validateData()
 
     /**
      * @return ProcessingErrorAggregatorInterface
-     * @since 2.0.0
      */
     public function getErrorAggregator()
     {
@@ -893,7 +835,6 @@ public function getErrorAggregator()
      * Get count of created items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCreatedItemsCount()
     {
@@ -904,7 +845,6 @@ public function getCreatedItemsCount()
      * Get count of updated items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUpdatedItemsCount()
     {
@@ -915,7 +855,6 @@ public function getUpdatedItemsCount()
      * Get count of deleted items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDeletedItemsCount()
     {
@@ -926,7 +865,6 @@ public function getDeletedItemsCount()
      * Retrieve valid column names
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValidColumnNames()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
index d6f1226be0b69..9774c58a8bf95 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ImportExport\Model\Import\Entity\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return AbstractEntity|\Magento\ImportExport\Model\Import\AbstractEntity
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingError.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingError.php
index 0c81e047d2aef..06608ae4d5185 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingError.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingError.php
@@ -10,7 +10,6 @@
  * Class describe Processing Error
  *
  * @api
- * @since 2.0.0
  */
 class ProcessingError
 {
@@ -21,37 +20,31 @@ class ProcessingError
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $errorCode;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $errorMessage;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $errorDescription;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $rowNumber;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $columnName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $errorLevel;
 
@@ -63,7 +56,6 @@ class ProcessingError
      * @param string|null $errorMessage
      * @param string|null $errorDescription
      * @return void
-     * @since 2.0.0
      */
     public function init(
         $errorCode,
@@ -83,7 +75,6 @@ public function init(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getErrorCode()
     {
@@ -92,7 +83,6 @@ public function getErrorCode()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
@@ -101,7 +91,6 @@ public function getErrorMessage()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRowNumber()
     {
@@ -110,7 +99,6 @@ public function getRowNumber()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getColumnName()
     {
@@ -119,7 +107,6 @@ public function getColumnName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getErrorLevel()
     {
@@ -128,7 +115,6 @@ public function getErrorLevel()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getErrorDescription()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index f2ea422b6c2e3..079b2e60c4785 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -8,61 +8,51 @@
 
 /**
  * Import/Export Error Aggregator class
- * @since 2.0.0
  */
 class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $validationStrategy = self::VALIDATION_STRATEGY_STOP_ON_ERROR;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $allowedErrorsCount = 0;
 
     /**
      * @var ProcessingError[]
-     * @since 2.0.0
      */
     protected $items = [];
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $invalidRows = [];
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $skippedRows = [];
 
     /**
      * @var int[]
-     * @since 2.0.0
      */
     protected $errorStatistics = [];
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $messageTemplate = [];
 
     /**
      * @var \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorFactory
-     * @since 2.0.0
      */
     protected $errorFactory;
 
     /**
      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorFactory $errorFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorFactory $errorFactory
@@ -78,7 +68,6 @@ public function __construct(
      * @param string|null $errorMessage
      * @param string|null $errorDescription
      * @return $this
-     * @since 2.0.0
      */
     public function addError(
         $errorCode,
@@ -109,7 +98,6 @@ public function addError(
     /**
      * @param int $rowNumber
      * @return $this
-     * @since 2.0.0
      */
     public function addRowToSkip($rowNumber)
     {
@@ -124,7 +112,6 @@ public function addRowToSkip($rowNumber)
     /**
      * @param int $rowNumber
      * @return $this
-     * @since 2.0.0
      */
     protected function processInvalidRow($rowNumber)
     {
@@ -142,7 +129,6 @@ protected function processInvalidRow($rowNumber)
      * @param string $code
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorMessageTemplate($code, $template)
     {
@@ -154,7 +140,6 @@ public function addErrorMessageTemplate($code, $template)
     /**
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function isRowInvalid($rowNumber)
     {
@@ -163,7 +148,6 @@ public function isRowInvalid($rowNumber)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getInvalidRowsCount()
     {
@@ -175,7 +159,6 @@ public function getInvalidRowsCount()
      * @param int $allowedErrorCount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function initValidationStrategy($validationStrategy, $allowedErrorCount = 0)
     {
@@ -196,7 +179,6 @@ public function initValidationStrategy($validationStrategy, $allowedErrorCount =
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasToBeTerminated()
     {
@@ -205,7 +187,6 @@ public function hasToBeTerminated()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isErrorLimitExceeded()
     {
@@ -223,7 +204,6 @@ public function isErrorLimitExceeded()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasFatalExceptions()
     {
@@ -232,7 +212,6 @@ public function hasFatalExceptions()
 
     /**
      * @return ProcessingError[]
-     * @since 2.0.0
      */
     public function getAllErrors()
     {
@@ -251,7 +230,6 @@ public function getAllErrors()
     /**
      * @param string[] $codes
      * @return ProcessingError[]
-     * @since 2.0.0
      */
     public function getErrorsByCode(array $codes)
     {
@@ -268,7 +246,6 @@ public function getErrorsByCode(array $codes)
     /**
      * @param int $rowNumber
      * @return ProcessingError[]
-     * @since 2.0.0
      */
     public function getErrorByRowNumber($rowNumber)
     {
@@ -285,7 +262,6 @@ public function getErrorByRowNumber($rowNumber)
      * @param array $excludedCodes
      * @param bool $replaceCodeWithMessage
      * @return array
-     * @since 2.0.0
      */
     public function getRowsGroupedByErrorCode(
         array $errorCode = [],
@@ -317,7 +293,6 @@ public function getRowsGroupedByErrorCode(
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getAllowedErrorsCount()
     {
@@ -327,7 +302,6 @@ public function getAllowedErrorsCount()
     /**
      * @param string[] $errorLevels
      * @return int
-     * @since 2.0.0
      */
     public function getErrorsCount(
         array $errorLevels = [
@@ -345,7 +319,6 @@ public function getErrorsCount(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -361,7 +334,6 @@ public function clear()
      * @param int $rowNum
      * @param string $errorCode
      * @return bool
-     * @since 2.0.0
      */
     protected function isErrorAlreadyAdded($rowNum, $errorCode)
     {
@@ -379,7 +351,6 @@ protected function isErrorAlreadyAdded($rowNum, $errorCode)
      * @param string $errorMessage
      * @param string $columnName
      * @return string
-     * @since 2.0.0
      */
     protected function getErrorMessage($errorCode, $errorMessage, $columnName)
     {
@@ -399,7 +370,6 @@ protected function getErrorMessage($errorCode, $errorMessage, $columnName)
     /**
      * @param string $errorLevel
      * @return $this
-     * @since 2.0.0
      */
     protected function processErrorStatistics($errorLevel)
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregatorInterface.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregatorInterface.php
index 3c1c3776c4be2..165894cffe72e 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregatorInterface.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregatorInterface.php
@@ -10,7 +10,6 @@
  * Interface for Processing errors Aggregator
  *
  * @api
- * @since 2.0.0
  */
 interface ProcessingErrorAggregatorInterface
 {
@@ -27,7 +26,6 @@ interface ProcessingErrorAggregatorInterface
      * @param string|null $errorMessage
      * @param string|null $errorDescription
      * @return $this
-     * @since 2.0.0
      */
     public function addError(
         $errorCode,
@@ -43,7 +41,6 @@ public function addError(
      *
      * @param int $rowNumber
      * @return $this
-     * @since 2.0.0
      */
     public function addRowToSkip($rowNumber);
 
@@ -53,7 +50,6 @@ public function addRowToSkip($rowNumber);
      * @param string $code
      * @param string|object $template
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorMessageTemplate($code, $template);
 
@@ -62,7 +58,6 @@ public function addErrorMessageTemplate($code, $template);
      *
      * @param int $rowNumber
      * @return bool
-     * @since 2.0.0
      */
     public function isRowInvalid($rowNumber);
 
@@ -70,7 +65,6 @@ public function isRowInvalid($rowNumber);
      * Get invalid rows count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getInvalidRowsCount();
 
@@ -81,7 +75,6 @@ public function getInvalidRowsCount();
      * @param int $allowedErrorCount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function initValidationStrategy($validationStrategy, $allowedErrorCount = 0);
 
@@ -89,7 +82,6 @@ public function initValidationStrategy($validationStrategy, $allowedErrorCount =
      * Check if the further processing should be stopped
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasToBeTerminated();
 
@@ -97,7 +89,6 @@ public function hasToBeTerminated();
      * Check if errors limit is exceeded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isErrorLimitExceeded();
 
@@ -105,7 +96,6 @@ public function isErrorLimitExceeded();
      * Check if the aggregator contains error(s) with fatal exception code
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasFatalExceptions();
 
@@ -113,7 +103,6 @@ public function hasFatalExceptions();
      * Get all error(s) entities which has been added to the aggregator
      *
      * @return ProcessingError[]
-     * @since 2.0.0
      */
     public function getAllErrors();
 
@@ -122,7 +111,6 @@ public function getAllErrors();
      *
      * @param array $codes
      * @return array
-     * @since 2.0.0
      */
     public function getErrorsByCode(array $codes);
 
@@ -131,7 +119,6 @@ public function getErrorsByCode(array $codes);
      *
      * @param int $rowNumber
      * @return ProcessingError[]
-     * @since 2.0.0
      */
     public function getErrorByRowNumber($rowNumber);
 
@@ -142,7 +129,6 @@ public function getErrorByRowNumber($rowNumber);
      * @param array $excludedCodes
      * @param bool|true $replaceCodeWithMessage
      * @return mixed
-     * @since 2.0.0
      */
     public function getRowsGroupedByErrorCode(
         array $errorCode = [],
@@ -154,7 +140,6 @@ public function getRowsGroupedByErrorCode(
      * Get allowed errors count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getAllowedErrorsCount();
 
@@ -163,7 +148,6 @@ public function getAllowedErrorsCount();
      *
      * @param string[] $errorLevels
      * @return int
-     * @since 2.0.0
      */
     public function getErrorsCount(
         array $errorLevels = [
@@ -176,7 +160,6 @@ public function getErrorsCount(
      * Clear all aggregated data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear();
 }
diff --git a/app/code/Magento/ImportExport/Model/Import/Source/Csv.php b/app/code/Magento/ImportExport/Model/Import/Source/Csv.php
index a068feff8098b..ad95ca4d45cc4 100644
--- a/app/code/Magento/ImportExport/Model/Import/Source/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Import/Source/Csv.php
@@ -7,13 +7,11 @@
 
 /**
  * CSV import adapter
- * @since 2.0.0
  */
 class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
 {
     /**
      * @var \Magento\Framework\Filesystem\File\Write
-     * @since 2.0.0
      */
     protected $_file;
 
@@ -21,13 +19,11 @@ class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
      * Delimiter.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_delimiter = ',';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_enclosure = '';
 
@@ -41,7 +37,6 @@ class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
      * @param string $delimiter
      * @param string $enclosure
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function __construct(
         $file,
@@ -66,7 +61,6 @@ public function __construct(
      * Close file handle
      *
      * @return void
-     * @since 2.0.0
      */
     public function destruct()
     {
@@ -79,7 +73,6 @@ public function destruct()
      * Read next line from CSV-file
      *
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _getNextRow()
     {
@@ -101,7 +94,6 @@ protected function _getNextRow()
      * Rewind the \Iterator to the first element (\Iterator interface)
      *
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
index 9716253507025..b7fafc43ca4ed 100644
--- a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
+++ b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
@@ -7,7 +7,6 @@
 
 /**
  * Zip import adapter.
- * @since 2.0.0
  */
 class Zip extends Csv
 {
@@ -15,7 +14,6 @@ class Zip extends Csv
      * @param string $file
      * @param \Magento\Framework\Filesystem\Directory\Write $directory
      * @param string $options
-     * @since 2.0.0
      */
     public function __construct(
         $file,
diff --git a/app/code/Magento/ImportExport/Model/Report/Csv.php b/app/code/Magento/ImportExport/Model/Report/Csv.php
index 21385fd331213..f45910e519847 100644
--- a/app/code/Magento/ImportExport/Model/Report/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Report/Csv.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Csv create new CSV file and add Error data in additional column
- * @since 2.0.0
  */
 class Csv implements ReportProcessorInterface
 {
@@ -24,25 +23,21 @@ class Csv implements ReportProcessorInterface
 
     /**
      * @var \Magento\ImportExport\Helper\Report
-     * @since 2.0.0
      */
     protected $reportHelper;
 
     /**
      * @var \Magento\ImportExport\Model\Import\Source\CsvFactory
-     * @since 2.0.0
      */
     protected $sourceCsvFactory;
 
     /**
      * @var \Magento\ImportExport\Model\Export\Adapter\CsvFactory
-     * @since 2.0.0
      */
     protected $outputCsvFactory;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -51,7 +46,6 @@ class Csv implements ReportProcessorInterface
      * @param Import\Source\CsvFactory $sourceCsvFactory
      * @param \Magento\ImportExport\Model\Export\Adapter\CsvFactory $outputCsvFactory
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\ImportExport\Helper\Report $reportHelper,
@@ -71,7 +65,6 @@ public function __construct(
      * @param bool $writeOnlyErrorItems
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createReport(
         $originalFileName,
@@ -102,7 +95,6 @@ public function createReport(
      * @param int $rowNumber
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
-     * @since 2.0.0
      */
     public function retrieveErrorMessagesByRowNumber($rowNumber, ProcessingErrorAggregatorInterface $errorAggregator)
     {
@@ -122,7 +114,6 @@ public function retrieveErrorMessagesByRowNumber($rowNumber, ProcessingErrorAggr
     /**
      * @param string $sourceFile
      * @return string
-     * @since 2.0.0
      */
     protected function generateOutputFileName($sourceFile)
     {
@@ -133,7 +124,6 @@ protected function generateOutputFileName($sourceFile)
     /**
      * @param string $sourceFile
      * @return \Magento\ImportExport\Model\Import\Source\Csv
-     * @since 2.0.0
      */
     protected function createSourceCsvModel($sourceFile)
     {
@@ -148,7 +138,6 @@ protected function createSourceCsvModel($sourceFile)
     /**
      * @param string $outputFileName
      * @return \Magento\ImportExport\Model\Export\Adapter\Csv
-     * @since 2.0.0
      */
     protected function createOutputCsvModel($outputFileName)
     {
diff --git a/app/code/Magento/ImportExport/Model/Report/ReportProcessorInterface.php b/app/code/Magento/ImportExport/Model/Report/ReportProcessorInterface.php
index 3b1d8c6a2fdac..a87f543146a57 100644
--- a/app/code/Magento/ImportExport/Model/Report/ReportProcessorInterface.php
+++ b/app/code/Magento/ImportExport/Model/Report/ReportProcessorInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Error report generator interface
- * @since 2.0.0
  */
 interface ReportProcessorInterface
 {
@@ -19,7 +18,6 @@ interface ReportProcessorInterface
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @param bool $writeOnlyErrorItems
      * @return string
-     * @since 2.0.0
      */
     public function createReport(
         $originalFileName,
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php b/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
index 0cd8d934f4bfd..4e6a2aca598ad 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
@@ -9,7 +9,6 @@
  * Collection by pages iterator
  *
  * @api
- * @since 2.0.0
  */
 class CollectionByPagesIterator
 {
@@ -20,7 +19,6 @@ class CollectionByPagesIterator
      * @param int $pageSize Number of items to fetch from db in one query
      * @param array $callbacks Array of callbacks which should be applied to each collection item
      * @return void
-     * @since 2.0.0
      */
     public function iterate(\Magento\Framework\Data\Collection\AbstractDb $collection, $pageSize, array $callbacks)
     {
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/Helper.php b/app/code/Magento/ImportExport/Model/ResourceModel/Helper.php
index 3efd080bbccbd..d1005bed4bb65 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/Helper.php
@@ -9,7 +9,6 @@
  * ImportExport MySQL resource helper model
  *
  * @api
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper
 {
@@ -26,7 +25,6 @@ class Helper extends \Magento\Framework\DB\Helper
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'importexport')
     {
@@ -37,7 +35,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
      * Returns maximum size of packet, that we can send to DB
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaxDataSize()
     {
@@ -51,7 +48,6 @@ public function getMaxDataSize()
      *
      * @param string $tableName Real table name in DB
      * @return int
-     * @since 2.0.0
      */
     public function getNextAutoincrement($tableName)
     {
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/History.php b/app/code/Magento/ImportExport/Model/ResourceModel/History.php
index 16c0fde6ec157..9596a6082e507 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/History.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/History.php
@@ -9,7 +9,6 @@
  * Class History
  *
  * @api
- * @since 2.0.0
  */
 class History extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class History extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param string $userId
      * @return int $lastId
-     * @since 2.0.0
      */
     public function getLastInsertedId($userId)
     {
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php b/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
index 260cedefaaedc..73ea248a2214b 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
@@ -11,7 +11,6 @@
  * Import history collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Link table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_linkTable;
 
@@ -27,7 +25,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model and assign link table name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +39,6 @@ protected function _construct()
      * Init select
      *
      * @return \Magento\ImportExport\Model\ResourceModel\History\Collection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php b/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
index 764a07084c157..c4cd42a944ebb 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
@@ -9,13 +9,11 @@
  * ImportExport import data resource model
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements \IteratorAggregate
 {
     /**
      * @var \Iterator
-     * @since 2.0.0
      */
     protected $_iterator = null;
 
@@ -23,7 +21,6 @@ class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * Helper to encode/decode json
      *
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -33,7 +30,6 @@ class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +54,6 @@ protected function _construct()
      * Retrieve an external iterator
      *
      * @return \Iterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -83,7 +77,6 @@ public function getIterator()
      * Clean all bunches from table.
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function cleanBunches()
     {
@@ -94,7 +87,6 @@ public function cleanBunches()
      * Return behavior from import data table.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBehavior()
     {
@@ -105,7 +97,6 @@ public function getBehavior()
      * Return entity type code from import data table.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityTypeCode()
     {
@@ -118,7 +109,6 @@ public function getEntityTypeCode()
      * @param string $code parameter name
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getUniqueColumnData($code)
     {
@@ -137,7 +127,6 @@ public function getUniqueColumnData($code)
      * Get next bunch of validated rows.
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getNextBunch()
     {
@@ -166,7 +155,6 @@ public function getNextBunch()
      * @param string $behavior
      * @param array $data
      * @return int
-     * @since 2.0.0
      */
     public function saveBunch($entity, $behavior, array $data)
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Export/Entity.php b/app/code/Magento/ImportExport/Model/Source/Export/Entity.php
index e1c8c693e41c4..c5af519ba06b7 100644
--- a/app/code/Magento/ImportExport/Model/Source/Export/Entity.php
+++ b/app/code/Magento/ImportExport/Model/Source/Export/Entity.php
@@ -9,19 +9,16 @@
  * Source export entity model
  *
  * @api
- * @since 2.0.0
  */
 class Entity implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\ImportExport\Model\Export\ConfigInterface
-     * @since 2.0.0
      */
     protected $_exportConfig;
 
     /**
      * @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\ImportExport\Model\Export\ConfigInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Export/Format.php b/app/code/Magento/ImportExport/Model/Source/Export/Format.php
index 77dc8865d0bbc..fcb67b7fe0565 100644
--- a/app/code/Magento/ImportExport/Model/Source/Export/Format.php
+++ b/app/code/Magento/ImportExport/Model/Source/Export/Format.php
@@ -9,19 +9,16 @@
  * Source model of export file formats
  *
  * @api
- * @since 2.0.0
  */
 class Format implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\ImportExport\Model\Export\ConfigInterface
-     * @since 2.0.0
      */
     protected $_exportConfig;
 
     /**
      * @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\ImportExport\Model\Export\ConfigInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
index ba1d8b229e1dc..55533044b33f1 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
@@ -9,7 +9,6 @@
  * Source import behavior model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractBehavior implements \Magento\Framework\Option\ArrayInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractBehavior implements \Magento\Framework\Option\ArrayInterf
      *
      * @abstract
      * @return array
-     * @since 2.0.0
      */
     abstract public function toArray();
 
@@ -26,7 +24,6 @@ abstract public function toArray();
      * Prepare and return array of option values
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -45,7 +42,6 @@ public function toOptionArray()
      *
      * @abstract
      * @return string
-     * @since 2.0.0
      */
     abstract public function getCode();
 
@@ -55,7 +51,6 @@ abstract public function getCode();
      * @param string $entityCode
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getNotes($entityCode)
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
index 878b345ecae6b..f8e82c5aaeb68 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
@@ -9,13 +9,11 @@
  * Import behavior source model used for defining the behaviour during the import.
  *
  * @api
- * @since 2.0.0
  */
 class Basic extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -28,7 +26,6 @@ public function toArray()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -37,7 +34,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNotes($entityCode)
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Custom.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Custom.php
index 5722de69281d1..5bd7ee57b0321 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Custom.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Custom.php
@@ -9,13 +9,11 @@
  * Import behavior source model
  *
  * @api
- * @since 2.0.0
  */
 class Custom extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -28,7 +26,6 @@ public function toArray()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Factory.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Factory.php
index 2d5a2141ffbe3..48d70227afa42 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\ImportExport\Model\Source\Import\Behavior\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,13 +19,11 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @return \Magento\ImportExport\Model\Source\Import\AbstractBehavior
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Entity.php b/app/code/Magento/ImportExport/Model/Source/Import/Entity.php
index be61ad088c28c..85077960c8251 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Entity.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Entity.php
@@ -9,19 +9,16 @@
  * Source import entity model
  *
  * @api
- * @since 2.0.0
  */
 class Entity implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\ImportExport\Model\Import\ConfigInterface
-     * @since 2.0.0
      */
     protected $_importConfig;
 
     /**
      * @param \Magento\ImportExport\Model\Import\ConfigInterface $importConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\ImportExport\Model\Import\ConfigInterface $importConfig)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\ImportExport\Model\Import\ConfigInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/ImportExport/Setup/InstallSchema.php b/app/code/Magento/ImportExport/Setup/InstallSchema.php
index 573009fd85d0b..e40f1212f6f09 100644
--- a/app/code/Magento/ImportExport/Setup/InstallSchema.php
+++ b/app/code/Magento/ImportExport/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php b/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
index 7de9ead7e9c97..f02ca7c738150 100644
--- a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
+++ b/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Indexer/App/Indexer.php b/app/code/Magento/Indexer/App/Indexer.php
index 5267f05c86c18..726655575d21a 100644
--- a/app/code/Magento/Indexer/App/Indexer.php
+++ b/app/code/Magento/Indexer/App/Indexer.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Indexer\App\Indexer
  *
- * @since 2.0.0
  */
 class Indexer implements \Magento\Framework\AppInterface
 {
@@ -19,19 +18,16 @@ class Indexer implements \Magento\Framework\AppInterface
      * Report directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $reportDir;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\Framework\App\Console\Response
-     * @since 2.0.0
      */
     protected $_response;
 
@@ -40,7 +36,6 @@ class Indexer implements \Magento\Framework\AppInterface
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Indexer\Model\Processor $processor
      * @param \Magento\Framework\App\Console\Response $response
-     * @since 2.0.0
      */
     public function __construct(
         $reportDir,
@@ -58,7 +53,6 @@ public function __construct(
      * Run application
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -78,7 +72,6 @@ public function launch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(App\Bootstrap $bootstrap, \Exception $exception)
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Container.php b/app/code/Magento/Indexer/Block/Backend/Container.php
index f38dfa5e63876..9bc47fc06213a 100644
--- a/app/code/Magento/Indexer/Block/Backend/Container.php
+++ b/app/code/Magento/Indexer/Block/Backend/Container.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Container extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -15,7 +14,6 @@ class Container extends \Magento\Backend\Block\Widget\Grid\Container
      * Initialize object state with incoming parameters
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Scheduled.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Scheduled.php
index 680b49b0f8ace..7da00dbce43a7 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Scheduled.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Scheduled.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Scheduled
  *
- * @since 2.0.0
  */
 class Scheduled extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Scheduled extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstr
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php
index 5a41debefffbf..200134bca35ba 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Status
  *
- * @since 2.0.0
  */
 class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
index fb35563a855cf..9dcbc8888a8c4 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Updated
  *
- * @since 2.0.0
  */
 class Updated extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Datetime
 {
@@ -17,7 +16,6 @@ class Updated extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Datetim
      *
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php b/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php
index 10a71180f1c79..9511ba7a4e63b 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Indexer\Block\Backend\Grid\ItemsUpdater
  *
- * @since 2.0.0
  */
 class ItemsUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $authorization;
 
     /**
      * @param \Magento\Framework\AuthorizationInterface $authorization
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\AuthorizationInterface $authorization)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\AuthorizationInterface $authoriza
      * Remove massaction items in case they disallowed for user
      * @param mixed $argument
      * @return mixed
-     * @since 2.0.0
      */
     public function update($argument)
     {
diff --git a/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
index 82dca47784701..e08a02355f332 100644
--- a/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
@@ -15,19 +15,16 @@
 
 /**
  * An Abstract class for Indexer related commands.
- * @since 2.0.0
  */
 abstract class AbstractIndexerCommand extends Command
 {
     /**
      * @var ObjectManagerFactory
-     * @since 2.0.0
      */
     private $objectManagerFactory;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -42,7 +39,6 @@ abstract class AbstractIndexerCommand extends Command
      *
      * @param ObjectManagerFactory $objectManagerFactory
      * @param \Magento\Indexer\Model\Indexer\CollectionFactory|null $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
@@ -57,7 +53,6 @@ public function __construct(
      * Get all indexers
      *
      * @return IndexerInterface[]
-     * @since 2.0.0
      */
     protected function getAllIndexers()
     {
@@ -68,7 +63,6 @@ protected function getAllIndexers()
      * Gets initialized object manager
      *
      * @return ObjectManagerInterface
-     * @since 2.0.0
      */
     protected function getObjectManager()
     {
diff --git a/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php b/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
index 28ec3101498c4..72c1ba2d501a6 100644
--- a/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
@@ -15,7 +15,6 @@
 
 /**
  * An Abstract class for all Indexer related commands.
- * @since 2.0.0
  */
 abstract class AbstractIndexerManageCommand extends AbstractIndexerCommand
 {
@@ -51,7 +50,6 @@ public function __construct(
      * @param InputInterface $input
      * @return IndexerInterface[]
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getIndexers(InputInterface $input)
     {
@@ -93,7 +91,6 @@ protected function getIndexers(InputInterface $input)
      * Get list of options and arguments for the command
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getInputList()
     {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
index 6ead08a3369bc..af3d42d9a670e 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
@@ -10,13 +10,11 @@
 
 /**
  * Command for displaying information related to indexers.
- * @since 2.0.0
  */
 class IndexerInfoCommand extends AbstractIndexerCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -25,7 +23,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 3330ad9b26b67..a700f16720d56 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -15,7 +15,6 @@
 
 /**
  * Command to run indexers
- * @since 2.0.0
  */
 class IndexerReindexCommand extends AbstractIndexerManageCommand
 {
@@ -54,7 +53,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -67,7 +65,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
index 5f4000a401604..a184db660cdc3 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
@@ -13,7 +13,6 @@
 
 /**
  * Command for setting index mode for indexers.
- * @since 2.0.0
  */
 class IndexerSetModeCommand extends AbstractIndexerManageCommand
 {
@@ -27,7 +26,6 @@ class IndexerSetModeCommand extends AbstractIndexerManageCommand
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -40,7 +38,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -84,7 +81,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Get list of arguments for the command
      *
      * @return InputOption[]
-     * @since 2.0.0
      */
     public function getInputList()
     {
@@ -102,7 +98,6 @@ public function getInputList()
      *
      * @param InputInterface $input
      * @return string[]
-     * @since 2.0.0
      */
     public function validate(InputInterface $input)
     {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
index e595671cb99d2..4d063e86fcb90 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
@@ -10,13 +10,11 @@
 
 /**
  * Command for displaying current index mode for indexers.
- * @since 2.0.0
  */
 class IndexerShowModeCommand extends AbstractIndexerManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -29,7 +27,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
index 0ee4c0bf4e1b7..6590f6e0af99d 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
@@ -10,13 +10,11 @@
 
 /**
  * Command for displaying status of indexers.
- * @since 2.0.0
  */
 class IndexerStatusCommand extends AbstractIndexerManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -29,7 +27,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php
index 747824ea31a6d..47e294f2bcb73 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Controller\Adminhtml\Indexer
  *
- * @since 2.0.0
  */
 abstract class Indexer extends \Magento\Backend\App\Action
 {
@@ -16,7 +15,6 @@ abstract class Indexer extends \Magento\Backend\App\Action
      * Check ACL permissions
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
index f68cdd8fb2d43..fec2aab8bd381 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Indexer\Controller\Adminhtml\Indexer\ListAction
  *
- * @since 2.0.0
  */
 class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer
 {
@@ -17,7 +16,6 @@ class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer
      * Display processes grid action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
index 98fa9fe39f9d2..f96c1c66a6cdd 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Indexer\Controller\Adminhtml\Indexer\MassChangelog
  *
- * @since 2.0.0
  */
 class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer
 {
@@ -17,7 +16,6 @@ class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer
      * Turn mview on for the given indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
index 745050b98441a..6a6be1543536a 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Indexer\Controller\Adminhtml\Indexer\MassOnTheFly
  *
- * @since 2.0.0
  */
 class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer
 {
@@ -17,7 +16,6 @@ class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer
      * Turn mview off for the given indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Cron/ClearChangelog.php b/app/code/Magento/Indexer/Cron/ClearChangelog.php
index 1ac4bf8315736..f8c3cc7a1e862 100644
--- a/app/code/Magento/Indexer/Cron/ClearChangelog.php
+++ b/app/code/Magento/Indexer/Cron/ClearChangelog.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Indexer\Cron\ClearChangelog
  *
- * @since 2.0.0
  */
 class ClearChangelog
 {
     /**
      * @var \Magento\Indexer\Model\Processor
-     * @since 2.0.0
      */
     protected $processor;
 
     /**
      * @param \Magento\Indexer\Model\Processor $processor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Indexer\Model\Processor $processor
@@ -32,7 +29,6 @@ public function __construct(
      * Clean indexer view changelogs
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Cron/ReindexAllInvalid.php b/app/code/Magento/Indexer/Cron/ReindexAllInvalid.php
index 959546a2bf44f..590b78c96d6d7 100644
--- a/app/code/Magento/Indexer/Cron/ReindexAllInvalid.php
+++ b/app/code/Magento/Indexer/Cron/ReindexAllInvalid.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Indexer\Cron\ReindexAllInvalid
  *
- * @since 2.0.0
  */
 class ReindexAllInvalid
 {
     /**
      * @var \Magento\Indexer\Model\Processor
-     * @since 2.0.0
      */
     protected $processor;
 
     /**
      * @param \Magento\Indexer\Model\Processor $processor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Indexer\Model\Processor $processor
@@ -34,7 +31,6 @@ public function __construct(
      * Regenerate indexes for all invalid indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Cron/UpdateMview.php b/app/code/Magento/Indexer/Cron/UpdateMview.php
index b9e983293c055..31a792a3634bf 100644
--- a/app/code/Magento/Indexer/Cron/UpdateMview.php
+++ b/app/code/Magento/Indexer/Cron/UpdateMview.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Indexer\Cron\UpdateMview
  *
- * @since 2.0.0
  */
 class UpdateMview
 {
     /**
      * @var \Magento\Indexer\Model\Processor
-     * @since 2.0.0
      */
     protected $processor;
 
     /**
      * @param \Magento\Indexer\Model\Processor $processor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Indexer\Model\Processor $processor
@@ -32,7 +29,6 @@ public function __construct(
      * Regenerate indexes for all invalid indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Indexer/Model/Config.php b/app/code/Magento/Indexer/Model/Config.php
index dc8fe7f0f913c..e69b3174f527d 100644
--- a/app/code/Magento/Indexer/Model/Config.php
+++ b/app/code/Magento/Indexer/Model/Config.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Indexer\Model\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var Config\Data
-     * @since 2.0.0
      */
     protected $configData;
 
     /**
      * @param Config\Data $configData
-     * @since 2.0.0
      */
     public function __construct(Config\Data $configData)
     {
@@ -33,7 +30,6 @@ public function __construct(Config\Data $configData)
      * Get indexers list
      *
      * @return array[]
-     * @since 2.0.0
      */
     public function getIndexers()
     {
@@ -45,7 +41,6 @@ public function getIndexers()
      *
      * @param string $indexerId
      * @return array
-     * @since 2.0.0
      */
     public function getIndexer($indexerId)
     {
diff --git a/app/code/Magento/Indexer/Model/Config/Data.php b/app/code/Magento/Indexer/Model/Config/Data.php
index c15d47a053819..6434d5a585b90 100644
--- a/app/code/Magento/Indexer/Model/Config/Data.php
+++ b/app/code/Magento/Indexer/Model/Config/Data.php
@@ -10,13 +10,11 @@
 
 /**
  * Provides indexer configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
     /**
      * @var \Magento\Indexer\Model\ResourceModel\Indexer\State\Collection
-     * @since 2.0.0
      */
     protected $stateCollection;
 
@@ -28,7 +26,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Indexer\Model\ResourceModel\Indexer\State\Collection $stateCollection
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Indexer\Config\Reader $reader,
@@ -52,7 +49,6 @@ public function __construct(
      * Delete all states that are not in configuration
      *
      * @return void
-     * @since 2.0.0
      */
     protected function deleteNonexistentStates()
     {
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 4b13b307f4ba7..08d6f2f147da8 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -15,55 +15,46 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Indexer extends \Magento\Framework\DataObject implements IdxInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'indexer_id';
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
     /**
      * @var StructureFactory
-     * @since 2.0.0
      */
     protected $structureFactory;
 
     /**
      * @var \Magento\Framework\Mview\ViewInterface
-     * @since 2.0.0
      */
     protected $view;
 
     /**
      * @var \Magento\Indexer\Model\Indexer\StateFactory
-     * @since 2.0.0
      */
     protected $stateFactory;
 
     /**
      * @var \Magento\Indexer\Model\Indexer\State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @var Indexer\CollectionFactory
-     * @since 2.0.0
      */
     protected $indexersFactory;
 
@@ -76,7 +67,6 @@ class Indexer extends \Magento\Framework\DataObject implements IdxInterface
      * @param Indexer\StateFactory $stateFactory
      * @param Indexer\CollectionFactory $indexersFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $config,
@@ -102,7 +92,6 @@ public function __construct(
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -116,7 +105,6 @@ public function getId()
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -131,7 +119,6 @@ public function setId($id)
      *
      * @param  string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setIdFieldName($name)
     {
@@ -145,7 +132,6 @@ public function setIdFieldName($name)
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -156,7 +142,6 @@ public function getIdFieldName()
      * Return indexer's view ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getViewId()
     {
@@ -167,7 +152,6 @@ public function getViewId()
      * Return indexer action class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionClass()
     {
@@ -178,7 +162,6 @@ public function getActionClass()
      * Return indexer title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -189,7 +172,6 @@ public function getTitle()
      * Return indexer description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -200,7 +182,6 @@ public function getDescription()
      * Return indexer fields
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFields()
     {
@@ -211,7 +192,6 @@ public function getFields()
      * Return indexer sources
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSources()
     {
@@ -222,7 +202,6 @@ public function getSources()
      * Return indexer handlers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHandlers()
     {
@@ -235,7 +214,6 @@ public function getHandlers()
      * @param string $indexerId
      * @return IdxInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function load($indexerId)
     {
@@ -254,7 +232,6 @@ public function load($indexerId)
      * Return related view object
      *
      * @return \Magento\Framework\Mview\ViewInterface
-     * @since 2.0.0
      */
     public function getView()
     {
@@ -268,7 +245,6 @@ public function getView()
      * Return related state object
      *
      * @return StateInterface
-     * @since 2.0.0
      */
     public function getState()
     {
@@ -284,7 +260,6 @@ public function getState()
      *
      * @param StateInterface $state
      * @return IdxInterface
-     * @since 2.0.0
      */
     public function setState(StateInterface $state)
     {
@@ -296,7 +271,6 @@ public function setState(StateInterface $state)
      * Check whether indexer is run by schedule
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScheduled()
     {
@@ -308,7 +282,6 @@ public function isScheduled()
      *
      * @param bool $scheduled
      * @return void
-     * @since 2.0.0
      */
     public function setScheduled($scheduled)
     {
@@ -324,7 +297,6 @@ public function setScheduled($scheduled)
      * Check whether indexer is valid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -335,7 +307,6 @@ public function isValid()
      * Check whether indexer is invalid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInvalid()
     {
@@ -346,7 +317,6 @@ public function isInvalid()
      * Check whether indexer is working
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWorking()
     {
@@ -357,7 +327,6 @@ public function isWorking()
      * Set indexer invalid
      *
      * @return void
-     * @since 2.0.0
      */
     public function invalidate()
     {
@@ -370,7 +339,6 @@ public function invalidate()
      * Return indexer status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -381,7 +349,6 @@ public function getStatus()
      * Return indexer or mview latest updated time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLatestUpdated()
     {
@@ -402,7 +369,6 @@ public function getLatestUpdated()
      * Return indexer action instance
      *
      * @return ActionInterface
-     * @since 2.0.0
      */
     protected function getActionInstance()
     {
@@ -419,7 +385,6 @@ protected function getActionInstance()
      * Return indexer structure instance
      *
      * @return IndexStructureInterface
-     * @since 2.0.0
      */
     protected function getStructureInstance()
     {
@@ -434,7 +399,6 @@ protected function getStructureInstance()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -464,7 +428,6 @@ public function reindexAll()
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function reindexRow($id)
     {
@@ -477,7 +440,6 @@ public function reindexRow($id)
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function reindexList($ids)
     {
diff --git a/app/code/Magento/Indexer/Model/Indexer/Collection.php b/app/code/Magento/Indexer/Model/Indexer/Collection.php
index 6ff1e69599d20..28c478297144c 100644
--- a/app/code/Magento/Indexer/Model/Indexer/Collection.php
+++ b/app/code/Magento/Indexer/Model/Indexer/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Model\Indexer\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection
 {
@@ -16,19 +15,16 @@ class Collection extends \Magento\Framework\Data\Collection
      * Item object class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_itemObjectClass = \Magento\Framework\Indexer\IndexerInterface::class;
 
     /**
      * @var \Magento\Framework\Indexer\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory
-     * @since 2.0.0
      */
     protected $statesFactory;
 
@@ -36,7 +32,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
      * @param \Magento\Framework\Indexer\ConfigInterface $config
      * @param \Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory $statesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -56,7 +51,6 @@ public function __construct(
      * @return \Magento\Indexer\Model\Indexer\Collection
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Indexer/Model/Indexer/State.php b/app/code/Magento/Indexer/Model/Indexer/State.php
index 6fb0f94985ee0..4673d2f4e9037 100644
--- a/app/code/Magento/Indexer/Model/Indexer/State.php
+++ b/app/code/Magento/Indexer/Model/Indexer/State.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Indexer\Model\Indexer\State
  *
- * @since 2.0.0
  */
 class State extends \Magento\Framework\Model\AbstractModel implements StateInterface
 {
@@ -18,7 +17,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements StateInter
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'indexer_state';
 
@@ -26,7 +24,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements StateInter
      * Parameter name in event
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'indexer_state';
 
@@ -36,7 +33,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements StateInter
      * @param \Magento\Indexer\Model\ResourceModel\Indexer\State $resource
      * @param \Magento\Indexer\Model\ResourceModel\Indexer\State\Collection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Return indexer id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIndexerId()
     {
@@ -67,7 +62,6 @@ public function getIndexerId()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIndexerId($value)
     {
@@ -78,7 +72,6 @@ public function setIndexerId($value)
      * Return status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -89,7 +82,6 @@ public function getStatus()
      * Return updated
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated()
     {
@@ -101,7 +93,6 @@ public function getUpdated()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdated($value)
     {
@@ -113,7 +104,6 @@ public function setUpdated($value)
      *
      * @param string $indexerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIndexer($indexerId)
     {
@@ -129,7 +119,6 @@ public function loadByIndexer($indexerId)
      *
      * @param string $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status)
     {
@@ -140,7 +129,6 @@ public function setStatus($status)
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index bc562afaf1312..9af746d71c064 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Indexer\Model\Message\Invalid
  *
- * @since 2.0.0
  */
 class Invalid implements \Magento\Framework\Notification\MessageInterface
 {
     /**
      * @var \Magento\Indexer\Model\Indexer\Collection
-     * @since 2.0.0
      */
     protected $collection;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @param \Magento\Indexer\Model\Indexer\Collection $collection
      * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Indexer\Model\Indexer\Collection $collection,
@@ -42,7 +38,6 @@ public function __construct(
      * Check whether all indices are valid or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -62,7 +57,6 @@ public function isDisplayed()
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -73,7 +67,6 @@ public function getIdentity()
      * Retrieve message text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -91,7 +84,6 @@ public function getText()
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity()
     {
diff --git a/app/code/Magento/Indexer/Model/Mview/View/State.php b/app/code/Magento/Indexer/Model/Mview/View/State.php
index 978b3b1dee4f6..fe1a3a1e8766d 100644
--- a/app/code/Magento/Indexer/Model/Mview/View/State.php
+++ b/app/code/Magento/Indexer/Model/Mview/View/State.php
@@ -7,7 +7,6 @@
 
 /**
  * @method \Magento\Indexer\Model\Mview\View\State setViewId(string $value)
- * @since 2.0.0
  */
 class State extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Mview\View\StateInterface
 {
@@ -15,7 +14,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'mview_state';
 
@@ -23,7 +21,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * Parameter name in event
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'mview_state';
 
@@ -33,7 +30,6 @@ class State extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * @param \Magento\Indexer\Model\ResourceModel\Mview\View\State $resource
      * @param \Magento\Indexer\Model\ResourceModel\Mview\View\State\Collection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @param string $viewId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByView($viewId)
     {
@@ -71,7 +66,6 @@ public function loadByView($viewId)
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -83,7 +77,6 @@ public function beforeSave()
      * Get state view ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getViewId()
     {
@@ -94,7 +87,6 @@ public function getViewId()
      * Get state mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -106,7 +98,6 @@ public function getMode()
      *
      * @param string $mode
      * @return $this
-     * @since 2.0.0
      */
     public function setMode($mode)
     {
@@ -118,7 +109,6 @@ public function setMode($mode)
      * Get state status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -130,7 +120,6 @@ public function getStatus()
      *
      * @param string $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status)
     {
@@ -142,7 +131,6 @@ public function setStatus($status)
      * Get state updated time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated()
     {
@@ -154,7 +142,6 @@ public function getUpdated()
      *
      * @param string|int|\DateTimeInterface $updated
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdated($updated)
     {
@@ -166,7 +153,6 @@ public function setUpdated($updated)
      * Get state version ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersionId()
     {
@@ -178,7 +164,6 @@ public function getVersionId()
      *
      * @param int $versionId
      * @return $this
-     * @since 2.0.0
      */
     public function setVersionId($versionId)
     {
diff --git a/app/code/Magento/Indexer/Model/Processor.php b/app/code/Magento/Indexer/Model/Processor.php
index 94893cc0115b1..de7a78406e9af 100644
--- a/app/code/Magento/Indexer/Model/Processor.php
+++ b/app/code/Magento/Indexer/Model/Processor.php
@@ -12,31 +12,26 @@
 /**
  * Class \Magento\Indexer\Model\Processor
  *
- * @since 2.0.0
  */
 class Processor
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var IndexerFactory
-     * @since 2.0.0
      */
     protected $indexerFactory;
 
     /**
      * @var Indexer\CollectionFactory
-     * @since 2.0.0
      */
     protected $indexersFactory;
 
     /**
      * @var \Magento\Framework\Mview\ProcessorInterface
-     * @since 2.0.0
      */
     protected $mviewProcessor;
 
@@ -45,7 +40,6 @@ class Processor
      * @param IndexerFactory $indexerFactory
      * @param Indexer\CollectionFactory $indexersFactory
      * @param \Magento\Framework\Mview\ProcessorInterface $mviewProcessor
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $config,
@@ -63,7 +57,6 @@ public function __construct(
      * Regenerate indexes for all invalid indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindexAllInvalid()
     {
@@ -94,7 +87,6 @@ public function reindexAllInvalid()
      * Regenerate indexes for all indexers
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -109,7 +101,6 @@ public function reindexAll()
      * Update indexer views
      *
      * @return void
-     * @since 2.0.0
      */
     public function updateMview()
     {
@@ -120,7 +111,6 @@ public function updateMview()
      * Clean indexer view changelogs
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearChangelog()
     {
diff --git a/app/code/Magento/Indexer/Model/Processor/CleanCache.php b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
index dc3212bf17b02..cd211e649f3a8 100644
--- a/app/code/Magento/Indexer/Model/Processor/CleanCache.php
+++ b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
@@ -10,32 +10,32 @@
 /**
  * Class \Magento\Indexer\Model\Processor\CleanCache
  *
- * @since 2.1.0
+ * @since 2.0.11
  */
 class CleanCache
 {
     /**
      * @var \Magento\Framework\Indexer\CacheContext
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $context;
 
     /**
      * @var \Magento\Framework\Event\Manager
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $cache;
 
     /**
      * @param \Magento\Framework\Indexer\CacheContext $context
      * @param \Magento\Framework\Event\Manager $eventManager
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function __construct(
         \Magento\Framework\Indexer\CacheContext $context,
@@ -51,7 +51,7 @@ public function __construct(
      * @param \Magento\Indexer\Model\Processor $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
     {
@@ -67,7 +67,7 @@ public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
      * @param \Magento\Indexer\Model\Processor $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function afterReindexAllInvalid(\Magento\Indexer\Model\Processor $subject)
     {
@@ -81,8 +81,8 @@ public function afterReindexAllInvalid(\Magento\Indexer\Model\Processor $subject
      * Get cache interface
      *
      * @return \Magento\Framework\App\CacheInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getCache()
     {
diff --git a/app/code/Magento/Indexer/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Indexer/Model/ResourceModel/AbstractResource.php
index e486a52170f75..d660a489f9605 100644
--- a/app/code/Magento/Indexer/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Indexer/Model/ResourceModel/AbstractResource.php
@@ -12,7 +12,6 @@
  * Abstract resource model. Can be used as base for indexer resources
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,7 +19,6 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
      * Constructor
      *
      * @var \Magento\Framework\Indexer\Table\StrategyInterface
-     * @since 2.0.0
      */
     protected $tableStrategy;
 
@@ -30,7 +28,6 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Reindex all
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -57,7 +53,6 @@ public function reindexAll()
      * Get DB adapter for index data processing
      *
      * @return AdapterInterface
-     * @since 2.0.0
      */
     protected function _getIndexAdapter()
     {
@@ -69,7 +64,6 @@ protected function _getIndexAdapter()
      *
      * @param string $table
      * @return string
-     * @since 2.0.0
      */
     public function getIdxTable($table = null)
     {
@@ -83,7 +77,6 @@ public function getIdxTable($table = null)
      * Synchronize data between index storage and original storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function syncData()
     {
@@ -109,7 +102,6 @@ public function syncData()
      * @param string $destTable
      * @param bool $readToIndex data migration direction (true - read=>index, false - index=>read)
      * @return $this
-     * @since 2.0.0
      */
     public function insertFromTable($sourceTable, $destTable, $readToIndex = true)
     {
@@ -135,7 +127,6 @@ public function insertFromTable($sourceTable, $destTable, $readToIndex = true)
      * @param array $columns
      * @param bool $readToIndex data migration direction (true - read=>index, false - index=>read)
      * @return $this
-     * @since 2.0.0
      */
     public function insertFromSelect($select, $destTable, array $columns, $readToIndex = true)
     {
@@ -175,7 +166,6 @@ public function insertFromSelect($select, $destTable, array $columns, $readToInd
      * Clean up temporary index table
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearTemporaryIndexTable()
     {
diff --git a/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State.php b/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State.php
index 03a82b884480b..13e12328c581c 100644
--- a/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State.php
+++ b/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Model\ResourceModel\Indexer\State
  *
- * @since 2.0.0
  */
 class State extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -16,7 +15,6 @@ class State extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State/Collection.php b/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State/Collection.php
index 88ea95dcc2c18..cf7847b76fc05 100644
--- a/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State/Collection.php
+++ b/app/code/Magento/Indexer/Model/ResourceModel/Indexer/State/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Model\ResourceModel\Indexer\State\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State.php b/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State.php
index aaa431cebb772..d6aa1ffc15c7f 100644
--- a/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State.php
+++ b/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Model\ResourceModel\Mview\View\State
  *
- * @since 2.0.0
  */
 class State extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -16,7 +15,6 @@ class State extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State/Collection.php b/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State/Collection.php
index cf9abdd41ce63..57b43993f638a 100644
--- a/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State/Collection.php
+++ b/app/code/Magento/Indexer/Model/ResourceModel/Mview/View/State/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Indexer\Model\ResourceModel\Mview\View\State\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection implements
     \Magento\Framework\Mview\View\State\CollectionInterface
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Indexer/Model/Source/DataInterface.php b/app/code/Magento/Indexer/Model/Source/DataInterface.php
index 7ec40dc3b7029..4c3ed2566f1f2 100644
--- a/app/code/Magento/Indexer/Model/Source/DataInterface.php
+++ b/app/code/Magento/Indexer/Model/Source/DataInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Indexer\Model\Source\DataInterface
  *
- * @since 2.0.0
  */
 interface DataInterface
 {
@@ -18,7 +17,6 @@ interface DataInterface
      * @param array $fieldsData
      * @return array
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function getData(array $fieldsData);
 }
diff --git a/app/code/Magento/Indexer/Model/Source/ServiceSource.php b/app/code/Magento/Indexer/Model/Source/ServiceSource.php
index 7045e141d080d..0f29453fabd65 100644
--- a/app/code/Magento/Indexer/Model/Source/ServiceSource.php
+++ b/app/code/Magento/Indexer/Model/Source/ServiceSource.php
@@ -13,25 +13,21 @@
 /**
  * Class \Magento\Indexer\Model\Source\ServiceSource
  *
- * @since 2.0.0
  */
 class ServiceSource implements DataInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $service;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     private $searchCriteriaBuilder;
 
@@ -39,7 +35,6 @@ class ServiceSource implements DataInterface
      * @param ObjectManagerInterface $objectManager
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param string $service
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getData(array $fieldsData)
     {
@@ -72,7 +66,6 @@ public function getData(array $fieldsData)
      * @param array $fields
      * @return array
      * @throws NotFoundException
-     * @since 2.0.0
      */
     private function getRequestedFields(SearchResults $list, array $fields)
     {
@@ -91,7 +84,6 @@ private function getRequestedFields(SearchResults $list, array $fields)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     private function getService()
     {
diff --git a/app/code/Magento/Indexer/Setup/InstallData.php b/app/code/Magento/Indexer/Setup/InstallData.php
index 96a1b8790e164..98a49d6799b13 100644
--- a/app/code/Magento/Indexer/Setup/InstallData.php
+++ b/app/code/Magento/Indexer/Setup/InstallData.php
@@ -21,7 +21,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -29,31 +28,26 @@ class InstallData implements InstallDataInterface
      * Indexer collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $statesFactory;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     private $encryptor;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     private $encoder;
 
     /**
      * @var StateFactory
-     * @since 2.0.0
      */
     private $stateFactory;
 
@@ -66,7 +60,6 @@ class InstallData implements InstallDataInterface
      * @param EncryptorInterface $encryptor
      * @param EncoderInterface $encoder
      * @internal param StateFactory $stateFactory
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $statesFactory,
@@ -87,7 +80,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Indexer/Setup/InstallSchema.php b/app/code/Magento/Indexer/Setup/InstallSchema.php
index 9f502a5a75bb6..7e20fe78e1eb4 100644
--- a/app/code/Magento/Indexer/Setup/InstallSchema.php
+++ b/app/code/Magento/Indexer/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Indexer/Setup/Recurring.php b/app/code/Magento/Indexer/Setup/Recurring.php
index 169d332f74893..2f1946fab1ab7 100644
--- a/app/code/Magento/Indexer/Setup/Recurring.php
+++ b/app/code/Magento/Indexer/Setup/Recurring.php
@@ -21,7 +21,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Recurring implements InstallSchemaInterface
 {
@@ -29,31 +28,26 @@ class Recurring implements InstallSchemaInterface
      * Indexer collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     private $statesFactory;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     private $encryptor;
 
     /**
      * @var EncoderInterface
-     * @since 2.0.0
      */
     private $encoder;
 
     /**
      * @var StateFactory
-     * @since 2.0.0
      */
     private $stateFactory;
 
@@ -65,7 +59,6 @@ class Recurring implements InstallSchemaInterface
      * @param ConfigInterface $config
      * @param EncryptorInterface $encryptor
      * @param EncoderInterface $encoder
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $statesFactory,
@@ -83,7 +76,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Integration/Api/AdminTokenServiceInterface.php b/app/code/Magento/Integration/Api/AdminTokenServiceInterface.php
index b6cfc673f3903..3b7bcd755f00b 100644
--- a/app/code/Magento/Integration/Api/AdminTokenServiceInterface.php
+++ b/app/code/Magento/Integration/Api/AdminTokenServiceInterface.php
@@ -10,7 +10,6 @@
  * Interface providing token generation for Admins
  *
  * @api
- * @since 2.0.0
  */
 interface AdminTokenServiceInterface
 {
@@ -23,7 +22,6 @@ interface AdminTokenServiceInterface
      * @throws \Magento\Framework\Exception\InputException For invalid input
      * @throws \Magento\Framework\Exception\AuthenticationException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createAdminAccessToken($username, $password);
 
@@ -33,7 +31,6 @@ public function createAdminAccessToken($username, $password);
      * @param int $adminId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function revokeAdminAccessToken($adminId);
 }
diff --git a/app/code/Magento/Integration/Api/AuthorizationServiceInterface.php b/app/code/Magento/Integration/Api/AuthorizationServiceInterface.php
index 65a7cc82aa47f..0f4e5789a938b 100644
--- a/app/code/Magento/Integration/Api/AuthorizationServiceInterface.php
+++ b/app/code/Magento/Integration/Api/AuthorizationServiceInterface.php
@@ -12,7 +12,6 @@
  * Interface for integration permissions management.
  *
  * @api
- * @since 2.0.0
  */
 interface AuthorizationServiceInterface
 {
@@ -30,7 +29,6 @@ interface AuthorizationServiceInterface
      * @param string[] $resources List of resources which should be available to the specified user.
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function grantPermissions($integrationId, $resources);
 
@@ -40,7 +38,6 @@ public function grantPermissions($integrationId, $resources);
      * @param int $integrationId
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function grantAllPermissions($integrationId);
 
@@ -50,7 +47,6 @@ public function grantAllPermissions($integrationId);
      * @param int $integrationId
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function removePermissions($integrationId);
 }
diff --git a/app/code/Magento/Integration/Api/CustomerTokenServiceInterface.php b/app/code/Magento/Integration/Api/CustomerTokenServiceInterface.php
index 80b2b41654fa2..6c6a29cabb67b 100644
--- a/app/code/Magento/Integration/Api/CustomerTokenServiceInterface.php
+++ b/app/code/Magento/Integration/Api/CustomerTokenServiceInterface.php
@@ -10,7 +10,6 @@
  * Interface providing token generation for Customers
  *
  * @api
- * @since 2.0.0
  */
 interface CustomerTokenServiceInterface
 {
@@ -21,7 +20,6 @@ interface CustomerTokenServiceInterface
      * @param string $password
      * @return string Token created
      * @throws \Magento\Framework\Exception\AuthenticationException
-     * @since 2.0.0
      */
     public function createCustomerAccessToken($username, $password);
 
@@ -31,7 +29,6 @@ public function createCustomerAccessToken($username, $password);
      * @param int $customerId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function revokeCustomerAccessToken($customerId);
 }
diff --git a/app/code/Magento/Integration/Api/IntegrationServiceInterface.php b/app/code/Magento/Integration/Api/IntegrationServiceInterface.php
index 154b20a8ec567..331785b5d3438 100644
--- a/app/code/Magento/Integration/Api/IntegrationServiceInterface.php
+++ b/app/code/Magento/Integration/Api/IntegrationServiceInterface.php
@@ -11,7 +11,6 @@
  * Integration Service Interface
  *
  * @api
- * @since 2.0.0
  */
 interface IntegrationServiceInterface
 {
@@ -21,7 +20,6 @@ interface IntegrationServiceInterface
      * @param array $integrationData
      * @return IntegrationModel
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     public function create(array $integrationData);
 
@@ -31,7 +29,6 @@ public function create(array $integrationData);
      * @param int $integrationId
      * @return IntegrationModel
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     public function get($integrationId);
 
@@ -40,7 +37,6 @@ public function get($integrationId);
      *
      * @param string $integrationName
      * @return IntegrationModel
-     * @since 2.0.0
      */
     public function findByName($integrationName);
 
@@ -49,7 +45,6 @@ public function findByName($integrationName);
      *
      * @param int $consumerId
      * @return IntegrationModel
-     * @since 2.0.0
      */
     public function findByConsumerId($consumerId);
 
@@ -58,7 +53,6 @@ public function findByConsumerId($consumerId);
      *
      * @param int $consumerId
      * @return IntegrationModel
-     * @since 2.0.0
      */
     public function findActiveIntegrationByConsumerId($consumerId);
 
@@ -68,7 +62,6 @@ public function findActiveIntegrationByConsumerId($consumerId);
      * @param array $integrationData
      * @return IntegrationModel
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     public function update(array $integrationData);
 
@@ -78,7 +71,6 @@ public function update(array $integrationData);
      * @param int $integrationId
      * @return array Integration data
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     public function delete($integrationId);
 
@@ -87,7 +79,6 @@ public function delete($integrationId);
      *
      * @param int $integrationId
      * @return array
-     * @since 2.0.0
      */
     public function getSelectedResources($integrationId);
 }
diff --git a/app/code/Magento/Integration/Api/OauthServiceInterface.php b/app/code/Magento/Integration/Api/OauthServiceInterface.php
index dda3a62e56ef4..85ef84cf81d32 100644
--- a/app/code/Magento/Integration/Api/OauthServiceInterface.php
+++ b/app/code/Magento/Integration/Api/OauthServiceInterface.php
@@ -11,7 +11,6 @@
  * Integration oAuth Service Interface
  *
  * @api
- * @since 2.0.0
  */
 interface OauthServiceInterface
 {
@@ -28,7 +27,6 @@ interface OauthServiceInterface
      * @return \Magento\Integration\Model\Oauth\Consumer
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function createConsumer($consumerData);
 
@@ -38,7 +36,6 @@ public function createConsumer($consumerData);
      * @param int $consumerId
      * @param bool $clearExistingToken
      * @return bool If token was created
-     * @since 2.0.0
      */
     public function createAccessToken($consumerId, $clearExistingToken = false);
 
@@ -47,7 +44,6 @@ public function createAccessToken($consumerId, $clearExistingToken = false);
      *
      * @param int $consumerId
      * @return OauthTokenModel|bool Return false if no access token is available.
-     * @since 2.0.0
      */
     public function getAccessToken($consumerId);
 
@@ -58,7 +54,6 @@ public function getAccessToken($consumerId);
      * @return \Magento\Integration\Model\Oauth\Consumer
      * @throws \Magento\Framework\Oauth\Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadConsumer($consumerId);
 
@@ -69,7 +64,6 @@ public function loadConsumer($consumerId);
      * @return \Magento\Integration\Model\Oauth\Consumer
      * @throws \Magento\Framework\Oauth\Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadConsumerByKey($key);
 
@@ -81,7 +75,6 @@ public function loadConsumerByKey($key);
      * @return string - The oauth_verifier.
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function postToConsumer($consumerId, $endpointUrl);
 
@@ -90,7 +83,6 @@ public function postToConsumer($consumerId, $endpointUrl);
      *
      * @param int $consumerId
      * @return array Consumer data array
-     * @since 2.0.0
      */
     public function deleteConsumer($consumerId);
 
@@ -99,7 +91,6 @@ public function deleteConsumer($consumerId);
      *
      * @param int $consumerId
      * @return bool If token was deleted
-     * @since 2.0.0
      */
     public function deleteIntegrationToken($consumerId);
 }
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration.php b/app/code/Magento/Integration/Block/Adminhtml/Integration.php
index 4a716eaa5ffea..70db4638f9598 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Integration extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Integration extends \Magento\Backend\Block\Widget\Grid\Container
      * Define actions available on the integrations grid page.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
index a8423711bc22a..cddc9e643f730 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
@@ -14,44 +14,37 @@
  * API permissions tab for integration activation dialog.
  *
  * @api
- * @since 2.0.0
  */
 class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_selectedResources;
 
     /**
      * @var \Magento\Framework\Acl\RootResource
-     * @since 2.0.0
      */
     protected $_rootResource;
 
     /**
      * @var \Magento\Framework\Acl\AclResource\ProviderInterface
-     * @since 2.0.0
      */
     protected $_resourceProvider;
 
     /**
      * @var \Magento\Integration\Helper\Data
-     * @since 2.0.0
      */
     protected $_integrationData;
 
     /**
      * @var \Magento\Framework\Json\Encoder
-     * @since 2.0.0
      */
     protected $encoder;
 
     /**
      * @var \Magento\Integration\Api\IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $integrationService;
 
@@ -67,7 +60,6 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param \Magento\Framework\Json\Encoder $encoder
      * @param \Magento\Integration\Api\IntegrationServiceInterface $integrationService
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +86,6 @@ public function __construct(
      * If everything is allowed, the array will contain just the root resource id, which is "Magento_Backend::all".
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -114,7 +105,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -128,7 +118,6 @@ public function canShowTab()
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -139,7 +128,6 @@ public function getTabLabel()
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -150,7 +138,6 @@ public function getTabTitle()
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -161,7 +148,6 @@ public function isHidden()
      * Check if everything is allowed.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEverythingAllowed()
     {
@@ -172,7 +158,6 @@ public function isEverythingAllowed()
      * Get requested permissions tree.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResourcesTreeJson()
     {
@@ -189,7 +174,6 @@ public function getResourcesTreeJson()
      * returning "Magento_Backend::all".
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectedResourcesJson()
     {
@@ -224,7 +208,6 @@ function ($node) {
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isTreeEmpty()
     {
@@ -236,7 +219,6 @@ public function isTreeEmpty()
      *
      * @param array $resources
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getAllResourceIds(array $resources)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tabs.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tabs.php
index 195c768cd9657..03bf512eb181b 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tabs.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tabs.php
@@ -14,19 +14,16 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Tabs extends TabsWidget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::widget/tabshoriz.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
index 68efecd45fb55..1f6be409f947f 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -20,13 +19,11 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry = null;
 
     /**
      * @var \Magento\Integration\Helper\Data
-     * @since 2.0.0
      */
     protected $_integrationHelper;
 
@@ -37,7 +34,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Integration\Helper\Data $integrationHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Initialize Integration edit page
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -105,7 +100,6 @@ protected function _construct()
      * Get header text for edit page.
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -123,7 +117,6 @@ public function getHeaderText()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFormActionUrl()
     {
@@ -134,7 +127,6 @@ public function getFormActionUrl()
      * Determine whether we create new integration or editing an existing one.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isNewIntegration()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Form.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Form.php
index f8444e622c87b..8692b646ec85e 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Form.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Form.php
@@ -10,7 +10,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
index 8d0ab64c24b08..808ddc5e958a4 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
@@ -12,7 +12,6 @@
  * Main Integration info edit form
  *
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
@@ -43,7 +42,6 @@ class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
      * Set form id prefix, declare fields for integration info
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -62,7 +60,6 @@ protected function _prepareForm()
      * Prepare label for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -73,7 +70,6 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -84,7 +80,6 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -95,7 +90,6 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -108,7 +102,6 @@ public function isHidden()
      * @param \Magento\Framework\Data\Form $form
      * @param array $integrationData
      * @return void
-     * @since 2.0.0
      */
     protected function _addGeneralFieldset($form, $integrationData)
     {
@@ -196,7 +189,6 @@ protected function _addGeneralFieldset($form, $integrationData)
      * @param \Magento\Framework\Data\Form $form
      * @param array $integrationData
      * @return void
-     * @since 2.0.0
      */
     protected function _addDetailsFieldset($form, $integrationData)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
index 26f02e72835d5..a90eefab999d0 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
@@ -13,7 +13,6 @@
  * Class for handling API section within integration.
  *
  * @api
- * @since 2.0.0
  */
 class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -22,7 +21,6 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
      * Root ACL Resource
      *
      * @var \Magento\Framework\Acl\RootResource
-     * @since 2.0.0
      */
     protected $rootResource;
 
@@ -30,19 +28,16 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
      * Acl resource provider
      *
      * @var \Magento\Framework\Acl\AclResource\ProviderInterface
-     * @since 2.0.0
      */
     protected $aclResourceProvider;
 
     /**
      * @var \Magento\Integration\Helper\Data
-     * @since 2.0.0
      */
     protected $integrationData;
 
     /**
      * @var \Magento\Integration\Api\IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $integrationService;
 
@@ -59,7 +54,6 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +77,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Phrase
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -95,7 +88,6 @@ public function getTabLabel()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -106,7 +98,6 @@ public function getTabTitle()
      * Whether tab is available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -121,7 +112,6 @@ public function canShowTab()
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -132,7 +122,6 @@ public function isHidden()
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -179,7 +168,6 @@ protected function retrieveFormResources()
      * Check if everything is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEverythingAllowed()
     {
@@ -190,7 +178,6 @@ public function isEverythingAllowed()
      * Get Json Representation of Resource Tree
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTree()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tabs.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tabs.php
index 86ca63aa7fec8..2650405dd1393 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tabs.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tabs.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -16,7 +15,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Grid.php
index 9cd811df71d71..39054feb1697c 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Grid.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Grid.php
@@ -12,7 +12,6 @@
 /**
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Grid extends BackendGrid
 {
@@ -20,7 +19,6 @@ class Grid extends BackendGrid
      * Disable javascript callback on row clicking.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowClickCallback()
     {
@@ -31,7 +29,6 @@ public function getRowClickCallback()
      * Disable javascript callback on row init.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowInitCallback()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php
index 64c6f4c67a8da..a45c64b300aba 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Tokens extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -29,7 +28,6 @@ class Tokens extends \Magento\Backend\Block\Widget\Form\Generic
      * Set form id prefix, declare fields for integration consumer modal
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -59,7 +57,6 @@ protected function _prepareForm()
      * Return a list of form fields with oAuth credentials.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormFields()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index fe7548b3b2c5b..1345a04b357ab 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -12,13 +12,11 @@
 /**
  * Render HTML <button> tag.
  *
- * @since 2.0.0
  */
 class Button extends AbstractRenderer
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -32,7 +30,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return bool
-     * @since 2.0.0
      */
     protected function _isConfigBasedIntegration(DataObject $row)
     {
@@ -49,7 +46,6 @@ protected function _isConfigBasedIntegration(DataObject $row)
      * @param \Magento\Framework\DataObject $row
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isDisabled(DataObject $row)
     {
@@ -59,7 +55,6 @@ protected function _isDisabled(DataObject $row)
     /**
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getDisabledAttribute(DataObject $row)
     {
@@ -75,7 +70,6 @@ protected function _getDisabledAttribute(DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareAttributes(DataObject $row)
     {
@@ -105,7 +99,6 @@ protected function _prepareAttributes(DataObject $row)
      * Get list of available HTML attributes for this element.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getValidAttributes()
     {
@@ -142,7 +135,6 @@ protected function _getValidAttributes()
      *
      * @param array $attributes Array of attributes
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributesStr($attributes)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Delete.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Delete.php
index 92f13fdd8e5a2..0792a90f02900 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Delete.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Delete.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer\Button\Delete
  *
- * @since 2.0.0
  */
 class Delete extends Button
 {
@@ -22,7 +21,6 @@ class Delete extends Button
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getOnclickAttribute(DataObject $row)
     {
@@ -37,7 +35,6 @@ protected function _getOnclickAttribute(DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getTitleAttribute(DataObject $row)
     {
@@ -49,7 +46,6 @@ protected function _getTitleAttribute(DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return bool
-     * @since 2.0.0
      */
     protected function _isDisabled(DataObject $row)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Edit.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Edit.php
index a0e99525e3eee..14e0b58e735a3 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Edit.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/Edit.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer\Button\Edit
  *
- * @since 2.0.0
  */
 class Edit extends Button
 {
@@ -22,7 +21,6 @@ class Edit extends Button
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getOnclickAttribute(DataObject $row)
     {
@@ -34,7 +32,6 @@ protected function _getOnclickAttribute(DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getTitleAttribute(DataObject $row)
     {
@@ -46,7 +43,6 @@ protected function _getTitleAttribute(DataObject $row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function _getClassAttribute(DataObject $row)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
index 9cadc48aa6fe0..ce75a883f7e62 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer\Link
  *
- * @since 2.0.0
  */
 class Link extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_row;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -33,7 +30,6 @@ class Link extends AbstractRenderer
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(DataObject $row)
     {
@@ -73,7 +68,6 @@ public function render(DataObject $row)
      * Decide whether anything should be rendered.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
@@ -84,7 +78,6 @@ public function isVisible()
      * Decide whether action associated with the link is not available.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisabled()
     {
@@ -96,7 +89,6 @@ public function isDisabled()
      * will be translated to http://.../admin/integration/activate/id/X
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrlPattern()
     {
@@ -107,7 +99,6 @@ public function getUrlPattern()
      * Caption for the link.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCaption()
     {
@@ -124,7 +115,6 @@ public function getCaption()
      * Return additional HTML parameters for tag, e.g. 'style'
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributesHtml()
     {
@@ -144,7 +134,6 @@ protected function _getAttributesHtml()
      * Return additional HTML attributes for the tag.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttributes()
     {
@@ -165,7 +154,6 @@ protected function _getAttributes()
      * - JSON-encoded if necessary
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDataAttributes()
     {
@@ -177,7 +165,6 @@ protected function _getDataAttributes()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl(DataObject $row)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link/Activate.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link/Activate.php
index 1387e3fedbb56..4fc16fbd8af49 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link/Activate.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link/Activate.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer\Link\Activate
  *
- * @since 2.0.0
  */
 class Activate extends Link
 {
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getCaption()
     {
@@ -30,7 +28,6 @@ public function getCaption()
     /**
      * {@inheritDoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getUrl(DataObject $row)
     {
@@ -39,7 +36,6 @@ protected function _getUrl(DataObject $row)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     protected function _getAttributes()
     {
@@ -48,7 +44,6 @@ protected function _getAttributes()
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     protected function _getDataAttributes()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
index cad61141e1ab3..7dbdd38336d16 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
@@ -7,7 +7,6 @@
 
 /**
  * Integration Name Renderer
- * @since 2.0.0
  */
 class Name extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -18,7 +17,6 @@ class Name extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -35,7 +33,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     protected function isUrlSecure($url)
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
index f157881721d5c..04cc660237b3e 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
@@ -12,7 +12,6 @@
  * Controller for integrations management.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Integration extends Action
 {
@@ -36,49 +35,41 @@ abstract class Integration extends Action
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Integration\Api\IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $_integrationService;
 
     /**
      * @var \Magento\Integration\Api\OauthServiceInterface
-     * @since 2.0.0
      */
     protected $_oauthService;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Integration\Helper\Data
-     * @since 2.0.0
      */
     protected $_integrationData;
 
     /**
      * @var \Magento\Integration\Model\ResourceModel\Integration\Collection
-     * @since 2.0.0
      */
     protected $_integrationCollection;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -92,7 +83,6 @@ abstract class Integration extends Action
      * @param \Magento\Integration\Helper\Data $integrationData
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Integration\Model\ResourceModel\Integration\Collection $integrationCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -123,7 +113,6 @@ public function __construct(
      * @param string $path
      * @param array $arguments
      * @return $this|\Magento\Backend\App\AbstractAction
-     * @since 2.0.0
      */
     protected function _redirect($path, $arguments = [])
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 3c7d88cf753bc..61737872cb5fa 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -21,7 +20,6 @@ class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
      * Delete the integration.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
index 13330cae4061d..cc0757cf8289f 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
      * Edit integration action.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
index e81dbe8e0ffd5..dbd3553a23975 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Integration\Controller\Adminhtml\Integration
      * AJAX integrations grid.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
index 7eddc1481e564..5f90cac8c3f10 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Integration\Controller\Adminhtml\Integration
      * Integrations grid.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
index b3a6d040f05c3..472bc71649764 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\LoginSuccessCallback
  *
- * @since 2.0.0
  */
 class LoginSuccessCallback extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -17,7 +16,6 @@ class LoginSuccessCallback extends \Magento\Integration\Controller\Adminhtml\Int
      * Close window after callback has succeeded
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
index 29b6f4602db9a..d102512155fa6 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration
      * New integration action.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
index ec43c5ae0f255..05f007a0c4b6f 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\PermissionsDialog
  *
- * @since 2.0.0
  */
 class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -19,7 +18,6 @@ class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integr
      * Show permissions popup.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index 6d5493d32ea7b..c1890857c131b 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -16,7 +16,6 @@
  * Integration Save controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -46,7 +45,6 @@ private function getSecurityCookie()
      * Save integration action.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -137,7 +135,6 @@ protected function getIntegration($integrationId)
      * Redirect merchant to 'Edit integration' or 'New integration' if error happened during integration save.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _redirectOnSaveError()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
index b4e45a9a7198f..08cc040a53164 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\TokensDialog
  *
- * @since 2.0.0
  */
 class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -21,7 +20,6 @@ class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration
      * @param boolean $isReauthorize Is a re-authorization flow
      * @param string $integrationName Integration name
      * @return void
-     * @since 2.0.0
      */
     protected function _setActivationSuccessMsg($isReauthorize, $integrationName)
     {
@@ -40,7 +38,6 @@ protected function _setActivationSuccessMsg($isReauthorize, $integrationName)
      * Show tokens popup for simple tokens
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
index cf1f72ced55d0..6b0f67ad3b6c3 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Integration\Controller\Adminhtml\Integration\TokensExchange
  *
- * @since 2.0.0
  */
 class TokensExchange extends \Magento\Integration\Controller\Adminhtml\Integration
 {
@@ -21,7 +20,6 @@ class TokensExchange extends \Magento\Integration\Controller\Adminhtml\Integrati
      * @param bool   $isReauthorize
      * @param string $integrationName
      * @return void
-     * @since 2.0.0
      */
     protected function _setActivationInProcessMsg($isReauthorize, $integrationName)
     {
@@ -39,7 +37,6 @@ protected function _setActivationInProcessMsg($isReauthorize, $integrationName)
      * Post consumer credentials for Oauth integration.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Token/Access.php b/app/code/Magento/Integration/Controller/Token/Access.php
index 8e24fc7c4fea3..3fa5693038ee0 100644
--- a/app/code/Magento/Integration/Controller/Token/Access.php
+++ b/app/code/Magento/Integration/Controller/Token/Access.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Integration\Controller\Token\Access
  *
- * @since 2.0.0
  */
 class Access extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Oauth\OauthInterface
-     * @since 2.0.0
      */
     protected $oauthService;
 
     /**
      * @var IntegrationOauthService
-     * @since 2.0.0
      */
     protected $intOauthService;
 
     /**
      * @var IntegrationService
-     * @since 2.0.0
      */
     protected $integrationService;
 
     /**
      * @var \Magento\Framework\Oauth\Helper\Request
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -47,7 +42,6 @@ class Access extends \Magento\Framework\App\Action\Action
      * @param IntegrationOauthService $intOauthService
      * @param IntegrationService $integrationService
      * @param \Magento\Framework\Oauth\Helper\Request $helper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -67,7 +61,6 @@ public function __construct(
      * Initiate AccessToken request operation
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Controller/Token/Request.php b/app/code/Magento/Integration/Controller/Token/Request.php
index d2f999501b71b..7536bea0f0647 100644
--- a/app/code/Magento/Integration/Controller/Token/Request.php
+++ b/app/code/Magento/Integration/Controller/Token/Request.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Integration\Controller\Token\Request
  *
- * @since 2.0.0
  */
 class Request extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var  \Magento\Framework\Oauth\OauthInterface
-     * @since 2.0.0
      */
     protected $oauthService;
 
     /**
      * @var  \Magento\Framework\Oauth\Helper\Request
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -29,7 +26,6 @@ class Request extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Oauth\OauthInterface $oauthService
      * @param \Magento\Framework\Oauth\Helper\Request $helper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      *  Initiate RequestToken request operation
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Cron/CleanExpiredAuthenticationFailures.php b/app/code/Magento/Integration/Cron/CleanExpiredAuthenticationFailures.php
index b0ee765207510..a694ab2cae8bd 100644
--- a/app/code/Magento/Integration/Cron/CleanExpiredAuthenticationFailures.php
+++ b/app/code/Magento/Integration/Cron/CleanExpiredAuthenticationFailures.php
@@ -9,13 +9,13 @@
 
 /**
  * Cron class for clearing log of outdated token request authentication failures.
- * @since 2.1.0
+ * @since 2.0.3
  */
 class CleanExpiredAuthenticationFailures
 {
     /**
      * @var RequestLogWriter
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestLogWriter;
 
@@ -23,7 +23,7 @@ class CleanExpiredAuthenticationFailures
      * Initialize dependencies.
      *
      * @param RequestLogWriter $requestLogWriter
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(
         RequestLogWriter $requestLogWriter
@@ -35,7 +35,7 @@ public function __construct(
      * Clearing log of outdated token request authentication failures.
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function execute()
     {
diff --git a/app/code/Magento/Integration/Helper/Data.php b/app/code/Magento/Integration/Helper/Data.php
index 314ec63add56b..0a1655c990c9a 100644
--- a/app/code/Magento/Integration/Helper/Data.php
+++ b/app/code/Magento/Integration/Helper/Data.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Integration\Helper\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -19,7 +18,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param array $resources
      * @return array
-     * @since 2.0.0
      */
     public function mapResources(array $resources)
     {
@@ -43,7 +41,6 @@ public function mapResources(array $resources)
      *
      * @param array $integrationData
      * @return bool true if integration is created using Config file
-     * @since 2.0.0
      */
     public function isConfigType($integrationData)
     {
diff --git a/app/code/Magento/Integration/Helper/Oauth/Data.php b/app/code/Magento/Integration/Helper/Oauth/Data.php
index af51b8eb39926..df9f41984b6b3 100644
--- a/app/code/Magento/Integration/Helper/Oauth/Data.php
+++ b/app/code/Magento/Integration/Helper/Oauth/Data.php
@@ -7,19 +7,16 @@
 
 /**
  * OAuth View Helper for Controllers
- * @since 2.0.0
  */
 class Data
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -64,7 +61,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * Calculate cleanup possibility for data with lifetime property
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCleanupProbability()
     {
@@ -77,7 +73,6 @@ public function isCleanupProbability()
      * Get cleanup expiration period value from system configuration in minutes
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCleanupExpirationPeriod()
     {
@@ -89,7 +84,6 @@ public function getCleanupExpirationPeriod()
      * Get consumer expiration period value from system configuration in seconds
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConsumerExpirationPeriod()
     {
@@ -101,7 +95,6 @@ public function getConsumerExpirationPeriod()
      * Get the number of consumer post maximum redirects
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConsumerPostMaxRedirects()
     {
@@ -113,7 +106,6 @@ public function getConsumerPostMaxRedirects()
      * Get the number seconds for the consumer post timeout
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConsumerPostTimeout()
     {
diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
index feb7b06ccda20..dff8f0826ad87 100644
--- a/app/code/Magento/Integration/Model/AdminTokenService.php
+++ b/app/code/Magento/Integration/Model/AdminTokenService.php
@@ -17,7 +17,6 @@
 
 /**
  * Class to handle token generation for Admins
- * @since 2.0.0
  */
 class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInterface
 {
@@ -25,7 +24,6 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
      * Token Model
      *
      * @var TokenModelFactory
-     * @since 2.0.0
      */
     private $tokenModelFactory;
 
@@ -33,13 +31,11 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
      * User Model
      *
      * @var UserModel
-     * @since 2.0.0
      */
     private $userModel;
 
     /**
      * @var \Magento\Integration\Model\CredentialsValidator
-     * @since 2.0.0
      */
     private $validatorHelper;
 
@@ -47,13 +43,12 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
      * Token Collection Factory
      *
      * @var TokenCollectionFactory
-     * @since 2.0.0
      */
     private $tokenModelCollectionFactory;
 
     /**
      * @var RequestThrottler
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestThrottler;
 
@@ -64,7 +59,6 @@ class AdminTokenService implements \Magento\Integration\Api\AdminTokenServiceInt
      * @param UserModel $userModel
      * @param TokenCollectionFactory $tokenModelCollectionFactory
      * @param \Magento\Integration\Model\CredentialsValidator $validatorHelper
-     * @since 2.0.0
      */
     public function __construct(
         TokenModelFactory $tokenModelFactory,
@@ -80,7 +74,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createAdminAccessToken($username, $password)
     {
@@ -110,7 +103,6 @@ public function createAdminAccessToken($username, $password)
      * @param int $adminId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function revokeAdminAccessToken($adminId)
     {
@@ -132,8 +124,8 @@ public function revokeAdminAccessToken($adminId)
      * Get request throttler instance
      *
      * @return RequestThrottler
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.3
+     * @since 2.0.3
      */
     private function getRequestThrottler()
     {
diff --git a/app/code/Magento/Integration/Model/AuthorizationService.php b/app/code/Magento/Integration/Model/AuthorizationService.php
index 838e56103a322..1375116bd96d4 100644
--- a/app/code/Magento/Integration/Model/AuthorizationService.php
+++ b/app/code/Magento/Integration/Model/AuthorizationService.php
@@ -23,49 +23,41 @@
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AuthorizationService implements \Magento\Integration\Api\AuthorizationServiceInterface
 {
     /**
      * @var AclBuilder
-     * @since 2.0.0
      */
     protected $_aclBuilder;
 
     /**
      * @var RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
     /**
      * @var RoleCollectionFactory
-     * @since 2.0.0
      */
     protected $_roleCollectionFactory;
 
     /**
      * @var RulesFactory
-     * @since 2.0.0
      */
     protected $_rulesFactory;
 
     /**
      * @var RulesCollectionFactory
-     * @since 2.0.0
      */
     protected $_rulesCollectionFactory;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var RootAclResource
-     * @since 2.0.0
      */
     protected $_rootAclResource;
 
@@ -79,7 +71,6 @@ class AuthorizationService implements \Magento\Integration\Api\AuthorizationServ
      * @param RulesCollectionFactory $rulesCollectionFactory
      * @param Logger $logger
      * @param RootAclResource $rootAclResource
-     * @since 2.0.0
      */
     public function __construct(
         AclBuilder $aclBuilder,
@@ -101,7 +92,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function grantPermissions($integrationId, $resources)
     {
@@ -121,7 +111,6 @@ public function grantPermissions($integrationId, $resources)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function grantAllPermissions($integrationId)
     {
@@ -130,7 +119,6 @@ public function grantAllPermissions($integrationId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removePermissions($integrationId)
     {
@@ -152,7 +140,6 @@ public function removePermissions($integrationId)
      *
      * @param int $integrationId
      * @return \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     protected function _createRole($integrationId)
     {
@@ -172,7 +159,6 @@ protected function _createRole($integrationId)
      *
      * @param int $integrationId
      * @return \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     protected function _deleteRole($integrationId)
     {
@@ -186,7 +172,6 @@ protected function _deleteRole($integrationId)
      *
      * @param int $integrationId
      * @return \Magento\Authorization\Model\Role|false Return false in case when no role associated with user was found.
-     * @since 2.0.0
      */
     protected function _getUserRole($integrationId)
     {
@@ -205,7 +190,6 @@ protected function _getUserRole($integrationId)
      * @param string[] $resources
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _associateResourcesWithRole($role, $resources)
     {
diff --git a/app/code/Magento/Integration/Model/Cache/Type.php b/app/code/Magento/Integration/Model/Cache/Type.php
index eb506b3d53eb6..3c61226eaac10 100644
--- a/app/code/Magento/Integration/Model/Cache/Type.php
+++ b/app/code/Magento/Integration/Model/Cache/Type.php
@@ -7,7 +7,6 @@
 
 /**
  * System / Cache Management / Cache type "Integration Configuration"
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -23,7 +22,6 @@ class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
diff --git a/app/code/Magento/Integration/Model/Cache/TypeIntegration.php b/app/code/Magento/Integration/Model/Cache/TypeIntegration.php
index a0b5622a2619a..ca78974184423 100644
--- a/app/code/Magento/Integration/Model/Cache/TypeIntegration.php
+++ b/app/code/Magento/Integration/Model/Cache/TypeIntegration.php
@@ -8,7 +8,6 @@
 
 /**
  * System / Cache Management / Cache type "Integration Api Configuration"
- * @since 2.0.0
  */
 class TypeIntegration extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -24,7 +23,6 @@ class TypeIntegration extends \Magento\Framework\Cache\Frontend\Decorator\TagSco
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
diff --git a/app/code/Magento/Integration/Model/Config.php b/app/code/Magento/Integration/Model/Config.php
index b07d0981c10c5..c1d2ff6385ecb 100644
--- a/app/code/Magento/Integration/Model/Config.php
+++ b/app/code/Magento/Integration/Model/Config.php
@@ -14,7 +14,6 @@
  *
  * This is a parent class for storing information about Integrations.
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Config
 {
@@ -22,13 +21,11 @@ class Config
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Magento\Integration\Model\Config\Reader
-     * @since 2.0.0
      */
     protected $_configReader;
 
@@ -36,7 +33,6 @@ class Config
      * Array of integrations
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_integrations;
 
@@ -50,7 +46,6 @@ class Config
      * @param Cache\Type $configCacheType
      * @param Config\Reader $configReader
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Cache\Type $configCacheType,
@@ -67,7 +62,6 @@ public function __construct(
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getIntegrations()
     {
diff --git a/app/code/Magento/Integration/Model/Config/Converter.php b/app/code/Magento/Integration/Model/Config/Converter.php
index 1ef6bfa63c1d9..1bd4f4f08a86b 100644
--- a/app/code/Magento/Integration/Model/Config/Converter.php
+++ b/app/code/Magento/Integration/Model/Config/Converter.php
@@ -9,7 +9,6 @@
  * Converter of integration.xml content into array format.
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -26,7 +25,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Integration/Model/Config/Integration/Converter.php b/app/code/Magento/Integration/Model/Config/Integration/Converter.php
index b3974399b95f6..20d8f08aef479 100644
--- a/app/code/Magento/Integration/Model/Config/Integration/Converter.php
+++ b/app/code/Magento/Integration/Model/Config/Integration/Converter.php
@@ -9,7 +9,6 @@
  * Converter of api.xml content into array format.
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -24,7 +23,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Integration/Model/Config/Integration/Reader.php b/app/code/Magento/Integration/Model/Config/Integration/Reader.php
index 65a672390d8f7..0d388902de809 100644
--- a/app/code/Magento/Integration/Model/Config/Integration/Reader.php
+++ b/app/code/Magento/Integration/Model/Config/Integration/Reader.php
@@ -10,7 +10,6 @@
  *
  * @codeCoverageIgnore
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/integrations/integration' => 'name',
@@ -34,7 +32,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Integration/Model/Config/Integration/SchemaLocator.php b/app/code/Magento/Integration/Model/Config/Integration/SchemaLocator.php
index 4c3e80a4815af..5792ce46d9a08 100644
--- a/app/code/Magento/Integration/Model/Config/Integration/SchemaLocator.php
+++ b/app/code/Magento/Integration/Model/Config/Integration/SchemaLocator.php
@@ -11,7 +11,6 @@
  * Integration config schema locator.
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -19,7 +18,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -27,13 +25,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Integration/Model/Config/Reader.php b/app/code/Magento/Integration/Model/Config/Reader.php
index b6b4234f712ba..04901fcb0009c 100644
--- a/app/code/Magento/Integration/Model/Config/Reader.php
+++ b/app/code/Magento/Integration/Model/Config/Reader.php
@@ -9,7 +9,6 @@
  * Service config data reader.
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -17,7 +16,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/integrations/integration' => 'name'];
 
@@ -30,7 +28,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Integration/Model/Config/SchemaLocator.php b/app/code/Magento/Integration/Model/Config/SchemaLocator.php
index 00c8e7f3e3ab3..f4b43516644bd 100644
--- a/app/code/Magento/Integration/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Integration/Model/Config/SchemaLocator.php
@@ -11,7 +11,6 @@
  * Integration config schema locator.
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -19,7 +18,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -27,13 +25,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php b/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
index 899964565f83e..4a1f15a7dd789 100644
--- a/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
+++ b/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
@@ -12,7 +12,6 @@
 /**
  * Class to manage integrations installed from config file
  *
- * @since 2.0.0
  */
 class ConfigBasedIntegrationManager
 {
@@ -42,7 +41,6 @@ class ConfigBasedIntegrationManager
      * @param \Magento\Integration\Api\IntegrationServiceInterface $integrationService
      * @param AclRetriever $aclRetriever
      * @param Config $integrationConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Integration\Api\IntegrationServiceInterface $integrationService,
@@ -60,7 +58,6 @@ public function __construct(
      * @param array $integrationNames
      * @return array
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function processIntegrationConfig(array $integrationNames)
     {
diff --git a/app/code/Magento/Integration/Model/CredentialsValidator.php b/app/code/Magento/Integration/Model/CredentialsValidator.php
index 319b6667a83bb..d736a1f490063 100644
--- a/app/code/Magento/Integration/Model/CredentialsValidator.php
+++ b/app/code/Magento/Integration/Model/CredentialsValidator.php
@@ -10,7 +10,6 @@
 
 /**
  * Validator Helper for user credentials
- * @since 2.0.0
  */
 class CredentialsValidator
 {
@@ -21,7 +20,6 @@ class CredentialsValidator
      * @param string $password
      * @throws InputException
      * @return void
-     * @since 2.0.0
      */
     public function validate($username, $password)
     {
diff --git a/app/code/Magento/Integration/Model/CustomerTokenService.php b/app/code/Magento/Integration/Model/CustomerTokenService.php
index 0d2873f596c1b..f7ba14dc2fb7f 100644
--- a/app/code/Magento/Integration/Model/CustomerTokenService.php
+++ b/app/code/Magento/Integration/Model/CustomerTokenService.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Integration\Model\CustomerTokenService
  *
- * @since 2.0.0
  */
 class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServiceInterface
 {
@@ -26,7 +25,6 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      * Token Model
      *
      * @var TokenModelFactory
-     * @since 2.0.0
      */
     private $tokenModelFactory;
 
@@ -34,13 +32,11 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      * Customer Account Service
      *
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     private $accountManagement;
 
     /**
      * @var \Magento\Integration\Model\CredentialsValidator
-     * @since 2.0.0
      */
     private $validatorHelper;
 
@@ -48,13 +44,12 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      * Token Collection Factory
      *
      * @var TokenCollectionFactory
-     * @since 2.0.0
      */
     private $tokenModelCollectionFactory;
 
     /**
      * @var RequestThrottler
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestThrottler;
 
@@ -65,7 +60,6 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      * @param AccountManagementInterface $accountManagement
      * @param TokenCollectionFactory $tokenModelCollectionFactory
      * @param \Magento\Integration\Model\CredentialsValidator $validatorHelper
-     * @since 2.0.0
      */
     public function __construct(
         TokenModelFactory $tokenModelFactory,
@@ -81,7 +75,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createCustomerAccessToken($username, $password)
     {
@@ -107,7 +100,6 @@ public function createCustomerAccessToken($username, $password)
      * @param int $customerId
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function revokeCustomerAccessToken($customerId)
     {
@@ -129,8 +121,8 @@ public function revokeCustomerAccessToken($customerId)
      * Get request throttler instance
      *
      * @return RequestThrottler
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.3
+     * @since 2.0.3
      */
     private function getRequestThrottler()
     {
diff --git a/app/code/Magento/Integration/Model/Integration.php b/app/code/Magento/Integration/Model/Integration.php
index dfdfc8731f403..a63da3195422c 100644
--- a/app/code/Magento/Integration/Model/Integration.php
+++ b/app/code/Magento/Integration/Model/Integration.php
@@ -27,7 +27,6 @@
  * @method Integration setUpdatedAt(\string $createdAt)
  * @method \Magento\Integration\Model\ResourceModel\Integration getResource()
  * @api
- * @since 2.0.0
  */
 class Integration extends \Magento\Framework\Model\AbstractModel
 {
@@ -78,7 +77,6 @@ class Integration extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -94,7 +92,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -107,7 +104,6 @@ protected function _construct()
      *
      * @param int $consumerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByConsumerId($consumerId)
     {
@@ -119,7 +115,6 @@ public function loadByConsumerId($consumerId)
      *
      * @param int $consumerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadActiveIntegrationByConsumerId($consumerId)
     {
@@ -133,7 +128,6 @@ public function loadActiveIntegrationByConsumerId($consumerId)
      *
      * @return int
      * @api
-     * @since 2.0.0
      */
     public function getStatus()
     {
diff --git a/app/code/Magento/Integration/Model/Integration/Source/Status.php b/app/code/Magento/Integration/Model/Integration/Source/Status.php
index 702ab8191431e..e762db23c6de7 100644
--- a/app/code/Magento/Integration/Model/Integration/Source/Status.php
+++ b/app/code/Magento/Integration/Model/Integration/Source/Status.php
@@ -7,7 +7,6 @@
 
 /**
  * Integration status options.
- * @since 2.0.0
  */
 class Status implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,7 +14,6 @@ class Status implements \Magento\Framework\Option\ArrayInterface
      * Retrieve status options array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Integration/Model/IntegrationConfig.php b/app/code/Magento/Integration/Model/IntegrationConfig.php
index 3505da30898bc..2cde5c8db964f 100644
--- a/app/code/Magento/Integration/Model/IntegrationConfig.php
+++ b/app/code/Magento/Integration/Model/IntegrationConfig.php
@@ -16,7 +16,6 @@
  *
  * This is a parent class for storing information about Integrations.
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class IntegrationConfig
 {
@@ -24,13 +23,11 @@ class IntegrationConfig
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Magento\Integration\Model\Config\Integration\Reader
-     * @since 2.0.0
      */
     protected $_configReader;
 
@@ -38,7 +35,6 @@ class IntegrationConfig
      * Array of integrations with resource permissions from api config
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_integrations;
 
@@ -52,7 +48,6 @@ class IntegrationConfig
      * @param TypeIntegration $configCacheType
      * @param Reader $configReader
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         TypeIntegration $configCacheType,
@@ -69,7 +64,6 @@ public function __construct(
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getIntegrations()
     {
diff --git a/app/code/Magento/Integration/Model/IntegrationService.php b/app/code/Magento/Integration/Model/IntegrationService.php
index de4b536e562d5..6acb692273957 100644
--- a/app/code/Magento/Integration/Model/IntegrationService.php
+++ b/app/code/Magento/Integration/Model/IntegrationService.php
@@ -14,19 +14,16 @@
  * Integration Service.
  *
  * This service is used to interact with integrations.
- * @since 2.0.0
  */
 class IntegrationService implements \Magento\Integration\Api\IntegrationServiceInterface
 {
     /**
      * @var IntegrationFactory
-     * @since 2.0.0
      */
     protected $_integrationFactory;
 
     /**
      * @var IntegrationOauthService
-     * @since 2.0.0
      */
     protected $_oauthService;
 
@@ -35,7 +32,6 @@ class IntegrationService implements \Magento\Integration\Api\IntegrationServiceI
      *
      * @param IntegrationFactory $integrationFactory
      * @param IntegrationOauthService $oauthService
-     * @since 2.0.0
      */
     public function __construct(IntegrationFactory $integrationFactory, IntegrationOauthService $oauthService)
     {
@@ -45,7 +41,6 @@ public function __construct(IntegrationFactory $integrationFactory, IntegrationO
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create(array $integrationData)
     {
@@ -61,7 +56,6 @@ public function create(array $integrationData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function update(array $integrationData)
     {
@@ -77,7 +71,6 @@ public function update(array $integrationData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete($integrationId)
     {
@@ -89,7 +82,6 @@ public function delete($integrationId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($integrationId)
     {
@@ -101,7 +93,6 @@ public function get($integrationId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function findByName($name)
     {
@@ -111,7 +102,6 @@ public function findByName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function findByConsumerId($consumerId)
     {
@@ -121,7 +111,6 @@ public function findByConsumerId($consumerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function findActiveIntegrationByConsumerId($consumerId)
     {
@@ -135,7 +124,6 @@ public function findActiveIntegrationByConsumerId($consumerId)
      * @param string $name
      * @return void
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     private function _checkIntegrationByName($name)
     {
@@ -151,7 +139,6 @@ private function _checkIntegrationByName($name)
      * @param int $integrationId
      * @return IntegrationModel
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     protected function _loadIntegrationById($integrationId)
     {
@@ -167,7 +154,6 @@ protected function _loadIntegrationById($integrationId)
      *
      * @param IntegrationModel $integration
      * @return void
-     * @since 2.0.0
      */
     protected function _addOauthConsumerData(IntegrationModel $integration)
     {
@@ -183,7 +169,6 @@ protected function _addOauthConsumerData(IntegrationModel $integration)
      *
      * @param IntegrationModel $integration
      * @return void
-     * @since 2.0.0
      */
     protected function _addOauthTokenData(IntegrationModel $integration)
     {
@@ -198,7 +183,6 @@ protected function _addOauthTokenData(IntegrationModel $integration)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSelectedResources($integrationId)
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php
index 745bca90e1bb4..78f615581507e 100644
--- a/app/code/Magento/Integration/Model/Oauth/Consumer.php
+++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php
@@ -26,31 +26,27 @@
  * @method Consumer setUpdatedAt() setUpdatedAt(string $date)
  * @method string getRejectedCallbackUrl()
  * @method Consumer setRejectedCallbackUrl() setRejectedCallbackUrl(string $rejectedCallbackUrl)
- * @since 2.0.0
  */
 class Consumer extends \Magento\Framework\Model\AbstractModel implements ConsumerInterface
 {
     /**
      * @var \Magento\Framework\Url\Validator
-     * @since 2.0.0
      */
     protected $urlValidator;
 
     /**
      * @var \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength
-     * @since 2.0.0
      */
     protected $keyLengthValidator;
 
     /**
      * @var  \Magento\Integration\Helper\Oauth\Data
-     * @since 2.0.0
      */
     protected $dataHelper;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $_dateHelper;
 
@@ -63,7 +59,6 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -85,7 +80,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -98,8 +92,8 @@ protected function _construct()
      *
      * @return \Magento\Framework\Stdlib\DateTime\DateTime
      *
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.6
+     * @since 2.0.6
      */
     private function getDateHelper()
     {
@@ -114,7 +108,6 @@ private function getDateHelper()
      * BeforeSave actions
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -125,7 +118,6 @@ public function beforeSave()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -164,7 +156,6 @@ public function validate()
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function loadByKey($key)
     {
@@ -173,7 +164,6 @@ public function loadByKey($key)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getKey()
     {
@@ -182,7 +172,6 @@ public function getKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSecret()
     {
@@ -191,7 +180,6 @@ public function getSecret()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCallbackUrl()
     {
@@ -200,7 +188,6 @@ public function getCallbackUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -209,7 +196,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValidForTokenExchange()
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
index e59d98f123bf5..f896f92d5768b 100644
--- a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
+++ b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
@@ -7,7 +7,6 @@
 
 /**
  * Validate OAuth keys
- * @since 2.0.0
  */
 class KeyLength extends \Zend_Validate_StringLength
 {
@@ -15,13 +14,11 @@ class KeyLength extends \Zend_Validate_StringLength
      * Default key name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_name = 'Key';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [
         self::INVALID   => "Invalid type given for %name%. String expected",
@@ -33,7 +30,6 @@ class KeyLength extends \Zend_Validate_StringLength
      * Additional variables available for validation failure messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageVariables = ['min' => '_min', 'max' => '_max', 'name' => '_name'];
 
@@ -44,7 +40,6 @@ class KeyLength extends \Zend_Validate_StringLength
      * New option name added to allow adding key name in validation error messages
      *
      * @param  integer|array|\Zend_Config $options
-     * @since 2.0.0
      */
     public function __construct($options = [])
     {
@@ -71,7 +66,6 @@ public function __construct($options = [])
      *
      * @param int|null $length
      * @return $this
-     * @since 2.0.0
      */
     public function setLength($length)
     {
@@ -84,7 +78,6 @@ public function setLength($length)
      * Set length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLength()
     {
@@ -100,7 +93,6 @@ public function getLength()
      * @param  string $value
      * @return boolean
      * @throws \Exception
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -116,7 +108,6 @@ public function isValid($value)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -128,7 +119,6 @@ public function setName($name)
      * Get key name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Nonce.php b/app/code/Magento/Integration/Model/Oauth/Nonce.php
index 6bd6a457a9bfc..48f0347430a3f 100644
--- a/app/code/Magento/Integration/Model/Oauth/Nonce.php
+++ b/app/code/Magento/Integration/Model/Oauth/Nonce.php
@@ -16,7 +16,6 @@
  * @method \Magento\Integration\Model\Oauth\Nonce setTimestamp() setTimestamp(string $timestamp)
  * @method \Magento\Integration\Model\ResourceModel\Oauth\Nonce getResource()
  * @method \Magento\Integration\Model\ResourceModel\Oauth\Nonce _getResource()
- * @since 2.0.0
  */
 class Nonce extends \Magento\Framework\Model\AbstractModel
 {
@@ -24,7 +23,6 @@ class Nonce extends \Magento\Framework\Model\AbstractModel
      * Oauth data
      *
      * @var \Magento\Integration\Helper\Oauth\Data
-     * @since 2.0.0
      */
     protected $_oauthData;
 
@@ -35,7 +33,6 @@ class Nonce extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +60,6 @@ protected function _construct()
      * The "After save" actions
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -82,7 +77,6 @@ public function afterSave()
      * @param string $nonce - The nonce string
      * @param int $consumerId - The consumer id
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCompositeKey($nonce, $consumerId)
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Nonce/Generator.php b/app/code/Magento/Integration/Model/Oauth/Nonce/Generator.php
index 01c1d6b993594..d9b32590704df 100644
--- a/app/code/Magento/Integration/Model/Oauth/Nonce/Generator.php
+++ b/app/code/Magento/Integration/Model/Oauth/Nonce/Generator.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Integration\Model\Oauth\Nonce\Generator
  *
- * @since 2.0.0
  */
 class Generator implements NonceGeneratorInterface
 {
     /**
      * @var \Magento\Framework\Oauth\Helper\Oauth
-     * @since 2.0.0
      */
     protected $_oauthHelper;
 
     /**
      * @var  \Magento\Integration\Model\Oauth\NonceFactory
-     * @since 2.0.0
      */
     protected $_nonceFactory;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_nonceLength;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -49,7 +44,6 @@ class Generator implements NonceGeneratorInterface
      * @param \Magento\Integration\Model\Oauth\NonceFactory $nonceFactory
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param int $nonceLength - Length of the generated nonce
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Oauth\Helper\Oauth $oauthHelper,
@@ -65,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generateNonce(ConsumerInterface $consumer = null)
     {
@@ -74,7 +67,6 @@ public function generateNonce(ConsumerInterface $consumer = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generateTimestamp()
     {
@@ -83,7 +75,6 @@ public function generateTimestamp()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateNonce(ConsumerInterface $consumer, $nonce, $timestamp)
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token.php b/app/code/Magento/Integration/Model/Oauth/Token.php
index fb59d85b21656..a6fa06668b3dc 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token.php
@@ -42,7 +42,6 @@
  * @method Token setAuthorized() setAuthorized(int $authorized)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Token extends \Magento\Framework\Model\AbstractModel
 {
@@ -57,33 +56,26 @@ class Token extends \Magento\Framework\Model\AbstractModel
 
     /**#@- */
 
-    /**
-     * @var OauthHelper
-     * @since 2.0.0
-     */
+    /**#@- */
     protected $_oauthHelper;
 
     /**
      * @var \Magento\Integration\Helper\Oauth\Data
-     * @since 2.0.0
      */
     protected $_oauthData;
 
     /**
      * @var \Magento\Integration\Model\Oauth\ConsumerFactory
-     * @since 2.0.0
      */
     protected $_consumerFactory;
 
     /**
      * @var \Magento\Framework\Url\Validator
-     * @since 2.0.0
      */
     protected $_urlValidator;
 
     /**
      * @var Consumer\Validator\KeyLengthFactory
-     * @since 2.0.0
      */
     protected $_keyLengthFactory;
 
@@ -101,7 +93,6 @@ class Token extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -127,7 +118,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -138,7 +128,6 @@ protected function _construct()
      * The "After save" actions
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -156,7 +145,6 @@ public function afterSave()
      *
      * @param int $consumerId - The id of the consumer associated with the verifier to be generated.
      * @return $this
-     * @since 2.0.0
      */
     public function createVerifierToken($consumerId)
     {
@@ -185,7 +173,6 @@ public function createVerifierToken($consumerId)
      *
      * @return $this
      * @throws OauthException
-     * @since 2.0.0
      */
     public function convertToAccess()
     {
@@ -200,7 +187,6 @@ public function convertToAccess()
      *
      * @param int $userId
      * @return $this
-     * @since 2.0.0
      */
     public function createAdminToken($userId)
     {
@@ -213,7 +199,6 @@ public function createAdminToken($userId)
      *
      * @param int $userId
      * @return $this
-     * @since 2.0.0
      */
     public function createCustomerToken($userId)
     {
@@ -227,7 +212,6 @@ public function createCustomerToken($userId)
      * @param int $entityId Token identifier
      * @param string $callbackUrl Callback URL
      * @return $this
-     * @since 2.0.0
      */
     public function createRequestToken($entityId, $callbackUrl)
     {
@@ -252,7 +236,6 @@ public function createRequestToken($entityId, $callbackUrl)
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -264,7 +247,6 @@ public function __toString()
      *
      * @return bool
      * @throws OauthException Throw exception on fail validation
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -307,7 +289,6 @@ public function validate()
      * Return the token's verifier.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVerifier()
     {
@@ -319,7 +300,6 @@ public function getVerifier()
      *
      * @param int $userType
      * @return $this
-     * @since 2.0.0
      */
     protected function saveAccessToken($userType)
     {
@@ -336,7 +316,6 @@ protected function saveAccessToken($userType)
      * @param int $consumerId
      * @param int $userType
      * @return $this
-     * @since 2.0.0
      */
     public function loadByConsumerIdAndUserType($consumerId, $userType)
     {
@@ -350,7 +329,6 @@ public function loadByConsumerIdAndUserType($consumerId, $userType)
      *
      * @param int $adminId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByAdminId($adminId)
     {
@@ -364,7 +342,6 @@ public function loadByAdminId($adminId)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerId($customerId)
     {
@@ -378,7 +355,6 @@ public function loadByCustomerId($customerId)
      *
      * @param string $token
      * @return $this
-     * @since 2.0.0
      */
     public function loadByToken($token)
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
index 0f65816969b34..26546c1e00be9 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Integration\Model\Oauth\Token\Provider
  *
- * @since 2.0.0
  */
 class Provider implements TokenProviderInterface
 {
     /**
      * @var \Magento\Integration\Model\Oauth\ConsumerFactory
-     * @since 2.0.0
      */
     protected $_consumerFactory;
 
     /**
      * @var \Magento\Integration\Model\Oauth\TokenFactory
-     * @since 2.0.0
      */
     protected $_tokenFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -40,7 +36,6 @@ class Provider implements TokenProviderInterface
      * @param \Magento\Integration\Model\Oauth\ConsumerFactory $consumerFactory
      * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Integration\Model\Oauth\ConsumerFactory $consumerFactory,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateConsumer($consumer)
     {
@@ -69,7 +63,6 @@ public function validateConsumer($consumer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createRequestToken($consumer)
     {
@@ -85,7 +78,6 @@ public function createRequestToken($consumer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateRequestToken($requestToken, $consumer, $oauthVerifier)
     {
@@ -112,7 +104,6 @@ public function validateRequestToken($requestToken, $consumer, $oauthVerifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAccessToken($consumer)
     {
@@ -132,7 +123,6 @@ public function getAccessToken($consumer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateAccessTokenRequest($accessToken, $consumer)
     {
@@ -159,7 +149,6 @@ public function validateAccessTokenRequest($accessToken, $consumer)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateAccessToken($accessToken)
     {
@@ -184,7 +173,6 @@ public function validateAccessToken($accessToken)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateOauthToken($oauthToken)
     {
@@ -193,7 +181,6 @@ public function validateOauthToken($oauthToken)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConsumerByKey($consumerKey)
     {
@@ -221,7 +208,6 @@ public function getConsumerByKey($consumerKey)
      * @param string $tokenVerifier
      * @return void
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     protected function _validateVerifierParam($oauthVerifier, $tokenVerifier)
     {
@@ -248,7 +234,6 @@ protected function _validateVerifierParam($oauthVerifier, $tokenVerifier)
      * @param int $consumerId
      * @return \Magento\Framework\Oauth\ConsumerInterface
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     protected function _getConsumer($consumerId)
     {
@@ -272,7 +257,6 @@ protected function _getConsumer($consumerId)
      * @param string $token
      * @return Token
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     protected function _getToken($token)
     {
@@ -299,7 +283,6 @@ protected function _getToken($token)
      * @param int $consumerId - The Id of the consumer.
      * @return Token
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function getIntegrationTokenByConsumerId($consumerId)
     {
@@ -325,7 +308,6 @@ public function getIntegrationTokenByConsumerId($consumerId)
      * @param Token $token
      * @param \Magento\Framework\Oauth\ConsumerInterface $consumer
      * @return bool
-     * @since 2.0.0
      */
     protected function _isTokenAssociatedToConsumer($token, $consumer)
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/Config.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/Config.php
index db2f521ae66ec..ca83d51a80d5d 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/Config.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/Config.php
@@ -9,13 +9,13 @@
 
 /**
  * Token request log config.
- * @since 2.1.0
+ * @since 2.0.3
  */
 class Config
 {
     /**
      * @var ReinitableConfigInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $storeConfig;
 
@@ -23,7 +23,7 @@ class Config
      * Initialize dependencies.
      *
      * @param ReinitableConfigInterface $storeConfig
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(ReinitableConfigInterface $storeConfig)
     {
@@ -34,7 +34,7 @@ public function __construct(ReinitableConfigInterface $storeConfig)
      * Get maximum allowed authentication failures count before account is locked.
      *
      * @return int
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getMaxFailuresCount()
     {
@@ -45,7 +45,7 @@ public function getMaxFailuresCount()
      * Get period of time in seconds after which account will be unlocked.
      *
      * @return int
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getLockTimeout()
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/ReaderInterface.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/ReaderInterface.php
index c980babb40d20..a86c243c2702c 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/ReaderInterface.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/ReaderInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * OAuth token request log reader interface.
- * @since 2.1.0
+ * @since 2.0.3
  */
 interface ReaderInterface
 {
@@ -18,7 +18,7 @@ interface ReaderInterface
      * @param string $userName
      * @param int $userType
      * @return int
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getFailuresCount($userName, $userType);
 }
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/WriterInterface.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/WriterInterface.php
index e832ae6d88236..edfc1224f8ece 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/WriterInterface.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestLog/WriterInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * OAuth token request log writer interface.
- * @since 2.1.0
+ * @since 2.0.3
  */
 interface WriterInterface
 {
@@ -19,7 +19,7 @@ interface WriterInterface
      * @param int $userType
      * @param return void
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function resetFailuresCount($userName, $userType);
 
@@ -30,7 +30,7 @@ public function resetFailuresCount($userName, $userType);
      * @param int $userType
      * @param return void
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function incrementFailuresCount($userName, $userType);
 
@@ -38,7 +38,7 @@ public function incrementFailuresCount($userName, $userType);
      * Clear expired authentication failure logs.
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function clearExpiredFailures();
 }
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
index 1169e5753210e..33cb232d195ed 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
@@ -12,7 +12,7 @@
 
 /**
  * Model for OAuth admin/customer token requests throttling.
- * @since 2.1.0
+ * @since 2.0.3
  */
 class RequestThrottler
 {
@@ -25,19 +25,19 @@ class RequestThrottler
 
     /**
      * @var RequestLogReader
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestLogReader;
 
     /**
      * @var RequestLogWriter
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestLogWriter;
 
     /**
      * @var RequestLogConfig
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestLogConfig;
 
@@ -47,7 +47,7 @@ class RequestThrottler
      * @param RequestLogReader $requestLogReader
      * @param RequestLogWriter $requestLogWriter
      * @param RequestLogConfig $requestLogConfig
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(
         RequestLogReader $requestLogReader,
@@ -66,7 +66,7 @@ public function __construct(
      * @param int $userType
      * @return void
      * @throws AuthenticationException
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function throttle($userName, $userType)
     {
@@ -86,7 +86,7 @@ public function throttle($userName, $userType)
      * @param string $userName
      * @param int $userType
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function resetAuthenticationFailuresCount($userName, $userType)
     {
@@ -101,7 +101,7 @@ public function resetAuthenticationFailuresCount($userName, $userType)
      * @param string $userName
      * @param int $userType
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function logAuthenticationFailure($userName, $userType)
     {
diff --git a/app/code/Magento/Integration/Model/OauthService.php b/app/code/Magento/Integration/Model/OauthService.php
index b37b015cae8e8..f5a18309d026d 100644
--- a/app/code/Magento/Integration/Model/OauthService.php
+++ b/app/code/Magento/Integration/Model/OauthService.php
@@ -18,61 +18,52 @@
  * Integration oAuth service.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OauthService implements \Magento\Integration\Api\OauthServiceInterface
 {
     /**
      * @var  \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var  ConsumerFactory
-     * @since 2.0.0
      */
     protected $_consumerFactory;
 
     /**
      * @var  TokenFactory
-     * @since 2.0.0
      */
     protected $_tokenFactory;
 
     /**
      * @var  IntegrationOauthHelper
-     * @since 2.0.0
      */
     protected $_dataHelper;
 
     /**
      * @var  \Magento\Framework\HTTP\ZendClient
-     * @since 2.0.0
      */
     protected $_httpClient;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var OauthHelper
-     * @since 2.0.0
      */
     protected $_oauthHelper;
 
     /**
      * @var TokenProvider
-     * @since 2.0.0
      */
     protected $_tokenProvider;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $_dateHelper;
 
@@ -87,7 +78,6 @@ class OauthService implements \Magento\Integration\Api\OauthServiceInterface
      * @param \Psr\Log\LoggerInterface $logger
      * @param OauthHelper $oauthHelper
      * @param TokenProvider $tokenProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -114,8 +104,8 @@ public function __construct(
      *
      * @return \Magento\Framework\Stdlib\DateTime\DateTime
      *
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.6
+     * @since 2.0.6
      */
     private function getDateHelper()
     {
@@ -128,7 +118,6 @@ private function getDateHelper()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createConsumer($consumerData)
     {
@@ -149,7 +138,6 @@ public function createConsumer($consumerData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createAccessToken($consumerId, $clearExistingToken = false)
     {
@@ -174,7 +162,6 @@ public function createAccessToken($consumerId, $clearExistingToken = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAccessToken($consumerId)
     {
@@ -192,7 +179,6 @@ public function getAccessToken($consumerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadConsumer($consumerId)
     {
@@ -209,7 +195,6 @@ public function loadConsumer($consumerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadConsumerByKey($key)
     {
@@ -226,7 +211,6 @@ public function loadConsumerByKey($key)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function postToConsumer($consumerId, $endpointUrl)
     {
@@ -270,7 +254,6 @@ public function postToConsumer($consumerId, $endpointUrl)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteConsumer($consumerId)
     {
@@ -282,7 +265,6 @@ public function deleteConsumer($consumerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteIntegrationToken($consumerId)
     {
@@ -302,7 +284,6 @@ public function deleteIntegrationToken($consumerId)
      * @param int $consumerId
      * @return ConsumerModel
      * @throws \Magento\Framework\Exception\IntegrationException
-     * @since 2.0.0
      */
     protected function _loadConsumerById($consumerId)
     {
diff --git a/app/code/Magento/Integration/Model/Plugin/Integration.php b/app/code/Magento/Integration/Model/Plugin/Integration.php
index d4bd0eff1122d..a8b59aa12e7c3 100644
--- a/app/code/Magento/Integration/Model/Plugin/Integration.php
+++ b/app/code/Magento/Integration/Model/Plugin/Integration.php
@@ -16,19 +16,16 @@
 
 /**
  * Plugin for \Magento\Integration\Model\IntegrationService.
- * @since 2.0.0
  */
 class Integration
 {
     /**
      * @var \Magento\Integration\Api\AuthorizationServiceInterface
-     * @since 2.0.0
      */
     protected $integrationAuthorizationService;
 
     /**
      * @var \Magento\Authorization\Model\Acl\AclRetriever
-     * @since 2.0.0
      */
     protected $aclRetriever;
 
@@ -51,7 +48,6 @@ class Integration
      * @param AclRetriever $aclRetriever
      * @param IntegrationConfig $integrationConfig
      * @param ConsolidatedConfig $consolidatedConfig
-     * @since 2.0.0
      */
     public function __construct(
         AuthorizationServiceInterface $integrationAuthorizationService,
@@ -73,7 +69,6 @@ public function __construct(
      *
      * @return IntegrationModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterCreate(IntegrationServiceInterface $subject, $integration)
     {
@@ -92,7 +87,6 @@ public function afterCreate(IntegrationServiceInterface $subject, $integration)
      *
      * @return IntegrationModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterUpdate(IntegrationServiceInterface $subject, $integration)
     {
@@ -111,7 +105,6 @@ public function afterUpdate(IntegrationServiceInterface $subject, $integration)
      *
      * @return IntegrationModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGet(IntegrationServiceInterface $subject, $integration)
     {
@@ -124,7 +117,6 @@ public function afterGet(IntegrationServiceInterface $subject, $integration)
      *
      * @param IntegrationModel $integration
      * @return void
-     * @since 2.0.0
      */
     protected function _addAllowedResources(IntegrationModel $integration)
     {
@@ -158,7 +150,6 @@ protected function _addAllowedResources(IntegrationModel $integration)
      *
      * @param IntegrationModel $integration
      * @return void
-     * @since 2.0.0
      */
     protected function _saveApiPermissions(IntegrationModel $integration)
     {
@@ -182,7 +173,6 @@ protected function _saveApiPermissions(IntegrationModel $integration)
      *
      * @return array $integrationData
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDelete(IntegrationServiceInterface $subject, array $integrationData)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Integration.php b/app/code/Magento/Integration/Model/ResourceModel/Integration.php
index 1dff25f41ff50..ba30e698dfb16 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Integration.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Integration.php
@@ -8,7 +8,6 @@
 
 /**
  * Integration resource model
- * @since 2.0.0
  */
 class Integration extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -16,7 +15,6 @@ class Integration extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      *
      * @param int $consumerId
      * @return array|boolean - Row data (array) or false if there is no corresponding row
-     * @since 2.0.0
      */
     public function selectActiveIntegrationByConsumerId($consumerId)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Integration/Collection.php b/app/code/Magento/Integration/Model/ResourceModel/Integration/Collection.php
index c658ef89df4d5..001a8ba80a336 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Integration/Collection.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Integration/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Integrations collection.
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource collection initialization.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      * Add filter for finding integrations with unsecure URLs.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addUnsecureUrlsFilter()
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php
index 4232e439a771f..5168deead8d00 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Integration\Model\ResourceModel\Oauth\Consumer
  *
- * @since 2.0.0
  */
 class Consumer extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -28,7 +26,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +37,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -53,11 +49,10 @@ public function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     /**
      * Compute time in seconds since consumer was created.
      *
-     * @deprecated 2.1.0
+     * @deprecated 2.0.6
      *
      * @param int $consumerId - The consumer id
      * @return int - time lapsed in seconds
-     * @since 2.0.0
      */
     public function getTimeInSecondsSinceCreation($consumerId)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer/Collection.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer/Collection.php
index 86ced5dfbc049..83946fd900b92 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer/Collection.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * OAuth Application resource collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize collection model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php
index 65cdfb8676f00..5fa7f5fda8cf8 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php
@@ -9,7 +9,6 @@
  * oAuth nonce resource model
  *
  * @author Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Nonce extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Nonce extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param int $minutes Delete entries older than
      * @return int
-     * @since 2.0.0
      */
     public function deleteOldEntries($minutes)
     {
@@ -51,7 +48,6 @@ public function deleteOldEntries($minutes)
      * @param string $nonce - The nonce string
      * @param int $consumerId - The consumer id
      * @return array - Array of data
-     * @since 2.0.0
      */
     public function selectByCompositeKey($nonce, $consumerId)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce/Collection.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce/Collection.php
index 7b06bef6e5d53..ea6251419523b 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce/Collection.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * OAuth nonce resource collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize collection model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token.php
index 44d8ffec83848..2dd5a18614caf 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token.php
@@ -9,13 +9,11 @@
 
 /**
  * OAuth token resource model
- * @since 2.0.0
  */
 class Token extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
@@ -23,7 +21,6 @@ class Token extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $date;
 
@@ -32,7 +29,6 @@ class Token extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +57,6 @@ protected function _construct()
      * @param \Magento\Integration\Model\Oauth\Token $exceptToken Token just created to exclude from delete
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return int The number of affected rows
-     * @since 2.0.0
      */
     public function cleanOldAuthorizedTokensExcept(\Magento\Integration\Model\Oauth\Token $exceptToken)
     {
@@ -92,7 +86,6 @@ public function cleanOldAuthorizedTokensExcept(\Magento\Integration\Model\Oauth\
      *
      * @param int $minutes
      * @return int
-     * @since 2.0.0
      */
     public function deleteOldEntries($minutes)
     {
@@ -144,7 +137,6 @@ public function deleteExpiredTokens($hours, $userTypes)
      * @param int $consumerId - The consumer id
      * @param string $type - The token type (e.g. 'verifier')
      * @return array|boolean - Row data (array) or false if there is no corresponding row
-     * @since 2.0.0
      */
     public function selectTokenByType($consumerId, $type)
     {
@@ -162,7 +154,6 @@ public function selectTokenByType($consumerId, $type)
      * @param int $consumerId
      * @param int $userType
      * @return array|boolean - Row data (array) or false if there is no corresponding row
-     * @since 2.0.0
      */
     public function selectTokenByConsumerIdAndUserType($consumerId, $userType)
     {
@@ -179,7 +170,6 @@ public function selectTokenByConsumerIdAndUserType($consumerId, $userType)
      *
      * @param int $adminId
      * @return array|boolean - Row data (array) or false if there is no corresponding row
-     * @since 2.0.0
      */
     public function selectTokenByAdminId($adminId)
     {
@@ -196,7 +186,6 @@ public function selectTokenByAdminId($adminId)
      *
      * @param int $customerId
      * @return array|boolean - Row data (array) or false if there is no corresponding row
-     * @since 2.0.0
      */
     public function selectTokenByCustomerId($customerId)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/Collection.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/Collection.php
index df1f3e3e18e72..23bc9c928b65e 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/Collection.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * OAuth token resource collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize collection model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Method use for show applications list (token-consumer)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinConsumerAsApplication()
     {
@@ -50,7 +47,6 @@ public function joinConsumerAsApplication()
      *
      * @param int $adminId
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByAdminId($adminId)
     {
@@ -63,7 +59,6 @@ public function addFilterByAdminId($adminId)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByCustomerId($customerId)
     {
@@ -76,7 +71,6 @@ public function addFilterByCustomerId($customerId)
      *
      * @param int $consumerId
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByConsumerId($consumerId)
     {
@@ -89,7 +83,6 @@ public function addFilterByConsumerId($consumerId)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByType($type)
     {
@@ -102,7 +95,6 @@ public function addFilterByType($type)
      *
      * @param array|int $tokenId
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterById($tokenId)
     {
@@ -115,7 +107,6 @@ public function addFilterById($tokenId)
      *
      * @param bool|int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByRevoked($flag)
     {
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
index daf20ac721a84..fab2356f995d8 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
@@ -11,7 +11,7 @@
 
 /**
  * Resource model for failed authentication attempts to retrieve admin/customer token.
- * @since 2.1.0
+ * @since 2.0.3
  */
 class RequestLog extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     ReaderInterface,
@@ -19,13 +19,13 @@ class RequestLog extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb im
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $dateTime;
 
     /**
      * @var RequestLogConfig
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $requestLogConfig;
 
@@ -36,7 +36,7 @@ class RequestLog extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb im
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param RequestLogConfig $requestLogConfig
      * @param string|null $connectionName
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -51,7 +51,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected function _construct()
     {
@@ -60,7 +60,7 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getFailuresCount($userName, $userType)
     {
@@ -73,7 +73,7 @@ public function getFailuresCount($userName, $userType)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function resetFailuresCount($userName, $userType)
     {
@@ -85,7 +85,7 @@ public function resetFailuresCount($userName, $userType)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function incrementFailuresCount($userName, $userType)
     {
@@ -110,7 +110,7 @@ public function incrementFailuresCount($userName, $userType)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function clearExpiredFailures()
     {
diff --git a/app/code/Magento/Integration/Plugin/Model/AdminUser.php b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
index 3016d5dec0432..23f510d4c4d66 100644
--- a/app/code/Magento/Integration/Plugin/Model/AdminUser.php
+++ b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
@@ -9,19 +9,19 @@
 
 /**
  * Plugin to delete admin tokens when admin becomes inactive
- * @since 2.2.0
+ * @since 2.1.7
  */
 class AdminUser
 {
     /**
      * @var AdminTokenService
-     * @since 2.2.0
+     * @since 2.1.7
      */
     private $adminTokenService;
 
     /**
      * @param AdminTokenService $adminTokenService
-     * @since 2.2.0
+     * @since 2.1.7
      */
     public function __construct(
         AdminTokenService $adminTokenService
@@ -35,7 +35,7 @@ public function __construct(
      * @param \Magento\User\Model\User $subject
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.7
      */
     public function afterSave(
         \Magento\User\Model\User $subject,
diff --git a/app/code/Magento/Integration/Plugin/Model/CustomerUser.php b/app/code/Magento/Integration/Plugin/Model/CustomerUser.php
index 0fceb6cda5298..22e46768cdc08 100644
--- a/app/code/Magento/Integration/Plugin/Model/CustomerUser.php
+++ b/app/code/Magento/Integration/Plugin/Model/CustomerUser.php
@@ -9,19 +9,19 @@
 
 /**
  * Plugin to delete customer tokens when customer becomes inactive
- * @since 2.2.0
+ * @since 2.1.7
  */
 class CustomerUser
 {
     /**
      * @var CustomerTokenService
-     * @since 2.2.0
+     * @since 2.1.7
      */
     private $customerTokenService;
 
     /**
      * @param CustomerTokenService $customerTokenService
-     * @since 2.2.0
+     * @since 2.1.7
      */
     public function __construct(
         CustomerTokenService $customerTokenService
@@ -35,7 +35,7 @@ public function __construct(
      * @param \Magento\Customer\Model\Customer $subject
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.7
      */
     public function afterSave(
         \Magento\Customer\Model\Customer $subject,
diff --git a/app/code/Magento/Integration/Setup/InstallSchema.php b/app/code/Magento/Integration/Setup/InstallSchema.php
index 53e4339f6368c..11ec675782174 100644
--- a/app/code/Magento/Integration/Setup/InstallSchema.php
+++ b/app/code/Magento/Integration/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Integration/Setup/UpgradeData.php b/app/code/Magento/Integration/Setup/UpgradeData.php
index 8410392fae681..9bfc67b445b9b 100644
--- a/app/code/Magento/Integration/Setup/UpgradeData.php
+++ b/app/code/Magento/Integration/Setup/UpgradeData.php
@@ -11,13 +11,13 @@
 
 /**
  * Upgrade data script for Integration module
- * @since 2.2.0
+ * @since 2.1.7
  */
 class UpgradeData implements UpgradeDataInterface
 {
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.7
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -37,7 +37,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
      *
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.7
      */
     private function removeRevokedTokens($setup)
     {
@@ -52,7 +52,7 @@ private function removeRevokedTokens($setup)
      *
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.7
      */
     private function removeTokensFromInactiveAdmins($setup)
     {
@@ -78,7 +78,7 @@ private function removeTokensFromInactiveAdmins($setup)
      *
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.2.0
+     * @since 2.1.7
      */
     private function removeTokensFromInactiveCustomers($setup)
     {
diff --git a/app/code/Magento/Integration/Setup/UpgradeSchema.php b/app/code/Magento/Integration/Setup/UpgradeSchema.php
index be19a8902f692..072f3b43995a2 100644
--- a/app/code/Magento/Integration/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Integration/Setup/UpgradeSchema.php
@@ -11,13 +11,13 @@
 
 /**
  * Class for integration tables schema upgrades
- * @since 2.1.0
+ * @since 2.0.3
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation.php b/app/code/Magento/LayeredNavigation/Block/Navigation.php
index 45a5545794bd7..987a3a276913d 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Navigation extends \Magento\Framework\View\Element\Template
 {
@@ -23,19 +22,16 @@ class Navigation extends \Magento\Framework\View\Element\Template
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
     /**
      * @var \Magento\Catalog\Model\Layer\FilterList
-     * @since 2.0.0
      */
     protected $filterList;
 
     /**
      * @var \Magento\Catalog\Model\Layer\AvailabilityFlagInterface
-     * @since 2.0.0
      */
     protected $visibilityFlag;
 
@@ -45,7 +41,6 @@ class Navigation extends \Magento\Framework\View\Element\Template
      * @param \Magento\Catalog\Model\Layer\FilterList $filterList
      * @param \Magento\Catalog\Model\Layer\AvailabilityFlagInterface $visibilityFlag
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Apply layer
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -79,7 +73,6 @@ protected function _prepareLayout()
      * Get layer object
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function getLayer()
     {
@@ -90,7 +83,6 @@ public function getLayer()
      * Get layered navigation state html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStateHtml()
     {
@@ -101,7 +93,6 @@ public function getStateHtml()
      * Get all layer filters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFilters()
     {
@@ -112,7 +103,6 @@ public function getFilters()
      * Check availability display layer block
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowBlock()
     {
@@ -123,7 +113,6 @@ public function canShowBlock()
      * Get url for 'Clear All' link
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClearUrl()
     {
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
index eab5896f1aaed..bc09239e1226e 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
@@ -15,14 +15,12 @@
  * Catalog layer filter renderer
  *
  * @api
- * @since 2.0.0
  */
 class FilterRenderer extends Template implements FilterRendererInterface
 {
     /**
      * @param FilterInterface $filter
      * @return string
-     * @since 2.0.0
      */
     public function render(FilterInterface $filter)
     {
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRendererInterface.php b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRendererInterface.php
index 7cd7a45ea8354..2187ce6f83b24 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRendererInterface.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRendererInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface FilterRendererInterface
  * @api
- * @since 2.0.0
  */
 interface FilterRendererInterface
 {
@@ -19,7 +18,6 @@ interface FilterRendererInterface
      *
      * @param FilterInterface $filter
      * @return string
-     * @since 2.0.0
      */
     public function render(FilterInterface $filter);
 }
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
index e197733c7aebb..93d99d3bc336b 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
@@ -11,13 +11,11 @@
  * Layered navigation state
  *
  * @api
- * @since 2.0.0
  */
 class State extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'layer/state.phtml';
 
@@ -25,7 +23,6 @@ class State extends \Magento\Framework\View\Element\Template
      * Catalog layer
      *
      * @var \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     protected $_catalogLayer;
 
@@ -33,7 +30,6 @@ class State extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Retrieve active filters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getActiveFilters()
     {
@@ -63,7 +58,6 @@ public function getActiveFilters()
      * Retrieve Clear Filters URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClearUrl()
     {
@@ -82,7 +76,6 @@ public function getClearUrl()
      * Retrieve Layer object
      *
      * @return \Magento\Catalog\Model\Layer
-     * @since 2.0.0
      */
     public function getLayer()
     {
diff --git a/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php b/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
index 63d4262add201..ee75029b01442 100644
--- a/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
+++ b/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\LayeredNavigation\Model\Aggregation\Status
  *
- * @since 2.0.0
  */
 class Status implements StatusInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isEnabled()
     {
diff --git a/app/code/Magento/LayeredNavigation/Model/Attribute/Source/FilterableOptions.php b/app/code/Magento/LayeredNavigation/Model/Attribute/Source/FilterableOptions.php
index a7d9a08c45a6f..a25971eb0a196 100644
--- a/app/code/Magento/LayeredNavigation/Model/Attribute/Source/FilterableOptions.php
+++ b/app/code/Magento/LayeredNavigation/Model/Attribute/Source/FilterableOptions.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FilterableOptions implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
index 37c7c4a69a861..08c6269a33bca 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\LayeredNavigation\Observer\Edit\Tab\Front\ProductAttributeFormBuildFrontTabObserver
  *
- * @since 2.0.0
  */
 class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $optionList;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
      * @param Source\Yesno $optionList
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager, Source\Yesno $optionList)
     {
@@ -44,7 +40,6 @@ public function __construct(Manager $moduleManager, Source\Yesno $optionList)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
index 7b540b30196a9..0d581fd0c16aa 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\LayeredNavigation\Observer\Grid\ProductAttributeGridBuildObserver
  *
- * @since 2.0.0
  */
 class ProductAttributeGridBuildObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -35,7 +32,6 @@ public function __construct(Manager $moduleManager)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Marketplace/Block/Index.php b/app/code/Magento/Marketplace/Block/Index.php
index 6bcff49182dca..33b32110c5952 100644
--- a/app/code/Magento/Marketplace/Block/Index.php
+++ b/app/code/Magento/Marketplace/Block/Index.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\Block\Template
 {
@@ -16,13 +15,11 @@ class Index extends \Magento\Backend\Block\Template
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Backend\Block\Template\Context $context)
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
diff --git a/app/code/Magento/Marketplace/Block/Partners.php b/app/code/Magento/Marketplace/Block/Partners.php
index 7a795c5fca547..00e7089d7992c 100644
--- a/app/code/Magento/Marketplace/Block/Partners.php
+++ b/app/code/Magento/Marketplace/Block/Partners.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Partners extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Marketplace\Model\Partners
-     * @since 2.0.0
      */
     protected $partnersModel;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Marketplace::partners.phtml';
 
@@ -28,7 +25,6 @@ class Partners extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Marketplace\Model\Partners $partnersModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -43,7 +39,6 @@ public function __construct(
      * Gets partners
      *
      * @return bool|string
-     * @since 2.0.0
      */
     public function getPartners()
     {
@@ -54,7 +49,6 @@ public function getPartners()
      * Gets partners model
      *
      * @return \Magento\Marketplace\Model\Partners
-     * @since 2.0.0
      */
     public function getPartnersModel()
     {
diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Index.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Index.php
index a373cebed8611..dbcb03508341c 100644
--- a/app/code/Magento/Marketplace/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Index.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Marketplace\Controller\Adminhtml\Index
  *
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php
index 0655bd0afa965..b2eef1e83343c 100644
--- a/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Marketplace\Controller\Adminhtml\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Marketplace\Controller\Adminhtml\Index
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -49,7 +45,6 @@ public function execute()
 
     /**
      * @return \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     public function getResultPageFactory()
     {
diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners.php
index 650656f207b33..bbc15375d5a05 100644
--- a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners.php
+++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Marketplace\Controller\Adminhtml\Partners
  *
- * @since 2.0.0
  */
 abstract class Partners extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php
index baf7daf528142..7b62366766551 100644
--- a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php
+++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Marketplace\Controller\Adminhtml\Partners\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Marketplace\Controller\Adminhtml\Partners
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -54,7 +49,6 @@ public function execute()
 
     /**
      * @return \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     public function getLayoutFactory()
     {
diff --git a/app/code/Magento/Marketplace/Helper/Cache.php b/app/code/Magento/Marketplace/Helper/Cache.php
index 729b8d349b879..1cc174d738cf5 100644
--- a/app/code/Magento/Marketplace/Helper/Cache.php
+++ b/app/code/Magento/Marketplace/Helper/Cache.php
@@ -11,13 +11,11 @@
 
 /**
  * Cache helper
- * @since 2.0.0
  */
 class Cache extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pathToCacheFile = 'partners';
 
@@ -25,7 +23,6 @@ class Cache extends \Magento\Framework\App\Helper\AbstractHelper
      * Configuration cache model
      *
      * @var \Magento\Framework\Config\CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -39,7 +36,6 @@ class Cache extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Load partners from cache
      *
      * @return array
-     * @since 2.0.0
      */
     public function loadPartnersFromCache()
     {
@@ -71,7 +66,6 @@ public function loadPartnersFromCache()
      *
      * @param string $partners
      * @return bool
-     * @since 2.0.0
      */
     public function savePartnersToCache($partners)
     {
@@ -80,7 +74,6 @@ public function savePartnersToCache($partners)
 
     /**
      * @return \Magento\Framework\Config\CacheInterface
-     * @since 2.0.0
      */
     public function getCache()
     {
diff --git a/app/code/Magento/Marketplace/Model/Partners.php b/app/code/Magento/Marketplace/Model/Partners.php
index acb23484bd9e0..1aea7740c957d 100644
--- a/app/code/Magento/Marketplace/Model/Partners.php
+++ b/app/code/Magento/Marketplace/Model/Partners.php
@@ -11,31 +11,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Partners
 {
     /**
      * @var Curl
-     * @since 2.0.0
      */
     protected $curlClient;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $urlPrefix = 'https://';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $apiUrl = 'magento.com/magento-connect/platinumpartners/list';
 
     /**
      * @var \Magento\Marketplace\Helper\Cache
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -43,7 +38,6 @@ class Partners
      * @param Curl $curl
      * @param Cache $cache
      * @param UrlInterface $backendUrl
-     * @since 2.0.0
      */
     public function __construct(Curl $curl, Cache $cache, UrlInterface $backendUrl)
     {
@@ -54,7 +48,6 @@ public function __construct(Curl $curl, Cache $cache, UrlInterface $backendUrl)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getApiUrl()
     {
@@ -65,7 +58,6 @@ public function getApiUrl()
      * Gets partners json
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPartners()
     {
@@ -91,7 +83,6 @@ public function getPartners()
 
     /**
      * @return Curl
-     * @since 2.0.0
      */
     public function getCurlClient()
     {
@@ -100,7 +91,6 @@ public function getCurlClient()
 
     /**
      * @return cache
-     * @since 2.0.0
      */
     public function getCache()
     {
@@ -109,7 +99,6 @@ public function getCache()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getReferer()
     {
diff --git a/app/code/Magento/MediaStorage/App/Media.php b/app/code/Magento/MediaStorage/App/Media.php
index 31e7e52b87035..bff4b0d194518 100644
--- a/app/code/Magento/MediaStorage/App/Media.php
+++ b/app/code/Magento/MediaStorage/App/Media.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Media implements AppInterface
 {
@@ -25,7 +24,6 @@ class Media implements AppInterface
      * Authorization function
      *
      * @var \Closure
-     * @since 2.0.0
      */
     private $isAllowed;
 
@@ -33,7 +31,6 @@ class Media implements AppInterface
      * Media directory path
      *
      * @var string
-     * @since 2.0.0
      */
     private $mediaDirectoryPath;
 
@@ -41,7 +38,6 @@ class Media implements AppInterface
      * Configuration cache file path
      *
      * @var string
-     * @since 2.0.0
      */
     private $configCacheFile;
 
@@ -49,31 +45,26 @@ class Media implements AppInterface
      * Requested file name relative to working directory
      *
      * @var string
-     * @since 2.0.0
      */
     private $relativeFileName;
 
     /**
      * @var Response
-     * @since 2.0.0
      */
     private $response;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     private $directory;
 
     /**
      * @var ConfigFactory
-     * @since 2.0.0
      */
     private $configFactory;
 
     /**
      * @var SynchronizationFactory
-     * @since 2.0.0
      */
     private $syncFactory;
 
@@ -86,7 +77,6 @@ class Media implements AppInterface
      * @param string $configCacheFile
      * @param string $relativeFileName
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -116,7 +106,6 @@ public function __construct(
      *
      * @return Response
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -147,7 +136,6 @@ public function launch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(App\Bootstrap $bootstrap, \Exception $exception)
     {
diff --git a/app/code/Magento/MediaStorage/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/Magento/MediaStorage/Block/System/Config/System/Storage/Media/Synchronize.php
index 65684f27efd70..20f8eb61803d2 100644
--- a/app/code/Magento/MediaStorage/Block/System/Config/System/Storage/Media/Synchronize.php
+++ b/app/code/Magento/MediaStorage/Block/System/Config/System/Storage/Media/Synchronize.php
@@ -7,19 +7,16 @@
 
 /**
  * Synchronize button renderer
- * @since 2.0.0
  */
 class Synchronize extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_MediaStorage::system/config/system/storage/media/synchronize.phtml';
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage
-     * @since 2.0.0
      */
     protected $_fileStorage;
 
@@ -27,7 +24,6 @@ class Synchronize extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\MediaStorage\Model\File\Storage $fileStorage
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -58,7 +53,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * @return string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -69,7 +63,6 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Return ajax url for synchronize button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAjaxSyncUrl()
     {
@@ -80,7 +73,6 @@ public function getAjaxSyncUrl()
      * Return ajax url for synchronize button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAjaxStatusUpdateUrl()
     {
@@ -91,7 +83,6 @@ public function getAjaxStatusUpdateUrl()
      * Generate synchronize button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonHtml()
     {
@@ -117,7 +108,6 @@ public function getButtonHtml()
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSyncStorageParams()
     {
diff --git a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage.php b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage.php
index 98e4bc2644c6b..1c8223bcb51f8 100644
--- a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage.php
+++ b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\MediaStorage\Controller\Adminhtml\System\Config\System\Storage
  *
- * @since 2.0.0
  */
 abstract class Storage extends \Magento\Backend\App\Action
 {
@@ -22,7 +21,6 @@ abstract class Storage extends \Magento\Backend\App\Action
      * Return file storage singleton
      *
      * @return \Magento\MediaStorage\Model\File\Storage
-     * @since 2.0.0
      */
     protected function _getSyncSingleton()
     {
@@ -33,7 +31,6 @@ protected function _getSyncSingleton()
      * Return synchronize process status flag
      *
      * @return \Magento\MediaStorage\Model\File\Storage\Flag
-     * @since 2.0.0
      */
     protected function _getSyncFlag()
     {
diff --git a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php
index f43d9f66ab832..666dd4281e6ac 100644
--- a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php
+++ b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\MediaStorage\Controller\Adminhtml\System\Config\System\Storage\Status
  *
- * @since 2.0.0
  */
 class Status extends \Magento\MediaStorage\Controller\Adminhtml\System\Config\System\Storage
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\Result\Json
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
index ba2b19d2470ee..9cab8ded0fd26 100644
--- a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
+++ b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\MediaStorage\Controller\Adminhtml\System\Config\System\Storage\Synchronize
  *
- * @since 2.0.0
  */
 class Synchronize extends \Magento\MediaStorage\Controller\Adminhtml\System\Config\System\Storage
 {
@@ -17,7 +16,6 @@ class Synchronize extends \Magento\MediaStorage\Controller\Adminhtml\System\Conf
      * Synchronize action between storages
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/MediaStorage/Helper/File/Media.php b/app/code/Magento/MediaStorage/Helper/File/Media.php
index 5750ca9a99ddc..72b99728a99cc 100644
--- a/app/code/Magento/MediaStorage/Helper/File/Media.php
+++ b/app/code/Magento/MediaStorage/Helper/File/Media.php
@@ -9,19 +9,16 @@
 
 /**
  * Class Media
- * @since 2.0.0
  */
 class Media extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -31,7 +28,6 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * @param string $path
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function collectFileInfo($mediaDirectory, $path)
     {
diff --git a/app/code/Magento/MediaStorage/Helper/File/Storage.php b/app/code/Magento/MediaStorage/Helper/File/Storage.php
index c5a00ccfd662d..5406410cd9f3c 100644
--- a/app/code/Magento/MediaStorage/Helper/File/Storage.php
+++ b/app/code/Magento/MediaStorage/Helper/File/Storage.php
@@ -10,7 +10,6 @@
  * File storage helper
  *
  * @api
- * @since 2.0.0
  */
 class Storage extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -18,7 +17,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * Current storage code
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_currentStorage = null;
 
@@ -26,7 +24,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * List of internal storages
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $_internalStorageList = [\Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_FILE_SYSTEM];
 
@@ -34,13 +31,11 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage
-     * @since 2.0.0
      */
     protected $_storage;
 
@@ -48,7 +43,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * File system storage model
      *
      * @var \Magento\MediaStorage\Model\File\Storage\File
-     * @since 2.0.0
      */
     protected $_filesystemStorage;
 
@@ -57,7 +51,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Model\File\Storage $storage
      * @param \Magento\MediaStorage\Model\File\Storage\File $filesystemStorage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -75,7 +68,6 @@ public function __construct(
      * Return saved storage code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentStorageCode()
     {
@@ -93,7 +85,6 @@ public function getCurrentStorageCode()
      * Retrieve file system storage model
      *
      * @return \Magento\MediaStorage\Model\File\Storage\File
-     * @since 2.0.0
      */
     public function getStorageFileModel()
     {
@@ -105,7 +96,6 @@ public function getStorageFileModel()
      *
      * @param  int|null $storage
      * @return bool
-     * @since 2.0.0
      */
     public function isInternalStorage($storage = null)
     {
@@ -120,7 +110,6 @@ public function isInternalStorage($storage = null)
      * @param  int|null $storage
      * @param  array $params
      * @return \Magento\Framework\Model\AbstractModel|bool
-     * @since 2.0.0
      */
     public function getStorageModel($storage = null, $params = [])
     {
@@ -133,7 +122,6 @@ public function getStorageModel($storage = null, $params = [])
      *
      * @param  string $filename
      * @return bool|int
-     * @since 2.0.0
      */
     public function processStorageFile($filename)
     {
@@ -158,7 +146,6 @@ public function processStorageFile($filename)
      *
      * @param  \Magento\MediaStorage\Model\File\Storage\Database $file
      * @return bool|int
-     * @since 2.0.0
      */
     public function saveFileToFileSystem($file)
     {
diff --git a/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php b/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
index 979e19bebf999..790329f30a70d 100644
--- a/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
+++ b/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
@@ -13,21 +13,18 @@
  * Database saving file helper
  *
  * @api
- * @since 2.0.0
  */
 class Database extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Database storage model
      * @var null|\Magento\MediaStorage\Model\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_databaseModel = null;
 
     /**
      * Storage resource model
      * @var null|\Magento\MediaStorage\Model\ResourceModel\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_resourceModel = null;
 
@@ -35,7 +32,6 @@ class Database extends \Magento\Framework\App\Helper\AbstractHelper
      * Db usage flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useDb = null;
 
@@ -43,25 +39,21 @@ class Database extends \Magento\Framework\App\Helper\AbstractHelper
      * Media dir
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_mediaBaseDirectory;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_dbStorageFactory;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\File
-     * @since 2.0.0
      */
     protected $_fileStorage;
 
@@ -70,7 +62,6 @@ class Database extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $dbStorageFactory
      * @param \Magento\MediaStorage\Model\File\Storage\File $fileStorage
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -88,7 +79,6 @@ public function __construct(
      * Check if we use DB storage
      *
      * @return bool
-     * @since 2.0.0
      */
     public function checkDbUsage()
     {
@@ -107,7 +97,6 @@ public function checkDbUsage()
      * Get database storage model
      *
      * @return \Magento\MediaStorage\Model\File\Storage\Database
-     * @since 2.0.0
      */
     public function getStorageDatabaseModel()
     {
@@ -122,7 +111,6 @@ public function getStorageDatabaseModel()
      * Get file storage model
      *
      * @return \Magento\MediaStorage\Model\File\Storage\File
-     * @since 2.0.0
      */
     public function getStorageFileModel()
     {
@@ -133,7 +121,6 @@ public function getStorageFileModel()
      * Get storage model
      *
      * @return \Magento\MediaStorage\Model\ResourceModel\File\Storage\Database
-     * @since 2.0.0
      */
     public function getResourceStorageModel()
     {
@@ -148,7 +135,6 @@ public function getResourceStorageModel()
      *
      * @param string $filename
      * @return void
-     * @since 2.0.0
      */
     public function saveFile($filename)
     {
@@ -163,7 +149,6 @@ public function saveFile($filename)
      * @param string $oldName
      * @param string $newName
      * @return void
-     * @since 2.0.0
      */
     public function renameFile($oldName, $newName)
     {
@@ -181,7 +166,6 @@ public function renameFile($oldName, $newName)
      * @param string $oldName
      * @param string $newName
      * @return void
-     * @since 2.0.0
      */
     public function copyFile($oldName, $newName)
     {
@@ -198,7 +182,6 @@ public function copyFile($oldName, $newName)
      *
      * @param string $filename can be both full path or partial (like in DB)
      * @return bool|null
-     * @since 2.0.0
      */
     public function fileExists($filename)
     {
@@ -215,7 +198,6 @@ public function fileExists($filename)
      * @param string $directory - can be both full path or partial (like in DB)
      * @param string $filename - not just a filename. Can have directory chunks. return will have this form
      * @return string
-     * @since 2.0.0
      */
     public function getUniqueFilename($directory, $filename)
     {
@@ -239,7 +221,6 @@ public function getUniqueFilename($directory, $filename)
      *
      * @param string $filename
      * @return bool|int
-     * @since 2.0.0
      */
     public function saveFileToFilesystem($filename)
     {
@@ -260,7 +241,6 @@ public function saveFileToFilesystem($filename)
      *
      * @param string $fullPath
      * @return string
-     * @since 2.0.0
      */
     public function getMediaRelativePath($fullPath)
     {
@@ -273,7 +253,6 @@ public function getMediaRelativePath($fullPath)
      *
      * @param string $folderName
      * @return void
-     * @since 2.0.0
      */
     public function deleteFolder($folderName)
     {
@@ -287,7 +266,6 @@ public function deleteFolder($folderName)
      *
      * @param string $filename
      * @return void
-     * @since 2.0.0
      */
     public function deleteFile($filename)
     {
@@ -308,7 +286,6 @@ public function deleteFile($filename)
      *
      * @param array $result
      * @return string
-     * @since 2.0.0
      */
     public function saveUploadedFile($result)
     {
@@ -336,7 +313,6 @@ public function saveUploadedFile($result)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     protected function _removeAbsPathFromFileName($filename)
     {
@@ -347,7 +323,6 @@ protected function _removeAbsPathFromFileName($filename)
      * Return Media base dir
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaBaseDir()
     {
diff --git a/app/code/Magento/MediaStorage/Model/Asset/Plugin/CleanMergedJsCss.php b/app/code/Magento/MediaStorage/Model/Asset/Plugin/CleanMergedJsCss.php
index 5ef65b8ff932f..b5d6972562b8e 100644
--- a/app/code/Magento/MediaStorage/Model/Asset/Plugin/CleanMergedJsCss.php
+++ b/app/code/Magento/MediaStorage/Model/Asset/Plugin/CleanMergedJsCss.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\MediaStorage\Model\Asset\Plugin\CleanMergedJsCss
  *
- * @since 2.0.0
  */
 class CleanMergedJsCss
 {
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $database;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $database
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\MediaStorage\Helper\File\Storage\Database $database,
diff --git a/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php b/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php
index 9de2b09982887..eecbd81ec19df 100644
--- a/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php
+++ b/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\MediaStorage\Model\Config\Backend\Storage\Media\Database
  *
- * @since 2.0.0
  */
 class Database extends \Magento\Framework\App\Config\Value
 {
@@ -16,7 +15,6 @@ class Database extends \Magento\Framework\App\Config\Value
      * Core file storage
      *
      * @var \Magento\MediaStorage\Helper\File\Storage
-     * @since 2.0.0
      */
     protected $_coreFileStorage = null;
 
@@ -29,7 +27,6 @@ class Database extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * Create db structure
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php
index c3a05436fb169..8167603cb03f3 100644
--- a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php
+++ b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\MediaStorage\Model\Config\Source\Storage\Media\Database
  *
- * @since 2.0.0
  */
 class Database implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
     /**
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(DeploymentConfig $deploymentConfig)
     {
@@ -38,7 +35,6 @@ public function __construct(DeploymentConfig $deploymentConfig)
      * Returns list of available resources
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php
index fbdff38ff5b79..a229d189ff973 100644
--- a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php
+++ b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\MediaStorage\Model\Config\Source\Storage\Media\Storage
  *
- * @since 2.0.0
  */
 class Storage implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,7 +19,6 @@ class Storage implements \Magento\Framework\Option\ArrayInterface
      * Options getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage.php b/app/code/Magento/MediaStorage/Model/File/Storage.php
index d4341146dc40c..84633b3ed9ac8 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage.php
@@ -17,7 +17,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Storage extends AbstractModel
 {
@@ -43,7 +42,6 @@ class Storage extends AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'media_storage_file_storage';
 
@@ -51,7 +49,6 @@ class Storage extends AbstractModel
      * Core file storage
      *
      * @var \Magento\MediaStorage\Helper\File\Storage
-     * @since 2.0.0
      */
     protected $_coreFileStorage = null;
 
@@ -59,13 +56,11 @@ class Storage extends AbstractModel
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_coreConfig;
 
@@ -73,7 +68,6 @@ class Storage extends AbstractModel
      * Core file storage flag
      *
      * @var \Magento\MediaStorage\Model\File\Storage\Flag
-     * @since 2.0.0
      */
     protected $_fileFlag;
 
@@ -81,13 +75,11 @@ class Storage extends AbstractModel
      * File factory
      *
      * @var \Magento\MediaStorage\Model\File\Storage\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_databaseFactory;
 
@@ -95,7 +87,6 @@ class Storage extends AbstractModel
      * Filesystem instance
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -113,7 +104,6 @@ class Storage extends AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -145,7 +135,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $sourceModel
      * @param \Magento\Framework\Model\AbstractModel $destinationModel
      * @return bool
-     * @since 2.0.0
      */
     protected function _synchronizeHasErrors($sourceModel, $destinationModel)
     {
@@ -160,7 +149,6 @@ protected function _synchronizeHasErrors($sourceModel, $destinationModel)
      * Return synchronize process status flag
      *
      * @return \Magento\MediaStorage\Model\File\Storage\Flag
-     * @since 2.0.0
      */
     public function getSyncFlag()
     {
@@ -179,7 +167,6 @@ public function getSyncFlag()
      * @param  int|null $storage
      * @param  array $params
      * @return AbstractModel|bool
-     * @since 2.0.0
      */
     public function getStorageModel($storage = null, $params = [])
     {
@@ -217,7 +204,6 @@ public function getStorageModel($storage = null, $params = [])
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function synchronize($storage)
     {
@@ -297,7 +283,6 @@ public function synchronize($storage)
      * Return current media directory, allowed resources for get.php script, etc.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getScriptConfig()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Config.php b/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
index 483e9cc9a4dfa..1dc11cc036312 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\MediaStorage\Model\File\Storage\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -21,7 +20,6 @@ class Config
      * Config cache file path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $cacheFilePath;
 
@@ -29,7 +27,6 @@ class Config
      * Loaded config
      *
      * @var array
-     * @since 2.0.0
      */
     protected $config;
 
@@ -37,7 +34,6 @@ class Config
      * File stream handler
      *
      * @var DirectoryWrite
-     * @since 2.0.0
      */
     protected $rootDirectory;
 
@@ -45,7 +41,6 @@ class Config
      * @param \Magento\MediaStorage\Model\File\Storage $storage
      * @param \Magento\Framework\Filesystem $filesystem
      * @param string $cacheFile
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\MediaStorage\Model\File\Storage $storage,
@@ -61,7 +56,6 @@ public function __construct(
      * Retrieve media directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaDirectory()
     {
@@ -72,7 +66,6 @@ public function getMediaDirectory()
      * Retrieve list of allowed resources
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedResources()
     {
@@ -83,7 +76,6 @@ public function getAllowedResources()
      * Save config in cache file
      *
      * @return void
-     * @since 2.0.0
      */
     public function save()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Database.php b/app/code/Magento/MediaStorage/Model/File/Storage/Database.php
index 9669ca92cfcd0..87c809c2a6154 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Database.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Database.php
@@ -9,7 +9,6 @@
  * Class Database
  *
  * @api
- * @since 2.0.0
  */
 class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase
 {
@@ -17,7 +16,6 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'media_storage_file_storage_database';
 
@@ -25,7 +23,6 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * Directory singleton
      *
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\Database
-     * @since 2.0.0
      */
     protected $_directoryModel = null;
 
@@ -33,19 +30,16 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * Collect errors during sync process
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_errors = [];
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_directoryFactory;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Media
-     * @since 2.0.0
      */
     protected $_mediaHelper;
 
@@ -70,7 +64,6 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * @param string $connectionName
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -105,7 +98,6 @@ public function __construct(
      * Retrieve directory model
      *
      * @return \Magento\MediaStorage\Model\File\Storage\Directory\Database
-     * @since 2.0.0
      */
     public function getDirectoryModel()
     {
@@ -122,7 +114,6 @@ public function getDirectoryModel()
      * Create tables for file and directory storages
      *
      * @return $this
-     * @since 2.0.0
      */
     public function init()
     {
@@ -136,7 +127,6 @@ public function init()
      * Return storage name
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getStorageName()
     {
@@ -148,7 +138,6 @@ public function getStorageName()
      *
      * @param  string $filePath
      * @return $this
-     * @since 2.0.0
      */
     public function loadByFilename($filePath)
     {
@@ -162,7 +151,6 @@ public function loadByFilename($filePath)
      * Check if there was errors during sync process
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasErrors()
     {
@@ -173,7 +161,6 @@ public function hasErrors()
      * Clear files and directories in storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -188,7 +175,6 @@ public function clear()
      * @param  int $offset
      * @param  int $count
      * @return bool|array
-     * @since 2.0.0
      */
     public function exportDirectories($offset = 0, $count = 100)
     {
@@ -200,7 +186,6 @@ public function exportDirectories($offset = 0, $count = 100)
      *
      * @param  array $dirs
      * @return \Magento\MediaStorage\Model\File\Storage\Directory\Database
-     * @since 2.0.0
      */
     public function importDirectories($dirs)
     {
@@ -213,7 +198,6 @@ public function importDirectories($dirs)
      * @param  int $offset
      * @param  int $count
      * @return array|bool
-     * @since 2.0.0
      */
     public function exportFiles($offset = 0, $count = 100)
     {
@@ -233,7 +217,6 @@ public function exportFiles($offset = 0, $count = 100)
      *
      * @param  array $files
      * @return $this
-     * @since 2.0.0
      */
     public function importFiles($files)
     {
@@ -274,7 +257,6 @@ public function importFiles($files)
      *
      * @param  string $filename
      * @return $this
-     * @since 2.0.0
      */
     public function saveFile($filename)
     {
@@ -298,7 +280,6 @@ public function saveFile($filename)
      *
      * @param  string $filePath
      * @return bool
-     * @since 2.0.0
      */
     public function fileExists($filePath)
     {
@@ -311,7 +292,6 @@ public function fileExists($filePath)
      * @param  string $oldFilePath
      * @param  string $newFilePath
      * @return $this
-     * @since 2.0.0
      */
     public function copyFile($oldFilePath, $newFilePath)
     {
@@ -331,7 +311,6 @@ public function copyFile($oldFilePath, $newFilePath)
      * @param  string $oldFilePath
      * @param  string $newFilePath
      * @return $this
-     * @since 2.0.0
      */
     public function renameFile($oldFilePath, $newFilePath)
     {
@@ -362,7 +341,6 @@ public function renameFile($oldFilePath, $newFilePath)
      *
      * @param string $directory
      * @return array
-     * @since 2.0.0
      */
     public function getDirectoryFiles($directory)
     {
@@ -375,7 +353,6 @@ public function getDirectoryFiles($directory)
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function deleteFile($path)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php b/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php
index c3488fdf94865..ff4cd769d0ab0 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php
@@ -7,7 +7,6 @@
 
 /**
  * Class AbstractDatabase
- * @since 2.0.0
  */
 abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
 {
@@ -20,7 +19,6 @@ abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
@@ -28,13 +26,11 @@ abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
      * Date model
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_configuration;
 
@@ -42,7 +38,6 @@ abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
      * Connection name
      *
      * @var string
-     * @since 2.0.0
      */
     private $connectionName = self::CONNECTION_DEFAULT;
 
@@ -56,7 +51,6 @@ abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param string $connectionName
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -83,7 +77,6 @@ public function __construct(
      * Retrieve connection name saved at config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigConnectionName()
     {
@@ -102,7 +95,6 @@ public function getConfigConnectionName()
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\AbstractResource
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -116,7 +108,6 @@ protected function _getResource()
      * Prepare data storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareStorage()
     {
@@ -130,7 +121,6 @@ public function prepareStorage()
      *
      * @param string $connectionName
      * @return $this
-     * @since 2.0.0
      */
     public function setConnectionName($connectionName)
     {
@@ -146,7 +136,6 @@ public function setConnectionName($connectionName)
      * Get connection name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getConnectionName()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
index d19659da0244f..25c432b9403c4 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
@@ -12,7 +12,6 @@
  * Class Database
  *
  * @api
- * @since 2.0.0
  */
 class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase
 {
@@ -20,7 +19,6 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'media_storage_file_storage_directory_database';
 
@@ -28,13 +26,11 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * Collect errors during sync process
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_errors = [];
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_directoryFactory;
 
@@ -50,7 +46,6 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      * @param string $connectionName
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -84,7 +79,6 @@ public function __construct(
      *
      * @param  string $path
      * @return $this
-     * @since 2.0.0
      */
     public function loadByPath($path)
     {
@@ -104,7 +98,6 @@ public function loadByPath($path)
      * Check if there was errors during sync process
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasErrors()
     {
@@ -115,7 +108,6 @@ public function hasErrors()
      * Retrieve directory parent id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -136,7 +128,6 @@ public function getParentId()
      *
      * @param  string $path
      * @return $this
-     * @since 2.0.0
      */
     public function createRecursive($path)
     {
@@ -169,7 +160,6 @@ public function createRecursive($path)
      * @param  int $offset
      * @param  int $count
      * @return bool
-     * @since 2.0.0
      */
     public function exportDirectories($offset = 0, $count = 100)
     {
@@ -191,7 +181,6 @@ public function exportDirectories($offset = 0, $count = 100)
      * @param  array $dirs
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function importDirectories($dirs)
     {
@@ -232,7 +221,6 @@ public function importDirectories($dirs)
      * Clean directories at storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearDirectories()
     {
@@ -245,7 +233,6 @@ public function clearDirectories()
      *
      * @param string $directory
      * @return array
-     * @since 2.0.0
      */
     public function getSubdirectories($directory)
     {
@@ -259,7 +246,6 @@ public function getSubdirectories($directory)
      *
      * @param string $dirPath
      * @return $this
-     * @since 2.0.0
      */
     public function deleteDirectory($dirPath)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/File.php b/app/code/Magento/MediaStorage/Model/File/Storage/File.php
index 0a167c5b921ae..11128d816544c 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/File.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/File.php
@@ -9,7 +9,6 @@
  * Class File
  *
  * @api
- * @since 2.0.0
  */
 class File
 {
@@ -17,7 +16,6 @@ class File
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'media_storage_file_storage_file';
 
@@ -25,7 +23,6 @@ class File
      * Store media base directory path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_mediaBaseDirectory = null;
 
@@ -33,13 +30,11 @@ class File
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_storageHelper = null;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Media
-     * @since 2.0.0
      */
     protected $_mediaHelper = null;
 
@@ -47,7 +42,6 @@ class File
      * Data at storage
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = null;
 
@@ -55,13 +49,11 @@ class File
      * Collect errors during sync process
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_errors = [];
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -70,7 +62,6 @@ class File
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $storageHelper
      * @param \Magento\MediaStorage\Helper\File\Media $mediaHelper
      * @param \Magento\MediaStorage\Model\ResourceModel\File\Storage\File $fileUtility
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -88,7 +79,6 @@ public function __construct(
      * Initialization
      *
      * @return $this
-     * @since 2.0.0
      */
     public function init()
     {
@@ -99,7 +89,6 @@ public function init()
      * Return storage name
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getStorageName()
     {
@@ -110,7 +99,6 @@ public function getStorageName()
      * Get files and directories from storage
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStorageData()
     {
@@ -121,7 +109,6 @@ public function getStorageData()
      * Check if there was errors during sync process
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasErrors()
     {
@@ -132,7 +119,6 @@ public function hasErrors()
      * Clear files and directories in storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -148,7 +134,6 @@ public function clear()
      * @param  string $type
      * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function collectData($offset = 0, $count = 100, $type = 'files')
     {
@@ -174,7 +159,6 @@ public function collectData($offset = 0, $count = 100, $type = 'files')
      * Retrieve connection name saved at config
      *
      * @return null
-     * @since 2.0.0
      */
     public function getConfigConnectionName()
     {
@@ -185,7 +169,6 @@ public function getConfigConnectionName()
      * Retrieve connection name
      *
      * @return null
-     * @since 2.0.0
      */
     public function getConnectionName()
     {
@@ -198,7 +181,6 @@ public function getConnectionName()
      * @param  int $offset
      * @param  int $count
      * @return array|bool
-     * @since 2.0.0
      */
     public function exportDirectories($offset = 0, $count = 100)
     {
@@ -211,7 +193,6 @@ public function exportDirectories($offset = 0, $count = 100)
      * @param  int $offset
      * @param  int $count
      * @return array|bool
-     * @since 2.0.0
      */
     public function exportFiles($offset = 0, $count = 1)
     {
@@ -242,7 +223,6 @@ public function exportFiles($offset = 0, $count = 1)
      * @param  array $data
      * @param  string $callback
      * @return $this
-     * @since 2.0.0
      */
     public function import($data, $callback)
     {
@@ -267,7 +247,6 @@ public function import($data, $callback)
      *
      * @param  array $dirs
      * @return $this
-     * @since 2.0.0
      */
     public function importDirectories($dirs)
     {
@@ -279,7 +258,6 @@ public function importDirectories($dirs)
      *
      * @param  array $files
      * @return $this
-     * @since 2.0.0
      */
     public function importFiles($files)
     {
@@ -291,7 +269,6 @@ public function importFiles($files)
      *
      * @param  array $dir
      * @return bool
-     * @since 2.0.0
      */
     public function saveDir($dir)
     {
@@ -305,7 +282,6 @@ public function saveDir($dir)
      * @param  bool $overwrite
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function saveFile($file, $overwrite = true)
     {
@@ -338,7 +314,6 @@ public function saveFile($file, $overwrite = true)
      * Retrieve media base directory path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaBaseDirectory()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Flag.php b/app/code/Magento/MediaStorage/Model/File/Storage/Flag.php
index 97e6b89f9760f..4b7d2483b128f 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Flag.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Flag.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Flag extends \Magento\Framework\Flag
 {
@@ -46,7 +45,6 @@ class Flag extends \Magento\Framework\Flag
      * Synchronize flag code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_flagCode = 'synchronize';
 
@@ -56,7 +54,6 @@ class Flag extends \Magento\Framework\Flag
      * @param \Exception $e
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function passError(\Exception $e)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Request.php b/app/code/Magento/MediaStorage/Model/File/Storage/Request.php
index f10d1611a7387..2b2bd426ff792 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Request.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Request.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\MediaStorage\Model\File\Storage\Request
  *
- * @since 2.0.0
  */
 class Request
 {
@@ -18,13 +17,11 @@ class Request
      * Path info
      *
      * @var string
-     * @since 2.0.0
      */
     private $pathInfo;
 
     /**
      * @param HttpRequest $request
-     * @since 2.0.0
      */
     public function __construct(HttpRequest $request)
     {
@@ -35,7 +32,6 @@ public function __construct(HttpRequest $request)
      * Retrieve path info
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPathInfo()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
index 355f7781d45c6..bf0392a6f6f13 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\MediaStorage\Model\File\Storage\Response
  *
- * @since 2.0.0
  */
 class Response extends Http implements
     \Magento\Framework\App\Response\FileInterface,
@@ -21,7 +20,6 @@ class Response extends Http implements
 {
     /**
      * @var \Magento\Framework\File\Transfer\Adapter\Http
-     * @since 2.0.0
      */
     protected $_transferAdapter;
 
@@ -29,7 +27,6 @@ class Response extends Http implements
      * Full path to file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_filePath;
 
@@ -42,7 +39,6 @@ class Response extends Http implements
      * @param \Magento\Framework\App\Http\Context $context
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\File\Transfer\Adapter\Http $transferAdapter
-     * @since 2.0.0
      */
     public function __construct(
         HttpRequest $request,
@@ -60,7 +56,6 @@ public function __construct(
      * Send response
      *
      * @return void
-     * @since 2.0.0
      */
     public function sendResponse()
     {
@@ -74,7 +69,6 @@ public function sendResponse()
     /**
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     public function setFilePath($path)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
index 4e14e5081972d..d744afb0fad9f 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Synchronization
- * @since 2.0.0
  */
 class Synchronization
 {
@@ -19,7 +18,6 @@ class Synchronization
      * Database storage factory
      *
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
-     * @since 2.0.0
      */
     protected $storageFactory;
 
@@ -27,14 +25,12 @@ class Synchronization
      * File stream handler
      *
      * @var DirectoryWrite
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
     /**
      * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageFactory
      * @param DirectoryWrite $directory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageFactory,
@@ -50,7 +46,6 @@ public function __construct(
      * @param string $relativeFileName
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function synchronize($relativeFileName)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Uploader.php b/app/code/Magento/MediaStorage/Model/File/Uploader.php
index c0b8c59a26bbc..a90ac8fb05df7 100644
--- a/app/code/Magento/MediaStorage/Model/File/Uploader.php
+++ b/app/code/Magento/MediaStorage/Model/File/Uploader.php
@@ -10,7 +10,6 @@
  * Core file uploader model
  *
  * @api
- * @since 2.0.0
  */
 class Uploader extends \Magento\Framework\File\Uploader
 {
@@ -18,7 +17,6 @@ class Uploader extends \Magento\Framework\File\Uploader
      * Flag, that defines should DB processing be skipped
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_skipDbProcessing = false;
 
@@ -26,7 +24,6 @@ class Uploader extends \Magento\Framework\File\Uploader
      * Core file storage
      *
      * @var \Magento\MediaStorage\Helper\File\Storage
-     * @since 2.0.0
      */
     protected $_coreFileStorage = null;
 
@@ -34,13 +31,11 @@ class Uploader extends \Magento\Framework\File\Uploader
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDb = null;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
-     * @since 2.0.0
      */
     protected $_validator;
 
@@ -49,7 +44,6 @@ class Uploader extends \Magento\Framework\File\Uploader
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
-     * @since 2.0.0
      */
     public function __construct(
         $fileId,
@@ -68,7 +62,6 @@ public function __construct(
      *
      * @param  array $result
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave($result)
     {
@@ -90,7 +83,6 @@ protected function _afterSave($result)
      *
      * @param null|bool $flag
      * @return bool|\Magento\MediaStorage\Model\File\Uploader
-     * @since 2.0.0
      */
     public function skipDbProcessing($flag = null)
     {
@@ -106,7 +98,6 @@ public function skipDbProcessing($flag = null)
      *
      * @param string $extension
      * @return boolean
-     * @since 2.0.0
      */
     public function checkAllowedExtension($extension)
     {
@@ -122,7 +113,6 @@ public function checkAllowedExtension($extension)
      * Get file size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFileSize()
     {
@@ -133,7 +123,6 @@ public function getFileSize()
      * Validate file
      *
      * @return array
-     * @since 2.0.0
      */
     public function validateFile()
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Validator/AvailablePath.php b/app/code/Magento/MediaStorage/Model/File/Validator/AvailablePath.php
index f91fbdf5e1eb5..a0a5b603d45df 100644
--- a/app/code/Magento/MediaStorage/Model/File/Validator/AvailablePath.php
+++ b/app/code/Magento/MediaStorage/Model/File/Validator/AvailablePath.php
@@ -29,7 +29,6 @@
 /**
  * Class \Magento\MediaStorage\Model\File\Validator\AvailablePath
  *
- * @since 2.0.0
  */
 class AvailablePath extends \Zend_Validate_Abstract
 {
@@ -43,7 +42,6 @@ class AvailablePath extends \Zend_Validate_Abstract
      * The path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_value;
 
@@ -51,7 +49,6 @@ class AvailablePath extends \Zend_Validate_Abstract
      * Protected paths
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_protectedPaths = [];
 
@@ -59,7 +56,6 @@ class AvailablePath extends \Zend_Validate_Abstract
      * Available paths
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_availablePaths = [];
 
@@ -67,13 +63,11 @@ class AvailablePath extends \Zend_Validate_Abstract
      * Cache of made regular expressions from path masks
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_pathsData;
 
     /**
      * Construct
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -84,7 +78,6 @@ public function __construct()
      * Initialize message templates with translating
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessageTemplates()
     {
@@ -104,7 +97,6 @@ protected function _initMessageTemplates()
      * @param array $paths  All paths masks types.
      *                      E.g.: array('available' => array(...), 'protected' => array(...))
      * @return $this
-     * @since 2.0.0
      */
     public function setPaths(array $paths)
     {
@@ -122,7 +114,6 @@ public function setPaths(array $paths)
      *
      * @param array $paths
      * @return $this
-     * @since 2.0.0
      */
     public function setProtectedPaths(array $paths)
     {
@@ -135,7 +126,6 @@ public function setProtectedPaths(array $paths)
      *
      * @param string|string[] $path
      * @return $this
-     * @since 2.0.0
      */
     public function addProtectedPath($path)
     {
@@ -151,7 +141,6 @@ public function addProtectedPath($path)
      * Get protected paths masks
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getProtectedPaths()
     {
@@ -163,7 +152,6 @@ public function getProtectedPaths()
      *
      * @param array $paths
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailablePaths(array $paths)
     {
@@ -176,7 +164,6 @@ public function setAvailablePaths(array $paths)
      *
      * @param string|string[] $path
      * @return $this
-     * @since 2.0.0
      */
     public function addAvailablePath($path)
     {
@@ -192,7 +179,6 @@ public function addAvailablePath($path)
      * Get available paths masks
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAvailablePaths()
     {
@@ -210,7 +196,6 @@ public function getAvailablePaths()
      * @return bool
      * @throws \Exception       Throw exception on empty both paths masks types
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -254,7 +239,6 @@ public function isValid($value)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _isValidByPaths($valuePathInfo, $paths, $protected)
     {
diff --git a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
index 3aa4cd7930d2b..89bf05446452b 100644
--- a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
@@ -10,7 +10,6 @@
 
 /**
  * Validator for check not protected file extensions
- * @since 2.0.0
  */
 class NotProtectedExtension extends \Zend_Validate_Abstract
 {
@@ -28,7 +27,6 @@ class NotProtectedExtension extends \Zend_Validate_Abstract
      * The file extension
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_value;
 
@@ -36,7 +34,6 @@ class NotProtectedExtension extends \Zend_Validate_Abstract
      * Protected file types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_protectedFileExtensions = [];
 
@@ -44,7 +41,6 @@ class NotProtectedExtension extends \Zend_Validate_Abstract
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -52,7 +48,6 @@ class NotProtectedExtension extends \Zend_Validate_Abstract
      * Init validator
      *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -65,7 +60,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * Initialize message templates with translating
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessageTemplates()
     {
@@ -81,7 +75,6 @@ protected function _initMessageTemplates()
      * Initialize protected file extensions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initProtectedFileExtensions()
     {
@@ -103,7 +96,6 @@ protected function _initProtectedFileExtensions()
      *
      * @param \Magento\Store\Model\Store|string|int $store
      * @return string|string[]
-     * @since 2.0.0
      */
     public function getProtectedFileExtensions($store = null)
     {
@@ -119,7 +111,6 @@ public function getProtectedFileExtensions($store = null)
      *
      * @param string $value         Extension of file
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
index 122cb54e67fbb..227b428328b79 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
@@ -7,7 +7,6 @@
 
 /**
  * Class AbstractStorage
- * @since 2.0.0
  */
 abstract class AbstractStorage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ abstract class AbstractStorage extends \Magento\Framework\Model\ResourceModel\Db
      * File storage connection name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_connectionName = null;
 
@@ -24,7 +22,6 @@ abstract class AbstractStorage extends \Magento\Framework\Model\ResourceModel\Db
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setConnectionName($name)
     {
@@ -37,7 +34,6 @@ public function setConnectionName($name)
      *
      * @todo: make method protected
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -49,7 +45,6 @@ public function getConnection()
      *
      * @param string $resourceName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function _getConnection($resourceName)
     {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php
index d5cea58951d92..a3f322a55643b 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php
@@ -9,13 +9,11 @@
  * Class Database
  *
  * @api
- * @since 2.0.0
  */
 class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\AbstractStorage
 {
     /**
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -23,7 +21,6 @@ class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\Ab
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Define table name and id field for resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      * Create database scheme for storing files
      *
      * @return $this
-     * @since 2.0.0
      */
     public function createDatabaseScheme()
     {
@@ -130,7 +125,6 @@ public function createDatabaseScheme()
      *
      * @param  array $row Table row with 'content' key in it
      * @return array
-     * @since 2.0.0
      */
     protected function _decodeFileContent($row)
     {
@@ -143,7 +137,6 @@ protected function _decodeFileContent($row)
      *
      * @param  array $rows Array of table rows (files), each containing 'content' key
      * @return array
-     * @since 2.0.0
      */
     protected function _decodeAllFilesContent($rows)
     {
@@ -160,7 +153,6 @@ protected function _decodeAllFilesContent($rows)
      * @param  string $filename
      * @param  string $path
      * @return $this
-     * @since 2.0.0
      */
     public function loadByFilename(\Magento\MediaStorage\Model\File\Storage\Database $object, $filename, $path)
     {
@@ -189,7 +181,6 @@ public function loadByFilename(\Magento\MediaStorage\Model\File\Storage\Database
      * Clear files in storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearFiles()
     {
@@ -205,7 +196,6 @@ public function clearFiles()
      * @param  int $offset
      * @param  int $count
      * @return array
-     * @since 2.0.0
      */
     public function getFiles($offset = 0, $count = 100)
     {
@@ -230,7 +220,6 @@ public function getFiles($offset = 0, $count = 100)
      *
      * @param  array $file
      * @return $this
-     * @since 2.0.0
      */
     public function saveFile($file)
     {
@@ -259,7 +248,6 @@ public function saveFile($file)
      * @param  string $newFilename
      * @param  string $newPath
      * @return $this
-     * @since 2.0.0
      */
     public function renameFile($oldFilename, $oldPath, $newFilename, $newPath)
     {
@@ -282,7 +270,6 @@ public function renameFile($oldFilename, $oldPath, $newFilename, $newPath)
      * @param  string $newFilename
      * @param  string $newPath
      * @return $this
-     * @since 2.0.0
      */
     public function copyFile($oldFilename, $oldPath, $newFilename, $newPath)
     {
@@ -320,7 +307,6 @@ public function copyFile($oldFilename, $oldPath, $newFilename, $newPath)
      * @param string $filename
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function fileExists($filename, $path)
     {
@@ -346,7 +332,6 @@ public function fileExists($filename, $path)
      *
      * @param string $folderName
      * @return void
-     * @since 2.0.0
      */
     public function deleteFolder($folderName = '')
     {
@@ -368,7 +353,6 @@ public function deleteFolder($folderName = '')
      * @param string $filename
      * @param string $directory
      * @return void
-     * @since 2.0.0
      */
     public function deleteFile($filename, $directory)
     {
@@ -385,7 +369,6 @@ public function deleteFile($filename, $directory)
      *
      * @param string $directory
      * @return array
-     * @since 2.0.0
      */
     public function getDirectoryFiles($directory)
     {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php
index 9d9331f29bf31..e5f54cac4af6a 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Database
- * @since 2.0.0
  */
 class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\AbstractStorage
 {
@@ -15,7 +14,6 @@ class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\Ab
      * Define table name and id field for resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -26,7 +24,6 @@ protected function _construct()
      * Create database scheme for storing files
      *
      * @return $this
-     * @since 2.0.0
      */
     public function createDatabaseScheme()
     {
@@ -99,7 +96,6 @@ public function createDatabaseScheme()
      * @param  \Magento\MediaStorage\Model\File\Storage\Directory\Database $object
      * @param  string $path
      * @return $this
-     * @since 2.0.0
      */
     public function loadByPath(\Magento\MediaStorage\Model\File\Storage\Directory\Database $object, $path)
     {
@@ -134,7 +130,6 @@ public function loadByPath(\Magento\MediaStorage\Model\File\Storage\Directory\Da
      *
      * @param string $path
      * @return int
-     * @since 2.0.0
      */
     public function getParentId($path)
     {
@@ -163,7 +158,6 @@ public function getParentId($path)
      * Delete all directories from storage
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearDirectories()
     {
@@ -179,7 +173,6 @@ public function clearDirectories()
      * @param int $offset
      * @param int $count
      * @return array
-     * @since 2.0.0
      */
     public function exportDirectories($offset, $count = 100)
     {
@@ -203,7 +196,6 @@ public function exportDirectories($offset, $count = 100)
      *
      * @param string $directory
      * @return array
-     * @since 2.0.0
      */
     public function getSubdirectories($directory)
     {
@@ -228,7 +220,6 @@ public function getSubdirectories($directory)
      * @param string $name
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     public function deleteDirectory($name, $path)
     {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
index 913c95c2fb3f5..8dfce40419b4a 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
@@ -9,26 +9,22 @@
 
 /**
  * Class File
- * @since 2.0.0
  */
 class File
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Psr\Log\LoggerInterface $log
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Filesystem $filesystem, \Psr\Log\LoggerInterface $log)
     {
@@ -41,7 +37,6 @@ public function __construct(\Magento\Framework\Filesystem $filesystem, \Psr\Log\
      *
      * @param string $dir
      * @return array
-     * @since 2.0.0
      */
     public function getStorageData($dir = '/')
     {
@@ -73,7 +68,6 @@ public function getStorageData($dir = '/')
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function clear($dir = '')
     {
@@ -93,7 +87,6 @@ public function clear($dir = '')
      * @param array $dir
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function saveDir($dir)
     {
@@ -123,7 +116,6 @@ public function saveDir($dir)
      * @param bool $overwrite
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function saveFile($filePath, $content, $overwrite = false)
     {
diff --git a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
index 001002dbb32d9..cec017d57fbd3 100644
--- a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
+++ b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
@@ -7,13 +7,11 @@
 
 /**
  * Product form MSRP field helper
- * @since 2.0.0
  */
 class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -26,7 +24,6 @@ class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Msrp\Model\Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -52,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toHtml()
     {
diff --git a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type/Price.php b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type/Price.php
index b5df7c6701b1f..33c2000153b6c 100644
--- a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type/Price.php
+++ b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type/Price.php
@@ -11,13 +11,11 @@
 
 /**
  * Product form MSRP field helper
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Data\Form\Element\Select
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -27,7 +25,6 @@ class Price extends \Magento\Framework\Data\Form\Element\Select
      * @param Escaper $escaper
      * @param \Magento\Msrp\Model\Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toHtml()
     {
diff --git a/app/code/Magento/Msrp/Block/Popup.php b/app/code/Magento/Msrp/Block/Popup.php
index 21f10d3871925..187424e078f1e 100644
--- a/app/code/Magento/Msrp/Block/Popup.php
+++ b/app/code/Magento/Msrp/Block/Popup.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Popup extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -21,7 +19,6 @@ class Popup extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Msrp\Model\Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -43,7 +39,6 @@ public function isEnabled()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getExplanationMessage()
     {
@@ -52,7 +47,6 @@ public function getExplanationMessage()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getExplanationMessageWhatsThis()
     {
diff --git a/app/code/Magento/Msrp/Block/Total.php b/app/code/Magento/Msrp/Block/Total.php
index 68ee736266a04..d1b317d253d42 100644
--- a/app/code/Magento/Msrp/Block/Total.php
+++ b/app/code/Magento/Msrp/Block/Total.php
@@ -8,19 +8,16 @@
 /**
  * @api
  * @method string getOriginalBlockName()
- * @since 2.0.0
  */
 class Total extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Msrp\Model\Quote\Msrp
-     * @since 2.0.0
      */
     protected $msrp;
 
@@ -29,7 +26,6 @@ class Total extends \Magento\Framework\View\Element\Template
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Msrp\Model\Quote\Msrp $msrp
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +40,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 35808c88cb84a..b4ec34ebee19c 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -14,37 +14,31 @@
 
 /**
  * Msrp data helper
- * @since 2.0.0
  */
 class Data extends AbstractHelper
 {
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Msrp\Model\Product\Options
-     * @since 2.0.0
      */
     protected $productOptions;
 
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -56,7 +50,6 @@ class Data extends AbstractHelper
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -85,7 +78,6 @@ public function __construct(
      * @return bool
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function canApplyMsrp($product, $visibility = null)
     {
@@ -119,7 +111,6 @@ public function canApplyMsrp($product, $visibility = null)
      *
      * @param Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getMsrpPriceMessage($product)
     {
@@ -137,7 +128,6 @@ public function getMsrpPriceMessage($product)
      *
      * @param int|Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isShowPriceOnGesture($product)
     {
@@ -147,7 +137,6 @@ public function isShowPriceOnGesture($product)
     /**
      * @param int|Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isShowBeforeOrderConfirm($product)
     {
@@ -157,7 +146,6 @@ public function isShowBeforeOrderConfirm($product)
     /**
      * @param int|Product $product
      * @return bool|float
-     * @since 2.0.0
      */
     public function isMinimalPriceLessMsrp($product)
     {
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index 325f2a3836c2b..8a471365a3f0b 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Msrp\Model\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -26,27 +25,21 @@ class Config
     const XML_PATH_MSRP_EXPLANATION_MESSAGE_WHATS_THIS = 'sales/msrp/explanation_message_whats_this';
     /**#@-*/
 
-    /**
-     * @var ScopeConfigInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $scopeConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $storeId;
 
@@ -54,7 +47,6 @@ class Config
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -71,7 +63,6 @@ public function __construct(
      *
      * @param int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($store)
     {
@@ -84,7 +75,6 @@ public function setStoreId($store)
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -99,7 +89,6 @@ public function isEnabled()
      * Return Msrp display actual type
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getDisplayActualPriceType()
     {
@@ -114,7 +103,6 @@ public function getDisplayActualPriceType()
      * Return Msrp explanation message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExplanationMessage()
     {
@@ -132,7 +120,6 @@ public function getExplanationMessage()
      * Return Msrp explanation message for "Whats This" window
      *
      * @return string
-     * @since 2.0.0
      */
     public function getExplanationMessageWhatsThis()
     {
diff --git a/app/code/Magento/Msrp/Model/Msrp.php b/app/code/Magento/Msrp/Model/Msrp.php
index dc899a9fb5ce0..a6180b677fd28 100644
--- a/app/code/Magento/Msrp/Model/Msrp.php
+++ b/app/code/Magento/Msrp/Model/Msrp.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Msrp\Model\Msrp
  *
- * @since 2.0.0
  */
 class Msrp
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $mapApplyToProductType = null;
 
     /**
      * @var AttributeFactory
-     * @since 2.0.0
      */
     protected $eavAttributeFactory;
 
     /**
      * @param AttributeFactory $eavAttributeFactory
-     * @since 2.0.0
      */
     public function __construct(
         AttributeFactory $eavAttributeFactory
@@ -43,7 +39,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canApplyToProduct($product)
     {
diff --git a/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type.php b/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type.php
index 9a719e9d5bdec..57c7402f854bd 100644
--- a/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type.php
+++ b/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type.php
@@ -7,7 +7,6 @@
 
 /**
  * Catalog product Msrp "Display Actual Price" attribute source
- * @since 2.0.0
  */
 class Type extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -30,7 +29,6 @@ class Type extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * Get all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type/Price.php b/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type/Price.php
index 6cb95eb497b39..94c638483eda7 100644
--- a/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type/Price.php
+++ b/app/code/Magento/Msrp/Model/Product/Attribute/Source/Type/Price.php
@@ -7,7 +7,6 @@
 
 /**
  * Source model for 'msrp_display_actual_price_type' product attribute
- * @since 2.0.0
  */
 class Price extends \Magento\Msrp\Model\Product\Attribute\Source\Type
 {
@@ -20,7 +19,6 @@ class Price extends \Magento\Msrp\Model\Product\Attribute\Source\Type
      * Entity attribute factory
      *
      * @var \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $entityAttributeFactory;
 
@@ -28,7 +26,6 @@ class Price extends \Magento\Msrp\Model\Product\Attribute\Source\Type
      * Eav resource helper
      *
      * @var \Magento\Eav\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $eavResourceHelper;
 
@@ -37,7 +34,6 @@ class Price extends \Magento\Msrp\Model\Product\Attribute\Source\Type
      *
      * @param \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory $entityAttributeFactory
      * @param \Magento\Eav\Model\ResourceModel\Helper $eavResourceHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\AttributeFactory $entityAttributeFactory,
@@ -51,7 +47,6 @@ public function __construct(
      * Get all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
@@ -68,7 +63,6 @@ public function getAllOptions()
      * Retrieve flat column definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -91,7 +85,6 @@ public function getFlatColumns()
      *
      * @param int $store
      * @return \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
diff --git a/app/code/Magento/Msrp/Model/Product/Options.php b/app/code/Magento/Msrp/Model/Product/Options.php
index 6ff03d3f25b4b..528b7552242ba 100644
--- a/app/code/Magento/Msrp/Model/Product/Options.php
+++ b/app/code/Magento/Msrp/Model/Product/Options.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Msrp\Model\Product\Options
  *
- * @since 2.0.0
  */
 class Options
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpData;
 
     /**
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Msrp\Helper\Data $msrpData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Msrp\Model\Config $config,
@@ -44,7 +40,6 @@ public function __construct(
      * @param null $visibility
      * @return bool|null
      * @api
-     * @since 2.0.0
      */
     public function isEnabled($product, $visibility = null)
     {
@@ -66,7 +61,6 @@ public function isEnabled($product, $visibility = null)
     /**
      * @param \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     protected function getVisibilities($product)
     {
diff --git a/app/code/Magento/Msrp/Model/Quote/Address/CanApplyMsrp.php b/app/code/Magento/Msrp/Model/Quote/Address/CanApplyMsrp.php
index 8d4b273370da2..9443e8835e25f 100644
--- a/app/code/Magento/Msrp/Model/Quote/Address/CanApplyMsrp.php
+++ b/app/code/Magento/Msrp/Model/Quote/Address/CanApplyMsrp.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Msrp\Model\Quote\Address\CanApplyMsrp
  *
- * @since 2.0.0
  */
 class CanApplyMsrp
 {
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpHelper;
 
     /**
      * @param \Magento\Msrp\Helper\Data $msrpHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\Msrp\Helper\Data $msrpHelper)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Msrp\Helper\Data $msrpHelper)
     /**
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return bool
-     * @since 2.0.0
      */
     public function isCanApplyMsrp($address)
     {
diff --git a/app/code/Magento/Msrp/Model/Quote/Msrp.php b/app/code/Magento/Msrp/Model/Quote/Msrp.php
index 5941c08064f9b..5c0c8389bdcca 100644
--- a/app/code/Magento/Msrp/Model/Quote/Msrp.php
+++ b/app/code/Magento/Msrp/Model/Quote/Msrp.php
@@ -7,13 +7,11 @@
 
 /**
  * Class Msrp
- * @since 2.0.0
  */
 class Msrp
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $canApplyMsrpData = [];
 
@@ -21,7 +19,6 @@ class Msrp
      * @param int $quoteId
      * @param bool $canApply
      * @return $this
-     * @since 2.0.0
      */
     public function setCanApplyMsrp($quoteId, $canApply)
     {
@@ -33,7 +30,6 @@ public function setCanApplyMsrp($quoteId, $canApply)
      * @param int $quoteId
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanApplyMsrp($quoteId)
     {
diff --git a/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php b/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
index 62155d5a8de76..6352dd9772354 100644
--- a/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
+++ b/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
@@ -9,25 +9,21 @@
 
 /**
  * Class SetCanApplyMsrp
- * @since 2.0.0
  */
 class SetCanApplyMsrpObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Msrp\Model\Quote\Address\CanApplyMsrp
-     * @since 2.0.0
      */
     protected $canApplyMsrp;
 
     /**
      * @var \Magento\Msrp\Model\Quote\Msrp
-     * @since 2.0.0
      */
     protected $msrp;
 
@@ -35,7 +31,6 @@ class SetCanApplyMsrpObserver implements ObserverInterface
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Msrp\Model\Quote\Address\CanApplyMsrp $canApplyMsrp
      * @param \Magento\Msrp\Model\Quote\Msrp $msrp
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Msrp\Model\Config $config,
@@ -52,7 +47,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index 83931064ff057..59b8d622c42a0 100644
--- a/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Msrp\Plugin\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes
  *
- * @since 2.0.0
  */
 class Attributes
 {
@@ -18,7 +17,6 @@ class Attributes
      * @param \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes $subject
      * @param \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes $result
      * @return \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes
-     * @since 2.0.0
      */
     public function afterSetForm(
         \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes $subject,
diff --git a/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php b/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
index 2b51a122935c1..0bf36e7ce5d6b 100644
--- a/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
+++ b/app/code/Magento/Msrp/Pricing/Price/MsrpPrice.php
@@ -12,7 +12,6 @@
 
 /**
  * MSRP price model
- * @since 2.0.0
  */
 class MsrpPrice extends FinalPrice implements MsrpPriceInterface
 {
@@ -23,13 +22,11 @@ class MsrpPrice extends FinalPrice implements MsrpPriceInterface
 
     /**
      * @var \Magento\Msrp\Helper\Data
-     * @since 2.0.0
      */
     protected $msrpData;
 
     /**
      * @var \Magento\Msrp\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -40,7 +37,6 @@ class MsrpPrice extends FinalPrice implements MsrpPriceInterface
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Msrp\Helper\Data $msrpData
      * @param \Magento\Msrp\Model\Config $config
-     * @since 2.0.0
      */
     public function __construct(
         Product $saleableItem,
@@ -59,7 +55,6 @@ public function __construct(
      * Returns whether the MSRP should be shown on gesture
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShowPriceOnGesture()
     {
@@ -70,7 +65,6 @@ public function isShowPriceOnGesture()
      * Get Msrp message for price
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMsrpPriceMessage()
     {
@@ -81,7 +75,6 @@ public function getMsrpPriceMessage()
      * Check if Minimum Advertised Price is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMsrpEnabled()
     {
@@ -93,7 +86,6 @@ public function isMsrpEnabled()
      *
      * @param Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function canApplyMsrp(Product $product)
     {
@@ -103,7 +95,6 @@ public function canApplyMsrp(Product $product)
     /**
      * @param Product $product
      * @return bool|float
-     * @since 2.0.0
      */
     public function isMinimalPriceLessMsrp(Product $product)
     {
diff --git a/app/code/Magento/Msrp/Pricing/Price/MsrpPriceInterface.php b/app/code/Magento/Msrp/Pricing/Price/MsrpPriceInterface.php
index b7042d315145d..95c822262df5c 100644
--- a/app/code/Magento/Msrp/Pricing/Price/MsrpPriceInterface.php
+++ b/app/code/Magento/Msrp/Pricing/Price/MsrpPriceInterface.php
@@ -12,7 +12,6 @@
  * MSRP price interface
  *
  * @api
- * @since 2.0.0
  */
 interface MsrpPriceInterface
 {
@@ -20,7 +19,6 @@ interface MsrpPriceInterface
      * Check is product need gesture to show price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShowPriceOnGesture();
 
@@ -28,7 +26,6 @@ public function isShowPriceOnGesture();
      * Get Msrp message for price
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMsrpPriceMessage();
 
@@ -36,7 +33,6 @@ public function getMsrpPriceMessage();
      * Check if Minimum Advertised Price is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMsrpEnabled();
 
@@ -45,7 +41,6 @@ public function isMsrpEnabled();
      *
      * @param Product $saleableItem
      * @return bool
-     * @since 2.0.0
      */
     public function canApplyMsrp(Product $saleableItem);
 }
diff --git a/app/code/Magento/Msrp/Setup/InstallData.php b/app/code/Magento/Msrp/Setup/InstallData.php
index 9c854928b75fd..02bcc9d465f9a 100644
--- a/app/code/Magento/Msrp/Setup/InstallData.php
+++ b/app/code/Magento/Msrp/Setup/InstallData.php
@@ -15,7 +15,6 @@
 /**
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -23,7 +22,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -31,7 +29,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -40,7 +37,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Msrp/Setup/UpgradeData.php b/app/code/Magento/Msrp/Setup/UpgradeData.php
index aacab66d47581..286bfbc8ca36d 100644
--- a/app/code/Magento/Msrp/Setup/UpgradeData.php
+++ b/app/code/Magento/Msrp/Setup/UpgradeData.php
@@ -13,19 +13,19 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.2.0
+ * @since 2.1.3
  */
 class UpgradeData implements UpgradeDataInterface
 {
     /**
      * @var CategorySetupFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $categorySetupFactory;
 
     /**
      * @param CategorySetupFactory $categorySetupFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         CategorySetupFactory $categorySetupFactory
@@ -35,7 +35,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -53,7 +53,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
      * @param \Magento\Catalog\Setup\CategorySetup $categorySetup
      * @param int $entityTypeId
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function changePriceAttributeDefaultScope($categorySetup, $entityTypeId)
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
index c402e6d6f7cc5..234ff56725dc9 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Multishipping\Block\Checkout\AbstractMultishipping
  *
- * @since 2.0.0
  */
 class AbstractMultishipping extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
@@ -28,7 +26,6 @@ class AbstractMultishipping extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Retrieve multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
index c67d841254aeb..48e47fb816534 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
@@ -14,43 +14,36 @@
  * Multishipping checkout select billing address
  *
  * @api
- * @since 2.0.0
  */
 class Select extends \Magento\Multishipping\Block\Checkout\AbstractMultishipping
 {
     /**
      * @var CustomerAddressHelper
-     * @since 2.0.0
      */
     protected $_customerAddressHelper;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate = true;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
@@ -65,7 +58,6 @@ class Select extends \Magento\Multishipping\Block\Checkout\AbstractMultishipping
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -87,7 +79,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -101,7 +92,6 @@ protected function _prepareLayout()
      * Get a list of current customer addresses.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -128,7 +118,6 @@ public function getAddress()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getAddressAsHtml(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -145,7 +134,6 @@ public function getAddressAsHtml(\Magento\Customer\Api\Data\AddressInterface $ad
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return bool
-     * @since 2.0.0
      */
     public function isAddressDefaultBilling(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -157,7 +145,6 @@ public function isAddressDefaultBilling(\Magento\Customer\Api\Data\AddressInterf
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return bool
-     * @since 2.0.0
      */
     public function isAddressDefaultShipping(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -169,7 +156,6 @@ public function isAddressDefaultShipping(\Magento\Customer\Api\Data\AddressInter
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getEditAddressUrl(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -181,7 +167,6 @@ public function getEditAddressUrl(\Magento\Customer\Api\Data\AddressInterface $a
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getSetAddressUrl(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -190,7 +175,6 @@ public function getSetAddressUrl(\Magento\Customer\Api\Data\AddressInterface $ad
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddNewUrl()
     {
@@ -199,7 +183,6 @@ public function getAddNewUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Addresses.php b/app/code/Magento/Multishipping/Block/Checkout/Addresses.php
index 4d7b7ede9bbf7..d644ba5aebdad 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Addresses.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Addresses.php
@@ -12,37 +12,31 @@
  * Multishipping checkout choose item addresses block
  *
  * @api
- * @since 2.0.0
  */
 class Addresses extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
      * @var \Magento\Framework\Filter\DataObject\GridFactory
-     * @since 2.0.0
      */
     protected $_filterGridFactory;
 
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     private $_addressConfig;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -56,7 +50,6 @@ class Addresses extends \Magento\Sales\Block\Items\AbstractItems
      * @param AddressConfig $addressConfig
      * @param \Magento\Customer\Model\Address\Mapper $addressMapper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -80,7 +73,6 @@ public function __construct(
      * Retrieve multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -89,7 +81,6 @@ public function getCheckout()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -101,7 +92,6 @@ protected function _prepareLayout()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -118,7 +108,6 @@ public function getItems()
      * @param mixed $item
      * @param int $index
      * @return string
-     * @since 2.0.0
      */
     public function getAddressesHtmlSelect($item, $index)
     {
@@ -135,7 +124,6 @@ public function getAddressesHtmlSelect($item, $index)
      * Retrieve options for addresses dropdown
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAddressOptions()
     {
@@ -171,7 +159,6 @@ public function getAddressOptions()
      * Retrieve active customer ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -181,7 +168,6 @@ public function getCustomerId()
     /**
      * @param mixed $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemUrl($item)
     {
@@ -191,7 +177,6 @@ public function getItemUrl($item)
     /**
      * @param mixed $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemDeleteUrl($item)
     {
@@ -200,7 +185,6 @@ public function getItemDeleteUrl($item)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -209,7 +193,6 @@ public function getPostActionUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNewAddressUrl()
     {
@@ -218,7 +201,6 @@ public function getNewAddressUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -227,7 +209,6 @@ public function getBackUrl()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isContinueDisabled()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Billing.php b/app/code/Magento/Multishipping/Block/Checkout/Billing.php
index edfda8a381c34..29dc161eaef5e 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Billing.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Billing.php
@@ -10,25 +10,21 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Billing extends \Magento\Payment\Block\Form\Container
 {
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Payment\Model\Method\SpecificationInterface
-     * @since 2.0.0
      */
     protected $paymentSpecification;
 
@@ -41,7 +37,6 @@ class Billing extends \Magento\Payment\Block\Form\Container
      * @param \Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification
      * @param array $data
      * @param array $additionalChecks
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Prepare children blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -80,7 +74,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Payment\Model\Method\AbstractMethod|null $method
      * @return bool
-     * @since 2.0.0
      */
     protected function _canUseMethod($method)
     {
@@ -95,7 +88,6 @@ protected function _canUseMethod($method)
      * Retrieve code of current payment method
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getSelectedMethodCode()
     {
@@ -110,7 +102,6 @@ public function getSelectedMethodCode()
      * Retrieve billing address
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -126,7 +117,6 @@ public function getAddress()
      * Retrieve quote model object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -137,7 +127,6 @@ public function getQuote()
      * Getter
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQuoteBaseGrandTotal()
     {
@@ -148,7 +137,6 @@ public function getQuoteBaseGrandTotal()
      * Retrieve url for select billing address
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectAddressUrl()
     {
@@ -159,7 +147,6 @@ public function getSelectAddressUrl()
      * Retrieve data post destination url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -170,7 +157,6 @@ public function getPostActionUrl()
      * Retrieve back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php b/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
index a53bc115eae64..49b0b58e12867 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -34,7 +31,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Get multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -63,7 +58,6 @@ public function getCheckout()
      * Retrieve quote model object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -74,7 +68,6 @@ public function getQuote()
      * Retrieve virtual product edit url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVirtualProductEditUrl()
     {
@@ -85,7 +78,6 @@ public function getVirtualProductEditUrl()
      * Retrieve virtual product collection array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVirtualQuoteItems()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Link.php b/app/code/Magento/Multishipping/Block/Checkout/Link.php
index 38ee765864773..6c6cb921c55d6 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Link.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Link.php
@@ -9,7 +9,6 @@
  * Multishipping cart link
  *
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * Multishipping helper
      *
      * @var \Magento\Multishipping\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -25,7 +23,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Multishipping\Helper\Data $helper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutUrl()
     {
@@ -48,7 +44,6 @@ public function getCheckoutUrl()
 
     /**
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -57,7 +52,6 @@ public function getQuote()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function _toHtml()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 1cc6eef3a7afa..bf3a0e825ee83 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Overview extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -24,31 +23,26 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems
 
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsReader
-     * @since 2.0.0
      */
     protected $totalsReader;
 
@@ -60,7 +54,6 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
      * @param \Magento\Quote\Model\Quote\TotalsReader $totalsReader
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -84,7 +77,6 @@ public function __construct(
      * Initialize default item renderer
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -98,7 +90,6 @@ protected function _prepareLayout()
      * Get multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -107,7 +98,6 @@ public function getCheckout()
 
     /**
      * @return Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -116,7 +106,6 @@ public function getBillingAddress()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentHtml()
     {
@@ -127,7 +116,6 @@ public function getPaymentHtml()
      * Get object with payment info posted data
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getPayment()
     {
@@ -140,7 +128,6 @@ public function getPayment()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getShippingAddresses()
     {
@@ -149,7 +136,6 @@ public function getShippingAddresses()
 
     /**
      * @return int|mixed
-     * @since 2.0.0
      */
     public function getShippingAddressCount()
     {
@@ -165,7 +151,6 @@ public function getShippingAddressCount()
      * @param Address $address
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShippingAddressRate($address)
     {
@@ -179,7 +164,6 @@ public function getShippingAddressRate($address)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingPriceInclTax($address)
     {
@@ -191,7 +175,6 @@ public function getShippingPriceInclTax($address)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingPriceExclTax($address)
     {
@@ -203,7 +186,6 @@ public function getShippingPriceExclTax($address)
      * @return mixed
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -218,7 +200,6 @@ public function formatPrice($price)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingAddressItems($address)
     {
@@ -228,7 +209,6 @@ public function getShippingAddressItems($address)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingAddressTotals($address)
     {
@@ -247,7 +227,6 @@ public function getShippingAddressTotals($address)
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getTotal()
     {
@@ -256,7 +235,6 @@ public function getTotal()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddressesEditUrl()
     {
@@ -266,7 +244,6 @@ public function getAddressesEditUrl()
     /**
      * @param Address $address
      * @return string
-     * @since 2.0.0
      */
     public function getEditShippingAddressUrl($address)
     {
@@ -276,7 +253,6 @@ public function getEditShippingAddressUrl($address)
     /**
      * @param Address $address
      * @return string
-     * @since 2.0.0
      */
     public function getEditBillingAddressUrl($address)
     {
@@ -285,7 +261,6 @@ public function getEditBillingAddressUrl($address)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEditShippingUrl()
     {
@@ -294,7 +269,6 @@ public function getEditShippingUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -303,7 +277,6 @@ public function getPostActionUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEditBillingUrl()
     {
@@ -312,7 +285,6 @@ public function getEditBillingUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -323,7 +295,6 @@ public function getBackUrl()
      * Retrieve virtual product edit url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVirtualProductEditUrl()
     {
@@ -334,7 +305,6 @@ public function getVirtualProductEditUrl()
      * Retrieve virtual product collection array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVirtualItems()
     {
@@ -354,7 +324,6 @@ public function getVirtualItems()
      * Retrieve quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -363,7 +332,6 @@ public function getQuote()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getBillinAddressTotals()
     {
@@ -375,7 +343,6 @@ public function getBillinAddressTotals()
      * @param mixed $totals
      * @param null $colspan
      * @return string
-     * @since 2.0.0
      */
     public function renderTotals($totals, $colspan = null)
     {
@@ -405,7 +372,6 @@ public function renderTotals($totals, $colspan = null)
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowItemHtml(\Magento\Framework\DataObject $item)
     {
@@ -420,7 +386,6 @@ public function getRowItemHtml(\Magento\Framework\DataObject $item)
      *
      * @param string $type
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _getRowItemRenderer($type)
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Payment/Info.php b/app/code/Magento/Multishipping/Block/Checkout/Payment/Info.php
index 2d38105412867..c4973399c5358 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Payment/Info.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Payment/Info.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Payment\Block\Info\AbstractContainer
 {
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
@@ -28,7 +26,6 @@ class Info extends \Magento\Payment\Block\Info\AbstractContainer
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Retrieve payment info model
      *
      * @return \Magento\Payment\Model\Info
-     * @since 2.0.0
      */
     public function getPaymentInfo()
     {
@@ -53,7 +49,6 @@ public function getPaymentInfo()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
index 93d2178e38a4e..97b680f3515cd 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -13,25 +13,21 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
      * @var \Magento\Framework\Filter\DataObject\GridFactory
-     * @since 2.0.0
      */
     protected $_filterGridFactory;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -42,7 +38,6 @@ class Shipping extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Get multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -73,7 +67,6 @@ public function getCheckout()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -85,7 +78,6 @@ protected function _prepareLayout()
 
     /**
      * @return Address[]
-     * @since 2.0.0
      */
     public function getAddresses()
     {
@@ -94,7 +86,6 @@ public function getAddresses()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getAddressCount()
     {
@@ -109,7 +100,6 @@ public function getAddressCount()
     /**
      * @param Address $address
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getAddressItems($address)
     {
@@ -129,7 +119,6 @@ public function getAddressItems($address)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getAddressShippingMethod($address)
     {
@@ -139,7 +128,6 @@ public function getAddressShippingMethod($address)
     /**
      * @param Address $address
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingRates($address)
     {
@@ -150,7 +138,6 @@ public function getShippingRates($address)
     /**
      * @param string $carrierCode
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierName($carrierCode)
     {
@@ -167,7 +154,6 @@ public function getCarrierName($carrierCode)
     /**
      * @param Address $address
      * @return string
-     * @since 2.0.0
      */
     public function getAddressEditUrl($address)
     {
@@ -176,7 +162,6 @@ public function getAddressEditUrl($address)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getItemsEditUrl()
     {
@@ -185,7 +170,6 @@ public function getItemsEditUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPostActionUrl()
     {
@@ -194,7 +178,6 @@ public function getPostActionUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -206,7 +189,6 @@ public function getBackUrl()
      * @param float $price
      * @param bool $flag
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPrice($address, $price, $flag)
     {
@@ -225,7 +207,6 @@ public function getShippingPrice($address, $price, $flag)
      * @return string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getItemsBoxTextAfter(\Magento\Framework\DataObject $addressEntity)
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/State.php b/app/code/Magento/Multishipping/Block/Checkout/State.php
index 68222e1285ebe..0f6a5fb84def7 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/State.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/State.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Multishipping\Block\Checkout\State
  *
- * @since 2.0.0
  */
 class State extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping\State
-     * @since 2.0.0
      */
     protected $_multishippingState;
 
@@ -28,7 +26,6 @@ class State extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping\State $multishippingState
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSteps()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Success.php b/app/code/Magento/Multishipping/Block/Checkout/Success.php
index 9d0b7315ee5c4..588ca4920bae9 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Success.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Success.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Success extends \Magento\Multishipping\Block\Checkout\AbstractMultishipping
 {
@@ -21,7 +20,6 @@ class Success extends \Magento\Multishipping\Block\Checkout\AbstractMultishippin
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -34,7 +32,6 @@ public function __construct(
 
     /**
      * @return array|bool|string
-     * @since 2.0.0
      */
     public function getOrderIds()
     {
@@ -48,7 +45,6 @@ public function getOrderIds()
     /**
      * @param int $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getViewOrderUrl($orderId)
     {
@@ -57,7 +53,6 @@ public function getViewOrderUrl($orderId)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getContinueUrl()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index dc7fe535b2807..1870736a0efd9 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -13,7 +13,6 @@
  * Multishipping checkout controller
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Checkout extends \Magento\Checkout\Controller\Action implements
     \Magento\Checkout\Controller\Express\RedirectLoginInterface
@@ -25,7 +24,6 @@ abstract class Checkout extends \Magento\Checkout\Controller\Action implements
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -45,7 +43,6 @@ public function __construct(
      * Retrieve checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected function _getCheckout()
     {
@@ -56,7 +53,6 @@ protected function _getCheckout()
      * Retrieve checkout state model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping\State
-     * @since 2.0.0
      */
     protected function _getState()
     {
@@ -67,7 +63,6 @@ protected function _getState()
      * Retrieve checkout url helper
      *
      * @return \Magento\Multishipping\Helper\Url
-     * @since 2.0.0
      */
     protected function _getHelper()
     {
@@ -78,7 +73,6 @@ protected function _getHelper()
      * Retrieve checkout session
      *
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected function _getCheckoutSession()
     {
@@ -92,7 +86,6 @@ protected function _getCheckoutSession()
      * @return \Magento\Framework\App\ResponseInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -172,7 +165,6 @@ public function dispatch(RequestInterface $request)
      * Validate minimum amount
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateMinimumAmount()
     {
@@ -189,7 +181,6 @@ protected function _validateMinimumAmount()
      * Returns before_auth_url redirect parameter for customer session
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerBeforeAuthUrl()
     {
@@ -202,7 +193,6 @@ public function getCustomerBeforeAuthUrl()
      * Returns a list of action flags [flag_key] => boolean
      *
      * @return array
-     * @since 2.0.0
      */
     public function getActionFlagList()
     {
@@ -213,7 +203,6 @@ public function getActionFlagList()
      * Returns login url parameter for redirect
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoginUrl()
     {
@@ -224,7 +213,6 @@ public function getLoginUrl()
      * Returns action name which requires redirect
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectActionName()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address.php b/app/code/Magento/Multishipping/Controller/Checkout/Address.php
index 38d7633e70738..99a4247ad7ad9 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address.php
@@ -7,13 +7,11 @@
 
 /**
  * Multishipping checkout address manipulation controller
- * @since 2.0.0
  */
 abstract class Address extends \Magento\Framework\App\Action\Action
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -27,7 +25,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      * Retrieve multishipping checkout model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     protected function _getCheckout()
     {
@@ -38,7 +35,6 @@ protected function _getCheckout()
      * Retrieve checkout state model
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping\State
-     * @since 2.0.0
      */
     protected function _getState()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
index 90b9b4db494f8..d57a5bbf7fdbd 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\EditAddress
  *
- * @since 2.0.0
  */
 class EditAddress extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
index 9e0c3f991e84c..332317db21954 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\EditBilling
  *
- * @since 2.0.0
  */
 class EditBilling extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
index 66d175488fa55..ba65be5fd1db9 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\EditShipping
  *
- * @since 2.0.0
  */
 class EditShipping extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php
index 32a7dfbda0087..bbce7a8795d32 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\EditShippingPost
  *
- * @since 2.0.0
  */
 class EditShippingPost extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
index 5bba80e67d192..16839c8c5e2ff 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\NewBilling
  *
- * @since 2.0.0
  */
 class NewBilling extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
index 411e01e040b8e..6f3034cff0e5d 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\NewShipping
  *
- * @since 2.0.0
  */
 class NewShipping extends \Magento\Multishipping\Controller\Checkout\Address
 {
@@ -17,7 +16,6 @@ class NewShipping extends \Magento\Multishipping\Controller\Checkout\Address
      * Create New Shipping address Form
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php
index 79e7c56849fea..48ca3652d05af 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\SaveBilling
  *
- * @since 2.0.0
  */
 class SaveBilling extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php
index f67e7fe4dc5b6..4594b3ec13bec 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\SelectBilling
  *
- * @since 2.0.0
  */
 class SelectBilling extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php
index 0f633e0534c32..a676e72c29815 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Address\SetBilling
  *
- * @since 2.0.0
  */
 class SetBilling extends \Magento\Multishipping\Controller\Checkout\Address
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
index f5fc1622832e3..05f0dca1dc357 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
@@ -15,25 +15,21 @@
  * Class ShippingSaved
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class ShippingSaved extends Address
 {
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     private $addressRepository;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     private $filterBuilder;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     private $searchCriteriaBuilder;
 
@@ -44,7 +40,6 @@ class ShippingSaved extends Address
      * @param AddressRepositoryInterface $addressRepository
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +55,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
index 7238856512d91..5857fcaf19c55 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Addresses
  *
- * @since 2.0.0
  */
 class Addresses extends \Magento\Multishipping\Controller\Checkout
 {
@@ -19,7 +18,6 @@ class Addresses extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout select address page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
index e5efeee567f19..df6e23386540d 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\AddressesPost
  *
- * @since 2.0.0
  */
 class AddressesPost extends \Magento\Multishipping\Controller\Checkout
 {
@@ -19,7 +18,6 @@ class AddressesPost extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout process posted addresses
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php
index cacf08252ad4e..f9937b3260526 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\BackToAddresses
  *
- * @since 2.0.0
  */
 class BackToAddresses extends \Magento\Multishipping\Controller\Checkout
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php
index 3518ed73ffd47..c44bda8360724 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\BackToBilling
  *
- * @since 2.0.0
  */
 class BackToBilling extends \Magento\Multishipping\Controller\Checkout
 {
@@ -19,7 +18,6 @@ class BackToBilling extends \Magento\Multishipping\Controller\Checkout
      * Back to billing action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php
index 0115f7644e96a..96c84a4b373c1 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\BackToShipping
  *
- * @since 2.0.0
  */
 class BackToShipping extends \Magento\Multishipping\Controller\Checkout
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
index e1b8e4d4698df..507393ddd4c68 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Billing
  *
- * @since 2.0.0
  */
 class Billing extends \Magento\Multishipping\Controller\Checkout
 {
@@ -20,7 +19,6 @@ class Billing extends \Magento\Multishipping\Controller\Checkout
      * Validation of selecting of billing address
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _validateBilling()
     {
@@ -35,7 +33,6 @@ protected function _validateBilling()
      * Multishipping checkout billing information page
      *
      * @return void|ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Index.php b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
index 23ab89da1cde1..08f81fce2493e 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Index.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Multishipping\Controller\Checkout
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Multishipping\Controller\Checkout
      * Index action of Multishipping checkout
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Login.php b/app/code/Magento/Multishipping/Controller/Checkout/Login.php
index 5b078dd5256e1..9f05e1e7242c4 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Login.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Login.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Login
  *
- * @since 2.0.0
  */
 class Login extends \Magento\Multishipping\Controller\Checkout
 {
@@ -17,7 +16,6 @@ class Login extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout login page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
index 920d5b574f03d..3a075d0f2460c 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Overview
  *
- * @since 2.0.0
  */
 class Overview extends \Magento\Multishipping\Controller\Checkout
 {
@@ -19,7 +18,6 @@ class Overview extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout place order page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index dfc0db6e99080..d23f8863d0728 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -14,25 +14,21 @@
  * Class OverviewPost
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OverviewPost extends \Magento\Multishipping\Controller\Checkout
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Checkout\Api\AgreementsValidatorInterface
-     * @since 2.0.0
      */
     protected $agreementsValidator;
 
@@ -44,7 +40,6 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -71,7 +66,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php b/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php
index ae9c7d2c0ff86..0fc079c720de8 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @param \Magento\Checkout\Model\Cart $cart
-     * @since 2.0.0
      */
     public function __construct(\Magento\Checkout\Model\Cart $cart)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Checkout\Model\Cart $cart)
      * @param \Magento\Framework\App\Action\Action $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeExecute(\Magento\Framework\App\Action\Action $subject)
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Register.php b/app/code/Magento/Multishipping/Controller/Checkout/Register.php
index a25eaacfb9d65..b722de077c7b1 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Register.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Register.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Register
  *
- * @since 2.0.0
  */
 class Register extends \Magento\Multishipping\Controller\Checkout
 {
@@ -17,7 +16,6 @@ class Register extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout login page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
index 17a08a51e83eb..ea61e11b2e4b2 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\RemoveItem
  *
- * @since 2.0.0
  */
 class RemoveItem extends \Magento\Multishipping\Controller\Checkout
 {
@@ -17,7 +16,6 @@ class RemoveItem extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout remove item action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
index 7cd70de08ac41..90aa6a39daf69 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends \Magento\Multishipping\Controller\Checkout
 {
@@ -20,7 +19,6 @@ class Shipping extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout shipping information page
      *
      * @return  ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
index 38cc62ff7130c..5a656ed086322 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\ShippingPost
  *
- * @since 2.0.0
  */
 class ShippingPost extends \Magento\Multishipping\Controller\Checkout
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Success.php b/app/code/Magento/Multishipping/Controller/Checkout/Success.php
index e678ae0c39b09..dc7e7522abf34 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Success.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Success.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Multishipping\Controller\Checkout\Success
  *
- * @since 2.0.0
  */
 class Success extends \Magento\Multishipping\Controller\Checkout
 {
@@ -19,7 +18,6 @@ class Success extends \Magento\Multishipping\Controller\Checkout
      * Multishipping checkout success page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index 51956d426a991..c752057ebe7f5 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -10,7 +10,6 @@
 
 /**
  * Data helper
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -23,12 +22,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * Checkout session
-     *
-     * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $checkoutSession;
 
     /**
@@ -36,7 +30,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -50,7 +43,6 @@ public function __construct(
      * Retrieve checkout quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -61,7 +53,6 @@ public function getQuote()
      * Get maximum quantity allowed for shipping to multiple addresses
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaximumQty()
     {
@@ -73,7 +64,6 @@ public function getMaximumQty()
      * There should be a valid quote in checkout session. If not, only the config value will be returned
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMultishippingCheckoutAvailable()
     {
diff --git a/app/code/Magento/Multishipping/Helper/Url.php b/app/code/Magento/Multishipping/Helper/Url.php
index 4212a7ecd0203..b1d9493242638 100644
--- a/app/code/Magento/Multishipping/Helper/Url.php
+++ b/app/code/Magento/Multishipping/Helper/Url.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Multishipping\Helper\Url
  *
- * @since 2.0.0
  */
 class Url extends \Magento\Framework\Url\Helper\Data
 {
@@ -22,7 +21,6 @@ class Url extends \Magento\Framework\Url\Helper\Data
      * Retrieve shopping cart url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCartUrl()
     {
@@ -33,7 +31,6 @@ public function getCartUrl()
      * Retrieve checkout url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMSCheckoutUrl()
     {
@@ -44,7 +41,6 @@ public function getMSCheckoutUrl()
      * Retrieve login url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMSLoginUrl()
     {
@@ -55,7 +51,6 @@ public function getMSLoginUrl()
      * Retrieve address url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMSAddressesUrl()
     {
@@ -66,7 +61,6 @@ public function getMSAddressesUrl()
      * Retrieve shipping address save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMSShippingAddressSavedUrl()
     {
@@ -77,7 +71,6 @@ public function getMSShippingAddressSavedUrl()
      * Retrieve register url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMSRegisterUrl()
     {
diff --git a/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php b/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php
index 063ae357a7f85..44c5d1a199f44 100644
--- a/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php
+++ b/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php
@@ -8,19 +8,19 @@
 /**
  * Class \Magento\Multishipping\Model\Cart\Controller\CartPlugin
  *
- * @since 2.1.0
+ * @since 2.0.9
  */
 class CartPlugin
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $cartRepository;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $checkoutSession;
 
@@ -34,7 +34,7 @@ class CartPlugin
      * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
@@ -51,7 +51,7 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function beforeDispatch(
         \Magento\Checkout\Controller\Cart $subject,
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 8f15c1de62b16..96e078d00c631 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @codingStandardsIgnoreFile
- * @since 2.0.0
  */
 class Multishipping extends \Magento\Framework\DataObject
 {
@@ -28,7 +27,6 @@ class Multishipping extends \Magento\Framework\DataObject
      * Quote shipping addresses items cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_quoteShippingAddressesItems;
 
@@ -36,7 +34,6 @@ class Multishipping extends \Magento\Framework\DataObject
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -44,31 +41,26 @@ class Multishipping extends \Magento\Framework\DataObject
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Quote\Model\Quote\AddressFactory
-     * @since 2.0.0
      */
     protected $_addressFactory;
 
     /**
      * @var \Magento\Payment\Model\Method\SpecificationInterface
-     * @since 2.0.0
      */
     protected $paymentSpecification;
 
@@ -76,91 +68,76 @@ class Multishipping extends \Magento\Framework\DataObject
      * Initialize dependencies.
      *
      * @var \Magento\Multishipping\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\ToOrder
-     * @since 2.0.0
      */
     protected $quoteAddressToOrder;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\ToOrderItem
-     * @since 2.0.0
      */
     protected $quoteItemToOrderItem;
 
     /**
      * @var \Magento\Quote\Model\Quote\Payment\ToOrderPayment
-     * @since 2.0.0
      */
     protected $quotePaymentToOrderPayment;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\ToOrderAddress
-     * @since 2.0.0
      */
     protected $quoteAddressToOrderAddress;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -210,7 +187,6 @@ class Multishipping extends \Magento\Framework\DataObject
      * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory
      * @param AllowedCountries|null $allowedCountryReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -273,7 +249,6 @@ public function __construct(
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _init()
     {
@@ -338,7 +313,6 @@ protected function _init()
      * Based on result array we can display each item separately
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQuoteShippingAddressesItems()
     {
@@ -355,7 +329,6 @@ public function getQuoteShippingAddressesItems()
      * @param int $addressId
      * @param int $itemId
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function removeAddressItem($addressId, $itemId)
     {
@@ -410,7 +383,6 @@ public function removeAddressItem($addressId, $itemId)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function setShippingItemsInformation($info)
     {
@@ -499,7 +471,6 @@ public function setShippingItemsInformation($info)
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _addShippingItem($quoteItemId, $data)
     {
@@ -554,7 +525,6 @@ protected function _addShippingItem($quoteItemId, $data)
      * @param int $addressId customer address id
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function updateQuoteCustomerShippingAddress($addressId)
     {
@@ -582,7 +552,6 @@ public function updateQuoteCustomerShippingAddress($addressId)
      * @param int $addressId customer address id
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function setQuoteCustomerBillingAddress($addressId)
     {
@@ -610,7 +579,6 @@ public function setQuoteCustomerBillingAddress($addressId)
      * @param  array $methods
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setShippingMethods($methods)
     {
@@ -638,7 +606,6 @@ public function setShippingMethods($methods)
      * @param array $payment
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setPaymentMethod($payment)
     {
@@ -669,7 +636,6 @@ public function setPaymentMethod($payment)
      * @param   \Magento\Quote\Model\Quote\Address $address
      * @return  \Magento\Sales\Model\Order
      * @throws  \Magento\Checkout\Exception
-     * @since 2.0.0
      */
     protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
     {
@@ -720,7 +686,6 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validate()
     {
@@ -774,7 +739,6 @@ protected function _validate()
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
      * @throws \Exception
-     * @since 2.0.0
      */
     public function createOrders()
     {
@@ -829,7 +793,6 @@ public function createOrders()
      * Collect quote totals and save quote object
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function save()
     {
@@ -842,7 +805,6 @@ public function save()
      * Specify BEGIN state in checkout session whot allow reinit multishipping checkout
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -854,7 +816,6 @@ public function reset()
      * Check if quote amount is allowed for multishipping checkout
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validateMinimumAmount()
     {
@@ -871,7 +832,6 @@ public function validateMinimumAmount()
      * Get notification message for case when multishipping checkout is not allowed
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMinimumAmountDescription()
     {
@@ -890,7 +850,6 @@ public function getMinimumAmountDescription()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMinimumAmountError()
     {
@@ -912,7 +871,6 @@ public function getMinimumAmountError()
      *
      * @param bool $asAssoc
      * @return array
-     * @since 2.0.0
      */
     public function getOrderIds($asAssoc = false)
     {
@@ -924,7 +882,6 @@ public function getOrderIds($asAssoc = false)
      * Retrieve customer default billing address
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerDefaultBillingAddress()
     {
@@ -936,7 +893,6 @@ public function getCustomerDefaultBillingAddress()
      * Retrieve customer default shipping address
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerDefaultShippingAddress()
     {
@@ -950,7 +906,6 @@ public function getCustomerDefaultShippingAddress()
      * @param string $key
      * @param string|null $defaultAddressIdFromCustomer
      * @return int|null
-     * @since 2.0.0
      */
     private function getDefaultAddressByDataKey($key, $defaultAddressIdFromCustomer)
     {
@@ -981,7 +936,6 @@ private function getDefaultAddressByDataKey($key, $defaultAddressIdFromCustomer)
      * Retrieve checkout session model
      *
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     public function getCheckoutSession()
     {
@@ -997,7 +951,6 @@ public function getCheckoutSession()
      * Retrieve quote model
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -1008,7 +961,6 @@ public function getQuote()
      * Retrieve quote items
      *
      * @return \Magento\Quote\Model\Quote\Item[]
-     * @since 2.0.0
      */
     public function getQuoteItems()
     {
@@ -1019,7 +971,6 @@ public function getQuoteItems()
      * Retrieve customer session model
      *
      * @return \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     public function getCustomerSession()
     {
@@ -1030,7 +981,6 @@ public function getCustomerSession()
      * Retrieve customer object
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -1042,7 +992,6 @@ public function getCustomer()
      *
      * @param $addressId
      * @return bool
-     * @since 2.0.0
      */
     protected function isAddressIdApplicable($addressId)
     {
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/Plugin.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/Plugin.php
index a9183fafeee8d..701d5dbd0e12a 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/Plugin.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/Plugin.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $checkoutStateBegin;
 
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     {
@@ -38,7 +34,6 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
      * @param \Magento\Checkout\Model\Cart $subject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(\Magento\Checkout\Model\Cart $subject)
     {
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
index ecbfb7145acbd..2615ad1b540c8 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
@@ -12,7 +12,6 @@
  * Multishipping checkout state model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class State extends \Magento\Framework\DataObject
 {
@@ -30,7 +29,6 @@ class State extends \Magento\Framework\DataObject
      * Allow steps array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_steps;
 
@@ -38,13 +36,11 @@ class State extends \Magento\Framework\DataObject
      * Checkout model
      *
      * @var Multishipping
-     * @since 2.0.0
      */
     protected $_multishipping;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -53,7 +49,6 @@ class State extends \Magento\Framework\DataObject
      *
      * @param Session $checkoutSession
      * @param Multishipping $multishipping
-     * @since 2.0.0
      */
     public function __construct(Session $checkoutSession, Multishipping $multishipping)
     {
@@ -78,7 +73,6 @@ public function __construct(Session $checkoutSession, Multishipping $multishippi
      * Retrieve checkout model
      *
      * @return Multishipping
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -89,7 +83,6 @@ public function getCheckout()
      * Retrieve available checkout steps
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSteps()
     {
@@ -100,7 +93,6 @@ public function getSteps()
      * Retrieve active step code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActiveStep()
     {
@@ -114,7 +106,6 @@ public function getActiveStep()
     /**
      * @param string $step
      * @return $this
-     * @since 2.0.0
      */
     public function setActiveStep($step)
     {
@@ -139,7 +130,6 @@ public function setActiveStep($step)
      *
      * @param string $step
      * @return $this
-     * @since 2.0.0
      */
     public function setCompleteStep($step)
     {
@@ -155,7 +145,6 @@ public function setCompleteStep($step)
      * @param string $step
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCompleteStep($step)
     {
@@ -170,7 +159,6 @@ public function getCompleteStep($step)
      *
      * @param string $step
      * @return $this
-     * @since 2.0.0
      */
     public function unsCompleteStep($step)
     {
@@ -182,7 +170,6 @@ public function unsCompleteStep($step)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canSelectAddresses()
     {
@@ -190,7 +177,6 @@ public function canSelectAddresses()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canInputShipping()
     {
@@ -198,7 +184,6 @@ public function canInputShipping()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canSeeOverview()
     {
@@ -206,7 +191,6 @@ public function canSeeOverview()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canSuccess()
     {
@@ -216,7 +200,6 @@ public function canSuccess()
      * Retrieve checkout session
      *
      * @return Session
-     * @since 2.0.0
      */
     public function getCheckoutSession()
     {
diff --git a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Enabled.php b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Enabled.php
index f2a8173cc26af..fa3a7403dd9a4 100644
--- a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Enabled.php
+++ b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Enabled.php
@@ -9,7 +9,6 @@
 
 /**
  * Enable method specification
- * @since 2.0.0
  */
 class Enabled extends AbstractSpecification
 {
@@ -20,7 +19,6 @@ class Enabled extends AbstractSpecification
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isSatisfiedBy($paymentMethod)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
index 9f4ce9220e22c..7782374d356cd 100644
--- a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
+++ b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Apm\Deployments
  *
- * @since 2.0.0
  */
 class Deployments
 {
@@ -21,19 +20,16 @@ class Deployments
 
     /**
      * @var \Magento\NewRelicReporting\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory $clientFactory
-     * @since 2.0.0
      */
     protected $clientFactory;
 
@@ -43,7 +39,6 @@ class Deployments
      * @param \Magento\NewRelicReporting\Model\Config $config
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\HTTP\ZendClientFactory $clientFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\NewRelicReporting\Model\Config $config,
@@ -63,7 +58,6 @@ public function __construct(
      * @param bool $user
      *
      * @return bool|string
-     * @since 2.0.0
      */
     public function setDeployment($description, $change = false, $user = false)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php
index 581dfb17735ce..4821fbd025ec3 100644
--- a/app/code/Magento/NewRelicReporting/Model/Config.php
+++ b/app/code/Magento/NewRelicReporting/Model/Config.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -56,21 +55,16 @@ class Config
     const FALSE = 'false';
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected $resourceConfig;
 
@@ -80,7 +74,6 @@ class Config
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\Config\Model\ResourceModel\Config $resourceConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -96,7 +89,6 @@ public function __construct(
      * Returns module's enabled status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNewRelicEnabled()
     {
@@ -107,7 +99,6 @@ public function isNewRelicEnabled()
      * Returns configured URL for API
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewRelicApiUrl()
     {
@@ -118,7 +109,6 @@ public function getNewRelicApiUrl()
      * Returns configured URL for Insights API
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInsightsApiUrl()
     {
@@ -129,7 +119,6 @@ public function getInsightsApiUrl()
      * Returns configured account ID for New Relic
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewRelicAccountId()
     {
@@ -140,7 +129,6 @@ public function getNewRelicAccountId()
      * Return configured NR Application ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getNewRelicAppId()
     {
@@ -151,7 +139,6 @@ public function getNewRelicAppId()
      * Returns configured API key for APM
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewRelicApiKey()
     {
@@ -162,7 +149,6 @@ public function getNewRelicApiKey()
      * Returns configured Insights insert key for New Relic events related to cron jobs
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInsightsInsertKey()
     {
@@ -173,7 +159,6 @@ public function getInsightsInsertKey()
      * Returns configured NR Application name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewRelicAppName()
     {
@@ -184,7 +169,6 @@ public function getNewRelicAppName()
      * Returns config setting for overall cron to be enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCronEnabled()
     {
@@ -199,7 +183,6 @@ public function isCronEnabled()
      * @param string $scope
      * @param int $scopeId
      * @return void
-     * @since 2.0.0
      */
     protected function setConfigValue($pathId, $value, $scope = 'default', $scopeId = 0)
     {
@@ -210,7 +193,6 @@ protected function setConfigValue($pathId, $value, $scope = 'default', $scopeId
      * Disable module's functionality for case when new relic extension is not available
      *
      * @return void
-     * @since 2.0.0
      */
     public function disableModule()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Counter.php b/app/code/Magento/NewRelicReporting/Model/Counter.php
index 0327605137504..3a6c3ad658101 100644
--- a/app/code/Magento/NewRelicReporting/Model/Counter.php
+++ b/app/code/Magento/NewRelicReporting/Model/Counter.php
@@ -16,43 +16,36 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Counter
  *
- * @since 2.0.0
  */
 class Counter
 {
     /**
      * @var ProductManagementInterface
-     * @since 2.0.0
      */
     protected $productManagement;
 
     /**
      * @var ConfigurableProductManagementInterface
-     * @since 2.0.0
      */
     protected $configurableManagement;
 
     /**
      * @var CategoryManagementInterface
-     * @since 2.0.0
      */
     protected $categoryManagement;
 
     /**
      * @var CustomerManagementInterface
-     * @since 2.0.0
      */
     protected $customerManagement;
 
     /**
      * @var WebsiteManagementInterface
-     * @since 2.0.0
      */
     protected $websiteManagement;
 
     /**
      * @var StoreManagementInterface
-     * @since 2.0.0
      */
     protected $storeManagement;
 
@@ -65,7 +58,6 @@ class Counter
      * @param CustomerManagementInterface $customerManagement
      * @param WebsiteManagementInterface $websiteManagement
      * @param StoreManagementInterface $storeManagement
-     * @since 2.0.0
      */
     public function __construct(
         ProductManagementInterface $productManagement,
@@ -87,7 +79,6 @@ public function __construct(
      * Get count of all products, no conditions
      *
      * @return int
-     * @since 2.0.0
      */
     public function getAllProductsCount()
     {
@@ -99,7 +90,6 @@ public function getAllProductsCount()
      * Get count of configurable products
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConfigurableCount()
     {
@@ -111,7 +101,6 @@ public function getConfigurableCount()
      * Get count of products which are active
      *
      * @return int
-     * @since 2.0.0
      */
     public function getActiveCatalogSize()
     {
@@ -123,7 +112,6 @@ public function getActiveCatalogSize()
      * Get count of categories, minus one which is the root category
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCategoryCount()
     {
@@ -135,7 +123,6 @@ public function getCategoryCount()
      * Get customer count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerCount()
     {
@@ -147,7 +134,6 @@ public function getCustomerCount()
      * Get count of websites, minus one to exclude admin website
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteCount()
     {
@@ -159,7 +145,6 @@ public function getWebsiteCount()
      * Get count of store views
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreViewsCount()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Counts.php b/app/code/Magento/NewRelicReporting/Model/Counts.php
index fe92f7d7d37c5..3f0989a2ffe8a 100644
--- a/app/code/Magento/NewRelicReporting/Model/Counts.php
+++ b/app/code/Magento/NewRelicReporting/Model/Counts.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Counts
  *
- * @since 2.0.0
  */
 class Counts extends \Magento\Framework\Model\AbstractModel
 {
@@ -17,7 +16,6 @@ class Counts extends \Magento\Framework\Model\AbstractModel
      * Initialize counts model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron.php b/app/code/Magento/NewRelicReporting/Model/Cron.php
index f469da91ca221..57ac877e6b87b 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron.php
@@ -12,31 +12,26 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Cron
  *
- * @since 2.0.0
  */
 class Cron
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var ReportModulesInfo
-     * @since 2.0.0
      */
     protected $reportModulesInfo;
 
     /**
      * @var ReportCounts
-     * @since 2.0.0
      */
     protected $reportCounts;
 
     /**
      * @var ReportNewRelicCron
-     * @since 2.0.0
      */
     protected $reportNewRelicCron;
 
@@ -47,7 +42,6 @@ class Cron
      * @param ReportModulesInfo $reportModulesInfo
      * @param ReportCounts $reportCounts
      * @param ReportNewRelicCron $reportNewRelicCron
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -65,7 +59,6 @@ public function __construct(
      * The method run by the cron that fires all required events.
      *
      * @return \Magento\NewRelicReporting\Model\Cron
-     * @since 2.0.0
      */
     public function runCron()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
index 9b2a76f69d0af..817fef0e3cc4d 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
@@ -13,43 +13,36 @@
 
 /**
  * Class ReportCounts
- * @since 2.0.0
  */
 class ReportCounts
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var ProductManagementInterface
-     * @since 2.0.0
      */
     protected $productManagement;
 
     /**
      * @var ConfigurableProductManagementInterface
-     * @since 2.0.0
      */
     protected $configurableManagement;
 
     /**
      * @var CategoryManagementInterface
-     * @since 2.0.0
      */
     protected $categoryManagement;
 
     /**
      * @var \Magento\NewRelicReporting\Model\CountsFactory
-     * @since 2.0.0
      */
     protected $countsFactory;
 
     /**
      * @var \Magento\NewRelicReporting\Model\ResourceModel\Counts\CollectionFactory
-     * @since 2.0.0
      */
     protected $countsCollectionFactory;
 
@@ -62,7 +55,6 @@ class ReportCounts
      * @param CategoryManagementInterface $categoryManagement
      * @param \Magento\NewRelicReporting\Model\CountsFactory $countsFactory
      * @param \Magento\NewRelicReporting\Model\ResourceModel\Counts\CollectionFactory $countsCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -87,7 +79,6 @@ public function __construct(
      * @param \Magento\NewRelicReporting\Model\Counts $model
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     protected function updateCount($count, \Magento\NewRelicReporting\Model\Counts $model, $type)
     {
@@ -114,7 +105,6 @@ protected function updateCount($count, \Magento\NewRelicReporting\Model\Counts $
      * Reports product size to the database reporting_counts table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reportProductsSize()
     {
@@ -128,7 +118,6 @@ protected function reportProductsSize()
      * Reports configurable product size to the database reporting_counts table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reportConfigurableProductsSize()
     {
@@ -142,7 +131,6 @@ protected function reportConfigurableProductsSize()
      * Reports number of active products to the database reporting_counts table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reportProductsActive()
     {
@@ -156,7 +144,6 @@ protected function reportProductsActive()
      * Reports category size to the database reporting_counts table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reportCategorySize()
     {
@@ -170,7 +157,6 @@ protected function reportCategorySize()
      * Reports Modules and module changes to the database reporting_module_status table
      *
      * @return \Magento\NewRelicReporting\Model\Cron\ReportCounts
-     * @since 2.0.0
      */
     public function report()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
index 1d808ea6b006a..9cdc90bc46b2a 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
@@ -10,31 +10,26 @@
 
 /**
  * Class ReportModulesInfo
- * @since 2.0.0
  */
 class ReportModulesInfo
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var Collect
-     * @since 2.0.0
      */
     protected $collect;
 
     /**
      * @var \Magento\NewRelicReporting\Model\SystemFactory
-     * @since 2.0.0
      */
     protected $systemFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -45,7 +40,6 @@ class ReportModulesInfo
      * @param Collect $collect
      * @param \Magento\NewRelicReporting\Model\SystemFactory $systemFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -63,7 +57,6 @@ public function __construct(
      * Reports Modules and module changes to the database reporting_module_status table
      *
      * @return \Magento\NewRelicReporting\Model\Cron\ReportModulesInfo
-     * @since 2.0.0
      */
     public function report()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
index a7ab719b572e6..a4a7d30b44f5b 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
@@ -13,44 +13,37 @@
 
 /**
  * Class ReportNewRelicCron
- * @since 2.0.0
  */
 class ReportNewRelicCron
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var Collect
-     * @since 2.0.0
      */
     protected $collect;
 
     /**
      * @var Counter
-     * @since 2.0.0
      */
     protected $counter;
 
     /**
      * @var CronEventFactory
-     * @since 2.0.0
      */
     protected $cronEventFactory;
 
     /**
      * @var DeploymentsFactory
-     * @since 2.0.0
      */
     protected $deploymentsFactory;
 
     /**
      * Parameters to be sent to Insights
      * @var array
-     * @since 2.0.0
      */
     protected $customParameters = [];
 
@@ -62,7 +55,6 @@ class ReportNewRelicCron
      * @param Counter $counter
      * @param CronEventFactory $cronEventFactory
      * @param DeploymentsFactory $deploymentsFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -83,7 +75,6 @@ public function __construct(
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function addCustomParameters(array $data)
     {
@@ -96,7 +87,6 @@ public function addCustomParameters(array $data)
      *  Reports current total module counts to Insights
      *
      * @return void
-     * @since 2.0.0
      */
     protected function reportModules()
     {
@@ -139,7 +129,6 @@ protected function reportModules()
      * @param array $changesArray
      * @param string $deploymentText
      * @return void
-     * @since 2.0.0
      */
     protected function setModuleChangeStatusDeployment(array $changesArray, $deploymentText = '')
     {
@@ -159,7 +148,6 @@ protected function setModuleChangeStatusDeployment(array $changesArray, $deploym
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function reportCounts()
     {
@@ -183,7 +171,6 @@ protected function reportCounts()
      * Reports info to New Relic by Cron
      *
      * @return \Magento\NewRelicReporting\Model\Cron\ReportCounts
-     * @since 2.0.0
      */
     public function report()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/CronEvent.php b/app/code/Magento/NewRelicReporting/Model/CronEvent.php
index 5b007e1b156c9..eb3a9bc7b4739 100644
--- a/app/code/Magento/NewRelicReporting/Model/CronEvent.php
+++ b/app/code/Magento/NewRelicReporting/Model/CronEvent.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\NewRelicReporting\Model\CronEvent
  *
- * @since 2.0.0
  */
 class CronEvent
 {
     /**
      * @var \Magento\Framework\HTTP\ZendClient
-     * @since 2.0.0
      */
     protected $request;
 
@@ -24,7 +22,6 @@ class CronEvent
      * URL for Insights API, generated via method getEventsUrl
      *
      * @var string
-     * @since 2.0.0
      */
     protected $eventsUrl = '';
 
@@ -32,25 +29,21 @@ class CronEvent
      * Parameters to be sent to New Relic for a job run
      *
      * @var array
-     * @since 2.0.0
      */
     protected $customParameters = [];
 
     /**
      * @var \Magento\NewRelicReporting\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory $clientFactory
-     * @since 2.0.0
      */
     protected $clientFactory;
 
@@ -60,7 +53,6 @@ class CronEvent
      * @param \Magento\NewRelicReporting\Model\Config $config
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\HTTP\ZendClientFactory $clientFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\NewRelicReporting\Model\Config $config,
@@ -77,7 +69,6 @@ public function __construct(
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getEventsUrl()
     {
@@ -100,7 +91,6 @@ protected function getEventsUrl()
      * Returns HTTP request to events url
      *
      * @return \Magento\Framework\HTTP\ZendClient
-     * @since 2.0.0
      */
     protected function getRequest()
     {
@@ -124,7 +114,6 @@ protected function getRequest()
      * Returns all set custom parameters as JSON string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getJsonForResponse()
     {
@@ -151,7 +140,6 @@ protected function getJsonForResponse()
      *
      * @param array $data
      * @return \Magento\NewRelicReporting\Model\CronEvent $this
-     * @since 2.0.0
      */
     public function addData(array $data)
     {
@@ -163,7 +151,6 @@ public function addData(array $data)
      * Instantiates request if necessary and sends off with collected data
      *
      * @return bool
-     * @since 2.0.0
      */
     public function sendRequest()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Module.php b/app/code/Magento/NewRelicReporting/Model/Module.php
index bde2d34a48bb2..bf06d35a621cd 100644
--- a/app/code/Magento/NewRelicReporting/Model/Module.php
+++ b/app/code/Magento/NewRelicReporting/Model/Module.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Module
  *
- * @since 2.0.0
  */
 class Module extends \Magento\Framework\Model\AbstractModel
 {
@@ -17,7 +16,6 @@ class Module extends \Magento\Framework\Model\AbstractModel
      * Initialize module status model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
index 53335e7b46880..15e54ac9b15ea 100644
--- a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
+++ b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
@@ -14,37 +14,31 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Module\Collect
  *
- * @since 2.0.0
  */
 class Collect
 {
     /**
      * @var ModuleListInterface
-     * @since 2.0.0
      */
     protected $moduleList;
 
     /**
      * @var Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var fullModuleList
-     * @since 2.0.0
      */
     protected $fullModuleList;
 
     /**
      * @var \Magento\NewRelicReporting\Model\ModuleFactory
-     * @since 2.0.0
      */
     protected $moduleFactory;
 
     /**
      * @var \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory
-     * @since 2.0.0
      */
     protected $moduleCollectionFactory;
 
@@ -56,7 +50,6 @@ class Collect
      * @param Manager $moduleManager
      * @param \Magento\NewRelicReporting\Model\ModuleFactory $moduleFactory
      * @param \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory $moduleCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         ModuleListInterface $moduleList,
@@ -76,7 +69,6 @@ public function __construct(
      * Retrieve all disabled modules from the configuration
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getDisabledModules()
     {
@@ -91,7 +83,6 @@ protected function getDisabledModules()
      * Retrieve all modules array
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllModules()
     {
@@ -107,7 +98,6 @@ protected function getAllModules()
      * @param string $state
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getNewModuleChanges($moduleName, $active, $setupVersion, $state)
     {
@@ -136,7 +126,6 @@ protected function getNewModuleChanges($moduleName, $active, $setupVersion, $sta
      *
      * @param array $moduleChanges
      * @return array
-     * @since 2.0.0
      */
     protected function getFinalCounts($moduleChanges)
     {
@@ -185,7 +174,6 @@ protected function getFinalCounts($moduleChanges)
      *
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     protected function getState($moduleName)
     {
@@ -203,7 +191,6 @@ protected function getState($moduleName)
      *
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     protected function getActive($moduleName)
     {
@@ -221,7 +208,6 @@ protected function getActive($moduleName)
      *
      * @param array $changes
      * @return array mixed
-     * @since 2.0.0
      */
     protected function getCleanChangesArray($changes)
     {
@@ -241,7 +227,6 @@ protected function getCleanChangesArray($changes)
      * @param Module[] $dbModuleArray
      * @param string[] $arrayModuleNames
      * @return array|bool
-     * @since 2.0.0
      */
     protected function setUninstalledModuleChanges(array $dbModuleArray, array $arrayModuleNames)
     {
@@ -267,7 +252,6 @@ protected function setUninstalledModuleChanges(array $dbModuleArray, array $arra
      *
      * @param bool $refresh
      * @return array
-     * @since 2.0.0
      */
     public function getModuleData($refresh = true)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
index 0000254c185d5..c4818c38cd9c6 100644
--- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -9,7 +9,6 @@
  * Wrapper for New Relic functions
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class NewRelicWrapper
 {
@@ -19,7 +18,6 @@ class NewRelicWrapper
      * @param string $param
      * @param string|int $value
      * @return bool
-     * @since 2.0.0
      */
     public function addCustomParameter($param, $value)
     {
@@ -34,7 +32,6 @@ public function addCustomParameter($param, $value)
      * Checks whether newrelic-php5 agent is installed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isExtensionInstalled()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
index dc7890cf3dae1..f7eb658f40784 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
@@ -13,25 +13,21 @@
 
 /**
  * Class CheckConfig
- * @since 2.0.0
  */
 class CheckConfig implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -39,7 +35,6 @@ class CheckConfig implements ObserverInterface
      * @param Config $config
      * @param NewRelicWrapper $newRelicWrapper
      * @param ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -57,7 +52,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
index eda10a29998fa..615c80633cb0f 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
@@ -11,31 +11,26 @@
 
 /**
  * Class ReportConcurrentAdmins
- * @since 2.0.0
  */
 class ReportConcurrentAdmins implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $backendAuthSession;
 
     /**
      * @var \Magento\NewRelicReporting\Model\UsersFactory
-     * @since 2.0.0
      */
     protected $usersFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -44,7 +39,6 @@ class ReportConcurrentAdmins implements ObserverInterface
      * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
      * @param \Magento\NewRelicReporting\Model\UsersFactory $usersFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -64,7 +58,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
index 7731337dd21ce..cff1b159d481d 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
@@ -12,25 +12,21 @@
 
 /**
  * Class ReportConcurrentAdminsToNewRelic
- * @since 2.0.0
  */
 class ReportConcurrentAdminsToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $backendAuthSession;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
@@ -38,7 +34,6 @@ class ReportConcurrentAdminsToNewRelic implements ObserverInterface
      * @param Config $config
      * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
      * @param NewRelicWrapper $newRelicWrapper
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -56,7 +51,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsers.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsers.php
index d324a06702d69..1083a9f5d05af 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsers.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsers.php
@@ -11,43 +11,36 @@
 
 /**
  * Class ReportConcurrentUsers
- * @since 2.0.0
  */
 class ReportConcurrentUsers implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\NewRelicReporting\Model\UsersFactory
-     * @since 2.0.0
      */
     protected $usersFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -58,7 +51,6 @@ class ReportConcurrentUsers implements ObserverInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\NewRelicReporting\Model\UsersFactory $usersFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -82,7 +74,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsersToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsersToNewRelic.php
index 39a3935f0784e..beed7f3ba0520 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsersToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentUsersToNewRelic.php
@@ -12,37 +12,31 @@
 
 /**
  * Class ReportConcurrentUsersToNewRelic
- * @since 2.0.0
  */
 class ReportConcurrentUsersToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
@@ -52,7 +46,6 @@ class ReportConcurrentUsersToNewRelic implements ObserverInterface
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param NewRelicWrapper $newRelicWrapper
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -74,7 +67,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlaced.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlaced.php
index ec87ee72b48d7..721944b545f2a 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlaced.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlaced.php
@@ -11,26 +11,22 @@
 
 /**
  * Class ReportOrderPlaced
- * @since 2.0.0
  */
 class ReportOrderPlaced implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\NewRelicReporting\Model\OrdersFactory
-     * @since 2.0.0
      */
     protected $ordersFactory;
 
     /**
      * @param Config $config
      * @param \Magento\NewRelicReporting\Model\OrdersFactory $ordersFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -45,7 +41,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlacedToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlacedToNewRelic.php
index b8a0bc0315343..ac51632739349 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlacedToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportOrderPlacedToNewRelic.php
@@ -12,26 +12,22 @@
 
 /**
  * Class ReportOrderPlacedToNewRelic
- * @since 2.0.0
  */
 class ReportOrderPlacedToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
     /**
      * @param Config $config
      * @param NewRelicWrapper $newRelicWrapper
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeleted.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeleted.php
index 98b08f7263a17..0a52faea95cd3 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeleted.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeleted.php
@@ -11,25 +11,21 @@
 
 /**
  * Class ReportProductDeleted
- * @since 2.0.0
  */
 class ReportProductDeleted implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\NewRelicReporting\Model\SystemFactory
-     * @since 2.0.0
      */
     protected $systemFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -37,7 +33,6 @@ class ReportProductDeleted implements ObserverInterface
      * @param Config $config
      * @param \Magento\NewRelicReporting\Model\SystemFactory $systemFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeletedToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeletedToNewRelic.php
index b0e8b90612883..dee84abe901b0 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeletedToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductDeletedToNewRelic.php
@@ -12,26 +12,22 @@
 
 /**
  * Class ReportProductDeletedToNewRelic
- * @since 2.0.0
  */
 class ReportProductDeletedToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
     /**
      * @param Config $config
      * @param NewRelicWrapper $newRelicWrapper
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -47,7 +43,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSaved.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSaved.php
index 1bd03d2e11f03..693eff2d927f2 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSaved.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSaved.php
@@ -11,25 +11,21 @@
 
 /**
  * Class ReportProductSaved
- * @since 2.0.0
  */
 class ReportProductSaved implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\NewRelicReporting\Model\SystemFactory
-     * @since 2.0.0
      */
     protected $systemFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -37,7 +33,6 @@ class ReportProductSaved implements ObserverInterface
      * @param Config $config
      * @param \Magento\NewRelicReporting\Model\SystemFactory $systemFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSavedToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSavedToNewRelic.php
index 94cfae18e2af6..33c1ee4eec704 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSavedToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportProductSavedToNewRelic.php
@@ -12,26 +12,22 @@
 
 /**
  * Class ReportProductSavedToNewRelic
- * @since 2.0.0
  */
 class ReportProductSavedToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var NewRelicWrapper
-     * @since 2.0.0
      */
     protected $newRelicWrapper;
 
     /**
      * @param Config $config
      * @param NewRelicWrapper $newRelicWrapper
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlush.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlush.php
index e65ccdefe4e3a..b310111c10778 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlush.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlush.php
@@ -11,25 +11,21 @@
 
 /**
  * Class ReportSystemCacheFlush
- * @since 2.0.0
  */
 class ReportSystemCacheFlush implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\NewRelicReporting\Model\SystemFactory
-     * @since 2.0.0
      */
     protected $systemFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -37,7 +33,6 @@ class ReportSystemCacheFlush implements ObserverInterface
      * @param Config $config
      * @param \Magento\NewRelicReporting\Model\SystemFactory $systemFactory
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -55,7 +50,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
index 40921fce83d04..0e3ad1605f948 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
@@ -11,25 +11,21 @@
 
 /**
  * Class ReportSystemCacheFlushToNewRelic
- * @since 2.0.0
  */
 class ReportSystemCacheFlushToNewRelic implements ObserverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $backendAuthSession;
 
     /**
      * @var \Magento\NewRelicReporting\Model\Apm\DeploymentsFactory
-     * @since 2.0.0
      */
     protected $deploymentsFactory;
 
@@ -37,7 +33,6 @@ class ReportSystemCacheFlushToNewRelic implements ObserverInterface
      * @param Config $config
      * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
      * @param \Magento\NewRelicReporting\Model\Apm\DeploymentsFactory $deploymentsFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -55,7 +50,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Orders.php b/app/code/Magento/NewRelicReporting/Model/Orders.php
index 4b99004999f92..006a389710d4c 100644
--- a/app/code/Magento/NewRelicReporting/Model/Orders.php
+++ b/app/code/Magento/NewRelicReporting/Model/Orders.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Orders
  *
- * @since 2.0.0
  */
 class Orders extends \Magento\Framework\Model\AbstractModel
 {
@@ -17,7 +16,6 @@ class Orders extends \Magento\Framework\Model\AbstractModel
      * Initialize orders model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts.php
index f20ff2ce6cac9..89149b84ac37c 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Counts
  *
- * @since 2.0.0
  */
 class Counts extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Counts extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize users resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts/Collection.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts/Collection.php
index 6c58d62f42527..d07463fc74f33 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts/Collection.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Counts/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Counts\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize counts resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module.php
index 52ad966b87e64..f9576dbe7d340 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Module
  *
- * @since 2.0.0
  */
 class Module extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Module extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize module status resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module/Collection.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module/Collection.php
index 8eb725f5a4562..b48dc50964a4d 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module/Collection.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Module/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Module\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize module status resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders.php
index e36f778c653cc..44694186b35d0 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Orders
  *
- * @since 2.0.0
  */
 class Orders extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Orders extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize orders resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders/Collection.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders/Collection.php
index 07841ec510e31..c2e3508c2853c 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders/Collection.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Orders/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Orders\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize orders resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/System.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/System.php
index 69e19a8f4b76b..50a192cfb36a9 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/System.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/System.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\System
  *
- * @since 2.0.0
  */
 class System extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class System extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize system updates resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/System/Collection.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/System/Collection.php
index 3c6b3c789ef48..5fa235fd8a7a9 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/System/Collection.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/System/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\System\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize system updates resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users.php
index 70c7d858c30e7..2eec63bc75afb 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Users
  *
- * @since 2.0.0
  */
 class Users extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Users extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize users resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users/Collection.php b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users/Collection.php
index f70eda36c11ef..aa289df814800 100644
--- a/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users/Collection.php
+++ b/app/code/Magento/NewRelicReporting/Model/ResourceModel/Users/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\ResourceModel\Users\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize users resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/System.php b/app/code/Magento/NewRelicReporting/Model/System.php
index 11d9ebc9a8036..52143c36cdc6f 100644
--- a/app/code/Magento/NewRelicReporting/Model/System.php
+++ b/app/code/Magento/NewRelicReporting/Model/System.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\System
  *
- * @since 2.0.0
  */
 class System extends \Magento\Framework\Model\AbstractModel
 {
@@ -17,7 +16,6 @@ class System extends \Magento\Framework\Model\AbstractModel
      * Initialize system updates model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Model/Users.php b/app/code/Magento/NewRelicReporting/Model/Users.php
index 23de005fdd603..1aeba1472ba8a 100644
--- a/app/code/Magento/NewRelicReporting/Model/Users.php
+++ b/app/code/Magento/NewRelicReporting/Model/Users.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\NewRelicReporting\Model\Users
  *
- * @since 2.0.0
  */
 class Users extends \Magento\Framework\Model\AbstractModel
 {
@@ -17,7 +16,6 @@ class Users extends \Magento\Framework\Model\AbstractModel
      * Initialize users model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php b/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
index 2bbefff1fe7b4..aa6c8d1058f4b 100644
--- a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
+++ b/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index 7996010b52d6c..e6feb558d40e5 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -12,19 +12,16 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Problem extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'problem/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection
-     * @since 2.0.0
      */
     protected $_problemCollection;
 
@@ -32,7 +29,6 @@ class Problem extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param Collection $problemCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
     /**
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +54,6 @@ protected function _construct()
      * Prepare for the newsletter block layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -89,7 +83,6 @@ protected function _prepareLayout()
      * Get the html element for unsubscribe button
      *
      * @return $string
-     * @since 2.0.0
      */
     public function getUnsubscribeButtonHtml()
     {
@@ -100,7 +93,6 @@ public function getUnsubscribeButtonHtml()
      * Get the html element for delete button
      *
      * @return $string
-     * @since 2.0.0
      */
     public function getDeleteButtonHtml()
     {
@@ -112,7 +104,6 @@ public function getDeleteButtonHtml()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShowButtons()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
index 0cea70975a40d..029f484ee7883 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter\Checkbox
  *
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
@@ -22,7 +21,6 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Abstract
      * Get the condition of grid filter checkbox
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -33,7 +31,6 @@ public function getCondition()
      * Get html code for grid filter checkbox
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
index 8c2ecad1989e8..95caddd353889 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer\Checkbox
  *
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -23,7 +22,6 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index 7b8dd46869d54..7198770a3e195 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -12,13 +12,11 @@
  * Newsletter queue edit block
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'queue/edit.phtml';
 
@@ -26,7 +24,6 @@ class Edit extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -34,7 +31,6 @@ class Edit extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +57,6 @@ protected function _construct()
      * Retrieve current Newsletter Queue Object
      *
      * @return ModelQueue
-     * @since 2.0.0
      */
     public function getQueue()
     {
@@ -73,7 +67,6 @@ public function getQueue()
      * Before rendering html, but after trying to load cache
      *
      * @return AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -88,7 +81,6 @@ protected function _beforeToHtml()
      * Get the url for save
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -104,7 +96,6 @@ public function getSaveUrl()
      * Prepare for the layout
      *
      * @return AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -169,7 +160,6 @@ protected function _prepareLayout()
      * Return preview action url for form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewUrl()
     {
@@ -185,7 +175,6 @@ public function getPreviewUrl()
      * Retrieve Preview Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewButtonHtml()
     {
@@ -196,7 +185,6 @@ public function getPreviewButtonHtml()
      * Retrieve Save Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -207,7 +195,6 @@ public function getSaveButtonHtml()
      * Retrieve Reset Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResetButtonHtml()
     {
@@ -218,7 +205,6 @@ public function getResetButtonHtml()
      * Retrieve Back Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonHtml()
     {
@@ -229,7 +215,6 @@ public function getBackButtonHtml()
      * Retrieve Resume Button HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResumeButtonHtml()
     {
@@ -241,7 +226,6 @@ public function getResumeButtonHtml()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsPreview()
     {
@@ -255,7 +239,6 @@ public function getIsPreview()
      * Getter for single store mode check
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isSingleStoreMode()
     {
@@ -267,7 +250,6 @@ protected function isSingleStoreMode()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -279,7 +261,6 @@ protected function getStoreId()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsTextType()
     {
@@ -291,7 +272,6 @@ public function getIsTextType()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanResume()
     {
@@ -303,7 +283,6 @@ public function getCanResume()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index 16f537d579693..6a76ed51f41ce 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -12,25 +12,21 @@
  * Newsletter queue edit form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $_wysiwygConfig;
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @var \Magento\Newsletter\Model\QueueFactory
-     * @since 2.0.0
      */
     protected $_queueFactory;
 
@@ -42,7 +38,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -68,7 +63,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -290,7 +284,6 @@ protected function _prepareForm()
      * Retrieve queue object
      *
      * @return \Magento\Newsletter\Model\Queue
-     * @since 2.0.0
      */
     protected function getQueue()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index 031a678f8e832..3b3a223430a8a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer\Action
  *
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -23,7 +22,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index 33f0fadaf0207..58fc1ed15d64d 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -9,19 +9,16 @@
  * Newsletter template preview block
  *
  * @api
- * @since 2.0.0
  */
 class Preview extends \Magento\Newsletter\Block\Adminhtml\Template\Preview
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected $profilerName = "newsletter_queue_proccessing";
 
     /**
      * @var \Magento\Newsletter\Model\QueueFactory
-     * @since 2.0.0
      */
     protected $_queueFactory;
 
@@ -31,7 +28,6 @@ class Preview extends \Magento\Newsletter\Block\Adminhtml\Template\Preview
      * @param \Magento\Newsletter\Model\QueueFactory $queueFactory
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * @param \Magento\Newsletter\Model\Template $template
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $id)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
index 147bc59ab28a6..31378072d4097 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -22,7 +21,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      *
      * @return \Magento\Backend\Block\Widget\Form
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 7d3435829cb34..799e81cccde03 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Subscriber extends \Magento\Backend\Block\Template
 {
@@ -23,19 +22,16 @@ class Subscriber extends \Magento\Backend\Block\Template
      * Queue collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_queueCollection = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'subscriber/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -43,7 +39,6 @@ class Subscriber extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
      * Prepares block to render
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -69,7 +63,6 @@ protected function _beforeToHtml()
      * Return queue collection with loaded neversent queues
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getQueueCollection()
     {
@@ -90,7 +83,6 @@ public function getQueueCollection()
      * Get add option for queue
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getShowQueueAdd()
     {
@@ -101,7 +93,6 @@ public function getShowQueueAdd()
      * Return list of neversent queues for select
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQueueAsOptions()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
index 4446e62fac1cd..23971f9c8a61b 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
     /**
      * @var \Magento\Newsletter\Model\QueueFactory
-     * @since 2.0.0
      */
     protected $_queueFactory;
 
@@ -28,7 +26,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Newsletter\Model\QueueFactory $queueFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Prepare collection for grid
      *
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
index 85e0aeca71d60..d51513ad88f56 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter\Checkbox
  *
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
@@ -22,7 +21,6 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Abstract
      * Get the condition of grid filter checkbox
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -33,7 +31,6 @@ public function getCondition()
      * Get html code for grid filter checkbox
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index 7202e9749911d..a157bc853d1fb 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter\Website
  *
- * @since 2.0.0
  */
 class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
@@ -22,7 +21,6 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Website collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_websiteCollection = null;
 
@@ -30,19 +28,16 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Website\CollectionFactory
-     * @since 2.0.0
      */
     protected $_websitesFactory;
 
@@ -53,7 +48,6 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -73,7 +67,6 @@ public function __construct(
      * Get options for grid filter
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -84,7 +77,6 @@ protected function _getOptions()
 
     /**
      * @return Collection|null
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -101,7 +93,6 @@ public function getCollection()
      * Get options for grid filter
      *
      * @return null|array
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
index 020445a817155..dd51d494b69cf 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Renderer\Checkbox
  *
- * @since 2.0.0
  */
 class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -23,7 +22,6 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 4e3188790fb89..16c4189acbc8a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Template
  *
- * @since 2.0.0
  */
 class Template extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'template/list.phtml';
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -54,7 +51,6 @@ protected function _prepareLayout()
      * Get the url for create
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -65,7 +61,6 @@ public function getCreateUrl()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 09c27dec68559..500ff0e0148c0 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -18,7 +18,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends Widget
 {
@@ -26,13 +25,11 @@ class Edit extends Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $_wysiwygConfig;
 
@@ -41,7 +38,6 @@ class Edit extends Widget
      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Retrieve template object
      *
      * @return \Magento\Newsletter\Model\Template
-     * @since 2.0.0
      */
     public function getModel()
     {
@@ -70,7 +65,6 @@ public function getModel()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -187,7 +181,6 @@ protected function _prepareLayout()
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getEditMode()
     {
@@ -201,7 +194,6 @@ public function getEditMode()
      * Return header text for form
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -216,7 +208,6 @@ public function getHeaderText()
      * Return form block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -229,7 +220,6 @@ public function getForm()
      * Return return template name for JS
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsTemplateName()
     {
@@ -240,7 +230,6 @@ public function getJsTemplateName()
      * Return action url for form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -251,7 +240,6 @@ public function getSaveUrl()
      * Return preview action url for form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewUrl()
     {
@@ -262,7 +250,6 @@ public function getPreviewUrl()
      * Check Template Type is Plain Text
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTextType()
     {
@@ -273,7 +260,6 @@ public function isTextType()
      * Return template type from template object or TYPE_HTML by default
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTemplateType()
     {
@@ -287,7 +273,6 @@ public function getTemplateType()
      * Return delete url for customer group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteUrl()
     {
@@ -298,7 +283,6 @@ public function getDeleteUrl()
      * Retrieve Save As Flag
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSaveAsFlag()
     {
@@ -309,7 +293,6 @@ public function getSaveAsFlag()
      * Getter for single store mode check
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function isSingleStoreMode()
     {
@@ -320,7 +303,6 @@ protected function isSingleStoreMode()
      * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index 902c5cf8e970d..35acd96921a98 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Template\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
-     * @since 2.0.0
      */
     protected $_wysiwygConfig;
 
@@ -30,7 +28,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Retrieve template object
      *
      * @return \Magento\Newsletter\Model\Template
-     * @since 2.0.0
      */
     public function getModel()
     {
@@ -60,7 +56,6 @@ public function getModel()
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
index d301eeb72bdaa..bca44ae4b778d 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
@@ -17,13 +17,11 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Template\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Template\Collection
-     * @since 2.0.0
      */
     protected $_templateCollection;
 
@@ -32,7 +30,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Newsletter\Model\ResourceModel\Template\Collection $templateCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * Apply sorting and filtering to collection
      *
      * @return WidgetGrid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -62,7 +58,6 @@ protected function _prepareCollection()
      * Prepare grid columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -167,7 +162,6 @@ protected function _prepareColumns()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
index 14767126a9726..ada6e4d581b2a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Action
  *
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -23,7 +22,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 6f280ba36eda9..f3d5546c9e9d5 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender
  *
- * @since 2.0.0
  */
 class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -23,7 +22,6 @@ class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index 331696bf2b5fd..3d22a0b3b0698 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -9,7 +9,6 @@
  * Newsletter template preview block
  *
  * @api
- * @since 2.0.0
  */
 class Preview extends \Magento\Backend\Block\Widget
 {
@@ -17,19 +16,16 @@ class Preview extends \Magento\Backend\Block\Widget
      * Name for profiler
      *
      * @var string
-     * @since 2.0.0
      */
     protected $profilerName = "newsletter_template_proccessing";
 
     /**
      * @var \Magento\Newsletter\Model\TemplateFactory
-     * @since 2.0.0
      */
     protected $_templateFactory;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
@@ -38,7 +34,6 @@ class Preview extends \Magento\Backend\Block\Widget
      * @param \Magento\Newsletter\Model\TemplateFactory $templateFactory
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
      * Get html code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -128,7 +122,6 @@ private function getPreviewData()
      * Get Store Id from request or default
      *
      * @return int|null
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -152,7 +145,6 @@ protected function getStoreId()
      * @param \Magento\Newsletter\Model\Template $template
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $id)
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
index 062519c5432e0..ad268dbd68b04 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -22,7 +21,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      *
      * @return \Magento\Backend\Block\Widget\Form
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Newsletter/Block/Subscribe.php b/app/code/Magento/Newsletter/Block/Subscribe.php
index 466848fae3bda..449d9174e1a12 100644
--- a/app/code/Magento/Newsletter/Block/Subscribe.php
+++ b/app/code/Magento/Newsletter/Block/Subscribe.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Subscribe extends \Magento\Framework\View\Element\Template
 {
@@ -22,7 +21,6 @@ class Subscribe extends \Magento\Framework\View\Element\Template
      * message when we submit form from secure page to unsecure
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormActionUrl()
     {
diff --git a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php
index 64e4b634c7bcc..e30ae940fb307 100644
--- a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php
+++ b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Newsletter\Block\Subscribe\Grid\Options\GroupOptionHash
  *
- * @since 2.0.0
  */
 class GroupOptionHash implements \Magento\Framework\Option\ArrayInterface
 {
@@ -18,13 +17,11 @@ class GroupOptionHash implements \Magento\Framework\Option\ArrayInterface
      * System Store Model
      *
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @param \Magento\Store\Model\System\Store $systemStore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\System\Store $systemStore)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Store\Model\System\Store $systemStore)
      * Return store group array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php
index 8c3cb202ed860..c16c08a93fa7c 100644
--- a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php
+++ b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Newsletter\Block\Subscribe\Grid\Options\StoreOptionHash
  *
- * @since 2.0.0
  */
 class StoreOptionHash implements \Magento\Framework\Option\ArrayInterface
 {
@@ -18,13 +17,11 @@ class StoreOptionHash implements \Magento\Framework\Option\ArrayInterface
      * System Store Model
      *
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @param \Magento\Store\Model\System\Store $systemStore
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\System\Store $systemStore)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Store\Model\System\Store $systemStore)
      * Return store array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
index 46314e00dd500..6ae98044a051f 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
@@ -7,7 +7,6 @@
 
 /**
  * Newsletter subscribers controller
- * @since 2.0.0
  */
 abstract class Problem extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php
index ed4d5e2362d27..4dac1cc3e1c2f 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Problem\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Newsletter\Controller\Adminhtml\Problem
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Problem
      * Newsletter problems grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
index 9c471aadb7bde..fa6e721d1fd6a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Problem\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem
      * Newsletter problems report page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
index 59c39d27bd2f9..70d3980d0bdbd 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue
  *
- * @since 2.0.0
  */
 abstract class Queue extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php
index acec1622eff04..928c16ed4260d 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Cancel extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Cancel Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php
index 68ec38212fae1..75c794443f6b2 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Drop
  *
- * @since 2.0.0
  */
 class Drop extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Drop extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Drop Newsletter queue template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
index bd125b7974867..8a1f3630b0c0a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,14 +16,12 @@ class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Edit Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
index bb81666a721ab..e2993ca455239 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Queue list Ajax action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
index 9b5692ded099e..026f2505148d8 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Queue list action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php
index cfe620aaa21ee..dbe322ac7f7a9 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Pause
  *
- * @since 2.0.0
  */
 class Pause extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Pause extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Pause Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
index 23fd233139eb6..bf744c563491e 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Preview
  *
- * @since 2.0.0
  */
 class Preview extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Preview extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Preview Newsletter queue template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php
index 5dae3914c9f50..231462afc2d82 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Resume
  *
- * @since 2.0.0
  */
 class Resume extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Resume extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Resume Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index dd7bf84478e78..956570f215bfa 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -22,7 +21,6 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
index 231dee52022a1..6711a49a6dd0a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Sending
  *
- * @since 2.0.0
  */
 class Sending extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Sending extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Send Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php
index 1adfd92d2f498..4bef6f75168fe 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Queue\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Newsletter\Controller\Adminhtml\Queue
      * Start Newsletter queue
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
index c9b283622d1db..e27bec3eeb11c 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
@@ -7,7 +7,6 @@
 
 /**
  * Newsletter subscribers controller
- * @since 2.0.0
  */
 abstract class Subscriber extends \Magento\Backend\App\Action
 {
@@ -20,14 +19,12 @@ abstract class Subscriber extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
index 3297e8ae8fd7f..9e906565fc67a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\ExportCsv
  *
- * @since 2.0.0
  */
 class ExportCsv extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -20,7 +19,6 @@ class ExportCsv extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
      * Export subscribers grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
index 222a067edd192..65d6de2215156 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\ExportXml
  *
- * @since 2.0.0
  */
 class ExportXml extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -20,7 +19,6 @@ class ExportXml extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
      * Export subscribers grid to XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php
index e74706dee1fdb..292568ce909c7 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
      * Managing newsletter grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
index d2f3100950bd6..c2cc498f78956 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
      * Newsletter subscribers page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
index bb2ffeb4db2f0..9c9554a9c6788 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -17,7 +16,6 @@ class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
      * Delete one or more subscribers action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index a9bc311f24ce0..29c5fadc9d4a9 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Subscriber\MassUnsubscribe
  *
- * @since 2.0.0
  */
 class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
@@ -17,7 +16,6 @@ class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscribe
      * Unsubscribe one or more subscribers action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
index 4147e5aa3b627..6d9b7ba66402a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template
  *
- * @since 2.0.0
  */
 abstract class Template extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
index 1078d019624f2..5000d968008f0 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Delete newsletter Template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
index 084b37fca48e0..31b8f8779a145 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Drop
  *
- * @since 2.0.0
  */
 class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Drop Newsletter Template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
index 4e75c0541bab5..d1f9b08cd14ca 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,14 +16,12 @@ class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Edit Newsletter Template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php
index 50bcc497b2450..c9536e7107f06 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Template
      * JSON Grid Action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
index 469ba6e1bcec3..5a89c28f06db1 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Template
      * View Templates list
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
index 72f258cdb7e95..5a2834b3f7085 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Create new Newsletter Template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
index 077b730146b57..d95932de4d345 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Preview
  *
- * @since 2.0.0
  */
 class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -17,7 +16,6 @@ class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Preview Newsletter template
      *
      * @return void|$this
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
index 3adaca86d2aaf..162a531354cde 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Adminhtml\Template\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
@@ -20,7 +19,6 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Save Newsletter Template
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Manage.php b/app/code/Magento/Newsletter/Controller/Manage.php
index 2dd09f52f3df1..7e03cbbdac7fe 100644
--- a/app/code/Magento/Newsletter/Controller/Manage.php
+++ b/app/code/Magento/Newsletter/Controller/Manage.php
@@ -9,7 +9,6 @@
 
 /**
  * Customers newsletter subscription controller
- * @since 2.0.0
  */
 abstract class Manage extends \Magento\Framework\App\Action\Action
 {
@@ -17,14 +16,12 @@ abstract class Manage extends \Magento\Framework\App\Action\Action
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Index.php b/app/code/Magento/Newsletter/Controller/Manage/Index.php
index 2c1014c0eb011..b919129972ca8 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Manage\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Newsletter\Controller\Manage
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Newsletter\Controller\Manage
      * Managing newsletter subscription page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 8188417a161c4..03eb75c67c17f 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Newsletter\Controller\Manage\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Newsletter\Controller\Manage
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $subscriberFactory;
 
@@ -48,7 +43,6 @@ class Save extends \Magento\Newsletter\Controller\Manage
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CustomerRepository $customerRepository
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Save newsletter subscription preference action
      *
      * @return void|null
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index 5c5e01b452bbc..3dfdf4e446d02 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Newsletter\Controller\Subscriber
  *
- * @since 2.0.0
  */
 abstract class Subscriber extends \Magento\Framework\App\Action\Action
 {
@@ -26,7 +25,6 @@ abstract class Subscriber extends \Magento\Framework\App\Action\Action
      * Customer session
      *
      * @var Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -34,19 +32,16 @@ abstract class Subscriber extends \Magento\Framework\App\Action\Action
      * Subscriber factory
      *
      * @var SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var CustomerUrl
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -56,7 +51,6 @@ abstract class Subscriber extends \Magento\Framework\App\Action\Action
      * @param Session $customerSession
      * @param StoreManagerInterface $storeManager
      * @param CustomerUrl $customerUrl
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index a1241718b5c7c..b61b2df4cf394 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Newsletter\Controller\Subscriber\Confirm
  *
- * @since 2.0.0
  */
 class Confirm extends \Magento\Newsletter\Controller\Subscriber
 {
     /**
      * Subscription confirm action
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 67471b9f61081..13ab40665e591 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -15,13 +15,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class NewAction extends \Magento\Newsletter\Controller\Subscriber
 {
     /**
      * @var CustomerAccountManagement
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
@@ -34,7 +32,6 @@ class NewAction extends \Magento\Newsletter\Controller\Subscriber
      * @param StoreManagerInterface $storeManager
      * @param CustomerUrl $customerUrl
      * @param CustomerAccountManagement $customerAccountManagement
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +57,6 @@ public function __construct(
      * @param string $email
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function validateEmailAvailable($email)
     {
@@ -79,7 +75,6 @@ protected function validateEmailAvailable($email)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function validateGuestSubscription()
     {
@@ -105,7 +100,6 @@ protected function validateGuestSubscription()
      * @param string $email
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function validateEmailFormat($email)
     {
@@ -119,7 +113,6 @@ protected function validateEmailFormat($email)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index 8ff62f07bc456..fbe85673c8482 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Newsletter\Controller\Subscriber\Unsubscribe
  *
- * @since 2.0.0
  */
 class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber
 {
     /**
      * Unsubscribe newsletter
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Newsletter/Helper/Data.php b/app/code/Magento/Newsletter/Helper/Data.php
index ddaf81ceee23b..b892e57b46d9b 100644
--- a/app/code/Magento/Newsletter/Helper/Data.php
+++ b/app/code/Magento/Newsletter/Helper/Data.php
@@ -9,19 +9,16 @@
  * Newsletter Data Helper
  *
  * @api
- * @since 2.0.0
  */
 class Data
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_frontendUrlBuilder;
 
     /**
      * @param \Magento\Framework\UrlInterface $frontendUrlBuilder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
      *
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
      * @return string
-     * @since 2.0.0
      */
     public function getConfirmationUrl($subscriber)
     {
@@ -50,7 +46,6 @@ public function getConfirmationUrl($subscriber)
      *
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
      * @return string
-     * @since 2.0.0
      */
     public function getUnsubscribeUrl($subscriber)
     {
diff --git a/app/code/Magento/Newsletter/Model/Observer.php b/app/code/Magento/Newsletter/Model/Observer.php
index 313d64fba5d9d..d77371569601f 100644
--- a/app/code/Magento/Newsletter/Model/Observer.php
+++ b/app/code/Magento/Newsletter/Model/Observer.php
@@ -9,7 +9,6 @@
  * Newsletter module observer
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Observer
 {
@@ -17,7 +16,6 @@ class Observer
      * Queue collection factory
      *
      * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
-     * @since 2.0.0
      */
     protected $_queueCollectionFactory;
 
@@ -25,7 +23,6 @@ class Observer
      * Construct
      *
      * @param \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $queueCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $queueCollectionFactory
@@ -37,7 +34,6 @@ public function __construct(
      * Scheduled send handler
      *
      * @return void
-     * @since 2.0.0
      */
     public function scheduledSend()
     {
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 78b38378d34ab..3d650961f0133 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Newsletter\Model\Plugin\CustomerPlugin
  *
- * @since 2.0.0
  */
 class CustomerPlugin
 {
@@ -20,7 +19,6 @@ class CustomerPlugin
      * Factory used for manipulating newsletter subscriptions
      *
      * @var SubscriberFactory
-     * @since 2.0.0
      */
     private $subscriberFactory;
 
@@ -28,7 +26,6 @@ class CustomerPlugin
      * Initialize dependencies.
      *
      * @param SubscriberFactory $subscriberFactory
-     * @since 2.0.0
      */
     public function __construct(SubscriberFactory $subscriberFactory)
     {
@@ -45,7 +42,6 @@ public function __construct(SubscriberFactory $subscriberFactory)
      * @param CustomerInterface $customer
      * @return CustomerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(CustomerRepository $subject, CustomerInterface $result, CustomerInterface $customer)
     {
@@ -67,7 +63,6 @@ public function afterSave(CustomerRepository $subject, CustomerInterface $result
      * @param callable $deleteCustomerById Function we are wrapping around
      * @param int $customerId Input to the function
      * @return bool
-     * @since 2.0.0
      */
     public function aroundDeleteById(
         CustomerRepository $subject,
diff --git a/app/code/Magento/Newsletter/Model/Problem.php b/app/code/Magento/Newsletter/Model/Problem.php
index b5c4e21db5f9a..b5800e61c96da 100644
--- a/app/code/Magento/Newsletter/Model/Problem.php
+++ b/app/code/Magento/Newsletter/Model/Problem.php
@@ -22,7 +22,6 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Problem extends \Magento\Framework\Model\AbstractModel
 {
@@ -30,7 +29,6 @@ class Problem extends \Magento\Framework\Model\AbstractModel
      * Current Subscriber
      *
      * @var \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     protected $_subscriber = null;
 
@@ -38,7 +36,6 @@ class Problem extends \Magento\Framework\Model\AbstractModel
      * Subscriber factory
      *
      * @var \Magento\Newsletter\Model\SubscriberFactory
-     * @since 2.0.0
      */
     protected $_subscriberFactory;
 
@@ -51,7 +48,6 @@ class Problem extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -69,7 +65,6 @@ public function __construct(
      * Initialize Newsletter Problem Model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -81,7 +76,6 @@ protected function _construct()
      *
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscriberData(\Magento\Newsletter\Model\Subscriber $subscriber)
     {
@@ -94,7 +88,6 @@ public function addSubscriberData(\Magento\Newsletter\Model\Subscriber $subscrib
      *
      * @param \Magento\Newsletter\Model\Queue $queue
      * @return $this
-     * @since 2.0.0
      */
     public function addQueueData(\Magento\Newsletter\Model\Queue $queue)
     {
@@ -107,7 +100,6 @@ public function addQueueData(\Magento\Newsletter\Model\Queue $queue)
      *
      * @param \Exception $e
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorData(\Exception $e)
     {
@@ -120,7 +112,6 @@ public function addErrorData(\Exception $e)
      * Retrieve Subscriber
      *
      * @return \Magento\Newsletter\Model\Subscriber
-     * @since 2.0.0
      */
     public function getSubscriber()
     {
@@ -139,7 +130,6 @@ public function getSubscriber()
      * Unsubscribe Subscriber
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unsubscribe()
     {
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 2602434552753..5d33d1610a5c6 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -36,7 +36,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTypesInterface
 {
@@ -44,7 +43,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Newsletter Template object
      *
      * @var \Magento\Newsletter\Model\Template
-     * @since 2.0.0
      */
     protected $_template;
 
@@ -52,7 +50,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Subscribers collection
      *
      * @var \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection
-     * @since 2.0.0
      */
     protected $_subscribersCollection;
 
@@ -60,7 +57,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Save stores flag.
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_saveStoresFlag = false;
 
@@ -68,7 +64,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Stores assigned to queue.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_stores = [];
 
@@ -86,7 +81,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Filter for newsletter text
      *
      * @var \Magento\Newsletter\Model\Template\Filter
-     * @since 2.0.0
      */
     protected $_templateFilter;
 
@@ -94,7 +88,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -102,7 +95,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Problem factory
      *
      * @var \Magento\Newsletter\Model\ProblemFactory
-     * @since 2.0.0
      */
     protected $_problemFactory;
 
@@ -110,13 +102,11 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * Template factory
      *
      * @var \Magento\Newsletter\Model\TemplateFactory
-     * @since 2.0.0
      */
     protected $_templateFactory;
 
     /**
      * @var \Magento\Newsletter\Model\Queue\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
@@ -133,7 +123,6 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -167,7 +156,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -179,7 +167,6 @@ protected function _construct()
      * Return: is this queue newly created or not.
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isNew()
     {
@@ -191,7 +178,6 @@ public function isNew()
      *
      * @param string|null $startAt start date of the mailing queue
      * @return $this
-     * @since 2.0.0
      */
     public function setQueueStartAtByString($startAt)
     {
@@ -210,7 +196,6 @@ public function setQueueStartAtByString($startAt)
      * @param int $count
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function sendPerSubscriber($count = 20)
     {
@@ -282,7 +267,6 @@ public function sendPerSubscriber($count = 20)
      * Finish queue: set status SENT and update finish date
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _finishQueue()
     {
@@ -297,7 +281,6 @@ protected function _finishQueue()
      * Getter data for saving
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDataForSave()
     {
@@ -314,7 +297,6 @@ public function getDataForSave()
      *
      * @param array $subscriberIds
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscribersToQueue(array $subscriberIds)
     {
@@ -327,7 +309,6 @@ public function addSubscribersToQueue(array $subscriberIds)
      *
      * @param boolean|integer|string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setSaveStoresFlag($value)
     {
@@ -340,7 +321,6 @@ public function setSaveStoresFlag($value)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getSaveStoresFlag()
     {
@@ -352,7 +332,6 @@ public function getSaveStoresFlag()
      *
      * @param array $storesIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStores(array $storesIds)
     {
@@ -365,7 +344,6 @@ public function setStores(array $storesIds)
      * Getter for stores of queue.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -380,7 +358,6 @@ public function getStores()
      * Retrieve Newsletter Template object
      *
      * @return \Magento\Newsletter\Model\Template
-     * @since 2.0.0
      */
     public function getTemplate()
     {
@@ -394,7 +371,6 @@ public function getTemplate()
      * Return true if template type eq text
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isPlain()
     {
@@ -405,7 +381,6 @@ public function isPlain()
      * Getter for template type
      *
      * @return int|string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/app/code/Magento/Newsletter/Model/Queue/Options/Status.php b/app/code/Magento/Newsletter/Model/Queue/Options/Status.php
index 7880ba52d7985..136f463083c53 100644
--- a/app/code/Magento/Newsletter/Model/Queue/Options/Status.php
+++ b/app/code/Magento/Newsletter/Model/Queue/Options/Status.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Model\Queue\Options\Status
  *
- * @since 2.0.0
  */
 class Status implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class Status implements \Magento\Framework\Option\ArrayInterface
      * Return statuses option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php b/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
index c60fefd66d255..74ed7679561e1 100644
--- a/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
+++ b/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Newsletter\Model\Queue\TransportBuilder
  *
- * @since 2.0.0
  */
 class TransportBuilder extends \Magento\Framework\Mail\Template\TransportBuilder
 {
@@ -18,7 +17,6 @@ class TransportBuilder extends \Magento\Framework\Mail\Template\TransportBuilder
      * Template data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateData = [];
 
@@ -27,7 +25,6 @@ class TransportBuilder extends \Magento\Framework\Mail\Template\TransportBuilder
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateData($data)
     {
@@ -38,7 +35,6 @@ public function setTemplateData($data)
     /**
      * @param AbstractTemplate $template
      * @return void
-     * @since 2.0.0
      */
     protected function setTemplateFilter(AbstractTemplate $template)
     {
@@ -49,7 +45,6 @@ protected function setTemplateFilter(AbstractTemplate $template)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function prepareMessage()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
index f65e46f18619f..1bae78c4a2c40 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Newsletter\Model\ResourceModel\Grid\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Newsletter\Model\ResourceModel\Problem\Collection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Newsletter\Model\ResourceModel\Problem\Collect
      * Adds queue info to grid
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|\Magento\Newsletter\Model\ResourceModel\Grid\Collection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Problem.php b/app/code/Magento/Newsletter/Model/ResourceModel/Problem.php
index 8eee12d6d11ba..7b5f345b6aad7 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Problem.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Problem.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Problem extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Problem extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
index 9654e312d87e6..31d7b437a364a 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -23,7 +22,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * True when subscribers info joined
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_subscribersInfoJoinedFlag = false;
 
@@ -31,7 +29,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * True when grouped
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_problemGrouped = false;
 
@@ -39,13 +36,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Customer collection factory
      *
      * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customerCollectionFactory;
 
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -53,7 +48,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Customer View Helper
      *
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerView;
 
@@ -61,7 +55,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * checks if customer data is loaded
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_loadCustomersDataFlag = false;
 
@@ -74,7 +67,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Customer\Helper\View $customerView
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -95,7 +87,6 @@ public function __construct(
      * Define resource model and model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -107,7 +98,6 @@ protected function _construct()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     protected function _setIsLoaded($flag = true)
     {
@@ -121,7 +111,6 @@ protected function _setIsLoaded($flag = true)
      * Adds subscribers info
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscriberInfo()
     {
@@ -140,7 +129,6 @@ public function addSubscriberInfo()
      * Adds queue info
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addQueueInfo()
     {
@@ -160,7 +148,6 @@ public function addQueueInfo()
      * Loads customers info to collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addCustomersData()
     {
@@ -193,7 +180,6 @@ protected function _addCustomersData()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
index 127bbb1d68976..0f21355c71c6d 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
@@ -14,7 +14,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -22,7 +21,6 @@ class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Subscriber collection
      *
      * @var \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection
-     * @since 2.0.0
      */
     protected $_subscriberCollection;
 
@@ -32,7 +30,6 @@ class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection $subscriberCollection
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -61,7 +57,6 @@ protected function _construct()
      * @param array $subscriberIds
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addSubscribersToQueue(ModelQueue $queue, array $subscriberIds)
     {
@@ -111,7 +106,6 @@ public function addSubscribersToQueue(ModelQueue $queue, array $subscriberIds)
      * @param ModelQueue $queue
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function removeSubscribersFromQueue(ModelQueue $queue)
     {
@@ -135,7 +129,6 @@ public function removeSubscribersFromQueue(ModelQueue $queue)
      *
      * @param ModelQueue $queue
      * @return $this
-     * @since 2.0.0
      */
     public function setStores(ModelQueue $queue)
     {
@@ -182,7 +175,6 @@ public function setStores(ModelQueue $queue)
      *
      * @param ModelQueue $queue
      * @return array
-     * @since 2.0.0
      */
     public function getStores(ModelQueue $queue)
     {
@@ -206,7 +198,6 @@ public function getStores(ModelQueue $queue)
      *
      * @param \Magento\Framework\Model\AbstractModel $queue
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $queue)
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
index 22bedf11633ea..55ab3b178b2ed 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * True when subscribers info joined
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addSubscribersFlag = false;
 
@@ -27,7 +25,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * True when filtered by store
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isStoreFilter = false;
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -47,7 +43,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -66,7 +61,6 @@ public function __construct(
      * Initializes collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +72,6 @@ protected function _construct()
      * Joines templates information
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addTemplateInfo()
     {
@@ -95,7 +88,6 @@ public function addTemplateInfo()
      * Adds subscribers info to selelect
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addSubscriberInfoToSelect()
     {
@@ -127,7 +119,6 @@ protected function _addSubscriberInfoToSelect()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -141,7 +132,6 @@ public function load($printQuery = false, $logQuery = false)
      * Joines subscribers information
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscribersInfo()
     {
@@ -156,7 +146,6 @@ public function addSubscribersInfo()
      * @param string $field
      * @param null|string|array $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -174,7 +163,6 @@ public function addFieldToFilter($field, $condition = null)
      * @param string $field
      * @param null|string|array $condition
      * @return array
-     * @since 2.0.0
      */
     protected function _getIdsFromLink($field, $condition)
     {
@@ -205,7 +193,6 @@ protected function _getIdsFromLink($field, $condition)
      *
      * @param int $subscriberId
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscriberFilter($subscriberId)
     {
@@ -225,7 +212,6 @@ public function addSubscriberFilter($subscriberId)
      * Add filter by only ready fot sending item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOnlyForSendingFilter()
     {
@@ -246,7 +232,6 @@ public function addOnlyForSendingFilter()
      * Add filter by only not sent items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOnlyUnsentFilter()
     {
@@ -259,7 +244,6 @@ public function addOnlyUnsentFilter()
      * Returns options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -271,7 +255,6 @@ public function toOptionArray()
      *
      * @param int[]|int $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Grid/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Grid/Collection.php
index 10a816d90eea6..c4cbbbd34a649 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Grid/Collection.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Newsletter\Model\ResourceModel\Queue\Grid\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Newsletter\Model\ResourceModel\Queue\Collection
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index a2b3d230ad947..98a33a9cca3d8 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * DB connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -27,7 +25,6 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Name of subscriber link DB table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_subscriberLinkTable;
 
@@ -35,7 +32,6 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Name of scope for error messages
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_messagesScope = 'newsletter/session';
 
@@ -43,13 +39,11 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
@@ -60,7 +54,6 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -78,7 +71,6 @@ public function __construct(
      * Get tablename from config
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -92,7 +84,6 @@ protected function _construct()
      *
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setMessagesScope($scope)
     {
@@ -104,7 +95,6 @@ public function setMessagesScope($scope)
      *
      * @param string $subscriberEmail
      * @return array
-     * @since 2.0.0
      */
     public function loadByEmail($subscriberEmail)
     {
@@ -124,7 +114,6 @@ public function loadByEmail($subscriberEmail)
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return array
-     * @since 2.0.0
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -151,7 +140,6 @@ public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface
      * Generates random code for subscription confirmation
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateRandomCode()
     {
@@ -165,7 +153,6 @@ protected function _generateRandomCode()
      * @param \Magento\Newsletter\Model\Queue $queue
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function received(\Magento\Newsletter\Model\Subscriber $subscriber, \Magento\Newsletter\Model\Queue $queue)
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php
index 1a27ec5127433..b419df94311f4 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php
@@ -13,7 +13,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Queue link table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_queueLinkTable;
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_storeTable;
 
@@ -37,7 +34,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Queue joined flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_queueJoinedFlag = false;
 
@@ -45,7 +41,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Flag that indicates apply of customers info on load
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_showCustomersInfo = false;
 
@@ -53,7 +48,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Filter for count
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_countFilterPart = [];
 
@@ -61,7 +55,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Customer Eav data
      *
      * @var   \Magento\Eav\Helper\Data
-     * @since 2.0.0
      */
     protected $_customerHelperData;
 
@@ -73,7 +66,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Eav\Helper\Data $customerHelperData
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -93,7 +85,6 @@ public function __construct(
      * Configures collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -120,7 +111,6 @@ protected function _construct()
      *
      * @param ModelQueue $queue
      * @return $this
-     * @since 2.0.0
      */
     public function useQueue(ModelQueue $queue)
     {
@@ -140,7 +130,6 @@ public function useQueue(ModelQueue $queue)
      * Set using of links to only unsendet letter subscribers.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useOnlyUnsent()
     {
@@ -155,7 +144,6 @@ public function useOnlyUnsent()
      * Adds customer info to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function showCustomerInfo()
     {
@@ -173,7 +161,6 @@ public function showCustomerInfo()
      * Add type field expression to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSubscriberTypeField()
     {
@@ -185,7 +172,6 @@ public function addSubscriberTypeField()
      * Sets flag for customer info loading on load
      *
      * @return $this
-     * @since 2.0.0
      */
     public function showStoreInfo()
     {
@@ -202,7 +188,6 @@ public function showStoreInfo()
      * Returns select count sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -218,7 +203,6 @@ public function getSelectCountSql()
      * Load only subscribed customers
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useOnlyCustomers()
     {
@@ -231,7 +215,6 @@ public function useOnlyCustomers()
      * Show only with subscribed status
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useOnlySubscribed()
     {
@@ -248,7 +231,6 @@ public function useOnlySubscribed()
      *
      * @param int[]|int $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
@@ -261,7 +243,6 @@ public function addStoreFilter($storeIds)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getQueueJoinedFlag()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
index 3faaa34fe9760..3b173b347c279 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Newsletter\Model\ResourceModel\Subscriber\Coll
      * Sets flag for customer info loading on load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Template.php b/app/code/Magento/Newsletter/Model/ResourceModel/Template.php
index fd82fa1e44180..136fe3cf10606 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Template.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Template.php
@@ -14,7 +14,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Template extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -22,7 +21,6 @@ class Template extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -30,7 +28,6 @@ class Template extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +53,6 @@ protected function _construct()
      *
      * @param \Magento\Newsletter\Model\Template $template
      * @return boolean
-     * @since 2.0.0
      */
     public function checkUsageInQueue(\Magento\Newsletter\Model\Template $template)
     {
@@ -84,7 +79,6 @@ public function checkUsageInQueue(\Magento\Newsletter\Model\Template $template)
      *
      * @param \Magento\Newsletter\Model\Template $template
      * @return boolean
-     * @since 2.0.0
      */
     public function checkCodeUsage(\Magento\Newsletter\Model\Template $template)
     {
@@ -119,7 +113,6 @@ public function checkCodeUsage(\Magento\Newsletter\Model\Template $template)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Template/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Template/Collection.php
index 4672d96aacdfe..28b5b32899839 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Template/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Template/Collection.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model and model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * Load only actual template
      *
      * @return $this
-     * @since 2.0.0
      */
     public function useOnlyActual()
     {
@@ -46,7 +43,6 @@ public function useOnlyActual()
      * Returns options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Newsletter/Model/Session.php b/app/code/Magento/Newsletter/Model/Session.php
index 37eb5dd5ece1f..f16fdcb399955 100644
--- a/app/code/Magento/Newsletter/Model/Session.php
+++ b/app/code/Magento/Newsletter/Model/Session.php
@@ -7,7 +7,6 @@
 
 /**
  * Newsletter session model
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
@@ -16,7 +15,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     public function addError($message)
     {
@@ -29,7 +27,6 @@ public function addError($message)
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     public function addSuccess($message)
     {
@@ -41,7 +38,6 @@ public function addSuccess($message)
      * Get error message
      *
      * @return string $message
-     * @since 2.0.0
      */
     public function getError()
     {
@@ -54,7 +50,6 @@ public function getError()
      * Get success message
      *
      * @return string $message
-     * @since 2.0.0
      */
     public function getSuccess()
     {
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index c888cb8f6df05..f69f26a8d64ed 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -34,7 +34,6 @@
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  *
  * @api
- * @since 2.0.0
  */
 class Subscriber extends \Magento\Framework\Model\AbstractModel
 {
@@ -56,7 +55,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'newsletter_subscriber';
 
@@ -66,7 +64,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * In observe method you can use $observer->getEvent()->getObject() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'subscriber';
 
@@ -74,7 +71,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * True if data changed
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isStatusChanged = false;
 
@@ -82,7 +78,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * Newsletter data
      *
      * @var \Magento\Newsletter\Helper\Data
-     * @since 2.0.0
      */
     protected $_newsletterData = null;
 
@@ -90,7 +85,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -98,7 +92,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -106,31 +99,26 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -151,7 +139,6 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -183,7 +170,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -194,7 +180,6 @@ protected function _construct()
      * Alias for getSubscriberId()
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -206,7 +191,6 @@ public function getId()
      *
      * @param int $value
      * @return $this
-     * @since 2.0.0
      */
     public function setId($value)
     {
@@ -217,7 +201,6 @@ public function setId($value)
      * Alias for getSubscriberConfirmCode()
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -228,7 +211,6 @@ public function getCode()
      * Return link for confirmation of subscription
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfirmationLink()
     {
@@ -239,7 +221,6 @@ public function getConfirmationLink()
      * Returns Unsubscribe url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnsubscriptionLink()
     {
@@ -251,7 +232,6 @@ public function getUnsubscriptionLink()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($value)
     {
@@ -262,7 +242,6 @@ public function setCode($value)
      * Alias for getSubscriberStatus()
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -274,7 +253,6 @@ public function getStatus()
      *
      * @param int $value
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($value)
     {
@@ -286,7 +264,6 @@ public function setStatus($value)
      *
      * @param boolean $scope
      * @return $this
-     * @since 2.0.0
      */
     public function setMessagesScope($scope)
     {
@@ -298,7 +275,6 @@ public function setMessagesScope($scope)
      * Alias for getSubscriberEmail()
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -310,7 +286,6 @@ public function getEmail()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($value)
     {
@@ -322,7 +297,6 @@ public function setEmail($value)
      *
      * @param boolean $value
      * @return $this
-     * @since 2.0.0
      */
     public function setStatusChanged($value)
     {
@@ -334,7 +308,6 @@ public function setStatusChanged($value)
      * Return status change flag value
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isStatusChanged()
     {
@@ -345,7 +318,6 @@ public function isStatusChanged()
      * Return customer subscription status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSubscribed()
     {
@@ -361,7 +333,6 @@ public function isSubscribed()
      *
      * @param string $subscriberEmail
      * @return $this
-     * @since 2.0.0
      */
     public function loadByEmail($subscriberEmail)
     {
@@ -374,7 +345,6 @@ public function loadByEmail($subscriberEmail)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerId($customerId)
     {
@@ -397,7 +367,6 @@ public function loadByCustomerId($customerId)
      *
      * @param int $length
      * @return string
-     * @since 2.0.0
      */
     public function randomSequence($length = 32)
     {
@@ -422,7 +391,6 @@ public function randomSequence($length = 32)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function subscribe($email)
     {
@@ -495,7 +463,6 @@ public function subscribe($email)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function unsubscribe()
     {
@@ -517,7 +484,6 @@ public function unsubscribe()
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function subscribeCustomerById($customerId)
     {
@@ -529,7 +495,6 @@ public function subscribeCustomerById($customerId)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function unsubscribeCustomerById($customerId)
     {
@@ -541,7 +506,6 @@ public function unsubscribeCustomerById($customerId)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function updateSubscription($customerId)
     {
@@ -559,7 +523,6 @@ public function updateSubscription($customerId)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _updateCustomerSubscription($customerId, $subscribe)
     {
@@ -645,7 +608,6 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
      *
      * @param string $code
      * @return boolean
-     * @since 2.0.0
      */
     public function confirm($code)
     {
@@ -664,7 +626,6 @@ public function confirm($code)
      *
      * @param  \Magento\Newsletter\Model\Queue $queue
      * @return boolean
-     * @since 2.0.0
      */
     public function received(\Magento\Newsletter\Model\Queue $queue)
     {
@@ -676,7 +637,6 @@ public function received(\Magento\Newsletter\Model\Queue $queue)
      * Sends out confirmation email
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendConfirmationRequestEmail()
     {
@@ -730,7 +690,6 @@ public function sendConfirmationRequestEmail()
      * Sends out confirmation success email
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendConfirmationSuccessEmail()
     {
@@ -784,7 +743,6 @@ public function sendConfirmationSuccessEmail()
      * Sends out unsubscription email
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendUnsubscriptionEmail()
     {
@@ -837,7 +795,6 @@ public function sendUnsubscriptionEmail()
      * Retrieve Subscribers Full Name if it was set
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSubscriberFullName()
     {
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index 3b5faa953670b..5e4b273b9c62b 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -35,7 +35,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Template extends \Magento\Email\Model\AbstractTemplate
 {
@@ -43,7 +42,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * Mail object
      *
      * @var \Zend_Mail
-     * @since 2.0.0
      */
     protected $_mail;
 
@@ -51,7 +49,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * Store manager to emulate design
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -59,7 +56,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * Http-request, used to determine current store in multi-store mode
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -67,7 +63,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * Filter factory
      *
      * @var \Magento\Newsletter\Model\Template\FilterFactory
-     * @since 2.0.0
      */
     protected $_filterFactory;
 
@@ -89,7 +84,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * @param \Magento\Newsletter\Model\Template\FilterFactory $filterFactory ,
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -132,7 +126,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -144,7 +137,6 @@ protected function _construct()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -180,7 +172,6 @@ public function validate()
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -193,7 +184,6 @@ public function beforeSave()
      * Getter for template type
      *
      * @return int|string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -205,7 +195,6 @@ public function getType()
      *
      * @param array $variables
      * @return string
-     * @since 2.0.0
      */
     public function getProcessedTemplateSubject(array $variables)
     {
@@ -220,7 +209,6 @@ public function getProcessedTemplateSubject(array $variables)
      * Retrieve template text wrapper
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateText()
     {
@@ -240,7 +228,6 @@ public function getTemplateText()
 
     /**
      * @return \Magento\Newsletter\Model\Template\FilterFactory
-     * @since 2.0.0
      */
     protected function getFilterFactory()
     {
@@ -251,7 +238,6 @@ protected function getFilterFactory()
      * Check if template can be added to newsletter queue
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isValidForSend()
     {
diff --git a/app/code/Magento/Newsletter/Model/Template/Filter.php b/app/code/Magento/Newsletter/Model/Template/Filter.php
index 8da6b7d2a93f4..3c45ddad594b7 100644
--- a/app/code/Magento/Newsletter/Model/Template/Filter.php
+++ b/app/code/Magento/Newsletter/Model/Template/Filter.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Newsletter\Model\Template\Filter
  *
- * @since 2.0.0
  */
 class Filter extends \Magento\Widget\Model\Template\FilterEmulate
 {
@@ -23,7 +22,6 @@ class Filter extends \Magento\Widget\Model\Template\FilterEmulate
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function widgetDirective($construction)
     {
diff --git a/app/code/Magento/Newsletter/Setup/InstallSchema.php b/app/code/Magento/Newsletter/Setup/InstallSchema.php
index dcc4a862cf92b..80e1bf0a76aeb 100644
--- a/app/code/Magento/Newsletter/Setup/InstallSchema.php
+++ b/app/code/Magento/Newsletter/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
index 0aadc002489f8..b15dc4a46bb16 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
@@ -7,7 +7,6 @@
 
 /**
  * Abstract class for Cash On Delivery and Bank Transfer payment method form
- * @since 2.0.0
  */
 abstract class AbstractInstruction extends \Magento\Payment\Block\Form
 {
@@ -15,7 +14,6 @@ abstract class AbstractInstruction extends \Magento\Payment\Block\Form
      * Instructions text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instructions;
 
@@ -23,7 +21,6 @@ abstract class AbstractInstruction extends \Magento\Payment\Block\Form
      * Get instructions text from config
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getInstructions()
     {
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index 145feaff8eab9..c4fe10c386645 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -7,7 +7,6 @@
 
 /**
  * Block for Bank Transfer payment method form
- * @since 2.0.0
  */
 class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
@@ -15,7 +14,6 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
      * Bank transfer template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'form/banktransfer.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index 8e7004558907b..4e0f7d48ce09b 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -7,7 +7,6 @@
 
 /**
  * Block for Cash On Delivery payment method form
- * @since 2.0.0
  */
 class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
@@ -15,7 +14,6 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
      * Cash on delivery template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'form/cashondelivery.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Checkmo.php b/app/code/Magento/OfflinePayments/Block/Form/Checkmo.php
index 384446c261bc5..553691e7fe502 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Checkmo.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Checkmo.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\OfflinePayments\Block\Form\Checkmo
  *
- * @since 2.0.0
  */
 class Checkmo extends \Magento\Payment\Block\Form
 {
@@ -16,7 +15,6 @@ class Checkmo extends \Magento\Payment\Block\Form
      * Checkmo template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_OfflinePayments::form/checkmo.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Purchaseorder.php b/app/code/Magento/OfflinePayments/Block/Form/Purchaseorder.php
index f11b560dd42f3..d151e38465aa6 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Purchaseorder.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\OfflinePayments\Block\Form\Purchaseorder
  *
- * @since 2.0.0
  */
 class Purchaseorder extends \Magento\Payment\Block\Form
 {
@@ -16,7 +15,6 @@ class Purchaseorder extends \Magento\Payment\Block\Form
      * Purchase order template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_OfflinePayments::form/purchaseorder.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php b/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
index 2faa9afb3744b..04a9b2d26bf77 100644
--- a/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
+++ b/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\OfflinePayments\Block\Info\Checkmo
  *
- * @since 2.0.0
  */
 class Checkmo extends \Magento\Payment\Block\Info
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_payableTo;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_mailingAddress;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_OfflinePayments::info/checkmo.phtml';
 
@@ -34,7 +30,6 @@ class Checkmo extends \Magento\Payment\Block\Info
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPayableTo()
     {
@@ -48,7 +43,6 @@ public function getPayableTo()
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMailingAddress()
     {
@@ -59,9 +53,8 @@ public function getMailingAddress()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.2
      * @return $this
-     * @since 2.0.0
      */
     protected function _convertAdditionalData()
     {
@@ -72,7 +65,6 @@ protected function _convertAdditionalData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function toPdf()
     {
diff --git a/app/code/Magento/OfflinePayments/Block/Info/Purchaseorder.php b/app/code/Magento/OfflinePayments/Block/Info/Purchaseorder.php
index 3b9e7cebbe22d..0072cbe561cb7 100644
--- a/app/code/Magento/OfflinePayments/Block/Info/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Block/Info/Purchaseorder.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\OfflinePayments\Block\Info\Purchaseorder
  *
- * @since 2.0.0
  */
 class Purchaseorder extends \Magento\Payment\Block\Info
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_OfflinePayments::info/purchaseorder.phtml';
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function toPdf()
     {
diff --git a/app/code/Magento/OfflinePayments/Model/Banktransfer.php b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
index 0fe5f70f51873..4be2a9785e83b 100644
--- a/app/code/Magento/OfflinePayments/Model/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
@@ -11,7 +11,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @api
- * @since 2.0.0
  */
 class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -21,7 +20,6 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::PAYMENT_METHOD_BANKTRANSFER_CODE;
 
@@ -29,7 +27,6 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * Bank Transfer payment block paths
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\OfflinePayments\Block\Form\Banktransfer::class;
 
@@ -37,7 +34,6 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * Instructions block path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info\Instructions::class;
 
@@ -45,7 +41,6 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOffline = true;
 
@@ -53,7 +48,6 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * Get instructions text from config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInstructions()
     {
diff --git a/app/code/Magento/OfflinePayments/Model/Cashondelivery.php b/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
index 4ca8999de8891..900aa7f7fb507 100644
--- a/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
@@ -11,7 +11,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @api
- * @since 2.0.0
  */
 class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -21,7 +20,6 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::PAYMENT_METHOD_CASHONDELIVERY_CODE;
 
@@ -29,7 +27,6 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
      * Cash On Delivery payment block paths
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\OfflinePayments\Block\Form\Cashondelivery::class;
 
@@ -37,7 +34,6 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
      * Info instructions block path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info\Instructions::class;
 
@@ -45,7 +41,6 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOffline = true;
 
@@ -53,7 +48,6 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
      * Get instructions text from config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInstructions()
     {
diff --git a/app/code/Magento/OfflinePayments/Model/Checkmo.php b/app/code/Magento/OfflinePayments/Model/Checkmo.php
index a3e6124cc3271..ee8dfefc0d512 100644
--- a/app/code/Magento/OfflinePayments/Model/Checkmo.php
+++ b/app/code/Magento/OfflinePayments/Model/Checkmo.php
@@ -11,7 +11,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @api
- * @since 2.0.0
  */
 class Checkmo extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -21,19 +20,16 @@ class Checkmo extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::PAYMENT_METHOD_CHECKMO_CODE;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\OfflinePayments\Block\Form\Checkmo::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\OfflinePayments\Block\Info\Checkmo::class;
 
@@ -41,13 +37,11 @@ class Checkmo extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOffline = true;
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPayableTo()
     {
@@ -56,7 +50,6 @@ public function getPayableTo()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMailingAddress()
     {
diff --git a/app/code/Magento/OfflinePayments/Model/CheckmoConfigProvider.php b/app/code/Magento/OfflinePayments/Model/CheckmoConfigProvider.php
index 67a5c09e36de9..2690573a39c23 100644
--- a/app/code/Magento/OfflinePayments/Model/CheckmoConfigProvider.php
+++ b/app/code/Magento/OfflinePayments/Model/CheckmoConfigProvider.php
@@ -12,32 +12,27 @@
 /**
  * Class \Magento\OfflinePayments\Model\CheckmoConfigProvider
  *
- * @since 2.0.0
  */
 class CheckmoConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
 
     /**
      * @var Checkmo
-     * @since 2.0.0
      */
     protected $method;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @param PaymentHelper $paymentHelper
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         PaymentHelper $paymentHelper,
@@ -49,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -67,7 +61,6 @@ public function getConfig()
      * Get mailing address from config
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getMailingAddress()
     {
@@ -78,7 +71,6 @@ protected function getMailingAddress()
      * Get payable to from config
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getPayableTo()
     {
diff --git a/app/code/Magento/OfflinePayments/Model/InstructionsConfigProvider.php b/app/code/Magento/OfflinePayments/Model/InstructionsConfigProvider.php
index 2d67dac35083d..a08864126d704 100644
--- a/app/code/Magento/OfflinePayments/Model/InstructionsConfigProvider.php
+++ b/app/code/Magento/OfflinePayments/Model/InstructionsConfigProvider.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\OfflinePayments\Model\InstructionsConfigProvider
  *
- * @since 2.0.0
  */
 class InstructionsConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $methodCodes = [
         Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE,
@@ -27,20 +25,17 @@ class InstructionsConfigProvider implements ConfigProviderInterface
 
     /**
      * @var \Magento\Payment\Model\Method\AbstractMethod[]
-     * @since 2.0.0
      */
     protected $methods = [];
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @param PaymentHelper $paymentHelper
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         PaymentHelper $paymentHelper,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -72,7 +66,6 @@ public function getConfig()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function getInstructions($code)
     {
diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
index 3f300141a8ec7..054656e3cb6e9 100644
--- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
@@ -11,7 +11,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @api
- * @since 2.0.0
  */
 class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -21,19 +20,16 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::PAYMENT_METHOD_PURCHASEORDER_CODE;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\OfflinePayments\Block\Form\Purchaseorder::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\OfflinePayments\Block\Info\Purchaseorder::class;
 
@@ -41,7 +37,6 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOffline = true;
 
@@ -51,7 +46,6 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\DataObject|mixed $data
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
diff --git a/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php b/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
index 89bbebdf36bd9..e9ad3cf7a794b 100644
--- a/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
+++ b/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\OfflinePayments\Observer\BeforeOrderPaymentSaveObserver
  *
- * @since 2.0.0
  */
 class BeforeOrderPaymentSaveObserver implements ObserverInterface
 {
@@ -26,7 +25,6 @@ class BeforeOrderPaymentSaveObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
index 5a0d4c0f25084..91ed6c1a9e985 100644
--- a/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
+++ b/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -10,7 +10,6 @@
  * WARNING: This grid used for export table rates
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Website filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_websiteId;
 
@@ -26,19 +24,16 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Condition filter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_conditionName;
 
     /**
      * @var \Magento\OfflineShipping\Model\Carrier\Tablerate
-     * @since 2.0.0
      */
     protected $_tablerate;
 
     /**
      * @var \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -48,7 +43,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CollectionFactory $collectionFactory
      * @param \Magento\OfflineShipping\Model\Carrier\Tablerate $tablerate
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
      * Define grid properties
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +73,6 @@ protected function _construct()
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -92,7 +84,6 @@ public function setWebsiteId($websiteId)
      * Retrieve current website id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -107,7 +98,6 @@ public function getWebsiteId()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setConditionName($name)
     {
@@ -119,7 +109,6 @@ public function setConditionName($name)
      * Retrieve current website id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getConditionName()
     {
@@ -130,7 +119,6 @@ public function getConditionName()
      * Prepare shipping table rate collection
      *
      * @return \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -147,7 +135,6 @@ protected function _prepareCollection()
      * Prepare table columns
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
index c636f8e1b9eaa..a258223e06777 100644
--- a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
+++ b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
@@ -9,13 +9,11 @@
  * Export CSV button for shipping table rates
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
@@ -25,7 +23,6 @@ class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Backend\Helper\Data $helper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php
index 0f8dca87b7f02..77251070e90b5 100644
--- a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php
+++ b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php
@@ -9,13 +9,11 @@
  * Custom import CSV file field for shipping table rates
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Import extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -27,7 +25,6 @@ protected function _construct()
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index 323175ef31129..47efa0c16b707 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\OfflineShipping\Controller\Adminhtml\System\Config\ExportTablerates
  *
- * @since 2.0.0
  */
 class ExportTablerates extends \Magento\Config\Controller\Adminhtml\System\AbstractConfig
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -35,7 +32,6 @@ class ExportTablerates extends \Magento\Config\Controller\Adminhtml\System\Abstr
      * @param \Magento\Config\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Export shipping table rates in csv format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
index 17e29bdff71e7..d105596cc7ce0 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
@@ -15,31 +15,26 @@
  * Flat rate shipping model
  *
  * @api
- * @since 2.0.0
  */
 class Flatrate extends AbstractCarrier implements CarrierInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'flatrate';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFixed = true;
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateResultFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory
-     * @since 2.0.0
      */
     protected $_rateMethodFactory;
 
@@ -57,7 +52,6 @@ class Flatrate extends AbstractCarrier implements CarrierInterface
      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
      * @param ItemPriceCalculator $itemPriceCalculator
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -79,7 +73,6 @@ public function __construct(
      * @return Result|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -129,7 +122,6 @@ private function getFreeBoxesCount(RateRequest $request)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index ddd5c48eb8898..d4bfd8c82f39a 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -17,32 +17,27 @@
  * Free shipping model
  *
  * @api
- * @since 2.0.0
  */
 class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
     \Magento\Shipping\Model\Carrier\CarrierInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'freeshipping';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFixed = true;
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateResultFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory
-     * @since 2.0.0
      */
     protected $_rateMethodFactory;
 
@@ -53,7 +48,6 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
      * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -73,7 +67,6 @@ public function __construct(
      *
      * @param RateRequest $request
      * @return \Magento\Shipping\Model\Rate\Result|bool
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -113,7 +106,6 @@ public function collectRates(RateRequest $request)
      *
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return void
-     * @since 2.0.0
      */
     protected function _updateFreeMethodQuote($request)
     {
@@ -136,7 +128,6 @@ protected function _updateFreeMethodQuote($request)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
index 435486aa9d1b5..e7a2c176dbf34 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
@@ -11,32 +11,27 @@
  * Pickup shipping model
  *
  * @api
- * @since 2.0.0
  */
 class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
     \Magento\Shipping\Model\Carrier\CarrierInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'pickup';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFixed = true;
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateResultFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory
-     * @since 2.0.0
      */
     protected $_rateMethodFactory;
 
@@ -47,7 +42,6 @@ class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
      * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -66,7 +60,6 @@ public function __construct(
      * @param RateRequest $request
      * @return \Magento\Shipping\Model\Rate\Result
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -78,7 +71,6 @@ public function collectRates(RateRequest $request)
      * Get allowed shipping methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index ca81b8e1a196f..fdae42add1594 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -12,50 +12,42 @@
  * Table rate shipping model
  *
  * @api
- * @since 2.0.0
  */
 class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
     \Magento\Shipping\Model\Carrier\CarrierInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'tablerate';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFixed = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultConditionName = 'package_weight';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_conditionNames = [];
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateResultFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory
-     * @since 2.0.0
      */
     protected $_resultMethodFactory;
 
     /**
      * @var \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory
-     * @since 2.0.0
      */
     protected $_tablerateFactory;
 
@@ -68,7 +60,6 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory $tablerateFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -94,7 +85,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -208,7 +198,6 @@ public function collectRates(RateRequest $request)
     /**
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return array|bool
-     * @since 2.0.0
      */
     public function getRate(\Magento\Quote\Model\Quote\Address\RateRequest $request)
     {
@@ -220,7 +209,6 @@ public function getRate(\Magento\Quote\Model\Quote\Address\RateRequest $request)
      * @param string $code
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCode($type, $code = '')
     {
@@ -256,7 +244,6 @@ public function getCode($type, $code = '')
      * Get allowed shipping methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
index 075fe3b0a5c4d..2a64603af0deb 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
@@ -11,13 +11,11 @@
  * Backend model for shipping table rates CSV importing
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tablerate extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory
-     * @since 2.0.0
      */
     protected $_tablerateFactory;
 
@@ -30,7 +28,6 @@ class Tablerate extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php
index b9bd309cb4a7d..a10b05c37d3c5 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Flatrate implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php
index b773bab154eb8..5e41c1feb8f58 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tablerate implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\OfflineShipping\Model\Carrier\Tablerate
-     * @since 2.0.0
      */
     protected $_carrierTablerate;
 
     /**
      * @param \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate
-     * @since 2.0.0
      */
     public function __construct(\Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate)
     {
@@ -28,7 +25,6 @@ public function __construct(\Magento\OfflineShipping\Model\Carrier\Tablerate $ca
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
index d2de1fa9aaea3..dacde8a4409ba 100644
--- a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart\Shipping
  *
- * @since 2.0.0
  */
 class Shipping
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * @param  bool $result
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterIsStateActive(\Magento\Checkout\Block\Cart\LayoutProcessor $subject, $result)
     {
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
index c60792faf0d10..e1200d5519189 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\OfflineShipping\Model\Quote\Address\FreeShipping
  *
- * @since 2.0.0
  */
 class FreeShipping implements \Magento\Quote\Model\Quote\Address\FreeShippingInterface
 {
     /**
      * @var \Magento\OfflineShipping\Model\SalesRule\Calculator
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -39,7 +35,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
     {
@@ -88,7 +83,6 @@ public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param bool $isFreeShipping
      * @return void
-     * @since 2.0.0
      */
     protected function applyToChildren(\Magento\Quote\Model\Quote\Item\AbstractItem $item, $isFreeShipping)
     {
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
index 1a1ac33ec364d..f2d8fae858100 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -22,7 +22,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -30,7 +29,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Import table rates website ID
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_importWebsiteId = 0;
 
@@ -38,7 +36,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Errors in import process
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importErrors = [];
 
@@ -46,7 +43,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Count of imported table rates
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_importedRows = 0;
 
@@ -54,7 +50,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of unique table rate keys to protect from duplicates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importUniqueHash = [];
 
@@ -62,7 +57,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of countries keyed by iso2 code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importIso2Countries;
 
@@ -70,7 +64,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of countries keyed by iso3 code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importIso3Countries;
 
@@ -79,7 +72,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * [country_id][region_code] = region_id
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importRegions;
 
@@ -87,7 +79,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Import Table Rate condition name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_importConditionName;
 
@@ -95,7 +86,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Array of condition full names
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_conditionFullNames = [];
 
@@ -154,7 +144,6 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param RateQueryFactory $rateQueryFactory
      * @param Import $import
      * @param null $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -181,7 +170,6 @@ public function __construct(
      * Define main table and id field name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -193,7 +181,6 @@ protected function _construct()
      *
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return array|bool
-     * @since 2.0.0
      */
     public function getRate(\Magento\Quote\Model\Quote\Address\RateRequest $request)
     {
@@ -270,7 +257,6 @@ private function importData(array $fields, array $values)
      * @see https://wiki.corp.x.com/display/MCOMS/Magento+Filesystem+Decisions
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function uploadAndImport(\Magento\Framework\DataObject $object)
     {
@@ -349,7 +335,6 @@ private function getCsvFile($filePath)
      *
      * @param string $conditionName
      * @return string
-     * @since 2.0.0
      */
     protected function _getConditionFullName($conditionName)
     {
@@ -366,7 +351,6 @@ protected function _getConditionFullName($conditionName)
      *
      * @param array $data
      * @return \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate
-     * @since 2.0.0
      */
     protected function _saveImportData(array $data)
     {
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Collection.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Collection.php
index 9e3708e0cb578..ea078327ce44c 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Collection.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Collection.php
@@ -9,7 +9,6 @@
  * Shipping table rates collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Directory/country table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_countryTable;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Directory/country_region table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_regionTable;
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model and item
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      * Initialize select, add country iso3 code and region name
      *
      * @return void
-     * @since 2.0.0
      */
     public function _initSelect()
     {
@@ -76,7 +71,6 @@ public function _initSelect()
      *
      * @param int $websiteId
      * @return \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection
-     * @since 2.0.0
      */
     public function setWebsiteFilter($websiteId)
     {
@@ -88,7 +82,6 @@ public function setWebsiteFilter($websiteId)
      *
      * @param string $conditionName
      * @return \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection
-     * @since 2.0.0
      */
     public function setConditionFilter($conditionName)
     {
@@ -100,7 +93,6 @@ public function setConditionFilter($conditionName)
      *
      * @param string $countryId
      * @return \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection
-     * @since 2.0.0
      */
     public function setCountryFilter($countryId)
     {
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
index a7cb03f16f700..0b239b6d2fd79 100644
--- a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
+++ b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Calculator extends Validator
 {
@@ -26,7 +25,6 @@ class Calculator extends Validator
      *
      * @param   \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return  \Magento\OfflineShipping\Model\SalesRule\Calculator
-     * @since 2.0.0
      */
     public function processFreeShipping(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php
index f005d09f754e0..a743427a215ce 100644
--- a/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php
+++ b/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Rule
 {
diff --git a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
index 24fd209737cd7..363f24d660f58 100644
--- a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
+++ b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
@@ -12,26 +12,24 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $quoteConnectionName = 'checkout';
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $salesConnectionName = 'sales';
 
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/PageCache/Block/Javascript.php b/app/code/Magento/PageCache/Block/Javascript.php
index 196f84bb65c15..925888c66fac4 100644
--- a/app/code/Magento/PageCache/Block/Javascript.php
+++ b/app/code/Magento/PageCache/Block/Javascript.php
@@ -9,7 +9,6 @@
  * Class Form
  *
  * @api
- * @since 2.0.0
  */
 class Javascript extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class Javascript extends \Magento\Framework\View\Element\Template
      * Retrieve script options encoded to json
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScriptOptions()
     {
diff --git a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php
index 8b2051cb0f17d..cd9be04ee7a6a 100644
--- a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php
+++ b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php
@@ -9,7 +9,6 @@
  * Class Export
  *
  * @api
- * @since 2.0.0
  */
 class Export extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -19,7 +18,6 @@ class Export extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -45,7 +43,6 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Return Varnish version to this class
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVarnishVersion()
     {
@@ -78,7 +75,6 @@ private function getVarnishUrl($params = [])
      *
      * @return string
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function getTtlValue()
     {
diff --git a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php
index 1b2e44ffc15e0..c6c7766265dd9 100644
--- a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php
+++ b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Export
- * @since 2.0.0
  */
 class Varnish4 extends \Magento\PageCache\Block\System\Config\Form\Field\Export
 {
@@ -15,7 +14,6 @@ class Varnish4 extends \Magento\PageCache\Block\System\Config\Form\Field\Export
      * Return Varnish version to this class
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVarnishVersion()
     {
diff --git a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php
index 29a0b3af4c1bb..907b5fa8858f6 100644
--- a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php
+++ b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\PageCache\Controller\Adminhtml\PageCache\ExportVarnishConfig
  *
- * @since 2.0.0
  */
 class ExportVarnishConfig extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Backend\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -31,7 +28,6 @@ class ExportVarnishConfig extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\PageCache\Model\Config $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Export Varnish Configuration as .vcl
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/PageCache/Controller/Block.php b/app/code/Magento/PageCache/Controller/Block.php
index cc693617155ba..c01c7e27f0557 100644
--- a/app/code/Magento/PageCache/Controller/Block.php
+++ b/app/code/Magento/PageCache/Controller/Block.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\PageCache\Controller\Block
  *
- * @since 2.0.0
  */
 abstract class Block extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $translateInline;
 
@@ -40,7 +38,6 @@ abstract class Block extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param Json $jsonSerializer
      * @param Base64Json $base64jsonSerializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -60,7 +57,6 @@ public function __construct(
      * Get blocks from layout by handles
      *
      * @return array [\Element\BlockInterface]
-     * @since 2.0.0
      */
     protected function _getBlocks()
     {
diff --git a/app/code/Magento/PageCache/Controller/Block/Esi.php b/app/code/Magento/PageCache/Controller/Block/Esi.php
index bab7251bae562..1a38cd6e8520b 100644
--- a/app/code/Magento/PageCache/Controller/Block/Esi.php
+++ b/app/code/Magento/PageCache/Controller/Block/Esi.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\PageCache\Controller\Block\Esi
  *
- * @since 2.0.0
  */
 class Esi extends \Magento\PageCache\Controller\Block
 {
@@ -17,7 +16,6 @@ class Esi extends \Magento\PageCache\Controller\Block
      * Returns block content as part of ESI request from Varnish
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/PageCache/Controller/Block/Render.php b/app/code/Magento/PageCache/Controller/Block/Render.php
index 3ca5be815d05a..919838b3b56de 100644
--- a/app/code/Magento/PageCache/Controller/Block/Render.php
+++ b/app/code/Magento/PageCache/Controller/Block/Render.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\PageCache\Controller\Block\Render
  *
- * @since 2.0.0
  */
 class Render extends \Magento\PageCache\Controller\Block
 {
@@ -17,7 +16,6 @@ class Render extends \Magento\PageCache\Controller\Block
      * Returns block content depends on ajax request
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/PageCache/Helper/Data.php b/app/code/Magento/PageCache/Helper/Data.php
index f364e89a59280..df6d70f2252b1 100644
--- a/app/code/Magento/PageCache/Helper/Data.php
+++ b/app/code/Magento/PageCache/Helper/Data.php
@@ -12,7 +12,6 @@
 
 /**
  * Helper for Page Cache module
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -42,7 +41,6 @@ public function __construct(\Magento\Framework\Session\Config $config)
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($route, array $params = [])
     {
diff --git a/app/code/Magento/PageCache/Model/App/CacheIdentifierPlugin.php b/app/code/Magento/PageCache/Model/App/CacheIdentifierPlugin.php
index 3f6b958e11f99..08a136b711937 100644
--- a/app/code/Magento/PageCache/Model/App/CacheIdentifierPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/CacheIdentifierPlugin.php
@@ -9,7 +9,6 @@
 /**
  * Class CachePlugin
  * Should add design exceptions o identifier for built-in cache
- * @since 2.0.0
  */
 class CacheIdentifierPlugin
 {
@@ -19,7 +18,6 @@ class CacheIdentifierPlugin
      * @param \Magento\Framework\View\DesignExceptions $designExceptions
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\PageCache\Model\Config $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\DesignExceptions $designExceptions,
@@ -38,7 +36,6 @@ public function __construct(
      * @param string $result
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetValue(\Magento\Framework\App\PageCache\Identifier $identifier, $result)
     {
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
index 498df9dc603fb..37dcd1302b3a3 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
@@ -9,31 +9,26 @@
 
 /**
  * Plugin for processing builtin cache
- * @since 2.0.0
  */
 class BuiltinPlugin
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\App\PageCache\Version
-     * @since 2.0.0
      */
     protected $version;
 
     /**
      * @var \Magento\Framework\App\PageCache\Kernel
-     * @since 2.0.0
      */
     protected $kernel;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $state;
 
@@ -44,7 +39,6 @@ class BuiltinPlugin
      * @param \Magento\Framework\App\PageCache\Version $version
      * @param \Magento\Framework\App\PageCache\Kernel $kernel
      * @param \Magento\Framework\App\State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -64,7 +58,6 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\Controller\ResultInterface|\Magento\Framework\App\Response\Http
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDispatch(
         \Magento\Framework\App\FrontControllerInterface $subject,
@@ -93,7 +86,6 @@ public function aroundDispatch(
      *
      * @param ResponseHttp $result
      * @return ResponseHttp
-     * @since 2.0.0
      */
     protected function addDebugHeaders(ResponseHttp $result)
     {
@@ -113,7 +105,6 @@ protected function addDebugHeaders(ResponseHttp $result)
      * @param string $value
      * @param bool $replace
      * @return void
-     * @since 2.0.0
      */
     protected function addDebugHeader(ResponseHttp $response, $name, $value, $replace = false)
     {
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
index f98c3cb59fc4e..e5b03fe2e74eb 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
@@ -15,25 +15,21 @@
 
 /**
  * Varnish for processing builtin cache
- * @since 2.0.0
  */
 class VarnishPlugin
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Version
-     * @since 2.0.0
      */
     private $version;
 
     /**
      * @var AppState
-     * @since 2.0.0
      */
     private $state;
 
@@ -41,7 +37,6 @@ class VarnishPlugin
      * @param Config $config
      * @param Version $version
      * @param AppState $state
-     * @since 2.0.0
      */
     public function __construct(Config $config, Version $version, AppState $state)
     {
diff --git a/app/code/Magento/PageCache/Model/App/PageCachePlugin.php b/app/code/Magento/PageCache/Model/App/PageCachePlugin.php
index 332d5309afe1a..6688f77906f0f 100644
--- a/app/code/Magento/PageCache/Model/App/PageCachePlugin.php
+++ b/app/code/Magento/PageCache/Model/App/PageCachePlugin.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\PageCache\Model\App\PageCachePlugin
  *
- * @since 2.0.0
  */
 class PageCachePlugin
 {
@@ -29,7 +28,6 @@ class PageCachePlugin
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeSave(
         \Magento\Framework\App\PageCache\Cache $subject,
@@ -52,7 +50,6 @@ public function beforeSave(
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterLoad(
         \Magento\Framework\App\PageCache\Cache $subject,
@@ -71,7 +68,6 @@ public function afterLoad(
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     private function handleCompression($data)
     {
diff --git a/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php b/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php
index d6ff214b0b34a..bf958707dde49 100644
--- a/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php
@@ -8,7 +8,6 @@
 
 /**
  * HTTP response plugin for frontend.
- * @since 2.0.0
  */
 class HttpPlugin
 {
@@ -17,7 +16,6 @@ class HttpPlugin
      *
      * @param \Magento\Framework\App\Response\Http $subject
      * @return void
-     * @since 2.0.0
      */
     public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject)
     {
diff --git a/app/code/Magento/PageCache/Model/Cache/Server.php b/app/code/Magento/PageCache/Model/Cache/Server.php
index 376ab1f5e2a94..e16a4c698c9d5 100644
--- a/app/code/Magento/PageCache/Model/Cache/Server.php
+++ b/app/code/Magento/PageCache/Model/Cache/Server.php
@@ -15,25 +15,21 @@
 /**
  * Class \Magento\PageCache\Model\Cache\Server
  *
- * @since 2.0.0
  */
 class Server
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
@@ -45,7 +41,6 @@ class Server
      * @param UrlInterface $urlBuilder
      * @param DeploymentConfig $config
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         UrlInterface $urlBuilder,
@@ -61,7 +56,6 @@ public function __construct(
      * Get cache servers' Uris
      *
      * @return Uri[]
-     * @since 2.0.0
      */
     public function getUris()
     {
diff --git a/app/code/Magento/PageCache/Model/Cache/Type.php b/app/code/Magento/PageCache/Model/Cache/Type.php
index 749fa451a1755..4cc9ac141dc52 100644
--- a/app/code/Magento/PageCache/Model/Cache/Type.php
+++ b/app/code/Magento/PageCache/Model/Cache/Type.php
@@ -9,7 +9,6 @@
 /**
  * System / Cache Management / Cache type "Full Page Cache"
  *
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -25,14 +24,12 @@ class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     private $eventManager;
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool,
@@ -48,7 +45,6 @@ public function __construct(
      * @param string $mode
      * @param array $tags
      * @return bool
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 9c3666fb1734b..e98b8a8a398f0 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -16,7 +16,6 @@
  * file configuration with user-defined from configuration
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -46,7 +45,6 @@ class Config
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -62,19 +60,16 @@ class Config
 
     /**
      * @var \Magento\Framework\App\Cache\StateInterface $_cacheState
-     * @since 2.0.0
      */
     protected $_cacheState;
 
     /**
      * @var Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $reader;
 
@@ -97,7 +92,6 @@ class Config
      * @param Dir\Reader $reader
      * @param VclGeneratorFactory $vclGeneratorFactory
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
@@ -121,7 +115,6 @@ public function __construct(
      * @return int
      * @api
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -134,7 +127,6 @@ public function getType()
      * @return int
      * @api
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     public function getTtl()
     {
@@ -148,7 +140,6 @@ public function getTtl()
      * @return string
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      * @api
-     * @since 2.0.0
      */
     public function getVclFile($vclTemplatePath)
     {
@@ -178,7 +169,6 @@ public function getVclFile($vclTemplatePath)
      *
      * @return array
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     protected function _getReplacements()
     {
@@ -209,7 +199,6 @@ protected function _getReplacements()
      *
      * @return mixed|null|string
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     protected function _getAccessList()
     {
@@ -235,7 +224,6 @@ protected function _getAccessList()
      *
      * @return string
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     protected function _getDesignExceptions()
     {
@@ -269,7 +257,6 @@ protected function _getDesignExceptions()
      * @return bool
      * @api
      * @deprecated 2.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
-     * @since 2.0.0
      */
     public function isEnabled()
     {
diff --git a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
index 392daa9bcb54a..747d93adfecc6 100644
--- a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
+++ b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
@@ -18,31 +18,26 @@
  * Plugin for processing builtin cache
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BuiltinPlugin
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Kernel
-     * @since 2.0.0
      */
     private $kernel;
 
     /**
      * @var AppState
-     * @since 2.0.0
      */
     private $state;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $registry;
 
@@ -51,7 +46,6 @@ class BuiltinPlugin
      * @param Kernel $kernel
      * @param AppState $state
      * @param Registry $registry
-     * @since 2.0.0
      */
     public function __construct(Config $config, Kernel $kernel, AppState $state, Registry $registry)
     {
diff --git a/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
index afee8200eb9f1..80fb6096d2911 100644
--- a/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
+++ b/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
@@ -14,31 +14,26 @@
 
 /**
  * Plugin for processing varnish cache
- * @since 2.0.0
  */
 class VarnishPlugin
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Version
-     * @since 2.0.0
      */
     private $version;
 
     /**
      * @var AppState
-     * @since 2.0.0
      */
     private $state;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     private $registry;
 
@@ -47,7 +42,6 @@ class VarnishPlugin
      * @param Version $version
      * @param AppState $state
      * @param Registry $registry
-     * @since 2.0.0
      */
     public function __construct(Config $config, Version $version, AppState $state, Registry $registry)
     {
diff --git a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
index a2b2d7e494669..3023efb7a71a6 100644
--- a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
+++ b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
@@ -7,7 +7,6 @@
 
 /**
  * Checks if session should be depersonalized in Depersonalize plugin
- * @since 2.0.0
  */
 class DepersonalizeChecker
 {
@@ -15,7 +14,6 @@ class DepersonalizeChecker
      * Request
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
@@ -23,7 +21,6 @@ class DepersonalizeChecker
      * Module manager
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -31,7 +28,6 @@ class DepersonalizeChecker
      * Cache config
      *
      * @var Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
@@ -39,7 +35,6 @@ class DepersonalizeChecker
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -57,7 +52,6 @@ public function __construct(
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function checkIfDepersonalize(\Magento\Framework\View\LayoutInterface $subject)
     {
diff --git a/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
index e5847b5444b10..52b304d994bb3 100644
--- a/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
@@ -9,25 +9,21 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
     /**
      * @var \Magento\Framework\Event\Manager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\Message\Session
-     * @since 2.0.0
      */
     protected $messageSession;
 
@@ -35,7 +31,6 @@ class DepersonalizePlugin
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param \Magento\Framework\Event\Manager $eventManager
      * @param \Magento\Framework\Message\Session $messageSession
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -53,7 +48,6 @@ public function __construct(
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
     {
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index a4da96c15bee8..ef85d6faf2371 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -7,19 +7,16 @@
 
 /**
  * Class LayoutPlugin
- * @since 2.0.0
  */
 class LayoutPlugin
 {
     /**
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $response;
 
@@ -28,7 +25,6 @@ class LayoutPlugin
      *
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param \Magento\PageCache\Model\Config $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
@@ -45,7 +41,6 @@ public function __construct(
      * @param \Magento\Framework\View\Layout $subject
      * @param mixed $result
      * @return mixed
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\Layout $subject, $result)
     {
@@ -61,7 +56,6 @@ public function afterGenerateXml(\Magento\Framework\View\Layout $subject, $resul
      * @param \Magento\Framework\View\Layout $subject
      * @param mixed $result
      * @return mixed
-     * @since 2.0.0
      */
     public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result)
     {
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
index 4ace06035c807..dab8d7be16dd7 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
@@ -10,7 +10,6 @@
  * Backend model for processing Public content cache lifetime settings
  *
  * Class Ttl
- * @since 2.0.0
  */
 class Ttl extends \Magento\Framework\App\Config\Value
 {
@@ -19,7 +18,6 @@ class Ttl extends \Magento\Framework\App\Config\Value
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php
index 42b9e4250f011..d98601c78260f 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php
@@ -9,13 +9,11 @@
  * Backend model for processing Varnish settings
  *
  * Class Varnish
- * @since 2.0.0
  */
 class Varnish extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $defaultValues;
 
@@ -24,7 +22,6 @@ class Varnish extends \Magento\Framework\App\Config\Value
      *
      * @return $this|\Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -41,7 +38,6 @@ public function beforeSave()
      * Get Default Config Values
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultValues()
     {
@@ -55,7 +51,6 @@ protected function _getDefaultValues()
      * If fields are empty fill them with default data
      *
      * @return $this|\Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
index 6a8326616f623..d44daa7dec95d 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
@@ -14,7 +14,6 @@
 
 /**
  * Class Application
- * @since 2.0.0
  */
 class Application implements ArrayInterface
 {
@@ -22,7 +21,6 @@ class Application implements ArrayInterface
      * Options getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -42,7 +40,6 @@ public function toOptionArray()
      * Get options in "key-value" format
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
diff --git a/app/code/Magento/PageCache/Observer/FlushAllCache.php b/app/code/Magento/PageCache/Observer/FlushAllCache.php
index 8993e01b28530..fcbb56665d650 100644
--- a/app/code/Magento/PageCache/Observer/FlushAllCache.php
+++ b/app/code/Magento/PageCache/Observer/FlushAllCache.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\PageCache\Observer\FlushAllCache
  *
- * @since 2.0.0
  */
 class FlushAllCache implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class FlushAllCache implements ObserverInterface
      * @var \Magento\Framework\App\PageCache\Cache
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -28,7 +26,6 @@ class FlushAllCache implements ObserverInterface
      * Application config object
      *
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -41,7 +38,6 @@ class FlushAllCache implements ObserverInterface
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\PageCache\Cache $cache
-     * @since 2.0.0
      */
     public function __construct(\Magento\PageCache\Model\Config $config, \Magento\Framework\App\PageCache\Cache $cache)
     {
@@ -54,7 +50,6 @@ public function __construct(\Magento\PageCache\Model\Config $config, \Magento\Fr
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/PageCache/Observer/FlushCacheByTags.php b/app/code/Magento/PageCache/Observer/FlushCacheByTags.php
index 9d0117040ead0..b5b1140654df1 100644
--- a/app/code/Magento/PageCache/Observer/FlushCacheByTags.php
+++ b/app/code/Magento/PageCache/Observer/FlushCacheByTags.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\PageCache\Observer\FlushCacheByTags
  *
- * @since 2.0.0
  */
 class FlushCacheByTags implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class FlushCacheByTags implements ObserverInterface
      * @var \Magento\Framework\App\PageCache\Cache
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -28,7 +26,6 @@ class FlushCacheByTags implements ObserverInterface
      * Application config object
      *
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -42,14 +39,13 @@ class FlushCacheByTags implements ObserverInterface
      * Invalidation tags resolver
      *
      * @var \Magento\Framework\App\Cache\Tag\Resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $tagResolver;
 
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\PageCache\Cache $cache
-     * @since 2.0.0
      */
     public function __construct(\Magento\PageCache\Model\Config $config, \Magento\Framework\App\PageCache\Cache $cache)
     {
@@ -63,7 +59,6 @@ public function __construct(\Magento\PageCache\Model\Config $config, \Magento\Fr
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -96,9 +91,9 @@ private function getCache()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return \Magento\Framework\App\Cache\Tag\Resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getTagResolver()
     {
diff --git a/app/code/Magento/PageCache/Observer/FlushFormKeyOnLogout.php b/app/code/Magento/PageCache/Observer/FlushFormKeyOnLogout.php
index d913f39915f73..d31ab45528978 100644
--- a/app/code/Magento/PageCache/Observer/FlushFormKeyOnLogout.php
+++ b/app/code/Magento/PageCache/Observer/FlushFormKeyOnLogout.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\PageCache\Observer\FlushFormKeyOnLogout
  *
- * @since 2.0.0
  */
 class FlushFormKeyOnLogout implements ObserverInterface
 {
     /**
      * @var FormKey
-     * @since 2.0.0
      */
     private $cookieFormKey;
 
     /**
      * @param FormKey $cookieFormKey
-     * @since 2.0.0
      */
     public function __construct(
         FormKey $cookieFormKey
@@ -35,7 +32,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/PageCache/Observer/InvalidateCache.php b/app/code/Magento/PageCache/Observer/InvalidateCache.php
index c49c4e46c8718..2e6fede0fceb7 100644
--- a/app/code/Magento/PageCache/Observer/InvalidateCache.php
+++ b/app/code/Magento/PageCache/Observer/InvalidateCache.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\PageCache\Observer\InvalidateCache
  *
- * @since 2.0.0
  */
 class InvalidateCache implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_typeList;
 
@@ -25,14 +23,12 @@ class InvalidateCache implements ObserverInterface
      * Application config object
      *
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -48,7 +44,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php b/app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php
index 63140c0fb59b2..7b912e655bc9a 100644
--- a/app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php
+++ b/app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\PageCache\Observer\ProcessLayoutRenderElement
  *
- * @since 2.0.0
  */
 class ProcessLayoutRenderElement implements ObserverInterface
 {
@@ -22,7 +21,6 @@ class ProcessLayoutRenderElement implements ObserverInterface
      * Application config object
      *
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     private $_config;
 
@@ -30,7 +28,6 @@ class ProcessLayoutRenderElement implements ObserverInterface
      * Is varnish enabled flag
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isVarnishEnabled;
 
@@ -38,7 +35,6 @@ class ProcessLayoutRenderElement implements ObserverInterface
      * Is full page cache enabled flag
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isFullPageCacheEnabled;
 
@@ -67,7 +63,6 @@ class ProcessLayoutRenderElement implements ObserverInterface
      * @param EntitySpecificHandlesList $entitySpecificHandlesList
      * @param Json $jsonSerializer
      * @param Base64Json $base64jsonSerializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
@@ -90,7 +85,6 @@ public function __construct(
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @param \Magento\Framework\View\Layout $layout
      * @return string
-     * @since 2.0.0
      */
     private function _wrapEsi(
         \Magento\Framework\View\Element\AbstractBlock $block,
@@ -116,7 +110,6 @@ private function _wrapEsi(
      * Is full page cache enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isFullPageCacheEnabled()
     {
@@ -130,7 +123,6 @@ private function isFullPageCacheEnabled()
      * Is varnish cache engine enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isVarnishEnabled()
     {
@@ -146,7 +138,6 @@ private function isVarnishEnabled()
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
index d8081ef7bd859..ce4133bfb8913 100644
--- a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
+++ b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
@@ -11,37 +11,31 @@
 /**
  * Class \Magento\PageCache\Observer\RegisterFormKeyFromCookie
  *
- * @since 2.0.0
  */
 class RegisterFormKeyFromCookie implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\App\PageCache\FormKey
-     * @since 2.0.0
      */
     private $cookieFormKey;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     private $escaper;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     private $sessionFormKey;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     private $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\Session\Config\ConfigInterface
-     * @since 2.0.0
      */
     private $sessionConfig;
 
@@ -51,7 +45,6 @@ class RegisterFormKeyFromCookie implements ObserverInterface
      * @param \Magento\Framework\Data\Form\FormKey $sessionFormKey
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\PageCache\FormKey $formKey,
@@ -73,7 +66,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -89,7 +81,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     /**
      * @param string $formKey
      * @return void
-     * @since 2.0.0
      */
     private function updateCookieFormKey($formKey)
     {
diff --git a/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
index afc0bde51b0b0..0d125538204d7 100644
--- a/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
+++ b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
@@ -9,7 +9,7 @@
  * Payment method interface.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PaymentMethodInterface
 {
@@ -17,7 +17,7 @@ interface PaymentMethodInterface
      * Get code.
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getCode();
 
@@ -25,7 +25,7 @@ public function getCode();
      * Get title.
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTitle();
 
@@ -33,7 +33,7 @@ public function getTitle();
      * Get store id.
      *
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getStoreId();
 
@@ -42,7 +42,7 @@ public function getStoreId();
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIsActive();
 }
diff --git a/app/code/Magento/Payment/Api/PaymentMethodListInterface.php b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
index b01c01fce436b..e2f4ce4a59c4c 100644
--- a/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
+++ b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
@@ -9,7 +9,7 @@
  * Payment method list interface.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PaymentMethodListInterface
 {
@@ -18,7 +18,7 @@ interface PaymentMethodListInterface
      *
      * @param int $storeId
      * @return \Magento\Payment\Api\Data\PaymentMethodInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getList($storeId);
 
@@ -27,7 +27,7 @@ public function getList($storeId);
      *
      * @param int $storeId
      * @return \Magento\Payment\Api\Data\PaymentMethodInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getActiveList($storeId);
 }
diff --git a/app/code/Magento/Payment/Block/Adminhtml/Transparent/Form.php b/app/code/Magento/Payment/Block/Adminhtml/Transparent/Form.php
index bf4b37373affa..7c00087c66696 100644
--- a/app/code/Magento/Payment/Block/Adminhtml/Transparent/Form.php
+++ b/app/code/Magento/Payment/Block/Adminhtml/Transparent/Form.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Transparent\Form
 {
@@ -15,7 +14,6 @@ class Form extends \Magento\Payment\Block\Transparent\Form
      * On backend this block does not have any conditional checks
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function shouldRender()
     {
@@ -24,7 +22,6 @@ protected function shouldRender()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     protected function initializeMethod()
     {
diff --git a/app/code/Magento/Payment/Block/ConfigurableInfo.php b/app/code/Magento/Payment/Block/ConfigurableInfo.php
index 9599055134600..14911edc9acc0 100644
--- a/app/code/Magento/Payment/Block/ConfigurableInfo.php
+++ b/app/code/Magento/Payment/Block/ConfigurableInfo.php
@@ -12,13 +12,11 @@
 /**
  * Class ConfigurableInfo
  * @api
- * @since 2.0.0
  */
 class ConfigurableInfo extends \Magento\Payment\Block\Info
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
@@ -26,7 +24,6 @@ class ConfigurableInfo extends \Magento\Payment\Block\Info
      * @param Context $context
      * @param ConfigInterface $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -50,7 +47,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject|array|null $transport
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareSpecificInformation($transport = null)
     {
@@ -84,7 +80,6 @@ protected function _prepareSpecificInformation($transport = null)
      * @param string $field
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function setDataToTransfer(
         \Magento\Framework\DataObject $transport,
@@ -105,7 +100,6 @@ protected function setDataToTransfer(
      *
      * @param string $field
      * @return string | Phrase
-     * @since 2.0.0
      */
     protected function getLabel($field)
     {
@@ -119,7 +113,6 @@ protected function getLabel($field)
      * @param string $value
      * @return string | Phrase
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function getValueView($field, $value)
     {
diff --git a/app/code/Magento/Payment/Block/Form.php b/app/code/Magento/Payment/Block/Form.php
index ce7f78353bd60..24ea5c4c9131f 100644
--- a/app/code/Magento/Payment/Block/Form.php
+++ b/app/code/Magento/Payment/Block/Form.php
@@ -11,7 +11,6 @@
  * Payment method form base block
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Form extends \Magento\Framework\View\Element\Template
      *
      * @return MethodInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -39,7 +37,6 @@ public function getMethod()
      *
      * @param MethodInterface $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod(MethodInterface $method)
     {
@@ -51,7 +48,6 @@ public function setMethod(MethodInterface $method)
      * Retrieve payment method code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethodCode()
     {
@@ -63,7 +59,6 @@ public function getMethodCode()
      *
      * @param   string $field
      * @return  mixed
-     * @since 2.0.0
      */
     public function getInfoData($field)
     {
diff --git a/app/code/Magento/Payment/Block/Form/Cc.php b/app/code/Magento/Payment/Block/Form/Cc.php
index 7a98ef4dc3521..a8419acd34863 100644
--- a/app/code/Magento/Payment/Block/Form/Cc.php
+++ b/app/code/Magento/Payment/Block/Form/Cc.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cc extends \Magento\Payment\Block\Form
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Payment::form/cc.phtml';
 
@@ -21,7 +19,6 @@ class Cc extends \Magento\Payment\Block\Form
      * Payment config model
      *
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
@@ -29,7 +26,6 @@ class Cc extends \Magento\Payment\Block\Form
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getCcAvailableTypes()
     {
@@ -68,7 +63,6 @@ public function getCcAvailableTypes()
      * Retrieve credit card expire months
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCcMonths()
     {
@@ -85,7 +79,6 @@ public function getCcMonths()
      * Retrieve credit card expire years
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCcYears()
     {
@@ -102,7 +95,6 @@ public function getCcYears()
      * Retrieve has verification configuration
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasVerification()
     {
@@ -121,7 +113,6 @@ public function hasVerification()
      *
      * @deprecated 2.1.0 unused
      * @return bool
-     * @since 2.0.0
      */
     public function hasSsCardType()
     {
@@ -138,7 +129,6 @@ public function hasSsCardType()
      *
      * @deprecated 2.1.0 unused
      * @return array
-     * @since 2.0.0
      */
     public function getSsStartYears()
     {
@@ -157,7 +147,6 @@ public function getSsStartYears()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Payment/Block/Form/Container.php b/app/code/Magento/Payment/Block/Form/Container.php
index 8bd77f52412d2..78cc2c18d158d 100644
--- a/app/code/Magento/Payment/Block/Form/Container.php
+++ b/app/code/Magento/Payment/Block/Form/Container.php
@@ -14,37 +14,34 @@
  * @method \Magento\Quote\Model\Quote getQuote()
  *
  * @api
- * @since 2.0.0
  */
 class Container extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
     /**
      * @var \Magento\Payment\Model\Checks\SpecificationFactory
-     * @since 2.0.0
      */
     protected $methodSpecificationFactory;
 
     /**
      * @var \Magento\Payment\Api\PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentMethodList;
 
     /**
      * @var \Magento\Payment\Model\Method\InstanceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentMethodInstanceFactory;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $additionalChecks;
 
@@ -54,7 +51,6 @@ class Container extends \Magento\Framework\View\Element\Template
      * @param \Magento\Payment\Model\Checks\SpecificationFactory $methodSpecificationFactory
      * @param array $data
      * @param array $additionalChecks
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -73,7 +69,6 @@ public function __construct(
      * Prepare children blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -95,7 +90,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Payment\Model\MethodInterface $method
      * @return bool
-     * @since 2.0.0
      */
     protected function _canUseMethod($method)
     {
@@ -122,7 +116,6 @@ protected function _canUseMethod($method)
      *
      * @param \Magento\Payment\Model\MethodInterface $method
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignMethod($method)
     {
@@ -136,7 +129,6 @@ protected function _assignMethod($method)
      * @param string $method
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodFormTemplate($method = '', $template = '')
     {
@@ -152,7 +144,6 @@ public function setMethodFormTemplate($method = '', $template = '')
      * Retrieve available payment methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMethods()
     {
@@ -177,7 +168,6 @@ public function getMethods()
      * Retrieve code of current payment method
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getSelectedMethodCode()
     {
@@ -193,8 +183,8 @@ public function getSelectedMethodCode()
      * Get payment method list.
      *
      * @return \Magento\Payment\Api\PaymentMethodListInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getPaymentMethodList()
     {
@@ -210,8 +200,8 @@ private function getPaymentMethodList()
      * Get payment method instance factory.
      *
      * @return \Magento\Payment\Model\Method\InstanceFactory
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getPaymentMethodInstanceFactory()
     {
diff --git a/app/code/Magento/Payment/Block/Info.php b/app/code/Magento/Payment/Block/Info.php
index 873dd5e476575..de45aace2017b 100644
--- a/app/code/Magento/Payment/Block/Info.php
+++ b/app/code/Magento/Payment/Block/Info.php
@@ -9,7 +9,6 @@
  * Base payment iformation block
  *
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
@@ -17,13 +16,11 @@ class Info extends \Magento\Framework\View\Element\Template
      * Payment rendered specific information
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_paymentSpecificInformation;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Payment::info/default.phtml';
 
@@ -32,7 +29,6 @@ class Info extends \Magento\Framework\View\Element\Template
      *
      * @return \Magento\Payment\Model\InfoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getInfo()
     {
@@ -49,7 +45,6 @@ public function getInfo()
      * Retrieve payment method model
      *
      * @return \Magento\Payment\Model\MethodInterface
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -59,7 +54,6 @@ public function getMethod()
     /**
      * Render as PDF
      * @return string
-     * @since 2.0.0
      */
     public function toPdf()
     {
@@ -73,7 +67,6 @@ public function toPdf()
      * Children must have toPdf() callable
      * Known issue: not sorted
      * @return array
-     * @since 2.0.0
      */
     public function getChildPdfAsArray()
     {
@@ -90,7 +83,6 @@ public function getChildPdfAsArray()
      * Get some specific information in format of array($label => $value)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSpecificInformation()
     {
@@ -103,7 +95,6 @@ public function getSpecificInformation()
      * @param mixed $value
      * @param bool $escapeHtml
      * @return array
-     * @since 2.0.0
      */
     public function getValueAsArray($value, $escapeHtml = false)
     {
@@ -128,7 +119,6 @@ public function getValueAsArray($value, $escapeHtml = false)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSecureMode()
     {
@@ -155,7 +145,6 @@ public function getIsSecureMode()
      *
      * @param null|\Magento\Framework\DataObject|array $transport
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareSpecificInformation($transport = null)
     {
diff --git a/app/code/Magento/Payment/Block/Info/AbstractContainer.php b/app/code/Magento/Payment/Block/Info/AbstractContainer.php
index 6926a44f9e30f..6abf94759046c 100644
--- a/app/code/Magento/Payment/Block/Info/AbstractContainer.php
+++ b/app/code/Magento/Payment/Block/Info/AbstractContainer.php
@@ -9,7 +9,6 @@
  * Payment information container block
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractContainer extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ abstract class AbstractContainer extends \Magento\Framework\View\Element\Templat
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData = null;
 
@@ -25,7 +23,6 @@ abstract class AbstractContainer extends \Magento\Framework\View\Element\Templat
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Add payment info block to layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -54,7 +50,6 @@ protected function _prepareLayout()
      * Retrieve info block name
      *
      * @return string|false
-     * @since 2.0.0
      */
     protected function _getInfoBlockName()
     {
@@ -68,7 +63,6 @@ protected function _getInfoBlockName()
      * Retrieve payment info model
      *
      * @return \Magento\Payment\Model\Info|false
-     * @since 2.0.0
      */
     abstract public function getPaymentInfo();
 
@@ -78,7 +72,6 @@ abstract public function getPaymentInfo();
      * @param string $method
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function setInfoTemplate($method = '', $template = '')
     {
diff --git a/app/code/Magento/Payment/Block/Info/Cc.php b/app/code/Magento/Payment/Block/Info/Cc.php
index 0a734d887bfce..b56c06fc77745 100644
--- a/app/code/Magento/Payment/Block/Info/Cc.php
+++ b/app/code/Magento/Payment/Block/Info/Cc.php
@@ -9,7 +9,6 @@
  * Credit card generic payment info
  *
  * @api
- * @since 2.0.0
  */
 class Cc extends \Magento\Payment\Block\Info
 {
@@ -17,7 +16,6 @@ class Cc extends \Magento\Payment\Block\Info
      * Payment config model
      *
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
@@ -25,7 +23,6 @@ class Cc extends \Magento\Payment\Block\Info
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Retrieve credit card type name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcTypeName()
     {
@@ -56,7 +52,6 @@ public function getCcTypeName()
      * Whether current payment method has credit card expiration info
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasCcExpDate()
     {
@@ -67,7 +62,6 @@ public function hasCcExpDate()
      * Retrieve CC expiration month
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcExpMonth()
     {
@@ -82,7 +76,6 @@ public function getCcExpMonth()
      * Retrieve CC expiration date
      *
      * @return \DateTime
-     * @since 2.0.0
      */
     public function getCcExpDate()
     {
@@ -96,7 +89,6 @@ public function getCcExpDate()
      *
      * @param \Magento\Framework\DataObject|array $transport
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareSpecificInformation($transport = null)
     {
@@ -131,7 +123,6 @@ protected function _prepareSpecificInformation($transport = null)
      * @param string $year
      * @param string $month
      * @return string
-     * @since 2.0.0
      */
     protected function _formatCardDate($year, $month)
     {
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index ada7839e0147c..022fb108f3c24 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -9,7 +9,6 @@
  * Block for Bank Transfer payment generic info
  *
  * @api
- * @since 2.0.0
  */
 class Instructions extends \Magento\Payment\Block\Info
 {
@@ -17,13 +16,11 @@ class Instructions extends \Magento\Payment\Block\Info
      * Instructions text
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instructions;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'info/instructions.phtml';
 
@@ -32,7 +29,6 @@ class Instructions extends \Magento\Payment\Block\Info
      * (or from config, if instructions are missed in payment)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInstructions()
     {
diff --git a/app/code/Magento/Payment/Block/Info/Substitution.php b/app/code/Magento/Payment/Block/Info/Substitution.php
index 3be15b3d25b4f..35f8d0ff5e58f 100644
--- a/app/code/Magento/Payment/Block/Info/Substitution.php
+++ b/app/code/Magento/Payment/Block/Info/Substitution.php
@@ -7,7 +7,6 @@
 
 /**
  * Substitution payment info
- * @since 2.0.0
  */
 class Substitution extends \Magento\Payment\Block\Info
 {
@@ -15,7 +14,6 @@ class Substitution extends \Magento\Payment\Block\Info
      * Add additional info block
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Payment/Block/Transparent/Form.php b/app/code/Magento/Payment/Block/Transparent/Form.php
index 488ab1baab200..1ca2845a55bba 100644
--- a/app/code/Magento/Payment/Block/Transparent/Form.php
+++ b/app/code/Magento/Payment/Block/Transparent/Form.php
@@ -16,19 +16,16 @@
  * Transparent form block
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Form\Cc
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     private $checkoutSession;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Payment::transparent/form.phtml';
 
@@ -37,7 +34,6 @@ class Form extends \Magento\Payment\Block\Form\Cc
      * @param Config $paymentConfig
      * @param Session $checkoutSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -51,7 +47,6 @@ public function __construct(
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -67,7 +62,6 @@ protected function _toHtml()
      * basing on TransparentInterface presence in checkout session
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function shouldRender()
     {
@@ -84,7 +78,6 @@ protected function shouldRender()
      * Initializes method
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initializeMethod()
     {
@@ -101,7 +94,6 @@ protected function initializeMethod()
      * Parent rendering wrapper
      *
      * @return string
-     * @since 2.0.0
      */
     protected function processHtml()
     {
@@ -113,7 +105,6 @@ protected function processHtml()
      * Get type of request
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxRequest()
     {
@@ -124,7 +115,6 @@ public function isAjaxRequest()
      * Get delimiter for date
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDateDelim()
     {
@@ -136,7 +126,6 @@ public function getDateDelim()
      * Returns json formatted string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCardFieldsMap()
     {
@@ -149,7 +138,6 @@ public function getCardFieldsMap()
      * Retrieve place order url on front
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderUrl()
     {
@@ -165,7 +153,6 @@ public function getOrderUrl()
      * Retrieve gateway url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCgiUrl()
     {
@@ -179,7 +166,6 @@ public function getCgiUrl()
      *
      * @param string $fieldName
      * @return mixed
-     * @since 2.0.0
      */
     public function getMethodConfigData($fieldName)
     {
@@ -195,7 +181,6 @@ public function getMethodConfigData($fieldName)
      *
      * @return TransparentInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getMethod()
     {
diff --git a/app/code/Magento/Payment/Block/Transparent/Iframe.php b/app/code/Magento/Payment/Block/Transparent/Iframe.php
index a186b7d75bf55..4ef39f649b0b1 100644
--- a/app/code/Magento/Payment/Block/Transparent/Iframe.php
+++ b/app/code/Magento/Payment/Block/Transparent/Iframe.php
@@ -9,7 +9,6 @@
  * Iframe block for register specific params in layout
  *
  * @api
- * @since 2.0.0
  */
 class Iframe extends \Magento\Framework\View\Element\Template
 {
@@ -19,7 +18,6 @@ class Iframe extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
@@ -29,7 +27,6 @@ class Iframe extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Preparing layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Payment/Block/Transparent/Info.php b/app/code/Magento/Payment/Block/Transparent/Info.php
index dad8301ac05f2..7dc0065d38a60 100644
--- a/app/code/Magento/Payment/Block/Transparent/Info.php
+++ b/app/code/Magento/Payment/Block/Transparent/Info.php
@@ -9,13 +9,11 @@
  * Class Info. Payment Information block used for transparent redirect feature
  *
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Payment::transparent/info.phtml';
 }
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandException.php b/app/code/Magento/Payment/Gateway/Command/CommandException.php
index 52c34d4086011..8ba59a0300e9c 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandException.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandException.php
@@ -11,7 +11,6 @@
  * Class CommandException
  * @package Magento\Payment\Gateway\Command
  * @api
- * @since 2.0.0
  */
 class CommandException extends LocalizedException
 {
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandPool.php b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
index c7993fc0b90df..0d01a1f3a9a3f 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandPool.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
@@ -13,20 +13,17 @@
 /**
  * Class CommandPool
  * @api
- * @since 2.0.0
  */
 class CommandPool implements CommandPoolInterface
 {
     /**
      * @var CommandInterface[] | TMap
-     * @since 2.0.0
      */
     private $commands;
 
     /**
      * @param TMapFactory $tmapFactory
      * @param array $commands
-     * @since 2.0.0
      */
     public function __construct(
         TMapFactory $tmapFactory,
@@ -46,7 +43,6 @@ public function __construct(
      * @param string $commandCode
      * @return CommandInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function get($commandCode)
     {
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandPoolInterface.php b/app/code/Magento/Payment/Gateway/Command/CommandPoolInterface.php
index ccc2504c8ffbd..6d460e964c5aa 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandPoolInterface.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandPoolInterface.php
@@ -12,7 +12,6 @@
  * Interface CommandPoolInterface
  * @package Magento\Payment\Gateway\Command
  * @api
- * @since 2.0.0
  */
 interface CommandPoolInterface
 {
@@ -22,7 +21,6 @@ interface CommandPoolInterface
      * @param string $commandCode
      * @return CommandInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function get($commandCode);
 }
diff --git a/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php b/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
index c227e3b5f3358..d15f5891b536b 100644
--- a/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
+++ b/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
@@ -20,37 +20,31 @@
  * Class GatewayCommand
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GatewayCommand implements CommandInterface
 {
     /**
      * @var BuilderInterface
-     * @since 2.0.0
      */
     private $requestBuilder;
 
     /**
      * @var TransferFactoryInterface
-     * @since 2.0.0
      */
     private $transferFactory;
 
     /**
      * @var ClientInterface
-     * @since 2.0.0
      */
     private $client;
 
     /**
      * @var HandlerInterface
-     * @since 2.0.0
      */
     private $handler;
 
     /**
      * @var ValidatorInterface
-     * @since 2.0.0
      */
     private $validator;
 
@@ -67,7 +61,6 @@ class GatewayCommand implements CommandInterface
      * @param LoggerInterface $logger
      * @param HandlerInterface $handler
      * @param ValidatorInterface $validator
-     * @since 2.0.0
      */
     public function __construct(
         BuilderInterface $requestBuilder,
@@ -91,7 +84,6 @@ public function __construct(
      * @param array $commandSubject
      * @return void
      * @throws CommandException
-     * @since 2.0.0
      */
     public function execute(array $commandSubject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Command/NullCommand.php b/app/code/Magento/Payment/Gateway/Command/NullCommand.php
index 029097ad45aef..cfc6f23fa3cf3 100644
--- a/app/code/Magento/Payment/Gateway/Command/NullCommand.php
+++ b/app/code/Magento/Payment/Gateway/Command/NullCommand.php
@@ -15,7 +15,6 @@
  * or in case if command invoked by Magento has no sense for payment method.
  *
  * @api
- * @since 2.0.0
  */
 class NullCommand implements CommandInterface
 {
@@ -26,7 +25,6 @@ class NullCommand implements CommandInterface
      *
      * @return null|Command\ResultInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(array $commandSubject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Command/Result/ArrayResult.php b/app/code/Magento/Payment/Gateway/Command/Result/ArrayResult.php
index 6577f258bd4a8..dbb3a5fc21e33 100644
--- a/app/code/Magento/Payment/Gateway/Command/Result/ArrayResult.php
+++ b/app/code/Magento/Payment/Gateway/Command/Result/ArrayResult.php
@@ -11,19 +11,16 @@
  * Container for array that should be returned as command result.
  *
  * @api
- * @since 2.0.0
  */
 class ArrayResult implements ResultInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $array;
 
     /**
      * @param array $array
-     * @since 2.0.0
      */
     public function __construct(array $array = [])
     {
@@ -34,7 +31,6 @@ public function __construct(array $array = [])
      * Returns result interpretation
      *
      * @return array
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Payment/Gateway/Command/Result/BoolResult.php b/app/code/Magento/Payment/Gateway/Command/Result/BoolResult.php
index ae961ecca0204..669a60b7fcdb4 100644
--- a/app/code/Magento/Payment/Gateway/Command/Result/BoolResult.php
+++ b/app/code/Magento/Payment/Gateway/Command/Result/BoolResult.php
@@ -11,13 +11,11 @@
  * Container for boolean value that should be returned as command result.
  *
  * @api
- * @since 2.0.0
  */
 class BoolResult implements ResultInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $result;
 
@@ -25,7 +23,6 @@ class BoolResult implements ResultInterface
      * Constructor
      *
      * @param bool $result
-     * @since 2.0.0
      */
     public function __construct($result = true)
     {
@@ -36,7 +33,6 @@ public function __construct($result = true)
      * Returns result interpretation
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Payment/Gateway/Command/ResultInterface.php b/app/code/Magento/Payment/Gateway/Command/ResultInterface.php
index a12e70348db15..17391f7b8f229 100644
--- a/app/code/Magento/Payment/Gateway/Command/ResultInterface.php
+++ b/app/code/Magento/Payment/Gateway/Command/ResultInterface.php
@@ -9,7 +9,6 @@
  * Interface ResultInterface
  * @package Magento\Payment\Gateway\Command
  * @api
- * @since 2.0.0
  */
 interface ResultInterface
 {
@@ -17,7 +16,6 @@ interface ResultInterface
      * Returns result interpretation
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function get();
 }
diff --git a/app/code/Magento/Payment/Gateway/CommandInterface.php b/app/code/Magento/Payment/Gateway/CommandInterface.php
index d540725aed3a1..386d7fc207ade 100644
--- a/app/code/Magento/Payment/Gateway/CommandInterface.php
+++ b/app/code/Magento/Payment/Gateway/CommandInterface.php
@@ -11,7 +11,6 @@
  * Interface CommandInterface
  * @package Magento\Payment\Gateway
  * @api
- * @since 2.0.0
  */
 interface CommandInterface
 {
@@ -21,7 +20,6 @@ interface CommandInterface
      * @param array $commandSubject
      * @return null|Command\ResultInterface
      * @throws CommandException
-     * @since 2.0.0
      */
     public function execute(array $commandSubject);
 }
diff --git a/app/code/Magento/Payment/Gateway/Config/Config.php b/app/code/Magento/Payment/Gateway/Config/Config.php
index d5bee4317adaf..a319dd139a924 100644
--- a/app/code/Magento/Payment/Gateway/Config/Config.php
+++ b/app/code/Magento/Payment/Gateway/Config/Config.php
@@ -15,7 +15,6 @@
  * To process value retrieved from config implementation of \Magento\Payment\Gateway\Config\ValueHandlerInterface
  * should be used (inheritance and overriding of getValue method or introduction of new public methods
  * is not recommended).
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
@@ -23,19 +22,16 @@ class Config implements ConfigInterface
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     private $methodCode;
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     private $pathPattern;
 
@@ -43,7 +39,6 @@ class Config implements ConfigInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param string|null $methodCode
      * @param string $pathPattern
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @param string $methodCode
      * @return void
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode)
     {
@@ -72,7 +66,6 @@ public function setMethodCode($methodCode)
      *
      * @param string $pathPattern
      * @return void
-     * @since 2.0.0
      */
     public function setPathPattern($pathPattern)
     {
@@ -86,7 +79,6 @@ public function setPathPattern($pathPattern)
      * @param int|null $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($field, $storeId = null)
     {
diff --git a/app/code/Magento/Payment/Gateway/Config/ConfigValueHandler.php b/app/code/Magento/Payment/Gateway/Config/ConfigValueHandler.php
index 1b1809168cc15..c2d86c8769635 100644
--- a/app/code/Magento/Payment/Gateway/Config/ConfigValueHandler.php
+++ b/app/code/Magento/Payment/Gateway/Config/ConfigValueHandler.php
@@ -14,19 +14,16 @@
  * This class is designed to be injected into other classes. Inheritance in not recommended.
  *
  * @api
- * @since 2.0.0
  */
 class ConfigValueHandler implements ValueHandlerInterface
 {
     /**
      * @var \Magento\Payment\Gateway\ConfigInterface
-     * @since 2.0.0
      */
     private $configInterface;
 
     /**
      * @param \Magento\Payment\Gateway\ConfigInterface $configInterface
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $configInterface
@@ -41,7 +38,6 @@ public function __construct(
      * @param int|null $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function handle(array $subject, $storeId = null)
     {
diff --git a/app/code/Magento/Payment/Gateway/Config/ValueHandlerInterface.php b/app/code/Magento/Payment/Gateway/Config/ValueHandlerInterface.php
index 02682b787974b..46419f12113d2 100644
--- a/app/code/Magento/Payment/Gateway/Config/ValueHandlerInterface.php
+++ b/app/code/Magento/Payment/Gateway/Config/ValueHandlerInterface.php
@@ -9,7 +9,6 @@
  * Interface ValueHandlerInterface
  * @package Magento\Payment\Gateway\Config
  * @api
- * @since 2.0.0
  */
 interface ValueHandlerInterface
 {
@@ -20,7 +19,6 @@ interface ValueHandlerInterface
      * @param int|null $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function handle(array $subject, $storeId = null);
 }
diff --git a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
index 4867871d87295..fda9d34841115 100644
--- a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
+++ b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
@@ -15,7 +15,6 @@
  * Inheritance from this class is not recommended (declare virtual type or implement ValueHandlerPoolInterface instead).
  *
  * @api
- * @since 2.0.0
  */
 class ValueHandlerPool implements \Magento\Payment\Gateway\Config\ValueHandlerPoolInterface
 {
@@ -26,14 +25,12 @@ class ValueHandlerPool implements \Magento\Payment\Gateway\Config\ValueHandlerPo
 
     /**
      * @var ValueHandlerInterface[] | TMap
-     * @since 2.0.0
      */
     private $handlers;
 
     /**
      * @param TMapFactory $tmapFactory
      * @param array $handlers
-     * @since 2.0.0
      */
     public function __construct(
         TMapFactory $tmapFactory,
@@ -56,7 +53,6 @@ public function __construct(
      *
      * @param string $field
      * @return ValueHandlerInterface
-     * @since 2.0.0
      */
     public function get($field)
     {
diff --git a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPoolInterface.php b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPoolInterface.php
index f47ce3ff69200..b167047e3c701 100644
--- a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPoolInterface.php
+++ b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPoolInterface.php
@@ -11,7 +11,6 @@
  * Interface ValueHandlerPoolInterface
  * @package Magento\Payment\Gateway\Config
  * @api
- * @since 2.0.0
  */
 interface ValueHandlerPoolInterface
 {
@@ -21,7 +20,6 @@ interface ValueHandlerPoolInterface
      * @param string $field
      * @return ValueHandlerInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function get($field);
 }
diff --git a/app/code/Magento/Payment/Gateway/ConfigInterface.php b/app/code/Magento/Payment/Gateway/ConfigInterface.php
index ea88f5a923637..b27e9903911d4 100644
--- a/app/code/Magento/Payment/Gateway/ConfigInterface.php
+++ b/app/code/Magento/Payment/Gateway/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Interface ConfigInterface
  * @package Magento\Payment\Gateway
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -20,7 +19,6 @@ interface ConfigInterface
      * @param int|null $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($field, $storeId = null);
 
@@ -29,7 +27,6 @@ public function getValue($field, $storeId = null);
      *
      * @param string $methodCode
      * @return void
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode);
 
@@ -38,7 +35,6 @@ public function setMethodCode($methodCode);
      *
      * @param string $pathPattern
      * @return void
-     * @since 2.0.0
      */
     public function setPathPattern($pathPattern);
 }
diff --git a/app/code/Magento/Payment/Gateway/Data/AddressAdapterInterface.php b/app/code/Magento/Payment/Gateway/Data/AddressAdapterInterface.php
index 4b9521cd9e7e9..94c1c53f599ff 100644
--- a/app/code/Magento/Payment/Gateway/Data/AddressAdapterInterface.php
+++ b/app/code/Magento/Payment/Gateway/Data/AddressAdapterInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface AddressAdapterInterface
  * @api
- * @since 2.0.0
  */
 interface AddressAdapterInterface
 {
@@ -16,7 +15,6 @@ interface AddressAdapterInterface
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode();
 
@@ -24,7 +22,6 @@ public function getRegionCode();
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId();
 
@@ -32,7 +29,6 @@ public function getCountryId();
      * Get street line 1
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine1();
 
@@ -40,7 +36,6 @@ public function getStreetLine1();
      * Get street line 2
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine2();
 
@@ -48,7 +43,6 @@ public function getStreetLine2();
      * Get telephone number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTelephone();
 
@@ -56,7 +50,6 @@ public function getTelephone();
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode();
 
@@ -64,7 +57,6 @@ public function getPostcode();
      * Get city name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCity();
 
@@ -72,7 +64,6 @@ public function getCity();
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname();
 
@@ -80,7 +71,6 @@ public function getFirstname();
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname();
 
@@ -88,7 +78,6 @@ public function getLastname();
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename();
 
@@ -96,7 +85,6 @@ public function getMiddlename();
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -104,7 +92,6 @@ public function getCustomerId();
      * Get billing/shipping email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail();
 
@@ -112,7 +99,6 @@ public function getEmail();
      * Returns name prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -120,7 +106,6 @@ public function getPrefix();
      * Returns name suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -128,7 +113,6 @@ public function getSuffix();
      * Get company
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompany();
 }
diff --git a/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php b/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
index 92be29fde86ac..f4b05df2e8a20 100644
--- a/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
@@ -10,19 +10,16 @@
 
 /**
  * Class AddressAdapter
- * @since 2.0.0
  */
 class AddressAdapter implements AddressAdapterInterface
 {
     /**
      * @var OrderAddressInterface
-     * @since 2.0.0
      */
     private $address;
 
     /**
      * @param OrderAddressInterface $address
-     * @since 2.0.0
      */
     public function __construct(OrderAddressInterface $address)
     {
@@ -33,7 +30,6 @@ public function __construct(OrderAddressInterface $address)
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode()
     {
@@ -44,7 +40,6 @@ public function getRegionCode()
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -55,7 +50,6 @@ public function getCountryId()
      * Get street line 1
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine1()
     {
@@ -67,7 +61,6 @@ public function getStreetLine1()
      * Get street line 2
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine2()
     {
@@ -79,7 +72,6 @@ public function getStreetLine2()
      * Get telephone number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTelephone()
     {
@@ -90,7 +82,6 @@ public function getTelephone()
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -101,7 +92,6 @@ public function getPostcode()
      * Get city name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCity()
     {
@@ -112,7 +102,6 @@ public function getCity()
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -123,7 +112,6 @@ public function getFirstname()
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -134,7 +122,6 @@ public function getLastname()
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -145,7 +132,6 @@ public function getMiddlename()
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -156,7 +142,6 @@ public function getCustomerId()
      * Get billing/shipping email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -167,7 +152,6 @@ public function getEmail()
      * Returns name prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -178,7 +162,6 @@ public function getPrefix()
      * Returns name suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -189,7 +172,6 @@ public function getSuffix()
      * Get company
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompany()
     {
diff --git a/app/code/Magento/Payment/Gateway/Data/Order/OrderAdapter.php b/app/code/Magento/Payment/Gateway/Data/Order/OrderAdapter.php
index 68bfdddefb59a..8ccd471788dfa 100644
--- a/app/code/Magento/Payment/Gateway/Data/Order/OrderAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Order/OrderAdapter.php
@@ -11,26 +11,22 @@
 
 /**
  * Class OrderAdapter
- * @since 2.0.0
  */
 class OrderAdapter implements OrderAdapterInterface
 {
     /**
      * @var Order
-     * @since 2.0.0
      */
     private $order;
 
     /**
      * @var AddressAdapter
-     * @since 2.0.0
      */
     private $addressAdapterFactory;
 
     /**
      * @param Order $order
      * @param AddressAdapterFactory $addressAdapterFactory
-     * @since 2.0.0
      */
     public function __construct(
         Order $order,
@@ -44,7 +40,6 @@ public function __construct(
      * Returns currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyCode()
     {
@@ -55,7 +50,6 @@ public function getCurrencyCode()
      * Returns order increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderIncrementId()
     {
@@ -66,7 +60,6 @@ public function getOrderIncrementId()
      * Returns customer ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -77,7 +70,6 @@ public function getCustomerId()
      * Returns billing address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -94,7 +86,6 @@ public function getBillingAddress()
      * Returns shipping address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -111,7 +102,6 @@ public function getShippingAddress()
      * Returns order store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -122,7 +112,6 @@ public function getStoreId()
      * Returns order id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -133,7 +122,6 @@ public function getId()
      * Returns order grand total amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGrandTotalAmount()
     {
@@ -144,7 +132,6 @@ public function getGrandTotalAmount()
      * Returns list of line items in the cart
      *
      * @return \Magento\Sales\Api\Data\OrderItemInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -155,7 +142,6 @@ public function getItems()
      * Gets the remote IP address for the order.
      *
      * @return string|null Remote IP address.
-     * @since 2.0.0
      */
     public function getRemoteIp()
     {
diff --git a/app/code/Magento/Payment/Gateway/Data/OrderAdapterInterface.php b/app/code/Magento/Payment/Gateway/Data/OrderAdapterInterface.php
index d2261832eca59..af012bf8a2006 100644
--- a/app/code/Magento/Payment/Gateway/Data/OrderAdapterInterface.php
+++ b/app/code/Magento/Payment/Gateway/Data/OrderAdapterInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface OrderAdapterInterface
  * @api
- * @since 2.0.0
  */
 interface OrderAdapterInterface
 {
@@ -16,7 +15,6 @@ interface OrderAdapterInterface
      * Returns currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyCode();
 
@@ -24,7 +22,6 @@ public function getCurrencyCode();
      * Returns order increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderIncrementId();
 
@@ -32,7 +29,6 @@ public function getOrderIncrementId();
      * Returns customer ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -40,7 +36,6 @@ public function getCustomerId();
      * Returns billing address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress();
 
@@ -48,7 +43,6 @@ public function getBillingAddress();
      * Returns shipping address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getShippingAddress();
 
@@ -56,7 +50,6 @@ public function getShippingAddress();
      * Returns order store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -64,7 +57,6 @@ public function getStoreId();
      * Returns order id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -72,7 +64,6 @@ public function getId();
      * Returns order grand total amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getGrandTotalAmount();
 
@@ -80,7 +71,6 @@ public function getGrandTotalAmount();
      * Returns list of line items in the cart
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -88,7 +78,6 @@ public function getItems();
      * Gets the remote IP address for the order.
      *
      * @return string|null Remote IP address.
-     * @since 2.0.0
      */
     public function getRemoteIp();
 }
diff --git a/app/code/Magento/Payment/Gateway/Data/PaymentDataObject.php b/app/code/Magento/Payment/Gateway/Data/PaymentDataObject.php
index 591f3ebb9a581..4d801ceccd7e9 100644
--- a/app/code/Magento/Payment/Gateway/Data/PaymentDataObject.php
+++ b/app/code/Magento/Payment/Gateway/Data/PaymentDataObject.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Payment\Gateway\Data\PaymentDataObject
  *
- * @since 2.0.0
  */
 class PaymentDataObject implements PaymentDataObjectInterface
 {
     /**
      * @var OrderAdapterInterface
-     * @since 2.0.0
      */
     private $order;
 
     /**
      * @var InfoInterface
-     * @since 2.0.0
      */
     private $payment;
 
     /**
      * @param OrderAdapterInterface $order
      * @param InfoInterface $payment
-     * @since 2.0.0
      */
     public function __construct(
         OrderAdapterInterface $order,
@@ -43,7 +39,6 @@ public function __construct(
      * Returns order
      *
      * @return OrderAdapterInterface
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -54,7 +49,6 @@ public function getOrder()
      * Returns payment
      *
      * @return InfoInterface
-     * @since 2.0.0
      */
     public function getPayment()
     {
diff --git a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
index 98ab32f603c33..86e14ab4e9b25 100644
--- a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
+++ b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Payment\Gateway\Data\PaymentDataObjectFactory
  *
- * @since 2.0.0
  */
 class PaymentDataObjectFactory implements PaymentDataObjectFactoryInterface
 {
@@ -20,19 +19,16 @@ class PaymentDataObjectFactory implements PaymentDataObjectFactoryInterface
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var Order\OrderAdapterFactory
-     * @since 2.0.0
      */
     private $orderAdapterFactory;
 
     /**
      * @var Quote\QuoteAdapterFactory
-     * @since 2.0.0
      */
     private $quoteAdapterFactory;
 
@@ -42,7 +38,6 @@ class PaymentDataObjectFactory implements PaymentDataObjectFactoryInterface
      * @param ObjectManagerInterface $objectManager
      * @param Order\OrderAdapterFactory $orderAdapterFactory
      * @param Quote\QuoteAdapterFactory $quoteAdapterFactory
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @param InfoInterface $paymentInfo
      * @return PaymentDataObjectInterface
-     * @since 2.0.0
      */
     public function create(InfoInterface $paymentInfo)
     {
diff --git a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactoryInterface.php b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactoryInterface.php
index 4bad82296a014..4ecf4c8c43c45 100644
--- a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactoryInterface.php
+++ b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactoryInterface.php
@@ -11,7 +11,6 @@
  * Service for creation transferable payment object from model
  *
  * @api
- * @since 2.0.0
  */
 interface PaymentDataObjectFactoryInterface
 {
@@ -20,7 +19,6 @@ interface PaymentDataObjectFactoryInterface
      *
      * @param InfoInterface $paymentInfo
      * @return PaymentDataObjectInterface
-     * @since 2.0.0
      */
     public function create(InfoInterface $paymentInfo);
 }
diff --git a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectInterface.php b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectInterface.php
index 99af2123d0548..8597738c12c58 100644
--- a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectInterface.php
+++ b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectInterface.php
@@ -11,7 +11,6 @@
  * Interface PaymentDataObjectInterface
  * @package Magento\Payment\Gateway\Data
  * @api
- * @since 2.0.0
  */
 interface PaymentDataObjectInterface
 {
@@ -19,7 +18,6 @@ interface PaymentDataObjectInterface
      * Returns order
      *
      * @return OrderAdapterInterface
-     * @since 2.0.0
      */
     public function getOrder();
 
@@ -27,7 +25,6 @@ public function getOrder();
      * Returns payment
      *
      * @return InfoInterface
-     * @since 2.0.0
      */
     public function getPayment();
 }
diff --git a/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php b/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
index dd4c5b079c79c..3c8d5899a1083 100644
--- a/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
@@ -10,19 +10,16 @@
 
 /**
  * Class AddressAdapter
- * @since 2.0.0
  */
 class AddressAdapter implements AddressAdapterInterface
 {
     /**
      * @var AddressInterface
-     * @since 2.0.0
      */
     private $address;
 
     /**
      * @param AddressInterface $address
-     * @since 2.0.0
      */
     public function __construct(AddressInterface $address)
     {
@@ -33,7 +30,6 @@ public function __construct(AddressInterface $address)
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode()
     {
@@ -44,7 +40,6 @@ public function getRegionCode()
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -55,7 +50,6 @@ public function getCountryId()
      * Get street line 1
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine1()
     {
@@ -67,7 +61,6 @@ public function getStreetLine1()
      * Get street line 2
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine2()
     {
@@ -79,7 +72,6 @@ public function getStreetLine2()
      * Get telephone number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTelephone()
     {
@@ -90,7 +82,6 @@ public function getTelephone()
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -101,7 +92,6 @@ public function getPostcode()
      * Get city name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCity()
     {
@@ -112,7 +102,6 @@ public function getCity()
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -123,7 +112,6 @@ public function getFirstname()
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -134,7 +122,6 @@ public function getLastname()
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -145,7 +132,6 @@ public function getMiddlename()
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -156,7 +142,6 @@ public function getCustomerId()
      * Get billing/shipping email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -167,7 +152,6 @@ public function getEmail()
      * Returns name prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -178,7 +162,6 @@ public function getPrefix()
      * Returns name suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -189,7 +172,6 @@ public function getSuffix()
      * Get company
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompany()
     {
diff --git a/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php b/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
index a1005b55e0336..645c3470cd661 100644
--- a/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
@@ -12,26 +12,22 @@
 
 /**
  * Class QuoteAdapter
- * @since 2.0.0
  */
 class QuoteAdapter implements OrderAdapterInterface
 {
     /**
      * @var CartInterface
-     * @since 2.0.0
      */
     private $quote;
 
     /**
      * @var AddressAdapter
-     * @since 2.0.0
      */
     private $addressAdapterFactory;
 
     /**
      * @param CartInterface $quote
      * @param AddressAdapterFactory $addressAdapterFactory
-     * @since 2.0.0
      */
     public function __construct(
         CartInterface $quote,
@@ -45,7 +41,6 @@ public function __construct(
      * Returns currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyCode()
     {
@@ -56,7 +51,6 @@ public function getCurrencyCode()
      * Returns order increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderIncrementId()
     {
@@ -67,7 +61,6 @@ public function getOrderIncrementId()
      * Returns customer ID
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -78,7 +71,6 @@ public function getCustomerId()
      * Returns billing address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -95,7 +87,6 @@ public function getBillingAddress()
      * Returns shipping address
      *
      * @return AddressAdapterInterface|null
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -112,7 +103,6 @@ public function getShippingAddress()
      * Returns order store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -123,7 +113,6 @@ public function getStoreId()
      * Returns order id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -134,7 +123,6 @@ public function getId()
      * Returns order grand total amount
      *
      * @return null
-     * @since 2.0.0
      */
     public function getGrandTotalAmount()
     {
@@ -145,7 +133,6 @@ public function getGrandTotalAmount()
      * Returns list of line items in the cart
      *
      * @return \Magento\Quote\Api\Data\CartItemInterface[]|null
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -156,7 +143,6 @@ public function getItems()
      * Gets the remote IP address for the order.
      *
      * @return string|null Remote IP address.
-     * @since 2.0.0
      */
     public function getRemoteIp()
     {
diff --git a/app/code/Magento/Payment/Gateway/Helper/ContextHelper.php b/app/code/Magento/Payment/Gateway/Helper/ContextHelper.php
index 124da1adb2a07..0719a425a3fe0 100644
--- a/app/code/Magento/Payment/Gateway/Helper/ContextHelper.php
+++ b/app/code/Magento/Payment/Gateway/Helper/ContextHelper.php
@@ -12,7 +12,6 @@
  * Usage of this class should be avoided. This class introduced for supporting backward compatibility.
  *
  * @api
- * @since 2.0.0
  */
 class ContextHelper
 {
@@ -22,7 +21,6 @@ class ContextHelper
      * @param InfoInterface $paymentInfo
      * @throws \LogicException
      * @return null
-     * @since 2.0.0
      */
     public static function assertOrderPayment(InfoInterface $paymentInfo)
     {
@@ -37,7 +35,6 @@ public static function assertOrderPayment(InfoInterface $paymentInfo)
      * @param InfoInterface $paymentInfo
      * @throws \LogicException
      * @return null
-     * @since 2.0.0
      */
     public static function assertQuotePayment(InfoInterface $paymentInfo)
     {
diff --git a/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php b/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
index 2adef11198ece..2fb3c5bc7e887 100644
--- a/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
+++ b/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
@@ -13,7 +13,6 @@
  * This class was introduced for backward compatibility with legacy implementation.
  *
  * @api
- * @since 2.0.0
  */
 class SubjectReader
 {
@@ -22,7 +21,6 @@ class SubjectReader
      *
      * @param array $subject
      * @return PaymentDataObjectInterface
-     * @since 2.0.0
      */
     public static function readPayment(array $subject)
     {
@@ -40,7 +38,6 @@ public static function readPayment(array $subject)
      *
      * @param array $subject
      * @return mixed
-     * @since 2.0.0
      */
     public static function readAmount(array $subject)
     {
@@ -56,7 +53,6 @@ public static function readAmount(array $subject)
      *
      * @param array $subject
      * @return string
-     * @since 2.0.0
      */
     public static function readField(array $subject)
     {
@@ -72,7 +68,6 @@ public static function readField(array $subject)
      *
      * @param array $subject
      * @return array
-     * @since 2.0.0
      */
     public static function readResponse(array $subject)
     {
@@ -88,7 +83,6 @@ public static function readResponse(array $subject)
      *
      * @param array $subject
      * @return DataObject
-     * @since 2.0.0
      */
     public static function readStateObject(array $subject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/Client/Soap.php b/app/code/Magento/Payment/Gateway/Http/Client/Soap.php
index f24334732a26c..1150250bc85a0 100644
--- a/app/code/Magento/Payment/Gateway/Http/Client/Soap.php
+++ b/app/code/Magento/Payment/Gateway/Http/Client/Soap.php
@@ -15,25 +15,21 @@
  * Class Soap
  * @package Magento\Payment\Gateway\Http\Client
  * @api
- * @since 2.0.0
  */
 class Soap implements ClientInterface
 {
     /**
      * @var Logger
-     * @since 2.0.0
      */
     private $logger;
 
     /**
      * @var ConverterInterface | null
-     * @since 2.0.0
      */
     private $converter;
 
     /**
      * @var ClientFactory
-     * @since 2.0.0
      */
     private $clientFactory;
 
@@ -41,7 +37,6 @@ class Soap implements ClientInterface
      * @param Logger $logger
      * @param ClientFactory $clientFactory
      * @param ConverterInterface | null $converter
-     * @since 2.0.0
      */
     public function __construct(
         Logger $logger,
@@ -61,7 +56,6 @@ public function __construct(
      * @throws \Magento\Payment\Gateway\Http\ClientException
      * @throws \Magento\Payment\Gateway\Http\ConverterException
      * @throws \Exception
-     * @since 2.0.0
      */
     public function placeRequest(TransferInterface $transferObject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/Client/Zend.php b/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
index f22ab507a084a..df024e8772d0c 100644
--- a/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
+++ b/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
@@ -16,25 +16,21 @@
  * Class Zend
  * @package Magento\Payment\Gateway\Http\Client
  * @api
- * @since 2.0.0
  */
 class Zend implements ClientInterface
 {
     /**
      * @var ZendClientFactory
-     * @since 2.0.0
      */
     private $clientFactory;
 
     /**
      * @var ConverterInterface | null
-     * @since 2.0.0
      */
     private $converter;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     private $logger;
 
@@ -42,7 +38,6 @@ class Zend implements ClientInterface
      * @param ZendClientFactory $clientFactory
      * @param Logger $logger
      * @param ConverterInterface | null $converter
-     * @since 2.0.0
      */
     public function __construct(
         ZendClientFactory $clientFactory,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function placeRequest(TransferInterface $transferObject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/ClientException.php b/app/code/Magento/Payment/Gateway/Http/ClientException.php
index 9cd9493714aca..17c1abe81a508 100644
--- a/app/code/Magento/Payment/Gateway/Http/ClientException.php
+++ b/app/code/Magento/Payment/Gateway/Http/ClientException.php
@@ -11,7 +11,6 @@
  * Class ClientException
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 class ClientException extends LocalizedException
 {
diff --git a/app/code/Magento/Payment/Gateway/Http/ClientInterface.php b/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
index 42115c6b8afb6..d102541052240 100644
--- a/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
+++ b/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
@@ -11,7 +11,6 @@
  * Interface ClientInterface
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 interface ClientInterface
 {
@@ -22,7 +21,6 @@ interface ClientInterface
      * @return array
      * @throws \Magento\Payment\Gateway\Http\ClientException
      * @throws \Magento\Payment\Gateway\Http\ConverterException
-     * @since 2.0.0
      */
     public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $transferObject);
 }
diff --git a/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php b/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
index ba3665ed581f1..440c6c27f90f4 100644
--- a/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
+++ b/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
@@ -12,7 +12,6 @@
  * Class HtmlFormConverter
  * @package Magento\Payment\Gateway\Http\Converter
  * @api
- * @since 2.0.0
  */
 class HtmlFormConverter implements ConverterInterface
 {
@@ -22,7 +21,6 @@ class HtmlFormConverter implements ConverterInterface
      * @param string $response
      * @return array
      * @throws ConverterException
-     * @since 2.0.0
      */
     public function convert($response)
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/Converter/Soap/ObjectToArrayConverter.php b/app/code/Magento/Payment/Gateway/Http/Converter/Soap/ObjectToArrayConverter.php
index fdcb21119f3a4..22ce5c2061d95 100644
--- a/app/code/Magento/Payment/Gateway/Http/Converter/Soap/ObjectToArrayConverter.php
+++ b/app/code/Magento/Payment/Gateway/Http/Converter/Soap/ObjectToArrayConverter.php
@@ -11,7 +11,6 @@
  * Class ObjectToArrayConverter
  * @package Magento\Payment\Gateway\Http\Converter\Soap
  * @api
- * @since 2.0.0
  */
 class ObjectToArrayConverter implements ConverterInterface
 {
@@ -21,7 +20,6 @@ class ObjectToArrayConverter implements ConverterInterface
      * @param mixed $response
      * @return array
      * @throws \Magento\Payment\Gateway\Http\ConverterException
-     * @since 2.0.0
      */
     public function convert($response)
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/ConverterException.php b/app/code/Magento/Payment/Gateway/Http/ConverterException.php
index 796f15e0e7985..830fc98a4db1f 100644
--- a/app/code/Magento/Payment/Gateway/Http/ConverterException.php
+++ b/app/code/Magento/Payment/Gateway/Http/ConverterException.php
@@ -11,7 +11,6 @@
  * Class ConverterException
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 class ConverterException extends LocalizedException
 {
diff --git a/app/code/Magento/Payment/Gateway/Http/ConverterInterface.php b/app/code/Magento/Payment/Gateway/Http/ConverterInterface.php
index bb5e4150b5c84..3835f29cf5b64 100644
--- a/app/code/Magento/Payment/Gateway/Http/ConverterInterface.php
+++ b/app/code/Magento/Payment/Gateway/Http/ConverterInterface.php
@@ -9,7 +9,6 @@
  * Interface ConverterInterface
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 interface ConverterInterface
 {
@@ -19,7 +18,6 @@ interface ConverterInterface
      * @param mixed $response
      * @return array
      * @throws \Magento\Payment\Gateway\Http\ConverterException
-     * @since 2.0.0
      */
     public function convert($response);
 }
diff --git a/app/code/Magento/Payment/Gateway/Http/Transfer.php b/app/code/Magento/Payment/Gateway/Http/Transfer.php
index 3d3ec5bb2ce0b..81a83d1d300dd 100644
--- a/app/code/Magento/Payment/Gateway/Http/Transfer.php
+++ b/app/code/Magento/Payment/Gateway/Http/Transfer.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Transfer
- * @since 2.0.0
  */
 class Transfer implements TransferInterface
 {
@@ -23,43 +22,36 @@ class Transfer implements TransferInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $clientConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $headers;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $method;
 
     /**
      * @var array|string
-     * @since 2.0.0
      */
     private $body;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $uri;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $encode;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $auth;
 
@@ -71,7 +63,6 @@ class Transfer implements TransferInterface
      * @param string $method
      * @param string $uri
      * @param bool $encode
-     * @since 2.0.0
      */
     public function __construct(
         array $clientConfig,
@@ -95,7 +86,6 @@ public function __construct(
      * Returns gateway client configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getClientConfig()
     {
@@ -106,7 +96,6 @@ public function getClientConfig()
      * Returns method used to place request
      *
      * @return string|int
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -117,7 +106,6 @@ public function getMethod()
      * Returns headers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders()
     {
@@ -128,7 +116,6 @@ public function getHeaders()
      * Returns request body
      *
      * @return array|string
-     * @since 2.0.0
      */
     public function getBody()
     {
@@ -139,7 +126,6 @@ public function getBody()
      * Returns URI
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUri()
     {
@@ -148,7 +134,6 @@ public function getUri()
 
     /**
      * @return boolean
-     * @since 2.0.0
      */
     public function shouldEncode()
     {
@@ -159,7 +144,6 @@ public function shouldEncode()
      * Returns Auth username
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAuthUsername()
     {
@@ -170,7 +154,6 @@ public function getAuthUsername()
      * Returns Auth password
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAuthPassword()
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/TransferBuilder.php b/app/code/Magento/Payment/Gateway/Http/TransferBuilder.php
index 0802afde60c92..e148848fa7677 100644
--- a/app/code/Magento/Payment/Gateway/Http/TransferBuilder.php
+++ b/app/code/Magento/Payment/Gateway/Http/TransferBuilder.php
@@ -8,56 +8,47 @@
 /**
  * Class TransferBuilder
  * @api
- * @since 2.0.0
  */
 class TransferBuilder
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $clientConfig = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $headers = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $method;
 
     /**
      * @var array|string
-     * @since 2.0.0
      */
     private $body = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $uri = '';
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $encode = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $auth = [Transfer::AUTH_USERNAME => null, Transfer::AUTH_PASSWORD => null];
 
     /**
      * @param array $clientConfig
      * @return $this
-     * @since 2.0.0
      */
     public function setClientConfig(array $clientConfig)
     {
@@ -69,7 +60,6 @@ public function setClientConfig(array $clientConfig)
     /**
      * @param array $headers
      * @return $this
-     * @since 2.0.0
      */
     public function setHeaders(array $headers)
     {
@@ -81,7 +71,6 @@ public function setHeaders(array $headers)
     /**
      * @param array|string $body
      * @return $this
-     * @since 2.0.0
      */
     public function setBody($body)
     {
@@ -93,7 +82,6 @@ public function setBody($body)
     /**
      * @param string $username
      * @return $this
-     * @since 2.0.0
      */
     public function setAuthUsername($username)
     {
@@ -105,7 +93,6 @@ public function setAuthUsername($username)
     /**
      * @param string $password
      * @return $this
-     * @since 2.0.0
      */
     public function setAuthPassword($password)
     {
@@ -117,7 +104,6 @@ public function setAuthPassword($password)
     /**
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($method)
     {
@@ -129,7 +115,6 @@ public function setMethod($method)
     /**
      * @param string $uri
      * @return $this
-     * @since 2.0.0
      */
     public function setUri($uri)
     {
@@ -141,7 +126,6 @@ public function setUri($uri)
     /**
      * @param bool $encode
      * @return $this
-     * @since 2.0.0
      */
     public function shouldEncode($encode)
     {
@@ -152,7 +136,6 @@ public function shouldEncode($encode)
 
     /**
      * @return TransferInterface
-     * @since 2.0.0
      */
     public function build()
     {
diff --git a/app/code/Magento/Payment/Gateway/Http/TransferFactoryInterface.php b/app/code/Magento/Payment/Gateway/Http/TransferFactoryInterface.php
index f461b9d0858ec..153d6101e66c9 100644
--- a/app/code/Magento/Payment/Gateway/Http/TransferFactoryInterface.php
+++ b/app/code/Magento/Payment/Gateway/Http/TransferFactoryInterface.php
@@ -9,7 +9,6 @@
  * Interface TransferFactoryInterface
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 interface TransferFactoryInterface
 {
@@ -18,7 +17,6 @@ interface TransferFactoryInterface
      *
      * @param array $request
      * @return TransferInterface
-     * @since 2.0.0
      */
     public function create(array $request);
 }
diff --git a/app/code/Magento/Payment/Gateway/Http/TransferInterface.php b/app/code/Magento/Payment/Gateway/Http/TransferInterface.php
index 87b627c49c213..6e484e7d9548d 100644
--- a/app/code/Magento/Payment/Gateway/Http/TransferInterface.php
+++ b/app/code/Magento/Payment/Gateway/Http/TransferInterface.php
@@ -9,7 +9,6 @@
  * Interface TransferInterface
  * @package Magento\Payment\Gateway\Http
  * @api
- * @since 2.0.0
  */
 interface TransferInterface
 {
@@ -17,7 +16,6 @@ interface TransferInterface
      * Returns gateway client configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getClientConfig();
 
@@ -25,7 +23,6 @@ public function getClientConfig();
      * Returns method used to place request
      *
      * @return string|int
-     * @since 2.0.0
      */
     public function getMethod();
 
@@ -33,7 +30,6 @@ public function getMethod();
      * Returns headers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders();
 
@@ -41,7 +37,6 @@ public function getHeaders();
      * Whether body should be encoded before place
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldEncode();
 
@@ -49,7 +44,6 @@ public function shouldEncode();
      * Returns request body
      *
      * @return array|string
-     * @since 2.0.0
      */
     public function getBody();
 
@@ -57,7 +51,6 @@ public function getBody();
      * Returns URI
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUri();
 
@@ -65,7 +58,6 @@ public function getUri();
      * Returns Auth username
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAuthUsername();
 
@@ -73,7 +65,6 @@ public function getAuthUsername();
      * Returns Auth password
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAuthPassword();
 }
diff --git a/app/code/Magento/Payment/Gateway/Request/BuilderComposite.php b/app/code/Magento/Payment/Gateway/Request/BuilderComposite.php
index 7fcfba8e0dfe9..fabff7b252139 100644
--- a/app/code/Magento/Payment/Gateway/Request/BuilderComposite.php
+++ b/app/code/Magento/Payment/Gateway/Request/BuilderComposite.php
@@ -11,20 +11,17 @@
 /**
  * Class BuilderComposite
  * @api
- * @since 2.0.0
  */
 class BuilderComposite implements BuilderInterface
 {
     /**
      * @var BuilderInterface[] | TMap
-     * @since 2.0.0
      */
     private $builders;
 
     /**
      * @param TMapFactory $tmapFactory
      * @param array $builders
-     * @since 2.0.0
      */
     public function __construct(
         TMapFactory $tmapFactory,
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param array $buildSubject
      * @return array
-     * @since 2.0.0
      */
     public function build(array $buildSubject)
     {
@@ -62,7 +58,6 @@ public function build(array $buildSubject)
      * @param array $result
      * @param array $builder
      * @return array
-     * @since 2.0.0
      */
     protected function merge(array $result, array $builder)
     {
diff --git a/app/code/Magento/Payment/Gateway/Request/BuilderInterface.php b/app/code/Magento/Payment/Gateway/Request/BuilderInterface.php
index ba0a039b5d632..c89fa6a8c6756 100644
--- a/app/code/Magento/Payment/Gateway/Request/BuilderInterface.php
+++ b/app/code/Magento/Payment/Gateway/Request/BuilderInterface.php
@@ -9,7 +9,6 @@
  * Interface BuilderInterface
  * @package Magento\Payment\Gateway\Request
  * @api
- * @since 2.0.0
  */
 interface BuilderInterface
 {
@@ -18,7 +17,6 @@ interface BuilderInterface
      *
      * @param array $buildSubject
      * @return array
-     * @since 2.0.0
      */
     public function build(array $buildSubject);
 }
diff --git a/app/code/Magento/Payment/Gateway/Response/HandlerChain.php b/app/code/Magento/Payment/Gateway/Response/HandlerChain.php
index be2fc126a70c4..a094f7a613e77 100644
--- a/app/code/Magento/Payment/Gateway/Response/HandlerChain.php
+++ b/app/code/Magento/Payment/Gateway/Response/HandlerChain.php
@@ -12,20 +12,17 @@
  * Class HandlerChain
  * @package Magento\Payment\Gateway\Response
  * @api
- * @since 2.0.0
  */
 class HandlerChain implements HandlerInterface
 {
     /**
      * @var HandlerInterface[] | TMap
-     * @since 2.0.0
      */
     private $handlers;
 
     /**
      * @param TMapFactory $tmapFactory
      * @param array $handlers
-     * @since 2.0.0
      */
     public function __construct(
         TMapFactory $tmapFactory,
@@ -45,7 +42,6 @@ public function __construct(
      * @param array $handlingSubject
      * @param array $response
      * @return void
-     * @since 2.0.0
      */
     public function handle(array $handlingSubject, array $response)
     {
diff --git a/app/code/Magento/Payment/Gateway/Response/HandlerInterface.php b/app/code/Magento/Payment/Gateway/Response/HandlerInterface.php
index 09c1d48b161b4..8d40cefc957ab 100644
--- a/app/code/Magento/Payment/Gateway/Response/HandlerInterface.php
+++ b/app/code/Magento/Payment/Gateway/Response/HandlerInterface.php
@@ -9,7 +9,6 @@
  * Interface HandlerInterface
  * @package Magento\Payment\Gateway\Response
  * @api
- * @since 2.0.0
  */
 interface HandlerInterface
 {
@@ -19,7 +18,6 @@ interface HandlerInterface
      * @param array $handlingSubject
      * @param array $response
      * @return void
-     * @since 2.0.0
      */
     public function handle(array $handlingSubject, array $response);
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
index a96eae79f3629..74769947121fd 100644
--- a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
+++ b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
@@ -9,19 +9,16 @@
  * Class AbstractValidator
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 abstract class AbstractValidator implements ValidatorInterface
 {
     /**
      * @var ResultInterfaceFactory
-     * @since 2.0.0
      */
     private $resultInterfaceFactory;
 
     /**
      * @param ResultInterfaceFactory $resultFactory
-     * @since 2.0.0
      */
     public function __construct(
         ResultInterfaceFactory $resultFactory
@@ -35,7 +32,6 @@ public function __construct(
      * @param bool $isValid
      * @param array $fails
      * @return ResultInterface
-     * @since 2.0.0
      */
     protected function createResult($isValid, array $fails = [])
     {
diff --git a/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php b/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
index 540cf81d9e56f..00a113c7530b4 100644
--- a/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
+++ b/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
@@ -13,20 +13,17 @@
  * Class CountryValidator
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 class CountryValidator extends AbstractValidator
 {
     /**
      * @var \Magento\Payment\Gateway\ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @param ResultInterfaceFactory $resultFactory
      * @param \Magento\Payment\Gateway\ConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         ResultInterfaceFactory $resultFactory,
@@ -41,7 +38,6 @@ public function __construct(
      * @return bool
      * @throws NotFoundException
      * @throws \Exception
-     * @since 2.0.0
      */
     public function validate(array $validationSubject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Validator/Result.php b/app/code/Magento/Payment/Gateway/Validator/Result.php
index 0f2486a50e329..fc162f6a8cad9 100644
--- a/app/code/Magento/Payment/Gateway/Validator/Result.php
+++ b/app/code/Magento/Payment/Gateway/Validator/Result.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Payment\Gateway\Validator\Result
  *
- * @since 2.0.0
  */
 class Result implements ResultInterface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $isValid;
 
     /**
      * @var Phrase[]
-     * @since 2.0.0
      */
     private $failsDescription;
 
     /**
      * @param bool $isValid
      * @param array $failsDescription
-     * @since 2.0.0
      */
     public function __construct(
         $isValid,
@@ -43,7 +39,6 @@ public function __construct(
      * Returns validation result
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -54,7 +49,6 @@ public function isValid()
      * Returns list of fails description
      *
      * @return Phrase[]
-     * @since 2.0.0
      */
     public function getFailsDescription()
     {
diff --git a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
index da119cbbfb536..1620d94f1ddf3 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
@@ -11,7 +11,6 @@
  * Interface ResultInterface
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 interface ResultInterface
 {
@@ -19,7 +18,6 @@ interface ResultInterface
      * Returns validation result
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid();
 
@@ -27,7 +25,6 @@ public function isValid();
      * Returns list of fails description
      *
      * @return Phrase[]
-     * @since 2.0.0
      */
     public function getFailsDescription();
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
index 669fc813613bd..7b1e418717a09 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
@@ -13,13 +13,11 @@
  * Class ValidatorComposite
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 class ValidatorComposite extends AbstractValidator
 {
     /**
      * @var ValidatorInterface[] | TMap
-     * @since 2.0.0
      */
     private $validators;
 
@@ -27,7 +25,6 @@ class ValidatorComposite extends AbstractValidator
      * @param ResultInterfaceFactory $resultFactory
      * @param TMapFactory $tmapFactory
      * @param array $validators
-     * @since 2.0.0
      */
     public function __construct(
         ResultInterfaceFactory $resultFactory,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $validationSubject
      * @return ResultInterface
-     * @since 2.0.0
      */
     public function validate(array $validationSubject)
     {
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorInterface.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorInterface.php
index 039e573350182..0e9e7ba7bc1d6 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorInterface.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorInterface.php
@@ -9,7 +9,6 @@
  * Interface ValidatorInterface
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -18,7 +17,6 @@ interface ValidatorInterface
      *
      * @param array $validationSubject
      * @return ResultInterface
-     * @since 2.0.0
      */
     public function validate(array $validationSubject);
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
index 59062ad49fc12..59285352aa3c9 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
@@ -13,20 +13,17 @@
  * Class ValidatorPool
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 class ValidatorPool implements \Magento\Payment\Gateway\Validator\ValidatorPoolInterface
 {
     /**
      * @var ValidatorInterface[] | TMap
-     * @since 2.0.0
      */
     private $validators;
 
     /**
      * @param TMapFactory $tmapFactory
      * @param array $validators
-     * @since 2.0.0
      */
     public function __construct(
         TMapFactory $tmapFactory,
@@ -46,7 +43,6 @@ public function __construct(
      * @param string $code
      * @return ValidatorInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function get($code)
     {
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorPoolInterface.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorPoolInterface.php
index d194677bcc040..a0b5f79a9a245 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorPoolInterface.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorPoolInterface.php
@@ -11,7 +11,6 @@
  * Interface ValidatorPoolInterface
  * @package Magento\Payment\Gateway\Validator
  * @api
- * @since 2.0.0
  */
 interface ValidatorPoolInterface
 {
@@ -21,7 +20,6 @@ interface ValidatorPoolInterface
      * @param string $code
      * @return \Magento\Payment\Gateway\Validator\ValidatorInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function get($code);
 }
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 6410afaadcc90..187339e917652 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -28,7 +27,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
@@ -36,7 +34,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Layout
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -44,7 +41,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Factory for payment method models
      *
      * @var \Magento\Payment\Model\Method\Factory
-     * @since 2.0.0
      */
     protected $_methodFactory;
 
@@ -52,13 +48,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * App emulation model
      *
      * @var \Magento\Store\Model\App\Emulation
-     * @since 2.0.0
      */
     protected $_appEmulation;
 
     /**
      * @var \Magento\Framework\App\Config\Initial
-     * @since 2.0.0
      */
     protected $_initialConfig;
 
@@ -71,7 +65,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Magento\Framework\App\Config\Initial $initialConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -92,7 +85,6 @@ public function __construct(
     /**
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function getMethodModelConfigName($code)
     {
@@ -106,7 +98,6 @@ protected function getMethodModelConfigName($code)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return MethodInterface
-     * @since 2.0.0
      */
     public function getMethodInstance($code)
     {
@@ -128,9 +119,8 @@ public function getMethodInstance($code)
      * @param null|string|bool|int $store
      * @param Quote|null $quote
      * @return AbstractMethod[]
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @see \Magento\Payment\Api\PaymentMethodListInterface
-     * @since 2.0.0
      */
     public function getStoreMethods($store = null, $quote = null)
     {
@@ -181,7 +171,6 @@ function (MethodInterface $a, MethodInterface $b) {
      * @param MethodInterface $method
      * @param LayoutInterface $layout
      * @return Form
-     * @since 2.0.0
      */
     public function getMethodFormBlock(MethodInterface $method, LayoutInterface $layout)
     {
@@ -196,7 +185,6 @@ public function getMethodFormBlock(MethodInterface $method, LayoutInterface $lay
      * @param InfoInterface $info
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @return Template
-     * @since 2.0.0
      */
     public function getInfoBlock(InfoInterface $info, LayoutInterface $layout = null)
     {
@@ -214,7 +202,6 @@ public function getInfoBlock(InfoInterface $info, LayoutInterface $layout = null
      * @param int $storeId
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getInfoBlockHtml(InfoInterface $info, $storeId)
     {
@@ -242,7 +229,6 @@ public function getInfoBlockHtml(InfoInterface $info, $storeId)
      * Retrieve all payment methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPaymentMethods()
     {
@@ -272,7 +258,6 @@ public function getPaymentMethods()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getPaymentMethodList($sorted = true, $asLabelValue = false, $withGroups = false, $store = null)
     {
@@ -325,7 +310,6 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isZeroSubTotal($store = null)
     {
@@ -341,7 +325,6 @@ public function isZeroSubTotal($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getZeroSubTotalOrderStatus($store = null)
     {
@@ -357,7 +340,6 @@ public function getZeroSubTotalOrderStatus($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
     {
diff --git a/app/code/Magento/Payment/Model/Cart.php b/app/code/Magento/Payment/Model/Cart.php
index a3e208e07ac35..233590e6e7794 100644
--- a/app/code/Magento/Payment/Model/Cart.php
+++ b/app/code/Magento/Payment/Model/Cart.php
@@ -9,7 +9,6 @@
  * Provide methods for collecting cart items information of specific sales model entity
  *
  * @api
- * @since 2.0.0
  */
 class Cart
 {
@@ -25,19 +24,13 @@ class Cart
     const AMOUNT_SUBTOTAL = 'subtotal';
     /**#@-*/
 
-    /**
-     * Sales model
-     *
-     * @var \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_salesModel;
 
     /**
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -45,7 +38,6 @@ class Cart
      * Amounts
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_amounts;
 
@@ -53,7 +45,6 @@ class Cart
      * Custom items list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_customItems = [];
 
@@ -61,7 +52,6 @@ class Cart
      * Items imported from sales model
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_salesModelItems = [];
 
@@ -69,7 +59,6 @@ class Cart
      * Flags that indicates whether discount, shopping and taxes should be transferred as cart item
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_transferFlags = [];
 
@@ -77,7 +66,6 @@ class Cart
      * Flags which indicates whether items data is outdated and has to be recollected
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_itemsCollectingRequired = true;
 
@@ -85,7 +73,6 @@ class Cart
      * @param \Magento\Payment\Model\Cart\SalesModel\Factory $salesModelFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Quote\Api\Data\CartInterface $salesModel
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Model\Cart\SalesModel\Factory $salesModelFactory,
@@ -102,7 +89,6 @@ public function __construct(
      *
      * @return \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
      * @api
-     * @since 2.0.0
      */
     public function getSalesModel()
     {
@@ -115,7 +101,6 @@ public function getSalesModel()
      * @param float $taxAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function addTax($taxAmount)
     {
@@ -128,7 +113,6 @@ public function addTax($taxAmount)
      * @param float $taxAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setTax($taxAmount)
     {
@@ -140,7 +124,6 @@ public function setTax($taxAmount)
      *
      * @return float
      * @api
-     * @since 2.0.0
      */
     public function getTax()
     {
@@ -153,7 +136,6 @@ public function getTax()
      * @param float $discountAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function addDiscount($discountAmount)
     {
@@ -166,7 +148,6 @@ public function addDiscount($discountAmount)
      * @param float $discountAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setDiscount($discountAmount)
     {
@@ -178,7 +159,6 @@ public function setDiscount($discountAmount)
      *
      * @return float
      * @api
-     * @since 2.0.0
      */
     public function getDiscount()
     {
@@ -191,7 +171,6 @@ public function getDiscount()
      * @param float $shippingAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function addShipping($shippingAmount)
     {
@@ -204,7 +183,6 @@ public function addShipping($shippingAmount)
      * @param float $shippingAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setShipping($shippingAmount)
     {
@@ -216,7 +194,6 @@ public function setShipping($shippingAmount)
      *
      * @return float
      * @api
-     * @since 2.0.0
      */
     public function getShipping()
     {
@@ -229,7 +206,6 @@ public function getShipping()
      * @param float $subtotalAmount
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function addSubtotal($subtotalAmount)
     {
@@ -241,7 +217,6 @@ public function addSubtotal($subtotalAmount)
      *
      * @return float
      * @api
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -257,7 +232,6 @@ public function getSubtotal()
      * @param string|null $identifier
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function addCustomItem($name, $qty, $amount, $identifier = null)
     {
@@ -269,7 +243,6 @@ public function addCustomItem($name, $qty, $amount, $identifier = null)
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -282,7 +255,6 @@ public function getAllItems()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getAmounts()
     {
@@ -296,7 +268,6 @@ public function getAmounts()
      *
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setTransferShippingAsItem()
     {
@@ -308,7 +279,6 @@ public function setTransferShippingAsItem()
      *
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setTransferDiscountAsItem()
     {
@@ -319,7 +289,6 @@ public function setTransferDiscountAsItem()
      * Collect all items, discounts, taxes, shipping to cart
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _collectItemsAndAmounts()
     {
@@ -344,7 +313,6 @@ protected function _collectItemsAndAmounts()
      * Import items from sales model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _importItemsFromSalesModel()
     {
@@ -373,7 +341,6 @@ protected function _importItemsFromSalesModel()
      * Calculate subtotal from custom items
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _calculateCustomItemsSubtotal()
     {
@@ -396,7 +363,6 @@ protected function _calculateCustomItemsSubtotal()
      * @param string $flagType
      * @param bool $value
      * @return void
-     * @since 2.0.0
      */
     protected function _setTransferFlag($flagType, $value)
     {
@@ -408,7 +374,6 @@ protected function _setTransferFlag($flagType, $value)
      * @param string $amountType
      * @param float $amount
      * @return void
-     * @since 2.0.0
      */
     protected function _setAmount($amountType, $amount)
     {
@@ -419,7 +384,6 @@ protected function _setAmount($amountType, $amount)
      * @param string $amountType
      * @param float $amount
      * @return void
-     * @since 2.0.0
      */
     protected function _addAmount($amountType, $amount)
     {
@@ -431,7 +395,6 @@ protected function _addAmount($amountType, $amount)
      *
      * @param string $amountType
      * @return float
-     * @since 2.0.0
      */
     protected function _getAmount($amountType)
     {
@@ -446,7 +409,6 @@ protected function _getAmount($amountType)
      * @param float $amount
      * @param null|string $identifier
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _createItemFromData($name, $qty, $amount, $identifier = null)
     {
@@ -463,7 +425,6 @@ protected function _createItemFromData($name, $qty, $amount, $identifier = null)
      * Set all amount types to zero
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _resetAmounts()
     {
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
index 6154d4baeceb0..7db1d97d74a9e 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
@@ -7,19 +7,16 @@
 
 /**
  * Factory for creating payment cart sales models
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param \Magento\Quote\Api\Data\CartInterface $salesModel
      * @return \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($salesModel)
     {
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/Order.php b/app/code/Magento/Payment/Model/Cart/SalesModel/Order.php
index a73acc64b156f..c6fc6f29bcae7 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/Order.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/Order.php
@@ -7,7 +7,6 @@
 
 /**
  * Wrapper for \Magento\Sales\Model\Order sales model
- * @since 2.0.0
  */
 class Order implements \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
 {
@@ -15,13 +14,11 @@ class Order implements \Magento\Payment\Model\Cart\SalesModel\SalesModelInterfac
      * Sales order model instance
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_salesModel;
 
     /**
      * @param \Magento\Sales\Model\Order $salesModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Model\Order $salesModel)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Sales\Model\Order $salesModel)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -53,7 +49,6 @@ public function getAllItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -62,7 +57,6 @@ public function getBaseSubtotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -71,7 +65,6 @@ public function getBaseTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -80,7 +73,6 @@ public function getBaseShippingAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -89,7 +81,6 @@ public function getBaseDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataUsingMethod($key, $args = null)
     {
@@ -98,7 +89,6 @@ public function getDataUsingMethod($key, $args = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxContainer()
     {
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/Quote.php b/app/code/Magento/Payment/Model/Cart/SalesModel/Quote.php
index b9e682e085b93..5f8a554dd0c23 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/Quote.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/Quote.php
@@ -7,7 +7,6 @@
 
 /**
  * Wrapper for \Magento\Quote\Model\Quote sales model
- * @since 2.0.0
  */
 class Quote implements \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
 {
@@ -15,19 +14,16 @@ class Quote implements \Magento\Payment\Model\Cart\SalesModel\SalesModelInterfac
      * Sales quote model instance
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_salesModel;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $_address;
 
     /**
      * @param \Magento\Quote\Model\Quote $salesModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\Quote\Model\Quote $salesModel)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Quote\Model\Quote $salesModel)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -66,7 +61,6 @@ public function getAllItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -75,7 +69,6 @@ public function getBaseSubtotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -84,7 +77,6 @@ public function getBaseTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -93,7 +85,6 @@ public function getBaseShippingAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -102,7 +93,6 @@ public function getBaseDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataUsingMethod($key, $args = null)
     {
@@ -111,7 +101,6 @@ public function getDataUsingMethod($key, $args = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxContainer()
     {
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php b/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
index ec84072d33375..b551e6f0d8184 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Wrapper interface for accessing sales model data
- * @since 2.0.0
  */
 interface SalesModelInterface
 {
@@ -16,35 +15,30 @@ interface SalesModelInterface
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getAllItems();
 
     /**
      * @return float|null
      * @api
-     * @since 2.0.0
      */
     public function getBaseSubtotal();
 
     /**
      * @return float|null
      * @api
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
     /**
      * @return float|null
      * @api
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
     /**
      * @return float|null
      * @api
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -55,7 +49,6 @@ public function getBaseDiscountAmount();
      * @param mixed $args
      * @return mixed
      * @api
-     * @since 2.0.0
      */
     public function getDataUsingMethod($key, $args = null);
 
@@ -64,7 +57,6 @@ public function getDataUsingMethod($key, $args = null);
      *
      * @return \Magento\Sales\Api\Data\OrderInterface|\Magento\Quote\Api\Data\AddressInterface
      * @api
-     * @since 2.0.0
      */
     public function getTaxContainer();
 }
diff --git a/app/code/Magento/Payment/Model/CcConfig.php b/app/code/Magento/Payment/Model/CcConfig.php
index f438114e6945f..5e8e52e08ddd7 100644
--- a/app/code/Magento/Payment/Model/CcConfig.php
+++ b/app/code/Magento/Payment/Model/CcConfig.php
@@ -16,37 +16,31 @@
  * Credit card configuration model
  *
  * @api
- * @since 2.0.0
  */
 class CcConfig
 {
     /**
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -56,7 +50,6 @@ class CcConfig
      * @param RequestInterface $request
      * @param UrlInterface $urlBuilder
      * @param LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         PaymentConfig $paymentConfig,
@@ -77,7 +70,6 @@ public function __construct(
      *
      * @return array
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getSsStartYears()
     {
@@ -95,7 +87,6 @@ public function getSsStartYears()
      * Retrieve availables credit card types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCcAvailableTypes()
     {
@@ -106,7 +97,6 @@ public function getCcAvailableTypes()
      * Retrieve credit card expire months
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCcMonths()
     {
@@ -117,7 +107,6 @@ public function getCcMonths()
      * Retrieve credit card expire years
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCcYears()
     {
@@ -128,7 +117,6 @@ public function getCcYears()
      * Retrieve has verification configuration
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasVerification()
     {
@@ -140,7 +128,6 @@ public function hasVerification()
      *
      * @return bool
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function hasSsCardType()
     {
@@ -151,7 +138,6 @@ public function hasSsCardType()
      * Retrieve CVV tooltip image url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCvvImageUrl()
     {
@@ -164,7 +150,6 @@ public function getCvvImageUrl()
      * @param string $fileId
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getViewFileUrl($fileId, array $params = [])
     {
@@ -183,7 +168,6 @@ public function getViewFileUrl($fileId, array $params = [])
      * @param string $fileId
      * @param array $params
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createAsset($fileId, array $params = [])
     {
diff --git a/app/code/Magento/Payment/Model/CcConfigProvider.php b/app/code/Magento/Payment/Model/CcConfigProvider.php
index 0ae325ea09213..ded6de4f028c0 100644
--- a/app/code/Magento/Payment/Model/CcConfigProvider.php
+++ b/app/code/Magento/Payment/Model/CcConfigProvider.php
@@ -12,7 +12,6 @@
  * Class CcConfigProvider
  *
  * @api
- * @since 2.0.0
  */
 class CcConfigProvider implements ConfigProviderInterface
 {
@@ -24,20 +23,17 @@ class CcConfigProvider implements ConfigProviderInterface
 
     /**
      * @var CcConfig
-     * @since 2.0.0
      */
     protected $ccConfig;
 
     /**
      * @var \Magento\Framework\View\Asset\Source
-     * @since 2.0.0
      */
     protected $assetSource;
 
     /**
      * @param CcConfig $ccConfig
      * @param Source $assetSource
-     * @since 2.0.0
      */
     public function __construct(
         CcConfig $ccConfig,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -66,7 +61,6 @@ public function getConfig()
      * Get icons for available payment methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIcons()
     {
diff --git a/app/code/Magento/Payment/Model/CcGenericConfigProvider.php b/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
index 51186f25edb51..ae5d77ec13ae3 100644
--- a/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
+++ b/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
@@ -14,19 +14,16 @@
  * Direct injection as a dependency or extending of this class is not recommended.
  *
  * @api
- * @since 2.0.0
  */
 class CcGenericConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var CcConfig
-     * @since 2.0.0
      */
     protected $ccConfig;
 
     /**
      * @var MethodInterface[]
-     * @since 2.0.0
      */
     protected $methods = [];
 
@@ -34,7 +31,6 @@ class CcGenericConfigProvider implements ConfigProviderInterface
      * @param CcConfig $ccConfig
      * @param PaymentHelper $paymentHelper
      * @param array $methodCodes
-     * @since 2.0.0
      */
     public function __construct(
         CcConfig $ccConfig,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -77,7 +72,6 @@ public function getConfig()
      *
      * @return array
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     protected function getSsStartYears()
     {
@@ -88,7 +82,6 @@ protected function getSsStartYears()
      * Retrieve credit card expire months
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getCcMonths()
     {
@@ -99,7 +92,6 @@ protected function getCcMonths()
      * Retrieve credit card expire years
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getCcYears()
     {
@@ -110,7 +102,6 @@ protected function getCcYears()
      * Retrieve CVV tooltip image url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getCvvImageUrl()
     {
@@ -122,7 +113,6 @@ protected function getCvvImageUrl()
      *
      * @param string $methodCode
      * @return array
-     * @since 2.0.0
      */
     protected function getCcAvailableTypes($methodCode)
     {
@@ -144,7 +134,6 @@ protected function getCcAvailableTypes($methodCode)
      *
      * @param string $methodCode
      * @return bool
-     * @since 2.0.0
      */
     protected function hasVerification($methodCode)
     {
@@ -162,7 +151,6 @@ protected function hasVerification($methodCode)
      * @param string $methodCode
      * @return bool
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     protected function hasSsCardType($methodCode)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseCheckout.php b/app/code/Magento/Payment/Model/Checks/CanUseCheckout.php
index a7be707137f18..e406c45cc4028 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseCheckout.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseCheckout.php
@@ -12,7 +12,6 @@
  * Checks possibility of payment method to be used in storefront
  *
  * @api
- * @since 2.0.0
  */
 class CanUseCheckout implements SpecificationInterface
 {
@@ -22,7 +21,6 @@ class CanUseCheckout implements SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php b/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
index 90041cc239c49..1d8aadaa281f2 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
@@ -13,19 +13,16 @@
  * Checks possibility to use payment method at particular country
  *
  * @api
- * @since 2.0.0
  */
 class CanUseForCountry implements SpecificationInterface
 {
     /**
      * @var CountryProvider
-     * @since 2.0.0
      */
     protected $countryProvider;
 
     /**
      * @param CountryProvider $countryProvider
-     * @since 2.0.0
      */
     public function __construct(CountryProvider $countryProvider)
     {
@@ -37,7 +34,6 @@ public function __construct(CountryProvider $countryProvider)
      * @param MethodInterface $paymentMethod
      * @param Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
index 0aff3eef52402..7f1d1ce2a717b 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
@@ -14,19 +14,16 @@
  * This class may be extended if logic fo country selection should be modified.
  *
  * @api
- * @since 2.0.0
  */
 class CountryProvider
 {
     /**
      * @var DirectoryHelper
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @param DirectoryHelper $directoryHelper
-     * @since 2.0.0
      */
     public function __construct(DirectoryHelper $directoryHelper)
     {
@@ -38,7 +35,6 @@ public function __construct(DirectoryHelper $directoryHelper)
      *
      * @param Quote $quote
      * @return int
-     * @since 2.0.0
      */
     public function getCountry(Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCurrency.php b/app/code/Magento/Payment/Model/Checks/CanUseForCurrency.php
index f298352630278..c1e1d8a7bc095 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCurrency.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCurrency.php
@@ -12,7 +12,6 @@
  * Checks possibility to use payment method with particular currency
  *
  * @api
- * @since 2.0.0
  */
 class CanUseForCurrency implements SpecificationInterface
 {
@@ -23,7 +22,6 @@ class CanUseForCurrency implements SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseInternal.php b/app/code/Magento/Payment/Model/Checks/CanUseInternal.php
index 6a36fa216dfa7..d71fa22a02be0 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseInternal.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseInternal.php
@@ -12,7 +12,6 @@
  * Checks possibility of payment method to be used in admin area
  *
  * @api
- * @since 2.0.0
  */
 class CanUseInternal implements SpecificationInterface
 {
@@ -23,7 +22,6 @@ class CanUseInternal implements SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/Composite.php b/app/code/Magento/Payment/Model/Checks/Composite.php
index 0e214b2a2ae6f..19547a0f8aa86 100644
--- a/app/code/Magento/Payment/Model/Checks/Composite.php
+++ b/app/code/Magento/Payment/Model/Checks/Composite.php
@@ -13,19 +13,16 @@
  * Use this class to register own specifications.
  *
  * @api
- * @since 2.0.0
  */
 class Composite implements SpecificationInterface
 {
     /**
      * @var \Magento\Payment\Model\Checks\SpecificationInterface[]
-     * @since 2.0.0
      */
     protected $list = [];
 
     /**
      * @param SpecificationInterface[] $list
-     * @since 2.0.0
      */
     public function __construct(array $list)
     {
@@ -38,7 +35,6 @@ public function __construct(array $list)
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/SpecificationFactory.php b/app/code/Magento/Payment/Model/Checks/SpecificationFactory.php
index c7a2e95a69409..c6110d6836c48 100644
--- a/app/code/Magento/Payment/Model/Checks/SpecificationFactory.php
+++ b/app/code/Magento/Payment/Model/Checks/SpecificationFactory.php
@@ -11,7 +11,6 @@
  * Use this class to register predefined list of specifications that should be added to any complex specification.
  *
  * @api
- * @since 2.0.0
  */
 class SpecificationFactory
 {
@@ -19,13 +18,11 @@ class SpecificationFactory
      * Composite Factory
      *
      * @var \Magento\Payment\Model\Checks\CompositeFactory
-     * @since 2.0.0
      */
     protected $compositeFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $mapping;
 
@@ -34,7 +31,6 @@ class SpecificationFactory
      *
      * @param \Magento\Payment\Model\Checks\CompositeFactory $compositeFactory
      * @param array $mapping
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Model\Checks\CompositeFactory $compositeFactory, array $mapping)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Payment\Model\Checks\CompositeFactory $comp
      * @param array $data
      * @return Composite
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($data)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/SpecificationInterface.php b/app/code/Magento/Payment/Model/Checks/SpecificationInterface.php
index d0e15baab358c..81a302ae83810 100644
--- a/app/code/Magento/Payment/Model/Checks/SpecificationInterface.php
+++ b/app/code/Magento/Payment/Model/Checks/SpecificationInterface.php
@@ -12,7 +12,6 @@
  * Specification checks interface
  *
  * @api
- * @since 2.0.0
  */
 interface SpecificationInterface
 {
@@ -22,7 +21,6 @@ interface SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote);
 }
diff --git a/app/code/Magento/Payment/Model/Checks/TotalMinMax.php b/app/code/Magento/Payment/Model/Checks/TotalMinMax.php
index f95057404e58f..98a9644a39430 100644
--- a/app/code/Magento/Payment/Model/Checks/TotalMinMax.php
+++ b/app/code/Magento/Payment/Model/Checks/TotalMinMax.php
@@ -12,7 +12,6 @@
  * Checks is order total in allowed range or not
  *
  * @api
- * @since 2.0.0
  */
 class TotalMinMax implements SpecificationInterface
 {
@@ -32,7 +31,6 @@ class TotalMinMax implements SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Checks/ZeroTotal.php b/app/code/Magento/Payment/Model/Checks/ZeroTotal.php
index df68e4cf4284e..82599c79a694d 100644
--- a/app/code/Magento/Payment/Model/Checks/ZeroTotal.php
+++ b/app/code/Magento/Payment/Model/Checks/ZeroTotal.php
@@ -12,7 +12,6 @@
  * Checks that order total is meaningful
  *
  * @api
- * @since 2.0.0
  */
 class ZeroTotal implements SpecificationInterface
 {
@@ -23,7 +22,6 @@ class ZeroTotal implements SpecificationInterface
      * @param MethodInterface $paymentMethod
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isApplicable(MethodInterface $paymentMethod, Quote $quote)
     {
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index fecf5ce542a01..f35550c0d6149 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -15,7 +15,6 @@
  * Used for retrieving configuration data by payment models
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -26,7 +25,6 @@ class Config
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_methods;
 
@@ -34,13 +32,11 @@ class Config
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Config\DataInterface
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
@@ -48,7 +44,6 @@ class Config
      * Locale model
      *
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -56,7 +51,6 @@ class Config
      * Payment method factory
      *
      * @var \Magento\Payment\Model\Method\Factory
-     * @since 2.0.0
      */
     protected $_paymentMethodFactory;
 
@@ -64,7 +58,6 @@ class Config
      * DateTime
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -76,7 +69,6 @@ class Config
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Config\DataInterface $dataStorage
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -97,7 +89,6 @@ public function __construct(
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getActiveMethods()
     {
@@ -120,7 +111,6 @@ public function getActiveMethods()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getCcTypes()
     {
@@ -132,7 +122,6 @@ public function getCcTypes()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getMethodsInfo()
     {
@@ -144,7 +133,6 @@ public function getMethodsInfo()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getGroups()
     {
@@ -156,7 +144,6 @@ public function getGroups()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getMonths()
     {
@@ -176,7 +163,6 @@ public function getMonths()
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getYears()
     {
diff --git a/app/code/Magento/Payment/Model/Config/Converter.php b/app/code/Magento/Payment/Model/Config/Converter.php
index e57a28bd0d9b1..323174ac447c2 100644
--- a/app/code/Magento/Payment/Model/Config/Converter.php
+++ b/app/code/Magento/Payment/Model/Config/Converter.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Payment\Model\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -33,7 +31,6 @@ public function convert($source)
      *
      * @param \DOMXPath $xpath
      * @return array
-     * @since 2.0.0
      */
     protected function convertCreditCards(\DOMXPath $xpath)
     {
@@ -74,7 +71,6 @@ protected function convertCreditCards(\DOMXPath $xpath)
      * @param array $left
      * @param array $right
      * @return int
-     * @since 2.0.0
      */
     private function _compareCcTypes($left, $right)
     {
@@ -86,7 +82,6 @@ private function _compareCcTypes($left, $right)
      *
      * @param \DOMXPath $xpath
      * @return array
-     * @since 2.0.0
      */
     protected function convertGroups(\DOMXPath $xpath)
     {
@@ -115,7 +110,6 @@ protected function convertGroups(\DOMXPath $xpath)
      *
      * @param \DOMXPath $xpath
      * @return array
-     * @since 2.0.0
      */
     protected function convertMethods(\DOMXPath $xpath)
     {
diff --git a/app/code/Magento/Payment/Model/Config/Reader.php b/app/code/Magento/Payment/Model/Config/Reader.php
index 72e38e6018176..aa740e36347bd 100644
--- a/app/code/Magento/Payment/Model/Config/Reader.php
+++ b/app/code/Magento/Payment/Model/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Payment\Model\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/payment/credit_cards/type' => 'id',
diff --git a/app/code/Magento/Payment/Model/Config/SchemaLocator.php b/app/code/Magento/Payment/Model/Config/SchemaLocator.php
index 4f7a5021fc3e7..60e58987cd86a 100644
--- a/app/code/Magento/Payment/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Payment/Model/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Payment\Model\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -30,7 +29,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -38,13 +36,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -57,7 +53,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -68,7 +63,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Payment/Model/Config/Source/Allmethods.php b/app/code/Magento/Payment/Model/Config/Source/Allmethods.php
index acd6cca956f73..249acc5c0b6dd 100644
--- a/app/code/Magento/Payment/Model/Config/Source/Allmethods.php
+++ b/app/code/Magento/Payment/Model/Config/Source/Allmethods.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Payment\Model\Config\Source\Allmethods
  *
- * @since 2.0.0
  */
 class Allmethods implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,13 +15,11 @@ class Allmethods implements \Magento\Framework\Option\ArrayInterface
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Helper\Data $paymentData)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Payment\Helper\Data $paymentData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php b/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php
index 9ea7bd158a8bb..a250ece16d975 100644
--- a/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php
+++ b/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Allspecificcountries implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/Config/Source/Cctype.php b/app/code/Magento/Payment/Model/Config/Source/Cctype.php
index 35b4d3a503207..37c9ee7a05ac7 100644
--- a/app/code/Magento/Payment/Model/Config/Source/Cctype.php
+++ b/app/code/Magento/Payment/Model/Config/Source/Cctype.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Payment\Model\Config\Source\Cctype
  *
- * @since 2.0.0
  */
 class Cctype implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class Cctype implements \Magento\Framework\Option\ArrayInterface
      * Payment config model
      *
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
@@ -24,7 +22,6 @@ class Cctype implements \Magento\Framework\Option\ArrayInterface
      * Construct
      *
      * @param \Magento\Payment\Model\Config $paymentConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Model\Config $paymentConfig)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Payment\Model\Config $paymentConfig)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/IframeConfigProvider.php b/app/code/Magento/Payment/Model/IframeConfigProvider.php
index 9856dcb2159e6..56549d77c92fc 100644
--- a/app/code/Magento/Payment/Model/IframeConfigProvider.php
+++ b/app/code/Magento/Payment/Model/IframeConfigProvider.php
@@ -24,7 +24,6 @@
  * Extends from this class only in case of urgency.
  *
  * @api
- * @since 2.0.0
  */
 class IframeConfigProvider implements ConfigProviderInterface
 {
@@ -45,25 +44,21 @@ class IframeConfigProvider implements ConfigProviderInterface
 
     /**
      * @var Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -71,13 +66,11 @@ class IframeConfigProvider implements ConfigProviderInterface
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $methodCode;
 
     /**
      * @var \Magento\Payment\Model\Method\AbstractMethod
-     * @since 2.0.0
      */
     protected $method;
 
@@ -88,7 +81,6 @@ class IframeConfigProvider implements ConfigProviderInterface
      * @param LoggerInterface $logger
      * @param PaymentHelper $paymentHelper
      * @param string $methodCode
-     * @since 2.0.0
      */
     public function __construct(
         Repository $assetRepo,
@@ -108,7 +100,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -133,7 +124,6 @@ public function getConfig()
      * Get delimiter for date
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDateDelim()
     {
@@ -152,7 +142,6 @@ protected function getDateDelim()
      * Returns Cc expire year length
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getExpireDateYearLength()
     {
@@ -164,7 +153,6 @@ protected function getExpireDateYearLength()
      * Returns json formatted string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getCardFieldsMap()
     {
@@ -184,7 +172,6 @@ protected function getCardFieldsMap()
      * @param string $fileId
      * @param array $params
      * @return string[]
-     * @since 2.0.0
      */
     protected function getViewFileUrl($fileId, array $params = [])
     {
@@ -201,7 +188,6 @@ protected function getViewFileUrl($fileId, array $params = [])
      * Retrieve place order url on front
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getPlaceOrderUrl()
     {
@@ -217,7 +203,6 @@ protected function getPlaceOrderUrl()
      * Retrieve save order url on front
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSaveOrderUrl()
     {
@@ -228,7 +213,6 @@ protected function getSaveOrderUrl()
      * Retrieve gateway url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getCgiUrl()
     {
@@ -242,7 +226,6 @@ protected function getCgiUrl()
      *
      * @param string $fieldName
      * @return mixed
-     * @since 2.0.0
      */
     protected function getMethodConfigData($fieldName)
     {
diff --git a/app/code/Magento/Payment/Model/Info.php b/app/code/Magento/Payment/Model/Info.php
index 7b632e38f6cf7..48c0ff2508335 100644
--- a/app/code/Magento/Payment/Model/Info.php
+++ b/app/code/Magento/Payment/Model/Info.php
@@ -11,7 +11,6 @@
  * Payment information model
  *
  * @api
- * @since 2.0.0
  */
 class Info extends AbstractExtensibleModel implements InfoInterface
 {
@@ -19,7 +18,6 @@ class Info extends AbstractExtensibleModel implements InfoInterface
      * Additional information container
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_additionalInformation = [];
 
@@ -27,13 +25,11 @@ class Info extends AbstractExtensibleModel implements InfoInterface
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
@@ -47,7 +43,6 @@ class Info extends AbstractExtensibleModel implements InfoInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -79,7 +74,6 @@ public function __construct(
      * @param string $key
      * @param mixed $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -101,7 +95,6 @@ public function getData($key = '', $index = null)
      *
      * @return \Magento\Payment\Model\MethodInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getMethodInstance()
     {
@@ -130,7 +123,6 @@ public function getMethodInstance()
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data)
     {
@@ -142,7 +134,6 @@ public function encrypt($data)
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data)
     {
@@ -158,7 +149,6 @@ public function decrypt($data)
      * @param mixed $value
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAdditionalInformation($key, $value = null)
     {
@@ -179,7 +169,6 @@ public function setAdditionalInformation($key, $value = null)
      *
      * @param string $key
      * @return array|null|mixed
-     * @since 2.0.0
      */
     public function getAdditionalInformation($key = null)
     {
@@ -195,7 +184,6 @@ public function getAdditionalInformation($key = null)
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsAdditionalInformation($key = null)
     {
@@ -215,7 +203,6 @@ public function unsAdditionalInformation($key = null)
      *
      * @param mixed|null $key
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdditionalInformation($key = null)
     {
@@ -230,7 +217,6 @@ public function hasAdditionalInformation($key = null)
      * Initialize _additionalInformation with $this->_data['additional_information'] if empty
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initAdditionalInformation()
     {
diff --git a/app/code/Magento/Payment/Model/InfoInterface.php b/app/code/Magento/Payment/Model/InfoInterface.php
index bb3d88833af2a..bf012c336d8e3 100644
--- a/app/code/Magento/Payment/Model/InfoInterface.php
+++ b/app/code/Magento/Payment/Model/InfoInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface InfoInterface
  * @api
- * @since 2.0.0
  */
 interface InfoInterface
 {
@@ -18,7 +17,6 @@ interface InfoInterface
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data);
 
@@ -27,7 +25,6 @@ public function encrypt($data);
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data);
 
@@ -37,7 +34,6 @@ public function decrypt($data);
      * @param string $key
      * @param string|null $value
      * @return mixed
-     * @since 2.0.0
      */
     public function setAdditionalInformation($key, $value = null);
 
@@ -46,7 +42,6 @@ public function setAdditionalInformation($key, $value = null);
      *
      * @param mixed|null $key
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdditionalInformation($key = null);
 
@@ -55,7 +50,6 @@ public function hasAdditionalInformation($key = null);
      *
      * @param string|null $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsAdditionalInformation($key = null);
 
@@ -64,7 +58,6 @@ public function unsAdditionalInformation($key = null);
      *
      * @param string|null $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getAdditionalInformation($key = null);
 
@@ -73,7 +66,6 @@ public function getAdditionalInformation($key = null);
      *
      * @return \Magento\Payment\Model\MethodInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getMethodInstance();
 }
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index bec96870ec53e..2a7259059b379 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -23,10 +23,9 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 2.1.0
+ * @deprecated 2.0.6
  * @see \Magento\Payment\Model\Method\Adapter
  * @see http://devdocs.magento.com/guides/v2.1/payments-integrations/payment-gateway/payment-gateway-intro.html
- * @since 2.0.0
  */
 abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibleModel implements
     MethodInterface,
@@ -69,19 +68,16 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Payment\Block\Form::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info::class;
 
@@ -89,7 +85,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGateway = false;
 
@@ -97,7 +92,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOffline = false;
 
@@ -105,7 +99,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canOrder = false;
 
@@ -113,7 +106,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = false;
 
@@ -121,7 +113,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = false;
 
@@ -129,7 +120,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapturePartial = false;
 
@@ -137,7 +127,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCaptureOnce = false;
 
@@ -145,7 +134,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = false;
 
@@ -153,7 +141,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = false;
 
@@ -161,7 +148,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = false;
 
@@ -169,7 +155,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = true;
 
@@ -177,7 +162,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseCheckout = true;
 
@@ -185,7 +169,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isInitializeNeeded = false;
 
@@ -193,7 +176,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = false;
 
@@ -201,7 +183,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = false;
 
@@ -209,7 +190,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * TODO: whether a captured transaction may be voided by this gateway
      * This may happen when amount is captured, but not settled
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCancelInvoice = false;
 
@@ -217,7 +197,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Fields that should be replaced in debug with '***'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = [];
 
@@ -225,7 +204,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData;
 
@@ -233,13 +211,11 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -255,7 +231,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -289,7 +264,6 @@ public function __construct(
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function initializeData($data = [])
     {
@@ -300,7 +274,6 @@ protected function initializeData($data = [])
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function setStore($storeId)
     {
@@ -309,7 +282,6 @@ public function setStore($storeId)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -321,7 +293,6 @@ public function getStore()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canOrder()
     {
@@ -333,7 +304,6 @@ public function canOrder()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canAuthorize()
     {
@@ -345,7 +315,6 @@ public function canAuthorize()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -357,7 +326,6 @@ public function canCapture()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canCapturePartial()
     {
@@ -369,7 +337,6 @@ public function canCapturePartial()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canCaptureOnce()
     {
@@ -381,7 +348,6 @@ public function canCaptureOnce()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -393,7 +359,6 @@ public function canRefund()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canRefundPartialPerInvoice()
     {
@@ -405,7 +370,6 @@ public function canRefundPartialPerInvoice()
      * @return bool
      * @internal param \Magento\Framework\DataObject $payment
      * @api
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -417,7 +381,6 @@ public function canVoid()
      * Can be used in admin
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseInternal()
     {
@@ -428,7 +391,6 @@ public function canUseInternal()
      * Can be used in regular checkout
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseCheckout()
     {
@@ -440,7 +402,6 @@ public function canUseCheckout()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canEdit()
     {
@@ -452,7 +413,6 @@ public function canEdit()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canFetchTransactionInfo()
     {
@@ -467,7 +427,6 @@ public function canFetchTransactionInfo()
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @api
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
@@ -479,7 +438,6 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isGateway()
     {
@@ -491,7 +449,6 @@ public function isGateway()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isOffline()
     {
@@ -503,7 +460,6 @@ public function isOffline()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isInitializeNeeded()
     {
@@ -515,7 +471,6 @@ public function isInitializeNeeded()
      *
      * @param string $country
      * @return bool
-     * @since 2.0.0
      */
     public function canUseForCountry($country)
     {
@@ -537,7 +492,6 @@ public function canUseForCountry($country)
      * @param string $currencyCode
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode)
     {
@@ -549,7 +503,6 @@ public function canUseForCurrency($currencyCode)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -563,7 +516,6 @@ public function getCode()
      * Retrieve block type for method form generation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormBlockType()
     {
@@ -575,7 +527,6 @@ public function getFormBlockType()
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getInfoBlockType()
     {
@@ -588,7 +539,6 @@ public function getInfoBlockType()
      * @return InfoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
-     * @since 2.0.0
      */
     public function getInfoInstance()
     {
@@ -605,7 +555,6 @@ public function getInfoInstance()
      * @param InfoInterface $info
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function setInfoInstance(InfoInterface $info)
     {
@@ -618,7 +567,6 @@ public function setInfoInstance(InfoInterface $info)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -648,7 +596,6 @@ public function validate()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -667,7 +614,6 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -686,7 +632,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -706,7 +651,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -723,7 +667,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @return $this
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -738,7 +681,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -752,7 +694,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * Whether this method can accept or deny payment
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -767,7 +708,6 @@ public function canReviewPayment()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function acceptPayment(InfoInterface $payment)
     {
@@ -785,7 +725,6 @@ public function acceptPayment(InfoInterface $payment)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function denyPayment(InfoInterface $payment)
     {
@@ -799,7 +738,6 @@ public function denyPayment(InfoInterface $payment)
      * Retrieve payment method title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -813,7 +751,6 @@ public function getTitle()
      * @param int|string|null|\Magento\Store\Model\Store $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfigData($field, $storeId = null)
     {
@@ -834,7 +771,6 @@ public function getConfigData($field, $storeId = null)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @api
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
@@ -864,7 +800,6 @@ public function assignData(\Magento\Framework\DataObject $data)
      *
      * @param \Magento\Quote\Api\Data\CartInterface|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -893,7 +828,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isActive($storeId = null)
     {
@@ -910,7 +844,6 @@ public function isActive($storeId = null)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @api
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject)
     {
@@ -923,7 +856,6 @@ public function initialize($paymentAction, $stateObject)
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
@@ -935,7 +867,6 @@ public function getConfigPaymentAction()
      *
      * @param array $debugData
      * @return void
-     * @since 2.0.0
      */
     protected function _debug($debugData)
     {
@@ -952,7 +883,6 @@ protected function _debug($debugData)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @api
-     * @since 2.0.0
      */
     public function getDebugFlag()
     {
@@ -965,7 +895,6 @@ public function getDebugFlag()
      * @param mixed $debugData
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function debugData($debugData)
     {
@@ -976,7 +905,6 @@ public function debugData($debugData)
      * Return replace keys for debug data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDebugReplacePrivateDataKeys()
     {
diff --git a/app/code/Magento/Payment/Model/Method/Adapter.php b/app/code/Magento/Payment/Model/Method/Adapter.php
index 92907066955c9..50f885b01241c 100644
--- a/app/code/Magento/Payment/Model/Method/Adapter.php
+++ b/app/code/Magento/Payment/Model/Method/Adapter.php
@@ -27,67 +27,56 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api Use this class as a base for virtual types declaration
- * @since 2.0.0
  */
 class Adapter implements MethodInterface
 {
     /**
      * @var ValueHandlerPoolInterface
-     * @since 2.0.0
      */
     private $valueHandlerPool;
 
     /**
      * @var ValidatorPoolInterface
-     * @since 2.0.0
      */
     private $validatorPool;
 
     /**
      * @var CommandPoolInterface
-     * @since 2.0.0
      */
     private $commandPool;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $storeId;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $formBlockType;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $infoBlockType;
 
     /**
      * @var InfoInterface
-     * @since 2.0.0
      */
     private $infoInstance;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $code;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     private $eventManager;
 
     /**
      * @var PaymentDataObjectFactory
-     * @since 2.0.0
      */
     private $paymentDataObjectFactory;
 
@@ -117,7 +106,6 @@ class Adapter implements MethodInterface
      * @param CommandManagerInterface|null $commandExecutor
      * @param LoggerInterface|null $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         ManagerInterface $eventManager,
@@ -148,7 +136,6 @@ public function __construct(
      *
      * @return ValidatorPoolInterface
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function getValidatorPool()
     {
@@ -160,7 +147,6 @@ public function getValidatorPool()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canOrder()
     {
@@ -169,7 +155,6 @@ public function canOrder()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canAuthorize()
     {
@@ -178,7 +163,6 @@ public function canAuthorize()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -187,7 +171,6 @@ public function canCapture()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canCapturePartial()
     {
@@ -196,7 +179,6 @@ public function canCapturePartial()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canCaptureOnce()
     {
@@ -205,7 +187,6 @@ public function canCaptureOnce()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -214,7 +195,6 @@ public function canRefund()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canRefundPartialPerInvoice()
     {
@@ -223,7 +203,6 @@ public function canRefundPartialPerInvoice()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -232,7 +211,6 @@ public function canVoid()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canUseInternal()
     {
@@ -241,7 +219,6 @@ public function canUseInternal()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canUseCheckout()
     {
@@ -250,7 +227,6 @@ public function canUseCheckout()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canEdit()
     {
@@ -259,7 +235,6 @@ public function canEdit()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canFetchTransactionInfo()
     {
@@ -268,7 +243,6 @@ public function canFetchTransactionInfo()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -277,7 +251,6 @@ public function canReviewPayment()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isGateway()
     {
@@ -286,7 +259,6 @@ public function isGateway()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isOffline()
     {
@@ -295,7 +267,6 @@ public function isOffline()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isInitializeNeeded()
     {
@@ -304,7 +275,6 @@ public function isInitializeNeeded()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isAvailable(CartInterface $quote = null)
     {
@@ -345,7 +315,6 @@ public function isAvailable(CartInterface $quote = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isActive($storeId = null)
     {
@@ -354,7 +323,6 @@ public function isActive($storeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canUseForCountry($country)
     {
@@ -370,7 +338,6 @@ public function canUseForCountry($country)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode)
     {
@@ -389,7 +356,6 @@ public function canUseForCurrency($currencyCode)
      *
      * @param string $commandCode
      * @return bool
-     * @since 2.0.0
      */
     private function canPerformCommand($commandCode)
     {
@@ -402,7 +368,6 @@ private function canPerformCommand($commandCode)
      * @param string $field
      * @param null $storeId
      * @return mixed
-     * @since 2.0.0
      */
     private function getConfiguredValue($field, $storeId = null)
     {
@@ -420,7 +385,6 @@ private function getConfiguredValue($field, $storeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getConfigData($field, $storeId = null)
     {
@@ -429,7 +393,6 @@ public function getConfigData($field, $storeId = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -454,7 +417,6 @@ public function validate()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
@@ -466,7 +428,6 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function order(InfoInterface $payment, $amount)
     {
@@ -480,7 +441,6 @@ public function order(InfoInterface $payment, $amount)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function authorize(InfoInterface $payment, $amount)
     {
@@ -494,7 +454,6 @@ public function authorize(InfoInterface $payment, $amount)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function capture(InfoInterface $payment, $amount)
     {
@@ -508,7 +467,6 @@ public function capture(InfoInterface $payment, $amount)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function refund(InfoInterface $payment, $amount)
     {
@@ -522,7 +480,6 @@ public function refund(InfoInterface $payment, $amount)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function cancel(InfoInterface $payment)
     {
@@ -533,7 +490,6 @@ public function cancel(InfoInterface $payment)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function void(InfoInterface $payment)
     {
@@ -544,7 +500,6 @@ public function void(InfoInterface $payment)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function acceptPayment(InfoInterface $payment)
     {
@@ -555,7 +510,6 @@ public function acceptPayment(InfoInterface $payment)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function denyPayment(InfoInterface $payment)
     {
@@ -566,7 +520,6 @@ public function denyPayment(InfoInterface $payment)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     private function executeCommand($commandCode, array $arguments = [])
     {
@@ -596,7 +549,6 @@ private function executeCommand($commandCode, array $arguments = [])
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -605,7 +557,6 @@ public function getCode()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -614,7 +565,6 @@ public function getTitle()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setStore($storeId)
     {
@@ -623,7 +573,6 @@ public function setStore($storeId)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -632,7 +581,6 @@ public function getStore()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getFormBlockType()
     {
@@ -641,7 +589,6 @@ public function getFormBlockType()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getInfoBlockType()
     {
@@ -650,7 +597,6 @@ public function getInfoBlockType()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getInfoInstance()
     {
@@ -659,7 +605,6 @@ public function getInfoInstance()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setInfoInstance(InfoInterface $info)
     {
@@ -670,7 +615,6 @@ public function setInfoInstance(InfoInterface $info)
      * @inheritdoc
      * @param DataObject $data
      * @return $this
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
@@ -698,7 +642,6 @@ public function assignData(\Magento\Framework\DataObject $data)
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject)
     {
@@ -715,7 +658,6 @@ public function initialize($paymentAction, $stateObject)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
index 1b38b6104cb80..5f0a69cb6d8f2 100644
--- a/app/code/Magento/Payment/Model/Method/Cc.php
+++ b/app/code/Magento/Payment/Model/Method/Cc.php
@@ -12,38 +12,32 @@
 /**
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 2.1.0
- * @since 2.0.0
+ * @deprecated 2.0.11
  */
 class Cc extends \Magento\Payment\Model\Method\AbstractMethod
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Payment\Block\Form\Cc::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info\Cc::class;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSaveCc = false;
 
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     protected $_moduleList;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -61,7 +55,6 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -100,7 +93,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -199,7 +191,6 @@ public function validate()
     /**
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function hasVerification()
     {
@@ -213,7 +204,6 @@ public function hasVerification()
     /**
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getVerificationRegEx()
     {
@@ -239,7 +229,6 @@ public function getVerificationRegEx()
      * @param string $expYear
      * @param string $expMonth
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateExpDate($expYear, $expMonth)
     {
@@ -258,7 +247,6 @@ protected function _validateExpDate($expYear, $expMonth)
      * @param \Magento\Framework\DataObject|mixed $data
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
@@ -291,7 +279,6 @@ public function assignData(\Magento\Framework\DataObject $data)
      * @param string $type
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function otherCcType($type)
     {
@@ -304,7 +291,6 @@ public function otherCcType($type)
      * @param   string $ccNumber
      * @return  bool
      * @api
-     * @since 2.0.0
      */
     public function validateCcNum($ccNumber)
     {
@@ -345,7 +331,6 @@ public function validateCcNum($ccNumber)
      * @param string $ccNumber
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function validateCcNumOther($ccNumber)
     {
@@ -357,7 +342,6 @@ public function validateCcNumOther($ccNumber)
      *
      * @param \Magento\Quote\Api\Data\CartInterface|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
diff --git a/app/code/Magento/Payment/Model/Method/ConfigInterface.php b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
index 3c67033d83336..d7344a08bb11f 100644
--- a/app/code/Magento/Payment/Model/Method/ConfigInterface.php
+++ b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Interface for payment methods config
  *
  * @deprectated This interface has no semantic meaning and all it implementations has no joint points.
- * @since 2.0.0
  */
 interface ConfigInterface extends \Magento\Payment\Gateway\ConfigInterface
 {
diff --git a/app/code/Magento/Payment/Model/Method/Factory.php b/app/code/Magento/Payment/Model/Method/Factory.php
index 5d897bf834bb0..729ef65a97b38 100644
--- a/app/code/Magento/Payment/Model/Method/Factory.php
+++ b/app/code/Magento/Payment/Model/Method/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class \Magento\Payment\Model\Method\Factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -23,7 +21,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Payment\Model\MethodInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, $data = [])
     {
diff --git a/app/code/Magento/Payment/Model/Method/Free.php b/app/code/Magento/Payment/Model/Method/Free.php
index 3c3ca0c09c793..070419a9d34e9 100644
--- a/app/code/Magento/Payment/Model/Method/Free.php
+++ b/app/code/Magento/Payment/Model/Method/Free.php
@@ -16,7 +16,6 @@
  * Inheritance is allowed to modify it behavior.
  *
  * @api
- * @since 2.0.0
  */
 class Free extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -35,7 +34,6 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment Method features
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -43,13 +41,11 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment code name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::PAYMENT_METHOD_FREE_CODE;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -66,7 +62,6 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -101,7 +96,6 @@ public function __construct(
      *
      * @param \Magento\Quote\Api\Data\CartInterface|\Magento\Quote\Model\Quote|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -117,7 +111,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      *
      * @param \Magento\Quote\Model\Quote|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailableInConfig($quote = null)
     {
@@ -128,7 +121,6 @@ public function isAvailableInConfig($quote = null)
      * Get config payment action, do nothing if status is pending
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
diff --git a/app/code/Magento/Payment/Model/Method/InstanceFactory.php b/app/code/Magento/Payment/Model/Method/InstanceFactory.php
index aa837da9baaf6..8a7b06a4624ec 100644
--- a/app/code/Magento/Payment/Model/Method/InstanceFactory.php
+++ b/app/code/Magento/Payment/Model/Method/InstanceFactory.php
@@ -9,19 +9,19 @@
 
 /**
  * Payment method instance factory.
- * @since 2.2.0
+ * @since 2.1.3
  */
 class InstanceFactory
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $helper;
 
     /**
      * @param \Magento\Payment\Helper\Data $helper
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Payment\Helper\Data $helper
@@ -34,7 +34,7 @@ public function __construct(
      *
      * @param PaymentMethodInterface $paymentMethod
      * @return \Magento\Payment\Model\MethodInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function create(PaymentMethodInterface $paymentMethod)
     {
diff --git a/app/code/Magento/Payment/Model/Method/Logger.php b/app/code/Magento/Payment/Model/Method/Logger.php
index a06497079bd42..c3ff5f30119b4 100644
--- a/app/code/Magento/Payment/Model/Method/Logger.php
+++ b/app/code/Magento/Payment/Model/Method/Logger.php
@@ -13,7 +13,6 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Logger
 {
@@ -21,20 +20,17 @@ class Logger
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Payment\Gateway\ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @param LoggerInterface $logger
      * @param \Magento\Payment\Gateway\ConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         LoggerInterface $logger,
@@ -51,7 +47,6 @@ public function __construct(
      * @param array|null $maskKeys
      * @param bool|null $forceDebug
      * @return void
-     * @since 2.0.0
      */
     public function debug(array $data, array $maskKeys = null, $forceDebug = null)
     {
@@ -70,7 +65,6 @@ public function debug(array $data, array $maskKeys = null, $forceDebug = null)
      * Returns configured keys to be replaced with mask
      *
      * @return array
-     * @since 2.0.0
      */
     private function getDebugReplaceFields()
     {
@@ -84,7 +78,6 @@ private function getDebugReplaceFields()
      * Whether debug is enabled in configuration
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isDebugOn()
     {
@@ -97,7 +90,6 @@ private function isDebugOn()
      * @param array $debugData
      * @param array $debugReplacePrivateDataKeys
      * @return array
-     * @since 2.0.0
      */
     protected function filterDebugData(array $debugData, array $debugReplacePrivateDataKeys)
     {
diff --git a/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php b/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php
index 52a28e5746abe..1344bf84baff4 100644
--- a/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php
+++ b/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php
@@ -12,7 +12,6 @@
  * Gateway interface for online payment methods
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 interface GatewayInterface
 {
@@ -25,7 +24,6 @@ interface GatewayInterface
      * @return DataObject
      *
      * @throws \Exception
-     * @since 2.0.0
      */
     public function postRequest(DataObject $request, ConfigInterface $config);
 }
diff --git a/app/code/Magento/Payment/Model/Method/Specification/AbstractSpecification.php b/app/code/Magento/Payment/Model/Method/Specification/AbstractSpecification.php
index 015c6942d5a45..6fd5095be82cf 100644
--- a/app/code/Magento/Payment/Model/Method/Specification/AbstractSpecification.php
+++ b/app/code/Magento/Payment/Model/Method/Specification/AbstractSpecification.php
@@ -12,7 +12,6 @@
  * Abstract specification
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractSpecification implements SpecificationInterface
 {
@@ -20,7 +19,6 @@ abstract class AbstractSpecification implements SpecificationInterface
      * Payment methods info
      *
      * @var array
-     * @since 2.0.0
      */
     protected $methodsInfo = [];
 
@@ -28,7 +26,6 @@ abstract class AbstractSpecification implements SpecificationInterface
      * Construct
      *
      * @param PaymentConfig $paymentConfig
-     * @since 2.0.0
      */
     public function __construct(PaymentConfig $paymentConfig)
     {
diff --git a/app/code/Magento/Payment/Model/Method/Specification/Composite.php b/app/code/Magento/Payment/Model/Method/Specification/Composite.php
index 8d0e25ee68f7d..99304aa61c218 100644
--- a/app/code/Magento/Payment/Model/Method/Specification/Composite.php
+++ b/app/code/Magento/Payment/Model/Method/Specification/Composite.php
@@ -13,7 +13,6 @@
  * Use this class for virtual types declaration.
  *
  * @api
- * @since 2.0.0
  */
 class Composite implements SpecificationInterface
 {
@@ -21,7 +20,6 @@ class Composite implements SpecificationInterface
      * Specifications collection
      *
      * @var SpecificationInterface[]
-     * @since 2.0.0
      */
     protected $specifications = [];
 
@@ -30,7 +28,6 @@ class Composite implements SpecificationInterface
      *
      * @param Factory $factory
      * @param array $specifications
-     * @since 2.0.0
      */
     public function __construct(Factory $factory, $specifications = [])
     {
@@ -41,7 +38,6 @@ public function __construct(Factory $factory, $specifications = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isSatisfiedBy($paymentMethod)
     {
diff --git a/app/code/Magento/Payment/Model/Method/Specification/Factory.php b/app/code/Magento/Payment/Model/Method/Specification/Factory.php
index 9f66bd37ffa15..e9af5d8be9979 100644
--- a/app/code/Magento/Payment/Model/Method/Specification/Factory.php
+++ b/app/code/Magento/Payment/Model/Method/Specification/Factory.php
@@ -10,7 +10,6 @@
 
 /**
  * Specification Factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -18,7 +17,6 @@ class Factory
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class Factory
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -39,7 +36,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $specificationClass
      * @return SpecificationInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($specificationClass)
     {
diff --git a/app/code/Magento/Payment/Model/Method/SpecificationInterface.php b/app/code/Magento/Payment/Model/Method/SpecificationInterface.php
index d351290e700a7..23fbc5ed805af 100644
--- a/app/code/Magento/Payment/Model/Method/SpecificationInterface.php
+++ b/app/code/Magento/Payment/Model/Method/SpecificationInterface.php
@@ -9,7 +9,6 @@
  * Interface SpecificationInterface
  *
  * @api
- * @since 2.0.0
  */
 interface SpecificationInterface
 {
@@ -18,7 +17,6 @@ interface SpecificationInterface
      *
      * @param string $paymentMethod
      * @return bool
-     * @since 2.0.0
      */
     public function isSatisfiedBy($paymentMethod);
 }
diff --git a/app/code/Magento/Payment/Model/Method/Substitution.php b/app/code/Magento/Payment/Model/Method/Substitution.php
index 411037873508f..59b461ef0f25e 100644
--- a/app/code/Magento/Payment/Model/Method/Substitution.php
+++ b/app/code/Magento/Payment/Model/Method/Substitution.php
@@ -10,7 +10,6 @@
  * Substitution payment method for non-existing payments
  *
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
- * @since 2.0.0
  */
 class Substitution extends AbstractMethod
 {
@@ -26,13 +25,11 @@ class Substitution extends AbstractMethod
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::CODE;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Payment\Block\Info\Substitution::class;
 
@@ -40,7 +37,6 @@ class Substitution extends AbstractMethod
      * Retrieve payment method title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/Payment/Model/Method/TransparentInterface.php b/app/code/Magento/Payment/Model/Method/TransparentInterface.php
index 560e9bcdf29bd..1c85f646f50ef 100644
--- a/app/code/Magento/Payment/Model/Method/TransparentInterface.php
+++ b/app/code/Magento/Payment/Model/Method/TransparentInterface.php
@@ -11,7 +11,6 @@
  * Interface TransparentInterface need to be implemented by Payment Method service
  * which supports transparent redirect feature
  * @package Magento\Payment\Model\Method
- * @since 2.0.0
  */
 interface TransparentInterface extends MethodInterface
 {
@@ -19,7 +18,6 @@ interface TransparentInterface extends MethodInterface
      * Returns payment method configured config
      *
      * @return \Magento\Payment\Gateway\ConfigInterface
-     * @since 2.0.0
      */
     public function getConfigInterface();
 }
diff --git a/app/code/Magento/Payment/Model/MethodInterface.php b/app/code/Magento/Payment/Model/MethodInterface.php
index ecefce67a142b..351f3fc06a93a 100644
--- a/app/code/Magento/Payment/Model/MethodInterface.php
+++ b/app/code/Magento/Payment/Model/MethodInterface.php
@@ -11,7 +11,6 @@
 /**
  * Payment interface
  * @api
- * @since 2.0.0
  */
 interface MethodInterface
 {
@@ -20,7 +19,6 @@ interface MethodInterface
      *
      * @return string
      *
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -30,7 +28,6 @@ public function getCode();
      * @return string
      *
      * @deprecated 2.0.0
-     * @since 2.0.0
      */
     public function getFormBlockType();
 
@@ -39,7 +36,6 @@ public function getFormBlockType();
      *
      * @return string
      *
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -47,14 +43,12 @@ public function getTitle();
      * Store id setter
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     public function setStore($storeId);
 
     /**
      * Store id getter
      * @return int
-     * @since 2.0.0
      */
     public function getStore();
 
@@ -63,7 +57,6 @@ public function getStore();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canOrder();
 
@@ -72,7 +65,6 @@ public function canOrder();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canAuthorize();
 
@@ -81,7 +73,6 @@ public function canAuthorize();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canCapture();
 
@@ -90,7 +81,6 @@ public function canCapture();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canCapturePartial();
 
@@ -99,7 +89,6 @@ public function canCapturePartial();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canCaptureOnce();
 
@@ -108,7 +97,6 @@ public function canCaptureOnce();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canRefund();
 
@@ -117,7 +105,6 @@ public function canRefund();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canRefundPartialPerInvoice();
 
@@ -125,7 +112,6 @@ public function canRefundPartialPerInvoice();
      * Check void availability
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canVoid();
 
@@ -134,7 +120,6 @@ public function canVoid();
      * Can be used in admin
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseInternal();
 
@@ -142,7 +127,6 @@ public function canUseInternal();
      * Can be used in regular checkout
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseCheckout();
 
@@ -151,7 +135,6 @@ public function canUseCheckout();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canEdit();
 
@@ -160,7 +143,6 @@ public function canEdit();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canFetchTransactionInfo();
 
@@ -172,7 +154,6 @@ public function canFetchTransactionInfo();
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId);
 
@@ -181,7 +162,6 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId);
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function isGateway();
 
@@ -190,7 +170,6 @@ public function isGateway();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function isOffline();
 
@@ -199,7 +178,6 @@ public function isOffline();
      *
      * @return bool
      *
-     * @since 2.0.0
      */
     public function isInitializeNeeded();
 
@@ -208,7 +186,6 @@ public function isInitializeNeeded();
      *
      * @param string $country
      * @return bool
-     * @since 2.0.0
      */
     public function canUseForCountry($country);
 
@@ -218,7 +195,6 @@ public function canUseForCountry($country);
      * @param string $currencyCode
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode);
 
@@ -228,7 +204,6 @@ public function canUseForCurrency($currencyCode);
      * @return string
      *
      * @deprecated 2.0.0
-     * @since 2.0.0
      */
     public function getInfoBlockType();
 
@@ -239,7 +214,6 @@ public function getInfoBlockType();
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @deprecated 2.0.0
-     * @since 2.0.0
      */
     public function getInfoInstance();
 
@@ -250,7 +224,6 @@ public function getInfoInstance();
      * @return void
      *
      * @deprecated 2.0.0
-     * @since 2.0.0
      */
     public function setInfoInstance(InfoInterface $info);
 
@@ -260,7 +233,6 @@ public function setInfoInstance(InfoInterface $info);
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      *
-     * @since 2.0.0
      */
     public function validate();
 
@@ -271,7 +243,6 @@ public function validate();
      * @param float $amount
      * @return $this
      *
-     * @since 2.0.0
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -282,7 +253,6 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount);
      * @param float $amount
      * @return $this
      *
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -293,7 +263,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param float $amount
      * @return $this
      *
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -304,7 +273,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount);
      * @param float $amount
      * @return $this
      *
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -314,7 +282,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount);
      * @param InfoInterface $payment
      * @return $this
      *
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment);
 
@@ -324,7 +291,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment);
      * @param InfoInterface $payment
      * @return $this
      *
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment);
 
@@ -332,7 +298,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment);
      * Whether this method can accept or deny payment
      * @return bool
      *
-     * @since 2.0.0
      */
     public function canReviewPayment();
 
@@ -343,7 +308,6 @@ public function canReviewPayment();
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
      *
-     * @since 2.0.0
      */
     public function acceptPayment(InfoInterface $payment);
 
@@ -354,7 +318,6 @@ public function acceptPayment(InfoInterface $payment);
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
      *
-     * @since 2.0.0
      */
     public function denyPayment(InfoInterface $payment);
 
@@ -365,7 +328,6 @@ public function denyPayment(InfoInterface $payment);
      * @param int|string|null|\Magento\Store\Model\Store $storeId
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfigData($field, $storeId = null);
 
@@ -375,7 +337,6 @@ public function getConfigData($field, $storeId = null);
      * @param DataObject $data
      * @return $this
      *
-     * @since 2.0.0
      */
     public function assignData(DataObject $data);
 
@@ -385,7 +346,6 @@ public function assignData(DataObject $data);
      * @param CartInterface|null $quote
      * @return bool
      *
-     * @since 2.0.0
      */
     public function isAvailable(CartInterface $quote = null);
 
@@ -395,7 +355,6 @@ public function isAvailable(CartInterface $quote = null);
      * @param int|null $storeId
      * @return bool
      *
-     * @since 2.0.0
      */
     public function isActive($storeId = null);
 
@@ -409,7 +368,6 @@ public function isActive($storeId = null);
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject);
 
@@ -419,7 +377,6 @@ public function initialize($paymentAction, $stateObject);
      *
      * @return string
      *
-     * @since 2.0.0
      */
     public function getConfigPaymentAction();
 }
diff --git a/app/code/Magento/Payment/Model/MethodList.php b/app/code/Magento/Payment/Model/MethodList.php
index d72844e95c394..8a59becb7662d 100644
--- a/app/code/Magento/Payment/Model/MethodList.php
+++ b/app/code/Magento/Payment/Model/MethodList.php
@@ -13,40 +13,36 @@
  * Methods List service class.
  *
  * @api
- * @since 2.0.0
  */
 class MethodList
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @deprecated 2.2.0 Do not use this property in case of inheritance.
-     * @since 2.0.0
+     * @deprecated 2.1.3 Do not use this property in case of inheritance.
      */
     protected $paymentHelper;
 
     /**
      * @var \Magento\Payment\Model\Checks\SpecificationFactory
      * @deprecated 2.2.0 Do not use this property in case of inheritance.
-     * @since 2.0.0
      */
     protected $methodSpecificationFactory;
 
     /**
      * @var \Magento\Payment\Api\PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentMethodList;
 
     /**
      * @var \Magento\Payment\Model\Method\InstanceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentMethodInstanceFactory;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param Checks\SpecificationFactory $specificationFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentHelper,
@@ -59,7 +55,6 @@ public function __construct(
     /**
      * @param \Magento\Quote\Api\Data\CartInterface $quote
      * @return \Magento\Payment\Model\MethodInterface[]
-     * @since 2.0.0
      */
     public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -82,7 +77,6 @@ public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote
      * @param \Magento\Payment\Model\MethodInterface $method
      * @param \Magento\Quote\Api\Data\CartInterface $quote
      * @return bool
-     * @since 2.0.0
      */
     protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface $quote)
     {
@@ -103,7 +97,7 @@ protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface
      * Get payment method list.
      *
      * @return \Magento\Payment\Api\PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPaymentMethodList()
     {
@@ -119,7 +113,7 @@ private function getPaymentMethodList()
      * Get payment method instance factory.
      *
      * @return \Magento\Payment\Model\Method\InstanceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPaymentMethodInstanceFactory()
     {
diff --git a/app/code/Magento/Payment/Model/Paygate/Result.php b/app/code/Magento/Payment/Model/Paygate/Result.php
index d57dd486a52b6..840865b1e97d2 100644
--- a/app/code/Magento/Payment/Model/Paygate/Result.php
+++ b/app/code/Magento/Payment/Model/Paygate/Result.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Payment\Model\Paygate\Result
  *
- * @since 2.0.0
  */
 class Result extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Payment/Model/PaymentMethod.php b/app/code/Magento/Payment/Model/PaymentMethod.php
index e7732dfbbb53c..5401c80e6ebb8 100644
--- a/app/code/Magento/Payment/Model/PaymentMethod.php
+++ b/app/code/Magento/Payment/Model/PaymentMethod.php
@@ -7,31 +7,31 @@
 
 /**
  * Payment method class.
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PaymentMethod implements \Magento\Payment\Api\Data\PaymentMethodInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $code;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $title;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeId;
 
     /**
      * @var bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $isActive;
 
@@ -40,7 +40,7 @@ class PaymentMethod implements \Magento\Payment\Api\Data\PaymentMethodInterface
      * @param string $title
      * @param int $storeId
      * @param bool $isActive
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct($code, $title, $storeId, $isActive)
     {
@@ -52,7 +52,7 @@ public function __construct($code, $title, $storeId, $isActive)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getCode()
     {
@@ -61,7 +61,7 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTitle()
     {
@@ -70,7 +70,7 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getStoreId()
     {
@@ -79,7 +79,7 @@ public function getStoreId()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIsActive()
     {
diff --git a/app/code/Magento/Payment/Model/PaymentMethodList.php b/app/code/Magento/Payment/Model/PaymentMethodList.php
index 7e1767ce57e1a..51f5db999eda7 100644
--- a/app/code/Magento/Payment/Model/PaymentMethodList.php
+++ b/app/code/Magento/Payment/Model/PaymentMethodList.php
@@ -9,26 +9,26 @@
 
 /**
  * Payment method list class.
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PaymentMethodList implements \Magento\Payment\Api\PaymentMethodListInterface
 {
     /**
      * @var \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $methodFactory;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $helper;
 
     /**
      * @param \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory
      * @param \Magento\Payment\Helper\Data $helper
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory,
@@ -40,7 +40,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getList($storeId)
     {
@@ -82,7 +82,7 @@ function (MethodInterface $methodInstance) use ($storeId) {
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getActiveList($storeId)
     {
diff --git a/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php b/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php
index 4440911afd11d..7505643badf98 100644
--- a/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php
+++ b/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales transaction types option array
- * @since 2.0.0
  */
 class GroupList implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,13 +14,11 @@ class GroupList implements \Magento\Framework\Option\ArrayInterface
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentData;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Helper\Data $paymentData)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Payment\Helper\Data $paymentData)
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php b/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php
index ae016b4800c02..170db877a47b1 100644
--- a/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php
+++ b/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales transaction payment method types option array
- * @since 2.0.0
  */
 class TypeList implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,13 +14,11 @@ class TypeList implements \Magento\Framework\Option\ArrayInterface
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentData;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Helper\Data $paymentData)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Payment\Helper\Data $paymentData)
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/Source/Cctype.php b/app/code/Magento/Payment/Model/Source/Cctype.php
index a04c7e17b0ff8..27c274224f467 100644
--- a/app/code/Magento/Payment/Model/Source/Cctype.php
+++ b/app/code/Magento/Payment/Model/Source/Cctype.php
@@ -11,7 +11,6 @@
  * Inheritance of this class allowed as is a part of legacy implementation.
  *
  * @api
- * @since 2.0.0
  */
 class Cctype implements \Magento\Framework\Option\ArrayInterface
 {
@@ -19,7 +18,6 @@ class Cctype implements \Magento\Framework\Option\ArrayInterface
      * Allowed CC types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedTypes = [];
 
@@ -27,7 +25,6 @@ class Cctype implements \Magento\Framework\Option\ArrayInterface
      * Payment config model
      *
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
@@ -35,7 +32,6 @@ class Cctype implements \Magento\Framework\Option\ArrayInterface
      * Config
      *
      * @param \Magento\Payment\Model\Config $paymentConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Model\Config $paymentConfig)
     {
@@ -46,7 +42,6 @@ public function __construct(\Magento\Payment\Model\Config $paymentConfig)
      * Return allowed cc types for current method
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedTypes()
     {
@@ -58,7 +53,6 @@ public function getAllowedTypes()
      *
      * @param array $values
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowedTypes(array $values)
     {
@@ -68,7 +62,6 @@ public function setAllowedTypes(array $values)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Model/Source/Invoice.php b/app/code/Magento/Payment/Model/Source/Invoice.php
index 75c88a399b4bc..eea3e0cb6f1b0 100644
--- a/app/code/Magento/Payment/Model/Source/Invoice.php
+++ b/app/code/Magento/Payment/Model/Source/Invoice.php
@@ -11,13 +11,11 @@
  * Inheritance of this class allowed as is a part of legacy implementation.
  *
  * @api
- * @since 2.0.0
  */
 class Invoice implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Payment/Observer/AbstractDataAssignObserver.php b/app/code/Magento/Payment/Observer/AbstractDataAssignObserver.php
index 9b25c3e7479f5..91c3dcbd6e985 100644
--- a/app/code/Magento/Payment/Observer/AbstractDataAssignObserver.php
+++ b/app/code/Magento/Payment/Observer/AbstractDataAssignObserver.php
@@ -15,7 +15,6 @@
  * Class AbstractDataAssignObserver
  * @package Magento\Payment\Observer
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDataAssignObserver implements ObserverInterface
 {
@@ -30,7 +29,6 @@ abstract class AbstractDataAssignObserver implements ObserverInterface
      *
      * @param Observer $observer
      * @return MethodInterface
-     * @since 2.0.0
      */
     protected function readMethodArgument(Observer $observer)
     {
@@ -54,7 +52,6 @@ protected function readPaymentModelArgument(Observer $observer)
      *
      * @param Observer $observer
      * @return DataObject
-     * @since 2.0.0
      */
     protected function readDataArgument(Observer $observer)
     {
@@ -69,7 +66,6 @@ protected function readDataArgument(Observer $observer)
      * @param string $type
      * @return mixed
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function readArgument(Observer $observer, $key, $type)
     {
diff --git a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
index 2001e38bef97e..a19ed5149ddf9 100644
--- a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
+++ b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Payment\Observer\SalesOrderBeforeSaveObserver
  *
- * @since 2.0.0
  */
 class SalesOrderBeforeSaveObserver implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class SalesOrderBeforeSaveObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Payment/Observer/UpdateOrderStatusForPaymentMethodsObserver.php b/app/code/Magento/Payment/Observer/UpdateOrderStatusForPaymentMethodsObserver.php
index 05fadaa5f6a01..a0f0488a35396 100644
--- a/app/code/Magento/Payment/Observer/UpdateOrderStatusForPaymentMethodsObserver.php
+++ b/app/code/Magento/Payment/Observer/UpdateOrderStatusForPaymentMethodsObserver.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Payment\Observer\UpdateOrderStatusForPaymentMethodsObserver
  *
- * @since 2.0.0
  */
 class UpdateOrderStatusForPaymentMethodsObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_salesOrderConfig;
 
     /**
      * @var \Magento\Payment\Model\Config
-     * @since 2.0.0
      */
     protected $_paymentConfig;
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected $_resourceConfig;
 
@@ -39,7 +35,6 @@ class UpdateOrderStatusForPaymentMethodsObserver implements ObserverInterface
      * @param \Magento\Sales\Model\Order\Config $salesOrderConfig
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Magento\Config\Model\ResourceModel\Config $resourceConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Order\Config $salesOrderConfig,
@@ -54,7 +49,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
index 881a22767edf0..5afaa9fcf97b9 100644
--- a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
+++ b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
@@ -7,19 +7,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
@@ -27,7 +24,6 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
      * Constructor
      *
      * @param \Magento\Payment\Helper\Data $paymentHelper
-     * @since 2.0.0
      */
     public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
     {
@@ -38,7 +34,6 @@ public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement.php
index f4a70eb89105d..a667b71aab1ae 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement.php
@@ -9,7 +9,6 @@
  * Adminhtml billing agreement grid container
  *
  * @api
- * @since 2.0.0
  */
 class Agreement extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Agreement extends \Magento\Backend\Block\Widget\Grid\Container
      * Initialize billing agreements grid container
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/Grid.php
index 1d10a41ddf26d..9557525c2ca1c 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/Grid.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/Grid.php
@@ -8,25 +8,21 @@
 /**
  * Adminhtml billing agreements grid
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Paypal\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper = null;
 
     /**
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\CollectionFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
     /**
      * @var \Magento\Paypal\Model\Billing\Agreement
-     * @since 2.0.0
      */
     protected $_agreementModel;
 
@@ -37,7 +33,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Paypal\Model\ResourceModel\Billing\Agreement\CollectionFactory $agreementFactory
      * @param \Magento\Paypal\Model\Billing\Agreement $agreementModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Set grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +67,6 @@ protected function _construct()
      * Retrieve grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -85,7 +78,6 @@ public function getGridUrl()
      *
      * @param object $item
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($item)
     {
@@ -96,7 +88,6 @@ public function getRowUrl($item)
      * Prepare collection for grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -111,7 +102,6 @@ protected function _prepareCollection()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View.php
index fb2cb1d7bb097..896ebc7ddb5a8 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View.php
@@ -9,7 +9,6 @@
  * Adminhtml billing agreement view
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Initialize view container
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -87,7 +83,6 @@ protected function _construct()
      * Retrieve header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -98,7 +93,6 @@ public function getHeaderText()
      * Retrieve cancel billing agreement url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCancelUrl()
     {
@@ -109,7 +103,6 @@ protected function _getCancelUrl()
      * Retrieve billing agreement model
      *
      * @return \Magento\Paypal\Model\Billing\Agreement
-     * @since 2.0.0
      */
     protected function _getBillingAgreement()
     {
@@ -121,7 +114,6 @@ protected function _getBillingAgreement()
      *
      * @param string $resourceId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed($resourceId)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
index df7b4ccf2725c..31b3e0c1d6b6f 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
@@ -7,13 +7,11 @@
 
 /**
  * Adminhtml billing agreement view plane
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'billing/agreement/view/form.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index 58b1999e9d64e..d133d19f9c202 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -9,13 +9,11 @@
 
 /**
  * Adminhtml billing agreement info tab
- * @since 2.0.0
  */
 class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'billing/agreement/view/tab/info.phtml';
 
@@ -23,13 +21,11 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $_customerRepository;
 
@@ -38,7 +34,6 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
      * @param \Magento\Framework\Registry $registry
      * @param CustomerRepositoryInterface $customerRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -62,7 +56,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -71,7 +64,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -80,7 +72,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -91,7 +82,6 @@ public function isHidden()
      * Retrieve billing agreement model
      *
      * @return \Magento\Paypal\Model\Billing\Agreement
-     * @since 2.0.0
      */
     protected function _getBillingAgreement()
     {
@@ -102,7 +92,6 @@ protected function _getBillingAgreement()
      * Set data to block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
index df4a3b702ebf8..874656f1a5439 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
@@ -19,25 +19,21 @@
 /**
  * Adminhtml billing agreement related orders tab
  * @api
- * @since 2.0.0
  */
 class Orders extends ExtendedGrid implements TabInterface
 {
     /**
      * @var  CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var BillingAgreementResource
-     * @since 2.0.0
      */
     protected $billingAgreementResource;
 
@@ -48,7 +44,6 @@ class Orders extends ExtendedGrid implements TabInterface
      * @param Registry $coreRegistry
      * @param BillingAgreementResource $billingAgreementResource
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         TemplateContext $context,
@@ -66,7 +61,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -75,7 +69,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -84,7 +77,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -93,7 +85,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -102,7 +93,6 @@ public function isHidden()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -126,7 +116,6 @@ public function getGridUrl()
      * Apply various selection filters to prepare the sales order grid collection.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -159,7 +148,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tabs.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tabs.php
index aae4517f5072e..ddb35ee0034ba 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tabs.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tabs.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -19,7 +18,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * Initialize tab
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/Magento/Paypal/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
index 5f1eda195eb00..39eefe3a0c587 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Agreement extends \Magento\Paypal\Block\Adminhtml\Billing\Agreement\Grid implements TabInterface
 {
@@ -21,7 +20,6 @@ class Agreement extends \Magento\Paypal\Block\Adminhtml\Billing\Agreement\Grid i
      * Columns, that should be removed from grid
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columnsToRemove = ['customer_email', 'customer_firstname', 'customer_lastname'];
 
@@ -29,7 +27,6 @@ class Agreement extends \Magento\Paypal\Block\Adminhtml\Billing\Agreement\Grid i
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -41,7 +38,6 @@ class Agreement extends \Magento\Paypal\Block\Adminhtml\Billing\Agreement\Grid i
      * @param \Magento\Paypal\Model\Billing\Agreement $agreementModel
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -60,7 +56,6 @@ public function __construct(
      * Disable filters and paging
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -70,7 +65,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -79,7 +73,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -88,7 +81,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -97,7 +89,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -108,7 +99,6 @@ public function isHidden()
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -119,7 +109,6 @@ public function getGridUrl()
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -130,7 +119,6 @@ public function getTabClass()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -141,7 +129,6 @@ public function getTabUrl()
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded()
     {
@@ -152,7 +139,6 @@ public function isAjaxLoaded()
      * Defines after which tab, this tab should be rendered
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAfter()
     {
@@ -163,7 +149,6 @@ public function getAfter()
      * Prepare collection for grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -183,7 +168,6 @@ protected function _prepareCollection()
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php
index 3ef5d9832f443..65704480c1894 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php
@@ -9,7 +9,6 @@
  * Settlement reports transaction details
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Details extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -18,7 +17,6 @@ class Details extends \Magento\Backend\Block\Widget\Form\Container
      * Initialize titles, buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -34,7 +32,6 @@ protected function _construct()
      * Initialize form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
index 6e8c5f3feebc7..226276a174b37 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
@@ -7,19 +7,16 @@
 
 /**
  * Settlement reports transaction details
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Paypal\Model\Report\Settlement
-     * @since 2.0.0
      */
     protected $_settlement;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -30,7 +27,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Paypal\Model\Report\Settlement $settlement
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
index d45e0fcaf91e1..0b58aaeeccbc7 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Report extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Report extends \Magento\Backend\Block\Widget\Grid\Container
      * Prepare grid container, add additional buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Store/SwitcherPlugin.php b/app/code/Magento/Paypal/Block/Adminhtml/Store/SwitcherPlugin.php
index fd8402a258662..2215ed987d9cf 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Store/SwitcherPlugin.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Store/SwitcherPlugin.php
@@ -10,7 +10,6 @@
 
 /**
  * Plugin for \Magento\Backend\Block\Store\Switcher
- * @since 2.0.0
  */
 class SwitcherPlugin
 {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
index bdb4a856ac109..ee7433f3bb545 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
@@ -7,7 +7,6 @@
 
 /**
  * Custom renderer for PayPal API credentials wizard popup
- * @since 2.0.0
  */
 class ApiWizard extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -20,7 +19,6 @@ class ApiWizard extends \Magento\Config\Block\System\Config\Form\Field
      * Set template to itself
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -36,7 +34,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -49,7 +46,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
index 6ebd301993291..230e4ddbcf5fc 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard
  *
- * @since 2.0.0
  */
 class BmlApiWizard extends ApiWizard
 {
@@ -23,7 +22,6 @@ class BmlApiWizard extends ApiWizard
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
index f261c7351c8e3..0d210e3d844b1 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\Field\Country
  *
- * @since 2.0.0
  */
 class Country extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -32,25 +31,21 @@ class Country extends \Magento\Config\Block\System\Config\Form\Field
      * Country of default scope
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultCountry;
 
     /**
      * @var \Magento\Backend\Model\Url
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Framework\View\Helper\Js
-     * @since 2.0.0
      */
     protected $_jsHelper;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -60,7 +55,6 @@ class Country extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -80,7 +74,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -112,7 +105,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
index d051be7837598..1dbcf5b7e0f5d 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
@@ -9,7 +9,6 @@
 
 /**
  * Class AbstractEnable
- * @since 2.0.0
  */
 abstract class AbstractEnable extends Field
 {
@@ -26,7 +25,6 @@ abstract class AbstractEnable extends Field
      * @param string|null $arg4
      * @param string|null $arg5
      * @return string
-     * @since 2.0.0
      */
     public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
     {
@@ -39,7 +37,6 @@ public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null,
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -51,7 +48,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * Getting the name of a UI attribute
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function getDataAttributeName();
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Bml.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Bml.php
index 61fbe23abed68..738f6f176c647 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Bml.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Bml.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Bml
- * @since 2.0.0
  */
 class Bml extends AbstractEnable
 {
@@ -15,7 +14,6 @@ class Bml extends AbstractEnable
      * Getting the name of a UI attribute
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDataAttributeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
index 9f118e5ff7f08..1a8a5895c434c 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Bml
- * @since 2.0.0
  */
 class BmlApi extends AbstractEnable
 {
@@ -15,7 +14,6 @@ class BmlApi extends AbstractEnable
      * Getting the name of a UI attribute
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDataAttributeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Express.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Express.php
index aacd554428504..0b5a097bb7ce3 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Express.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Express.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Express
- * @since 2.0.0
  */
 class Express extends AbstractEnable
 {
@@ -15,7 +14,6 @@ class Express extends AbstractEnable
      * Getting the name of a UI attribute
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDataAttributeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Payment.php
index ed2dac5823bc7..f96afbbb112f7 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/Payment.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Payment
- * @since 2.0.0
  */
 class Payment extends AbstractEnable
 {
@@ -15,7 +14,6 @@ class Payment extends AbstractEnable
      * Getting the name of a UI attribute
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDataAttributeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
index f5a2b47fe911e..b0302961e0c98 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden
  *
- * @since 2.0.0
  */
 class Hidden extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -22,7 +21,6 @@ class Hidden extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function _decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
index 52073d65a3306..82997e764e9cf 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
@@ -9,7 +9,6 @@
 
 /**
  * Fieldset renderer which expanded by default
- * @since 2.0.0
  */
 class Expanded extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
@@ -17,7 +16,6 @@ class Expanded extends \Magento\Config\Block\System\Config\Form\Fieldset
      * Whether is collapsed by default
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isCollapsedDefault = true;
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php
index 76a2e6b38dcfa..e1218bcb03553 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group
  *
- * @since 2.0.0
  */
 class Group extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
@@ -21,7 +20,6 @@ class Group extends \Magento\Config\Block\System\Config\Form\Fieldset
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -37,7 +35,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getHeaderCommentHtml($element)
     {
@@ -64,7 +61,6 @@ protected function _getHeaderCommentHtml($element)
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCollapseState($element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
index 23dd5831f5fed..86a2b7339ae38 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
@@ -12,21 +12,18 @@
 /**
  * Class Hint adds "Configuration Details" link to payment configuration.
  * `<comment>` node must be defined in `<group>` node and contain some link.
- * @since 2.0.0
  */
 class Hint extends Template implements RendererInterface
 {
     /**
      * @var string
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.3
      */
     protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml';
 
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index f15c92634abbc..4eadddb723b3e 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -7,13 +7,11 @@
 
 /**
  * Fieldset renderer for PayPal solution
- * @since 2.0.0
  */
 class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
     /**
      * @var \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     protected $_backendConfig;
 
@@ -23,7 +21,6 @@ class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Config\Model\Config $backendConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getFrontendClass($element)
     {
@@ -54,7 +50,6 @@ protected function _getFrontendClass($element)
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return bool
-     * @since 2.0.0
      */
     protected function _isPaymentEnabled($element)
     {
@@ -80,7 +75,6 @@ protected function _isPaymentEnabled($element)
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getHeaderTitleHtml($element)
     {
@@ -138,7 +132,6 @@ protected function _getHeaderTitleHtml($element)
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getHeaderCommentHtml($element)
     {
@@ -151,7 +144,6 @@ protected function _getHeaderCommentHtml($element)
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return false
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isCollapseState($element)
     {
@@ -162,7 +154,7 @@ protected function _isCollapseState($element)
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _getExtraJs($element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
index 31a4e0d7b590e..e0108fac4f508 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced
  *
- * @since 2.0.0
  */
 class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info
 {
@@ -20,7 +19,6 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
      * Template path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'system/config/payflowlink/advanced.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
index a0c75056e6c6e..07d7a8709626e 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info
  *
- * @since 2.0.0
  */
 class Info extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -20,7 +19,6 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
      * Template path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'system/config/payflowlink/info.phtml';
 
@@ -29,7 +27,6 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ResolutionRules.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ResolutionRules.php
index 248ac1552f83f..efe88b1d2f1af 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ResolutionRules.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ResolutionRules.php
@@ -13,13 +13,11 @@
  * Class ResolutionRules
  *
  * @api
- * @since 2.0.0
  */
 class ResolutionRules extends Template
 {
     /**
      * @var Reader
-     * @since 2.0.0
      */
     private $rulesReader;
 
@@ -29,7 +27,6 @@ class ResolutionRules extends Template
      * @param Context $context
      * @param Reader $rulesReader
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Getting data for generating rules (JSON)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJson()
     {
diff --git a/app/code/Magento/Paypal/Block/Billing/Agreement/View.php b/app/code/Magento/Paypal/Block/Billing/Agreement/View.php
index 513c18d4a9e28..8cb02992f2f56 100644
--- a/app/code/Magento/Paypal/Block/Billing/Agreement/View.php
+++ b/app/code/Magento/Paypal/Block/Billing/Agreement/View.php
@@ -9,7 +9,6 @@
  * Customer account billing agreement view block
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class View extends \Magento\Framework\View\Element\Template
      * Payment methods array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_paymentMethods = [];
 
@@ -25,7 +23,6 @@ class View extends \Magento\Framework\View\Element\Template
      * Billing Agreement instance
      *
      * @var \Magento\Paypal\Model\Billing\Agreement
-     * @since 2.0.0
      */
     protected $_billingAgreementInstance = null;
 
@@ -33,7 +30,6 @@ class View extends \Magento\Framework\View\Element\Template
      * Related orders collection
      *
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $_relatedOrders = null;
 
@@ -41,37 +37,31 @@ class View extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderCollectionFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @var \Magento\Paypal\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement
-     * @since 2.0.0
      */
     protected $_agreementResource;
 
@@ -84,7 +74,6 @@ class View extends \Magento\Framework\View\Element\Template
      * @param \Magento\Paypal\Helper\Data $helper
      * @param \Magento\Paypal\Model\ResourceModel\Billing\Agreement $agreementResource
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -110,7 +99,6 @@ public function __construct(
      * Retrieve related orders collection
      *
      * @return \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     public function getRelatedOrders()
     {
@@ -141,7 +129,6 @@ public function getRelatedOrders()
      * @param string $key
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getOrderItemValue(\Magento\Sales\Model\Order $order, $key)
     {
@@ -181,7 +168,6 @@ public function getOrderItemValue(\Magento\Sales\Model\Order $order, $key)
      * Set pager
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -204,7 +190,6 @@ protected function _prepareLayout()
      * Return current billing agreement.
      *
      * @return \Magento\Paypal\Model\Billing\Agreement|null
-     * @since 2.0.0
      */
     protected function _getBillingAgreementInstance()
     {
@@ -218,7 +203,6 @@ protected function _getBillingAgreementInstance()
      * Load available billing agreement methods
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _loadPaymentMethods()
     {
@@ -234,7 +218,6 @@ protected function _loadPaymentMethods()
      * Set data to block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Billing/Agreements.php b/app/code/Magento/Paypal/Block/Billing/Agreements.php
index 3736c8590482b..0ce056a976bb0 100644
--- a/app/code/Magento/Paypal/Block/Billing/Agreements.php
+++ b/app/code/Magento/Paypal/Block/Billing/Agreements.php
@@ -9,7 +9,6 @@
  * Customer account billing agreements block
  *
  * @api
- * @since 2.0.0
  */
 class Agreements extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class Agreements extends \Magento\Framework\View\Element\Template
      * Payment methods array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_paymentMethods = [];
 
@@ -25,25 +23,21 @@ class Agreements extends \Magento\Framework\View\Element\Template
      * Billing agreements collection
      *
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection
-     * @since 2.0.0
      */
     protected $_billingAgreements = null;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\CollectionFactory
-     * @since 2.0.0
      */
     protected $_agreementCollection;
 
     /**
      * @var \Magento\Paypal\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
@@ -53,7 +47,6 @@ class Agreements extends \Magento\Framework\View\Element\Template
      * @param \Magento\Paypal\Model\ResourceModel\Billing\Agreement\CollectionFactory $agreementCollection
      * @param \Magento\Paypal\Helper\Data $helper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -73,7 +66,6 @@ public function __construct(
      * Set Billing Agreement instance
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -94,7 +86,6 @@ protected function _prepareLayout()
      * Retrieve billing agreements collection
      *
      * @return \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection
-     * @since 2.0.0
      */
     public function getBillingAgreements()
     {
@@ -116,7 +107,6 @@ public function getBillingAgreements()
      * @param \Magento\Framework\DataObject|\Magento\Paypal\Model\Billing\Agreement $item
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public function getItemValue(\Magento\Paypal\Model\Billing\Agreement $item, $key)
     {
@@ -148,7 +138,6 @@ public function getItemValue(\Magento\Paypal\Model\Billing\Agreement $item, $key
      * Load available billing agreement methods
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _loadPaymentMethods()
     {
@@ -164,7 +153,6 @@ protected function _loadPaymentMethods()
      * Retrieve wizard payment options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWizardPaymentMethodOptions()
     {
@@ -181,7 +169,6 @@ public function getWizardPaymentMethodOptions()
      * Set data to block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Bml/Banners.php b/app/code/Magento/Paypal/Block/Bml/Banners.php
index ac76e38680e83..4c6c3bf4e720d 100644
--- a/app/code/Magento/Paypal/Block/Bml/Banners.php
+++ b/app/code/Magento/Paypal/Block/Bml/Banners.php
@@ -11,25 +11,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Banners extends Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_section;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_position;
 
     /**
      * @var \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected $_paypalConfig;
 
@@ -37,7 +33,6 @@ class Banners extends Template
      * @param Template\Context $context
      * @param Config $paypalConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Disable block output if banner turned off or PublisherId is miss
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Bml/Form.php b/app/code/Magento/Paypal/Block/Bml/Form.php
index ee9f94f36395f..a6ac6584c9b2b 100644
--- a/app/code/Magento/Paypal/Block/Bml/Form.php
+++ b/app/code/Magento/Paypal/Block/Bml/Form.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\Paypal\Block\Bml\Form
  *
- * @since 2.0.0
  */
 class Form extends Express\Form
 {
     /**
      * Payment method code
      * @var string
-     * @since 2.0.0
      */
     protected $_methodCode = Config::METHOD_WPP_BML;
 
@@ -27,7 +25,6 @@ class Form extends Express\Form
      * Set template and redirect message
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index c01b86238884b..e334ab9865f99 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Block\Bml\Shortcut
  *
- * @since 2.0.0
  */
 class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
 {
@@ -20,7 +19,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Whether the block should be eventually rendered
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_shouldRender = true;
 
@@ -28,7 +26,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     private $_paymentMethodCode = '';
 
@@ -36,7 +33,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Shortcut alias
      *
      * @var string
-     * @since 2.0.0
      */
     private $_alias = '';
 
@@ -44,19 +40,16 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Start express action
      *
      * @var string
-     * @since 2.0.0
      */
     private $_startAction = '';
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     private $_paymentData;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     private $_mathRandom;
 
@@ -64,7 +57,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Bml method code
      *
      * @var string
-     * @since 2.0.0
      */
     private $_bmlMethodCode = '';
 
@@ -75,7 +67,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
 
     /**
      * @var ValidatorInterface
-     * @since 2.0.0
      */
     private $_shortcutValidator;
 
@@ -91,7 +82,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * @param string $shortcutTemplate
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -119,7 +109,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -155,7 +144,6 @@ protected function _beforeToHtml()
      * Render the block if needed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -169,7 +157,6 @@ protected function _toHtml()
      * Check is "OR" label position before shortcut
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOrPositionBefore()
     {
@@ -180,7 +167,6 @@ public function isOrPositionBefore()
      * Check is "OR" label position after shortcut
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOrPositionAfter()
     {
@@ -191,7 +177,6 @@ public function isOrPositionAfter()
      * Get shortcut alias
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAlias()
     {
diff --git a/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php b/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
index f86a33a4d9b74..31c285f5a6dc8 100644
--- a/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
+++ b/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
@@ -12,13 +12,11 @@
  * PayPal order review page validation messages block
  *
  * @api
- * @since 2.0.0
  */
 class ValidationMessages extends \Magento\Framework\View\Element\Messages
 {
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
@@ -30,7 +28,6 @@ class ValidationMessages extends \Magento\Framework\View\Element\Messages
      * @param InterpretationStrategyInterface $interpretationStrategy
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -54,7 +51,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -69,7 +65,6 @@ protected function _prepareLayout()
      * Add quote messages
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addQuoteMessages()
     {
diff --git a/app/code/Magento/Paypal/Block/Checkout/Onepage/Success/BillingAgreement.php b/app/code/Magento/Paypal/Block/Checkout/Onepage/Success/BillingAgreement.php
index 36ba5c81e3020..c21071314c6e4 100644
--- a/app/code/Magento/Paypal/Block/Checkout/Onepage/Success/BillingAgreement.php
+++ b/app/code/Magento/Paypal/Block/Checkout/Onepage/Success/BillingAgreement.php
@@ -9,25 +9,21 @@
  * Billing agreement information on Order success page
  *
  * @api
- * @since 2.0.0
  */
 class BillingAgreement extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
@@ -37,7 +33,6 @@ class BillingAgreement extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Return billing agreement information
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Form.php b/app/code/Magento/Paypal/Block/Express/Form.php
index 6d85d1090cf5b..1bf29f5f559ac 100644
--- a/app/code/Magento/Paypal/Block/Express/Form.php
+++ b/app/code/Magento/Paypal/Block/Express/Form.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Paypal\Block\Express\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Form
 {
@@ -25,7 +24,6 @@ class Form extends \Magento\Payment\Block\Form
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_methodCode = Config::METHOD_WPP_EXPRESS;
 
@@ -33,37 +31,31 @@ class Form extends \Magento\Payment\Block\Form
      * Paypal data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_paypalData;
 
     /**
      * @var ConfigFactory
-     * @since 2.0.0
      */
     protected $_paypalConfigFactory;
 
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var null
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate;
 
     /**
      * @var CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -74,7 +66,6 @@ class Form extends \Magento\Payment\Block\Form
      * @param Data $paypalData
      * @param CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -97,7 +88,6 @@ public function __construct(
      * Set template and redirect message
      *
      * @return null
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -121,7 +111,6 @@ protected function _construct()
      * Payment method code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethodCode()
     {
@@ -132,7 +121,6 @@ public function getMethodCode()
      * Get initialized mark template
      *
      * @return Template
-     * @since 2.0.0
      */
     protected function _getMarkTemplate()
     {
@@ -147,7 +135,6 @@ protected function _getMarkTemplate()
      * @param Template $mark
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initializeRedirectTemplateWithMark(Template $mark)
     {
@@ -167,7 +154,6 @@ protected function _initializeRedirectTemplateWithMark(Template $mark)
      * Get billing agreement code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBillingAgreementCode()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Review.php b/app/code/Magento/Paypal/Block/Express/Review.php
index ce63ed36d9b39..21618c6cb55f6 100644
--- a/app/code/Magento/Paypal/Block/Express/Review.php
+++ b/app/code/Magento/Paypal/Block/Express/Review.php
@@ -16,25 +16,21 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Review extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $_address;
 
     /**
      * @var \Magento\Customer\Model\Address\Config
-     * @since 2.0.0
      */
     protected $_addressConfig;
 
@@ -42,7 +38,6 @@ class Review extends \Magento\Framework\View\Element\Template
      * Currently selected shipping rate
      *
      * @var Rate
-     * @since 2.0.0
      */
     protected $_currentShippingRate = null;
 
@@ -50,19 +45,16 @@ class Review extends \Magento\Framework\View\Element\Template
      * Paypal controller path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_controllerPath = 'paypal/express';
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -72,7 +64,6 @@ class Review extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -92,7 +83,6 @@ public function __construct(
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -104,7 +94,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * Return quote billing address
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -115,7 +104,6 @@ public function getBillingAddress()
      * Return quote shipping address
      *
      * @return false|\Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -130,7 +118,6 @@ public function getShippingAddress()
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return string
-     * @since 2.0.0
      */
     public function renderAddress($address)
     {
@@ -145,7 +132,6 @@ public function renderAddress($address)
      *
      * @param string $carrierCode
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierName($carrierCode)
     {
@@ -160,7 +146,6 @@ public function getCarrierName($carrierCode)
      *
      * @param \Magento\Framework\DataObject $rate
      * @return string
-     * @since 2.0.0
      */
     public function renderShippingRateValue(\Magento\Framework\DataObject $rate)
     {
@@ -177,7 +162,6 @@ public function renderShippingRateValue(\Magento\Framework\DataObject $rate)
      * @param string $format
      * @param string $inclTaxFormat
      * @return string
-     * @since 2.0.0
      */
     public function renderShippingRateOption($rate, $format = '%s - %s%s', $inclTaxFormat = ' (%s %s)')
     {
@@ -202,7 +186,6 @@ public function renderShippingRateOption($rate, $format = '%s - %s%s', $inclTaxF
      * Getter for current shipping rate
      *
      * @return Rate
-     * @since 2.0.0
      */
     public function getCurrentShippingRate()
     {
@@ -213,7 +196,6 @@ public function getCurrentShippingRate()
      * Whether can edit shipping method
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEditShippingMethod()
     {
@@ -224,7 +206,6 @@ public function canEditShippingMethod()
      * Get quote email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -237,7 +218,6 @@ public function getEmail()
      *
      * @param string $prefix
      * @return void
-     * @since 2.0.0
      */
     public function setControllerPath($prefix)
     {
@@ -250,7 +230,6 @@ public function setControllerPath($prefix)
      * @param float $price
      * @param bool $isInclTax
      * @return string
-     * @since 2.0.0
      */
     protected function _getShippingPrice($price, $isInclTax)
     {
@@ -262,7 +241,6 @@ protected function _getShippingPrice($price, $isInclTax)
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     protected function _formatPrice($price)
     {
@@ -279,7 +257,6 @@ protected function _formatPrice($price)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Review/Billing.php b/app/code/Magento/Paypal/Block/Express/Review/Billing.php
index 94c5545d475ea..1a29240b2a642 100644
--- a/app/code/Magento/Paypal/Block/Express/Review/Billing.php
+++ b/app/code/Magento/Paypal/Block/Express/Review/Billing.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Billing extends \Magento\Framework\View\Element\Template
 {
@@ -22,7 +21,6 @@ class Billing extends \Magento\Framework\View\Element\Template
      * Sales Quote Billing Address instance
      *
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $address;
 
@@ -30,55 +28,46 @@ class Billing extends \Magento\Framework\View\Element\Template
      * Customer Taxvat Widget block
      *
      * @var \Magento\Customer\Block\Widget\Taxvat
-     * @since 2.0.0
      */
     protected $taxvat;
 
     /**
      * @var \Magento\Quote\Model\Quote\AddressFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $customer;
 
     /**
      * @var Quote
-     * @since 2.0.0
      */
     protected $quote;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $countryCollectionFactory;
 
@@ -91,7 +80,6 @@ class Billing extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param Quote\AddressFactory $addressFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -117,7 +105,6 @@ public function __construct(
      * Initialize billing address step
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -134,7 +121,6 @@ protected function _construct()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isUseBillingAddressForShipping()
     {
@@ -148,7 +134,6 @@ public function isUseBillingAddressForShipping()
      * Return country collection
      *
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.0.0
      */
     public function getCountries()
     {
@@ -159,7 +144,6 @@ public function getCountries()
      * Return checkout method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -171,7 +155,6 @@ public function getMethod()
      * If Sales Quote Address First Name is not defined - return Customer First Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -183,7 +166,6 @@ public function getFirstname()
      * If Sales Quote Address Last Name is not defined - return Customer Last Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -194,7 +176,6 @@ public function getLastname()
      * Check is Quote items can ship to
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShip()
     {
@@ -203,7 +184,6 @@ public function canShip()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -213,7 +193,6 @@ public function getSaveUrl()
      * Get Customer Taxvat Widget block
      *
      * @return \Magento\Customer\Block\Widget\Taxvat
-     * @since 2.0.0
      */
     protected function _getTaxvat()
     {
@@ -228,7 +207,6 @@ protected function _getTaxvat()
      * Check whether taxvat is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTaxvatEnabled()
     {
@@ -237,7 +215,6 @@ public function isTaxvatEnabled()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTaxvatHtml()
     {
@@ -252,7 +229,6 @@ public function getTaxvatHtml()
      * Return Sales Quote Address model
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -278,7 +254,6 @@ public function getAddress()
      *
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -289,7 +264,6 @@ public function getConfig($path)
      * Get logged in customer
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function _getCustomer()
     {
@@ -303,7 +277,6 @@ protected function _getCustomer()
      * Retrieve checkout session model
      *
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     public function getCheckout()
     {
@@ -314,7 +287,6 @@ public function getCheckout()
      * Retrieve sales quote model
      *
      * @return Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -326,7 +298,6 @@ public function getQuote()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isCustomerLoggedIn()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Review/Details.php b/app/code/Magento/Paypal/Block/Express/Review/Details.php
index a1600f7c4b149..26bc630a79f0c 100644
--- a/app/code/Magento/Paypal/Block/Express/Review/Details.php
+++ b/app/code/Magento/Paypal/Block/Express/Review/Details.php
@@ -11,13 +11,11 @@
  * Paypal Express Onepage checkout block
  *
  * @api
- * @since 2.0.0
  */
 class Details extends \Magento\Checkout\Block\Cart\Totals
 {
     /**
      * @var Address
-     * @since 2.0.0
      */
     protected $_address;
 
@@ -25,7 +23,6 @@ class Details extends \Magento\Checkout\Block\Cart\Totals
      * Return review shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -39,7 +36,6 @@ public function getAddress()
      * Return review quote totals
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Review/Shipping.php b/app/code/Magento/Paypal/Block/Express/Review/Shipping.php
index 6b47d9d837eb8..b1b8c9ca41a35 100644
--- a/app/code/Magento/Paypal/Block/Express/Review/Shipping.php
+++ b/app/code/Magento/Paypal/Block/Express/Review/Shipping.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Paypal\Block\Express\Review\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends \Magento\Framework\View\Element\Template
 {
@@ -23,49 +22,41 @@ class Shipping extends \Magento\Framework\View\Element\Template
      * Sales Quote Shipping Address instance
      *
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $address = null;
 
     /**
      * @var \Magento\Quote\Model\Quote\AddressFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $customer;
 
     /**
      * @var Quote
-     * @since 2.0.0
      */
     protected $quote;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
@@ -77,7 +68,6 @@ class Shipping extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Quote\Model\Quote\AddressFactory $addressFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -101,7 +91,6 @@ public function __construct(
      * Initialize shipping address step
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -117,7 +106,6 @@ protected function _construct()
      * Return checkout method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -128,7 +116,6 @@ public function getMethod()
      * Retrieve is allow and show block
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShow()
     {
@@ -139,7 +126,6 @@ public function isShow()
      * Return Sales Quote Address model (shipping address)
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -159,7 +145,6 @@ public function getAddress()
      *
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -170,7 +155,6 @@ public function getConfig($path)
      * Get logged in customer
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function _getCustomer()
     {
@@ -184,7 +168,6 @@ protected function _getCustomer()
      * Retrieve sales quote model
      *
      * @return Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -196,7 +179,6 @@ public function getQuote()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isCustomerLoggedIn()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/Express/Shortcut.php
index 4d08ea18451a0..cd8d9565b1c4a 100644
--- a/app/code/Magento/Paypal/Block/Express/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Express/Shortcut.php
@@ -13,7 +13,6 @@
  * Paypal express checkout shortcut link
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
 {
@@ -21,7 +20,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Whether the block should be eventually rendered
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_shouldRender = true;
 
@@ -29,7 +27,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_paymentMethodCode = '';
 
@@ -37,7 +34,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Start express action
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_startAction = '';
 
@@ -45,7 +41,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Express checkout model factory name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = '';
 
@@ -53,43 +48,36 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * Shortcut alias
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_alias = '';
 
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_paypalConfigFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Paypal\Model\Express\Checkout\Factory
-     * @since 2.0.0
      */
     protected $_checkoutFactory;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $_mathRandom;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var ValidatorInterface
-     * @since 2.0.0
      */
     private $_shortcutValidator;
 
@@ -114,7 +102,6 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -152,7 +139,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -191,7 +177,6 @@ protected function _beforeToHtml()
      * Render the block if needed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -222,7 +207,6 @@ protected function shouldRender()
      * Check is "OR" label position before shortcut
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOrPositionBefore()
     {
@@ -233,7 +217,6 @@ public function isOrPositionBefore()
      * Check is "OR" label position after shortcut
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOrPositionAfter()
     {
@@ -244,7 +227,6 @@ public function isOrPositionAfter()
      * Get shortcut alias
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAlias()
     {
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
index 889d4c7fb036d..92281d3058eef 100644
--- a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
+++ b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
@@ -9,13 +9,11 @@
  * Hosted Pro link form
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Form
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'hss/info.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php
index 214c0eaf3c4ce..f67c8d6759a3c 100644
--- a/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php
@@ -9,7 +9,6 @@
  * Hosted Pro iframe block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Iframe extends \Magento\Paypal\Block\Iframe
 {
@@ -18,7 +17,6 @@ class Iframe extends \Magento\Paypal\Block\Iframe
      * Set payment method code
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get iframe action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php
index 21d4985470e9e..eabfc587af626 100644
--- a/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php
+++ b/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Paypal\Block\Hosted\Pro\Info
  *
- * @since 2.0.0
  */
 class Info extends \Magento\Paypal\Block\Payment\Info
 {
@@ -22,7 +21,6 @@ class Info extends \Magento\Paypal\Block\Payment\Info
      * Don't show CC type
      *
      * @return false
-     * @since 2.0.0
      */
     public function getCcTypeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Iframe.php b/app/code/Magento/Paypal/Block/Iframe.php
index e288cb874ccbd..2bf0ca516f2b1 100644
--- a/app/code/Magento/Paypal/Block/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Iframe.php
@@ -9,7 +9,6 @@
  * HSS iframe block
  *
  * @api
- * @since 2.0.0
  */
 class Iframe extends \Magento\Payment\Block\Form
 {
@@ -17,7 +16,6 @@ class Iframe extends \Magento\Payment\Block\Form
      * Whether the block should be eventually rendered
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_shouldRender = false;
 
@@ -25,7 +23,6 @@ class Iframe extends \Magento\Payment\Block\Form
      * Order object
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
@@ -33,7 +30,6 @@ class Iframe extends \Magento\Payment\Block\Form
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_paymentMethodCode;
 
@@ -41,43 +37,36 @@ class Iframe extends \Magento\Payment\Block\Form
      * Current iframe block instance
      *
      * @var \Magento\Payment\Block\Form
-     * @since 2.0.0
      */
     protected $_block;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'hss/js.phtml';
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Paypal\Helper\Hss
-     * @since 2.0.0
      */
     protected $_hssHelper;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $reader;
 
@@ -89,7 +78,6 @@ class Iframe extends \Magento\Payment\Block\Form
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param \Magento\Framework\Module\Dir\Reader $reader
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -113,7 +101,6 @@ public function __construct(
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -138,7 +125,6 @@ protected function _construct()
      *
      * @return \Magento\Payment\Block\Form
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getBlock()
     {
@@ -162,7 +148,6 @@ protected function _getBlock()
      * Get order object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected function _getOrder()
     {
@@ -177,7 +162,6 @@ protected function _getOrder()
      * Get frontend checkout session object
      *
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected function _getCheckout()
     {
@@ -188,7 +172,6 @@ protected function _getCheckout()
      * Before rendering html, check if is block rendering needed
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -210,7 +193,6 @@ protected function _beforeToHtml()
      * Render the block if needed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -228,7 +210,6 @@ protected function _toHtml()
      * Check whether block is rendering after save payment
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAfterPaymentSave()
     {
@@ -248,7 +229,6 @@ protected function _isAfterPaymentSave()
      * Get iframe action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
@@ -259,7 +239,6 @@ public function getFrameActionUrl()
      * Get secure token
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureToken()
     {
@@ -270,7 +249,6 @@ public function getSecureToken()
      * Get secure token ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureTokenId()
     {
@@ -281,7 +259,6 @@ public function getSecureTokenId()
      * Get payflow transaction URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTransactionUrl()
     {
@@ -292,7 +269,6 @@ public function getTransactionUrl()
      * Check sandbox mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTestMode()
     {
diff --git a/app/code/Magento/Paypal/Block/Logo.php b/app/code/Magento/Paypal/Block/Logo.php
index b597041df853f..6b3900afb485e 100644
--- a/app/code/Magento/Paypal/Block/Logo.php
+++ b/app/code/Magento/Paypal/Block/Logo.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Logo extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected $_paypalConfig;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -32,7 +29,6 @@ class Logo extends \Magento\Framework\View\Element\Template
      * @param \Magento\Paypal\Model\Config $paypalConfig
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Return URL for Paypal Landing page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAboutPaypalPageUrl()
     {
@@ -60,7 +55,6 @@ public function getAboutPaypalPageUrl()
      * Getter for paypal config
      *
      * @return \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected function _getConfig()
     {
@@ -71,7 +65,6 @@ protected function _getConfig()
      * Disable block output if logo turned off
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
index 520b58755b9b5..d777279ad47a8 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
@@ -9,13 +9,11 @@
  * Payflow Advanced iframe block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Paypal\Block\Payflow\Link\Form
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'payflowadvanced/info.phtml';
 
@@ -23,7 +21,6 @@ class Form extends \Magento\Paypal\Block\Payflow\Link\Form
      * Get frame action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Iframe.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Iframe.php
index 22b1a3c593e63..a949babeb61ca 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Iframe.php
@@ -9,7 +9,6 @@
  * Payflow Advanced iframe block
  *
  * @api
- * @since 2.0.0
  */
 class Iframe extends \Magento\Paypal\Block\Payflow\Link\Iframe
 {
@@ -22,7 +21,6 @@ class Iframe extends \Magento\Paypal\Block\Payflow\Link\Iframe
      * @param \Magento\Framework\Module\Dir\Reader $reader
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -51,7 +49,6 @@ public function __construct(
      * Set payment method code
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -63,7 +60,6 @@ protected function _construct()
      * Get frame action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
@@ -74,7 +70,6 @@ public function getFrameActionUrl()
      * Check sandbox mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTestMode()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
index 25b66c63c1e9d..856e7221d0715 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
@@ -9,7 +9,6 @@
  * @deprecated 2.2.0 This class should not be used because parent class can handle client calls.
  *             Class was not removed for backward compatibility.
  * @see \Magento\Paypal\Block\Payment\Info
- * @since 2.0.0
  */
 class Info extends \Magento\Paypal\Block\Payflow\Link\Info
 {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Bml/Form.php b/app/code/Magento/Paypal/Block/Payflow/Bml/Form.php
index 55d0950f8d54b..8a2687bc8a5dd 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Bml/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Bml/Form.php
@@ -11,14 +11,12 @@
 /**
  * @todo methodCode should be set in constructor, than this form should be eliminated
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Paypal\Block\Bml\Form
 {
     /**
      * Payment method code
      * @var string
-     * @since 2.0.0
      */
     protected $_methodCode = Config::METHOD_WPP_PE_BML;
 }
diff --git a/app/code/Magento/Paypal/Block/Payflow/Info.php b/app/code/Magento/Paypal/Block/Payflow/Info.php
index 18f88553a3722..d7e74c74471e0 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Info.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Info.php
@@ -9,7 +9,6 @@
  * @deprecated 2.2.0 This class should not be used because parent class can handle client calls.
  *             Class was not removed for backward compatibility.
  * @see \Magento\Paypal\Block\Payment\Info
- * @since 2.0.0
  */
 class Info extends \Magento\Paypal\Block\Payment\Info
 {
@@ -18,7 +17,6 @@ class Info extends \Magento\Paypal\Block\Payment\Info
      *
      * @return false
      * @deprecated 2.2.0 unused
-     * @since 2.0.0
      */
     public function getCcTypeName()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
index 8643dd42f796f..f414a63d69046 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
@@ -9,13 +9,11 @@
  * Payflow link iframe block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Form
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'payflowlink/info.phtml';
 
@@ -23,7 +21,6 @@ class Form extends \Magento\Payment\Block\Form
      * Get frame action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Iframe.php b/app/code/Magento/Paypal/Block/Payflow/Link/Iframe.php
index 3f5202a34c4d1..5fbecbec68f9b 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Link/Iframe.php
@@ -9,7 +9,6 @@
  * Payflow link iframe block
  *
  * @api
- * @since 2.0.0
  */
 class Iframe extends \Magento\Paypal\Block\Iframe
 {
@@ -17,7 +16,6 @@ class Iframe extends \Magento\Paypal\Block\Iframe
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData = null;
 
@@ -30,7 +28,6 @@ class Iframe extends \Magento\Paypal\Block\Iframe
      * @param \Magento\Framework\Module\Dir\Reader $reader
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +47,6 @@ public function __construct(
      * Set payment method code
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +58,6 @@ protected function _construct()
      * Get frame action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrameActionUrl()
     {
@@ -73,7 +68,6 @@ public function getFrameActionUrl()
      * Get secure token
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureToken()
     {
@@ -84,7 +78,6 @@ public function getSecureToken()
      * Get secure token ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureTokenId()
     {
@@ -95,7 +88,6 @@ public function getSecureTokenId()
      * Get payflow transaction URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTransactionUrl()
     {
@@ -110,7 +102,6 @@ public function getTransactionUrl()
      * Check sandbox mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTestMode()
     {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Info.php b/app/code/Magento/Paypal/Block/Payflow/Link/Info.php
index 8c3075716c634..5c573bc6ea22f 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Info.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Link/Info.php
@@ -9,7 +9,6 @@
  * @deprecated 2.2.0 This class should not be used because parent class can handle client calls.
  *             Class was not removed for backward compatibility.
  * @see \Magento\Paypal\Block\Payment\Info
- * @since 2.0.0
  */
 class Info extends \Magento\Paypal\Block\Payment\Info
 {
@@ -18,7 +17,6 @@ class Info extends \Magento\Paypal\Block\Payment\Info
      *
      * @return false
      * @deprecated 2.2.0 unused
-     * @since 2.0.0
      */
     public function getCcTypeName()
     {
diff --git a/app/code/Magento/Paypal/Block/PayflowExpress/Form.php b/app/code/Magento/Paypal/Block/PayflowExpress/Form.php
index e319a977b2da4..4157d4ab0ee89 100644
--- a/app/code/Magento/Paypal/Block/PayflowExpress/Form.php
+++ b/app/code/Magento/Paypal/Block/PayflowExpress/Form.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Paypal\Block\PayflowExpress\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Paypal\Block\Express\Form
 {
     /**
      * Payment method code
      * @var string
-     * @since 2.0.0
      */
     protected $_methodCode = Config::METHOD_WPP_PE_EXPRESS;
 
@@ -25,7 +23,6 @@ class Form extends \Magento\Paypal\Block\Express\Form
      * No billing agreements available for payflow express
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBillingAgreementCode()
     {
diff --git a/app/code/Magento/Paypal/Block/Payment/Form/Billing/Agreement.php b/app/code/Magento/Paypal/Block/Payment/Form/Billing/Agreement.php
index 0e6b906cb558d..c02526156d941 100644
--- a/app/code/Magento/Paypal/Block/Payment/Form/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Block/Payment/Form/Billing/Agreement.php
@@ -7,19 +7,16 @@
 
 /**
  * Paypal Billing Agreement form block
- * @since 2.0.0
  */
 class Agreement extends \Magento\Payment\Block\Form
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Paypal::payment/form/billing/agreement.phtml';
 
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
@@ -27,7 +24,6 @@ class Agreement extends \Magento\Payment\Block\Form
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -56,7 +51,6 @@ protected function _construct()
      * Retrieve available customer billing agreements
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBillingAgreements()
     {
diff --git a/app/code/Magento/Paypal/Block/Payment/Info.php b/app/code/Magento/Paypal/Block/Payment/Info.php
index 17e8072facde5..f2e949e6533ed 100644
--- a/app/code/Magento/Paypal/Block/Payment/Info.php
+++ b/app/code/Magento/Paypal/Block/Payment/Info.php
@@ -8,13 +8,11 @@
 /**
  * PayPal common payment info block
  * Uses default templates
- * @since 2.0.0
  */
 class Info extends \Magento\Payment\Block\Info\Cc
 {
     /**
      * @var \Magento\Paypal\Model\InfoFactory
-     * @since 2.0.0
      */
     protected $_paypalInfoFactory;
 
@@ -23,7 +21,6 @@ class Info extends \Magento\Payment\Block\Info\Cc
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Magento\Paypal\Model\InfoFactory $paypalInfoFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Don't show CC type for non-CC methods
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCcTypeName()
     {
@@ -53,7 +49,6 @@ public function getCcTypeName()
      *
      * @param \Magento\Framework\DataObject|array|null $transport
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareSpecificInformation($transport = null)
     {
diff --git a/app/code/Magento/Paypal/Block/Payment/Info/Billing/Agreement.php b/app/code/Magento/Paypal/Block/Payment/Info/Billing/Agreement.php
index 4647ce8bc92fe..11248c15dbeaa 100644
--- a/app/code/Magento/Paypal/Block/Payment/Info/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Block/Payment/Info/Billing/Agreement.php
@@ -7,7 +7,6 @@
 
 /**
  * Billing Agreement info block
- * @since 2.0.0
  */
 class Agreement extends \Magento\Payment\Block\Info
 {
@@ -16,7 +15,6 @@ class Agreement extends \Magento\Payment\Block\Info
      *
      * @param \Magento\Framework\DataObject|array|null $transport
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareSpecificInformation($transport = null)
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement.php
index 1faefbd3f2f54..97f6d41b43c68 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement.php
@@ -7,7 +7,6 @@
 
 /**
  * Adminhtml billing agreement controller
- * @since 2.0.0
  */
 abstract class Agreement extends \Magento\Backend\App\Action
 {
@@ -22,14 +21,12 @@ abstract class Agreement extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * Initialize billing agreement by ID specified in request
      *
      * @return \Magento\Paypal\Model\Billing\Agreement|false
-     * @since 2.0.0
      */
     protected function _initBillingAgreement()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php
index 324da56d4a0e7..05eed609795e1 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -24,7 +23,6 @@ class Cancel extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * Cancel billing agreement action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php
index 7df5f8519fcb1..40de731d78e4f 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\CustomerGrid
  *
- * @since 2.0.0
  */
 class CustomerGrid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -19,7 +18,6 @@ class CustomerGrid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreemen
      * Initialize customer by ID specified in request
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initCurrentCustomer()
     {
@@ -34,7 +32,6 @@ protected function initCurrentCustomer()
      * Customer billing agreements ajax action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php
index 170e2a3a1c465..5691a530d76d1 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -24,7 +23,6 @@ class Delete extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * Delete billing agreement action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php
index 59524b908aa9f..2219cc27f0c93 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -24,7 +23,6 @@ class Grid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * Ajax action for billing agreements
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
index 70c64d2f6c2f6..f3e9e8d0d4f84 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -24,7 +23,6 @@ class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * Billing agreements
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php
index 28a09f2f5a62c..b4b2216dd0757 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\OrdersGrid
  *
- * @since 2.0.0
  */
 class OrdersGrid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -17,7 +16,6 @@ class OrdersGrid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * Related orders ajax action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php
index 010d76d002040..f00b35b4c3418 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Billing\Agreement\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
 {
@@ -24,7 +23,6 @@ class View extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
      * View billing agreement action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
index fbd019aa62a66..1b14783919e06 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
@@ -7,7 +7,6 @@
 
 /**
  * PayPal Settlement Reports Controller
- * @since 2.0.0
  */
 abstract class Reports extends \Magento\Backend\App\Action
 {
@@ -22,25 +21,21 @@ abstract class Reports extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Paypal\Model\Report\Settlement\RowFactory
-     * @since 2.0.0
      */
     protected $_rowFactory;
 
     /**
      * @var \Magento\Paypal\Model\Report\SettlementFactory
-     * @since 2.0.0
      */
     protected $_settlementFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -50,7 +45,6 @@ abstract class Reports extends \Magento\Backend\App\Action
      * @param \Magento\Paypal\Model\Report\Settlement\RowFactory $rowFactory
      * @param \Magento\Paypal\Model\Report\SettlementFactory $settlementFactory
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      * Initialize titles, navigation
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php
index 4400024485013..906884cd32bdd 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Paypal\Reports\Details
  *
- * @since 2.0.0
  */
 class Details extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
 {
@@ -24,7 +23,6 @@ class Details extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
      * View transaction details action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
index b0654db79feb4..33daebd117648 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Paypal\Reports\Fetch
  *
- * @since 2.0.0
  */
 class Fetch extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
 {
@@ -29,7 +28,6 @@ class Fetch extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
      * Forced fetch reports action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php
index 15ca28e7d5cf1..7968e6c8db56d 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Paypal\Reports\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
      * Ajax callback for grid actions
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
index b31caad153669..2bf6ad05de095 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Adminhtml\Paypal\Reports\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
 {
@@ -24,7 +23,6 @@ class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
      * Grid action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
index ff0abcc6549d7..a7cd4fbe731bf 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
@@ -9,7 +9,6 @@
  * Class RequestSecureToken
  *
  * @package Magento\Paypal\Controller\Adminhtml\Transparent
- * @since 2.0.0
  */
 class RequestSecureToken extends \Magento\Paypal\Controller\Transparent\RequestSecureToken
 {
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/Response.php
index f9d757938651d..4265e6356b36d 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/Response.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/Response.php
@@ -9,7 +9,6 @@
  * Class Response
  *
  * @package Magento\Paypal\Controller\Adminhtml\Transparent
- * @since 2.0.0
  */
 class Response extends \Magento\Paypal\Controller\Transparent\Response
 {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement.php b/app/code/Magento/Paypal/Controller/Billing/Agreement.php
index 33e5caf07426d..54ad9bb06f289 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement.php
@@ -9,7 +9,6 @@
 
 /**
  * Billing agreements controller
- * @since 2.0.0
  */
 abstract class Agreement extends \Magento\Framework\App\Action\Action
 {
@@ -17,14 +16,12 @@ abstract class Agreement extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -56,7 +52,6 @@ public function dispatch(RequestInterface $request)
      * Init billing agreement model from request
      *
      * @return \Magento\Paypal\Model\Billing\Agreement|false
-     * @since 2.0.0
      */
     protected function _initAgreement()
     {
@@ -83,7 +78,6 @@ protected function _initAgreement()
      * Retrieve customer session model
      *
      * @return \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected function _getSession()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php
index c81d58aec6c21..2648508e706fc 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -18,7 +17,6 @@ class Cancel extends \Magento\Paypal\Controller\Billing\Agreement
      * Set billing agreement status to 'Canceled'
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php
index 758eef6fad97e..c26eb0c51afea 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\CancelWizard
  *
- * @since 2.0.0
  */
 class CancelWizard extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -17,7 +16,6 @@ class CancelWizard extends \Magento\Paypal\Controller\Billing\Agreement
      * Wizard cancel action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
index 8dc258f9ea8d5..6e31b95158681 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Paypal\Controller\Billing\Agreement
      * View billing agreements
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php
index 11aec3614b695..cfdd5dce7913a 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\ReturnWizard
  *
- * @since 2.0.0
  */
 class ReturnWizard extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -19,7 +18,6 @@ class ReturnWizard extends \Magento\Paypal\Controller\Billing\Agreement
      * Wizard return action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php
index 62582a277eb2e..30c36cb915bcb 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\StartWizard
  *
- * @since 2.0.0
  */
 class StartWizard extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -17,7 +16,6 @@ class StartWizard extends \Magento\Paypal\Controller\Billing\Agreement
      * Wizard start action
      *
      * @return \Magento\Framework\App\Response\Http
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php
index d3c82575da391..1b58382b230ec 100644
--- a/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php
+++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Billing\Agreement\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Paypal\Controller\Billing\Agreement
 {
@@ -17,7 +16,6 @@ class View extends \Magento\Paypal\Controller\Billing\Agreement
      * View billing agreement
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Bml/Start.php b/app/code/Magento/Paypal/Controller/Bml/Start.php
index 72329d128d2cb..19699c1fc9b68 100644
--- a/app/code/Magento/Paypal/Controller/Bml/Start.php
+++ b/app/code/Magento/Paypal/Controller/Bml/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Bml\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Framework\App\Action\Action
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Framework\App\Action\Action
      * Action for Bill Me Later checkout button (product view and shopping cart pages)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
index e9dc12e8b36bf..571d73d07b68e 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
@@ -11,13 +11,11 @@
 /**
  * Abstract Express Checkout Controller
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractExpress extends AppAction implements RedirectLoginInterface
 {
     /**
      * @var \Magento\Paypal\Model\Express\Checkout
-     * @since 2.0.0
      */
     protected $_checkout;
 
@@ -25,19 +23,16 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
      * Internal cache of checkout models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_checkoutTypes = [];
 
     /**
      * @var \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote = false;
 
@@ -45,7 +40,6 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType;
 
@@ -53,7 +47,6 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod;
 
@@ -61,49 +54,41 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Paypal\Model\Express\Checkout\Factory
-     * @since 2.0.0
      */
     protected $_checkoutFactory;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_paypalSession;
 
     /**
      * @var \Magento\Framework\Url\Helper
-     * @since 2.0.0
      */
     protected $_urlHelper;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
@@ -116,7 +101,6 @@ abstract class AbstractExpress extends AppAction implements RedirectLoginInterfa
      * @param \Magento\Framework\Session\Generic $paypalSession
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -145,7 +129,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initCheckout()
     {
@@ -174,7 +157,6 @@ protected function _initCheckout()
      * @param string|null $setToken
      * @return $this|string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initToken($setToken = null)
     {
@@ -209,7 +191,6 @@ protected function _initToken($setToken = null)
      * PayPal session instance getter
      *
      * @return \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -220,7 +201,6 @@ protected function _getSession()
      * Return checkout session object
      *
      * @return \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected function _getCheckoutSession()
     {
@@ -231,7 +211,6 @@ protected function _getCheckoutSession()
      * Return checkout quote object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function _getQuote()
     {
@@ -244,7 +223,6 @@ protected function _getQuote()
     /**
      * Returns before_auth_url redirect parameter for customer session
      * @return null
-     * @since 2.0.0
      */
     public function getCustomerBeforeAuthUrl()
     {
@@ -254,7 +232,6 @@ public function getCustomerBeforeAuthUrl()
     /**
      * Returns a list of action flags [flag_key] => boolean
      * @return array
-     * @since 2.0.0
      */
     public function getActionFlagList()
     {
@@ -264,7 +241,6 @@ public function getActionFlagList()
     /**
      * Returns login url parameter for redirect
      * @return string
-     * @since 2.0.0
      */
     public function getLoginUrl()
     {
@@ -274,7 +250,6 @@ public function getLoginUrl()
     /**
      * Returns action name which requires redirect
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectActionName()
     {
@@ -285,7 +260,6 @@ public function getRedirectActionName()
      * Redirect to login page
      *
      * @return void
-     * @since 2.0.0
      */
     public function redirectLogin()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
index 83a2ef7ee7872..b544d490e07d5 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -19,7 +18,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress
      * Cancel Express Checkout
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php
index c65f13b3075c9..0ffd042ae5e55 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress
      * Dispatch customer back to PayPal for editing payment information
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
index 409daf0bd0a5d..aa016ed954ff0 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
@@ -11,13 +11,11 @@
 /**
  * Class PlaceOrder
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
     /**
      * @var \Magento\Checkout\Api\AgreementsValidatorInterface
-     * @since 2.0.0
      */
     protected $agreementsValidator;
 
@@ -31,7 +29,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -62,7 +59,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -132,7 +128,6 @@ public function execute()
      *
      * @param \Magento\Paypal\Model\Api\ProcessableException $exception
      * @return void
-     * @since 2.0.0
      */
     protected function _processPaypalApiError($exception)
     {
@@ -169,7 +164,6 @@ protected function _processPaypalApiError($exception)
      * Redirect customer back to PayPal with the same token
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _redirectSameToken()
     {
@@ -184,7 +178,6 @@ protected function _redirectSameToken()
      *
      * @param string $errorMessage
      * @return void
-     * @since 2.0.0
      */
     protected function _redirectToCartAndShowError($errorMessage)
     {
@@ -209,7 +202,6 @@ private function redirectToOrderReviewPageAndShowError($errorMessage)
      * Return true if agreements validation required
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidationRequired()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php
index d0a89913f521f..acaa5a568927d 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\ReturnAction
  *
- * @since 2.0.0
  */
 class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -19,7 +18,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress
      * Return from PayPal and dispatch customer to order review page
      *
      * @return void|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php
index 2cea0ae929c68..b27b01ec855c2 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\Review
  *
- * @since 2.0.0
  */
 class Review extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -19,7 +18,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress
      * Review order after returning from PayPal
      *
      * @return void|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php
index e82fd1cf8541c..71cd60a24c713 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\SaveShippingMethod
  *
- * @since 2.0.0
  */
 class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -17,7 +16,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Update shipping method (combined action for ajax and regular request)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
index a5075405a8fb9..b42c540d211e7 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\ShippingOptionsCallback
  *
- * @since 2.0.0
  */
 class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -29,7 +27,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Return shipping options items for shipping address from request
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
index 6df6555fbcfb4..df959c2cb0998 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Start
- * @since 2.0.0
  */
 class Start extends GetToken
 {
@@ -18,7 +17,6 @@ class Start extends GetToken
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php
index 2b001c92e30eb..7c82b9b70b2c7 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\AbstractExpress\UpdateShippingMethods
  *
- * @since 2.0.0
  */
 class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractExpress
 {
@@ -17,7 +16,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Update Order (combined action for ajax and regular request)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/Cancel.php b/app/code/Magento/Paypal/Controller/Express/Cancel.php
index 1461726c4f440..ed64f4020c0d8 100644
--- a/app/code/Magento/Paypal/Controller/Express/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Express/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
 {
@@ -17,7 +16,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/Edit.php b/app/code/Magento/Paypal/Controller/Express/Edit.php
index 4a4279482f849..90061e846d27e 100644
--- a/app/code/Magento/Paypal/Controller/Express/Edit.php
+++ b/app/code/Magento/Paypal/Controller/Express/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/PlaceOrder.php
index bb34def019d0a..ed73d7fd36c1a 100644
--- a/app/code/Magento/Paypal/Controller/Express/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/PlaceOrder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\PlaceOrder
  *
- * @since 2.0.0
  */
 class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\PlaceOrder
 {
@@ -17,7 +16,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/ReturnAction.php b/app/code/Magento/Paypal/Controller/Express/ReturnAction.php
index d3f88731cce67..147a04d55634a 100644
--- a/app/code/Magento/Paypal/Controller/Express/ReturnAction.php
+++ b/app/code/Magento/Paypal/Controller/Express/ReturnAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\ReturnAction
  *
- * @since 2.0.0
  */
 class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\ReturnAction
 {
@@ -17,7 +16,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/Review.php b/app/code/Magento/Paypal/Controller/Express/Review.php
index f21d5e3b006f1..9677ae2eaef4f 100644
--- a/app/code/Magento/Paypal/Controller/Express/Review.php
+++ b/app/code/Magento/Paypal/Controller/Express/Review.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\Review
  *
- * @since 2.0.0
  */
 class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
 {
@@ -17,7 +16,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/SaveShippingMethod.php b/app/code/Magento/Paypal/Controller/Express/SaveShippingMethod.php
index cf6568afdfe70..89c0bc8b5e42b 100644
--- a/app/code/Magento/Paypal/Controller/Express/SaveShippingMethod.php
+++ b/app/code/Magento/Paypal/Controller/Express/SaveShippingMethod.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\SaveShippingMethod
  *
- * @since 2.0.0
  */
 class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpress\SaveShippingMethod
 {
@@ -17,7 +16,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/ShippingOptionsCallback.php
index 7d18f72d956cf..6d2e6a0f01ce8 100644
--- a/app/code/Magento/Paypal/Controller/Express/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Express/ShippingOptionsCallback.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\ShippingOptionsCallback
  *
- * @since 2.0.0
  */
 class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress\ShippingOptionsCallback
 {
@@ -17,7 +16,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/Start.php b/app/code/Magento/Paypal/Controller/Express/Start.php
index bf4f21c06b20a..0de0e659ae942 100644
--- a/app/code/Magento/Paypal/Controller/Express/Start.php
+++ b/app/code/Magento/Paypal/Controller/Express/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/UpdateShippingMethods.php b/app/code/Magento/Paypal/Controller/Express/UpdateShippingMethods.php
index 24e412b70e2bc..679780e4caabd 100644
--- a/app/code/Magento/Paypal/Controller/Express/UpdateShippingMethods.php
+++ b/app/code/Magento/Paypal/Controller/Express/UpdateShippingMethods.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Express\UpdateShippingMethods
  *
- * @since 2.0.0
  */
 class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractExpress\UpdateShippingMethods
 {
@@ -17,7 +16,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
@@ -33,7 +30,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php b/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php
index 8f9fd7440918f..560092e359280 100644
--- a/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Paypal\Controller\Hostedpro\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var Checkout
-     * @since 2.0.0
      */
     private $checkoutHelper;
 
     /**
      * @param Context $context
      * @param Checkout $checkoutHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Customer canceled payment on gateway side.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php b/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php
index 64ff24fdde68c..1f4da82d5edff 100644
--- a/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php
+++ b/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Hostedpro\Redirect
  *
- * @since 2.0.0
  */
 class Redirect extends \Magento\Paypal\Controller\Payflow
 {
@@ -17,7 +16,6 @@ class Redirect extends \Magento\Paypal\Controller\Payflow
      * Redirect to HostedPro gateway into iframe
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -30,7 +28,6 @@ public function execute()
      * Get order object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected function getOrder()
     {
diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php b/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php
index 9f12936d2099f..676d12736affe 100644
--- a/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php
+++ b/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Hostedpro\ReturnAction
  *
- * @since 2.0.0
  */
 class ReturnAction extends \Magento\Framework\App\Action\Action
 {
@@ -17,7 +16,6 @@ class ReturnAction extends \Magento\Framework\App\Action\Action
      * When a customer return to website from gateway.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index 1a89c09b15866..ca2670292ec8a 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -11,19 +11,16 @@
 
 /**
  * Unified IPN controller for all supported PayPal methods
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Paypal\Model\IpnFactory
-     * @since 2.0.0
      */
     protected $_ipnFactory;
 
@@ -31,7 +28,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Paypal\Model\IpnFactory $ipnFactory
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflow.php b/app/code/Magento/Paypal/Controller/Payflow.php
index d5d1e579e99eb..ab21986bde3ba 100644
--- a/app/code/Magento/Paypal/Controller/Payflow.php
+++ b/app/code/Magento/Paypal/Controller/Payflow.php
@@ -7,44 +7,37 @@
 
 /**
  * Payflow Checkout Controller
- * @since 2.0.0
  */
 abstract class Payflow extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Paypal\Model\PayflowlinkFactory
-     * @since 2.0.0
      */
     protected $_payflowModelFactory;
 
     /**
      * @var \Magento\Paypal\Helper\Checkout
-     * @since 2.0.0
      */
     protected $_checkoutHelper;
 
     /**
      * Redirect block name
      * @var string
-     * @since 2.0.0
      */
     protected $_redirectBlockName = 'payflow.link.iframe';
 
@@ -55,7 +48,6 @@ abstract class Payflow extends \Magento\Framework\App\Action\Action
      * @param \Magento\Paypal\Model\PayflowlinkFactory $payflowModelFactory
      * @param \Magento\Paypal\Helper\Checkout $checkoutHelper
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -78,7 +70,6 @@ public function __construct(
      *
      * @param string $errorMsg
      * @return false|string
-     * @since 2.0.0
      */
     protected function _cancelPayment($errorMsg = '')
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
index d04ce53d57adb..8327aa3b5426d 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflow\CancelPayment
  *
- * @since 2.0.0
  */
 class CancelPayment extends \Magento\Paypal\Controller\Payflow
 {
@@ -17,7 +16,6 @@ class CancelPayment extends \Magento\Paypal\Controller\Payflow
      * When a customer cancel payment from payflow gateway.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflow/Form.php b/app/code/Magento/Paypal/Controller/Payflow/Form.php
index a336ba77624fb..5a516d281cabd 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/Form.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/Form.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Form
- * @since 2.0.0
  */
 class Form extends Payflow
 {
@@ -17,7 +16,6 @@ class Form extends Payflow
      * Submit transaction to Payflow getaway into iframe
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
index e5fcccf08671b..8dd0c1ad334de 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Paypal\Controller\Payflow\ReturnUrl
  *
- * @since 2.0.0
  */
 class ReturnUrl extends Payflow
 {
     /**
      * @var array of allowed order states on frontend
-     * @since 2.0.0
      */
     protected $allowedOrderStates = [
         Order::STATE_PROCESSING,
@@ -30,7 +28,7 @@ class ReturnUrl extends Payflow
     /**
      * Payment method code
      * @var string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $allowedPaymentMethodCodes = [
         Config::METHOD_PAYFLOWPRO,
@@ -41,7 +39,6 @@ class ReturnUrl extends Payflow
      * When a customer return to website from payflow gateway.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -77,7 +74,7 @@ public function execute()
      *
      * @param Order $order
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function checkOrderState(Order $order)
     {
@@ -89,7 +86,7 @@ protected function checkOrderState(Order $order)
      *
      * @param Order $order
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function checkPaymentMethod(Order $order)
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
index 488d845b9ceab..b7c25acd8caf6 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflow\SilentPost
  *
- * @since 2.0.0
  */
 class SilentPost extends \Magento\Paypal\Controller\Payflow
 {
@@ -17,7 +16,6 @@ class SilentPost extends \Magento\Paypal\Controller\Payflow
      * Get response from PayPal by silent post method
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflowadvanced/CancelPayment.php b/app/code/Magento/Paypal/Controller/Payflowadvanced/CancelPayment.php
index 7df319efdeb4c..d00bb2d13f838 100644
--- a/app/code/Magento/Paypal/Controller/Payflowadvanced/CancelPayment.php
+++ b/app/code/Magento/Paypal/Controller/Payflowadvanced/CancelPayment.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowadvanced\CancelPayment
  *
- * @since 2.0.0
  */
 class CancelPayment extends \Magento\Paypal\Controller\Payflow\CancelPayment
 {
     /**
      * Redirect block name
      * @var string
-     * @since 2.0.0
      */
     protected $_redirectBlockName = 'payflow.advanced.iframe';
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowadvanced/Form.php b/app/code/Magento/Paypal/Controller/Payflowadvanced/Form.php
index 47a1a9dd95a27..2cfaa7ddf989f 100644
--- a/app/code/Magento/Paypal/Controller/Payflowadvanced/Form.php
+++ b/app/code/Magento/Paypal/Controller/Payflowadvanced/Form.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowadvanced\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Paypal\Controller\Payflow\Form
 {
diff --git a/app/code/Magento/Paypal/Controller/Payflowadvanced/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflowadvanced/ReturnUrl.php
index eaa388d935785..e8f31dc9a96c9 100644
--- a/app/code/Magento/Paypal/Controller/Payflowadvanced/ReturnUrl.php
+++ b/app/code/Magento/Paypal/Controller/Payflowadvanced/ReturnUrl.php
@@ -11,21 +11,19 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowadvanced\ReturnUrl
  *
- * @since 2.0.0
  */
 class ReturnUrl extends \Magento\Paypal\Controller\Payflow\ReturnUrl
 {
     /**
      * Redirect block name
      * @var string
-     * @since 2.0.0
      */
     protected $_redirectBlockName = 'payflow.advanced.iframe';
 
     /**
      * Payment method code
      * @var string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $allowedPaymentMethodCodes = [
         Config::METHOD_PAYFLOWADVANCED
diff --git a/app/code/Magento/Paypal/Controller/Payflowadvanced/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflowadvanced/SilentPost.php
index 0ee4c478e8e0b..fec034d460618 100644
--- a/app/code/Magento/Paypal/Controller/Payflowadvanced/SilentPost.php
+++ b/app/code/Magento/Paypal/Controller/Payflowadvanced/SilentPost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowadvanced\SilentPost
  *
- * @since 2.0.0
  */
 class SilentPost extends \Magento\Paypal\Controller\Payflow\SilentPost
 {
diff --git a/app/code/Magento/Paypal/Controller/Payflowbml/Start.php b/app/code/Magento/Paypal/Controller/Payflowbml/Start.php
index ead2431d5f335..724486d187172 100644
--- a/app/code/Magento/Paypal/Controller/Payflowbml/Start.php
+++ b/app/code/Magento/Paypal/Controller/Payflowbml/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowbml\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Framework\App\Action\Action
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Framework\App\Action\Action
      * Action for Bill Me Later checkout button (product view and shopping cart pages)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Cancel.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Cancel.php
index 0106f92572141..ae9b5635133cd 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
 {
@@ -17,7 +16,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress\Cancel
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Edit.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Edit.php
index 4a6691112c20d..5f8ea75341be2 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/Edit.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress\Edit
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Payflowexpress/PlaceOrder.php
index c2ccc52115453..3a6f605063429 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/PlaceOrder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\PlaceOrder
  *
- * @since 2.0.0
  */
 class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\PlaceOrder
 {
@@ -17,7 +16,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress\Plac
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/ReturnAction.php b/app/code/Magento/Paypal/Controller/Payflowexpress/ReturnAction.php
index 38c973d42b64f..6dfd9e16cc74e 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/ReturnAction.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/ReturnAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\ReturnAction
  *
- * @since 2.0.0
  */
 class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\ReturnAction
 {
@@ -17,7 +16,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress\Re
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Review.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Review.php
index 64441fd224443..8432a6c074c80 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/Review.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Review.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\Review
  *
- * @since 2.0.0
  */
 class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
 {
@@ -17,7 +16,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress\Review
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/SaveShippingMethod.php b/app/code/Magento/Paypal/Controller/Payflowexpress/SaveShippingMethod.php
index 9947718da5a6c..3c368098dd9f0 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/SaveShippingMethod.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/SaveShippingMethod.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\SaveShippingMethod
  *
- * @since 2.0.0
  */
 class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpress\SaveShippingMethod
 {
@@ -17,7 +16,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Payflowexpress/ShippingOptionsCallback.php
index a2133c95caf6d..173b81ccb53a4 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/ShippingOptionsCallback.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\ShippingOptionsCallback
  *
- * @since 2.0.0
  */
 class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress\ShippingOptionsCallback
 {
@@ -17,7 +16,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
index 7a3deada31867..8916bb02e7e66 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/UpdateShippingMethods.php b/app/code/Magento/Paypal/Controller/Payflowexpress/UpdateShippingMethods.php
index e4ec21a8a79f2..bfbdc31266d4c 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/UpdateShippingMethods.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/UpdateShippingMethods.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Controller\Payflowexpress\UpdateShippingMethods
  *
- * @since 2.0.0
  */
 class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractExpress\UpdateShippingMethods
 {
@@ -17,7 +16,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Config mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -25,7 +23,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Config method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE
      * Checkout mode type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutType = \Magento\Paypal\Model\PayflowExpress\Checkout::class;
 }
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index cc894026324fc..2efae34a96459 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -20,37 +20,31 @@
  *
  * @package Magento\Paypal\Controller\Transparent
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RequestSecureToken extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var Generic
-     * @since 2.0.0
      */
     private $sessionTransparent;
 
     /**
      * @var SecureToken
-     * @since 2.0.0
      */
     private $secureTokenService;
 
     /**
      * @var SessionManager
-     * @since 2.0.0
      */
     private $sessionManager;
 
     /**
      * @var Transparent
-     * @since 2.0.0
      */
     private $transparent;
 
@@ -61,7 +55,6 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
      * @param SecureToken $secureTokenService
      * @param SessionManager $sessionManager
      * @param Transparent $transparent
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -83,7 +76,6 @@ public function __construct(
      * Send request to PayfloPro gateway for get Secure Token
      *
      * @return ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -115,7 +107,6 @@ public function execute()
 
     /**
      * @return Json
-     * @since 2.0.0
      */
     private function getErrorResponse()
     {
diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php
index da63d229e983b..a04b952d0a285 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/Response.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php
@@ -17,7 +17,6 @@
 
 /**
  * Class Response
- * @since 2.0.0
  */
 class Response extends \Magento\Framework\App\Action\Action
 {
@@ -25,19 +24,16 @@ class Response extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     private $coreRegistry;
 
     /**
      * @var Transaction
-     * @since 2.0.0
      */
     private $transaction;
 
     /**
      * @var ResponseValidator
-     * @since 2.0.0
      */
     private $responseValidator;
 
@@ -62,7 +58,6 @@ class Response extends \Magento\Framework\App\Action\Action
      * @param ResponseValidator $responseValidator
      * @param LayoutFactory $resultLayoutFactory
      * @param Transparent $transparent
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -82,7 +77,6 @@ public function __construct(
 
     /**
      * @return ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Cron/FetchReports.php b/app/code/Magento/Paypal/Cron/FetchReports.php
index e85f414eb1bf1..3ba2b927c5007 100644
--- a/app/code/Magento/Paypal/Cron/FetchReports.php
+++ b/app/code/Magento/Paypal/Cron/FetchReports.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Paypal\Cron\FetchReports
  *
- * @since 2.0.0
  */
 class FetchReports
 {
     /**
      * @var \Magento\Paypal\Model\Report\SettlementFactory
-     * @since 2.0.0
      */
     protected $_settlementFactory;
 
@@ -22,7 +20,6 @@ class FetchReports
      * Constructor
      *
      * @param \Magento\Paypal\Model\Report\SettlementFactory $settlementFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\Report\SettlementFactory $settlementFactory
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Paypal/Helper/Backend.php b/app/code/Magento/Paypal/Helper/Backend.php
index 27868b68a76dd..43eff59897c84 100644
--- a/app/code/Magento/Paypal/Helper/Backend.php
+++ b/app/code/Magento/Paypal/Helper/Backend.php
@@ -9,25 +9,21 @@
 
 /**
  * Paypal Backend helper
- * @since 2.0.0
  */
 class Backend extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var \Magento\Config\Model\Config
-     * @since 2.0.0
      */
     protected $backendConfig;
 
     /**
      * @var \Magento\Config\Model\Config\ScopeDefiner
-     * @since 2.0.0
      */
     protected $scopeDefiner;
 
@@ -36,7 +32,6 @@ class Backend extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Config\Model\Config $backendConfig
      * @param \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Get selected merchant country code in system configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigurationCountryCode()
     {
diff --git a/app/code/Magento/Paypal/Helper/Checkout.php b/app/code/Magento/Paypal/Helper/Checkout.php
index 295441ae9085c..a91d5fb4b99b2 100644
--- a/app/code/Magento/Paypal/Helper/Checkout.php
+++ b/app/code/Magento/Paypal/Helper/Checkout.php
@@ -9,19 +9,16 @@
 
 /**
  * Checkout workflow helper
- * @since 2.0.0
  */
 class Checkout
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @param \Magento\Checkout\Model\Session $session
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $session
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param string $comment Comment appended to order history
      * @return bool True if order cancelled, false otherwise
-     * @since 2.0.0
      */
     public function cancelCurrentOrder($comment)
     {
@@ -50,7 +46,6 @@ public function cancelCurrentOrder($comment)
      * Restores quote
      *
      * @return bool
-     * @since 2.0.0
      */
     public function restoreQuote()
     {
diff --git a/app/code/Magento/Paypal/Helper/Data.php b/app/code/Magento/Paypal/Helper/Data.php
index 10dbe470f8578..f6024afcdeb3c 100644
--- a/app/code/Magento/Paypal/Helper/Data.php
+++ b/app/code/Magento/Paypal/Helper/Data.php
@@ -14,7 +14,6 @@
 
 /**
  * Paypal Data helper
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,31 +24,26 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Cache for shouldAskToCreateBillingAgreement()
      *
      * @var bool
-     * @since 2.0.0
      */
     protected static $_shouldAskToCreateBillingAgreement = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData;
 
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $methodCodes;
 
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     private $configFactory;
 
@@ -71,7 +65,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
      * @param array $methodCodes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -93,7 +86,6 @@ public function __construct(
      * @param \Magento\Paypal\Model\Config $config
      * @param int $customerId
      * @return bool
-     * @since 2.0.0
      */
     public function shouldAskToCreateBillingAgreement(\Magento\Paypal\Model\Config $config, $customerId)
     {
@@ -114,7 +106,6 @@ public function shouldAskToCreateBillingAgreement(\Magento\Paypal\Model\Config $
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @param \Magento\Quote\Model\Quote|null $quote
      * @return BillingAgreementMethodInterface[]
-     * @since 2.0.0
      */
     public function getBillingAgreementMethods($store = null, $quote = null)
     {
@@ -141,7 +132,6 @@ function (MethodInterface $method) use ($quote) {
      * @param string $methodCode
      * @param string $txnId
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlTransactionId($methodCode, $txnId)
     {
diff --git a/app/code/Magento/Paypal/Helper/Hss.php b/app/code/Magento/Paypal/Helper/Hss.php
index 440c0d45e364a..e2bfd6c2c4426 100644
--- a/app/code/Magento/Paypal/Helper/Hss.php
+++ b/app/code/Magento/Paypal/Helper/Hss.php
@@ -7,7 +7,6 @@
 
 /**
  * Hosted Sole Solution helper
- * @since 2.0.0
  */
 class Hss extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -15,7 +14,6 @@ class Hss extends \Magento\Framework\App\Helper\AbstractHelper
      * Hosted Sole Solution methods
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_hssMethods = [
         \Magento\Paypal\Model\Config::METHOD_HOSTEDPRO,
@@ -25,7 +23,6 @@ class Hss extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -34,7 +31,6 @@ class Hss extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param string $name template name
      * @return string
-     * @since 2.0.0
      */
     public function getReviewButtonTemplate($name)
     {
@@ -67,7 +62,6 @@ public function getReviewButtonTemplate($name)
      * Get methods
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHssMethods()
     {
diff --git a/app/code/Magento/Paypal/Helper/Shortcut/CheckoutValidator.php b/app/code/Magento/Paypal/Helper/Shortcut/CheckoutValidator.php
index cf0950ce4acd5..9ee6c5c299160 100644
--- a/app/code/Magento/Paypal/Helper/Shortcut/CheckoutValidator.php
+++ b/app/code/Magento/Paypal/Helper/Shortcut/CheckoutValidator.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Paypal\Helper\Shortcut\CheckoutValidator
  *
- * @since 2.0.0
  */
 class CheckoutValidator implements ValidatorInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     private $_checkoutSession;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     private $_paymentData;
 
     /**
      * @var ShortcutCheckoutValidator
-     * @since 2.0.0
      */
     private $_shortcutValidator;
 
@@ -35,7 +31,6 @@ class CheckoutValidator implements ValidatorInterface
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param Validator $shortcutValidator
      * @param \Magento\Payment\Helper\Data $paymentData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -53,7 +48,6 @@ public function __construct(
      * @param string $code
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function validate($code, $isInCatalog)
     {
@@ -69,7 +63,6 @@ public function validate($code, $isInCatalog)
      * @param string $paymentCode
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodQuoteAvailable($paymentCode, $isInCatalog)
     {
@@ -88,7 +81,6 @@ public function isMethodQuoteAvailable($paymentCode, $isInCatalog)
      *
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function isQuoteSummaryValid($isInCatalog)
     {
diff --git a/app/code/Magento/Paypal/Helper/Shortcut/Factory.php b/app/code/Magento/Paypal/Helper/Shortcut/Factory.php
index e9bb1bcddb730..c89029163f0e4 100644
--- a/app/code/Magento/Paypal/Helper/Shortcut/Factory.php
+++ b/app/code/Magento/Paypal/Helper/Shortcut/Factory.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Helper\Shortcut\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -25,13 +24,11 @@ class Factory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
     /**
      * @param mixed $parameter
      * @return \Magento\Paypal\Helper\Shortcut\ValidatorInterface
-     * @since 2.0.0
      */
     public function create($parameter = null)
     {
diff --git a/app/code/Magento/Paypal/Helper/Shortcut/Validator.php b/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
index c2594ed41ed1c..70fb497984296 100644
--- a/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
+++ b/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
@@ -8,31 +8,26 @@
 
 /**
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
- * @since 2.0.0
  */
 class Validator implements ValidatorInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     private $_paypalConfigFactory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     private $_registry;
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     private $_productTypeConfig;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     private $_paymentData;
 
@@ -41,7 +36,6 @@ class Validator implements ValidatorInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $productTypeConfig
      * @param \Magento\Payment\Helper\Data $paymentData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\ConfigFactory $paypalConfigFactory,
@@ -61,7 +55,6 @@ public function __construct(
      * @param string $code
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function validate($code, $isInCatalog)
     {
@@ -76,7 +69,6 @@ public function validate($code, $isInCatalog)
      * @param string $paymentCode Payment method code
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function isContextAvailable($paymentCode, $isInCatalog)
     {
@@ -97,7 +89,6 @@ public function isContextAvailable($paymentCode, $isInCatalog)
      *
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function isPriceOrSetAvailable($isInCatalog)
     {
@@ -124,7 +115,6 @@ public function isPriceOrSetAvailable($isInCatalog)
      *
      * @param string $paymentCode
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodAvailable($paymentCode)
     {
diff --git a/app/code/Magento/Paypal/Helper/Shortcut/ValidatorInterface.php b/app/code/Magento/Paypal/Helper/Shortcut/ValidatorInterface.php
index 8daf3e0a37c7e..af5039fbc7059 100644
--- a/app/code/Magento/Paypal/Helper/Shortcut/ValidatorInterface.php
+++ b/app/code/Magento/Paypal/Helper/Shortcut/ValidatorInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Paypal\Helper\Shortcut\ValidatorInterface
  *
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -19,7 +18,6 @@ interface ValidatorInterface
      * @param string $code
      * @param bool $isInCatalog
      * @return bool
-     * @since 2.0.0
      */
     public function validate($code, $isInCatalog);
 }
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index e3fc060f126cf..6280683fb4f0a 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -14,7 +14,6 @@
 
 /**
  * Class AbstractConfig
- * @since 2.0.0
  */
 abstract class AbstractConfig implements ConfigInterface
 {
@@ -37,7 +36,6 @@ abstract class AbstractConfig implements ConfigInterface
      * Current payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_methodCode;
 
@@ -45,13 +43,11 @@ abstract class AbstractConfig implements ConfigInterface
      * Current store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pathPattern;
 
@@ -69,7 +65,6 @@ abstract class AbstractConfig implements ConfigInterface
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -79,7 +74,6 @@ public function __construct(
 
     /**
      * @var MethodInterface
-     * @since 2.0.0
      */
     protected $methodInstance;
 
@@ -88,7 +82,6 @@ public function __construct(
      *
      * @param MethodInterface $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodInstance($method)
     {
@@ -101,7 +94,6 @@ public function setMethodInstance($method)
      *
      * @param string|MethodInterface $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($method)
     {
@@ -117,7 +109,6 @@ public function setMethod($method)
      * Payment method instance code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethodCode()
     {
@@ -129,7 +120,6 @@ public function getMethodCode()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -145,7 +135,6 @@ public function setStoreId($storeId)
      * @return null|string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getValue($key, $storeId = null)
     {
@@ -173,7 +162,6 @@ public function getValue($key, $storeId = null)
      *
      * @param string $methodCode
      * @return void
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode)
     {
@@ -185,7 +173,6 @@ public function setMethodCode($methodCode)
      *
      * @param string $pathPattern
      * @return void
-     * @since 2.0.0
      */
     public function setPathPattern($pathPattern)
     {
@@ -197,7 +184,6 @@ public function setPathPattern($pathPattern)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getSpecificConfigPath($fieldName)
     {
@@ -214,7 +200,6 @@ protected function _getSpecificConfigPath($fieldName)
      * @param string $key Underscored key
      * @param string $value Old value
      * @return string Modified value or old value
-     * @since 2.0.0
      */
     protected function _prepareValue($key, $value)
     {
@@ -233,7 +218,6 @@ protected function _prepareValue($key, $value)
      * Check whether only Unilateral payments (Accelerated Boarding) possible for Express method or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldUseUnilateralPayments()
     {
@@ -244,7 +228,6 @@ public function shouldUseUnilateralPayments()
      * Check whether WPP API credentials are available for this method
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWppApiAvailabe()
     {
@@ -260,7 +243,6 @@ public function isWppApiAvailabe()
      * @param null $methodCode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodAvailable($methodCode = null)
     {
@@ -277,7 +259,6 @@ public function isMethodAvailable($methodCode = null)
      *
      * @todo: refactor this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isMethodActive($method)
     {
@@ -343,7 +324,6 @@ public function isMethodActive($method)
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isMethodSupportedForCountry($method = null, $countryCode = null)
     {
@@ -354,7 +334,6 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      * BN code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBuildNotationCode()
     {
diff --git a/app/code/Magento/Paypal/Model/AbstractIpn.php b/app/code/Magento/Paypal/Model/AbstractIpn.php
index 2a663327fd3f0..e83ae9fd5dec9 100644
--- a/app/code/Magento/Paypal/Model/AbstractIpn.php
+++ b/app/code/Magento/Paypal/Model/AbstractIpn.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Paypal\Model\AbstractIpn
  *
- * @since 2.0.0
  */
 class AbstractIpn
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -25,7 +23,6 @@ class AbstractIpn
      * IPN request data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ipnRequest;
 
@@ -33,19 +30,16 @@ class AbstractIpn
      * Collected debug information
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debugData = [];
 
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\CurlFactory
-     * @since 2.0.0
      */
     protected $_curlFactory;
 
@@ -54,7 +48,6 @@ class AbstractIpn
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\ConfigFactory $configFactory,
@@ -73,7 +66,6 @@ public function __construct(
      *
      * @param string $key
      * @return array|string
-     * @since 2.0.0
      */
     public function getRequestData($key = null)
     {
@@ -89,7 +81,6 @@ public function getRequestData($key = null)
      * @return void
      * @throws RemoteServiceUnavailableException
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _postBack()
     {
@@ -136,7 +127,6 @@ protected function _postBack()
      * @param string $ipnPaymentStatus
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _filterPaymentStatus($ipnPaymentStatus)
     {
@@ -176,7 +166,6 @@ protected function _filterPaymentStatus($ipnPaymentStatus)
      * Log debug data to file
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _debug()
     {
@@ -189,7 +178,6 @@ protected function _debug()
      * @param string $key
      * @param array|string $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _addDebugData($key, $value)
     {
diff --git a/app/code/Magento/Paypal/Model/Api/AbstractApi.php b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
index 6e3fb35cb5877..c82fcecddf051 100644
--- a/app/code/Magento/Paypal/Model/Api/AbstractApi.php
+++ b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
@@ -10,7 +10,6 @@
 
 /**
  * Abstract class for Paypal API wrappers
- * @since 2.0.0
  */
 abstract class AbstractApi extends \Magento\Framework\DataObject
 {
@@ -20,14 +19,12 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Config instance
      *
      * @var \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * Global private to public interface map
      * @var array
-     * @since 2.0.0
      */
     protected $_globalMap = [];
 
@@ -35,7 +32,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Filter callbacks for exporting $this data to API call
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_exportToRequestFilters = [];
 
@@ -43,7 +39,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Filter callbacks for importing API result to $this data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importFromRequestFilters = [];
 
@@ -51,13 +46,11 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Line items export to request mapping settings
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemExportItemsFormat = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemExportItemsFilters = [
         'name' => 'strval'
@@ -65,7 +58,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemTotalExportMap = [];
 
@@ -73,7 +65,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * PayPal shopping cart instance
      *
      * @var \Magento\Paypal\Model\Cart
-     * @since 2.0.0
      */
     protected $_cart;
 
@@ -81,7 +72,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Shipping options export to request mapping settings
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_shippingOptionsExportItemsFormat = [];
 
@@ -89,7 +79,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Fields that should be replaced in debug with '***'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = [];
 
@@ -97,31 +86,26 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * Customer address
      *
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $_customerAddress;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $customLogger;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
@@ -135,7 +119,6 @@ abstract class AbstractApi extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Directory\Model\RegionFactory $regionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddress,
@@ -157,7 +140,6 @@ public function __construct(
      * Return Paypal Api user name based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiUsername()
     {
@@ -168,7 +150,6 @@ public function getApiUsername()
      * Return Paypal Api password based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiPassword()
     {
@@ -179,7 +160,6 @@ public function getApiPassword()
      * Return Paypal Api signature based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiSignature()
     {
@@ -190,7 +170,6 @@ public function getApiSignature()
      * Return Paypal Api certificate based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiCertificate()
     {
@@ -201,7 +180,6 @@ public function getApiCertificate()
      * BN code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBuildNotationCode()
     {
@@ -213,7 +191,6 @@ public function getBuildNotationCode()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseProxy()
     {
@@ -224,7 +201,6 @@ public function getUseProxy()
      * Return Paypal Api proxy host based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProxyHost()
     {
@@ -235,7 +211,6 @@ public function getProxyHost()
      * Return Paypal Api proxy port based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProxyPort()
     {
@@ -246,7 +221,6 @@ public function getProxyPort()
      * PayPal page CSS getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageStyle()
     {
@@ -257,7 +231,6 @@ public function getPageStyle()
      * PayPal page header image URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHdrimg()
     {
@@ -268,7 +241,6 @@ public function getHdrimg()
      * PayPal page header border color getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHdrbordercolor()
     {
@@ -279,7 +251,6 @@ public function getHdrbordercolor()
      * PayPal page header background color getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHdrbackcolor()
     {
@@ -290,7 +261,6 @@ public function getHdrbackcolor()
      * PayPal page "payflow color" (?) getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPayflowcolor()
     {
@@ -301,7 +271,6 @@ public function getPayflowcolor()
      * Payment action getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentAction()
     {
@@ -312,7 +281,6 @@ public function getPaymentAction()
      * PayPal merchant email getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBusinessAccount()
     {
@@ -325,7 +293,6 @@ public function getBusinessAccount()
      * @param array|\Magento\Framework\DataObject $to
      * @param array $publicMap
      * @return array|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function import($to, array $publicMap = [])
     {
@@ -338,7 +305,6 @@ public function import($to, array $publicMap = [])
      * @param array|\Magento\Framework\DataObject $from
      * @param array $publicMap
      * @return $this
-     * @since 2.0.0
      */
     public function export($from, array $publicMap = [])
     {
@@ -351,7 +317,6 @@ public function export($from, array $publicMap = [])
      *
      * @param \Magento\Paypal\Model\Cart $cart
      * @return $this
-     * @since 2.0.0
      */
     public function setPaypalCart(\Magento\Paypal\Model\Cart $cart)
     {
@@ -364,7 +329,6 @@ public function setPaypalCart(\Magento\Paypal\Model\Cart $cart)
      *
      * @param \Magento\Paypal\Model\Config $config
      * @return $this
-     * @since 2.0.0
      */
     public function setConfigObject(\Magento\Paypal\Model\Config $config)
     {
@@ -376,7 +340,6 @@ public function setConfigObject(\Magento\Paypal\Model\Config $config)
      * Current locale code getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -387,7 +350,6 @@ public function getLocale()
      * Always take into account
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFraudManagementFiltersEnabled()
     {
@@ -400,7 +362,6 @@ public function getFraudManagementFiltersEnabled()
      * @param array $privateRequestMap
      * @param array $request
      * @return array
-     * @since 2.0.0
      */
     protected function &_exportToRequest(array $privateRequestMap, array $request = [])
     {
@@ -428,7 +389,6 @@ protected function &_exportToRequest(array $privateRequestMap, array $request =
      * @param array $privateResponseMap
      * @param array $response
      * @return void
-     * @since 2.0.0
      */
     protected function _importFromResponse(array $privateResponseMap, array $response)
     {
@@ -454,7 +414,6 @@ protected function _importFromResponse(array $privateResponseMap, array $respons
      * @param int $i
      * @return true|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _exportLineItems(array &$request, $i = 0)
     {
@@ -497,7 +456,6 @@ protected function _exportLineItems(array &$request, $i = 0)
      * @param array &$request
      * @param int $i
      * @return bool
-     * @since 2.0.0
      */
     protected function _exportShippingOptions(array &$request, $i = 0)
     {
@@ -526,7 +484,6 @@ protected function _exportShippingOptions(array &$request, $i = 0)
      *
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterBool($value)
     {
@@ -538,7 +495,6 @@ protected function _filterBool($value)
      *
      * @param mixed $value
      * @return int
-     * @since 2.0.0
      */
     protected function _filterInt($value)
     {
@@ -551,7 +507,6 @@ protected function _filterInt($value)
      * @param string $key
      * @param mixed|null $default
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getDataOrConfig($key, $default = null)
     {
@@ -566,7 +521,6 @@ protected function _getDataOrConfig($key, $default = null)
      *
      * @param \Magento\Framework\DataObject $address
      * @return string
-     * @since 2.0.0
      */
     protected function _lookupRegionCodeFromAddress(\Magento\Framework\DataObject $address)
     {
@@ -587,7 +541,6 @@ protected function _lookupRegionCodeFromAddress(\Magento\Framework\DataObject $a
      * @param \Magento\Framework\DataObject $address
      * @param array $to
      * @return void
-     * @since 2.0.0
      */
     protected function _importStreetFromAddress(\Magento\Framework\DataObject $address, array &$to)
     {
@@ -613,7 +566,6 @@ protected function _importStreetFromAddress(\Magento\Framework\DataObject $addre
      *
      * @param array $request
      * @return string
-     * @since 2.0.0
      */
     protected function _buildQuery($request)
     {
@@ -626,7 +578,6 @@ protected function _buildQuery($request)
      *
      * @param float|string|int $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterQty($value)
     {
@@ -638,7 +589,6 @@ protected function _filterQty($value)
      *
      * @param mixed $debugData
      * @return void
-     * @since 2.0.0
      */
     protected function _debug($debugData)
     {
@@ -654,7 +604,6 @@ protected function _debug($debugData)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getDebugFlag()
     {
@@ -666,7 +615,6 @@ public function getDebugFlag()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseCertAuthentication()
     {
@@ -677,7 +625,6 @@ public function getUseCertAuthentication()
      * Return replace keys for debug data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDebugReplacePrivateDataKeys()
     {
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index a2c9cbcfd6c46..238534a8cf929 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -19,7 +19,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
 {
@@ -55,7 +54,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Capture type (make authorization close or remain open)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_captureTypeComplete = 'Complete';
 
@@ -63,7 +61,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Capture type (make authorization close or remain open)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_captureTypeNotcomplete = 'NotComplete';
 
@@ -71,7 +68,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Global public interface map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_globalMap = [
         // each call
@@ -177,7 +173,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Filter callback for preparing internal amounts to NVP request
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_exportToRequestFilters = [
         'AMT' => 'formatPrice',
@@ -199,7 +194,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Filter callback for preparing internal amounts to NVP request
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_importFromRequestFilters = [
         'REDIRECTREQUIRED' => '_filterToBool',
@@ -211,7 +205,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Request map for each API call
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_eachCallRequest = ['VERSION', 'USER', 'PWD', 'SIGNATURE', 'BUTTONSOURCE'];
 
@@ -219,7 +212,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * SetExpressCheckout request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_setExpressCheckoutRequest = [
         'PAYMENTACTION',
@@ -252,7 +244,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * SetExpressCheckout response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_setExpressCheckoutResponse = ['TOKEN'];
 
@@ -260,7 +251,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * GetExpressCheckoutDetails request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getExpressCheckoutDetailsRequest = ['TOKEN', 'SUBJECT'];
 
@@ -268,7 +258,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoExpressCheckoutPayment request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doExpressCheckoutPaymentRequest = [
         'TOKEN',
@@ -290,7 +279,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoExpressCheckoutPayment response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doExpressCheckoutPaymentResponse = [
         'TRANSACTIONID',
@@ -304,7 +292,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoDirectPayment request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doDirectPaymentRequest = [
         'PAYMENTACTION',
@@ -335,7 +322,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoDirectPayment response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doDirectPaymentResponse = [
         'TRANSACTIONID',
@@ -350,7 +336,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoReauthorization request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doReauthorizationRequest = ['AUTHORIZATIONID', 'AMT', 'CURRENCYCODE'];
 
@@ -358,7 +343,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoReauthorization response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doReauthorizationResponse = [
         'AUTHORIZATIONID',
@@ -371,7 +355,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoCapture request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doCaptureRequest = ['AUTHORIZATIONID', 'COMPLETETYPE', 'AMT', 'CURRENCYCODE', 'NOTE', 'INVNUM'];
 
@@ -379,7 +362,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoCapture response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doCaptureResponse = ['TRANSACTIONID', 'CURRENCYCODE', 'AMT', 'PAYMENTSTATUS', 'PENDINGREASON'];
 
@@ -387,7 +369,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoAuthorization request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doAuthorizationRequest = ['TRANSACTIONID', 'AMT', 'CURRENCYCODE'];
 
@@ -395,7 +376,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoAuthorization response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doAuthorizationResponse = ['TRANSACTIONID', 'AMT'];
 
@@ -403,7 +383,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * DoVoid request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doVoidRequest = ['AUTHORIZATIONID', 'NOTE'];
 
@@ -411,7 +390,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * GetTransactionDetailsRequest
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getTransactionDetailsRequest = ['TRANSACTIONID'];
 
@@ -419,7 +397,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * GetTransactionDetailsResponse
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getTransactionDetailsResponse = [
         'PAYERID',
@@ -437,7 +414,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * RefundTransaction request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_refundTransactionRequest = ['TRANSACTIONID', 'REFUNDTYPE', 'CURRENCYCODE', 'NOTE'];
 
@@ -445,7 +421,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * RefundTransaction response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_refundTransactionResponse = ['REFUNDTRANSACTIONID', 'GROSSREFUNDAMT'];
 
@@ -453,7 +428,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * ManagePendingTransactionStatus request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_managePendingTransactionStatusRequest = ['TRANSACTIONID', 'ACTION'];
 
@@ -461,7 +435,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * ManagePendingTransactionStatus response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_managePendingTransactionStatusResponse = ['TRANSACTIONID', 'STATUS'];
 
@@ -469,7 +442,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * GetPalDetails response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getPalDetailsResponse = ['PAL'];
 
@@ -477,7 +449,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Map for billing address import/export
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_billingAddressMap = [
         'BUSINESS' => 'company',
@@ -502,14 +473,12 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Merging with $_billingAddressMap
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_billingAddressMapRequest = [];
 
     /**
      * Map for shipping address import/export (extends billing address mapper)
      * @var array
-     * @since 2.0.0
      */
     protected $_shippingAddressMap = [
         'SHIPTOCOUNTRYCODE' => 'country_id',
@@ -525,7 +494,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
     /**
      * Map for callback request
      * @var array
-     * @since 2.0.0
      */
     protected $_callbackRequestMap = [
         'SHIPTOCOUNTRY' => 'country_id',
@@ -539,7 +507,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
     /**
      * Payment information response specifically to be collected after some requests
      * @var string[]
-     * @since 2.0.0
      */
     protected $_paymentInformationResponse = [
         'PAYERID',
@@ -559,7 +526,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
     /**
      * Line items export mapping settings
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemTotalExportMap = [
         Cart::AMOUNT_SUBTOTAL => 'ITEMAMT',
@@ -570,7 +536,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
     /**
      * Line items export mapping settings
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemExportItemsFormat = [
         'id' => 'L_NUMBER%d',
@@ -582,7 +547,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
     /**
      * Shipping options export to request mapping settings
      * @var array
-     * @since 2.0.0
      */
     protected $_shippingOptionsExportItemsFormat = [
         'is_default' => 'L_SHIPPINGOPTIONISDEFAULT%d',
@@ -596,7 +560,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * init Billing Agreement request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customerBillingAgreementRequest = ['RETURNURL', 'CANCELURL', 'BILLINGTYPE'];
 
@@ -604,7 +567,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * init Billing Agreement response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customerBillingAgreementResponse = ['TOKEN'];
 
@@ -612,7 +574,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Billing Agreement details request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_billingAgreementCustomerDetailsRequest = ['TOKEN'];
 
@@ -620,7 +581,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Billing Agreement details response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_billingAgreementCustomerDetailsResponse = [
         'EMAIL',
@@ -634,7 +594,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Create Billing Agreement request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_createBillingAgreementRequest = ['TOKEN'];
 
@@ -642,7 +601,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Create Billing Agreement response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_createBillingAgreementResponse = ['BILLINGAGREEMENTID'];
 
@@ -650,7 +608,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Update Billing Agreement request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_updateBillingAgreementRequest = [
         'REFERENCEID',
@@ -663,7 +620,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Update Billing Agreement response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_updateBillingAgreementResponse = [
         'REFERENCEID',
@@ -676,7 +632,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Do Reference Transaction request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doReferenceTransactionRequest = [
         'REFERENCEID',
@@ -694,7 +649,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Do Reference Transaction response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doReferenceTransactionResponse = ['BILLINGAGREEMENTID', 'TRANSACTIONID'];
 
@@ -702,7 +656,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Fields that should be replaced in debug with '***'
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = [
         'ACCT',
@@ -720,7 +673,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Map of credit card types supported by this API
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_supportedCcTypes = [
         'VI' => 'Visa',
@@ -735,7 +687,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Required fields in the response
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_requiredResponseParams = [self::DO_DIRECT_PAYMENT => ['ACK', 'CORRELATIONID', 'AMT']];
 
@@ -743,7 +694,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Warning codes recollected after each API call
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_callWarnings = [];
 
@@ -751,7 +701,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Error codes recollected after each API call
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_callErrors = [];
 
@@ -759,31 +708,26 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * Whether to return raw response information after each call
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_rawResponseNeeded = false;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
     /**
      * @var \Magento\Paypal\Model\Api\ProcessableExceptionFactory
-     * @since 2.0.0
      */
     protected $_processableExceptionFactory;
 
     /**
      * @var \Magento\Framework\Exception\LocalizedExceptionFactory
-     * @since 2.0.0
      */
     protected $_frameworkExceptionFactory;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\CurlFactory
-     * @since 2.0.0
      */
     protected $_curlFactory;
 
@@ -791,7 +735,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * API call HTTP headers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_headers = [];
 
@@ -807,7 +750,6 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      * @param \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddress,
@@ -832,7 +774,6 @@ public function __construct(
      * API endpoint getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiEndpoint()
     {
@@ -844,7 +785,6 @@ public function getApiEndpoint()
      * Return Paypal Api version
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersion()
     {
@@ -855,7 +795,6 @@ public function getVersion()
      * Retrieve billing agreement type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBillingAgreementType()
     {
@@ -869,7 +808,6 @@ public function getBillingAgreementType()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetExpressCheckout
-     * @since 2.0.0
      */
     public function callSetExpressCheckout()
     {
@@ -901,7 +839,6 @@ public function callSetExpressCheckout()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetExpressCheckoutDetails
-     * @since 2.0.0
      */
     public function callGetExpressCheckoutDetails()
     {
@@ -917,7 +854,6 @@ public function callGetExpressCheckoutDetails()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoExpressCheckoutPayment
-     * @since 2.0.0
      */
     public function callDoExpressCheckoutPayment()
     {
@@ -940,7 +876,6 @@ public function callDoExpressCheckoutPayment()
      * Process a credit card payment
      *
      * @return void
-     * @since 2.0.0
      */
     public function callDoDirectPayment()
     {
@@ -958,7 +893,6 @@ public function callDoDirectPayment()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoReferenceTransaction
-     * @since 2.0.0
      */
     public function callDoReferenceTransaction()
     {
@@ -973,7 +907,6 @@ public function callDoReferenceTransaction()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsFraudDetected()
     {
@@ -984,7 +917,6 @@ public function getIsFraudDetected()
      * Made additional request to PayPal to get authorization id
      *
      * @return void
-     * @since 2.0.0
      */
     public function callDoReauthorization()
     {
@@ -998,7 +930,6 @@ public function callDoReauthorization()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoCapture
-     * @since 2.0.0
      */
     public function callDoCapture()
     {
@@ -1014,7 +945,6 @@ public function callDoCapture()
      *
      * @return $this
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoAuthorization
-     * @since 2.0.0
      */
     public function callDoAuthorization()
     {
@@ -1031,7 +961,6 @@ public function callDoAuthorization()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoVoid
-     * @since 2.0.0
      */
     public function callDoVoid()
     {
@@ -1044,7 +973,6 @@ public function callDoVoid()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
-     * @since 2.0.0
      */
     public function callGetTransactionDetails()
     {
@@ -1058,7 +986,6 @@ public function callGetTransactionDetails()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_RefundTransaction
-     * @since 2.0.0
      */
     public function callRefundTransaction()
     {
@@ -1075,7 +1002,6 @@ public function callRefundTransaction()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_ManagePendingTransactionStatus
-     * @since 2.0.0
      */
     public function callManagePendingTransactionStatus()
     {
@@ -1093,7 +1019,6 @@ public function callManagePendingTransactionStatus()
      * @return void
      * @link https://www.x.com/docs/DOC-1300
      * @link https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECButtonIntegration
-     * @since 2.0.0
      */
     public function callGetPalDetails()
     {
@@ -1106,7 +1031,6 @@ public function callGetPalDetails()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
-     * @since 2.0.0
      */
     public function callSetCustomerBillingAgreement()
     {
@@ -1120,7 +1044,6 @@ public function callSetCustomerBillingAgreement()
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetBillingAgreementCustomerDetails
-     * @since 2.0.0
      */
     public function callGetBillingAgreementCustomerDetails()
     {
@@ -1133,7 +1056,6 @@ public function callGetBillingAgreementCustomerDetails()
      * Create Billing Agreement call
      *
      * @return void
-     * @since 2.0.0
      */
     public function callCreateBillingAgreement()
     {
@@ -1146,7 +1068,6 @@ public function callCreateBillingAgreement()
      * Billing Agreement Update call
      *
      * @return void
-     * @since 2.0.0
      */
     public function callUpdateBillingAgreement()
     {
@@ -1167,7 +1088,6 @@ public function callUpdateBillingAgreement()
      *
      * @param array $request
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function prepareShippingOptionsCallbackAddress(array $request)
     {
@@ -1182,7 +1102,6 @@ public function prepareShippingOptionsCallbackAddress(array $request)
      * Prepare response for shipping options callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function formatShippingOptionsCallback()
     {
@@ -1200,7 +1119,6 @@ public function formatShippingOptionsCallback()
      * @param string $methodName
      * @param array $request
      * @return array
-     * @since 2.0.0
      */
     protected function _addMethodToRequest($methodName, $request)
     {
@@ -1214,7 +1132,6 @@ protected function _addMethodToRequest($methodName, $request)
      *
      * @param array $response
      * @return array
-     * @since 2.0.0
      */
     protected function _postProcessResponse($response)
     {
@@ -1244,7 +1161,6 @@ protected function _postProcessResponse($response)
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function call($methodName, array $request)
     {
@@ -1332,7 +1248,6 @@ public function call($methodName, array $request)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setRawResponseNeeded($flag)
     {
@@ -1347,7 +1262,6 @@ public function setRawResponseNeeded($flag)
      * @return void
      * @throws \Magento\Paypal\Model\Api\ProcessableException|\Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _handleCallErrors($response)
     {
@@ -1402,7 +1316,6 @@ protected function _handleCallErrors($response)
      * @param string $shortErrorMessage
      * @param string $longErrorMessage
      * @return string
-     * @since 2.0.0
      */
     protected function _formatErrorMessage($errorCode, $shortErrorMessage, $longErrorMessage)
     {
@@ -1418,7 +1331,6 @@ protected function _formatErrorMessage($errorCode, $shortErrorMessage, $longErro
      *
      * @param int $errorCode
      * @return bool
-     * @since 2.0.0
      */
     protected function _isProcessableError($errorCode)
     {
@@ -1436,7 +1348,6 @@ protected function _isProcessableError($errorCode)
      *
      * @param array $response
      * @return array
-     * @since 2.0.0
      */
     protected function _extractErrorsFromResponse($response)
     {
@@ -1463,7 +1374,6 @@ protected function _extractErrorsFromResponse($response)
      *
      * @param array $response
      * @return bool success flag
-     * @since 2.0.0
      */
     protected function _isCallSuccessful($response)
     {
@@ -1491,7 +1401,6 @@ protected function _isCallSuccessful($response)
      * @param string $method
      * @param array $response
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateResponse($method, $response)
     {
@@ -1509,7 +1418,6 @@ protected function _validateResponse($method, $response)
      * Parse an NVP response string into an associative array
      * @param string $nvpstr
      * @return array
-     * @since 2.0.0
      */
     protected function _deformatNVP($nvpstr)
     {
@@ -1540,7 +1448,6 @@ protected function _deformatNVP($nvpstr)
      * @param array $request
      * @param int $i
      * @return true|null
-     * @since 2.0.0
      */
     protected function _exportLineItems(array &$request, $i = 0)
     {
@@ -1556,7 +1463,6 @@ protected function _exportLineItems(array &$request, $i = 0)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function _exportAddressses($data)
     {
@@ -1581,7 +1487,6 @@ protected function _exportAddressses($data)
      *
      * @param \Magento\Framework\DataObject $address
      * @return void
-     * @since 2.0.0
      */
     protected function _applyStreetAndRegionWorkarounds(\Magento\Framework\DataObject $address)
     {
@@ -1612,7 +1517,6 @@ protected function _applyStreetAndRegionWorkarounds(\Magento\Framework\DataObjec
      *
      * @param array $to
      * @return array
-     * @since 2.0.0
      */
     protected function _importAddresses(array $to)
     {
@@ -1650,7 +1554,6 @@ protected function _importAddresses(array $to)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterCcType($value)
     {
@@ -1665,7 +1568,6 @@ protected function _filterCcType($value)
      *
      * @param mixed $value
      * @return bool|mixed
-     * @since 2.0.0
      */
     protected function _filterToBool($value)
     {
@@ -1682,7 +1584,6 @@ protected function _filterToBool($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterBillFailedLater($value)
     {
@@ -1694,7 +1595,6 @@ protected function _filterBillFailedLater($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterPeriodUnit($value)
     {
@@ -1719,7 +1619,6 @@ protected function _filterPeriodUnit($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterInitialAmountMayFail($value)
     {
@@ -1731,7 +1630,6 @@ protected function _filterInitialAmountMayFail($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _filterBillingAgreementStatus($value)
     {
@@ -1751,7 +1649,6 @@ protected function _filterBillingAgreementStatus($value)
      * @param string $value
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _filterPaymentStatusFromNvpToInfo($value)
     {
@@ -1792,7 +1689,6 @@ protected function _filterPaymentStatusFromNvpToInfo($value)
      *
      * @param string $value
      * @return string|null
-     * @since 2.0.0
      */
     protected function _filterPaymentReviewAction($value)
     {
@@ -1810,7 +1706,6 @@ protected function _filterPaymentReviewAction($value)
      * Return capture type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCaptureCompleteType()
     {
@@ -1822,7 +1717,6 @@ protected function _getCaptureCompleteType()
      *
      * @param string $methodName Current method name
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareEachCallRequest($methodName)
     {
@@ -1842,7 +1736,6 @@ protected function _prepareEachCallRequest($methodName)
      *
      * @param &array $requestFields
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareExpressCheckoutCallRequest(&$requestFields)
     {
diff --git a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
index 46bc033fcb8fe..6373c6d99fb16 100644
--- a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
+++ b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
@@ -12,7 +12,6 @@
  * NVP API wrappers model
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
 {
@@ -60,19 +59,13 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
 
     /**#@-*/
 
-    /**
-     * Capture type (make authorization close or remain open)
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_captureTypeComplete = 'Y';
 
     /**
      * Capture type (make authorization close or remain open)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_captureTypeNotcomplete = 'N';
 
@@ -80,7 +73,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Global public interface map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_globalMap = [
         // each call
@@ -150,7 +142,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Fields that should be replaced in debug with '***'
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = ['ACCT', 'EXPDATE', 'CVV2', 'PARTNER', 'USER', 'VENDOR', 'PWD'];
 
@@ -158,7 +149,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoDirectPayment request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doDirectPaymentRequest = [
         'ACCT',
@@ -186,7 +176,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoDirectPayment response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doDirectPaymentResponse = [
         'PNREF',
@@ -202,7 +191,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoCapture request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doCaptureRequest = ['ORIGID', 'CAPTURECOMPLETE', 'AMT', 'TENDER', 'NOTE', 'INVNUM'];
 
@@ -210,7 +198,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoCapture response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doCaptureResponse = ['PNREF', 'PPREF'];
 
@@ -218,7 +205,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoVoid request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doVoidRequest = ['ORIGID', 'NOTE', 'TENDER'];
 
@@ -226,7 +212,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Request map for each API call
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_eachCallRequest = ['PARTNER', 'USER', 'VENDOR', 'PWD', 'BUTTONSOURCE'];
 
@@ -234,7 +219,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * RefundTransaction request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_refundTransactionRequest = ['ORIGID', 'TENDER'];
 
@@ -242,7 +226,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * RefundTransaction response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_refundTransactionResponse = ['PNREF', 'PPREF'];
 
@@ -250,7 +233,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * SetExpressCheckout request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_setExpressCheckoutRequest = [
         'TENDER',
@@ -272,7 +254,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * SetExpressCheckout response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_setExpressCheckoutResponse = ['REPMSG', 'TOKEN'];
 
@@ -280,7 +261,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * GetExpressCheckoutDetails request/response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getExpressCheckoutDetailsRequest = ['TENDER', 'TOKEN'];
 
@@ -288,7 +268,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoExpressCheckoutPayment request map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doExpressCheckoutPaymentRequest = [
         'TENDER',
@@ -305,7 +284,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * DoExpressCheckoutPayment response map
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_doExpressCheckoutPaymentResponse = [
         'PNREF',
@@ -323,7 +301,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * GetTransactionDetailsRequest
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getTransactionDetailsRequest = ['ORIGID', 'TENDER'];
 
@@ -331,7 +308,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * GetTransactionDetailsResponse
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_getTransactionDetailsResponse = [
         'PAYERID',
@@ -348,7 +324,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Map for shipping address import/export (extends billing address mapper)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_shippingAddressMap = [
         'SHIPTOCOUNTRY' => 'country_id',
@@ -364,7 +339,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Map for billing address import/export
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_billingAddressMap = [
         'BUSINESS' => 'company',
@@ -388,7 +362,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Map for billing address to do request to Payflow
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_billingAddressMapRequest = ['country_id' => 'COUNTRY'];
 
@@ -396,7 +369,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Line items export mapping settings
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemTotalExportMap = [Cart::AMOUNT_TAX => 'TAXAMT', Cart::AMOUNT_SHIPPING => 'FREIGHTAMT'];
 
@@ -404,7 +376,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Line items export request totals format
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemsExportRequestTotalsFormat = [
         'amount' => 'PAYMENTREQUEST_%d_ITEMAMT',
@@ -416,7 +387,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Line items export items format
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_lineItemExportItemsFormat = [
         'name' => 'L_NAME%d',
@@ -428,7 +398,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Payment information response specifically to be collected after some requests
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_paymentInformationResponse = [
         'PAYERID',
@@ -445,7 +414,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * Required fields in the response
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_requiredResponseParams = [
         self::DO_DIRECT_PAYMENT => ['RESULT', 'PNREF', 'PPREF'],
@@ -453,13 +421,11 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var NvpFactory
-     * @since 2.0.0
      */
     protected $nvpFactory;
 
@@ -477,7 +443,6 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
      * @param NvpFactory $nvpFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddress,
@@ -513,7 +478,6 @@ public function __construct(
      * API endpoint getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiEndpoint()
     {
@@ -527,7 +491,6 @@ public function getApiEndpoint()
      * Return Payflow partner based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPartner()
     {
@@ -538,7 +501,6 @@ public function getPartner()
      * Return Payflow user based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUser()
     {
@@ -549,7 +511,6 @@ public function getUser()
      * Return Payflow password based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPassword()
     {
@@ -560,7 +521,6 @@ public function getPassword()
      * Return Payflow vendor based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVendor()
     {
@@ -571,7 +531,6 @@ public function getVendor()
      * Return Payflow tender based on config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTender()
     {
@@ -585,7 +544,6 @@ public function getTender()
      * Override transaction id getting to process payflow accounts not assigned to paypal side
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPaypalTransactionId()
     {
@@ -601,7 +559,6 @@ public function getPaypalTransactionId()
      * @param string $methodName
      * @param array $request
      * @return array
-     * @since 2.0.0
      */
     protected function _addMethodToRequest($methodName, $request)
     {
@@ -617,7 +574,6 @@ protected function _addMethodToRequest($methodName, $request)
      *
      * @param string $methodName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getPayflowActionName($methodName)
     {
@@ -637,7 +593,6 @@ protected function _getPayflowActionName($methodName)
      *
      * @param string| $methodName
      * @return string
-     * @since 2.0.0
      */
     protected function _mapPaypalMethodName($methodName)
     {
@@ -662,7 +617,6 @@ protected function _mapPaypalMethodName($methodName)
      *
      * @param array $response
      * @return bool success flag
-     * @since 2.0.0
      */
     protected function _isCallSuccessful($response)
     {
@@ -683,7 +637,6 @@ protected function _isCallSuccessful($response)
      * @param array $response
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _handleCallErrors($response)
     {
@@ -702,7 +655,6 @@ protected function _handleCallErrors($response)
      *
      * @param array $request
      * @return string
-     * @since 2.0.0
      */
     protected function _buildQuery($request)
     {
@@ -717,7 +669,6 @@ protected function _buildQuery($request)
      * Generate Request ID
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getRequestId()
     {
@@ -728,7 +679,6 @@ protected function getRequestId()
      * GetTransactionDetails method does not exists in Payflow
      *
      * @return void
-     * @since 2.0.0
      */
     public function callGetTransactionDetails()
     {
@@ -741,7 +691,6 @@ public function callGetTransactionDetails()
      * @param array $collectedWarnings
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _importFraudFiltersResult(array $from, array $collectedWarnings)
     {
@@ -758,7 +707,6 @@ protected function _importFraudFiltersResult(array $from, array $collectedWarnin
      * @param string $methodName Current method name
      * @return string[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _prepareEachCallRequest($methodName)
     {
@@ -771,7 +719,6 @@ protected function _prepareEachCallRequest($methodName)
      *
      * @param array $requestFields Standard set of values
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareExpressCheckoutCallRequest(&$requestFields)
     {
@@ -784,7 +731,6 @@ protected function _prepareExpressCheckoutCallRequest(&$requestFields)
      *
      * @param  array $response
      * @return array
-     * @since 2.0.0
      */
     protected function _postProcessResponse($response)
     {
@@ -812,7 +758,6 @@ protected function _postProcessResponse($response)
      * @param array $request
      * @param int $i
      * @return null|true
-     * @since 2.0.0
      */
     protected function _exportLineItems(array &$request, $i = 0)
     {
@@ -841,7 +786,6 @@ protected function _exportLineItems(array &$request, $i = 0)
     /**
      * Set specific data when negative line item case
      * @return void
-     * @since 2.0.0
      */
     protected function _setSpecificForNegativeLineItems()
     {
diff --git a/app/code/Magento/Paypal/Model/Api/ProcessableException.php b/app/code/Magento/Paypal/Model/Api/ProcessableException.php
index 1137af6ee2b91..9aeac9d0d75b9 100644
--- a/app/code/Magento/Paypal/Model/Api/ProcessableException.php
+++ b/app/code/Magento/Paypal/Model/Api/ProcessableException.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ProcessableException extends LocalizedException
 {
@@ -39,7 +38,6 @@ class ProcessableException extends LocalizedException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
@@ -51,7 +49,6 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
      * Get error message which can be displayed to website user
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getUserMessage()
     {
diff --git a/app/code/Magento/Paypal/Model/Api/Type/Factory.php b/app/code/Magento/Paypal/Model/Api/Type/Factory.php
index 5edc16f367774..a102e7a887538 100644
--- a/app/code/Magento/Paypal/Model/Api/Type/Factory.php
+++ b/app/code/Magento/Paypal/Model/Api/Type/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Model\Api\Type\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -28,7 +26,6 @@ class Factory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $data
      * @return \Magento\Paypal\Model\Api\AbstractApi
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
index b77f2b3619058..2ebe088d31d86 100644
--- a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
+++ b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
@@ -7,7 +7,6 @@
 
 /**
  * Billing Agreement abstaract class
- * @since 2.0.0
  */
 abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
 {
@@ -15,7 +14,6 @@ abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
      * Payment method instance
      *
      * @var \Magento\Payment\Model\MethodInterface
-     * @since 2.0.0
      */
     protected $_paymentMethodInstance = null;
 
@@ -23,7 +21,6 @@ abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
      * Billing Agreement Errors
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -31,7 +28,6 @@ abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
      * Init billing agreement
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function initToken();
 
@@ -39,7 +35,6 @@ abstract public function initToken();
      * Verify billing agreement details
      *
      * @return $this
-     * @since 2.0.0
      */
     abstract public function verifyToken();
 
@@ -47,7 +42,6 @@ abstract public function verifyToken();
      * Create billing agreement
      *
      * @return $this
-     * @since 2.0.0
      */
     abstract public function place();
 
@@ -55,7 +49,6 @@ abstract public function place();
      * Cancel billing agreement
      *
      * @return $this
-     * @since 2.0.0
      */
     abstract public function cancel();
 
@@ -63,7 +56,6 @@ abstract public function cancel();
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData = null;
 
@@ -74,7 +66,6 @@ abstract public function cancel();
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -92,7 +83,6 @@ public function __construct(
      * Retrieve payment method instance
      *
      * @return \Magento\Payment\Model\MethodInterface
-     * @since 2.0.0
      */
     public function getPaymentMethodInstance()
     {
@@ -107,7 +97,6 @@ public function getPaymentMethodInstance()
      * Validate data before save
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -126,7 +115,6 @@ public function isValid()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Paypal/Model/Billing/Agreement.php b/app/code/Magento/Paypal/Model/Billing/Agreement.php
index 77ac8c592345d..dc4de506d9220 100644
--- a/app/code/Magento/Paypal/Model/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Model/Billing/Agreement.php
@@ -31,7 +31,6 @@
  * @method \Magento\Paypal\Model\Billing\Agreement setAgreementLabel(string $value)
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Agreement extends \Magento\Paypal\Model\Billing\AbstractAgreement
 {
@@ -43,19 +42,16 @@ class Agreement extends \Magento\Paypal\Model\Billing\AbstractAgreement
      * Related agreement orders
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_relatedOrders = [];
 
     /**
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\CollectionFactory
-     * @since 2.0.0
      */
     protected $_billingAgreementFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
@@ -68,7 +64,6 @@ class Agreement extends \Magento\Paypal\Model\Billing\AbstractAgreement
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -89,7 +84,6 @@ public function __construct(
      * Init model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -100,7 +94,6 @@ protected function _construct()
      * Set created_at parameter
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -117,7 +110,6 @@ public function beforeSave()
      * Save agreement order relations
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -131,7 +123,6 @@ public function afterSave()
      * Retrieve billing agreement status label
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getStatusLabel()
     {
@@ -149,7 +140,6 @@ public function getStatusLabel()
      * Initialize token
      *
      * @return string
-     * @since 2.0.0
      */
     public function initToken()
     {
@@ -164,7 +154,6 @@ public function initToken()
      * Data from response is inside this object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function verifyToken()
     {
@@ -178,7 +167,6 @@ public function verifyToken()
      * Create billing agreement
      *
      * @return $this
-     * @since 2.0.0
      */
     public function place()
     {
@@ -201,7 +189,6 @@ public function place()
      * Cancel billing agreement
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -214,7 +201,6 @@ public function cancel()
      * Check whether can cancel billing agreement
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCancel()
     {
@@ -225,7 +211,6 @@ public function canCancel()
      * Retrieve billing agreement statuses array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStatusesArray()
     {
@@ -239,7 +224,6 @@ public function getStatusesArray()
      * Validate data
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid()
     {
@@ -262,7 +246,6 @@ public function isValid()
      *
      * @param Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     public function importOrderPayment(Payment $payment)
     {
@@ -287,7 +270,6 @@ public function importOrderPayment(Payment $payment)
      *
      * @param int $customerId
      * @return \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection
-     * @since 2.0.0
      */
     public function getAvailableCustomerBillingAgreements($customerId)
     {
@@ -303,7 +285,6 @@ public function getAvailableCustomerBillingAgreements($customerId)
      *
      * @param int $customerId
      * @return bool
-     * @since 2.0.0
      */
     public function needToCreateForCustomer($customerId)
     {
@@ -315,7 +296,6 @@ public function needToCreateForCustomer($customerId)
      *
      * @param int|\Magento\Sales\Model\Order $orderId
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderRelation($orderId)
     {
@@ -327,7 +307,6 @@ public function addOrderRelation($orderId)
      * Save related orders
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _saveOrderRelations()
     {
diff --git a/app/code/Magento/Paypal/Model/Billing/Agreement/MethodInterface.php b/app/code/Magento/Paypal/Model/Billing/Agreement/MethodInterface.php
index 730ab24e58ee0..ea4efe52dfec7 100644
--- a/app/code/Magento/Paypal/Model/Billing/Agreement/MethodInterface.php
+++ b/app/code/Magento/Paypal/Model/Billing/Agreement/MethodInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for payment methods that support billing agreements management
- * @since 2.0.0
  */
 interface MethodInterface
 {
@@ -16,7 +15,6 @@ interface MethodInterface
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
-     * @since 2.0.0
      */
     public function initBillingAgreementToken(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement);
 
@@ -25,7 +23,6 @@ public function initBillingAgreementToken(\Magento\Paypal\Model\Billing\Abstract
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return array
-     * @since 2.0.0
      */
     public function getBillingAgreementTokenInfo(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement);
 
@@ -34,7 +31,6 @@ public function getBillingAgreementTokenInfo(\Magento\Paypal\Model\Billing\Abstr
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
-     * @since 2.0.0
      */
     public function placeBillingAgreement(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement);
 
@@ -43,7 +39,6 @@ public function placeBillingAgreement(\Magento\Paypal\Model\Billing\AbstractAgre
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
-     * @since 2.0.0
      */
     public function updateBillingAgreementStatus(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement);
 }
diff --git a/app/code/Magento/Paypal/Model/Billing/Agreement/OrdersUpdater.php b/app/code/Magento/Paypal/Model/Billing/Agreement/OrdersUpdater.php
index 134da2770ac7a..c103b328159b9 100644
--- a/app/code/Magento/Paypal/Model/Billing/Agreement/OrdersUpdater.php
+++ b/app/code/Magento/Paypal/Model/Billing/Agreement/OrdersUpdater.php
@@ -7,19 +7,16 @@
 
 /**
  * Orders grid massaction items updater
- * @since 2.0.0
  */
 class OrdersUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registryManager;
 
     /**
      * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement
-     * @since 2.0.0
      */
     protected $_agreementResource;
 
@@ -28,7 +25,6 @@ class OrdersUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterIn
      * @param \Magento\Paypal\Model\ResourceModel\Billing\Agreement $agreementResource
      * @param array $data
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $coreRegistry,
@@ -49,7 +45,6 @@ public function __construct(
      * @param mixed $argument
      * @return mixed
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function update($argument)
     {
diff --git a/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php b/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
index 5dfc85eb7623e..b225b366045c9 100644
--- a/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
@@ -12,26 +12,22 @@
 
 /**
  * Class BillingAgreementConfigProvider
- * @since 2.0.0
  */
 class BillingAgreementConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var AgreementFactory
-     * @since 2.0.0
      */
     protected $agreementFactory;
 
     /**
      * @param CurrentCustomer $currentCustomer
      * @param AgreementFactory $agreementFactory
-     * @since 2.0.0
      */
     public function __construct(
         CurrentCustomer $currentCustomer,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -63,7 +58,6 @@ public function getConfig()
      * Retrieve available customer billing agreements
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getBillingAgreements()
     {
diff --git a/app/code/Magento/Paypal/Model/Bml.php b/app/code/Magento/Paypal/Model/Bml.php
index 90c2355523255..99cf2f2d82be4 100644
--- a/app/code/Magento/Paypal/Model/Bml.php
+++ b/app/code/Magento/Paypal/Model/Bml.php
@@ -9,21 +9,18 @@
 /**
  * Class \Magento\Paypal\Model\Bml
  *
- * @since 2.0.0
  */
 class Bml extends Express
 {
     /**
      * Payment method code
      * @var string
-     * @since 2.0.0
      */
     protected $_code  = Config::METHOD_WPP_BML;
 
     /**
      * Checkout payment form
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Bml\Form::class;
 
@@ -31,7 +28,6 @@ class Bml extends Express
      * Checkout redirect URL getter for onepage checkout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutRedirectUrl()
     {
diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
index 0266c79210371..c8e4a6acf4649 100644
--- a/app/code/Magento/Paypal/Model/Cart.php
+++ b/app/code/Magento/Paypal/Model/Cart.php
@@ -8,13 +8,11 @@
 /**
  * PayPal-specific model for shopping cart items and totals
  * The main idea is to accommodate all possible totals into PayPal-compatible 4 totals and line items
- * @since 2.0.0
  */
 class Cart extends \Magento\Payment\Model\Cart
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_areAmountsValid = false;
 
@@ -22,7 +20,6 @@ class Cart extends \Magento\Payment\Model\Cart
      * Get shipping, tax, subtotal and discount amounts all together
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAmounts()
     {
@@ -49,7 +46,6 @@ public function getAmounts()
      * Calculate subtotal from custom items
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _calculateCustomItemsSubtotal()
     {
@@ -63,7 +59,6 @@ protected function _calculateCustomItemsSubtotal()
      * Check the line items and totals according to PayPal business logic limitations
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _validate()
     {
@@ -112,7 +107,6 @@ protected function _validate()
      * Import items from sales model with workarounds for PayPal
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _importItemsFromSalesModel()
     {
@@ -177,7 +171,6 @@ protected function _importItemsFromSalesModel()
      *
      * @param \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface $salesEntity
      * @return void
-     * @since 2.0.0
      */
     protected function _applyDiscountTaxCompensationWorkaround(
         \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface $salesEntity
@@ -191,7 +184,6 @@ protected function _applyDiscountTaxCompensationWorkaround(
      * Check whether any item has negative amount
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasNegativeItemAmount()
     {
diff --git a/app/code/Magento/Paypal/Model/Cert.php b/app/code/Magento/Paypal/Model/Cert.php
index 89a6c74d13529..348f752bb439a 100644
--- a/app/code/Magento/Paypal/Model/Cert.php
+++ b/app/code/Magento/Paypal/Model/Cert.php
@@ -10,7 +10,6 @@
 
 /**
  * PayPal specific model for certificate based authentication
- * @since 2.0.0
  */
 class Cert extends \Magento\Framework\Model\AbstractModel
 {
@@ -21,13 +20,11 @@ class Cert extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var WriteInterface
-     * @since 2.0.0
      */
     protected $varDirectory;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
@@ -39,7 +36,6 @@ class Cert extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +67,6 @@ protected function _construct()
      * @param int $websiteId
      * @param bool $strictLoad
      * @return $this
-     * @since 2.0.0
      */
     public function loadByWebsite($websiteId, $strictLoad = true)
     {
@@ -86,7 +80,6 @@ public function loadByWebsite($websiteId, $strictLoad = true)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getCertPath()
     {
@@ -108,7 +101,6 @@ public function getCertPath()
      *
      * @param string $file
      * @return void
-     * @since 2.0.0
      */
     protected function _createCertFile($file)
     {
@@ -122,7 +114,6 @@ protected function _createCertFile($file)
      * Check and remove outdated certificate file by website
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _removeOutdatedCertFile()
     {
@@ -137,7 +128,6 @@ protected function _removeOutdatedCertFile()
      * Delete assigned certificate file after delete object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 9c1162ec788f8..1a8f53c752039 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -16,7 +16,6 @@
 
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Config extends AbstractConfig
 {
@@ -180,7 +179,6 @@ class Config extends AbstractConfig
      * Instructions for generating proper BN code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_buildNotationPPMap = [
         'paypal_express' => 'EC',
@@ -192,7 +190,6 @@ class Config extends AbstractConfig
      * Style system config map (Express Checkout)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ecStyleConfigMap = [
         'page_style' => 'page_style',
@@ -206,7 +203,6 @@ class Config extends AbstractConfig
      * Currency codes supported by PayPal methods
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_supportedCurrencyCodes = [
         'AUD',
@@ -236,7 +232,6 @@ class Config extends AbstractConfig
      * Merchant country supported by PayPal
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_supportedCountryCodes = [
         'AE',
@@ -313,7 +308,6 @@ class Config extends AbstractConfig
      * Buyer country supported by PayPal
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_supportedBuyerCountryCodes = [
         'AF ',
@@ -566,7 +560,6 @@ class Config extends AbstractConfig
      *
      * @var string[]
      * @link https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECButtonIntegration#id089QD0O0TX4__id08AH904I0YK
-     * @since 2.0.0
      */
     protected $_supportedImageLocales = [
         'de_DE',
@@ -589,25 +582,21 @@ class Config extends AbstractConfig
      * Core data
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Payment\Model\Source\CctypeFactory
-     * @since 2.0.0
      */
     protected $_cctypeFactory;
 
     /**
      * @var \Magento\Paypal\Model\CertFactory
-     * @since 2.0.0
      */
     protected $_certFactory;
 
@@ -618,7 +607,6 @@ class Config extends AbstractConfig
      * @param \Magento\Payment\Model\Source\CctypeFactory $cctypeFactory
      * @param CertFactory $certFactory
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -650,7 +638,6 @@ public function __construct(
      * @param string|null $methodCode
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isMethodAvailable($methodCode = null)
     {
@@ -701,7 +688,6 @@ public function isMethodAvailable($methodCode = null)
      * Return merchant country codes supported by PayPal
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedMerchantCountryCodes()
     {
@@ -712,7 +698,6 @@ public function getSupportedMerchantCountryCodes()
      * Return buyer country codes supported by PayPal
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedBuyerCountryCodes()
     {
@@ -723,7 +708,6 @@ public function getSupportedBuyerCountryCodes()
      * Return merchant country code, use default country if it not specified in General settings
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantCountry()
     {
@@ -745,7 +729,6 @@ public function getMerchantCountry()
      * @param string|null $method
      * @param string|null $countryCode
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodSupportedForCountry($method = null, $countryCode = null)
     {
@@ -764,7 +747,6 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      * @param string|null $countryCode 2-letters iso code
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getCountryMethods($countryCode = null)
     {
@@ -847,7 +829,6 @@ public function getCountryMethods($countryCode = null)
      *
      * @param string $token
      * @return string
-     * @since 2.0.0
      */
     public function getPayPalBasicStartUrl($token)
     {
@@ -867,7 +848,6 @@ public function getPayPalBasicStartUrl($token)
      * Check whether order review step enabled in configuration
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOrderReviewStepDisabled()
     {
@@ -883,7 +863,6 @@ public function isOrderReviewStepDisabled()
      *
      * @param string $token
      * @return string
-     * @since 2.0.0
      */
     public function getExpressCheckoutStartUrl($token)
     {
@@ -897,7 +876,6 @@ public function getExpressCheckoutStartUrl($token)
      *
      * @param string $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getExpressCheckoutOrderUrl($orderId)
     {
@@ -909,7 +887,6 @@ public function getExpressCheckoutOrderUrl($orderId)
      *
      * @param \Magento\Paypal\Controller\Express|string $token
      * @return string
-     * @since 2.0.0
      */
     public function getExpressCheckoutEditUrl($token)
     {
@@ -922,7 +899,6 @@ public function getExpressCheckoutEditUrl($token)
      *
      * @param string $token
      * @return string
-     * @since 2.0.0
      */
     public function getExpressCheckoutCompleteUrl($token)
     {
@@ -934,7 +910,6 @@ public function getExpressCheckoutCompleteUrl($token)
      *
      * @param string $token
      * @return string
-     * @since 2.0.0
      */
     public function getStartBillingAgreementUrl($token)
     {
@@ -946,7 +921,6 @@ public function getStartBillingAgreementUrl($token)
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getPaypalUrl(array $params = [])
     {
@@ -961,7 +935,7 @@ public function getPaypalUrl(array $params = [])
      * PayPal web URL for IPN
      *
      * @return string
-     * @since 2.1.0
+     * @since 2.0.15
      */
     public function getPayPalIpnUrl()
     {
@@ -975,7 +949,6 @@ public function getPayPalIpnUrl()
      * Whether Express Checkout button should be rendered dynamically
      *
      * @return bool
-     * @since 2.0.0
      */
     public function areButtonsDynamic()
     {
@@ -991,7 +964,6 @@ public function areButtonsDynamic()
      * @param string|null $pal encrypted summary about merchant
      * @return string
      * @see Paypal_Model_Api_Nvp::callGetPalDetails()
-     * @since 2.0.0
      */
     public function getExpressCheckoutShortcutImageUrl($localeCode, $orderTotal = null, $pal = null)
     {
@@ -1033,7 +1005,6 @@ public function getExpressCheckoutInContextImageUrl($localeCode)
      * @param string|null $pal
      * @param string|null $staticSize
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = null, $staticSize = null)
     {
@@ -1066,7 +1037,6 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n
      *
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentMarkWhatIsPaypalUrl(\Magento\Framework\Locale\ResolverInterface $localeResolver = null)
     {
@@ -1094,7 +1064,6 @@ public function getPaymentMarkWhatIsPaypalUrl(\Magento\Framework\Locale\Resolver
      * @param bool $isVertical
      * @param bool $isEcheck
      * @return string
-     * @since 2.0.0
      */
     public function getSolutionImageUrl($localeCode, $isVertical = false, $isEcheck = false)
     {
@@ -1111,7 +1080,6 @@ public function getSolutionImageUrl($localeCode, $isVertical = false, $isEcheck
      *
      * @param string $localeCode
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentFormLogoUrl($localeCode)
     {
@@ -1154,7 +1122,6 @@ public function getPaymentFormLogoUrl($localeCode)
      * Return supported types for PayPal logo
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAdditionalOptionsLogoTypes()
     {
@@ -1176,7 +1143,6 @@ public function getAdditionalOptionsLogoTypes()
      * @param string $localeCode Supported locale code
      * @param bool|string $type One of supported logo types
      * @return string|bool Logo Image URL or false if logo disabled in configuration
-     * @since 2.0.0
      */
     public function getAdditionalOptionsLogoUrl($localeCode, $type = false)
     {
@@ -1201,7 +1167,6 @@ public function getAdditionalOptionsLogoUrl($localeCode, $type = false)
      * Express Checkout button "flavors" source getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExpressCheckoutButtonFlavors()
     {
@@ -1212,7 +1177,6 @@ public function getExpressCheckoutButtonFlavors()
      * Express Checkout button types source getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExpressCheckoutButtonTypes()
     {
@@ -1226,7 +1190,6 @@ public function getExpressCheckoutButtonTypes()
      * Payment actions source getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPaymentActions()
     {
@@ -1244,7 +1207,6 @@ public function getPaymentActions()
      * Require Billing Address source getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRequireBillingAddressOptions()
     {
@@ -1259,7 +1221,6 @@ public function getRequireBillingAddressOptions()
      * Mapper from PayPal-specific payment actions to Magento payment actions
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPaymentAction()
     {
@@ -1280,7 +1241,6 @@ public function getPaymentAction()
      * "mark" = "Normal Express Checkout" - PayPal requires to checkout with PayPal buyer account only
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExpressCheckoutSolutionTypes()
     {
@@ -1291,7 +1251,6 @@ public function getExpressCheckoutSolutionTypes()
      * Retrieve express checkout billing agreement signup options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExpressCheckoutBASignupOptions()
     {
@@ -1307,7 +1266,6 @@ public function getExpressCheckoutBASignupOptions()
      * Unilateral payments are incompatible with the billing agreements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldAskToCreateBillingAgreement()
     {
@@ -1319,7 +1277,6 @@ public function shouldAskToCreateBillingAgreement()
      * Payment data delivery methods getter for PayPal Standard
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWpsPaymentDeliveryMethods()
     {
@@ -1330,7 +1287,6 @@ public function getWpsPaymentDeliveryMethods()
      * Return list of supported credit card types by Paypal Direct gateway
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWppCcTypesAsOptionArray()
     {
@@ -1343,7 +1299,6 @@ public function getWppCcTypesAsOptionArray()
      * Return list of supported credit card types by Paypal Direct (Payflow Edition) gateway
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWppPeCcTypesAsOptionArray()
     {
@@ -1356,7 +1311,6 @@ public function getWppPeCcTypesAsOptionArray()
      * Return list of supported credit card types by Payflow Pro gateway
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPayflowproCcTypesAsOptionArray()
     {
@@ -1369,7 +1323,6 @@ public function getPayflowproCcTypesAsOptionArray()
      * @param string $code
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public static function getIsCreditCardMethod($code)
     {
@@ -1388,7 +1341,6 @@ public static function getIsCreditCardMethod($code)
      *
      * @param string $code
      * @return bool
-     * @since 2.0.0
      */
     public function isCurrencyCodeSupported($code)
     {
@@ -1412,7 +1364,6 @@ public function isCurrencyCodeSupported($code)
      *
      * @param \Magento\Framework\DataObject $to
      * @return void
-     * @since 2.0.0
      */
     public function exportExpressCheckoutStyleSettings(\Magento\Framework\DataObject $to)
     {
@@ -1433,7 +1384,6 @@ public function exportExpressCheckoutStyleSettings(\Magento\Framework\DataObject
      * @param float $orderTotal
      * @param string $pal
      * @return string
-     * @since 2.0.0
      */
     protected function _getDynamicImageUrl($type, $localeCode, $orderTotal, $pal)
     {
@@ -1469,7 +1419,6 @@ protected function _getDynamicImageUrl($type, $localeCode, $orderTotal, $pal)
      *
      * @param string|null $localeCode
      * @return string
-     * @since 2.0.0
      */
     protected function _getSupportedLocaleCode($localeCode = null)
     {
@@ -1486,7 +1435,6 @@ protected function _getSupportedLocaleCode($localeCode = null)
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getSpecificConfigPath($fieldName)
     {
@@ -1540,7 +1488,6 @@ protected function _getSpecificConfigPath($fieldName)
      * @param string $fieldName
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mapExpressFieldset($fieldName)
     {
@@ -1567,7 +1514,6 @@ protected function _mapExpressFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _mapBmlFieldset($fieldName)
     {
@@ -1584,7 +1530,6 @@ protected function _mapBmlFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _mapBmlPayflowFieldset($fieldName)
     {
@@ -1601,7 +1546,6 @@ protected function _mapBmlPayflowFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _mapDirectFieldset($fieldName)
     {
@@ -1619,7 +1563,6 @@ protected function _mapDirectFieldset($fieldName)
      * @param string $fieldName
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mapWppFieldset($fieldName)
     {
@@ -1647,7 +1590,6 @@ protected function _mapWppFieldset($fieldName)
      * @param string $fieldName
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mapWpukFieldset($fieldName)
     {
@@ -1685,7 +1627,6 @@ protected function _mapWpukFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _mapGenericStyleFieldset($fieldName)
     {
@@ -1707,7 +1648,6 @@ protected function _mapGenericStyleFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _mapGeneralFieldset($fieldName)
     {
@@ -1726,7 +1666,6 @@ protected function _mapGeneralFieldset($fieldName)
      * @param string $fieldName
      * @return string|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mapMethodFieldset($fieldName)
     {
@@ -1754,7 +1693,6 @@ protected function _mapMethodFieldset($fieldName)
      * Payment API authentication methods source getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getApiAuthenticationMethods()
     {
@@ -1765,7 +1703,6 @@ public function getApiAuthenticationMethods()
      * Api certificate getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiCertificate()
     {
@@ -1777,7 +1714,6 @@ public function getApiCertificate()
      * Get PublisherId from stored config
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBmlPublisherId()
     {
@@ -1793,7 +1729,6 @@ public function getBmlPublisherId()
      * @param string $section
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBmlDisplay($section)
     {
@@ -1821,7 +1756,6 @@ public function getBmlDisplay($section)
      * @param string $section
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBmlPosition($section)
     {
@@ -1837,7 +1771,6 @@ public function getBmlPosition($section)
      * @param string $section
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBmlSize($section)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Factory.php b/app/code/Magento/Paypal/Model/Config/Factory.php
index 781633b74af1c..89992eef28bcc 100644
--- a/app/code/Magento/Paypal/Model/Config/Factory.php
+++ b/app/code/Magento/Paypal/Model/Config/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for payment config
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class Factory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $data
      * @return object
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
index 29814b7647006..2bae810a5fde1 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Converter
- * @since 2.0.0
  */
 class Converter implements ConverterInterface
 {
@@ -18,7 +17,6 @@ class Converter implements ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -56,7 +54,6 @@ public function convert($source)
      *
      * @param \DOMElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function createEvents(\DOMElement $node)
     {
@@ -79,7 +76,6 @@ protected function createEvents(\DOMElement $node)
      *
      * @param \DOMElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function createPredicate(\DOMElement $node)
     {
@@ -104,7 +100,6 @@ protected function createPredicate(\DOMElement $node)
      *
      * @param \DOMElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function createRelation(\DOMElement $node)
     {
@@ -127,7 +122,6 @@ protected function createRelation(\DOMElement $node)
      *
      * @param \DOMElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function createArgument(\DOMElement $node)
     {
@@ -147,7 +141,6 @@ protected function createArgument(\DOMElement $node)
      *
      * @param \DOMNode $node
      * @return bool
-     * @since 2.0.0
      */
     protected function hasNodeElement(\DOMNode $node)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/FileResolver.php b/app/code/Magento/Paypal/Model/Config/Rules/FileResolver.php
index a37b2be30daac..842f3381a7c8b 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/FileResolver.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/FileResolver.php
@@ -10,7 +10,6 @@
 
 /**
  * Class FileResolver
- * @since 2.0.0
  */
 class FileResolver implements FileResolverInterface
 {
@@ -18,7 +17,6 @@ class FileResolver implements FileResolverInterface
      * Module configuration file reader
      *
      * @var DirReader
-     * @since 2.0.0
      */
     protected $moduleReader;
 
@@ -26,7 +24,6 @@ class FileResolver implements FileResolverInterface
      * Constructor
      *
      * @param DirReader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(DirReader $moduleReader)
     {
@@ -40,7 +37,6 @@ public function __construct(DirReader $moduleReader)
      * @param string $scope
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Reader.php b/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
index 4d4e9a890c252..cc2a433284476 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
@@ -14,7 +14,6 @@
 
 /**
  * Class Reader
- * @since 2.0.0
  */
 class Reader extends Filesystem
 {
@@ -22,7 +21,6 @@ class Reader extends Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/rules/payment' => 'id',
@@ -41,7 +39,6 @@ class Reader extends Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         FileResolverInterface $fileResolver,
@@ -72,7 +69,6 @@ public function __construct(
      *
      * @param string|null $scope
      * @return array
-     * @since 2.0.0
      */
     public function read($scope = null)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/SchemaLocator.php b/app/code/Magento/Paypal/Model/Config/Rules/SchemaLocator.php
index 955a691efbd78..0791e5ad43587 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/SchemaLocator.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/SchemaLocator.php
@@ -10,7 +10,6 @@
 
 /**
  * Class SchemaLocator
- * @since 2.0.0
  */
 class SchemaLocator implements SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -56,7 +51,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
index 57b73cc892d4e..6222deda9a7cd 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
@@ -11,7 +11,6 @@
 
 /**
  * Plugin for \Magento\Config\Model\Config\Structure\Element\Field
- * @since 2.0.0
  */
 class FieldPlugin
 {
@@ -23,7 +22,6 @@ class FieldPlugin
 
     /**
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
index a8884d2175149..2e9e5adf576e9 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
@@ -7,7 +7,7 @@
 
 /**
  * PayPal change structure of payment methods configuration in admin panel.
- * @since 2.2.0
+ * @since 2.1.4
  */
 class PaymentSectionModifier
 {
@@ -15,7 +15,7 @@ class PaymentSectionModifier
      * Identifiers of special payment method configuration groups
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private static $specialGroups = [
         'account',
@@ -39,7 +39,7 @@ class PaymentSectionModifier
      *
      * @param array $initialStructure
      * @return array
-     * @since 2.2.0
+     * @since 2.1.4
      */
     public function modify(array $initialStructure)
     {
@@ -83,7 +83,7 @@ public function modify(array $initialStructure)
      * @param string $section
      * @param array $data
      * @return array
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private function getMoveInstructions($section, $data)
     {
diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
index 1e2cfe9ec912a..eeee45078d72f 100644
--- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
@@ -15,7 +15,6 @@
 
 /**
  * Plugin for \Magento\Config\Model\Config\Structure
- * @since 2.0.0
  */
 class StructurePlugin
 {
@@ -38,7 +37,7 @@ class StructurePlugin
 
     /**
      * @var PaymentSectionModifier
-     * @since 2.2.0
+     * @since 2.1.4
      */
     private $paymentSectionModifier;
 
@@ -64,7 +63,6 @@ class StructurePlugin
      * @param ScopeDefiner $scopeDefiner
      * @param BackendHelper $backendHelper
      * @param PaymentSectionModifier|null $paymentSectionModifier
-     * @since 2.0.0
      */
     public function __construct(
         ScopeDefiner $scopeDefiner,
@@ -82,7 +80,6 @@ public function __construct(
      *
      * @param bool $addOther
      * @return string[]
-     * @since 2.0.0
      */
     public static function getPaypalConfigCountries($addOther = false)
     {
@@ -104,7 +101,6 @@ public static function getPaypalConfigCountries($addOther = false)
      * @return ElementInterface|null
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetElementByPathParts(Structure $subject, \Closure $proceed, array $pathParts)
     {
@@ -143,7 +139,7 @@ public function aroundGetElementByPathParts(Structure $subject, \Closure $procee
      *
      * @param Section $result
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function restructurePayments(Section $result)
     {
diff --git a/app/code/Magento/Paypal/Model/Direct.php b/app/code/Magento/Paypal/Model/Direct.php
index bbb4c28c71850..950819e01c35f 100644
--- a/app/code/Magento/Paypal/Model/Direct.php
+++ b/app/code/Magento/Paypal/Model/Direct.php
@@ -12,19 +12,16 @@
  * PayPal Direct Module
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Direct extends \Magento\Payment\Model\Method\Cc
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_WPP_DIRECT;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info::class;
 
@@ -32,7 +29,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGateway = true;
 
@@ -40,7 +36,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -48,7 +43,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = true;
 
@@ -56,7 +50,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapturePartial = true;
 
@@ -64,7 +57,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = true;
 
@@ -72,7 +64,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = true;
 
@@ -80,7 +71,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = true;
 
@@ -88,7 +78,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = true;
 
@@ -96,7 +85,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseCheckout = true;
 
@@ -104,13 +92,11 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSaveCc = false;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = true;
 
@@ -118,7 +104,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = true;
 
@@ -126,31 +111,26 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * Website Payments Pro instance
      *
      * @var \Magento\Paypal\Model\Pro
-     * @since 2.0.0
      */
     protected $_pro;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_requestHttp;
 
     /**
      * @var \Magento\Paypal\Model\CartFactory
-     * @since 2.0.0
      */
     protected $_cartFactory;
 
@@ -173,7 +153,6 @@ class Direct extends \Magento\Payment\Model\Method\Cc
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -228,7 +207,6 @@ public function __construct(
      *
      * @param \Magento\Store\Model\Store|int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -245,7 +223,6 @@ public function setStore($store)
      *
      * @param string $currencyCode
      * @return bool
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode)
     {
@@ -257,7 +234,6 @@ public function canUseForCurrency($currencyCode)
      *
      * @see \Magento\Sales\Model\Payment::place()
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
@@ -268,7 +244,6 @@ public function getConfigPaymentAction()
      * Return available CC types for gateway based on merchant country
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAllowedCcTypes()
     {
@@ -288,7 +263,6 @@ public function getAllowedCcTypes()
      *
      * @param \Magento\Quote\Api\Data\CartInterface|\Magento\Quote\Model\Quote|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -302,7 +276,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      * @param int|null $storeId
      * @return null|string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getConfigData($field, $storeId = null)
     {
@@ -326,7 +299,6 @@ public function getConfigData($field, $storeId = null)
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -339,7 +311,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -353,7 +324,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -370,7 +340,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -383,7 +352,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      *
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -395,7 +363,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     /**
      * Whether payment can be reviewed
      * @return bool
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -407,7 +374,6 @@ public function canReviewPayment()
      *
      * @param \Magento\Payment\Model\Info|Payment $payment
      * @return bool
-     * @since 2.0.0
      */
     public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -420,7 +386,6 @@ public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
      *
      * @param \Magento\Payment\Model\Info|PaymentInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -434,7 +399,6 @@ public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
     {
@@ -447,7 +411,6 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
      * @param Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _placeOrder(Payment $payment, $amount)
     {
@@ -510,7 +473,6 @@ protected function _placeOrder(Payment $payment, $amount)
      * @param string|int $month
      * @param string|int $year
      * @return string
-     * @since 2.0.0
      */
     protected function _getFormattedCcExpirationDate($month, $year)
     {
@@ -523,7 +485,6 @@ protected function _getFormattedCcExpirationDate($month, $year)
      * @param \Magento\Paypal\Model\Api\Nvp $api
      * @param Payment $payment
      * @return void
-     * @since 2.0.0
      */
     protected function _importResultToPayment($api, $payment)
     {
@@ -535,7 +496,6 @@ protected function _importResultToPayment($api, $payment)
      * Check void availability
      * @return bool
      * @internal param \Magento\Framework\DataObject $payment
-     * @since 2.0.0
      */
     public function canVoid()
     {
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index e81170a131b80..8ba8adcede511 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -20,25 +20,21 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Express extends \Magento\Payment\Model\Method\AbstractMethod
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Express\Form::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info::class;
 
@@ -46,7 +42,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGateway = false;
 
@@ -54,7 +49,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canOrder = true;
 
@@ -62,7 +56,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -70,7 +63,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = true;
 
@@ -78,7 +70,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapturePartial = true;
 
@@ -86,7 +77,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = true;
 
@@ -94,7 +84,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = true;
 
@@ -102,7 +91,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = true;
 
@@ -110,7 +98,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = false;
 
@@ -118,7 +105,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseCheckout = true;
 
@@ -126,7 +112,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = true;
 
@@ -134,7 +119,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = true;
 
@@ -142,7 +126,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Website Payments Pro instance
      *
      * @var \Magento\Paypal\Model\Pro
-     * @since 2.0.0
      */
     protected $_pro;
 
@@ -150,7 +133,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment additional information key for payment action
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_isOrderPaymentActionKey = 'is_order_action';
 
@@ -158,49 +140,41 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * Payment additional information key for number of used authorizations
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_authorizationCountKey = 'authorization_count';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Paypal\Model\CartFactory
-     * @since 2.0.0
      */
     protected $_cartFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Framework\Exception\LocalizedExceptionFactory
-     * @since 2.0.0
      */
     protected $_exception;
 
     /**
      * @var \Magento\Sales\Api\TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
     /**
      * @var Transaction\BuilderInterface
-     * @since 2.0.0
      */
     protected $transactionBuilder;
 
@@ -224,7 +198,6 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -280,7 +253,6 @@ public function __construct(
      * Set processable error codes to API model
      *
      * @return \Magento\Paypal\Model\Api\Nvp
-     * @since 2.0.0
      */
     protected function _setApiProcessableErrors()
     {
@@ -306,7 +278,6 @@ protected function _setApiProcessableErrors()
      *
      * @param \Magento\Store\Model\Store|int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -322,7 +293,6 @@ public function setStore($store)
      * Can be used in regular checkout
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUseCheckout()
     {
@@ -344,7 +314,6 @@ public function canUseCheckout()
      *
      * @param string $currencyCode
      * @return bool
-     * @since 2.0.0
      */
     public function canUseForCurrency($currencyCode)
     {
@@ -356,7 +325,6 @@ public function canUseForCurrency($currencyCode)
      *
      * @see \Magento\Sales\Model\Payment::place()
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
@@ -367,7 +335,6 @@ public function getConfigPaymentAction()
      * Check whether payment method can be used
      * @param \Magento\Quote\Api\Data\CartInterface|Quote|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -381,7 +348,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      * @param int|null $storeId
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getConfigData($field, $storeId = null)
     {
@@ -398,7 +364,6 @@ public function getConfigData($field, $storeId = null)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -476,7 +441,6 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -489,7 +453,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -516,7 +479,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -612,7 +574,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -625,7 +586,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      *
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -637,7 +597,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     /**
      * Whether payment can be reviewed
      * @return bool
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -649,7 +608,6 @@ public function canReviewPayment()
      *
      * @param \Magento\Payment\Model\Info|Payment $payment
      * @return bool
-     * @since 2.0.0
      */
     public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -662,7 +620,6 @@ public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
      *
      * @param \Magento\Payment\Model\InfoInterface|Payment $payment
      * @return bool
-     * @since 2.0.0
      */
     public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -676,7 +633,6 @@ public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
      * @see \Magento\Checkout\Controller\Onepage::savePaymentAction()
      * @see Quote\Payment::getCheckoutRedirectUrl()
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutRedirectUrl()
     {
@@ -689,7 +645,6 @@ public function getCheckoutRedirectUrl()
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
     {
@@ -698,7 +653,6 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
 
     /**
      * @return Api\Nvp
-     * @since 2.0.0
      */
     public function getApi()
     {
@@ -711,7 +665,6 @@ public function getApi()
      * @param array|\Magento\Framework\DataObject $data
      * @return \Magento\Payment\Model\Info
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
@@ -735,7 +688,6 @@ public function assignData(\Magento\Framework\DataObject $data)
      * @param Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _placeOrder(Payment $payment, $amount)
     {
@@ -785,7 +737,6 @@ protected function _placeOrder(Payment $payment, $amount)
      * @param Nvp $api
      * @param Payment $payment
      * @return void
-     * @since 2.0.0
      */
     protected function _importToPayment($api, $payment)
     {
@@ -815,7 +766,6 @@ protected function _importToPayment($api, $payment)
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      * @internal param \Magento\Framework\DataObject $payment
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -834,7 +784,6 @@ public function canVoid()
      * Check capture availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -868,7 +817,6 @@ public function canCapture()
      * @param \Magento\Framework\DataObject $payment
      * @param string $parentTransactionId
      * @return \Magento\Paypal\Model\Api\AbstractApi
-     * @since 2.0.0
      */
     protected function _callDoAuthorize($amount, $payment, $parentTransactionId)
     {
@@ -900,7 +848,6 @@ protected function _callDoAuthorize($amount, $payment, $parentTransactionId)
      * @param Transaction $transaction
      * @param int $period
      * @return bool
-     * @since 2.0.0
      */
     protected function _isTransactionExpired(Transaction $transaction, $period)
     {
@@ -931,7 +878,6 @@ protected function _isTransactionExpired(Transaction $transaction, $period)
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isActive($storeId = null)
     {
@@ -948,7 +894,6 @@ public function isActive($storeId = null)
      *
      * @param OrderPaymentInterface $payment
      * @return false|\Magento\Sales\Api\Data\TransactionInterface
-     * @since 2.0.0
      */
     protected function getOrderTransaction($payment)
     {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 3047d3598cb5f..e9f2c1b8415a8 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -19,7 +19,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Checkout
 {
@@ -49,7 +48,6 @@ class Checkout
 
     /**
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -57,7 +55,6 @@ class Checkout
      * Config instance
      *
      * @var PaypalConfig
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -65,7 +62,6 @@ class Checkout
      * API instance
      *
      * @var \Magento\Paypal\Model\Api\Nvp
-     * @since 2.0.0
      */
     protected $_api;
 
@@ -73,7 +69,6 @@ class Checkout
      * Api Model Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_apiType = \Magento\Paypal\Model\Api\Nvp::class;
 
@@ -81,7 +76,6 @@ class Checkout
      * Payment method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_methodType = PaypalConfig::METHOD_WPP_EXPRESS;
 
@@ -89,7 +83,6 @@ class Checkout
      * State helper variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_redirectUrl = '';
 
@@ -97,7 +90,6 @@ class Checkout
      * State helper variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_pendingPaymentMessage = '';
 
@@ -105,13 +97,11 @@ class Checkout
      * State helper variable
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_checkoutRedirectUrl = '';
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -119,7 +109,6 @@ class Checkout
      * Redirect urls supposed to be set to support giropay
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_giropayUrls = [];
 
@@ -127,7 +116,6 @@ class Checkout
      * Create Billing Agreement flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isBARequested = false;
 
@@ -135,7 +123,6 @@ class Checkout
      * Flag for Bill Me Later mode
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isBml = false;
 
@@ -143,7 +130,6 @@ class Checkout
      * Customer ID
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_customerId;
 
@@ -151,7 +137,6 @@ class Checkout
      * Billing agreement that might be created during order placing
      *
      * @var \Magento\Paypal\Model\Billing\Agreement
-     * @since 2.0.0
      */
     protected $_billingAgreement;
 
@@ -159,13 +144,11 @@ class Checkout
      * Order
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
@@ -173,7 +156,6 @@ class Checkout
      * Checkout data
      *
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $_checkoutData;
 
@@ -181,7 +163,6 @@ class Checkout
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
@@ -189,121 +170,101 @@ class Checkout
      * Customer data
      *
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $_customerUrl;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Paypal\Model\Info
-     * @since 2.0.0
      */
     protected $_paypalInfo;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_coreUrl;
 
     /**
      * @var \Magento\Paypal\Model\CartFactory
-     * @since 2.0.0
      */
     protected $_cartFactory;
 
     /**
      * @var \Magento\Checkout\Model\Type\OnepageFactory
-     * @since 2.0.0
      */
     protected $_checkoutOnepageFactory;
 
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
     /**
      * @var \Magento\Paypal\Model\Api\Type\Factory
-     * @since 2.0.0
      */
     protected $_apiTypeFactory;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $_customerRepository;
 
     /**
      * @var \Magento\Customer\Model\AccountManagement
-     * @since 2.0.0
      */
     protected $_accountManagement;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $_messageManager;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
-     * @since 2.0.0
      */
     protected $quoteManagement;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -335,7 +296,6 @@ class Checkout
      * @param array $params
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -408,7 +368,6 @@ public function __construct(
      * Spares API calls of getting "pal" variable, by putting it into cache per store view
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutShortcutImageUrl()
     {
@@ -446,7 +405,6 @@ public function getCheckoutShortcutImageUrl()
      * @param string $cancelUrl  - payment cancellation result
      * @param string $pendingUrl - pending payment result
      * @return $this
-     * @since 2.0.0
      */
     public function prepareGiropayUrls($successUrl, $cancelUrl, $pendingUrl)
     {
@@ -459,7 +417,6 @@ public function prepareGiropayUrls($successUrl, $cancelUrl, $pendingUrl)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsBillingAgreementRequested($flag)
     {
@@ -472,7 +429,6 @@ public function setIsBillingAgreementRequested($flag)
      *
      * @param bool $isBml
      * @return $this
-     * @since 2.0.0
      */
     public function setIsBml($isBml)
     {
@@ -485,7 +441,6 @@ public function setIsBml($isBml)
      *
      * @param CustomerDataObject $customerData
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerData(CustomerDataObject $customerData)
     {
@@ -501,7 +456,6 @@ public function setCustomerData(CustomerDataObject $customerData)
      * @param Address|null $billingAddress
      * @param Address|null $shippingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerWithAddressChange(
         CustomerDataObject $customerData,
@@ -524,7 +478,6 @@ public function setCustomerWithAddressChange(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function start($returnUrl, $cancelUrl, $button = null)
     {
@@ -634,7 +587,6 @@ public function start($returnUrl, $cancelUrl, $button = null)
      * Check whether system can skip order review page before placing order
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSkipOrderReviewStep()
     {
@@ -651,7 +603,6 @@ public function canSkipOrderReviewStep()
      * @param string $token
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function returnFromPaypal($token)
     {
@@ -736,7 +687,6 @@ public function returnFromPaypal($token)
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareOrderReview($token = null)
     {
@@ -761,7 +711,6 @@ public function prepareOrderReview($token = null)
      * @param array $request
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getShippingOptionsCallbackResponse(array $request)
     {
@@ -799,7 +748,6 @@ public function getShippingOptionsCallbackResponse(array $request)
      *
      * @param string $methodCode
      * @return void
-     * @since 2.0.0
      */
     public function updateShippingMethod($methodCode)
     {
@@ -828,7 +776,6 @@ public function updateShippingMethod($methodCode)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function place($token, $shippingMethodCode = null)
     {
@@ -875,7 +822,6 @@ public function place($token, $shippingMethodCode = null)
      * Make sure addresses will be saved without validation errors
      *
      * @return void
-     * @since 2.0.0
      */
     private function ignoreAddressValidation()
     {
@@ -894,7 +840,6 @@ private function ignoreAddressValidation()
      * Determine whether redirect somewhere specifically is required
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectUrl()
     {
@@ -905,7 +850,6 @@ public function getRedirectUrl()
      * Get created billing agreement
      *
      * @return \Magento\Paypal\Model\Billing\Agreement|null
-     * @since 2.0.0
      */
     public function getBillingAgreement()
     {
@@ -916,7 +860,6 @@ public function getBillingAgreement()
      * Return order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -927,7 +870,6 @@ public function getOrder()
      * Get checkout method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutMethod()
     {
@@ -950,7 +892,6 @@ public function getCheckoutMethod()
      * @param Address $address
      * @param array $exportedAddress
      * @return void
-     * @since 2.0.0
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {
@@ -972,7 +913,6 @@ protected function _setExportedAddressData($address, $exportedAddress)
      * Set create billing agreement flag to api call
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _setBillingAgreementRequest()
     {
@@ -998,7 +938,6 @@ protected function _setBillingAgreementRequest()
 
     /**
      * @return \Magento\Paypal\Model\Api\Nvp
-     * @since 2.0.0
      */
     protected function _getApi()
     {
@@ -1019,7 +958,6 @@ protected function _getApi()
      * @return array|false
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareShippingOptions(Address $address, $mayReturnEmpty = false, $calculateTax = false)
     {
@@ -1101,7 +1039,6 @@ protected function _prepareShippingOptions(Address $address, $mayReturnEmpty = f
      * @param \Magento\Framework\DataObject $option1
      * @param \Magento\Framework\DataObject $option2
      * @return int
-     * @since 2.0.0
      */
     protected static function cmpShippingOptions(DataObject $option1, DataObject $option2)
     {
@@ -1120,7 +1057,6 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op
      * @param Address $address
      * @param string $selectedCode
      * @return string
-     * @since 2.0.0
      */
     protected function _matchShippingMethodCode(Address $address, $selectedCode)
     {
@@ -1142,7 +1078,6 @@ protected function _matchShippingMethodCode(Address $address, $selectedCode)
      * @param bool|null $button
      * @param string $token
      * @return void
-     * @since 2.0.0
      */
     protected function _setRedirectUrl($button, $token)
     {
@@ -1155,7 +1090,6 @@ protected function _setRedirectUrl($button, $token)
      * Get customer session object
      *
      * @return \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     public function getCustomerSession()
     {
@@ -1167,7 +1101,6 @@ public function getCustomerSession()
      * @param \Magento\Paypal\Model\Cart $cart
      * @param \Magento\Quote\Model\Quote\Address|null $address
      * @return void
-     * @since 2.0.0
      */
     private function setShippingOptions(PaypalCart $cart, Address $address = null)
     {
@@ -1198,7 +1131,6 @@ private function setShippingOptions(PaypalCart $cart, Address $address = null)
      * Prepare quote for guest checkout order submit
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function prepareGuestQuote()
     {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout/Factory.php b/app/code/Magento/Paypal/Model/Express/Checkout/Factory.php
index 4e4046b9a9826..d543a4af900ba 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout/Factory.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Paypal\Model\Express\Checkout
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class Factory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $data
      * @return \Magento\Paypal\Model\Express\Checkout
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 483a2d3de5cc0..b14f5d4b6e917 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -15,7 +15,6 @@
 /**
  * Class ExpressConfigProvider
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ExpressConfigProvider implements ConfigProviderInterface
 {
@@ -23,31 +22,26 @@ class ExpressConfigProvider implements ConfigProviderInterface
 
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var PaypalHelper
-     * @since 2.0.0
      */
     protected $paypalHelper;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $methodCodes = [
         Config::METHOD_WPP_BML,
@@ -58,13 +52,11 @@ class ExpressConfigProvider implements ConfigProviderInterface
 
     /**
      * @var \Magento\Payment\Model\Method\AbstractMethod[]
-     * @since 2.0.0
      */
     protected $methods = [];
 
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
@@ -83,7 +75,6 @@ class ExpressConfigProvider implements ConfigProviderInterface
      * @param PaypalHelper $paypalHelper
      * @param PaymentHelper $paymentHelper
      * @param UrlInterface $urlBuilder
-     * @since 2.0.0
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -107,7 +98,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -172,7 +162,6 @@ protected function isInContextCheckout()
      *
      * @param string $code
      * @return mixed
-     * @since 2.0.0
      */
     protected function getMethodRedirectUrl($code)
     {
@@ -184,7 +173,6 @@ protected function getMethodRedirectUrl($code)
      *
      * @param string $code
      * @return null|string
-     * @since 2.0.0
      */
     protected function getBillingAgreementCode($code)
     {
diff --git a/app/code/Magento/Paypal/Model/Hostedpro.php b/app/code/Magento/Paypal/Model/Hostedpro.php
index 2d3dff7c62dda..ae6876723e03c 100644
--- a/app/code/Magento/Paypal/Model/Hostedpro.php
+++ b/app/code/Magento/Paypal/Model/Hostedpro.php
@@ -14,7 +14,6 @@
 /**
  * Website Payments Pro Hosted Solution payment gateway model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Hostedpro extends Direct
 {
@@ -37,19 +36,16 @@ class Hostedpro extends Direct
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = Config::METHOD_HOSTEDPRO;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Hosted\Pro\Form::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Hosted\Pro\Info::class;
 
@@ -57,7 +53,6 @@ class Hostedpro extends Direct
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = false;
 
@@ -65,7 +60,6 @@ class Hostedpro extends Direct
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSaveCc = false;
 
@@ -73,7 +67,6 @@ class Hostedpro extends Direct
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isInitializeNeeded = true;
 
@@ -103,7 +96,6 @@ class Hostedpro extends Direct
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -152,7 +144,6 @@ public function __construct(
      * We do not have to check the availability of card types.
      *
      * @return true
-     * @since 2.0.0
      */
     public function getAllowedCcTypes()
     {
@@ -164,7 +155,6 @@ public function getAllowedCcTypes()
      * use default country if it not specified in General settings
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMerchantCountry()
     {
@@ -175,7 +165,6 @@ public function getMerchantCountry()
      * Do not validate payment form using server methods
      *
      * @return true
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -188,7 +177,6 @@ public function validate()
      * @param string $paymentAction
      * @param \Magento\Framework\DataObject $stateObject
      * @return void
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject)
     {
@@ -288,7 +276,6 @@ protected function buildBasicRequest()
      *
      * @param int|null $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getReturnUrl($storeId = null)
     {
@@ -300,7 +287,6 @@ public function getReturnUrl($storeId = null)
      *
      * @param int|null $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getNotifyUrl($storeId = null)
     {
@@ -312,7 +298,6 @@ public function getNotifyUrl($storeId = null)
      *
      * @param int|null $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getCancelUrl($storeId = null)
     {
diff --git a/app/code/Magento/Paypal/Model/Hostedpro/Request.php b/app/code/Magento/Paypal/Model/Hostedpro/Request.php
index 3da5d38fd33ef..6ddbd0f94824f 100644
--- a/app/code/Magento/Paypal/Model/Hostedpro/Request.php
+++ b/app/code/Magento/Paypal/Model/Hostedpro/Request.php
@@ -17,7 +17,6 @@
  *  Website Payments Pro Hosted Solution request model to get token.
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Request extends DataObject
 {
@@ -75,7 +74,6 @@ class Request extends DataObject
      * Locale Resolver
      *
      * @var \Magento\Framework\Locale\Resolver
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -84,7 +82,6 @@ class Request extends DataObject
      * @param \Magento\Customer\Helper\Address $customerAddress
      * @param \Magento\Tax\Helper\Data $taxData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Resolver $localeResolver,
@@ -102,7 +99,6 @@ public function __construct(
      * Build and return request array from object data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRequestData()
     {
@@ -130,7 +126,6 @@ public function getRequestData()
      *
      * @param \Magento\Paypal\Model\Hostedpro $paymentMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentMethod($paymentMethod)
     {
@@ -146,7 +141,6 @@ public function setPaymentMethod($paymentMethod)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(Order $order)
     {
@@ -163,7 +157,6 @@ public function setOrder(Order $order)
      * @access public
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount(Order $order)
     {
@@ -192,7 +185,6 @@ protected function getAmountData(Order $order)
      * Get payment amount data with excluded tax
      * @param \Magento\Sales\Model\Order $order
      * @return array
-     * @since 2.0.0
      */
     private function getNonTaxableAmount(Order $order)
     {
@@ -212,7 +204,6 @@ private function getNonTaxableAmount(Order $order)
      * Get order amount data with included tax
      * @param \Magento\Sales\Model\Order $order
      * @return array
-     * @since 2.0.0
      */
     private function getTaxableAmount(Order $order)
     {
diff --git a/app/code/Magento/Paypal/Model/IframeConfigProvider.php b/app/code/Magento/Paypal/Model/IframeConfigProvider.php
index 464cc47076b3c..02b8af1f2ae5e 100644
--- a/app/code/Magento/Paypal/Model/IframeConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/IframeConfigProvider.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Paypal\Model\IframeConfigProvider
  *
- * @since 2.0.0
  */
 class IframeConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $methodCodes = [
         Config::METHOD_PAYFLOWADVANCED,
@@ -28,26 +26,22 @@ class IframeConfigProvider implements ConfigProviderInterface
 
     /**
      * @var \Magento\Payment\Model\Method\AbstractMethod[]
-     * @since 2.0.0
      */
     protected $methods = [];
 
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @param PaymentHelper $paymentHelper
      * @param UrlInterface $urlBuilder
-     * @since 2.0.0
      */
     public function __construct(
         PaymentHelper $paymentHelper,
@@ -63,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -86,7 +79,6 @@ public function getConfig()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function getFrameActionUrl($code)
     {
diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 902609832bdcd..10a80bc01b07e 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -14,7 +14,6 @@
  * Aware of all PayPal payment methods
  * Collects and provides access to PayPal-specific payment data
  * Provides business logic information about payment flow
- * @since 2.0.0
  */
 class Info
 {
@@ -79,7 +78,6 @@ class Info
      * All payment information map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_paymentMap = [
         self::PAYER_ID => self::PAYPAL_PAYER_ID,
@@ -104,7 +102,6 @@ class Info
      * System information map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_systemMap = [
         self::PAYMENT_STATUS => self::PAYMENT_STATUS_GLOBAL,
@@ -171,7 +168,6 @@ class Info
      * Map of payment information available to customer
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_paymentPublicMap = ['paypal_payer_email', self::BUYER_TAX_ID, self::BUYER_TAX_ID_TYPE];
 
@@ -179,7 +175,6 @@ class Info
      * Rendered payment map cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_paymentMapFull = [];
 
@@ -187,7 +182,6 @@ class Info
      * Cache for storing label translations
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_labelCodesCache = [];
 
@@ -272,7 +266,6 @@ class Info
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param bool $labelValuesOnly
      * @return array
-     * @since 2.0.0
      */
     public function getPaymentInfo(\Magento\Payment\Model\InfoInterface $payment, $labelValuesOnly = false)
     {
@@ -297,7 +290,6 @@ public function getPaymentInfo(\Magento\Payment\Model\InfoInterface $payment, $l
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param bool $labelValuesOnly
      * @return array
-     * @since 2.0.0
      */
     public function getPublicPaymentInfo(\Magento\Payment\Model\InfoInterface $payment, $labelValuesOnly = false)
     {
@@ -310,7 +302,6 @@ public function getPublicPaymentInfo(\Magento\Payment\Model\InfoInterface $payme
      * @param array|\Magento\Framework\DataObject|callback $from
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return void
-     * @since 2.0.0
      */
     public function importToPayment($from, \Magento\Payment\Model\InfoInterface $payment)
     {
@@ -328,7 +319,6 @@ public function importToPayment($from, \Magento\Payment\Model\InfoInterface $pay
      * @param array|\Magento\Framework\DataObject|callback $to
      * @param array|null $map
      * @return array|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function &exportFromPayment(\Magento\Payment\Model\InfoInterface $payment, $to, array $map = null)
     {
@@ -346,7 +336,6 @@ public function &exportFromPayment(\Magento\Payment\Model\InfoInterface $payment
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public static function isPaymentReviewRequired(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -363,7 +352,6 @@ public static function isPaymentReviewRequired(\Magento\Payment\Model\InfoInterf
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public static function isFraudReviewAllowed(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -379,7 +367,6 @@ public static function isFraudReviewAllowed(\Magento\Payment\Model\InfoInterface
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public static function isPaymentCompleted(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -392,7 +379,6 @@ public static function isPaymentCompleted(\Magento\Payment\Model\InfoInterface $
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public static function isPaymentSuccessful(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -423,7 +409,6 @@ public static function isPaymentSuccessful(\Magento\Payment\Model\InfoInterface
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public static function isPaymentFailed(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -448,7 +433,6 @@ public static function isPaymentFailed(\Magento\Payment\Model\InfoInterface $pay
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_html_IPNandPDTVariables
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public static function explainPendingReason($code)
     {
@@ -496,7 +480,6 @@ public static function explainPendingReason($code)
      * @return string
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_html_IPNandPDTVariables
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
-     * @since 2.0.0
      */
     public static function explainReasonCode($code)
     {
@@ -541,7 +524,6 @@ public static function explainReasonCode($code)
      *
      * @param string $code
      * @return bool;
-     * @since 2.0.0
      */
     public static function isReversalDisputable($code)
     {
@@ -566,7 +548,6 @@ public static function isReversalDisputable($code)
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param bool $labelValuesOnly
      * @return array
-     * @since 2.0.0
      */
     protected function _getFullInfo(array $keys, \Magento\Payment\Model\InfoInterface $payment, $labelValuesOnly)
     {
@@ -603,7 +584,6 @@ protected function _getFullInfo(array $keys, \Magento\Payment\Model\InfoInterfac
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     protected function _getLabel($key)
     {
@@ -637,7 +617,6 @@ protected function _getLabel($key)
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public static function getCaseTypeLabel($key)
     {
@@ -657,7 +636,6 @@ public static function getCaseTypeLabel($key)
      * @param string $key
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getValue($value, $key)
     {
@@ -694,7 +672,6 @@ protected function _getValue($value, $key)
      * @param string $value
      * @return string
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_AVSResponseCodes
-     * @since 2.0.0
      */
     protected function _getAvsLabel($value)
     {
@@ -735,7 +712,6 @@ protected function _getAvsLabel($value)
      * @param string $value
      * @return string
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_AVSResponseCodes
-     * @since 2.0.0
      */
     protected function _getCvv2Label($value)
     {
@@ -767,7 +743,6 @@ protected function _getCvv2Label($value)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function _getBuyerIdTypeValue($code)
     {
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
index 6d74b61f38485..aa019ce276d3b 100644
--- a/app/code/Magento/Paypal/Model/Ipn.php
+++ b/app/code/Magento/Paypal/Model/Ipn.php
@@ -16,19 +16,16 @@
 /**
  * PayPal Instant Payment Notification processor model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Ipn extends \Magento\Paypal\Model\AbstractIpn implements IpnInterface
 {
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
@@ -36,19 +33,16 @@ class Ipn extends \Magento\Paypal\Model\AbstractIpn implements IpnInterface
      * PayPal info instance
      *
      * @var Info
-     * @since 2.0.0
      */
     protected $_paypalInfo;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
     /**
      * @var CreditmemoSender
-     * @since 2.0.0
      */
     protected $creditmemoSender;
 
@@ -61,7 +55,6 @@ class Ipn extends \Magento\Paypal\Model\AbstractIpn implements IpnInterface
      * @param OrderSender $orderSender
      * @param CreditmemoSender $creditmemoSender
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\ConfigFactory $configFactory,
@@ -85,7 +78,6 @@ public function __construct(
      *
      * @return void
      * @throws Exception
-     * @since 2.0.0
      */
     public function processIpnRequest()
     {
@@ -108,7 +100,6 @@ public function processIpnRequest()
      *
      * @return \Magento\Paypal\Model\Config
      * @throws Exception
-     * @since 2.0.0
      */
     protected function _getConfig()
     {
@@ -140,7 +131,6 @@ protected function _getConfig()
      *
      * @return \Magento\Sales\Model\Order
      * @throws Exception
-     * @since 2.0.0
      */
     protected function _getOrder()
     {
@@ -159,7 +149,6 @@ protected function _getOrder()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _processOrder()
     {
@@ -192,7 +181,6 @@ protected function _processOrder()
      * Process dispute notification
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerDispute()
     {
@@ -215,7 +203,6 @@ protected function _registerDispute()
      * Process adjustment notification
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerAdjustment()
     {
@@ -239,7 +226,6 @@ protected function _registerAdjustment()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _registerTransaction()
     {
@@ -290,7 +276,6 @@ protected function _registerTransaction()
      *
      * @param bool $skipFraudDetection
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentCapture($skipFraudDetection = false)
     {
@@ -341,7 +326,6 @@ protected function _registerPaymentCapture($skipFraudDetection = false)
      *
      * @return void
      * @throws Exception
-     * @since 2.0.0
      */
     protected function _registerPaymentDenial()
     {
@@ -366,7 +350,6 @@ protected function _registerPaymentDenial()
      * Treat failed payment as order cancellation
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentFailure()
     {
@@ -379,7 +362,6 @@ protected function _registerPaymentFailure()
      *
      * @return void
      * @throws Exception
-     * @since 2.0.0
      */
     public function _registerPaymentPending()
     {
@@ -415,7 +397,6 @@ public function _registerPaymentPending()
      * Register authorized payment
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentAuthorization()
     {
@@ -449,7 +430,6 @@ protected function _registerPaymentAuthorization()
      * The status "Processed" is used when all Masspayments are successful
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerMasspaymentsSuccess()
     {
@@ -461,7 +441,6 @@ protected function _registerMasspaymentsSuccess()
      * Process payment reversal and cancelled reversal notification
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentReversal()
     {
@@ -490,7 +469,6 @@ protected function _registerPaymentReversal()
      * Process a refund
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentRefund()
     {
@@ -527,7 +505,6 @@ protected function _registerPaymentRefund()
      * Process voided authorization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _registerPaymentVoid()
     {
@@ -557,7 +534,6 @@ protected function _registerPaymentVoid()
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _importPaymentInformation()
     {
@@ -625,7 +601,6 @@ protected function _importPaymentInformation()
      * @param string $comment
      * @param bool $addToHistory
      * @return string|\Magento\Sales\Model\Order\Status\History
-     * @since 2.0.0
      */
     protected function _createIpnComment($comment = '', $addToHistory = false)
     {
diff --git a/app/code/Magento/Paypal/Model/IpnFactory.php b/app/code/Magento/Paypal/Model/IpnFactory.php
index e20743acb81e7..776cd7591b77e 100644
--- a/app/code/Magento/Paypal/Model/IpnFactory.php
+++ b/app/code/Magento/Paypal/Model/IpnFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Paypal\Model\IpnFactory
  *
- * @since 2.0.0
  */
 class IpnFactory
 {
@@ -16,13 +15,11 @@ class IpnFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $mapping = [];
 
@@ -31,7 +28,6 @@ class IpnFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $mapping
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $mapping = [])
     {
@@ -44,7 +40,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Paypal\Model\IpnInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Paypal/Model/IpnInterface.php b/app/code/Magento/Paypal/Model/IpnInterface.php
index 54b201c4809f7..5b67668e95c99 100644
--- a/app/code/Magento/Paypal/Model/IpnInterface.php
+++ b/app/code/Magento/Paypal/Model/IpnInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Paypal\Model\IpnInterface
  *
- * @since 2.0.0
  */
 interface IpnInterface
 {
@@ -17,7 +16,6 @@ interface IpnInterface
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function processIpnRequest();
 }
diff --git a/app/code/Magento/Paypal/Model/Method/Agreement.php b/app/code/Magento/Paypal/Model/Method/Agreement.php
index 56383e7a22ab0..83bb492666f5e 100644
--- a/app/code/Magento/Paypal/Model/Method/Agreement.php
+++ b/app/code/Magento/Paypal/Model/Method/Agreement.php
@@ -12,7 +12,6 @@
 /**
  * Paypal Billing Agreement method
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgreement implements
     \Magento\Paypal\Model\Billing\Agreement\MethodInterface
@@ -21,7 +20,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_BILLING_AGREEMENT;
 
@@ -29,7 +27,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -37,7 +34,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = true;
 
@@ -45,7 +41,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapturePartial = true;
 
@@ -53,7 +48,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = true;
 
@@ -61,7 +55,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = true;
 
@@ -69,7 +62,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = true;
 
@@ -77,7 +69,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseCheckout = true;
 
@@ -85,7 +76,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = true;
 
@@ -93,7 +83,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = true;
 
@@ -101,7 +90,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Method instance setting
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = true;
 
@@ -109,25 +97,21 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * Website Payments Pro instance
      *
      * @var \Magento\Paypal\Model\Pro
-     * @since 2.0.0
      */
     protected $_pro;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Paypal\Model\CartFactory
-     * @since 2.0.0
      */
     protected $_cartFactory;
 
@@ -148,7 +132,6 @@ class Agreement extends \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgr
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -198,7 +181,6 @@ public function __construct(
      *
      * @param Store|int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -215,7 +197,6 @@ public function setStore($store)
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
-     * @since 2.0.0
      */
     public function initBillingAgreementToken(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement)
     {
@@ -237,7 +218,6 @@ public function initBillingAgreementToken(\Magento\Paypal\Model\Billing\Abstract
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return array
-     * @since 2.0.0
      */
     public function getBillingAgreementTokenInfo(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement)
     {
@@ -258,7 +238,6 @@ public function getBillingAgreementTokenInfo(\Magento\Paypal\Model\Billing\Abstr
      *
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
-     * @since 2.0.0
      */
     public function placeBillingAgreement(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement)
     {
@@ -274,7 +253,6 @@ public function placeBillingAgreement(\Magento\Paypal\Model\Billing\AbstractAgre
      * @param \Magento\Paypal\Model\Billing\AbstractAgreement $agreement
      * @return $this
      * @throws \Exception|\Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function updateBillingAgreementStatus(\Magento\Paypal\Model\Billing\AbstractAgreement $agreement)
     {
@@ -303,7 +281,6 @@ public function updateBillingAgreementStatus(\Magento\Paypal\Model\Billing\Abstr
      * @param \Magento\Framework\DataObject|InfoInterface $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -316,7 +293,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param \Magento\Framework\DataObject|InfoInterface|Payment $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -330,7 +306,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * @param \Magento\Framework\DataObject|InfoInterface|Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -347,7 +322,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -360,7 +334,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      *
      * @param \Magento\Framework\DataObject|InfoInterface|Payment $payment
      * @return $this
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -372,7 +345,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * Whether payment can be reviewed
      * @return bool
      * @internal param InfoInterface|Payment $payment
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -384,7 +356,6 @@ public function canReviewPayment()
      *
      * @param InfoInterface|Payment $payment
      * @return bool
-     * @since 2.0.0
      */
     public function acceptPayment(InfoInterface $payment)
     {
@@ -397,7 +368,6 @@ public function acceptPayment(InfoInterface $payment)
      *
      * @param InfoInterface|Payment $payment
      * @return bool
-     * @since 2.0.0
      */
     public function denyPayment(InfoInterface $payment)
     {
@@ -411,7 +381,6 @@ public function denyPayment(InfoInterface $payment)
      * @param InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
@@ -424,7 +393,6 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
      * @param Payment $payment
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _placeOrder(Payment $payment, $amount)
     {
@@ -478,7 +446,6 @@ protected function _placeOrder(Payment $payment, $amount)
      * @param object $quote
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isAvailable($quote)
     {
@@ -490,7 +457,6 @@ protected function _isAvailable($quote)
      *
      * @see \Magento\Sales\Model\Payment::place()
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
diff --git a/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php b/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
index 0a913196f4ce3..b405950fc3303 100644
--- a/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
+++ b/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
@@ -13,7 +13,6 @@
 
 /**
  * Plugin for \Magento\Payment\Model\Checks\Composite
- * @since 2.0.0
  */
 class SpecificationPlugin
 {
@@ -25,7 +24,6 @@ class SpecificationPlugin
 
     /**
      * @param AgreementFactory $agreementFactory
-     * @since 2.0.0
      */
     public function __construct(AgreementFactory $agreementFactory)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Bml.php b/app/code/Magento/Paypal/Model/Payflow/Bml.php
index 14d03d2e23d73..79858c0415003 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Bml.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Bml.php
@@ -11,21 +11,18 @@
 /**
  * Class \Magento\Paypal\Model\Payflow\Bml
  *
- * @since 2.0.0
  */
 class Bml extends Model\Express
 {
     /**
      * Payment method code
      * @var string
-     * @since 2.0.0
      */
     protected $_code  = Model\Config::METHOD_WPP_PE_BML;
 
     /**
      * Checkout payment form
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Payflow\Bml\Form::class;
 
@@ -33,7 +30,6 @@ class Bml extends Model\Express
      * Checkout redirect URL getter for onepage checkout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutRedirectUrl()
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Pro.php b/app/code/Magento/Paypal/Model/Payflow/Pro.php
index 0c53625a3a7cc..22e211b1b9bfe 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Pro.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Pro.php
@@ -9,7 +9,6 @@
  * PayPal Website Payments Pro (Payflow Edition) implementation for payment method instances
  * This model was created because right now PayPal Direct and PayPal Express payment
  * (Payflow Edition) methods cannot have same abstract
- * @since 2.0.0
  */
 class Pro extends \Magento\Paypal\Model\Pro
 {
@@ -17,7 +16,6 @@ class Pro extends \Magento\Paypal\Model\Pro
      * Api model type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_apiType = \Magento\Paypal\Model\Api\PayflowNvp::class;
 
@@ -25,7 +23,6 @@ class Pro extends \Magento\Paypal\Model\Pro
      * Config model type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
@@ -40,7 +37,6 @@ class Pro extends \Magento\Paypal\Model\Pro
      * @param \Magento\Framework\DataObject $payment
      * @param float $amount
      * @return void
-     * @since 2.0.0
      */
     public function refund(\Magento\Framework\DataObject $payment, $amount)
     {
@@ -56,7 +52,6 @@ public function refund(\Magento\Framework\DataObject $payment, $amount)
      * Is capture request needed on this transaction
      *
      * @return true
-     * @since 2.0.0
      */
     protected function _isCaptureNeeded()
     {
@@ -68,7 +63,6 @@ protected function _isCaptureNeeded()
      *
      * @param \Magento\Framework\DataObject $payment
      * @return string
-     * @since 2.0.0
      */
     protected function _getParentTransactionId(\Magento\Framework\DataObject $payment)
     {
@@ -90,7 +84,6 @@ protected function _getParentTransactionId(\Magento\Framework\DataObject $paymen
      * @param \Magento\Paypal\Model\Api\Nvp $api
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return void
-     * @since 2.0.0
      */
     protected function _importCaptureResultToPayment($api, $payment)
     {
@@ -114,7 +107,6 @@ protected function _importCaptureResultToPayment($api, $payment)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
     {
@@ -130,7 +122,6 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @param bool $canRefundMore
      * @return void
-     * @since 2.0.0
      */
     protected function _importRefundResultToPayment($api, $payment, $canRefundMore)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Request.php b/app/code/Magento/Paypal/Model/Payflow/Request.php
index ec8ec6c305403..b15e8441cf73b 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Request.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Request.php
@@ -9,7 +9,6 @@
  * Payflow Link request model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Request extends \Magento\Framework\DataObject
 {
@@ -22,7 +21,6 @@ class Request extends \Magento\Framework\DataObject
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php b/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
index cbec508ef5cfe..6a2229c3d55ca 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
@@ -15,25 +15,21 @@
 
 /**
  * Gateway Service
- * @since 2.0.0
  */
 class Gateway implements GatewayInterface
 {
     /**
      * @var ZendClientFactory
-     * @since 2.0.0
      */
     protected $httpClientFactory;
 
     /**
      * @var Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -41,7 +37,6 @@ class Gateway implements GatewayInterface
      * @param ZendClientFactory $httpClientFactory
      * @param Random $mathRandom
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(
         ZendClientFactory $httpClientFactory,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @return DataObject
      * @throws \Zend_Http_Client_Exception
-     * @since 2.0.0
      */
     public function postRequest(DataObject $request, ConfigInterface $config)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
index 1cd7f48b14fc4..9d215ca6cbe17 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -15,25 +15,21 @@
 
 /**
  * Class SecureToken
- * @since 2.0.0
  */
 class SecureToken
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     private $url;
 
     /**
      * @var Random
-     * @since 2.0.0
      */
     private $mathRandom;
 
     /**
      * @var Transparent
-     * @since 2.0.0
      */
     private $transparent;
 
@@ -41,7 +37,6 @@ class SecureToken
      * @param UrlInterface $url
      * @param Random $mathRandom
      * @param Transparent $transparent
-     * @since 2.0.0
      */
     public function __construct(
         UrlInterface $url,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @return DataObject
      * @throws \Exception
-     * @since 2.0.0
      */
     public function requestToken(Quote $quote)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/CreditCardValidationHandler.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/CreditCardValidationHandler.php
index 34c1d5e3cbe71..15158e9b26988 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/CreditCardValidationHandler.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/CreditCardValidationHandler.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Paypal\Model\Payflow\Service\Response\Handler\CreditCardValidationHandler
  *
- * @since 2.0.0
  */
 class CreditCardValidationHandler implements HandlerInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $fieldsToHandle = [
         Info::PAYPAL_CVV2MATCH,
@@ -29,13 +27,11 @@ class CreditCardValidationHandler implements HandlerInterface
 
     /**
      * @var Info
-     * @since 2.0.0
      */
     private $paypalInfoManager;
 
     /**
      * @param Info $paypalInfoManager
-     * @since 2.0.0
      */
     public function __construct(Info $paypalInfoManager)
     {
@@ -44,7 +40,6 @@ public function __construct(Info $paypalInfoManager)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function handle(InfoInterface $payment, DataObject $response)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
index b26c18d036f23..6f83597c9b418 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
@@ -14,7 +14,6 @@
 
 /**
  * Class FraudHandler
- * @since 2.0.0
  */
 class FraudHandler implements HandlerInterface
 {
@@ -30,7 +29,6 @@ class FraudHandler implements HandlerInterface
 
     /**
      * @var Info
-     * @since 2.0.0
      */
     private $paypalInfoManager;
 
@@ -38,7 +36,6 @@ class FraudHandler implements HandlerInterface
      * The security scanner XML document
      *
      * @var Security
-     * @since 2.0.0
      */
     private $xmlSecurity;
 
@@ -47,7 +44,6 @@ class FraudHandler implements HandlerInterface
      *
      * @param Info $paypalInfoManager
      * @param Security $xmlSecurity
-     * @since 2.0.0
      */
     public function __construct(Info $paypalInfoManager, Security $xmlSecurity)
     {
@@ -57,7 +53,6 @@ public function __construct(Info $paypalInfoManager, Security $xmlSecurity)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function handle(InfoInterface $payment, DataObject $response)
     {
@@ -96,7 +91,6 @@ public function handle(InfoInterface $payment, DataObject $response)
      * @param string $rulesString
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function getFraudRulesDictionary($rulesString)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerComposite.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerComposite.php
index d1978661cf81d..7c0075655513a 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerComposite.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerComposite.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerComposite
  *
- * @since 2.0.0
  */
 class HandlerComposite implements HandlerInterface
 {
     /**
      * @var HandlerInterface[]
-     * @since 2.0.0
      */
     private $handlers = [];
 
     /**
      * @param HandlerInterface[] $handlers
-     * @since 2.0.0
      */
     public function __construct(array $handlers = [])
     {
@@ -45,7 +42,6 @@ function ($handler, $code) {
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function handle(InfoInterface $payment, DataObject $response)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerInterface.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerInterface.php
index 6bc3f0c52f863..83787d8a9c296 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerInterface.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/HandlerInterface.php
@@ -11,7 +11,6 @@
 /**
  * Interface HandlerInterface used for error handling of gateway response
  * @package Magento\Paypal\Model\Payflow\Service\Response\Handler
- * @since 2.0.0
  */
 interface HandlerInterface
 {
@@ -21,7 +20,6 @@ interface HandlerInterface
      * @param InfoInterface $payment
      * @param Object $response
      * @return void
-     * @since 2.0.0
      */
     public function handle(InfoInterface $payment, DataObject $response);
 }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
index d0f6872171ab5..06a8a5b680bf4 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
@@ -18,43 +18,36 @@
 
 /**
  * Class Transaction
- * @since 2.0.0
  */
 class Transaction
 {
     /**
      * @var Generic
-     * @since 2.0.0
      */
     protected $sessionTransparent;
 
     /**
      * @var CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var Transparent
-     * @since 2.0.0
      */
     protected $transparent;
 
     /**
      * @var PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     private $paymentManagement;
 
     /**
      * @var HandlerInterface
-     * @since 2.0.0
      */
     private $errorHandler;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     private $logger;
 
@@ -65,7 +58,6 @@ class Transaction
      * @param PaymentMethodManagementInterface $paymentManagement
      * @param HandlerInterface $errorHandler
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(
         Generic $sessionTransparent,
@@ -88,7 +80,6 @@ public function __construct(
      *
      * @param array $gatewayTransactionResponse
      * @return DataObject
-     * @since 2.0.0
      */
     public function getResponseObject($gatewayTransactionResponse)
     {
@@ -110,7 +101,6 @@ public function getResponseObject($gatewayTransactionResponse)
      * @param DataObject $response
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function savePaymentInQuote($response)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
index df6c3dcab7882..4e921944738cb 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
@@ -11,7 +11,6 @@
 
 /**
  * Class AVSResponse
- * @since 2.0.0
  */
 class AVSResponse implements ValidatorInterface
 {
@@ -55,10 +54,7 @@ class AVSResponse implements ValidatorInterface
     const CONFIG_OFF = 0;
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $avsCheck = [
         'avsaddr' => 'avs_street',
         'avszip' => 'avs_zip',
@@ -66,7 +62,6 @@ class AVSResponse implements ValidatorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $errorsMessages = [
         'avs_street' => 'AVS address does not match.',
@@ -79,7 +74,6 @@ class AVSResponse implements ValidatorInterface
      * @param DataObject|Object $response
      * @param Transparent $transparentModel
      * @return bool
-     * @since 2.0.0
      */
     public function validate(DataObject $response, Transparent $transparentModel)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
index a26638d319331..705b667ab2f65 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
@@ -11,7 +11,6 @@
 
 /**
  * Class CVV2Match
- * @since 2.0.0
  */
 class CVV2Match implements ValidatorInterface
 {
@@ -53,7 +52,6 @@ class CVV2Match implements ValidatorInterface
      * @param DataObject $response
      * @param Transparent $transparentModel
      * @return bool
-     * @since 2.0.0
      */
     public function validate(DataObject $response, Transparent $transparentModel)
     {
@@ -83,7 +81,6 @@ public function validate(DataObject $response, Transparent $transparentModel)
      *
      * @param DataObject $response
      * @return bool
-     * @since 2.0.0
      */
     protected function isMatchCvv(DataObject $response)
     {
@@ -96,7 +93,6 @@ protected function isMatchCvv(DataObject $response)
      *
      * @param DataObject $response
      * @return bool
-     * @since 2.0.0
      */
     protected function isNotMatchCvv(DataObject $response)
     {
@@ -108,7 +104,6 @@ protected function isNotMatchCvv(DataObject $response)
      *
      * @param DataObject $response
      * @return bool
-     * @since 2.0.0
      */
     protected function isCvvDoNotExists(DataObject $response)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
index be14a5d64f5b7..f79b3048600be 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
@@ -13,13 +13,11 @@
 
 /**
  * Class ResponseValidator
- * @since 2.0.0
  */
 class ResponseValidator implements ValidatorInterface
 {
     /**
      * @var ValidatorInterface[]
-     * @since 2.0.0
      */
     protected $validators;
 
@@ -27,7 +25,6 @@ class ResponseValidator implements ValidatorInterface
      * Constructor
      *
      * @param ValidatorInterface[] $validators
-     * @since 2.0.0
      */
     public function __construct(array $validators)
     {
@@ -41,7 +38,6 @@ public function __construct(array $validators)
      * @param Transparent $transparentModel
      * @return bool
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function validate(DataObject $response, Transparent $transparentModel)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/SecureToken.php
index 1db3060b74c22..ec8435942164b 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/SecureToken.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/SecureToken.php
@@ -11,7 +11,6 @@
 
 /**
  * Class SecureToken
- * @since 2.0.0
  */
 class SecureToken implements ValidatorInterface
 {
@@ -35,7 +34,6 @@ class SecureToken implements ValidatorInterface
      * @param DataObject $response
      * @param Transparent $transparentModel
      * @return bool
-     * @since 2.0.0
      */
     public function validate(DataObject $response, Transparent $transparentModel)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/ValidatorInterface.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/ValidatorInterface.php
index af22b0259719e..3003954c6a84c 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/ValidatorInterface.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/ValidatorInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Interface ValidatorInterface
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -20,7 +19,6 @@ interface ValidatorInterface
      * @param DataObject $response
      * @param Transparent|null $transparentModel
      * @return bool
-     * @since 2.0.0
      */
     public function validate(DataObject $response, Transparent $transparentModel);
 }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index f9248a5f11355..d2f33615ec8ce 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -24,7 +24,6 @@
  * Payflow Pro payment gateway model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Transparent extends Payflowpro implements TransparentInterface
 {
@@ -36,19 +35,16 @@ class Transparent extends Payflowpro implements TransparentInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Payment\Block\Transparent\Info::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info::class;
 
     /**
      * @var ResponseValidator
-     * @since 2.0.0
      */
     private $responseValidator;
 
@@ -85,7 +81,6 @@ class Transparent extends Payflowpro implements TransparentInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -144,7 +139,6 @@ public function getResponceValidator()
      * Do not validate payment form using server methods
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -159,7 +153,6 @@ public function validate()
      * @return $this
      * @throws InvalidTransitionException
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function authorize(InfoInterface $payment, $amount)
     {
@@ -202,7 +195,6 @@ public function authorize(InfoInterface $payment, $amount)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function getConfigInterface()
     {
diff --git a/app/code/Magento/Paypal/Model/PayflowConfig.php b/app/code/Magento/Paypal/Model/PayflowConfig.php
index adae6c746ad80..588eb77f2859b 100644
--- a/app/code/Magento/Paypal/Model/PayflowConfig.php
+++ b/app/code/Magento/Paypal/Model/PayflowConfig.php
@@ -10,7 +10,6 @@
 /**
  * Class PayflowConfig
  * @todo ELiminate current configuration class
- * @since 2.0.0
  */
 class PayflowConfig extends Config
 {
@@ -29,7 +28,6 @@ class PayflowConfig extends Config
      * Mapper from Magento payment actions to PayPal-specific transaction types
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTrxType()
     {
@@ -50,7 +48,6 @@ public function getTrxType()
      *
      * @param bool|null $testMode Ability to specify test mode using
      * @return string
-     * @since 2.0.0
      */
     public function getTransactionUrl($testMode = null)
     {
@@ -65,7 +62,6 @@ public function getTransactionUrl($testMode = null)
      * Payment action getter compatible with payment model
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPaymentAction()
     {
@@ -87,7 +83,6 @@ public function getPaymentAction()
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isMethodActive($method)
     {
@@ -100,7 +95,6 @@ public function isMethodActive($method)
      *
      * @param string $fieldName
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getSpecificConfigPath($fieldName)
     {
diff --git a/app/code/Magento/Paypal/Model/PayflowExpress.php b/app/code/Magento/Paypal/Model/PayflowExpress.php
index 1a76d1094c3eb..025455be7e6fa 100644
--- a/app/code/Magento/Paypal/Model/PayflowExpress.php
+++ b/app/code/Magento/Paypal/Model/PayflowExpress.php
@@ -10,19 +10,16 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PayflowExpress extends \Magento\Paypal\Model\Express
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_code = Config::METHOD_WPP_PE_EXPRESS;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\PayflowExpress\Form::class;
 
@@ -30,13 +27,11 @@ class PayflowExpress extends \Magento\Paypal\Model\Express
      * Express Checkout payment method instance
      *
      * @var Express
-     * @since 2.0.0
      */
     protected $_ecInstance = null;
 
     /**
      * @var InfoFactory
-     * @since 2.0.0
      */
     protected $_paypalInfoFactory;
 
@@ -44,7 +39,6 @@ class PayflowExpress extends \Magento\Paypal\Model\Express
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = false;
 
@@ -52,7 +46,6 @@ class PayflowExpress extends \Magento\Paypal\Model\Express
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = false;
 
@@ -77,7 +70,6 @@ class PayflowExpress extends \Magento\Paypal\Model\Express
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -128,7 +120,6 @@ public function __construct(
      *
      * @param \Magento\Quote\Api\Data\CartInterface|\Magento\Quote\Model\Quote|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -152,7 +143,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      * @param Api\Nvp $api
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return void
-     * @since 2.0.0
      */
     protected function _importToPayment($api, $payment)
     {
@@ -179,7 +169,6 @@ protected function _importToPayment($api, $payment)
      * @see \Magento\Checkout\Controller\Onepage::savePaymentAction()
      * @see \Magento\Quote\Model\Quote\Payment::getCheckoutRedirectUrl()
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutRedirectUrl()
     {
@@ -192,7 +181,6 @@ public function getCheckoutRedirectUrl()
      * additional information(needed to perform online refund. Requirement of the Payflow gateway)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canRefund()
     {
diff --git a/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php b/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
index e669d09169ea0..53e6391d99baa 100644
--- a/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
+++ b/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
@@ -8,7 +8,6 @@
 /**
  * Wrapper that performs Paypal Express and Checkout communication
  * Use current Paypal Express method instance
- * @since 2.0.0
  */
 class Checkout extends \Magento\Paypal\Model\Express\Checkout
 {
@@ -16,7 +15,6 @@ class Checkout extends \Magento\Paypal\Model\Express\Checkout
      * Api Model Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_apiType = \Magento\Paypal\Model\Api\PayflowNvp::class;
 
@@ -24,7 +22,6 @@ class Checkout extends \Magento\Paypal\Model\Express\Checkout
      * Payment method type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_methodType = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
 
@@ -33,7 +30,6 @@ class Checkout extends \Magento\Paypal\Model\Express\Checkout
      *
      * @param string $methodCode
      * @return void
-     * @since 2.0.0
      */
     public function updateShippingMethod($methodCode)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflowadvanced.php b/app/code/Magento/Paypal/Model/Payflowadvanced.php
index 3e470421bc8a5..45e4170a8f86e 100644
--- a/app/code/Magento/Paypal/Model/Payflowadvanced.php
+++ b/app/code/Magento/Paypal/Model/Payflowadvanced.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Paypal\Model\Payflowadvanced
  *
- * @since 2.0.0
  */
 class Payflowadvanced extends \Magento\Paypal\Model\Payflowlink
 {
@@ -20,7 +19,6 @@ class Payflowadvanced extends \Magento\Paypal\Model\Payflowlink
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_PAYFLOWADVANCED;
 
@@ -28,7 +26,6 @@ class Payflowadvanced extends \Magento\Paypal\Model\Payflowlink
      * Type of block that generates method form
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Payflow\Advanced\Form::class;
 
@@ -36,7 +33,6 @@ class Payflowadvanced extends \Magento\Paypal\Model\Payflowlink
      * Type of block that displays method information
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info::class;
 
@@ -44,7 +40,6 @@ class Payflowadvanced extends \Magento\Paypal\Model\Payflowlink
      * Controller for callback urls
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_callbackController = 'payflowadvanced';
 }
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index 07741326a38d9..5177e4247dd68 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -17,7 +17,6 @@
 /**
  * Payflow Link payment gateway model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Payflowlink extends \Magento\Paypal\Model\Payflowpro
 {
@@ -30,7 +29,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Controller for callback urls
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_callbackController = 'payflow';
 
@@ -38,19 +36,16 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_PAYFLOWLINK;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Payflow\Link\Form::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info::class;
 
@@ -58,7 +53,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = false;
 
@@ -66,7 +60,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isInitializeNeeded = true;
 
@@ -74,7 +67,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Request & response model
      *
      * @var \Magento\Paypal\Model\Payflow\Request
-     * @since 2.0.0
      */
     protected $_response;
 
@@ -92,37 +84,31 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * Key for storing secure hash in additional information of payment model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_secureSilentPostHashKey = 'secure_silent_post_hash';
 
     /**
      * @var \Magento\Paypal\Model\Payflow\RequestFactory
-     * @since 2.0.0
      */
     protected $_requestFactory;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Store\Model\WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
@@ -157,7 +143,6 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -215,7 +200,6 @@ public function __construct(
      * Do not validate payment form using server methods
      *
      * @return true
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -228,7 +212,6 @@ public function validate()
      * @param \Magento\Quote\Api\Data\CartInterface|\Magento\Quote\Model\Quote|null $quote
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -240,7 +223,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isActive($storeId = null)
     {
@@ -253,7 +235,6 @@ public function isActive($storeId = null)
      * @param string $paymentAction
      * @param \Magento\Framework\DataObject $stateObject
      * @return void
-     * @since 2.0.0
      */
     public function initialize($paymentAction, $stateObject)
     {
@@ -286,7 +267,6 @@ public function initialize($paymentAction, $stateObject)
      * Return response model.
      *
      * @return \Magento\Paypal\Model\Payflow\Request
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -303,7 +283,6 @@ public function getResponse()
      * @param array $responseData
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException In case of validation error or order creation error
-     * @since 2.0.0
      */
     public function process($responseData)
     {
@@ -325,7 +304,6 @@ public function process($responseData)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _processOrder(\Magento\Sales\Model\Order $order)
     {
@@ -392,7 +370,6 @@ protected function _processOrder(\Magento\Sales\Model\Order $order)
      * @throws \Magento\Framework\Exception\LocalizedException In other cases
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getOrderFromResponse()
     {
@@ -441,7 +418,6 @@ protected function _getOrderFromResponse()
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _buildTokenRequest(\Magento\Sales\Model\Order\Payment $payment)
     {
@@ -468,7 +444,6 @@ protected function _buildTokenRequest(\Magento\Sales\Model\Order\Payment $paymen
      * or default
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getStoreId()
     {
@@ -483,7 +458,6 @@ protected function _getStoreId()
      * Return request object with basic information for gateway request
      *
      * @return \Magento\Paypal\Model\Payflow\Request
-     * @since 2.0.0
      */
     public function buildBasicRequest()
     {
@@ -525,7 +499,6 @@ public function buildBasicRequest()
      * Get payment action code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTrxTokenType()
     {
@@ -547,7 +520,6 @@ protected function _getTrxTokenType()
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _processTokenErrors($response, $payment)
     {
@@ -572,7 +544,6 @@ protected function _processTokenErrors($response, $payment)
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return string
-     * @since 2.0.0
      */
     protected function _getSecureSilentPostHash($payment)
     {
@@ -584,7 +555,6 @@ protected function _getSecureSilentPostHash($payment)
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return string
-     * @since 2.0.0
      */
     protected function _generateSecureSilentPostHash($payment)
     {
@@ -598,7 +568,6 @@ protected function _generateSecureSilentPostHash($payment)
      *
      * @param string $actionName
      * @return string
-     * @since 2.0.0
      */
     protected function _getCallbackUrl($actionName)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
index 4d875b3f12015..e7ad4bad3fb3a 100644
--- a/app/code/Magento/Paypal/Model/Payflowpro.php
+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -24,7 +24,6 @@
  * Payflow Pro payment gateway model
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInterface
 {
@@ -86,12 +85,7 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
 
     /**#@-*/
 
-    /**
-     * Response params mappings
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_responseParamsMappings = [
         'firstname' => 'billtofirstname',
         'lastname' => 'billtolastname',
@@ -147,7 +141,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Payment method code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = \Magento\Paypal\Model\Config::METHOD_PAYFLOWPRO;
 
@@ -155,7 +148,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isGateway = true;
 
@@ -163,7 +155,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAuthorize = true;
 
@@ -171,7 +162,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapture = true;
 
@@ -179,7 +169,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canCapturePartial = true;
 
@@ -187,7 +176,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefund = true;
 
@@ -195,7 +183,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canRefundInvoicePartial = true;
 
@@ -203,7 +190,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canVoid = true;
 
@@ -211,7 +197,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseInternal = true;
 
@@ -219,7 +204,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseCheckout = true;
 
@@ -227,7 +211,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSaveCc = false;
 
@@ -235,7 +218,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isProxy = false;
 
@@ -243,7 +225,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Availability option
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canFetchTransactionInfo = true;
 
@@ -251,7 +232,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Payment Method feature
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReviewPayment = true;
 
@@ -259,7 +239,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Gateway request timeout
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_clientTimeout = 45;
 
@@ -267,37 +246,31 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * Fields that should be replaced in debug with '***'
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = ['user', 'pwd', 'acct', 'expdate', 'cvv2'];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var ConfigInterfaceFactory
-     * @since 2.0.0
      */
     protected $configFactory;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Gateway
-     * @since 2.0.0
      */
     private $gateway;
 
     /**
      * @var HandlerInterface
-     * @since 2.0.0
      */
     private $errorHandler;
 
@@ -319,7 +292,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -365,7 +337,6 @@ public function __construct(
      * @param \Magento\Quote\Api\Data\CartInterface|Quote|null $quote
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -377,7 +348,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      *
      * @param int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isActive($storeId = null)
     {
@@ -392,7 +362,6 @@ public function isActive($storeId = null)
      * Payment action getter compatible with payment model
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPaymentAction()
     {
@@ -407,7 +376,6 @@ public function getConfigPaymentAction()
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -425,7 +393,6 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      *
      * @param float $amount
      * @return float
-     * @since 2.0.0
      */
     protected function _getCaptureAmount($amount)
     {
@@ -443,7 +410,6 @@ protected function _getCaptureAmount($amount)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -481,7 +447,6 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -508,7 +473,6 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * Check void availability
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -524,7 +488,6 @@ public function canVoid()
      *
      * @param InfoInterface|Object $payment
      * @return $this
-     * @since 2.0.0
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -543,7 +506,6 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -566,7 +528,6 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
@@ -592,7 +553,6 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
      *
      * @param string $status
      * @return bool
-     * @since 2.0.0
      */
     protected static function _isTransactionUnderReview($status)
     {
@@ -606,7 +566,6 @@ protected static function _isTransactionUnderReview($status)
      * Get Config instance
      *
      * @return PayflowConfig
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -625,7 +584,6 @@ public function getConfig()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function postRequest(DataObject $request, ConfigInterface $config)
     {
@@ -645,7 +603,6 @@ public function postRequest(DataObject $request, ConfigInterface $config)
      * @param Object|Payment $payment
      * @param float $amount
      * @return DataObject
-     * @since 2.0.0
      */
     protected function _buildPlaceRequest(DataObject $payment, $amount)
     {
@@ -665,7 +622,6 @@ protected function _buildPlaceRequest(DataObject $payment, $amount)
      * Return request object with basic information for gateway request
      *
      * @return DataObject
-     * @since 2.0.0
      */
     public function buildBasicRequest()
     {
@@ -692,7 +648,6 @@ public function buildBasicRequest()
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @since 2.0.0
      */
     public function processErrors(DataObject $response)
     {
@@ -714,7 +669,6 @@ public function processErrors(DataObject $response)
      *
      * @param InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public function acceptPayment(InfoInterface $payment)
     {
@@ -726,7 +680,6 @@ public function acceptPayment(InfoInterface $payment)
      *
      * @param InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public function denyPayment(InfoInterface $payment)
     {
@@ -739,7 +692,6 @@ public function denyPayment(InfoInterface $payment)
      * @param InfoInterface $payment
      * @param string $action
      * @return bool
-     * @since 2.0.0
      */
     public function reviewPayment(InfoInterface $payment, $action)
     {
@@ -770,7 +722,6 @@ public function reviewPayment(InfoInterface $payment, $action)
      * @param DataObject $billing
      *
      * @return Object
-     * @since 2.0.0
      */
     public function setBilling(DataObject $request, $billing)
     {
@@ -797,7 +748,6 @@ public function setBilling(DataObject $request, $billing)
      * @param DataObject $shipping
      *
      * @return Object
-     * @since 2.0.0
      */
     public function setShipping($request, $shipping)
     {
@@ -826,7 +776,6 @@ public function setShipping($request, $shipping)
      * @param DataObject $response
      *
      * @return DataObject
-     * @since 2.0.0
      */
     public function mapGatewayResponse(array $postData, DataObject $response)
     {
@@ -870,7 +819,6 @@ public function mapGatewayResponse(array $postData, DataObject $response)
      *
      * @return Object
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setTransStatus($payment, $response)
     {
@@ -902,7 +850,6 @@ public function setTransStatus($payment, $response)
      * @param DataObject $order
      * @param DataObject $request
      * @return DataObject
-     * @since 2.0.0
      */
     public function fillCustomerContacts(DataObject $order, DataObject $request)
     {
@@ -924,7 +871,6 @@ public function fillCustomerContacts(DataObject $order, DataObject $request)
      * @param DataObject $request
      * @param Order $order
      * @return void
-     * @since 2.0.0
      */
     public function addRequestOrderInfo(DataObject $request, Order $order)
     {
@@ -945,7 +891,7 @@ public function addRequestOrderInfo(DataObject $request, Order $order)
      * @param array|DataObject $data
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function assignData(DataObject $data)
     {
diff --git a/app/code/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreement.php b/app/code/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreement.php
index 14a33585ff71b..16073a2c9bbe0 100644
--- a/app/code/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreement.php
+++ b/app/code/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreement.php
@@ -14,7 +14,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractAgreement extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -27,13 +26,11 @@ abstract class AbstractAgreement extends \Magento\Payment\Model\Method\AbstractM
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_infoBlockType = \Magento\Paypal\Block\Payment\Info\Billing\Agreement::class;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_formBlockType = \Magento\Paypal\Block\Payment\Form\Billing\Agreement::class;
 
@@ -41,13 +38,11 @@ abstract class AbstractAgreement extends \Magento\Payment\Model\Method\AbstractM
      * Is method instance available
      *
      * @var null|bool
-     * @since 2.0.0
      */
     protected $_isAvailable = null;
 
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $_agreementFactory;
 
@@ -64,7 +59,6 @@ abstract class AbstractAgreement extends \Magento\Payment\Model\Method\AbstractM
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -99,7 +93,6 @@ public function __construct(
      *
      * @param \Magento\Paypal\Model\Quote|\Magento\Quote\Api\Data\CartInterface|null $quote
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
@@ -117,7 +110,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      * @param \Magento\Framework\DataObject $data
      * @return \Magento\Payment\Model\Info
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
@@ -150,7 +142,6 @@ public function assignData(\Magento\Framework\DataObject $data)
     /**
      * @param object $quote
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function _isAvailable($quote);
 }
diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
index 008e44e915deb..1bb6c48f6ba94 100644
--- a/app/code/Magento/Paypal/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Pro.php
@@ -15,7 +15,6 @@
 /**
  * PayPal Website Payments Pro implementation for payment method instances
  * This model was created because right now PayPal Direct and PayPal Express payment methods cannot have same abstract
- * @since 2.0.0
  */
 class Pro
 {
@@ -30,7 +29,6 @@ class Pro
      * Config instance
      *
      * @var \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -38,7 +36,6 @@ class Pro
      * API instance
      *
      * @var \Magento\Paypal\Model\Api\Nvp
-     * @since 2.0.0
      */
     protected $_api;
 
@@ -46,7 +43,6 @@ class Pro
      * PayPal info object
      *
      * @var \Magento\Paypal\Model\Info
-     * @since 2.0.0
      */
     protected $_infoInstance;
 
@@ -54,7 +50,6 @@ class Pro
      * API model type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_apiType = \Magento\Paypal\Model\Api\Nvp::class;
 
@@ -62,31 +57,26 @@ class Pro
      * Config model type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configType = \Magento\Paypal\Model\Config::class;
 
     /**
      * @var \Magento\Paypal\Model\Config\Factory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Paypal\Model\Api\Type\Factory
-     * @since 2.0.0
      */
     protected $_apiFactory;
 
     /**
      * @var \Magento\Paypal\Model\InfoFactory
-     * @since 2.0.0
      */
     protected $_infoFactory;
 
     /**
      * @var TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
@@ -95,7 +85,6 @@ class Pro
      * @param \Magento\Paypal\Model\Api\Type\Factory $apiFactory
      * @param \Magento\Paypal\Model\InfoFactory $infoFactory
      * @param TransactionRepositoryInterface $transactionRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\Config\Factory $configFactory,
@@ -115,7 +104,6 @@ public function __construct(
      * @param string $code
      * @param int|null $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($code, $storeId = null)
     {
@@ -140,7 +128,6 @@ public function setMethod($code, $storeId = null)
      * @param \Magento\Paypal\Model\Config $instace
      * @param int|null $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setConfig(\Magento\Paypal\Model\Config $instance, $storeId = null)
     {
@@ -155,7 +142,6 @@ public function setConfig(\Magento\Paypal\Model\Config $instance, $storeId = nul
      * Config instance getter
      *
      * @return \Magento\Paypal\Model\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -167,7 +153,6 @@ public function getConfig()
      * Sets current store id to current config instance and passes it to API
      *
      * @return \Magento\Paypal\Model\Api\Nvp
-     * @since 2.0.0
      */
     public function getApi()
     {
@@ -182,7 +167,6 @@ public function getApi()
      * Destroy existing NVP Api object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetApi()
     {
@@ -195,7 +179,6 @@ public function resetApi()
      * Instantiate and return info model
      *
      * @return \Magento\Paypal\Model\Info
-     * @since 2.0.0
      */
     public function getInfo()
     {
@@ -211,7 +194,6 @@ public function getInfo()
      * @param \Magento\Framework\DataObject|AbstractApi $from
      * @param \Magento\Payment\Model\InfoInterface $to
      * @return $this
-     * @since 2.0.0
      */
     public function importPaymentInfo(\Magento\Framework\DataObject $from, \Magento\Payment\Model\InfoInterface $to)
     {
@@ -245,7 +227,6 @@ public function importPaymentInfo(\Magento\Framework\DataObject $from, \Magento\
      * @param \Magento\Framework\DataObject $payment
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function void(\Magento\Framework\DataObject $payment)
     {
@@ -268,7 +249,6 @@ public function void(\Magento\Framework\DataObject $payment)
      * @param \Magento\Framework\DataObject $payment
      * @param float $amount
      * @return false|null
-     * @since 2.0.0
      */
     public function capture(\Magento\Framework\DataObject $payment, $amount)
     {
@@ -300,7 +280,6 @@ public function capture(\Magento\Framework\DataObject $payment, $amount)
      * @param float $amount
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function refund(\Magento\Framework\DataObject $payment, $amount)
     {
@@ -337,7 +316,6 @@ public function refund(\Magento\Framework\DataObject $payment, $amount)
      *
      * @param \Magento\Framework\DataObject $payment
      * @return void
-     * @since 2.0.0
      */
     public function cancel(\Magento\Framework\DataObject $payment)
     {
@@ -351,7 +329,6 @@ public function cancel(\Magento\Framework\DataObject $payment)
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     public function canReviewPayment(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -366,7 +343,6 @@ public function canReviewPayment(\Magento\Payment\Model\InfoInterface $payment)
      *
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @return bool
-     * @since 2.0.0
      */
     protected function _isPaymentReviewRequired(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -379,7 +355,6 @@ protected function _isPaymentReviewRequired(\Magento\Payment\Model\InfoInterface
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $action
      * @return bool
-     * @since 2.0.0
      */
     public function reviewPayment(\Magento\Payment\Model\InfoInterface $payment, $action)
     {
@@ -405,7 +380,6 @@ public function reviewPayment(\Magento\Payment\Model\InfoInterface $payment, $ac
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $transactionId
      * @return array
-     * @since 2.0.0
      */
     public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
     {
@@ -422,7 +396,6 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
      * @param \Magento\Paypal\Model\Api\Nvp $api
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return void
-     * @since 2.0.0
      */
     protected function _importCaptureResultToPayment($api, $payment)
     {
@@ -437,7 +410,6 @@ protected function _importCaptureResultToPayment($api, $payment)
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @param bool $canRefundMore
      * @return void
-     * @since 2.0.0
      */
     protected function _importRefundResultToPayment($api, $payment, $canRefundMore)
     {
@@ -456,7 +428,6 @@ protected function _importRefundResultToPayment($api, $payment, $canRefundMore)
      *
      * @param \Magento\Framework\DataObject $payment
      * @return string
-     * @since 2.0.0
      */
     protected function _getParentTransactionId(\Magento\Framework\DataObject $payment)
     {
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
index bd84edd58424e..25c66aa23081a 100644
--- a/app/code/Magento/Paypal/Model/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/Report/Settlement.php
@@ -29,7 +29,6 @@
  * @method string getLastModified()
  * @method \Magento\Paypal\Model\Report\Settlement setLastModified(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Settlement extends \Magento\Framework\Model\AbstractModel
 {
@@ -62,13 +61,11 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
      * Reports rows storage
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rows = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_csvColumns = [
         'old' => [
@@ -153,19 +150,16 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_tmpDirectory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -201,7 +195,6 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -226,7 +219,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -237,7 +229,6 @@ protected function _construct()
      * Stop saving process if file with same report date, account ID and last modified date was already ferched
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -258,7 +249,6 @@ public function beforeSave()
      * @param \Magento\Framework\Filesystem\Io\Sftp $connection
      * @return int Number of report rows that were fetched and saved successfully
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function fetchAndSave(\Magento\Framework\Filesystem\Io\Sftp $connection)
     {
@@ -323,7 +313,6 @@ public function fetchAndSave(\Magento\Framework\Filesystem\Io\Sftp $connection)
      * @param array $config
      * @return \Magento\Framework\Filesystem\Io\Sftp
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public static function createConnection(array $config)
     {
@@ -354,7 +343,6 @@ public static function createConnection(array $config)
      * @param string $format CSV format(column names)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function parseCsv($localCsv, $format = 'new')
     {
@@ -479,7 +467,6 @@ private function formatAmountColumn($lineItem)
      * Load report by unique key (accoutn + report date)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadByAccountAndDate()
     {
@@ -491,7 +478,6 @@ public function loadByAccountAndDate()
      * Return collected rows for further processing.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRows()
     {
@@ -504,7 +490,6 @@ public function getRows()
      * @param string $field Field name in row model
      * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getFieldLabel($field)
     {
@@ -552,7 +537,6 @@ public function getFieldLabel($field)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getSftpCredentials($automaticMode = false)
     {
@@ -619,7 +603,6 @@ public function getSftpCredentials($automaticMode = false)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     protected function _fileNameToDate($filename)
     {
@@ -634,7 +617,6 @@ protected function _fileNameToDate($filename)
      *
      * @param array $list List of files as per $connection->rawls()
      * @return array Trimmed down list of files
-     * @since 2.0.0
      */
     protected function _filterReportsList($list)
     {
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement/Row.php b/app/code/Magento/Paypal/Model/Report/Settlement/Row.php
index c2500f831221f..0071a5eaeb9d6 100644
--- a/app/code/Magento/Paypal/Model/Report/Settlement/Row.php
+++ b/app/code/Magento/Paypal/Model/Report/Settlement/Row.php
@@ -43,7 +43,6 @@
  * @method Row setConsumerId(string $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Row extends \Magento\Framework\Model\AbstractModel
 {
@@ -51,7 +50,6 @@ class Row extends \Magento\Framework\Model\AbstractModel
      * Assoc array event code => label
      *
      * @var array
-     * @since 2.0.0
      */
     private $eventLabelsList = [];
 
@@ -59,7 +57,6 @@ class Row extends \Magento\Framework\Model\AbstractModel
      * Cast amount relation
      *
      * @var array
-     * @since 2.0.0
      */
     private $castAmountRelation = [
         'fee_amount' => 'fee_debit_or_credit',
@@ -70,7 +67,6 @@ class Row extends \Magento\Framework\Model\AbstractModel
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +79,6 @@ protected function _construct()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getReferenceType($code)
     {
@@ -101,7 +96,6 @@ public function getReferenceType($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getTransactionEvent($code)
     {
@@ -115,7 +109,6 @@ public function getTransactionEvent($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getDebitCreditText($code)
     {
@@ -131,7 +124,6 @@ public function getDebitCreditText($code)
      *
      * @param string $key
      * @return float|null
-     * @since 2.0.0
      */
     public function getCastedAmount($key)
     {
@@ -153,7 +145,6 @@ public function getCastedAmount($key)
      * Get full list of codes with their description
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTransactionEvents()
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement.php b/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement.php
index f9f7638dda0d4..da39cf3085a11 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement.php
@@ -7,7 +7,6 @@
 
 /**
  * Billing agreement resource model
- * @since 2.0.0
  */
 class Agreement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Agreement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * @param int $agreementId
      * @param int $orderId
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderRelation($agreementId, $orderId)
     {
@@ -45,7 +42,6 @@ public function addOrderRelation($agreementId, $orderId)
      * @param \Magento\Framework\Data\Collection\AbstractDb $orderCollection
      * @param string|int|array $agreementIds
      * @return $this
-     * @since 2.0.0
      */
     public function addOrdersFilter(\Magento\Framework\Data\Collection\AbstractDb $orderCollection, $agreementIds)
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement/Collection.php b/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement/Collection.php
index d13984fffed49..ba16bef32b008 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement/Collection.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement/Collection.php
@@ -9,7 +9,6 @@
  * Billing agreements resource collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Mapping for fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = [
         'fields' => [
@@ -31,13 +29,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $_customerResource;
 
     /**
      * @var \Magento\Eav\Helper\Data
-     * @since 2.0.0
      */
     protected $_eavHelper;
 
@@ -50,7 +46,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Eav\Helper\Data $eavHelper
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -71,7 +66,6 @@ public function __construct(
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -85,7 +79,6 @@ protected function _construct()
      * Add customer details(email, firstname, lastname) to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerDetails()
     {
@@ -103,7 +96,6 @@ public function addCustomerDetails()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Cert.php b/app/code/Magento/Paypal/Model/ResourceModel/Cert.php
index b18171dc8c302..25f91c5abae8e 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Cert.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Cert.php
@@ -7,19 +7,16 @@
 
 /**
  * PayPal resource model for certificate based authentication
- * @since 2.0.0
  */
 class Cert extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -28,7 +25,6 @@ class Cert extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -45,7 +41,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +52,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -71,7 +65,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Paypal\Model\Cert $object
      * @param bool $strictLoad
      * @return \Magento\Paypal\Model\Cert
-     * @since 2.0.0
      */
     public function loadByWebsite($object, $strictLoad = true)
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
index ae0581dfde92d..0796c22db98bf 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
@@ -10,7 +10,6 @@
 
 /**
  * Report settlement resource model
- * @since 2.0.0
  */
 class Settlement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,13 +17,11 @@ class Settlement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_rowsTable;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_coreDate;
 
@@ -32,7 +29,6 @@ class Settlement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Init main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -60,7 +55,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Paypal\Model\Report\Settlement $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -110,7 +104,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @param string $accountId
      * @param string $reportDate
      * @return $this
-     * @since 2.0.0
      */
     public function loadByAccountAndDate(\Magento\Paypal\Model\Report\Settlement $report, $accountId, $reportDate)
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php
index 87381fe2ced3f..ad47e7b84fe20 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php
@@ -9,19 +9,16 @@
  * Transaction Events Types Options
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class TransactionEvents implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\Report\Settlement\Row
-     * @since 2.0.0
      */
     protected $_model;
 
     /**
      * @param \Magento\Paypal\Model\Report\Settlement\Row $model
-     * @since 2.0.0
      */
     public function __construct(\Magento\Paypal\Model\Report\Settlement\Row $model)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Paypal\Model\Report\Settlement\Row $model)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php
index c34c04f6b069b..82485e07a0c8f 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php
@@ -9,7 +9,6 @@
  * Report settlement row resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Row extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Row extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Set main entity table name and primary key field name.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php
index 3801c8a242864..feab21d478b65 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Paypal\Model\ResourceModel\Report\Settlement\Row\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initializing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +34,6 @@ protected function _construct()
      * Join reports info table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -54,7 +51,6 @@ protected function _initSelect()
      *
      * @param string $accountId
      * @return $this
-     * @since 2.0.0
      */
     public function addAccountFilter($accountId)
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
index 7c0e508d7abfd..600c70cf3c57d 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
@@ -12,25 +12,21 @@
  * Backend model for saving certificate file in case of using certificate based authentication
  *
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @since 2.0.0
  */
 class Cert extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Paypal\Model\CertFactory
-     * @since 2.0.0
      */
     protected $_certFactory;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $_tmpDirectory;
 
@@ -45,7 +41,6 @@ class Cert extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -106,7 +100,6 @@ public function beforeSave()
      * Process object after delete data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
index 10a1869e6d233..a33b752474d7e 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Paypal\Model\System\Config\Backend\Cron
  *
- * @since 2.0.0
  */
 class Cron extends \Magento\Framework\App\Config\Value
 {
@@ -18,7 +17,6 @@ class Cron extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
-     * @since 2.0.0
      */
     protected $_configValueFactory;
 
@@ -31,7 +29,6 @@ class Cron extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -51,7 +48,6 @@ public function __construct(
      * Cron settings after save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php b/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
index 9f7d93b46c189..f3be3553532d2 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
@@ -7,7 +7,6 @@
 
 /**
  * Backend model for merchant country. Default country used instead of empty value.
- * @since 2.0.0
  */
 class MerchantCountry extends \Magento\Framework\App\Config\Value
 {
@@ -15,13 +14,11 @@ class MerchantCountry extends \Magento\Framework\App\Config\Value
      * Core data
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -35,7 +32,6 @@ class MerchantCountry extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Substitute empty value with Default country.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/BmlPosition.php b/app/code/Magento/Paypal/Model/System/Config/Source/BmlPosition.php
index abd4f55d23857..005d1f244755e 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/BmlPosition.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/BmlPosition.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Model\System\Config\Source\BmlPosition
  *
- * @since 2.0.0
  */
 class BmlPosition
 {
@@ -17,7 +16,6 @@ class BmlPosition
      * Bml positions source getter for Home Page
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlPositionsHP()
     {
@@ -31,7 +29,6 @@ public function getBmlPositionsHP()
      * Bml positions source getter for Catalog Category Page
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlPositionsCCP()
     {
@@ -45,7 +42,6 @@ public function getBmlPositionsCCP()
      * Bml positions source getter for Catalog Product Page
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlPositionsCPP()
     {
@@ -59,7 +55,6 @@ public function getBmlPositionsCPP()
      * Bml positions source getter for Checkout Cart Page
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlPositionsCheckout()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/BmlSize.php b/app/code/Magento/Paypal/Model/System/Config/Source/BmlSize.php
index cc6f3b8e106c8..39d3e58b83066 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/BmlSize.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/BmlSize.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Paypal\Model\System\Config\Source\BmlSize
  *
- * @since 2.0.0
  */
 class BmlSize
 {
@@ -17,7 +16,6 @@ class BmlSize
      * Options getter for Home Page and position Header
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeHPH()
     {
@@ -35,7 +33,6 @@ public function getBmlSizeHPH()
      * Options getter for Home Page and position Sidebar (right)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeHPS()
     {
@@ -54,7 +51,6 @@ public function getBmlSizeHPS()
      * Options getter for Catalog Category Page and position Center
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCCPC()
     {
@@ -72,7 +68,6 @@ public function getBmlSizeCCPC()
      * Options getter for Catalog Category Page and position Sidebar (right)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCCPS()
     {
@@ -91,7 +86,6 @@ public function getBmlSizeCCPS()
      * Options getter for Catalog Product Page and position Center
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCPPC()
     {
@@ -109,7 +103,6 @@ public function getBmlSizeCPPC()
      * Options getter for Catalog Product Page and position Near Bill Me Later checkout button
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCPPN()
     {
@@ -128,7 +121,6 @@ public function getBmlSizeCPPN()
      * Options getter for Checkout Cart Page and position Center
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCheckoutC()
     {
@@ -145,7 +137,6 @@ public function getBmlSizeCheckoutC()
      * Options getter for Checkout Cart Page and position Near Bill Me Later checkout button
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBmlSizeCheckoutN()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php b/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php
index d2a39dbe731fa..dc0c1183bc25f 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php
@@ -7,26 +7,22 @@
 
 /**
  * Source model for buyer countries supported by PayPal
- * @since 2.0.0
  */
 class BuyerCountry implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_countryCollectionFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\ConfigFactory $configFactory,
@@ -38,7 +34,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false)
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php
index ba7d8224e8cef..b9f66926a8459 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php
@@ -7,13 +7,11 @@
 
 /**
  * Source model for available settlement report fetching intervals
- * @since 2.0.0
  */
 class FetchingSchedule implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php b/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php
index ae6140869f7d1..2377a8bf3fde4 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php
@@ -7,19 +7,16 @@
 
 /**
  * Source model for available logo types
- * @since 2.0.0
  */
 class Logo implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
     {
@@ -28,7 +25,6 @@ public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php b/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php
index c0d3353825d40..b4efcd14a81c8 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php
@@ -7,26 +7,22 @@
 
 /**
  * Source model for merchant countries supported by PayPal
- * @since 2.0.0
  */
 class MerchantCountry implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
-     * @since 2.0.0
      */
     protected $_countryCollectionFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\ConfigFactory $configFactory,
@@ -38,7 +34,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray($isMultiselect = false)
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php
index 3b8e62c8d8a37..1111612a6cc9b 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php
@@ -7,19 +7,16 @@
 
 /**
  * Source model for available payment actions
- * @since 2.0.0
  */
 class PaymentActions implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
     {
@@ -28,7 +25,6 @@ public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php
index 503e947d4d99d..47cfaf74af2ed 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php
@@ -7,19 +7,16 @@
 
 /**
  * Source model for available paypal express payment actions
- * @since 2.0.0
  */
 class Express implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
     {
@@ -28,7 +25,6 @@ public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php b/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php
index 4cce84e57fb78..2fc86f8e6ef58 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php
@@ -7,19 +7,16 @@
 
 /**
  * Source model for Require Billing Address
- * @since 2.0.0
  */
 class RequireBillingAddress implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Paypal\Model\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
     /**
      * @param \Magento\Paypal\Model\ConfigFactory $configFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
     {
@@ -28,7 +25,6 @@ public function __construct(\Magento\Paypal\Model\ConfigFactory $configFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php b/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php
index 1a5bd9b97ee0c..9769b9b1bce21 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php
@@ -7,13 +7,11 @@
 
 /**
  * Source model for url method: GET/POST
- * @since 2.0.0
  */
 class UrlMethod implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php b/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php
index a969356666d74..638f3d05ab114 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php
@@ -7,7 +7,6 @@
 
 /**
  * Used in creating options for Yes|No config value selection
- * @since 2.0.0
  */
 class Yesnoshortcut implements \Magento\Framework\Option\ArrayInterface
 {
@@ -15,7 +14,6 @@ class Yesnoshortcut implements \Magento\Framework\Option\ArrayInterface
      * Options getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php b/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
index 1adc7b2ca4762..8178d725f6949 100644
--- a/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
@@ -10,19 +10,16 @@
 
 /**
  * PayPal module observer
- * @since 2.0.0
  */
 class AddBillingAgreementToSessionObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Paypal\Model\Billing\AgreementFactory
-     * @since 2.0.0
      */
     protected $agreementFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -31,7 +28,6 @@ class AddBillingAgreementToSessionObserver implements ObserverInterface
      *
      * @param \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory,
@@ -44,7 +40,6 @@ public function __construct(
     /**
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
index ab64b2366dd76..58edf68f3475e 100644
--- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
@@ -12,19 +12,16 @@
 
 /**
  * PayPal module observer
- * @since 2.0.0
  */
 class AddPaypalShortcutsObserver implements ObserverInterface
 {
     /**
      * @var Factory
-     * @since 2.0.0
      */
     protected $shortcutFactory;
 
     /**
      * @var PaypalConfig
-     * @since 2.0.0
      */
     protected $paypalConfig;
 
@@ -33,7 +30,6 @@ class AddPaypalShortcutsObserver implements ObserverInterface
      *
      * @param Factory $shortcutFactory
      * @param PaypalConfig $paypalConfig
-     * @since 2.0.0
      */
     public function __construct(
         Factory $shortcutFactory,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php b/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
index 9c0e3440a7714..9f62f52a1ac79 100644
--- a/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
+++ b/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
@@ -10,19 +10,16 @@
 
 /**
  * PayPal module observer
- * @since 2.0.0
  */
 class HtmlTransactionIdObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Paypal\Helper\Data
-     * @since 2.0.0
      */
     private $paypalData;
 
     /**
      * @param \Magento\Paypal\Helper\Data $paypalData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Helper\Data $paypalData
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php b/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
index 4f84d42ea2d76..f1c037f12c201 100644
--- a/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
+++ b/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Paypal\Observer\RestrictAdminBillingAgreementUsageObserver
  *
- * @since 2.0.0
  */
 class RestrictAdminBillingAgreementUsageObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @param \Magento\Framework\AuthorizationInterface $authorization
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\AuthorizationInterface $authorization
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
index 1958fc7a8f1e0..6900176702700 100644
--- a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
+++ b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * PayPal module observer
- * @since 2.0.0
  */
 class SaveOrderAfterSubmitObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class SaveOrderAfterSubmitObserver implements ObserverInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -26,7 +24,6 @@ class SaveOrderAfterSubmitObserver implements ObserverInterface
      * Constructor
      *
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $coreRegistry
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
index 5dfdb162e4783..0e05791dc875d 100644
--- a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
+++ b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * PayPal module observer
- * @since 2.0.0
  */
 class SetResponseAfterSaveOrderObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class SetResponseAfterSaveOrderObserver implements ObserverInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -26,19 +24,16 @@ class SetResponseAfterSaveOrderObserver implements ObserverInterface
      * Paypal hss
      *
      * @var \Magento\Paypal\Helper\Hss
-     * @since 2.0.0
      */
     protected $_paypalHss;
 
     /**
      * @var \Magento\Paypal\Model\Report\SettlementFactory
-     * @since 2.0.0
      */
     protected $_settlementFactory;
 
     /**
      * @var \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     protected $_view;
 
@@ -48,7 +43,6 @@ class SetResponseAfterSaveOrderObserver implements ObserverInterface
      * @param \Magento\Paypal\Helper\Hss $paypalHss
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\App\ViewInterface $view
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Paypal\Helper\Hss $paypalHss,
@@ -65,7 +59,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Paypal/Setup/InstallData.php b/app/code/Magento/Paypal/Setup/InstallData.php
index bd4a4a259251c..688d7dabb2ceb 100644
--- a/app/code/Magento/Paypal/Setup/InstallData.php
+++ b/app/code/Magento/Paypal/Setup/InstallData.php
@@ -14,26 +14,22 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * @var SalesSetupFactory
-     * @since 2.0.0
      */
     protected $salesSetupFactory;
 
     /**
      * @var QuoteSetupFactory
-     * @since 2.0.0
      */
     protected $quoteSetupFactory;
 
     /**
      * @param SalesSetupFactory $salesSetupFactory
      * @param QuoteSetupFactory $quoteSetupFactory
-     * @since 2.0.0
      */
     public function __construct(SalesSetupFactory $salesSetupFactory, QuoteSetupFactory $quoteSetupFactory)
     {
@@ -43,7 +39,6 @@ public function __construct(SalesSetupFactory $salesSetupFactory, QuoteSetupFact
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Paypal/Setup/InstallSchema.php b/app/code/Magento/Paypal/Setup/InstallSchema.php
index 4fbf95de0d91b..cf885981783fa 100644
--- a/app/code/Magento/Paypal/Setup/InstallSchema.php
+++ b/app/code/Magento/Paypal/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Persistent/Block/Form/Remember.php b/app/code/Magento/Persistent/Block/Form/Remember.php
index 2a9a6dabdfcf6..71c7d2a257cfa 100644
--- a/app/code/Magento/Persistent/Block/Form/Remember.php
+++ b/app/code/Magento/Persistent/Block/Form/Remember.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Remember extends \Magento\Framework\View\Element\Template
 {
@@ -18,13 +17,11 @@ class Remember extends \Magento\Framework\View\Element\Template
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
@@ -33,7 +30,6 @@ class Remember extends \Magento\Framework\View\Element\Template
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Prevent rendering if Persistent disabled
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -62,7 +57,6 @@ protected function _toHtml()
      * Is "Remember Me" checked
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRememberMeChecked()
     {
@@ -78,7 +72,6 @@ public function isRememberMeChecked()
      * @param string|null $chars
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRandomString($length, $chars = null)
     {
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index a932866a14b44..c740f5a3469fb 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -9,19 +9,16 @@
  * Remember Me block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Additional extends \Magento\Framework\View\Element\Html\Link
 {
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
     /**
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSessionHelper;
 
@@ -29,7 +26,6 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -41,7 +37,6 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
      * @param \Magento\Persistent\Helper\Session $persistentSessionHelper
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Retrieve unset cookie link
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -73,7 +67,6 @@ public function getHref()
      * Render additional header html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Persistent/Controller/Index.php b/app/code/Magento/Persistent/Controller/Index.php
index 9bb25030f6742..3edb8af510a72 100644
--- a/app/code/Magento/Persistent/Controller/Index.php
+++ b/app/code/Magento/Persistent/Controller/Index.php
@@ -15,7 +15,6 @@
 /**
  * Persistent front controller
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 abstract class Index extends Action
 {
@@ -23,7 +22,6 @@ abstract class Index extends Action
      * Persistent observer
      *
      * @var \Magento\Persistent\Model\Observer
-     * @since 2.0.0
      */
     protected $quoteManager;
 
@@ -31,7 +29,6 @@ abstract class Index extends Action
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -39,13 +36,11 @@ abstract class Index extends Action
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $sessionHelper;
 
@@ -53,7 +48,6 @@ abstract class Index extends Action
      * Whether clear checkout session when logout
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $clearCheckoutSession = true;
 
@@ -63,7 +57,6 @@ abstract class Index extends Action
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Helper\Session $sessionHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -84,7 +77,6 @@ public function __construct(
      *
      * @param bool $clear
      * @return $this
-     * @since 2.0.0
      */
     public function setClearCheckoutSession($clear = true)
     {
diff --git a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
index 51da17fe5b2b8..70fd4f9eb2904 100644
--- a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
+++ b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ExpressCheckout extends Index
 {
@@ -18,7 +17,6 @@ class ExpressCheckout extends Index
      * Add appropriate session message and redirect to shopping cart
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
index 9222383398283..40e73041f6b08 100644
--- a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
+++ b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Controller\Index\SaveMethod
  *
- * @since 2.0.0
  */
 class SaveMethod extends Index
 {
@@ -19,7 +18,6 @@ class SaveMethod extends Index
      * Save onepage checkout method to be register
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
index 5d3385629576b..245c4fcd66c83 100644
--- a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
+++ b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Controller\Index\UnsetCookie
  *
- * @since 2.0.0
  */
 class UnsetCookie extends Index
 {
@@ -19,7 +18,6 @@ class UnsetCookie extends Index
      * Unset persistent cookie action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -36,7 +34,6 @@ public function execute()
      * Revert all persistent data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function cleanup()
     {
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index 223cca5b56c52..3134629c3928b 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -34,19 +33,16 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Name of config file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configFileName = 'persistent.xml';
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_modulesReader;
 
@@ -54,7 +50,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Module\Dir\Reader $modulesReader
      * @param \Magento\Framework\Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -74,7 +69,6 @@ public function __construct(
      * @param int|string|\Magento\Store\Model\Store $store
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isEnabled($store = null)
     {
@@ -91,7 +85,6 @@ public function isEnabled($store = null)
      * @param int|string|\Magento\Store\Model\Store $store
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isRememberMeEnabled($store = null)
     {
@@ -108,7 +101,6 @@ public function isRememberMeEnabled($store = null)
      * @param int|string|\Magento\Store\Model\Store $store
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isRememberMeCheckedDefault($store = null)
     {
@@ -125,7 +117,6 @@ public function isRememberMeCheckedDefault($store = null)
      * @param int|string|\Magento\Store\Model\Store $store
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isShoppingCartPersist($store = null)
     {
@@ -141,7 +132,6 @@ public function isShoppingCartPersist($store = null)
      *
      * @param int|string|\Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getLifeTime($store = null)
     {
@@ -161,7 +151,6 @@ public function getLifeTime($store = null)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getClearOnLogout()
     {
@@ -176,7 +165,6 @@ public function getClearOnLogout()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getUnsetCookieUrl()
     {
@@ -187,7 +175,6 @@ public function getUnsetCookieUrl()
      * Retrieve path for config file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPersistentConfigFilePath()
     {
@@ -202,7 +189,6 @@ public function getPersistentConfigFilePath()
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function canProcess($observer)
     {
diff --git a/app/code/Magento/Persistent/Helper/Session.php b/app/code/Magento/Persistent/Helper/Session.php
index 5d9c4b1d88145..dd414c67bf16d 100644
--- a/app/code/Magento/Persistent/Helper/Session.php
+++ b/app/code/Magento/Persistent/Helper/Session.php
@@ -9,7 +9,6 @@
  * Persistent Shopping Cart Data Helper
  *
  * @api
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -17,7 +16,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * Instance of Session Model
      *
      * @var \Magento\Persistent\Model\Session
-     * @since 2.0.0
      */
     protected $_sessionModel;
 
@@ -25,7 +23,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * Is "Remember Me" checked
      *
      * @var null|bool
-     * @since 2.0.0
      */
     protected $_isRememberMeChecked;
 
@@ -33,7 +30,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData;
 
@@ -41,7 +37,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * Persistent session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
@@ -49,7 +44,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -58,7 +52,6 @@ class Session extends \Magento\Framework\App\Helper\AbstractHelper
      * @param Data $persistentData
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -79,7 +72,6 @@ public function __construct(
      * Get Session model
      *
      * @return \Magento\Persistent\Model\Session
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -96,7 +88,6 @@ public function getSession()
      * @param \Magento\Persistent\Model\Session $sessionModel
      * @return \Magento\Persistent\Model\Session
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setSession($sessionModel)
     {
@@ -108,7 +99,6 @@ public function setSession($sessionModel)
      * Check whether persistent mode is running
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPersistent()
     {
@@ -119,7 +109,6 @@ public function isPersistent()
      * Check if "Remember Me" checked
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRememberMeChecked()
     {
@@ -146,7 +135,6 @@ public function isRememberMeChecked()
      * @param bool $checked
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setRememberMeChecked($checked = true)
     {
diff --git a/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php b/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
index 84738ba66f6c0..eaebc21c4343c 100644
--- a/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Persistent\Model\Checkout\AddressDataProcessorPlugin
  *
- * @since 2.0.0
  */
 class AddressDataProcessorPlugin
 {
     /**
      * @var PersistentSession
-     * @since 2.0.0
      */
     private $persistentSession;
 
     /**
      * @var PersistentHelper
-     * @since 2.0.0
      */
     private $persistentHelper;
 
     /**
      * @var CheckoutSession
-     * @since 2.0.0
      */
     private $checkoutSession;
 
@@ -40,7 +36,6 @@ class AddressDataProcessorPlugin
      * @param PersistentHelper $persistentHelper
      * @param PersistentSession $persistentSession
      * @param CheckoutSession $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         PersistentHelper $persistentHelper,
@@ -59,7 +54,6 @@ public function __construct(
      * @param AddressAdditionalData $additionalData
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeProcess(AddressAdditionalDataProcessor $subject, AddressAdditionalData $additionalData)
     {
diff --git a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
index 5b91a8b62f158..d50f0366b9c37 100644
--- a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
@@ -14,37 +14,31 @@
 /**
  * Class \Magento\Persistent\Model\Checkout\ConfigProviderPlugin
  *
- * @since 2.0.0
  */
 class ConfigProviderPlugin
 {
     /**
      * @var PersistentSession
-     * @since 2.0.0
      */
     private $persistentSession;
 
     /**
      * @var PersistentHelper
-     * @since 2.0.0
      */
     private $persistentHelper;
 
     /**
      * @var CheckoutSession
-     * @since 2.0.0
      */
     private $checkoutSession;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     private $quoteIdMaskFactory;
 
     /**
      * @var CustomerSession
-     * @since 2.0.0
      */
     private $customerSession;
 
@@ -54,7 +48,6 @@ class ConfigProviderPlugin
      * @param CheckoutSession $checkoutSession
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CustomerSession $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         PersistentHelper $persistentHelper,
@@ -75,7 +68,6 @@ public function __construct(
      * @param array $result
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetConfig(\Magento\Checkout\Model\DefaultConfigProvider $subject, array $result)
     {
diff --git a/app/code/Magento/Persistent/Model/CheckoutConfigProvider.php b/app/code/Magento/Persistent/Model/CheckoutConfigProvider.php
index b0d0b311c55df..67e4febd62f44 100644
--- a/app/code/Magento/Persistent/Model/CheckoutConfigProvider.php
+++ b/app/code/Magento/Persistent/Model/CheckoutConfigProvider.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Persistent\Model\CheckoutConfigProvider
  *
- * @since 2.0.0
  */
 class CheckoutConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var PersistentHelper
-     * @since 2.0.0
      */
     private $persistentHelper;
 
     /**
      * @param PersistentHelper $persistentHelper
-     * @since 2.0.0
      */
     public function __construct(PersistentHelper $persistentHelper)
     {
@@ -32,7 +29,6 @@ public function __construct(PersistentHelper $persistentHelper)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/Persistent/Model/Factory.php b/app/code/Magento/Persistent/Model/Factory.php
index 20dea4bf27f44..fde85138bb308 100644
--- a/app/code/Magento/Persistent/Model/Factory.php
+++ b/app/code/Magento/Persistent/Model/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Persistent Factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -15,7 +14,6 @@ class Factory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -23,7 +21,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $data
      * @return mixed
-     * @since 2.0.0
      */
     public function create($className, $data = [])
     {
diff --git a/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
index c5f1db53a8fb6..3bb15a2625dbb 100644
--- a/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
@@ -9,19 +9,16 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
     /**
      * @var \Magento\Persistent\Model\Session
-     * @since 2.0.0
      */
     protected $persistentSession;
 
@@ -30,7 +27,6 @@ class DepersonalizePlugin
      *
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param \Magento\Persistent\Model\Session $persistentSession
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -46,7 +42,6 @@ public function __construct(
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(
         \Magento\Framework\View\LayoutInterface $subject,
diff --git a/app/code/Magento/Persistent/Model/Observer.php b/app/code/Magento/Persistent/Model/Observer.php
index 06ddbfdf869ef..f86b29716463e 100644
--- a/app/code/Magento/Persistent/Model/Observer.php
+++ b/app/code/Magento/Persistent/Model/Observer.php
@@ -9,7 +9,6 @@
  * Persistent Observer
  *
  * @SuppressWarnings(PHPMD.LongVariable)
- * @since 2.0.0
  */
 class Observer
 {
@@ -17,7 +16,6 @@ class Observer
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -25,7 +23,6 @@ class Observer
      * Layout model
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -33,13 +30,11 @@ class Observer
      * Url model
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -47,7 +42,6 @@ class Observer
      * Customer view helper
      *
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -55,7 +49,6 @@ class Observer
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -68,7 +61,6 @@ class Observer
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -91,7 +83,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     public function emulateWelcomeBlock($block)
     {
@@ -113,7 +104,6 @@ public function emulateWelcomeBlock($block)
      * Emulate 'account links' block with persistent data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _applyAccountLinksPersistentData()
     {
@@ -127,7 +117,6 @@ protected function _applyAccountLinksPersistentData()
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return void
-     * @since 2.0.0
      */
     public function emulateTopLinks($block)
     {
diff --git a/app/code/Magento/Persistent/Model/Persistent/Config.php b/app/code/Magento/Persistent/Model/Persistent/Config.php
index 5311368bbabc1..b606a80d4a04b 100644
--- a/app/code/Magento/Persistent/Model/Persistent/Config.php
+++ b/app/code/Magento/Persistent/Model/Persistent/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Persistent Config Model
- * @since 2.0.0
  */
 class Config
 {
@@ -17,25 +16,21 @@ class Config
      * Path to config file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configFilePath;
 
     /**
      * @var \Magento\Framework\Config\DomFactory
-     * @since 2.0.0
      */
     protected $_domFactory;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_moduleReader;
 
     /**
      * @var \DOMXPath
-     * @since 2.0.0
      */
     protected $_configDomXPath = null;
 
@@ -43,7 +38,6 @@ class Config
      * Layout model
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -51,7 +45,6 @@ class Config
      * App state model
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -59,13 +52,11 @@ class Config
      * Model factory
      *
      * @var \Magento\Persistent\Model\Factory
-     * @since 2.0.0
      */
     protected $_persistentFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
@@ -76,7 +67,6 @@ class Config
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Persistent\Model\Factory $persistentFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\DomFactory $domFactory,
@@ -100,7 +90,6 @@ public function __construct(
      * @param string $path
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setConfigFilePath($path)
     {
@@ -113,7 +102,6 @@ public function setConfigFilePath($path)
      *
      * @return \DOMXPath
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getConfigDomXPath()
     {
@@ -151,7 +139,6 @@ protected function _getConfigDomXPath()
      * @param string $block
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBlockConfigInfo($block)
     {
@@ -165,7 +152,6 @@ public function getBlockConfigInfo($block)
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function collectInstancesToEmulate()
     {
@@ -180,7 +166,6 @@ public function collectInstancesToEmulate()
      *
      * @param /DomNodeList $blocks
      * @return array
-     * @since 2.0.0
      */
     protected function _convertBlocksToArray($blocks)
     {
@@ -209,7 +194,6 @@ protected function _convertBlocksToArray($blocks)
      * Run all methods declared in persistent configuration
      *
      * @return $this
-     * @since 2.0.0
      */
     public function fire()
     {
@@ -235,7 +219,6 @@ public function fire()
      * @param bool $instance
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function fireOne($info, $instance = false)
     {
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index d50dc7d67d19e..cbd2f48c7a57a 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -7,7 +7,6 @@
 
 /**
  * Class QuoteManager
- * @since 2.0.0
  */
 class QuoteManager
 {
@@ -15,7 +14,6 @@ class QuoteManager
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $persistentSession;
 
@@ -23,7 +21,6 @@ class QuoteManager
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -31,7 +28,6 @@ class QuoteManager
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $persistentData;
 
@@ -39,13 +35,11 @@ class QuoteManager
      * Whether set quote to be persistent in workflow
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_setQuotePersistent = true;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -54,7 +48,6 @@ class QuoteManager
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -73,7 +66,6 @@ public function __construct(
      *
      * @param bool $checkQuote Check quote to be persistent (not stolen)
      * @return void
-     * @since 2.0.0
      */
     public function setGuest($checkQuote = false)
     {
@@ -141,7 +133,6 @@ public function convertCustomerCartToGuest()
      * Expire persistent quote
      *
      * @return void
-     * @since 2.0.0
      */
     public function expire()
     {
@@ -160,7 +151,6 @@ public function expire()
      * Is quote persistent
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPersistent()
     {
diff --git a/app/code/Magento/Persistent/Model/ResourceModel/Session.php b/app/code/Magento/Persistent/Model/ResourceModel/Session.php
index fb4bfc1e1cc80..e504db5046787 100644
--- a/app/code/Magento/Persistent/Model/ResourceModel/Session.php
+++ b/app/code/Magento/Persistent/Model/ResourceModel/Session.php
@@ -7,7 +7,6 @@
 
 /**
  * Persistent Session Resource Model
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Session extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Use is object new method for object saving
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useIsObjectNew = true;
 
@@ -23,7 +21,6 @@ class Session extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
@@ -33,7 +30,6 @@ class Session extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Initialize connection and define main table and primary key
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +57,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Persistent\Model\Session $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -86,7 +80,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteByCustomerId($customerId)
     {
@@ -99,7 +92,6 @@ public function deleteByCustomerId($customerId)
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     public function isKeyAllowed($key)
     {
@@ -114,7 +106,6 @@ public function isKeyAllowed($key)
      * @param  int $websiteId
      * @param  string $expiredBefore A formatted date string
      * @return $this
-     * @since 2.0.0
      */
     public function deleteExpired($websiteId, $expiredBefore)
     {
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index 1fc32352591b6..fd627561a0446 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -12,7 +12,6 @@
  * @method int getCustomerId()
  * @method Session setCustomerId()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Model\AbstractModel
 {
@@ -30,7 +29,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Fields which model does not save into `info` db field
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_unserializableFields = [
         'persistent_id',
@@ -45,7 +43,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * If model loads expired sessions
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_loadExpired = false;
 
@@ -53,7 +50,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData;
 
@@ -61,13 +57,11 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Json Helper
      *
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_coreConfig;
 
@@ -75,7 +69,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -83,7 +76,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Cookie manager
      *
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $_cookieManager;
 
@@ -91,19 +83,16 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * Cookie metadata factory
      *
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $_cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Session\Config\ConfigInterface
-     * @since 2.0.0
      */
     protected $sessionConfig;
 
@@ -132,7 +121,6 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -165,7 +153,6 @@ public function __construct(
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -178,7 +165,6 @@ protected function _construct()
      * @param bool $loadExpired
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setLoadExpired($loadExpired = true)
     {
@@ -191,7 +177,6 @@ public function setLoadExpired($loadExpired = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLoadExpired()
     {
@@ -204,7 +189,6 @@ public function getLoadExpired()
      * @param int|string|\Magento\Store\Model\Store $store
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getExpiredBefore($store = null)
     {
@@ -216,7 +200,6 @@ public function getExpiredBefore($store = null)
      * For new model check and set available cookie key
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -246,7 +229,6 @@ public function beforeSave()
      * Set model data from info field
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -268,7 +250,6 @@ protected function _afterLoad()
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCookieKey($key = null)
     {
@@ -288,7 +269,6 @@ public function loadByCookieKey($key = null)
      * @param int $id
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function loadByCustomerId($id)
     {
@@ -301,7 +281,6 @@ public function loadByCustomerId($id)
      * @param int $customerId
      * @param bool $clearCookie
      * @return $this
-     * @since 2.0.0
      */
     public function deleteByCustomerId($customerId, $clearCookie = true)
     {
@@ -317,7 +296,6 @@ public function deleteByCustomerId($customerId, $clearCookie = true)
      *
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function removePersistentCookie()
     {
@@ -334,7 +312,6 @@ public function removePersistentCookie()
      * @param string $path
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function setPersistentCookie($duration, $path)
     {
@@ -349,7 +326,6 @@ public function setPersistentCookie($duration, $path)
      * @param int $duration Time in seconds.
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function renewPersistentCookie($duration, $path)
     {
@@ -368,7 +344,6 @@ public function renewPersistentCookie($duration, $path)
      *
      * @param null|int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteExpired($websiteId = null)
     {
@@ -394,7 +369,6 @@ public function deleteExpired($websiteId = null)
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -409,7 +383,6 @@ public function afterDeleteCommit()
      * @param int $duration
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     private function setCookie($value, $duration, $path)
     {
diff --git a/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
index dc0735bfed333..7516e96f17d28 100644
--- a/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\ApplyBlockPersistentDataObserver
  *
- * @since 2.0.0
  */
 class ApplyBlockPersistentDataObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class ApplyBlockPersistentDataObserver implements ObserverInterface
      * Persistent config factory
      *
      * @var \Magento\Persistent\Model\Persistent\ConfigFactory
-     * @since 2.0.0
      */
     protected $_persistentConfigFactory;
 
@@ -27,7 +25,6 @@ class ApplyBlockPersistentDataObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -35,7 +32,6 @@ class ApplyBlockPersistentDataObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -43,7 +39,6 @@ class ApplyBlockPersistentDataObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -52,7 +47,6 @@ class ApplyBlockPersistentDataObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Model\Persistent\ConfigFactory $persistentConfigFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -71,7 +65,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/ApplyPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/ApplyPersistentDataObserver.php
index 2724c4e348bee..d621bb2356151 100644
--- a/app/code/Magento/Persistent/Observer/ApplyPersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/ApplyPersistentDataObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\ApplyPersistentDataObserver
  *
- * @since 2.0.0
  */
 class ApplyPersistentDataObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class ApplyPersistentDataObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class ApplyPersistentDataObserver implements ObserverInterface
      * Persistent config factory
      *
      * @var \Magento\Persistent\Model\Persistent\ConfigFactory
-     * @since 2.0.0
      */
     protected $_persistentConfigFactory;
 
@@ -35,7 +32,6 @@ class ApplyPersistentDataObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -43,7 +39,6 @@ class ApplyPersistentDataObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -52,7 +47,6 @@ class ApplyPersistentDataObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Model\Persistent\ConfigFactory $persistentConfigFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -71,7 +65,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index f3ee9bc42a89b..3a14264a78b78 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver
  *
- * @since 2.0.0
  */
 class CheckExpirePersistentQuoteObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -35,7 +32,6 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -43,13 +39,11 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
     /**
      * @var \Magento\Persistent\Model\QuoteManager
-     * @since 2.0.0
      */
     protected $quoteManager;
 
@@ -57,7 +51,6 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -68,7 +61,6 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -91,7 +83,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php b/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
index 5e1ae1cdb9f0d..7f62c8698dd74 100644
--- a/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
+++ b/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\ClearExpiredCronJobObserver
  *
- * @since 2.0.0
  */
 class ClearExpiredCronJobObserver
 {
@@ -19,7 +18,6 @@ class ClearExpiredCronJobObserver
      * Website collection factory
      *
      * @var \Magento\Store\Model\ResourceModel\Website\CollectionFactory
-     * @since 2.0.0
      */
     protected $_websiteCollectionFactory;
 
@@ -27,14 +25,12 @@ class ClearExpiredCronJobObserver
      * Session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
     /**
      * @param \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websiteCollectionFactory
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websiteCollectionFactory,
@@ -50,7 +46,6 @@ public function __construct(
      * @param \Magento\Cron\Model\Schedule $schedule
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Cron\Model\Schedule $schedule)
     {
diff --git a/app/code/Magento/Persistent/Observer/CustomerAuthenticatedEventObserver.php b/app/code/Magento/Persistent/Observer/CustomerAuthenticatedEventObserver.php
index d3b269798cce6..a04c08a4093b7 100644
--- a/app/code/Magento/Persistent/Observer/CustomerAuthenticatedEventObserver.php
+++ b/app/code/Magento/Persistent/Observer/CustomerAuthenticatedEventObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\CustomerAuthenticatedEventObserver
  *
- * @since 2.0.0
  */
 class CustomerAuthenticatedEventObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class CustomerAuthenticatedEventObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,13 +25,11 @@ class CustomerAuthenticatedEventObserver implements ObserverInterface
      * Request http
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_requestHttp;
 
     /**
      * @var \Magento\Persistent\Model\QuoteManager
-     * @since 2.0.0
      */
     protected $quoteManager;
 
@@ -41,7 +37,6 @@ class CustomerAuthenticatedEventObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Persistent\Model\QuoteManager $quoteManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
@@ -59,7 +54,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
index 8d2d12674e615..3aaa765e83962 100644
--- a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
+++ b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
@@ -9,7 +9,6 @@
 
 /**
  * Class EmulateCustomer
- * @since 2.0.0
  */
 class EmulateCustomerObserver implements ObserverInterface
 {
@@ -17,7 +16,6 @@ class EmulateCustomerObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -25,7 +23,6 @@ class EmulateCustomerObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -33,7 +30,6 @@ class EmulateCustomerObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData;
 
@@ -41,7 +37,6 @@ class EmulateCustomerObserver implements ObserverInterface
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -59,7 +54,6 @@ class EmulateCustomerObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -82,7 +76,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/EmulateQuoteObserver.php b/app/code/Magento/Persistent/Observer/EmulateQuoteObserver.php
index 9676b20765c96..23e7ee26cf3af 100644
--- a/app/code/Magento/Persistent/Observer/EmulateQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/EmulateQuoteObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Class EmulateQuote
- * @since 2.0.0
  */
 class EmulateQuoteObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * Customer account service
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -26,7 +24,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -34,7 +31,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -42,7 +38,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -50,7 +45,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -60,7 +54,6 @@ class EmulateQuoteObserver implements ObserverInterface
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -81,7 +74,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
index b783c5beb4302..1319779d24fa8 100644
--- a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
+++ b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\MakePersistentQuoteGuestObserver
  *
- * @since 2.0.0
  */
 class MakePersistentQuoteGuestObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class MakePersistentQuoteGuestObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class MakePersistentQuoteGuestObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -35,13 +32,11 @@ class MakePersistentQuoteGuestObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
     /**
      * @var \Magento\Persistent\Model\QuoteManager
-     * @since 2.0.0
      */
     protected $quoteManager;
 
@@ -50,7 +45,6 @@ class MakePersistentQuoteGuestObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Model\QuoteManager $quoteManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -69,7 +63,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php b/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
index 4f2ba61b190c0..f3a7bbaca596f 100644
--- a/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
+++ b/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\PreventClearCheckoutSessionObserver
  *
- * @since 2.0.0
  */
 class PreventClearCheckoutSessionObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class PreventClearCheckoutSessionObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class PreventClearCheckoutSessionObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -35,7 +32,6 @@ class PreventClearCheckoutSessionObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -43,7 +39,6 @@ class PreventClearCheckoutSessionObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/PreventExpressCheckoutObserver.php b/app/code/Magento/Persistent/Observer/PreventExpressCheckoutObserver.php
index 557840a654d50..320eefe398374 100644
--- a/app/code/Magento/Persistent/Observer/PreventExpressCheckoutObserver.php
+++ b/app/code/Magento/Persistent/Observer/PreventExpressCheckoutObserver.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Persistent\Observer\PreventExpressCheckoutObserver
  *
- * @since 2.0.0
  */
 class PreventExpressCheckoutObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -25,7 +23,6 @@ class PreventExpressCheckoutObserver implements ObserverInterface
      * Url model
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -33,19 +30,16 @@ class PreventExpressCheckoutObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Checkout\Helper\ExpressRedirect
-     * @since 2.0.0
      */
     protected $_expressRedirectHelper;
 
@@ -55,7 +49,6 @@ class PreventExpressCheckoutObserver implements ObserverInterface
      * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Checkout\Helper\ExpressRedirect $expressRedirectHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -76,7 +69,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/RenewCookieObserver.php b/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
index 83adb247134a1..c814abe415b2b 100644
--- a/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
+++ b/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class RenewCookieObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class RenewCookieObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -27,7 +25,6 @@ class RenewCookieObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -35,7 +32,6 @@ class RenewCookieObserver implements ObserverInterface
      * Session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
@@ -43,7 +39,6 @@ class RenewCookieObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -54,7 +49,6 @@ class RenewCookieObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -73,7 +67,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
index 584d4c7721f11..fefe7bf465a4b 100644
--- a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver
  *
- * @since 2.0.0
  */
 class SetLoadPersistentQuoteObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SetLoadPersistentQuoteObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class SetLoadPersistentQuoteObserver implements ObserverInterface
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -35,7 +32,6 @@ class SetLoadPersistentQuoteObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -43,7 +39,6 @@ class SetLoadPersistentQuoteObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -52,7 +47,6 @@ class SetLoadPersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -72,7 +66,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index 023191bda12d9..07adc5b293081 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Persistent\Observer\SetQuotePersistentDataObserver
  *
- * @since 2.0.0
  */
 class SetQuotePersistentDataObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SetQuotePersistentDataObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -27,7 +25,6 @@ class SetQuotePersistentDataObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession = null;
 
@@ -35,13 +32,11 @@ class SetQuotePersistentDataObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
     /**
      * @var \Magento\Persistent\Model\QuoteManager
-     * @since 2.0.0
      */
     protected $quoteManager;
 
@@ -50,7 +45,6 @@ class SetQuotePersistentDataObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Persistent\Model\QuoteManager $quoteManager
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -69,7 +63,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php b/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
index 2d9fe4fceb400..83f2e55d8def0 100644
--- a/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class SetRememberMeCheckedStatusObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SetRememberMeCheckedStatusObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -27,7 +25,6 @@ class SetRememberMeCheckedStatusObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -35,7 +32,6 @@ class SetRememberMeCheckedStatusObserver implements ObserverInterface
      * Checkout session
      *
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $_checkoutSession;
 
@@ -45,7 +41,6 @@ class SetRememberMeCheckedStatusObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -62,7 +57,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php b/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
index eeb7844c8fe03..77046b587e346 100644
--- a/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class SetRememberMeStatusForAjaxLoginObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SetRememberMeStatusForAjaxLoginObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -27,7 +25,6 @@ class SetRememberMeStatusForAjaxLoginObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -44,7 +41,6 @@ class SetRememberMeStatusForAjaxLoginObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -62,7 +58,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
index 9c5e44f74e671..62c3845b02add 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
@@ -10,7 +10,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class SynchronizePersistentInfoObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class SynchronizePersistentInfoObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -26,7 +24,6 @@ class SynchronizePersistentInfoObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -34,7 +31,6 @@ class SynchronizePersistentInfoObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -42,7 +38,6 @@ class SynchronizePersistentInfoObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -60,7 +55,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
index 19d7b1010b8a7..52a2912c4b170 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class SynchronizePersistentOnLoginObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SynchronizePersistentOnLoginObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -27,7 +25,6 @@ class SynchronizePersistentOnLoginObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -35,7 +32,6 @@ class SynchronizePersistentOnLoginObserver implements ObserverInterface
      * Session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
@@ -43,7 +39,6 @@ class SynchronizePersistentOnLoginObserver implements ObserverInterface
      * Customer session
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -54,7 +49,6 @@ class SynchronizePersistentOnLoginObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -72,7 +66,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLogoutObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLogoutObserver.php
index 93e5156408848..af1d4ae21a2d8 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLogoutObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLogoutObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * Persistent Session Observer
- * @since 2.0.0
  */
 class SynchronizePersistentOnLogoutObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class SynchronizePersistentOnLogoutObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -27,7 +25,6 @@ class SynchronizePersistentOnLogoutObserver implements ObserverInterface
      * Persistent data
      *
      * @var \Magento\Persistent\Helper\Data
-     * @since 2.0.0
      */
     protected $_persistentData = null;
 
@@ -35,7 +32,6 @@ class SynchronizePersistentOnLogoutObserver implements ObserverInterface
      * Session factory
      *
      * @var \Magento\Persistent\Model\SessionFactory
-     * @since 2.0.0
      */
     protected $_sessionFactory;
 
@@ -45,7 +41,6 @@ class SynchronizePersistentOnLogoutObserver implements ObserverInterface
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
@@ -63,7 +58,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Observer/UpdateCustomerCookiesObserver.php b/app/code/Magento/Persistent/Observer/UpdateCustomerCookiesObserver.php
index 6902d94253d83..fec6fabba4821 100644
--- a/app/code/Magento/Persistent/Observer/UpdateCustomerCookiesObserver.php
+++ b/app/code/Magento/Persistent/Observer/UpdateCustomerCookiesObserver.php
@@ -9,7 +9,6 @@
 
 /**
  * Class UpdateCustomerCookies
- * @since 2.0.0
  */
 class UpdateCustomerCookiesObserver implements ObserverInterface
 {
@@ -17,7 +16,6 @@ class UpdateCustomerCookiesObserver implements ObserverInterface
      * Persistent session
      *
      * @var \Magento\Persistent\Helper\Session
-     * @since 2.0.0
      */
     protected $_persistentSession;
 
@@ -25,7 +23,6 @@ class UpdateCustomerCookiesObserver implements ObserverInterface
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -34,7 +31,6 @@ class UpdateCustomerCookiesObserver implements ObserverInterface
      *
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Persistent/Setup/InstallSchema.php b/app/code/Magento/Persistent/Setup/InstallSchema.php
index bc3f8d3fe8ae2..324e85ea10b79 100644
--- a/app/code/Magento/Persistent/Setup/InstallSchema.php
+++ b/app/code/Magento/Persistent/Setup/InstallSchema.php
@@ -12,19 +12,17 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'checkout';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
index 16adaef53d8a9..b2ac2965a94c4 100644
--- a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
+++ b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
@@ -14,7 +14,6 @@
  * Product Alert Abstract Email Block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
 {
@@ -22,7 +21,6 @@ abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
      * Product collection array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_products = [];
 
@@ -30,25 +28,21 @@ abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
      * Current Store scope object
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
     /**
      * @var \Magento\Framework\Filter\Input\MaliciousCode
-     * @since 2.0.0
      */
     protected $_maliciousCode;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageBuilder;
 
@@ -58,7 +52,6 @@ abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -78,7 +71,6 @@ public function __construct(
     *
     * @param  string|array $content
     * @return string|array
-     * @since 2.0.0
     */
     public function getFilteredContent($content)
     {
@@ -90,7 +82,6 @@ public function getFilteredContent($content)
      *
      * @param int|string|\Magento\Store\Model\Website|\Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -110,7 +101,6 @@ public function setStore($store)
      * Retrieve current store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -127,7 +117,6 @@ public function getStore()
      * @param boolean $format             Format price to currency format
      * @param boolean $includeContainer   Enclose into <span class="price"><span>
      * @return float
-     * @since 2.0.0
      */
     public function formatPrice($price, $format = true, $includeContainer = true)
     {
@@ -140,7 +129,6 @@ public function formatPrice($price, $format = true, $includeContainer = true)
      * Reset product collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -152,7 +140,6 @@ public function reset()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
-     * @since 2.0.0
      */
     public function addProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -163,7 +150,6 @@ public function addProduct(\Magento\Catalog\Model\Product $product)
      * Retrieve product collection array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProducts()
     {
@@ -174,7 +160,6 @@ public function getProducts()
      * Get store url params
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getUrlParams()
     {
@@ -183,7 +168,6 @@ protected function _getUrlParams()
 
     /**
      * @return \Magento\Framework\Pricing\Render
-     * @since 2.0.0
      */
     protected function getPriceRender()
     {
@@ -202,7 +186,6 @@ protected function getPriceRender()
      * @param string $renderZone
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function getProductPriceHtml(
         \Magento\Catalog\Model\Product $product,
@@ -235,7 +218,6 @@ public function getProductPriceHtml(
      * @param string $imageId
      * @param array $attributes
      * @return \Magento\Catalog\Block\Product\Image
-     * @since 2.0.0
      */
     public function getImage($product, $imageId, $attributes = [])
     {
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 8daf59cd5da2e..982b0f7f63375 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -9,13 +9,11 @@
  * ProductAlert email price changed grid
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'email/price.phtml';
 
@@ -24,7 +22,6 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
      *
      * @param int $productId
      * @return string
-     * @since 2.0.0
      */
     public function getProductUnsubscribeUrl($productId)
     {
@@ -37,7 +34,6 @@ public function getProductUnsubscribeUrl($productId)
      * Retrieve unsubscribe url for all products
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnsubscribeUrl()
     {
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index 393294f4438b2..f424e7d7125c4 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -9,13 +9,11 @@
  * ProductAlert email back in stock grid
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'email/stock.phtml';
 
@@ -24,7 +22,6 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
      *
      * @param int $productId
      * @return string
-     * @since 2.0.0
      */
     public function getProductUnsubscribeUrl($productId)
     {
@@ -37,7 +34,6 @@ public function getProductUnsubscribeUrl($productId)
      * Retrieve unsubscribe url for all products
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnsubscribeUrl()
     {
diff --git a/app/code/Magento/ProductAlert/Block/Product/View.php b/app/code/Magento/ProductAlert/Block/Product/View.php
index 5b70af00242ea..1eaa0c56b634c 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View.php
@@ -7,13 +7,11 @@
 
 /**
  * Product view price and stock alerts
- * @since 2.0.0
  */
 class View extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
@@ -21,13 +19,11 @@ class View extends \Magento\Framework\View\Element\Template
      * Helper instance
      *
      * @var \Magento\ProductAlert\Helper\Data
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $coreHelper;
 
@@ -37,7 +33,6 @@ class View extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\Helper\PostHelper $coreHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Retrieve currently edited product object
      *
      * @return \Magento\Catalog\Model\Product|boolean
-     * @since 2.0.0
      */
     protected function getProduct()
     {
@@ -71,7 +65,6 @@ protected function getProduct()
      * Retrieve post action config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostAction()
     {
diff --git a/app/code/Magento/ProductAlert/Block/Product/View/Price.php b/app/code/Magento/ProductAlert/Block/Product/View/Price.php
index e0717beb36793..c91c4f1a859c8 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View/Price.php
@@ -9,7 +9,6 @@
  * Product view price
  *
  * @api
- * @since 2.0.0
  */
 class Price extends \Magento\ProductAlert\Block\Product\View
 {
@@ -18,7 +17,6 @@ class Price extends \Magento\ProductAlert\Block\Product\View
      *
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplate($template)
     {
diff --git a/app/code/Magento/ProductAlert/Block/Product/View/Stock.php b/app/code/Magento/ProductAlert/Block/Product/View/Stock.php
index d0a59c22f7a99..4b3e8c0112ebc 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View/Stock.php
@@ -9,7 +9,6 @@
  * Recurring payment view stock
  *
  * @api
- * @since 2.0.0
  */
 class Stock extends \Magento\ProductAlert\Block\Product\View
 {
@@ -18,7 +17,6 @@ class Stock extends \Magento\ProductAlert\Block\Product\View
      *
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplate($template)
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Add.php b/app/code/Magento/ProductAlert/Controller/Add.php
index 1ad5e5ee04a95..bcb8b40c1ab5e 100644
--- a/app/code/Magento/ProductAlert/Controller/Add.php
+++ b/app/code/Magento/ProductAlert/Controller/Add.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\ProductAlert\Controller\Add
  *
- * @since 2.0.0
  */
 abstract class Add extends Action
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index 80e967901da49..910f1b705fdd3 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -18,19 +18,16 @@
 /**
  * Class \Magento\ProductAlert\Controller\Add\Price
  *
- * @since 2.0.0
  */
 class Price extends AddController
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var  \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -39,7 +36,6 @@ class Price extends AddController
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     protected function isInternal($url)
     {
@@ -71,7 +66,6 @@ protected function isInternal($url)
 
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 13098abb1cba0..a028d2414a469 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Add\Stock
  *
- * @since 2.0.0
  */
 class Stock extends AddController
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -30,7 +28,6 @@ class Stock extends AddController
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -43,7 +40,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php b/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php
index 0cb62953d8ac2..c46565f5de985 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Add\TestObserver
  *
- * @since 2.0.0
  */
 class TestObserver extends AddController
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe.php
index 714dc2de9878a..cdf8b09099fb7 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ProductAlert\Controller\Unsubscribe
  *
- * @since 2.0.0
  */
 abstract class Unsubscribe extends Add
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 4a41c0f6e0c57..6a4d2ebb68554 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Unsubscribe\Price
  *
- * @since 2.0.0
  */
 class Price extends UnsubscribeController
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -29,7 +27,6 @@ class Price extends UnsubscribeController
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
index 9cb2a372e77cd..08d0867359f90 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Unsubscribe\PriceAll
  *
- * @since 2.0.0
  */
 class PriceAll extends UnsubscribeController
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 42b23508349ef..f936b7b9dc82b 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Unsubscribe\Stock
  *
- * @since 2.0.0
  */
 class Stock extends UnsubscribeController
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -29,7 +27,6 @@ class Stock extends UnsubscribeController
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
index 307b1db1ef5d7..839e223c61058 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\ProductAlert\Controller\Unsubscribe\StockAll
  *
- * @since 2.0.0
  */
 class StockAll extends UnsubscribeController
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
index f3a9545563694..b9e6b239d2e91 100644
--- a/app/code/Magento/ProductAlert/Helper/Data.php
+++ b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -13,7 +13,6 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Url\Helper\Data
 {
@@ -21,7 +20,6 @@ class Data extends \Magento\Framework\Url\Helper\Data
      * Current product instance (override registry one)
      *
      * @var null|\Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product = null;
 
@@ -29,19 +27,16 @@ class Data extends \Magento\Framework\Url\Helper\Data
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $_storeManager;
 
@@ -50,7 +45,6 @@ class Data extends \Magento\Framework\Url\Helper\Data
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutInterface $layout
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -68,7 +62,6 @@ public function __construct(
      * Get current product instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -83,7 +76,6 @@ public function getProduct()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\ProductAlert\Helper\Data
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -93,7 +85,6 @@ public function setProduct($product)
 
     /**
      * @return Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -103,7 +94,6 @@ public function getStore()
     /**
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl($type)
     {
@@ -122,7 +112,6 @@ public function getSaveUrl($type)
      * @param string|\Magento\Framework\View\Element\AbstractBlock $block
      * @return \Magento\Framework\View\Element\AbstractBlock
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createBlock($block)
     {
@@ -141,7 +130,6 @@ public function createBlock($block)
      * Check whether stock alert is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStockAlertAllowed()
     {
@@ -155,7 +143,6 @@ public function isStockAlertAllowed()
      * Check whether price alert is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPriceAlertAllowed()
     {
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index c62742cb66346..25ca038af5da6 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -12,7 +12,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Email extends \Magento\Framework\Model\AbstractModel
 {
@@ -26,7 +25,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_type = 'price';
 
@@ -34,7 +32,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Website Model
      *
      * @var \Magento\Store\Model\Website
-     * @since 2.0.0
      */
     protected $_website;
 
@@ -42,7 +39,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Customer model
      *
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $_customer;
 
@@ -50,7 +46,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Products collection where changed price
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_priceProducts = [];
 
@@ -58,7 +53,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Product collection which of back in stock
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_stockProducts = [];
 
@@ -66,7 +60,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Price block
      *
      * @var \Magento\ProductAlert\Block\Email\Price
-     * @since 2.0.0
      */
     protected $_priceBlock;
 
@@ -74,7 +67,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Stock block
      *
      * @var \Magento\ProductAlert\Block\Email\Stock
-     * @since 2.0.0
      */
     protected $_stockBlock;
 
@@ -82,7 +74,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Product alert data
      *
      * @var \Magento\ProductAlert\Helper\Data
-     * @since 2.0.0
      */
     protected $_productAlertData = null;
 
@@ -90,37 +81,31 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Store\Model\App\Emulation
-     * @since 2.0.0
      */
     protected $_appEmulation;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerHelper;
 
@@ -138,7 +123,6 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -169,7 +153,6 @@ public function __construct(
      *
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -180,7 +163,6 @@ public function setType($type)
      * Retrieve model type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -192,7 +174,6 @@ public function getType()
      *
      * @param \Magento\Store\Model\Website $website
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsite(\Magento\Store\Model\Website $website)
     {
@@ -205,7 +186,6 @@ public function setWebsite(\Magento\Store\Model\Website $website)
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -218,7 +198,6 @@ public function setWebsiteId($websiteId)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -231,7 +210,6 @@ public function setCustomerId($customerId)
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerData($customer)
     {
@@ -243,7 +221,6 @@ public function setCustomerData($customer)
      * Clean data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -259,7 +236,6 @@ public function clean()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function addPriceProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -272,7 +248,6 @@ public function addPriceProduct(\Magento\Catalog\Model\Product $product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function addStockProduct(\Magento\Catalog\Model\Product $product)
     {
@@ -284,7 +259,6 @@ public function addStockProduct(\Magento\Catalog\Model\Product $product)
      * Retrieve price block
      *
      * @return \Magento\ProductAlert\Block\Email\Price
-     * @since 2.0.0
      */
     protected function _getPriceBlock()
     {
@@ -298,7 +272,6 @@ protected function _getPriceBlock()
      * Retrieve stock block
      *
      * @return \Magento\ProductAlert\Block\Email\Stock
-     * @since 2.0.0
      */
     protected function _getStockBlock()
     {
@@ -315,7 +288,6 @@ protected function _getStockBlock()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function send()
     {
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index ff92dda8e5820..df046c4e4af8f 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Observer
 {
@@ -45,7 +44,6 @@ class Observer
      * Website collection array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websites;
 
@@ -53,7 +51,6 @@ class Observer
      * Warning (exception) errors array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -61,7 +58,6 @@ class Observer
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
@@ -69,61 +65,51 @@ class Observer
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\ProductAlert\Model\ResourceModel\Price\CollectionFactory
-     * @since 2.0.0
      */
     protected $_priceColFactory;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
     /**
      * @var \Magento\ProductAlert\Model\ResourceModel\Stock\CollectionFactory
-     * @since 2.0.0
      */
     protected $_stockColFactory;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\ProductAlert\Model\EmailFactory
-     * @since 2.0.0
      */
     protected $_emailFactory;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -140,7 +126,6 @@ class Observer
      * @param \Magento\ProductAlert\Model\EmailFactory $emailFactory
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Helper\Data $catalogData,
@@ -173,7 +158,6 @@ public function __construct(
      *
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _getWebsites()
     {
@@ -196,7 +180,6 @@ protected function _getWebsites()
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
     {
@@ -286,7 +269,6 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _processStock(\Magento\ProductAlert\Model\Email $email)
     {
@@ -375,7 +357,6 @@ protected function _processStock(\Magento\ProductAlert\Model\Email $email)
      * Send email to administrator if error
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _sendErrorEmail()
     {
@@ -426,7 +407,6 @@ protected function _sendErrorEmail()
      * Run process send product alerts
      *
      * @return $this
-     * @since 2.0.0
      */
     public function process()
     {
diff --git a/app/code/Magento/ProductAlert/Model/Price.php b/app/code/Magento/ProductAlert/Model/Price.php
index fdb1249ce5c24..f5e54fd643d25 100644
--- a/app/code/Magento/ProductAlert/Model/Price.php
+++ b/app/code/Magento/ProductAlert/Model/Price.php
@@ -32,13 +32,11 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Price extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var \Magento\ProductAlert\Model\ResourceModel\Price\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customerColFactory;
 
@@ -49,7 +47,6 @@ class Price extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -65,7 +62,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -74,7 +70,6 @@ protected function _construct()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getCustomerCollection()
     {
@@ -83,7 +78,6 @@ public function getCustomerCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadByParam()
     {
@@ -97,7 +91,6 @@ public function loadByParam()
      * @param int $customerId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteCustomer($customerId, $websiteId = 0)
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
index 18c6f78cda35b..710ede8ecefa6 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
@@ -9,7 +9,6 @@
  * Product alert for back in abstract resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return array|false
-     * @since 2.0.0
      */
     protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -48,7 +46,6 @@ protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -67,7 +64,6 @@ public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
      * @param int $websiteId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function deleteCustomer(\Magento\Framework\Model\AbstractModel $object, $customerId, $websiteId = null)
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
index e20011b17b7da..311cbd6cd78ce 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
@@ -12,13 +12,11 @@
  * Product alert for changed price resource model
  *
  * @api
- * @since 2.0.0
  */
 class Price extends \Magento\ProductAlert\Model\ResourceModel\AbstractResource
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
@@ -26,7 +24,6 @@ class Price extends \Magento\ProductAlert\Model\ResourceModel\AbstractResource
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Collection.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Collection.php
index 99871275abb9e..75cb452b15aa8 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Collection.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Collection.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define price collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param mixed $website
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($website)
     {
@@ -53,7 +50,6 @@ public function addWebsiteFilter($website)
      *
      * @param string $sort
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerOrder($sort = 'ASC')
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Customer/Collection.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Customer/Collection.php
index b7b389250aac2..4a627617db29c 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Customer/Collection.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Price/Customer/Collection.php
@@ -9,7 +9,6 @@
  * ProductAlert Price Customer collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * @param int $productId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function join($productId, $websiteId)
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
index 37fc30d7052df..f502e04cc96f3 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
@@ -12,13 +12,11 @@
  * Product alert for back in stock resource model
  *
  * @api
- * @since 2.0.0
  */
 class Stock extends \Magento\ProductAlert\Model\ResourceModel\AbstractResource
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
@@ -26,7 +24,6 @@ class Stock extends \Magento\ProductAlert\Model\ResourceModel\AbstractResource
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Initialize connection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Collection.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Collection.php
index c2831c70cad53..a6fec62686057 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Collection.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Collection.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define stock collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      *
      * @param mixed $website
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($website)
     {
@@ -55,7 +52,6 @@ public function addWebsiteFilter($website)
      *
      * @param int $status
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusFilter($status)
     {
@@ -69,7 +65,6 @@ public function addStatusFilter($status)
      *
      * @param string $sort
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerOrder($sort = 'ASC')
     {
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Customer/Collection.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Customer/Collection.php
index 467d2f67f7a2b..f743763cfb229 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Customer/Collection.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Customer/Collection.php
@@ -9,7 +9,6 @@
  * ProductAlert Stock Customer collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * @param int $productId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function join($productId, $websiteId)
     {
diff --git a/app/code/Magento/ProductAlert/Model/Stock.php b/app/code/Magento/ProductAlert/Model/Stock.php
index e39790aeda6dd..2cf72ed78e01d 100644
--- a/app/code/Magento/ProductAlert/Model/Stock.php
+++ b/app/code/Magento/ProductAlert/Model/Stock.php
@@ -30,13 +30,11 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Stock extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var \Magento\ProductAlert\Model\ResourceModel\Stock\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customerColFactory;
 
@@ -47,7 +45,6 @@ class Stock extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -63,7 +60,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +68,6 @@ protected function _construct()
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getCustomerCollection()
     {
@@ -81,7 +76,6 @@ public function getCustomerCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadByParam()
     {
@@ -95,7 +89,6 @@ public function loadByParam()
      * @param int $customerId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteCustomer($customerId, $websiteId = 0)
     {
diff --git a/app/code/Magento/ProductAlert/Setup/InstallSchema.php b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
index 42daedbab03e5..8db92a7d0a0b1 100644
--- a/app/code/Magento/ProductAlert/Setup/InstallSchema.php
+++ b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php b/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php
index 4eb178ffa5771..76ba9554a0bc8 100644
--- a/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php
+++ b/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php
@@ -9,7 +9,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class NewVideo extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -20,19 +19,16 @@ class NewVideo extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @var \Magento\ProductVideo\Helper\Media
-     * @since 2.0.0
      */
     protected $mediaHelper;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -49,7 +45,6 @@ class NewVideo extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\ProductVideo\Helper\Media $mediaHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -71,7 +66,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -191,7 +185,6 @@ protected function _prepareForm()
      * Get html id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -205,7 +198,6 @@ public function getHtmlId()
      * Get widget options
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWidgetOptions()
     {
@@ -224,7 +216,6 @@ public function getWidgetOptions()
      * Retrieve currently viewed product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function getProduct()
     {
@@ -239,7 +230,6 @@ protected function getProduct()
      *
      * @param Fieldset $fieldset
      * @return $this
-     * @since 2.0.0
      */
     protected function addMediaRoleAttributes(Fieldset $fieldset)
     {
@@ -266,7 +256,6 @@ protected function addMediaRoleAttributes(Fieldset $fieldset)
      * Get note for video url
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function getNoteVideoUrl()
     {
@@ -285,7 +274,6 @@ protected function getNoteVideoUrl()
      * Get url for config params
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getConfigApiKeyUrl()
     {
diff --git a/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php b/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
index 9e6322d93d4c9..c6860d4850016 100644
--- a/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
+++ b/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Gallery extends \Magento\Catalog\Block\Product\View\Gallery
 {
     /**
      * @var \Magento\ProductVideo\Helper\Media
-     * @since 2.0.0
      */
     protected $mediaHelper;
 
@@ -29,7 +27,6 @@ class Gallery extends \Magento\Catalog\Block\Product\View\Gallery
      * @param \Magento\ProductVideo\Helper\Media $mediaHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -51,7 +48,6 @@ public function __construct(
      * Retrieve media gallery data in JSON format
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaGalleryDataJson()
     {
@@ -70,7 +66,6 @@ public function getMediaGalleryDataJson()
      * Retrieve video settings data in JSON format
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoSettingsJson()
     {
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
index 6c06288e1312e..cd8009a361e42 100644
--- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
+++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -11,43 +11,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RetrieveImage extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $mediaConfig;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $fileSystem;
 
     /**
      * @var \Magento\Framework\Image\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     protected $imageAdapter;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\Curl
-     * @since 2.0.0
      */
     protected $curl;
 
     /**
      * @var \Magento\MediaStorage\Model\ResourceModel\File\Storage\File
-     * @since 2.0.0
      */
     protected $fileUtility;
 
@@ -68,7 +61,6 @@ class RetrieveImage extends \Magento\Backend\App\Action
      * @param \Magento\Framework\HTTP\Adapter\Curl $curl
      * @param \Magento\MediaStorage\Model\ResourceModel\File\Storage\File $fileUtility
      * @param \Magento\Framework\Validator\ValidatorInterface $protocolValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -95,7 +87,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -129,7 +120,7 @@ public function execute()
      * @throws LocalizedException
      *
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function validateRemoteFile($remoteFileUrl)
     {
@@ -145,7 +136,6 @@ private function validateRemoteFile($remoteFileUrl)
     /**
      * @param string $fileName
      * @return mixed
-     * @since 2.0.0
      */
     protected function appendResultSaveRemoteImage($fileName)
     {
@@ -167,7 +157,6 @@ protected function appendResultSaveRemoteImage($fileName)
      * @param string $localFilePath
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function retrieveRemoteImage($fileUrl, $localFilePath)
     {
@@ -185,7 +174,6 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
     /**
      * @param string $localFilePath
      * @return string
-     * @since 2.0.0
      */
     protected function appendNewFileName($localFilePath)
     {
@@ -198,7 +186,6 @@ protected function appendNewFileName($localFilePath)
     /**
      * @param string $localTmpFile
      * @return string
-     * @since 2.0.0
      */
     protected function appendAbsoluteFileSystemPath($localTmpFile)
     {
diff --git a/app/code/Magento/ProductVideo/Helper/Media.php b/app/code/Magento/ProductVideo/Helper/Media.php
index 09749352b4b43..f77c8bacf94fb 100644
--- a/app/code/Magento/ProductVideo/Helper/Media.php
+++ b/app/code/Magento/ProductVideo/Helper/Media.php
@@ -12,7 +12,6 @@
  * Helper to get attributes for video
  *
  * @api
- * @since 2.0.0
  */
 class Media extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -48,7 +47,6 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param Context $context
-     * @since 2.0.0
      */
     public function __construct(
         Context $context
@@ -60,7 +58,6 @@ public function __construct(
      * Get play if base video attribute
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getPlayIfBaseAttribute()
     {
@@ -71,7 +68,6 @@ public function getPlayIfBaseAttribute()
      * Get show related youtube attribute
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getShowRelatedAttribute()
     {
@@ -82,7 +78,6 @@ public function getShowRelatedAttribute()
      * Get video auto restart attribute
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getVideoAutoRestartAttribute()
     {
@@ -93,7 +88,6 @@ public function getVideoAutoRestartAttribute()
      * Retrieve YouTube API key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getYouTubeApiKey()
     {
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
index 0a84ebc942ed5..f4ea1ac2b8c84 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
@@ -11,19 +11,16 @@
 
 /**
  * Media Resource decorator
- * @since 2.0.0
  */
 class ExternalVideoResourceBackend
 {
     /**
      * @var \Magento\ProductVideo\Model\ResourceModel\Video
-     * @since 2.0.0
      */
     protected $videoResourceModel;
 
     /**
      * @param \Magento\ProductVideo\Model\ResourceModel\Video $videoResourceModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\ProductVideo\Model\ResourceModel\Video $videoResourceModel)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\ProductVideo\Model\ResourceModel\Video $vid
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterDuplicate(Gallery $originalResourceModel, array $valueIdMap)
     {
@@ -53,7 +49,7 @@ public function afterDuplicate(Gallery $originalResourceModel, array $valueIdMap
      * @param Gallery $originalResourceModel
      * @param Select $select
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function afterCreateBatchBaseSelect(Gallery $originalResourceModel, Select $select)
     {
diff --git a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
index e8cc69ca4a952..0650777423255 100644
--- a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
+++ b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
@@ -13,7 +13,6 @@
 
 /**
  * Converter for External Video media gallery type
- * @since 2.0.0
  */
 class ExternalVideoEntryConverter extends ImageEntryConverter
 {
@@ -24,13 +23,11 @@ class ExternalVideoEntryConverter extends ImageEntryConverter
 
     /**
      * @var \Magento\Framework\Api\Data\VideoContentInterfaceFactory
-     * @since 2.0.0
      */
     protected $videoEntryFactory;
 
     /**
      * @var \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory
-     * @since 2.0.0
      */
     protected $mediaGalleryEntryExtensionFactory;
 
@@ -39,7 +36,6 @@ class ExternalVideoEntryConverter extends ImageEntryConverter
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Api\Data\VideoContentInterfaceFactory $videoEntryFactory
      * @param ProductAttributeMediaGalleryEntryExtensionFactory $mediaGalleryEntryExtensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory,
@@ -54,7 +50,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMediaEntryType()
     {
@@ -65,7 +60,6 @@ public function getMediaEntryType()
      * @param Product $product
      * @param array $rowData
      * @return ProductAttributeMediaGalleryEntryInterface
-     * @since 2.0.0
      */
     public function convertTo(Product $product, array $rowData)
     {
@@ -84,7 +78,6 @@ public function convertTo(Product $product, array $rowData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convertFrom(ProductAttributeMediaGalleryEntryInterface $entry)
     {
diff --git a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
index af3ca88a98a6b..7eea0512ca354 100644
--- a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
+++ b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
@@ -11,7 +11,6 @@
 
 /**
  * VideoEntry class
- * @since 2.0.0
  */
 class VideoEntry extends AbstractExtensibleModel implements VideoContentInterface
 {
@@ -19,7 +18,6 @@ class VideoEntry extends AbstractExtensibleModel implements VideoContentInterfac
      * Retrieve MIME type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaType()
     {
@@ -31,7 +29,6 @@ public function getMediaType()
      *
      * @param string $mimeType
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaType($mimeType)
     {
@@ -42,7 +39,6 @@ public function setMediaType($mimeType)
      * Get provider YouTube|Vimeo
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoProvider()
     {
@@ -54,7 +50,6 @@ public function getVideoProvider()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoProvider($data)
     {
@@ -65,7 +60,6 @@ public function setVideoProvider($data)
      * Get video URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoUrl()
     {
@@ -77,7 +71,6 @@ public function getVideoUrl()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoUrl($data)
     {
@@ -88,7 +81,6 @@ public function setVideoUrl($data)
      * Get Title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoTitle()
     {
@@ -100,7 +92,6 @@ public function getVideoTitle()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoTitle($data)
     {
@@ -111,7 +102,6 @@ public function setVideoTitle($data)
      * Get video Description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoDescription()
     {
@@ -123,7 +113,6 @@ public function getVideoDescription()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoDescription($data)
     {
@@ -134,7 +123,6 @@ public function setVideoDescription($data)
      * Get Metadata
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoMetadata()
     {
@@ -146,7 +134,6 @@ public function getVideoMetadata()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoMetadata($data)
     {
@@ -157,7 +144,6 @@ public function setVideoMetadata($data)
      * Get extension attributes
      *
      * @return \Magento\Framework\Api\ExtensionAttributesInterface
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -169,7 +155,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php b/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
index 2dc6455ebbd00..b01fc7a626744 100644
--- a/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
+++ b/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\ProductVideo\Model\ResourceModel\Video
  *
- * @since 2.0.0
  */
 class Video extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -16,7 +15,6 @@ class Video extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -28,7 +26,6 @@ public function _construct()
      * @param array $fields
      * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function insertOnDuplicate(array $data, array $fields = [])
     {
@@ -39,7 +36,6 @@ public function insertOnDuplicate(array $data, array $fields = [])
      * @param array $ids
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadByIds(array $ids)
     {
diff --git a/app/code/Magento/ProductVideo/Model/VideoExtractor.php b/app/code/Magento/ProductVideo/Model/VideoExtractor.php
index fcfee272bc697..c792059fb541b 100644
--- a/app/code/Magento/ProductVideo/Model/VideoExtractor.php
+++ b/app/code/Magento/ProductVideo/Model/VideoExtractor.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\ProductVideo\Model\VideoExtractor
  *
- * @since 2.0.0
  */
 class VideoExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface
 {
@@ -25,7 +24,6 @@ class VideoExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtrac
      * @param \DOMElement $mediaNode
      * @param string $mediaParentTag
      * @return array
-     * @since 2.0.0
      */
     public function process(\DOMElement $mediaNode, $mediaParentTag)
     {
diff --git a/app/code/Magento/ProductVideo/Observer/ChangeTemplateObserver.php b/app/code/Magento/ProductVideo/Observer/ChangeTemplateObserver.php
index d2bcac7e26634..b21c0bc86e325 100644
--- a/app/code/Magento/ProductVideo/Observer/ChangeTemplateObserver.php
+++ b/app/code/Magento/ProductVideo/Observer/ChangeTemplateObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\ProductVideo\Observer\ChangeTemplateObserver
  *
- * @since 2.0.0
  */
 class ChangeTemplateObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class ChangeTemplateObserver implements ObserverInterface
      * @param mixed $observer
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/ProductVideo/Setup/InstallSchema.php b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
index 198fd8f9f662a..09da12c93d80b 100644
--- a/app/code/Magento/ProductVideo/Setup/InstallSchema.php
+++ b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
@@ -12,7 +12,6 @@
 
 /**
  * Class InstallSchema adds new table `catalog_product_entity_media_gallery_value_video`
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
@@ -23,7 +22,6 @@ class InstallSchema implements InstallSchemaInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $contextInterface)
     {
diff --git a/app/code/Magento/Quote/Api/BillingAddressManagementInterface.php b/app/code/Magento/Quote/Api/BillingAddressManagementInterface.php
index 6eb9963fa66b4..1f84a10cfc919 100644
--- a/app/code/Magento/Quote/Api/BillingAddressManagementInterface.php
+++ b/app/code/Magento/Quote/Api/BillingAddressManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface BillingAddressManagementInterface
  * @api
- * @since 2.0.0
  */
 interface BillingAddressManagementInterface
 {
@@ -21,7 +20,6 @@ interface BillingAddressManagementInterface
      * @return int Address ID.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException The specified cart ID or address data is not valid.
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false);
 
@@ -31,7 +29,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Quote billing address object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/CartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/CartItemRepositoryInterface.php
index b9e0e74e4de63..d25124997944f 100644
--- a/app/code/Magento/Quote/Api/CartItemRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartItemRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface CartItemRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface CartItemRepositoryInterface
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\CartItemInterface[] Array of items.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function getList($cartId);
 
@@ -30,7 +28,6 @@ public function getList($cartId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified item could not be saved to the cart.
      * @throws \Magento\Framework\Exception\InputException The specified item or cart is not valid.
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem);
 
@@ -42,7 +39,6 @@ public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified item or cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The item could not be removed.
-     * @since 2.0.0
      */
     public function deleteById($cartId, $itemId);
 }
diff --git a/app/code/Magento/Quote/Api/CartManagementInterface.php b/app/code/Magento/Quote/Api/CartManagementInterface.php
index 0ac002b90b68e..673aec92725d5 100644
--- a/app/code/Magento/Quote/Api/CartManagementInterface.php
+++ b/app/code/Magento/Quote/Api/CartManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface CartManagementInterface
  * @api
- * @since 2.0.0
  */
 interface CartManagementInterface
 {
@@ -24,7 +23,6 @@ interface CartManagementInterface
      *
      * @return int Cart ID.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The empty cart and quote could not be created.
-     * @since 2.0.0
      */
     public function createEmptyCart();
 
@@ -34,7 +32,6 @@ public function createEmptyCart();
      * @param int $customerId The customer ID.
      * @return int new cart ID if customer did not have a cart or ID of the existing cart otherwise.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The empty cart and quote could not be created.
-     * @since 2.0.0
      */
     public function createEmptyCartForCustomer($customerId);
 
@@ -44,7 +41,6 @@ public function createEmptyCartForCustomer($customerId);
      * @param int $customerId The customer ID.
      * @return \Magento\Quote\Api\Data\CartInterface Cart object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer does not exist.
-     * @since 2.0.0
      */
     public function getCartForCustomer($customerId);
 
@@ -55,7 +51,6 @@ public function getCartForCustomer($customerId);
      * @param int $customerId The customer ID.
      * @param int $storeId
      * @return boolean
-     * @since 2.0.0
      */
     public function assignCustomer($cartId, $customerId, $storeId);
 
@@ -66,7 +61,6 @@ public function assignCustomer($cartId, $customerId, $storeId);
      * @param PaymentInterface|null $paymentMethod
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null);
 }
diff --git a/app/code/Magento/Quote/Api/CartRepositoryInterface.php b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
index bc951e1257c2a..c9f760ce1de3e 100644
--- a/app/code/Magento/Quote/Api/CartRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface CartRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface CartRepositoryInterface
      * @param int $cartId
      * @return \Magento\Quote\Api\Data\CartInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -32,7 +30,6 @@ public function get($cartId);
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Quote\Api\Data\CartSearchResultsInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -43,7 +40,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param int[] $sharedStoreIds
      * @return \Magento\Quote\Api\Data\CartInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getForCustomer($customerId, array $sharedStoreIds = []);
 
@@ -54,7 +50,6 @@ public function getForCustomer($customerId, array $sharedStoreIds = []);
      * @param int[] $sharedStoreIds
      * @return \Magento\Quote\Api\Data\CartInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getActive($cartId, array $sharedStoreIds = []);
 
@@ -65,7 +60,6 @@ public function getActive($cartId, array $sharedStoreIds = []);
      * @param int[] $sharedStoreIds
      * @return \Magento\Quote\Api\Data\CartInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getActiveForCustomer($customerId, array $sharedStoreIds = []);
 
@@ -74,7 +68,6 @@ public function getActiveForCustomer($customerId, array $sharedStoreIds = []);
      *
      * @param \Magento\Quote\Api\Data\CartInterface $quote
      * @return void
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartInterface $quote);
 
@@ -83,7 +76,6 @@ public function save(\Magento\Quote\Api\Data\CartInterface $quote);
      *
      * @param \Magento\Quote\Api\Data\CartInterface $quote
      * @return void
-     * @since 2.0.0
      */
     public function delete(\Magento\Quote\Api\Data\CartInterface $quote);
 }
diff --git a/app/code/Magento/Quote/Api/CartTotalManagementInterface.php b/app/code/Magento/Quote/Api/CartTotalManagementInterface.php
index bfaaeb58c69dc..4aff39c31ac5d 100644
--- a/app/code/Magento/Quote/Api/CartTotalManagementInterface.php
+++ b/app/code/Magento/Quote/Api/CartTotalManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Bundled API to collect totals for cart based on shipping/payment methods and additional data.
  * @api
- * @since 2.0.0
  */
 interface CartTotalManagementInterface
 {
@@ -21,7 +20,6 @@ interface CartTotalManagementInterface
      * @param string $shippingMethodCode The shipping method code.
      * @param \Magento\Quote\Api\Data\TotalsAdditionalDataInterface $additionalData Additional data to collect totals.
      * @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.
-     * @since 2.0.0
      */
     public function collectTotals(
         $cartId,
diff --git a/app/code/Magento/Quote/Api/CartTotalRepositoryInterface.php b/app/code/Magento/Quote/Api/CartTotalRepositoryInterface.php
index 8146daca58fd1..3bc017d818e2c 100644
--- a/app/code/Magento/Quote/Api/CartTotalRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartTotalRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartTotalRepositoryInterface
  * @api
- * @since 2.0.0
  */
 interface CartTotalRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface CartTotalRepositoryInterface
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/CouponManagementInterface.php b/app/code/Magento/Quote/Api/CouponManagementInterface.php
index 5f696c20140bf..b8142ad83ea9b 100644
--- a/app/code/Magento/Quote/Api/CouponManagementInterface.php
+++ b/app/code/Magento/Quote/Api/CouponManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Coupon management service interface.
  * @api
- * @since 2.0.0
  */
 interface CouponManagementInterface
 {
@@ -20,7 +19,6 @@ interface CouponManagementInterface
      * @param int $cartId The cart ID.
      * @return string The coupon code data.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -32,7 +30,6 @@ public function get($cartId);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified coupon could not be added.
-     * @since 2.0.0
      */
     public function set($cartId, $couponCode);
 
@@ -43,7 +40,6 @@ public function set($cartId, $couponCode);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotDeleteException The specified coupon could not be deleted.
-     * @since 2.0.0
      */
     public function remove($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/Data/AddressAdditionalDataInterface.php b/app/code/Magento/Quote/Api/Data/AddressAdditionalDataInterface.php
index af443fbc52679..36216afa4a686 100644
--- a/app/code/Magento/Quote/Api/Data/AddressAdditionalDataInterface.php
+++ b/app/code/Magento/Quote/Api/Data/AddressAdditionalDataInterface.php
@@ -10,7 +10,6 @@
 /**
  * Additional data that is provided with quote address information
  * @api
- * @since 2.0.0
  */
 interface AddressAdditionalDataInterface extends CustomAttributesDataInterface
 {
@@ -18,7 +17,6 @@ interface AddressAdditionalDataInterface extends CustomAttributesDataInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\AddressAdditionalDataExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -27,7 +25,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\AddressAdditionalDataExtensionInterface $extensionAttributes
      * @return void
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\AddressAdditionalDataExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/AddressInterface.php b/app/code/Magento/Quote/Api/Data/AddressInterface.php
index ff6b7661d066c..39cc9ae32c30d 100644
--- a/app/code/Magento/Quote/Api/Data/AddressInterface.php
+++ b/app/code/Magento/Quote/Api/Data/AddressInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface AddressInterface
  * @api
- * @since 2.0.0
  */
 interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -65,7 +64,6 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn
      * Get id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -74,7 +72,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -82,7 +79,6 @@ public function setId($id);
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion();
 
@@ -91,7 +87,6 @@ public function getRegion();
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region);
 
@@ -99,7 +94,6 @@ public function setRegion($region);
      * Get region id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId();
 
@@ -108,7 +102,6 @@ public function getRegionId();
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId);
 
@@ -116,7 +109,6 @@ public function setRegionId($regionId);
      * Get region code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegionCode();
 
@@ -125,7 +117,6 @@ public function getRegionCode();
      *
      * @param string $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode);
 
@@ -133,7 +124,6 @@ public function setRegionCode($regionCode);
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId();
 
@@ -142,7 +132,6 @@ public function getCountryId();
      *
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($countryId);
 
@@ -150,7 +139,6 @@ public function setCountryId($countryId);
      * Get street
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getStreet();
 
@@ -159,7 +147,6 @@ public function getStreet();
      *
      * @param string|string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreet($street);
 
@@ -167,7 +154,6 @@ public function setStreet($street);
      * Get company
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCompany();
 
@@ -176,7 +162,6 @@ public function getCompany();
      *
      * @param string $company
      * @return $this
-     * @since 2.0.0
      */
     public function setCompany($company);
 
@@ -184,7 +169,6 @@ public function setCompany($company);
      * Get telephone number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTelephone();
 
@@ -193,7 +177,6 @@ public function getTelephone();
      *
      * @param string $telephone
      * @return $this
-     * @since 2.0.0
      */
     public function setTelephone($telephone);
 
@@ -201,7 +184,6 @@ public function setTelephone($telephone);
      * Get fax number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFax();
 
@@ -210,7 +192,6 @@ public function getFax();
      *
      * @param string $fax
      * @return $this
-     * @since 2.0.0
      */
     public function setFax($fax);
 
@@ -218,7 +199,6 @@ public function setFax($fax);
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode();
 
@@ -227,7 +207,6 @@ public function getPostcode();
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode);
 
@@ -235,7 +214,6 @@ public function setPostcode($postcode);
      * Get city name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCity();
 
@@ -244,7 +222,6 @@ public function getCity();
      *
      * @param string $city
      * @return $this
-     * @since 2.0.0
      */
     public function setCity($city);
 
@@ -252,7 +229,6 @@ public function setCity($city);
      * Get first name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname();
 
@@ -261,7 +237,6 @@ public function getFirstname();
      *
      * @param string $firstname
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstname);
 
@@ -269,7 +244,6 @@ public function setFirstname($firstname);
      * Get last name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname();
 
@@ -278,7 +252,6 @@ public function getLastname();
      *
      * @param string $lastname
      * @return $this
-     * @since 2.0.0
      */
     public function setLastname($lastname);
 
@@ -286,7 +259,6 @@ public function setLastname($lastname);
      * Get middle name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMiddlename();
 
@@ -295,7 +267,6 @@ public function getMiddlename();
      *
      * @param string $middlename
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middlename);
 
@@ -303,7 +274,6 @@ public function setMiddlename($middlename);
      * Get prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -312,7 +282,6 @@ public function getPrefix();
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix);
 
@@ -320,7 +289,6 @@ public function setPrefix($prefix);
      * Get suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -329,7 +297,6 @@ public function getSuffix();
      *
      * @param string $suffix
      * @return $this|null
-     * @since 2.0.0
      */
     public function setSuffix($suffix);
 
@@ -337,7 +304,6 @@ public function setSuffix($suffix);
      * Get Vat id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getVatId();
 
@@ -346,7 +312,6 @@ public function getVatId();
      *
      * @param string $vatId
      * @return $this
-     * @since 2.0.0
      */
     public function setVatId($vatId);
 
@@ -354,7 +319,6 @@ public function setVatId($vatId);
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -363,7 +327,6 @@ public function getCustomerId();
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId);
 
@@ -371,7 +334,6 @@ public function setCustomerId($customerId);
      * Get billing/shipping email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail();
 
@@ -380,7 +342,6 @@ public function getEmail();
      *
      * @param string $email
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($email);
 
@@ -388,7 +349,6 @@ public function setEmail($email);
      * Get same as billing flag
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getSameAsBilling();
 
@@ -397,7 +357,6 @@ public function getSameAsBilling();
      *
      * @param int $sameAsBilling
      * @return $this
-     * @since 2.0.0
      */
     public function setSameAsBilling($sameAsBilling);
 
@@ -405,7 +364,6 @@ public function setSameAsBilling($sameAsBilling);
      * Get customer address id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerAddressId();
 
@@ -414,7 +372,6 @@ public function getCustomerAddressId();
      *
      * @param int|null $customerAddressId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerAddressId($customerAddressId);
 
@@ -422,7 +379,6 @@ public function setCustomerAddressId($customerAddressId);
      * Get save in address book flag
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getSaveInAddressBook();
 
@@ -431,7 +387,6 @@ public function getSaveInAddressBook();
      *
      * @param int|null $saveInAddressBook
      * @return $this
-     * @since 2.0.0
      */
     public function setSaveInAddressBook($saveInAddressBook);
 
@@ -439,7 +394,6 @@ public function setSaveInAddressBook($saveInAddressBook);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -448,7 +402,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/CartInterface.php b/app/code/Magento/Quote/Api/Data/CartInterface.php
index 08ba9548c010d..746c597a9be2e 100644
--- a/app/code/Magento/Quote/Api/Data/CartInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartInterface
  * @api
- * @since 2.0.0
  */
 interface CartInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -65,7 +64,6 @@ interface CartInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Returns the cart/quote ID.
      *
      * @return int Cart/quote ID.
-     * @since 2.0.0
      */
     public function getId();
 
@@ -74,7 +72,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -82,7 +79,6 @@ public function setId($id);
      * Returns the cart creation date and time.
      *
      * @return string|null Cart creation date and time. Otherwise, null.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -91,7 +87,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -99,7 +94,6 @@ public function setCreatedAt($createdAt);
      * Returns the cart last update date and time.
      *
      * @return string|null Cart last update date and time. Otherwise, null.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -108,7 +102,6 @@ public function getUpdatedAt();
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt);
 
@@ -116,7 +109,6 @@ public function setUpdatedAt($updatedAt);
      * Returns the cart conversion date and time.
      *
      * @return string|null Cart conversion date and time. Otherwise, null.
-     * @since 2.0.0
      */
     public function getConvertedAt();
 
@@ -125,7 +117,6 @@ public function getConvertedAt();
      *
      * @param string $convertedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setConvertedAt($convertedAt);
 
@@ -133,7 +124,6 @@ public function setConvertedAt($convertedAt);
      * Determines whether the cart is still active.
      *
      * @return bool|null Active status flag value. Otherwise, null.
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -142,7 +132,6 @@ public function getIsActive();
      *
      * @param bool $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 
@@ -152,7 +141,6 @@ public function setIsActive($isActive);
      * A virtual cart contains virtual items.
      *
      * @return bool|null Virtual flag value. Otherwise, null.
-     * @since 2.0.0
      */
     public function getIsVirtual();
 
@@ -160,7 +148,6 @@ public function getIsVirtual();
      * Lists items in the cart.
      *
      * @return \Magento\Quote\Api\Data\CartItemInterface[]|null Array of items. Otherwise, null.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -169,7 +156,6 @@ public function getItems();
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
@@ -177,7 +163,6 @@ public function setItems(array $items = null);
      * Returns the number of different items or products in the cart.
      *
      * @return int|null Number of different items or products in the cart. Otherwise, null.
-     * @since 2.0.0
      */
     public function getItemsCount();
 
@@ -186,7 +171,6 @@ public function getItemsCount();
      *
      * @param int $itemsCount
      * @return $this
-     * @since 2.0.0
      */
     public function setItemsCount($itemsCount);
 
@@ -194,7 +178,6 @@ public function setItemsCount($itemsCount);
      * Returns the total quantity of all cart items.
      *
      * @return float|null Total quantity of all cart items. Otherwise, null.
-     * @since 2.0.0
      */
     public function getItemsQty();
 
@@ -203,7 +186,6 @@ public function getItemsQty();
      *
      * @param float $itemQty
      * @return $this
-     * @since 2.0.0
      */
     public function setItemsQty($itemQty);
 
@@ -211,7 +193,6 @@ public function setItemsQty($itemQty);
      * Returns information about the customer who is assigned to the cart.
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface Information about the customer who is assigned to the cart.
-     * @since 2.0.0
      */
     public function getCustomer();
 
@@ -220,7 +201,6 @@ public function getCustomer();
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $customer = null);
 
@@ -228,7 +208,6 @@ public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $custom
      * Returns the cart billing address.
      *
      * @return \Magento\Quote\Api\Data\AddressInterface|null Cart billing address. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBillingAddress();
 
@@ -237,7 +216,6 @@ public function getBillingAddress();
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $billingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $billingAddress = null);
 
@@ -245,7 +223,6 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $bill
      * Returns the reserved order ID for the cart.
      *
      * @return int|null Reserved order ID. Otherwise, null.
-     * @since 2.0.0
      */
     public function getReservedOrderId();
 
@@ -254,7 +231,6 @@ public function getReservedOrderId();
      *
      * @param int $reservedOrderId
      * @return $this
-     * @since 2.0.0
      */
     public function setReservedOrderId($reservedOrderId);
 
@@ -262,7 +238,6 @@ public function setReservedOrderId($reservedOrderId);
      * Returns the original order ID for the cart.
      *
      * @return int|null Original order ID. Otherwise, null.
-     * @since 2.0.0
      */
     public function getOrigOrderId();
 
@@ -271,7 +246,6 @@ public function getOrigOrderId();
      *
      * @param int $origOrderId
      * @return $this
-     * @since 2.0.0
      */
     public function setOrigOrderId($origOrderId);
 
@@ -279,7 +253,6 @@ public function setOrigOrderId($origOrderId);
      * Returns information about quote currency, such as code, exchange rate, and so on.
      *
      * @return \Magento\Quote\Api\Data\CurrencyInterface|null Quote currency information. Otherwise, null.
-     * @since 2.0.0
      */
     public function getCurrency();
 
@@ -288,7 +261,6 @@ public function getCurrency();
      *
      * @param \Magento\Quote\Api\Data\CurrencyInterface $currency
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null);
 
@@ -296,7 +268,6 @@ public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency
      * True for guest customers, false for logged in customers
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getCustomerIsGuest();
 
@@ -305,7 +276,6 @@ public function getCustomerIsGuest();
      *
      * @param bool $customerIsGuest
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerIsGuest($customerIsGuest);
 
@@ -313,7 +283,6 @@ public function setCustomerIsGuest($customerIsGuest);
      * Customer notice text
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerNote();
 
@@ -322,7 +291,6 @@ public function getCustomerNote();
      *
      * @param string $customerNote
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerNote($customerNote);
 
@@ -330,7 +298,6 @@ public function setCustomerNote($customerNote);
      * Send customer notification flag
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getCustomerNoteNotify();
 
@@ -339,7 +306,6 @@ public function getCustomerNoteNotify();
      *
      * @param bool $customerNoteNotify
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerNoteNotify($customerNoteNotify);
 
@@ -347,7 +313,6 @@ public function setCustomerNoteNotify($customerNoteNotify);
      * Get customer tax class ID.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerTaxClassId();
 
@@ -356,7 +321,6 @@ public function getCustomerTaxClassId();
      *
      * @param int $customerTaxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassId($customerTaxClassId);
 
@@ -364,7 +328,6 @@ public function setCustomerTaxClassId($customerTaxClassId);
      * Get store identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -373,7 +336,6 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -381,7 +343,6 @@ public function setStoreId($storeId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\CartExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -390,7 +351,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/CartItemInterface.php b/app/code/Magento/Quote/Api/Data/CartItemInterface.php
index c4b12b92c8bb1..e2547a0f28444 100644
--- a/app/code/Magento/Quote/Api/Data/CartItemInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartItemInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartItemInterface
  * @api
- * @since 2.0.0
  */
 interface CartItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -37,7 +36,6 @@ interface CartItemInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Returns the item ID.
      *
      * @return int|null Item ID. Otherwise, null.
-     * @since 2.0.0
      */
     public function getItemId();
 
@@ -46,7 +44,6 @@ public function getItemId();
      *
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($itemId);
 
@@ -54,7 +51,6 @@ public function setItemId($itemId);
      * Returns the product SKU.
      *
      * @return string|null Product SKU. Otherwise, null.
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -63,7 +59,6 @@ public function getSku();
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -71,7 +66,6 @@ public function setSku($sku);
      * Returns the product quantity.
      *
      * @return float Product quantity.
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -80,7 +74,6 @@ public function getQty();
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -88,7 +81,6 @@ public function setQty($qty);
      * Returns the product name.
      *
      * @return string|null Product name. Otherwise, null.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -97,7 +89,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -105,7 +96,6 @@ public function setName($name);
      * Returns the product price.
      *
      * @return float|null Product price. Otherwise, null.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -114,7 +104,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -122,7 +111,6 @@ public function setPrice($price);
      * Returns the product type.
      *
      * @return string|null Product type. Otherwise, null.
-     * @since 2.0.0
      */
     public function getProductType();
 
@@ -131,7 +119,6 @@ public function getProductType();
      *
      * @param string $productType
      * @return $this
-     * @since 2.0.0
      */
     public function setProductType($productType);
 
@@ -139,7 +126,6 @@ public function setProductType($productType);
      * Returns Quote id.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getQuoteId();
 
@@ -148,7 +134,6 @@ public function getQuoteId();
      *
      * @param string $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteId($quoteId);
 
@@ -156,7 +141,6 @@ public function setQuoteId($quoteId);
      * Returns product option
      *
      * @return \Magento\Quote\Api\Data\ProductOptionInterface|null
-     * @since 2.0.0
      */
     public function getProductOption();
 
@@ -165,7 +149,6 @@ public function getProductOption();
      *
      * @param \Magento\Quote\Api\Data\ProductOptionInterface $productOption
      * @return $this
-     * @since 2.0.0
      */
     public function setProductOption(\Magento\Quote\Api\Data\ProductOptionInterface $productOption);
 
@@ -173,7 +156,6 @@ public function setProductOption(\Magento\Quote\Api\Data\ProductOptionInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\CartItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -182,7 +164,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\CartItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CartItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php b/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
index 615ae2504fd88..5b1ac32f71108 100644
--- a/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CartSearchResultsInterface
  * @api
- * @since 2.0.0
  */
 interface CartSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -27,7 +26,6 @@ interface CartSearchResultsInterface extends \Magento\Framework\Api\SearchResult
      * Get carts list.
      *
      * @return \Magento\Quote\Api\Data\CartInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -36,7 +34,6 @@ public function getItems();
      *
      * @param \Magento\Quote\Api\Data\CartInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 
@@ -44,7 +41,6 @@ public function setItems(array $items);
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 
@@ -53,7 +49,6 @@ public function getSearchCriteria();
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -61,7 +56,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount();
 
@@ -70,7 +64,6 @@ public function getTotalCount();
      *
      * @param int $totalCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount);
 }
diff --git a/app/code/Magento/Quote/Api/Data/CurrencyInterface.php b/app/code/Magento/Quote/Api/Data/CurrencyInterface.php
index aeed8fa76ec0a..8a70eba0cbc75 100644
--- a/app/code/Magento/Quote/Api/Data/CurrencyInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CurrencyInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface CurrencyInterface
  * @api
- * @since 2.0.0
  */
 interface CurrencyInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -37,7 +36,6 @@ interface CurrencyInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Get global currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode();
 
@@ -46,7 +44,6 @@ public function getGlobalCurrencyCode();
      *
      * @param string $globalCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($globalCurrencyCode);
 
@@ -54,7 +51,6 @@ public function setGlobalCurrencyCode($globalCurrencyCode);
      * Get base currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -63,7 +59,6 @@ public function getBaseCurrencyCode();
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode);
 
@@ -71,7 +66,6 @@ public function setBaseCurrencyCode($baseCurrencyCode);
      * Get store currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode();
 
@@ -80,7 +74,6 @@ public function getStoreCurrencyCode();
      *
      * @param string $storeCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($storeCurrencyCode);
 
@@ -88,7 +81,6 @@ public function setStoreCurrencyCode($storeCurrencyCode);
      * Get quote currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getQuoteCurrencyCode();
 
@@ -97,7 +89,6 @@ public function getQuoteCurrencyCode();
      *
      * @param string $quoteCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteCurrencyCode($quoteCurrencyCode);
 
@@ -105,7 +96,6 @@ public function setQuoteCurrencyCode($quoteCurrencyCode);
      * Get store currency to base currency rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToBaseRate();
 
@@ -114,7 +104,6 @@ public function getStoreToBaseRate();
      *
      * @param float $storeToBaseRate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($storeToBaseRate);
 
@@ -122,7 +111,6 @@ public function setStoreToBaseRate($storeToBaseRate);
      * Get store currency to quote currency rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToQuoteRate();
 
@@ -131,7 +119,6 @@ public function getStoreToQuoteRate();
      *
      * @param float $storeToQuoteRate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToQuoteRate($storeToQuoteRate);
 
@@ -139,7 +126,6 @@ public function setStoreToQuoteRate($storeToQuoteRate);
      * Get base currency to global currency rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate();
 
@@ -148,7 +134,6 @@ public function getBaseToGlobalRate();
      *
      * @param float $baseToGlobalRate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($baseToGlobalRate);
 
@@ -156,7 +141,6 @@ public function setBaseToGlobalRate($baseToGlobalRate);
      * Get base currency to quote currency rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToQuoteRate();
 
@@ -165,7 +149,6 @@ public function getBaseToQuoteRate();
      *
      * @param float $baseToQuoteRate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToQuoteRate($baseToQuoteRate);
 
@@ -173,7 +156,6 @@ public function setBaseToQuoteRate($baseToQuoteRate);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\CurrencyExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -182,7 +164,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\CurrencyExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CurrencyExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/EstimateAddressInterface.php b/app/code/Magento/Quote/Api/Data/EstimateAddressInterface.php
index af5165711fef2..8a14c8cae514e 100644
--- a/app/code/Magento/Quote/Api/Data/EstimateAddressInterface.php
+++ b/app/code/Magento/Quote/Api/Data/EstimateAddressInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface EstimateAddressInterface
  * @api
- * @since 2.0.0
  */
 interface EstimateAddressInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
@@ -29,7 +28,6 @@ interface EstimateAddressInterface extends \Magento\Framework\Api\CustomAttribut
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion();
 
@@ -38,7 +36,6 @@ public function getRegion();
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region);
 
@@ -46,7 +43,6 @@ public function setRegion($region);
      * Get region id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId();
 
@@ -55,7 +51,6 @@ public function getRegionId();
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId);
 
@@ -63,7 +58,6 @@ public function setRegionId($regionId);
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId();
 
@@ -72,7 +66,6 @@ public function getCountryId();
      *
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($countryId);
 
@@ -80,7 +73,6 @@ public function setCountryId($countryId);
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode();
 
@@ -89,7 +81,6 @@ public function getPostcode();
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode);
 
@@ -97,7 +88,6 @@ public function setPostcode($postcode);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\EstimateAddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -106,7 +96,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\EstimateAddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\EstimateAddressExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/PaymentInterface.php b/app/code/Magento/Quote/Api/Data/PaymentInterface.php
index 684f217e02146..7317347c68e9e 100644
--- a/app/code/Magento/Quote/Api/Data/PaymentInterface.php
+++ b/app/code/Magento/Quote/Api/Data/PaymentInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface PaymentInterface
  * @api
- * @since 2.0.0
  */
 interface PaymentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -27,7 +26,6 @@ interface PaymentInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
      * Get purchase order number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPoNumber();
 
@@ -36,7 +34,6 @@ public function getPoNumber();
      *
      * @param string $poNumber
      * @return $this
-     * @since 2.0.0
      */
     public function setPoNumber($poNumber);
 
@@ -44,7 +41,6 @@ public function setPoNumber($poNumber);
      * Get payment method code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod();
 
@@ -53,7 +49,6 @@ public function getMethod();
      *
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($method);
 
@@ -61,7 +56,6 @@ public function setMethod($method);
      * Get payment additional details
      *
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -70,7 +64,6 @@ public function getAdditionalData();
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -78,7 +71,6 @@ public function setAdditionalData($additionalData);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\PaymentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -87,7 +79,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\PaymentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\PaymentExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/PaymentMethodInterface.php b/app/code/Magento/Quote/Api/Data/PaymentMethodInterface.php
index 684105206406d..9198237496097 100644
--- a/app/code/Magento/Quote/Api/Data/PaymentMethodInterface.php
+++ b/app/code/Magento/Quote/Api/Data/PaymentMethodInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface PaymentMethodInterface
  * @api
- * @since 2.0.0
  */
 interface PaymentMethodInterface
 {
@@ -16,7 +15,6 @@ interface PaymentMethodInterface
      * Get payment method code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -24,7 +22,6 @@ public function getCode();
      * Get payment method title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 }
diff --git a/app/code/Magento/Quote/Api/Data/ProductOptionInterface.php b/app/code/Magento/Quote/Api/Data/ProductOptionInterface.php
index 254a93112c7e6..cc6864c0d86af 100644
--- a/app/code/Magento/Quote/Api/Data/ProductOptionInterface.php
+++ b/app/code/Magento/Quote/Api/Data/ProductOptionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Product option interface
  * @api
- * @since 2.0.0
  */
 interface ProductOptionInterface extends ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface ProductOptionInterface extends ExtensibleDataInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\ProductOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -27,7 +25,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/ShippingAssignmentInterface.php b/app/code/Magento/Quote/Api/Data/ShippingAssignmentInterface.php
index a2d2b36270750..dc5bf5be44ef8 100644
--- a/app/code/Magento/Quote/Api/Data/ShippingAssignmentInterface.php
+++ b/app/code/Magento/Quote/Api/Data/ShippingAssignmentInterface.php
@@ -9,33 +9,28 @@
 /**
  * Interface ShippingAssignmentInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingAssignmentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return \Magento\Quote\Api\Data\ShippingInterface
-     * @since 2.0.0
      */
     public function getShipping();
 
     /**
      * @param ShippingInterface $value
      * @return \Magento\Quote\Api\Data\ShippingInterface
-     * @since 2.0.0
      */
     public function setShipping(\Magento\Quote\Api\Data\ShippingInterface $value);
 
     /**
      * @return \Magento\Quote\Api\Data\CartItemInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
     /**
      * @param \Magento\Quote\Api\Data\CartItemInterface[] $value
      * @return mixed
-     * @since 2.0.0
      */
     public function setItems($value);
 
@@ -43,7 +38,6 @@ public function setItems($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\ShippingAssignmentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -52,7 +46,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/ShippingInterface.php b/app/code/Magento/Quote/Api/Data/ShippingInterface.php
index df587635c73dd..356bf71b8d36f 100644
--- a/app/code/Magento/Quote/Api/Data/ShippingInterface.php
+++ b/app/code/Magento/Quote/Api/Data/ShippingInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface ShippingInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface ShippingInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Get shipping Address
      *
      * @return \Magento\Quote\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     public function getAddress();
 
@@ -26,7 +24,6 @@ public function getAddress();
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $value
      * @return void
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Api\Data\AddressInterface $value);
 
@@ -34,7 +31,6 @@ public function setAddress(\Magento\Quote\Api\Data\AddressInterface $value);
      * Get shipping method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod();
 
@@ -43,7 +39,6 @@ public function getMethod();
      *
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setMethod($value);
 
@@ -51,7 +46,6 @@ public function setMethod($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\ShippingExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -60,7 +54,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\ShippingExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\ShippingExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/ShippingMethodInterface.php b/app/code/Magento/Quote/Api/Data/ShippingMethodInterface.php
index 6a1fff8b6798d..010f9bec28437 100644
--- a/app/code/Magento/Quote/Api/Data/ShippingMethodInterface.php
+++ b/app/code/Magento/Quote/Api/Data/ShippingMethodInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ShippingMethodInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingMethodInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -66,7 +65,6 @@ interface ShippingMethodInterface extends \Magento\Framework\Api\ExtensibleDataI
      * Returns the shipping carrier code.
      *
      * @return string Shipping carrier code.
-     * @since 2.0.0
      */
     public function getCarrierCode();
 
@@ -75,7 +73,6 @@ public function getCarrierCode();
      *
      * @param string $carrierCode
      * @return $this
-     * @since 2.0.0
      */
     public function setCarrierCode($carrierCode);
 
@@ -83,7 +80,6 @@ public function setCarrierCode($carrierCode);
      * Returns the shipping method code.
      *
      * @return string Shipping method code.
-     * @since 2.0.0
      */
     public function getMethodCode();
 
@@ -92,7 +88,6 @@ public function getMethodCode();
      *
      * @param string $methodCode
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode);
 
@@ -100,7 +95,6 @@ public function setMethodCode($methodCode);
      * Returns the shipping carrier title.
      *
      * @return string|null Shipping carrier title. Otherwise, null.
-     * @since 2.0.0
      */
     public function getCarrierTitle();
 
@@ -109,7 +103,6 @@ public function getCarrierTitle();
      *
      * @param string $carrierTitle
      * @return $this
-     * @since 2.0.0
      */
     public function setCarrierTitle($carrierTitle);
 
@@ -117,7 +110,6 @@ public function setCarrierTitle($carrierTitle);
      * Returns the shipping method title.
      *
      * @return string|null Shipping method title. Otherwise, null.
-     * @since 2.0.0
      */
     public function getMethodTitle();
 
@@ -126,7 +118,6 @@ public function getMethodTitle();
      *
      * @param string $methodTitle
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodTitle($methodTitle);
 
@@ -134,7 +125,6 @@ public function setMethodTitle($methodTitle);
      * Returns the shipping amount in store currency.
      *
      * @return float Shipping amount in store currency.
-     * @since 2.0.0
      */
     public function getAmount();
 
@@ -143,7 +133,6 @@ public function getAmount();
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount);
 
@@ -151,7 +140,6 @@ public function setAmount($amount);
      * Returns the shipping amount in base currency.
      *
      * @return float Shipping amount in base currency.
-     * @since 2.0.0
      */
     public function getBaseAmount();
 
@@ -160,7 +148,6 @@ public function getBaseAmount();
      *
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmount($baseAmount);
 
@@ -169,7 +156,6 @@ public function setBaseAmount($baseAmount);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getAvailable();
 
@@ -178,7 +164,6 @@ public function getAvailable();
      *
      * @param bool $available
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailable($available);
 
@@ -186,7 +171,6 @@ public function setAvailable($available);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\ShippingMethodExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -195,7 +179,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\ShippingMethodExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ShippingMethodExtensionInterface $extensionAttributes
@@ -205,7 +188,6 @@ public function setExtensionAttributes(
      * Returns an error message.
      *
      * @return string Shipping Error message.
-     * @since 2.0.0
      */
     public function getErrorMessage();
 
@@ -214,7 +196,6 @@ public function getErrorMessage();
      *
      * @param string $errorMessage
      * @return $this
-     * @since 2.0.0
      */
     public function setErrorMessage($errorMessage);
 
@@ -222,7 +203,6 @@ public function setErrorMessage($errorMessage);
      * Returns shipping price excl tax.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceExclTax();
 
@@ -231,7 +211,6 @@ public function getPriceExclTax();
      *
      * @param float $priceExclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceExclTax($priceExclTax);
 
@@ -239,7 +218,6 @@ public function setPriceExclTax($priceExclTax);
      * Returns shipping price incl tax.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -248,7 +226,6 @@ public function getPriceInclTax();
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax);
 }
diff --git a/app/code/Magento/Quote/Api/Data/TotalSegmentInterface.php b/app/code/Magento/Quote/Api/Data/TotalSegmentInterface.php
index ba5e91001b0f7..9e95e63d0555b 100644
--- a/app/code/Magento/Quote/Api/Data/TotalSegmentInterface.php
+++ b/app/code/Magento/Quote/Api/Data/TotalSegmentInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface TotalsInterface
  * @api
- * @since 2.0.0
  */
 interface TotalSegmentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -25,7 +24,6 @@ interface TotalSegmentInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Total code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -34,7 +32,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -42,7 +39,6 @@ public function setCode($code);
      * Get total title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -51,7 +47,6 @@ public function getTitle();
      *
      * @param string|null $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title = null);
 
@@ -59,7 +54,6 @@ public function setTitle($title = null);
      * Get total value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -68,7 +62,6 @@ public function getValue();
      *
      * @param float $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -76,7 +69,6 @@ public function setValue($value);
      * Get display area code.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getArea();
 
@@ -85,7 +77,6 @@ public function getArea();
      *
      * @param string|null $area
      * @return $this
-     * @since 2.0.0
      */
     public function setArea($area = null);
 
@@ -93,7 +84,6 @@ public function setArea($area = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\TotalSegmentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -102,7 +92,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\TotalSegmentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\TotalSegmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/TotalsAdditionalDataInterface.php b/app/code/Magento/Quote/Api/Data/TotalsAdditionalDataInterface.php
index 3d43dfa55bf48..c49aa4e93590c 100644
--- a/app/code/Magento/Quote/Api/Data/TotalsAdditionalDataInterface.php
+++ b/app/code/Magento/Quote/Api/Data/TotalsAdditionalDataInterface.php
@@ -10,7 +10,6 @@
 /**
  * Additional data for totals collection.
  * @api
- * @since 2.0.0
  */
 interface TotalsAdditionalDataInterface extends CustomAttributesDataInterface
 {
@@ -18,7 +17,6 @@ interface TotalsAdditionalDataInterface extends CustomAttributesDataInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -27,7 +25,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface $extensionAttributes
      * @return void
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Api/Data/TotalsInterface.php b/app/code/Magento/Quote/Api/Data/TotalsInterface.php
index 784450682f13f..8e8fd893c6a47 100644
--- a/app/code/Magento/Quote/Api/Data/TotalsInterface.php
+++ b/app/code/Magento/Quote/Api/Data/TotalsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface TotalsInterface
  * @api
- * @since 2.0.0
  */
 interface TotalsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -75,7 +74,6 @@ interface TotalsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Get grand total in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGrandTotal();
 
@@ -84,7 +82,6 @@ public function getGrandTotal();
      *
      * @param float $grandTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setGrandTotal($grandTotal);
 
@@ -92,7 +89,6 @@ public function setGrandTotal($grandTotal);
      * Get grand total in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseGrandTotal();
 
@@ -101,7 +97,6 @@ public function getBaseGrandTotal();
      *
      * @param float $baseGrandTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($baseGrandTotal);
 
@@ -109,7 +104,6 @@ public function setBaseGrandTotal($baseGrandTotal);
      * Get subtotal in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotal();
 
@@ -118,7 +112,6 @@ public function getSubtotal();
      *
      * @param float $subtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($subtotal);
 
@@ -126,7 +119,6 @@ public function setSubtotal($subtotal);
      * Get subtotal in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotal();
 
@@ -135,7 +127,6 @@ public function getBaseSubtotal();
      *
      * @param float $baseSubtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotal($baseSubtotal);
 
@@ -143,7 +134,6 @@ public function setBaseSubtotal($baseSubtotal);
      * Get discount amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -152,7 +142,6 @@ public function getDiscountAmount();
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount);
 
@@ -160,7 +149,6 @@ public function setDiscountAmount($discountAmount);
      * Get discount amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -169,7 +157,6 @@ public function getBaseDiscountAmount();
      *
      * @param float $baseDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($baseDiscountAmount);
 
@@ -177,7 +164,6 @@ public function setBaseDiscountAmount($baseDiscountAmount);
      * Get subtotal in quote currency with applied discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalWithDiscount();
 
@@ -186,7 +172,6 @@ public function getSubtotalWithDiscount();
      *
      * @param float $subtotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalWithDiscount($subtotalWithDiscount);
 
@@ -194,7 +179,6 @@ public function setSubtotalWithDiscount($subtotalWithDiscount);
      * Get subtotal in base currency with applied discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalWithDiscount();
 
@@ -203,7 +187,6 @@ public function getBaseSubtotalWithDiscount();
      *
      * @param float $baseSubtotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalWithDiscount($baseSubtotalWithDiscount);
 
@@ -211,7 +194,6 @@ public function setBaseSubtotalWithDiscount($baseSubtotalWithDiscount);
      * Get shipping amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingAmount();
 
@@ -220,7 +202,6 @@ public function getShippingAmount();
      *
      * @param float $shippingAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($shippingAmount);
 
@@ -228,7 +209,6 @@ public function setShippingAmount($shippingAmount);
      * Get shipping amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
@@ -237,7 +217,6 @@ public function getBaseShippingAmount();
      *
      * @param float $baseShippingAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($baseShippingAmount);
 
@@ -245,7 +224,6 @@ public function setBaseShippingAmount($baseShippingAmount);
      * Get shipping discount amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountAmount();
 
@@ -254,7 +232,6 @@ public function getShippingDiscountAmount();
      *
      * @param float $shippingDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountAmount($shippingDiscountAmount);
 
@@ -262,7 +239,6 @@ public function setShippingDiscountAmount($shippingDiscountAmount);
      * Get shipping discount amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountAmount();
 
@@ -271,7 +247,6 @@ public function getBaseShippingDiscountAmount();
      *
      * @param float $baseShippingDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountAmount($baseShippingDiscountAmount);
 
@@ -279,7 +254,6 @@ public function setBaseShippingDiscountAmount($baseShippingDiscountAmount);
      * Get tax amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -288,7 +262,6 @@ public function getTaxAmount();
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount);
 
@@ -296,7 +269,6 @@ public function setTaxAmount($taxAmount);
      * Get tax amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -305,7 +277,6 @@ public function getBaseTaxAmount();
      *
      * @param float $baseTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($baseTaxAmount);
 
@@ -313,7 +284,6 @@ public function setBaseTaxAmount($baseTaxAmount);
      * Returns the total weee tax applied amount in quote currency.
      *
      * @return float Item weee tax applied amount in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount();
 
@@ -322,7 +292,6 @@ public function getWeeeTaxAppliedAmount();
      *
      * @param float $weeeTaxAppliedAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount);
 
@@ -330,7 +299,6 @@ public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount);
      * Get shipping tax amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingTaxAmount();
 
@@ -339,7 +307,6 @@ public function getShippingTaxAmount();
      *
      * @param float $shippingTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($shippingTaxAmount);
 
@@ -347,7 +314,6 @@ public function setShippingTaxAmount($shippingTaxAmount);
      * Get shipping tax amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount();
 
@@ -356,7 +322,6 @@ public function getBaseShippingTaxAmount();
      *
      * @param float $baseShippingTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($baseShippingTaxAmount);
 
@@ -364,7 +329,6 @@ public function setBaseShippingTaxAmount($baseShippingTaxAmount);
      * Get subtotal including tax in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalInclTax();
 
@@ -373,7 +337,6 @@ public function getSubtotalInclTax();
      *
      * @param float $subtotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($subtotalInclTax);
 
@@ -381,7 +344,6 @@ public function setSubtotalInclTax($subtotalInclTax);
      * Get subtotal including tax in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax();
 
@@ -390,7 +352,6 @@ public function getBaseSubtotalInclTax();
      *
      * @param float $baseSubtotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($baseSubtotalInclTax);
 
@@ -398,7 +359,6 @@ public function setBaseSubtotalInclTax($baseSubtotalInclTax);
      * Get shipping including tax in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingInclTax();
 
@@ -407,7 +367,6 @@ public function getShippingInclTax();
      *
      * @param float $shippingInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInclTax($shippingInclTax);
 
@@ -415,7 +374,6 @@ public function setShippingInclTax($shippingInclTax);
      * Get shipping including tax in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax();
 
@@ -424,7 +382,6 @@ public function getBaseShippingInclTax();
      *
      * @param float $baseShippingInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($baseShippingInclTax);
 
@@ -432,7 +389,6 @@ public function setBaseShippingInclTax($baseShippingInclTax);
      * Get base currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -441,7 +397,6 @@ public function getBaseCurrencyCode();
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode);
 
@@ -449,7 +404,6 @@ public function setBaseCurrencyCode($baseCurrencyCode);
      * Get quote currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getQuoteCurrencyCode();
 
@@ -458,7 +412,6 @@ public function getQuoteCurrencyCode();
      *
      * @param string $quoteCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteCurrencyCode($quoteCurrencyCode);
 
@@ -466,7 +419,6 @@ public function setQuoteCurrencyCode($quoteCurrencyCode);
      * Get applied coupon code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCouponCode();
 
@@ -475,7 +427,6 @@ public function getCouponCode();
      *
      * @param string $couponCode
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponCode($couponCode);
 
@@ -483,7 +434,6 @@ public function setCouponCode($couponCode);
      * Get items qty
      *
      * @return int||null
-     * @since 2.0.0
      */
     public function getItemsQty();
 
@@ -492,7 +442,6 @@ public function getItemsQty();
      *
      * @param int $itemsQty
      * @return $this
-     * @since 2.0.0
      */
     public function setItemsQty($itemsQty = null);
 
@@ -500,7 +449,6 @@ public function setItemsQty($itemsQty = null);
      * Get totals by items
      *
      * @return \Magento\Quote\Api\Data\TotalsItemInterface[]|null
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -509,7 +457,6 @@ public function getItems();
      *
      * @param \Magento\Quote\Api\Data\TotalsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
@@ -517,7 +464,6 @@ public function setItems(array $items = null);
      * Get dynamically calculated totals
      *
      * @return \Magento\Quote\Api\Data\TotalSegmentInterface[]
-     * @since 2.0.0
      */
     public function getTotalSegments();
 
@@ -526,7 +472,6 @@ public function getTotalSegments();
      *
      * @param \Magento\Quote\Api\Data\TotalSegmentInterface[] $totals
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalSegments($totals = []);
 
@@ -534,7 +479,6 @@ public function setTotalSegments($totals = []);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\TotalsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -543,7 +487,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Quote\Api\Data\TotalsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\TotalsExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php b/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
index a00830e1ad8fd..34d72f7639727 100644
--- a/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
+++ b/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface TotalsItemInterface
  * @api
- * @since 2.0.0
  */
 interface TotalsItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -128,7 +127,6 @@ interface TotalsItemInterface extends \Magento\Framework\Api\ExtensibleDataInter
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($id);
 
@@ -136,7 +134,6 @@ public function setItemId($id);
      * Get totals item id
      *
      * @return int Item id
-     * @since 2.0.0
      */
     public function getItemId();
 
@@ -144,7 +141,6 @@ public function getItemId();
      * Returns the item price in quote currency.
      *
      * @return float Item price in quote currency.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -153,7 +149,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -161,7 +156,6 @@ public function setPrice($price);
      * Returns the item price in base currency.
      *
      * @return float Item price in base currency.
-     * @since 2.0.0
      */
     public function getBasePrice();
 
@@ -170,7 +164,6 @@ public function getBasePrice();
      *
      * @param float $basePrice
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePrice($basePrice);
 
@@ -178,7 +171,6 @@ public function setBasePrice($basePrice);
      * Returns the item quantity.
      *
      * @return float Item quantity.
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -187,7 +179,6 @@ public function getQty();
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -195,7 +186,6 @@ public function setQty($qty);
      * Returns the row total in quote currency.
      *
      * @return float Row total in quote currency.
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -204,7 +194,6 @@ public function getRowTotal();
      *
      * @param float $rowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($rowTotal);
 
@@ -212,7 +201,6 @@ public function setRowTotal($rowTotal);
      * Returns the row total in base currency.
      *
      * @return float Row total in base currency.
-     * @since 2.0.0
      */
     public function getBaseRowTotal();
 
@@ -221,7 +209,6 @@ public function getBaseRowTotal();
      *
      * @param float $baseRowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotal($baseRowTotal);
 
@@ -229,7 +216,6 @@ public function setBaseRowTotal($baseRowTotal);
      * Returns the row total with discount in quote currency.
      *
      * @return float|null Row total with discount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getRowTotalWithDiscount();
 
@@ -238,7 +224,6 @@ public function getRowTotalWithDiscount();
      *
      * @param float $rowTotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalWithDiscount($rowTotalWithDiscount);
 
@@ -246,7 +231,6 @@ public function setRowTotalWithDiscount($rowTotalWithDiscount);
      * Returns the tax amount in quote currency.
      *
      * @return float|null Tax amount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -255,7 +239,6 @@ public function getTaxAmount();
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount);
 
@@ -263,7 +246,6 @@ public function setTaxAmount($taxAmount);
      * Returns the tax amount in base currency.
      *
      * @return float|null Tax amount in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -272,7 +254,6 @@ public function getBaseTaxAmount();
      *
      * @param float $baseTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($baseTaxAmount);
 
@@ -280,7 +261,6 @@ public function setBaseTaxAmount($baseTaxAmount);
      * Returns the tax percent.
      *
      * @return float|null Tax percent. Otherwise, null.
-     * @since 2.0.0
      */
     public function getTaxPercent();
 
@@ -289,7 +269,6 @@ public function getTaxPercent();
      *
      * @param float $taxPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent);
 
@@ -297,7 +276,6 @@ public function setTaxPercent($taxPercent);
      * Returns the discount amount in quote currency.
      *
      * @return float|null Discount amount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -306,7 +284,6 @@ public function getDiscountAmount();
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount);
 
@@ -314,7 +291,6 @@ public function setDiscountAmount($discountAmount);
      * Returns the discount amount in base currency.
      *
      * @return float|null Discount amount in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -323,7 +299,6 @@ public function getBaseDiscountAmount();
      *
      * @param float $baseDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($baseDiscountAmount);
 
@@ -331,7 +306,6 @@ public function setBaseDiscountAmount($baseDiscountAmount);
      * Returns the discount percent.
      *
      * @return float|null Discount percent. Otherwise, null.
-     * @since 2.0.0
      */
     public function getDiscountPercent();
 
@@ -340,7 +314,6 @@ public function getDiscountPercent();
      *
      * @param float $discountPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountPercent($discountPercent);
 
@@ -348,7 +321,6 @@ public function setDiscountPercent($discountPercent);
      * Returns the price including tax in quote currency.
      *
      * @return float|null Price including tax in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -357,7 +329,6 @@ public function getPriceInclTax();
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax);
 
@@ -365,7 +336,6 @@ public function setPriceInclTax($priceInclTax);
      * Returns the price including tax in base currency.
      *
      * @return float|null Price including tax in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBasePriceInclTax();
 
@@ -374,7 +344,6 @@ public function getBasePriceInclTax();
      *
      * @param float $basePriceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($basePriceInclTax);
 
@@ -382,7 +351,6 @@ public function setBasePriceInclTax($basePriceInclTax);
      * Returns the row total including tax in quote currency.
      *
      * @return float|null Row total including tax in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getRowTotalInclTax();
 
@@ -391,7 +359,6 @@ public function getRowTotalInclTax();
      *
      * @param float $rowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($rowTotalInclTax);
 
@@ -399,7 +366,6 @@ public function setRowTotalInclTax($rowTotalInclTax);
      * Returns the row total including tax in base currency.
      *
      * @return float|null Row total including tax in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax();
 
@@ -408,7 +374,6 @@ public function getBaseRowTotalInclTax();
      *
      * @param float $baseRowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($baseRowTotalInclTax);
 
@@ -416,7 +381,6 @@ public function setBaseRowTotalInclTax($baseRowTotalInclTax);
      * Returns the item options data.
      *
      * @return string Item price in quote currency.
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -425,7 +389,6 @@ public function getOptions();
      *
      * @param string $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options);
 
@@ -433,7 +396,6 @@ public function setOptions($options);
      * Returns the item weee tax applied amount in quote currency.
      *
      * @return float Item weee tax applied amount in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount();
 
@@ -442,7 +404,6 @@ public function getWeeeTaxAppliedAmount();
      *
      * @param float $weeeTaxAppliedAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount);
 
@@ -450,7 +411,6 @@ public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount);
      * Returns the item weee tax applied in quote currency.
      *
      * @return string Item weee tax applied in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied();
 
@@ -459,7 +419,6 @@ public function getWeeeTaxApplied();
      *
      * @param string $weeeTaxApplied
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied);
 
@@ -467,7 +426,6 @@ public function setWeeeTaxApplied($weeeTaxApplied);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\TotalsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -475,7 +433,6 @@ public function getExtensionAttributes();
      * Returns the product name.
      *
      * @return string|null Product name. Otherwise, null.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -484,7 +441,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -493,7 +449,6 @@ public function setName($name);
      *
      * @param \Magento\Quote\Api\Data\TotalsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\TotalsItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php b/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php
index 10c902b6fcac3..cf20632e299cb 100644
--- a/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Billing address management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestBillingAddressManagementInterface
 {
@@ -21,7 +20,6 @@ interface GuestBillingAddressManagementInterface
      * @return int Address ID.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException The specified cart ID or address data is not valid.
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false);
 
@@ -31,7 +29,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Quote billing address object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php
index fe49ebd1bd4b0..72a93bee9f971 100644
--- a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Cart Item repository interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestCartItemRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface GuestCartItemRepositoryInterface
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\CartItemInterface[] Array of items.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function getList($cartId);
 
@@ -30,7 +28,6 @@ public function getList($cartId);
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified item could not be saved to the cart.
      * @throws \Magento\Framework\Exception\InputException The specified item or cart is not valid.
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem);
 
@@ -42,7 +39,6 @@ public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified item or cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The item could not be removed.
-     * @since 2.0.0
      */
     public function deleteById($cartId, $itemId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestCartManagementInterface.php b/app/code/Magento/Quote/Api/GuestCartManagementInterface.php
index b4e1ccd7041a9..24630dd646518 100644
--- a/app/code/Magento/Quote/Api/GuestCartManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCartManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Cart Management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestCartManagementInterface
 {
@@ -19,7 +18,6 @@ interface GuestCartManagementInterface
      *
      * @return string Cart ID.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The empty cart and quote could not be created.
-     * @since 2.0.0
      */
     public function createEmptyCart();
 
@@ -30,7 +28,6 @@ public function createEmptyCart();
      * @param int $customerId The customer ID.
      * @param int $storeId
      * @return boolean
-     * @since 2.0.0
      */
     public function assignCustomer($cartId, $customerId, $storeId);
 
@@ -41,7 +38,6 @@ public function assignCustomer($cartId, $customerId, $storeId);
      * @param PaymentInterface|null $paymentMethod
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null);
 }
diff --git a/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php
index bfecc51e475f9..0cfd3e79026f7 100644
--- a/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Cart Repository interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestCartRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface GuestCartRepositoryInterface
      * @param string $cartId
      * @return \Magento\Quote\Api\Data\CartInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestCartTotalManagementInterface.php b/app/code/Magento/Quote/Api/GuestCartTotalManagementInterface.php
index ad05232277fb2..85bf8e67167a8 100644
--- a/app/code/Magento/Quote/Api/GuestCartTotalManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCartTotalManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Bundled API to collect totals for cart based on shipping/payment methods and additional data.
  * @api
- * @since 2.0.0
  */
 interface GuestCartTotalManagementInterface
 {
@@ -21,7 +20,6 @@ interface GuestCartTotalManagementInterface
      * @param string $shippingMethodCode The shipping method code.
      * @param \Magento\Quote\Api\Data\TotalsAdditionalDataInterface $additionalData Additional data to collect totals.
      * @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.
-     * @since 2.0.0
      */
     public function collectTotals(
         $cartId,
diff --git a/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php
index e41924c90dca3..aa1146f89697e 100644
--- a/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Cart totals repository interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestCartTotalRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface GuestCartTotalRepositoryInterface
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\TotalsInterface Quote totals data.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php b/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php
index 699d48e9cc474..e4451e06cae62 100644
--- a/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestCouponManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Coupon management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestCouponManagementInterface
 {
@@ -20,7 +19,6 @@ interface GuestCouponManagementInterface
      * @param string $cartId The cart ID.
      * @return string The coupon code data.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -32,7 +30,6 @@ public function get($cartId);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The specified coupon could not be added.
-     * @since 2.0.0
      */
     public function set($cartId, $couponCode);
 
@@ -43,7 +40,6 @@ public function set($cartId, $couponCode);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\CouldNotDeleteException The specified coupon could not be deleted.
-     * @since 2.0.0
      */
     public function remove($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
index 42660bbcc4dfa..581b8a1501505 100644
--- a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Payment method management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestPaymentMethodManagementInterface
 {
@@ -21,7 +20,6 @@ interface GuestPaymentMethodManagementInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException The billing or shipping address
      * is not set, or the specified payment method is not available.
-     * @since 2.0.0
      */
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
 
@@ -31,7 +29,6 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentInterface  Payment method object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -45,7 +42,6 @@ public function get($cartId);
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentMethodInterface[] Array of payment methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function getList($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php b/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
index 0512663639b29..7a67afff37a78 100644
--- a/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
+++ b/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface GuestShipmentEstimationInterface
  * @api
- * @since 2.1.0
+ * @since 2.0.10
  */
 interface GuestShipmentEstimationInterface extends ShipmentEstimationInterface
 {
diff --git a/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
index 3deee6a1750b6..0a3d1e37384d1 100644
--- a/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Shipping method management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestShippingMethodManagementInterface
 {
@@ -19,7 +18,6 @@ interface GuestShippingMethodManagementInterface
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified quote does not exist.
      * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
-     * @since 2.0.0
      */
     public function getList($cartId);
 
@@ -29,8 +27,7 @@ public function getList($cartId);
      * @param string $cartId The shopping cart ID.
      * @param \Magento\Quote\Api\Data\EstimateAddressInterface $address The estimate address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
-     * @deprecated 2.1.0
-     * @since 2.0.0
+     * @deprecated 2.0.10
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address);
 }
diff --git a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
index 283d2ebda5b7c..c951c8b9ee5ec 100644
--- a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface PaymentMethodManagementInterface
  * @api
- * @since 2.0.0
  */
 interface PaymentMethodManagementInterface
 {
@@ -21,7 +20,6 @@ interface PaymentMethodManagementInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException The billing or shipping address
      * is not set, or the specified payment method is not available.
-     * @since 2.0.0
      */
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
 
@@ -31,7 +29,6 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method);
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentInterface  Payment method object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 
@@ -45,7 +42,6 @@ public function get($cartId);
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\PaymentMethodInterface[] Array of payment methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function getList($cartId);
 }
diff --git a/app/code/Magento/Quote/Api/ShipmentEstimationInterface.php b/app/code/Magento/Quote/Api/ShipmentEstimationInterface.php
index 25a7f3930c5a0..04cad7030afe8 100644
--- a/app/code/Magento/Quote/Api/ShipmentEstimationInterface.php
+++ b/app/code/Magento/Quote/Api/ShipmentEstimationInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface ShipmentManagementInterface
  * @api
- * @since 2.1.0
+ * @since 2.0.10
  */
 interface ShipmentEstimationInterface
 {
@@ -19,7 +19,7 @@ interface ShipmentEstimationInterface
      * @param mixed $cartId
      * @param AddressInterface $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods
-     * @since 2.1.0
+     * @since 2.0.10
      */
     public function estimateByExtendedAddress($cartId, AddressInterface $address);
 }
diff --git a/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php b/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
index 4c4211bde0035..9b8deb0246c12 100644
--- a/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ShippingMethodManagementInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingMethodManagementInterface
 {
@@ -18,8 +17,7 @@ interface ShippingMethodManagementInterface
      * @param int $cartId The shopping cart ID.
      * @param \Magento\Quote\Api\Data\EstimateAddressInterface $address The estimate address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
-     * @deprecated 2.1.0
-     * @since 2.0.0
+     * @deprecated 2.0.10
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address);
 
@@ -29,7 +27,6 @@ public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddre
      * @param int $cartId The shopping cart ID.
      * @param int $addressId The estimate address id
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
-     * @since 2.0.0
      */
     public function estimateByAddressId($cartId, $addressId);
 
@@ -40,7 +37,6 @@ public function estimateByAddressId($cartId, $addressId);
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified quote does not exist.
      * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
-     * @since 2.0.0
      */
     public function getList($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/AddressAdditionalData.php b/app/code/Magento/Quote/Model/AddressAdditionalData.php
index 5b2fbe5694754..477b4bb022ab8 100644
--- a/app/code/Magento/Quote/Model/AddressAdditionalData.php
+++ b/app/code/Magento/Quote/Model/AddressAdditionalData.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Quote\Model\AddressAdditionalData
  *
- * @since 2.0.0
  */
 class AddressAdditionalData extends AbstractExtensibleModel implements AddressAdditionalDataInterface
 {
@@ -19,7 +18,6 @@ class AddressAdditionalData extends AbstractExtensibleModel implements AddressAd
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\AddressAdditionalDataExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -28,7 +26,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\AddressAdditionalDataExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php b/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
index 0613d9233e169..868b7088061bb 100644
--- a/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
+++ b/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Quote\Model\AddressAdditionalDataProcessor
  *
- * @since 2.0.0
  */
 class AddressAdditionalDataProcessor
 {
@@ -21,7 +20,6 @@ class AddressAdditionalDataProcessor
      * @param AddressAdditionalDataInterface $additionalData
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function process(AddressAdditionalDataInterface $additionalData)
     {
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
index 6a195dae86b05..9b8438ccf99e1 100644
--- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -14,7 +14,6 @@
 /**
  * Quote billing address write service object.
  *
- * @since 2.0.0
  */
 class BillingAddressManagement implements BillingAddressManagementInterface
 {
@@ -22,7 +21,6 @@ class BillingAddressManagement implements BillingAddressManagementInterface
      * Validator.
      *
      * @var QuoteAddressValidator
-     * @since 2.0.0
      */
     protected $addressValidator;
 
@@ -30,7 +28,6 @@ class BillingAddressManagement implements BillingAddressManagementInterface
      * Logger.
      *
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -38,13 +35,11 @@ class BillingAddressManagement implements BillingAddressManagementInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
@@ -61,7 +56,6 @@ class BillingAddressManagement implements BillingAddressManagementInterface
      * @param QuoteAddressValidator $addressValidator Address validator.
      * @param Logger $logger Logger.
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -78,7 +72,6 @@ public function __construct(
     /**
      * {@inheritDoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false)
     {
@@ -99,7 +92,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalManagement.php b/app/code/Magento/Quote/Model/Cart/CartTotalManagement.php
index d78eced54711a..5f98c0dd88941 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalManagement.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalManagement.php
@@ -9,31 +9,26 @@
 
 /**
  * @inheritDoc
- * @since 2.0.0
  */
 class CartTotalManagement implements CartTotalManagementInterface
 {
     /**
      * @var \Magento\Quote\Api\ShippingMethodManagementInterface
-     * @since 2.0.0
      */
     protected $shippingMethodManagement;
 
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
     /**
      * @var \Magento\Quote\Api\CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartTotalsRepository;
 
     /**
      * @var \Magento\Quote\Model\Cart\TotalsAdditionalDataProcessor
-     * @since 2.0.0
      */
     protected $dataProcessor;
 
@@ -42,7 +37,6 @@ class CartTotalManagement implements CartTotalManagementInterface
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
      * @param \Magento\Quote\Model\Cart\TotalsAdditionalDataProcessor $dataProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement,
@@ -58,7 +52,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function collectTotals(
         $cartId,
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
index 4c33be426fbaa..9fe69b691424d 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -16,7 +16,6 @@
 /**
  * Cart totals data object.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CartTotalRepository implements CartTotalRepositoryInterface
 {
@@ -24,7 +23,6 @@ class CartTotalRepository implements CartTotalRepositoryInterface
      * Cart totals factory.
      *
      * @var Api\Data\TotalsInterfaceFactory
-     * @since 2.0.0
      */
     private $totalsFactory;
 
@@ -32,31 +30,26 @@ class CartTotalRepository implements CartTotalRepositoryInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     private $quoteRepository;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
     /**
      * @var ConfigurationPool
-     * @since 2.0.0
      */
     private $itemConverter;
 
     /**
      * @var CouponManagementInterface
-     * @since 2.0.0
      */
     protected $couponService;
 
     /**
      * @var TotalsConverter
-     * @since 2.0.0
      */
     protected $totalsConverter;
 
@@ -67,7 +60,6 @@ class CartTotalRepository implements CartTotalRepositoryInterface
      * @param CouponManagementInterface $couponService
      * @param TotalsConverter $totalsConverter
      * @param ItemConverter $converter
-     * @since 2.0.0
      */
     public function __construct(
         Api\Data\TotalsInterfaceFactory $totalsFactory,
@@ -90,7 +82,6 @@ public function __construct(
      *
      * @param int $cartId The cart ID.
      * @return Totals Quote totals data.
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/Currency.php b/app/code/Magento/Quote/Model/Cart/Currency.php
index 75d901f8f35f0..44ef9f82e2d77 100644
--- a/app/code/Magento/Quote/Model/Cart/Currency.php
+++ b/app/code/Magento/Quote/Model/Cart/Currency.php
@@ -7,14 +7,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Currency extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Quote\Api\Data\CurrencyInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode()
     {
@@ -23,7 +21,6 @@ public function getGlobalCurrencyCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -32,7 +29,6 @@ public function getBaseCurrencyCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode()
     {
@@ -41,7 +37,6 @@ public function getStoreCurrencyCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQuoteCurrencyCode()
     {
@@ -50,7 +45,6 @@ public function getQuoteCurrencyCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreToBaseRate()
     {
@@ -59,7 +53,6 @@ public function getStoreToBaseRate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreToQuoteRate()
     {
@@ -68,7 +61,6 @@ public function getStoreToQuoteRate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate()
     {
@@ -77,7 +69,6 @@ public function getBaseToGlobalRate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseToQuoteRate()
     {
@@ -89,7 +80,6 @@ public function getBaseToQuoteRate()
      *
      * @param string $globalCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($globalCurrencyCode)
     {
@@ -101,7 +91,6 @@ public function setGlobalCurrencyCode($globalCurrencyCode)
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode)
     {
@@ -113,7 +102,6 @@ public function setBaseCurrencyCode($baseCurrencyCode)
      *
      * @param string $storeCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($storeCurrencyCode)
     {
@@ -125,7 +113,6 @@ public function setStoreCurrencyCode($storeCurrencyCode)
      *
      * @param string $quoteCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteCurrencyCode($quoteCurrencyCode)
     {
@@ -137,7 +124,6 @@ public function setQuoteCurrencyCode($quoteCurrencyCode)
      *
      * @param float $storeToBaseRate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($storeToBaseRate)
     {
@@ -149,7 +135,6 @@ public function setStoreToBaseRate($storeToBaseRate)
      *
      * @param float $storeToQuoteRate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToQuoteRate($storeToQuoteRate)
     {
@@ -161,7 +146,6 @@ public function setStoreToQuoteRate($storeToQuoteRate)
      *
      * @param float $baseToGlobalRate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($baseToGlobalRate)
     {
@@ -173,7 +157,6 @@ public function setBaseToGlobalRate($baseToGlobalRate)
      *
      * @param float $baseToQuoteRate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToQuoteRate($baseToQuoteRate)
     {
@@ -184,7 +167,6 @@ public function setBaseToQuoteRate($baseToQuoteRate)
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\CurrencyExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -196,7 +178,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\CurrencyExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CurrencyExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethod.php b/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
index a248f1ed08377..3417dc090f796 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
@@ -11,7 +11,6 @@
  * Quote shipping method data.
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ShippingMethod extends \Magento\Framework\Api\AbstractExtensibleObject implements
     ShippingMethodInterface
@@ -20,7 +19,6 @@ class ShippingMethod extends \Magento\Framework\Api\AbstractExtensibleObject imp
      * Returns the shipping carrier code.
      *
      * @return string Shipping carrier code.
-     * @since 2.0.0
      */
     public function getCarrierCode()
     {
@@ -32,7 +30,6 @@ public function getCarrierCode()
      *
      * @param string $carrierCode
      * @return $this
-     * @since 2.0.0
      */
     public function setCarrierCode($carrierCode)
     {
@@ -43,7 +40,6 @@ public function setCarrierCode($carrierCode)
      * Returns the shipping method code.
      *
      * @return string Shipping method code.
-     * @since 2.0.0
      */
     public function getMethodCode()
     {
@@ -55,7 +51,6 @@ public function getMethodCode()
      *
      * @param string $methodCode
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodCode($methodCode)
     {
@@ -66,7 +61,6 @@ public function setMethodCode($methodCode)
      * Returns the shipping carrier title.
      *
      * @return string|null Shipping carrier title. Otherwise, null.
-     * @since 2.0.0
      */
     public function getCarrierTitle()
     {
@@ -78,7 +72,6 @@ public function getCarrierTitle()
      *
      * @param string $carrierTitle
      * @return $this
-     * @since 2.0.0
      */
     public function setCarrierTitle($carrierTitle)
     {
@@ -89,7 +82,6 @@ public function setCarrierTitle($carrierTitle)
      * Returns the shipping method title.
      *
      * @return string|null Shipping method title. Otherwise, null.
-     * @since 2.0.0
      */
     public function getMethodTitle()
     {
@@ -101,7 +93,6 @@ public function getMethodTitle()
      *
      * @param string $methodTitle
      * @return $this
-     * @since 2.0.0
      */
     public function setMethodTitle($methodTitle)
     {
@@ -112,7 +103,6 @@ public function setMethodTitle($methodTitle)
      * Returns the shipping amount in store currency.
      *
      * @return float Shipping amount in store currency.
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -124,7 +114,6 @@ public function getAmount()
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount)
     {
@@ -135,7 +124,6 @@ public function setAmount($amount)
      * Returns the shipping amount in base currency.
      *
      * @return float Shipping amount in base currency.
-     * @since 2.0.0
      */
     public function getBaseAmount()
     {
@@ -147,7 +135,6 @@ public function getBaseAmount()
      *
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmount($baseAmount)
     {
@@ -159,7 +146,6 @@ public function setBaseAmount($baseAmount)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getAvailable()
     {
@@ -171,7 +157,6 @@ public function getAvailable()
      *
      * @param bool $available
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailable($available)
     {
@@ -182,7 +167,6 @@ public function setAvailable($available)
      * Returns the error message.
      *
      * @return string|null Shipping Error message.
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
@@ -194,7 +178,6 @@ public function getErrorMessage()
      *
      * @param string|null $errorMessage
      * @return $this
-     * @since 2.0.0
      */
     public function setErrorMessage($errorMessage)
     {
@@ -205,7 +188,6 @@ public function setErrorMessage($errorMessage)
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\ShippingMethodExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -217,7 +199,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\ShippingMethodExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ShippingMethodExtensionInterface $extensionAttributes
@@ -229,7 +210,6 @@ public function setExtensionAttributes(
      * {@inheritdoc}
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceExclTax()
     {
@@ -241,7 +221,6 @@ public function getPriceExclTax()
      *
      * @param float $priceExclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceExclTax($priceExclTax)
     {
@@ -252,7 +231,6 @@ public function setPriceExclTax($priceExclTax)
      * {@inheritdoc}
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -264,7 +242,6 @@ public function getPriceInclTax()
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
index b455cd744f988..16d53c58d42ef 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
@@ -8,7 +8,6 @@
 /**
  * Quote shipping method data.
  *
- * @since 2.0.0
  */
 class ShippingMethodConverter
 {
@@ -16,13 +15,11 @@ class ShippingMethodConverter
      * Shipping method data factory.
      *
      * @var \Magento\Quote\Api\Data\ShippingMethodInterfaceFactory
-     * @since 2.0.0
      */
     protected $shippingMethodDataFactory;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -32,7 +29,6 @@ class ShippingMethodConverter
      * @param \Magento\Quote\Api\Data\ShippingMethodInterfaceFactory $shippingMethodDataFactory Shipping method factory.
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager interface.
      * @param \Magento\Tax\Helper\Data $taxHelper Tax data helper.
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\Data\ShippingMethodInterfaceFactory $shippingMethodDataFactory,
@@ -50,7 +46,6 @@ public function __construct(
      * @param string $quoteCurrencyCode The quote currency code.
      * @param \Magento\Quote\Model\Quote\Address\Rate $rateModel The rate model.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method data object.
-     * @since 2.0.0
      */
     public function modelToDataObject($rateModel, $quoteCurrencyCode)
     {
@@ -81,7 +76,6 @@ public function modelToDataObject($rateModel, $quoteCurrencyCode)
      * @param \Magento\Quote\Model\Quote\Address\Rate $rateModel
      * @param bool $flag
      * @return float
-     * @since 2.0.0
      */
     private function getShippingPriceWithFlag($rateModel, $flag)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/TotalSegment.php b/app/code/Magento/Quote/Model/Cart/TotalSegment.php
index e60b510d11c67..a40c967b59c96 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalSegment.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalSegment.php
@@ -12,13 +12,11 @@
  * Extensible Cart Totals
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class TotalSegment extends AbstractExtensibleModel implements TotalSegmentInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -27,7 +25,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -36,7 +33,6 @@ public function setCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -45,7 +41,6 @@ public function getValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -54,7 +49,6 @@ public function setValue($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -63,7 +57,6 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTitle($title = null)
     {
@@ -72,7 +65,6 @@ public function setTitle($title = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -81,7 +73,6 @@ public function getArea()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setArea($area = null)
     {
@@ -90,7 +81,6 @@ public function setArea($area = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -99,7 +89,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\TotalSegmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/Cart/Totals.php b/app/code/Magento/Quote/Model/Cart/Totals.php
index fc8c3783bbd94..e42b72e2eb696 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Totals extends AbstractExtensibleModel implements TotalsInterface
 {
@@ -21,7 +20,6 @@ class Totals extends AbstractExtensibleModel implements TotalsInterface
      * Get grand total in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGrandTotal()
     {
@@ -33,7 +31,6 @@ public function getGrandTotal()
      *
      * @param float $grandTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setGrandTotal($grandTotal)
     {
@@ -44,7 +41,6 @@ public function setGrandTotal($grandTotal)
      * Get grand total in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseGrandTotal()
     {
@@ -56,7 +52,6 @@ public function getBaseGrandTotal()
      *
      * @param float $baseGrandTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($baseGrandTotal)
     {
@@ -67,7 +62,6 @@ public function setBaseGrandTotal($baseGrandTotal)
      * Get subtotal in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -79,7 +73,6 @@ public function getSubtotal()
      *
      * @param float $subtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($subtotal)
     {
@@ -90,7 +83,6 @@ public function setSubtotal($subtotal)
      * Get subtotal in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -102,7 +94,6 @@ public function getBaseSubtotal()
      *
      * @param float $baseSubtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotal($baseSubtotal)
     {
@@ -113,7 +104,6 @@ public function setBaseSubtotal($baseSubtotal)
      * Get discount amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -125,7 +115,6 @@ public function getDiscountAmount()
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount)
     {
@@ -136,7 +125,6 @@ public function setDiscountAmount($discountAmount)
      * Get discount amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -148,7 +136,6 @@ public function getBaseDiscountAmount()
      *
      * @param float $baseDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($baseDiscountAmount)
     {
@@ -159,7 +146,6 @@ public function setBaseDiscountAmount($baseDiscountAmount)
      * Get subtotal in quote currency with applied discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalWithDiscount()
     {
@@ -171,7 +157,6 @@ public function getSubtotalWithDiscount()
      *
      * @param float $subtotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalWithDiscount($subtotalWithDiscount)
     {
@@ -182,7 +167,6 @@ public function setSubtotalWithDiscount($subtotalWithDiscount)
      * Get subtotal in base currency with applied discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalWithDiscount()
     {
@@ -194,7 +178,6 @@ public function getBaseSubtotalWithDiscount()
      *
      * @param float $baseSubtotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalWithDiscount($baseSubtotalWithDiscount)
     {
@@ -205,7 +188,6 @@ public function setBaseSubtotalWithDiscount($baseSubtotalWithDiscount)
      * Get shipping amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -217,7 +199,6 @@ public function getShippingAmount()
      *
      * @param float $shippingAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($shippingAmount)
     {
@@ -228,7 +209,6 @@ public function setShippingAmount($shippingAmount)
      * Get shipping amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -240,7 +220,6 @@ public function getBaseShippingAmount()
      *
      * @param float $baseShippingAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($baseShippingAmount)
     {
@@ -251,7 +230,6 @@ public function setBaseShippingAmount($baseShippingAmount)
      * Get shipping discount amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountAmount()
     {
@@ -263,7 +241,6 @@ public function getShippingDiscountAmount()
      *
      * @param float $shippingDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountAmount($shippingDiscountAmount)
     {
@@ -274,7 +251,6 @@ public function setShippingDiscountAmount($shippingDiscountAmount)
      * Get shipping discount amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountAmount()
     {
@@ -286,7 +262,6 @@ public function getBaseShippingDiscountAmount()
      *
      * @param float $baseShippingDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountAmount($baseShippingDiscountAmount)
     {
@@ -297,7 +272,6 @@ public function setBaseShippingDiscountAmount($baseShippingDiscountAmount)
      * Get tax amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -309,7 +283,6 @@ public function getTaxAmount()
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount)
     {
@@ -320,7 +293,6 @@ public function setTaxAmount($taxAmount)
      * Get tax amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -332,7 +304,6 @@ public function getBaseTaxAmount()
      *
      * @param float $baseTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($baseTaxAmount)
     {
@@ -343,7 +314,6 @@ public function setBaseTaxAmount($baseTaxAmount)
      * Returns the total weee tax applied amount in quote currency.
      *
      * @return float Item weee tax applied amount in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount()
     {
@@ -355,7 +325,6 @@ public function getWeeeTaxAppliedAmount()
      *
      * @param float $weeeTaxAppliedAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount)
     {
@@ -366,7 +335,6 @@ public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount)
      * Get shipping tax amount in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingTaxAmount()
     {
@@ -378,7 +346,6 @@ public function getShippingTaxAmount()
      *
      * @param float $shippingTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($shippingTaxAmount)
     {
@@ -389,7 +356,6 @@ public function setShippingTaxAmount($shippingTaxAmount)
      * Get shipping tax amount in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount()
     {
@@ -401,7 +367,6 @@ public function getBaseShippingTaxAmount()
      *
      * @param float $baseShippingTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($baseShippingTaxAmount)
     {
@@ -412,7 +377,6 @@ public function setBaseShippingTaxAmount($baseShippingTaxAmount)
      * Get subtotal including tax in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalInclTax()
     {
@@ -424,7 +388,6 @@ public function getSubtotalInclTax()
      *
      * @param float $subtotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($subtotalInclTax)
     {
@@ -435,7 +398,6 @@ public function setSubtotalInclTax($subtotalInclTax)
      * Get subtotal including tax in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax()
     {
@@ -447,7 +409,6 @@ public function getBaseSubtotalInclTax()
      *
      * @param float $baseSubtotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($baseSubtotalInclTax)
     {
@@ -458,7 +419,6 @@ public function setBaseSubtotalInclTax($baseSubtotalInclTax)
      * Get shipping including tax in quote currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingInclTax()
     {
@@ -470,7 +430,6 @@ public function getShippingInclTax()
      *
      * @param float $shippingInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInclTax($shippingInclTax)
     {
@@ -481,7 +440,6 @@ public function setShippingInclTax($shippingInclTax)
      * Get shipping including tax in base currency
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax()
     {
@@ -493,7 +451,6 @@ public function getBaseShippingInclTax()
      *
      * @param float $baseShippingInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($baseShippingInclTax)
     {
@@ -504,7 +461,6 @@ public function setBaseShippingInclTax($baseShippingInclTax)
      * Get base currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -516,7 +472,6 @@ public function getBaseCurrencyCode()
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode)
     {
@@ -527,7 +482,6 @@ public function setBaseCurrencyCode($baseCurrencyCode)
      * Get quote currency code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getQuoteCurrencyCode()
     {
@@ -539,7 +493,6 @@ public function getQuoteCurrencyCode()
      *
      * @param string $quoteCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteCurrencyCode($quoteCurrencyCode)
     {
@@ -548,7 +501,6 @@ public function setQuoteCurrencyCode($quoteCurrencyCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCouponCode()
     {
@@ -557,7 +509,6 @@ public function getCouponCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCouponCode($couponCode)
     {
@@ -568,7 +519,6 @@ public function setCouponCode($couponCode)
      * Get items qty
      *
      * @return int||null
-     * @since 2.0.0
      */
     public function getItemsQty()
     {
@@ -580,7 +530,6 @@ public function getItemsQty()
      *
      * @param int $itemsQty
      * @return $this
-     * @since 2.0.0
      */
     public function setItemsQty($itemsQty = null)
     {
@@ -591,7 +540,6 @@ public function setItemsQty($itemsQty = null)
      * Get totals by items
      *
      * @return \Magento\Quote\Api\Data\TotalsItemInterface[]|null
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -603,7 +551,6 @@ public function getItems()
      *
      * @param \Magento\Quote\Api\Data\TotalsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -612,7 +559,6 @@ public function setItems(array $items = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTotalSegments()
     {
@@ -621,7 +567,6 @@ public function getTotalSegments()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalSegments($totals = [])
     {
@@ -632,7 +577,6 @@ public function setTotalSegments($totals = [])
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\TotalsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -644,7 +588,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\TotalsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\TotalsExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/Item.php b/app/code/Magento/Quote/Model/Cart/Totals/Item.php
index ca782e1842078..afb87f1d3a32c 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/Item.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/Item.php
@@ -12,7 +12,6 @@
  * Cart item totals.
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Item extends AbstractExtensibleObject implements TotalsItemInterface
 {
@@ -21,7 +20,6 @@ class Item extends AbstractExtensibleObject implements TotalsItemInterface
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($id)
     {
@@ -32,7 +30,6 @@ public function setItemId($id)
      * Get totals item id
      *
      * @return int Item id
-     * @since 2.0.0
      */
     public function getItemId()
     {
@@ -43,7 +40,6 @@ public function getItemId()
      * Returns the item price in quote currency.
      *
      * @return float Item price in quote currency.
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -55,7 +51,6 @@ public function getPrice()
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -66,7 +61,6 @@ public function setPrice($price)
      * Returns the item price in base currency.
      *
      * @return float Item price in base currency.
-     * @since 2.0.0
      */
     public function getBasePrice()
     {
@@ -78,7 +72,6 @@ public function getBasePrice()
      *
      * @param float $basePrice
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePrice($basePrice)
     {
@@ -89,7 +82,6 @@ public function setBasePrice($basePrice)
      * Returns the item quantity.
      *
      * @return int Item quantity.
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -101,7 +93,6 @@ public function getQty()
      *
      * @param int $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -112,7 +103,6 @@ public function setQty($qty)
      * Returns the row total in quote currency.
      *
      * @return float Row total in quote currency.
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -124,7 +114,6 @@ public function getRowTotal()
      *
      * @param float $rowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($rowTotal)
     {
@@ -135,7 +124,6 @@ public function setRowTotal($rowTotal)
      * Returns the row total in base currency.
      *
      * @return float Row total in base currency.
-     * @since 2.0.0
      */
     public function getBaseRowTotal()
     {
@@ -147,7 +135,6 @@ public function getBaseRowTotal()
      *
      * @param float $baseRowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotal($baseRowTotal)
     {
@@ -158,7 +145,6 @@ public function setBaseRowTotal($baseRowTotal)
      * Returns the row total with discount in quote currency.
      *
      * @return float|null Row total with discount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getRowTotalWithDiscount()
     {
@@ -170,7 +156,6 @@ public function getRowTotalWithDiscount()
      *
      * @param float $rowTotalWithDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalWithDiscount($rowTotalWithDiscount)
     {
@@ -181,7 +166,6 @@ public function setRowTotalWithDiscount($rowTotalWithDiscount)
      * Returns the tax amount in quote currency.
      *
      * @return float|null Tax amount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -193,7 +177,6 @@ public function getTaxAmount()
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount)
     {
@@ -204,7 +187,6 @@ public function setTaxAmount($taxAmount)
      * Returns the tax amount in base currency.
      *
      * @return float|null Tax amount in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -216,7 +198,6 @@ public function getBaseTaxAmount()
      *
      * @param float $baseTaxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($baseTaxAmount)
     {
@@ -227,7 +208,6 @@ public function setBaseTaxAmount($baseTaxAmount)
      * Returns the tax percent.
      *
      * @return int|null Tax percent. Otherwise, null.
-     * @since 2.0.0
      */
     public function getTaxPercent()
     {
@@ -239,7 +219,6 @@ public function getTaxPercent()
      *
      * @param int $taxPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent)
     {
@@ -250,7 +229,6 @@ public function setTaxPercent($taxPercent)
      * Returns the discount amount in quote currency.
      *
      * @return float|null Discount amount in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -262,7 +240,6 @@ public function getDiscountAmount()
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount)
     {
@@ -273,7 +250,6 @@ public function setDiscountAmount($discountAmount)
      * Returns the discount amount in base currency.
      *
      * @return float|null Discount amount in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -285,7 +261,6 @@ public function getBaseDiscountAmount()
      *
      * @param float $baseDiscountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($baseDiscountAmount)
     {
@@ -296,7 +271,6 @@ public function setBaseDiscountAmount($baseDiscountAmount)
      * Returns the discount percent.
      *
      * @return int|null Discount percent. Otherwise, null.
-     * @since 2.0.0
      */
     public function getDiscountPercent()
     {
@@ -308,7 +282,6 @@ public function getDiscountPercent()
      *
      * @param int $discountPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountPercent($discountPercent)
     {
@@ -319,7 +292,6 @@ public function setDiscountPercent($discountPercent)
      * Returns the price including tax in quote currency.
      *
      * @return float|null Price including tax in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -331,7 +303,6 @@ public function getPriceInclTax()
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax)
     {
@@ -342,7 +313,6 @@ public function setPriceInclTax($priceInclTax)
      * Returns the price including tax in base currency.
      *
      * @return float|null Price including tax in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBasePriceInclTax()
     {
@@ -354,7 +324,6 @@ public function getBasePriceInclTax()
      *
      * @param float $basePriceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($basePriceInclTax)
     {
@@ -365,7 +334,6 @@ public function setBasePriceInclTax($basePriceInclTax)
      * Returns the row total including tax in quote currency.
      *
      * @return float|null Row total including tax in quote currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getRowTotalInclTax()
     {
@@ -377,7 +345,6 @@ public function getRowTotalInclTax()
      *
      * @param float $rowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($rowTotalInclTax)
     {
@@ -388,7 +355,6 @@ public function setRowTotalInclTax($rowTotalInclTax)
      * Returns the row total including tax in base currency.
      *
      * @return float|null Row total including tax in base currency. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax()
     {
@@ -400,7 +366,6 @@ public function getBaseRowTotalInclTax()
      *
      * @param float $baseRowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($baseRowTotalInclTax)
     {
@@ -411,7 +376,6 @@ public function setBaseRowTotalInclTax($baseRowTotalInclTax)
      * Returns the item options data.
      *
      * @return string[] Item price in quote currency.
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -423,7 +387,6 @@ public function getOptions()
      *
      * @param string $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options)
     {
@@ -434,7 +397,6 @@ public function setOptions($options)
      * Returns the item weee tax applied amount in quote currency.
      *
      * @return float Item weee tax applied amount in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount()
     {
@@ -446,7 +408,6 @@ public function getWeeeTaxAppliedAmount()
      *
      * @param float $weeeTaxAppliedAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount)
     {
@@ -457,7 +418,6 @@ public function setWeeeTaxAppliedAmount($weeeTaxAppliedAmount)
      * Returns the item weee tax applied in quote currency.
      *
      * @return string[] Item weee tax applied in quote currency.
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied()
     {
@@ -469,7 +429,6 @@ public function getWeeeTaxApplied()
      *
      * @param string $weeeTaxApplied
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied)
     {
@@ -478,7 +437,6 @@ public function setWeeeTaxApplied($weeeTaxApplied)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -487,7 +445,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -498,7 +455,6 @@ public function setName($name)
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\TotalsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -510,7 +466,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\TotalsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\TotalsItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
index 87bc5d6708781..ddaa8c389be8f 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
@@ -14,31 +14,26 @@
  * Cart item totals converter.
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ItemConverter
 {
     /**
      * @var ConfigurationPool
-     * @since 2.0.0
      */
     private $configurationPool;
 
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     private $eventManager;
 
     /**
      * @var \Magento\Quote\Api\Data\TotalsItemInterfaceFactory
-     * @since 2.0.0
      */
     private $totalsItemFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
@@ -57,7 +52,6 @@ class ItemConverter
      * @param DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         ConfigurationPool $configurationPool,
@@ -80,7 +74,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote\Item $item
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     public function modelToDataObject($item)
     {
@@ -103,7 +96,6 @@ public function modelToDataObject($item)
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface $item
      * @return string
-     * @since 2.0.0
      */
     private function getFormattedOptionValue($item)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
index 6630d4c46a138..766d9585d572f 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
@@ -10,7 +10,6 @@
 
 /**
  * @inheritDoc
- * @since 2.0.0
  */
 class TotalsAdditionalData extends AbstractExtensibleModel implements TotalsAdditionalDataInterface
 {
@@ -18,7 +17,6 @@ class TotalsAdditionalData extends AbstractExtensibleModel implements TotalsAddi
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -30,7 +28,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface $extensionAttributes
      * @return void
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\TotalsAdditionalDataExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalDataProcessor.php b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalDataProcessor.php
index 5a483063c4344..41d9b8fc96d9b 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalDataProcessor.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalDataProcessor.php
@@ -9,7 +9,6 @@
 
 /**
  * Processes additional data for cart totals.
- * @since 2.0.0
  */
 class TotalsAdditionalDataProcessor
 {
@@ -20,7 +19,6 @@ class TotalsAdditionalDataProcessor
      * @param int $cartId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function process(TotalsAdditionalDataInterface $additionalData, $cartId)
     {
diff --git a/app/code/Magento/Quote/Model/Cart/TotalsConverter.php b/app/code/Magento/Quote/Model/Cart/TotalsConverter.php
index c5c2078c5fb89..a84ccda9168bb 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalsConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalsConverter.php
@@ -10,19 +10,16 @@
 
 /**
  * Cart totals data objects converter.
- * @since 2.0.0
  */
 class TotalsConverter
 {
     /**
      * @var TotalSegmentInterfaceFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @param TotalSegmentInterfaceFactory $factory
-     * @since 2.0.0
      */
     public function __construct(
         TotalSegmentInterfaceFactory $factory
@@ -33,7 +30,6 @@ public function __construct(
     /**
      * @param \Magento\Quote\Model\Quote\Address\Total[] $addressTotals
      * @return \Magento\Quote\Api\Data\TotalSegmentInterface[]
-     * @since 2.0.0
      */
     public function process($addressTotals)
     {
diff --git a/app/code/Magento/Quote/Model/CouponManagement.php b/app/code/Magento/Quote/Model/CouponManagement.php
index 93adf03a72cdf..7701e41e0b55a 100644
--- a/app/code/Magento/Quote/Model/CouponManagement.php
+++ b/app/code/Magento/Quote/Model/CouponManagement.php
@@ -14,7 +14,6 @@
 
 /**
  * Coupon management object.
- * @since 2.0.0
  */
 class CouponManagement implements CouponManagementInterface
 {
@@ -22,7 +21,6 @@ class CouponManagement implements CouponManagementInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -30,7 +28,6 @@ class CouponManagement implements CouponManagementInterface
      * Constructs a coupon read service object.
      *
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository Quote repository.
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
@@ -40,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -51,7 +47,6 @@ public function get($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function set($cartId, $couponCode)
     {
@@ -76,7 +71,6 @@ public function set($cartId, $couponCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/CustomerManagement.php b/app/code/Magento/Quote/Model/CustomerManagement.php
index eb19e06600063..d2459f134ce87 100644
--- a/app/code/Magento/Quote/Model/CustomerManagement.php
+++ b/app/code/Magento/Quote/Model/CustomerManagement.php
@@ -14,25 +14,21 @@
 
 /**
  * Class Customer
- * @since 2.0.0
  */
 class CustomerManagement
 {
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var CustomerAddressRepository
-     * @since 2.0.0
      */
     protected $customerAddressRepository;
 
     /**
      * @var AccountManagement
-     * @since 2.0.0
      */
     protected $accountManagement;
 
@@ -55,7 +51,6 @@ class CustomerManagement
      * @param AccountManagement $accountManagement
      * @param \Magento\Framework\Validator\Factory|null $validatorFactory
      * @param \Magento\Customer\Model\AddressFactory|null $addressFactory
-     * @since 2.0.0
      */
     public function __construct(
         CustomerRepository $customerRepository,
@@ -78,7 +73,6 @@ public function __construct(
      *
      * @param Quote $quote
      * @return void
-     * @since 2.0.0
      */
     public function populateCustomerInfo(QuoteEntity $quote)
     {
diff --git a/app/code/Magento/Quote/Model/EstimateAddress.php b/app/code/Magento/Quote/Model/EstimateAddress.php
index 185b96de9998f..f2f618c082dde 100644
--- a/app/code/Magento/Quote/Model/EstimateAddress.php
+++ b/app/code/Magento/Quote/Model/EstimateAddress.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Quote\Model\EstimateAddress
  *
- * @since 2.0.0
  */
 class EstimateAddress extends AbstractExtensibleModel implements EstimateAddressInterface
 {
@@ -20,7 +19,6 @@ class EstimateAddress extends AbstractExtensibleModel implements EstimateAddress
      * Get region name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -32,7 +30,6 @@ public function getRegion()
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region)
     {
@@ -43,7 +40,6 @@ public function setRegion($region)
      * Get region id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -55,7 +51,6 @@ public function getRegionId()
      *
      * @param int $regionId
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($regionId)
     {
@@ -66,7 +61,6 @@ public function setRegionId($regionId)
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -78,7 +72,6 @@ public function getCountryId()
      *
      * @param string $countryId
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($countryId)
     {
@@ -89,7 +82,6 @@ public function setCountryId($countryId)
      * Get postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -101,7 +93,6 @@ public function getPostcode()
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode)
     {
@@ -112,7 +103,6 @@ public function setPostcode($postcode)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\EstimateAddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -124,7 +114,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\EstimateAddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\EstimateAddressExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
index 4f94f3984c27e..3de2e0c3ff3fc 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
@@ -12,19 +12,16 @@
 
 /**
  * Billing address management service for guest carts.
- * @since 2.0.0
  */
 class GuestBillingAddressManagement implements GuestBillingAddressManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     private $quoteIdMaskFactory;
 
     /**
      * @var BillingAddressManagementInterface
-     * @since 2.0.0
      */
     private $billingAddressManagement;
 
@@ -33,7 +30,6 @@ class GuestBillingAddressManagement implements GuestBillingAddressManagementInte
      *
      * @param BillingAddressManagementInterface $billingAddressManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         BillingAddressManagementInterface $billingAddressManagement,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false)
     {
@@ -56,7 +51,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
index fb611b9826b6f..46c3b9b7a8fdf 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
@@ -13,19 +13,16 @@
 
 /**
  * Cart Item repository class for guest carts.
- * @since 2.0.0
  */
 class GuestCartItemRepository implements \Magento\Quote\Api\GuestCartItemRepositoryInterface
 {
     /**
      * @var \Magento\Quote\Api\CartItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $repository;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
@@ -34,7 +31,6 @@ class GuestCartItemRepository implements \Magento\Quote\Api\GuestCartItemReposit
      *
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $repository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $repository,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
@@ -62,7 +57,6 @@ public function getList($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
     {
@@ -74,7 +68,6 @@ public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($cartId, $itemId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
index cae689cb1f595..0236cb583dac1 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
@@ -17,25 +17,21 @@
  * Cart Management class for guest carts.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class GuestCartManagement implements GuestCartManagementInterface
 {
     /**
      * @var CartManagementInterface
-     * @since 2.0.0
      */
     protected $quoteManagement;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $cartRepository;
 
@@ -46,7 +42,6 @@ class GuestCartManagement implements GuestCartManagementInterface
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         CartManagementInterface $quoteManagement,
@@ -60,7 +55,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createEmptyCart()
     {
@@ -73,7 +67,6 @@ public function createEmptyCart()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function assignCustomer($cartId, $customerId, $storeId)
     {
@@ -84,7 +77,6 @@ public function assignCustomer($cartId, $customerId, $storeId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
index a37548c72fb98..665dc0a87c97b 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
@@ -12,19 +12,16 @@
 
 /**
  * Cart Repository class for guest carts.
- * @since 2.0.0
  */
 class GuestCartRepository implements GuestCartRepositoryInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -33,7 +30,6 @@ class GuestCartRepository implements GuestCartRepositoryInterface
      *
      * @param CartRepositoryInterface $quoteRepository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         CartRepositoryInterface $quoteRepository,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
index 9d33b241c26ba..33cb83fa5fbcb 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
@@ -10,26 +10,22 @@
 
 /**
  * @inheritDoc
- * @since 2.0.0
  */
 class GuestCartTotalManagement implements GuestCartTotalManagementInterface
 {
     /**
      * @var \Magento\Quote\Api\CartTotalManagementInterface
-     * @since 2.0.0
      */
     protected $cartTotalManagement;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @param \Magento\Quote\Api\CartTotalManagementInterface $cartTotalManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartTotalManagementInterface $cartTotalManagement,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function collectTotals(
         $cartId,
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
index 048660fec7637..9e384671cf6bd 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
@@ -13,19 +13,16 @@
 
 /**
  * Cart totals repository class for guest carts.
- * @since 2.0.0
  */
 class GuestCartTotalRepository implements GuestCartTotalRepositoryInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     private $quoteIdMaskFactory;
 
     /**
      * @var CartTotalRepositoryInterface
-     * @since 2.0.0
      */
     private $cartTotalRepository;
 
@@ -34,7 +31,6 @@ class GuestCartTotalRepository implements GuestCartTotalRepositoryInterface
      *
      * @param CartTotalRepositoryInterface $cartTotalRepository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         CartTotalRepositoryInterface $cartTotalRepository,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
index 46fe96d6372a0..d2e807e543b2a 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
@@ -13,19 +13,16 @@
 
 /**
  * Coupon management class for guest carts.
- * @since 2.0.0
  */
 class GuestCouponManagement implements GuestCouponManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     private $quoteIdMaskFactory;
 
     /**
      * @var CouponManagementInterface
-     * @since 2.0.0
      */
     private $couponManagement;
 
@@ -34,7 +31,6 @@ class GuestCouponManagement implements GuestCouponManagementInterface
      *
      * @param CouponManagementInterface $couponManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         CouponManagementInterface $couponManagement,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -57,7 +52,6 @@ public function get($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function set($cartId, $couponCode)
     {
@@ -68,7 +62,6 @@ public function set($cartId, $couponCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
index a314bedc7d6e5..f57a7d2e0ba6e 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
@@ -12,19 +12,16 @@
 
 /**
  * Payment method management class for guest carts.
- * @since 2.0.0
  */
 class GuestPaymentMethodManagement implements GuestPaymentMethodManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var PaymentMethodManagementInterface
-     * @since 2.0.0
      */
     protected $paymentMethodManagement;
 
@@ -33,7 +30,6 @@ class GuestPaymentMethodManagement implements GuestPaymentMethodManagementInterf
      *
      * @param PaymentMethodManagementInterface $paymentMethodManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         PaymentMethodManagementInterface $paymentMethodManagement,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
     {
@@ -56,7 +51,6 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -67,7 +61,6 @@ public function get($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
index 958aaf36184d4..e2f31406cfe7e 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
@@ -12,19 +12,16 @@
 
 /**
  * Shipping address management class for guest carts.
- * @since 2.0.0
  */
 class GuestShippingAddressManagement implements GuestShippingAddressManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     protected $quoteIdMaskFactory;
 
     /**
      * @var ShippingAddressManagementInterface
-     * @since 2.0.0
      */
     protected $shippingAddressManagement;
 
@@ -33,7 +30,6 @@ class GuestShippingAddressManagement implements GuestShippingAddressManagementIn
      *
      * @param ShippingAddressManagementInterface $shippingAddressManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         ShippingAddressManagementInterface $shippingAddressManagement,
@@ -45,7 +41,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -56,7 +51,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagementInterface.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagementInterface.php
index c13383ceea1bf..127f83334b79b 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagementInterface.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Shipping address management interface for guest carts.
  * @api
- * @since 2.0.0
  */
 interface GuestShippingAddressManagementInterface
 {
@@ -20,7 +19,6 @@ interface GuestShippingAddressManagementInterface
      * @return int Address ID.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException The specified cart ID or address data is not valid.
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address);
 
@@ -30,7 +28,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      * @param string $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Shipping address object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
index f89925e4a92f1..6c6dda715b6f3 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
@@ -16,7 +16,6 @@
 
 /**
  * Shipping method management class for guest carts.
- * @since 2.0.0
  */
 class GuestShippingMethodManagement implements
     \Magento\Quote\Api\GuestShippingMethodManagementInterface,
@@ -25,19 +24,17 @@ class GuestShippingMethodManagement implements
 {
     /**
      * @var ShippingMethodManagementInterface
-     * @since 2.0.0
      */
     private $shippingMethodManagement;
 
     /**
      * @var QuoteIdMaskFactory
-     * @since 2.0.0
      */
     private $quoteIdMaskFactory;
 
     /**
      * @var ShipmentEstimationInterface
-     * @since 2.1.0
+     * @since 2.0.10
      */
     private $shipmentEstimationManagement;
 
@@ -46,7 +43,6 @@ class GuestShippingMethodManagement implements
      *
      * @param ShippingMethodManagementInterface $shippingMethodManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @since 2.0.0
      */
     public function __construct(
         ShippingMethodManagementInterface $shippingMethodManagement,
@@ -58,7 +54,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -69,7 +64,6 @@ public function get($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
@@ -80,7 +74,6 @@ public function getList($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function set($cartId, $carrierCode, $methodCode)
     {
@@ -91,7 +84,6 @@ public function set($cartId, $carrierCode, $methodCode)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address)
     {
@@ -102,7 +94,7 @@ public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddre
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.10
      */
     public function estimateByExtendedAddress($cartId, AddressInterface $address)
     {
@@ -116,8 +108,8 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
     /**
      * Get shipment estimation management service
      * @return ShipmentEstimationInterface
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.10
+     * @since 2.0.10
      */
     private function getShipmentEstimationManagement()
     {
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
index ee3d0d129736b..e8109a0ac0cee 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface
  *
- * @since 2.0.0
  */
 interface GuestShippingMethodManagementInterface
 {
@@ -24,7 +23,6 @@ interface GuestShippingMethodManagementInterface
      * @throws \Magento\Framework\Exception\StateException The billing or shipping address is not set.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart contains only virtual products
      * so the shipping method does not apply.
-     * @since 2.0.0
      */
     public function set($cartId, $carrierCode, $methodCode);
 
@@ -35,7 +33,6 @@ public function set($cartId, $carrierCode, $methodCode);
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified shopping cart does not exist.
      * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/PaymentMethodManagement.php b/app/code/Magento/Quote/Model/PaymentMethodManagement.php
index 6018ad9e53b0c..f12b9e5d1fb7f 100644
--- a/app/code/Magento/Quote/Model/PaymentMethodManagement.php
+++ b/app/code/Magento/Quote/Model/PaymentMethodManagement.php
@@ -9,25 +9,21 @@
 
 /**
  * Class PaymentMethodManagement
- * @since 2.0.0
  */
 class PaymentMethodManagement implements \Magento\Quote\Api\PaymentMethodManagementInterface
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Payment\Model\Checks\ZeroTotal
-     * @since 2.0.0
      */
     protected $zeroTotalValidator;
 
     /**
      * @var \Magento\Payment\Model\MethodList
-     * @since 2.0.0
      */
     protected $methodList;
 
@@ -37,7 +33,6 @@ class PaymentMethodManagement implements \Magento\Quote\Api\PaymentMethodManagem
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Magento\Payment\Model\Checks\ZeroTotal $zeroTotalValidator
      * @param \Magento\Payment\Model\MethodList $methodList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -51,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
     {
@@ -92,7 +86,6 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -107,7 +100,6 @@ public function get($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php b/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php
index 193c8ed156647..bb0ac959cbb25 100644
--- a/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php
+++ b/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php
@@ -10,19 +10,19 @@
 /**
  * Class \Magento\Quote\Model\Product\Plugin\RemoveQuoteItems
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RemoveQuoteItems
 {
     /**
      * @var \Magento\Quote\Model\Product\QuoteItemsCleanerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $quoteItemsCleaner;
 
     /**
      * @param \Magento\Quote\Model\Product\QuoteItemsCleanerInterface $quoteItemsCleaner
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Quote\Model\Product\QuoteItemsCleanerInterface $quoteItemsCleaner)
     {
diff --git a/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php b/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php
index 204a8b5879927..52300df821a0f 100644
--- a/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php
+++ b/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php
@@ -8,19 +8,19 @@
 /**
  * Class \Magento\Quote\Model\Product\QuoteItemsCleaner
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class QuoteItemsCleaner implements \Magento\Quote\Model\Product\QuoteItemsCleanerInterface
 {
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $itemResource;
 
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Quote\Model\ResourceModel\Quote\Item $itemResource)
     {
@@ -29,7 +29,7 @@ public function __construct(\Magento\Quote\Model\ResourceModel\Quote\Item $itemR
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
diff --git a/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php b/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php
index 8b908a3264b21..f1c20f2a7f4a1 100644
--- a/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php
+++ b/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php
@@ -10,14 +10,14 @@
 /**
  * Interface \Magento\Quote\Model\Product\QuoteItemsCleanerInterface
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface QuoteItemsCleanerInterface
 {
     /**
      * @param ProductInterface $product
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(ProductInterface $product);
 }
diff --git a/app/code/Magento/Quote/Model/QueryResolver.php b/app/code/Magento/Quote/Model/QueryResolver.php
index 1dbd0c37527b5..4aea7c4b35b5c 100644
--- a/app/code/Magento/Quote/Model/QueryResolver.php
+++ b/app/code/Magento/Quote/Model/QueryResolver.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Quote\Model\QueryResolver
  *
- * @since 2.0.0
  */
 class QueryResolver
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     private $cache;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $cacheId;
 
@@ -45,7 +40,6 @@ class QueryResolver
      * Cache tags
      *
      * @var array
-     * @since 2.0.0
      */
     private $cacheTags = [];
 
@@ -60,7 +54,6 @@ class QueryResolver
      * @param CacheInterface $cache
      * @param string $cacheId
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $config,
@@ -78,7 +71,6 @@ public function __construct(
      * Get flag value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleQuery()
     {
@@ -91,7 +83,6 @@ public function isSingleQuery()
     /**
      * Initialise data for configuration
      * @return void
-     * @since 2.0.0
      */
     protected function initData()
     {
@@ -111,7 +102,6 @@ protected function initData()
      *
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index adb80b51de693..0dbc77468bb1f 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -101,7 +101,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\CartInterface
 {
@@ -112,13 +111,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'quote';
 
@@ -126,7 +123,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote customer model object
      *
      * @var \Magento\Customer\Model\Customer
-     * @since 2.0.0
      */
     protected $_customer;
 
@@ -134,7 +130,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote addresses collection
      *
      * @var \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_addresses;
 
@@ -142,7 +137,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote items collection
      *
      * @var \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_items;
 
@@ -150,13 +144,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote payments
      *
      * @var \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_payments;
 
     /**
      * @var \Magento\Quote\Model\Quote\Payment
-     * @since 2.0.0
      */
     protected $_currentPayment;
 
@@ -164,7 +156,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Different groups of error infos
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errorInfoGroups = [];
 
@@ -172,7 +163,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Whether quote should not be saved
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_preventSaving = false;
 
@@ -180,7 +170,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
@@ -188,7 +177,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote validator
      *
      * @var \Magento\Quote\Model\QuoteValidator
-     * @since 2.0.0
      */
     protected $quoteValidator;
 
@@ -196,31 +184,26 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Quote\Model\Quote\AddressFactory
-     * @since 2.0.0
      */
     protected $_quoteAddressFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
@@ -228,55 +211,46 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Group repository
      *
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_quoteItemCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\ItemFactory
-     * @since 2.0.0
      */
     protected $_quoteItemFactory;
 
     /**
      * @var \Magento\Framework\Message\Factory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
     /**
      * @var \Magento\Sales\Model\Status\ListFactory
-     * @since 2.0.0
      */
     protected $_statusListFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Quote\Model\Quote\PaymentFactory
-     * @since 2.0.0
      */
     protected $_quotePaymentFactory;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Payment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_quotePaymentCollectionFactory;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
@@ -284,7 +258,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Address repository
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
@@ -292,7 +265,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Search criteria builder
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -300,91 +272,76 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Filter builder
      *
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\Processor
-     * @since 2.0.0
      */
     protected $itemProcessor;
 
     /**
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $extensibleDataObjectConverter;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var Cart\CurrencyFactory
-     * @since 2.0.0
      */
     protected $currencyFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsReader
-     * @since 2.0.0
      */
     protected $totalsReader;
 
     /**
      * @var \Magento\Quote\Model\ShippingFactory
-     * @since 2.0.0
      */
     protected $shippingFactory;
 
     /**
      * @var \Magento\Quote\Model\ShippingAssignmentFactory
-     * @since 2.0.0
      */
     protected $shippingAssignmentFactory;
 
@@ -392,7 +349,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * Quote shipping addresses items cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $shippingAddressesItems;
 
@@ -438,7 +394,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -530,7 +485,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -541,7 +495,6 @@ protected function _construct()
      * @codeCoverageIgnoreStart
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCurrency()
     {
@@ -563,7 +516,6 @@ public function getCurrency()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null)
     {
@@ -572,7 +524,6 @@ public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -581,7 +532,6 @@ public function getItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -590,7 +540,6 @@ public function setItems(array $items = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -599,7 +548,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -608,7 +556,6 @@ public function setCreatedAt($createdAt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -617,7 +564,6 @@ public function getUpdatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -626,7 +572,6 @@ public function setUpdatedAt($updatedAt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConvertedAt()
     {
@@ -635,7 +580,6 @@ public function getConvertedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setConvertedAt($convertedAt)
     {
@@ -644,7 +588,6 @@ public function setConvertedAt($convertedAt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -653,7 +596,6 @@ public function getIsActive()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
@@ -662,7 +604,6 @@ public function setIsActive($isActive)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVirtual($isVirtual)
     {
@@ -671,7 +612,6 @@ public function setIsVirtual($isVirtual)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
@@ -680,7 +620,6 @@ public function getItemsCount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItemsCount($itemsCount)
     {
@@ -689,7 +628,6 @@ public function setItemsCount($itemsCount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemsQty()
     {
@@ -698,7 +636,6 @@ public function getItemsQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItemsQty($itemsQty)
     {
@@ -707,7 +644,6 @@ public function setItemsQty($itemsQty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOrigOrderId()
     {
@@ -716,7 +652,6 @@ public function getOrigOrderId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrigOrderId($origOrderId)
     {
@@ -725,7 +660,6 @@ public function setOrigOrderId($origOrderId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getReservedOrderId()
     {
@@ -734,7 +668,6 @@ public function getReservedOrderId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setReservedOrderId($reservedOrderId)
     {
@@ -743,7 +676,6 @@ public function setReservedOrderId($reservedOrderId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerIsGuest()
     {
@@ -752,7 +684,6 @@ public function getCustomerIsGuest()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerIsGuest($customerIsGuest)
     {
@@ -761,7 +692,6 @@ public function setCustomerIsGuest($customerIsGuest)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerNote()
     {
@@ -770,7 +700,6 @@ public function getCustomerNote()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerNote($customerNote)
     {
@@ -779,7 +708,6 @@ public function setCustomerNote($customerNote)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerNoteNotify()
     {
@@ -788,7 +716,6 @@ public function getCustomerNoteNotify()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerNoteNotify($customerNoteNotify)
     {
@@ -799,7 +726,6 @@ public function setCustomerNoteNotify($customerNoteNotify)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -811,7 +737,6 @@ public function getStoreId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -823,7 +748,6 @@ public function setStoreId($storeId)
      * Get quote store model object
      *
      * @return  \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -835,7 +759,6 @@ public function getStore()
      *
      * @param \Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore(\Magento\Store\Model\Store $store)
     {
@@ -847,7 +770,6 @@ public function setStore(\Magento\Store\Model\Store $store)
      * Get all available store ids for quote
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSharedStoreIds()
     {
@@ -866,7 +788,6 @@ public function getSharedStoreIds()
      * Prepare data before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -929,7 +850,6 @@ public function beforeSave()
      * @param \Magento\Customer\Model\Customer|int $customer
      * @deprecated 2.2.0
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomer($customer)
     {
@@ -949,7 +869,6 @@ public function loadByCustomer($customer)
      *
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function loadActive($quoteId)
     {
@@ -963,7 +882,6 @@ public function loadActive($quoteId)
      *
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIdWithoutStore($quoteId)
     {
@@ -977,7 +895,6 @@ public function loadByIdWithoutStore($quoteId)
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function assignCustomer(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -991,7 +908,6 @@ public function assignCustomer(\Magento\Customer\Api\Data\CustomerInterface $cus
      * @param Address $billingAddress Quote billing address
      * @param Address $shippingAddress Quote shipping address
      * @return $this
-     * @since 2.0.0
      */
     public function assignCustomerWithAddressChange(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -1042,7 +958,6 @@ public function assignCustomerWithAddressChange(
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $customer = null)
     {
@@ -1068,7 +983,6 @@ public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $custom
      * Retrieve customer model object
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface|\Magento\Framework\Api\ExtensibleDataInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -1093,7 +1007,6 @@ public function getCustomer()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface[] $addresses
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerAddressData(array $addresses)
     {
@@ -1113,7 +1026,6 @@ public function setCustomerAddressData(array $addresses)
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -1129,7 +1041,6 @@ public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return $this
-     * @since 2.0.0
      */
     public function updateCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -1143,7 +1054,6 @@ public function updateCustomerData(\Magento\Customer\Api\Data\CustomerInterface
      * Retrieve customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -1158,7 +1068,6 @@ public function getCustomerGroupId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerTaxClassId()
     {
@@ -1178,7 +1087,6 @@ public function getCustomerTaxClassId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerTaxClassId($customerTaxClassId)
     {
@@ -1189,7 +1097,6 @@ public function setCustomerTaxClassId($customerTaxClassId)
      * Retrieve quote address collection
      *
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getAddressesCollection()
     {
@@ -1210,7 +1117,6 @@ public function getAddressesCollection()
      *
      * @param   string $type
      * @return  Address
-     * @since 2.0.0
      */
     protected function _getAddressByType($type)
     {
@@ -1229,7 +1135,6 @@ protected function _getAddressByType($type)
      * Retrieve quote billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -1240,7 +1145,6 @@ public function getBillingAddress()
      * Retrieve quote shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -1249,7 +1153,6 @@ public function getShippingAddress()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllShippingAddresses()
     {
@@ -1266,7 +1169,6 @@ public function getAllShippingAddresses()
      * Get all quote addresses
      *
      * @return \Magento\Quote\Model\Quote\Address[]
-     * @since 2.0.0
      */
     public function getAllAddresses()
     {
@@ -1283,7 +1185,6 @@ public function getAllAddresses()
      *
      * @param int $addressId
      * @return Address|false
-     * @since 2.0.0
      */
     public function getAddressById($addressId)
     {
@@ -1298,7 +1199,6 @@ public function getAddressById($addressId)
     /**
      * @param int|string $addressId
      * @return Address|false
-     * @since 2.0.0
      */
     public function getAddressByCustomerAddressId($addressId)
     {
@@ -1315,7 +1215,6 @@ public function getAddressByCustomerAddressId($addressId)
      *
      * @param int|string $addressId
      * @return Address|false
-     * @since 2.0.0
      */
     public function getShippingAddressByCustomerAddressId($addressId)
     {
@@ -1334,7 +1233,6 @@ public function getShippingAddressByCustomerAddressId($addressId)
     /**
      * @param int|string $addressId
      * @return $this
-     * @since 2.0.0
      */
     public function removeAddress($addressId)
     {
@@ -1351,7 +1249,6 @@ public function removeAddress($addressId)
      * Leave no more than one billing and one shipping address, fill them with default data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllAddresses()
     {
@@ -1388,7 +1285,6 @@ public function removeAllAddresses()
     /**
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function addAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -1402,7 +1298,6 @@ public function addAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     /**
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address = null)
     {
@@ -1421,7 +1316,6 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $addr
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $address = null)
     {
@@ -1441,7 +1335,6 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
     /**
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -1455,7 +1348,6 @@ public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
      * @param bool $useCache
      * @return  \Magento\Eav\Model\Entity\Collection\AbstractCollection
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getItemsCollection($useCache = true)
     {
@@ -1474,7 +1366,6 @@ public function getItemsCollection($useCache = true)
      * Retrieve quote items array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -1492,7 +1383,6 @@ public function getAllItems()
      * Get array of all items what can be display directly
      *
      * @return \Magento\Quote\Model\Quote\Item[]
-     * @since 2.0.0
      */
     public function getAllVisibleItems()
     {
@@ -1509,7 +1399,6 @@ public function getAllVisibleItems()
      * Checking items availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasItems()
     {
@@ -1520,7 +1409,6 @@ public function hasItems()
      * Checking availability of items with decimal qty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasItemsWithDecimalQty()
     {
@@ -1541,7 +1429,6 @@ public function hasItemsWithDecimalQty()
      *
      * @param int $productId
      * @return bool
-     * @since 2.0.0
      */
     public function hasProductId($productId)
     {
@@ -1559,7 +1446,6 @@ public function hasProductId($productId)
      *
      * @param   int $itemId
      * @return  \Magento\Quote\Model\Quote\Item|false
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -1577,7 +1463,6 @@ public function getItemById($itemId)
      *
      * @param   \Magento\Quote\Model\Quote\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function deleteItem(\Magento\Quote\Model\Quote\Item $item)
     {
@@ -1608,7 +1493,6 @@ public function deleteItem(\Magento\Quote\Model\Quote\Item $item)
      *
      * @param   int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function removeItem($itemId)
     {
@@ -1642,7 +1526,6 @@ public function removeItem($itemId)
      * Mark all quote items as deleted (empty quote)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllItems()
     {
@@ -1662,7 +1545,6 @@ public function removeAllItems()
      * @param   \Magento\Quote\Model\Quote\Item $item
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addItem(\Magento\Quote\Model\Quote\Item $item)
     {
@@ -1685,7 +1567,6 @@ public function addItem(\Magento\Quote\Model\Quote\Item $item)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addProduct(
         \Magento\Catalog\Model\Product $product,
@@ -1780,7 +1661,6 @@ public function addProduct(
      * @param int $qty
      * @return \Magento\Quote\Model\Quote\Item
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $qty = 1)
     {
@@ -1836,7 +1716,6 @@ protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $
      *
      * @see \Magento\Catalog\Helper\Product::addParamsToBuyRequest()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function updateItem($itemId, $buyRequest, $params = null)
     {
@@ -1900,7 +1779,6 @@ public function updateItem($itemId, $buyRequest, $params = null)
      *
      * @param   \Magento\Catalog\Model\Product $product
      * @return  \Magento\Quote\Model\Quote\Item|bool
-     * @since 2.0.0
      */
     public function getItemByProduct($product)
     {
@@ -1914,7 +1792,6 @@ public function getItemByProduct($product)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getItemsSummaryQty()
     {
@@ -1942,7 +1819,6 @@ public function getItemsSummaryQty()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getItemVirtualQty()
     {
@@ -1976,7 +1852,6 @@ public function getItemVirtualQty()
 
     /**
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getPaymentsCollection()
     {
@@ -1994,7 +1869,6 @@ public function getPaymentsCollection()
 
     /**
      * @return \Magento\Quote\Model\Quote\Payment
-     * @since 2.0.0
      */
     public function getPayment()
     {
@@ -2021,7 +1895,6 @@ public function getPayment()
      *
      * @param PaymentInterface $payment
      * @return $this
-     * @since 2.0.0
      */
     protected function addPayment(PaymentInterface $payment)
     {
@@ -2037,7 +1910,6 @@ protected function addPayment(PaymentInterface $payment)
      *
      * @param PaymentInterface $payment
      * @return PaymentInterface
-     * @since 2.0.0
      */
     public function setPayment(PaymentInterface $payment)
     {
@@ -2051,7 +1923,6 @@ public function setPayment(PaymentInterface $payment)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function removePayment()
     {
@@ -2063,7 +1934,6 @@ public function removePayment()
      * Collect totals
      *
      * @return $this
-     * @since 2.0.0
      */
     public function collectTotals()
     {
@@ -2082,7 +1952,6 @@ public function collectTotals()
      * Get all quote totals (sorted by priority)
      *
      * @return AddressTotal[]
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -2093,7 +1962,6 @@ public function getTotals()
      * @param string $message
      * @param string $index
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage($message, $index = 'error')
     {
@@ -2117,7 +1985,6 @@ public function addMessage($message, $index = 'error')
      * Retrieve current quote messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -2133,7 +2000,6 @@ public function getMessages()
      * Retrieve current quote errors
      *
      * @return array
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -2154,7 +2020,6 @@ public function getErrors()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     protected function _setHasError($flag)
     {
@@ -2170,7 +2035,6 @@ protected function _setHasError($flag)
      * @param bool $flag
      * @return $this
      * @see addErrorInfo()
-     * @since 2.0.0
      */
     public function setHasError($flag)
     {
@@ -2187,7 +2051,6 @@ public function setHasError($flag)
      * Also automatically removes error-flag from oneself.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearErrorInfo()
     {
@@ -2206,7 +2069,6 @@ protected function _clearErrorInfo()
      * @param string|null $message Error message
      * @param \Magento\Framework\DataObject|null $additionalData Any additional data, that caller would like to store
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorInfo(
         $type = 'error',
@@ -2238,7 +2100,6 @@ public function addErrorInfo(
      * @param array $params
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function removeErrorInfosByParams($type, $params)
     {
@@ -2282,7 +2143,6 @@ public function removeErrorInfosByParams($type, $params)
      * @param string $type
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function removeMessageByText($type, $text)
     {
@@ -2312,7 +2172,6 @@ public function removeMessageByText($type, $text)
      * Generate new increment order id and associate it with current quote
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reserveOrderId()
     {
@@ -2333,7 +2192,6 @@ public function reserveOrderId()
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateMinimumAmount($multishipping = false)
     {
@@ -2402,7 +2260,6 @@ public function validateMinimumAmount($multishipping = false)
      * Check quote for virtual product only
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual()
     {
@@ -2427,7 +2284,6 @@ public function isVirtual()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsVirtual()
     {
@@ -2438,7 +2294,6 @@ public function getIsVirtual()
      * Has a virtual products on quote
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasVirtualItems()
     {
@@ -2459,7 +2314,6 @@ public function hasVirtualItems()
      *
      * @param   Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function merge(Quote $quote)
     {
@@ -2515,7 +2369,6 @@ public function merge(Quote $quote)
      * Trigger collect totals after loading, if required
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -2530,7 +2383,6 @@ protected function _afterLoad()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function addressCollectionWasSet()
     {
@@ -2541,7 +2393,6 @@ public function addressCollectionWasSet()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function itemsCollectionWasSet()
     {
@@ -2552,7 +2403,6 @@ public function itemsCollectionWasSet()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function paymentsCollectionWasSet()
     {
@@ -2563,7 +2413,6 @@ public function paymentsCollectionWasSet()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function currentPaymentWasSet()
     {
@@ -2575,7 +2424,6 @@ public function currentPaymentWasSet()
      *
      * @param boolean $originalMethod if true return defined method from beginning
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutMethod($originalMethod = false)
     {
@@ -2590,7 +2438,6 @@ public function getCheckoutMethod($originalMethod = false)
      * Based on result array we can display each item separately
      *
      * @return array
-     * @since 2.0.0
      */
     public function getShippingAddressesItems()
     {
@@ -2635,7 +2482,6 @@ public function getShippingAddressesItems()
      *
      * @param string $checkoutMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setCheckoutMethod($checkoutMethod)
     {
@@ -2648,7 +2494,6 @@ public function setCheckoutMethod($checkoutMethod)
      * @codeCoverageIgnore
      *
      * @return $this
-     * @since 2.0.0
      */
     public function preventSaving()
     {
@@ -2662,7 +2507,6 @@ public function preventSaving()
      * @codeCoverageIgnore
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPreventSaving()
     {
@@ -2673,7 +2517,6 @@ public function isPreventSaving()
      * Check if there are more than one shipping address
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMultipleShippingAddresses()
     {
@@ -2684,7 +2527,6 @@ public function isMultipleShippingAddresses()
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\CartExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -2696,7 +2538,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 8f120378f9e76..4fed13f33e5d9 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -95,7 +95,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
     \Magento\Quote\Api\Data\AddressInterface
@@ -112,7 +111,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Prefix of model events
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote_address';
 
@@ -120,7 +118,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Name of event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'quote_address';
 
@@ -128,7 +125,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Quote object
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_items;
 
@@ -136,7 +132,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Quote object
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -144,7 +139,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Sales Quote address rates
      *
      * @var \Magento\Quote\Model\Quote\Address\Rate
-     * @since 2.0.0
      */
     protected $_rates;
 
@@ -152,7 +146,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Total models collector
      *
      * @var \Magento\Quote\Model\Quote\Address\Total\Collector
-     * @since 2.0.0
      */
     protected $_totalCollector;
 
@@ -160,19 +153,16 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Total data as array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_totalAmounts = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_baseTotalAmounts = [];
 
@@ -180,43 +170,36 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\ItemFactory
-     * @since 2.0.0
      */
     protected $_addressItemFactory;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Address\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory
-     * @since 2.0.0
      */
     protected $_rateCollector;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory
-     * @since 2.0.0
      */
     protected $_rateCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\Total\CollectorFactory
-     * @since 2.0.0
      */
     protected $_totalCollectorFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\TotalFactory
-     * @since 2.0.0
      */
     protected $_addressTotalFactory;
 
@@ -228,43 +211,36 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressDataFactory;
 
     /**
      * @var Address\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
     /**
      * @var Address\RateRequestFactory
-     * @since 2.0.0
      */
     protected $_rateRequestFactory;
 
     /**
      * @var Address\CustomAttributeListInterface
-     * @since 2.0.0
      */
     protected $attributeList;
 
     /**
      * @var TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsReader
-     * @since 2.0.0
      */
     protected $totalsReader;
 
@@ -317,7 +293,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * @param StoreManagerInterface $storeManager
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -398,7 +373,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -409,7 +383,6 @@ protected function _construct()
      * Initialize quote identifier before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -422,7 +395,6 @@ public function beforeSave()
      * Set the required fields
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _populateBeforeSaveData()
     {
@@ -451,7 +423,6 @@ protected function _populateBeforeSaveData()
      * Returns true if shipping address is same as billing
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSameAsBilling()
     {
@@ -464,7 +435,6 @@ protected function _isSameAsBilling()
      * Checks if the user is a registered customer
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isNotRegisteredCustomer()
     {
@@ -475,7 +445,6 @@ protected function _isNotRegisteredCustomer()
      * Returns true if shipping address is same as billing or it is undefined
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isDefaultShippingNullOrSameAsBillingAddress()
     {
@@ -505,7 +474,6 @@ protected function _isDefaultShippingNullOrSameAsBillingAddress()
      *
      * @param   \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -518,7 +486,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * Retrieve quote object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -530,7 +497,6 @@ public function getQuote()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function importCustomerAddressData(\Magento\Customer\Api\Data\AddressInterface $address)
     {
@@ -553,7 +519,6 @@ public function importCustomerAddressData(\Magento\Customer\Api\Data\AddressInte
      * Export data to customer address Data Object.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface
-     * @since 2.0.0
      */
     public function exportCustomerAddress()
     {
@@ -586,7 +551,6 @@ public function exportCustomerAddress()
      *
      * @param   array $arrAttributes
      * @return  array
-     * @since 2.0.0
      */
     public function toArray(array $arrAttributes = [])
     {
@@ -604,7 +568,6 @@ public function toArray(array $arrAttributes = [])
      * Retrieve address items collection
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
@@ -626,7 +589,6 @@ public function getItemsCollection()
      * @return \Magento\Quote\Model\Quote\Address\Item[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -683,7 +645,6 @@ public function getAllItems()
      * Retrieve all visible items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllVisibleItems()
     {
@@ -702,7 +663,6 @@ public function getAllVisibleItems()
      *
      * @param int $itemId
      * @return float|int
-     * @since 2.0.0
      */
     public function getItemQty($itemId = 0)
     {
@@ -729,7 +689,6 @@ public function getItemQty($itemId = 0)
      * Check Quote address has Items
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasItems()
     {
@@ -741,7 +700,6 @@ public function hasItems()
      *
      * @param int $itemId
      * @return \Magento\Quote\Model\Quote\Address\Item|false
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -759,7 +717,6 @@ public function getItemById($itemId)
      *
      * @param int $itemId
      * @return \Magento\Quote\Model\Quote\Address\Item|false
-     * @since 2.0.0
      */
     public function getValidItemById($itemId)
     {
@@ -777,7 +734,6 @@ public function getValidItemById($itemId)
      *
      * @param int $itemId
      * @return \Magento\Quote\Model\Quote\Address\Item|false
-     * @since 2.0.0
      */
     public function getItemByQuoteItemId($itemId)
     {
@@ -794,7 +750,6 @@ public function getItemByQuoteItemId($itemId)
      *
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function removeItem($itemId)
     {
@@ -812,7 +767,6 @@ public function removeItem($itemId)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param int $qty
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item, $qty = null)
     {
@@ -854,7 +808,6 @@ public function addItem(\Magento\Quote\Model\Quote\Item\AbstractItem $item, $qty
      * Retrieve collection of quote shipping rates
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getShippingRatesCollection()
     {
@@ -873,7 +826,6 @@ public function getShippingRatesCollection()
      * Retrieve all address shipping rates
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllShippingRates()
     {
@@ -891,7 +843,6 @@ public function getAllShippingRates()
      * Retrieve all grouped shipping rates
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGroupedAllShippingRates()
     {
@@ -919,7 +870,6 @@ public function getGroupedAllShippingRates()
      * @param array $firstItem
      * @param array $secondItem
      * @return int
-     * @since 2.0.0
      */
     protected function _sortRates($firstItem, $secondItem)
     {
@@ -937,7 +887,6 @@ protected function _sortRates($firstItem, $secondItem)
      *
      * @param   int $rateId
      * @return  \Magento\Quote\Model\Quote\Address\Rate|false
-     * @since 2.0.0
      */
     public function getShippingRateById($rateId)
     {
@@ -955,7 +904,6 @@ public function getShippingRateById($rateId)
      *
      * @param   string $code
      * @return  \Magento\Quote\Model\Quote\Address\Rate|false
-     * @since 2.0.0
      */
     public function getShippingRateByCode($code)
     {
@@ -972,7 +920,6 @@ public function getShippingRateByCode($code)
      * Mark all shipping rates as deleted
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllShippingRates()
     {
@@ -987,7 +934,6 @@ public function removeAllShippingRates()
      *
      * @param \Magento\Quote\Model\Quote\Address\Rate $rate
      * @return $this
-     * @since 2.0.0
      */
     public function addShippingRate(\Magento\Quote\Model\Quote\Address\Rate $rate)
     {
@@ -1001,7 +947,6 @@ public function addShippingRate(\Magento\Quote\Model\Quote\Address\Rate $rate)
      * Collecting shipping rates by address
      *
      * @return $this
-     * @since 2.0.0
      */
     public function collectShippingRates()
     {
@@ -1033,7 +978,6 @@ public function collectShippingRates()
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractItem $item = null)
     {
@@ -1116,7 +1060,6 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
      * Get address totals as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -1134,7 +1077,6 @@ public function getTotals()
      *
      * @param \Magento\Quote\Model\Quote\Address\Total|array $total
      * @return $this
-     * @since 2.0.0
      */
     public function addTotal($total)
     {
@@ -1160,7 +1102,6 @@ public function addTotal($total)
      * Rewrite clone method
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -1171,7 +1112,6 @@ public function __clone()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function itemsCollectionWasSet()
     {
@@ -1182,7 +1122,6 @@ public function itemsCollectionWasSet()
      * Checks if it was set
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shippingRatesCollectionWasSet()
     {
@@ -1193,7 +1132,6 @@ public function shippingRatesCollectionWasSet()
      * Validate minimum amount
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validateMinimumAmount()
     {
@@ -1230,7 +1168,6 @@ public function validateMinimumAmount()
      * Retrieve applied taxes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAppliedTaxes()
     {
@@ -1242,7 +1179,6 @@ public function getAppliedTaxes()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes($data)
     {
@@ -1258,7 +1194,6 @@ public function setAppliedTaxes($data)
      * @param bool $alreadyExclTax
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setShippingAmount($value, $alreadyExclTax = false)
     {
@@ -1272,7 +1207,6 @@ public function setShippingAmount($value, $alreadyExclTax = false)
      * @param bool $alreadyExclTax
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($value, $alreadyExclTax = false)
     {
@@ -1285,7 +1219,6 @@ public function setBaseShippingAmount($value, $alreadyExclTax = false)
      * @param   string $code
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalAmount($code, $amount)
     {
@@ -1304,7 +1237,6 @@ public function setTotalAmount($code, $amount)
      * @param   string $code
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalAmount($code, $amount)
     {
@@ -1323,7 +1255,6 @@ public function setBaseTotalAmount($code, $amount)
      * @param   string $code
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function addTotalAmount($code, $amount)
     {
@@ -1339,7 +1270,6 @@ public function addTotalAmount($code, $amount)
      * @param   string $code
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function addBaseTotalAmount($code, $amount)
     {
@@ -1354,7 +1284,6 @@ public function addBaseTotalAmount($code, $amount)
      *
      * @param   string $code
      * @return  float|int
-     * @since 2.0.0
      */
     public function getTotalAmount($code)
     {
@@ -1370,7 +1299,6 @@ public function getTotalAmount($code)
      *
      * @param   string $code
      * @return  float|int
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($code)
     {
@@ -1385,7 +1313,6 @@ public function getBaseTotalAmount($code)
      * Get subtotal amount with applied discount in base currency
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseSubtotalWithDiscount()
     {
@@ -1396,7 +1323,6 @@ public function getBaseSubtotalWithDiscount()
      * Get subtotal amount with applied discount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSubtotalWithDiscount()
     {
@@ -1409,7 +1335,6 @@ public function getSubtotalWithDiscount()
      * Get all total amount values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTotalAmounts()
     {
@@ -1420,7 +1345,6 @@ public function getAllTotalAmounts()
      * Get all total amount values in base currency
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllBaseTotalAmounts()
     {
@@ -1431,7 +1355,6 @@ public function getAllBaseTotalAmounts()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -1440,7 +1363,6 @@ protected function _getValidationRulesBeforeSave()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -1449,7 +1371,6 @@ public function getCountryId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCountryId($countryId)
     {
@@ -1458,7 +1379,6 @@ public function setCountryId($countryId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStreet()
     {
@@ -1468,7 +1388,6 @@ public function getStreet()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStreet($street)
     {
@@ -1477,7 +1396,6 @@ public function setStreet($street)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCompany()
     {
@@ -1486,7 +1404,6 @@ public function getCompany()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCompany($company)
     {
@@ -1495,7 +1412,6 @@ public function setCompany($company)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTelephone()
     {
@@ -1504,7 +1420,6 @@ public function getTelephone()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTelephone($telephone)
     {
@@ -1513,7 +1428,6 @@ public function setTelephone($telephone)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFax()
     {
@@ -1522,7 +1436,6 @@ public function getFax()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFax($fax)
     {
@@ -1531,7 +1444,6 @@ public function setFax($fax)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -1540,7 +1452,6 @@ public function getPostcode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPostcode($postcode)
     {
@@ -1549,7 +1460,6 @@ public function setPostcode($postcode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCity()
     {
@@ -1558,7 +1468,6 @@ public function getCity()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCity($city)
     {
@@ -1567,7 +1476,6 @@ public function setCity($city)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -1576,7 +1484,6 @@ public function getFirstname()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFirstname($firstname)
     {
@@ -1585,7 +1492,6 @@ public function setFirstname($firstname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -1594,7 +1500,6 @@ public function getLastname()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLastname($lastname)
     {
@@ -1603,7 +1508,6 @@ public function setLastname($lastname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -1612,7 +1516,6 @@ public function getMiddlename()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMiddlename($middlename)
     {
@@ -1621,7 +1524,6 @@ public function setMiddlename($middlename)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -1630,7 +1532,6 @@ public function getPrefix()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -1639,7 +1540,6 @@ public function setPrefix($prefix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -1648,7 +1548,6 @@ public function getSuffix()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -1657,7 +1556,6 @@ public function setSuffix($suffix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getVatId()
     {
@@ -1666,7 +1564,6 @@ public function getVatId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatId($vatId)
     {
@@ -1675,7 +1572,6 @@ public function setVatId($vatId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -1684,7 +1580,6 @@ public function getCustomerId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -1693,7 +1588,6 @@ public function setCustomerId($customerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -1707,7 +1601,6 @@ public function getEmail()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmail($email)
     {
@@ -1716,7 +1609,6 @@ public function setEmail($email)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegion($region)
     {
@@ -1725,7 +1617,6 @@ public function setRegion($region)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegionId($regionId)
     {
@@ -1734,7 +1625,6 @@ public function setRegionId($regionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode)
     {
@@ -1743,7 +1633,6 @@ public function setRegionCode($regionCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSameAsBilling()
     {
@@ -1752,7 +1641,6 @@ public function getSameAsBilling()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSameAsBilling($sameAsBilling)
     {
@@ -1761,7 +1649,6 @@ public function setSameAsBilling($sameAsBilling)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerAddressId()
     {
@@ -1770,7 +1657,6 @@ public function getCustomerAddressId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerAddressId($customerAddressId)
     {
@@ -1781,7 +1667,6 @@ public function setCustomerAddressId($customerAddressId)
      * Get save in address book flag
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getSaveInAddressBook()
     {
@@ -1793,7 +1678,6 @@ public function getSaveInAddressBook()
      *
      * @param int|null $saveInAddressBook
      * @return $this
-     * @since 2.0.0
      */
     public function setSaveInAddressBook($saveInAddressBook)
     {
@@ -1806,7 +1690,6 @@ public function setSaveInAddressBook($saveInAddressBook)
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1818,7 +1701,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes)
     {
@@ -1829,7 +1711,6 @@ public function setExtensionAttributes(\Magento\Quote\Api\Data\AddressExtensionI
      * Shipping method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShippingMethod()
     {
@@ -1838,7 +1719,6 @@ public function getShippingMethod()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
index f4e6670dfe40d..dd4db9257b73e 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\CustomAttributeList
  *
- * @since 2.0.0
  */
 class CustomAttributeList implements CustomAttributeListInterface
 {
@@ -16,7 +15,6 @@ class CustomAttributeList implements CustomAttributeListInterface
      * Retrieve list of quote addresss custom attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
index 8725c8643f870..4d642c31ae16f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Quote\Model\Quote\Address\CustomAttributeListInterface
  *
- * @since 2.0.0
  */
 interface CustomAttributeListInterface
 {
@@ -16,7 +15,6 @@ interface CustomAttributeListInterface
      * Retrieve list of quote addresss custom attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes();
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address/FreeShipping.php b/app/code/Magento/Quote/Model/Quote/Address/FreeShipping.php
index f80be86711c44..d48df3609aa81 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/FreeShipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/FreeShipping.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\FreeShipping
  *
- * @since 2.0.0
  */
 class FreeShipping implements \Magento\Quote\Model\Quote\Address\FreeShippingInterface
 {
     /**
      * {@inheritDoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/FreeShippingInterface.php b/app/code/Magento/Quote/Model/Quote/Address/FreeShippingInterface.php
index dd3e2619b663c..ce13f2058f4e8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/FreeShippingInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/FreeShippingInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface FreeShippingInterface
 {
@@ -15,7 +14,6 @@ interface FreeShippingInterface
      * @param \Magento\Quote\Model\Quote $quote
      * @param \Magento\Quote\Api\Data\CartItemInterface[] $items
      * @return bool
-     * @since 2.0.0
      */
     public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items);
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Item.php b/app/code/Magento/Quote/Model/Quote/Address/Item.php
index c49f8f991b213..f9ea6bdbc9f7f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Item.php
@@ -86,7 +86,6 @@
  * @method \Magento\Quote\Model\Quote\Address\Item setBaseDiscountTaxCompensationAmount(float $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
 {
@@ -94,19 +93,16 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
      * Quote address model object
      *
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $_address;
 
     /**
      * @var Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -115,7 +111,6 @@ protected function _construct()
 
     /**
      * @return $this|\Magento\Quote\Model\Quote\Item\AbstractItem
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -131,7 +126,6 @@ public function beforeSave()
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Model\Quote\Address $address)
     {
@@ -144,7 +138,6 @@ public function setAddress(\Magento\Quote\Model\Quote\Address $address)
      * Retrieve address model
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -155,7 +148,6 @@ public function getAddress()
      * Retrieve quote model instance
      *
      * @return Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -165,7 +157,6 @@ public function getQuote()
     /**
      * @param \Magento\Quote\Model\Quote\Item $quoteItem
      * @return $this
-     * @since 2.0.0
      */
     public function importQuoteItem(\Magento\Quote\Model\Quote\Item $quoteItem)
     {
@@ -202,7 +193,6 @@ public function importQuoteItem(\Magento\Quote\Model\Quote\Item $quoteItem)
     /**
      * @param string $code
      * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface|null
-     * @since 2.0.0
      */
     public function getOptionBycode($code)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Rate.php b/app/code/Magento/Quote/Model/Quote/Address/Rate.php
index 05d60eda66a7f..a2145b1babfb6 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Rate.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Rate.php
@@ -35,19 +35,16 @@
  * @method \Magento\Quote\Model\Quote\Address\Rate setMethodTitle(string $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rate extends AbstractModel
 {
     /**
      * @var \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     protected $_address;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -56,7 +53,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -70,7 +66,6 @@ public function beforeSave()
     /**
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Model\Quote\Address $address)
     {
@@ -80,7 +75,6 @@ public function setAddress(\Magento\Quote\Model\Quote\Address $address)
 
     /**
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -90,7 +84,6 @@ public function getAddress()
     /**
      * @param \Magento\Quote\Model\Quote\Address\RateResult\AbstractResult $rate
      * @return $this
-     * @since 2.0.0
      */
     public function importShippingRate(\Magento\Quote\Model\Quote\Address\RateResult\AbstractResult $rate)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterface.php b/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterface.php
index 6fc8e8a60a5cd..0da78ead6abbe 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterface.php
@@ -7,14 +7,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RateCollectorInterface
 {
     /**
      * @param RateRequest $request
      * @return $this
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request);
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterfaceFactory.php b/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterfaceFactory.php
index 08e558556ee7c..97c0143d0b51e 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterfaceFactory.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateCollectorInterfaceFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Quote\Model\Quote\Address\RateCollectorInterface
- * @since 2.0.0
  */
 class RateCollectorInterfaceFactory
 {
@@ -15,7 +14,6 @@ class RateCollectorInterfaceFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class RateCollectorInterfaceFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class RateCollectorInterfaceFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Quote\Model\Quote\Address\RateCollectorInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateRequest.php b/app/code/Magento/Quote/Model/Quote/Address/RateRequest.php
index 28ab08ccd9408..b2b2834d511f6 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateRequest.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateRequest.php
@@ -110,7 +110,6 @@
  * @method string getLimitMethod()
  *
  * @api
- * @since 2.0.0
  */
 class RateRequest extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateResult/AbstractResult.php b/app/code/Magento/Quote/Model/Quote/Address/RateResult/AbstractResult.php
index 38a174d4ebedc..33e33b21925f7 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateResult/AbstractResult.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateResult/AbstractResult.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AbstractResult extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateResult/Error.php b/app/code/Magento/Quote/Model/Quote/Address/RateResult/Error.php
index a14dd9f43e234..468189f525be7 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateResult/Error.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateResult/Error.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\RateResult\Error
  *
- * @since 2.0.0
  */
 class Error extends AbstractResult
 {
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/RateResult/Method.php b/app/code/Magento/Quote/Model/Quote/Address/RateResult/Method.php
index d76ba374aaa0e..2854742317896 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/RateResult/Method.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/RateResult/Method.php
@@ -15,20 +15,17 @@
  * - cost: cost
  *
  * @api
- * @since 2.0.0
  */
 class Method extends AbstractResult
 {
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param string|float|int $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Relation.php b/app/code/Magento/Quote/Model/Quote/Address/Relation.php
index b144d03f95df8..0a7644f77a923 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Relation.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Relation.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\Relation
  *
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
@@ -19,7 +18,6 @@ class Relation implements RelationInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
index fd678ccda44e7..4e96486361310 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
@@ -14,31 +14,26 @@
 
 /**
  * Class ToOrder converter
- * @since 2.0.0
  */
 class ToOrder
 {
     /**
      * @var Copy
-     * @since 2.0.0
      */
     protected $objectCopyService;
 
     /**
      * @var OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -47,7 +42,6 @@ class ToOrder
      * @param Copy $objectCopyService
      * @param ManagerInterface $eventManager
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         OrderFactory $orderFactory,
@@ -65,7 +59,6 @@ public function __construct(
      * @param Address $object
      * @param array $data
      * @return OrderInterface
-     * @since 2.0.0
      */
     public function convert(Address $object, $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
index cec4a76e3dabd..f7f53a93cc5a4 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
@@ -13,25 +13,21 @@
 
 /**
  * Class ToOrderAddress
- * @since 2.0.0
  */
 class ToOrderAddress
 {
     /**
      * @var Copy
-     * @since 2.0.0
      */
     protected $objectCopyService;
 
     /**
      * @var OrderAddressRepository
-     * @since 2.0.0
      */
     protected $orderAddressRepository;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -39,7 +35,6 @@ class ToOrderAddress
      * @param OrderAddressRepository $orderAddressRepository
      * @param Copy $objectCopyService
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         OrderAddressRepository $orderAddressRepository,
@@ -55,7 +50,6 @@ public function __construct(
      * @param Address $object
      * @param array $data
      * @return OrderAddressInterface
-     * @since 2.0.0
      */
     public function convert(Address $object, $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 0610580668ca4..79f5514035a47 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -9,19 +9,16 @@
  * @method string getCode()
  *
  * @api
- * @since 2.0.0
  */
 class Total extends \Magento\Framework\DataObject
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $totalAmounts = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $baseTotalAmounts = [];
 
@@ -55,7 +52,6 @@ public function __construct(
      * @param string $code
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalAmount($code, $amount)
     {
@@ -74,7 +70,6 @@ public function setTotalAmount($code, $amount)
      * @param string $code
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalAmount($code, $amount)
     {
@@ -93,7 +88,6 @@ public function setBaseTotalAmount($code, $amount)
      * @param string $code
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function addTotalAmount($code, $amount)
     {
@@ -109,7 +103,6 @@ public function addTotalAmount($code, $amount)
      * @param string $code
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function addBaseTotalAmount($code, $amount)
     {
@@ -124,7 +117,6 @@ public function addBaseTotalAmount($code, $amount)
      *
      * @param   string $code
      * @return  float|int
-     * @since 2.0.0
      */
     public function getTotalAmount($code)
     {
@@ -140,7 +132,6 @@ public function getTotalAmount($code)
      *
      * @param   string $code
      * @return  float|int
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($code)
     {
@@ -157,7 +148,6 @@ public function getBaseTotalAmount($code)
      * Get all total amount values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTotalAmounts()
     {
@@ -168,7 +158,6 @@ public function getAllTotalAmounts()
      * Get all total amount values in base currency
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllBaseTotalAmounts()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/AbstractTotal.php b/app/code/Magento/Quote/Model/Quote/Address/Total/AbstractTotal.php
index 6617a7c64a656..150d9a44aafc5 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/AbstractTotal.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/AbstractTotal.php
@@ -11,7 +11,6 @@
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @since 2.0.0
  */
 abstract class AbstractTotal implements CollectorInterface, ReaderInterface
 {
@@ -19,13 +18,11 @@ abstract class AbstractTotal implements CollectorInterface, ReaderInterface
      * Total Code name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_address = null;
 
@@ -33,7 +30,6 @@ abstract class AbstractTotal implements CollectorInterface, ReaderInterface
      * Various abstract abilities
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canAddAmountToAddress = true;
 
@@ -41,7 +37,6 @@ abstract class AbstractTotal implements CollectorInterface, ReaderInterface
      * Various abstract abilities
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSetAddressAmount = true;
 
@@ -49,7 +44,6 @@ abstract class AbstractTotal implements CollectorInterface, ReaderInterface
      * Key for item row total getting
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_itemRowTotalKey = null;
 
@@ -58,7 +52,6 @@ abstract class AbstractTotal implements CollectorInterface, ReaderInterface
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -70,7 +63,6 @@ public function setCode($code)
      * Retrieve total code name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -81,7 +73,6 @@ public function getCode()
      * Label getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -95,7 +86,6 @@ public function getLabel()
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -119,7 +109,6 @@ public function collect(
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array
      * @internal param \Magento\Quote\Model\Quote\Address $address
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -131,7 +120,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
      *
      * @param   \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     protected function _setAddress(\Magento\Quote\Model\Quote\Address $address)
     {
@@ -144,7 +132,6 @@ protected function _setAddress(\Magento\Quote\Model\Quote\Address $address)
      *
      * @return  \Magento\Quote\Model\Quote\Address
      * @throws   \Magento\Framework\Exception\LocalizedException if address not declared
-     * @since 2.0.0
      */
     protected function _getAddress()
     {
@@ -156,14 +143,12 @@ protected function _getAddress()
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\Total
-     * @since 2.0.0
      */
     protected $total;
 
     /**
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function _setTotal(\Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -173,7 +158,6 @@ public function _setTotal(\Magento\Quote\Model\Quote\Address\Total $total)
 
     /**
      * @return \Magento\Quote\Model\Quote\Address\Total
-     * @since 2.0.0
      */
     protected function _getTotal()
     {
@@ -185,7 +169,6 @@ protected function _getTotal()
      *
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _setAmount($amount)
     {
@@ -201,7 +184,6 @@ protected function _setAmount($amount)
      * @param float $baseAmount
      * @internal param float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _setBaseAmount($baseAmount)
     {
@@ -216,7 +198,6 @@ protected function _setBaseAmount($baseAmount)
      *
      * @param   float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _addAmount($amount)
     {
@@ -231,7 +212,6 @@ protected function _addAmount($amount)
      *
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     protected function _addBaseAmount($baseAmount)
     {
@@ -246,7 +226,6 @@ protected function _addBaseAmount($baseAmount)
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return array
-     * @since 2.0.0
      */
     protected function _getAddressItems(\Magento\Quote\Model\Quote\Address $address)
     {
@@ -258,7 +237,6 @@ protected function _getAddressItems(\Magento\Quote\Model\Quote\Address $address)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float|int
-     * @since 2.0.0
      */
     public function getItemRowTotal(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -273,7 +251,6 @@ public function getItemRowTotal(\Magento\Quote\Model\Quote\Item\AbstractItem $it
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float|int
-     * @since 2.0.0
      */
     public function getItemBaseRowTotal(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -289,7 +266,6 @@ public function getItemBaseRowTotal(\Magento\Quote\Model\Quote\Item\AbstractItem
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsItemRowTotalCompoundable(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -307,7 +283,6 @@ public function getIsItemRowTotalCompoundable(\Magento\Quote\Model\Quote\Item\Ab
      * @param   store $store
      * @return  array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processConfigArray($config, $store)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
index 806938328d24a..7509022208598 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
@@ -9,7 +9,6 @@
 
 /**
  * Address Total Collector model
- * @since 2.0.0
  */
 class Collector extends \Magento\Sales\Model\Config\Ordered
 {
@@ -22,7 +21,6 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * Total models array ordered for right display sequence
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_retrievers = [];
 
@@ -30,7 +28,6 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * Corresponding store object
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -38,13 +35,11 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * Config group for totals declaration
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configGroup = 'totals';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configSection = 'quote';
 
@@ -52,7 +47,6 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * Cache key for collectors
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_collectorsCacheKey = 'sorted_quote_collectors';
 
@@ -60,13 +54,11 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\TotalFactory
-     * @since 2.0.0
      */
     protected $_totalFactory;
 
@@ -80,7 +72,6 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * @param \Magento\Framework\Simplexml\Element|mixed $sourceData
      * @param mixed $store
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
@@ -104,7 +95,6 @@ public function __construct(
      * Get total models array ordered for right calculation logic
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCollectors()
     {
@@ -115,7 +105,6 @@ public function getCollectors()
      * Get total models array ordered for right display sequence
      *
      * @return \Magento\Quote\Model\Quote\Address\Total\AbstractTotal[]
-     * @since 2.0.0
      */
     public function getRetrievers()
     {
@@ -130,7 +119,6 @@ public function getRetrievers()
      * @param array $totalConfig
      * @return \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initModelInstance($class, $totalCode, $totalConfig)
     {
@@ -156,7 +144,6 @@ protected function _initModelInstance($class, $totalCode, $totalConfig)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     * @since 2.0.0
      */
     private function _initRetrievers()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/CollectorInterface.php b/app/code/Magento/Quote/Model/Quote/Address/Total/CollectorInterface.php
index cc24e7b6361d6..152baa143e792 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/CollectorInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/CollectorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Quote\Model\Quote\Address\Total\CollectorInterface
  *
- * @since 2.0.0
  */
 interface CollectorInterface
 {
@@ -17,7 +16,6 @@ interface CollectorInterface
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return CollectorInterface
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
index 7c0166d7efdc1..7e7671f99f397 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\Total\Grand
  *
- * @since 2.0.0
  */
 class Grand extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
@@ -20,7 +19,6 @@ class Grand extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -44,7 +42,6 @@ public function collect(
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/ReaderInterface.php b/app/code/Magento/Quote/Model/Quote/Address/Total/ReaderInterface.php
index 225da0554b98e..0bb04a929898c 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/ReaderInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/ReaderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Quote\Model\Quote\Address\Total\ReaderInterface
  *
- * @since 2.0.0
  */
 interface ReaderInterface
 {
@@ -16,7 +15,6 @@ interface ReaderInterface
      * @param \Magento\Quote\Model\Quote $quote
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return  []
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total);
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index c84549a0b632d..2803a66dd7207 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\Total\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var FreeShippingInterface
-     * @since 2.0.0
      */
     protected $freeShipping;
 
     /**
      * @param PriceCurrencyInterface $priceCurrency
      * @param FreeShippingInterface $freeShipping
-     * @since 2.0.0
      */
     public function __construct(
         PriceCurrencyInterface $priceCurrency,
@@ -51,7 +47,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -199,7 +194,6 @@ public function collect(
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -220,7 +214,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
      * Get Shipping label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
index 221548ac8748f..57d8f2fb42f02 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\Total\Subtotal
  *
- * @since 2.0.0
  */
 class Subtotal extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
@@ -20,13 +19,11 @@ class Subtotal extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * Sales data
      *
      * @var \Magento\Quote\Model\QuoteValidator
-     * @since 2.0.0
      */
     protected $quoteValidator = null;
 
     /**
      * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
-     * @since 2.0.0
      */
     public function __construct(\Magento\Quote\Model\QuoteValidator $quoteValidator)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Quote\Model\QuoteValidator $quoteValidator)
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -89,7 +85,6 @@ public function collect(
      * @param Address $address
      * @param AddressItem|Item $item
      * @return bool
-     * @since 2.0.0
      */
     protected function _initItem($address, $item)
     {
@@ -141,7 +136,6 @@ protected function _initItem($address, $item)
      * @param int $finalPrice
      * @param int $originalPrice
      * @return $this
-     * @since 2.0.0
      */
     protected function _calculateRowTotal($item, $finalPrice, $originalPrice)
     {
@@ -159,7 +153,6 @@ protected function _calculateRowTotal($item, $finalPrice, $originalPrice)
      * @param Address $address
      * @param  AddressItem|Item $item
      * @return $this
-     * @since 2.0.0
      */
     protected function _removeItem($address, $item)
     {
@@ -184,7 +177,6 @@ protected function _removeItem($address, $item)
      * @param Address\Total $total
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -199,7 +191,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
      * Get Subtotal label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/TotalFactory.php b/app/code/Magento/Quote/Model/Quote/Address/TotalFactory.php
index 2096326cc286d..f217f835671b0 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/TotalFactory.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/TotalFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\TotalFactory
  *
- * @since 2.0.0
  */
 class TotalFactory
 {
@@ -20,7 +19,6 @@ class TotalFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -28,7 +26,6 @@ class TotalFactory
      * Quote address factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objManager)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objManage
      * @param string $instanceName
      * @param array $data
      * @return Total\AbstractTotal|Total
-     * @since 2.0.0
      */
     public function create($instanceName = Total::class, array $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Validator.php b/app/code/Magento/Quote/Model/Quote/Address/Validator.php
index 02b34cf29adfb..8b1607e021260 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Validator.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Validator.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Quote\Model\Quote\Address\Validator
  *
- * @since 2.0.0
  */
 class Validator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $countryFactory;
 
     /**
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CountryFactory $countryFactory
@@ -41,7 +38,6 @@ public function __construct(
      * @param  \Magento\Quote\Model\Quote\Address $value
      * @return boolean
      * @throws Zend_Validate_Exception If validation of $value is impossible
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Config.php b/app/code/Magento/Quote/Model/Quote/Config.php
index fe096e93e433b..05cb5efecfe9d 100644
--- a/app/code/Magento/Quote/Model/Quote/Config.php
+++ b/app/code/Magento/Quote/Model/Quote/Config.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Quote\Model\Quote\Config
  *
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
-     * @since 2.0.0
      */
     private $_attributeConfig;
 
     /**
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Catalog\Model\Attribute\Config $attributeConfig)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Catalog\Model\Attribute\Config $attributeCo
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getProductAttributes()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index 786c7c9ffd696..c11fb64de40a3 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -95,7 +95,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Magento\Quote\Api\Data\CartItemInterface
 {
@@ -103,7 +102,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote_item';
 
@@ -113,7 +111,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * In observe method you can use $observer->getEvent()->getObject() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'item';
 
@@ -121,7 +118,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Quote model object
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -129,7 +125,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Item options array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = [];
 
@@ -137,7 +132,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Item options by code cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByCode = [];
 
@@ -145,14 +139,12 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Not Represent options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_notRepresentOptions = ['info_buyRequest'];
 
     /**
      * Flag stating that options were successfully saved
      *
-     * @since 2.0.0
      */
     protected $_flagOptionsSaved;
 
@@ -160,32 +152,27 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      * Array of errors associated with this quote item
      *
      * @var \Magento\Sales\Model\Status\ListStatus
-     * @since 2.0.0
      */
     protected $_errorInfos;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\OptionFactory
-     * @since 2.0.0
      */
     protected $_itemOptionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\Compare
-     * @since 2.0.0
      */
     protected $quoteItemCompare;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -215,7 +202,6 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
      *
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -258,7 +244,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -269,7 +254,6 @@ protected function _construct()
      * Quote Item Before Save prepare data process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -285,7 +269,6 @@ public function beforeSave()
      * Retrieve address model
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -303,7 +286,6 @@ public function getAddress()
      *
      * @param   \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -319,7 +301,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * @codeCoverageIgnore
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -331,7 +312,6 @@ public function getQuote()
      *
      * @param float|int $qty
      * @return int|float
-     * @since 2.0.0
      */
     protected function _prepareQty($qty)
     {
@@ -345,7 +325,6 @@ protected function _prepareQty($qty)
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function addQty($qty)
     {
@@ -366,7 +345,6 @@ public function addQty($qty)
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -395,7 +373,6 @@ public function setQty($qty)
      * 'product'    => the product model
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQtyOptions()
     {
@@ -432,7 +409,6 @@ public function getQtyOptions()
      *
      * @param array $qtyOptions
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyOptions($qtyOptions)
     {
@@ -444,7 +420,6 @@ public function setQtyOptions($qtyOptions)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -477,7 +452,6 @@ public function setProduct($product)
      *
      * @param   \Magento\Catalog\Model\Product $product
      * @return  bool
-     * @since 2.0.0
      */
     public function representProduct($product)
     {
@@ -518,7 +492,6 @@ public function representProduct($product)
      * @param array $options1
      * @param array $options2
      * @return bool
-     * @since 2.0.0
      */
     public function compareOptions($options1, $options2)
     {
@@ -539,7 +512,6 @@ public function compareOptions($options1, $options2)
      *
      * @param   \Magento\Quote\Model\Quote\Item $item
      * @return  bool
-     * @since 2.0.0
      */
     public function compare($item)
     {
@@ -550,7 +522,6 @@ public function compare($item)
      * Get item product type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductType()
     {
@@ -572,7 +543,6 @@ public function getProductType()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRealProductType()
     {
@@ -584,7 +554,6 @@ public function getRealProductType()
      *
      * @param array $arrAttributes
      * @return array
-     * @since 2.0.0
      */
     public function toArray(array $arrAttributes = [])
     {
@@ -602,7 +571,6 @@ public function toArray(array $arrAttributes = [])
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options)
     {
@@ -620,7 +588,6 @@ public function setOptions($options)
      * @codeCoverageIgnore
      *
      * @return \Magento\Quote\Model\Quote\Item\Option[]
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -633,7 +600,6 @@ public function getOptions()
      * @codeCoverageIgnore
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByCode()
     {
@@ -646,7 +612,6 @@ public function getOptionsByCode()
      * @param \Magento\Quote\Model\Quote\Item\Option|\Magento\Framework\DataObject $option
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addOption($option)
     {
@@ -686,7 +651,6 @@ public function addOption($option)
      * @param \Magento\Framework\DataObject $option
      * @param int|float|null $value
      * @return $this
-     * @since 2.0.0
      */
     public function updateQtyOption(\Magento\Framework\DataObject $option, $value)
     {
@@ -712,7 +676,6 @@ public function updateQtyOption(\Magento\Framework\DataObject $option, $value)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function removeOption($code)
     {
@@ -729,7 +692,6 @@ public function removeOption($code)
      * @param \Magento\Quote\Model\Quote\Item\Option $option
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _addOptionCode($option)
     {
@@ -748,7 +710,6 @@ protected function _addOptionCode($option)
      *
      * @param   string $code
      * @return  \Magento\Quote\Model\Quote\Item\Option || null
-     * @since 2.0.0
      */
     public function getOptionByCode($code)
     {
@@ -763,7 +724,6 @@ public function getOptionByCode($code)
      * Call save item options if model isn't need to save in DB
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _hasModelChanged()
     {
@@ -778,7 +738,6 @@ protected function _hasModelChanged()
      * Save item options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveItemOptions()
     {
@@ -805,7 +764,6 @@ public function saveItemOptions()
      *
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     public function setIsOptionsSaved($flag)
     {
@@ -818,7 +776,6 @@ public function setIsOptionsSaved($flag)
      * @codeCoverageIgnore
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOptionsSaved()
     {
@@ -829,7 +786,6 @@ public function isOptionsSaved()
      * Save item options after item saved
      *
      * @return \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -841,7 +797,6 @@ public function afterSave()
      * Clone quote item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -861,7 +816,6 @@ public function __clone()
      * product view page with keys and options for configured product
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getBuyRequest()
     {
@@ -880,7 +834,6 @@ public function getBuyRequest()
      *
      * @param bool $flag
      * @return \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     protected function _setHasError($flag)
     {
@@ -896,7 +849,6 @@ protected function _setHasError($flag)
      * @param bool $flag
      * @return $this
      * @see addErrorInfo()
-     * @since 2.0.0
      */
     public function setHasError($flag)
     {
@@ -913,7 +865,6 @@ public function setHasError($flag)
      * Also automatically removes error-flag from oneself.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearErrorInfo()
     {
@@ -931,7 +882,6 @@ protected function _clearErrorInfo()
      * @param string|null $message Error message
      * @param \Magento\Framework\DataObject|null $additionalData Any additional data, that caller would like to store
      * @return $this
-     * @since 2.0.0
      */
     public function addErrorInfo($origin = null, $code = null, $message = null, $additionalData = null)
     {
@@ -948,7 +898,6 @@ public function addErrorInfo($origin = null, $code = null, $message = null, $add
      * Retrieves all error infos, associated with this item
      *
      * @return array
-     * @since 2.0.0
      */
     public function getErrorInfos()
     {
@@ -962,7 +911,6 @@ public function getErrorInfos()
      *
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function removeErrorInfosByParams($params)
     {
@@ -984,7 +932,6 @@ public function removeErrorInfosByParams($params)
      * @codeCoverageIgnoreStart
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemId()
     {
@@ -993,7 +940,6 @@ public function getItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItemId($itemID)
     {
@@ -1002,7 +948,6 @@ public function setItemId($itemID)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -1011,7 +956,6 @@ public function getSku()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -1020,7 +964,6 @@ public function setSku($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -1029,7 +972,6 @@ public function getQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -1038,7 +980,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -1047,7 +988,6 @@ public function setName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -1056,7 +996,6 @@ public function getPrice()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -1065,7 +1004,6 @@ public function setPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductType($productType)
     {
@@ -1074,7 +1012,6 @@ public function setProductType($productType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQuoteId()
     {
@@ -1083,7 +1020,6 @@ public function getQuoteId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuoteId($quoteId)
     {
@@ -1094,7 +1030,6 @@ public function setQuoteId($quoteId)
      * Returns product option
      *
      * @return \Magento\Quote\Api\Data\ProductOptionInterface|null
-     * @since 2.0.0
      */
     public function getProductOption()
     {
@@ -1106,7 +1041,6 @@ public function getProductOption()
      *
      * @param \Magento\Quote\Api\Data\ProductOptionInterface $productOption
      * @return $this
-     * @since 2.0.0
      */
     public function setProductOption(\Magento\Quote\Api\Data\ProductOptionInterface $productOption)
     {
@@ -1119,7 +1053,6 @@ public function setProductOption(\Magento\Quote\Api\Data\ProductOptionInterface
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\CartItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1131,7 +1064,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\CartItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\CartItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
index 42495e87c77dd..8bcffd884b46a 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
@@ -45,26 +45,22 @@
  * @method float getRowTotal()
  * @method float getPriceInclTax()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface
 {
     /**
      * @var Item|null
-     * @since 2.0.0
      */
     protected $_parentItem = null;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\AbstractItem[]
-     * @since 2.0.0
      */
     protected $_children = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = [];
 
@@ -72,19 +68,16 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
      * List of custom options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByCode;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -98,7 +91,6 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -128,7 +120,6 @@ public function __construct(
      * Retrieve Quote instance
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     abstract public function getQuote();
 
@@ -136,7 +127,6 @@ abstract public function getQuote();
      * Retrieve address model
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     abstract public function getAddress();
 
@@ -144,7 +134,6 @@ abstract public function getAddress();
      * Retrieve product model object associated with item
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -174,7 +163,6 @@ public function getProduct()
      * Return null, as quote item needs no additional configuration.
      *
      * @return null|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFileDownloadParams()
     {
@@ -185,7 +173,6 @@ public function getFileDownloadParams()
      * Specify parent item id before saving data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -201,7 +188,6 @@ public function beforeSave()
      *
      * @param  Item $parentItem
      * @return $this
-     * @since 2.0.0
      */
     public function setParentItem($parentItem)
     {
@@ -216,7 +202,6 @@ public function setParentItem($parentItem)
      * Get parent item
      *
      * @return Item
-     * @since 2.0.0
      */
     public function getParentItem()
     {
@@ -227,7 +212,6 @@ public function getParentItem()
      * Get child items
      *
      * @return \Magento\Quote\Model\Quote\Item\AbstractItem[]
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -239,7 +223,6 @@ public function getChildren()
      *
      * @param  \Magento\Quote\Model\Quote\Item\AbstractItem $child
      * @return $this
-     * @since 2.0.0
      */
     public function addChild($child)
     {
@@ -253,7 +236,6 @@ public function addChild($child)
      *
      * @param  mixed $messages
      * @return $this
-     * @since 2.0.0
      */
     public function setMessage($messages)
     {
@@ -274,7 +256,6 @@ public function setMessage($messages)
      *
      * @param   string $message
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage($message)
     {
@@ -287,7 +268,6 @@ public function addMessage($message)
      *
      * @param   bool $string flag for converting messages to string
      * @return  array|string
-     * @since 2.0.0
      */
     public function getMessage($string = true)
     {
@@ -302,7 +282,6 @@ public function getMessage($string = true)
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function removeMessageByText($text)
     {
@@ -318,7 +297,6 @@ public function removeMessageByText($text)
      * Clears all messages
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearMessage()
     {
@@ -332,7 +310,6 @@ public function clearMessage()
      * Retrieve store model object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -343,7 +320,6 @@ public function getStore()
      * Checking item data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function checkData()
     {
@@ -403,7 +379,6 @@ public function checkData()
      * Get original (not related with parent item) item quantity
      *
      * @return  int|float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -414,7 +389,6 @@ public function getQty()
      * Get total item quantity (include parent item relation)
      *
      * @return  int|float
-     * @since 2.0.0
      */
     public function getTotalQty()
     {
@@ -428,7 +402,6 @@ public function getTotalQty()
      * Calculate item row total price
      *
      * @return $this
-     * @since 2.0.0
      */
     public function calcRowTotal()
     {
@@ -447,7 +420,6 @@ public function calcRowTotal()
      * This method get custom price (if it is defined) or original product final price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCalculationPrice()
     {
@@ -468,7 +440,6 @@ public function getCalculationPrice()
      * This method get original custom price applied before tax calculation
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCalculationPriceOriginal()
     {
@@ -488,7 +459,6 @@ public function getCalculationPriceOriginal()
      * Get calculation price used for quote calculation in base currency.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseCalculationPrice()
     {
@@ -511,7 +481,6 @@ public function getBaseCalculationPrice()
      * Get original calculation price used for quote calculation in base currency.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseCalculationPriceOriginal()
     {
@@ -535,7 +504,6 @@ public function getBaseCalculationPriceOriginal()
      * Original price value is in quote selected currency
      *
      * @return float
-     * @since 2.0.0
      */
     public function getOriginalPrice()
     {
@@ -552,7 +520,6 @@ public function getOriginalPrice()
      *
      * @param   float $price
      * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
-     * @since 2.0.0
      */
     public function setOriginalPrice($price)
     {
@@ -563,7 +530,6 @@ public function setOriginalPrice($price)
      * Get Original item price (got from product) in base website currency
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseOriginalPrice()
     {
@@ -575,7 +541,6 @@ public function getBaseOriginalPrice()
      *
      * @param   float $value
      * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
-     * @since 2.0.0
      */
     public function setCustomPrice($value)
     {
@@ -588,7 +553,6 @@ public function setCustomPrice($value)
      * Get item price. Item price currency is website base currency.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -600,7 +564,6 @@ public function getPrice()
      *
      * @param   float $value
      * @return  $this
-     * @since 2.0.0
      */
     public function setPrice($value)
     {
@@ -612,7 +575,6 @@ public function setPrice($value)
     /**
      * Get item price converted to quote currency
      * @return float
-     * @since 2.0.0
      */
     public function getConvertedPrice()
     {
@@ -628,7 +590,6 @@ public function getConvertedPrice()
      * Set new value for converted price
      * @param float $value
      * @return $this
-     * @since 2.0.0
      */
     public function setConvertedPrice($value)
     {
@@ -641,7 +602,6 @@ public function setConvertedPrice($value)
      * Clone quote item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -657,7 +617,6 @@ public function __clone()
      * when we have parent quote item and its children
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isChildrenCalculated()
     {
@@ -680,7 +639,6 @@ public function isChildrenCalculated()
      * or each parent product item can be shipped only like one item
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShipSeparately()
     {
@@ -703,7 +661,6 @@ public function isShipSeparately()
      * amount of this item.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalDiscountAmount()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/CartItemProcessorInterface.php b/app/code/Magento/Quote/Model/Quote/Item/CartItemProcessorInterface.php
index c63fda5b22964..36865609a6f59 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/CartItemProcessorInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/CartItemProcessorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CartItemProcessorInterface
- * @since 2.0.0
  */
 interface CartItemProcessorInterface
 {
@@ -18,7 +17,6 @@ interface CartItemProcessorInterface
      *
      * @param CartItemInterface $cartItem
      * @return \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function convertToBuyRequest(CartItemInterface $cartItem);
 
@@ -27,7 +25,6 @@ public function convertToBuyRequest(CartItemInterface $cartItem);
      *
      * @param CartItemInterface $cartItem
      * @return CartItemInterface
-     * @since 2.0.0
      */
     public function processOptions(CartItemInterface $cartItem);
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
index 303c7a18d17fc..6d9028cfe8d1f 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
@@ -12,7 +12,6 @@
 
 /**
  * Compare quote items
- * @since 2.0.0
  */
 class Compare
 {
@@ -48,7 +47,6 @@ public function __construct(
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function getOptionValues($value)
     {
@@ -70,7 +68,6 @@ protected function getOptionValues($value)
      * @param Item $target
      * @param Item $compared
      * @return bool
-     * @since 2.0.0
      */
     public function compare(Item $target, Item $compared)
     {
@@ -97,7 +94,6 @@ public function compare(Item $target, Item $compared)
      *
      * @param Item $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptions(Item $item)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Option.php b/app/code/Magento/Quote/Model/Quote/Item/Option.php
index ab00d24ccedbb..71d7acb740ea7 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Option.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Option.php
@@ -17,20 +17,17 @@
  * @method string getCode()
  * @method \Magento\Quote\Model\Quote\Item\Option setCode(string $value)
  * @method \Magento\Quote\Model\Quote\Item\Option setValue(string $value)
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\AbstractModel implements
     \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
 {
     /**
      * @var \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     protected $_item;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -38,7 +35,6 @@ class Option extends \Magento\Framework\Model\AbstractModel implements
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      * Checks that item option model has data changes
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _hasModelChanged()
     {
@@ -65,7 +60,6 @@ protected function _hasModelChanged()
      *
      * @param   \Magento\Quote\Model\Quote\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem($item)
     {
@@ -78,7 +72,6 @@ public function setItem($item)
      * Get option item
      *
      * @return \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -90,7 +83,6 @@ public function getItem()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -103,7 +95,6 @@ public function setProduct($product)
      * Get option product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -114,7 +105,6 @@ public function getProduct()
      * Get option value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -125,7 +115,6 @@ public function getValue()
      * Initialize item identifier before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -139,7 +128,6 @@ public function beforeSave()
      * Clone option object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function __clone()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index 5191f7b6fa28a..74b25ea7f4976 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -17,25 +17,21 @@
  * Class Processor
  *  - initializes quote item with store_id and qty data
  *  - updates quote item qty and custom price data
- * @since 2.0.0
  */
 class Processor
 {
     /**
      * @var \Magento\Quote\Model\Quote\ItemFactory
-     * @since 2.0.0
      */
     protected $quoteItemFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -43,7 +39,6 @@ class Processor
      * @param ItemFactory $quoteItemFactory
      * @param StoreManagerInterface $storeManager
      * @param State $appState
-     * @since 2.0.0
      */
     public function __construct(
         ItemFactory $quoteItemFactory,
@@ -62,7 +57,6 @@ public function __construct(
      * @param Product $product
      *
      * @return \Magento\Quote\Model\Quote\Item
-     * @since 2.0.0
      */
     public function init(Product $product, $request)
     {
@@ -94,7 +88,6 @@ public function init(Product $product, $request)
      * @param \Magento\Framework\DataObject $request
      * @param Product $candidate
      * @return void
-     * @since 2.0.0
      */
     public function prepare(Item $item, DataObject $request, Product $candidate)
     {
@@ -118,7 +111,6 @@ public function prepare(Item $item, DataObject $request, Product $candidate)
      *
      * @param Item $item
      * @return void
-     * @since 2.0.0
      */
     protected function setItemStoreId(Item $item)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php b/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
index e371515466e5c..db5dd081ff507 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Item\RelatedProducts
  *
- * @since 2.0.0
  */
 class RelatedProducts
 {
@@ -17,13 +16,11 @@ class RelatedProducts
      * List of related product types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_relatedProductTypes;
 
     /**
      * @param array $relatedProductTypes
-     * @since 2.0.0
      */
     public function __construct($relatedProductTypes = [])
     {
@@ -35,7 +32,6 @@ public function __construct($relatedProductTypes = [])
      *
      * @param \Magento\Quote\Model\Quote\Item[] $quoteItems
      * @return int[]
-     * @since 2.0.0
      */
     public function getRelatedProductIds(array $quoteItems)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Repository.php b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
index d8261b4a64d7f..1d58926345f05 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Repository.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Item\Repository
  *
- * @since 2.0.0
  */
 class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
 {
@@ -21,7 +20,6 @@ class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -29,19 +27,16 @@ class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
      * Product repository.
      *
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Quote\Api\Data\CartItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $itemDataFactory;
 
     /**
      * @var CartItemProcessorInterface[]
-     * @since 2.0.0
      */
     protected $cartItemProcessors;
 
@@ -56,7 +51,6 @@ class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Quote\Api\Data\CartItemInterfaceFactory $itemDataFactory
      * @param CartItemProcessorInterface[] $cartItemProcessors
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -72,7 +66,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
@@ -90,7 +83,6 @@ public function getList($cartId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
     {
@@ -108,7 +100,6 @@ public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($cartId, $itemId)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index df4df550ac1f8..32687499274f8 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -14,25 +14,21 @@
 
 /**
  * Class ToOrderItem
- * @since 2.0.0
  */
 class ToOrderItem
 {
     /**
      * @var Copy
-     * @since 2.0.0
      */
     protected $objectCopyService;
 
     /**
      * @var OrderItemFactory
-     * @since 2.0.0
      */
     protected $orderItemFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -40,7 +36,6 @@ class ToOrderItem
      * @param OrderItemFactory $orderItemFactory
      * @param Copy $objectCopyService
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         OrderItemFactory $orderItemFactory,
@@ -56,7 +51,6 @@ public function __construct(
      * @param Item|AddressItem $item
      * @param array $data
      * @return OrderItemInterface
-     * @since 2.0.0
      */
     public function convert($item, $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Updater.php b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
index 6ce67809527a2..8ff0adff69156 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Updater.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
@@ -14,25 +14,21 @@
 
 /**
  * Class Updater
- * @since 2.0.0
  */
 class Updater
 {
     /**
      * @var ProductFactory
-     * @since 2.0.0
      */
     protected $productFactory;
 
     /**
      * @var FormatInterface
-     * @since 2.0.0
      */
     protected $localeFormat;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
@@ -49,7 +45,6 @@ class Updater
      * @param FormatInterface $localeFormat
      * @param ObjectFactory $objectFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         ProductFactory $productFactory,
@@ -73,7 +68,6 @@ public function __construct(
      * @throws InvalidArgumentException
      * @return Updater
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function update(Item $item, array $info)
     {
@@ -113,7 +107,6 @@ public function update(Item $item, array $info)
      * @param array $info
      * @param Item $item
      * @return void
-     * @since 2.0.0
      */
     protected function setCustomPrice(array $info, Item $item)
     {
@@ -139,7 +132,6 @@ protected function setCustomPrice(array $info, Item $item)
      *
      * @param Item $item
      * @return void
-     * @since 2.0.0
      */
     protected function unsetCustomPrice(Item $item)
     {
@@ -163,7 +155,6 @@ protected function unsetCustomPrice(Item $item)
      *
      * @param float|int $price
      * @return float|int
-     * @since 2.0.0
      */
     protected function parseCustomPrice($price)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Payment.php b/app/code/Magento/Quote/Model/Quote/Payment.php
index 0ebc5a53a7a2b..7cb8645089d1e 100644
--- a/app/code/Magento/Quote/Model/Quote/Payment.php
+++ b/app/code/Magento/Quote/Model/Quote/Payment.php
@@ -34,19 +34,16 @@
  * @method string getCcSsIssue()
  * @method \Magento\Quote\Model\Quote\Payment setCcSsIssue(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Payment extends \Magento\Payment\Model\Info implements PaymentInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote_payment';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'payment';
 
@@ -54,13 +51,11 @@ class Payment extends \Magento\Payment\Model\Info implements PaymentInterface
      * Quote model object
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @var \Magento\Payment\Model\Checks\SpecificationFactory
-     * @since 2.0.0
      */
     protected $methodSpecificationFactory;
 
@@ -97,7 +92,6 @@ class Payment extends \Magento\Payment\Model\Info implements PaymentInterface
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param \Magento\Framework\Serialize\JsonValidator|null $jsonValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -137,7 +131,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -149,7 +142,6 @@ protected function _construct()
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -164,7 +156,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * @codeCoverageIgnore
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -179,7 +170,6 @@ public function getQuote()
      * @param array $data
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function importData(array $data)
     {
@@ -222,7 +212,7 @@ public function importData(array $data)
      *
      * @param array $rawData
      * @return array
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function convertPaymentData(array $rawData)
     {
@@ -253,7 +243,6 @@ private function convertPaymentData(array $rawData)
      * Prepare object for save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -267,7 +256,6 @@ public function beforeSave()
      * Checkout redirect URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCheckoutRedirectUrl()
     {
@@ -282,7 +270,6 @@ public function getCheckoutRedirectUrl()
      * Checkout order place redirect URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderPlaceRedirectUrl()
     {
@@ -297,7 +284,6 @@ public function getOrderPlaceRedirectUrl()
      * Retrieve payment method model object
      *
      * @return \Magento\Payment\Model\MethodInterface
-     * @since 2.0.0
      */
     public function getMethodInstance()
     {
@@ -314,7 +300,6 @@ public function getMethodInstance()
      * Get purchase order number
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPoNumber()
     {
@@ -326,7 +311,6 @@ public function getPoNumber()
      *
      * @param string $poNumber
      * @return $this
-     * @since 2.0.0
      */
     public function setPoNumber($poNumber)
     {
@@ -337,7 +321,6 @@ public function setPoNumber($poNumber)
      * Get payment method code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -349,7 +332,6 @@ public function getMethod()
      *
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($method)
     {
@@ -360,7 +342,6 @@ public function setMethod($method)
      * Get payment additional details
      *
      * @return string[]|null
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -382,7 +363,6 @@ public function getAdditionalData()
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -395,7 +375,6 @@ public function setAdditionalData($additionalData)
      * {@inheritdoc}
      *
      * @return \Magento\Quote\Api\Data\PaymentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -407,7 +386,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\PaymentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\PaymentExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php b/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
index 9c62f1b2aa572..3e7974bb433af 100644
--- a/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
+++ b/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
@@ -14,25 +14,21 @@
 
 /**
  * Class ToOrderPayment
- * @since 2.0.0
  */
 class ToOrderPayment
 {
     /**
      * @var Copy
-     * @since 2.0.0
      */
     protected $objectCopyService;
 
     /**
      * @var OrderPaymentRepository
-     * @since 2.0.0
      */
     protected $orderPaymentRepository;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -40,7 +36,6 @@ class ToOrderPayment
      * @param OrderPaymentRepository $orderPaymentRepository
      * @param Copy $objectCopyService
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         OrderPaymentRepository $orderPaymentRepository,
@@ -56,7 +51,6 @@ public function __construct(
      * @param Payment $object
      * @param array $data
      * @return OrderPaymentInterface
-     * @since 2.0.0
      */
     public function convert(Payment $object, $data = [])
     {
diff --git a/app/code/Magento/Quote/Model/Quote/ProductOption.php b/app/code/Magento/Quote/Model/Quote/ProductOption.php
index 56b560c015d98..e39822260f517 100644
--- a/app/code/Magento/Quote/Model/Quote/ProductOption.php
+++ b/app/code/Magento/Quote/Model/Quote/ProductOption.php
@@ -10,7 +10,6 @@
 
 /**
  * Product option entity
- * @since 2.0.0
  */
 class ProductOption extends AbstractExtensibleModel implements ProductOptionInterface
 {
@@ -18,7 +17,6 @@ class ProductOption extends AbstractExtensibleModel implements ProductOptionInte
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\ProductOptionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -30,7 +28,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/Quote/Relation.php b/app/code/Magento/Quote/Model/Quote/Relation.php
index dc999c86645f4..8e4f555efe60c 100644
--- a/app/code/Magento/Quote/Model/Quote/Relation.php
+++ b/app/code/Magento/Quote/Model/Quote/Relation.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\Relation
  *
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
@@ -19,7 +18,6 @@ class Relation implements RelationInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
index ce002c14ef415..8fa03232a0e8d 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
@@ -14,7 +14,6 @@
 /**
  * Class TotalsCollector
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class TotalsCollector
 {
@@ -22,13 +21,11 @@ class TotalsCollector
      * Total models collector
      *
      * @var \Magento\Quote\Model\Quote\Address\Total\Collector
-     * @since 2.0.0
      */
     protected $totalCollector;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\Total\CollectorFactory
-     * @since 2.0.0
      */
     protected $totalCollectorFactory;
 
@@ -36,25 +33,21 @@ class TotalsCollector
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\TotalFactory
-     * @since 2.0.0
      */
     protected $totalFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollectorList
-     * @since 2.0.0
      */
     protected $collectorList;
 
@@ -62,19 +55,16 @@ class TotalsCollector
      * Quote validator
      *
      * @var \Magento\Quote\Model\QuoteValidator
-     * @since 2.0.0
      */
     protected $quoteValidator;
 
     /**
      * @var \Magento\Quote\Model\ShippingFactory
-     * @since 2.0.0
      */
     protected $shippingFactory;
 
     /**
      * @var \Magento\Quote\Model\ShippingAssignmentFactory
-     * @since 2.0.0
      */
     protected $shippingAssignmentFactory;
 
@@ -89,7 +79,6 @@ class TotalsCollector
      * @param \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory
      * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Collector $totalCollector,
@@ -116,7 +105,6 @@ public function __construct(
     /**
      * @param \Magento\Quote\Model\Quote $quote
      * @return Address\Total
-     * @since 2.0.0
      */
     public function collectQuoteTotals(\Magento\Quote\Model\Quote $quote)
     {
@@ -129,7 +117,6 @@ public function collectQuoteTotals(\Magento\Quote\Model\Quote $quote)
     /**
      * @param \Magento\Quote\Model\Quote $quote
      * @return \Magento\Quote\Model\Quote\Address\Total
-     * @since 2.0.0
      */
     public function collect(\Magento\Quote\Model\Quote $quote)
     {
@@ -187,7 +174,6 @@ public function collect(\Magento\Quote\Model\Quote $quote)
     /**
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
     {
@@ -214,7 +200,6 @@ protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     {
@@ -249,7 +234,6 @@ protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address $address
      * @return Address\Total
-     * @since 2.0.0
      */
     public function collectAddressTotals(
         \Magento\Quote\Model\Quote $quote,
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php b/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
index 9e9d54b0fe372..644ce46305428 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Quote\Model\Quote\TotalsCollectorList
  *
- * @since 2.0.0
  */
 class TotalsCollectorList
 {
@@ -23,13 +22,11 @@ class TotalsCollectorList
      * Total models collector
      *
      * @var \Magento\Quote\Model\Quote\Address\Total\Collector
-     * @since 2.0.0
      */
     protected $totalCollector;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\Total\CollectorFactory
-     * @since 2.0.0
      */
     protected $totalCollectorFactory;
 
@@ -37,7 +34,6 @@ class TotalsCollectorList
      * Prefix of model events
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote_address';
 
@@ -45,7 +41,6 @@ class TotalsCollectorList
      * Name of event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'quote_address';
 
@@ -53,19 +48,16 @@ class TotalsCollectorList
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\TotalFactory
-     * @since 2.0.0
      */
     protected $totalFactory;
 
@@ -75,7 +67,6 @@ class TotalsCollectorList
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Address\TotalFactory $totalFactory
-     * @since 2.0.0
      */
     public function __construct(
         Collector $totalCollector,
@@ -94,7 +85,6 @@ public function __construct(
     /**
      * @param int $storeId
      * @return Collector
-     * @since 2.0.0
      */
     private function getTotalCollector($storeId)
     {
@@ -111,7 +101,6 @@ private function getTotalCollector($storeId)
     /**
      * @param int $storeId
      * @return \Magento\Quote\Model\Quote\Address\Total\AbstractTotal[]
-     * @since 2.0.0
      */
     public function getCollectors($storeId)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsReader.php b/app/code/Magento/Quote/Model/Quote/TotalsReader.php
index 26e1077cbe7bc..696774c3646e7 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsReader.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsReader.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Quote\Model\Quote\TotalsReader
  *
- * @since 2.0.0
  */
 class TotalsReader
 {
     /**
      * @var \Magento\Quote\Model\Quote\Address\TotalFactory
-     * @since 2.0.0
      */
     protected $totalFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\TotalsCollectorList
-     * @since 2.0.0
      */
     protected $collectorList;
 
     /**
      * @param Address\TotalFactory $totalFactory
      * @param TotalsCollectorList $collectorList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory,
@@ -44,7 +40,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote $quote
      * @param array $total
      * @return Total[]
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, array $total)
     {
@@ -72,7 +67,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, array $total)
     /**
      * @param array $total
      * @return Total|Total[]
-     * @since 2.0.0
      */
     protected function convert($total)
     {
@@ -95,7 +89,6 @@ protected function convert($total)
      * @param Total $totalInstance
      * @param Total[] $output
      * @return Total[]
-     * @since 2.0.0
      */
     protected function merge(Total $totalInstance, $output)
     {
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 70aec14af1387..9a86829bfc4ce 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -10,7 +10,6 @@
 /**
  * Quote shipping/billing address validator service.
  *
- * @since 2.0.0
  */
 class QuoteAddressValidator
 {
@@ -18,7 +17,6 @@ class QuoteAddressValidator
      * Address factory.
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
@@ -26,13 +24,11 @@ class QuoteAddressValidator
      * Customer repository.
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
@@ -42,7 +38,6 @@ class QuoteAddressValidator
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository Customer repository.
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
@@ -61,7 +56,6 @@ public function __construct(
      * @return bool
      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
-     * @since 2.0.0
      */
     public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
     {
diff --git a/app/code/Magento/Quote/Model/QuoteIdMask.php b/app/code/Magento/Quote/Model/QuoteIdMask.php
index 4e606dbe7b32f..7950ab47c3665 100644
--- a/app/code/Magento/Quote/Model/QuoteIdMask.php
+++ b/app/code/Magento/Quote/Model/QuoteIdMask.php
@@ -11,13 +11,11 @@
  *
  * @method string getMaskedId()
  * @method QuoteIdMask setMaskedId()
- * @since 2.0.0
  */
 class QuoteIdMask extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $randomDataGenerator;
 
@@ -28,7 +26,6 @@ class QuoteIdMask extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +53,6 @@ protected function _construct()
      * Initialize quote identifier before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 9a92773b2aa10..36b3a1c2049dc 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -27,133 +27,112 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
 {
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var QuoteValidator
-     * @since 2.0.0
      */
     protected $quoteValidator;
 
     /**
      * @var OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var OrderManagement
-     * @since 2.0.0
      */
     protected $orderManagement;
 
     /**
      * @var CustomerManagement
-     * @since 2.0.0
      */
     protected $customerManagement;
 
     /**
      * @var ToOrderConverter
-     * @since 2.0.0
      */
     protected $quoteAddressToOrder;
 
     /**
      * @var ToOrderAddressConverter
-     * @since 2.0.0
      */
     protected $quoteAddressToOrderAddress;
 
     /**
      * @var ToOrderItemConverter
-     * @since 2.0.0
      */
     protected $quoteItemToOrderItem;
 
     /**
      * @var ToOrderPaymentConverter
-     * @since 2.0.0
      */
     protected $quotePaymentToOrderPayment;
 
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerModelFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\AddressFactory
-     * @since 2.0.0
      */
     protected $quoteAddressFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
     /**
      * @var \Magento\Quote\Model\QuoteIdMaskFactory
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $quoteIdMaskFactory;
 
@@ -193,7 +172,6 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      * @param \Magento\Quote\Model\QuoteIdMaskFactory|null $quoteIdMaskFactory
      * @param \Magento\Customer\Api\AddressRepositoryInterface|null $addressRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         EventManager $eventManager,
@@ -247,7 +225,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createEmptyCart()
     {
@@ -267,7 +244,6 @@ public function createEmptyCart()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createEmptyCartForCustomer($customerId)
     {
@@ -284,7 +260,6 @@ public function createEmptyCartForCustomer($customerId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function assignCustomer($cartId, $customerId, $storeId)
     {
@@ -326,7 +301,6 @@ public function assignCustomer($cartId, $customerId, $storeId)
      *
      * @param int $storeId
      * @return \Magento\Quote\Model\Quote Cart object.
-     * @since 2.0.0
      */
     protected function createAnonymousCart($storeId)
     {
@@ -343,7 +317,6 @@ protected function createAnonymousCart($storeId)
      * @param int $storeId
      * @return \Magento\Quote\Model\Quote Cart object.
      * @throws CouldNotSaveException The cart could not be created.
-     * @since 2.0.0
      */
     protected function createCustomerCart($customerId, $storeId)
     {
@@ -362,7 +335,6 @@ protected function createCustomerCart($customerId, $storeId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
@@ -410,7 +382,6 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCartForCustomer($customerId)
     {
@@ -425,7 +396,6 @@ public function getCartForCustomer($customerId)
      * @return \Magento\Framework\Model\AbstractExtensibleModel|\Magento\Sales\Api\Data\OrderInterface|object|null
      * @throws \Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function submit(QuoteEntity $quote, $orderData = [])
     {
@@ -440,7 +410,6 @@ public function submit(QuoteEntity $quote, $orderData = [])
     /**
      * @param Quote $quote
      * @return array
-     * @since 2.0.0
      */
     protected function resolveItems(QuoteEntity $quote)
     {
@@ -467,7 +436,6 @@ protected function resolveItems(QuoteEntity $quote)
      * @return \Magento\Framework\Model\AbstractExtensibleModel|\Magento\Sales\Api\Data\OrderInterface|object
      * @throws \Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function submitQuote(QuoteEntity $quote, $orderData = [])
     {
@@ -570,7 +538,6 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCustomerQuote($quote)
     {
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index ef9839e8caa44..946ec699a344c 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -22,50 +22,42 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
 {
     /**
      * @var Quote[]
-     * @since 2.0.0
      */
     protected $quotesById = [];
 
     /**
      * @var Quote[]
-     * @since 2.0.0
      */
     protected $quotesByCustomerId = [];
 
     /**
      * @var QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Collection
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $quoteCollection;
 
     /**
      * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsDataFactory;
 
     /**
      * @var JoinProcessorInterface
-     * @since 2.0.0
      */
     private $extensionAttributesJoinProcessor;
 
@@ -104,7 +96,6 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @param \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory|null $quoteCollectionFactory
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         QuoteFactory $quoteFactory,
@@ -127,7 +118,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($cartId, array $sharedStoreIds = [])
     {
@@ -141,7 +131,6 @@ public function get($cartId, array $sharedStoreIds = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getForCustomer($customerId, array $sharedStoreIds = [])
     {
@@ -156,7 +145,6 @@ public function getForCustomer($customerId, array $sharedStoreIds = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActive($cartId, array $sharedStoreIds = [])
     {
@@ -169,7 +157,6 @@ public function getActive($cartId, array $sharedStoreIds = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
     {
@@ -182,7 +169,6 @@ public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Quote\Api\Data\CartInterface $quote)
     {
@@ -203,7 +189,6 @@ public function save(\Magento\Quote\Api\Data\CartInterface $quote)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
     {
@@ -223,7 +208,6 @@ public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
      * @param int[] $sharedStoreIds
      * @throws NoSuchEntityException
      * @return Quote
-     * @since 2.0.0
      */
     protected function loadQuote($loadMethod, $loadField, $identifier, array $sharedStoreIds = [])
     {
@@ -241,7 +225,6 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -269,7 +252,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return void
      * @deprecated 2.2.0
      * @throws InputException The specified filter group or quote collection does not exist.
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, QuoteCollection $collection)
     {
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
index e4fe81300b059..607363a6d4fac 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Quote\Model\QuoteRepository\Plugin\Authorization
  *
- * @since 2.0.0
  */
 class Authorization
 {
     /**
      * @var \Magento\Authorization\Model\UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
     /**
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Authorization\Model\UserContextInterface $userContext
@@ -40,7 +37,6 @@ public function __construct(
      * @return \Magento\Quote\Model\Quote
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetActive(
         \Magento\Quote\Api\CartRepositoryInterface $subject,
@@ -60,7 +56,6 @@ public function afterGetActive(
      * @return \Magento\Quote\Model\Quote
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetActiveForCustomer(
         \Magento\Quote\Api\CartRepositoryInterface $subject,
@@ -77,7 +72,6 @@ public function afterGetActiveForCustomer(
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return bool
-     * @since 2.0.0
      */
     protected function isAllowed(\Magento\Quote\Model\Quote $quote)
     {
diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
index 6b76d3fb67524..47074937d983d 100644
--- a/app/code/Magento/Quote/Model/QuoteValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class QuoteValidator
 {
@@ -58,7 +57,6 @@ public function __construct(
      * @param QuoteEntity $quote
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function validateQuoteAmount(QuoteEntity $quote, $amount)
     {
@@ -75,7 +73,6 @@ public function validateQuoteAmount(QuoteEntity $quote, $amount)
      * @param Quote $quote
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateBeforeSubmit(QuoteEntity $quote)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index a6b82ac2759f0..d23bf86a360f9 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -15,13 +15,11 @@
 
 /**
  * Quote resource model
- * @since 2.0.0
  */
 class Quote extends AbstractDb
 {
     /**
      * @var \Magento\SalesSequence\Model\Manager
-     * @since 2.0.0
      */
     protected $sequenceManager;
 
@@ -31,7 +29,6 @@ class Quote extends AbstractDb
      * @param RelationComposite $entityRelationComposite,
      * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      * Initialize table nad PK name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +58,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -88,7 +83,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param \Magento\Quote\Model\Quote $quote
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerId($quote, $customerId)
     {
@@ -123,7 +117,6 @@ public function loadByCustomerId($quote, $customerId)
      * @param \Magento\Quote\Model\Quote $quote
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function loadActive($quote, $quoteId)
     {
@@ -146,7 +139,6 @@ public function loadActive($quote, $quoteId)
      * @param \Magento\Quote\Model\Quote $quote
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIdWithoutStore($quote, $quoteId)
     {
@@ -170,7 +162,6 @@ public function loadByIdWithoutStore($quote, $quoteId)
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return string
-     * @since 2.0.0
      */
     public function getReservedOrderId($quote)
     {
@@ -209,7 +200,6 @@ public function isOrderIncrementIdUsed($orderIncrementId)
      * Mark quotes - that depend on catalog price rules - to be recollected on demand
      *
      * @return $this
-     * @since 2.0.0
      */
     public function markQuotesRecollectOnCatalogRules()
     {
@@ -244,7 +234,6 @@ public function markQuotesRecollectOnCatalogRules()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function substractProductFromQuotes($product)
     {
@@ -291,7 +280,6 @@ public function substractProductFromQuotes($product)
      *
      * @param array|int|\Zend_Db_Expr $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function markQuotesRecollect($productIds)
     {
@@ -320,7 +308,6 @@ public function markQuotesRecollect($productIds)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address.php
index 1c2444784ae56..7c7f6f5723f60 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address.php
@@ -11,7 +11,6 @@
  * Quote address resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Address extends AbstractDb
 {
@@ -19,7 +18,6 @@ class Address extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend.php
index c7870cb57134d..212844127e257 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend.php
@@ -9,7 +9,6 @@
  * Quote address attribute backend resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Backend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -19,7 +18,6 @@ class Backend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collectTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Child.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Child.php
index 31e942f63412c..e3529cc356343 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Child.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Child.php
@@ -9,7 +9,6 @@
  * Quote address attribute backend child resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Region.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Region.php
index 9212558884cc0..571c3e8653fd3 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Region.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Backend/Region.php
@@ -7,19 +7,16 @@
 
 /**
  * Quote address attribute backend region resource model
- * @since 2.0.0
  */
 class Region extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @param \Magento\Directory\Model\RegionFactory $regionFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\RegionFactory $regionFactory)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Directory\Model\RegionFactory $regionFactor
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend.php
index 7ef864b671f84..bf3238dab99d9 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Frontend extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
 {
@@ -19,7 +18,6 @@ class Frontend extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFron
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Custbalance.php
index 629c00360a05f..ed44d9744bdc2 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Custbalance.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Custbalance.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend custbalance resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Custbalance extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Custbalance extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attri
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Discount.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Discount.php
index 97ec646d131d4..d30812f0dcadc 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Discount.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Discount.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend discount resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Discount extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Discount extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribut
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Grand.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Grand.php
index f3a0c073d0918..0620c85e0d0c4 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Grand.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Grand.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend grand resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grand extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Grand extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\F
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Shipping.php
index 91e463b6d2a26..64b50240d7b0e 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Shipping.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Shipping.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend shipping resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Shipping extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribut
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Subtotal.php
index ed33d6c367dc3..e6005ddb0fef9 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Subtotal.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Subtotal.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend subtotal resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Subtotal extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Subtotal extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribut
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Tax.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Tax.php
index 4898c91bbd89c..ba922475629c6 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Tax.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Attribute/Frontend/Tax.php
@@ -9,7 +9,6 @@
  * Quote address attribute frontend tax resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Frontend
 {
@@ -18,7 +17,6 @@ class Tax extends \Magento\Quote\Model\ResourceModel\Quote\Address\Attribute\Fro
      *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function fetchTotals(\Magento\Quote\Model\Quote\Address $address)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Collection.php
index 28e4bbef02c8d..62d863334c465 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Collection.php
@@ -9,7 +9,6 @@
  * Quote addresses collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_quote_address_collection';
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Event object name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'quote_address_collection';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      *
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteFilter($quoteId)
     {
@@ -61,7 +56,6 @@ public function setQuoteFilter($quoteId)
      * Redeclare after load method for dispatch event
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item.php
index 1d9cbce5adc30..73837d739e49f 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item.php
@@ -11,7 +11,6 @@
  * Quote address item resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends AbstractDb
 {
@@ -19,7 +18,6 @@ class Item extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item/Collection.php
index 570570afaea69..3fcfeed9475c5 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Item/Collection.php
@@ -9,7 +9,6 @@
  * Quote addresses collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Set parent items
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -53,7 +50,6 @@ protected function _afterLoad()
      *
      * @param int $addressId
      * @return $this
-     * @since 2.0.0
      */
     public function setAddressFilter($addressId)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate.php
index 17748e8b548bc..d0bca757830d8 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate.php
@@ -11,7 +11,6 @@
  * Quote address shipping rate resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rate extends AbstractDb
 {
@@ -19,7 +18,6 @@ class Rate extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate/Collection.php
index 93ded0e330398..02839648f7061 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Address/Rate/Collection.php
@@ -9,7 +9,6 @@
  * Quote addresses shipping rates collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Whether to load fixed items only
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_allowFixedOnly = false;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -58,7 +55,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +69,6 @@ protected function _construct()
      *
      * @param int $addressId
      * @return $this
-     * @since 2.0.0
      */
     public function setAddressFilter($addressId)
     {
@@ -91,7 +86,6 @@ public function setAddressFilter($addressId)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setFixedOnlyFilter($value)
     {
@@ -104,7 +98,6 @@ public function setFixedOnlyFilter($value)
      *
      * @param \Magento\Quote\Model\Quote\Address\Rate $rate
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Framework\DataObject $rate)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Collection.php
index 9f47e87490856..0385f43a2bf7f 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Collection.php
@@ -9,7 +9,6 @@
  * Quotes collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item.php
index 02d0ddbce19d1..59cda0442af82 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item.php
@@ -11,7 +11,6 @@
  * Quote resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends AbstractDb
 {
@@ -19,7 +18,6 @@ class Item extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -45,7 +42,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function prepareDataForUpdate($object)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 2d6cd45ce5743..d06656c5fdc51 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -20,7 +19,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Collection quote instance
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -28,25 +26,21 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * Product Ids array
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $_productIds = [];
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_itemOptionCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Config
-     * @since 2.0.0
      */
     protected $_quoteConfig;
 
@@ -62,7 +56,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -94,7 +87,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -105,7 +97,6 @@ protected function _construct()
      * Retrieve store Id (From Quote)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -117,7 +108,6 @@ public function getStoreId()
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote($quote)
     {
@@ -139,7 +129,6 @@ public function setQuote($quote)
      * @param string $quotesTableName
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function resetJoinQuotes($quotesTableName, $productId = null)
     {
@@ -161,7 +150,6 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
      * After load processing
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -193,7 +181,6 @@ protected function _afterLoad()
      * Add options to items
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignOptions()
     {
@@ -213,7 +200,6 @@ protected function _assignOptions()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _assignProducts()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option.php
index 2d50ddb1c0908..36845f5f53941 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option.php
@@ -9,7 +9,6 @@
  * Item option resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option/Collection.php
index 13f8d162573db..c4d684b5f01d9 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Option/Collection.php
@@ -11,7 +11,6 @@
  * Item option collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Array of option ids grouped by item id
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByItem = [];
 
@@ -27,7 +25,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Array of option ids grouped by product id
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByProduct = [];
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model for collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      * Fill array of options by item and product
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -79,7 +74,6 @@ protected function _afterLoad()
      *
      * @param int|array|Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItemFilter($item)
     {
@@ -102,7 +96,6 @@ public function addItemFilter($item)
      * Get array of all product ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -116,7 +109,6 @@ public function getProductIds()
      *
      * @param mixed $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByItem($item)
     {
@@ -143,7 +135,6 @@ public function getOptionsByItem($item)
      *
      * @param int | \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByProduct($product)
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
index 89d72d238915c..9b097f5e7bce8 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
@@ -9,7 +9,6 @@
 
 /**
  * Quote payment resource model
- * @since 2.0.0
  */
 class Payment extends AbstractDb
 {
@@ -17,7 +16,6 @@ class Payment extends AbstractDb
      * Serializeable field: additional_information
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = ['additional_information' => [null, []]];
 
@@ -25,7 +23,6 @@ class Payment extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment/Collection.php
index 79f1c698b58bc..09f1e4758c49f 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Quote payments collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -45,7 +43,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -60,7 +57,6 @@ protected function _construct()
      *
      * @param int $quoteId
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteFilter($quoteId)
     {
@@ -71,7 +67,6 @@ public function setQuoteFilter($quoteId)
      * Unserialize additional_information in each item
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
index 3f366beb7fea5..d40cf525e8659 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
@@ -10,7 +10,6 @@
 /**
  * QuoteIdMask Resource model
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class QuoteIdMask extends AbstractDb
 {
@@ -18,7 +17,6 @@ class QuoteIdMask extends AbstractDb
      * Main table and field initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Quote/Model/Shipping.php b/app/code/Magento/Quote/Model/Shipping.php
index 918c7c235032f..c9647298047e2 100644
--- a/app/code/Magento/Quote/Model/Shipping.php
+++ b/app/code/Magento/Quote/Model/Shipping.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Shipping
- * @since 2.0.0
  */
 class Shipping extends \Magento\Framework\Model\AbstractExtensibleModel implements ShippingInterface
 {
@@ -19,7 +18,6 @@ class Shipping extends \Magento\Framework\Model\AbstractExtensibleModel implemen
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -28,7 +26,6 @@ public function getAddress()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setAddress(\Magento\Quote\Api\Data\AddressInterface $value)
     {
@@ -38,7 +35,6 @@ public function setAddress(\Magento\Quote\Api\Data\AddressInterface $value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -47,7 +43,6 @@ public function getMethod()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setMethod($value)
     {
@@ -57,7 +52,6 @@ public function setMethod($value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -66,7 +60,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\ShippingExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index 5106edc137a39..0e2be5c9e3692 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -13,7 +13,6 @@
 /**
  * Quote shipping address write service object.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressManagementInterface
 {
@@ -21,7 +20,6 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -29,7 +27,6 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
      * Logger.
      *
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -37,25 +34,21 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
      * Validator.
      *
      * @var QuoteAddressValidator
-     * @since 2.0.0
      */
     protected $addressValidator;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -67,7 +60,6 @@ class ShippingAddressManagement implements \Magento\Quote\Model\ShippingAddressM
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Quote\TotalsCollector $totalsCollector
      *
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -88,7 +80,6 @@ public function __construct(
     /**
      * {@inheritDoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
     {
@@ -132,7 +123,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagementInterface.php b/app/code/Magento/Quote/Model/ShippingAddressManagementInterface.php
index 7d907df73388e..f1baf3fd2fd21 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagementInterface.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ShippingAddressManagementInterface
  * @api
- * @since 2.0.0
  */
 interface ShippingAddressManagementInterface
 {
@@ -20,7 +19,6 @@ interface ShippingAddressManagementInterface
      * @return int Address ID.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
      * @throws \Magento\Framework\Exception\InputException The specified cart ID or address data is not valid.
-     * @since 2.0.0
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address);
 
@@ -30,7 +28,6 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      * @param int $cartId The cart ID.
      * @return \Magento\Quote\Api\Data\AddressInterface Shipping address object.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart does not exist.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/ShippingAssignment.php b/app/code/Magento/Quote/Model/ShippingAssignment.php
index b430492632afc..8d0cc1d15e87a 100644
--- a/app/code/Magento/Quote/Model/ShippingAssignment.php
+++ b/app/code/Magento/Quote/Model/ShippingAssignment.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Quote\Model\ShippingAssignment
  *
- * @since 2.0.0
  */
 class ShippingAssignment extends \Magento\Framework\Model\AbstractExtensibleModel implements ShippingAssignmentInterface
 {
@@ -20,7 +19,6 @@ class ShippingAssignment extends \Magento\Framework\Model\AbstractExtensibleMode
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getShipping()
     {
@@ -29,7 +27,6 @@ public function getShipping()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -38,7 +35,6 @@ public function getItems()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setShipping(\Magento\Quote\Api\Data\ShippingInterface $value)
     {
@@ -48,7 +44,6 @@ public function setShipping(\Magento\Quote\Api\Data\ShippingInterface $value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setItems($value)
     {
@@ -58,7 +53,6 @@ public function setItems($value)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -67,7 +61,6 @@ public function getExtensionAttributes()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Quote\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
index 7568bf4e4bb97..a641c858092a8 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -20,7 +20,6 @@
  * Shipping method read service
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ShippingMethodManagement implements
     \Magento\Quote\Api\ShippingMethodManagementInterface,
@@ -31,7 +30,6 @@ class ShippingMethodManagement implements
      * Quote repository.
      *
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -39,7 +37,6 @@ class ShippingMethodManagement implements
      * Shipping method converter
      *
      * @var \Magento\Quote\Model\Cart\ShippingMethodConverter
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -47,13 +44,11 @@ class ShippingMethodManagement implements
      * Customer Address repository
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var Quote\TotalsCollector
-     * @since 2.0.0
      */
     protected $totalsCollector;
 
@@ -77,7 +72,6 @@ class ShippingMethodManagement implements
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param Quote\TotalsCollector $totalsCollector
      * @param AddressInterfaceFactory|null $addressFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -96,7 +90,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function get($cartId)
     {
@@ -125,7 +118,6 @@ public function get($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getList($cartId)
     {
@@ -155,7 +147,6 @@ public function getList($cartId)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function set($cartId, $carrierCode, $methodCode)
     {
@@ -207,7 +198,6 @@ public function apply($cartId, $carrierCode, $methodCode)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address)
     {
@@ -224,7 +214,7 @@ public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddre
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.10
      */
     public function estimateByExtendedAddress($cartId, AddressInterface $address)
     {
@@ -240,7 +230,6 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function estimateByAddressId($cartId, $addressId)
     {
@@ -267,7 +256,6 @@ public function estimateByAddressId($cartId, $addressId)
      * @param \Magento\Framework\Api\ExtensibleDataInterface|null $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function getEstimatedRates(
         \Magento\Quote\Model\Quote $quote,
@@ -293,7 +281,7 @@ protected function getEstimatedRates(
      * @param \Magento\Quote\Model\Quote $quote
      * @param \Magento\Framework\Api\ExtensibleDataInterface $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[]
-     * @since 2.1.0
+     * @since 2.0.10
      */
     private function getShippingMethods(Quote $quote, $address)
     {
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php b/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
index fe7516daa7eb8..eef2dc3abf09f 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Quote\Model\ShippingMethodManagementInterface
  *
- * @since 2.0.0
  */
 interface ShippingMethodManagementInterface
 {
@@ -24,7 +23,6 @@ interface ShippingMethodManagementInterface
      * @throws \Magento\Framework\Exception\StateException The billing or shipping address is not set.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart contains only virtual products
      * so the shipping method does not apply.
-     * @since 2.0.0
      */
     public function set($cartId, $carrierCode, $methodCode);
 
@@ -35,7 +33,6 @@ public function set($cartId, $carrierCode, $methodCode);
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified shopping cart does not exist.
      * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
-     * @since 2.0.0
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
index b9df210f040c1..a13a2dc590def 100644
--- a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
+++ b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
@@ -13,19 +13,16 @@
 
 /**
  * Replaces a "%cart_id%" value with the current authenticated customer's cart
- * @since 2.0.0
  */
 class ParamOverriderCartId implements ParamOverriderInterface
 {
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     private $userContext;
 
     /**
      * @var CartManagementInterface
-     * @since 2.0.0
      */
     private $cartManagement;
 
@@ -34,7 +31,6 @@ class ParamOverriderCartId implements ParamOverriderInterface
      *
      * @param UserContextInterface $userContext
      * @param CartManagementInterface $cartManagement
-     * @since 2.0.0
      */
     public function __construct(
         UserContextInterface $userContext,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getOverriddenValue()
     {
diff --git a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
index 42e2913cedcb3..3c03c4db2e59e 100644
--- a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
+++ b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
@@ -13,25 +13,21 @@
 
 /**
  * Class CustomerQuote
- * @since 2.0.0
  */
 class CustomerQuoteObserver implements ObserverInterface
 {
     /**
      * @var ShareConfig
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
@@ -39,7 +35,6 @@ class CustomerQuoteObserver implements ObserverInterface
      * @param StoreManagerInterface $storeManager
      * @param ShareConfig $config
      * @param CartRepositoryInterface $quoteRepository
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -56,7 +51,6 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 6bf945520145a..1743773ab678e 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Quote\Observer\Frontend\Quote\Address\CollectTotalsObserver
  *
- * @since 2.0.0
  */
 class CollectTotalsObserver implements ObserverInterface
 {
@@ -28,25 +27,21 @@ class CollectTotalsObserver implements ObserverInterface
 
     /**
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $customerAddressHelper;
 
     /**
      * @var \Magento\Customer\Model\Vat
-     * @since 2.0.0
      */
     protected $customerVat;
 
     /**
      * @var VatValidator
-     * @since 2.0.0
      */
     protected $vatValidator;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerDataFactory;
 
@@ -54,7 +49,6 @@ class CollectTotalsObserver implements ObserverInterface
      * Group Management
      *
      * @var \Magento\Customer\Api\GroupManagementInterface
-     * @since 2.0.0
      */
     protected $groupManagement;
 
@@ -68,7 +62,6 @@ class CollectTotalsObserver implements ObserverInterface
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddressHelper,
@@ -94,7 +87,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/VatValidator.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/VatValidator.php
index eb9e5dafe1d31..4195f65926b7d 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/VatValidator.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/VatValidator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Quote\Observer\Frontend\Quote\Address\VatValidator
  *
- * @since 2.0.0
  */
 class VatValidator
 {
@@ -16,7 +15,6 @@ class VatValidator
      * Customer address
      *
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $customerAddress;
 
@@ -24,14 +22,12 @@ class VatValidator
      * Customer VAT
      *
      * @var \Magento\Customer\Model\Vat
-     * @since 2.0.0
      */
     protected $customerVat;
 
     /**
      * @param \Magento\Customer\Helper\Address $customerAddress
      * @param \Magento\Customer\Model\Vat $customerVat
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddress,
@@ -47,7 +43,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote\Address $quoteAddress
      * @param \Magento\Store\Model\Store|int $store
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function validate(\Magento\Quote\Model\Quote\Address $quoteAddress, $store)
     {
@@ -101,7 +96,6 @@ public function validate(\Magento\Quote\Model\Quote\Address $quoteAddress, $stor
      * @param \Magento\Quote\Model\Quote\Address $quoteAddress
      * @param \Magento\Store\Model\Store|int $store
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled(\Magento\Quote\Model\Quote\Address $quoteAddress, $store)
     {
diff --git a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php b/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
index e975606cff270..fde24faff17df 100644
--- a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
+++ b/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Quote\Observer\Webapi\SubmitObserver
  *
- * @since 2.0.0
  */
 class SubmitObserver implements ObserverInterface
 {
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param OrderSender $orderSender
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -44,7 +40,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Quote/Setup/InstallData.php b/app/code/Magento/Quote/Setup/InstallData.php
index e17f33d400e33..f039c15797c27 100644
--- a/app/code/Magento/Quote/Setup/InstallData.php
+++ b/app/code/Magento/Quote/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * Quote setup factory
      *
      * @var QuoteSetupFactory
-     * @since 2.0.0
      */
     private $quoteSetupFactory;
 
@@ -29,7 +27,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param QuoteSetupFactory $setupFactory
-     * @since 2.0.0
      */
     public function __construct(QuoteSetupFactory $setupFactory)
     {
@@ -38,7 +35,6 @@ public function __construct(QuoteSetupFactory $setupFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php
index 25e49b5c00cb7..bbf7e670da0b4 100644
--- a/app/code/Magento/Quote/Setup/InstallSchema.php
+++ b/app/code/Magento/Quote/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Quote/Setup/QuoteSetup.php b/app/code/Magento/Quote/Setup/QuoteSetup.php
index 360c23f5aa742..800aa9dfe5808 100644
--- a/app/code/Magento/Quote/Setup/QuoteSetup.php
+++ b/app/code/Magento/Quote/Setup/QuoteSetup.php
@@ -17,25 +17,22 @@
  *
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class QuoteSetup extends EavSetup
 {
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'checkout';
 
@@ -45,7 +42,6 @@ class QuoteSetup extends EavSetup
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
      * @param ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -63,7 +59,6 @@ public function __construct(
      * List of entities converted from EAV to flat data structure
      *
      * @var $_flatEntityTables array
-     * @since 2.0.0
      */
     protected $_flatEntityTables = [
         'quote' => 'quote',
@@ -79,7 +74,6 @@ public function __construct(
      *
      * @param string $table
      * @return bool
-     * @since 2.0.0
      */
     protected function _flatTableExist($table)
     {
@@ -97,7 +91,6 @@ protected function _flatTableExist($table)
      * @param string $code
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -121,7 +114,6 @@ public function addAttribute($entityTypeId, $code, array $attr)
      * @param string $attribute
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     protected function _addFlatAttribute($table, $attribute, $attr)
     {
@@ -146,7 +138,6 @@ protected function _addFlatAttribute($table, $attribute, $attr)
      * @param array $data
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getAttributeColumnDefinition($code, $data)
     {
@@ -192,7 +183,6 @@ protected function _getAttributeColumnDefinition($code, $data)
      * Get config model
      *
      * @return ScopeConfigInterface
-     * @since 2.0.0
      */
     public function getConfigModel()
     {
@@ -201,7 +191,6 @@ public function getConfigModel()
 
     /**
      * @return \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     public function getEncryptor()
     {
diff --git a/app/code/Magento/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
index d7748ad360e94..7ea99ac6f49ec 100644
--- a/app/code/Magento/Quote/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Quote/Setup/UpgradeSchema.php
@@ -11,19 +11,17 @@
 
 /**
  * Upgrade the Catalog module DB scheme
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'checkout';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
index 63c5bd7c53114..fdc79440384d0 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
@@ -11,14 +11,12 @@
  * Dashboard Month-To-Date Day starts Field Renderer
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class MtdStart extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
index 8d9dc995199ec..5a27b4dc7666f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
@@ -11,7 +11,6 @@
  * Dashboard Year-To-Date Month and Day starts Field Renderer
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class YtdStart extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -19,7 +18,6 @@ class YtdStart extends \Magento\Config\Block\System\Config\Form\Field
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
index 84f5fba0eee76..d743ab0e46828 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Accounts extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Reports';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
index d6920edca5921..719a59a6fc01f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Orders extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Container
      * Define children block group
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Reports';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
index 151170661d9c0..2476794fdd253 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totals extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Reports';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index 068990b53b9f5..843c36347a49f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -12,7 +12,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -20,7 +19,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Report type options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_reportTypeOptions = [];
 
@@ -28,7 +26,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Report field visibility
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fieldVisibility = [];
 
@@ -36,7 +33,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Report field opions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_fieldOptions = [];
 
@@ -48,7 +44,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      *
      * @codeCoverageIgnore
      * @return void
-     * @since 2.0.0
      */
     public function setFieldVisibility($fieldId, $visibility)
     {
@@ -62,7 +57,6 @@ public function setFieldVisibility($fieldId, $visibility)
      * @param bool $defaultVisibility
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getFieldVisibility($fieldId, $defaultVisibility = true)
     {
@@ -80,7 +74,6 @@ public function getFieldVisibility($fieldId, $defaultVisibility = true)
      * @param mixed|null $value Field option value
      *
      * @return void
-     * @since 2.0.0
      */
     public function setFieldOption($fieldId, $option, $value = null)
     {
@@ -104,7 +97,6 @@ public function setFieldOption($fieldId, $option, $value = null)
      * @param string $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function addReportTypeOption($key, $value)
     {
@@ -116,7 +108,6 @@ public function addReportTypeOption($key, $value)
      * Add fieldset with general report fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -212,7 +203,6 @@ protected function _prepareForm()
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return \Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
@@ -230,7 +220,6 @@ protected function _initFormValues()
      * This method is called before rendering HTML
      *
      * @return \Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index 50f980bdfc2f9..eeca1c3ed6e8c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
@@ -19,7 +18,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Should Store Switcher block be visible
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_storeSwitcherVisibility = true;
 
@@ -27,7 +25,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Should Date Filter block be visible
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_dateFilterVisibility = true;
 
@@ -35,7 +32,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Filters array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filters = [];
 
@@ -43,7 +39,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Default filters values
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultFilters = ['report_from' => '', 'report_to' => '', 'report_period' => 'day'];
 
@@ -51,7 +46,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Sub-report rows count
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_subReportSize = 5;
 
@@ -59,7 +53,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Errors messages aggregated array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -67,7 +60,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Block template file name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Reports::grid.phtml';
 
@@ -75,7 +67,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * Filter values array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filterValues;
 
@@ -84,7 +75,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -164,7 +154,6 @@ protected function _prepareCollection()
      * Get allowed stores
      *
      * @return array|\int[]
-     * @since 2.0.0
      */
     protected function _getAllowedStoreIds()
     {
@@ -202,7 +191,6 @@ protected function _getAllowedStoreIds()
      * @param array $data
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _setFilterValues($data)
     {
@@ -218,7 +206,6 @@ protected function _setFilterValues($data)
      * @param bool $visible
      * @codeCoverageIgnore
      * @return void
-     * @since 2.0.0
      */
     public function setStoreSwitcherVisibility($visible = true)
     {
@@ -231,7 +218,6 @@ public function setStoreSwitcherVisibility($visible = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getStoreSwitcherVisibility()
     {
@@ -243,7 +229,6 @@ public function getStoreSwitcherVisibility()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreSwitcherHtml()
     {
@@ -256,7 +241,6 @@ public function getStoreSwitcherHtml()
      * @param bool $visible
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setDateFilterVisibility($visible = true)
     {
@@ -269,7 +253,6 @@ public function setDateFilterVisibility($visible = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getDateFilterVisibility()
     {
@@ -281,7 +264,6 @@ public function getDateFilterVisibility()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDateFilterHtml()
     {
@@ -292,7 +274,6 @@ public function getDateFilterHtml()
      * Get periods
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getPeriods()
     {
@@ -303,7 +284,6 @@ public function getPeriods()
      * Get date format according the locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDateFormat()
     {
@@ -315,7 +295,6 @@ public function getDateFormat()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRefreshButtonHtml()
     {
@@ -329,7 +308,6 @@ public function getRefreshButtonHtml()
      * @param string $value
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setFilter($name, $value)
     {
@@ -343,7 +321,6 @@ public function setFilter($name, $value)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function getFilter($name)
     {
@@ -360,7 +337,6 @@ public function getFilter($name)
      * @param int $size
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setSubReportSize($size)
     {
@@ -372,7 +348,6 @@ public function setSubReportSize($size)
      * @codeCoverageIgnore
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSubReportSize()
     {
@@ -384,7 +359,6 @@ public function getSubReportSize()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -395,7 +369,6 @@ public function getErrors()
      * Prepare grid filter buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFilterButtons()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 5d0dbdb82eac6..a73f1d8564b77 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
  *
- * @since 2.0.0
  */
 class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceCollectionName = '';
 
     /**
      * @var null
-     * @since 2.0.0
      */
     protected $_currentCurrencyCode = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
     /**
      * @var null
-     * @since 2.0.0
      */
     protected $_aggregatedColumns = null;
 
@@ -40,7 +35,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Reports data
      *
      * @var \Magento\Reports\Helper\Data
-     * @since 2.0.0
      */
     protected $_reportsData = null;
 
@@ -48,7 +42,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Reports grouped collection factory
      *
      * @var \Magento\Reports\Model\Grouped\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -56,7 +49,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Resource collection factory
      *
      * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory
-     * @since 2.0.0
      */
     protected $_resourceFactory;
 
@@ -67,7 +59,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
      * @param \Magento\Reports\Helper\Data $reportsData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -87,7 +78,6 @@ public function __construct(
      * Pseudo constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -107,7 +97,6 @@ protected function _construct()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -116,7 +105,6 @@ public function getResourceCollectionName()
 
     /**
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -128,7 +116,6 @@ public function getCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getAggregatedColumns()
     {
@@ -154,7 +141,6 @@ protected function _getAggregatedColumns()
      * @param string $columnId
      * @param array $column
      * @return $this
-     * @since 2.0.0
      */
     public function addColumn($columnId, $column)
     {
@@ -185,7 +171,6 @@ public function addColumn($columnId, $column)
      * Get allowed store ids array intersected with selected scope in store switcher
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getStoreIds()
     {
@@ -213,7 +198,6 @@ protected function _getStoreIds()
      * @return $this|\Magento\Backend\Block\Widget\Grid
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -301,7 +285,6 @@ protected function _prepareCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getCountTotals()
     {
@@ -339,7 +322,6 @@ public function getCountTotals()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSubTotals()
     {
@@ -372,7 +354,6 @@ public function getSubTotals()
      * @param array $storeIds
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -382,7 +363,6 @@ public function setStoreIds($storeIds)
 
     /**
      * @return string|\Magento\Directory\Model\Currency $currencyCode
-     * @since 2.0.0
      */
     public function getCurrentCurrencyCode()
     {
@@ -401,7 +381,6 @@ public function getCurrentCurrencyCode()
      *
      * @param string|\Magento\Directory\Model\Currency $toCurrency
      * @return float
-     * @since 2.0.0
      */
     public function getRate($toCurrency)
     {
@@ -414,7 +393,6 @@ public function getRate($toCurrency)
      * @param \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection $collection
      * @param \Magento\Framework\DataObject $filterData
      * @return $this
-     * @since 2.0.0
      */
     protected function _addOrderStatusFilter($collection, $filterData)
     {
@@ -431,7 +409,6 @@ protected function _addOrderStatusFilter($collection, $filterData)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _addCustomFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
index fcabc0765a20b..581c7b18f24a1 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
@@ -9,7 +9,6 @@
  * Adminhtml grid item renderer number or blank line
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Blanknumber extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Number
 {
@@ -17,7 +16,6 @@ class Blanknumber extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Num
      * @param \Magento\Framework\DataObject $row
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getValue(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index 6804357047701..cccef6f0c4e79 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -11,7 +11,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency
 {
@@ -20,7 +19,6 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Curren
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
index 6548b352487eb..1bf6a4120b74c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
@@ -9,7 +9,6 @@
  * Adminhtml Report Customers Reviews renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -18,7 +17,6 @@ class Customer extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      *
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
index 8bee7940a6906..97fee9acf5d0e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
@@ -9,7 +9,6 @@
  * Adminhtml Report Products Reviews renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -18,7 +17,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
index 6840c90281578..afa0ce79aca6e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
@@ -9,7 +9,6 @@
  * Adminhtml shopping carts report grid block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -17,7 +16,6 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
      * Stores current currency code
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_currentCurrencyCode = null;
 
@@ -25,7 +23,6 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
      * Ids of current stores
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
@@ -35,7 +32,6 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -47,7 +43,6 @@ public function setStoreIds($storeIds)
      * Retrieve currency code based on selected store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentCurrencyCode()
     {
@@ -67,7 +62,6 @@ public function getCurrentCurrencyCode()
      *
      * @param string|\Magento\Directory\Model\Currency $toCurrency
      * @return float
-     * @since 2.0.0
      */
     public function getRate($toCurrency)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Product.php
index dab91144cdd2e..5532d02ea5252 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product.php
@@ -9,13 +9,11 @@
  * Adminhtml products report page content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
index f654e7716a5dc..127d131d44f50 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
@@ -9,13 +9,11 @@
  * Adminhtml product downloads report
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Downloads extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
index dfc06a986c938..69053ee944086 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
@@ -9,13 +9,11 @@
  * Adminhtml product downloads report grid
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Product\Downloads\CollectionFactory
-     * @since 2.0.0
      */
     protected $_downloadsFactory;
 
@@ -24,7 +22,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Product\Downloads\CollectionFactory $downloadsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -84,7 +79,6 @@ protected function _prepareCollection()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
index 0feafe6f7ca93..27de409b07677 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
@@ -9,7 +9,6 @@
  * Adminhtml Product Downloads Purchases Renderer
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Purchases extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -18,7 +17,6 @@ class Purchases extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstr
      *
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
index bdcfc3085c3bd..0e84e0d63dfa5 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Lowstock extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
index f9814d9b6a606..8e7523a0955ef 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory
-     * @since 2.0.0
      */
     protected $_lowstocksFactory;
 
@@ -25,7 +23,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory $lowstocksFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
index ad05e50540e43..759feae5d9752 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sold extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Reports';
 
@@ -24,7 +22,6 @@ class Sold extends \Magento\Backend\Block\Widget\Grid\Container
      * Initialize container block settings
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
index ca42fe03cb571..28a917bdda0d3 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Viewed extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +39,6 @@ protected function _construct()
      * Get filter url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
index fb4a2728e18f8..a621d530222ff 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * Column for grid to be grouped by
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
@@ -26,7 +24,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * Grid resource collection name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceCollectionName = \Magento\Reports\Model\ResourceModel\Report\Product\Viewed\Collection::class;
 
@@ -34,7 +31,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * Init grid parameters
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +42,6 @@ protected function _construct()
      * Custom columns preparation
      *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -123,7 +118,6 @@ protected function _prepareColumns()
      * @param \Magento\Framework\DataObject $filterData
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _addOrderStatusFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
index 2b5b79f0a0db2..30e09ecab54bc 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Statistics extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Statistics extends \Magento\Backend\Block\Widget\Grid\Container
      * Modify Header and remove button "Add"
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
index a47048c4e2f9d..16964ddf9bc24 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
index 94717a440daa8..2179e89916d7c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
@@ -9,13 +9,11 @@
  * Adminhtml report review product blocks content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Detail extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -23,7 +21,6 @@ class Detail extends \Magento\Backend\Block\Widget\Grid\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
index c1922a70fd02d..c28abd0fa9161 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
@@ -9,13 +9,11 @@
  * Adminhtml report reviews product grid block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Review\CollectionFactory
-     * @since 2.0.0
      */
     protected $_reviewsFactory;
 
@@ -24,7 +22,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Review\CollectionFactory $reviewsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
      * Apply sorting and filtering to reports review collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -67,7 +62,6 @@ protected function _prepareCollection()
      * Initialize grid report review columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
index a4d17b5a9559a..4ca4995744b00 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
index f11ec487172fe..f403a91d01643 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Bestsellers extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Bestsellers extends \Magento\Backend\Block\Widget\Grid\Container
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
index 12aea41ff5770..f898775f6b99a 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -18,14 +17,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +33,6 @@ protected function _construct()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -45,7 +41,6 @@ public function getResourceCollectionName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
index c1531a65228f7..6ec8d5cbd3498 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Coupons extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Coupons extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
index 038c125384ed8..69ce13c52a2fa 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -18,14 +17,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +33,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -50,7 +46,6 @@ public function getResourceCollectionName()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -213,7 +208,6 @@ protected function _prepareColumns()
      * @param \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection $collection
      * @param \Magento\Framework\DataObject $filterData
      * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
-     * @since 2.0.0
      */
     protected function _addCustomFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
index 9cc0eb55a8fc3..34edf99fc65ae 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
@@ -10,7 +10,6 @@
 
 /**
  * Adminhtml grid item renderer date
- * @since 2.0.0
  */
 class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Date
 {
@@ -28,7 +27,6 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Date
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -44,7 +42,6 @@ public function __construct(
      * Retrieve date format
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFormat()
     {
@@ -73,7 +70,6 @@ protected function _getFormat()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
index 0dfb0dac57bd0..a8e288abad7ed 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Invoiced extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Invoiced extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
index d8e87d3aabe87..66ab7fd1bb7c0 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
@@ -11,7 +11,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -19,14 +18,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY condition
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +33,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -47,7 +43,6 @@ public function getResourceCollectionName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
index df1f047b6d768..1222435e2b120 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
index d741ac7cb09f5..f696c85dd9505 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
@@ -11,7 +11,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -19,14 +18,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +33,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -47,7 +43,6 @@ public function getResourceCollectionName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
index ef80bdedb098b..966d5e9ea10a6 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sales extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index f06089be656ed..21836f1a8c276 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -11,7 +11,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -19,14 +18,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +33,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -49,7 +45,6 @@ public function getResourceCollectionName()
      * {@inheritdoc}
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
index 01baab948c2d1..edd14e86fb266 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
index dfff8d38c561b..851e7cdfdda1a 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
@@ -11,7 +11,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -19,14 +18,12 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * Group by criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +34,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -48,7 +44,6 @@ public function getResourceCollectionName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
index 6e19d3dee2416..8a03ec33983a8 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,13 +17,11 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Get filter URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilterUrl()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index a6536f62a4d8d..79deb27423be5 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -11,7 +11,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
@@ -19,7 +18,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * GROUP BY criteria
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = 'period';
 
@@ -27,7 +25,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * Config factory
      *
      * @var \Magento\Sales\Model\Order\ConfigFactory
-     * @since 2.0.0
      */
     protected $_configFactory;
 
@@ -41,7 +38,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      * @param \Magento\Reports\Helper\Data $reportsData
      * @param \Magento\Sales\Model\Order\ConfigFactory $configFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -70,7 +65,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getResourceCollectionName()
     {
@@ -81,7 +75,6 @@ public function getResourceCollectionName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -169,7 +162,6 @@ protected function _prepareColumns()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
index 041d87620a429..ddbc8671e0164 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
@@ -9,13 +9,11 @@
  * Adminhtml abandoned shopping cart report page content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Abandoned extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index 6db68a020c61f..f81176b7a1124 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -12,13 +12,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Quote\CollectionFactory
-     * @since 2.0.0
      */
     protected $_quotesFactory;
 
@@ -27,7 +25,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Quote\CollectionFactory $quotesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -51,7 +47,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -80,7 +75,6 @@ protected function _prepareCollection()
      * @param array $column
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -98,7 +92,6 @@ protected function _addColumnFilterToCollection($column)
     /**
      * @return \Magento\Backend\Block\Widget\Grid\Extended
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -233,7 +226,6 @@ protected function _prepareColumns()
      * @param \Magento\Framework\DataObject $row
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
index 207db7f1207e8..71402c031b047 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
@@ -9,13 +9,11 @@
  * Adminhtml Shopping cart customers report page content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
index dbcc24176eeff..8e5197dd6bbdc 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
@@ -10,13 +10,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customersFactory;
 
@@ -25,7 +23,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Customer\CollectionFactory $customersFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -66,7 +61,6 @@ protected function _prepareCollection()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid|void
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -75,7 +69,6 @@ protected function _afterLoadCollection()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
index f74ae1a2d8c0b..5be0033e2ad3f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
@@ -9,13 +9,11 @@
  * Adminhtml Shopping cart products report page content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index d843c5c1c5def..1bb49cbd63374 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -10,19 +10,16 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Quote\CollectionFactory
-     * @since 2.0.0
      */
     protected $quoteItemCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\QueryResolver
-     * @since 2.0.0
      */
     protected $queryResolver;
 
@@ -32,7 +29,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
      * @param \Magento\Reports\Model\ResourceModel\Quote\Item\CollectionFactory $quoteItemCollectionFactory
      * @param \Magento\Quote\Model\QueryResolver $queryResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +53,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -71,7 +65,6 @@ protected function _prepareCollection()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -151,7 +144,6 @@ protected function _prepareColumns()
      * @param \Magento\Framework\DataObject $row
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index 5a5840216b94b..28f2011de3365 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -10,7 +10,6 @@
  * Adminhtml wishlist report page content block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Backend\Block\Template
 {
@@ -18,7 +17,6 @@ class Wishlist extends \Magento\Backend\Block\Template
      * Template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'report/wishlist.phtml';
 
@@ -26,7 +24,6 @@ class Wishlist extends \Magento\Backend\Block\Template
      * Reports wishlist collection factory
      *
      * @var \Magento\Reports\Model\ResourceModel\Wishlist\CollectionFactory
-     * @since 2.0.0
      */
     protected $_wishlistFactory;
 
@@ -36,7 +33,6 @@ class Wishlist extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Wishlist\CollectionFactory $wishlistFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
index a67209e979e9b..d77d6a1e2bedc 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
@@ -9,13 +9,11 @@
  * Adminhtml wishlist report grid block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Wishlist\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productsFactory;
 
@@ -24,7 +22,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Reports\Model\ResourceModel\Wishlist\Product\CollectionFactory $productsFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -69,7 +64,6 @@ protected function _prepareCollection()
 
     /**
      * @return \Magento\Backend\Block\Widget\Grid\Extended
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/Magento/Reports/Block/Product/AbstractProduct.php b/app/code/Magento/Reports/Block/Product/AbstractProduct.php
index 09358b0883777..a9249dcfa578b 100644
--- a/app/code/Magento/Reports/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Reports/Block/Product/AbstractProduct.php
@@ -9,7 +9,6 @@
  * Reports Recently Products Abstract Block
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -17,7 +16,6 @@ abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractPr
      * Product Index model type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_indexType;
 
@@ -25,19 +23,16 @@ abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractPr
      * Product Index Collection
      *
      * @var \Magento\Reports\Model\ResourceModel\Product\Index\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_collection;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\Factory
-     * @since 2.0.0
      */
     protected $_indexFactory;
 
@@ -46,7 +41,6 @@ abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractPr
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
      * @param \Magento\Reports\Model\Product\Index\Factory $indexFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -67,7 +61,6 @@ public function __construct(
      * Retrieve page size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -81,7 +74,6 @@ public function getPageSize()
      * Retrieve product ids, that must not be included in collection
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getProductsToSkip()
     {
@@ -92,7 +84,6 @@ protected function _getProductsToSkip()
      * Public method for retrieve Product Index model
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Reports\Model\Product\Index\AbstractIndex
-     * @since 2.0.0
      */
     public function getModel()
     {
@@ -109,7 +100,6 @@ public function getModel()
      * Retrieve Index Product Collection
      *
      * @return \Magento\Reports\Model\ResourceModel\Product\Index\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
@@ -149,7 +139,6 @@ public function getItemsCollection()
      * Retrieve count of product index items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php
index 144bbbc728286..24b4a33056561 100644
--- a/app/code/Magento/Reports/Block/Product/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Compared.php
@@ -11,7 +11,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Compared extends \Magento\Reports\Block\Product\AbstractProduct
 {
@@ -24,7 +23,6 @@ class Compared extends \Magento\Reports\Block\Product\AbstractProduct
      * Compared Product Index type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_indexType = \Magento\Reports\Model\Product\Index\Factory::TYPE_COMPARED;
 
@@ -32,7 +30,6 @@ class Compared extends \Magento\Reports\Block\Product\AbstractProduct
      * Retrieve page size (count)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -50,7 +47,6 @@ public function getPageSize()
      * Check has compared products
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index c08efc893fd74..9867e4c5f7fcb 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -13,7 +13,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Viewed extends AbstractProduct implements IdentityInterface
 {
@@ -26,7 +25,6 @@ class Viewed extends AbstractProduct implements IdentityInterface
      * Viewed Product Index type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_indexType = \Magento\Reports\Model\Product\Index\Factory::TYPE_VIEWED;
 
@@ -34,7 +32,6 @@ class Viewed extends AbstractProduct implements IdentityInterface
      * Retrieve page size (count)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -51,7 +48,6 @@ public function getPageSize()
      * Added predefined ids support
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -67,7 +63,6 @@ public function getCount()
      * check has viewed products
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -79,7 +74,6 @@ protected function _toHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Widget/Compared.php b/app/code/Magento/Reports/Block/Product/Widget/Compared.php
index ca0f6d6afdd04..661239d8d7da9 100644
--- a/app/code/Magento/Reports/Block/Product/Widget/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Widget/Compared.php
@@ -9,7 +9,6 @@
  * Reports Recently Compared Products Widget
  * @deprecated 2.2.0 Since new frontend base widgets are provided
  * @see \Magento\Catalog\Block\Widget\RecentlyCompared
- * @since 2.0.0
  */
 class Compared extends \Magento\Reports\Block\Product\Compared implements \Magento\Widget\Block\BlockInterface
 {
@@ -17,7 +16,6 @@ class Compared extends \Magento\Reports\Block\Product\Compared implements \Magen
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed.php
index 3e18b23cea98c..0443e6eff3765 100644
--- a/app/code/Magento/Reports/Block/Product/Widget/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed.php
@@ -9,7 +9,6 @@
  * Reports Recently Viewed Products Widget
  * @deprecated 2.2.0 Since new frontend base widgets are provided
  * @see \Magento\Catalog\Block\Widget\RecentlyViewed
- * @since 2.0.0
  */
 class Viewed extends \Magento\Reports\Block\Product\Viewed implements \Magento\Widget\Block\BlockInterface
 {
@@ -17,7 +16,6 @@ class Viewed extends \Magento\Reports\Block\Product\Viewed implements \Magento\W
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
index 1e7caedd0d8f0..04a402c9ac41e 100644
--- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
+++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
@@ -9,7 +9,6 @@
  * Reports Recently Viewed Products Widget
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
 {
@@ -17,7 +16,6 @@ class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Ma
      * Viewed Product Index type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_indexType = \Magento\Reports\Model\Product\Index\Factory::TYPE_VIEWED;
 }
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
index 5fd66c341c691..61ac7fbb03433 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -26,14 +25,12 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 8fd3078f61777..8e482c576a50e 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -15,25 +15,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractReport extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $_dateFilter;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $timezone;
 
@@ -42,7 +38,6 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param TimezoneInterface $timezone
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Admin session model
      *
      * @var null|\Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_adminSession = null;
 
@@ -68,7 +62,6 @@ public function __construct(
      * Retrieve admin session model
      *
      * @return \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -82,7 +75,6 @@ protected function _getSession()
      * Add report breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -96,7 +88,6 @@ public function _initAction()
      *
      * @param array|\Magento\Framework\DataObject $blocks
      * @return $this
-     * @since 2.0.0
      */
     public function _initReportAction($blocks)
     {
@@ -140,7 +131,6 @@ public function _initReportAction($blocks)
      * @param string $flagCode
      * @param string $refreshCode
      * @return $this
-     * @since 2.0.0
      */
     protected function _showLastExecutionTime($flagCode, $refreshCode)
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
index dc4af2d50dc23..58bc34ef243fa 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
@@ -14,20 +14,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Customer extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Add reports and customer breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -60,7 +56,6 @@ public function _initAction()
      * Determine if action is allowed for reports module
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
index 81941b5ef7cdb..55c7a9ae2be7c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\Accounts
  *
- * @since 2.0.0
  */
 class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -17,7 +16,6 @@ class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer
      * New accounts action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
index 7b5c2f7573fe1..4ba46e1849145 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportAccountsCsv
  *
- * @since 2.0.0
  */
 class ExportAccountsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportAccountsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Cus
      * Export new accounts report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
index b72592fe40c57..c41e588065382 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportAccountsExcel
  *
- * @since 2.0.0
  */
 class ExportAccountsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportAccountsExcel extends \Magento\Reports\Controller\Adminhtml\Report\C
      * Export new accounts report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
index 481bd261af002..e6e11c349d589 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportOrdersCsv
  *
- * @since 2.0.0
  */
 class ExportOrdersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportOrdersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Custo
      * Export customers most ordered report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
index 737594119ba11..b69c28baf6245 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportOrdersExcel
  *
- * @since 2.0.0
  */
 class ExportOrdersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportOrdersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Cus
      * Export customers most ordered report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
index cd8e060f992c6..d3eb0fee7d46f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportTotalsCsv
  *
- * @since 2.0.0
  */
 class ExportTotalsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportTotalsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Custo
      * Export customers biggest totals report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
index 5e229fd932f3e..4080f5edd194d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\ExportTotalsExcel
  *
- * @since 2.0.0
  */
 class ExportTotalsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -21,7 +20,6 @@ class ExportTotalsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Cus
      * Export customers biggest totals report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
index 2167bbfe9139a..944a5da928f49 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\Orders
  *
- * @since 2.0.0
  */
 class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -17,7 +16,6 @@ class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer
      * Customers by number of orders action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
index bf3f00e689ad3..1f36851124c90 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Customer\Totals
  *
- * @since 2.0.0
  */
 class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
@@ -17,7 +16,6 @@ class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer
      * Customers by orders total action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
index 38b2380282d5a..00d06ba0fb320 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Product extends AbstractReport
 {
@@ -21,7 +20,6 @@ abstract class Product extends AbstractReport
      * Add report/products breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
index a15372199bc0d..e1f454e1254bc 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\Downloads
  *
- * @since 2.0.0
  */
 class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -24,7 +23,6 @@ class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product
      * Downloads action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php
index b0a2874500863..1f724ba4d565f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportDownloadsCsv
  *
- * @since 2.0.0
  */
 class ExportDownloadsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -26,7 +25,6 @@ class ExportDownloadsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Pr
      * Export products downloads report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php
index 93ef03b70bec7..c4c938a8f7609 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportDownloadsExcel
  *
- * @since 2.0.0
  */
 class ExportDownloadsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -26,7 +25,6 @@ class ExportDownloadsExcel extends \Magento\Reports\Controller\Adminhtml\Report\
      * Export products downloads report to XLS format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
index b8fdc4b1c4a67..ce5dd49ba1550 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportLowstockCsv
  *
- * @since 2.0.0
  */
 class ExportLowstockCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -27,7 +26,6 @@ class ExportLowstockCsv extends \Magento\Reports\Controller\Adminhtml\Report\Pro
      * Export low stock products report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
index c83cd10c26a3d..31e8bbddaf33d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportLowstockExcel
  *
- * @since 2.0.0
  */
 class ExportLowstockExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -27,7 +26,6 @@ class ExportLowstockExcel extends \Magento\Reports\Controller\Adminhtml\Report\P
      * Export low stock products report to XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
index a5d66389c04c3..f11c8ab59d1f3 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportSoldCsv
  *
- * @since 2.0.0
  */
 class ExportSoldCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -28,7 +27,6 @@ class ExportSoldCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
      * Export Sold Products report to CSV format action
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
index 0e07eeb7ade21..bd106073425bd 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportSoldExcel
  *
- * @since 2.0.0
  */
 class ExportSoldExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -28,7 +27,6 @@ class ExportSoldExcel extends \Magento\Reports\Controller\Adminhtml\Report\Produ
      * Export Sold Products report to XML format action
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
index cc52e8ea285b1..4dcfa7a53f246 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportViewedCsv
  *
- * @since 2.0.0
  */
 class ExportViewedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -27,7 +26,6 @@ class ExportViewedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Produ
      * Export products most viewed report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
index dc973244b102f..ffc0c0e3b1ee8 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\ExportViewedExcel
  *
- * @since 2.0.0
  */
 class ExportViewedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -27,7 +26,6 @@ class ExportViewedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Pro
      * Export products most viewed report to XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
index 57611b2268ac6..ce5fbc7fd8188 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\Lowstock
  *
- * @since 2.0.0
  */
 class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -24,7 +23,6 @@ class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product
      * Low stock action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
index d921377fb64ab..30213ea378bc0 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\Sold
  *
- * @since 2.0.0
  */
 class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -24,7 +23,6 @@ class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product
      * Sold Products Report Action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
index 2217d589a0706..ab67ce0fd8e4b 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Product\Viewed
  *
- * @since 2.0.0
  */
 class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
@@ -26,7 +25,6 @@ class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product
      * Most viewed products
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
index 1074d5b63056a..1c0fb8c3fac24 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
@@ -13,20 +13,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Review extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Add reports and reviews breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -54,7 +50,6 @@ public function _initAction()
      * Determine if action is allowed for reports module
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
index 898dc01818c2f..7dbff65f00f1c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\Customer
  *
- * @since 2.0.0
  */
 class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -17,7 +16,6 @@ class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review
      * Customer Reviews Report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
index 143c4559e8bc8..47d49c27bb722 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportCustomerCsv
  *
- * @since 2.0.0
  */
 class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Rev
      * Export review customer report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
index 4bc3ba54c0754..a37ac018f788a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportCustomerExcel
  *
- * @since 2.0.0
  */
 class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\R
      * Export review customer report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
index dfe046ae4fd0f..7892740eaff86 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportProductCsv
  *
- * @since 2.0.0
  */
 class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Revi
      * Export review product report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
index a6b8e4a6bfe73..d4e962238bac1 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportProductDetailCsv
  *
- * @since 2.0.0
  */
 class ExportProductDetailCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportProductDetailCsv extends \Magento\Reports\Controller\Adminhtml\Repor
      * Export review product detail report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
index 5f2ab8e5c530e..11ced40f56356 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportProductDetailExcel
  *
- * @since 2.0.0
  */
 class ExportProductDetailExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportProductDetailExcel extends \Magento\Reports\Controller\Adminhtml\Rep
      * Export review product detail report to ExcelXML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
index 00f8dbb9ef6da..421808d810bb6 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ExportProductExcel
  *
- * @since 2.0.0
  */
 class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -20,7 +19,6 @@ class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Re
      * Export review product report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
index aa1316212e3bf..3799b9b31f550 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -17,7 +16,6 @@ class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review
      * Product reviews report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php
index 27b4482fad5a8..3ebd75dc1a010 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Review\ProductDetail
  *
- * @since 2.0.0
  */
 class ProductDetail extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
@@ -17,7 +16,6 @@ class ProductDetail extends \Magento\Reports\Controller\Adminhtml\Report\Review
      * Details action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index 8ede24fd377eb..213901b3568fe 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -14,7 +14,6 @@
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
- * @since 2.0.0
  */
 abstract class Sales extends AbstractReport
 {
@@ -22,7 +21,6 @@ abstract class Sales extends AbstractReport
      * Add report/sales breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -35,7 +33,6 @@ public function _initAction()
      * Determine if action is allowed for reports module
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
index 0a71cc5afa1e6..d3cfe36f020f8 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Bestsellers
  *
- * @since 2.0.0
  */
 class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Bestsellers report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
index 68311a83ad777..98ec1d3e5242b 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Coupons
  *
- * @since 2.0.0
  */
 class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Coupons report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
index 797d51c1d0d2b..29b919bb30f44 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportBestsellersCsv
  *
- * @since 2.0.0
  */
 class ExportBestsellersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportBestsellersCsv extends \Magento\Reports\Controller\Adminhtml\Report\
      * Export bestsellers report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
index c5396a99f3d10..3847070f831c9 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportBestsellersExcel
  *
- * @since 2.0.0
  */
 class ExportBestsellersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportBestsellersExcel extends \Magento\Reports\Controller\Adminhtml\Repor
      * Export bestsellers report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
index 23e9df91edb34..9cbd1d5d00c32 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportCouponsCsv
  *
- * @since 2.0.0
  */
 class ExportCouponsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportCouponsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sale
      * Export coupons report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
index e648d8fc42705..6895cf76b5b39 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportCouponsExcel
  *
- * @since 2.0.0
  */
 class ExportCouponsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportCouponsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sa
      * Export coupons report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
index d60af82fa304c..b691f2f422d42 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportInvoicedCsv
  *
- * @since 2.0.0
  */
 class ExportInvoicedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportInvoicedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal
      * Export invoiced report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
index c026f169882f9..ef906281b4448 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportInvoicedExcel
  *
- * @since 2.0.0
  */
 class ExportInvoicedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportInvoicedExcel extends \Magento\Reports\Controller\Adminhtml\Report\S
      * Export invoiced report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
index 694aafa4746a6..ca68f7f0140b2 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportRefundedCsv
  *
- * @since 2.0.0
  */
 class ExportRefundedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportRefundedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal
      * Export refunded report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
index b617f4213dca2..88098eef23d4f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportRefundedExcel
  *
- * @since 2.0.0
  */
 class ExportRefundedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportRefundedExcel extends \Magento\Reports\Controller\Adminhtml\Report\S
      * Export refunded report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
index 32e5b28b5a864..d11f34e951910 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportSalesCsv
  *
- * @since 2.0.0
  */
 class ExportSalesCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportSalesCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Export sales report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
index 838c51ffac5ce..d0020cf7b9bb1 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportSalesExcel
  *
- * @since 2.0.0
  */
 class ExportSalesExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportSalesExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sale
      * Export sales report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
index bc7254aa586fc..6717bbd8d3c3d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportShippingCsv
  *
- * @since 2.0.0
  */
 class ExportShippingCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportShippingCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal
      * Export shipping report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
index 4e6ae6d53af48..b656b7c88d674 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportShippingExcel
  *
- * @since 2.0.0
  */
 class ExportShippingExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportShippingExcel extends \Magento\Reports\Controller\Adminhtml\Report\S
      * Export shipping report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
index 7576c2218fba0..6c1310c5bd6c4 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportTaxCsv
  *
- * @since 2.0.0
  */
 class ExportTaxCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportTaxCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Export tax report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
index 24655cc234328..693bb47888c77 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\ExportTaxExcel
  *
- * @since 2.0.0
  */
 class ExportTaxExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -20,7 +19,6 @@ class ExportTaxExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Export tax report grid to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
index 721d6c1c75dd6..7cf3ba4876146 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Invoiced
  *
- * @since 2.0.0
  */
 class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Invoice report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php
index 043c411e6364a..33bcf8b464e9f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\RefreshLifetime
  *
- * @since 2.0.0
  */
 class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -17,7 +16,6 @@ class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Refresh statistics for all period
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php
index 9d0099419a8b9..19d7523780d1f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\RefreshRecent
  *
- * @since 2.0.0
  */
 class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -17,7 +16,6 @@ class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Refresh statistics for last 25 hours
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php
index ef28952693e63..0bb75548f1d6a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\RefreshStatistics
  *
- * @since 2.0.0
  */
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -17,7 +16,6 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sal
      * Refresh report statistics action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
index 55439e71f28f0..c96ee51b377ca 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Refunded
  *
- * @since 2.0.0
  */
 class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Refunds report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
index 5b4ca0f2d75a9..3b5c0226791de 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Sales
  *
- * @since 2.0.0
  */
 class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Sales report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php
index 15c3f2992a589..5c00971c71954 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Shipping extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Shipping report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
index ab492afcd6bb9..2a465c3f2cff8 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Sales\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
@@ -19,7 +18,6 @@ class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales
      * Tax report action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
index ddfe93589d4ed..769ab8a13bbe0 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
@@ -13,20 +13,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Shopcart extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Add reports and shopping cart breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -54,7 +50,6 @@ public function _initAction()
      * Determine if action is allowed for reports module
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
index 64e56efd55382..8a2526132d4bb 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Abandoned
  *
- * @since 2.0.0
  */
 class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -17,7 +16,6 @@ class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
      * Abandoned carts action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php
index 79d78bab20cf0..e6c194b0f398a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Customer
  *
- * @since 2.0.0
  */
 class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -17,7 +16,6 @@ class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
      * Customer shopping carts action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
index ea88f47255980..29fd23d8bbeef 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportAbandonedCsv
  *
- * @since 2.0.0
  */
 class ExportAbandonedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -20,7 +19,6 @@ class ExportAbandonedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sh
      * Export abandoned carts report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
index 74cbec1da6d59..9213443ced265 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportAbandonedExcel
  *
- * @since 2.0.0
  */
 class ExportAbandonedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -20,7 +19,6 @@ class ExportAbandonedExcel extends \Magento\Reports\Controller\Adminhtml\Report\
      * Export abandoned carts report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php
index a88d8ffa36f43..3d837936324dd 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportCustomerCsv
  *
- * @since 2.0.0
  */
 class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -19,7 +18,6 @@ class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sho
      * Export shopcart customer report to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php
index 957e4d171d290..5e6c31bea1efe 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportCustomerExcel
  *
- * @since 2.0.0
  */
 class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -19,7 +18,6 @@ class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\S
      * Export shopcart customer report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
index 90bfcd2642cf6..478e3fca45fe6 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportProductCsv
  *
- * @since 2.0.0
  */
 class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -20,7 +19,6 @@ class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shop
      * Export products report grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
index b83c59732a57a..8e9566bc213ff 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportProductExcel
  *
- * @since 2.0.0
  */
 class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -20,7 +19,6 @@ class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sh
      * Export products report to Excel XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
index fa5ef0e6a56c0..b99685860c231 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
@@ -17,7 +16,6 @@ class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
      * Products in carts action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 256dbe44fd706..c3b4bdfcfed9c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class Statistics extends \Magento\Backend\App\Action
 {
@@ -31,13 +30,11 @@ abstract class Statistics extends \Magento\Backend\App\Action
      * Admin session model
      *
      * @var null|AuthSession
-     * @since 2.0.0
      */
     protected $_adminSession = null;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $_dateFilter;
 
@@ -45,7 +42,6 @@ abstract class Statistics extends \Magento\Backend\App\Action
      * Codes for Refresh Statistics
      *
      * @var []
-     * @since 2.0.0
      */
     protected $reportTypes;
 
@@ -53,7 +49,6 @@ abstract class Statistics extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param [] $reportTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -69,7 +64,6 @@ public function __construct(
      * Add reports and statistics breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initAction()
     {
@@ -84,7 +78,6 @@ public function _initAction()
      *
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _getCollectionNames()
     {
@@ -110,7 +103,6 @@ protected function _getCollectionNames()
      * Retrieve admin session model
      *
      * @return AuthSession|Session|mixed|null
-     * @since 2.0.0
      */
     protected function _getSession()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
index 8c22b7cd4b50e..17208ea6ce7ee 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Statistics\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
      * Refresh statistics action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
index 8712e62631053..26aaa38a3692c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Statistics\RefreshLifetime
  *
- * @since 2.0.0
  */
 class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
@@ -17,7 +16,6 @@ class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Stati
      * Refresh statistics for all period
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
index fe69c30a9e700..7f89d4cc5a29a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Reports\Controller\Adminhtml\Report\Statistics\RefreshRecent
  *
- * @since 2.0.0
  */
 class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
@@ -17,7 +16,6 @@ class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statist
      * Refresh statistics for last 25 hours
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 9eaaf3241cbaa..c286281310fdf 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -28,7 +27,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Item factory
      *
      * @var \Magento\Reports\Model\ItemFactory
-     * @since 2.0.0
      */
     protected $_itemFactory;
 
@@ -37,7 +35,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ItemFactory $itemFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * @param string $period
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
     {
@@ -93,7 +89,6 @@ public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
      * @param string $to
      * @param string $periodType
      * @return void
-     * @since 2.0.0
      */
     public function prepareIntervalsCollection($collection, $from, $to, $periodType = self::REPORT_PERIOD_TYPE_DAY)
     {
diff --git a/app/code/Magento/Reports/Model/Config.php b/app/code/Magento/Reports/Model/Config.php
index f9e245e7531a3..98adbf4ae50ab 100644
--- a/app/code/Magento/Reports/Model/Config.php
+++ b/app/code/Magento/Reports/Model/Config.php
@@ -10,19 +10,16 @@
 /**
  * Configuration for reports
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\DataObject
 {
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_moduleReader;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -30,7 +27,6 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Module\Dir\Reader $moduleReader,
@@ -46,7 +42,6 @@ public function __construct(
      * Return reports global configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGlobalConfig()
     {
@@ -65,7 +60,6 @@ public function getGlobalConfig()
      * Return reports language
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLanguage()
     {
@@ -78,7 +72,6 @@ public function getLanguage()
      * Return reports dashboard
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDashboard()
     {
diff --git a/app/code/Magento/Reports/Model/Event.php b/app/code/Magento/Reports/Model/Event.php
index 4e2249b78f5e7..2a479473989f5 100644
--- a/app/code/Magento/Reports/Model/Event.php
+++ b/app/code/Magento/Reports/Model/Event.php
@@ -25,7 +25,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Event extends \Magento\Framework\Model\AbstractModel
 {
@@ -43,13 +42,11 @@ class Event extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
     /**
      * @var \Magento\Reports\Model\Event\TypeFactory
-     * @since 2.0.0
      */
     protected $_eventTypeFactory;
 
@@ -61,7 +58,6 @@ class Event extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -81,7 +77,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -92,7 +87,6 @@ protected function _construct()
      * Before Event save process
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -108,7 +102,6 @@ public function beforeSave()
      * @param int $customerId
      * @param array $types
      * @return $this
-     * @since 2.0.0
      */
     public function updateCustomerType($visitorId, $customerId, $types = null)
     {
@@ -129,7 +122,6 @@ public function updateCustomerType($visitorId, $customerId, $types = null)
      * Clean events (visitors)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
diff --git a/app/code/Magento/Reports/Model/Event/Type.php b/app/code/Magento/Reports/Model/Event/Type.php
index 9bc75f12a7320..557cce89cb7d9 100644
--- a/app/code/Magento/Reports/Model/Event/Type.php
+++ b/app/code/Magento/Reports/Model/Event/Type.php
@@ -16,13 +16,11 @@
  * @method \Magento\Reports\Model\Event\Type setCustomerLogin(int $value)
  *
  * @api
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Model/Flag.php b/app/code/Magento/Reports/Model/Flag.php
index dbbeee0a097df..4623efd438b22 100644
--- a/app/code/Magento/Reports/Model/Flag.php
+++ b/app/code/Magento/Reports/Model/Flag.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Flag extends \Magento\Framework\Flag
 {
@@ -36,7 +35,6 @@ class Flag extends \Magento\Framework\Flag
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setReportFlagCode($code)
     {
diff --git a/app/code/Magento/Reports/Model/Grouped/Collection.php b/app/code/Magento/Reports/Model/Grouped/Collection.php
index b8394f669e111..4a774c073de4b 100644
--- a/app/code/Magento/Reports/Model/Grouped/Collection.php
+++ b/app/code/Magento/Reports/Model/Grouped/Collection.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Column name for group by clause
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_columnGroupBy = null;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Collection resource
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_resourceCollection = null;
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Framework\Data\Collection
      *
      * @param string $column
      * @return $this
-     * @since 2.0.0
      */
     public function setColumnGroupBy($column)
     {
@@ -49,7 +45,6 @@ public function setColumnGroupBy($column)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -74,7 +69,6 @@ public function load($printQuery = false, $logQuery = false)
      *
      * @param DbCollection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function setResourceCollection($collection)
     {
@@ -86,7 +80,6 @@ public function setResourceCollection($collection)
      * Merge empty data collection with resource collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _mergeWithEmptyData()
     {
@@ -113,7 +106,6 @@ protected function _mergeWithEmptyData()
      * Group data in resource collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _groupResourceData()
     {
diff --git a/app/code/Magento/Reports/Model/Item.php b/app/code/Magento/Reports/Model/Item.php
index 3564b79cf1a8d..61223078bfd3e 100644
--- a/app/code/Magento/Reports/Model/Item.php
+++ b/app/code/Magento/Reports/Model/Item.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\DataObject
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isEmpty = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_children = [];
 
@@ -29,7 +26,6 @@ class Item extends \Magento\Framework\DataObject
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsEmpty($flag = true)
     {
@@ -43,7 +39,6 @@ public function setIsEmpty($flag = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsEmpty()
     {
@@ -52,7 +47,6 @@ public function getIsEmpty()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function hasIsEmpty()
     {
@@ -63,7 +57,6 @@ public function hasIsEmpty()
      * @codeCoverageIgnore
      *
      * @return array
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -76,7 +69,6 @@ public function getChildren()
      *
      * @param array $children
      * @return $this
-     * @since 2.0.0
      */
     public function setChildren($children)
     {
@@ -88,7 +80,6 @@ public function setChildren($children)
      * Indicator of whether or not children are present
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -100,7 +91,6 @@ public function hasChildren()
      *
      * @param array $child
      * @return $this
-     * @since 2.0.0
      */
     public function addChild($child)
     {
diff --git a/app/code/Magento/Reports/Model/Plugin/Log.php b/app/code/Magento/Reports/Model/Plugin/Log.php
index 66c347385394b..0ba737a7a413c 100644
--- a/app/code/Magento/Reports/Model/Plugin/Log.php
+++ b/app/code/Magento/Reports/Model/Plugin/Log.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\Reports\Model\Plugin\Log
  *
- * @since 2.0.0
  */
 class Log
 {
     /**
      * @var \Magento\Reports\Model\Event
-     * @since 2.0.0
      */
     protected $_reportEvent;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\Compared
-     * @since 2.0.0
      */
     protected $_comparedProductIdx;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\Viewed
-     * @since 2.0.0
      */
     protected $_viewedProductIdx;
 
@@ -36,7 +32,6 @@ class Log
      * @param \Magento\Reports\Model\Event $reportEvent
      * @param \Magento\Reports\Model\Product\Index\Compared $comparedProductIdx
      * @param \Magento\Reports\Model\Product\Index\Viewed $viewedProductIdx
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Reports\Model\Event $reportEvent,
@@ -58,7 +53,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @see Global Log Clean Settings
-     * @since 2.0.0
      */
     public function afterClean(\Magento\Customer\Model\ResourceModel\Visitor $subject, $logResourceModel)
     {
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index f89f3d0e5dd3a..769471e16beba 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -8,7 +8,6 @@
 /**
  * Reports Product Index Abstract Model
  * @api
- * @since 2.0.0
  */
 abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
 {
@@ -16,43 +15,36 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
      * Cache key name for Count of product index
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_countCacheKey;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_reportSession;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -69,7 +61,6 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -97,7 +88,6 @@ public function __construct(
      * Prepare customer/visitor, store data before save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -125,7 +115,6 @@ public function beforeSave()
      * if don't exists return current visitor id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVisitorId()
     {
@@ -141,7 +130,6 @@ public function getVisitorId()
      * if customer don't logged in return null
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -157,7 +145,6 @@ public function getCustomerId()
      * default return current store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -171,7 +158,6 @@ public function getStoreId()
      * Retrieve resource instance wrapper
      *
      * @return \Magento\Reports\Model\ResourceModel\Product\Index\AbstractIndex
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -182,7 +168,6 @@ protected function _getResource()
      * On customer loggin merge visitor/customer index
      *
      * @return $this
-     * @since 2.0.0
      */
     public function updateCustomerFromVisitor()
     {
@@ -194,7 +179,6 @@ public function updateCustomerFromVisitor()
      * Purge visitor data by customer (logout)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function purgeVisitorByCustomer()
     {
@@ -206,7 +190,6 @@ public function purgeVisitorByCustomer()
      * Retrieve Reports Session instance
      *
      * @return \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -217,7 +200,6 @@ protected function _getSession()
      * Calculate count of product index items cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function calculate()
     {
@@ -236,7 +218,6 @@ public function calculate()
      * Retrieve Exclude Product Ids List for Collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExcludeProductIds()
     {
@@ -247,7 +228,6 @@ public function getExcludeProductIds()
      * Retrieve count of product index items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
@@ -266,7 +246,6 @@ public function getCount()
      * Clean index (visitors)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -278,7 +257,6 @@ public function clean()
      * Add product ids to current visitor/customer log
      * @param string[] $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function registerIds($productIds)
     {
diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php
index 5db2a0866a20c..e5acaf3d8a047 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php
@@ -20,7 +20,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
 {
@@ -28,7 +27,6 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
      * Cache key name for Count of product index
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_countCacheKey = 'product_index_compared_count';
 
@@ -36,7 +34,6 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
      * Catalog product compare
      *
      * @var \Magento\Catalog\Helper\Product\Compare
-     * @since 2.0.0
      */
     protected $_productCompare = null;
 
@@ -54,7 +51,6 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -90,7 +86,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -101,7 +96,6 @@ protected function _construct()
      * Retrieve Exclude Product Ids List for Collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExcludeProductIds()
     {
diff --git a/app/code/Magento/Reports/Model/Product/Index/Factory.php b/app/code/Magento/Reports/Model/Product/Index/Factory.php
index 03959536485a6..3ec22bf399bf9 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Factory.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
@@ -17,7 +16,6 @@ class Factory
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_typeClasses = [
         self::TYPE_COMPARED => \Magento\Reports\Model\Product\Index\Compared::class,
@@ -26,13 +24,11 @@ class Factory
 
     /**
      * @var \Magento\Reports\Model\Product\Index\Abstract[]
-     * @since 2.0.0
      */
     protected $_instances;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -43,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @return \Magento\Reports\Model\Product\Index\AbstractIndex
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function get($type)
     {
diff --git a/app/code/Magento/Reports/Model/Product/Index/Viewed.php b/app/code/Magento/Reports/Model/Product/Index/Viewed.php
index ba52b147d2f71..5243b2bff7a50 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Viewed.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Viewed.php
@@ -20,7 +20,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Viewed extends \Magento\Reports\Model\Product\Index\AbstractIndex
 {
@@ -28,7 +27,6 @@ class Viewed extends \Magento\Reports\Model\Product\Index\AbstractIndex
      * Cache key name for Count of product index
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_countCacheKey = 'product_index_viewed_count';
 
@@ -36,7 +34,6 @@ class Viewed extends \Magento\Reports\Model\Product\Index\AbstractIndex
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -47,7 +44,6 @@ protected function _construct()
      * Retrieve Exclude Product Ids List for Collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExcludeProductIds()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php
index 2a501732fda4f..b28088f1d6e81 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Customer\Collection
 {
@@ -23,7 +22,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Customer\Collectio
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinFields($fromDate = '', $toDate = '')
     {
@@ -48,7 +46,6 @@ protected function _joinFields($fromDate = '', $toDate = '')
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($fromDate, $toDate)
     {
@@ -61,7 +58,6 @@ public function setDateRange($fromDate, $toDate)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php
index 3230aae16486e..4a44ade9bb3e0 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php
@@ -13,14 +13,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
 {
     /**
      * Report sub-collection class name
      * @var string
-     * @since 2.0.0
      */
     protected $_reportCollection = \Magento\Reports\Model\ResourceModel\Accounts\Collection::class;
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
index ef976228d71fc..7066084177fa8 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
@@ -12,7 +12,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
 {
@@ -20,7 +19,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Add order statistics flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addOrderStatistics = false;
 
@@ -28,7 +26,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Add order statistics is filter flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addOrderStatFilter = false;
 
@@ -36,7 +33,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Customer id table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_customerIdTableName;
 
@@ -44,7 +40,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Customer id field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_customerIdFieldName;
 
@@ -52,7 +47,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Order entity table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderEntityTable;
 
@@ -60,25 +54,21 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * Order entity field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderEntityField;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_quoteItemFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $orderResource;
 
@@ -101,7 +91,6 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
      * @param string $modelName
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -145,7 +134,6 @@ public function __construct(
      * Add cart info to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addCartInfo()
     {
@@ -169,7 +157,6 @@ public function addCartInfo()
      * Add customer name to results
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerName()
     {
@@ -182,7 +169,6 @@ public function addCustomerName()
      *
      * @param bool $isFilter
      * @return $this
-     * @since 2.0.0
      */
     public function addOrdersStatistics($isFilter = false)
     {
@@ -195,7 +181,6 @@ public function addOrdersStatistics($isFilter = false)
      * Add orders statistics to collection items
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addOrdersStatistics()
     {
@@ -244,7 +229,6 @@ protected function _addOrdersStatistics()
      * Collection after load operations like adding orders statistics
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -257,7 +241,6 @@ protected function _afterLoad()
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
     {
@@ -269,7 +252,6 @@ public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
      * Get select count sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php
index cd9c780cdbbb5..f65de78501fca 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php
@@ -14,7 +14,6 @@
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinFields($fromDate = '', $toDate = '')
     {
@@ -41,7 +39,6 @@ protected function _joinFields($fromDate = '', $toDate = '')
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($fromDate, $toDate)
     {
@@ -54,7 +51,6 @@ public function setDateRange($fromDate, $toDate)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php
index 4b8404e457704..369cc02f91e7c 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php
@@ -13,14 +13,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
 {
     /**
      * Report sub-collection class name
      * @var string
-     * @since 2.0.0
      */
     protected $_reportCollection = \Magento\Reports\Model\ResourceModel\Customer\Orders\Collection::class;
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php
index 17d5022dc1403..8405a44ef3493 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php
@@ -14,7 +14,6 @@
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinFields($fromDate = '', $toDate = '')
     {
@@ -41,7 +39,6 @@ protected function _joinFields($fromDate = '', $toDate = '')
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($fromDate, $toDate)
     {
@@ -54,7 +51,6 @@ public function setDateRange($fromDate, $toDate)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection/Initial.php
index 06095c212aa3e..7b1cb078b2226 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection/Initial.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection/Initial.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
 {
@@ -21,7 +20,6 @@ class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
      * Report sub-collection class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reportCollection = \Magento\Reports\Model\ResourceModel\Customer\Totals\Collection::class;
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event.php b/app/code/Magento/Reports/Model/ResourceModel/Event.php
index c73269cbf7858..c57a9e44ce403 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event.php
@@ -8,7 +8,6 @@
 /**
  * Report events resource model
  * @api
- * @since 2.0.0
  */
 class Event extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -16,13 +15,11 @@ class Event extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -31,7 +28,6 @@ class Event extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Initialize main table and identifier field. Set main entity table name and primary key field name.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +59,6 @@ protected function _construct()
      * @param array $types
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function updateCustomerType(\Magento\Reports\Model\Event $model, $visitorId, $customerId, $types = [])
     {
@@ -89,7 +83,6 @@ public function updateCustomerType(\Magento\Reports\Model\Event $model, $visitor
      * @param int $subtype
      * @param array $skipIds
      * @return $this
-     * @since 2.0.0
      */
     public function applyLogToCollection(
         \Magento\Framework\Data\Collection\AbstractDb $collection,
@@ -133,7 +126,6 @@ public function applyLogToCollection(
      *
      * @param null|array $predefinedStoreIds
      * @return array
-     * @since 2.0.0
      */
     public function getCurrentStoreIds(array $predefinedStoreIds = null)
     {
@@ -182,7 +174,6 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
      * @param \Magento\Reports\Model\Event $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function clean(\Magento\Reports\Model\Event $object)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Event/Collection.php
index c952fe2dd43eb..4f397d5382f35 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store Ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds;
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initializations
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +39,6 @@ protected function _construct()
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter(array $storeIds)
     {
@@ -59,7 +55,6 @@ public function addStoreFilter(array $storeIds)
      * @param null|int|array $ignore
      * @param int $limit
      * @return $this
-     * @since 2.0.0
      */
     public function addRecentlyFiler($typeId, $subjectId, $subtype = 0, $ignore = null, $limit = 15)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event/Type.php b/app/code/Magento/Reports/Model/ResourceModel/Event/Type.php
index e2ee8b7e17c8a..785f5e6a78651 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event/Type.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event/Type.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Type extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Main table initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event/Type/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Event/Type/Collection.php
index a8a3c8039d9ed..3f87b8d7389ca 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event/Type/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event/Type/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Helper.php b/app/code/Magento/Reports/Model/ResourceModel/Helper.php
index 6662b6928e5e8..8b243c65e3b62 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Helper.php
@@ -14,14 +14,12 @@
 /**
  * Class \Magento\Reports\Model\ResourceModel\Helper
  *
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper implements \Magento\Reports\Model\ResourceModel\HelperInterface
 {
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'reports')
     {
@@ -36,7 +34,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
      * @param mixed $matchFields
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return string
-     * @since 2.0.0
      */
     public function mergeVisitorProductIndex($mainTable, $data, $matchFields)
     {
@@ -46,7 +43,6 @@ public function mergeVisitorProductIndex($mainTable, $data, $matchFields)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function updateReportRatingPos($connection, $type, $column, $mainTable, $aggregationTable)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/HelperInterface.php b/app/code/Magento/Reports/Model/ResourceModel/HelperInterface.php
index adb143a817d4f..5b35a7a13ff83 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/HelperInterface.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/HelperInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface HelperInterface
 {
@@ -22,7 +21,6 @@ interface HelperInterface
      * @param array $data
      * @param mixed $matchFields
      * @return string
-     * @since 2.0.0
      */
     public function mergeVisitorProductIndex($mainTable, $data, $matchFields);
 
@@ -35,7 +33,6 @@ public function mergeVisitorProductIndex($mainTable, $data, $matchFields);
      * @param string $mainTable
      * @param string $aggregationTable
      * @return $this
-     * @since 2.0.0
      */
     public function updateReportRatingPos($connection, $type, $column, $mainTable, $aggregationTable);
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 09a12b1ce7015..112a8a93a152c 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -14,7 +14,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Is live
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isLive = false;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Sales amount expression
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_salesAmountExpression;
 
@@ -38,7 +35,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -46,7 +42,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Store manager instance
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -54,7 +49,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Locale date instance
      *
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -62,7 +56,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Order config instance
      *
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
@@ -70,7 +63,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * Reports order factory
      *
      * @var \Magento\Sales\Model\ResourceModel\Report\OrderFactory
-     * @since 2.0.0
      */
     protected $_reportOrderFactory;
 
@@ -92,7 +84,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -132,7 +123,6 @@ public function __construct(
      * @param string $range
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function checkIsLive($range)
     {
@@ -148,7 +138,6 @@ public function checkIsLive($range)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isLive()
     {
@@ -163,7 +152,6 @@ public function isLive()
      * @param mixed $customEnd
      * @param int $isFilter
      * @return $this
-     * @since 2.0.0
      */
     public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
     {
@@ -181,7 +169,6 @@ public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
      * Get sales amount expression
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSalesAmountExpression()
     {
@@ -222,7 +209,6 @@ protected function _getSalesAmountExpression()
      * @param mixed $customEnd
      * @param int $isFilter
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareSummaryLive($range, $customStart, $customEnd, $isFilter = 0)
     {
@@ -284,7 +270,6 @@ protected function _prepareSummaryLive($range, $customStart, $customEnd, $isFilt
      * @param string|null $customStart
      * @param string|null $customEnd
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareSummaryAggregated($range, $customStart, $customEnd)
     {
@@ -329,7 +314,6 @@ protected function _prepareSummaryAggregated($range, $customStart, $customEnd)
      *
      * @param string $range
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     protected function _getRangeExpression($range)
     {
@@ -363,7 +347,6 @@ protected function _getRangeExpression($range)
      * @param string $range
      * @param string $attribute
      * @return string
-     * @since 2.0.0
      */
     protected function _getRangeExpressionForAttribute($range, $attribute)
     {
@@ -379,7 +362,6 @@ protected function _getRangeExpressionForAttribute($range, $attribute)
      * @param string|null $from
      * @param string|null $to
      * @return string
-     * @since 2.0.0
      */
     protected function _getTZRangeOffsetExpression($range, $attribute, $from = null, $to = null)
     {
@@ -399,7 +381,6 @@ protected function _getTZRangeOffsetExpression($range, $attribute, $from = null,
      * @param string $tzTo
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom = '+00:00', $tzTo = null)
     {
@@ -427,7 +408,6 @@ protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom
      * @param bool $returnObjects
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getDateRange($range, $customStart, $customEnd, $returnObjects = false)
     {
@@ -498,7 +478,6 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
      * Add item count expression
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addItemCountExpr()
     {
@@ -511,7 +490,6 @@ public function addItemCountExpr()
      *
      * @param int $isFilter
      * @return $this
-     * @since 2.0.0
      */
     public function calculateTotals($isFilter = 0)
     {
@@ -529,7 +507,6 @@ public function calculateTotals($isFilter = 0)
      *
      * @param int $isFilter
      * @return $this
-     * @since 2.0.0
      */
     protected function _calculateTotalsLive($isFilter = 0)
     {
@@ -582,7 +559,6 @@ protected function _calculateTotalsLive($isFilter = 0)
      * @param int $isFilter
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _calculateTotalsAggregated($isFilter = 0)
     {
@@ -614,7 +590,6 @@ protected function _calculateTotalsAggregated($isFilter = 0)
      *
      * @param int $isFilter
      * @return $this
-     * @since 2.0.0
      */
     public function calculateSales($isFilter = 0)
     {
@@ -677,7 +652,6 @@ public function calculateSales($isFilter = 0)
      * @param string $fromDate
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($fromDate, $toDate)
     {
@@ -703,7 +677,6 @@ public function setDateRange($fromDate, $toDate)
      *
      * @param int[] $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -754,7 +727,6 @@ public function setStoreIds($storeIds)
      * Add group By customer attribute
      *
      * @return $this
-     * @since 2.0.0
      */
     public function groupByCustomer()
     {
@@ -767,7 +739,6 @@ public function groupByCustomer()
      *
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function joinCustomerName($alias = 'name')
     {
@@ -781,7 +752,6 @@ public function joinCustomerName($alias = 'name')
      * Add Order count field to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOrdersCount()
     {
@@ -796,7 +766,6 @@ public function addOrdersCount()
      *
      * @param bool $convertCurrency
      * @return $this
-     * @since 2.0.0
      */
     public function addRevenueToSelect($convertCurrency = false)
     {
@@ -816,7 +785,6 @@ public function addRevenueToSelect($convertCurrency = false)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addSumAvgTotals($storeId = 0)
     {
@@ -847,7 +815,6 @@ public function addSumAvgTotals($storeId = 0)
      * @param string $baseSubtotalCanceled
      * @param string $baseDiscountCanceled
      * @return string
-     * @since 2.0.0
      */
     protected function getTotalsExpression(
         $storeId,
@@ -867,7 +834,6 @@ protected function getTotalsExpression(
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByTotalAmount($dir = self::SORT_ORDER_DESC)
     {
@@ -880,7 +846,6 @@ public function orderByTotalAmount($dir = self::SORT_ORDER_DESC)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByOrdersCount($dir = self::SORT_ORDER_DESC)
     {
@@ -893,7 +858,6 @@ public function orderByOrdersCount($dir = self::SORT_ORDER_DESC)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
     {
@@ -906,7 +870,6 @@ public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByCreatedAt($dir = self::SORT_ORDER_DESC)
     {
@@ -918,7 +881,6 @@ public function orderByCreatedAt($dir = self::SORT_ORDER_DESC)
      * Get select count sql
      *
      * @return Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -939,7 +901,6 @@ public function getSelectCountSql()
      *
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _initInitialFieldsToSelect()
     {
@@ -952,7 +913,6 @@ protected function _initInitialFieldsToSelect()
      *
      * @param string $period
      * @return $this
-     * @since 2.0.0
      */
     public function addCreateAtPeriodFilter($period)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
index 11e669a4ad75f..0e1bd49320c06 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
@@ -14,7 +14,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Product entity identifier
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_productEntityId;
 
@@ -32,7 +30,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Product entity table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_productEntityTableName;
 
@@ -40,7 +37,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Product entity attribute set identifier
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_productEntityAttributeSetId;
 
@@ -48,25 +44,21 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Select count
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_selectCountSqlType = 0;
 
     /**
      * @var \Magento\Reports\Model\Event\TypeFactory
-     * @since 2.0.0
      */
     protected $_eventTypeFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_productType;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Collection
-     * @since 2.0.0
      */
     protected $quoteResource;
 
@@ -98,7 +90,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param mixed $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -162,7 +153,6 @@ public function __construct(
      *
      * @param int $type
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectCountSqlType($type)
     {
@@ -176,7 +166,6 @@ public function setSelectCountSqlType($type)
      *
      * @param string $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setProductEntityId($entityId)
     {
@@ -189,7 +178,6 @@ public function setProductEntityId($entityId)
      * @codeCoverageIgnore
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductEntityId()
     {
@@ -202,7 +190,6 @@ public function getProductEntityId()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setProductEntityTableName($value)
     {
@@ -215,7 +202,6 @@ public function setProductEntityTableName($value)
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductEntityTableName()
     {
@@ -227,7 +213,6 @@ public function getProductEntityTableName()
      * @codeCoverageIgnore
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductAttributeSetId()
     {
@@ -240,7 +225,6 @@ public function getProductAttributeSetId()
      *
      * @param int $value
      * @return $this
-     * @since 2.0.0
      */
     public function setProductAttributeSetId($value)
     {
@@ -252,7 +236,6 @@ public function setProductAttributeSetId($value)
      * Join fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinFields()
     {
@@ -267,7 +250,6 @@ protected function _joinFields()
      * Get select count sql
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -302,7 +284,6 @@ public function getSelectCountSql()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     {
@@ -321,7 +302,6 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
      * @param string $from
      * @param string $to
      * @return $this
-     * @since 2.0.0
      */
     public function addViewsCount($from = '', $to = '')
     {
@@ -370,7 +350,6 @@ public function addViewsCount($from = '', $to = '')
      * @param string $from
      * @param string $to
      * @return string Formatted sql string
-     * @since 2.0.0
      */
     protected function _prepareBetweenSql($fieldName, $from, $to)
     {
@@ -388,7 +367,6 @@ protected function _prepareBetweenSql($fieldName, $from, $to)
      * @param array $storeIds
      * @param array $websiteIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreRestrictions($storeIds, $websiteIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
index 3d4b79475242e..d1e03429d1bf4 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Identifier field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'link_id';
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Add downloads summary grouping by product
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addSummary()
     {
@@ -71,7 +68,6 @@ public function addSummary()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     {
@@ -89,7 +85,6 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
      * @param string $field
      * @param null|string $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/AbstractIndex.php
index 68317c0c8e3b2..c394d3ec2e8ca 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/AbstractIndex.php
@@ -9,7 +9,6 @@
 /**
  * Reports Product Index Abstract Resource Model
  * @api
- * @since 2.0.0
  */
 abstract class AbstractIndex extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ abstract class AbstractIndex extends \Magento\Framework\Model\ResourceModel\Db\A
      * Reports helper
      *
      * @var \Magento\Reports\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -27,7 +25,6 @@ abstract class AbstractIndex extends \Magento\Framework\Model\ResourceModel\Db\A
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Helper $resourceHelper
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Reports\Model\Product\Index\AbstractIndex $object
      * @return $this
-     * @since 2.0.0
      */
     public function updateCustomerFromVisitor(\Magento\Reports\Model\Product\Index\AbstractIndex $object)
     {
@@ -104,7 +100,6 @@ public function updateCustomerFromVisitor(\Magento\Reports\Model\Product\Index\A
      *
      * @param \Magento\Reports\Model\Product\Index\AbstractIndex $object
      * @return $this
-     * @since 2.0.0
      */
     public function purgeVisitorByCustomer(\Magento\Reports\Model\Product\Index\AbstractIndex $object)
     {
@@ -127,7 +122,6 @@ public function purgeVisitorByCustomer(\Magento\Reports\Model\Product\Index\Abst
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -156,7 +150,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
      * Clean index (visitor)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -196,7 +189,6 @@ public function clean()
      * @param \Magento\Framework\DataObject|\Magento\Reports\Model\Product\Index\AbstractIndex $object
      * @param int[] $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function registerIds(\Magento\Framework\DataObject $object, $productIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
index 0c90efb1521fd..098a1ce5f8d69 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
@@ -14,7 +14,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -22,13 +21,11 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
      * Customer id
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_customerId = null;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -57,7 +54,6 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
      * @param mixed $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -111,7 +107,6 @@ public function __construct(
      * Retrieve Product Index table name
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function _getTableName();
 
@@ -119,7 +114,6 @@ abstract protected function _getTableName();
      * Join index table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinIdxTable()
     {
@@ -139,7 +133,6 @@ protected function _joinIdxTable()
      * Add Viewed Products Index to Collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addIndexFilter()
     {
@@ -155,7 +148,6 @@ public function addIndexFilter()
      *
      * @param array $ids
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByIds($ids)
     {
@@ -171,7 +163,6 @@ public function addFilterByIds($ids)
      * Retrieve Where Condition to Index table
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getWhereCondition()
     {
@@ -194,7 +185,6 @@ protected function _getWhereCondition()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -207,7 +197,6 @@ public function setCustomerId($id)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setAddedAtOrder($dir = self::SORT_ORDER_DESC)
     {
@@ -222,7 +211,6 @@ public function setAddedAtOrder($dir = self::SORT_ORDER_DESC)
      *
      * @param int|array $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function excludeProductIds($productIds)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared.php
index ffad084730c0d..09d8c5301c039 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Compared extends \Magento\Reports\Model\ResourceModel\Product\Index\AbstractIndex
 {
@@ -21,7 +20,6 @@ class Compared extends \Magento\Reports\Model\ResourceModel\Product\Index\Abstra
      * Initialize connection and main resource table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared/Collection.php
index c54d23003b7ce..b6ae025781391 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Product\Index\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Index\Coll
      * Retrieve Product Index table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTableName()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed.php
index c8f9d52412a3a..ff0dbe737bc1b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Viewed extends \Magento\Reports\Model\ResourceModel\Product\Index\AbstractIndex
 {
@@ -22,7 +21,6 @@ class Viewed extends \Magento\Reports\Model\ResourceModel\Product\Index\Abstract
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed/Collection.php
index 669f20b2233ef..26c759d33e9f1 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Product\Index\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Index\Coll
      * Retrieve Product Index table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTableName()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
index 7fc57de330ff1..da1da7bc3c92b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
@@ -16,7 +16,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
      * Flag about is joined CatalogInventory Stock Item
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_inventoryItemJoined = false;
 
@@ -32,25 +30,21 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
      * Alias for CatalogInventory Stock Item Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_inventoryItemTableAlias = 'lowstock_inventory_item';
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Item
-     * @since 2.0.0
      */
     protected $_itemResource;
 
@@ -85,7 +79,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -151,7 +144,6 @@ public function __construct(
      * Retrieve CatalogInventory Stock Item Table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInventoryItemTable()
     {
@@ -162,7 +154,6 @@ protected function _getInventoryItemTable()
      * Retrieve CatalogInventory Stock Item Table Id field name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInventoryItemIdField()
     {
@@ -173,7 +164,6 @@ protected function _getInventoryItemIdField()
      * Retrieve alias for CatalogInventory Stock Item Table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInventoryItemTableAlias()
     {
@@ -186,7 +176,6 @@ protected function _getInventoryItemTableAlias()
      * @param string $field
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     protected function _addInventoryItemFieldToSelect($field, $alias = null)
     {
@@ -209,7 +198,6 @@ protected function _addInventoryItemFieldToSelect($field, $alias = null)
      *
      * @param string $field
      * @return string
-     * @since 2.0.0
      */
     protected function _getInventoryItemField($field)
     {
@@ -221,7 +209,6 @@ protected function _getInventoryItemField($field)
      *
      * @param array $fields
      * @return $this
-     * @since 2.0.0
      */
     public function joinInventoryItem($fields = [])
     {
@@ -262,7 +249,6 @@ public function joinInventoryItem($fields = [])
      * @param array|string $typeFilter
      * @throws LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function filterByProductType($typeFilter)
     {
@@ -277,7 +263,6 @@ public function filterByProductType($typeFilter)
      * Add filter by product types from config - only types which have QTY parameter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function filterByIsQtyProductTypes()
     {
@@ -290,7 +275,6 @@ public function filterByIsQtyProductTypes()
      *
      * @param null|int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function useManageStockFilter($storeId = null)
     {
@@ -309,7 +293,6 @@ public function useManageStockFilter($storeId = null)
      *
      * @param null|int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function useNotifyStockQtyFilter($storeId = null)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
index 26dfde69f6760..51238f2c97fee 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
@@ -16,7 +16,6 @@
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
 {
@@ -26,7 +25,6 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
      * @param int $from
      * @param int $to
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($from, $to)
     {
@@ -48,7 +46,6 @@ public function setDateRange($from, $to)
      * @param string $from
      * @param string $to
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderedQty($from = '', $to = '')
     {
@@ -88,7 +85,6 @@ public function addOrderedQty($from = '', $to = '')
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -104,7 +100,6 @@ public function setStoreIds($storeIds)
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     {
@@ -138,7 +133,6 @@ public function getSelectCountSql()
      * @param string $from
      * @param string $to
      * @return string Formatted sql string
-     * @since 2.0.0
      */
     protected function prepareBetweenSql($fieldName, $from, $to)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection/Initial.php
index 9167c1c834210..5102de29ad4eb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection/Initial.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection/Initial.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
 {
@@ -21,7 +20,6 @@ class Initial extends \Magento\Reports\Model\ResourceModel\Report\Collection
      * Report sub-collection class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reportCollection = \Magento\Reports\Model\ResourceModel\Product\Sold\Collection::class;
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
index a503a388904a8..258351308e171 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Quote\Model\ResourceModel\Quote\Collection
 {
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $customerResource;
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Quote\Model\ResourceModel\Quote\Collection
      * @param \Magento\Customer\Model\ResourceModel\Customer $customerResource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -56,7 +53,6 @@ public function __construct(
      * @param array $storeIds
      * @param string $filter
      * @return $this
-     * @since 2.0.0
      */
     public function prepareForAbandonedReport($storeIds, $filter = null)
     {
@@ -90,7 +86,6 @@ public function prepareForAbandonedReport($storeIds, $filter = null)
      *
      * @param array|null $filter
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerData($filter = null)
     {
@@ -118,7 +113,6 @@ public function addCustomerData($filter = null)
      * @param array $storeIds
      * @param null|array $filter
      * @return $this
-     * @since 2.0.0
      */
     public function addSubtotal($storeIds = '', $filter = null)
     {
@@ -157,7 +151,6 @@ public function addSubtotal($storeIds = '', $filter = null)
      * Resolve customers data based on ids quote table.
      *
      * @return void
-     * @since 2.0.0
      */
     public function resolveCustomerNames()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
index 8b8b734dd04c8..dfdd66455d02e 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
@@ -9,7 +9,6 @@
  * Factory class for @see \Magento\Reports\Model\ResourceModel\Quote\Collection
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CollectionFactory implements \Magento\Reports\Model\ResourceModel\Quote\CollectionFactoryInterface
 {
@@ -17,7 +16,6 @@ class CollectionFactory implements \Magento\Reports\Model\ResourceModel\Quote\Co
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -25,7 +23,6 @@ class CollectionFactory implements \Magento\Reports\Model\ResourceModel\Quote\Co
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -34,7 +31,6 @@ class CollectionFactory implements \Magento\Reports\Model\ResourceModel\Quote\Co
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc)
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactoryInterface.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactoryInterface.php
index 07ec9d953cf01..996bbcc4449a7 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactoryInterface.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactoryInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CollectionFactoryInterface
 {
@@ -16,7 +15,6 @@ interface CollectionFactoryInterface
      *
      * @param array $data
      * @return \Magento\Reports\Model\ResourceModel\Quote\Collection
-     * @since 2.0.0
      */
     public function create(array $data = []);
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index ca6640ea65809..b85e85dd4f5a7 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Join fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_joinedFields = [];
 
@@ -29,25 +27,21 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Fields map for correlation names & real selected fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = ['fields' => ['store_id' => 'main_table.store_id']];
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected $productResource;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $customerResource;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $orderResource;
 
@@ -61,7 +55,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -91,7 +84,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -102,7 +94,6 @@ protected function _construct()
      * Prepare select query for products in carts report
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function prepareActiveCartItems()
     {
@@ -131,7 +122,6 @@ public function prepareActiveCartItems()
      *
      * @param array $productIds
      * @return array
-     * @since 2.0.0
      */
     protected function getOrdersData(array $productIds)
     {
@@ -151,7 +141,6 @@ protected function getOrdersData(array $productIds)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
@@ -163,7 +152,6 @@ public function addStoreFilter($storeIds)
      * Get select count sql
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -180,7 +168,6 @@ public function getSelectCountSql()
      * @param array $productIds
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getProductData(array $productIds)
     {
@@ -219,7 +206,6 @@ protected function getProductData(array $productIds)
      * Add data fetched from another database
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Refresh/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Refresh/Collection.php
index 60b6d16311670..1d340fb429027 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Refresh/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Refresh/Collection.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Reports\Model\FlagFactory
-     * @since 2.0.0
      */
     protected $_reportsFlagFactory;
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param string $reportCode
      * @return string
-     * @since 2.0.0
      */
     protected function _getUpdatedAt($reportCode)
     {
@@ -65,7 +60,6 @@ protected function _getUpdatedAt($reportCode)
      * @param bool $logQuery
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/AbstractReport.php b/app/code/Magento/Reports/Model/ResourceModel/Report/AbstractReport.php
index b5129293773bb..09df97a3c2457 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/AbstractReport.php
@@ -10,7 +10,6 @@
  * Abstract report aggregate resource model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\
      * Flag object
      *
      * @var \Magento\Reports\Model\Flag
-     * @since 2.0.0
      */
     protected $_flag = null;
 
@@ -26,7 +24,6 @@ abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\
      * Logger instance
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -34,7 +31,6 @@ abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\
      * Locale date instance
      *
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -42,13 +38,11 @@ abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\
      * Reports flag factory
      *
      * @var \Magento\Reports\Model\FlagFactory
-     * @since 2.0.0
      */
     protected $_reportsFlagFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -62,7 +56,6 @@ abstract class AbstractReport extends \Magento\Framework\Model\ResourceModel\Db\
      * @param \Magento\Framework\Stdlib\DateTime\Timezone\Validator $timezoneValidator
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param null $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -85,7 +78,6 @@ public function __construct(
      * Retrieve flag object
      *
      * @return \Magento\Reports\Model\Flag
-     * @since 2.0.0
      */
     protected function _getFlag()
     {
@@ -101,7 +93,6 @@ protected function _getFlag()
      * @param string $code
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     protected function _setFlagData($code, $value = null)
     {
@@ -124,7 +115,6 @@ protected function _setFlagData($code, $value = null)
      *
      * @param string $code
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getFlagData($code)
     {
@@ -138,7 +128,6 @@ protected function _getFlagData($code)
      *
      * @param string $table
      * @return $this
-     * @since 2.0.0
      */
     protected function _truncateTable($table)
     {
@@ -162,7 +151,6 @@ protected function _truncateTable($table)
      * @param bool $doNotUseTruncate
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearTableByDateRange(
         $table,
@@ -205,7 +193,6 @@ protected function _clearTableByDateRange(
      * @param [][] $additionalWhere
      * @param string $alias
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getTableDateRangeSelect(
         $table,
@@ -257,7 +244,6 @@ protected function _getTableDateRangeSelect(
      * @param string $periodColumn
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return array|bool|string
-     * @since 2.0.0
      */
     protected function _makeConditionFromDateRangeSelect($select, $periodColumn, $connection = null)
     {
@@ -316,7 +302,6 @@ protected function _makeConditionFromDateRangeSelect($select, $periodColumn, $co
      * @param string $relatedAlias
      * @return \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     protected function _getTableDateRangeRelatedSelect(
         $table,
@@ -386,7 +371,6 @@ protected function _getTableDateRangeRelatedSelect(
      * @param null|int|string|\Magento\Store\Model\Store $store
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return string
-     * @since 2.0.0
      */
     public function getStoreTZOffsetQuery(
         $table,
@@ -450,7 +434,6 @@ public function getStoreTZOffsetQuery(
      * @param mixed $to
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getTZOffsetTransitions($timezone, $from = null, $to = null)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
index b6bb2f19fdf7b..e0c22003c8763 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * From value
      *
      * @var \DateTime
-     * @since 2.0.0
      */
     protected $_from;
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * To value
      *
      * @var \DateTime
-     * @since 2.0.0
      */
     protected $_to;
 
@@ -37,7 +34,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Report period
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_period;
 
@@ -45,7 +41,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Intervals
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_intervals;
 
@@ -53,7 +48,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Intervals
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_reports;
 
@@ -61,7 +55,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Page size
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_pageSize;
 
@@ -69,7 +62,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * Array of store ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds;
 
@@ -77,19 +69,16 @@ class Collection extends \Magento\Framework\Data\Collection
      * Set the resource report collection class
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reportCollection = null;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -97,7 +86,6 @@ class Collection extends \Magento\Framework\Data\Collection
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -115,7 +103,6 @@ public function __construct(
      *
      * @param int $period
      * @return $this
-     * @since 2.0.0
      */
     public function setPeriod($period)
     {
@@ -130,7 +117,6 @@ public function setPeriod($period)
      * @param \DateTimeInterface $fromDate
      * @param \DateTimeInterface $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setInterval(\DateTimeInterface $fromDate, \DateTimeInterface $toDate)
     {
@@ -144,7 +130,6 @@ public function setInterval(\DateTimeInterface $fromDate, \DateTimeInterface $to
      * Get intervals
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getIntervals()
     {
@@ -185,7 +170,6 @@ protected function _getIntervals()
      *
      * @param \DateTime $dateStart
      * @return array
-     * @since 2.0.0
      */
     protected function _getDayInterval(\DateTime $dateStart)
     {
@@ -208,7 +192,6 @@ protected function _getDayInterval(\DateTime $dateStart)
      * @param \DateTime $dateEnd
      * @param bool $firstInterval
      * @return array
-     * @since 2.0.0
      */
     protected function _getMonthInterval(\DateTime $dateStart, \DateTime $dateEnd, $firstInterval)
     {
@@ -252,7 +235,6 @@ protected function _getMonthInterval(\DateTime $dateStart, \DateTime $dateEnd, $
      * @param \DateTime $dateEnd
      * @param bool $firstInterval
      * @return array
-     * @since 2.0.0
      */
     protected function _getYearInterval(\DateTime $dateStart, \DateTime $dateEnd, $firstInterval)
     {
@@ -281,7 +263,6 @@ protected function _getYearInterval(\DateTime $dateStart, \DateTime $dateEnd, $f
      * Return date periods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPeriods()
     {
@@ -294,7 +275,6 @@ public function getPeriods()
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreIds($storeIds)
     {
@@ -307,7 +287,6 @@ public function setStoreIds($storeIds)
      * @codeCoverageIgnore
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -318,7 +297,6 @@ public function getStoreIds()
      * Get size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -331,7 +309,6 @@ public function getSize()
      *
      * @param int $size
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($size)
     {
@@ -344,7 +321,6 @@ public function setPageSize($size)
      * @codeCoverageIgnore
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -357,7 +333,6 @@ public function getPageSize()
      * @param int $fromDate
      * @param int $toDate
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _getReport($fromDate, $toDate)
     {
@@ -373,7 +348,6 @@ protected function _getReport($fromDate, $toDate)
      * Get Reports based on intervals
      *
      * @return array
-     * @since 2.0.0
      */
     public function getReports()
     {
@@ -399,7 +373,6 @@ public function getReports()
      * @return $this
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/AbstractCollection.php
index 66eb6473e136f..ca78fd6e9cee4 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/AbstractCollection.php
@@ -9,7 +9,6 @@
  * Report collection abstract model
  *
  * @api
- * @since 2.0.0
  */
 class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * From date
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_from = null;
 
@@ -25,7 +23,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * To date
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_to = null;
 
@@ -33,7 +30,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * Period
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_period = null;
 
@@ -41,7 +37,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * Store ids
      *
      * @var int|array
-     * @since 2.0.0
      */
     protected $_storesIds = 0;
 
@@ -49,7 +44,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * Is totals
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isTotals = false;
 
@@ -57,7 +51,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * Is subtotals
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isSubTotals = false;
 
@@ -65,7 +58,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      * Aggregated columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_aggregatedColumns = [];
 
@@ -75,7 +67,6 @@ class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Colle
      *
      * @param array $columns
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregatedColumns(array $columns)
     {
@@ -88,7 +79,6 @@ public function setAggregatedColumns(array $columns)
      * @codeCoverageIgnore
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAggregatedColumns()
     {
@@ -102,7 +92,6 @@ public function getAggregatedColumns()
      * @param mixed $from
      * @param mixed $to
      * @return $this
-     * @since 2.0.0
      */
     public function setDateRange($from = null, $to = null)
     {
@@ -117,7 +106,6 @@ public function setDateRange($from = null, $to = null)
      *
      * @param string $period
      * @return $this
-     * @since 2.0.0
      */
     public function setPeriod($period)
     {
@@ -129,7 +117,6 @@ public function setPeriod($period)
      * Apply needed aggregated table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyAggregatedTable()
     {
@@ -140,7 +127,6 @@ protected function _applyAggregatedTable()
      * Apply date range filter
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyDateRangeFilter()
     {
@@ -160,7 +146,6 @@ protected function _applyDateRangeFilter()
      *
      * @param mixed $storeIds (null, int|string, array, array may contain null)
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
@@ -173,7 +158,6 @@ public function addStoreFilter($storeIds)
      *
      * @param \Magento\Framework\DB\Select $select
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyStoresFilterToSelect(\Magento\Framework\DB\Select $select)
     {
@@ -204,7 +188,6 @@ protected function _applyStoresFilterToSelect(\Magento\Framework\DB\Select $sele
      * Apply stores filter
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyStoresFilter()
     {
@@ -216,7 +199,6 @@ protected function _applyStoresFilter()
      *
      * @param null|bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function isTotals($flag = null)
     {
@@ -231,7 +213,6 @@ public function isTotals($flag = null)
      * Getter for isSubTotals
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSubTotals()
     {
@@ -244,7 +225,6 @@ public function isSubTotals()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSubTotals($flag)
     {
@@ -256,7 +236,6 @@ public function setIsSubTotals($flag)
      * Custom filters application ability
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyCustomFilter()
     {
@@ -265,7 +244,6 @@ protected function _applyCustomFilter()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -276,7 +254,6 @@ protected function _initSelect()
      * Apply filters common to reports
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/Factory.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/Factory.php
index 3cb8a741873c9..e2453eab8d30a 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/Factory.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection/Factory.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $arguments
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed.php
index f17673ea42873..e35bb80230f99 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Viewed extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
 {
@@ -36,7 +35,6 @@ class Viewed extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
      * Product resource instance
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_productResource;
 
@@ -44,7 +42,6 @@ class Viewed extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
      * Resource helper instance
      *
      * @var \Magento\Reports\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -60,7 +57,6 @@ class Viewed extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
      * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
      * @param \Magento\Reports\Model\ResourceModel\Helper $resourceHelper
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -90,7 +86,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -104,7 +99,6 @@ protected function _construct()
      * @param null|mixed $to
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/Collection.php
index f04e42e8bb7e4..dd10329455182 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/Collection.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Bestsellers\Collection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Bestsellers\C
      * Tables per period
      *
      * @var array
-     * @since 2.0.0
      */
     protected $tableForPeriod = [
         'daily' => \Magento\Reports\Model\ResourceModel\Report\Product\Viewed::AGGREGATION_DAILY,
@@ -28,7 +26,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Bestsellers\C
      * Return ordered filed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getOrderedField()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Collection.php
index 80d093f1af91a..ab63d789ac24a 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Review\Model\ResourceModel\Review\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Review\Model\ResourceModel\Review\Collection
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      *
      * @param string $productId
      * @return $this
-     * @since 2.0.0
      */
     public function addProductFilter($productId)
     {
@@ -46,7 +43,6 @@ public function addProductFilter($productId)
      * Reset select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetSelect()
     {
@@ -59,7 +55,6 @@ public function resetSelect()
      * Get select count sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -79,7 +74,6 @@ public function getSelectCountSql()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
index d6038b1d94e4c..dec7ee090b3b1 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Review\Model\ResourceModel\Review\Collection
 {
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer
-     * @since 2.0.0
      */
     protected $_customerResource;
 
@@ -35,7 +33,6 @@ class Collection extends \Magento\Review\Model\ResourceModel\Review\Collection
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -67,7 +64,6 @@ public function __construct(
      * Init Select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -80,7 +76,6 @@ protected function _initSelect()
      * Join customers
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinCustomers()
     {
@@ -111,7 +106,6 @@ protected function _joinCustomers()
      * Get select count sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
index 1bce81296931d..7e7d60fd8f130 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Init Select
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -34,7 +32,6 @@ protected function _initSelect()
      * Join review table to result
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinReview()
     {
@@ -86,7 +83,6 @@ protected function _joinReview()
      * @param string $attribute
      * @param string $dir
      * @return $this|\Magento\Catalog\Model\ResourceModel\Product\Collection
-     * @since 2.0.0
      */
     public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -102,7 +98,6 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
      * Get select count sql
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
index 86fedf7dccaa9..d429edb4e50bb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,13 +20,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Wishlist table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_wishlistTable;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory
-     * @since 2.0.0
      */
     protected $_customerResFactory;
 
@@ -39,7 +36,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerResFactory
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -58,7 +54,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +67,6 @@ protected function _construct()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setWishlistTable($value)
     {
@@ -85,7 +79,6 @@ public function setWishlistTable($value)
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWishlistTable()
     {
@@ -96,7 +89,6 @@ public function getWishlistTable()
      * Retrieve wishlist customer count
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWishlistCustomerCount()
     {
@@ -127,7 +119,6 @@ public function getWishlistCustomerCount()
      * Get shared items collection count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSharedCount()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Product/Collection.php
index f2ae44fc7199e..8f9bb83734a07 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Product/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Wishlist\Model\ResourceModel\Item\Collection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Wishlist\Model\ResourceModel\Item\Collection
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -32,7 +30,6 @@ public function _construct()
      * Add wishlist count
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addWishlistCount()
     {
@@ -55,7 +52,6 @@ public function addWishlistCount()
      * Add customer count to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function getCustomerCount()
     {
@@ -74,7 +70,6 @@ public function getCustomerCount()
      * Get select count sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -95,7 +90,6 @@ public function getSelectCountSql()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     {
diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
index 203e8c84ee090..c7da558180a85 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
@@ -9,31 +9,26 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CatalogProductCompareAddProductObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Reports\Model\Product\Index\ComparedFactory
-     * @since 2.0.0
      */
     protected $_productCompFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
@@ -42,7 +37,6 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
@@ -63,7 +57,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
index 7941cb609dc75..daa52d9daa22d 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
@@ -9,19 +9,16 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CatalogProductCompareClearObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Reports\Model\Product\Index\ComparedFactory
-     * @since 2.0.0
      */
     protected $_productCompFactory;
 
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
@@ -37,7 +34,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
index 7d015542477d6..4c4476ed7c673 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
@@ -9,37 +9,31 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CatalogProductViewObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\ViewedFactory
-     * @since 2.0.0
      */
     protected $_productIndxFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
@@ -49,7 +43,6 @@ class CatalogProductViewObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -70,7 +63,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
index 1fe1f548d2a9f..1e44b3c4fbec2 100644
--- a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
@@ -9,19 +9,16 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CheckoutCartAddProductObserver implements ObserverInterface
 {
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
     /**
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         EventSaver $eventSaver
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/CustomerLoginObserver.php b/app/code/Magento/Reports/Observer/CustomerLoginObserver.php
index c551d974c8062..71891e72341f5 100644
--- a/app/code/Magento/Reports/Observer/CustomerLoginObserver.php
+++ b/app/code/Magento/Reports/Observer/CustomerLoginObserver.php
@@ -9,37 +9,31 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CustomerLoginObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Reports\Model\EventFactory
-     * @since 2.0.0
      */
     protected $_eventFactory;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\ComparedFactory
-     * @since 2.0.0
      */
     protected $_productCompFactory;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\ViewedFactory
-     * @since 2.0.0
      */
     protected $_productIndexFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -49,7 +43,6 @@ class CustomerLoginObserver implements ObserverInterface
      * @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndexFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Reports\Model\EventFactory $event,
@@ -71,7 +64,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
index 6f74af3429190..833834d06bc74 100644
--- a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
+++ b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
@@ -9,26 +9,22 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class CustomerLogoutObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Reports\Model\Product\Index\ComparedFactory
-     * @since 2.0.0
      */
     protected $_productCompFactory;
 
     /**
      * @var \Magento\Reports\Model\Product\Index\ViewedFactory
-     * @since 2.0.0
      */
     protected $_productIndxFactory;
 
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
      * @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
@@ -44,7 +40,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/EventSaver.php b/app/code/Magento/Reports/Observer/EventSaver.php
index eab64b04723e3..d50f24d77b1e1 100644
--- a/app/code/Magento/Reports/Observer/EventSaver.php
+++ b/app/code/Magento/Reports/Observer/EventSaver.php
@@ -7,31 +7,26 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class EventSaver
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Reports\Model\EventFactory
-     * @since 2.0.0
      */
     protected $_eventFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\Visitor
-     * @since 2.0.0
      */
     protected $_customerVisitor;
 
@@ -40,7 +35,6 @@ class EventSaver
      * @param \Magento\Reports\Model\EventFactory $event
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -62,7 +56,6 @@ public function __construct(
      * @param int|null $subjectId
      * @param int $subtype
      * @return void
-     * @since 2.0.0
      */
     public function save($eventTypeId, $objectId, $subjectId = null, $subtype = 0)
     {
diff --git a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
index 696d99da0cde7..b8ae653043362 100644
--- a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
+++ b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
@@ -9,19 +9,16 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class SendfriendProductObserver implements ObserverInterface
 {
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
     /**
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         EventSaver $eventSaver
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
index e9f920c47753d..1bbd4a1666ba6 100644
--- a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
@@ -9,19 +9,16 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class WishlistAddProductObserver implements ObserverInterface
 {
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
     /**
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         EventSaver $eventSaver
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Observer/WishlistShareObserver.php b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
index 213ccfa58275a..832429cf6a3a0 100644
--- a/app/code/Magento/Reports/Observer/WishlistShareObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
@@ -9,19 +9,16 @@
 
 /**
  * Reports Event observer model
- * @since 2.0.0
  */
 class WishlistShareObserver implements ObserverInterface
 {
     /**
      * @var EventSaver
-     * @since 2.0.0
      */
     protected $eventSaver;
 
     /**
      * @param EventSaver $eventSaver
-     * @since 2.0.0
      */
     public function __construct(
         EventSaver $eventSaver
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Reports/Setup/InstallData.php b/app/code/Magento/Reports/Setup/InstallData.php
index c66ea8aa3f56c..66ee0d9f288bc 100644
--- a/app/code/Magento/Reports/Setup/InstallData.php
+++ b/app/code/Magento/Reports/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements \Magento\Framework\Setup\InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements \Magento\Framework\Setup\InstallDataInterface
      * Page factory
      *
      * @var PageFactory
-     * @since 2.0.0
      */
     private $pageFactory;
 
@@ -29,7 +27,6 @@ class InstallData implements \Magento\Framework\Setup\InstallDataInterface
      * Init
      *
      * @param PageFactory $pageFactory
-     * @since 2.0.0
      */
     public function __construct(PageFactory $pageFactory)
     {
@@ -38,7 +35,6 @@ public function __construct(PageFactory $pageFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Reports/Setup/InstallSchema.php b/app/code/Magento/Reports/Setup/InstallSchema.php
index df55ac50e6a49..0ad61096612ab 100644
--- a/app/code/Magento/Reports/Setup/InstallSchema.php
+++ b/app/code/Magento/Reports/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
index 9a3948869241f..0ba9ddd7d0463 100644
--- a/app/code/Magento/RequireJs/Block/Html/Head/Config.php
+++ b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -13,31 +13,26 @@
  * Block responsible for including RequireJs config on the page
  *
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
      * @var RequireJsConfig
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var \Magento\RequireJs\Model\FileManager
-     * @since 2.0.0
      */
     private $fileManager;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     protected $minification;
 
@@ -55,7 +50,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      * @param \Magento\Framework\View\Asset\ConfigInterface $bundleConfig
      * @param Minification $minification
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -78,7 +72,6 @@ public function __construct(
      * Include RequireJs configuration as an asset on the page
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 8a285a0f45ddc..386fcfc474e34 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -11,31 +11,26 @@
 
 /**
  * A service for handling RequireJS files in the application
- * @since 2.0.0
  */
 class FileManager
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var AppState
-     * @since 2.0.0
      */
     private $appState;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
@@ -44,7 +39,6 @@ class FileManager
      * @param \Magento\Framework\Filesystem $appFilesystem
      * @param AppState $appState
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -62,7 +56,6 @@ public function __construct(
      * Create a view asset representing the aggregated configuration file
      *
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createRequireJsConfigAsset()
     {
@@ -75,7 +68,6 @@ public function createRequireJsConfigAsset()
      * Create '.min' files resolver asset
      *
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createMinResolverAsset()
     {
@@ -88,7 +80,6 @@ public function createMinResolverAsset()
      * Create a view asset representing the aggregated configuration file
      *
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createRequireJsMixinsAsset()
     {
@@ -99,7 +90,6 @@ public function createRequireJsMixinsAsset()
      * Create a view asset representing the aggregated configuration file
      *
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createRequireJsAsset()
     {
@@ -139,7 +129,6 @@ public function createRequireJsMapConfigAsset()
      *
      * @param string $relPath
      * @return void
-     * @since 2.0.0
      */
     private function ensureSourceFile($relPath)
     {
@@ -154,7 +143,6 @@ private function ensureSourceFile($relPath)
      *
      * @param string $relPath
      * @return void
-     * @since 2.0.0
      */
     private function ensureMinResolverFile($relPath)
     {
@@ -168,7 +156,6 @@ private function ensureMinResolverFile($relPath)
      * Create a view asset representing the static js functionality
      *
      * @return \Magento\Framework\View\Asset\File|false
-     * @since 2.0.0
      */
     public function createStaticJsAsset()
     {
@@ -182,7 +169,6 @@ public function createStaticJsAsset()
      * Create a view assets representing the bundle js functionality
      *
      * @return \Magento\Framework\View\Asset\File[]
-     * @since 2.0.0
      */
     public function createBundleJsPool()
     {
@@ -209,10 +195,9 @@ public function createBundleJsPool()
 
     /**
      * Remove all bundles from pool
-     * @deprecated 2.2.0
+     * @deprecated 2.1.1
      *
      * @return bool
-     * @since 2.0.0
      */
     public function clearBundleJsPool()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index 4796173288d51..26dff821308d6 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -12,7 +12,6 @@
  * Adminhtml add Review main block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Add extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -20,7 +19,6 @@ class Add extends \Magento\Backend\Block\Widget\Form\Container
      * Initialize add review
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -123,7 +121,6 @@ protected function _construct()
      * Get add new review header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 156db36bb23b3..2d619725ae201 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -9,7 +9,6 @@
  * Adminhtml add product review form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Review data
      *
      * @var \Magento\Review\Helper\Data
-     * @since 2.0.0
      */
     protected $_reviewData = null;
 
@@ -25,7 +23,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Core system store model
      *
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -36,7 +33,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Review\Helper\Data $reviewData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index fea72fa2f15ca..d6868eae6fcbc 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * Review edit form
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -15,7 +14,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Review action pager
      *
      * @var \Magento\Review\Helper\Action\Pager
-     * @since 2.0.0
      */
     protected $_reviewActionPager = null;
 
@@ -23,7 +21,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -31,7 +28,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Review model factory
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
@@ -41,7 +37,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Review\Helper\Action\Pager $reviewActionPager
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -218,7 +212,6 @@ protected function _construct()
      * Get edit review header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 6b9aec3c11caa..f721a4722f955 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Review\Block\Adminhtml\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -20,13 +19,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Review data
      *
      * @var \Magento\Review\Helper\Data
-     * @since 2.0.0
      */
     protected $_reviewData = null;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -34,7 +31,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Catalog product factory
      *
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -42,7 +38,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Core system store model
      *
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -55,7 +50,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Review\Helper\Data $reviewData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -79,7 +73,6 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index d9f2d421d6cb7..6c7b8155b491a 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -22,7 +22,6 @@
 /**
  * Class \Magento\Review\Block\Adminhtml\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -30,7 +29,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Review action pager
      *
      * @var \Magento\Review\Helper\Action\Pager
-     * @since 2.0.0
      */
     protected $_reviewActionPager = null;
 
@@ -38,7 +36,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Review data
      *
      * @var \Magento\Review\Helper\Data
-     * @since 2.0.0
      */
     protected $_reviewData = null;
 
@@ -46,7 +43,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -54,7 +50,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Review collection model factory
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productsFactory;
 
@@ -62,7 +57,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Review model factory
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
@@ -75,7 +69,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Review\Helper\Action\Pager $reviewActionPager
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -99,7 +92,6 @@ public function __construct(
      * Initialize grid
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -112,7 +104,6 @@ protected function _construct()
      * Save search results
      *
      * @return \Magento\Backend\Block\Widget\Grid
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
@@ -128,7 +119,6 @@ protected function _afterLoadCollection()
      * Prepare collection
      *
      * @return \Magento\Review\Block\Adminhtml\Grid
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -170,7 +160,6 @@ protected function _prepareCollection()
      *
      * @return \Magento\Backend\Block\Widget\Grid
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -322,7 +311,6 @@ protected function _prepareColumns()
      * Prepare grid mass actions
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -371,7 +359,6 @@ protected function _prepareMassaction()
      *
      * @param \Magento\Review\Model\Review|\Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -390,7 +377,6 @@ public function getRowUrl($row)
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
index bd6461f6a4ae5..b042def8dac77 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
@@ -9,7 +9,6 @@
  * Adminhtml review grid filter by type
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
@@ -17,7 +16,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * Get grid options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOptions()
     {
@@ -33,7 +31,6 @@ protected function _getOptions()
      * Get condition
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index 2320b2d961d8c..83108ad6cb514 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -9,7 +9,6 @@
  * Adminhtml review grid item renderer for item type
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -18,7 +17,6 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      *
      * @param \Magento\Framework\DataObject $row
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Main.php b/app/code/Magento/Review/Block/Adminhtml/Main.php
index dd16965626c55..78c95fdc8ea11 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Main.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Main.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Review\Block\Adminhtml\Main
  *
- * @since 2.0.0
  */
 class Main extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -20,13 +19,11 @@ class Main extends \Magento\Backend\Block\Widget\Grid\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -34,7 +31,6 @@ class Main extends \Magento\Backend\Block\Widget\Grid\Container
      * Catalog product model factory
      *
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -42,7 +38,6 @@ class Main extends \Magento\Backend\Block\Widget\Grid\Container
      * Customer View Helper
      *
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -53,7 +48,6 @@ class Main extends \Magento\Backend\Block\Widget\Grid\Container
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -74,7 +68,6 @@ public function __construct(
      * Initialize add new review
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab.php b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab.php
index 86db6d9b255ee..4a9334c30736f 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab.php
@@ -7,14 +7,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tab extends \Magento\Backend\Block\Widget\Tab
 {
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
index 7a271c7864434..8d9eee51958e9 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
@@ -10,7 +10,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Reviews extends \Magento\Review\Block\Adminhtml\Grid
 {
@@ -18,7 +17,6 @@ class Reviews extends \Magento\Review\Block\Adminhtml\Grid
      * Hide grid mass action elements
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -29,7 +27,6 @@ protected function _prepareMassaction()
      * Determine ajax url for grid refresh
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 0e59bb7828fa6..d3bbdf9a7eb40 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
      * Website collection
      *
      * @var \Magento\Store\Model\ResourceModel\Website\CollectionFactory
-     * @since 2.0.0
      */
     protected $_websitesFactory;
 
@@ -36,7 +34,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +67,6 @@ public function __construct(
      * Initialize review
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +79,6 @@ protected function _construct()
      * Prepare product review grid
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -144,7 +139,6 @@ protected function _prepareColumns()
      * Get catalog product grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -156,7 +150,6 @@ public function getGridUrl()
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
@@ -167,7 +160,6 @@ public function getRowUrl($row)
      * Prepare mass action
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating.php b/app/code/Magento/Review/Block/Adminhtml/Rating.php
index 12e6d8c3b1b4d..aad6def13fe71 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rating extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index ffce3409a447b..adad931da5a69 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -12,7 +12,6 @@
 
 /**
  * Adminhtml detailed rating stars
- * @since 2.0.0
  */
 class Detailed extends \Magento\Backend\Block\Template
 {
@@ -20,7 +19,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * Vote collection
      *
      * @var VoteCollection
-     * @since 2.0.0
      */
     protected $_voteCollection = false;
 
@@ -28,7 +26,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * Rating detail template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Review::rating/detailed.phtml';
 
@@ -36,7 +33,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -44,7 +40,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * Rating resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Rating\CollectionFactory
-     * @since 2.0.0
      */
     protected $_ratingsFactory;
 
@@ -52,7 +47,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * Rating resource option model
      *
      * @var \Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory
-     * @since 2.0.0
      */
     protected $_votesFactory;
 
@@ -62,7 +56,6 @@ class Detailed extends \Magento\Backend\Block\Template
      * @param \Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory $votesFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -81,7 +74,6 @@ public function __construct(
      * Initialize review data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -96,7 +88,6 @@ protected function _construct()
      * Get collection of ratings
      *
      * @return RatingCollection
-     * @since 2.0.0
      */
     public function getRating()
     {
@@ -145,7 +136,6 @@ public function getRating()
      * Set independent mode
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setIndependentMode()
     {
@@ -160,7 +150,6 @@ public function setIndependentMode()
      * @param \Magento\Review\Model\Rating $rating
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isSelected($option, $rating)
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
index 7295cc8ce0414..0c9c963b1b874 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * Rating edit form
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -15,7 +14,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -23,13 +21,11 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Rating factory
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Review';
 
@@ -38,7 +34,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -74,7 +68,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Form.php
index 60263266481c0..61bb2ce2e903a 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Form.php
@@ -9,13 +9,11 @@
  * Rating edit form block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index 3c274de3c7811..097b88e95adb7 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Review\Block\Adminhtml\Rating\Edit\Tab\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -16,13 +15,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * System store
      *
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $systemStore;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rating/form.phtml';
 
@@ -30,7 +27,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Session
      *
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
@@ -38,13 +34,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Option factory
      *
      * @var \Magento\Review\Model\Rating\OptionFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     protected $fieldset;
 
@@ -56,7 +50,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -80,7 +73,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -103,7 +95,6 @@ protected function _prepareForm()
      * Add rating fieldset to form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addRatingFieldset()
     {
@@ -133,7 +124,6 @@ protected function addRatingFieldset()
      * Set rating data to form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setRatingData()
     {
@@ -159,7 +149,6 @@ protected function setRatingData()
      *
      * @param array $ratingCodes
      * @return void
-     * @since 2.0.0
      */
     protected function setRatingCodes($ratingCodes)
     {
@@ -175,7 +164,6 @@ protected function setRatingCodes($ratingCodes)
      * Set rating options to form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setRatingOptions()
     {
@@ -213,7 +201,6 @@ protected function setRatingOptions()
      * Add visibility fieldset to form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addVisibilityFieldset()
     {
@@ -253,7 +240,6 @@ protected function addVisibilityFieldset()
      * @param string $formId
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     protected function initFieldset($formId, array $config)
     {
@@ -271,7 +257,6 @@ protected function initFieldset($formId, array $config)
      *
      * @param string $formId
      * @return \Magento\Framework\Data\Form\Element\Fieldset|null
-     * @since 2.0.0
      */
     protected function getFieldset($formId)
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tabs.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tabs.php
index df6e15f767cb7..86c7ee6a24597 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tabs.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tabs.php
@@ -9,13 +9,11 @@
  * Admin rating left menu
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -27,7 +25,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
index af1e29bffe5ad..9c6b5b5adbb33 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
@@ -9,7 +9,6 @@
 
 /**
  * Adminhtml summary rating stars
- * @since 2.0.0
  */
 class Summary extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Summary extends \Magento\Backend\Block\Template
      * Rating summary template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Review::rating/stars/summary.phtml';
 
@@ -25,7 +23,6 @@ class Summary extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -33,7 +30,6 @@ class Summary extends \Magento\Backend\Block\Template
      * Rating resource option model
      *
      * @var \Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory
-     * @since 2.0.0
      */
     protected $_votesFactory;
 
@@ -41,7 +37,6 @@ class Summary extends \Magento\Backend\Block\Template
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
@@ -51,7 +46,6 @@ class Summary extends \Magento\Backend\Block\Template
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      * Initialize review data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +76,6 @@ protected function _construct()
      * Get collection of ratings
      *
      * @return RatingCollection
-     * @since 2.0.0
      */
     public function getRating()
     {
@@ -100,7 +92,6 @@ public function getRating()
      * Get rating summary
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRatingSummary()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
index e8d42a2e35dcb..f62f8e2aa0d4c 100644
--- a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
+++ b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
@@ -14,7 +14,6 @@
  * Class ReviewTab
  *
  * @package Magento\Review\Block\Adminhtml
- * @since 2.0.0
  */
 class ReviewTab extends TabWrapper
 {
@@ -22,13 +21,11 @@ class ReviewTab extends TabWrapper
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAjaxLoaded = true;
 
@@ -38,7 +35,6 @@ class ReviewTab extends TabWrapper
      * @param Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $registry, array $data = [])
     {
@@ -48,7 +44,6 @@ public function __construct(Context $context, Registry $registry, array $data =
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -59,7 +54,6 @@ public function canShowTab()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -70,7 +64,6 @@ public function getTabLabel()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
index 091f35faef7c1..7a935b656cdaf 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss.php
@@ -10,19 +10,16 @@
 /**
  * Class Rss
  * @package Magento\Catalog\Block\Adminhtml\Rss
- * @since 2.0.0
  */
 class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Rss\Product\Review
-     * @since 2.0.0
      */
     protected $rssModel;
 
@@ -31,7 +28,6 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Rss $rssModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -86,7 +81,6 @@ public function getRssData()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -95,7 +89,6 @@ public function getCacheLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -104,7 +97,6 @@ public function isAllowed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -113,7 +105,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
index 7a749777d16a6..755ea9bde530f 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
@@ -9,19 +9,16 @@
  * Class Link
  * @api
  * @package Magento\Review\Block\Adminhtml\Grid\Rss
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rss/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -29,7 +26,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +47,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -61,7 +55,6 @@ public function getLink()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -72,7 +65,6 @@ public function getLabel()
      * Check whether status notification is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -81,7 +73,6 @@ public function isRssAllowed()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Review/Block/Customer/ListCustomer.php b/app/code/Magento/Review/Block/Customer/ListCustomer.php
index cbda0100cc79e..2ba48a26ab0db 100644
--- a/app/code/Magento/Review/Block/Customer/ListCustomer.php
+++ b/app/code/Magento/Review/Block/Customer/ListCustomer.php
@@ -12,7 +12,6 @@
  * Customer Reviews list block
  *
  * @api
- * @since 2.0.0
  */
 class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
 {
@@ -20,7 +19,6 @@ class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
      * Product reviews collection
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Product\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -28,13 +26,11 @@ class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -47,7 +43,6 @@ class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
      * @param \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory $collectionFactory
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -75,7 +70,6 @@ public function __construct(
      * Get html code for toolbar
      *
      * @return string
-     * @since 2.0.0
      */
     public function getToolbarHtml()
     {
@@ -86,7 +80,6 @@ public function getToolbarHtml()
      * Initializes toolbar
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -107,7 +100,6 @@ protected function _prepareLayout()
      * Get reviews
      *
      * @return bool|\Magento\Review\Model\ResourceModel\Review\Product\Collection
-     * @since 2.0.0
      */
     public function getReviews()
     {
@@ -129,7 +121,6 @@ public function getReviews()
      *
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getReviewLink()
     {
@@ -153,7 +144,6 @@ public function getReviewUrl($review)
      *
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getProductLink()
     {
@@ -177,7 +167,6 @@ public function getProductUrl($review)
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function dateFormat($date)
     {
@@ -188,7 +177,6 @@ public function dateFormat($date)
      * Add review summary
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Review/Block/Customer/Recent.php b/app/code/Magento/Review/Block/Customer/Recent.php
index 4cb34b156f335..f3e851981fda1 100644
--- a/app/code/Magento/Review/Block/Customer/Recent.php
+++ b/app/code/Magento/Review/Block/Customer/Recent.php
@@ -11,7 +11,6 @@
  * Recent Customer Reviews Block
  *
  * @api
- * @since 2.0.0
  */
 class Recent extends \Magento\Framework\View\Element\Template
 {
@@ -19,7 +18,6 @@ class Recent extends \Magento\Framework\View\Element\Template
      * Customer list template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'customer/list.phtml';
 
@@ -27,7 +25,6 @@ class Recent extends \Magento\Framework\View\Element\Template
      * Product reviews collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -35,13 +32,11 @@ class Recent extends \Magento\Framework\View\Element\Template
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -50,7 +45,6 @@ class Recent extends \Magento\Framework\View\Element\Template
      * @param \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory $collectionFactory
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -72,7 +66,6 @@ public function __construct(
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
-     * @since 2.0.0
      */
     public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
     {
@@ -86,7 +79,6 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      * Return collection of reviews
      *
      * @return array|\Magento\Review\Model\ResourceModel\Review\Product\Collection
-     * @since 2.0.0
      */
     public function getReviews()
     {
@@ -110,7 +102,6 @@ public function getReviews()
      * Return review customer view url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReviewLink()
     {
@@ -121,7 +112,6 @@ public function getReviewLink()
      * Return catalog product view url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductLink()
     {
@@ -133,7 +123,6 @@ public function getProductLink()
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function dateFormat($date)
     {
@@ -144,7 +133,6 @@ public function dateFormat($date)
      * Return review customer url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAllReviewsUrl()
     {
@@ -156,7 +144,6 @@ public function getAllReviewsUrl()
      *
      * @param int $id
      * @return string
-     * @since 2.0.0
      */
     public function getReviewUrl($id)
     {
diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
index b97528f2903a2..df3b27cc8d62e 100644
--- a/app/code/Magento/Review/Block/Customer/View.php
+++ b/app/code/Magento/Review/Block/Customer/View.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -22,7 +21,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Customer view template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'customer/view.phtml';
 
@@ -30,7 +28,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Catalog product model
      *
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -38,7 +35,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
@@ -46,7 +42,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Rating option model
      *
      * @var \Magento\Review\Model\Rating\Option\VoteFactory
-     * @since 2.0.0
      */
     protected $_voteFactory;
 
@@ -54,13 +49,11 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
@@ -72,7 +65,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -98,7 +90,6 @@ public function __construct(
      * Initialize review id
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -110,7 +101,6 @@ protected function _construct()
      * Get product data
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProductData()
     {
@@ -125,7 +115,6 @@ public function getProductData()
      * Get review data
      *
      * @return Review
-     * @since 2.0.0
      */
     public function getReviewData()
     {
@@ -139,7 +128,6 @@ public function getReviewData()
      * Return review customer url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -150,7 +138,6 @@ public function getBackUrl()
      * Get review rating collection
      *
      * @return VoteCollection
-     * @since 2.0.0
      */
     public function getRating()
     {
@@ -173,7 +160,6 @@ public function getRating()
      * Get rating summary
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRatingSummary()
     {
@@ -189,7 +175,6 @@ public function getRatingSummary()
      * Get total reviews
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalReviews()
     {
@@ -208,7 +193,6 @@ public function getTotalReviews()
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function dateFormat($date)
     {
@@ -222,7 +206,6 @@ public function dateFormat($date)
      * @param bool $templateType
      * @param bool $displayIfNoReviews
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
@@ -237,7 +220,6 @@ public function getReviewsSummaryHtml(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 8ee5778621d7d..96b49ccd97c6b 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -16,7 +16,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\View\Element\Template
 {
@@ -24,7 +23,6 @@ class Form extends \Magento\Framework\View\Element\Template
      * Review data
      *
      * @var \Magento\Review\Helper\Data
-     * @since 2.0.0
      */
     protected $_reviewData = null;
 
@@ -32,7 +30,6 @@ class Form extends \Magento\Framework\View\Element\Template
      * Catalog product model
      *
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -40,13 +37,11 @@ class Form extends \Magento\Framework\View\Element\Template
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -54,25 +49,21 @@ class Form extends \Magento\Framework\View\Element\Template
      * Message manager interface
      *
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $customerUrl;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout;
 
@@ -97,7 +88,6 @@ class Form extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -128,7 +118,6 @@ public function __construct(
      * Initialize review form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -155,7 +144,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -167,7 +155,6 @@ public function getJsLayout()
      *
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getProductInfo()
     {
@@ -182,7 +169,6 @@ public function getProductInfo()
      * Get review product post action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAction()
     {
@@ -200,7 +186,6 @@ public function getAction()
      *
      * @return RatingCollection
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getRatings()
     {
@@ -219,7 +204,6 @@ public function getRatings()
      * Return register URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegisterUrl()
     {
@@ -230,7 +214,6 @@ public function getRegisterUrl()
      * Get review product id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getProductId()
     {
diff --git a/app/code/Magento/Review/Block/Form/Configure.php b/app/code/Magento/Review/Block/Form/Configure.php
index bff7326a79034..d63792ed72986 100644
--- a/app/code/Magento/Review/Block/Form/Configure.php
+++ b/app/code/Magento/Review/Block/Form/Configure.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Configure extends \Magento\Review\Block\Form
 {
@@ -18,7 +17,6 @@ class Configure extends \Magento\Review\Block\Form
      * Get review product id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
diff --git a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
index fb50ab39fc7a6..1f66c82e3c76b 100644
--- a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
+++ b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Review\Block\Product\Compare\ListCompare\Plugin\Review
  *
- * @since 2.0.0
  */
 class Review
 {
@@ -17,7 +16,6 @@ class Review
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $reviewFactory;
 
@@ -25,14 +23,12 @@ class Review
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeGetReviewsSummaryHtml(
         \Magento\Catalog\Block\Product\Compare\ListCompare $subject,
diff --git a/app/code/Magento/Review/Block/Product/Review.php b/app/code/Magento/Review/Block/Product/Review.php
index 8167c39b0b0bc..8906f3dabb30c 100644
--- a/app/code/Magento/Review/Block/Product/Review.php
+++ b/app/code/Magento/Review/Block/Product/Review.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Review extends Template implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class Review extends Template implements IdentityInterface
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -29,7 +27,6 @@ class Review extends Template implements IdentityInterface
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review\CollectionFactory
-     * @since 2.0.0
      */
     protected $_reviewsColFactory;
 
@@ -38,7 +35,6 @@ class Review extends Template implements IdentityInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Review\Model\ResourceModel\Review\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Get current product id
      *
      * @return null|int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -69,7 +64,6 @@ public function getProductId()
      * Get URL for ajax call
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductReviewUrl()
     {
@@ -86,7 +80,6 @@ public function getProductReviewUrl()
      * Set tab title
      *
      * @return void
-     * @since 2.0.0
      */
     public function setTabTitle()
     {
@@ -100,7 +93,6 @@ public function setTabTitle()
      * Get size of reviews collection
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCollectionSize()
     {
@@ -120,7 +112,6 @@ public function getCollectionSize()
      * Return unique ID(s) for each object in system
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Review/Block/Product/ReviewRenderer.php b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
index 92127e173806a..2bb2a6d83e546 100644
--- a/app/code/Magento/Review/Block/Product/ReviewRenderer.php
+++ b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Review\Block\Product\ReviewRenderer
  *
- * @since 2.0.0
  */
 class ReviewRenderer extends \Magento\Framework\View\Element\Template implements ReviewRendererInterface
 {
@@ -21,7 +20,6 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * Array of available template name
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_availableTemplates = [
         self::FULL_VIEW => 'helper/summary.phtml',
@@ -32,7 +30,6 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * Review model factory
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
@@ -40,7 +37,6 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * @param bool $displayIfNoReviews
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
@@ -89,7 +84,6 @@ public function getReviewsSummaryHtml(
      * Get ratings summary
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRatingSummary()
     {
@@ -100,7 +94,6 @@ public function getRatingSummary()
      * Get count of reviews
      *
      * @return int
-     * @since 2.0.0
      */
     public function getReviewsCount()
     {
@@ -112,7 +105,6 @@ public function getReviewsCount()
      *
      * @param bool $useDirectLink allows to use direct link for product reviews page
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsUrl($useDirectLink = false)
     {
diff --git a/app/code/Magento/Review/Block/Product/View.php b/app/code/Magento/Review/Block/Product/View.php
index b665102851298..c7b813ea8eed9 100644
--- a/app/code/Magento/Review/Block/Product/View.php
+++ b/app/code/Magento/Review/Block/Product/View.php
@@ -13,7 +13,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends \Magento\Catalog\Block\Product\View
 {
@@ -21,7 +20,6 @@ class View extends \Magento\Catalog\Block\Product\View
      * Review collection
      *
      * @var ReviewCollection
-     * @since 2.0.0
      */
     protected $_reviewsCollection;
 
@@ -29,7 +27,6 @@ class View extends \Magento\Catalog\Block\Product\View
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review\CollectionFactory
-     * @since 2.0.0
      */
     protected $_reviewsColFactory;
 
@@ -47,7 +44,6 @@ class View extends \Magento\Catalog\Block\Product\View
      * @param \Magento\Review\Model\ResourceModel\Review\CollectionFactory $collectionFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -83,7 +79,6 @@ public function __construct(
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -101,7 +96,6 @@ protected function _toHtml()
      * @param bool $displayIfNoReviews
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
@@ -124,7 +118,6 @@ public function getReviewsSummaryHtml(
      * Get collection of reviews
      *
      * @return ReviewCollection
-     * @since 2.0.0
      */
     public function getReviewsCollection()
     {
@@ -145,7 +138,6 @@ public function getReviewsCollection()
      * Force product view page behave like without options
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasOptions()
     {
diff --git a/app/code/Magento/Review/Block/Product/View/ListView.php b/app/code/Magento/Review/Block/Product/View/ListView.php
index ec5f50d1bc67d..708aaab06811d 100644
--- a/app/code/Magento/Review/Block/Product/View/ListView.php
+++ b/app/code/Magento/Review/Block/Product/View/ListView.php
@@ -9,14 +9,12 @@
  * Detailed Product Reviews
  *
  * @api
- * @since 2.0.0
  */
 class ListView extends \Magento\Review\Block\Product\View
 {
     /**
      * Unused class property
      * @var false
-     * @since 2.0.0
      */
     protected $_forceHasOptions = false;
 
@@ -24,7 +22,6 @@ class ListView extends \Magento\Review\Block\Product\View
      * Get product id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -36,7 +33,6 @@ public function getProductId()
      * Prepare product review list toolbar
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -55,7 +51,6 @@ protected function _prepareLayout()
      * Add rate votes
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -68,7 +63,6 @@ protected function _beforeToHtml()
      *
      * @param int $id
      * @return string
-     * @since 2.0.0
      */
     public function getReviewUrl($id)
     {
diff --git a/app/code/Magento/Review/Block/Product/View/Other.php b/app/code/Magento/Review/Block/Product/View/Other.php
index 79d977295ca69..463e330fd9201 100644
--- a/app/code/Magento/Review/Block/Product/View/Other.php
+++ b/app/code/Magento/Review/Block/Product/View/Other.php
@@ -9,13 +9,11 @@
  * Product view other block
  *
  * @api
- * @since 2.0.0
  */
 class Other extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
@@ -23,7 +21,6 @@ class Other extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Get product object
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
diff --git a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
index b7138b8cf2009..de871d9061428 100644
--- a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
+++ b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
@@ -9,19 +9,16 @@
  * Entity rating block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Detailed extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'detailed.phtml';
 
     /**
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
@@ -29,7 +26,6 @@ class Detailed extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
index 5bcd55fe3fe47..e9b6573b57cb8 100644
--- a/app/code/Magento/Review/Block/View.php
+++ b/app/code/Magento/Review/Block/View.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -18,7 +17,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * View template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'view.phtml';
 
@@ -26,7 +24,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Rating option model
      *
      * @var \Magento\Review\Model\Rating\Option\VoteFactory
-     * @since 2.0.0
      */
     protected $_voteFactory;
 
@@ -34,7 +31,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Rating model factory
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
@@ -42,7 +38,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
@@ -52,7 +47,6 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -75,7 +69,6 @@ public function __construct(
      * Retrieve current product model from registry
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProductData()
     {
@@ -86,7 +79,6 @@ public function getProductData()
      * Retrieve current review model from registry
      *
      * @return \Magento\Review\Model\Review
-     * @since 2.0.0
      */
     public function getReviewData()
     {
@@ -97,7 +89,6 @@ public function getReviewData()
      * Prepare link to review list for current product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -108,7 +99,6 @@ public function getBackUrl()
      * Retrieve collection of ratings
      *
      * @return \Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection
-     * @since 2.0.0
      */
     public function getRating()
     {
@@ -129,7 +119,6 @@ public function getRating()
      * Retrieve rating summary for current product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRatingSummary()
     {
@@ -145,7 +134,6 @@ public function getRatingSummary()
      * Retrieve total review count for current product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTotalReviews()
     {
@@ -166,7 +154,6 @@ public function getTotalReviews()
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function dateFormat($date)
     {
@@ -180,7 +167,6 @@ public function dateFormat($date)
      * @param bool $templateType
      * @param bool $displayIfNoReviews
      * @return string
-     * @since 2.0.0
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product.php b/app/code/Magento/Review/Controller/Adminhtml/Product.php
index 2a1cb44c0d23e..8c4503d8f023e 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product.php
@@ -13,7 +13,6 @@
 
 /**
  * Reviews admin controller
- * @since 2.0.0
  */
 abstract class Product extends Action
 {
@@ -21,7 +20,6 @@ abstract class Product extends Action
      * Array of actions which can be processed without secret key validation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_publicActions = ['edit'];
 
@@ -29,7 +27,6 @@ abstract class Product extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
@@ -37,7 +34,6 @@ abstract class Product extends Action
      * Review model factory
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $reviewFactory;
 
@@ -45,7 +41,6 @@ abstract class Product extends Action
      * Rating model factory
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $ratingFactory;
 
@@ -54,7 +49,6 @@ abstract class Product extends Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -70,7 +64,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
index da0d459718228..0f55869531640 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Delete
  *
- * @since 2.0.0
  */
 class Delete extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
index 8eae63568e14d..e70cca43fcb1b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Edit
  *
- * @since 2.0.0
  */
 class Edit extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
index 8ab0641bf9faa..df2f13a6b772f 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Index
  *
- * @since 2.0.0
  */
 class Index extends ProductController
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index 7e0d8a82da04a..f941fb64cda2a 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -17,13 +17,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\JsonProductInfo
  *
- * @since 2.0.0
  */
 class JsonProductInfo extends ProductController
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -33,7 +31,6 @@ class JsonProductInfo extends ProductController
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
index f050d35d7f097..de105e3ce9de0 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
index 6a53390fe47f0..f44a0bc852940 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\MassUpdateStatus
  *
- * @since 2.0.0
  */
 class MassUpdateStatus extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
index b67926322d6eb..4b81424253326 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\MassVisibleIn
  *
- * @since 2.0.0
  */
 class MassVisibleIn extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
index b297b11654e66..d01b2b28e9639 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
index 42ecb8f3f4db7..97b76cdd7b9e1 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Pending
  *
- * @since 2.0.0
  */
 class Pending extends ProductController
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index 5c56f3b8d76f8..38e92f4655484 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Post
  *
- * @since 2.0.0
  */
 class Post extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
index fc83c80b9dc0d..50241058b2bbf 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\ProductGrid
  *
- * @since 2.0.0
  */
 class ProductGrid extends ProductController
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -32,7 +30,6 @@ class ProductGrid extends ProductController
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -47,7 +44,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
index 335bf7f6502d8..e3d1ad2e041e4 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\RatingItems
  *
- * @since 2.0.0
  */
 class RatingItems extends ProductController
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -32,7 +30,6 @@ class RatingItems extends ProductController
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -47,7 +44,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
index 3ac03d5192e2a..75c5acd75afb7 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\ReviewGrid
  *
- * @since 2.0.0
  */
 class ReviewGrid extends ProductController
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -32,7 +30,6 @@ class ReviewGrid extends ProductController
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -47,7 +44,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php
index 10a838a1fc2c2..48cd10a3e9f74 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Reviews\Grid
  *
- * @since 2.0.0
  */
 class Grid extends Action
 {
     /**
      * @var \Magento\Catalog\Controller\Adminhtml\Product\Builder
-     * @since 2.0.0
      */
     protected $productBuilder;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Get product reviews grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 15806bf964a80..0298678ae00d9 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Product\Save
  *
- * @since 2.0.0
  */
 class Save extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating.php b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
index 236a8920cdb86..73c31dbcb0777 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
@@ -11,7 +11,6 @@
 
 /**
  * Admin ratings controller
- * @since 2.0.0
  */
 abstract class Rating extends Action
 {
@@ -26,14 +25,12 @@ abstract class Rating extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function initEnityId()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
index 973f55e16cd07..955755d4dac92 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Rating\Delete
  *
- * @since 2.0.0
  */
 class Delete extends RatingController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
index efa36ce659775..cf714a498a20b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Rating\Edit
  *
- * @since 2.0.0
  */
 class Edit extends RatingController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
index ebd7bead83c79..4832a6a77d053 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Rating\Index
  *
- * @since 2.0.0
  */
 class Index extends RatingController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
index e62bcd9068b45..0384800b222ef 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Rating\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends RatingController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
index ad6f30c207ab8..71c5982a5aec5 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Review\Controller\Adminhtml\Rating\Save
  *
- * @since 2.0.0
  */
 class Save extends RatingController
 {
@@ -19,7 +18,6 @@ class Save extends RatingController
      * Save rating
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Customer.php b/app/code/Magento/Review/Controller/Customer.php
index 786091c27658f..52fdf41eeab76 100644
--- a/app/code/Magento/Review/Controller/Customer.php
+++ b/app/code/Magento/Review/Controller/Customer.php
@@ -12,7 +12,6 @@
 
 /**
  * Customer reviews controller
- * @since 2.0.0
  */
 abstract class Customer extends Action
 {
@@ -20,14 +19,12 @@ abstract class Customer extends Action
      * Customer session model
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/app/code/Magento/Review/Controller/Customer/Index.php b/app/code/Magento/Review/Controller/Customer/Index.php
index f0f134389a479..1bf954433a183 100644
--- a/app/code/Magento/Review/Controller/Customer/Index.php
+++ b/app/code/Magento/Review/Controller/Customer/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Review\Controller\Customer\Index
  *
- * @since 2.0.0
  */
 class Index extends CustomerController
 {
@@ -19,7 +18,6 @@ class Index extends CustomerController
      * Render my product reviews
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Customer/View.php b/app/code/Magento/Review/Controller/Customer/View.php
index fd7ba54f5c3ec..4c63d22facb49 100644
--- a/app/code/Magento/Review/Controller/Customer/View.php
+++ b/app/code/Magento/Review/Controller/Customer/View.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Review\Controller\Customer\View
  *
- * @since 2.0.0
  */
 class View extends CustomerController
 {
     /**
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $reviewFactory;
 
@@ -28,7 +26,6 @@ class View extends CustomerController
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Render review details
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index 7305119c125d7..fea94dae23bcc 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -14,7 +14,6 @@
  * Review controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Product extends \Magento\Framework\App\Action\Action
 {
@@ -22,7 +21,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
@@ -30,7 +28,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Customer session model
      *
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
@@ -38,7 +35,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Generic session
      *
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $reviewSession;
 
@@ -46,7 +42,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Catalog catgory model
      *
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -54,7 +49,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -62,7 +56,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Catalog product model
      *
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -70,7 +63,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $reviewFactory;
 
@@ -78,7 +70,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $ratingFactory;
 
@@ -86,7 +77,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Catalog design model
      *
      * @var \Magento\Catalog\Model\Design
-     * @since 2.0.0
      */
     protected $catalogDesign;
 
@@ -94,7 +84,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Core model store manager interface
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -102,7 +91,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Core form key validator
      *
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
@@ -120,7 +108,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -156,7 +143,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -187,7 +173,6 @@ public function dispatch(RequestInterface $request)
      * Initialize and check product
      *
      * @return \Magento\Catalog\Model\Product|bool
-     * @since 2.0.0
      */
     protected function initProduct()
     {
@@ -225,7 +210,6 @@ protected function initProduct()
      *
      * @param int $productId
      * @return bool|CatalogProduct
-     * @since 2.0.0
      */
     protected function loadProduct($productId)
     {
diff --git a/app/code/Magento/Review/Controller/Product/ListAction.php b/app/code/Magento/Review/Controller/Product/ListAction.php
index bbaae66ce2f4c..099f46bf6ac90 100644
--- a/app/code/Magento/Review/Controller/Product/ListAction.php
+++ b/app/code/Magento/Review/Controller/Product/ListAction.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Review\Controller\Product\ListAction
  *
- * @since 2.0.0
  */
 class ListAction extends ProductController
 {
@@ -22,7 +21,6 @@ class ListAction extends ProductController
      *
      * @param CatalogProduct $product
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     protected function getProductPage($product)
     {
@@ -42,7 +40,6 @@ protected function getProductPage($product)
      * Show list of product's reviews
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php
index 49acc83fcd2c4..2481ea9b2531a 100644
--- a/app/code/Magento/Review/Controller/Product/ListAjax.php
+++ b/app/code/Magento/Review/Controller/Product/ListAjax.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Review\Controller\Product\ListAjax
  *
- * @since 2.0.0
  */
 class ListAjax extends ProductController
 {
@@ -20,7 +19,6 @@ class ListAjax extends ProductController
      * Show list of product's reviews
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index df5b6a12e28be..39132bcb1a640 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Review\Controller\Product\Post
  *
- * @since 2.0.0
  */
 class Post extends ProductController
 {
@@ -22,7 +21,6 @@ class Post extends ProductController
      * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/Controller/Product/View.php b/app/code/Magento/Review/Controller/Product/View.php
index 92bc380847ad9..583ec9490b418 100644
--- a/app/code/Magento/Review/Controller/Product/View.php
+++ b/app/code/Magento/Review/Controller/Product/View.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Review\Controller\Product\View
  *
- * @since 2.0.0
  */
 class View extends ProductController
 {
@@ -22,7 +21,6 @@ class View extends ProductController
      *
      * @param int $reviewId
      * @return bool|Review
-     * @since 2.0.0
      */
     protected function loadReview($reviewId)
     {
@@ -45,7 +43,6 @@ protected function loadReview($reviewId)
      * Show details of one review
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Review/CustomerData/Review.php b/app/code/Magento/Review/CustomerData/Review.php
index 04ceda8b10e98..6906b783b1f75 100644
--- a/app/code/Magento/Review/CustomerData/Review.php
+++ b/app/code/Magento/Review/CustomerData/Review.php
@@ -10,19 +10,16 @@
 
 /**
  * Review section
- * @since 2.0.0
  */
 class Review implements SectionSourceInterface
 {
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $reviewSession;
 
     /**
      * @param \Magento\Framework\Session\Generic $reviewSession
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Session\Generic $reviewSession)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\Session\Generic $reviewSession)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
diff --git a/app/code/Magento/Review/Helper/Action/Pager.php b/app/code/Magento/Review/Helper/Action/Pager.php
index ca4503dd884b1..9df6784c4fd2e 100644
--- a/app/code/Magento/Review/Helper/Action/Pager.php
+++ b/app/code/Magento/Review/Helper/Action/Pager.php
@@ -14,7 +14,6 @@
  * Action pager helper for iterating over search results
  *
  * @api
- * @since 2.0.0
  */
 class Pager extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -24,7 +23,6 @@ class Pager extends \Magento\Framework\App\Helper\AbstractHelper
      * Storage id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storageId = null;
 
@@ -32,7 +30,6 @@ class Pager extends \Magento\Framework\App\Helper\AbstractHelper
      * Array of items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_items = null;
 
@@ -40,14 +37,12 @@ class Pager extends \Magento\Framework\App\Helper\AbstractHelper
      * Backend session model
      *
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Backend\Model\Session $backendSession
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Helper\Context $context, \Magento\Backend\Model\Session $backendSession)
     {
@@ -60,7 +55,6 @@ public function __construct(\Magento\Framework\App\Helper\Context $context, \Mag
      *
      * @param int $storageId
      * @return void
-     * @since 2.0.0
      */
     public function setStorageId($storageId)
     {
@@ -72,7 +66,6 @@ public function setStorageId($storageId)
      *
      * @param array $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items)
     {
@@ -86,7 +79,6 @@ public function setItems(array $items)
      * Load stored items
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadItems()
     {
@@ -100,7 +92,6 @@ protected function _loadItems()
      *
      * @param int $id
      * @return int|bool
-     * @since 2.0.0
      */
     public function getNextItemId($id)
     {
@@ -117,7 +108,6 @@ public function getNextItemId($id)
      *
      * @param int $id
      * @return int|bool
-     * @since 2.0.0
      */
     public function getPreviousItemId($id)
     {
@@ -134,7 +124,6 @@ public function getPreviousItemId($id)
      *
      * @param mixed $value
      * @return int|bool
-     * @since 2.0.0
      */
     protected function _findItemPositionByValue($value)
     {
@@ -147,7 +136,6 @@ protected function _findItemPositionByValue($value)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getStorageKey()
     {
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index 784d3d666d5b8..c662c11d59786 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -12,7 +12,6 @@
  * Default review helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -22,7 +21,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Filter manager
      *
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filter;
 
@@ -30,7 +28,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -38,7 +35,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Filter\FilterManager $filter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      *
      * @param string $origDetail
      * @return string
-     * @since 2.0.0
      */
     public function getDetail($origDetail)
     {
@@ -67,7 +62,6 @@ public function getDetail($origDetail)
      *
      * @param string $origDetail Full detail info
      * @return string
-     * @since 2.0.0
      */
     public function getDetailHtml($origDetail)
     {
@@ -79,7 +73,6 @@ public function getDetailHtml($origDetail)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsGuestAllowToWrite()
     {
@@ -90,7 +83,6 @@ public function getIsGuestAllowToWrite()
      * Get review statuses with their codes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getReviewStatuses()
     {
@@ -105,7 +97,6 @@ public function getReviewStatuses()
      * Get review statuses as option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getReviewStatusesOptionArray()
     {
diff --git a/app/code/Magento/Review/Model/Rating.php b/app/code/Magento/Review/Model/Rating.php
index f27347c49f4c3..33dece9688a31 100644
--- a/app/code/Magento/Review/Model/Rating.php
+++ b/app/code/Magento/Review/Model/Rating.php
@@ -21,7 +21,6 @@
  * @method string getRatingCode()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rating extends \Magento\Framework\Model\AbstractModel implements IdentityInterface
 {
@@ -36,13 +35,11 @@ class Rating extends \Magento\Framework\Model\AbstractModel implements IdentityI
 
     /**
      * @var \Magento\Review\Model\Rating\OptionFactory
-     * @since 2.0.0
      */
     protected $_ratingOptionFactory;
 
     /**
      * @var \Magento\Review\Model\ResourceModel\Rating\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_ratingCollectionF;
 
@@ -54,7 +51,6 @@ class Rating extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -74,7 +70,6 @@ public function __construct(
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -85,7 +80,6 @@ protected function _construct()
      * @param int $optionId
      * @param int $entityPkValue
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionVote($optionId, $entityPkValue)
     {
@@ -104,7 +98,6 @@ public function addOptionVote($optionId, $entityPkValue)
     /**
      * @param int $optionId
      * @return $this
-     * @since 2.0.0
      */
     public function updateOptionVote($optionId)
     {
@@ -124,7 +117,6 @@ public function updateOptionVote($optionId)
      * retrieve rating options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -145,7 +137,6 @@ public function getOptions()
      * @param int $entityPkValue
      * @param bool $onlyForCurrentStore
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function getEntitySummary($entityPkValue, $onlyForCurrentStore = true)
     {
@@ -157,7 +148,6 @@ public function getEntitySummary($entityPkValue, $onlyForCurrentStore = true)
      * @param int $reviewId
      * @param bool $onlyForCurrentStore
      * @return array
-     * @since 2.0.0
      */
     public function getReviewSummary($reviewId, $onlyForCurrentStore = true)
     {
@@ -170,7 +160,6 @@ public function getReviewSummary($reviewId, $onlyForCurrentStore = true)
      *
      * @param string $entityCode
      * @return int
-     * @since 2.0.0
      */
     public function getEntityIdByCode($entityCode)
     {
@@ -181,7 +170,6 @@ public function getEntityIdByCode($entityCode)
      * Return unique ID(s) for each object in system
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Review/Model/Rating/Entity.php b/app/code/Magento/Review/Model/Rating/Entity.php
index b706f7b6d4e58..691adffc2bc14 100644
--- a/app/code/Magento/Review/Model/Rating/Entity.php
+++ b/app/code/Magento/Review/Model/Rating/Entity.php
@@ -15,13 +15,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Entity extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
     /**
      * @param string $entityCode
      * @return int
-     * @since 2.0.0
      */
     public function getIdByCode($entityCode)
     {
diff --git a/app/code/Magento/Review/Model/Rating/Option.php b/app/code/Magento/Review/Model/Rating/Option.php
index 0ee75026306fc..74c70e09a22b4 100644
--- a/app/code/Magento/Review/Model/Rating/Option.php
+++ b/app/code/Magento/Review/Model/Rating/Option.php
@@ -23,13 +23,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +36,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function addVote()
     {
@@ -49,7 +46,6 @@ public function addVote()
     /**
      * @param mixed $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
diff --git a/app/code/Magento/Review/Model/Rating/Option/Vote.php b/app/code/Magento/Review/Model/Rating/Option/Vote.php
index 731393e5af47a..275933adea463 100644
--- a/app/code/Magento/Review/Model/Rating/Option/Vote.php
+++ b/app/code/Magento/Review/Model/Rating/Option/Vote.php
@@ -12,13 +12,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Vote extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
index 7a251626ceee0..a26cbb9e303eb 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,19 +20,16 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -44,7 +40,6 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +70,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -91,7 +84,6 @@ protected function _initUniqueFields()
      * @param mixed $value
      * @param \Magento\Review\Model\Rating $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -116,7 +108,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Review\Model\Rating $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -152,7 +143,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param  int $ratingId
      * @return array
-     * @since 2.0.0
      */
     public function getStores($ratingId)
     {
@@ -171,7 +161,6 @@ public function getStores($ratingId)
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Review\Model\Rating $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -190,7 +179,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     /**
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function processRatingCodes(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -214,7 +202,6 @@ protected function processRatingCodes(\Magento\Framework\Model\AbstractModel $ob
     /**
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function processRatingStores(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -240,7 +227,6 @@ protected function processRatingStores(\Magento\Framework\Model\AbstractModel $o
      * @param string $table
      * @param array $storeIds
      * @return void
-     * @since 2.0.0
      */
     protected function deleteRatingData($ratingId, $table, array $storeIds)
     {
@@ -263,7 +249,6 @@ protected function deleteRatingData($ratingId, $table, array $storeIds)
      * @param string $table
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function insertRatingData($table, array $data)
     {
@@ -287,7 +272,6 @@ protected function insertRatingData($table, array $data)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -312,7 +296,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Review\Model\Rating $object
      * @param boolean $onlyForCurrentStore
      * @return array
-     * @since 2.0.0
      */
     public function getEntitySummary($object, $onlyForCurrentStore = true)
     {
@@ -354,7 +337,6 @@ public function getEntitySummary($object, $onlyForCurrentStore = true)
      *
      * @param \Magento\Review\Model\Rating $object
      * @return array
-     * @since 2.0.0
      */
     protected function _getEntitySummaryData($object)
     {
@@ -410,7 +392,6 @@ protected function _getEntitySummaryData($object)
      * @param \Magento\Review\Model\Rating $object
      * @param boolean $onlyForCurrentStore
      * @return array
-     * @since 2.0.0
      */
     public function getReviewSummary($object, $onlyForCurrentStore = true)
     {
@@ -482,7 +463,6 @@ public function getReviewSummary($object, $onlyForCurrentStore = true)
      *
      * @param string $entityCode
      * @return int
-     * @since 2.0.0
      */
     public function getEntityIdByCode($entityCode)
     {
@@ -501,7 +481,6 @@ public function getEntityIdByCode($entityCode)
      *
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteAggregatedRatingsByProductId($productId)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
index e9594e3dd9958..0a0699166afd8 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
@@ -11,26 +11,22 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Review\Model\ResourceModel\Rating\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_ratingCollectionF;
 
     /**
      * Add store data flag
      * @var bool
-     * @since 2.0.0
      */
     protected $_addStoreDataFlag = false;
 
@@ -43,7 +39,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Review\Model\ResourceModel\Rating\Option\CollectionFactory $ratingCollectionF
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isStoreJoined = false;
 
@@ -70,7 +64,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -82,7 +75,6 @@ protected function _construct()
      *
      * @param   int|string $entity
      * @return  $this
-     * @since 2.0.0
      */
     public function addEntityFilter($entity)
     {
@@ -115,7 +107,6 @@ public function addEntityFilter($entity)
      *
      * @param   string $dir
      * @return  $this
-     * @since 2.0.0
      */
     public function setPositionOrder($dir = 'ASC')
     {
@@ -128,7 +119,6 @@ public function setPositionOrder($dir = 'ASC')
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreFilter($storeId)
     {
@@ -163,7 +153,6 @@ public function setStoreFilter($storeId)
      * Add options to ratings in collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionToItems()
     {
@@ -189,7 +178,6 @@ public function addOptionToItems()
      * @param int $entityPkValue
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addEntitySummaryToItem($entityPkValue, $storeId)
     {
@@ -250,7 +238,6 @@ public function addEntitySummaryToItem($entityPkValue, $storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addRatingPerStoreName($storeId)
     {
@@ -268,7 +255,6 @@ public function addRatingPerStoreName($storeId)
      * Add stores data to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreData()
     {
@@ -289,7 +275,6 @@ public function addStoreData()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -308,7 +293,6 @@ public function load($printQuery = false, $logQuery = false)
      * Add store data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addStoreData()
     {
@@ -341,7 +325,6 @@ protected function _addStoreData()
      *
      * @param bool $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setActiveFilter($isActive = true)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Entity.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Entity.php
index 161ac9046442e..f19a2bb328efa 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Entity.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Entity.php
@@ -9,7 +9,6 @@
  * Rating entity resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Entity extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Entity extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating entity resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param string $entityCode
      * @return int
-     * @since 2.0.0
      */
     public function getIdByCode($entityCode)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Grid/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Grid/Collection.php
index c4df1cebcaaad..3a6e880bf6f28 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Grid/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Grid/Collection.php
@@ -9,7 +9,6 @@
  * Rating grid collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Review\Model\ResourceModel\Rating\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Review\Model\ResourceModel\Rating\Collection
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -31,7 +29,6 @@ class Collection extends \Magento\Review\Model\ResourceModel\Rating\Collection
      * @param \Magento\Framework\Registry $coreRegistry
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -61,7 +58,6 @@ public function __construct(
      * Add entity filter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initSelect()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
index e1352ecd157c6..971850b68ceb9 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
@@ -9,7 +9,6 @@
  * Rating option resource model
  *
  * @api
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewTable;
 
@@ -25,7 +23,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating option table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ratingOptionTable;
 
@@ -33,7 +30,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating vote table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ratingVoteTable;
 
@@ -41,7 +37,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Aggregate table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregateTable;
 
@@ -49,7 +44,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review store table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStoreTable;
 
@@ -57,7 +51,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating store table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ratingStoreTable;
 
@@ -65,7 +58,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Option data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionData;
 
@@ -73,19 +65,16 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Option id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_optionId;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Review\Model\Rating\Option\VoteFactory
-     * @since 2.0.0
      */
     protected $_ratingOptionVoteF;
 
@@ -95,7 +84,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Review\Model\Rating\Option\VoteFactory $ratingOptionVoteF
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -114,7 +102,6 @@ public function __construct(
      * Resource initialization. Define other tables name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -133,7 +120,6 @@ protected function _construct()
      *
      * @param \Magento\Review\Model\Rating\Option $option
      * @return $this
-     * @since 2.0.0
      */
     public function addVote($option)
     {
@@ -178,7 +164,6 @@ public function addVote($option)
      *
      * @param \Magento\Review\Model\Rating\Option $option
      * @return void
-     * @since 2.0.0
      */
     public function aggregate($option)
     {
@@ -192,7 +177,6 @@ public function aggregate($option)
      * @param int $ratingId
      * @param int $entityPkValue
      * @return void
-     * @since 2.0.0
      */
     public function aggregateEntityByRatingId($ratingId, $entityPkValue)
     {
@@ -281,7 +265,6 @@ public function aggregateEntityByRatingId($ratingId, $entityPkValue)
      *
      * @param int $optionId
      * @return array
-     * @since 2.0.0
      */
     public function loadDataById($optionId)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Collection.php
index 4a4fdd185586b..394eb5c3e077a 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Collection.php
@@ -9,7 +9,6 @@
  * Rating option collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Rating votes table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ratingVoteTable;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -41,7 +38,6 @@ protected function _construct()
      *
      * @param   int|array $rating
      * @return  $this
-     * @since 2.0.0
      */
     public function addRatingFilter($rating)
     {
@@ -58,7 +54,6 @@ public function addRatingFilter($rating)
      *
      * @param   string $dir
      * @return  $this
-     * @since 2.0.0
      */
     public function setPositionOrder($dir = 'ASC')
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote.php
index 54a142b6fd813..ed20396bb382d 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote.php
@@ -9,7 +9,6 @@
  * Rating vote resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Vote extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Vote extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote/Collection.php
index 18d42b8a34923..78f01dc3eb88d 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option/Vote/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,13 +17,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store list manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Review\Model\ResourceModel\Rating\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_ratingCollectionF;
 
@@ -37,7 +34,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Review\Model\ResourceModel\Rating\Option\CollectionFactory $ratingCollectionF
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -58,7 +54,6 @@ public function __construct(
      * Define model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +68,6 @@ protected function _construct()
      *
      * @param int $reviewId
      * @return $this
-     * @since 2.0.0
      */
     public function setReviewFilter($reviewId)
     {
@@ -86,7 +80,6 @@ public function setReviewFilter($reviewId)
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityPkFilter($entityId)
     {
@@ -99,7 +92,6 @@ public function setEntityPkFilter($entityId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreFilter($storeId)
     {
@@ -122,7 +114,6 @@ public function setStoreFilter($storeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addRatingInfo($storeId = null)
     {
@@ -164,7 +155,6 @@ public function addRatingInfo($storeId = null)
      * Add option info to select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionInfo()
     {
@@ -179,7 +169,6 @@ public function addOptionInfo()
      * Add rating options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRatingOptions()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review.php b/app/code/Magento/Review/Model/ResourceModel/Review.php
index 6294d6d493b4b..b364501f04108 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review.php
@@ -11,7 +11,6 @@
  * Review resource model
  *
  * @api
- * @since 2.0.0
  */
 class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewTable;
 
@@ -27,7 +25,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review Detail table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewDetailTable;
 
@@ -35,7 +32,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review status table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStatusTable;
 
@@ -43,7 +39,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review entity table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewEntityTable;
 
@@ -51,7 +46,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review store table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStoreTable;
 
@@ -59,7 +53,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Review aggregate table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregateTable;
 
@@ -67,7 +60,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Cache of deleted rating data
      *
      * @var array
-     * @since 2.0.0
      */
     private $_deleteCache = [];
 
@@ -75,7 +67,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core date model
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -83,7 +74,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Core model store manager interface
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -91,7 +81,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
@@ -99,7 +88,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rating resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Rating\Option
-     * @since 2.0.0
      */
     protected $_ratingOptions;
 
@@ -110,7 +98,6 @@ class Review extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Review\Model\ResourceModel\Rating\Option $ratingOptions
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -132,7 +119,6 @@ public function __construct(
      * Define main table. Define other tables name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -152,7 +138,6 @@ protected function _construct()
      * @param mixed $value
      * @param AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -169,7 +154,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(AbstractModel $object)
     {
@@ -191,7 +175,6 @@ protected function _beforeSave(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -248,7 +231,6 @@ protected function _afterSave(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(AbstractModel $object)
     {
@@ -273,7 +255,6 @@ protected function _afterLoad(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeDelete(AbstractModel $object)
     {
@@ -290,7 +271,6 @@ protected function _beforeDelete(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function afterDeleteCommit(AbstractModel $object)
     {
@@ -310,7 +290,6 @@ public function afterDeleteCommit(AbstractModel $object)
      * @param bool $approvedOnly
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId = 0)
     {
@@ -342,7 +321,6 @@ public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function aggregate($object)
     {
@@ -364,7 +342,6 @@ public function aggregate($object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param \Magento\Review\Model\Rating $ratingSummaryObject
      * @return void
-     * @since 2.0.0
      */
     protected function aggregateReviewSummary($object, $ratingSummaryObject)
     {
@@ -408,7 +385,6 @@ protected function aggregateReviewSummary($object, $ratingSummaryObject)
      * @param array|bool $oldData
      * @param \Magento\Framework\DataObject $data
      * @return void
-     * @since 2.0.0
      */
     protected function writeReviewSummary($oldData, \Magento\Framework\DataObject $data)
     {
@@ -432,7 +408,6 @@ protected function writeReviewSummary($oldData, \Magento\Framework\DataObject $d
      *
      * @param int $reviewId
      * @return array
-     * @since 2.0.0
      */
     protected function _loadVotedRatingIds($reviewId)
     {
@@ -453,7 +428,6 @@ protected function _loadVotedRatingIds($reviewId)
      * @param int[] $ratingIds
      * @param int $entityPkValue
      * @return $this
-     * @since 2.0.0
      */
     protected function _aggregateRatings($ratingIds, $entityPkValue)
     {
@@ -474,7 +448,6 @@ protected function _aggregateRatings($ratingIds, $entityPkValue)
      * @param int $reviewId
      * @param int $entityPkValue
      * @return void
-     * @since 2.0.0
      */
     public function reAggregateReview($reviewId, $entityPkValue)
     {
@@ -486,7 +459,6 @@ public function reAggregateReview($reviewId, $entityPkValue)
      *
      * @param string $entityCode
      * @return int|bool
-     * @since 2.0.0
      */
     public function getEntityIdByCode($entityCode)
     {
@@ -502,7 +474,6 @@ public function getEntityIdByCode($entityCode)
      *
      * @param int $productId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteReviewsByProductId($productId)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Collection.php
index d2267d3656ea7..5d9eb8d29f048 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Collection.php
@@ -9,7 +9,6 @@
  * Review collection resource model
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewTable = null;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review detail table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewDetailTable = null;
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review status table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStatusTable = null;
 
@@ -41,7 +37,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review entity table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewEntityTable = null;
 
@@ -49,14 +44,12 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review store table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStoreTable = null;
 
     /**
      * Add store data flag
      * @var bool
-     * @since 2.0.0
      */
     protected $_addStoreDataFlag = false;
 
@@ -64,7 +57,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review data
      *
      * @var \Magento\Review\Helper\Data
-     * @since 2.0.0
      */
     protected $_reviewData = null;
 
@@ -72,7 +64,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Rating option model
      *
      * @var \Magento\Review\Model\Rating\Option\VoteFactory
-     * @since 2.0.0
      */
     protected $_voteFactory;
 
@@ -80,7 +71,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Core model store manager interface
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -94,7 +84,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -118,7 +107,6 @@ public function __construct(
      * Define module
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -129,7 +117,6 @@ protected function _construct()
      * Initialize select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -147,7 +134,6 @@ protected function _initSelect()
      *
      * @param int|string $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerFilter($customerId)
     {
@@ -160,7 +146,6 @@ public function addCustomerFilter($customerId)
      *
      * @param int|int[] $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId)
     {
@@ -178,7 +163,6 @@ public function addStoreFilter($storeId)
      * Add stores data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreData()
     {
@@ -192,7 +176,6 @@ public function addStoreData()
      * @param int|string $entity
      * @param int $pkValue
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityFilter($entity, $pkValue)
     {
@@ -227,7 +210,6 @@ public function addEntityFilter($entity, $pkValue)
      *
      * @param int|string $status
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusFilter($status)
     {
@@ -246,7 +228,6 @@ public function addStatusFilter($status)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setDateOrder($dir = 'DESC')
     {
@@ -258,7 +239,6 @@ public function setDateOrder($dir = 'DESC')
      * Add rate votes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRateVotes()
     {
@@ -280,7 +260,6 @@ public function addRateVotes()
      * Add reviews total count
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addReviewsTotalCount()
     {
@@ -301,7 +280,6 @@ public function addReviewsTotalCount()
      * @param boolean $printQuery
      * @param boolean $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -320,7 +298,6 @@ public function load($printQuery = false, $logQuery = false)
      * Add store data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addStoreData()
     {
@@ -353,7 +330,6 @@ protected function _addStoreData()
      * Get review table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getReviewTable()
     {
@@ -367,7 +343,6 @@ protected function getReviewTable()
      * Get review detail table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getReviewDetailTable()
     {
@@ -381,7 +356,6 @@ protected function getReviewDetailTable()
      * Get review status table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getReviewStatusTable()
     {
@@ -395,7 +369,6 @@ protected function getReviewStatusTable()
      * Get review entity table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getReviewEntityTable()
     {
@@ -409,7 +382,6 @@ protected function getReviewEntityTable()
      * Get review store table
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getReviewStoreTable()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
index ecfc66f25ad45..879ae1c766776 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
@@ -15,7 +15,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -23,7 +22,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Entities alias
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_entitiesAlias = [];
 
@@ -31,7 +29,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Review store table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStoreTable;
 
@@ -39,7 +36,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Add store data flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_addStoreDataFlag = false;
 
@@ -47,7 +43,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Filter by stores for the collection
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storesIds = [];
 
@@ -55,7 +50,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Rating model
      *
      * @var \Magento\Review\Model\RatingFactory
-     * @since 2.0.0
      */
     protected $_ratingFactory;
 
@@ -63,7 +57,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * Rating option vote model
      *
      * @var \Magento\Review\Model\Rating\Option\VoteFactory
-     * @since 2.0.0
      */
     protected $_voteFactory;
 
@@ -96,7 +89,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param MetadataPool|null $metadataPool
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -156,7 +148,6 @@ public function __construct(
      * Define module
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -170,7 +161,6 @@ protected function _construct()
      * Initialize select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -184,7 +174,6 @@ protected function _initSelect()
      *
      * @param int|int[] $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId = null)
     {
@@ -212,7 +201,6 @@ public function addStoreFilter($storeId = null)
      *
      * @param array $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreFilter($storeId)
     {
@@ -238,7 +226,6 @@ public function setStoreFilter($storeId)
      *
      * @param Select $select
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyStoresFilterToSelect(Select $select = null)
     {
@@ -276,7 +263,6 @@ protected function _applyStoresFilterToSelect(Select $select = null)
      * Add stores data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreData()
     {
@@ -289,7 +275,6 @@ public function addStoreData()
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerFilter($customerId)
     {
@@ -302,7 +287,6 @@ public function addCustomerFilter($customerId)
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityFilter($entityId)
     {
@@ -315,7 +299,6 @@ public function addEntityFilter($entityId)
      *
      * @param int $status
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusFilter($status)
     {
@@ -328,7 +311,6 @@ public function addStatusFilter($status)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setDateOrder($dir = 'DESC')
     {
@@ -340,7 +322,6 @@ public function setDateOrder($dir = 'DESC')
      * Add review summary
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addReviewSummary()
     {
@@ -356,7 +337,6 @@ public function addReviewSummary()
      * Add rote votes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRateVotes()
     {
@@ -375,7 +355,6 @@ public function addRateVotes()
      * Join fields to entity
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinFields()
     {
@@ -403,7 +382,6 @@ protected function _joinFields()
      * @param null|int|string $offset
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAllIds($limit = null, $offset = null)
     {
@@ -420,7 +398,6 @@ public function getAllIds($limit = null, $offset = null)
      * Get result sorted ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getResultingIds()
     {
@@ -437,7 +414,6 @@ public function getResultingIds()
      * Render SQL for retrieve product count
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -453,7 +429,6 @@ public function getSelectCountSql()
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($attribute, $dir = 'DESC')
     {
@@ -487,7 +462,6 @@ public function setOrder($attribute, $dir = 'DESC')
      * @param string $joinType
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
     {
@@ -541,7 +515,6 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
      *
      * @param string $colName
      * @return array
-     * @since 2.0.0
      */
     public function getColumnValues($colName)
     {
@@ -556,7 +529,6 @@ public function getColumnValues($colName)
      * Action after load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -571,7 +543,6 @@ protected function _afterLoad()
      * Add store data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addStoreData()
     {
@@ -611,7 +582,6 @@ protected function _addStoreData()
      * Redeclare parent method for store filters applying
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Status.php b/app/code/Magento/Review/Model/ResourceModel/Review/Status.php
index 6b3874cc26328..0c865e0ab8fc4 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Status.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Status.php
@@ -9,7 +9,6 @@
  * Review status resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource status model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Status/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Status/Collection.php
index 43bf9d74933a0..afb99bc884c83 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Status/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Status/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Review\Model\ResourceModel\Review\Status\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Review status table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_reviewStatusTable;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      * Convert items array to array for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php b/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
index 7f7c63b9dbe22..b69065fbaf6cd 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Summary.php
@@ -11,7 +11,6 @@
  * Review summary resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Summary extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Summary extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define module
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * @param mixed $value
      * @param AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -47,7 +44,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param array $summary
      * @return $this
-     * @since 2.0.0
      */
     public function reAggregate($summary)
     {
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Summary/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Summary/Collection.php
index e62afe210f26a..2d6b848bde449 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Summary/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Summary/Collection.php
@@ -9,13 +9,11 @@
  * Review summery collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * @param int|string $entityId
      * @param int $entityType
      * @return $this
-     * @since 2.0.0
      */
     public function addEntityFilter($entityId, $entityType = 1)
     {
@@ -44,7 +41,6 @@ public function addEntityFilter($entityId, $entityType = 1)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId)
     {
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index 69c4a9ef3d078..a661c0d1a1179 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -22,7 +22,6 @@
  * @method int getStatusId()
  * @method \Magento\Review\Model\Review setStatusId(int $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Review extends \Magento\Framework\Model\AbstractModel implements IdentityInterface
 {
@@ -30,7 +29,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Event prefix for observer
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'review';
 
@@ -73,7 +71,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Review product collection factory
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
@@ -81,7 +78,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Review status collection factory
      *
      * @var \Magento\Review\Model\ResourceModel\Review\Status\CollectionFactory
-     * @since 2.0.0
      */
     protected $_statusFactory;
 
@@ -89,7 +85,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Review model summary factory
      *
      * @var \Magento\Review\Model\Review\SummaryFactory
-     * @since 2.0.0
      */
     protected $_summaryFactory;
 
@@ -97,7 +92,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Review model summary factory
      *
      * @var \Magento\Review\Model\Review\SummaryFactory
-     * @since 2.0.0
      */
     protected $_summaryModFactory;
 
@@ -105,7 +99,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Review model summary
      *
      * @var \Magento\Review\Model\Review\Summary
-     * @since 2.0.0
      */
     protected $_reviewSummary;
 
@@ -113,7 +106,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Core model store manager interface
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -121,7 +113,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * Url interface
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlModel;
 
@@ -139,7 +130,6 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -169,7 +159,6 @@ public function __construct(
      * Initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -180,7 +169,6 @@ protected function _construct()
      * Get product collection
      *
      * @return ProductCollection
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
@@ -191,7 +179,6 @@ public function getProductCollection()
      * Get status collection
      *
      * @return StatusCollection
-     * @since 2.0.0
      */
     public function getStatusCollection()
     {
@@ -205,7 +192,6 @@ public function getStatusCollection()
      * @param bool $approvedOnly
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId = 0)
     {
@@ -216,7 +202,6 @@ public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId
      * Aggregate reviews
      *
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate()
     {
@@ -230,7 +215,6 @@ public function aggregate()
      * @param Product $product
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     public function getEntitySummary($product, $storeId = 0)
     {
@@ -244,7 +228,6 @@ public function getEntitySummary($product, $storeId = 0)
      * Get pending status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPendingStatus()
     {
@@ -255,7 +238,6 @@ public function getPendingStatus()
      * Get review product view url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReviewUrl()
     {
@@ -268,7 +250,6 @@ public function getReviewUrl()
      * @param string|int $productId
      * @param string|int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($productId, $storeId)
     {
@@ -283,7 +264,6 @@ public function getProductUrl($productId, $storeId)
      * Validate review summary fields
      *
      * @return bool|string[]
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -311,7 +291,6 @@ public function validate()
      * Perform actions after object delete
      *
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -324,7 +303,6 @@ public function afterDeleteCommit()
      *
      * @param ProductCollection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function appendSummary($collection)
     {
@@ -357,7 +335,6 @@ public function appendSummary($collection)
      * Check if current review approved or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isApproved()
     {
@@ -369,7 +346,6 @@ public function isApproved()
      *
      * @param int|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailableOnStore($store = null)
     {
@@ -385,7 +361,6 @@ public function isAvailableOnStore($store = null)
      *
      * @param string $entityCode
      * @return int|bool
-     * @since 2.0.0
      */
     public function getEntityIdByCode($entityCode)
     {
@@ -396,7 +371,6 @@ public function getEntityIdByCode($entityCode)
      * Return unique ID(s) for each object in system
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Review/Model/Review/Status.php b/app/code/Magento/Review/Model/Review/Status.php
index 4c59ffe4e16f9..c5bbb574e381b 100644
--- a/app/code/Magento/Review/Model/Review/Status.php
+++ b/app/code/Magento/Review/Model/Review/Status.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Review\Model\Review\Status
  *
- * @since 2.0.0
  */
 class Status extends \Magento\Framework\Model\AbstractModel
 {
@@ -25,7 +24,6 @@ class Status extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Review/Model/Review/Summary.php b/app/code/Magento/Review/Model/Review/Summary.php
index deeeaecb84443..5e1363ae6f34b 100644
--- a/app/code/Magento/Review/Model/Review/Summary.php
+++ b/app/code/Magento/Review/Model/Review/Summary.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Summary extends \Magento\Framework\Model\AbstractModel
 {
@@ -21,7 +20,6 @@ class Summary extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Review\Model\ResourceModel\Review\Summary $resource
      * @param \Magento\Review\Model\ResourceModel\Review\Summary\Collection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -37,7 +35,6 @@ public function __construct(
      * Get entity primary key value
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityPkValue()
     {
@@ -48,7 +45,6 @@ public function getEntityPkValue()
      * Get rating summary data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRatingSummary()
     {
@@ -59,7 +55,6 @@ public function getRatingSummary()
      * Get count of reviews
      *
      * @return int
-     * @since 2.0.0
      */
     public function getReviewsCount()
     {
diff --git a/app/code/Magento/Review/Model/Rss.php b/app/code/Magento/Review/Model/Rss.php
index 93f944da45259..df8a5dbb96841 100644
--- a/app/code/Magento/Review/Model/Rss.php
+++ b/app/code/Magento/Review/Model/Rss.php
@@ -8,13 +8,11 @@
 /**
  * Class Rss
  * @package Magento\Catalog\Model\Rss\Product
- * @since 2.0.0
  */
 class Rss extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $reviewFactory;
 
@@ -22,14 +20,12 @@ class Rss extends \Magento\Framework\Model\AbstractModel
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param ReviewFactory $reviewFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * @return $this|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getProductCollection()
     {
diff --git a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php b/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
index 2b492c32f2137..ba98e05124ef3 100644
--- a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
+++ b/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Review\Observer\CatalogBlockProductCollectionBeforeToHtmlObserver
  *
- * @since 2.0.0
  */
 class CatalogBlockProductCollectionBeforeToHtmlObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class CatalogBlockProductCollectionBeforeToHtmlObserver implements ObserverInter
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
     /**
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Review\Model\ReviewFactory $reviewFactory
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Review/Observer/ProcessProductAfterDeleteEventObserver.php b/app/code/Magento/Review/Observer/ProcessProductAfterDeleteEventObserver.php
index ee616cb416050..3842443172ae7 100644
--- a/app/code/Magento/Review/Observer/ProcessProductAfterDeleteEventObserver.php
+++ b/app/code/Magento/Review/Observer/ProcessProductAfterDeleteEventObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Review\Observer\ProcessProductAfterDeleteEventObserver
  *
- * @since 2.0.0
  */
 class ProcessProductAfterDeleteEventObserver implements ObserverInterface
 {
@@ -18,20 +17,17 @@ class ProcessProductAfterDeleteEventObserver implements ObserverInterface
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review
-     * @since 2.0.0
      */
     protected $_resourceReview;
 
     /**
      * @var \Magento\Review\Model\ResourceModel\Rating
-     * @since 2.0.0
      */
     protected $_resourceRating;
 
     /**
      * @param \Magento\Review\Model\ResourceModel\Review $resourceReview
      * @param \Magento\Review\Model\ResourceModel\Rating $resourceRating
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Review\Model\ResourceModel\Review $resourceReview,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php b/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php
index 632d8fe059734..f5cfd0d80ddae 100644
--- a/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php
+++ b/app/code/Magento/Review/Observer/TagProductCollectionLoadAfterObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Review\Observer\TagProductCollectionLoadAfterObserver
  *
- * @since 2.0.0
  */
 class TagProductCollectionLoadAfterObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class TagProductCollectionLoadAfterObserver implements ObserverInterface
      * Review model
      *
      * @var \Magento\Review\Model\ReviewFactory
-     * @since 2.0.0
      */
     protected $_reviewFactory;
 
     /**
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Review\Model\ReviewFactory $reviewFactory
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Review/Setup/InstallData.php b/app/code/Magento/Review/Setup/InstallData.php
index f8240946b4f82..8e9e60d3d64df 100644
--- a/app/code/Magento/Review/Setup/InstallData.php
+++ b/app/code/Magento/Review/Setup/InstallData.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Review/Setup/InstallSchema.php b/app/code/Magento/Review/Setup/InstallSchema.php
index 094c29326f541..334d66abcc63c 100644
--- a/app/code/Magento/Review/Setup/InstallSchema.php
+++ b/app/code/Magento/Review/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index f700cd84355af..cdce13659b03b 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -15,31 +15,26 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentication
 {
     /**
      * @var \Magento\Framework\HTTP\Authentication
-     * @since 2.0.0
      */
     protected $httpAuthentication;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $authorization;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $aclResources;
 
@@ -58,7 +53,6 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $aclResources
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\Auth $auth,
@@ -102,7 +96,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function aroundDispatch(AbstractAction $subject, \Closure $proceed, RequestInterface $request)
     {
diff --git a/app/code/Magento/Rss/Block/Feeds.php b/app/code/Magento/Rss/Block/Feeds.php
index 2c9b40621aa86..a322d817e6b8d 100644
--- a/app/code/Magento/Rss/Block/Feeds.php
+++ b/app/code/Magento/Rss/Block/Feeds.php
@@ -9,19 +9,16 @@
  * Class Feeds
  * @api
  * @package Magento\Rss\Block
- * @since 2.0.0
  */
 class Feeds extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'feeds.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\RssManagerInterface
-     * @since 2.0.0
      */
     protected $rssManager;
 
@@ -29,7 +26,6 @@ class Feeds extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Rss\RssManagerInterface $rssManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +40,6 @@ public function __construct(
      * Add Link elements to head
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -66,7 +61,6 @@ protected function _prepareLayout()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed.php
index 83dd70f77d46f..f50a6f5456b68 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed.php
@@ -8,25 +8,21 @@
 /**
  * Class Feed
  * @package Magento\Rss\Controller
- * @since 2.0.0
  */
 abstract class Feed extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Rss\Model\RssManager
-     * @since 2.0.0
      */
     protected $rssManager;
 
     /**
      * @var \Magento\Rss\Model\RssFactory
-     * @since 2.0.0
      */
     protected $rssFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -35,7 +31,6 @@ abstract class Feed extends \Magento\Backend\App\Action
      * @param \Magento\Rss\Model\RssManager $rssManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Rss\Model\RssFactory $rssFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
index 9a7d36146b907..adcbee068ae1e 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class Index
  * @package Magento\Rss\Controller\Feed
- * @since 2.0.0
  */
 class Index extends \Magento\Rss\Controller\Adminhtml\Feed
 {
@@ -20,7 +19,6 @@ class Index extends \Magento\Rss\Controller\Adminhtml\Feed
      *
      * @return void
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Rss/Controller/Feed.php b/app/code/Magento/Rss/Controller/Feed.php
index 3b0f7dac53c39..8fbe7addb560d 100644
--- a/app/code/Magento/Rss/Controller/Feed.php
+++ b/app/code/Magento/Rss/Controller/Feed.php
@@ -7,49 +7,41 @@
 
 /**
  * Class Feed
- * @since 2.0.0
  */
 abstract class Feed extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var \Magento\Framework\HTTP\Authentication
-     * @since 2.0.0
      */
     protected $httpAuthentication;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Rss\Model\RssManager
-     * @since 2.0.0
      */
     protected $rssManager;
 
     /**
      * @var \Magento\Rss\Model\RssFactory
-     * @since 2.0.0
      */
     protected $rssFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -62,7 +54,6 @@ abstract class Feed extends \Magento\Framework\App\Action\Action
      * @param \Magento\Customer\Api\AccountManagementInterface $customerAccountManagement
      * @param \Magento\Framework\HTTP\Authentication $httpAuthentication
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -86,7 +77,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function auth()
     {
diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php
index cb8484d37bd56..9f525561072a9 100644
--- a/app/code/Magento/Rss/Controller/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Feed/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class Index
  * @package Magento\Rss\Controller\Feed
- * @since 2.0.0
  */
 class Index extends \Magento\Rss\Controller\Feed
 {
@@ -20,7 +19,6 @@ class Index extends \Magento\Rss\Controller\Feed
      *
      * @return void
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Rss/Controller/Index.php b/app/code/Magento/Rss/Controller/Index.php
index d49fb7217c5ed..ab7976b8e814e 100644
--- a/app/code/Magento/Rss/Controller/Index.php
+++ b/app/code/Magento/Rss/Controller/Index.php
@@ -8,20 +8,17 @@
 /**
  * Class Index
  * @package Magento\Rss\Controller
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
diff --git a/app/code/Magento/Rss/Controller/Index/Index.php b/app/code/Magento/Rss/Controller/Index/Index.php
index 27222f054c114..65ae956360d15 100644
--- a/app/code/Magento/Rss/Controller/Index/Index.php
+++ b/app/code/Magento/Rss/Controller/Index/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Rss\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Rss\Controller\Index
 {
@@ -20,7 +19,6 @@ class Index extends \Magento\Rss\Controller\Index
      *
      * @return void
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index 2b4aa6c9c5cfd..69543d84ea550 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -13,19 +13,16 @@
  * Provides functionality to work with RSS feeds
  *
  * @api
- * @since 2.0.0
  */
 class Rss
 {
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     protected $dataProvider;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -40,7 +37,6 @@ class Rss
      *
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -85,7 +80,6 @@ public function getFeeds()
     /**
      * @param DataProviderInterface $dataProvider
      * @return $this
-     * @since 2.0.0
      */
     public function setDataProvider(DataProviderInterface $dataProvider)
     {
@@ -95,7 +89,6 @@ public function setDataProvider(DataProviderInterface $dataProvider)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function createRssXml()
     {
diff --git a/app/code/Magento/Rss/Model/RssManager.php b/app/code/Magento/Rss/Model/RssManager.php
index 354c785c970ad..ae94d9dd6fc80 100644
--- a/app/code/Magento/Rss/Model/RssManager.php
+++ b/app/code/Magento/Rss/Model/RssManager.php
@@ -12,20 +12,17 @@
  * Rss Manager
  *
  * @api
- * @since 2.0.0
  */
 class RssManager implements RssManagerInterface
 {
     /**
      * @var \Magento\Framework\App\Rss\DataProviderInterface[]
-     * @since 2.0.0
      */
     protected $providers;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $dataProviders
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -41,7 +38,6 @@ public function __construct(
      * @param string $type
      * @return DataProviderInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getProvider($type)
     {
@@ -66,7 +62,6 @@ public function getProvider($type)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProviders()
     {
diff --git a/app/code/Magento/Rss/Model/System/Config/Backend/Links.php b/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
index c9c7000b22d83..b9d2a5d9f9e34 100644
--- a/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
+++ b/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
@@ -8,7 +8,6 @@
 /**
  * Cache cleaner backend model
  *
- * @since 2.0.0
  */
 class Links extends \Magento\Framework\App\Config\Value
 {
@@ -16,7 +15,6 @@ class Links extends \Magento\Framework\App\Config\Value
      * Invalidate cache type, when value was changed
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Rss/Model/UrlBuilder.php b/app/code/Magento/Rss/Model/UrlBuilder.php
index 9c993a6dcf621..0f0a62a04448b 100644
--- a/app/code/Magento/Rss/Model/UrlBuilder.php
+++ b/app/code/Magento/Rss/Model/UrlBuilder.php
@@ -10,26 +10,22 @@
 /**
  * Class UrlBuilder
  * @package Magento\Rss\Model
- * @since 2.0.0
  */
 class UrlBuilder implements UrlBuilderInterface
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\UrlInterface $urlBuilder,
@@ -42,7 +38,6 @@ public function __construct(
     /**
      * @param array $queryParams
      * @return string
-     * @since 2.0.0
      */
     public function getUrl(array $queryParams = [])
     {
diff --git a/app/code/Magento/Rule/Block/Actions.php b/app/code/Magento/Rule/Block/Actions.php
index ed39e2f72fc14..c8d0d362db739 100644
--- a/app/code/Magento/Rule/Block/Actions.php
+++ b/app/code/Magento/Rule/Block/Actions.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Rule\Block\Actions
  *
- * @since 2.0.0
  */
 class Actions implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Block/Conditions.php b/app/code/Magento/Rule/Block/Conditions.php
index 3d83392c97628..60fb8ac67abb7 100644
--- a/app/code/Magento/Rule/Block/Conditions.php
+++ b/app/code/Magento/Rule/Block/Conditions.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Rule\Block\Conditions
  *
- * @since 2.0.0
  */
 class Conditions implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Block/Editable.php b/app/code/Magento/Rule/Block/Editable.php
index 68a7268c07cf2..30963d5a80d78 100644
--- a/app/code/Magento/Rule/Block/Editable.php
+++ b/app/code/Magento/Rule/Block/Editable.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Editable extends AbstractBlock implements RendererInterface
 {
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $inlineTranslate;
 
@@ -24,7 +22,6 @@ class Editable extends AbstractBlock implements RendererInterface
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Translate\InlineInterface $inlineTranslate
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * @return string
      *
      * @see RendererInterface::render()
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Block/Newchild.php b/app/code/Magento/Rule/Block/Newchild.php
index 4d8ff3d2baef6..2641724ac2f9d 100644
--- a/app/code/Magento/Rule/Block/Newchild.php
+++ b/app/code/Magento/Rule/Block/Newchild.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Rule\Block\Newchild
  *
- * @since 2.0.0
  */
 class Newchild extends \Magento\Framework\View\Element\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
@@ -18,7 +17,6 @@ class Newchild extends \Magento\Framework\View\Element\AbstractBlock implements
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Block/Rule.php b/app/code/Magento/Rule/Block/Rule.php
index 6c42734f0554c..c0ad450a7ed7d 100644
--- a/app/code/Magento/Rule/Block/Rule.php
+++ b/app/code/Magento/Rule/Block/Rule.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Rule\Block\Rule
  *
- * @since 2.0.0
  */
 class Rule extends \Magento\Framework\View\Element\AbstractBlock
 {
diff --git a/app/code/Magento/Rule/Model/AbstractModel.php b/app/code/Magento/Rule/Model/AbstractModel.php
index 43f7bd28a309f..4f5827584308e 100644
--- a/app/code/Magento/Rule/Model/AbstractModel.php
+++ b/app/code/Magento/Rule/Model/AbstractModel.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensibleModel
 {
@@ -21,7 +20,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Store rule combine conditions model
      *
      * @var \Magento\Rule\Model\Condition\Combine
-     * @since 2.0.0
      */
     protected $_conditions;
 
@@ -29,7 +27,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Store rule actions model
      *
      * @var \Magento\Rule\Model\Action\Collection
-     * @since 2.0.0
      */
     protected $_actions;
 
@@ -37,7 +34,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Store rule form instance
      *
      * @var \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     protected $_form;
 
@@ -45,7 +41,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Is model can be deleted flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDeleteable = true;
 
@@ -53,7 +48,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Is model readonly
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isReadonly = false;
 
@@ -67,7 +61,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * Getter for rule combine conditions instance
      *
      * @return \Magento\Rule\Model\Condition\Combine
-     * @since 2.0.0
      */
     abstract public function getConditionsInstance();
 
@@ -75,7 +68,6 @@ abstract public function getConditionsInstance();
      * Getter for rule actions collection instance
      *
      * @return \Magento\Rule\Model\Action\Collection
-     * @since 2.0.0
      */
     abstract public function getActionsInstance();
 
@@ -83,7 +75,6 @@ abstract public function getActionsInstance();
      * Form factory
      *
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
@@ -91,7 +82,6 @@ abstract public function getActionsInstance();
      * Timezone instance
      *
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -109,7 +99,6 @@ abstract public function getActionsInstance();
      * @param AttributeValueFactory|null $customAttributeFactory
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -145,7 +134,6 @@ public function __construct(
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -199,7 +187,6 @@ public function beforeSave()
      *
      * @param \Magento\Rule\Model\Condition\Combine $conditions
      * @return $this
-     * @since 2.0.0
      */
     public function setConditions($conditions)
     {
@@ -211,7 +198,6 @@ public function setConditions($conditions)
      * Retrieve rule combine conditions model
      *
      * @return \Magento\Rule\Model\Condition\Combine
-     * @since 2.0.0
      */
     public function getConditions()
     {
@@ -239,7 +225,6 @@ public function getConditions()
      *
      * @param \Magento\Rule\Model\Action\Collection $actions
      * @return $this
-     * @since 2.0.0
      */
     public function setActions($actions)
     {
@@ -251,7 +236,6 @@ public function setActions($actions)
      * Retrieve rule actions model
      *
      * @return \Magento\Rule\Model\Action\Collection
-     * @since 2.0.0
      */
     public function getActions()
     {
@@ -279,7 +263,6 @@ public function getActions()
      *
      * @param null|\Magento\Rule\Model\Condition\Combine $conditions
      * @return $this
-     * @since 2.0.0
      */
     protected function _resetConditions($conditions = null)
     {
@@ -297,7 +280,6 @@ protected function _resetConditions($conditions = null)
      *
      * @param null|\Magento\Rule\Model\Action\Collection $actions
      * @return $this
-     * @since 2.0.0
      */
     protected function _resetActions($actions = null)
     {
@@ -314,7 +296,6 @@ protected function _resetActions($actions = null)
      * Rule form getter
      *
      * @return \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -329,7 +310,6 @@ public function getForm()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function loadPost(array $data)
     {
@@ -352,7 +332,6 @@ public function loadPost(array $data)
      * @param array $data
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _convertFlatToRecursive(array $data)
     {
@@ -391,7 +370,6 @@ protected function _convertFlatToRecursive(array $data)
      *
      * @param \Magento\Framework\DataObject $object
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\DataObject $object)
     {
@@ -405,7 +383,6 @@ public function validate(\Magento\Framework\DataObject $object)
      * @return bool|string[] - return true if validation passed successfully. Array with errors description otherwise
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validateData(\Magento\Framework\DataObject $dataObject)
     {
@@ -447,7 +424,6 @@ public function validateData(\Magento\Framework\DataObject $dataObject)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isDeleteable()
     {
@@ -460,7 +436,6 @@ public function isDeleteable()
      * @param bool $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIsDeleteable($value)
     {
@@ -473,7 +448,6 @@ public function setIsDeleteable($value)
      *
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -486,7 +460,6 @@ public function isReadonly()
      * @param bool $value
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setIsReadonly($value)
     {
@@ -498,7 +471,6 @@ public function setIsReadonly($value)
      * Get rule associated website Ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteIds()
     {
diff --git a/app/code/Magento/Rule/Model/Action/AbstractAction.php b/app/code/Magento/Rule/Model/Action/AbstractAction.php
index 577affb28402e..e8111c0dc9cd1 100644
--- a/app/code/Magento/Rule/Model/Action/AbstractAction.php
+++ b/app/code/Magento/Rule/Model/Action/AbstractAction.php
@@ -12,26 +12,22 @@
  * Abstract rule action
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractAction extends \Magento\Framework\DataObject implements ActionInterface
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * Base name for hidden elements
      * @var string
-     * @since 2.0.0
      */
     protected $elementName = 'rule';
 
@@ -39,7 +35,6 @@ abstract class AbstractAction extends \Magento\Framework\DataObject implements A
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -65,7 +60,6 @@ public function __construct(
 
     /**
      * @return Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -76,7 +70,6 @@ public function getForm()
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asArray(array $arrAttributes = [])
     {
@@ -91,7 +84,6 @@ public function asArray(array $arrAttributes = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asXml()
     {
@@ -113,7 +105,6 @@ public function asXml()
     /**
      * @param array $arr
      * @return $this
-     * @since 2.0.0
      */
     public function loadArray(array $arr)
     {
@@ -133,7 +124,6 @@ public function loadArray(array $arr)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -143,7 +133,6 @@ public function loadAttributeOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeSelectOptions()
     {
@@ -156,7 +145,6 @@ public function getAttributeSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeName()
     {
@@ -165,7 +153,6 @@ public function getAttributeName()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadOperatorOptions()
     {
@@ -175,7 +162,6 @@ public function loadOperatorOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOperatorSelectOptions()
     {
@@ -188,7 +174,6 @@ public function getOperatorSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOperatorName()
     {
@@ -197,7 +182,6 @@ public function getOperatorName()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadValueOptions()
     {
@@ -207,7 +191,6 @@ public function loadValueOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValueSelectOptions()
     {
@@ -220,7 +203,6 @@ public function getValueSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValueName()
     {
@@ -230,7 +212,6 @@ public function getValueName()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
@@ -239,7 +220,6 @@ public function getNewChildSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNewChildName()
     {
@@ -248,7 +228,6 @@ public function getNewChildName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -257,7 +236,6 @@ public function asHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtmlRecursive()
     {
@@ -267,7 +245,6 @@ public function asHtmlRecursive()
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getTypeElement()
     {
@@ -284,7 +261,6 @@ public function getTypeElement()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getAttributeElement()
     {
@@ -304,7 +280,6 @@ public function getAttributeElement()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getOperatorElement()
     {
@@ -324,7 +299,6 @@ public function getOperatorElement()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getValueElement()
     {
@@ -343,7 +317,6 @@ public function getValueElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddLinkHtml()
     {
@@ -354,7 +327,6 @@ public function getAddLinkHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveLinkHtml()
     {
@@ -369,7 +341,6 @@ public function getRemoveLinkHtml()
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asString($format = '')
     {
@@ -379,7 +350,6 @@ public function asString($format = '')
     /**
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     public function asStringRecursive($level = 0)
     {
@@ -389,7 +359,6 @@ public function asStringRecursive($level = 0)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function process()
     {
diff --git a/app/code/Magento/Rule/Model/Action/ActionInterface.php b/app/code/Magento/Rule/Model/Action/ActionInterface.php
index 79785de83cc1b..ce2d74e020168 100644
--- a/app/code/Magento/Rule/Model/Action/ActionInterface.php
+++ b/app/code/Magento/Rule/Model/Action/ActionInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ActionInterface
 {
diff --git a/app/code/Magento/Rule/Model/Action/Collection.php b/app/code/Magento/Rule/Model/Action/Collection.php
index b1b8c32edb2f1..2f9963deffd12 100644
--- a/app/code/Magento/Rule/Model/Action/Collection.php
+++ b/app/code/Magento/Rule/Model/Action/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends AbstractAction
 {
     /**
      * @var \Magento\Rule\Model\ActionFactory
-     * @since 2.0.0
      */
     protected $_actionFactory;
 
@@ -22,7 +20,6 @@ class Collection extends AbstractAction
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Rule\Model\ActionFactory $actionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -51,7 +48,6 @@ public function __construct(
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asArray(array $arrAttributes = [])
     {
@@ -66,7 +62,6 @@ public function asArray(array $arrAttributes = [])
     /**
      * @param array $arr
      * @return $this
-     * @since 2.0.0
      */
     public function loadArray(array $arr)
     {
@@ -86,7 +81,6 @@ public function loadArray(array $arr)
     /**
      * @param ActionInterface $action
      * @return $this
-     * @since 2.0.0
      */
     public function addAction(ActionInterface $action)
     {
@@ -105,7 +99,6 @@ public function addAction(ActionInterface $action)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -118,7 +111,6 @@ public function asHtml()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getNewChildElement()
     {
@@ -137,7 +129,6 @@ public function getNewChildElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtmlRecursive()
     {
@@ -153,7 +144,6 @@ public function asHtmlRecursive()
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asString($format = '')
     {
@@ -164,7 +154,6 @@ public function asString($format = '')
     /**
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     public function asStringRecursive($level = 0)
     {
@@ -177,7 +166,6 @@ public function asStringRecursive($level = 0)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function process()
     {
diff --git a/app/code/Magento/Rule/Model/ActionFactory.php b/app/code/Magento/Rule/Model/ActionFactory.php
index 4df57d4284a8b..4d20dd08365c3 100644
--- a/app/code/Magento/Rule/Model/ActionFactory.php
+++ b/app/code/Magento/Rule/Model/ActionFactory.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ActionFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @param array $data
      * @return \Magento\Rule\Model\Action\ActionInterface
-     * @since 2.0.0
      */
     public function create($type, array $data = [])
     {
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 5a42f60b06674..75888b0deec81 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -18,7 +18,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCondition extends \Magento\Framework\DataObject implements ConditionInterface
 {
@@ -26,60 +25,51 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
      * Defines which operators will be available for this condition
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_inputType = null;
 
     /**
      * Default values for possible operator options
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultOperatorOptions = null;
 
     /**
      * Default combinations of operator options, depending on input type
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultOperatorInputByType = null;
 
     /**
      * List of input types for values which should be array
      * @var string[]
-     * @since 2.0.0
      */
     protected $_arrayInputTypes = [];
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * Base name for hidden elements
      * @var string
-     * @since 2.0.0
      */
     protected $elementName = 'rule';
 
     /**
      * @param Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, array $data = [])
     {
@@ -111,7 +101,6 @@ public function __construct(Context $context, array $data = [])
      * Default operator input by type map getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultOperatorInputByType()
     {
@@ -135,7 +124,6 @@ public function getDefaultOperatorInputByType()
      * Provides all possible operator options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultOperatorOptions()
     {
@@ -158,7 +146,6 @@ public function getDefaultOperatorOptions()
 
     /**
      * @return Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -169,7 +156,6 @@ public function getForm()
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asArray(array $arrAttributes = [])
     {
@@ -187,7 +173,6 @@ public function asArray(array $arrAttributes = [])
      * Get tables to join
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTablesToJoin()
     {
@@ -198,7 +183,6 @@ public function getTablesToJoin()
      * Get value to bind
      *
      * @return array|float|int|mixed|string
-     * @since 2.0.0
      */
     public function getBindArgumentValue()
     {
@@ -209,7 +193,6 @@ public function getBindArgumentValue()
      * Get field by attribute
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMappedSqlField()
     {
@@ -218,7 +201,6 @@ public function getMappedSqlField()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asXml()
     {
@@ -241,7 +223,6 @@ public function asXml()
      * @param array $arr
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function loadArray($arr)
     {
@@ -256,7 +237,6 @@ public function loadArray($arr)
     /**
      * @param string|array $xml
      * @return $this
-     * @since 2.0.0
      */
     public function loadXml($xml)
     {
@@ -270,7 +250,6 @@ public function loadXml($xml)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -279,7 +258,6 @@ public function loadAttributeOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeOptions()
     {
@@ -288,7 +266,6 @@ public function getAttributeOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAttributeSelectOptions()
     {
@@ -301,7 +278,6 @@ public function getAttributeSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeName()
     {
@@ -310,7 +286,6 @@ public function getAttributeName()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadOperatorOptions()
     {
@@ -325,7 +300,6 @@ public function loadOperatorOptions()
      * Possible values are: string, numeric, date, select, multiselect, grid, boolean
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInputType()
     {
@@ -337,7 +311,6 @@ public function getInputType()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOperatorSelectOptions()
     {
@@ -354,7 +327,6 @@ public function getOperatorSelectOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOperatorName()
     {
@@ -363,7 +335,6 @@ public function getOperatorName()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadValueOptions()
     {
@@ -373,7 +344,6 @@ public function loadValueOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValueSelectOptions()
     {
@@ -391,7 +361,6 @@ public function getValueSelectOptions()
      * Retrieve parsed value
      *
      * @return array|string|int|float
-     * @since 2.0.0
      */
     public function getValueParsed()
     {
@@ -414,7 +383,6 @@ public function getValueParsed()
      * Depends on operator input type
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isArrayOperatorType()
     {
@@ -424,7 +392,6 @@ public function isArrayOperatorType()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -441,7 +408,6 @@ public function getValue()
     /**
      * @return array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getValueName()
     {
@@ -484,7 +450,6 @@ public function getValueName()
      * Get inherited conditions selectors
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
@@ -493,7 +458,6 @@ public function getNewChildSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getNewChildName()
     {
@@ -502,7 +466,6 @@ public function getNewChildName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -517,7 +480,6 @@ public function asHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtmlRecursive()
     {
@@ -527,7 +489,6 @@ public function asHtmlRecursive()
 
     /**
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getTypeElement()
     {
@@ -546,7 +507,6 @@ public function getTypeElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTypeElementHtml()
     {
@@ -555,7 +515,6 @@ public function getTypeElementHtml()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getAttributeElement()
     {
@@ -582,7 +541,6 @@ public function getAttributeElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeElementHtml()
     {
@@ -594,7 +552,6 @@ public function getAttributeElementHtml()
      * If the operator value is empty - define first available operator value as default
      *
      * @return \Magento\Framework\Data\Form\Element\Select
-     * @since 2.0.0
      */
     public function getOperatorElement()
     {
@@ -626,7 +583,6 @@ public function getOperatorElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOperatorElementHtml()
     {
@@ -638,7 +594,6 @@ public function getOperatorElementHtml()
      *
      * @see \Magento\Framework\Data\Form\Element
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementType()
     {
@@ -647,7 +602,6 @@ public function getValueElementType()
 
     /**
      * @return \Magento\Rule\Block\Editable
-     * @since 2.0.0
      */
     public function getValueElementRenderer()
     {
@@ -659,7 +613,6 @@ public function getValueElementRenderer()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getValueElement()
     {
@@ -688,7 +641,6 @@ public function getValueElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementHtml()
     {
@@ -697,7 +649,6 @@ public function getValueElementHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddLinkHtml()
     {
@@ -708,7 +659,6 @@ public function getAddLinkHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveLinkHtml()
     {
@@ -721,7 +671,6 @@ public function getRemoveLinkHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getChooserContainerHtml()
     {
@@ -737,7 +686,6 @@ public function getChooserContainerHtml()
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asString($format = '')
     {
@@ -748,7 +696,6 @@ public function asString($format = '')
     /**
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     public function asStringRecursive($level = 0)
     {
@@ -764,7 +711,6 @@ public function asStringRecursive($level = 0)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function validateAttribute($validatedValue)
     {
@@ -881,7 +827,6 @@ public function validateAttribute($validatedValue)
      * @param string|int|float $value
      * @param bool $strict
      * @return bool
-     * @since 2.0.0
      */
     protected function _compareValues($validatedValue, $value, $strict = true)
     {
@@ -899,7 +844,6 @@ protected function _compareValues($validatedValue, $value, $strict = true)
     /**
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -915,7 +859,6 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
      * Retrieve operator for php validation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOperatorForValidate()
     {
diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php
index 5549d7a270ecc..c8b1e744a62e4 100644
--- a/app/code/Magento/Rule/Model/Condition/Combine.php
+++ b/app/code/Magento/Rule/Model/Condition/Combine.php
@@ -7,26 +7,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Combine extends AbstractCondition
 {
     /**
      * @var \Magento\Rule\Model\ConditionFactory
-     * @since 2.0.0
      */
     protected $_conditionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @param Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, array $data = [])
     {
@@ -60,7 +56,6 @@ public function __construct(Context $context, array $data = [])
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadAggregatorOptions()
     {
@@ -70,7 +65,6 @@ public function loadAggregatorOptions()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAggregatorSelectOptions()
     {
@@ -83,7 +77,6 @@ public function getAggregatorSelectOptions()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAggregatorName()
     {
@@ -92,7 +85,6 @@ public function getAggregatorName()
 
     /**
      * @return object
-     * @since 2.0.0
      */
     public function getAggregatorElement()
     {
@@ -121,7 +113,6 @@ public function getAggregatorElement()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadValueOptions()
     {
@@ -132,7 +123,6 @@ public function loadValueOptions()
     /**
      * @param object $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addCondition($condition)
     {
@@ -153,7 +143,6 @@ public function addCondition($condition)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementType()
     {
@@ -178,7 +167,6 @@ public function getValueElementType()
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asArray(array $arrAttributes = [])
     {
@@ -196,7 +184,6 @@ public function asArray(array $arrAttributes = [])
      * @param string $containerKey
      * @param string $itemKey
      * @return string
-     * @since 2.0.0
      */
     public function asXml($containerKey = 'conditions', $itemKey = 'condition')
     {
@@ -219,7 +206,6 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
      * @param string $key
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function loadArray($arr, $key = 'conditions')
     {
@@ -246,7 +232,6 @@ public function loadArray($arr, $key = 'conditions')
     /**
      * @param array|string $xml
      * @return $this
-     * @since 2.0.0
      */
     public function loadXml($xml)
     {
@@ -263,7 +248,6 @@ public function loadXml($xml)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -280,7 +264,6 @@ public function asHtml()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getNewChildElement()
     {
@@ -300,7 +283,6 @@ public function getNewChildElement()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function asHtmlRecursive()
     {
@@ -321,7 +303,6 @@ public function asHtmlRecursive()
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function asString($format = '')
     {
@@ -332,7 +313,6 @@ public function asString($format = '')
     /**
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     public function asStringRecursive($level = 0)
     {
@@ -346,7 +326,6 @@ public function asStringRecursive($level = 0)
     /**
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -358,7 +337,6 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
      *
      * @param int $entityId
      * @return mixed
-     * @since 2.0.0
      */
     public function validateByEntityId($entityId)
     {
@@ -370,7 +348,6 @@ public function validateByEntityId($entityId)
      *
      * @param int|\Magento\Framework\Model\AbstractModel $entity
      * @return bool
-     * @since 2.0.0
      */
     protected function _isValid($entity)
     {
@@ -399,7 +376,6 @@ protected function _isValid($entity)
     /**
      * @param \Magento\Framework\Data\Form $form
      * @return $this
-     * @since 2.0.0
      */
     public function setJsFormObject($form)
     {
@@ -414,7 +390,6 @@ public function setJsFormObject($form)
      * Get conditions, if current prefix is undefined use 'conditions' key
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConditions()
     {
@@ -427,7 +402,6 @@ public function getConditions()
      *
      * @param array $conditions
      * @return $this
-     * @since 2.0.0
      */
     public function setConditions($conditions)
     {
@@ -439,7 +413,6 @@ public function setConditions($conditions)
      * Getter for "Conditions Combination" select option for recursive combines
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getRecursiveChildSelectOption()
     {
diff --git a/app/code/Magento/Rule/Model/Condition/ConditionInterface.php b/app/code/Magento/Rule/Model/Condition/ConditionInterface.php
index 88b5b5544cb04..b7e03424a4860 100644
--- a/app/code/Magento/Rule/Model/Condition/ConditionInterface.php
+++ b/app/code/Magento/Rule/Model/Condition/ConditionInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ConditionInterface
 {
@@ -15,7 +14,6 @@ interface ConditionInterface
      * Get tables to join
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTablesToJoin();
 
@@ -23,7 +21,6 @@ public function getTablesToJoin();
      * Get field by attribute
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMappedSqlField();
 
@@ -31,7 +28,6 @@ public function getMappedSqlField();
      * Get argument value to bind
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBindArgumentValue();
 }
diff --git a/app/code/Magento/Rule/Model/Condition/Context.php b/app/code/Magento/Rule/Model/Condition/Context.php
index 4d40f08f82690..c7055b5ce8c18 100644
--- a/app/code/Magento/Rule/Model/Condition/Context.php
+++ b/app/code/Magento/Rule/Model/Condition/Context.php
@@ -18,37 +18,31 @@
  *
  * @api
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Rule\Model\ConditionFactory
-     * @since 2.0.0
      */
     protected $_conditionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -58,7 +52,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Rule\Model\ConditionFactory $conditionFactory
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -76,7 +69,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     public function getAssetRepository()
     {
@@ -85,7 +77,6 @@ public function getAssetRepository()
 
     /**
      * @return \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     public function getLocaleDate()
     {
@@ -94,7 +85,6 @@ public function getLocaleDate()
 
     /**
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -103,7 +93,6 @@ public function getLayout()
 
     /**
      * @return \Magento\Rule\Model\ConditionFactory
-     * @since 2.0.0
      */
     public function getConditionFactory()
     {
@@ -112,7 +101,6 @@ public function getConditionFactory()
 
     /**
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index 7125eccbac130..c5a59ddc99a9e 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCondition
 {
@@ -34,7 +33,6 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
      * Will be set only for not global scope attribute
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_entityAttributeValues = null;
 
@@ -42,7 +40,6 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
      * Attribute data key that indicates whether it should be used for rules
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_isUsedForRuleProperty = 'is_used_for_promo_rules';
 
@@ -50,43 +47,36 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_backendData;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_productResource;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
-     * @since 2.0.0
      */
     protected $_attrSetCollection;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
@@ -109,7 +99,6 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -138,7 +127,6 @@ public function __construct(
      * Customize default operator input by type mapper for some types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultOperatorInputByType()
     {
@@ -157,7 +145,6 @@ public function getDefaultOperatorInputByType()
      * Retrieve attribute object
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.0.0
      */
     public function getAttributeObject()
     {
@@ -175,7 +162,6 @@ public function getAttributeObject()
      *
      * @param array &$attributes
      * @return void
-     * @since 2.0.0
      */
     protected function _addSpecialAttributes(array &$attributes)
     {
@@ -187,7 +173,6 @@ protected function _addSpecialAttributes(array &$attributes)
      * Load attribute options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -221,7 +206,6 @@ public function loadAttributeOptions()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareValueOptions()
     {
@@ -273,7 +257,6 @@ protected function _prepareValueOptions()
      * @param array $selectReady
      * @param array $hashedReady
      * @return $this
-     * @since 2.0.0
      */
     protected function _setSelectOptions($selectOptions, $selectReady, $hashedReady)
     {
@@ -301,7 +284,6 @@ protected function _setSelectOptions($selectOptions, $selectReady, $hashedReady)
      *
      * @param string|null $option
      * @return string
-     * @since 2.0.0
      */
     public function getValueOption($option = null)
     {
@@ -313,7 +295,6 @@ public function getValueOption($option = null)
      * Retrieve select option values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getValueSelectOptions()
     {
@@ -325,7 +306,6 @@ public function getValueSelectOptions()
      * Retrieve after element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueAfterElementHtml()
     {
@@ -353,7 +333,6 @@ public function getValueAfterElementHtml()
      * Retrieve attribute element
      *
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function getAttributeElement()
     {
@@ -367,7 +346,6 @@ public function getAttributeElement()
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
      * @return $this
-     * @since 2.0.0
      */
     public function collectValidatedAttributes($productCollection)
     {
@@ -390,7 +368,6 @@ public function collectValidatedAttributes($productCollection)
      * Retrieve input type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInputType()
     {
@@ -425,7 +402,6 @@ public function getInputType()
      * Retrieve value element type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementType()
     {
@@ -455,7 +431,6 @@ public function getValueElementType()
      * Retrieve value element chooser URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementChooserUrl()
     {
@@ -479,7 +454,6 @@ public function getValueElementChooserUrl()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getExplicitApply()
     {
@@ -507,7 +481,6 @@ public function getExplicitApply()
      * @param array $arr
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function loadArray($arr)
     {
@@ -553,7 +526,6 @@ public function loadArray($arr)
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -617,7 +589,6 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
      * Get argument value to bind
      *
      * @return array|float|int|mixed|string|\Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getBindArgumentValue()
     {
@@ -641,7 +612,6 @@ public function getBindArgumentValue()
      * Get mapped sql field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMappedSqlField()
     {
@@ -662,7 +632,6 @@ public function getMappedSqlField()
      *
      * @param int $productId
      * @return bool
-     * @since 2.0.0
      */
     public function validateByEntityId($productId)
     {
@@ -683,7 +652,6 @@ public function validateByEntityId($productId)
      *
      * @param int $productId
      * @return array
-     * @since 2.0.0
      */
     protected function _getAvailableInCategories($productId)
     {
@@ -707,7 +675,6 @@ protected function _getAvailableInCategories($productId)
      *
      * @param int $productId
      * @return string
-     * @since 2.0.0
      */
     protected function _getAttributeSetId($productId)
     {
@@ -731,7 +698,6 @@ protected function _getAttributeSetId($productId)
      * Categories can't be equal because product is included categories selected by administrator and in their parents
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOperatorForValidate()
     {
@@ -751,7 +717,6 @@ public function getOperatorForValidate()
      * Check is attribute set or category
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isAttributeSetOrCategory()
     {
@@ -762,7 +727,6 @@ protected function isAttributeSetOrCategory()
      * Get eav attribute alias
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getEavAttributeTableAlias()
     {
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 1a725ca7a88c2..c3ffda059c951 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -12,19 +12,16 @@
 
 /**
  * Class SQL Builder
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_conditionOperatorMap = [
         '=='    => ':field = ?',
@@ -41,13 +38,11 @@ class Builder
 
     /**
      * @var \Magento\Rule\Model\Condition\Sql\ExpressionFactory
-     * @since 2.0.0
      */
     protected $_expressionFactory;
 
     /**
      * @param ExpressionFactory $expressionFactory
-     * @since 2.0.0
      */
     public function __construct(ExpressionFactory $expressionFactory)
     {
@@ -59,7 +54,6 @@ public function __construct(ExpressionFactory $expressionFactory)
      *
      * @param Combine $combine
      * @return array
-     * @since 2.0.0
      */
     protected function _getCombineTablesToJoin(Combine $combine)
     {
@@ -73,7 +67,6 @@ protected function _getCombineTablesToJoin(Combine $combine)
      * @param Combine $combine
      * @param array $tables
      * @return array
-     * @since 2.0.0
      */
     protected function _getChildCombineTablesToJoin(Combine $combine, $tables = [])
     {
@@ -98,7 +91,6 @@ protected function _getChildCombineTablesToJoin(Combine $combine, $tables = [])
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
      * @param Combine $combine
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinTablesToCollection(
         \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
@@ -120,7 +112,6 @@ protected function _joinTablesToCollection(
      * @param string $value
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getMappedSqlCondition(AbstractCondition $condition, $value = '')
     {
@@ -150,7 +141,6 @@ protected function _getMappedSqlCondition(AbstractCondition $condition, $value =
      * @param string $value
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getMappedSqlCombination(Combine $combine, $value = '')
     {
@@ -179,7 +169,6 @@ protected function _getMappedSqlCombination(Combine $combine, $value = '')
      * @param Combine $combine
      *
      * @return void
-     * @since 2.0.0
      */
     public function attachConditionToCollection(
         \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Expression.php b/app/code/Magento/Rule/Model/Condition/Sql/Expression.php
index c526f72515185..0896a65652681 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Expression.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Expression.php
@@ -8,7 +8,6 @@
 
 /**
  * Abstract Rule sql condition
- * @since 2.0.0
  */
 class Expression extends \Zend_Db_Expr
 {
@@ -16,7 +15,6 @@ class Expression extends \Zend_Db_Expr
      * Turn expression in this object into string
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
diff --git a/app/code/Magento/Rule/Model/ConditionFactory.php b/app/code/Magento/Rule/Model/ConditionFactory.php
index e95e720dd1a07..0f84fa555d0ea 100644
--- a/app/code/Magento/Rule/Model/ConditionFactory.php
+++ b/app/code/Magento/Rule/Model/ConditionFactory.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Rule\Model\ConditionFactory
  *
- * @since 2.0.0
  */
 class ConditionFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -24,13 +22,11 @@ class ConditionFactory
      * Store all used condition models
      *
      * @var array
-     * @since 2.0.0
      */
     private $conditionModels = [];
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -48,7 +44,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @throws \LogicException
      * @throws \BadMethodCallException
-     * @since 2.0.0
      */
     public function create($type)
     {
diff --git a/app/code/Magento/Rule/Model/Renderer/Actions.php b/app/code/Magento/Rule/Model/Renderer/Actions.php
index c260c5b819fe9..e85b10a32d7f4 100644
--- a/app/code/Magento/Rule/Model/Renderer/Actions.php
+++ b/app/code/Magento/Rule/Model/Renderer/Actions.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Rule\Model\Renderer\Actions
  *
- * @since 2.0.0
  */
 class Actions implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Model/Renderer/Conditions.php b/app/code/Magento/Rule/Model/Renderer/Conditions.php
index dc89dc145fd8a..9b1130f064f26 100644
--- a/app/code/Magento/Rule/Model/Renderer/Conditions.php
+++ b/app/code/Magento/Rule/Model/Renderer/Conditions.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Rule\Model\Renderer\Conditions
  *
- * @since 2.0.0
  */
 class Conditions implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
diff --git a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
index cd1b44a37c83f..71e70a3406915 100644
--- a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
@@ -10,7 +10,6 @@
  * Abstract Rule entity resource model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -33,7 +32,6 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_associatedEntitiesMap = [];
 
@@ -42,7 +40,6 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -76,7 +73,6 @@ private function resolveDate(\Magento\Framework\Model\AbstractModel $object, $da
      * @param string $entityType
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function bindRuleToEntity($ruleIds, $entityIds, $entityType)
     {
@@ -101,7 +97,6 @@ public function bindRuleToEntity($ruleIds, $entityIds, $entityType)
      * @param int|[] $entityIds
      * @param string $entityType
      * @return $this
-     * @since 2.0.0
      */
     protected function _multiplyBunchInsert($ruleIds, $entityIds, $entityType)
     {
@@ -162,7 +157,6 @@ protected function _multiplyBunchInsert($ruleIds, $entityIds, $entityType)
      * @param int[]|int|string $entityIds
      * @param string $entityType
      * @return $this
-     * @since 2.0.0
      */
     public function unbindRuleFromEntity($ruleIds, $entityIds, $entityType)
     {
@@ -195,7 +189,6 @@ public function unbindRuleFromEntity($ruleIds, $entityIds, $entityType)
      * @param int $ruleId
      * @param string $entityType
      * @return array
-     * @since 2.0.0
      */
     public function getAssociatedEntityIds($ruleId, $entityType)
     {
@@ -217,7 +210,6 @@ public function getAssociatedEntityIds($ruleId, $entityType)
      *
      * @param int $ruleId
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteIds($ruleId)
     {
@@ -229,7 +221,6 @@ public function getWebsiteIds($ruleId)
      *
      * @param int $ruleId
      * @return array
-     * @since 2.0.0
      */
     public function getCustomerGroupIds($ruleId)
     {
@@ -243,7 +234,6 @@ public function getCustomerGroupIds($ruleId)
      * @param string $entityType
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getAssociatedEntityInfo($entityType)
     {
diff --git a/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php b/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
index 34642731eab4f..dc4049b597ef8 100644
--- a/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
+++ b/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
@@ -10,7 +10,6 @@
  * Abstract Rule entity resource collection model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -33,7 +32,6 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_associatedEntitiesMap = [];
 
@@ -41,7 +39,6 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
      * Add website ids to rules data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -61,7 +58,6 @@ protected function _afterLoad()
      *
      * @param bool|null $flag
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsitesToResult($flag = null)
     {
@@ -75,7 +71,6 @@ public function addWebsitesToResult($flag = null)
      *
      * @param int|int[]|\Magento\Store\Model\Website $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($websiteId)
     {
@@ -104,7 +99,6 @@ public function addWebsiteFilter($websiteId)
      * @param string $field
      * @param null|string|array $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -121,7 +115,6 @@ public function addFieldToFilter($field, $condition = null)
      *
      * @param int $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function addIsActiveFilter($isActive = 1)
     {
@@ -140,7 +133,6 @@ public function addIsActiveFilter($isActive = 1)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
-     * @since 2.0.0
      */
     protected function _getAssociatedEntityInfo($entityType)
     {
diff --git a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
index e8dbfafb9942b..b2dc16dfdf454 100644
--- a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
@@ -16,7 +16,6 @@
  * customer account so that the customer can make future purchases. A credit memo usually includes comments that detail
  * why the credit memo amount was credited to the customer.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoCommentRepositoryInterface
 {
@@ -25,7 +24,6 @@ interface CreditmemoCommentRepositoryInterface
      *
      * @param int $id The credit memo comment ID.
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface Credit memo comment interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -36,7 +34,6 @@ public function get($id);
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterface Credit memo comment search results interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -45,7 +42,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterface $entity The credit memo comment.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entity);
 
@@ -54,7 +50,6 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entit
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterface $entity The credit memo comment.
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface Credit memo comment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/CreditmemoItemRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoItemRepositoryInterface.php
index b82c4ca93b5de..c67a3abf4473f 100644
--- a/app/code/Magento/Sales/Api/CreditmemoItemRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoItemRepositoryInterface.php
@@ -13,7 +13,6 @@
  * customer account so that the customer can make future purchases. A credit memo item is an invoiced item for which
  * a merchant creates a credit memo.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoItemRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface CreditmemoItemRepositoryInterface
      *
      * @param int $id The credit memo item ID.
      * @return \Magento\Sales\Api\Data\CreditmemoItemInterface Credit memo item interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -31,7 +29,6 @@ public function get($id);
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\CreditmemoItemSearchResultInterface Credit memo item search results interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -40,7 +37,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface $entity The credit memo item.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\CreditmemoItemInterface $entity);
 
@@ -49,7 +45,6 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoItemInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface $entity The credit memo item.
      * @return \Magento\Sales\Api\Data\CreditmemoItemInterface Credit memo interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\CreditmemoItemInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
index fafb99cceea7a..dee190229a754 100644
--- a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
@@ -15,7 +15,6 @@
  * to refund all or part of the amount paid for any returned or undelivered items. The memo restores funds to the
  * customer account so that the customer can make future purchases.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoManagementInterface
 {
@@ -25,7 +24,6 @@ interface CreditmemoManagementInterface
      * @param int $id The credit memo ID.
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function cancel($id);
 
@@ -34,7 +32,6 @@ public function cancel($id);
      *
      * @param int $id The credit memo ID.
      * @return \Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterface Credit memo comment search results interface.
-     * @since 2.0.0
      */
     public function getCommentsList($id);
 
@@ -43,7 +40,6 @@ public function getCommentsList($id);
      *
      * @param int $id The credit memo ID.
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id);
 
@@ -53,7 +49,6 @@ public function notify($id);
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
      * @param bool $offlineRequested
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
-     * @since 2.0.0
      */
     public function refund(
         \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
diff --git a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
index 9c42b6c9cdd9c..2b53c5806aec1 100644
--- a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
@@ -12,7 +12,6 @@
  * to refund all or part of the amount paid for any returned or undelivered items. The memo restores funds to the
  * customer account so that the customer can make future purchases.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoRepositoryInterface
 {
@@ -25,7 +24,6 @@ interface CreditmemoRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\CreditmemoSearchResultInterface Credit memo search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -34,7 +32,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The credit memo ID.
      * @return \Magento\Sales\Api\Data\CreditmemoInterface Credit memo interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -42,7 +39,6 @@ public function get($id);
      * Create credit memo instance
      *
      * @return \Magento\Sales\Api\Data\CreditmemoInterface Credit memo interface.
-     * @since 2.0.0
      */
     public function create();
 
@@ -51,7 +47,6 @@ public function create();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $entity The credit memo.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\CreditmemoInterface $entity);
 
@@ -60,7 +55,6 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $entity The credit memo.
      * @return \Magento\Sales\Api\Data\CreditmemoInterface Credit memo interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\CreditmemoInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CommentInterface.php b/app/code/Magento/Sales/Api/Data/CommentInterface.php
index 1b136eba1a8e5..80de68d301a60 100644
--- a/app/code/Magento/Sales/Api/Data/CommentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CommentInterface.php
@@ -9,7 +9,7 @@
  * Interface CommentInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface CommentInterface
 {
@@ -27,7 +27,7 @@ interface CommentInterface
      * Gets the comment text.
      *
      * @return string Comment.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getComment();
 
@@ -36,7 +36,7 @@ public function getComment();
      *
      * @param string $comment
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setComment($comment);
 
@@ -44,7 +44,7 @@ public function setComment($comment);
      * Gets the is-visible-on-storefront flag value for the comment.
      *
      * @return int Is-visible-on-storefront flag value.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getIsVisibleOnFront();
 
@@ -53,7 +53,7 @@ public function getIsVisibleOnFront();
      *
      * @param int $isVisibleOnFront
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setIsVisibleOnFront($isVisibleOnFront);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php
index dd4a15dd87441..1c0dc90b7627c 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php
@@ -11,7 +11,7 @@
  * Interface CreditmemoCommentCreationInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CreditmemoCommentCreationInterface extends ExtensibleDataInterface, CommentInterface
 {
@@ -19,7 +19,7 @@ interface CreditmemoCommentCreationInterface extends ExtensibleDataInterface, Co
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes();
 
@@ -28,7 +28,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCommentInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCommentInterface.php
index 1663ce3e42d7b..00326b61134e0 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoCommentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoCommentInterface.php
@@ -13,7 +13,6 @@
  * customer account so that the customer can make future purchases. A credit memo usually includes comments that detail
  * why the credit memo amount was credited to the customer.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoCommentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -49,7 +48,6 @@ interface CreditmemoCommentInterface extends \Magento\Framework\Api\ExtensibleDa
      * Gets the credit memo comment.
      *
      * @return string Comment.
-     * @since 2.0.0
      */
     public function getComment();
 
@@ -57,7 +55,6 @@ public function getComment();
      * Gets the credit memo created-at timestamp.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -66,7 +63,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -74,7 +70,6 @@ public function setCreatedAt($createdAt);
      * Gets the credit memo ID.
      *
      * @return int|null Credit memo ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -83,7 +78,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -91,7 +85,6 @@ public function setEntityId($entityId);
      * Gets the is-customer-notified flag value for the credit memo.
      *
      * @return int Is-customer-notified flag value.
-     * @since 2.0.0
      */
     public function getIsCustomerNotified();
 
@@ -99,7 +92,6 @@ public function getIsCustomerNotified();
      * Gets the is-visible-on-storefront flag value for the credit memo.
      *
      * @return int Is-visible-on-storefront flag value.
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront();
 
@@ -107,7 +99,6 @@ public function getIsVisibleOnFront();
      * Gets the parent ID for the credit memo.
      *
      * @return int Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -116,7 +107,6 @@ public function getParentId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -125,7 +115,6 @@ public function setParentId($id);
      *
      * @param int $isCustomerNotified
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified);
 
@@ -134,7 +123,6 @@ public function setIsCustomerNotified($isCustomerNotified);
      *
      * @param int $isVisibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront);
 
@@ -143,7 +131,6 @@ public function setIsVisibleOnFront($isVisibleOnFront);
      *
      * @param string $comment
      * @return $this
-     * @since 2.0.0
      */
     public function setComment($comment);
 
@@ -151,7 +138,6 @@ public function setComment($comment);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -160,7 +146,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php
index 35ff716411027..c277827347a95 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php
@@ -13,7 +13,6 @@
  * customer account so that the customer can make future purchases. A credit memo usually includes comments that detail
  * why the credit memo amount was credited to the customer.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoCommentSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -21,7 +20,6 @@ interface CreditmemoCommentSearchResultInterface extends \Magento\Framework\Api\
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -30,7 +28,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php
index 87ec10bfc3bc2..f8d34f4cc1007 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php
@@ -9,7 +9,7 @@
  * Interface CreditmemoCreationArgumentsInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CreditmemoCreationArgumentsInterface
 {
@@ -17,7 +17,7 @@ interface CreditmemoCreationArgumentsInterface
      * Gets the credit memo shipping amount.
      *
      * @return float|null Credit memo shipping amount.
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getShippingAmount();
 
@@ -25,7 +25,7 @@ public function getShippingAmount();
      * Gets the credit memo positive adjustment.
      *
      * @return float|null Credit memo positive adjustment.
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAdjustmentPositive();
 
@@ -33,7 +33,7 @@ public function getAdjustmentPositive();
      * Gets the credit memo negative adjustment.
      *
      * @return float|null Credit memo negative adjustment.
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAdjustmentNegative();
 
@@ -42,7 +42,7 @@ public function getAdjustmentNegative();
      *
      * @param float $amount
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setShippingAmount($amount);
 
@@ -51,7 +51,7 @@ public function setShippingAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setAdjustmentPositive($amount);
 
@@ -60,7 +60,7 @@ public function setAdjustmentPositive($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setAdjustmentNegative($amount);
 
@@ -68,7 +68,7 @@ public function setAdjustmentNegative($amount);
      * Gets existing extension attributes.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes();
 
@@ -78,7 +78,7 @@ public function getExtensionAttributes();
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface $extensionAttributes
      *
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
index 395b35fb5449d..2a317c30962bb 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
@@ -15,7 +15,6 @@
  * to refund all or part of the amount paid for any returned or undelivered items. The memo restores funds to the
  * customer account so that the customer can make future purchases.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -227,7 +226,6 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter
      * Gets the credit memo adjustment.
      *
      * @return float|null Credit memo adjustment.
-     * @since 2.0.0
      */
     public function getAdjustment();
 
@@ -235,7 +233,6 @@ public function getAdjustment();
      * Gets the credit memo negative adjustment.
      *
      * @return float|null Credit memo negative adjustment.
-     * @since 2.0.0
      */
     public function getAdjustmentNegative();
 
@@ -243,7 +240,6 @@ public function getAdjustmentNegative();
      * Gets the credit memo positive adjustment.
      *
      * @return float|null Credit memo positive adjustment.
-     * @since 2.0.0
      */
     public function getAdjustmentPositive();
 
@@ -251,7 +247,6 @@ public function getAdjustmentPositive();
      * Gets the credit memo base adjustment.
      *
      * @return float|null Credit memo base adjustment.
-     * @since 2.0.0
      */
     public function getBaseAdjustment();
 
@@ -259,7 +254,6 @@ public function getBaseAdjustment();
      * Gets the credit memo negative base adjustment.
      *
      * @return float|null Credit memo negative base adjustment.
-     * @since 2.0.0
      */
     public function getBaseAdjustmentNegative();
 
@@ -268,7 +262,6 @@ public function getBaseAdjustmentNegative();
      *
      * @param float $baseAdjustmentNegative
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentNegative($baseAdjustmentNegative);
 
@@ -276,7 +269,6 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative);
      * Gets the credit memo positive base adjustment.
      *
      * @return float|null Credit memo positive base adjustment.
-     * @since 2.0.0
      */
     public function getBaseAdjustmentPositive();
 
@@ -285,7 +277,6 @@ public function getBaseAdjustmentPositive();
      *
      * @param float $baseAdjustmentPositive
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentPositive($baseAdjustmentPositive);
 
@@ -293,7 +284,6 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive);
      * Gets the credit memo base currency code.
      *
      * @return string|null Credit memo base currency code.
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -301,7 +291,6 @@ public function getBaseCurrencyCode();
      * Gets the credit memo base discount amount.
      *
      * @return float|null Credit memo base discount amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -309,7 +298,6 @@ public function getBaseDiscountAmount();
      * Gets the credit memo base grand total.
      *
      * @return float|null Credit memo base grand total.
-     * @since 2.0.0
      */
     public function getBaseGrandTotal();
 
@@ -317,7 +305,6 @@ public function getBaseGrandTotal();
      * Gets the credit memo base discount tax compensation amount.
      *
      * @return float|null Credit memo base discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -325,7 +312,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the credit memo base shipping amount.
      *
      * @return float|null Credit memo base shipping amount.
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
@@ -333,7 +319,6 @@ public function getBaseShippingAmount();
      * Gets the credit memo base shipping discount tax compensation amount.
      *
      * @return float|null Credit memo base shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -341,7 +326,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt();
      * Gets the credit memo base shipping including tax.
      *
      * @return float|null Credit memo base shipping including tax.
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax();
 
@@ -349,7 +333,6 @@ public function getBaseShippingInclTax();
      * Gets the credit memo base shipping tax amount.
      *
      * @return float|null Credit memo base shipping tax amount.
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount();
 
@@ -357,7 +340,6 @@ public function getBaseShippingTaxAmount();
      * Gets the credit memo base subtotal.
      *
      * @return float|null Credit memo base subtotal.
-     * @since 2.0.0
      */
     public function getBaseSubtotal();
 
@@ -365,7 +347,6 @@ public function getBaseSubtotal();
      * Gets the credit memo base subtotal including tax.
      *
      * @return float|null Credit memo base subtotal including tax.
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax();
 
@@ -373,7 +354,6 @@ public function getBaseSubtotalInclTax();
      * Gets the credit memo base tax amount.
      *
      * @return float|null Credit memo base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -381,7 +361,6 @@ public function getBaseTaxAmount();
      * Gets the credit memo base-to-global rate.
      *
      * @return float|null Credit memo base-to-global rate.
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate();
 
@@ -389,7 +368,6 @@ public function getBaseToGlobalRate();
      * Gets the credit memo base-to-order rate.
      *
      * @return float|null Credit memo base-to-order rate.
-     * @since 2.0.0
      */
     public function getBaseToOrderRate();
 
@@ -397,7 +375,6 @@ public function getBaseToOrderRate();
      * Gets the credit memo billing address ID.
      *
      * @return int|null Credit memo billing address ID.
-     * @since 2.0.0
      */
     public function getBillingAddressId();
 
@@ -405,7 +382,6 @@ public function getBillingAddressId();
      * Gets the credit memo created-at timestamp.
      *
      * @return string|null Credit memo created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -414,7 +390,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -422,7 +397,6 @@ public function setCreatedAt($createdAt);
      * Gets the credit memo status.
      *
      * @return int|null Credit memo status.
-     * @since 2.0.0
      */
     public function getCreditmemoStatus();
 
@@ -430,7 +404,6 @@ public function getCreditmemoStatus();
      * Gets the credit memo discount amount.
      *
      * @return float|null Credit memo discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -438,7 +411,6 @@ public function getDiscountAmount();
      * Gets the credit memo discount description.
      *
      * @return string|null Credit memo discount description.
-     * @since 2.0.0
      */
     public function getDiscountDescription();
 
@@ -446,7 +418,6 @@ public function getDiscountDescription();
      * Gets the credit memo email sent flag value.
      *
      * @return int|null Credit memo email sent flag value.
-     * @since 2.0.0
      */
     public function getEmailSent();
 
@@ -454,7 +425,6 @@ public function getEmailSent();
      * Gets the credit memo ID.
      *
      * @return int|null Credit memo ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -463,7 +433,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -471,7 +440,6 @@ public function setEntityId($entityId);
      * Gets the credit memo global currency code.
      *
      * @return string|null Credit memo global currency code.
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode();
 
@@ -479,7 +447,6 @@ public function getGlobalCurrencyCode();
      * Gets the credit memo grand total.
      *
      * @return float|null Credit memo grand total.
-     * @since 2.0.0
      */
     public function getGrandTotal();
 
@@ -487,7 +454,6 @@ public function getGrandTotal();
      * Gets the credit memo discount tax compensation amount.
      *
      * @return float|null Credit memo discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -495,7 +461,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the credit memo increment ID.
      *
      * @return string|null Credit memo increment ID.
-     * @since 2.0.0
      */
     public function getIncrementId();
 
@@ -503,7 +468,6 @@ public function getIncrementId();
      * Gets the credit memo invoice ID.
      *
      * @return int|null Credit memo invoice ID.
-     * @since 2.0.0
      */
     public function getInvoiceId();
 
@@ -511,7 +475,6 @@ public function getInvoiceId();
      * Gets the credit memo order currency code.
      *
      * @return string|null Credit memo order currency code.
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode();
 
@@ -519,7 +482,6 @@ public function getOrderCurrencyCode();
      * Gets the credit memo order ID.
      *
      * @return int Credit memo order ID.
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -527,7 +489,6 @@ public function getOrderId();
      * Gets the credit memo shipping address ID.
      *
      * @return int|null Credit memo shipping address ID.
-     * @since 2.0.0
      */
     public function getShippingAddressId();
 
@@ -535,7 +496,6 @@ public function getShippingAddressId();
      * Gets the credit memo shipping amount.
      *
      * @return float|null Credit memo shipping amount.
-     * @since 2.0.0
      */
     public function getShippingAmount();
 
@@ -543,7 +503,6 @@ public function getShippingAmount();
      * Gets the credit memo shipping discount tax compensation amount.
      *
      * @return float|null Credit memo shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount();
 
@@ -551,7 +510,6 @@ public function getShippingDiscountTaxCompensationAmount();
      * Gets the credit memo shipping including tax.
      *
      * @return float|null Credit memo shipping including tax.
-     * @since 2.0.0
      */
     public function getShippingInclTax();
 
@@ -559,7 +517,6 @@ public function getShippingInclTax();
      * Gets the credit memo shipping tax amount.
      *
      * @return float|null Credit memo shipping tax amount.
-     * @since 2.0.0
      */
     public function getShippingTaxAmount();
 
@@ -567,7 +524,6 @@ public function getShippingTaxAmount();
      * Gets the credit memo state.
      *
      * @return int|null Credit memo state.
-     * @since 2.0.0
      */
     public function getState();
 
@@ -575,7 +531,6 @@ public function getState();
      * Gets the credit memo store currency code.
      *
      * @return string|null Credit memo store currency code.
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode();
 
@@ -583,7 +538,6 @@ public function getStoreCurrencyCode();
      * Gets the credit memo store ID.
      *
      * @return int|null Credit memo store ID.
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -591,7 +545,6 @@ public function getStoreId();
      * Gets the credit memo store-to-base rate.
      *
      * @return float|null Credit memo store-to-base rate.
-     * @since 2.0.0
      */
     public function getStoreToBaseRate();
 
@@ -599,7 +552,6 @@ public function getStoreToBaseRate();
      * Gets the credit memo store-to-order rate.
      *
      * @return float|null Credit memo store-to-order rate.
-     * @since 2.0.0
      */
     public function getStoreToOrderRate();
 
@@ -607,7 +559,6 @@ public function getStoreToOrderRate();
      * Gets the credit memo subtotal.
      *
      * @return float|null Credit memo subtotal.
-     * @since 2.0.0
      */
     public function getSubtotal();
 
@@ -615,7 +566,6 @@ public function getSubtotal();
      * Gets the credit memo subtotal including tax.
      *
      * @return float|null Credit memo subtotal including tax.
-     * @since 2.0.0
      */
     public function getSubtotalInclTax();
 
@@ -623,7 +573,6 @@ public function getSubtotalInclTax();
      * Gets the credit memo tax amount.
      *
      * @return float|null Credit memo tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -631,7 +580,6 @@ public function getTaxAmount();
      * Gets the credit memo transaction ID.
      *
      * @return string|null Credit memo transaction ID.
-     * @since 2.0.0
      */
     public function getTransactionId();
 
@@ -640,7 +588,6 @@ public function getTransactionId();
      *
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId);
 
@@ -648,7 +595,6 @@ public function setTransactionId($transactionId);
      * Gets the credit memo updated-at timestamp.
      *
      * @return string|null Credit memo updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -656,7 +602,6 @@ public function getUpdatedAt();
      * Gets credit memo items.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemInterface[] Array of credit memo items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -665,7 +610,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems($items);
 
@@ -673,7 +617,6 @@ public function setItems($items);
      * Gets credit memo comments.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface[]|null Array of any credit memo comments. Otherwise, null.
-     * @since 2.0.0
      */
     public function getComments();
 
@@ -682,7 +625,6 @@ public function getComments();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterface[] $comments
      * @return $this
-     * @since 2.0.0
      */
     public function setComments($comments);
 
@@ -691,7 +633,6 @@ public function setComments($comments);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($id);
 
@@ -700,7 +641,6 @@ public function setStoreId($id);
      *
      * @param float $adjustmentPositive
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentPositive($adjustmentPositive);
 
@@ -709,7 +649,6 @@ public function setAdjustmentPositive($adjustmentPositive);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount);
 
@@ -718,7 +657,6 @@ public function setBaseShippingTaxAmount($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate);
 
@@ -727,7 +665,6 @@ public function setStoreToOrderRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -736,7 +673,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate);
 
@@ -745,7 +681,6 @@ public function setBaseToOrderRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setGrandTotal($amount);
 
@@ -754,7 +689,6 @@ public function setGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount);
 
@@ -763,7 +697,6 @@ public function setBaseSubtotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($amount);
 
@@ -772,7 +705,6 @@ public function setShippingAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount);
 
@@ -781,7 +713,6 @@ public function setSubtotalInclTax($amount);
      *
      * @param float $adjustmentNegative
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentNegative($adjustmentNegative);
 
@@ -790,7 +721,6 @@ public function setAdjustmentNegative($adjustmentNegative);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount);
 
@@ -799,7 +729,6 @@ public function setBaseShippingAmount($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate);
 
@@ -808,7 +737,6 @@ public function setStoreToBaseRate($rate);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate);
 
@@ -817,7 +745,6 @@ public function setBaseToGlobalRate($rate);
      *
      * @param float $baseAdjustment
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustment($baseAdjustment);
 
@@ -826,7 +753,6 @@ public function setBaseAdjustment($baseAdjustment);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount);
 
@@ -835,7 +761,6 @@ public function setBaseSubtotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -844,7 +769,6 @@ public function setDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($amount);
 
@@ -853,7 +777,6 @@ public function setSubtotal($amount);
      *
      * @param float $adjustment
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustment($adjustment);
 
@@ -862,7 +785,6 @@ public function setAdjustment($adjustment);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount);
 
@@ -871,7 +793,6 @@ public function setBaseGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -880,7 +801,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount);
 
@@ -889,7 +809,6 @@ public function setShippingTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -898,7 +817,6 @@ public function setTaxAmount($amount);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -907,7 +825,6 @@ public function setOrderId($id);
      *
      * @param int $emailSent
      * @return $this
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent);
 
@@ -916,7 +833,6 @@ public function setEmailSent($emailSent);
      *
      * @param int $creditmemoStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemoStatus($creditmemoStatus);
 
@@ -925,7 +841,6 @@ public function setCreditmemoStatus($creditmemoStatus);
      *
      * @param int $state
      * @return $this
-     * @since 2.0.0
      */
     public function setState($state);
 
@@ -934,7 +849,6 @@ public function setState($state);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddressId($id);
 
@@ -943,7 +857,6 @@ public function setShippingAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddressId($id);
 
@@ -952,7 +865,6 @@ public function setBillingAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoiceId($id);
 
@@ -961,7 +873,6 @@ public function setInvoiceId($id);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code);
 
@@ -970,7 +881,6 @@ public function setStoreCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code);
 
@@ -979,7 +889,6 @@ public function setOrderCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code);
 
@@ -988,7 +897,6 @@ public function setBaseCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code);
 
@@ -997,7 +905,6 @@ public function setGlobalCurrencyCode($code);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setIncrementId($id);
 
@@ -1006,7 +913,6 @@ public function setIncrementId($id);
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -1015,7 +921,6 @@ public function setUpdatedAt($timestamp);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -1024,7 +929,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -1033,7 +937,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount);
 
@@ -1042,7 +945,6 @@ public function setShippingDiscountTaxCompensationAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
 
@@ -1051,7 +953,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount);
 
@@ -1060,7 +961,6 @@ public function setShippingInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount);
 
@@ -1069,7 +969,6 @@ public function setBaseShippingInclTax($amount);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountDescription($description);
 
@@ -1077,7 +976,6 @@ public function setDiscountDescription($description);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -1086,7 +984,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php
index fe2fffa488070..851bd1444df31 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface CreditmemoItemCreationInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CreditmemoItemCreationInterface extends LineItemInterface, ExtensibleDataInterface
 {
@@ -18,7 +18,7 @@ interface CreditmemoItemCreationInterface extends LineItemInterface, ExtensibleD
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes();
 
@@ -27,7 +27,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
index 360daca557329..8b85dfb68acdd 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
@@ -13,7 +13,6 @@
  * customer account so that the customer can make future purchases. A credit memo item is an invoiced item for which
  * a merchant creates a credit memo.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -157,7 +156,6 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI
      * Gets the additional data for a credit memo item.
      *
      * @return string|null Additional data.
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -165,7 +163,6 @@ public function getAdditionalData();
      * Gets the base cost for a credit memo item.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseCost();
 
@@ -173,7 +170,6 @@ public function getBaseCost();
      * Gets the base discount amount for a credit memo item.
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -181,7 +177,6 @@ public function getBaseDiscountAmount();
      * Gets the base discount tax compensation amount for a credit memo item.
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -189,7 +184,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the base price for a credit memo item.
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBasePrice();
 
@@ -197,7 +191,6 @@ public function getBasePrice();
      * Gets the base price including tax for a credit memo item.
      *
      * @return float|null Base price including tax.
-     * @since 2.0.0
      */
     public function getBasePriceInclTax();
 
@@ -205,7 +198,6 @@ public function getBasePriceInclTax();
      * Gets the base row total for a credit memo item.
      *
      * @return float|null Base row total.
-     * @since 2.0.0
      */
     public function getBaseRowTotal();
 
@@ -213,7 +205,6 @@ public function getBaseRowTotal();
      * Gets the base row total including tax for a credit memo item.
      *
      * @return float|null Base row total including tax.
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax();
 
@@ -221,7 +212,6 @@ public function getBaseRowTotalInclTax();
      * Gets the base tax amount for a credit memo item.
      *
      * @return float|null Base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -229,7 +219,6 @@ public function getBaseTaxAmount();
      * Gets the base WEEE tax applied amount for a credit memo item.
      *
      * @return float|null Base WEEE tax applied amount.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedAmount();
 
@@ -237,7 +226,6 @@ public function getBaseWeeeTaxAppliedAmount();
      * Gets the base WEEE tax applied row amount for a credit memo item.
      *
      * @return float|null Base WEEE tax applied row amount.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedRowAmnt();
 
@@ -245,7 +233,6 @@ public function getBaseWeeeTaxAppliedRowAmnt();
      * Gets the base WEEE tax disposition for a credit memo item.
      *
      * @return float|null Base WEEE tax disposition.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxDisposition();
 
@@ -253,7 +240,6 @@ public function getBaseWeeeTaxDisposition();
      * Gets the base WEEE tax row disposition for a credit memo item.
      *
      * @return float|null Base WEEE tax row disposition.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxRowDisposition();
 
@@ -261,7 +247,6 @@ public function getBaseWeeeTaxRowDisposition();
      * Gets the description for a credit memo item.
      *
      * @return string|null Description.
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -269,7 +254,6 @@ public function getDescription();
      * Gets the discount amount for a credit memo item.
      *
      * @return float|null Discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -277,7 +261,6 @@ public function getDiscountAmount();
      * Gets the ID for a credit memo item.
      *
      * @return int Credit memo item ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -286,7 +269,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -294,7 +276,6 @@ public function setEntityId($entityId);
      * Gets the discount tax compensation amount for a credit memo item.
      *
      * @return float|null Discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -302,7 +283,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the name for a credit memo item.
      *
      * @return string|null Name.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -310,7 +290,6 @@ public function getName();
      * Gets the order item ID for a credit memo item.
      *
      * @return int Order item ID.
-     * @since 2.0.0
      */
     public function getOrderItemId();
 
@@ -318,7 +297,6 @@ public function getOrderItemId();
      * Gets the parent ID for a credit memo item.
      *
      * @return int|null Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -326,7 +304,6 @@ public function getParentId();
      * Gets the price for a credit memo item.
      *
      * @return float|null Price.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -334,7 +311,6 @@ public function getPrice();
      * Gets the price including tax for a credit memo item.
      *
      * @return float|null Price including tax.
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -342,7 +318,6 @@ public function getPriceInclTax();
      * Gets the product ID for a credit memo item.
      *
      * @return int|null Product ID.
-     * @since 2.0.0
      */
     public function getProductId();
 
@@ -350,7 +325,6 @@ public function getProductId();
      * Gets the quantity for a credit memo item.
      *
      * @return float Quantity.
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -358,7 +332,6 @@ public function getQty();
      * Gets the row total for a credit memo item.
      *
      * @return float|null Row total.
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -366,7 +339,6 @@ public function getRowTotal();
      * Gets the row total including tax for a credit memo item.
      *
      * @return float|null Row total including tax.
-     * @since 2.0.0
      */
     public function getRowTotalInclTax();
 
@@ -374,7 +346,6 @@ public function getRowTotalInclTax();
      * Gets the SKU for a credit memo item.
      *
      * @return string|null SKU.
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -382,7 +353,6 @@ public function getSku();
      * Gets the tax amount for a credit memo item.
      *
      * @return float|null Tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -390,7 +360,6 @@ public function getTaxAmount();
      * Gets the WEEE tax applied for a credit memo item.
      *
      * @return string|null WEEE tax applied.
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied();
 
@@ -398,7 +367,6 @@ public function getWeeeTaxApplied();
      * Gets the WEEE tax applied amount for a credit memo item.
      *
      * @return float|null WEEE tax applied amount.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount();
 
@@ -406,7 +374,6 @@ public function getWeeeTaxAppliedAmount();
      * Gets the WEEE tax applied row amount for a credit memo item.
      *
      * @return float|null WEEE tax applied row amount.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedRowAmount();
 
@@ -414,7 +381,6 @@ public function getWeeeTaxAppliedRowAmount();
      * Gets the WEEE tax disposition for a credit memo item.
      *
      * @return float|null WEEE tax disposition.
-     * @since 2.0.0
      */
     public function getWeeeTaxDisposition();
 
@@ -422,7 +388,6 @@ public function getWeeeTaxDisposition();
      * Gets the WEEE tax row disposition for a credit memo item.
      *
      * @return float|null WEEE tax row disposition.
-     * @since 2.0.0
      */
     public function getWeeeTaxRowDisposition();
 
@@ -431,7 +396,6 @@ public function getWeeeTaxRowDisposition();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -440,7 +404,6 @@ public function setParentId($id);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePrice($price);
 
@@ -449,7 +412,6 @@ public function setBasePrice($price);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -458,7 +420,6 @@ public function setTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount);
 
@@ -467,7 +428,6 @@ public function setBaseRowTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -476,7 +436,6 @@ public function setDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($amount);
 
@@ -485,7 +444,6 @@ public function setRowTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -494,7 +452,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount);
 
@@ -503,7 +460,6 @@ public function setPriceInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -512,7 +468,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount);
 
@@ -521,7 +476,6 @@ public function setBasePriceInclTax($amount);
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -530,7 +484,6 @@ public function setQty($qty);
      *
      * @param float $baseCost
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost);
 
@@ -539,7 +492,6 @@ public function setBaseCost($baseCost);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -548,7 +500,6 @@ public function setPrice($price);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount);
 
@@ -557,7 +508,6 @@ public function setBaseRowTotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount);
 
@@ -566,7 +516,6 @@ public function setRowTotalInclTax($amount);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($id);
 
@@ -575,7 +524,6 @@ public function setProductId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderItemId($id);
 
@@ -584,7 +532,6 @@ public function setOrderItemId($id);
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -593,7 +540,6 @@ public function setAdditionalData($additionalData);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -602,7 +548,6 @@ public function setDescription($description);
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -611,7 +556,6 @@ public function setSku($sku);
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -620,7 +564,6 @@ public function setName($name);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -629,7 +572,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -638,7 +580,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      *
      * @param float $weeeTaxDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition);
 
@@ -647,7 +588,6 @@ public function setWeeeTaxDisposition($weeeTaxDisposition);
      *
      * @param float $weeeTaxRowDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition);
 
@@ -656,7 +596,6 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition);
      *
      * @param float $baseWeeeTaxDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition);
 
@@ -665,7 +604,6 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition);
      *
      * @param float $baseWeeeTaxRowDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition);
 
@@ -674,7 +612,6 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition);
      *
      * @param string $weeeTaxApplied
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied);
 
@@ -683,7 +620,6 @@ public function setWeeeTaxApplied($weeeTaxApplied);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedAmount($amount);
 
@@ -692,7 +628,6 @@ public function setBaseWeeeTaxAppliedAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt);
 
@@ -701,7 +636,6 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($amount);
 
@@ -710,7 +644,6 @@ public function setWeeeTaxAppliedAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedRowAmount($amount);
 
@@ -718,7 +651,6 @@ public function setWeeeTaxAppliedRowAmount($amount);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -727,7 +659,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php
index f5d132ebf1479..1f613f6b06622 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php
@@ -13,7 +13,6 @@
  * customer account so that the customer can make future purchases. A credit memo item is an invoiced item for which
  * a merchant creates a credit memo.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoItemSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -21,7 +20,6 @@ interface CreditmemoItemSearchResultInterface extends \Magento\Framework\Api\Sea
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -30,7 +28,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php
index 18fef84f047b3..7954ebaf86098 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php
@@ -12,7 +12,6 @@
  * to refund all or part of the amount paid for any returned or undelivered items. The memo restores funds to the
  * customer account so that the customer can make future purchases.
  * @api
- * @since 2.0.0
  */
 interface CreditmemoSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface CreditmemoSearchResultInterface extends \Magento\Framework\Api\SearchR
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\CreditmemoInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/EntityInterface.php b/app/code/Magento/Sales/Api/Data/EntityInterface.php
index e14cc0e205303..ac9a43db9fd6d 100644
--- a/app/code/Magento/Sales/Api/Data/EntityInterface.php
+++ b/app/code/Magento/Sales/Api/Data/EntityInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface EntityInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface EntityInterface
 {
@@ -26,7 +26,7 @@ interface EntityInterface
      * Gets the created-at timestamp for the invoice.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getCreatedAt();
 
@@ -35,7 +35,7 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setCreatedAt($createdAt);
 
@@ -43,7 +43,7 @@ public function setCreatedAt($createdAt);
      * Gets the ID for the invoice.
      *
      * @return int|null Invoice ID.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getEntityId();
 
@@ -52,7 +52,7 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setEntityId($entityId);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceCommentCreationInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceCommentCreationInterface.php
index e9ed6fa283b9d..6ec2dc32c5e3e 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceCommentCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceCommentCreationInterface.php
@@ -12,7 +12,7 @@
  * Interface InvoiceCommentCreationInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceCommentCreationInterface extends ExtensibleDataInterface, CommentInterface
 {
@@ -20,7 +20,7 @@ interface InvoiceCommentCreationInterface extends ExtensibleDataInterface, Comme
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -29,7 +29,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceCommentInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceCommentInterface.php
index 8596271c50dc1..6b5c344ed5b9a 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceCommentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceCommentInterface.php
@@ -13,7 +13,6 @@
  * An invoice is a record of the receipt of payment for an order. An invoice can include comments that detail the
  * invoice history.
  * @api
- * @since 2.0.0
  */
 interface InvoiceCommentInterface extends ExtensibleDataInterface, CommentInterface, EntityInterface
 {
@@ -33,7 +32,6 @@ interface InvoiceCommentInterface extends ExtensibleDataInterface, CommentInterf
      * Gets the is-customer-notified flag value for the invoice.
      *
      * @return int Is-customer-notified flag value.
-     * @since 2.0.0
      */
     public function getIsCustomerNotified();
 
@@ -41,7 +39,6 @@ public function getIsCustomerNotified();
      * Gets the parent ID for the invoice.
      *
      * @return int Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -50,7 +47,6 @@ public function getParentId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -59,7 +55,6 @@ public function setParentId($id);
      *
      * @param int $isCustomerNotified
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified);
 
@@ -67,7 +62,6 @@ public function setIsCustomerNotified($isCustomerNotified);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -76,7 +70,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php
index 36d139bd17f5a..80dec8d471927 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php
@@ -11,7 +11,6 @@
  * An invoice is a record of the receipt of payment for an order. An invoice can include comments that detail the
  * invoice history.
  * @api
- * @since 2.0.0
  */
 interface InvoiceCommentSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -19,7 +18,6 @@ interface InvoiceCommentSearchResultInterface extends \Magento\Framework\Api\Sea
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -28,7 +26,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceCreationArgumentsInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceCreationArgumentsInterface.php
index 0713f9c38bbb3..0c5e546f50083 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceCreationArgumentsInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceCreationArgumentsInterface.php
@@ -9,7 +9,7 @@
  * Interface for creation arguments for Invoice.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceCreationArgumentsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +17,7 @@ interface InvoiceCreationArgumentsInterface extends \Magento\Framework\Api\Exten
      * Gets existing extension attributes.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCreationArgumentsExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -27,7 +27,7 @@ public function getExtensionAttributes();
      * @param \Magento\Sales\Api\Data\InvoiceCreationArgumentsExtensionInterface $extensionAttributes
      *
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php
index 07e52d4f2b49d..ad5b9da52f241 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order.
  * @api
- * @since 2.0.0
  */
 interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -206,7 +205,6 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
      * Gets the base currency code for the invoice.
      *
      * @return string|null Base currency code.
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -214,7 +212,6 @@ public function getBaseCurrencyCode();
      * Gets the base discount amount for the invoice.
      *
      * @return float|null Base discount amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -222,7 +219,6 @@ public function getBaseDiscountAmount();
      * Gets the base grand total for the invoice.
      *
      * @return float|null Base grand total.
-     * @since 2.0.0
      */
     public function getBaseGrandTotal();
 
@@ -230,7 +226,6 @@ public function getBaseGrandTotal();
      * Gets the base discount tax compensation amount for the invoice.
      *
      * @return float|null Base discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -238,7 +233,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the base shipping amount for the invoice.
      *
      * @return float|null Base shipping amount.
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
@@ -246,7 +240,6 @@ public function getBaseShippingAmount();
      * Gets the base shipping discount tax compensation amount for the invoice.
      *
      * @return float|null Base shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -254,7 +247,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt();
      * Gets the base shipping including tax for the invoice.
      *
      * @return float|null Base shipping including tax.
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax();
 
@@ -262,7 +254,6 @@ public function getBaseShippingInclTax();
      * Gets the base shipping tax amount for the invoice.
      *
      * @return float|null Base shipping tax amount.
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount();
 
@@ -270,7 +261,6 @@ public function getBaseShippingTaxAmount();
      * Gets the base subtotal for the invoice.
      *
      * @return float|null Base subtotal.
-     * @since 2.0.0
      */
     public function getBaseSubtotal();
 
@@ -278,7 +268,6 @@ public function getBaseSubtotal();
      * Gets the base subtotal including tax for the invoice.
      *
      * @return float|null Base subtotal including tax.
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax();
 
@@ -286,7 +275,6 @@ public function getBaseSubtotalInclTax();
      * Gets the base tax amount for the invoice.
      *
      * @return float|null Base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -294,7 +282,6 @@ public function getBaseTaxAmount();
      * Gets the base total refunded for the invoice.
      *
      * @return float|null Base total refunded.
-     * @since 2.0.0
      */
     public function getBaseTotalRefunded();
 
@@ -302,7 +289,6 @@ public function getBaseTotalRefunded();
      * Gets the base-to-global rate for the invoice.
      *
      * @return float|null Base-to-global rate.
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate();
 
@@ -310,7 +296,6 @@ public function getBaseToGlobalRate();
      * Gets the base-to-order rate for the invoice.
      *
      * @return float|null Base-to-order rate.
-     * @since 2.0.0
      */
     public function getBaseToOrderRate();
 
@@ -318,7 +303,6 @@ public function getBaseToOrderRate();
      * Gets the billing address ID for the invoice.
      *
      * @return int|null Billing address ID.
-     * @since 2.0.0
      */
     public function getBillingAddressId();
 
@@ -326,7 +310,6 @@ public function getBillingAddressId();
      * Gets the can void flag value for the invoice.
      *
      * @return int|null Can void flag value.
-     * @since 2.0.0
      */
     public function getCanVoidFlag();
 
@@ -334,7 +317,6 @@ public function getCanVoidFlag();
      * Gets the created-at timestamp for the invoice.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -343,7 +325,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -351,7 +332,6 @@ public function setCreatedAt($createdAt);
      * Gets the discount amount for the invoice.
      *
      * @return float|null Discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -359,7 +339,6 @@ public function getDiscountAmount();
      * Gets the discount description for the invoice.
      *
      * @return string|null Discount description.
-     * @since 2.0.0
      */
     public function getDiscountDescription();
 
@@ -367,7 +346,6 @@ public function getDiscountDescription();
      * Gets the email-sent flag value for the invoice.
      *
      * @return int|null Email-sent flag value.
-     * @since 2.0.0
      */
     public function getEmailSent();
 
@@ -375,7 +353,6 @@ public function getEmailSent();
      * Gets the ID for the invoice.
      *
      * @return int|null Invoice ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -384,7 +361,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -392,7 +368,6 @@ public function setEntityId($entityId);
      * Gets the global currency code for the invoice.
      *
      * @return string|null Global currency code.
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode();
 
@@ -400,7 +375,6 @@ public function getGlobalCurrencyCode();
      * Gets the grand total for the invoice.
      *
      * @return float|null Grand total.
-     * @since 2.0.0
      */
     public function getGrandTotal();
 
@@ -408,7 +382,6 @@ public function getGrandTotal();
      * Gets the discount tax compensation amount for the invoice.
      *
      * @return float|null Discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -416,7 +389,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the increment ID for the invoice.
      *
      * @return string|null Increment ID.
-     * @since 2.0.0
      */
     public function getIncrementId();
 
@@ -424,7 +396,6 @@ public function getIncrementId();
      * Gets the is-used-for-refund flag value for the invoice.
      *
      * @return int|null Is-used-for-refund flag value.
-     * @since 2.0.0
      */
     public function getIsUsedForRefund();
 
@@ -432,7 +403,6 @@ public function getIsUsedForRefund();
      * Gets the order currency code for the invoice.
      *
      * @return string|null Order currency code.
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode();
 
@@ -440,7 +410,6 @@ public function getOrderCurrencyCode();
      * Gets the order ID for the invoice.
      *
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -448,7 +417,6 @@ public function getOrderId();
      * Gets the shipping address ID for the invoice.
      *
      * @return int|null Shipping address ID.
-     * @since 2.0.0
      */
     public function getShippingAddressId();
 
@@ -456,7 +424,6 @@ public function getShippingAddressId();
      * Gets the shipping amount for the invoice.
      *
      * @return float|null Shipping amount.
-     * @since 2.0.0
      */
     public function getShippingAmount();
 
@@ -464,7 +431,6 @@ public function getShippingAmount();
      * Gets the shipping discount tax compensation amount for the invoice.
      *
      * @return float|null Shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount();
 
@@ -472,7 +438,6 @@ public function getShippingDiscountTaxCompensationAmount();
      * Gets the shipping including tax for the invoice.
      *
      * @return float|null Shipping including tax.
-     * @since 2.0.0
      */
     public function getShippingInclTax();
 
@@ -480,7 +445,6 @@ public function getShippingInclTax();
      * Gets the shipping tax amount for the invoice.
      *
      * @return float|null Shipping tax amount.
-     * @since 2.0.0
      */
     public function getShippingTaxAmount();
 
@@ -488,7 +452,6 @@ public function getShippingTaxAmount();
      * Gets the state for the invoice.
      *
      * @return int|null State.
-     * @since 2.0.0
      */
     public function getState();
 
@@ -496,7 +459,6 @@ public function getState();
      * Gets the store currency code for the invoice.
      *
      * @return string|null Store currency code.
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode();
 
@@ -504,7 +466,6 @@ public function getStoreCurrencyCode();
      * Gets the store ID for the invoice.
      *
      * @return int|null Store ID.
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -512,7 +473,6 @@ public function getStoreId();
      * Gets the store-to-base rate for the invoice.
      *
      * @return float|null Store-to-base rate.
-     * @since 2.0.0
      */
     public function getStoreToBaseRate();
 
@@ -520,7 +480,6 @@ public function getStoreToBaseRate();
      * Gets the store-to-order rate for the invoice.
      *
      * @return float|null Store-to-order rate.
-     * @since 2.0.0
      */
     public function getStoreToOrderRate();
 
@@ -528,7 +487,6 @@ public function getStoreToOrderRate();
      * Gets the subtotal for the invoice.
      *
      * @return float|null Subtotal.
-     * @since 2.0.0
      */
     public function getSubtotal();
 
@@ -536,7 +494,6 @@ public function getSubtotal();
      * Gets the subtotal including tax for the invoice.
      *
      * @return float|null Subtotal including tax.
-     * @since 2.0.0
      */
     public function getSubtotalInclTax();
 
@@ -544,7 +501,6 @@ public function getSubtotalInclTax();
      * Gets the tax amount for the invoice.
      *
      * @return float|null Tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -552,7 +508,6 @@ public function getTaxAmount();
      * Gets the total quantity for the invoice.
      *
      * @return float Total quantity.
-     * @since 2.0.0
      */
     public function getTotalQty();
 
@@ -560,7 +515,6 @@ public function getTotalQty();
      * Gets the transaction ID for the invoice.
      *
      * @return string|null Transaction ID.
-     * @since 2.0.0
      */
     public function getTransactionId();
 
@@ -569,7 +523,6 @@ public function getTransactionId();
      *
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId);
 
@@ -577,7 +530,6 @@ public function setTransactionId($transactionId);
      * Gets the updated-at timestamp for the invoice.
      *
      * @return string|null Updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -585,7 +537,6 @@ public function getUpdatedAt();
      * Gets the items in the invoice.
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemInterface[] Array of invoice items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -594,7 +545,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems($items);
 
@@ -602,7 +552,6 @@ public function setItems($items);
      * Gets the comments, if any, for the invoice.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentInterface[]|null Array of any invoice comments. Otherwise, null.
-     * @since 2.0.0
      */
     public function getComments();
 
@@ -611,7 +560,6 @@ public function getComments();
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentInterface[] $comments
      * @return $this
-     * @since 2.0.0
      */
     public function setComments($comments);
 
@@ -620,7 +568,6 @@ public function setComments($comments);
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -629,7 +576,6 @@ public function setUpdatedAt($timestamp);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($id);
 
@@ -638,7 +584,6 @@ public function setStoreId($id);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount);
 
@@ -647,7 +592,6 @@ public function setBaseGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount);
 
@@ -656,7 +600,6 @@ public function setShippingTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -665,7 +608,6 @@ public function setTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -674,7 +616,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate);
 
@@ -683,7 +624,6 @@ public function setStoreToOrderRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount);
 
@@ -692,7 +632,6 @@ public function setBaseShippingTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -701,7 +640,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate);
 
@@ -710,7 +648,6 @@ public function setBaseToOrderRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setGrandTotal($amount);
 
@@ -719,7 +656,6 @@ public function setGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($amount);
 
@@ -728,7 +664,6 @@ public function setShippingAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount);
 
@@ -737,7 +672,6 @@ public function setSubtotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount);
 
@@ -746,7 +680,6 @@ public function setBaseSubtotalInclTax($amount);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate);
 
@@ -755,7 +688,6 @@ public function setStoreToBaseRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount);
 
@@ -764,7 +696,6 @@ public function setBaseShippingAmount($amount);
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalQty($qty);
 
@@ -773,7 +704,6 @@ public function setTotalQty($qty);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate);
 
@@ -782,7 +712,6 @@ public function setBaseToGlobalRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($amount);
 
@@ -791,7 +720,6 @@ public function setSubtotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount);
 
@@ -800,7 +728,6 @@ public function setBaseSubtotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -809,7 +736,6 @@ public function setDiscountAmount($amount);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddressId($id);
 
@@ -818,7 +744,6 @@ public function setBillingAddressId($id);
      *
      * @param int $isUsedForRefund
      * @return $this
-     * @since 2.0.0
      */
     public function setIsUsedForRefund($isUsedForRefund);
 
@@ -827,7 +752,6 @@ public function setIsUsedForRefund($isUsedForRefund);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -836,7 +760,6 @@ public function setOrderId($id);
      *
      * @param int $emailSent
      * @return $this
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent);
 
@@ -845,7 +768,6 @@ public function setEmailSent($emailSent);
      *
      * @param int $canVoidFlag
      * @return $this
-     * @since 2.0.0
      */
     public function setCanVoidFlag($canVoidFlag);
 
@@ -854,7 +776,6 @@ public function setCanVoidFlag($canVoidFlag);
      *
      * @param int $state
      * @return $this
-     * @since 2.0.0
      */
     public function setState($state);
 
@@ -863,7 +784,6 @@ public function setState($state);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddressId($id);
 
@@ -872,7 +792,6 @@ public function setShippingAddressId($id);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code);
 
@@ -881,7 +800,6 @@ public function setStoreCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code);
 
@@ -890,7 +808,6 @@ public function setOrderCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code);
 
@@ -899,7 +816,6 @@ public function setBaseCurrencyCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code);
 
@@ -908,7 +824,6 @@ public function setGlobalCurrencyCode($code);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setIncrementId($id);
 
@@ -917,7 +832,6 @@ public function setIncrementId($id);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -926,7 +840,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -935,7 +848,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount);
 
@@ -944,7 +856,6 @@ public function setShippingDiscountTaxCompensationAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
 
@@ -953,7 +864,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount);
 
@@ -962,7 +872,6 @@ public function setShippingInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount);
 
@@ -971,7 +880,6 @@ public function setBaseShippingInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalRefunded($amount);
 
@@ -980,7 +888,6 @@ public function setBaseTotalRefunded($amount);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountDescription($description);
 
@@ -988,7 +895,6 @@ public function setDiscountDescription($description);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -997,7 +903,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemCreationInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemCreationInterface.php
index 2c8c872d7628b..2c087e42575ff 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceItemCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceItemCreationInterface.php
@@ -14,7 +14,7 @@
  * Interface InvoiceItemCreationInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceItemCreationInterface extends LineItemInterface, ExtensibleDataInterface
 {
@@ -22,7 +22,7 @@ interface InvoiceItemCreationInterface extends LineItemInterface, ExtensibleData
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -31,7 +31,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php
index 95d769583cc39..5ce86000839de 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php
@@ -12,7 +12,6 @@
  *
  * An invoice is a record of the receipt of payment for an order. An invoice item is a purchased item in an invoice.
  * @api
- * @since 2.0.0
  */
 interface InvoiceItemInterface extends ExtensibleDataInterface, LineItemInterface
 {
@@ -125,7 +124,6 @@ interface InvoiceItemInterface extends ExtensibleDataInterface, LineItemInterfac
      * Gets the additional data for the invoice item.
      *
      * @return string|null Additional data.
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -133,7 +131,6 @@ public function getAdditionalData();
      * Gets the base cost for the invoice item.
      *
      * @return float|null Base cost.
-     * @since 2.0.0
      */
     public function getBaseCost();
 
@@ -141,7 +138,6 @@ public function getBaseCost();
      * Gets the base discount amount for the invoice item.
      *
      * @return float|null Base discount amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -149,7 +145,6 @@ public function getBaseDiscountAmount();
      * Gets the base discount tax compensation amount for the invoice item.
      *
      * @return float|null Base discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -157,7 +152,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the base price for the invoice item.
      *
      * @return float|null Base price.
-     * @since 2.0.0
      */
     public function getBasePrice();
 
@@ -165,7 +159,6 @@ public function getBasePrice();
      * Gets the base price including tax for the invoice item.
      *
      * @return float|null Base price including tax.
-     * @since 2.0.0
      */
     public function getBasePriceInclTax();
 
@@ -173,7 +166,6 @@ public function getBasePriceInclTax();
      * Gets the base row total for the invoice item.
      *
      * @return float|null Base row total.
-     * @since 2.0.0
      */
     public function getBaseRowTotal();
 
@@ -181,7 +173,6 @@ public function getBaseRowTotal();
      * Gets the base row total including tax for the invoice item.
      *
      * @return float|null Base row total including tax.
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax();
 
@@ -189,7 +180,6 @@ public function getBaseRowTotalInclTax();
      * Gets the base tax amount for the invoice item.
      *
      * @return float|null Base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -197,7 +187,6 @@ public function getBaseTaxAmount();
      * Gets the description for the invoice item.
      *
      * @return string|null Description.
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -205,7 +194,6 @@ public function getDescription();
      * Gets the discount amount for the invoice item.
      *
      * @return float|null Discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -213,7 +201,6 @@ public function getDiscountAmount();
      * Gets the ID for the invoice item.
      *
      * @return int|null Invoice item ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -222,7 +209,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -230,7 +216,6 @@ public function setEntityId($entityId);
      * Gets the discount tax compensation amount for the invoice item.
      *
      * @return float|null Discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -238,7 +223,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the name for the invoice item.
      *
      * @return string|null Name.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -246,7 +230,6 @@ public function getName();
      * Gets the parent ID for the invoice item.
      *
      * @return int|null Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -254,7 +237,6 @@ public function getParentId();
      * Gets the price for the invoice item.
      *
      * @return float|null Price.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -262,7 +244,6 @@ public function getPrice();
      * Gets the price including tax for the invoice item.
      *
      * @return float|null Price including tax.
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -270,7 +251,6 @@ public function getPriceInclTax();
      * Gets the product ID for the invoice item.
      *
      * @return int|null Product ID.
-     * @since 2.0.0
      */
     public function getProductId();
 
@@ -278,7 +258,6 @@ public function getProductId();
      * Gets the row total for the invoice item.
      *
      * @return float|null Row total.
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -286,7 +265,6 @@ public function getRowTotal();
      * Gets the row total including tax for the invoice item.
      *
      * @return float|null Row total including tax.
-     * @since 2.0.0
      */
     public function getRowTotalInclTax();
 
@@ -294,7 +272,6 @@ public function getRowTotalInclTax();
      * Gets the SKU for the invoice item.
      *
      * @return string SKU.
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -302,7 +279,6 @@ public function getSku();
      * Gets the tax amount for the invoice item.
      *
      * @return float|null Tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -311,7 +287,6 @@ public function getTaxAmount();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -320,7 +295,6 @@ public function setParentId($id);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePrice($price);
 
@@ -329,7 +303,6 @@ public function setBasePrice($price);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -338,7 +311,6 @@ public function setTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount);
 
@@ -347,7 +319,6 @@ public function setBaseRowTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -356,7 +327,6 @@ public function setDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($amount);
 
@@ -365,7 +335,6 @@ public function setRowTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -374,7 +343,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount);
 
@@ -383,7 +351,6 @@ public function setPriceInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -392,7 +359,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount);
 
@@ -401,7 +367,6 @@ public function setBasePriceInclTax($amount);
      *
      * @param float $baseCost
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost);
 
@@ -410,7 +375,6 @@ public function setBaseCost($baseCost);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -419,7 +383,6 @@ public function setPrice($price);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount);
 
@@ -428,7 +391,6 @@ public function setBaseRowTotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount);
 
@@ -437,7 +399,6 @@ public function setRowTotalInclTax($amount);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($id);
 
@@ -446,7 +407,6 @@ public function setProductId($id);
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -455,7 +415,6 @@ public function setAdditionalData($additionalData);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -464,7 +423,6 @@ public function setDescription($description);
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -473,7 +431,6 @@ public function setSku($sku);
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -482,7 +439,6 @@ public function setName($name);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -491,7 +447,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -499,7 +454,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -508,7 +462,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php
index 160901180b23d..2bea5273885b5 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order. An invoice item is a purchased item in an invoice.
  * @api
- * @since 2.0.0
  */
 interface InvoiceItemSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface InvoiceItemSearchResultInterface extends \Magento\Framework\Api\Search
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php
index ed4a5830b4f9f..4593c852a30d2 100644
--- a/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order.
  * @api
- * @since 2.0.0
  */
 interface InvoiceSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface InvoiceSearchResultInterface extends \Magento\Framework\Api\SearchResu
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\InvoiceInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/LineItemInterface.php b/app/code/Magento/Sales/Api/Data/LineItemInterface.php
index ffcfc218bc64c..09042ad84db9f 100644
--- a/app/code/Magento/Sales/Api/Data/LineItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/LineItemInterface.php
@@ -11,7 +11,7 @@
  *
  * Interface LineItemInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface LineItemInterface
 {
@@ -19,7 +19,7 @@ interface LineItemInterface
      * Gets the order item ID for the item.
      *
      * @return int Order item ID.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getOrderItemId();
 
@@ -28,7 +28,7 @@ public function getOrderItemId();
      *
      * @param int $id
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setOrderItemId($id);
 
@@ -36,7 +36,7 @@ public function setOrderItemId($id);
      * Gets the quantity for the item.
      *
      * @return float Quantity.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getQty();
 
@@ -45,7 +45,7 @@ public function getQty();
      *
      * @param float $qty
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setQty($qty);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php b/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
index fb914d7a3d839..ac6b9f221e806 100644
--- a/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderAddressInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -150,7 +149,6 @@ interface OrderAddressInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Gets the address type for the order address.
      *
      * @return string Address type.
-     * @since 2.0.0
      */
     public function getAddressType();
 
@@ -158,7 +156,6 @@ public function getAddressType();
      * Gets the city for the order address.
      *
      * @return string City.
-     * @since 2.0.0
      */
     public function getCity();
 
@@ -166,7 +163,6 @@ public function getCity();
      * Gets the company for the order address.
      *
      * @return string|null Company.
-     * @since 2.0.0
      */
     public function getCompany();
 
@@ -174,7 +170,6 @@ public function getCompany();
      * Gets the country ID for the order address.
      *
      * @return string Country ID.
-     * @since 2.0.0
      */
     public function getCountryId();
 
@@ -182,7 +177,6 @@ public function getCountryId();
      * Gets the country address ID for the order address.
      *
      * @return int|null Country address ID.
-     * @since 2.0.0
      */
     public function getCustomerAddressId();
 
@@ -190,7 +184,6 @@ public function getCustomerAddressId();
      * Gets the customer ID for the order address.
      *
      * @return int|null Customer ID.
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -198,7 +191,6 @@ public function getCustomerId();
      * Gets the email address for the order address.
      *
      * @return string|null Email address.
-     * @since 2.0.0
      */
     public function getEmail();
 
@@ -206,7 +198,6 @@ public function getEmail();
      * Gets the ID for the order address.
      *
      * @return int|null Order address ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -215,7 +206,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -223,7 +213,6 @@ public function setEntityId($entityId);
      * Gets the fax number for the order address.
      *
      * @return string|null Fax number.
-     * @since 2.0.0
      */
     public function getFax();
 
@@ -231,7 +220,6 @@ public function getFax();
      * Gets the first name for the order address.
      *
      * @return string First name.
-     * @since 2.0.0
      */
     public function getFirstname();
 
@@ -239,7 +227,6 @@ public function getFirstname();
      * Gets the last name for the order address.
      *
      * @return string Last name.
-     * @since 2.0.0
      */
     public function getLastname();
 
@@ -247,7 +234,6 @@ public function getLastname();
      * Gets the middle name for the order address.
      *
      * @return string|null Middle name.
-     * @since 2.0.0
      */
     public function getMiddlename();
 
@@ -255,7 +241,6 @@ public function getMiddlename();
      * Gets the parent ID for the order address.
      *
      * @return int|null Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -263,7 +248,6 @@ public function getParentId();
      * Gets the postal code for the order address.
      *
      * @return string Postal code.
-     * @since 2.0.0
      */
     public function getPostcode();
 
@@ -271,7 +255,6 @@ public function getPostcode();
      * Gets the prefix for the order address.
      *
      * @return string|null Prefix.
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -279,7 +262,6 @@ public function getPrefix();
      * Gets the region for the order address.
      *
      * @return string|null Region.
-     * @since 2.0.0
      */
     public function getRegion();
 
@@ -287,7 +269,6 @@ public function getRegion();
      * Gets the region code for the order address
      *
      * @return string|null Region code.
-     * @since 2.0.0
      */
     public function getRegionCode();
 
@@ -295,7 +276,6 @@ public function getRegionCode();
      * Gets the region ID for the order address.
      *
      * @return int|null Region ID.
-     * @since 2.0.0
      */
     public function getRegionId();
 
@@ -303,7 +283,6 @@ public function getRegionId();
      * Gets the street values, if any, for the order address.
      *
      * @return string[]|null Array of any street values. Otherwise, null.
-     * @since 2.0.0
      */
     public function getStreet();
 
@@ -311,7 +290,6 @@ public function getStreet();
      * Gets the suffix for the order address.
      *
      * @return string|null Suffix.
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -319,7 +297,6 @@ public function getSuffix();
      * Gets the telephone number for the order address.
      *
      * @return string Telephone number.
-     * @since 2.0.0
      */
     public function getTelephone();
 
@@ -327,7 +304,6 @@ public function getTelephone();
      * Gets the VAT ID for the order address.
      *
      * @return string|null VAT ID.
-     * @since 2.0.0
      */
     public function getVatId();
 
@@ -335,7 +311,6 @@ public function getVatId();
      * Gets the VAT-is-valid flag value for the order address.
      *
      * @return int|null VAT-is-valid flag value.
-     * @since 2.0.0
      */
     public function getVatIsValid();
 
@@ -343,7 +318,6 @@ public function getVatIsValid();
      * Gets the VAT request date for the order address.
      *
      * @return string|null VAT request date.
-     * @since 2.0.0
      */
     public function getVatRequestDate();
 
@@ -351,7 +325,6 @@ public function getVatRequestDate();
      * Gets the VAT request ID for the order address.
      *
      * @return string|null VAT request ID.
-     * @since 2.0.0
      */
     public function getVatRequestId();
 
@@ -359,7 +332,6 @@ public function getVatRequestId();
      * Gets the VAT-request-success flag value for the order address.
      *
      * @return int|null VAT-request-success flag value.
-     * @since 2.0.0
      */
     public function getVatRequestSuccess();
 
@@ -368,7 +340,6 @@ public function getVatRequestSuccess();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -377,7 +348,6 @@ public function setParentId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerAddressId($id);
 
@@ -386,7 +356,6 @@ public function setCustomerAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionId($id);
 
@@ -395,7 +364,6 @@ public function setRegionId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id);
 
@@ -404,7 +372,6 @@ public function setCustomerId($id);
      *
      * @param string $fax
      * @return $this
-     * @since 2.0.0
      */
     public function setFax($fax);
 
@@ -413,7 +380,6 @@ public function setFax($fax);
      *
      * @param string $region
      * @return $this
-     * @since 2.0.0
      */
     public function setRegion($region);
 
@@ -422,7 +388,6 @@ public function setRegion($region);
      *
      * @param string $postcode
      * @return $this
-     * @since 2.0.0
      */
     public function setPostcode($postcode);
 
@@ -431,7 +396,6 @@ public function setPostcode($postcode);
      *
      * @param string $lastname
      * @return $this
-     * @since 2.0.0
      */
     public function setLastname($lastname);
 
@@ -440,7 +404,6 @@ public function setLastname($lastname);
      *
      * @param string|string[] $street
      * @return $this
-     * @since 2.0.0
      */
     public function setStreet($street);
 
@@ -449,7 +412,6 @@ public function setStreet($street);
      *
      * @param string $city
      * @return $this
-     * @since 2.0.0
      */
     public function setCity($city);
 
@@ -458,7 +420,6 @@ public function setCity($city);
      *
      * @param string $email
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($email);
 
@@ -467,7 +428,6 @@ public function setEmail($email);
      *
      * @param string $telephone
      * @return $this
-     * @since 2.0.0
      */
     public function setTelephone($telephone);
 
@@ -476,7 +436,6 @@ public function setTelephone($telephone);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCountryId($id);
 
@@ -485,7 +444,6 @@ public function setCountryId($id);
      *
      * @param string $firstname
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstname($firstname);
 
@@ -494,7 +452,6 @@ public function setFirstname($firstname);
      *
      * @param string $addressType
      * @return $this
-     * @since 2.0.0
      */
     public function setAddressType($addressType);
 
@@ -503,7 +460,6 @@ public function setAddressType($addressType);
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix);
 
@@ -512,7 +468,6 @@ public function setPrefix($prefix);
      *
      * @param string $middlename
      * @return $this
-     * @since 2.0.0
      */
     public function setMiddlename($middlename);
 
@@ -521,7 +476,6 @@ public function setMiddlename($middlename);
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix);
 
@@ -530,7 +484,6 @@ public function setSuffix($suffix);
      *
      * @param string $company
      * @return $this
-     * @since 2.0.0
      */
     public function setCompany($company);
 
@@ -539,7 +492,6 @@ public function setCompany($company);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setVatId($id);
 
@@ -548,7 +500,6 @@ public function setVatId($id);
      *
      * @param int $vatIsValid
      * @return $this
-     * @since 2.0.0
      */
     public function setVatIsValid($vatIsValid);
 
@@ -557,7 +508,6 @@ public function setVatIsValid($vatIsValid);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setVatRequestId($id);
 
@@ -566,7 +516,6 @@ public function setVatRequestId($id);
      *
      * @param string $regionCode
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode);
 
@@ -575,7 +524,6 @@ public function setRegionCode($regionCode);
      *
      * @param string $vatRequestDate
      * @return $this
-     * @since 2.0.0
      */
     public function setVatRequestDate($vatRequestDate);
 
@@ -584,7 +532,6 @@ public function setVatRequestDate($vatRequestDate);
      *
      * @param int $vatRequestSuccess
      * @return $this
-     * @since 2.0.0
      */
     public function setVatRequestSuccess($vatRequestSuccess);
 
@@ -592,7 +539,6 @@ public function setVatRequestSuccess($vatRequestSuccess);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\OrderAddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -601,7 +547,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php
index fd3c25240787a..1765bec75e0dc 100644
--- a/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderAddressSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface OrderAddressSearchResultInterface extends \Magento\Framework\Api\Searc
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderInterface.php b/app/code/Magento/Sales/Api/Data/OrderInterface.php
index 2e83450273909..5c7a809c8ea09 100644
--- a/app/code/Magento/Sales/Api/Data/OrderInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -568,7 +567,6 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Gets the negative adjustment value for the order.
      *
      * @return float|null Negative adjustment value.
-     * @since 2.0.0
      */
     public function getAdjustmentNegative();
 
@@ -576,7 +574,6 @@ public function getAdjustmentNegative();
      * Gets the positive adjustment value for the order.
      *
      * @return float|null Positive adjustment value.
-     * @since 2.0.0
      */
     public function getAdjustmentPositive();
 
@@ -584,7 +581,6 @@ public function getAdjustmentPositive();
      * Gets the applied rule IDs for the order.
      *
      * @return string|null Applied rule IDs.
-     * @since 2.0.0
      */
     public function getAppliedRuleIds();
 
@@ -592,7 +588,6 @@ public function getAppliedRuleIds();
      * Gets the base negative adjustment value for the order.
      *
      * @return float|null Base negative adjustment value.
-     * @since 2.0.0
      */
     public function getBaseAdjustmentNegative();
 
@@ -600,7 +595,6 @@ public function getBaseAdjustmentNegative();
      * Gets the base positive adjustment value for the order.
      *
      * @return float|null Base positive adjustment value.
-     * @since 2.0.0
      */
     public function getBaseAdjustmentPositive();
 
@@ -608,7 +602,6 @@ public function getBaseAdjustmentPositive();
      * Gets the base currency code for the order.
      *
      * @return string|null Base currency code.
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -616,7 +609,6 @@ public function getBaseCurrencyCode();
      * Gets the base discount amount for the order.
      *
      * @return float|null Base discount amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -624,7 +616,6 @@ public function getBaseDiscountAmount();
      * Gets the base discount canceled for the order.
      *
      * @return float|null Base discount canceled.
-     * @since 2.0.0
      */
     public function getBaseDiscountCanceled();
 
@@ -632,7 +623,6 @@ public function getBaseDiscountCanceled();
      * Gets the base discount invoiced amount for the order.
      *
      * @return float|null Base discount invoiced.
-     * @since 2.0.0
      */
     public function getBaseDiscountInvoiced();
 
@@ -640,7 +630,6 @@ public function getBaseDiscountInvoiced();
      * Gets the base discount refunded amount for the order.
      *
      * @return float|null Base discount refunded.
-     * @since 2.0.0
      */
     public function getBaseDiscountRefunded();
 
@@ -648,7 +637,6 @@ public function getBaseDiscountRefunded();
      * Gets the base grand total for the order.
      *
      * @return float Base grand total.
-     * @since 2.0.0
      */
     public function getBaseGrandTotal();
 
@@ -656,7 +644,6 @@ public function getBaseGrandTotal();
      * Gets the base discount tax compensation amount for the order.
      *
      * @return float|null Base discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -664,7 +651,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the base discount tax compensation invoiced amount for the order.
      *
      * @return float|null Base discount tax compensation invoiced.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationInvoiced();
 
@@ -672,7 +658,6 @@ public function getBaseDiscountTaxCompensationInvoiced();
      * Gets the base discount tax compensation refunded amount for the order.
      *
      * @return float|null Base discount tax compensation refunded.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationRefunded();
 
@@ -680,7 +665,6 @@ public function getBaseDiscountTaxCompensationRefunded();
      * Gets the base shipping amount for the order.
      *
      * @return float|null Base shipping amount.
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
@@ -688,7 +672,6 @@ public function getBaseShippingAmount();
      * Gets the base shipping canceled for the order.
      *
      * @return float|null Base shipping canceled.
-     * @since 2.0.0
      */
     public function getBaseShippingCanceled();
 
@@ -696,7 +679,6 @@ public function getBaseShippingCanceled();
      * Gets the base shipping discount amount for the order.
      *
      * @return float|null Base shipping discount amount.
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountAmount();
 
@@ -704,7 +686,6 @@ public function getBaseShippingDiscountAmount();
      * Gets the base shipping discount tax compensation amount for the order.
      *
      * @return float|null Base shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -712,7 +693,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt();
      * Gets the base shipping including tax for the order.
      *
      * @return float|null Base shipping including tax.
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax();
 
@@ -720,7 +700,6 @@ public function getBaseShippingInclTax();
      * Gets the base shipping invoiced amount for the order.
      *
      * @return float|null Base shipping invoiced.
-     * @since 2.0.0
      */
     public function getBaseShippingInvoiced();
 
@@ -728,7 +707,6 @@ public function getBaseShippingInvoiced();
      * Gets the base shipping refunded amount for the order.
      *
      * @return float|null Base shipping refunded.
-     * @since 2.0.0
      */
     public function getBaseShippingRefunded();
 
@@ -736,7 +714,6 @@ public function getBaseShippingRefunded();
      * Gets the base shipping tax amount for the order.
      *
      * @return float|null Base shipping tax amount.
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount();
 
@@ -744,7 +721,6 @@ public function getBaseShippingTaxAmount();
      * Gets the base shipping tax refunded amount for the order.
      *
      * @return float|null Base shipping tax refunded.
-     * @since 2.0.0
      */
     public function getBaseShippingTaxRefunded();
 
@@ -752,7 +728,6 @@ public function getBaseShippingTaxRefunded();
      * Gets the base subtotal for the order.
      *
      * @return float|null Base subtotal.
-     * @since 2.0.0
      */
     public function getBaseSubtotal();
 
@@ -760,7 +735,6 @@ public function getBaseSubtotal();
      * Gets the base subtotal canceled for the order.
      *
      * @return float|null Base subtotal canceled.
-     * @since 2.0.0
      */
     public function getBaseSubtotalCanceled();
 
@@ -768,7 +742,6 @@ public function getBaseSubtotalCanceled();
      * Gets the base subtotal including tax for the order.
      *
      * @return float|null Base subtotal including tax.
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax();
 
@@ -776,7 +749,6 @@ public function getBaseSubtotalInclTax();
      * Gets the base subtotal invoiced amount for the order.
      *
      * @return float|null Base subtotal invoiced.
-     * @since 2.0.0
      */
     public function getBaseSubtotalInvoiced();
 
@@ -784,7 +756,6 @@ public function getBaseSubtotalInvoiced();
      * Gets the base subtotal refunded amount for the order.
      *
      * @return float|null Base subtotal refunded.
-     * @since 2.0.0
      */
     public function getBaseSubtotalRefunded();
 
@@ -792,7 +763,6 @@ public function getBaseSubtotalRefunded();
      * Gets the base tax amount for the order.
      *
      * @return float|null Base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -800,7 +770,6 @@ public function getBaseTaxAmount();
      * Gets the base tax canceled for the order.
      *
      * @return float|null Base tax canceled.
-     * @since 2.0.0
      */
     public function getBaseTaxCanceled();
 
@@ -808,7 +777,6 @@ public function getBaseTaxCanceled();
      * Gets the base tax invoiced amount for the order.
      *
      * @return float|null Base tax invoiced.
-     * @since 2.0.0
      */
     public function getBaseTaxInvoiced();
 
@@ -816,7 +784,6 @@ public function getBaseTaxInvoiced();
      * Gets the base tax refunded amount for the order.
      *
      * @return float|null Base tax refunded.
-     * @since 2.0.0
      */
     public function getBaseTaxRefunded();
 
@@ -824,7 +791,6 @@ public function getBaseTaxRefunded();
      * Gets the base total canceled for the order.
      *
      * @return float|null Base total canceled.
-     * @since 2.0.0
      */
     public function getBaseTotalCanceled();
 
@@ -832,7 +798,6 @@ public function getBaseTotalCanceled();
      * Gets the base total due for the order.
      *
      * @return float|null Base total due.
-     * @since 2.0.0
      */
     public function getBaseTotalDue();
 
@@ -840,7 +805,6 @@ public function getBaseTotalDue();
      * Gets the base total invoiced amount for the order.
      *
      * @return float|null Base total invoiced.
-     * @since 2.0.0
      */
     public function getBaseTotalInvoiced();
 
@@ -848,7 +812,6 @@ public function getBaseTotalInvoiced();
      * Gets the base total invoiced cost for the order.
      *
      * @return float|null Base total invoiced cost.
-     * @since 2.0.0
      */
     public function getBaseTotalInvoicedCost();
 
@@ -856,7 +819,6 @@ public function getBaseTotalInvoicedCost();
      * Gets the base total offline refunded amount for the order.
      *
      * @return float|null Base total offline refunded.
-     * @since 2.0.0
      */
     public function getBaseTotalOfflineRefunded();
 
@@ -864,7 +826,6 @@ public function getBaseTotalOfflineRefunded();
      * Gets the base total online refunded amount for the order.
      *
      * @return float|null Base total online refunded.
-     * @since 2.0.0
      */
     public function getBaseTotalOnlineRefunded();
 
@@ -872,7 +833,6 @@ public function getBaseTotalOnlineRefunded();
      * Gets the base total paid for the order.
      *
      * @return float|null Base total paid.
-     * @since 2.0.0
      */
     public function getBaseTotalPaid();
 
@@ -880,7 +840,6 @@ public function getBaseTotalPaid();
      * Gets the base total quantity ordered for the order.
      *
      * @return float|null Base total quantity ordered.
-     * @since 2.0.0
      */
     public function getBaseTotalQtyOrdered();
 
@@ -888,7 +847,6 @@ public function getBaseTotalQtyOrdered();
      * Gets the base total refunded amount for the order.
      *
      * @return float|null Base total refunded.
-     * @since 2.0.0
      */
     public function getBaseTotalRefunded();
 
@@ -896,7 +854,6 @@ public function getBaseTotalRefunded();
      * Gets the base-to-global rate for the order.
      *
      * @return float|null Base-to-global rate.
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate();
 
@@ -904,7 +861,6 @@ public function getBaseToGlobalRate();
      * Gets the base-to-order rate for the order.
      *
      * @return float|null Base-to-order rate.
-     * @since 2.0.0
      */
     public function getBaseToOrderRate();
 
@@ -912,7 +868,6 @@ public function getBaseToOrderRate();
      * Gets the billing address ID for the order.
      *
      * @return int|null Billing address ID.
-     * @since 2.0.0
      */
     public function getBillingAddressId();
 
@@ -920,7 +875,6 @@ public function getBillingAddressId();
      * Gets the can-ship-partially flag value for the order.
      *
      * @return int|null Can-ship-partially flag value.
-     * @since 2.0.0
      */
     public function getCanShipPartially();
 
@@ -928,7 +882,6 @@ public function getCanShipPartially();
      * Gets the can-ship-partially-item flag value for the order.
      *
      * @return int|null Can-ship-partially-item flag value.
-     * @since 2.0.0
      */
     public function getCanShipPartiallyItem();
 
@@ -936,7 +889,6 @@ public function getCanShipPartiallyItem();
      * Gets the coupon code for the order.
      *
      * @return string|null Coupon code.
-     * @since 2.0.0
      */
     public function getCouponCode();
 
@@ -944,7 +896,6 @@ public function getCouponCode();
      * Gets the created-at timestamp for the order.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -953,7 +904,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -961,7 +911,6 @@ public function setCreatedAt($createdAt);
      * Gets the customer date-of-birth (DOB) for the order.
      *
      * @return string|null Customer date-of-birth (DOB).
-     * @since 2.0.0
      */
     public function getCustomerDob();
 
@@ -969,7 +918,6 @@ public function getCustomerDob();
      * Gets the customer email address for the order.
      *
      * @return string Customer email address.
-     * @since 2.0.0
      */
     public function getCustomerEmail();
 
@@ -977,7 +925,6 @@ public function getCustomerEmail();
      * Gets the customer first name for the order.
      *
      * @return string|null Customer first name.
-     * @since 2.0.0
      */
     public function getCustomerFirstname();
 
@@ -985,7 +932,6 @@ public function getCustomerFirstname();
      * Gets the customer gender for the order.
      *
      * @return int|null Customer gender.
-     * @since 2.0.0
      */
     public function getCustomerGender();
 
@@ -993,7 +939,6 @@ public function getCustomerGender();
      * Gets the customer group ID for the order.
      *
      * @return int|null Customer group ID.
-     * @since 2.0.0
      */
     public function getCustomerGroupId();
 
@@ -1001,7 +946,6 @@ public function getCustomerGroupId();
      * Gets the customer ID for the order.
      *
      * @return int|null Customer ID.
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -1009,7 +953,6 @@ public function getCustomerId();
      * Gets the customer-is-guest flag value for the order.
      *
      * @return int|null Customer-is-guest flag value.
-     * @since 2.0.0
      */
     public function getCustomerIsGuest();
 
@@ -1017,7 +960,6 @@ public function getCustomerIsGuest();
      * Gets the customer last name for the order.
      *
      * @return string|null Customer last name.
-     * @since 2.0.0
      */
     public function getCustomerLastname();
 
@@ -1025,7 +967,6 @@ public function getCustomerLastname();
      * Gets the customer middle name for the order.
      *
      * @return string|null Customer middle name.
-     * @since 2.0.0
      */
     public function getCustomerMiddlename();
 
@@ -1033,7 +974,6 @@ public function getCustomerMiddlename();
      * Gets the customer note for the order.
      *
      * @return string|null Customer note.
-     * @since 2.0.0
      */
     public function getCustomerNote();
 
@@ -1041,7 +981,6 @@ public function getCustomerNote();
      * Gets the customer-note-notify flag value for the order.
      *
      * @return int|null Customer-note-notify flag value.
-     * @since 2.0.0
      */
     public function getCustomerNoteNotify();
 
@@ -1049,7 +988,6 @@ public function getCustomerNoteNotify();
      * Gets the customer prefix for the order.
      *
      * @return string|null Customer prefix.
-     * @since 2.0.0
      */
     public function getCustomerPrefix();
 
@@ -1057,7 +995,6 @@ public function getCustomerPrefix();
      * Gets the customer suffix for the order.
      *
      * @return string|null Customer suffix.
-     * @since 2.0.0
      */
     public function getCustomerSuffix();
 
@@ -1065,7 +1002,6 @@ public function getCustomerSuffix();
      * Gets the customer value-added tax (VAT) for the order.
      *
      * @return string|null Customer value-added tax (VAT).
-     * @since 2.0.0
      */
     public function getCustomerTaxvat();
 
@@ -1073,7 +1009,6 @@ public function getCustomerTaxvat();
      * Gets the discount amount for the order.
      *
      * @return float|null Discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -1081,7 +1016,6 @@ public function getDiscountAmount();
      * Gets the discount canceled for the order.
      *
      * @return float|null Discount canceled.
-     * @since 2.0.0
      */
     public function getDiscountCanceled();
 
@@ -1089,7 +1023,6 @@ public function getDiscountCanceled();
      * Gets the discount description for the order.
      *
      * @return string|null Discount description.
-     * @since 2.0.0
      */
     public function getDiscountDescription();
 
@@ -1097,7 +1030,6 @@ public function getDiscountDescription();
      * Gets the discount invoiced amount for the order.
      *
      * @return float|null Discount invoiced.
-     * @since 2.0.0
      */
     public function getDiscountInvoiced();
 
@@ -1105,7 +1037,6 @@ public function getDiscountInvoiced();
      * Gets the discount refunded amount for the order.
      *
      * @return float|null Discount refunded amount.
-     * @since 2.0.0
      */
     public function getDiscountRefunded();
 
@@ -1113,7 +1044,6 @@ public function getDiscountRefunded();
      * Gets the edit increment value for the order.
      *
      * @return int|null Edit increment value.
-     * @since 2.0.0
      */
     public function getEditIncrement();
 
@@ -1121,7 +1051,6 @@ public function getEditIncrement();
      * Gets the email-sent flag value for the order.
      *
      * @return int|null Email-sent flag value.
-     * @since 2.0.0
      */
     public function getEmailSent();
 
@@ -1129,7 +1058,6 @@ public function getEmailSent();
      * Gets the ID for the order.
      *
      * @return int|null Order ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -1138,7 +1066,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -1146,7 +1073,6 @@ public function setEntityId($entityId);
      * Gets the external customer ID for the order.
      *
      * @return string|null External customer ID.
-     * @since 2.0.0
      */
     public function getExtCustomerId();
 
@@ -1154,7 +1080,6 @@ public function getExtCustomerId();
      * Gets the external order ID for the order.
      *
      * @return string|null External order ID.
-     * @since 2.0.0
      */
     public function getExtOrderId();
 
@@ -1162,7 +1087,6 @@ public function getExtOrderId();
      * Gets the forced-shipment-with-invoice flag value for the order.
      *
      * @return int|null Forced-shipment-with-invoice flag value.
-     * @since 2.0.0
      */
     public function getForcedShipmentWithInvoice();
 
@@ -1170,7 +1094,6 @@ public function getForcedShipmentWithInvoice();
      * Gets the global currency code for the order.
      *
      * @return string|null Global currency code.
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode();
 
@@ -1178,7 +1101,6 @@ public function getGlobalCurrencyCode();
      * Gets the grand total for the order.
      *
      * @return float Grand total.
-     * @since 2.0.0
      */
     public function getGrandTotal();
 
@@ -1186,7 +1108,6 @@ public function getGrandTotal();
      * Gets the discount tax compensation amount for the order.
      *
      * @return float|null Discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -1194,7 +1115,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the discount tax compensation invoiced amount for the order.
      *
      * @return float|null Discount tax compensation invoiced amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationInvoiced();
 
@@ -1202,7 +1122,6 @@ public function getDiscountTaxCompensationInvoiced();
      * Gets the discount tax compensation refunded amount for the order.
      *
      * @return float|null Discount tax compensation refunded amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationRefunded();
 
@@ -1210,7 +1129,6 @@ public function getDiscountTaxCompensationRefunded();
      * Gets the hold before state for the order.
      *
      * @return string|null Hold before state.
-     * @since 2.0.0
      */
     public function getHoldBeforeState();
 
@@ -1218,7 +1136,6 @@ public function getHoldBeforeState();
      * Gets the hold before status for the order.
      *
      * @return string|null Hold before status.
-     * @since 2.0.0
      */
     public function getHoldBeforeStatus();
 
@@ -1226,7 +1143,6 @@ public function getHoldBeforeStatus();
      * Gets the increment ID for the order.
      *
      * @return string|null Increment ID.
-     * @since 2.0.0
      */
     public function getIncrementId();
 
@@ -1234,7 +1150,6 @@ public function getIncrementId();
      * Gets the is-virtual flag value for the order.
      *
      * @return int|null Is-virtual flag value.
-     * @since 2.0.0
      */
     public function getIsVirtual();
 
@@ -1242,7 +1157,6 @@ public function getIsVirtual();
      * Gets the order currency code for the order.
      *
      * @return string|null Order currency code.
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode();
 
@@ -1250,7 +1164,6 @@ public function getOrderCurrencyCode();
      * Gets the original increment ID for the order.
      *
      * @return string|null Original increment ID.
-     * @since 2.0.0
      */
     public function getOriginalIncrementId();
 
@@ -1258,7 +1171,6 @@ public function getOriginalIncrementId();
      * Gets the payment authorization amount for the order.
      *
      * @return float|null Payment authorization amount.
-     * @since 2.0.0
      */
     public function getPaymentAuthorizationAmount();
 
@@ -1266,7 +1178,6 @@ public function getPaymentAuthorizationAmount();
      * Gets the payment authorization expiration date for the order.
      *
      * @return int|null Payment authorization expiration date.
-     * @since 2.0.0
      */
     public function getPaymentAuthExpiration();
 
@@ -1274,7 +1185,6 @@ public function getPaymentAuthExpiration();
      * Gets the protect code for the order.
      *
      * @return string|null Protect code.
-     * @since 2.0.0
      */
     public function getProtectCode();
 
@@ -1282,7 +1192,6 @@ public function getProtectCode();
      * Gets the quote address ID for the order.
      *
      * @return int|null Quote address ID.
-     * @since 2.0.0
      */
     public function getQuoteAddressId();
 
@@ -1290,7 +1199,6 @@ public function getQuoteAddressId();
      * Gets the quote ID for the order.
      *
      * @return int|null Quote ID.
-     * @since 2.0.0
      */
     public function getQuoteId();
 
@@ -1298,7 +1206,6 @@ public function getQuoteId();
      * Gets the relation child ID for the order.
      *
      * @return string|null Relation child ID.
-     * @since 2.0.0
      */
     public function getRelationChildId();
 
@@ -1306,7 +1213,6 @@ public function getRelationChildId();
      * Gets the relation child real ID for the order.
      *
      * @return string|null Relation child real ID.
-     * @since 2.0.0
      */
     public function getRelationChildRealId();
 
@@ -1314,7 +1220,6 @@ public function getRelationChildRealId();
      * Gets the relation parent ID for the order.
      *
      * @return string|null Relation parent ID.
-     * @since 2.0.0
      */
     public function getRelationParentId();
 
@@ -1322,7 +1227,6 @@ public function getRelationParentId();
      * Gets the relation parent real ID for the order.
      *
      * @return string|null Relation parent real ID.
-     * @since 2.0.0
      */
     public function getRelationParentRealId();
 
@@ -1330,7 +1234,6 @@ public function getRelationParentRealId();
      * Gets the remote IP address for the order.
      *
      * @return string|null Remote IP address.
-     * @since 2.0.0
      */
     public function getRemoteIp();
 
@@ -1338,7 +1241,6 @@ public function getRemoteIp();
      * Gets the shipping amount for the order.
      *
      * @return float|null Shipping amount.
-     * @since 2.0.0
      */
     public function getShippingAmount();
 
@@ -1346,7 +1248,6 @@ public function getShippingAmount();
      * Gets the shipping canceled amount for the order.
      *
      * @return float|null Shipping canceled amount.
-     * @since 2.0.0
      */
     public function getShippingCanceled();
 
@@ -1354,7 +1255,6 @@ public function getShippingCanceled();
      * Gets the shipping description for the order.
      *
      * @return string|null Shipping description.
-     * @since 2.0.0
      */
     public function getShippingDescription();
 
@@ -1362,7 +1262,6 @@ public function getShippingDescription();
      * Gets the shipping discount amount for the order.
      *
      * @return float|null Shipping discount amount.
-     * @since 2.0.0
      */
     public function getShippingDiscountAmount();
 
@@ -1370,7 +1269,6 @@ public function getShippingDiscountAmount();
      * Gets the shipping discount tax compensation amount for the order.
      *
      * @return float|null Shipping discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount();
 
@@ -1378,7 +1276,6 @@ public function getShippingDiscountTaxCompensationAmount();
      * Gets the shipping including tax amount for the order.
      *
      * @return float|null Shipping including tax amount.
-     * @since 2.0.0
      */
     public function getShippingInclTax();
 
@@ -1386,7 +1283,6 @@ public function getShippingInclTax();
      * Gets the shipping invoiced amount for the order.
      *
      * @return float|null Shipping invoiced amount.
-     * @since 2.0.0
      */
     public function getShippingInvoiced();
 
@@ -1394,7 +1290,6 @@ public function getShippingInvoiced();
      * Gets the shipping refunded amount for the order.
      *
      * @return float|null Shipping refunded amount.
-     * @since 2.0.0
      */
     public function getShippingRefunded();
 
@@ -1402,7 +1297,6 @@ public function getShippingRefunded();
      * Gets the shipping tax amount for the order.
      *
      * @return float|null Shipping tax amount.
-     * @since 2.0.0
      */
     public function getShippingTaxAmount();
 
@@ -1410,7 +1304,6 @@ public function getShippingTaxAmount();
      * Gets the shipping tax refunded amount for the order.
      *
      * @return float|null Shipping tax refunded amount.
-     * @since 2.0.0
      */
     public function getShippingTaxRefunded();
 
@@ -1418,7 +1311,6 @@ public function getShippingTaxRefunded();
      * Gets the state for the order.
      *
      * @return string|null State.
-     * @since 2.0.0
      */
     public function getState();
 
@@ -1426,7 +1318,6 @@ public function getState();
      * Gets the status for the order.
      *
      * @return string|null Status.
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -1434,7 +1325,6 @@ public function getStatus();
      * Gets the store currency code for the order.
      *
      * @return string|null Store currency code.
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode();
 
@@ -1442,7 +1332,6 @@ public function getStoreCurrencyCode();
      * Gets the store ID for the order.
      *
      * @return int|null Store ID.
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -1450,7 +1339,6 @@ public function getStoreId();
      * Gets the store name for the order.
      *
      * @return string|null Store name.
-     * @since 2.0.0
      */
     public function getStoreName();
 
@@ -1458,7 +1346,6 @@ public function getStoreName();
      * Gets the store-to-base rate for the order.
      *
      * @return float|null Store-to-base rate.
-     * @since 2.0.0
      */
     public function getStoreToBaseRate();
 
@@ -1466,7 +1353,6 @@ public function getStoreToBaseRate();
      * Gets the store-to-order rate for the order.
      *
      * @return float|null Store-to-order rate.
-     * @since 2.0.0
      */
     public function getStoreToOrderRate();
 
@@ -1474,7 +1360,6 @@ public function getStoreToOrderRate();
      * Gets the subtotal for the order.
      *
      * @return float|null Subtotal.
-     * @since 2.0.0
      */
     public function getSubtotal();
 
@@ -1482,7 +1367,6 @@ public function getSubtotal();
      * Gets the subtotal canceled amount for the order.
      *
      * @return float|null Subtotal canceled amount.
-     * @since 2.0.0
      */
     public function getSubtotalCanceled();
 
@@ -1490,7 +1374,6 @@ public function getSubtotalCanceled();
      * Gets the subtotal including tax amount for the order.
      *
      * @return float|null Subtotal including tax amount.
-     * @since 2.0.0
      */
     public function getSubtotalInclTax();
 
@@ -1498,7 +1381,6 @@ public function getSubtotalInclTax();
      * Gets the subtotal invoiced amount for the order.
      *
      * @return float|null Subtotal invoiced amount.
-     * @since 2.0.0
      */
     public function getSubtotalInvoiced();
 
@@ -1506,7 +1388,6 @@ public function getSubtotalInvoiced();
      * Gets the subtotal refunded amount for the order.
      *
      * @return float|null Subtotal refunded amount.
-     * @since 2.0.0
      */
     public function getSubtotalRefunded();
 
@@ -1514,7 +1395,6 @@ public function getSubtotalRefunded();
      * Gets the tax amount for the order.
      *
      * @return float|null Tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -1522,7 +1402,6 @@ public function getTaxAmount();
      * Gets the tax canceled amount for the order.
      *
      * @return float|null Tax canceled amount.
-     * @since 2.0.0
      */
     public function getTaxCanceled();
 
@@ -1530,7 +1409,6 @@ public function getTaxCanceled();
      * Gets the tax invoiced amount for the order.
      *
      * @return float|null Tax invoiced amount.
-     * @since 2.0.0
      */
     public function getTaxInvoiced();
 
@@ -1538,7 +1416,6 @@ public function getTaxInvoiced();
      * Gets the tax refunded amount for the order.
      *
      * @return float|null Tax refunded amount.
-     * @since 2.0.0
      */
     public function getTaxRefunded();
 
@@ -1546,7 +1423,6 @@ public function getTaxRefunded();
      * Gets the total canceled for the order.
      *
      * @return float|null Total canceled.
-     * @since 2.0.0
      */
     public function getTotalCanceled();
 
@@ -1554,7 +1430,6 @@ public function getTotalCanceled();
      * Gets the total due for the order.
      *
      * @return float|null Total due.
-     * @since 2.0.0
      */
     public function getTotalDue();
 
@@ -1562,7 +1437,6 @@ public function getTotalDue();
      * Gets the total invoiced amount for the order.
      *
      * @return float|null Total invoiced amount.
-     * @since 2.0.0
      */
     public function getTotalInvoiced();
 
@@ -1570,7 +1444,6 @@ public function getTotalInvoiced();
      * Gets the total item count for the order.
      *
      * @return int|null Total item count.
-     * @since 2.0.0
      */
     public function getTotalItemCount();
 
@@ -1578,7 +1451,6 @@ public function getTotalItemCount();
      * Gets the total offline refunded amount for the order.
      *
      * @return float|null Total offline refunded amount.
-     * @since 2.0.0
      */
     public function getTotalOfflineRefunded();
 
@@ -1586,7 +1458,6 @@ public function getTotalOfflineRefunded();
      * Gets the total online refunded amount for the order.
      *
      * @return float|null Total online refunded amount.
-     * @since 2.0.0
      */
     public function getTotalOnlineRefunded();
 
@@ -1594,7 +1465,6 @@ public function getTotalOnlineRefunded();
      * Gets the total paid for the order.
      *
      * @return float|null Total paid.
-     * @since 2.0.0
      */
     public function getTotalPaid();
 
@@ -1602,7 +1472,6 @@ public function getTotalPaid();
      * Gets the total quantity ordered for the order.
      *
      * @return float|null Total quantity ordered.
-     * @since 2.0.0
      */
     public function getTotalQtyOrdered();
 
@@ -1610,7 +1479,6 @@ public function getTotalQtyOrdered();
      * Gets the total amount refunded amount for the order.
      *
      * @return float|null Total amount refunded.
-     * @since 2.0.0
      */
     public function getTotalRefunded();
 
@@ -1618,7 +1486,6 @@ public function getTotalRefunded();
      * Gets the updated-at timestamp for the order.
      *
      * @return string|null Updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -1626,7 +1493,6 @@ public function getUpdatedAt();
      * Gets the weight for the order.
      *
      * @return float|null Weight.
-     * @since 2.0.0
      */
     public function getWeight();
 
@@ -1637,7 +1503,6 @@ public function getWeight();
      * connecting to a web server through an HTTP proxy or load balancer.
      *
      * @return string|null X-Forwarded-For field value.
-     * @since 2.0.0
      */
     public function getXForwardedFor();
 
@@ -1645,7 +1510,6 @@ public function getXForwardedFor();
      * Gets items for the order.
      *
      * @return \Magento\Sales\Api\Data\OrderItemInterface[] Array of items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -1654,7 +1518,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems($items);
 
@@ -1662,7 +1525,6 @@ public function setItems($items);
      * Gets the billing address, if any, for the order.
      *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface|null Billing address. Otherwise, null.
-     * @since 2.0.0
      */
     public function getBillingAddress();
 
@@ -1671,7 +1533,6 @@ public function getBillingAddress();
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $billingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Sales\Api\Data\OrderAddressInterface $billingAddress = null);
 
@@ -1679,7 +1540,6 @@ public function setBillingAddress(\Magento\Sales\Api\Data\OrderAddressInterface
      * Gets order payment
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface|null
-     * @since 2.0.0
      */
     public function getPayment();
 
@@ -1688,7 +1548,6 @@ public function getPayment();
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface|null $payment
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface
-     * @since 2.0.0
      */
     public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $payment = null);
 
@@ -1696,7 +1555,6 @@ public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $paymen
      * Gets status histories for the order.
      *
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null Array of status histories.
-     * @since 2.0.0
      */
     public function getStatusHistories();
 
@@ -1705,7 +1563,6 @@ public function getStatusHistories();
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface[] $statusHistories
      * @return $this
-     * @since 2.0.0
      */
     public function setStatusHistories(array $statusHistories = null);
 
@@ -1714,7 +1571,6 @@ public function setStatusHistories(array $statusHistories = null);
      *
      * @param string $state
      * @return $this
-     * @since 2.0.0
      */
     public function setState($state);
 
@@ -1723,7 +1579,6 @@ public function setState($state);
      *
      * @param string $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status);
 
@@ -1732,7 +1587,6 @@ public function setStatus($status);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponCode($code);
 
@@ -1741,7 +1595,6 @@ public function setCouponCode($code);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setProtectCode($code);
 
@@ -1750,7 +1603,6 @@ public function setProtectCode($code);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDescription($description);
 
@@ -1759,7 +1611,6 @@ public function setShippingDescription($description);
      *
      * @param int $isVirtual
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVirtual($isVirtual);
 
@@ -1768,7 +1619,6 @@ public function setIsVirtual($isVirtual);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($id);
 
@@ -1777,7 +1627,6 @@ public function setStoreId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id);
 
@@ -1786,7 +1635,6 @@ public function setCustomerId($id);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -1795,7 +1643,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $baseDiscountCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountCanceled($baseDiscountCanceled);
 
@@ -1804,7 +1651,6 @@ public function setBaseDiscountCanceled($baseDiscountCanceled);
      *
      * @param float $baseDiscountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced);
 
@@ -1813,7 +1659,6 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced);
      *
      * @param float $baseDiscountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded);
 
@@ -1822,7 +1667,6 @@ public function setBaseDiscountRefunded($baseDiscountRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount);
 
@@ -1831,7 +1675,6 @@ public function setBaseGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount);
 
@@ -1840,7 +1683,6 @@ public function setBaseShippingAmount($amount);
      *
      * @param float $baseShippingCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingCanceled($baseShippingCanceled);
 
@@ -1849,7 +1691,6 @@ public function setBaseShippingCanceled($baseShippingCanceled);
      *
      * @param float $baseShippingInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInvoiced($baseShippingInvoiced);
 
@@ -1858,7 +1699,6 @@ public function setBaseShippingInvoiced($baseShippingInvoiced);
      *
      * @param float $baseShippingRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingRefunded($baseShippingRefunded);
 
@@ -1867,7 +1707,6 @@ public function setBaseShippingRefunded($baseShippingRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount);
 
@@ -1876,7 +1715,6 @@ public function setBaseShippingTaxAmount($amount);
      *
      * @param float $baseShippingTaxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded);
 
@@ -1885,7 +1723,6 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount);
 
@@ -1894,7 +1731,6 @@ public function setBaseSubtotal($amount);
      *
      * @param float $baseSubtotalCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalCanceled($baseSubtotalCanceled);
 
@@ -1903,7 +1739,6 @@ public function setBaseSubtotalCanceled($baseSubtotalCanceled);
      *
      * @param float $baseSubtotalInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInvoiced($baseSubtotalInvoiced);
 
@@ -1912,7 +1747,6 @@ public function setBaseSubtotalInvoiced($baseSubtotalInvoiced);
      *
      * @param float $baseSubtotalRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalRefunded($baseSubtotalRefunded);
 
@@ -1921,7 +1755,6 @@ public function setBaseSubtotalRefunded($baseSubtotalRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -1930,7 +1763,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $baseTaxCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxCanceled($baseTaxCanceled);
 
@@ -1939,7 +1771,6 @@ public function setBaseTaxCanceled($baseTaxCanceled);
      *
      * @param float $baseTaxInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced);
 
@@ -1948,7 +1779,6 @@ public function setBaseTaxInvoiced($baseTaxInvoiced);
      *
      * @param float $baseTaxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxRefunded($baseTaxRefunded);
 
@@ -1957,7 +1787,6 @@ public function setBaseTaxRefunded($baseTaxRefunded);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate);
 
@@ -1966,7 +1795,6 @@ public function setBaseToGlobalRate($rate);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate);
 
@@ -1975,7 +1803,6 @@ public function setBaseToOrderRate($rate);
      *
      * @param float $baseTotalCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalCanceled($baseTotalCanceled);
 
@@ -1984,7 +1811,6 @@ public function setBaseTotalCanceled($baseTotalCanceled);
      *
      * @param float $baseTotalInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalInvoiced($baseTotalInvoiced);
 
@@ -1993,7 +1819,6 @@ public function setBaseTotalInvoiced($baseTotalInvoiced);
      *
      * @param float $baseTotalInvoicedCost
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalInvoicedCost($baseTotalInvoicedCost);
 
@@ -2002,7 +1827,6 @@ public function setBaseTotalInvoicedCost($baseTotalInvoicedCost);
      *
      * @param float $baseTotalOfflineRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded);
 
@@ -2011,7 +1835,6 @@ public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded);
      *
      * @param float $baseTotalOnlineRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded);
 
@@ -2020,7 +1843,6 @@ public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded);
      *
      * @param float $baseTotalPaid
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalPaid($baseTotalPaid);
 
@@ -2029,7 +1851,6 @@ public function setBaseTotalPaid($baseTotalPaid);
      *
      * @param float $baseTotalQtyOrdered
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalQtyOrdered($baseTotalQtyOrdered);
 
@@ -2038,7 +1859,6 @@ public function setBaseTotalQtyOrdered($baseTotalQtyOrdered);
      *
      * @param float $baseTotalRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalRefunded($baseTotalRefunded);
 
@@ -2047,7 +1867,6 @@ public function setBaseTotalRefunded($baseTotalRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -2056,7 +1875,6 @@ public function setDiscountAmount($amount);
      *
      * @param float $discountCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountCanceled($discountCanceled);
 
@@ -2065,7 +1883,6 @@ public function setDiscountCanceled($discountCanceled);
      *
      * @param float $discountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountInvoiced($discountInvoiced);
 
@@ -2074,7 +1891,6 @@ public function setDiscountInvoiced($discountInvoiced);
      *
      * @param float $discountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountRefunded($discountRefunded);
 
@@ -2083,7 +1899,6 @@ public function setDiscountRefunded($discountRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setGrandTotal($amount);
 
@@ -2092,7 +1907,6 @@ public function setGrandTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($amount);
 
@@ -2101,7 +1915,6 @@ public function setShippingAmount($amount);
      *
      * @param float $shippingCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingCanceled($shippingCanceled);
 
@@ -2110,7 +1923,6 @@ public function setShippingCanceled($shippingCanceled);
      *
      * @param float $shippingInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInvoiced($shippingInvoiced);
 
@@ -2119,7 +1931,6 @@ public function setShippingInvoiced($shippingInvoiced);
      *
      * @param float $shippingRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingRefunded($shippingRefunded);
 
@@ -2128,7 +1939,6 @@ public function setShippingRefunded($shippingRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount);
 
@@ -2137,7 +1947,6 @@ public function setShippingTaxAmount($amount);
      *
      * @param float $shippingTaxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingTaxRefunded($shippingTaxRefunded);
 
@@ -2146,7 +1955,6 @@ public function setShippingTaxRefunded($shippingTaxRefunded);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate);
 
@@ -2155,7 +1963,6 @@ public function setStoreToBaseRate($rate);
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate);
 
@@ -2164,7 +1971,6 @@ public function setStoreToOrderRate($rate);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($amount);
 
@@ -2173,7 +1979,6 @@ public function setSubtotal($amount);
      *
      * @param float $subtotalCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalCanceled($subtotalCanceled);
 
@@ -2182,7 +1987,6 @@ public function setSubtotalCanceled($subtotalCanceled);
      *
      * @param float $subtotalInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInvoiced($subtotalInvoiced);
 
@@ -2191,7 +1995,6 @@ public function setSubtotalInvoiced($subtotalInvoiced);
      *
      * @param float $subtotalRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalRefunded($subtotalRefunded);
 
@@ -2200,7 +2003,6 @@ public function setSubtotalRefunded($subtotalRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -2209,7 +2011,6 @@ public function setTaxAmount($amount);
      *
      * @param float $taxCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxCanceled($taxCanceled);
 
@@ -2218,7 +2019,6 @@ public function setTaxCanceled($taxCanceled);
      *
      * @param float $taxInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxInvoiced($taxInvoiced);
 
@@ -2227,7 +2027,6 @@ public function setTaxInvoiced($taxInvoiced);
      *
      * @param float $taxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRefunded($taxRefunded);
 
@@ -2236,7 +2035,6 @@ public function setTaxRefunded($taxRefunded);
      *
      * @param float $totalCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCanceled($totalCanceled);
 
@@ -2245,7 +2043,6 @@ public function setTotalCanceled($totalCanceled);
      *
      * @param float $totalInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalInvoiced($totalInvoiced);
 
@@ -2254,7 +2051,6 @@ public function setTotalInvoiced($totalInvoiced);
      *
      * @param float $totalOfflineRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalOfflineRefunded($totalOfflineRefunded);
 
@@ -2263,7 +2059,6 @@ public function setTotalOfflineRefunded($totalOfflineRefunded);
      *
      * @param float $totalOnlineRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalOnlineRefunded($totalOnlineRefunded);
 
@@ -2272,7 +2067,6 @@ public function setTotalOnlineRefunded($totalOnlineRefunded);
      *
      * @param float $totalPaid
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalPaid($totalPaid);
 
@@ -2281,7 +2075,6 @@ public function setTotalPaid($totalPaid);
      *
      * @param float $totalQtyOrdered
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalQtyOrdered($totalQtyOrdered);
 
@@ -2290,7 +2083,6 @@ public function setTotalQtyOrdered($totalQtyOrdered);
      *
      * @param float $totalRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalRefunded($totalRefunded);
 
@@ -2299,7 +2091,6 @@ public function setTotalRefunded($totalRefunded);
      *
      * @param int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCanShipPartially($flag);
 
@@ -2308,7 +2099,6 @@ public function setCanShipPartially($flag);
      *
      * @param int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCanShipPartiallyItem($flag);
 
@@ -2317,7 +2107,6 @@ public function setCanShipPartiallyItem($flag);
      *
      * @param int $customerIsGuest
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerIsGuest($customerIsGuest);
 
@@ -2326,7 +2115,6 @@ public function setCustomerIsGuest($customerIsGuest);
      *
      * @param int $customerNoteNotify
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerNoteNotify($customerNoteNotify);
 
@@ -2335,7 +2123,6 @@ public function setCustomerNoteNotify($customerNoteNotify);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddressId($id);
 
@@ -2344,7 +2131,6 @@ public function setBillingAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupId($id);
 
@@ -2353,7 +2139,6 @@ public function setCustomerGroupId($id);
      *
      * @param int $editIncrement
      * @return $this
-     * @since 2.0.0
      */
     public function setEditIncrement($editIncrement);
 
@@ -2362,7 +2147,6 @@ public function setEditIncrement($editIncrement);
      *
      * @param int $emailSent
      * @return $this
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent);
 
@@ -2371,7 +2155,6 @@ public function setEmailSent($emailSent);
      *
      * @param int $forcedShipmentWithInvoice
      * @return $this
-     * @since 2.0.0
      */
     public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice);
 
@@ -2380,7 +2163,6 @@ public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice);
      *
      * @param int $paymentAuthExpiration
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentAuthExpiration($paymentAuthExpiration);
 
@@ -2389,7 +2171,6 @@ public function setPaymentAuthExpiration($paymentAuthExpiration);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteAddressId($id);
 
@@ -2398,7 +2179,6 @@ public function setQuoteAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteId($id);
 
@@ -2407,7 +2187,6 @@ public function setQuoteId($id);
      *
      * @param float $adjustmentNegative
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentNegative($adjustmentNegative);
 
@@ -2416,7 +2195,6 @@ public function setAdjustmentNegative($adjustmentNegative);
      *
      * @param float $adjustmentPositive
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentPositive($adjustmentPositive);
 
@@ -2425,7 +2203,6 @@ public function setAdjustmentPositive($adjustmentPositive);
      *
      * @param float $baseAdjustmentNegative
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentNegative($baseAdjustmentNegative);
 
@@ -2434,7 +2211,6 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative);
      *
      * @param float $baseAdjustmentPositive
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentPositive($baseAdjustmentPositive);
 
@@ -2443,7 +2219,6 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountAmount($amount);
 
@@ -2452,7 +2227,6 @@ public function setBaseShippingDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount);
 
@@ -2461,7 +2235,6 @@ public function setBaseSubtotalInclTax($amount);
      *
      * @param float $baseTotalDue
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTotalDue($baseTotalDue);
 
@@ -2470,7 +2243,6 @@ public function setBaseTotalDue($baseTotalDue);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentAuthorizationAmount($amount);
 
@@ -2479,7 +2251,6 @@ public function setPaymentAuthorizationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountAmount($amount);
 
@@ -2488,7 +2259,6 @@ public function setShippingDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount);
 
@@ -2497,7 +2267,6 @@ public function setSubtotalInclTax($amount);
      *
      * @param float $totalDue
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalDue($totalDue);
 
@@ -2506,7 +2275,6 @@ public function setTotalDue($totalDue);
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight);
 
@@ -2515,7 +2283,6 @@ public function setWeight($weight);
      *
      * @param string $customerDob
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerDob($customerDob);
 
@@ -2524,7 +2291,6 @@ public function setCustomerDob($customerDob);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setIncrementId($id);
 
@@ -2533,7 +2299,6 @@ public function setIncrementId($id);
      *
      * @param string $appliedRuleIds
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedRuleIds($appliedRuleIds);
 
@@ -2542,7 +2307,6 @@ public function setAppliedRuleIds($appliedRuleIds);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code);
 
@@ -2551,7 +2315,6 @@ public function setBaseCurrencyCode($code);
      *
      * @param string $customerEmail
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerEmail($customerEmail);
 
@@ -2560,7 +2323,6 @@ public function setCustomerEmail($customerEmail);
      *
      * @param string $customerFirstname
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerFirstname($customerFirstname);
 
@@ -2569,7 +2331,6 @@ public function setCustomerFirstname($customerFirstname);
      *
      * @param string $customerLastname
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerLastname($customerLastname);
 
@@ -2578,7 +2339,6 @@ public function setCustomerLastname($customerLastname);
      *
      * @param string $customerMiddlename
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerMiddlename($customerMiddlename);
 
@@ -2587,7 +2347,6 @@ public function setCustomerMiddlename($customerMiddlename);
      *
      * @param string $customerPrefix
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerPrefix($customerPrefix);
 
@@ -2596,7 +2355,6 @@ public function setCustomerPrefix($customerPrefix);
      *
      * @param string $customerSuffix
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerSuffix($customerSuffix);
 
@@ -2605,7 +2363,6 @@ public function setCustomerSuffix($customerSuffix);
      *
      * @param string $customerTaxvat
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxvat($customerTaxvat);
 
@@ -2614,7 +2371,6 @@ public function setCustomerTaxvat($customerTaxvat);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountDescription($description);
 
@@ -2623,7 +2379,6 @@ public function setDiscountDescription($description);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setExtCustomerId($id);
 
@@ -2632,7 +2387,6 @@ public function setExtCustomerId($id);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setExtOrderId($id);
 
@@ -2641,7 +2395,6 @@ public function setExtOrderId($id);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code);
 
@@ -2650,7 +2403,6 @@ public function setGlobalCurrencyCode($code);
      *
      * @param string $holdBeforeState
      * @return $this
-     * @since 2.0.0
      */
     public function setHoldBeforeState($holdBeforeState);
 
@@ -2659,7 +2411,6 @@ public function setHoldBeforeState($holdBeforeState);
      *
      * @param string $holdBeforeStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setHoldBeforeStatus($holdBeforeStatus);
 
@@ -2668,7 +2419,6 @@ public function setHoldBeforeStatus($holdBeforeStatus);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code);
 
@@ -2677,7 +2427,6 @@ public function setOrderCurrencyCode($code);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOriginalIncrementId($id);
 
@@ -2686,7 +2435,6 @@ public function setOriginalIncrementId($id);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setRelationChildId($id);
 
@@ -2695,7 +2443,6 @@ public function setRelationChildId($id);
      *
      * @param string $realId
      * @return $this
-     * @since 2.0.0
      */
     public function setRelationChildRealId($realId);
 
@@ -2704,7 +2451,6 @@ public function setRelationChildRealId($realId);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setRelationParentId($id);
 
@@ -2713,7 +2459,6 @@ public function setRelationParentId($id);
      *
      * @param string $realId
      * @return $this
-     * @since 2.0.0
      */
     public function setRelationParentRealId($realId);
 
@@ -2722,7 +2467,6 @@ public function setRelationParentRealId($realId);
      *
      * @param string $remoteIp
      * @return $this
-     * @since 2.0.0
      */
     public function setRemoteIp($remoteIp);
 
@@ -2731,7 +2475,6 @@ public function setRemoteIp($remoteIp);
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code);
 
@@ -2740,7 +2483,6 @@ public function setStoreCurrencyCode($code);
      *
      * @param string $storeName
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreName($storeName);
 
@@ -2749,7 +2491,6 @@ public function setStoreName($storeName);
      *
      * @param string $xForwardedFor
      * @return $this
-     * @since 2.0.0
      */
     public function setXForwardedFor($xForwardedFor);
 
@@ -2758,7 +2499,6 @@ public function setXForwardedFor($xForwardedFor);
      *
      * @param string $customerNote
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerNote($customerNote);
 
@@ -2767,7 +2507,6 @@ public function setCustomerNote($customerNote);
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -2776,7 +2515,6 @@ public function setUpdatedAt($timestamp);
      *
      * @param int $totalItemCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalItemCount($totalItemCount);
 
@@ -2785,7 +2523,6 @@ public function setTotalItemCount($totalItemCount);
      *
      * @param int $customerGender
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGender($customerGender);
 
@@ -2794,7 +2531,6 @@ public function setCustomerGender($customerGender);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -2803,7 +2539,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -2812,7 +2547,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount);
 
@@ -2821,7 +2555,6 @@ public function setShippingDiscountTaxCompensationAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
 
@@ -2830,7 +2563,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
      *
      * @param float $discountTaxCompensationInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced);
 
@@ -2839,7 +2571,6 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
      *
      * @param float $baseDiscountTaxCompensationInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced);
 
@@ -2848,7 +2579,6 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
      *
      * @param float $discountTaxCompensationRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded);
 
@@ -2857,7 +2587,6 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
      *
      * @param float $baseDiscountTaxCompensationRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded);
 
@@ -2866,7 +2595,6 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount);
 
@@ -2875,7 +2603,6 @@ public function setShippingInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount);
 
@@ -2883,7 +2610,6 @@ public function setBaseShippingInclTax($amount);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -2892,7 +2618,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
index 77c8bbbfbe56d..b7b96318b73c4 100644
--- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -402,7 +401,6 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Gets the additional data for the order item.
      *
      * @return string|null Additional data.
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -410,7 +408,6 @@ public function getAdditionalData();
      * Gets the amount refunded for the order item.
      *
      * @return float|null Amount refunded.
-     * @since 2.0.0
      */
     public function getAmountRefunded();
 
@@ -418,7 +415,6 @@ public function getAmountRefunded();
      * Gets the applied rule IDs for the order item.
      *
      * @return string|null Applied rule IDs.
-     * @since 2.0.0
      */
     public function getAppliedRuleIds();
 
@@ -426,7 +422,6 @@ public function getAppliedRuleIds();
      * Gets the base amount refunded for the order item.
      *
      * @return float|null Base amount refunded.
-     * @since 2.0.0
      */
     public function getBaseAmountRefunded();
 
@@ -434,7 +429,6 @@ public function getBaseAmountRefunded();
      * Gets the base cost for the order item.
      *
      * @return float|null Base cost.
-     * @since 2.0.0
      */
     public function getBaseCost();
 
@@ -442,7 +436,6 @@ public function getBaseCost();
      * Gets the base discount amount for the order item.
      *
      * @return float|null Base discount amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount();
 
@@ -450,7 +443,6 @@ public function getBaseDiscountAmount();
      * Gets the base discount invoiced for the order item.
      *
      * @return float|null Base discount invoiced.
-     * @since 2.0.0
      */
     public function getBaseDiscountInvoiced();
 
@@ -458,7 +450,6 @@ public function getBaseDiscountInvoiced();
      * Gets the base discount refunded for the order item.
      *
      * @return float|null Base discount refunded.
-     * @since 2.0.0
      */
     public function getBaseDiscountRefunded();
 
@@ -466,7 +457,6 @@ public function getBaseDiscountRefunded();
      * Gets the base discount tax compensation amount for the order item.
      *
      * @return float|null Base discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -474,7 +464,6 @@ public function getBaseDiscountTaxCompensationAmount();
      * Gets the base discount tax compensation invoiced for the order item.
      *
      * @return float|null Base discount tax compensation invoiced.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationInvoiced();
 
@@ -482,7 +471,6 @@ public function getBaseDiscountTaxCompensationInvoiced();
      * Gets the base discount tax compensation refunded for the order item.
      *
      * @return float|null Base discount tax compensation refunded.
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationRefunded();
 
@@ -490,7 +478,6 @@ public function getBaseDiscountTaxCompensationRefunded();
      * Gets the base original price for the order item.
      *
      * @return float|null Base original price.
-     * @since 2.0.0
      */
     public function getBaseOriginalPrice();
 
@@ -498,7 +485,6 @@ public function getBaseOriginalPrice();
      * Gets the base price for the order item.
      *
      * @return float|null Base price.
-     * @since 2.0.0
      */
     public function getBasePrice();
 
@@ -506,7 +492,6 @@ public function getBasePrice();
      * Gets the base price including tax for the order item.
      *
      * @return float|null Base price including tax.
-     * @since 2.0.0
      */
     public function getBasePriceInclTax();
 
@@ -514,7 +499,6 @@ public function getBasePriceInclTax();
      * Gets the base row invoiced for the order item.
      *
      * @return float|null Base row invoiced.
-     * @since 2.0.0
      */
     public function getBaseRowInvoiced();
 
@@ -522,7 +506,6 @@ public function getBaseRowInvoiced();
      * Gets the base row total for the order item.
      *
      * @return float|null Base row total.
-     * @since 2.0.0
      */
     public function getBaseRowTotal();
 
@@ -530,7 +513,6 @@ public function getBaseRowTotal();
      * Gets the base row total including tax for the order item.
      *
      * @return float|null Base row total including tax.
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax();
 
@@ -538,7 +520,6 @@ public function getBaseRowTotalInclTax();
      * Gets the base tax amount for the order item.
      *
      * @return float|null Base tax amount.
-     * @since 2.0.0
      */
     public function getBaseTaxAmount();
 
@@ -546,7 +527,6 @@ public function getBaseTaxAmount();
      * Gets the base tax before discount for the order item.
      *
      * @return float|null Base tax before discount.
-     * @since 2.0.0
      */
     public function getBaseTaxBeforeDiscount();
 
@@ -554,7 +534,6 @@ public function getBaseTaxBeforeDiscount();
      * Gets the base tax invoiced for the order item.
      *
      * @return float|null Base tax invoiced.
-     * @since 2.0.0
      */
     public function getBaseTaxInvoiced();
 
@@ -562,7 +541,6 @@ public function getBaseTaxInvoiced();
      * Gets the base tax refunded for the order item.
      *
      * @return float|null Base tax refunded.
-     * @since 2.0.0
      */
     public function getBaseTaxRefunded();
 
@@ -570,7 +548,6 @@ public function getBaseTaxRefunded();
      * Gets the base WEEE tax applied amount for the order item.
      *
      * @return float|null Base WEEE tax applied amount.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedAmount();
 
@@ -578,7 +555,6 @@ public function getBaseWeeeTaxAppliedAmount();
      * Gets the base WEEE tax applied row amount for the order item.
      *
      * @return float|null Base WEEE tax applied row amount.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedRowAmnt();
 
@@ -586,7 +562,6 @@ public function getBaseWeeeTaxAppliedRowAmnt();
      * Gets the base WEEE tax disposition for the order item.
      *
      * @return float|null Base WEEE tax disposition.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxDisposition();
 
@@ -594,7 +569,6 @@ public function getBaseWeeeTaxDisposition();
      * Gets the base WEEE tax row disposition for the order item.
      *
      * @return float|null Base WEEE tax row disposition.
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxRowDisposition();
 
@@ -602,7 +576,6 @@ public function getBaseWeeeTaxRowDisposition();
      * Gets the created-at timestamp for the order item.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -611,7 +584,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -619,7 +591,6 @@ public function setCreatedAt($createdAt);
      * Gets the description for the order item.
      *
      * @return string|null Description.
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -627,7 +598,6 @@ public function getDescription();
      * Gets the discount amount for the order item.
      *
      * @return float|null Discount amount.
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -635,7 +605,6 @@ public function getDiscountAmount();
      * Gets the discount invoiced for the order item.
      *
      * @return float|null Discount invoiced.
-     * @since 2.0.0
      */
     public function getDiscountInvoiced();
 
@@ -643,7 +612,6 @@ public function getDiscountInvoiced();
      * Gets the discount percent for the order item.
      *
      * @return float|null Discount percent.
-     * @since 2.0.0
      */
     public function getDiscountPercent();
 
@@ -651,7 +619,6 @@ public function getDiscountPercent();
      * Gets the discount refunded for the order item.
      *
      * @return float|null Discount refunded.
-     * @since 2.0.0
      */
     public function getDiscountRefunded();
 
@@ -659,7 +626,6 @@ public function getDiscountRefunded();
      * Gets the event ID for the order item.
      *
      * @return int|null Event ID.
-     * @since 2.0.0
      */
     public function getEventId();
 
@@ -667,7 +633,6 @@ public function getEventId();
      * Gets the external order item ID for the order item.
      *
      * @return string|null External order item ID.
-     * @since 2.0.0
      */
     public function getExtOrderItemId();
 
@@ -675,7 +640,6 @@ public function getExtOrderItemId();
      * Gets the free-shipping flag value for the order item.
      *
      * @return int|null Free-shipping flag value.
-     * @since 2.0.0
      */
     public function getFreeShipping();
 
@@ -683,7 +647,6 @@ public function getFreeShipping();
      * Gets the GW base price for the order item.
      *
      * @return float|null GW base price.
-     * @since 2.0.0
      */
     public function getGwBasePrice();
 
@@ -691,7 +654,6 @@ public function getGwBasePrice();
      * Gets the GW base price invoiced for the order item.
      *
      * @return float|null GW base price invoiced.
-     * @since 2.0.0
      */
     public function getGwBasePriceInvoiced();
 
@@ -699,7 +661,6 @@ public function getGwBasePriceInvoiced();
      * Gets the GW base price refunded for the order item.
      *
      * @return float|null GW base price refunded.
-     * @since 2.0.0
      */
     public function getGwBasePriceRefunded();
 
@@ -707,7 +668,6 @@ public function getGwBasePriceRefunded();
      * Gets the GW base tax amount for the order item.
      *
      * @return float|null GW base tax amount.
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmount();
 
@@ -715,7 +675,6 @@ public function getGwBaseTaxAmount();
      * Gets the GW base tax amount invoiced for the order item.
      *
      * @return float|null GW base tax amount invoiced.
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmountInvoiced();
 
@@ -723,7 +682,6 @@ public function getGwBaseTaxAmountInvoiced();
      * Gets the GW base tax amount refunded for the order item.
      *
      * @return float|null GW base tax amount refunded.
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmountRefunded();
 
@@ -731,7 +689,6 @@ public function getGwBaseTaxAmountRefunded();
      * Gets the GW ID for the order item.
      *
      * @return int|null GW ID.
-     * @since 2.0.0
      */
     public function getGwId();
 
@@ -739,7 +696,6 @@ public function getGwId();
      * Gets the GW price for the order item.
      *
      * @return float|null GW price.
-     * @since 2.0.0
      */
     public function getGwPrice();
 
@@ -747,7 +703,6 @@ public function getGwPrice();
      * Gets the GW price invoiced for the order item.
      *
      * @return float|null GW price invoiced.
-     * @since 2.0.0
      */
     public function getGwPriceInvoiced();
 
@@ -755,7 +710,6 @@ public function getGwPriceInvoiced();
      * Gets the GW price refunded for the order item.
      *
      * @return float|null GW price refunded.
-     * @since 2.0.0
      */
     public function getGwPriceRefunded();
 
@@ -763,7 +717,6 @@ public function getGwPriceRefunded();
      * Gets the GW tax amount for the order item.
      *
      * @return float|null GW tax amount.
-     * @since 2.0.0
      */
     public function getGwTaxAmount();
 
@@ -771,7 +724,6 @@ public function getGwTaxAmount();
      * Gets the GW tax amount invoiced for the order item.
      *
      * @return float|null GW tax amount invoiced.
-     * @since 2.0.0
      */
     public function getGwTaxAmountInvoiced();
 
@@ -779,7 +731,6 @@ public function getGwTaxAmountInvoiced();
      * Gets the GW tax amount refunded for the order item.
      *
      * @return float|null GW tax amount refunded.
-     * @since 2.0.0
      */
     public function getGwTaxAmountRefunded();
 
@@ -787,7 +738,6 @@ public function getGwTaxAmountRefunded();
      * Gets the discount tax compensation amount for the order item.
      *
      * @return float|null Discount tax compensation amount.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -795,7 +745,6 @@ public function getDiscountTaxCompensationAmount();
      * Gets the discount tax compensation canceled for the order item.
      *
      * @return float|null Discount tax compensation canceled.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationCanceled();
 
@@ -803,7 +752,6 @@ public function getDiscountTaxCompensationCanceled();
      * Gets the discount tax compensation invoiced for the order item.
      *
      * @return float|null Discount tax compensation invoiced.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationInvoiced();
 
@@ -811,7 +759,6 @@ public function getDiscountTaxCompensationInvoiced();
      * Gets the discount tax compensation refunded for the order item.
      *
      * @return float|null Discount tax compensation refunded.
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationRefunded();
 
@@ -819,7 +766,6 @@ public function getDiscountTaxCompensationRefunded();
      * Gets the is-quantity-decimal flag value for the order item.
      *
      * @return int|null Is-quantity-decimal flag value.
-     * @since 2.0.0
      */
     public function getIsQtyDecimal();
 
@@ -827,7 +773,6 @@ public function getIsQtyDecimal();
      * Gets the is-virtual flag value for the order item.
      *
      * @return int|null Is-virtual flag value.
-     * @since 2.0.0
      */
     public function getIsVirtual();
 
@@ -835,7 +780,6 @@ public function getIsVirtual();
      * Gets the item ID for the order item.
      *
      * @return int|null Item ID.
-     * @since 2.0.0
      */
     public function getItemId();
 
@@ -843,7 +787,6 @@ public function getItemId();
      * Gets the locked DO invoice flag value for the order item.
      *
      * @return int|null Locked DO invoice flag value.
-     * @since 2.0.0
      */
     public function getLockedDoInvoice();
 
@@ -851,7 +794,6 @@ public function getLockedDoInvoice();
      * Gets the locked DO ship flag value for the order item.
      *
      * @return int|null Locked DO ship flag value.
-     * @since 2.0.0
      */
     public function getLockedDoShip();
 
@@ -859,7 +801,6 @@ public function getLockedDoShip();
      * Gets the name for the order item.
      *
      * @return string|null Name.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -867,7 +808,6 @@ public function getName();
      * Gets the no discount flag value for the order item.
      *
      * @return int|null No-discount flag value.
-     * @since 2.0.0
      */
     public function getNoDiscount();
 
@@ -875,7 +815,6 @@ public function getNoDiscount();
      * Gets the order ID for the order item.
      *
      * @return int|null Order ID.
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -883,7 +822,6 @@ public function getOrderId();
      * Gets the original price for the order item.
      *
      * @return float|null Original price.
-     * @since 2.0.0
      */
     public function getOriginalPrice();
 
@@ -891,7 +829,6 @@ public function getOriginalPrice();
      * Gets the parent item ID for the order item.
      *
      * @return int|null Parent item ID.
-     * @since 2.0.0
      */
     public function getParentItemId();
 
@@ -899,7 +836,6 @@ public function getParentItemId();
      * Gets the price for the order item.
      *
      * @return float|null Price.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -907,7 +843,6 @@ public function getPrice();
      * Gets the price including tax for the order item.
      *
      * @return float|null Price including tax.
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -915,7 +850,6 @@ public function getPriceInclTax();
      * Gets the product ID for the order item.
      *
      * @return int|null Product ID.
-     * @since 2.0.0
      */
     public function getProductId();
 
@@ -923,7 +857,6 @@ public function getProductId();
      * Gets the product type for the order item.
      *
      * @return string|null Product type.
-     * @since 2.0.0
      */
     public function getProductType();
 
@@ -931,7 +864,6 @@ public function getProductType();
      * Gets the quantity backordered for the order item.
      *
      * @return float|null Quantity backordered.
-     * @since 2.0.0
      */
     public function getQtyBackordered();
 
@@ -939,7 +871,6 @@ public function getQtyBackordered();
      * Gets the quantity canceled for the order item.
      *
      * @return float|null Quantity canceled.
-     * @since 2.0.0
      */
     public function getQtyCanceled();
 
@@ -947,7 +878,6 @@ public function getQtyCanceled();
      * Gets the quantity invoiced for the order item.
      *
      * @return float|null Quantity invoiced.
-     * @since 2.0.0
      */
     public function getQtyInvoiced();
 
@@ -955,7 +885,6 @@ public function getQtyInvoiced();
      * Gets the quantity ordered for the order item.
      *
      * @return float|null Quantity ordered.
-     * @since 2.0.0
      */
     public function getQtyOrdered();
 
@@ -963,7 +892,6 @@ public function getQtyOrdered();
      * Gets the quantity refunded for the order item.
      *
      * @return float|null Quantity refunded.
-     * @since 2.0.0
      */
     public function getQtyRefunded();
 
@@ -971,7 +899,6 @@ public function getQtyRefunded();
      * Gets the quantity returned for the order item.
      *
      * @return float|null Quantity returned.
-     * @since 2.0.0
      */
     public function getQtyReturned();
 
@@ -979,7 +906,6 @@ public function getQtyReturned();
      * Gets the quantity shipped for the order item.
      *
      * @return float|null Quantity shipped.
-     * @since 2.0.0
      */
     public function getQtyShipped();
 
@@ -987,7 +913,6 @@ public function getQtyShipped();
      * Gets the quote item ID for the order item.
      *
      * @return int|null Quote item ID.
-     * @since 2.0.0
      */
     public function getQuoteItemId();
 
@@ -995,7 +920,6 @@ public function getQuoteItemId();
      * Gets the row invoiced for the order item.
      *
      * @return float|null Row invoiced.
-     * @since 2.0.0
      */
     public function getRowInvoiced();
 
@@ -1003,7 +927,6 @@ public function getRowInvoiced();
      * Gets the row total for the order item.
      *
      * @return float|null Row total.
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -1011,7 +934,6 @@ public function getRowTotal();
      * Gets the row total including tax for the order item.
      *
      * @return float|null Row total including tax.
-     * @since 2.0.0
      */
     public function getRowTotalInclTax();
 
@@ -1019,7 +941,6 @@ public function getRowTotalInclTax();
      * Gets the row weight for the order item.
      *
      * @return float|null Row weight.
-     * @since 2.0.0
      */
     public function getRowWeight();
 
@@ -1027,7 +948,6 @@ public function getRowWeight();
      * Gets the SKU for the order item.
      *
      * @return string SKU.
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -1035,7 +955,6 @@ public function getSku();
      * Gets the store ID for the order item.
      *
      * @return int|null Store ID.
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -1043,7 +962,6 @@ public function getStoreId();
      * Gets the tax amount for the order item.
      *
      * @return float|null Tax amount.
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -1051,7 +969,6 @@ public function getTaxAmount();
      * Gets the tax before discount for the order item.
      *
      * @return float|null Tax before discount.
-     * @since 2.0.0
      */
     public function getTaxBeforeDiscount();
 
@@ -1059,7 +976,6 @@ public function getTaxBeforeDiscount();
      * Gets the tax canceled for the order item.
      *
      * @return float|null Tax canceled.
-     * @since 2.0.0
      */
     public function getTaxCanceled();
 
@@ -1067,7 +983,6 @@ public function getTaxCanceled();
      * Gets the tax invoiced for the order item.
      *
      * @return float|null Tax invoiced.
-     * @since 2.0.0
      */
     public function getTaxInvoiced();
 
@@ -1075,7 +990,6 @@ public function getTaxInvoiced();
      * Gets the tax percent for the order item.
      *
      * @return float|null Tax percent.
-     * @since 2.0.0
      */
     public function getTaxPercent();
 
@@ -1083,7 +997,6 @@ public function getTaxPercent();
      * Gets the tax refunded for the order item.
      *
      * @return float|null Tax refunded.
-     * @since 2.0.0
      */
     public function getTaxRefunded();
 
@@ -1091,7 +1004,6 @@ public function getTaxRefunded();
      * Gets the updated-at timestamp for the order item.
      *
      * @return string|null Updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -1099,7 +1011,6 @@ public function getUpdatedAt();
      * Gets the WEEE tax applied for the order item.
      *
      * @return string|null WEEE tax applied.
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied();
 
@@ -1107,7 +1018,6 @@ public function getWeeeTaxApplied();
      * Gets the WEEE tax applied amount for the order item.
      *
      * @return float|null WEEE tax applied amount.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount();
 
@@ -1115,7 +1025,6 @@ public function getWeeeTaxAppliedAmount();
      * Gets the WEEE tax applied row amount for the order item.
      *
      * @return float|null WEEE tax applied row amount.
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedRowAmount();
 
@@ -1123,7 +1032,6 @@ public function getWeeeTaxAppliedRowAmount();
      * Gets the WEEE tax disposition for the order item.
      *
      * @return float|null WEEE tax disposition.
-     * @since 2.0.0
      */
     public function getWeeeTaxDisposition();
 
@@ -1131,7 +1039,6 @@ public function getWeeeTaxDisposition();
      * Gets the WEEE tax row disposition for the order item.
      *
      * @return float|null WEEE tax row disposition.
-     * @since 2.0.0
      */
     public function getWeeeTaxRowDisposition();
 
@@ -1139,7 +1046,6 @@ public function getWeeeTaxRowDisposition();
      * Gets the weight for the order item.
      *
      * @return float|null Weight.
-     * @since 2.0.0
      */
     public function getWeight();
 
@@ -1147,7 +1053,6 @@ public function getWeight();
      * Gets the parent item
      *
      * @return \Magento\Sales\Api\Data\OrderItemInterface|null Parent item
-     * @since 2.0.0
      */
     public function getParentItem();
 
@@ -1156,7 +1061,6 @@ public function getParentItem();
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface $parentItem
      * @return $this
-     * @since 2.0.0
      */
     public function setParentItem($parentItem);
 
@@ -1165,7 +1069,6 @@ public function setParentItem($parentItem);
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -1174,7 +1077,6 @@ public function setUpdatedAt($timestamp);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($id);
 
@@ -1183,7 +1085,6 @@ public function setItemId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -1192,7 +1093,6 @@ public function setOrderId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentItemId($id);
 
@@ -1201,7 +1101,6 @@ public function setParentItemId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setQuoteItemId($id);
 
@@ -1210,7 +1109,6 @@ public function setQuoteItemId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($id);
 
@@ -1219,7 +1117,6 @@ public function setStoreId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($id);
 
@@ -1228,7 +1125,6 @@ public function setProductId($id);
      *
      * @param string $productType
      * @return $this
-     * @since 2.0.0
      */
     public function setProductType($productType);
 
@@ -1237,7 +1133,6 @@ public function setProductType($productType);
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight);
 
@@ -1246,7 +1141,6 @@ public function setWeight($weight);
      *
      * @param int $isVirtual
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVirtual($isVirtual);
 
@@ -1255,7 +1149,6 @@ public function setIsVirtual($isVirtual);
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -1264,7 +1157,6 @@ public function setSku($sku);
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -1273,7 +1165,6 @@ public function setName($name);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -1282,7 +1173,6 @@ public function setDescription($description);
      *
      * @param string $appliedRuleIds
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedRuleIds($appliedRuleIds);
 
@@ -1291,7 +1181,6 @@ public function setAppliedRuleIds($appliedRuleIds);
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -1300,7 +1189,6 @@ public function setAdditionalData($additionalData);
      *
      * @param int $isQtyDecimal
      * @return $this
-     * @since 2.0.0
      */
     public function setIsQtyDecimal($isQtyDecimal);
 
@@ -1309,7 +1197,6 @@ public function setIsQtyDecimal($isQtyDecimal);
      *
      * @param int $noDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setNoDiscount($noDiscount);
 
@@ -1318,7 +1205,6 @@ public function setNoDiscount($noDiscount);
      *
      * @param float $qtyBackordered
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyBackordered($qtyBackordered);
 
@@ -1327,7 +1213,6 @@ public function setQtyBackordered($qtyBackordered);
      *
      * @param float $qtyCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyCanceled($qtyCanceled);
 
@@ -1336,7 +1221,6 @@ public function setQtyCanceled($qtyCanceled);
      *
      * @param float $qtyInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyInvoiced($qtyInvoiced);
 
@@ -1345,7 +1229,6 @@ public function setQtyInvoiced($qtyInvoiced);
      *
      * @param float $qtyOrdered
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyOrdered($qtyOrdered);
 
@@ -1354,7 +1237,6 @@ public function setQtyOrdered($qtyOrdered);
      *
      * @param float $qtyRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyRefunded($qtyRefunded);
 
@@ -1363,7 +1245,6 @@ public function setQtyRefunded($qtyRefunded);
      *
      * @param float $qtyShipped
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyShipped($qtyShipped);
 
@@ -1372,7 +1253,6 @@ public function setQtyShipped($qtyShipped);
      *
      * @param float $baseCost
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost);
 
@@ -1381,7 +1261,6 @@ public function setBaseCost($baseCost);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -1390,7 +1269,6 @@ public function setPrice($price);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePrice($price);
 
@@ -1399,7 +1277,6 @@ public function setBasePrice($price);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setOriginalPrice($price);
 
@@ -1408,7 +1285,6 @@ public function setOriginalPrice($price);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseOriginalPrice($price);
 
@@ -1417,7 +1293,6 @@ public function setBaseOriginalPrice($price);
      *
      * @param float $taxPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent);
 
@@ -1426,7 +1301,6 @@ public function setTaxPercent($taxPercent);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($amount);
 
@@ -1435,7 +1309,6 @@ public function setTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount);
 
@@ -1444,7 +1317,6 @@ public function setBaseTaxAmount($amount);
      *
      * @param float $taxInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxInvoiced($taxInvoiced);
 
@@ -1453,7 +1325,6 @@ public function setTaxInvoiced($taxInvoiced);
      *
      * @param float $baseTaxInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced);
 
@@ -1462,7 +1333,6 @@ public function setBaseTaxInvoiced($baseTaxInvoiced);
      *
      * @param float $discountPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountPercent($discountPercent);
 
@@ -1471,7 +1341,6 @@ public function setDiscountPercent($discountPercent);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount);
 
@@ -1480,7 +1349,6 @@ public function setDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount);
 
@@ -1489,7 +1357,6 @@ public function setBaseDiscountAmount($amount);
      *
      * @param float $discountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountInvoiced($discountInvoiced);
 
@@ -1498,7 +1365,6 @@ public function setDiscountInvoiced($discountInvoiced);
      *
      * @param float $baseDiscountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced);
 
@@ -1507,7 +1373,6 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced);
      *
      * @param float $amountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountRefunded($amountRefunded);
 
@@ -1516,7 +1381,6 @@ public function setAmountRefunded($amountRefunded);
      *
      * @param float $baseAmountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountRefunded($baseAmountRefunded);
 
@@ -1525,7 +1389,6 @@ public function setBaseAmountRefunded($baseAmountRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($amount);
 
@@ -1534,7 +1397,6 @@ public function setRowTotal($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount);
 
@@ -1543,7 +1405,6 @@ public function setBaseRowTotal($amount);
      *
      * @param float $rowInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setRowInvoiced($rowInvoiced);
 
@@ -1552,7 +1413,6 @@ public function setRowInvoiced($rowInvoiced);
      *
      * @param float $baseRowInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowInvoiced($baseRowInvoiced);
 
@@ -1561,7 +1421,6 @@ public function setBaseRowInvoiced($baseRowInvoiced);
      *
      * @param float $rowWeight
      * @return $this
-     * @since 2.0.0
      */
     public function setRowWeight($rowWeight);
 
@@ -1570,7 +1429,6 @@ public function setRowWeight($rowWeight);
      *
      * @param float $baseTaxBeforeDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount);
 
@@ -1579,7 +1437,6 @@ public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount);
      *
      * @param float $taxBeforeDiscount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxBeforeDiscount($taxBeforeDiscount);
 
@@ -1588,7 +1445,6 @@ public function setTaxBeforeDiscount($taxBeforeDiscount);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setExtOrderItemId($id);
 
@@ -1597,7 +1453,6 @@ public function setExtOrderItemId($id);
      *
      * @param int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setLockedDoInvoice($flag);
 
@@ -1606,7 +1461,6 @@ public function setLockedDoInvoice($flag);
      *
      * @param int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setLockedDoShip($flag);
 
@@ -1615,7 +1469,6 @@ public function setLockedDoShip($flag);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount);
 
@@ -1624,7 +1477,6 @@ public function setPriceInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount);
 
@@ -1633,7 +1485,6 @@ public function setBasePriceInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount);
 
@@ -1642,7 +1493,6 @@ public function setRowTotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount);
 
@@ -1651,7 +1501,6 @@ public function setBaseRowTotalInclTax($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount);
 
@@ -1660,7 +1509,6 @@ public function setDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount);
 
@@ -1669,7 +1517,6 @@ public function setBaseDiscountTaxCompensationAmount($amount);
      *
      * @param float $discountTaxCompensationInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced);
 
@@ -1678,7 +1525,6 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
      *
      * @param float $baseDiscountTaxCompensationInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced);
 
@@ -1687,7 +1533,6 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
      *
      * @param float $discountTaxCompensationRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded);
 
@@ -1696,7 +1541,6 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
      *
      * @param float $baseDiscountTaxCompensationRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded);
 
@@ -1705,7 +1549,6 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
      *
      * @param float $taxCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxCanceled($taxCanceled);
 
@@ -1714,7 +1557,6 @@ public function setTaxCanceled($taxCanceled);
      *
      * @param float $discountTaxCompensationCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationCanceled($discountTaxCompensationCanceled);
 
@@ -1723,7 +1565,6 @@ public function setDiscountTaxCompensationCanceled($discountTaxCompensationCance
      *
      * @param float $taxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRefunded($taxRefunded);
 
@@ -1732,7 +1573,6 @@ public function setTaxRefunded($taxRefunded);
      *
      * @param float $baseTaxRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseTaxRefunded($baseTaxRefunded);
 
@@ -1741,7 +1581,6 @@ public function setBaseTaxRefunded($baseTaxRefunded);
      *
      * @param float $discountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountRefunded($discountRefunded);
 
@@ -1750,7 +1589,6 @@ public function setDiscountRefunded($discountRefunded);
      *
      * @param float $baseDiscountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded);
 
@@ -1759,7 +1597,6 @@ public function setBaseDiscountRefunded($baseDiscountRefunded);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setGwId($id);
 
@@ -1768,7 +1605,6 @@ public function setGwId($id);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBasePrice($price);
 
@@ -1777,7 +1613,6 @@ public function setGwBasePrice($price);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setGwPrice($price);
 
@@ -1786,7 +1621,6 @@ public function setGwPrice($price);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmount($amount);
 
@@ -1795,7 +1629,6 @@ public function setGwBaseTaxAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setGwTaxAmount($amount);
 
@@ -1804,7 +1637,6 @@ public function setGwTaxAmount($amount);
      *
      * @param float $gwBasePriceInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBasePriceInvoiced($gwBasePriceInvoiced);
 
@@ -1813,7 +1645,6 @@ public function setGwBasePriceInvoiced($gwBasePriceInvoiced);
      *
      * @param float $gwPriceInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setGwPriceInvoiced($gwPriceInvoiced);
 
@@ -1822,7 +1653,6 @@ public function setGwPriceInvoiced($gwPriceInvoiced);
      *
      * @param float $gwBaseTaxAmountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced);
 
@@ -1831,7 +1661,6 @@ public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced);
      *
      * @param float $gwTaxAmountInvoiced
      * @return $this
-     * @since 2.0.0
      */
     public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced);
 
@@ -1840,7 +1669,6 @@ public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced);
      *
      * @param float $gwBasePriceRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBasePriceRefunded($gwBasePriceRefunded);
 
@@ -1849,7 +1677,6 @@ public function setGwBasePriceRefunded($gwBasePriceRefunded);
      *
      * @param float $gwPriceRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setGwPriceRefunded($gwPriceRefunded);
 
@@ -1858,7 +1685,6 @@ public function setGwPriceRefunded($gwPriceRefunded);
      *
      * @param float $gwBaseTaxAmountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded);
 
@@ -1867,7 +1693,6 @@ public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded);
      *
      * @param float $gwTaxAmountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setGwTaxAmountRefunded($gwTaxAmountRefunded);
 
@@ -1876,7 +1701,6 @@ public function setGwTaxAmountRefunded($gwTaxAmountRefunded);
      *
      * @param int $freeShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setFreeShipping($freeShipping);
 
@@ -1885,7 +1709,6 @@ public function setFreeShipping($freeShipping);
      *
      * @param float $qtyReturned
      * @return $this
-     * @since 2.0.0
      */
     public function setQtyReturned($qtyReturned);
 
@@ -1894,7 +1717,6 @@ public function setQtyReturned($qtyReturned);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setEventId($id);
 
@@ -1903,7 +1725,6 @@ public function setEventId($id);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedAmount($amount);
 
@@ -1912,7 +1733,6 @@ public function setBaseWeeeTaxAppliedAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt);
 
@@ -1921,7 +1741,6 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($amount);
 
@@ -1930,7 +1749,6 @@ public function setWeeeTaxAppliedAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedRowAmount($amount);
 
@@ -1939,7 +1757,6 @@ public function setWeeeTaxAppliedRowAmount($amount);
      *
      * @param string $weeeTaxApplied
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied);
 
@@ -1948,7 +1765,6 @@ public function setWeeeTaxApplied($weeeTaxApplied);
      *
      * @param float $weeeTaxDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition);
 
@@ -1957,7 +1773,6 @@ public function setWeeeTaxDisposition($weeeTaxDisposition);
      *
      * @param float $weeeTaxRowDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition);
 
@@ -1966,7 +1781,6 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition);
      *
      * @param float $baseWeeeTaxDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition);
 
@@ -1975,7 +1789,6 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition);
      *
      * @param float $baseWeeeTaxRowDisposition
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition);
 
@@ -1983,7 +1796,6 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition);
      * Returns product option
      *
      * @return \Magento\Catalog\Api\Data\ProductOptionInterface|null
-     * @since 2.0.0
      */
     public function getProductOption();
 
@@ -1992,7 +1804,6 @@ public function getProductOption();
      *
      * @param \Magento\Catalog\Api\Data\ProductOptionInterface $productOption
      * @return $this
-     * @since 2.0.0
      */
     public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterface $productOption);
 
@@ -2000,7 +1811,6 @@ public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterfac
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\OrderItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -2009,7 +1819,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php
index 80cdbb884bb17..4fbc8154d1406 100644
--- a/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderItemSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface OrderItemSearchResultInterface extends \Magento\Framework\Api\SearchRe
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\OrderItemInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
index 12c474540b0bd..979717daac6b3 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -249,7 +248,6 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Gets the account status for the order payment.
      *
      * @return string Account status.
-     * @since 2.0.0
      */
     public function getAccountStatus();
 
@@ -257,7 +255,6 @@ public function getAccountStatus();
      * Gets the additional data for the order payment.
      *
      * @return string|null Additional data.
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -265,7 +262,6 @@ public function getAdditionalData();
      * Gets the additional information for the order payment.
      *
      * @return string[] Array of additional information.
-     * @since 2.0.0
      */
     public function getAdditionalInformation();
 
@@ -273,7 +269,6 @@ public function getAdditionalInformation();
      * Gets the address status for the order payment.
      *
      * @return string|null Address status.
-     * @since 2.0.0
      */
     public function getAddressStatus();
 
@@ -281,7 +276,6 @@ public function getAddressStatus();
      * Gets the amount authorized for the order payment.
      *
      * @return float|null Amount authorized.
-     * @since 2.0.0
      */
     public function getAmountAuthorized();
 
@@ -289,7 +283,6 @@ public function getAmountAuthorized();
      * Gets the amount canceled for the order payment.
      *
      * @return float|null Amount canceled.
-     * @since 2.0.0
      */
     public function getAmountCanceled();
 
@@ -297,7 +290,6 @@ public function getAmountCanceled();
      * Gets the amount ordered for the order payment.
      *
      * @return float|null Amount ordered.
-     * @since 2.0.0
      */
     public function getAmountOrdered();
 
@@ -305,7 +297,6 @@ public function getAmountOrdered();
      * Gets the amount paid for the order payment.
      *
      * @return float|null Amount paid.
-     * @since 2.0.0
      */
     public function getAmountPaid();
 
@@ -313,7 +304,6 @@ public function getAmountPaid();
      * Gets the amount refunded for the order payment.
      *
      * @return float|null Amount refunded.
-     * @since 2.0.0
      */
     public function getAmountRefunded();
 
@@ -321,7 +311,6 @@ public function getAmountRefunded();
      * Gets the anet transaction method for the order payment.
      *
      * @return string|null Anet transaction method.
-     * @since 2.0.0
      */
     public function getAnetTransMethod();
 
@@ -329,7 +318,6 @@ public function getAnetTransMethod();
      * Gets the base amount authorized for the order payment.
      *
      * @return float|null Base amount authorized.
-     * @since 2.0.0
      */
     public function getBaseAmountAuthorized();
 
@@ -337,7 +325,6 @@ public function getBaseAmountAuthorized();
      * Gets the base amount canceled for the order payment.
      *
      * @return float|null Base amount canceled.
-     * @since 2.0.0
      */
     public function getBaseAmountCanceled();
 
@@ -345,7 +332,6 @@ public function getBaseAmountCanceled();
      * Gets the base amount ordered for the order payment.
      *
      * @return float|null Base amount ordered.
-     * @since 2.0.0
      */
     public function getBaseAmountOrdered();
 
@@ -353,7 +339,6 @@ public function getBaseAmountOrdered();
      * Gets the base amount paid for the order payment.
      *
      * @return float|null Base amount paid.
-     * @since 2.0.0
      */
     public function getBaseAmountPaid();
 
@@ -361,7 +346,6 @@ public function getBaseAmountPaid();
      * Gets the base amount paid online for the order payment.
      *
      * @return float|null Base amount paid online.
-     * @since 2.0.0
      */
     public function getBaseAmountPaidOnline();
 
@@ -369,7 +353,6 @@ public function getBaseAmountPaidOnline();
      * Gets the base amount refunded for the order payment.
      *
      * @return float|null Base amount refunded.
-     * @since 2.0.0
      */
     public function getBaseAmountRefunded();
 
@@ -377,7 +360,6 @@ public function getBaseAmountRefunded();
      * Gets the base amount refunded online for the order payment.
      *
      * @return float|null Base amount refunded online.
-     * @since 2.0.0
      */
     public function getBaseAmountRefundedOnline();
 
@@ -385,7 +367,6 @@ public function getBaseAmountRefundedOnline();
      * Gets the base shipping amount for the order payment.
      *
      * @return float|null Base shipping amount.
-     * @since 2.0.0
      */
     public function getBaseShippingAmount();
 
@@ -393,7 +374,6 @@ public function getBaseShippingAmount();
      * Gets the base shipping captured for the order payment.
      *
      * @return float|null Base shipping captured amount.
-     * @since 2.0.0
      */
     public function getBaseShippingCaptured();
 
@@ -401,7 +381,6 @@ public function getBaseShippingCaptured();
      * Gets the base shipping refunded amount for the order payment.
      *
      * @return float|null Base shipping refunded amount.
-     * @since 2.0.0
      */
     public function getBaseShippingRefunded();
 
@@ -409,7 +388,6 @@ public function getBaseShippingRefunded();
      * Gets the credit card approval for the order payment.
      *
      * @return string|null Credit card approval.
-     * @since 2.0.0
      */
     public function getCcApproval();
 
@@ -417,7 +395,6 @@ public function getCcApproval();
      * Gets the credit card avs status for the order payment.
      *
      * @return string|null Credit card avs status.
-     * @since 2.0.0
      */
     public function getCcAvsStatus();
 
@@ -425,7 +402,6 @@ public function getCcAvsStatus();
      * Gets the credit card cid status for the order payment.
      *
      * @return string|null Credit card CID status.
-     * @since 2.0.0
      */
     public function getCcCidStatus();
 
@@ -433,7 +409,6 @@ public function getCcCidStatus();
      * Gets the credit card debug request body for the order payment.
      *
      * @return string|null Credit card debug request body.
-     * @since 2.0.0
      */
     public function getCcDebugRequestBody();
 
@@ -441,7 +416,6 @@ public function getCcDebugRequestBody();
      * Gets the credit card debug response body for the order payment.
      *
      * @return string|null Credit card debug response body.
-     * @since 2.0.0
      */
     public function getCcDebugResponseBody();
 
@@ -449,7 +423,6 @@ public function getCcDebugResponseBody();
      * Gets the credit card debug response serialized for the order payment.
      *
      * @return string|null Credit card debug response serialized.
-     * @since 2.0.0
      */
     public function getCcDebugResponseSerialized();
 
@@ -457,7 +430,6 @@ public function getCcDebugResponseSerialized();
      * Gets the credit card expiration month for the order payment.
      *
      * @return string|null Credit card expiration month.
-     * @since 2.0.0
      */
     public function getCcExpMonth();
 
@@ -465,7 +437,6 @@ public function getCcExpMonth();
      * Gets the credit card expiration year for the order payment.
      *
      * @return string|null Credit card expiration year.
-     * @since 2.0.0
      */
     public function getCcExpYear();
 
@@ -473,7 +444,6 @@ public function getCcExpYear();
      * Gets the last four digits of the credit card for the order payment.
      *
      * @return string Last four digits of the credit card.
-     * @since 2.0.0
      */
     public function getCcLast4();
 
@@ -481,7 +451,6 @@ public function getCcLast4();
      * Gets the encrypted credit card number for the order payment.
      *
      * @return string|null Encrypted credit card number.
-     * @since 2.0.0
      */
     public function getCcNumberEnc();
 
@@ -489,7 +458,6 @@ public function getCcNumberEnc();
      * Gets the credit card owner for the order payment.
      *
      * @return string|null Credit card number.
-     * @since 2.0.0
      */
     public function getCcOwner();
 
@@ -497,7 +465,6 @@ public function getCcOwner();
      * Gets the credit card secure verify for the order payment.
      *
      * @return string|null Credit card secure verify.
-     * @since 2.0.0
      */
     public function getCcSecureVerify();
 
@@ -506,7 +473,6 @@ public function getCcSecureVerify();
      *
      * @return string|null Credit card SS issue.
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsIssue();
 
@@ -515,7 +481,6 @@ public function getCcSsIssue();
      *
      * @return string|null Credit card SS start month.
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsStartMonth();
 
@@ -524,7 +489,6 @@ public function getCcSsStartMonth();
      *
      * @return string|null Credit card SS start year.
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsStartYear();
 
@@ -532,7 +496,6 @@ public function getCcSsStartYear();
      * Gets the credit card status for the order payment.
      *
      * @return string|null Credit card status.
-     * @since 2.0.0
      */
     public function getCcStatus();
 
@@ -540,7 +503,6 @@ public function getCcStatus();
      * Gets the credit card status description for the order payment.
      *
      * @return string|null Credit card status description.
-     * @since 2.0.0
      */
     public function getCcStatusDescription();
 
@@ -548,7 +510,6 @@ public function getCcStatusDescription();
      * Gets the credit card transaction id for the order payment.
      *
      * @return string|null Credit card transaction ID.
-     * @since 2.0.0
      */
     public function getCcTransId();
 
@@ -556,7 +517,6 @@ public function getCcTransId();
      * Gets the credit card type for the order payment.
      *
      * @return string|null Credit card type.
-     * @since 2.0.0
      */
     public function getCcType();
 
@@ -564,7 +524,6 @@ public function getCcType();
      * Gets the eCheck account name for the order payment.
      *
      * @return string|null eCheck account name.
-     * @since 2.0.0
      */
     public function getEcheckAccountName();
 
@@ -572,7 +531,6 @@ public function getEcheckAccountName();
      * Gets the eCheck account type for the order payment.
      *
      * @return string|null eCheck account type.
-     * @since 2.0.0
      */
     public function getEcheckAccountType();
 
@@ -580,7 +538,6 @@ public function getEcheckAccountType();
      * Gets the eCheck bank name for the order payment.
      *
      * @return string|null eCheck bank name.
-     * @since 2.0.0
      */
     public function getEcheckBankName();
 
@@ -588,7 +545,6 @@ public function getEcheckBankName();
      * Gets the eCheck routing number for the order payment.
      *
      * @return string|null eCheck routing number.
-     * @since 2.0.0
      */
     public function getEcheckRoutingNumber();
 
@@ -596,7 +552,6 @@ public function getEcheckRoutingNumber();
      * Gets the eCheck type for the order payment.
      *
      * @return string|null eCheck type.
-     * @since 2.0.0
      */
     public function getEcheckType();
 
@@ -604,7 +559,6 @@ public function getEcheckType();
      * Gets the entity ID for the order payment.
      *
      * @return int|null Entity ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -613,7 +567,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -621,7 +574,6 @@ public function setEntityId($entityId);
      * Gets the last transaction ID for the order payment.
      *
      * @return string|null Last transaction ID.
-     * @since 2.0.0
      */
     public function getLastTransId();
 
@@ -629,7 +581,6 @@ public function getLastTransId();
      * Gets the method for the order payment.
      *
      * @return string Method.
-     * @since 2.0.0
      */
     public function getMethod();
 
@@ -637,7 +588,6 @@ public function getMethod();
      * Gets the parent ID for the order payment.
      *
      * @return int|null Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -645,7 +595,6 @@ public function getParentId();
      * Gets the PO number for the order payment.
      *
      * @return string|null PO number.
-     * @since 2.0.0
      */
     public function getPoNumber();
 
@@ -653,7 +602,6 @@ public function getPoNumber();
      * Gets the protection eligibility for the order payment.
      *
      * @return string|null Protection eligibility.
-     * @since 2.0.0
      */
     public function getProtectionEligibility();
 
@@ -661,7 +609,6 @@ public function getProtectionEligibility();
      * Gets the quote payment ID for the order payment.
      *
      * @return int|null Quote payment ID.
-     * @since 2.0.0
      */
     public function getQuotePaymentId();
 
@@ -669,7 +616,6 @@ public function getQuotePaymentId();
      * Gets the shipping amount for the order payment.
      *
      * @return float|null Shipping amount.
-     * @since 2.0.0
      */
     public function getShippingAmount();
 
@@ -677,7 +623,6 @@ public function getShippingAmount();
      * Gets the shipping captured for the order payment.
      *
      * @return float|null Shipping captured.
-     * @since 2.0.0
      */
     public function getShippingCaptured();
 
@@ -685,7 +630,6 @@ public function getShippingCaptured();
      * Gets the shipping refunded for the order payment.
      *
      * @return float|null Shipping refunded.
-     * @since 2.0.0
      */
     public function getShippingRefunded();
 
@@ -694,7 +638,6 @@ public function getShippingRefunded();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -703,7 +646,6 @@ public function setParentId($id);
      *
      * @param float $baseShippingCaptured
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingCaptured($baseShippingCaptured);
 
@@ -712,7 +654,6 @@ public function setBaseShippingCaptured($baseShippingCaptured);
      *
      * @param float $shippingCaptured
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingCaptured($shippingCaptured);
 
@@ -721,7 +662,6 @@ public function setShippingCaptured($shippingCaptured);
      *
      * @param float $amountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountRefunded($amountRefunded);
 
@@ -730,7 +670,6 @@ public function setAmountRefunded($amountRefunded);
      *
      * @param float $baseAmountPaid
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountPaid($baseAmountPaid);
 
@@ -739,7 +678,6 @@ public function setBaseAmountPaid($baseAmountPaid);
      *
      * @param float $amountCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountCanceled($amountCanceled);
 
@@ -748,7 +686,6 @@ public function setAmountCanceled($amountCanceled);
      *
      * @param float $baseAmountAuthorized
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountAuthorized($baseAmountAuthorized);
 
@@ -757,7 +694,6 @@ public function setBaseAmountAuthorized($baseAmountAuthorized);
      *
      * @param float $baseAmountPaidOnline
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountPaidOnline($baseAmountPaidOnline);
 
@@ -766,7 +702,6 @@ public function setBaseAmountPaidOnline($baseAmountPaidOnline);
      *
      * @param float $baseAmountRefundedOnline
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountRefundedOnline($baseAmountRefundedOnline);
 
@@ -775,7 +710,6 @@ public function setBaseAmountRefundedOnline($baseAmountRefundedOnline);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount);
 
@@ -784,7 +718,6 @@ public function setBaseShippingAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($amount);
 
@@ -793,7 +726,6 @@ public function setShippingAmount($amount);
      *
      * @param float $amountPaid
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountPaid($amountPaid);
 
@@ -802,7 +734,6 @@ public function setAmountPaid($amountPaid);
      *
      * @param float $amountAuthorized
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountAuthorized($amountAuthorized);
 
@@ -811,7 +742,6 @@ public function setAmountAuthorized($amountAuthorized);
      *
      * @param float $baseAmountOrdered
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountOrdered($baseAmountOrdered);
 
@@ -820,7 +750,6 @@ public function setBaseAmountOrdered($baseAmountOrdered);
      *
      * @param float $baseShippingRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseShippingRefunded($baseShippingRefunded);
 
@@ -829,7 +758,6 @@ public function setBaseShippingRefunded($baseShippingRefunded);
      *
      * @param float $shippingRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingRefunded($shippingRefunded);
 
@@ -838,7 +766,6 @@ public function setShippingRefunded($shippingRefunded);
      *
      * @param float $baseAmountRefunded
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountRefunded($baseAmountRefunded);
 
@@ -847,7 +774,6 @@ public function setBaseAmountRefunded($baseAmountRefunded);
      *
      * @param float $amountOrdered
      * @return $this
-     * @since 2.0.0
      */
     public function setAmountOrdered($amountOrdered);
 
@@ -856,7 +782,6 @@ public function setAmountOrdered($amountOrdered);
      *
      * @param float $baseAmountCanceled
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmountCanceled($baseAmountCanceled);
 
@@ -865,7 +790,6 @@ public function setBaseAmountCanceled($baseAmountCanceled);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setQuotePaymentId($id);
 
@@ -874,7 +798,6 @@ public function setQuotePaymentId($id);
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -883,7 +806,6 @@ public function setAdditionalData($additionalData);
      *
      * @param string $ccExpMonth
      * @return $this
-     * @since 2.0.0
      */
     public function setCcExpMonth($ccExpMonth);
 
@@ -892,7 +814,6 @@ public function setCcExpMonth($ccExpMonth);
      *
      * @param string $ccSsStartYear
      * @return $this
-     * @since 2.0.0
      */
     public function setCcSsStartYear($ccSsStartYear);
 
@@ -901,7 +822,6 @@ public function setCcSsStartYear($ccSsStartYear);
      *
      * @param string $echeckBankName
      * @return $this
-     * @since 2.0.0
      */
     public function setEcheckBankName($echeckBankName);
 
@@ -910,7 +830,6 @@ public function setEcheckBankName($echeckBankName);
      *
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setMethod($method);
 
@@ -919,7 +838,6 @@ public function setMethod($method);
      *
      * @param string $ccDebugRequestBody
      * @return $this
-     * @since 2.0.0
      */
     public function setCcDebugRequestBody($ccDebugRequestBody);
 
@@ -928,7 +846,6 @@ public function setCcDebugRequestBody($ccDebugRequestBody);
      *
      * @param string $ccSecureVerify
      * @return $this
-     * @since 2.0.0
      */
     public function setCcSecureVerify($ccSecureVerify);
 
@@ -937,7 +854,6 @@ public function setCcSecureVerify($ccSecureVerify);
      *
      * @param string $protectionEligibility
      * @return $this
-     * @since 2.0.0
      */
     public function setProtectionEligibility($protectionEligibility);
 
@@ -946,7 +862,6 @@ public function setProtectionEligibility($protectionEligibility);
      *
      * @param string $ccApproval
      * @return $this
-     * @since 2.0.0
      */
     public function setCcApproval($ccApproval);
 
@@ -955,7 +870,6 @@ public function setCcApproval($ccApproval);
      *
      * @param string $ccLast4
      * @return $this
-     * @since 2.0.0
      */
     public function setCcLast4($ccLast4);
 
@@ -964,7 +878,6 @@ public function setCcLast4($ccLast4);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setCcStatusDescription($description);
 
@@ -973,7 +886,6 @@ public function setCcStatusDescription($description);
      *
      * @param string $echeckType
      * @return $this
-     * @since 2.0.0
      */
     public function setEcheckType($echeckType);
 
@@ -982,7 +894,6 @@ public function setEcheckType($echeckType);
      *
      * @param string $ccDebugResponseSerialized
      * @return $this
-     * @since 2.0.0
      */
     public function setCcDebugResponseSerialized($ccDebugResponseSerialized);
 
@@ -991,7 +902,6 @@ public function setCcDebugResponseSerialized($ccDebugResponseSerialized);
      *
      * @param string $ccSsStartMonth
      * @return $this
-     * @since 2.0.0
      */
     public function setCcSsStartMonth($ccSsStartMonth);
 
@@ -1000,7 +910,6 @@ public function setCcSsStartMonth($ccSsStartMonth);
      *
      * @param string $echeckAccountType
      * @return $this
-     * @since 2.0.0
      */
     public function setEcheckAccountType($echeckAccountType);
 
@@ -1009,7 +918,6 @@ public function setEcheckAccountType($echeckAccountType);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setLastTransId($id);
 
@@ -1018,7 +926,6 @@ public function setLastTransId($id);
      *
      * @param string $ccCidStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setCcCidStatus($ccCidStatus);
 
@@ -1027,7 +934,6 @@ public function setCcCidStatus($ccCidStatus);
      *
      * @param string $ccOwner
      * @return $this
-     * @since 2.0.0
      */
     public function setCcOwner($ccOwner);
 
@@ -1036,7 +942,6 @@ public function setCcOwner($ccOwner);
      *
      * @param string $ccType
      * @return $this
-     * @since 2.0.0
      */
     public function setCcType($ccType);
 
@@ -1045,7 +950,6 @@ public function setCcType($ccType);
      *
      * @param string $poNumber
      * @return $this
-     * @since 2.0.0
      */
     public function setPoNumber($poNumber);
 
@@ -1054,7 +958,6 @@ public function setPoNumber($poNumber);
      *
      * @param string $ccExpYear
      * @return $this
-     * @since 2.0.0
      */
     public function setCcExpYear($ccExpYear);
 
@@ -1063,7 +966,6 @@ public function setCcExpYear($ccExpYear);
      *
      * @param string $ccStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setCcStatus($ccStatus);
 
@@ -1072,7 +974,6 @@ public function setCcStatus($ccStatus);
      *
      * @param string $echeckRoutingNumber
      * @return $this
-     * @since 2.0.0
      */
     public function setEcheckRoutingNumber($echeckRoutingNumber);
 
@@ -1081,7 +982,6 @@ public function setEcheckRoutingNumber($echeckRoutingNumber);
      *
      * @param string $accountStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setAccountStatus($accountStatus);
 
@@ -1090,7 +990,6 @@ public function setAccountStatus($accountStatus);
      *
      * @param string $anetTransMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setAnetTransMethod($anetTransMethod);
 
@@ -1099,7 +998,6 @@ public function setAnetTransMethod($anetTransMethod);
      *
      * @param string $ccDebugResponseBody
      * @return $this
-     * @since 2.0.0
      */
     public function setCcDebugResponseBody($ccDebugResponseBody);
 
@@ -1108,7 +1006,6 @@ public function setCcDebugResponseBody($ccDebugResponseBody);
      *
      * @param string $ccSsIssue
      * @return $this
-     * @since 2.0.0
      */
     public function setCcSsIssue($ccSsIssue);
 
@@ -1117,7 +1014,6 @@ public function setCcSsIssue($ccSsIssue);
      *
      * @param string $echeckAccountName
      * @return $this
-     * @since 2.0.0
      */
     public function setEcheckAccountName($echeckAccountName);
 
@@ -1126,7 +1022,6 @@ public function setEcheckAccountName($echeckAccountName);
      *
      * @param string $ccAvsStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setCcAvsStatus($ccAvsStatus);
 
@@ -1135,7 +1030,6 @@ public function setCcAvsStatus($ccAvsStatus);
      *
      * @param string $ccNumberEnc
      * @return $this
-     * @since 2.0.0
      */
     public function setCcNumberEnc($ccNumberEnc);
 
@@ -1144,7 +1038,6 @@ public function setCcNumberEnc($ccNumberEnc);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCcTransId($id);
 
@@ -1153,7 +1046,6 @@ public function setCcTransId($id);
      *
      * @param string $addressStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setAddressStatus($addressStatus);
 
@@ -1161,7 +1053,6 @@ public function setAddressStatus($addressStatus);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -1170,7 +1061,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php
index fd0287f4644c1..66fd03221bad8 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderPaymentSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface OrderPaymentSearchResultInterface extends \Magento\Framework\Api\Searc
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderSearchResultInterface.php
index 20409c822c908..85ef9e9b7c8b7 100644
--- a/app/code/Magento/Sales/Api/Data/OrderSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderSearchResultInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface OrderSearchResultInterface extends \Magento\Framework\Api\SearchResult
      * Get items.
      *
      * @return \Magento\Sales\Api\Data\OrderInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderStatusHistoryInterface.php b/app/code/Magento/Sales/Api/Data/OrderStatusHistoryInterface.php
index 94585a362595a..ccc5a2da18a39 100644
--- a/app/code/Magento/Sales/Api/Data/OrderStatusHistoryInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderStatusHistoryInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderStatusHistoryInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -56,7 +55,6 @@ interface OrderStatusHistoryInterface extends \Magento\Framework\Api\ExtensibleD
      * Gets the comment for the order status history.
      *
      * @return string Comment.
-     * @since 2.0.0
      */
     public function getComment();
 
@@ -64,7 +62,6 @@ public function getComment();
      * Gets the created-at timestamp for the order status history.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -73,7 +70,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -81,7 +77,6 @@ public function setCreatedAt($createdAt);
      * Gets the ID for the order status history.
      *
      * @return int|null Order status history ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -90,7 +85,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -98,7 +92,6 @@ public function setEntityId($entityId);
      * Gets the entity name for the order status history.
      *
      * @return string|null Entity name.
-     * @since 2.0.0
      */
     public function getEntityName();
 
@@ -106,7 +99,6 @@ public function getEntityName();
      * Gets the is-customer-notified flag value for the order status history.
      *
      * @return int Is-customer-notified flag value.
-     * @since 2.0.0
      */
     public function getIsCustomerNotified();
 
@@ -114,7 +106,6 @@ public function getIsCustomerNotified();
      * Gets the is-visible-on-storefront flag value for the order status history.
      *
      * @return int Is-visible-on-storefront flag value.
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront();
 
@@ -122,7 +113,6 @@ public function getIsVisibleOnFront();
      * Gets the parent ID for the order status history.
      *
      * @return int Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -130,7 +120,6 @@ public function getParentId();
      * Gets the status for the order status history.
      *
      * @return string|null Status.
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -139,7 +128,6 @@ public function getStatus();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -148,7 +136,6 @@ public function setParentId($id);
      *
      * @param int $isCustomerNotified
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified);
 
@@ -157,7 +144,6 @@ public function setIsCustomerNotified($isCustomerNotified);
      *
      * @param int $isVisibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront);
 
@@ -166,7 +152,6 @@ public function setIsVisibleOnFront($isVisibleOnFront);
      *
      * @param string $comment
      * @return $this
-     * @since 2.0.0
      */
     public function setComment($comment);
 
@@ -175,7 +160,6 @@ public function setComment($comment);
      *
      * @param string $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status);
 
@@ -184,7 +168,6 @@ public function setStatus($status);
      *
      * @param string $entityName
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityName($entityName);
 
@@ -192,7 +175,6 @@ public function setEntityName($entityName);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -201,7 +183,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php
index 5e899589e119c..6a608f68ec8a2 100644
--- a/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderStatusHistorySearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface OrderStatusHistorySearchResultInterface extends \Magento\Framework\Api
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentCommentCreationInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentCommentCreationInterface.php
index 268815bf4e1de..c56fabee12ce8 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentCommentCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentCommentCreationInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface ShipmentCommentCreationInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentCommentCreationInterface extends ExtensibleDataInterface, CommentInterface
 {
@@ -18,7 +18,7 @@ interface ShipmentCommentCreationInterface extends ExtensibleDataInterface, Comm
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -27,7 +27,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentCommentInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentCommentInterface.php
index a70bd86e20343..1eeb3a0c8d0ee 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentCommentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentCommentInterface.php
@@ -13,7 +13,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A shipment document can contain comments.
  * @api
- * @since 2.0.0
  */
 interface ShipmentCommentInterface extends ExtensibleDataInterface, CommentInterface, EntityInterface
 {
@@ -33,7 +32,6 @@ interface ShipmentCommentInterface extends ExtensibleDataInterface, CommentInter
      * Gets the is-customer-notified flag value for the shipment comment.
      *
      * @return int Is-customer-notified flag value.
-     * @since 2.0.0
      */
     public function getIsCustomerNotified();
 
@@ -41,7 +39,6 @@ public function getIsCustomerNotified();
      * Gets the parent ID for the shipment comment.
      *
      * @return int Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -50,7 +47,6 @@ public function getParentId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -59,7 +55,6 @@ public function setParentId($id);
      *
      * @param int $isCustomerNotified
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified);
 
@@ -67,7 +62,6 @@ public function setIsCustomerNotified($isCustomerNotified);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -76,7 +70,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php
index 6229d1471d363..9b250a62bc1d0 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A shipment document can contain comments.
  * @api
- * @since 2.0.0
  */
 interface ShipmentCommentSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -19,7 +18,6 @@ interface ShipmentCommentSearchResultInterface extends \Magento\Framework\Api\Se
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -28,7 +26,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentCreationArgumentsInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentCreationArgumentsInterface.php
index 872a12114202a..45ca80182172d 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentCreationArgumentsInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentCreationArgumentsInterface.php
@@ -9,7 +9,7 @@
  * Interface for creation arguments for Shipment.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentCreationArgumentsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +17,7 @@ interface ShipmentCreationArgumentsInterface extends \Magento\Framework\Api\Exte
      * Gets existing extension attributes.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -27,7 +27,7 @@ public function getExtensionAttributes();
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface $extensionAttributes
      *
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentInterface.php
index 76c001ea7e5cd..d4a039015e137 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -95,7 +94,6 @@ interface ShipmentInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Gets the billing address ID for the shipment.
      *
      * @return int|null Billing address ID.
-     * @since 2.0.0
      */
     public function getBillingAddressId();
 
@@ -103,7 +101,6 @@ public function getBillingAddressId();
      * Gets the created-at timestamp for the shipment.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -112,7 +109,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -120,7 +116,6 @@ public function setCreatedAt($createdAt);
      * Gets the customer ID for the shipment.
      *
      * @return int|null Customer ID.
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -128,7 +123,6 @@ public function getCustomerId();
      * Gets the email-sent flag value for the shipment.
      *
      * @return int|null Email-sent flag value.
-     * @since 2.0.0
      */
     public function getEmailSent();
 
@@ -136,7 +130,6 @@ public function getEmailSent();
      * Gets the ID for the shipment.
      *
      * @return int|null Shipment ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -145,7 +138,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -153,7 +145,6 @@ public function setEntityId($entityId);
      * Gets the increment ID for the shipment.
      *
      * @return string|null Increment ID.
-     * @since 2.0.0
      */
     public function getIncrementId();
 
@@ -161,7 +152,6 @@ public function getIncrementId();
      * Gets the order ID for the shipment.
      *
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -169,7 +159,6 @@ public function getOrderId();
      * Gets any packages for the shipment.
      *
      * @return \Magento\Sales\Api\Data\ShipmentPackageInterface[]|null Array of packages, if any. Otherwise, null.
-     * @since 2.0.0
      */
     public function getPackages();
 
@@ -178,7 +167,6 @@ public function getPackages();
      *
      * @param \Magento\Sales\Api\Data\ShipmentPackageInterface[] $packages
      * @return $this
-     * @since 2.0.0
      */
     public function setPackages(array $packages = null);
 
@@ -186,7 +174,6 @@ public function setPackages(array $packages = null);
      * Gets the shipment status.
      *
      * @return int|null Shipment status.
-     * @since 2.0.0
      */
     public function getShipmentStatus();
 
@@ -194,7 +181,6 @@ public function getShipmentStatus();
      * Gets the shipping address ID for the shipment.
      *
      * @return int|null Shipping address ID.
-     * @since 2.0.0
      */
     public function getShippingAddressId();
 
@@ -202,7 +188,6 @@ public function getShippingAddressId();
      * Gets the shipping label for the shipment.
      *
      * @return string|null Shipping label.
-     * @since 2.0.0
      */
     public function getShippingLabel();
 
@@ -210,7 +195,6 @@ public function getShippingLabel();
      * Gets the store ID for the shipment.
      *
      * @return int|null Store ID.
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -218,7 +202,6 @@ public function getStoreId();
      * Gets the total quantity for the shipment.
      *
      * @return float|null Total quantity.
-     * @since 2.0.0
      */
     public function getTotalQty();
 
@@ -226,7 +209,6 @@ public function getTotalQty();
      * Gets the total weight for the shipment.
      *
      * @return float|null Total weight.
-     * @since 2.0.0
      */
     public function getTotalWeight();
 
@@ -234,7 +216,6 @@ public function getTotalWeight();
      * Gets the updated-at timestamp for the shipment.
      *
      * @return string|null Updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -242,7 +223,6 @@ public function getUpdatedAt();
      * Gets the items for the shipment.
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemInterface[] Array of items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -251,7 +231,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems($items);
 
@@ -259,7 +238,6 @@ public function setItems($items);
      * Gets the tracks for the shipment.
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[] Array of tracks.
-     * @since 2.0.0
      */
     public function getTracks();
 
@@ -268,7 +246,6 @@ public function getTracks();
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface[] $tracks
      * @return $this
-     * @since 2.0.0
      */
     public function setTracks($tracks);
 
@@ -276,7 +253,6 @@ public function setTracks($tracks);
      * Gets the comments for the shipment.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentInterface[] Array of comments.
-     * @since 2.0.0
      */
     public function getComments();
 
@@ -285,7 +261,6 @@ public function getComments();
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
-     * @since 2.0.0
      */
     public function setComments($comments = null);
 
@@ -294,7 +269,6 @@ public function setComments($comments = null);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($id);
 
@@ -303,7 +277,6 @@ public function setStoreId($id);
      *
      * @param float $totalWeight
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalWeight($totalWeight);
 
@@ -312,7 +285,6 @@ public function setTotalWeight($totalWeight);
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalQty($qty);
 
@@ -321,7 +293,6 @@ public function setTotalQty($qty);
      *
      * @param int $emailSent
      * @return $this
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent);
 
@@ -330,7 +301,6 @@ public function setEmailSent($emailSent);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -339,7 +309,6 @@ public function setOrderId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($id);
 
@@ -348,7 +317,6 @@ public function setCustomerId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddressId($id);
 
@@ -357,7 +325,6 @@ public function setShippingAddressId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddressId($id);
 
@@ -366,7 +333,6 @@ public function setBillingAddressId($id);
      *
      * @param int $shipmentStatus
      * @return $this
-     * @since 2.0.0
      */
     public function setShipmentStatus($shipmentStatus);
 
@@ -375,7 +341,6 @@ public function setShipmentStatus($shipmentStatus);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setIncrementId($id);
 
@@ -384,7 +349,6 @@ public function setIncrementId($id);
      *
      * @param string $shippingLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingLabel($shippingLabel);
 
@@ -393,7 +357,6 @@ public function setShippingLabel($shippingLabel);
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -401,7 +364,6 @@ public function setUpdatedAt($timestamp);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -410,7 +372,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
index 690661b3279f1..dbfadecbc1894 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
@@ -12,7 +12,7 @@
  * Interface ShipmentItemCreationInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentItemCreationInterface extends
     LineItemInterface,
@@ -22,7 +22,7 @@ interface ShipmentItemCreationInterface extends
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -31,7 +31,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
index 093113ab15488..fbee4ee3cafd6 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A product is an item in a shipment.
  * @api
- * @since 2.0.0
  */
 interface ShipmentItemInterface extends
     \Magento\Sales\Api\Data\LineItemInterface,
@@ -73,7 +72,6 @@ interface ShipmentItemInterface extends
      * Gets the additional data for the shipment item.
      *
      * @return string|null Additional data.
-     * @since 2.0.0
      */
     public function getAdditionalData();
 
@@ -81,7 +79,6 @@ public function getAdditionalData();
      * Gets the description for the shipment item.
      *
      * @return string|null Description.
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -89,7 +86,6 @@ public function getDescription();
      * Gets the ID for the shipment item.
      *
      * @return int|null Shipment item ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -98,7 +94,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -106,7 +101,6 @@ public function setEntityId($entityId);
      * Gets the name for the shipment item.
      *
      * @return string|null Name.
-     * @since 2.0.0
      */
     public function getName();
 
@@ -114,7 +108,6 @@ public function getName();
      * Gets the parent ID for the shipment item.
      *
      * @return int|null Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -122,7 +115,6 @@ public function getParentId();
      * Gets the price for the shipment item.
      *
      * @return float|null Price.
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -130,7 +122,6 @@ public function getPrice();
      * Gets the product ID for the shipment item.
      *
      * @return int|null Product ID.
-     * @since 2.0.0
      */
     public function getProductId();
 
@@ -138,7 +129,6 @@ public function getProductId();
      * Gets the row total for the shipment item.
      *
      * @return float|null Row total.
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -146,7 +136,6 @@ public function getRowTotal();
      * Gets the SKU for the shipment item.
      *
      * @return string|null SKU.
-     * @since 2.0.0
      */
     public function getSku();
 
@@ -154,7 +143,6 @@ public function getSku();
      * Gets the weight for the shipment item.
      *
      * @return float|null Weight.
-     * @since 2.0.0
      */
     public function getWeight();
 
@@ -163,7 +151,6 @@ public function getWeight();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -172,7 +159,6 @@ public function setParentId($id);
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($amount);
 
@@ -181,7 +167,6 @@ public function setRowTotal($amount);
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -190,7 +175,6 @@ public function setPrice($price);
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight);
 
@@ -199,7 +183,6 @@ public function setWeight($weight);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setProductId($id);
 
@@ -208,7 +191,6 @@ public function setProductId($id);
      *
      * @param string $additionalData
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData);
 
@@ -217,7 +199,6 @@ public function setAdditionalData($additionalData);
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -226,7 +207,6 @@ public function setDescription($description);
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -235,7 +215,6 @@ public function setName($name);
      *
      * @param string $sku
      * @return $this
-     * @since 2.0.0
      */
     public function setSku($sku);
 
@@ -243,7 +222,6 @@ public function setSku($sku);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -252,7 +230,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php
index 36d5779a3cf1a..6c54e221dffe8 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A product is an item in a shipment.
  * @api
- * @since 2.0.0
  */
 interface ShipmentItemSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -19,7 +18,6 @@ interface ShipmentItemSearchResultInterface extends \Magento\Framework\Api\Searc
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -28,7 +26,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentPackageCreationInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentPackageCreationInterface.php
index d13f6b5771c48..5145992745df5 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentPackageCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentPackageCreationInterface.php
@@ -11,7 +11,7 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentPackageCreationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -19,7 +19,7 @@ interface ShipmentPackageCreationInterface extends \Magento\Framework\Api\Extens
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentPackageCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -28,7 +28,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentPackageCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentPackageCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentPackageInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentPackageInterface.php
index a40fcb91b9b6c..4ef7e94bc9a3d 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentPackageInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentPackageInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentPackageInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -19,7 +18,6 @@ interface ShipmentPackageInterface extends \Magento\Framework\Api\ExtensibleData
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentPackageExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -28,7 +26,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentPackageExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentPackageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php
index a91cdde0d6b04..445a57d0b3678 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php
@@ -13,7 +13,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentSearchResultInterface extends SearchResultsInterface
 {
@@ -21,7 +20,6 @@ interface ShipmentSearchResultInterface extends SearchResultsInterface
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\ShipmentInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -30,7 +28,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\ShipmentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentTrackCreationInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentTrackCreationInterface.php
index 800955d508743..276e807775067 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentTrackCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentTrackCreationInterface.php
@@ -12,7 +12,7 @@
  * Shipment Track Creation interface.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentTrackCreationInterface extends TrackInterface, ExtensibleDataInterface
 {
@@ -20,7 +20,7 @@ interface ShipmentTrackCreationInterface extends TrackInterface, ExtensibleDataI
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes();
 
@@ -29,7 +29,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentTrackCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentTrackInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentTrackInterface.php
index ae0eb92406487..b1490a8510a73 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentTrackInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentTrackInterface.php
@@ -14,7 +14,6 @@
  * document lists the products and their quantities in the delivery package. Merchants and customers can track
  * shipments.
  * @api
- * @since 2.0.0
  */
 interface ShipmentTrackInterface extends TrackInterface, ExtensibleDataInterface
 {
@@ -71,7 +70,6 @@ interface ShipmentTrackInterface extends TrackInterface, ExtensibleDataInterface
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -79,7 +77,6 @@ public function setOrderId($id);
      * Gets the order_id for the shipment package.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -87,7 +84,6 @@ public function getOrderId();
      * Gets the created-at timestamp for the shipment package.
      *
      * @return string|null Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -96,7 +92,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -104,7 +99,6 @@ public function setCreatedAt($createdAt);
      * Gets the ID for the shipment package.
      *
      * @return int|null Shipment package ID.
-     * @since 2.0.0
      */
     public function getEntityId();
 
@@ -113,7 +107,6 @@ public function getEntityId();
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId);
 
@@ -121,7 +114,6 @@ public function setEntityId($entityId);
      * Gets the parent ID for the shipment package.
      *
      * @return int Parent ID.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -129,7 +121,6 @@ public function getParentId();
      * Gets the updated-at timestamp for the shipment package.
      *
      * @return string|null Updated-at timestamp.
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -138,7 +129,6 @@ public function getUpdatedAt();
      *
      * @param string $timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp);
 
@@ -147,7 +137,6 @@ public function setUpdatedAt($timestamp);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -156,7 +145,6 @@ public function setParentId($id);
      *
      * @param float $weight
      * @return $this
-     * @since 2.0.0
      */
     public function setWeight($weight);
 
@@ -164,7 +152,6 @@ public function setWeight($weight);
      * Gets the weight for the shipment package.
      *
      * @return float Weight.
-     * @since 2.0.0
      */
     public function getWeight();
 
@@ -173,7 +160,6 @@ public function getWeight();
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty);
 
@@ -181,7 +167,6 @@ public function setQty($qty);
      * Gets the quantity for the shipment package.
      *
      * @return float Quantity.
-     * @since 2.0.0
      */
     public function getQty();
 
@@ -190,7 +175,6 @@ public function getQty();
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -198,7 +182,6 @@ public function setDescription($description);
      * Gets the description for the shipment package.
      *
      * @return string Description.
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -206,7 +189,6 @@ public function getDescription();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -215,7 +197,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php
index a3c2b36af73c0..40b991fbc9904 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php
@@ -12,7 +12,6 @@
  * document lists the products and their quantities in the delivery package. Merchants and customers can track
  * shipments.
  * @api
- * @since 2.0.0
  */
 interface ShipmentTrackSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface ShipmentTrackSearchResultInterface extends \Magento\Framework\Api\Sear
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShippingAssignmentInterface.php b/app/code/Magento/Sales/Api/Data/ShippingAssignmentInterface.php
index d8d29b63deb34..63d5e179cb19c 100644
--- a/app/code/Magento/Sales/Api/Data/ShippingAssignmentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShippingAssignmentInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface ShippingAssignmentInterface
  * @api
- * @since 2.1.0
+ * @since 2.0.3
  */
 interface ShippingAssignmentInterface extends ExtensibleDataInterface
 {
@@ -28,7 +28,7 @@ interface ShippingAssignmentInterface extends ExtensibleDataInterface
      * Gets shipping object
      *
      * @return \Magento\Sales\Api\Data\ShippingInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShipping();
 
@@ -36,7 +36,7 @@ public function getShipping();
      * Gets order items of shipping assignment
      *
      * @return \Magento\Sales\Api\Data\OrderItemInterface[]
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getItems();
 
@@ -44,7 +44,7 @@ public function getItems();
      * Gets stock id
      *
      * @return int|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getStockId();
 
@@ -53,7 +53,7 @@ public function getStockId();
      *
      * @param \Magento\Sales\Api\Data\ShippingInterface $shipping
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShipping(\Magento\Sales\Api\Data\ShippingInterface $shipping);
 
@@ -62,7 +62,7 @@ public function setShipping(\Magento\Sales\Api\Data\ShippingInterface $shipping)
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface[] $items
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setItems(array $items);
 
@@ -71,7 +71,7 @@ public function setItems(array $items);
      *
      * @param int|null $stockId
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setStockId($stockId = null);
 
@@ -79,7 +79,7 @@ public function setStockId($stockId = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes();
 
@@ -88,7 +88,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/ShippingInterface.php b/app/code/Magento/Sales/Api/Data/ShippingInterface.php
index ae38f8dbfe031..1f8d0bc09010a 100644
--- a/app/code/Magento/Sales/Api/Data/ShippingInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShippingInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface ShippingInterface
  * @api
- * @since 2.1.0
+ * @since 2.0.3
  */
 interface ShippingInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -26,7 +26,7 @@ interface ShippingInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Gets shipping address
      *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getAddress();
 
@@ -34,7 +34,7 @@ public function getAddress();
      * Gets shipping method
      *
      * @return string|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getMethod();
 
@@ -42,7 +42,7 @@ public function getMethod();
      * Gets object with shipping totals
      *
      * @return \Magento\Sales\Api\Data\TotalInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getTotal();
 
@@ -51,7 +51,7 @@ public function getTotal();
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $address
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setAddress(\Magento\Sales\Api\Data\OrderAddressInterface $address);
 
@@ -60,7 +60,7 @@ public function setAddress(\Magento\Sales\Api\Data\OrderAddressInterface $addres
      *
      * @param string $method
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setMethod($method);
 
@@ -69,7 +69,7 @@ public function setMethod($method);
      *
      * @param \Magento\Sales\Api\Data\TotalInterface $total
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setTotal(\Magento\Sales\Api\Data\TotalInterface $total);
 
@@ -77,7 +77,7 @@ public function setTotal(\Magento\Sales\Api\Data\TotalInterface $total);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShippingExtensionInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes();
 
@@ -86,7 +86,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\ShippingExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShippingExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/TotalInterface.php b/app/code/Magento/Sales/Api/Data/TotalInterface.php
index a859247e4be8d..b61c7cd02aebb 100644
--- a/app/code/Magento/Sales/Api/Data/TotalInterface.php
+++ b/app/code/Magento/Sales/Api/Data/TotalInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface TotalInterface
  * @api
- * @since 2.1.0
+ * @since 2.0.3
  */
 interface TotalInterface extends ExtensibleDataInterface
 {
@@ -95,7 +95,7 @@ interface TotalInterface extends ExtensibleDataInterface
      * Gets the base shipping amount.
      *
      * @return float|null Base shipping amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingAmount();
 
@@ -103,7 +103,7 @@ public function getBaseShippingAmount();
      * Gets the base shipping canceled.
      *
      * @return float|null Base shipping canceled.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingCanceled();
 
@@ -111,7 +111,7 @@ public function getBaseShippingCanceled();
      * Gets the base shipping discount amount.
      *
      * @return float|null Base shipping discount amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingDiscountAmount();
 
@@ -119,7 +119,7 @@ public function getBaseShippingDiscountAmount();
      * Gets the base shipping discount tax compensation amount.
      *
      * @return float|null Base shipping discount tax compensation amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -127,7 +127,7 @@ public function getBaseShippingDiscountTaxCompensationAmnt();
      * Gets the base shipping including tax.
      *
      * @return float|null Base shipping including tax.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingInclTax();
 
@@ -135,7 +135,7 @@ public function getBaseShippingInclTax();
      * Gets the base shipping invoiced amount.
      *
      * @return float|null Base shipping invoiced.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingInvoiced();
 
@@ -143,7 +143,7 @@ public function getBaseShippingInvoiced();
      * Gets the base shipping refunded amount.
      *
      * @return float|null Base shipping refunded.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingRefunded();
 
@@ -151,7 +151,7 @@ public function getBaseShippingRefunded();
      * Gets the base shipping tax amount.
      *
      * @return float|null Base shipping tax amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingTaxAmount();
 
@@ -159,7 +159,7 @@ public function getBaseShippingTaxAmount();
      * Gets the base shipping tax refunded amount.
      *
      * @return float|null Base shipping tax refunded.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingTaxRefunded();
 
@@ -167,7 +167,7 @@ public function getBaseShippingTaxRefunded();
      * Gets the shipping amount.
      *
      * @return float|null Shipping amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingAmount();
 
@@ -175,7 +175,7 @@ public function getShippingAmount();
      * Gets the shipping canceled amount.
      *
      * @return float|null Shipping canceled amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingCanceled();
 
@@ -183,7 +183,7 @@ public function getShippingCanceled();
      * Gets the shipping discount amount.
      *
      * @return float|null Shipping discount amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingDiscountAmount();
 
@@ -191,7 +191,7 @@ public function getShippingDiscountAmount();
      * Gets the shipping discount tax compensation amount.
      *
      * @return float|null Shipping discount tax compensation amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingDiscountTaxCompensationAmount();
 
@@ -199,7 +199,7 @@ public function getShippingDiscountTaxCompensationAmount();
      * Gets the shipping including tax amount.
      *
      * @return float|null Shipping including tax amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingInclTax();
 
@@ -207,7 +207,7 @@ public function getShippingInclTax();
      * Gets the shipping invoiced amount.
      *
      * @return float|null Shipping invoiced amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingInvoiced();
 
@@ -215,7 +215,7 @@ public function getShippingInvoiced();
      * Gets the shipping refunded amount.
      *
      * @return float|null Shipping refunded amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingRefunded();
 
@@ -223,7 +223,7 @@ public function getShippingRefunded();
      * Gets the shipping tax amount.
      *
      * @return float|null Shipping tax amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingTaxAmount();
 
@@ -231,7 +231,7 @@ public function getShippingTaxAmount();
      * Gets the shipping tax refunded amount.
      *
      * @return float|null Shipping tax refunded amount.
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingTaxRefunded();
 
@@ -240,7 +240,7 @@ public function getShippingTaxRefunded();
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingAmount($amount);
 
@@ -249,7 +249,7 @@ public function setBaseShippingAmount($amount);
      *
      * @param float $baseShippingCanceled
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingCanceled($baseShippingCanceled);
 
@@ -258,7 +258,7 @@ public function setBaseShippingCanceled($baseShippingCanceled);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingDiscountAmount($amount);
 
@@ -267,7 +267,7 @@ public function setBaseShippingDiscountAmount($amount);
      *
      * @param float $amnt
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
 
@@ -276,7 +276,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingInclTax($amount);
 
@@ -285,7 +285,7 @@ public function setBaseShippingInclTax($amount);
      *
      * @param float $baseShippingInvoiced
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingInvoiced($baseShippingInvoiced);
 
@@ -294,7 +294,7 @@ public function setBaseShippingInvoiced($baseShippingInvoiced);
      *
      * @param float $baseShippingRefunded
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingRefunded($baseShippingRefunded);
 
@@ -303,7 +303,7 @@ public function setBaseShippingRefunded($baseShippingRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingTaxAmount($amount);
 
@@ -312,7 +312,7 @@ public function setBaseShippingTaxAmount($amount);
      *
      * @param float $baseShippingTaxRefunded
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded);
 
@@ -321,7 +321,7 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingAmount($amount);
 
@@ -330,7 +330,7 @@ public function setShippingAmount($amount);
      *
      * @param float $shippingCanceled
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingCanceled($shippingCanceled);
 
@@ -339,7 +339,7 @@ public function setShippingCanceled($shippingCanceled);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingDiscountAmount($amount);
 
@@ -348,7 +348,7 @@ public function setShippingDiscountAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingDiscountTaxCompensationAmount($amount);
 
@@ -357,7 +357,7 @@ public function setShippingDiscountTaxCompensationAmount($amount);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingInclTax($amount);
 
@@ -366,7 +366,7 @@ public function setShippingInclTax($amount);
      *
      * @param float $shippingInvoiced
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingInvoiced($shippingInvoiced);
 
@@ -375,7 +375,7 @@ public function setShippingInvoiced($shippingInvoiced);
      *
      * @param float $shippingRefunded
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingRefunded($shippingRefunded);
 
@@ -384,7 +384,7 @@ public function setShippingRefunded($shippingRefunded);
      *
      * @param float $amount
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingTaxAmount($amount);
 
@@ -393,7 +393,7 @@ public function setShippingTaxAmount($amount);
      *
      * @param float $shippingTaxRefunded
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingTaxRefunded($shippingTaxRefunded);
 
@@ -401,7 +401,7 @@ public function setShippingTaxRefunded($shippingTaxRefunded);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\TotalExtensionInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes();
 
@@ -410,7 +410,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\TotalExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\TotalExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Api/Data/TrackInterface.php b/app/code/Magento/Sales/Api/Data/TrackInterface.php
index eee2862698bc0..c63beb23fdc05 100644
--- a/app/code/Magento/Sales/Api/Data/TrackInterface.php
+++ b/app/code/Magento/Sales/Api/Data/TrackInterface.php
@@ -9,7 +9,7 @@
  * Shipment Track Creation interface.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface TrackInterface
 {
@@ -18,7 +18,7 @@ interface TrackInterface
      *
      * @param string $trackNumber
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setTrackNumber($trackNumber);
 
@@ -26,7 +26,7 @@ public function setTrackNumber($trackNumber);
      * Gets the track number for the shipment package.
      *
      * @return string Track number.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getTrackNumber();
 
@@ -35,7 +35,7 @@ public function getTrackNumber();
      *
      * @param string $title
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setTitle($title);
 
@@ -43,7 +43,7 @@ public function setTitle($title);
      * Gets the title for the shipment package.
      *
      * @return string Title.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getTitle();
 
@@ -52,7 +52,7 @@ public function getTitle();
      *
      * @param string $code
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setCarrierCode($code);
 
@@ -60,7 +60,7 @@ public function setCarrierCode($code);
      * Gets the carrier code for the shipment package.
      *
      * @return string Carrier code.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getCarrierCode();
 }
diff --git a/app/code/Magento/Sales/Api/Data/TransactionInterface.php b/app/code/Magento/Sales/Api/Data/TransactionInterface.php
index 94ef518656375..9456f6e18f28e 100644
--- a/app/code/Magento/Sales/Api/Data/TransactionInterface.php
+++ b/app/code/Magento/Sales/Api/Data/TransactionInterface.php
@@ -10,7 +10,6 @@
  *
  * A transaction is an interaction between a merchant and a customer such as a purchase, a credit, a refund, and so on.
  * @api
- * @since 2.0.0
  */
 interface TransactionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -92,7 +91,6 @@ interface TransactionInterface extends \Magento\Framework\Api\ExtensibleDataInte
      * Gets the transaction ID for the transaction.
      *
      * @return int Transaction ID.
-     * @since 2.0.0
      */
     public function getTransactionId();
 
@@ -101,7 +99,6 @@ public function getTransactionId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($id);
 
@@ -109,7 +106,6 @@ public function setTransactionId($id);
      * Gets the parent ID for the transaction.
      *
      * @return int|null The parent ID for the transaction. Otherwise, null.
-     * @since 2.0.0
      */
     public function getParentId();
 
@@ -117,7 +113,6 @@ public function getParentId();
      * Gets the order ID for the transaction.
      *
      * @return int Order ID.
-     * @since 2.0.0
      */
     public function getOrderId();
 
@@ -125,7 +120,6 @@ public function getOrderId();
      * Gets the payment ID for the transaction.
      *
      * @return int Payment ID.
-     * @since 2.0.0
      */
     public function getPaymentId();
 
@@ -133,7 +127,6 @@ public function getPaymentId();
      * Gets the transaction business ID for the transaction.
      *
      * @return string Transaction business ID.
-     * @since 2.0.0
      */
     public function getTxnId();
 
@@ -141,7 +134,6 @@ public function getTxnId();
      * Gets the parent transaction business ID for the transaction.
      *
      * @return string Parent transaction business ID.
-     * @since 2.0.0
      */
     public function getParentTxnId();
 
@@ -149,7 +141,6 @@ public function getParentTxnId();
      * Gets the transaction type for the transaction.
      *
      * @return string Transaction type.
-     * @since 2.0.0
      */
     public function getTxnType();
 
@@ -157,7 +148,6 @@ public function getTxnType();
      * Gets the value of the is-closed flag for the transaction.
      *
      * @return int Is-closed flag value.
-     * @since 2.0.0
      */
     public function getIsClosed();
 
@@ -165,7 +155,6 @@ public function getIsClosed();
      * Gets any additional information for the transaction.
      *
      * @return string[]|null Array of additional information. Otherwise, null.
-     * @since 2.0.0
      */
     public function getAdditionalInformation();
 
@@ -173,7 +162,6 @@ public function getAdditionalInformation();
      * Gets the created-at timestamp for the transaction.
      *
      * @return string Created-at timestamp.
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -182,7 +170,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt timestamp
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -190,7 +177,6 @@ public function setCreatedAt($createdAt);
      * Gets an array of child transactions for the transaction.
      *
      * @return \Magento\Sales\Api\Data\TransactionInterface[] Array of child transactions.
-     * @since 2.0.0
      */
     public function getChildTransactions();
 
@@ -199,7 +185,6 @@ public function getChildTransactions();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentId($id);
 
@@ -208,7 +193,6 @@ public function setParentId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderId($id);
 
@@ -217,7 +201,6 @@ public function setOrderId($id);
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentId($id);
 
@@ -226,7 +209,6 @@ public function setPaymentId($id);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setTxnId($id);
 
@@ -235,7 +217,6 @@ public function setTxnId($id);
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setParentTxnId($id);
 
@@ -244,7 +225,6 @@ public function setParentTxnId($id);
      *
      * @param string $txnType
      * @return $this
-     * @since 2.0.0
      */
     public function setTxnType($txnType);
 
@@ -253,7 +233,6 @@ public function setTxnType($txnType);
      *
      * @param int $isClosed
      * @return $this
-     * @since 2.0.0
      */
     public function setIsClosed($isClosed);
 
@@ -266,7 +245,6 @@ public function setIsClosed($isClosed);
      * @param mixed $value
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAdditionalInformation($key, $value);
 
@@ -274,7 +252,6 @@ public function setAdditionalInformation($key, $value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\TransactionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -283,7 +260,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php
index ce24ef1335cd8..86e2e2f8033be 100644
--- a/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php
+++ b/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php
@@ -10,7 +10,6 @@
  *
  * A transaction is an interaction between a merchant and a customer such as a purchase, a credit, a refund, and so on.
  * @api
- * @since 2.0.0
  */
 interface TransactionSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface TransactionSearchResultInterface extends \Magento\Framework\Api\Search
      * Gets collection items.
      *
      * @return \Magento\Sales\Api\Data\TransactionInterface[] Array of collection items.
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Sales\Api\Data\TransactionInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Exception/CouldNotInvoiceExceptionInterface.php b/app/code/Magento/Sales/Api/Exception/CouldNotInvoiceExceptionInterface.php
index 6200b9efefb03..212a402718295 100644
--- a/app/code/Magento/Sales/Api/Exception/CouldNotInvoiceExceptionInterface.php
+++ b/app/code/Magento/Sales/Api/Exception/CouldNotInvoiceExceptionInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface CouldNotInvoiceExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php b/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php
index cf865208bc618..ea78d5f3f6fd3 100644
--- a/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php
+++ b/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CouldNotRefundExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Api/Exception/CouldNotShipExceptionInterface.php b/app/code/Magento/Sales/Api/Exception/CouldNotShipExceptionInterface.php
index ac845d9ebd28b..b6b7857be6e1f 100644
--- a/app/code/Magento/Sales/Api/Exception/CouldNotShipExceptionInterface.php
+++ b/app/code/Magento/Sales/Api/Exception/CouldNotShipExceptionInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface CouldNotShipExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Api/Exception/DocumentValidationExceptionInterface.php b/app/code/Magento/Sales/Api/Exception/DocumentValidationExceptionInterface.php
index 6c0d505d5566f..e3b7462a73120 100644
--- a/app/code/Magento/Sales/Api/Exception/DocumentValidationExceptionInterface.php
+++ b/app/code/Magento/Sales/Api/Exception/DocumentValidationExceptionInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface DocumentValidationExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Api/InvoiceCommentRepositoryInterface.php b/app/code/Magento/Sales/Api/InvoiceCommentRepositoryInterface.php
index a61e0ac7572a0..57537da9f84a3 100644
--- a/app/code/Magento/Sales/Api/InvoiceCommentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceCommentRepositoryInterface.php
@@ -11,7 +11,6 @@
  * An invoice is a record of the receipt of payment for an order. An invoice can include comments that detail the
  * invoice history.
  * @api
- * @since 2.0.0
  */
 interface InvoiceCommentRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface InvoiceCommentRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\InvoiceCommentSearchResultInterface Invoice search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -29,7 +27,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The invoice comment ID.
      * @return \Magento\Sales\Api\Data\InvoiceCommentInterface Invoice comment interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -38,7 +35,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentInterface $entity The invoice comment.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\InvoiceCommentInterface $entity);
 
@@ -47,7 +43,6 @@ public function delete(\Magento\Sales\Api\Data\InvoiceCommentInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentInterface $entity The invoice comment.
      * @return \Magento\Sales\Api\Data\InvoiceCommentInterface Invoice comment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\InvoiceCommentInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/InvoiceItemRepositoryInterface.php b/app/code/Magento/Sales/Api/InvoiceItemRepositoryInterface.php
index e8d7d5ce6b1b1..cbe0e3ab76b0f 100644
--- a/app/code/Magento/Sales/Api/InvoiceItemRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceItemRepositoryInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order. An invoice item is a purchased item in an invoice.
  * @api
- * @since 2.0.0
  */
 interface InvoiceItemRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface InvoiceItemRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Sales\Api\Data\InvoiceItemSearchResultInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -28,7 +26,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The invoice item ID.
      * @return \Magento\Sales\Api\Data\InvoiceItemInterface Invoice item interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -37,7 +34,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface $entity The invoice item.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\InvoiceItemInterface $entity);
 
@@ -46,7 +42,6 @@ public function delete(\Magento\Sales\Api\Data\InvoiceItemInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface $entity The invoice item.
      * @return \Magento\Sales\Api\Data\InvoiceItemInterface Invoice item interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\InvoiceItemInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/InvoiceManagementInterface.php b/app/code/Magento/Sales/Api/InvoiceManagementInterface.php
index 599c32637548a..78f5935857ee0 100644
--- a/app/code/Magento/Sales/Api/InvoiceManagementInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceManagementInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order.
  * @api
- * @since 2.0.0
  */
 interface InvoiceManagementInterface
 {
@@ -19,7 +18,6 @@ interface InvoiceManagementInterface
      *
      * @param int $id
      * @return string
-     * @since 2.0.0
      */
     public function setCapture($id);
 
@@ -28,7 +26,6 @@ public function setCapture($id);
      *
      * @param int $id The invoice ID.
      * @return \Magento\Sales\Api\Data\InvoiceCommentSearchResultInterface Invoice comment search result interface.
-     * @since 2.0.0
      */
     public function getCommentsList($id);
 
@@ -37,7 +34,6 @@ public function getCommentsList($id);
      *
      * @param int $id The invoice ID.
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id);
 
@@ -46,7 +42,6 @@ public function notify($id);
      *
      * @param int $id The invoice ID.
      * @return bool
-     * @since 2.0.0
      */
     public function setVoid($id);
 }
diff --git a/app/code/Magento/Sales/Api/InvoiceOrderInterface.php b/app/code/Magento/Sales/Api/InvoiceOrderInterface.php
index 2e3496608616a..37abc8f6682c9 100644
--- a/app/code/Magento/Sales/Api/InvoiceOrderInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceOrderInterface.php
@@ -10,7 +10,7 @@
  * Class InvoiceOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceOrderInterface
 {
@@ -23,7 +23,7 @@ interface InvoiceOrderInterface
      * @param Data\InvoiceCommentCreationInterface|null $comment
      * @param Data\InvoiceCreationArgumentsInterface|null $arguments
      * @return int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
index cc4c816337071..ae9d939368c22 100644
--- a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
@@ -10,7 +10,6 @@
  *
  * An invoice is a record of the receipt of payment for an order.
  * @api
- * @since 2.0.0
  */
 interface InvoiceRepositoryInterface
 {
@@ -23,7 +22,6 @@ interface InvoiceRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\InvoiceSearchResultInterface Invoice search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -31,7 +29,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * Return Invoice object
      *
      * @return \Magento\Sales\Api\Data\InvoiceInterface
-     * @since 2.0.0
      */
     public function create();
 
@@ -40,7 +37,6 @@ public function create();
      *
      * @param int $id The invoice ID.
      * @return \Magento\Sales\Api\Data\InvoiceInterface Invoice interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -49,7 +45,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $entity The invoice.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\InvoiceInterface $entity);
 
@@ -58,7 +53,6 @@ public function delete(\Magento\Sales\Api\Data\InvoiceInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $entity The invoice.
      * @return \Magento\Sales\Api\Data\InvoiceInterface Invoice interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\InvoiceInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/OrderAddressRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderAddressRepositoryInterface.php
index e83a45cd6f88d..a1a07da3630b4 100644
--- a/app/code/Magento/Sales/Api/OrderAddressRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderAddressRepositoryInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderAddressRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface OrderAddressRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderAddressSearchResultInterface Order address search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -30,7 +28,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The order address ID.
      * @return \Magento\Sales\Api\Data\OrderAddressInterface Order address interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -39,7 +36,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $entity The order address.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderAddressInterface $entity);
 
@@ -48,7 +44,6 @@ public function delete(\Magento\Sales\Api\Data\OrderAddressInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $entity The order address.
      * @return \Magento\Sales\Api\Data\OrderAddressInterface Order address interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/OrderCustomerManagementInterface.php b/app/code/Magento/Sales/Api/OrderCustomerManagementInterface.php
index 005e979298c9e..d87aa3ff3b6b7 100644
--- a/app/code/Magento/Sales/Api/OrderCustomerManagementInterface.php
+++ b/app/code/Magento/Sales/Api/OrderCustomerManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * @api
  *
- * @since 2.0.0
  */
 interface OrderCustomerManagementInterface
 {
@@ -18,7 +17,6 @@ interface OrderCustomerManagementInterface
      * @param int $orderId
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @since 2.0.0
      */
     public function create($orderId);
 }
diff --git a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
index 43854ee1a16b6..e64d855353b72 100644
--- a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderItemRepositoryInterface
 {
@@ -25,7 +24,6 @@ interface OrderItemRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderItemSearchResultInterface Order item search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -34,7 +32,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The order item ID.
      * @return \Magento\Sales\Api\Data\OrderItemInterface Order item interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -43,7 +40,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface $entity The order item.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderItemInterface $entity);
 
@@ -52,7 +48,6 @@ public function delete(\Magento\Sales\Api\Data\OrderItemInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface $entity The order item.
      * @return \Magento\Sales\Api\Data\OrderItemInterface Order item interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderItemInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/OrderManagementInterface.php b/app/code/Magento/Sales/Api/OrderManagementInterface.php
index 321cee49280e5..55cf9592b9f82 100644
--- a/app/code/Magento/Sales/Api/OrderManagementInterface.php
+++ b/app/code/Magento/Sales/Api/OrderManagementInterface.php
@@ -15,7 +15,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderManagementInterface
 {
@@ -24,7 +23,6 @@ interface OrderManagementInterface
      *
      * @param int $id The order ID.
      * @return bool
-     * @since 2.0.0
      */
     public function cancel($id);
 
@@ -33,7 +31,6 @@ public function cancel($id);
      *
      * @param int $id The order ID.
      * @return \Magento\Sales\Api\Data\OrderStatusHistorySearchResultInterface Order status history search results interface.
-     * @since 2.0.0
      */
     public function getCommentsList($id);
 
@@ -43,7 +40,6 @@ public function getCommentsList($id);
      * @param int $id The order ID.
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface $statusHistory Status history comment.
      * @return bool
-     * @since 2.0.0
      */
     public function addComment($id, \Magento\Sales\Api\Data\OrderStatusHistoryInterface $statusHistory);
 
@@ -52,7 +48,6 @@ public function addComment($id, \Magento\Sales\Api\Data\OrderStatusHistoryInterf
      *
      * @param int $id The order ID.
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id);
 
@@ -61,7 +56,6 @@ public function notify($id);
      *
      * @param int $id The order ID.
      * @return string Order status.
-     * @since 2.0.0
      */
     public function getStatus($id);
 
@@ -70,7 +64,6 @@ public function getStatus($id);
      *
      * @param int $id The order ID.
      * @return bool
-     * @since 2.0.0
      */
     public function hold($id);
 
@@ -79,14 +72,12 @@ public function hold($id);
      *
      * @param int $id The order ID.
      * @return bool
-     * @since 2.0.0
      */
     public function unHold($id);
 
     /**
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.0.0
      */
     public function place(\Magento\Sales\Api\Data\OrderInterface $order);
 }
diff --git a/app/code/Magento/Sales/Api/OrderPaymentRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderPaymentRepositoryInterface.php
index 577c7a13b1db3..bcdde6a0a557e 100644
--- a/app/code/Magento/Sales/Api/OrderPaymentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderPaymentRepositoryInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderPaymentRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface OrderPaymentRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderPaymentSearchResultInterface Order payment search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -30,7 +28,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The order payment ID.
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Order payment interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -39,7 +36,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface $entity The order payment ID.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderPaymentInterface $entity);
 
@@ -48,7 +44,6 @@ public function delete(\Magento\Sales\Api\Data\OrderPaymentInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface $entity The order payment ID.
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Order payment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderPaymentInterface $entity);
 
@@ -56,7 +51,6 @@ public function save(\Magento\Sales\Api\Data\OrderPaymentInterface $entity);
      * Creates new Order Payment instance.
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Transaction interface.
-     * @since 2.0.0
      */
     public function create();
 }
diff --git a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
index db37e18b4a111..534d9ab879d13 100644
--- a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
@@ -12,7 +12,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderRepositoryInterface
 {
@@ -25,7 +24,6 @@ interface OrderRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderSearchResultInterface Order search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -34,7 +32,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The order ID.
      * @return \Magento\Sales\Api\Data\OrderInterface Order interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -43,7 +40,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $entity The order ID.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderInterface $entity);
 
@@ -52,7 +48,6 @@ public function delete(\Magento\Sales\Api\Data\OrderInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $entity The order ID.
      * @return \Magento\Sales\Api\Data\OrderInterface Order interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
index 9b50a23fa29d6..674d91d8cf0c7 100644
--- a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
@@ -15,7 +15,6 @@
  * items, billing and shipping addresses, and shipping and payment methods. A corresponding external document, known as
  * a purchase order, is emailed to the customer.
  * @api
- * @since 2.0.0
  */
 interface OrderStatusHistoryRepositoryInterface
 {
@@ -24,7 +23,6 @@ interface OrderStatusHistoryRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderStatusHistorySearchResultInterface Order status history search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -33,7 +31,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The order status comment ID.
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface Order status history interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -42,7 +39,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface $entity The order status comment.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderStatusHistoryInterface $entity);
 
@@ -51,7 +47,6 @@ public function delete(\Magento\Sales\Api\Data\OrderStatusHistoryInterface $enti
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface $entity The order status comment.
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface Order status history interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderStatusHistoryInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/RefundInvoiceInterface.php b/app/code/Magento/Sales/Api/RefundInvoiceInterface.php
index a282742670a2f..80d7bce7d13ff 100644
--- a/app/code/Magento/Sales/Api/RefundInvoiceInterface.php
+++ b/app/code/Magento/Sales/Api/RefundInvoiceInterface.php
@@ -9,7 +9,7 @@
  * Interface RefundInvoiceInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface RefundInvoiceInterface
 {
@@ -24,7 +24,7 @@ interface RefundInvoiceInterface
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(
         $invoiceId,
diff --git a/app/code/Magento/Sales/Api/RefundOrderInterface.php b/app/code/Magento/Sales/Api/RefundOrderInterface.php
index d0ce2145f3f73..edcc83ad71ac7 100644
--- a/app/code/Magento/Sales/Api/RefundOrderInterface.php
+++ b/app/code/Magento/Sales/Api/RefundOrderInterface.php
@@ -9,7 +9,7 @@
  * Interface RefundOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface RefundOrderInterface
 {
@@ -23,7 +23,7 @@ interface RefundOrderInterface
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Api/ShipOrderInterface.php b/app/code/Magento/Sales/Api/ShipOrderInterface.php
index 584296d136572..02767065b5032 100644
--- a/app/code/Magento/Sales/Api/ShipOrderInterface.php
+++ b/app/code/Magento/Sales/Api/ShipOrderInterface.php
@@ -9,7 +9,7 @@
  * Class ShipOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipOrderInterface
 {
@@ -25,7 +25,7 @@ interface ShipOrderInterface
      * @param \Magento\Sales\Api\Data\ShipmentPackageCreationInterface[] $packages
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return int Id of created Shipment.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Api/ShipmentCommentRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentCommentRepositoryInterface.php
index d42735b33a772..4fb9d16b6f5dc 100644
--- a/app/code/Magento/Sales/Api/ShipmentCommentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentCommentRepositoryInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A shipment document can contain comments.
  * @api
- * @since 2.0.0
  */
 interface ShipmentCommentRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface ShipmentCommentRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\ShipmentCommentSearchResultInterface Shipment comment search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -29,7 +27,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The shipment comment ID.
      * @return \Magento\Sales\Api\Data\ShipmentCommentInterface Shipment comment interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -38,7 +35,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface $entity The shipment comment.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\ShipmentCommentInterface $entity);
 
@@ -47,7 +43,6 @@ public function delete(\Magento\Sales\Api\Data\ShipmentCommentInterface $entity)
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface $entity The shipment comment.
      * @return \Magento\Sales\Api\Data\ShipmentCommentInterface Shipment comment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\ShipmentCommentInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/ShipmentItemRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentItemRepositoryInterface.php
index 8f397747e193f..0e106c12b3ec9 100644
--- a/app/code/Magento/Sales/Api/ShipmentItemRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentItemRepositoryInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package. A product is an item in a shipment.
  * @api
- * @since 2.0.0
  */
 interface ShipmentItemRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface ShipmentItemRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\ShipmentItemSearchResultInterface Shipment item search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -29,7 +27,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id
      * @return \Magento\Sales\Api\Data\ShipmentItemInterface
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -38,7 +35,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemInterface $entity The shipment item.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\ShipmentItemInterface $entity);
 
@@ -47,7 +43,6 @@ public function delete(\Magento\Sales\Api\Data\ShipmentItemInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemInterface $entity The shipment item.
      * @return \Magento\Sales\Api\Data\ShipmentItemInterface Shipment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\ShipmentItemInterface $entity);
 }
diff --git a/app/code/Magento/Sales/Api/ShipmentManagementInterface.php b/app/code/Magento/Sales/Api/ShipmentManagementInterface.php
index 0fd058a2eb255..4a64c2060a1da 100644
--- a/app/code/Magento/Sales/Api/ShipmentManagementInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentManagementInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentManagementInterface
 {
@@ -20,7 +19,6 @@ interface ShipmentManagementInterface
      *
      * @param int $id The shipment label ID.
      * @return string Shipment label.
-     * @since 2.0.0
      */
     public function getLabel($id);
 
@@ -29,7 +27,6 @@ public function getLabel($id);
      *
      * @param int $id The shipment ID.
      * @return \Magento\Sales\Api\Data\ShipmentCommentSearchResultInterface Shipment comment search result interface.
-     * @since 2.0.0
      */
     public function getCommentsList($id);
 
@@ -38,7 +35,6 @@ public function getCommentsList($id);
      *
      * @param int $id The shipment ID.
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id);
 }
diff --git a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
index 2593d39222646..53b3daafdcb62 100644
--- a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentRepositoryInterface
 {
@@ -24,7 +23,6 @@ interface ShipmentRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\ShipmentSearchResultInterface Shipment search results interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -33,7 +31,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The shipment ID.
      * @return \Magento\Sales\Api\Data\ShipmentInterface
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -42,7 +39,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\ShipmentInterface $entity The shipment.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\ShipmentInterface $entity);
 
@@ -51,7 +47,6 @@ public function delete(\Magento\Sales\Api\Data\ShipmentInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\ShipmentInterface $entity The shipment.
      * @return \Magento\Sales\Api\Data\ShipmentInterface Shipment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\ShipmentInterface $entity);
 
@@ -59,7 +54,6 @@ public function save(\Magento\Sales\Api\Data\ShipmentInterface $entity);
      * Creates new shipment instance.
      *
      * @return \Magento\Sales\Api\Data\ShipmentInterface Shipment interface.
-     * @since 2.0.0
      */
     public function create();
 }
diff --git a/app/code/Magento/Sales/Api/ShipmentTrackRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentTrackRepositoryInterface.php
index 660dea6b16f56..58666573e0333 100644
--- a/app/code/Magento/Sales/Api/ShipmentTrackRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentTrackRepositoryInterface.php
@@ -11,7 +11,6 @@
  * A shipment is a delivery package that contains products. A shipment document accompanies the shipment. This
  * document lists the products and their quantities in the delivery package.
  * @api
- * @since 2.0.0
  */
 interface ShipmentTrackRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface ShipmentTrackRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\ShipmentTrackSearchResultInterface Shipment track search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -29,7 +27,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The shipment track ID.
      * @return \Magento\Sales\Api\Data\ShipmentTrackInterface Shipment track interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -38,7 +35,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface $entity The shipment track.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\ShipmentTrackInterface $entity);
 
@@ -47,7 +43,6 @@ public function delete(\Magento\Sales\Api\Data\ShipmentTrackInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface $entity The shipment track.
      * @return \Magento\Sales\Api\Data\ShipmentTrackInterface Shipment track interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\ShipmentTrackInterface $entity);
 
@@ -56,7 +51,6 @@ public function save(\Magento\Sales\Api\Data\ShipmentTrackInterface $entity);
      *
      * @param int $id The shipment track ID.
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id);
 }
diff --git a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
index 9fc15708d4a06..537f6b06b8854 100644
--- a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
@@ -10,7 +10,6 @@
  *
  * A transaction is an interaction between a merchant and a customer such as a purchase, a credit, a refund, and so on.
  * @api
- * @since 2.0.0
  */
 interface TransactionRepositoryInterface
 {
@@ -23,7 +22,6 @@ interface TransactionRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\TransactionSearchResultInterface Transaction search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -32,7 +30,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param int $id The transaction ID.
      * @return \Magento\Sales\Api\Data\TransactionInterface Transaction interface.
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -41,7 +38,6 @@ public function get($id);
      *
      * @param \Magento\Sales\Api\Data\TransactionInterface $entity The transaction.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\TransactionInterface $entity);
 
@@ -50,7 +46,6 @@ public function delete(\Magento\Sales\Api\Data\TransactionInterface $entity);
      *
      * @param \Magento\Sales\Api\Data\TransactionInterface $entity The transaction.
      * @return \Magento\Sales\Api\Data\TransactionInterface Transaction interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\TransactionInterface $entity);
 
@@ -58,7 +53,6 @@ public function save(\Magento\Sales\Api\Data\TransactionInterface $entity);
      * Creates new Transaction instance.
      *
      * @return \Magento\Sales\Api\Data\TransactionInterface Transaction interface.
-     * @since 2.0.0
      */
     public function create();
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
index 9b348d1d7d252..4636a8c2cb087 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
@@ -9,13 +9,11 @@
  * Adminhtml sales creditmemos block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
index 8c0e75877e26d..89ffac09a9baf 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
@@ -14,7 +14,6 @@
  * Class CustomerOrdersTab
  *
  * @package Magento\Sales\Block\Adminhtml
- * @since 2.0.0
  */
 class CustomerOrdersTab extends TabWrapper
 {
@@ -22,13 +21,11 @@ class CustomerOrdersTab extends TabWrapper
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAjaxLoaded = true;
 
@@ -38,7 +35,6 @@ class CustomerOrdersTab extends TabWrapper
      * @param Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $registry, array $data = [])
     {
@@ -48,7 +44,6 @@ public function __construct(Context $context, Registry $registry, array $data =
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -61,7 +56,6 @@ public function canShowTab()
      * @codeCoverageIgnore
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -72,7 +66,6 @@ public function getTabLabel()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Invoice.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
index fa60063b2b6a3..0a6207299f463 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
@@ -9,7 +9,6 @@
  * Adminhtml sales invoices block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Invoice extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Invoice extends \Magento\Backend\Block\Widget\Grid\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * Get payment info html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
index ec17d00d552ea..a1435fd14db8c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
@@ -12,7 +12,6 @@
  * Abstract items renderer
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class AbstractItems extends \Magento\Backend\Block\Template
 {
@@ -28,7 +27,6 @@ class AbstractItems extends \Magento\Backend\Block\Template
      * renderer => the block object
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columnRenders = [];
 
@@ -36,7 +34,6 @@ class AbstractItems extends \Magento\Backend\Block\Template
      * Flag - if it is set method canEditQty will return value of it
      *
      * @var bool|null
-     * @since 2.0.0
      */
     protected $_canEditQty;
 
@@ -44,19 +41,16 @@ class AbstractItems extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -66,7 +60,6 @@ class AbstractItems extends \Magento\Backend\Block\Template
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -86,7 +79,6 @@ public function __construct(
      *
      * @param array $blocks
      * @return $this
-     * @since 2.0.0
      */
     public function setColumnRenders(array $blocks)
     {
@@ -106,7 +98,6 @@ public function setColumnRenders(array $blocks)
      * @param string $type
      * @return \Magento\Framework\View\Element\AbstractBlock
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getItemRenderer($type)
     {
@@ -126,7 +117,6 @@ public function getItemRenderer($type)
      * @param string $column
      * @param string $compositePart
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getColumnRenderer($column, $compositePart = '')
     {
@@ -145,7 +135,6 @@ public function getColumnRenderer($column, $compositePart = '')
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemHtml(\Magento\Framework\DataObject $item)
     {
@@ -163,7 +152,6 @@ public function getItemHtml(\Magento\Framework\DataObject $item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemExtraInfoHtml(\Magento\Framework\DataObject $item)
     {
@@ -181,7 +169,6 @@ public function getItemExtraInfoHtml(\Magento\Framework\DataObject $item)
      * @param string $column the column key
      * @param string $field the custom item field
      * @return string
-     * @since 2.0.0
      */
     public function getColumnHtml(\Magento\Framework\DataObject $item, $column, $field = null)
     {
@@ -205,7 +192,6 @@ public function getColumnHtml(\Magento\Framework\DataObject $item, $column, $fie
      * Get credit memo
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -221,7 +207,6 @@ public function getCreditmemo()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -251,7 +236,6 @@ public function getOrder()
      * Retrieve price data object
      *
      * @return Order
-     * @since 2.0.0
      */
     public function getPriceDataObject()
     {
@@ -269,7 +253,6 @@ public function getPriceDataObject()
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayPriceAttribute($code, $strong = false, $separator = '<br />')
     {
@@ -299,7 +282,6 @@ public function displayPriceAttribute($code, $strong = false, $separator = '<br
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayPrices($basePrice, $price, $strong = false, $separator = '<br />')
     {
@@ -315,7 +297,6 @@ public function displayPrices($basePrice, $price, $strong = false, $separator =
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayRoundedPrices($basePrice, $price, $precision = 2, $strong = false, $separator = '<br />')
     {
@@ -338,7 +319,6 @@ public function displayRoundedPrices($basePrice, $price, $precision = 2, $strong
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function displayTaxCalculation(\Magento\Framework\DataObject $item)
     {
@@ -361,7 +341,6 @@ public function displayTaxCalculation(\Magento\Framework\DataObject $item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function displayTaxPercent(\Magento\Framework\DataObject $item)
     {
@@ -380,7 +359,6 @@ public function displayTaxPercent(\Magento\Framework\DataObject $item)
      * Check shipment availability for current invoice
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateShipment()
     {
@@ -399,7 +377,6 @@ public function canCreateShipment()
      * @return $this
      * @see self::_canEditQty
      * @see self::canEditQty
-     * @since 2.0.0
      */
     public function setCanEditQty($value)
     {
@@ -411,7 +388,6 @@ public function setCanEditQty($value)
      * Check availability to edit quantity of item
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEditQty()
     {
@@ -441,7 +417,6 @@ public function canEditQty()
      * Check capture availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -456,7 +431,6 @@ public function canCapture()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -467,7 +441,6 @@ public function formatPrice($price)
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -478,7 +451,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -488,7 +460,6 @@ public function getInvoice()
     /**
      * @param \Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canReturnToStock($store = null)
     {
@@ -500,7 +471,6 @@ public function canReturnToStock($store = null)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canReturnItemToStock($item = null)
     {
@@ -523,7 +493,6 @@ public function canReturnItemToStock($item = null)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canParentReturnToStock($item = null)
     {
@@ -542,7 +511,6 @@ public function canParentReturnToStock($item = null)
      *
      * @param Order|null $order
      * @return bool
-     * @since 2.0.0
      */
     public function canShipPartially($order = null)
     {
@@ -561,7 +529,6 @@ public function canShipPartially($order = null)
      *
      * @param Order|null $order
      * @return bool
-     * @since 2.0.0
      */
     public function canShipPartiallyItem($order = null)
     {
@@ -579,7 +546,6 @@ public function canShipPartiallyItem($order = null)
      * Check is shipment is regular
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShipmentRegular()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index 7b32c1171a6a4..bee8336ede4ba 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -15,7 +15,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class DefaultColumn extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -23,7 +22,6 @@ class DefaultColumn extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Option factory
      *
      * @var \Magento\Catalog\Model\Product\OptionFactory
-     * @since 2.0.0
      */
     protected $_optionFactory;
 
@@ -34,7 +32,6 @@ class DefaultColumn extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\Product\OptionFactory $optionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +49,6 @@ public function __construct(
      * Get item
      *
      * @return Item|QuoteItem
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -68,7 +64,6 @@ public function getItem()
      * Get order options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderOptions()
     {
@@ -92,7 +87,6 @@ public function getOrderOptions()
      *
      * @param array $optionInfo
      * @return string
-     * @since 2.0.0
      */
     public function getCustomizedOptionValue($optionInfo)
     {
@@ -113,7 +107,6 @@ public function getCustomizedOptionValue($optionInfo)
      * Get sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -125,7 +118,6 @@ public function getSku()
      *
      * @param QuoteItem|Item|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -139,7 +131,6 @@ public function getTotalAmount($item)
      *
      * @param QuoteItem|Item|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index c7ba2ca5ef04d..c9f2076a7c56b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -9,7 +9,6 @@
  * Sales Order items name column renderer
  *
  * @api
- * @since 2.0.0
  */
 class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
 {
@@ -22,7 +21,6 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
-     * @since 2.0.0
      */
     public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
     {
@@ -37,7 +35,6 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      *
      * @param string $value
      * @return array
-     * @since 2.0.0
      */
     public function getFormattedOption($value)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
index 4884f4d0deae7..45665be3cfdf2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Qty extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
 {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
index 01828c5728044..0ba39cdcd2358 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order item renderer
  *
  * @api
- * @since 2.0.0
  */
 class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -19,7 +18,6 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Get order item
      *
      * @return Item
-     * @since 2.0.0
      */
     public function getItem()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Order.php
index ead006348ec27..614130af74f04 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order.php
@@ -9,7 +9,6 @@
  * Adminhtml sales orders block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Order extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Order extends \Magento\Backend\Block\Widget\Grid\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * Retrieve url for order creation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
index 366f2aded10cb..fecb32e932aef 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class AbstractOrder extends \Magento\Backend\Block\Widget
 {
@@ -20,7 +19,6 @@ class AbstractOrder extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -28,7 +26,6 @@ class AbstractOrder extends \Magento\Backend\Block\Widget
      * Admin helper
      *
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     protected $_adminHelper;
 
@@ -37,7 +34,6 @@ class AbstractOrder extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      *
      * @return Order
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -75,7 +70,6 @@ public function getOrder()
      * Get price data object
      *
      * @return Order|mixed
-     * @since 2.0.0
      */
     public function getPriceDataObject()
     {
@@ -93,7 +87,6 @@ public function getPriceDataObject()
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayPriceAttribute($code, $strong = false, $separator = '<br/>')
     {
@@ -108,7 +101,6 @@ public function displayPriceAttribute($code, $strong = false, $separator = '<br/
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayPrices($basePrice, $price, $strong = false, $separator = '<br/>')
     {
@@ -125,7 +117,6 @@ public function displayPrices($basePrice, $price, $strong = false, $separator =
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -136,7 +127,6 @@ public function getOrderTotalData()
      * Retrieve order info block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderInfoData()
     {
@@ -148,7 +138,6 @@ public function getOrderInfoData()
      *
      * @param \Magento\Framework\DataObject $order
      * @return string
-     * @since 2.0.0
      */
     public function displayShippingPriceInclTax($order)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
index 547e2effee080..d66793ad9f5de 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
@@ -9,7 +9,6 @@
  * Edit order address form container block
  *
  * @api
- * @since 2.0.0
  */
 class Address extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Address extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Address extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -56,7 +52,6 @@ protected function _construct()
      * Retrieve text for header element depending on loaded page
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -74,7 +69,6 @@ public function getHeaderText()
      * Back button url getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index d7f83a3c75c88..f2b454260dc22 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order address block
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
 {
@@ -19,7 +18,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * Address form template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/address/form.phtml';
 
@@ -27,7 +25,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -50,7 +47,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -97,7 +93,6 @@ public function __construct(
      * Order address getter
      *
      * @return \Magento\Sales\Model\Order\Address
-     * @since 2.0.0
      */
     protected function _getAddress()
     {
@@ -108,7 +103,6 @@ protected function _getAddress()
      * Define form attributes (id, method, action)
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -126,7 +120,6 @@ protected function _prepareForm()
      * Form header text getter
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -137,7 +130,6 @@ public function getHeaderText()
      * Return Form Elements values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormValues()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
index 701df00a6fdc4..fcfd0152645b0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Template
 {
@@ -18,13 +17,11 @@ class View extends \Magento\Backend\Block\Template
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData = null;
 
     /**
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     private $adminHelper;
 
@@ -33,7 +30,6 @@ class View extends \Magento\Backend\Block\Template
      * @param \Magento\Sales\Helper\Data $salesData
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -68,7 +63,6 @@ protected function _beforeToHtml()
      * Preparing global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -84,7 +78,6 @@ protected function _prepareLayout()
      * Get submit url
      *
      * @return string|true
-     * @since 2.0.0
      */
     public function getSubmitUrl()
     {
@@ -93,7 +86,6 @@ public function getSubmitUrl()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canSendCommentEmail()
     {
@@ -120,7 +112,6 @@ public function canSendCommentEmail()
      * @param array|string $data
      * @param null|array $allowedTags
      * @return string
-     * @since 2.0.0
      */
     public function escapeHtml($data, $allowedTags = null)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
index 70bab3ba695e8..021c78f30cd72 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Create extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -18,7 +17,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * Session quote
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
@@ -26,7 +24,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -92,7 +88,6 @@ protected function _construct()
      * {@inheritdoc}
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -109,7 +104,6 @@ protected function _prepareLayout()
      * Prepare header html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderHtml()
     {
@@ -123,7 +117,6 @@ public function getHeaderHtml()
      * Get header width
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderWidth()
     {
@@ -134,7 +127,6 @@ public function getHeaderWidth()
      * Retrieve quote session object
      *
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -145,7 +137,6 @@ protected function _getSession()
      * Get cancel url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCancelUrl()
     {
@@ -162,7 +153,6 @@ public function getCancelUrl()
      * Get URL for back (reset) button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 6d42641f3c642..3e1c52d4406b4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -14,7 +14,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractCreate extends \Magento\Backend\Block\Widget
 {
@@ -22,7 +21,6 @@ abstract class AbstractCreate extends \Magento\Backend\Block\Widget
      * Session quote
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
@@ -30,13 +28,11 @@ abstract class AbstractCreate extends \Magento\Backend\Block\Widget
      * Order create
      *
      * @var \Magento\Sales\Model\AdminOrder\Create
-     * @since 2.0.0
      */
     protected $_orderCreate;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -46,7 +42,6 @@ abstract class AbstractCreate extends \Magento\Backend\Block\Widget
      * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * Retrieve create order model object
      *
      * @return \Magento\Sales\Model\AdminOrder\Create
-     * @since 2.0.0
      */
     public function getCreateOrderModel()
     {
@@ -76,7 +70,6 @@ public function getCreateOrderModel()
      * Retrieve quote session object
      *
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -87,7 +80,6 @@ protected function _getSession()
      * Retrieve quote model object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -98,7 +90,6 @@ public function getQuote()
      * Retrieve customer identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -109,7 +100,6 @@ public function getCustomerId()
      * Retrieve store model object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -120,7 +110,6 @@ public function getStore()
      * Retrieve store identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -132,7 +121,6 @@ public function getStoreId()
      *
      * @param float $value
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($value)
     {
@@ -161,7 +149,6 @@ public function getItemPrice(Product $product)
      * @param int|float $value
      * @param bool $format
      * @return string|int|float
-     * @since 2.0.0
      */
     public function convertPrice($value, $format = true)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index 262b8983eabcc..7ba1ec7957806 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -11,7 +11,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
 {
@@ -19,7 +18,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * Return header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -30,7 +28,6 @@ public function getHeaderText()
      * Return Header CSS Class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -41,7 +38,6 @@ public function getHeaderCssClass()
      * Prepare Form and add elements to form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -59,7 +55,6 @@ protected function _prepareForm()
      * Return Form Elements values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormValues()
     {
@@ -70,7 +65,6 @@ public function getFormValues()
      * Return customer address id
      *
      * @return int|bool
-     * @since 2.0.0
      */
     public function getAddressId()
     {
@@ -81,7 +75,6 @@ public function getAddressId()
      * Return billing address object
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
index b829a34ab6991..83be8c9714d6a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -41,7 +38,6 @@ public function getHeaderText()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
index 3f5b09ac693d4..221daf9b33cc0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Payment\Block\Form\Container
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Payment\Block\Form\Container
      * Session quote
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
@@ -29,7 +27,6 @@ class Form extends \Magento\Payment\Block\Form\Container
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param array $data
      * @param array $additionalChecks
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param \Magento\Payment\Model\MethodInterface|null $method
      * @return bool
-     * @since 2.0.0
      */
     protected function _canUseMethod($method)
     {
@@ -59,7 +55,6 @@ protected function _canUseMethod($method)
      * Check existing of payment methods
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasMethods()
     {
@@ -74,7 +69,6 @@ public function hasMethods()
      * Get current payment method code or the only available, if there is only one method
      *
      * @return string|false
-     * @since 2.0.0
      */
     public function getSelectedMethodCode()
     {
@@ -100,7 +94,6 @@ public function getSelectedMethodCode()
      * Enter description here...
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -112,7 +105,6 @@ public function getQuote()
      *
      * @return true
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function hasSsCardType()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
index f9d8cd34359e7..2db21a550163c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Data Form object
      *
      * @var \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     protected $_form;
 
@@ -26,7 +24,6 @@ class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -37,7 +34,6 @@ public function getHeaderCssClass()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -48,7 +44,6 @@ public function getHeaderText()
      * Get comment note
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCommentNote()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
index 9a19543cbe2af..5a7dd8f047f20 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Coupons extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Coupons extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get coupon code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCouponCode()
     {
@@ -41,7 +38,6 @@ public function getCouponCode()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -52,7 +48,6 @@ public function getHeaderText()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
index aa6e1e4847581..55b7eabf50f17 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get coupon code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCouponCode()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
index c3abd610bc2fe..4e1c73788eeb2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Customer extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreat
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -41,7 +38,6 @@ public function getHeaderText()
      * Get buttons html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonsHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
index c9310411866e2..c3cb59c0c284f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Data extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,13 +19,11 @@ class Data extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Currency factory
      *
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
@@ -38,7 +35,6 @@ class Data extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Retrieve avilable currency codes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAvailableCurrencies()
     {
@@ -83,7 +78,6 @@ public function getAvailableCurrencies()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencyName($code)
     {
@@ -95,7 +89,6 @@ public function getCurrencyName($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencySymbol($code)
     {
@@ -107,7 +100,6 @@ public function getCurrencySymbol($code)
      * Retrieve current order currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentCurrencyCode()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
index a692a65b380b8..7040f5bd5e0f4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order create form block
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -19,7 +18,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Customer form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_customerFormFactory;
 
@@ -27,7 +25,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -35,19 +32,16 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Address service
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $_localeCurrency;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
@@ -65,7 +59,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param \Magento\Customer\Model\Address\Mapper $addressMapper
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -91,7 +84,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -103,7 +95,6 @@ protected function _construct()
      * Retrieve url for loading blocks
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoadBlockUrl()
     {
@@ -114,7 +105,6 @@ public function getLoadBlockUrl()
      * Retrieve url for form submiting
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -125,7 +115,6 @@ public function getSaveUrl()
      * Get customer selector display
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerSelectorDisplay()
     {
@@ -140,7 +129,6 @@ public function getCustomerSelectorDisplay()
      * Get store selector display
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreSelectorDisplay()
     {
@@ -156,7 +144,6 @@ public function getStoreSelectorDisplay()
      * Get data selector display
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDataSelectorDisplay()
     {
@@ -172,7 +159,6 @@ public function getDataSelectorDisplay()
      * Get order data jason
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderDataJson()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index 6da0928a3afb4..d5aff28721534 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -12,7 +12,6 @@
  * Sales Order Create Form Abstract Block
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
      * Form factory
      *
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     protected $_formFactory;
 
@@ -28,13 +26,11 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
      * Data Form object
      *
      * @var \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     protected $_form;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
@@ -46,7 +42,6 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      * Add renderers to \Magento\Framework\Data\Form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -99,7 +93,6 @@ protected function _prepareLayout()
      * Return Form object
      *
      * @return \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -114,7 +107,6 @@ public function getForm()
      * Prepare Form and add elements to form
      *
      * @return $this
-     * @since 2.0.0
      */
     abstract protected function _prepareForm();
 
@@ -122,7 +114,6 @@ abstract protected function _prepareForm();
      * Return array of additional form element types by type
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalFormElementTypes()
     {
@@ -137,7 +128,6 @@ protected function _getAdditionalFormElementTypes()
      * Return array of additional form element renderers by element id
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalFormElementRenderers()
     {
@@ -154,7 +144,6 @@ protected function _getAdditionalFormElementRenderers()
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _addAdditionalFormElementData(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -168,7 +157,6 @@ protected function _addAdditionalFormElementData(\Magento\Framework\Data\Form\El
      * @param \Magento\Framework\Data\Form\AbstractForm $form
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _addAttributesToForm($attributes, \Magento\Framework\Data\Form\AbstractForm $form)
     {
@@ -235,7 +223,6 @@ protected function _addAttributesToForm($attributes, \Magento\Framework\Data\For
      * Return Form Elements values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormValues()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index e936e88a550bf..efda5e95c6327 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -18,7 +18,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Account extends AbstractForm
 {
@@ -26,7 +25,6 @@ class Account extends AbstractForm
      * Metadata form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_metadataFormFactory;
 
@@ -34,13 +32,11 @@ class Account extends AbstractForm
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @since 2.0.0
      */
     protected $_extensibleDataObjectConverter;
 
@@ -56,7 +52,6 @@ class Account extends AbstractForm
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -88,7 +83,6 @@ public function __construct(
      * Return Header CSS Class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -99,7 +93,6 @@ public function getHeaderCssClass()
      * Return header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -110,7 +103,6 @@ public function getHeaderText()
      * Prepare Form and add elements to form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -151,7 +143,6 @@ protected function _prepareForm()
      *
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     protected function _addAdditionalFormElementData(AbstractElement $element)
     {
@@ -168,7 +159,6 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
      * Return Form Elements values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormValues()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 07435f8678ee1..1fa0f574beff4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -13,7 +13,6 @@
 /**
  * Order create address form
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
 {
@@ -21,7 +20,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Customer form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_customerFormFactory;
 
@@ -29,7 +27,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -37,7 +34,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Directory helper
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
@@ -45,7 +41,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Customer options
      *
      * @var \Magento\Customer\Model\Options
-     * @since 2.0.0
      */
     protected $options;
 
@@ -53,7 +48,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Address service
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressService;
 
@@ -61,7 +55,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Address helper
      *
      * @var \Magento\Customer\Helper\Address
-     * @since 2.0.0
      */
     protected $_addressHelper;
 
@@ -69,7 +62,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Search criteria builder
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -77,25 +69,23 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * Filter builder
      *
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Customer\Model\Address\Mapper
-     * @since 2.0.0
      */
     protected $addressMapper;
 
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $countriesCollection;
 
     /**
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $backendQuoteSession;
 
@@ -120,7 +110,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -165,7 +154,6 @@ public function __construct(
      *
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -176,7 +164,6 @@ public function getConfig($path)
      * Retrieve current customer address DATA collection.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]
-     * @since 2.0.0
      */
     public function getAddressCollection()
     {
@@ -198,7 +185,6 @@ public function getAddressCollection()
      * Return Customer Address Collection as JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddressCollectionJson()
     {
@@ -230,7 +216,6 @@ public function getAddressCollectionJson()
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -311,7 +296,7 @@ protected function _prepareForm()
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $countryElement
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function processCountryOptions(\Magento\Framework\Data\Form\Element\AbstractElement $countryElement)
     {
@@ -325,9 +310,9 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst
 
     /**
      * Retrieve Directiry Countries collection
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getCountriesCollection()
     {
@@ -341,9 +326,9 @@ private function getCountriesCollection()
 
     /**
      * Retrieve Backend Quote Session
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Quote
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getBackendQuoteSession()
     {
@@ -359,7 +344,6 @@ private function getBackendQuoteSession()
      *
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     protected function _addAdditionalFormElementData(AbstractElement $element)
     {
@@ -373,7 +357,6 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
      * Return customer address id
      *
      * @return false
-     * @since 2.0.0
      */
     public function getAddressId()
     {
@@ -385,7 +368,6 @@ public function getAddressId()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @since 2.0.0
      */
     public function getAddressAsString(\Magento\Customer\Api\Data\AddressInterface $address)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index a95ef9ca00719..e3109fc455ed5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
      * Gift message save
      *
      * @var \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected $_giftMessageSave;
 
@@ -28,7 +26,6 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
      * Message helper
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -40,7 +37,6 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
      * @param \Magento\GiftMessage\Model\Save $giftMessageSave
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      * @param \Magento\Framework\DataObject $entity
      * @param string $entityType
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml(\Magento\Framework\DataObject $entity, $entityType = 'quote')
     {
@@ -81,7 +76,6 @@ public function getFormHtml(\Magento\Framework\DataObject $entity, $entityType =
      * If no items available return false.
      *
      * @return array|false
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -113,7 +107,6 @@ public function getItems()
      * Retrieve gift message save model
      *
      * @return \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected function _getGiftmessageSaveModel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index 1c0a54d1921c0..ced2d872827a7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -11,7 +11,6 @@
  * Adminhtml order creating gift message item form
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -19,7 +18,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Entity for editing of gift message
      *
      * @var \Magento\Eav\Model\Entity\AbstractEntity
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -27,7 +25,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Giftmessage object
      *
      * @var \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     protected $_giftMessage;
 
@@ -35,7 +32,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Session quote
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
@@ -43,19 +39,16 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Message helper
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -70,7 +63,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +86,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $entity
      * @return $this
-     * @since 2.0.0
      */
     public function setEntity(\Magento\Framework\DataObject $entity)
     {
@@ -106,7 +97,6 @@ public function setEntity(\Magento\Framework\DataObject $entity)
      * Retrieve entity for form
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -115,7 +105,6 @@ public function getEntity()
 
     /**
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -126,7 +115,6 @@ protected function _getSession()
      * Retrieve default value for giftmessage sender
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSender()
     {
@@ -153,7 +141,6 @@ public function getDefaultSender()
      * Retrieve default value for giftmessage recipient
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultRecipient()
     {
@@ -182,7 +169,6 @@ public function getDefaultRecipient()
      * Prepares form
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _prepareForm()
     {
@@ -222,7 +208,6 @@ public function _prepareForm()
      *
      * @param Fieldset $fieldset
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareHiddenFields(Fieldset $fieldset)
     {
@@ -239,7 +224,6 @@ protected function _prepareHiddenFields(Fieldset $fieldset)
      *
      * @param Fieldset $fieldset
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareVisibleFields(Fieldset $fieldset)
     {
@@ -278,7 +262,6 @@ protected function _prepareVisibleFields(Fieldset $fieldset)
      * Initialize gift message for entity
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessage()
     {
@@ -290,7 +273,6 @@ protected function _initMessage()
      * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -306,7 +288,6 @@ public function getMessage()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _getFieldName($name)
     {
@@ -318,7 +299,6 @@ protected function _getFieldName($name)
      *
      * @param string $id
      * @return string
-     * @since 2.0.0
      */
     protected function _getFieldId($id)
     {
@@ -329,7 +309,6 @@ protected function _getFieldId($id)
      * Retrieve field html id prefix
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFieldIdPrefix()
     {
@@ -340,7 +319,6 @@ protected function _getFieldIdPrefix()
      * Applies posted data to gift message
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyPostData()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
index a5477a4fa1a01..1a6ab0e49ed71 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
@@ -11,7 +11,6 @@
  * Create order form header
  *
  * @api
- * @since 2.0.0
  */
 class Header extends AbstractCreate
 {
@@ -19,7 +18,6 @@ class Header extends AbstractCreate
      * Customer repository
      *
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -27,7 +25,6 @@ class Header extends AbstractCreate
      * Customer view helper
      *
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
@@ -41,7 +38,6 @@ class Header extends AbstractCreate
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -74,7 +69,6 @@ protected function _toHtml()
      * Generate title for new order creation page.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCreateOrderTitle()
     {
@@ -107,7 +101,6 @@ protected function _getCreateOrderTitle()
      *
      * @param int $customerId
      * @return string
-     * @since 2.0.0
      */
     protected function _getCustomerName($customerId)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
index 67b47a84e0898..be8133763cc6d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Contains button descriptions to be shown at the top of accordion
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_buttons = [];
 
@@ -28,7 +26,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Define block ID
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +37,6 @@ protected function _construct()
      * Accordion header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -51,7 +47,6 @@ public function getHeaderText()
      * Returns all visible items
      *
      * @return Item[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -63,7 +58,6 @@ public function getItems()
      *
      * @param array $args
      * @return void
-     * @since 2.0.0
      */
     public function addButton($args)
     {
@@ -74,7 +68,6 @@ public function addButton($args)
      * Render buttons and return HTML code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonsHtml()
     {
@@ -96,7 +89,6 @@ public function getButtonsHtml()
      * Return HTML code of the block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 09d1df50b1cc0..de342bb5d7ced 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -16,7 +16,6 @@
  * Adminhtml sales order create items grid block
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -24,7 +23,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Flag to check can items be move to customer storage
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_moveToCustomerStorage = true;
 
@@ -32,7 +30,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
@@ -40,7 +37,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Wishlist factory
      *
      * @var \Magento\Wishlist\Model\WishlistFactory
-     * @since 2.0.0
      */
     protected $_wishlistFactory;
 
@@ -48,7 +44,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Gift message save
      *
      * @var \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected $_giftMessageSave;
 
@@ -56,7 +51,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Tax config
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -64,19 +58,16 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Message helper
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
     /**
      * @var StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var StockStateInterface
-     * @since 2.0.0
      */
     protected $stockState;
 
@@ -94,7 +85,6 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param StockStateInterface $stockState
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -124,7 +114,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -136,7 +125,6 @@ protected function _construct()
      * Get items
      *
      * @return Item[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -186,7 +174,6 @@ public function getItems()
      * Get session
      *
      * @return SessionManagerInterface
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -198,7 +185,6 @@ public function getSession()
      *
      * @param Item $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemEditablePrice($item)
     {
@@ -210,7 +196,6 @@ public function getItemEditablePrice($item)
      *
      * @param Item $item
      * @return float
-     * @since 2.0.0
      */
     public function getOriginalEditablePrice($item)
     {
@@ -233,7 +218,6 @@ public function getOriginalEditablePrice($item)
      *
      * @param Item $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemOrigPrice($item)
     {
@@ -245,7 +229,6 @@ public function getItemOrigPrice($item)
      *
      * @param Item|null $item
      * @return bool|null|string
-     * @since 2.0.0
      */
     public function isGiftMessagesAvailable($item = null)
     {
@@ -260,7 +243,6 @@ public function isGiftMessagesAvailable($item = null)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowedForGiftMessage($item)
     {
@@ -271,7 +253,6 @@ public function isAllowedForGiftMessage($item)
      * Check if we need display grid totals include tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayTotalsIncludeTax()
     {
@@ -284,7 +265,6 @@ public function displayTotalsIncludeTax()
      * Get subtotal
      *
      * @return false|float
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -302,7 +282,6 @@ public function getSubtotal()
      * Get subtotal with discount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSubtotalWithDiscount()
     {
@@ -321,7 +300,6 @@ public function getSubtotalWithDiscount()
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -332,7 +310,6 @@ public function getDiscountAmount()
      * Retrieve quote address
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getQuoteAddress()
     {
@@ -348,7 +325,6 @@ public function getQuoteAddress()
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function usedCustomPriceForItem($item)
     {
@@ -360,7 +336,6 @@ public function usedCustomPriceForItem($item)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canApplyCustomPrice($item)
     {
@@ -372,7 +347,6 @@ public function canApplyCustomPrice($item)
      *
      * @param Item $item
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getQtyTitle($item)
     {
@@ -397,7 +371,6 @@ public function getQtyTitle($item)
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getTierHtml($item)
     {
@@ -420,7 +393,6 @@ public function getTierHtml($item)
      *
      * @param array $prices
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getBundleTierPriceInfo($prices)
     {
@@ -437,7 +409,6 @@ protected function _getBundleTierPriceInfo($prices)
      *
      * @param array $prices
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getTierPriceInfo($prices)
     {
@@ -457,7 +428,6 @@ protected function _getTierPriceInfo($prices)
      * @return string
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getCustomOptions(Item $item)
     {
@@ -486,7 +456,6 @@ public function getCustomOptions(Item $item)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getMoveToCustomerStorage()
     {
@@ -498,7 +467,6 @@ public function getMoveToCustomerStorage()
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function displaySubtotalInclTax($item)
     {
@@ -515,7 +483,6 @@ public function displaySubtotalInclTax($item)
      *
      * @param Item $item
      * @return float
-     * @since 2.0.0
      */
     public function displayOriginalPriceInclTax($item)
     {
@@ -531,7 +498,6 @@ public function displayOriginalPriceInclTax($item)
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function displayRowTotalWithDiscountInclTax($item)
     {
@@ -543,7 +509,6 @@ public function displayRowTotalWithDiscountInclTax($item)
      * Get including/excluding tax message
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getInclExclTaxMessage()
     {
@@ -558,7 +523,6 @@ public function getInclExclTaxMessage()
      * Get store
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -570,7 +534,6 @@ public function getStore()
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getConfigureButtonHtml($item)
     {
@@ -594,7 +557,6 @@ public function getConfigureButtonHtml($item)
      *
      * @param Item $item
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getItemExtraInfo($item)
     {
@@ -606,7 +568,6 @@ public function getItemExtraInfo($item)
      *
      * @param Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function isMoveToWishlistAllowed($item)
     {
@@ -617,7 +578,6 @@ public function isMoveToWishlistAllowed($item)
      * Retrieve collection of customer wishlists
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Wishlist\Collection
-     * @since 2.0.0
      */
     public function getCustomerWishlists()
     {
@@ -629,7 +589,6 @@ public function getCustomerWishlists()
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemUnitPriceHtml(Item $item)
     {
@@ -643,7 +602,6 @@ public function getItemUnitPriceHtml(Item $item)
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemRowTotalHtml(Item $item)
     {
@@ -657,7 +615,6 @@ public function getItemRowTotalHtml(Item $item)
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemRowTotalWithDiscountHtml(Item $item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
index 9a4ec87448ccb..c8a168619ac61 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Load extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\View\Helper\Js
-     * @since 2.0.0
      */
     protected $_jsHelper = null;
 
@@ -24,7 +22,6 @@ class Load extends \Magento\Framework\View\Element\Template
      * Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -33,7 +30,6 @@ class Load extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\View\Helper\Js $adminhtmlJs
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
index 754a9d31bb415..3a99d7b883d52 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Messages extends \Magento\Framework\View\Element\Messages
 {
@@ -18,7 +17,6 @@ class Messages extends \Magento\Framework\View\Element\Messages
      * Preparing global layout
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
index b9aacdc9df122..21cdf3cc5d557 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCre
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -41,7 +38,6 @@ public function getHeaderText()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -50,7 +46,6 @@ public function getHeaderCssClass()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
index 9f725e310a335..352c6a98dac6b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Backend\Block\Widget
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
index 64df735fa5de2..a1894cc3f181f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Search extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Search extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -41,7 +38,6 @@ public function getHeaderText()
      * Get buttons html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getButtonsHtml()
     {
@@ -61,7 +57,6 @@ public function getButtonsHtml()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 75d2c44d435be..4b89321f0f536 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Sales config
      *
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
@@ -26,7 +24,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Session quote
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_sessionQuote;
 
@@ -34,7 +31,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Catalog config
      *
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     protected $_catalogConfig;
 
@@ -42,7 +38,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Product factory
      *
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -54,7 +49,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -96,7 +89,6 @@ protected function _construct()
      * Retrieve quote store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -107,7 +99,6 @@ public function getStore()
      * Retrieve quote object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -119,7 +110,6 @@ public function getQuote()
      *
      * @param \Magento\Backend\Block\Widget\Grid\Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -146,7 +136,6 @@ protected function _addColumnFilterToCollection($column)
      * Prepare collection to be displayed in the grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -174,7 +163,6 @@ protected function _prepareCollection()
      * Prepare columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -246,7 +234,6 @@ protected function _prepareColumns()
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -260,7 +247,6 @@ public function getGridUrl()
      * Get selected products
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getSelectedProducts()
     {
@@ -273,7 +259,6 @@ protected function _getSelectedProducts()
      * Add custom options to product collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadCollection()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
index 58b072104367d..5f8e366ab84a2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
@@ -9,7 +9,6 @@
  * Adminhtml sales create order product search grid price column renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Price
 {
@@ -18,7 +17,6 @@ class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Price
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
index d6a7f5b22df98..271b5b7afa1c9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
@@ -9,7 +9,6 @@
  * Adminhtml sales create order product search grid product name column renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
@@ -18,7 +17,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
index 48308a1f86203..3cbcf62067fc0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
@@ -9,7 +9,6 @@
  * Renderer for Qty field in sales create new order search grid
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Qty extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Input
 {
@@ -17,7 +16,6 @@ class Qty extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Input
      * Type config
      *
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $typeConfig;
 
@@ -25,7 +23,6 @@ class Qty extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Input
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $typeConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return bool
-     * @since 2.0.0
      */
     protected function _isInactive($row)
     {
@@ -53,7 +49,6 @@ protected function _isInactive($row)
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index db520e5e28173..848e25253376f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -11,7 +11,6 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
 {
@@ -19,7 +18,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * Return header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -30,7 +28,6 @@ public function getHeaderText()
      * Return Header CSS Class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -41,7 +38,6 @@ public function getHeaderCssClass()
      * Prepare Form and add elements to form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -59,7 +55,6 @@ protected function _prepareForm()
      * Return is shipping address flag
      *
      * @return true
-     * @since 2.0.0
      */
     public function getIsShipping()
     {
@@ -71,7 +66,6 @@ public function getIsShipping()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAsBilling()
     {
@@ -83,7 +77,6 @@ public function getIsAsBilling()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getDontSaveInAddressBook()
     {
@@ -94,7 +87,6 @@ public function getDontSaveInAddressBook()
      * Return Form Elements values
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormValues()
     {
@@ -105,7 +97,6 @@ public function getFormValues()
      * Return customer address id
      *
      * @return int|bool
-     * @since 2.0.0
      */
     public function getAddressId()
     {
@@ -116,7 +107,6 @@ public function getAddressId()
      * Return address object
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -134,7 +124,6 @@ public function getAddress()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsDisabled()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
index 51f714195aec6..3c80bd4383a62 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -41,7 +38,6 @@ public function getHeaderText()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index b4aad34aed51a..195d3886571ac 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Shipping rates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates;
 
@@ -28,13 +26,11 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData = null;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -45,7 +41,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Helper\Data $taxData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +69,6 @@ protected function _construct()
      * Retrieve quote shipping address model
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getAddress()
     {
@@ -86,7 +79,6 @@ public function getAddress()
      * Retrieve array of shipping rates groups
      *
      * @return array
-     * @since 2.0.0
      */
     public function getShippingRates()
     {
@@ -101,7 +93,6 @@ public function getShippingRates()
      *
      * @param string $carrierCode
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierName($carrierCode)
     {
@@ -120,7 +111,6 @@ public function getCarrierName($carrierCode)
      * Retrieve current selected shipping method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShippingMethod()
     {
@@ -132,7 +122,6 @@ public function getShippingMethod()
      *
      * @param string $code
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodActive($code)
     {
@@ -143,7 +132,6 @@ public function isMethodActive($code)
      * Retrieve rate of active shipping method
      *
      * @return \Magento\Quote\Model\Quote\Address\Rate|false
-     * @since 2.0.0
      */
     public function getActiveMethodRate()
     {
@@ -164,7 +152,6 @@ public function getActiveMethodRate()
      * Get rate request
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getIsRateRequest()
     {
@@ -177,7 +164,6 @@ public function getIsRateRequest()
      * @param float $price
      * @param bool $flag
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPrice($price, $flag)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
index acf54f033b57f..37861be033b1b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Sidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Sidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Preparing global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -50,7 +48,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Framework\DataObject $child
      * @return true
-     * @since 2.0.0
      */
     public function canDisplay($child)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 384501a29013d..f411a93fd3368 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
      * Default Storage action on selected item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sidebarStorageAction = 'add';
 
@@ -28,7 +26,6 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
      * Sales config
      *
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
@@ -39,7 +36,6 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Return name of sidebar storage action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSidebarStorageAction()
     {
@@ -68,7 +63,6 @@ public function getSidebarStorageAction()
      * Retrieve display block availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplay()
     {
@@ -79,7 +73,6 @@ public function canDisplay()
      * Retrieve disply item qty availablity
      *
      * @return false
-     * @since 2.0.0
      */
     public function canDisplayItemQty()
     {
@@ -90,7 +83,6 @@ public function canDisplayItemQty()
      * Retrieve availability removing items in block
      *
      * @return true
-     * @since 2.0.0
      */
     public function canRemoveItems()
     {
@@ -102,7 +94,6 @@ public function canRemoveItems()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
@@ -114,7 +105,6 @@ public function getIdentifierId($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getItemId($item)
     {
@@ -126,7 +116,6 @@ public function getItemId($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getProductId($item)
     {
@@ -137,7 +126,6 @@ public function getProductId($item)
      * Retrieve item count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemCount()
     {
@@ -154,7 +142,6 @@ public function getItemCount()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -201,7 +188,6 @@ public function getItems()
      * Retrieve item collection
      *
      * @return false
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -212,7 +198,6 @@ public function getItemCollection()
      * Retrieve disply price availablity
      *
      * @return true
-     * @since 2.0.0
      */
     public function canDisplayPrice()
     {
@@ -224,7 +209,6 @@ public function canDisplayPrice()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getItemQty(\Magento\Framework\DataObject $item)
     {
@@ -237,7 +221,6 @@ public function getItemQty(\Magento\Framework\DataObject $item)
      * @param string|int|null $productType
      * @return false
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isConfigurationRequired($productType)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index 40219512be8ef..b1c16825d4a82 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -18,7 +17,6 @@ class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractS
      * Storage action on selected item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sidebarStorageAction = 'add_cart_item';
 
@@ -26,7 +24,6 @@ class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractS
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +36,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -50,7 +46,6 @@ public function getHeaderText()
      * Retrieve item collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -66,7 +61,6 @@ public function getItemCollection()
      * Retrieve display item qty availability
      *
      * @return true
-     * @since 2.0.0
      */
     public function canDisplayItemQty()
     {
@@ -78,7 +72,6 @@ public function canDisplayItemQty()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
@@ -90,7 +83,6 @@ public function getIdentifierId($item)
      *
      * @param \Magento\Quote\Model\Quote\Item $item
      * @return int
-     * @since 2.0.0
      */
     public function getProductId($item)
     {
@@ -103,7 +95,6 @@ public function getProductId($item)
      * Add button that clears customer's shopping cart
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
index 9335860679a3f..78c4e7a12edf6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Compared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -18,7 +17,6 @@ class Compared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstr
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -42,7 +39,6 @@ public function getHeaderText()
      * Retrieve item collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -77,7 +73,6 @@ public function getItemCollection()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getItemId($item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
index 4b955348ce2fd..43ff088c5bc5a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -20,7 +19,6 @@ class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abst
      * Product factory
      *
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -28,7 +26,6 @@ class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abst
      * Event
      *
      * @var \Magento\Reports\Model\ResourceModel\Event
-     * @since 2.0.0
      */
     protected $_event;
 
@@ -41,7 +38,6 @@ class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abst
      * @param \Magento\Reports\Model\ResourceModel\Event $event
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +70,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -86,7 +80,6 @@ public function getHeaderText()
      * Retrieve item collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -137,7 +130,6 @@ public function getItemCollection()
      * Retrieve availability removing items in block
      *
      * @return false
-     * @since 2.0.0
      */
     public function canRemoveItems()
     {
@@ -149,7 +141,6 @@ public function canRemoveItems()
      *
      * @param \Magento\Catalog\Model\Product $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
@@ -161,7 +152,6 @@ public function getIdentifierId($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getProductId($item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
index 7339865c95158..477f6edc101bd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -20,7 +19,6 @@ class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * Product factory
      *
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
@@ -28,7 +26,6 @@ class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * Event factory
      *
      * @var \Magento\Reports\Model\EventFactory
-     * @since 2.0.0
      */
     protected $_eventFactory;
 
@@ -41,7 +38,6 @@ class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * @param \Magento\Reports\Model\EventFactory $eventFactory
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,7 +58,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +70,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -86,7 +80,6 @@ public function getHeaderText()
      * Retrieve item collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -135,7 +128,6 @@ public function getItemCollection()
      * Retrieve availability removing items in block
      *
      * @return false
-     * @since 2.0.0
      */
     public function canRemoveItems()
     {
@@ -147,7 +139,6 @@ public function canRemoveItems()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
index d8a905b0a2e8a..6a1ae5c5be1f0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -20,7 +19,6 @@ class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * Storage action on selected item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sidebarStorageAction = 'add_order_item';
 
@@ -28,7 +26,6 @@ class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * Orders factory
      *
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_ordersFactory;
 
@@ -40,7 +37,6 @@ class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $ordersFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +67,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -83,7 +77,6 @@ public function getHeaderText()
      * Retrieve last order on current website
      *
      * @return \Magento\Sales\Model\Order|false
-     * @since 2.0.0
      */
     public function getLastOrder()
     {
@@ -111,7 +104,6 @@ public function getLastOrder()
      * Retrieve item collection
      *
      * @return array|false
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -131,7 +123,6 @@ public function getItemCollection()
      * Retrieve display item qty availability
      *
      * @return false
-     * @since 2.0.0
      */
     public function canDisplayItemQty()
     {
@@ -142,7 +133,6 @@ public function canDisplayItemQty()
      * Retrieve remove items availability
      *
      * @return false
-     * @since 2.0.0
      */
     public function canRemoveItems()
     {
@@ -153,7 +143,6 @@ public function canRemoveItems()
      * Retrieve display price availability
      *
      * @return false
-     * @since 2.0.0
      */
     public function canDisplayPrice()
     {
@@ -165,7 +154,6 @@ public function canDisplayPrice()
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
index f9c03b1d5e74c..3389511d79ede 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Viewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -18,7 +17,6 @@ class Viewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstrac
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Retrieve display block availability
      *
      * @return false
-     * @since 2.0.0
      */
     public function canDisplay()
     {
@@ -42,7 +39,6 @@ public function canDisplay()
      * Retrieve availability removing items in block
      *
      * @return false
-     * @since 2.0.0
      */
     public function canRemoveItems()
     {
@@ -53,7 +49,6 @@ public function canRemoveItems()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
index 65e242311d57f..72c34412c6ba3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
 {
@@ -18,7 +17,6 @@ class Wishlist extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstr
      * Storage action on selected item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sidebarStorageAction = 'add_wishlist_item';
 
@@ -26,7 +24,6 @@ class Wishlist extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstr
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -39,7 +36,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -50,7 +46,6 @@ public function getHeaderText()
      * Retrieve item collection
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -69,7 +64,6 @@ public function getItemCollection()
      * Retrieve all items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -88,7 +82,6 @@ public function getItems()
      *
      * @param \Magento\Wishlist\Model\Item $item
      * @return int
-     * @since 2.0.0
      */
     public function getProductId($item)
     {
@@ -100,7 +93,6 @@ public function getProductId($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return int
-     * @since 2.0.0
      */
     public function getIdentifierId($item)
     {
@@ -111,7 +103,6 @@ public function getIdentifierId($item)
      * Retrieve possibility to display quantity column in grid of wishlist block
      *
      * @return true
-     * @since 2.0.0
      */
     public function canDisplayItemQty()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
index 0c90d94441789..fba7a61ff629d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Store extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -18,7 +17,6 @@ class Store extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
index 6938240914132..7aee297ccafed 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Select extends \Magento\Backend\Block\Store\Switcher
 {
@@ -18,7 +17,6 @@ class Select extends \Magento\Backend\Block\Store\Switcher
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index 60f57c61d70f3..aacc8d1add988 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
@@ -20,7 +19,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Total renderers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totalRenderers;
 
@@ -28,7 +26,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Default renderer
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultRenderer = \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals::class;
 
@@ -36,7 +33,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData = null;
 
@@ -44,7 +40,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * Sales config
      *
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
@@ -56,7 +51,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param \Magento\Sales\Helper\Data $salesData
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -88,7 +81,6 @@ protected function _construct()
      * Get totals
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -105,7 +97,6 @@ public function getTotals()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -116,7 +107,6 @@ public function getHeaderText()
      * Get header css class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderCssClass()
     {
@@ -128,7 +118,6 @@ public function getHeaderCssClass()
      *
      * @param string $code
      * @return bool|\Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     protected function _getTotalRenderer($code)
     {
@@ -158,7 +147,6 @@ protected function _getTotalRenderer($code)
      * @param string|null $area
      * @param int $colspan
      * @return mixed
-     * @since 2.0.0
      */
     public function renderTotal($total, $area = null, $colspan = 1)
     {
@@ -179,7 +167,6 @@ public function renderTotal($total, $area = null, $colspan = 1)
      * @param null $area
      * @param int $colspan
      * @return string
-     * @since 2.0.0
      */
     public function renderTotals($area = null, $colspan = 1)
     {
@@ -197,7 +184,6 @@ public function renderTotals($area = null, $colspan = 1)
      * Check allow to send new order confirmation email
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewOrderConfirmationEmail()
     {
@@ -209,7 +195,6 @@ public function canSendNewOrderConfirmationEmail()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getNoteNotify()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
index 83073381085a6..42d0c3007eb88 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
@@ -11,7 +11,6 @@
  * Default Total Row Renderer
  *
  * @author Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class DefaultTotals extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals
 {
@@ -19,13 +18,11 @@ class DefaultTotals extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Sales::order/create/totals/default.phtml';
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -33,7 +30,6 @@ class DefaultTotals extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals
      * Retrieve quote session object
      *
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -44,7 +40,6 @@ protected function _getSession()
      * Retrieve store model object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -56,7 +51,6 @@ public function getStore()
      *
      * @param float $value
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($value)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
index adf179a86fc95..738f9a4fef999 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -12,18 +12,12 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
     //protected $_template = 'tax/checkout/subtotal.phtml';
 
-    /**
-     * Tax config
-     *
-     * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
-     */
+    //protected $_template = 'tax/checkout/subtotal.phtml';
     protected $_taxConfig;
 
     /**
@@ -35,7 +29,6 @@ class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +48,6 @@ public function __construct(
      * Display both
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
index e872ffb084cdb..eb437915ad668 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
@@ -12,7 +12,6 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
@@ -20,7 +19,6 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/create/totals/grandtotal.phtml';
 
@@ -28,7 +26,6 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
      * Tax config
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -41,7 +38,6 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      * Include tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function includeTax()
     {
@@ -72,7 +67,6 @@ public function includeTax()
      * Get total excluding tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalExclTax()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index bd32fb489630c..9225d8c2e5f68 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -12,7 +12,6 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
@@ -20,7 +19,6 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/create/totals/shipping.phtml';
 
@@ -28,7 +26,6 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * Tax config
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -41,7 +38,6 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      * Check if we need display shipping include and exclude tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
@@ -72,7 +67,6 @@ public function displayBoth()
      * Check if we need display shipping include tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayIncludeTax()
     {
@@ -83,7 +77,6 @@ public function displayIncludeTax()
      * Get shipping amount include tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingIncludeTax()
     {
@@ -94,7 +87,6 @@ public function getShippingIncludeTax()
      * Get shipping amount exclude tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingExcludeTax()
     {
@@ -105,7 +97,6 @@ public function getShippingExcludeTax()
      * Get label for shipping include tax
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getIncludeTaxLabel()
     {
@@ -119,7 +110,6 @@ public function getIncludeTaxLabel()
      * Get label for shipping exclude tax
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getExcludeTaxLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
index 474a3a79518d7..1807c587c6893 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
@@ -12,7 +12,6 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
@@ -20,7 +19,6 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/create/totals/subtotal.phtml';
 
@@ -28,7 +26,6 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * Tax config
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -41,7 +38,6 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      * Check if we need display both sobtotals
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
index 0383204fa69f4..19d526155a3ca 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order create totals table block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Table extends \Magento\Backend\Block\Template
 {
@@ -19,7 +18,6 @@ class Table extends \Magento\Backend\Block\Template
      * Website collection
      *
      * @var Collection|null
-     * @since 2.0.0
      */
     protected $_websiteCollection = null;
 
@@ -27,7 +25,6 @@ class Table extends \Magento\Backend\Block\Template
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index 3d3ea58ae6dab..d3da37c3f1bf8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -10,7 +10,6 @@
  *
  * @author Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
@@ -18,7 +17,6 @@ class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTota
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/create/totals/tax.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
index 2010523cadaeb..df26937e489f6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
@@ -9,7 +9,6 @@
  * Adminhtml creditmemo create
  *
  * @api
- * @since 2.0.0
  */
 class Create extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +54,6 @@ protected function _construct()
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -69,7 +64,6 @@ public function getCreditmemo()
      * Get header text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -86,7 +80,6 @@ public function getHeaderText()
      * Get back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index 9dd49a4e356c2..1f40b593637d6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Adjustments extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Adjustments extends \Magento\Backend\Block\Template
      * Source object
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -25,13 +23,11 @@ class Adjustments extends \Magento\Backend\Block\Template
      * Tax config
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -40,7 +36,6 @@ class Adjustments extends \Magento\Backend\Block\Template
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Initialize creditmemo agjustment totals
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initTotals()
     {
@@ -75,7 +69,6 @@ public function initTotals()
      * Get source object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -86,7 +79,6 @@ public function getSource()
      * Get credit memo shipping amount depend on configuration settings
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -103,7 +95,6 @@ public function getShippingAmount()
      * Get label for shipping total based on configuration settings
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShippingLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
index 00d10903abaff..3682e89dab48c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
@@ -9,7 +9,6 @@
  * Adminhtml creditmemo create form
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -28,7 +26,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -39,7 +36,6 @@ public function getSource()
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -50,7 +46,6 @@ public function getCreditmemo()
      * Get save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
index 715f41d9e4dce..fd70252574ea5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
@@ -9,13 +9,11 @@
  * Adminhtml credit memo items grid
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canReturnToStock;
 
@@ -23,7 +21,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData;
 
@@ -34,7 +31,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Data $salesData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Prepare child blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -103,7 +98,6 @@ protected function _prepareLayout()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -114,7 +108,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -125,7 +118,6 @@ public function getSource()
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -136,7 +128,6 @@ public function getOrderTotalData()
      * Retrieve order total bar block data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalbarData()
     {
@@ -155,7 +146,6 @@ public function getOrderTotalbarData()
      * Retrieve credit memo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -166,7 +156,6 @@ public function getCreditmemo()
      * Check if allow to edit qty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEditQty()
     {
@@ -180,7 +169,6 @@ public function canEditQty()
      * Get update button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateButtonHtml()
     {
@@ -191,7 +179,6 @@ public function getUpdateButtonHtml()
      * Get update url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateUrl()
     {
@@ -208,7 +195,6 @@ public function getUpdateUrl()
      * Whether to show 'Return to stock' column in creaditmemo grid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canReturnItemsToStock()
     {
@@ -240,7 +226,6 @@ public function canReturnItemsToStock()
      * Check allow to send new credit memo email
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSendCreditmemoEmail()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
index 022ad0d11ab31..265051ff94b47 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Adminhtml\Totals
 {
@@ -20,7 +19,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals
      * Creditmemo
      *
      * @var Creditmemo|null
-     * @since 2.0.0
      */
     protected $_creditmemo;
 
@@ -28,7 +26,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals
      * Retrieve creditmemo model instance
      *
      * @return Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -48,7 +45,6 @@ public function getCreditmemo()
      * Get source
      *
      * @return Creditmemo|null
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -59,7 +55,6 @@ public function getSource()
      * Initialize creditmemo totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
index c8fb498232248..d0832a34100b9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -18,7 +17,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Add & remove control buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -121,7 +117,6 @@ protected function _construct()
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -132,7 +127,6 @@ public function getCreditmemo()
      * Retrieve text for header
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -158,7 +152,6 @@ public function getHeaderText()
      * Retrieve back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -175,7 +168,6 @@ public function getBackUrl()
      * Retrieve capture url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCaptureUrl()
     {
@@ -186,7 +178,6 @@ public function getCaptureUrl()
      * Retrieve void url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVoidUrl()
     {
@@ -197,7 +188,6 @@ public function getVoidUrl()
      * Retrieve cancel url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCancelUrl()
     {
@@ -208,7 +198,6 @@ public function getCancelUrl()
      * Retrieve email url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmailUrl()
     {
@@ -225,7 +214,6 @@ public function getEmailUrl()
      * Retrieve print url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -237,7 +225,6 @@ public function getPrintUrl()
      *
      * @param bool $flag
      * @return \Magento\Backend\Block\Widget\Container|$this
-     * @since 2.0.0
      */
     public function updateBackButtonUrl($flag)
     {
@@ -264,7 +251,6 @@ public function updateBackButtonUrl($flag)
      *
      * @param string $resourceId
      * @return bool
-     * @since 2.0.0
      */
     public function _isAllowedAction($resourceId)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
index 05d934e547403..9f42982cbd89a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comments extends \Magento\Backend\Block\Text\ListText
 {
@@ -18,7 +17,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -52,7 +48,6 @@ public function getCreditmemo()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -63,7 +58,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getSource()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
index 839b723b45058..e15db7f903a93 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -29,7 +27,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -40,7 +37,6 @@ public function getSource()
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -51,7 +47,6 @@ public function getOrderTotalData()
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -62,7 +57,6 @@ public function getCreditmemo()
      * Get order url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
index 6503b21499be6..9fdc02786f166 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
@@ -9,7 +9,6 @@
  * Adminhtml sales item renderer
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -17,7 +16,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -28,7 +26,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -39,7 +36,6 @@ public function getSource()
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -50,7 +46,6 @@ public function getOrderTotalData()
      * Retrieve creditmemo model instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -61,7 +56,6 @@ public function getCreditmemo()
      * Get order url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
index 341ec021ab053..5c3a7fce805cc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
@@ -8,13 +8,11 @@
 /**
  * Class Details
  * @package Magento\Sales\Block\Adminhtml\Order
- * @since 2.0.0
  */
 class Details extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/details.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
index c80a99024daff..5c6ce93ee9693 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
@@ -9,7 +9,6 @@
  * Adminhtml invoice create
  *
  * @api
- * @since 2.0.0
  */
 class Create extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +54,6 @@ protected function _construct()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -69,7 +64,6 @@ public function getInvoice()
      * Retrieve text for header
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -86,7 +80,6 @@ public function getHeaderText()
      * Retrieve back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
index 2463882f1aaef..5ab5cfa92d06f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -29,7 +27,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -40,7 +37,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -51,7 +47,6 @@ public function getInvoice()
      * Get save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -62,7 +57,6 @@ public function getSaveUrl()
      * Check shipment availability for current invoice
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateShipment()
     {
@@ -78,7 +72,6 @@ public function canCreateShipment()
      * Check invoice shipment type mismatch
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasInvoiceShipmentTypeMismatch()
     {
@@ -94,7 +87,6 @@ public function hasInvoiceShipmentTypeMismatch()
      * Check shipment availability for partially item
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShipPartiallyItem()
     {
@@ -109,7 +101,6 @@ public function canShipPartiallyItem()
      * Return forced creating of shipment flag
      *
      * @return int
-     * @since 2.0.0
      */
     public function getForcedShipmentCreate()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
index 56c25313871db..bb7f7dca9eb20 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
@@ -9,7 +9,6 @@
  * Adminhtml invoice items grid
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -17,7 +16,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Disable submit button
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_disableSubmitButton = false;
 
@@ -25,7 +23,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData;
 
@@ -36,7 +33,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Data $salesData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Prepare child blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -100,7 +95,6 @@ protected function _beforeToHtml()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getDisableSubmitButton()
     {
@@ -111,7 +105,6 @@ public function getDisableSubmitButton()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -122,7 +115,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -133,7 +125,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -144,7 +135,6 @@ public function getInvoice()
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -155,7 +145,6 @@ public function getOrderTotalData()
      * Retrieve order totalbar block data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalbarData()
     {
@@ -175,7 +164,6 @@ public function getOrderTotalbarData()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -186,7 +174,6 @@ public function formatPrice($price)
      * Get update button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateButtonHtml()
     {
@@ -197,7 +184,6 @@ public function getUpdateButtonHtml()
      * Get update url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateUrl()
     {
@@ -208,7 +194,6 @@ public function getUpdateUrl()
      * Check shipment availability for current invoice
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateShipment()
     {
@@ -224,7 +209,6 @@ public function canCreateShipment()
      * Check if qty can be edited
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEditQty()
     {
@@ -238,7 +222,6 @@ public function canEditQty()
      * Check if capture operation is allowed in ACL
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCaptureAllowed()
     {
@@ -249,7 +232,6 @@ public function isCaptureAllowed()
      * Check if invoice can be captured
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -260,7 +242,6 @@ public function canCapture()
      * Check if gateway is associated with invoice order
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGatewayUsed()
     {
@@ -271,7 +252,6 @@ public function isGatewayUsed()
      * Check if new invoice emails can be sent
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSendInvoiceEmail()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
index 5d4c5e6ad22c6..7ad22a919f4d4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Adminhtml\Totals
 {
@@ -20,7 +19,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals
      * Order invoice
      *
      * @var Invoice|null
-     * @since 2.0.0
      */
     protected $_invoice = null;
 
@@ -28,7 +26,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals
      * Get invoice
      *
      * @return Invoice|null
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -48,7 +45,6 @@ public function getInvoice()
      * Get source
      *
      * @return Invoice|null
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -59,7 +55,6 @@ public function getSource()
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index e757b619fbb70..a3cb3b2552e84 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -21,7 +20,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Admin session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -29,7 +27,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,7 +34,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Backend session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_backendSession;
 
@@ -46,7 +42,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Model\Auth\Session $backendSession
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -171,7 +165,6 @@ protected function _construct()
      * Check whether order is under payment review
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isPaymentReview()
     {
@@ -183,7 +176,6 @@ protected function _isPaymentReview()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -194,7 +186,6 @@ public function getInvoice()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -220,7 +211,6 @@ public function getHeaderText()
      * Get back url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -237,7 +227,6 @@ public function getBackUrl()
      * Get capture url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCaptureUrl()
     {
@@ -248,7 +237,6 @@ public function getCaptureUrl()
      * Get void url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVoidUrl()
     {
@@ -259,7 +247,6 @@ public function getVoidUrl()
      * Get cancel url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCancelUrl()
     {
@@ -270,7 +257,6 @@ public function getCancelUrl()
      * Get email url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmailUrl()
     {
@@ -284,7 +270,6 @@ public function getEmailUrl()
      * Get credit memo url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreditMemoUrl()
     {
@@ -298,7 +283,6 @@ public function getCreditMemoUrl()
      * Get print url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -310,7 +294,6 @@ public function getPrintUrl()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function updateBackButtonUrl($flag)
     {
@@ -332,7 +315,6 @@ public function updateBackButtonUrl($flag)
      *
      * @param string $resourceId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowedAction($resourceId)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
index 65a5e669f4ecf..8e44361ef62d3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comments extends \Magento\Backend\Block\Text\ListText
 {
@@ -18,7 +17,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -52,7 +48,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -63,7 +58,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
index 9293d7ade1915..672b7e893d367 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -18,7 +17,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -29,7 +27,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -40,7 +37,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -51,7 +47,6 @@ public function getInvoice()
      * Retrieve order url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderUrl()
     {
@@ -63,7 +58,6 @@ public function getOrderUrl()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
index 2e4c80eac4e20..9e7c59db20493 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
@@ -9,7 +9,6 @@
  * Adminhtml sales item renderer
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -17,7 +16,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -28,7 +26,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -39,7 +36,6 @@ public function getSource()
      * Retrieve invoice model instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -50,7 +46,6 @@ public function getInvoice()
      * Retrieve order url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderUrl()
     {
@@ -62,7 +57,6 @@ public function getOrderUrl()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
index d92d4b779fd6f..0914241e4deda 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Payment extends \Magento\Backend\Block\Template
 {
@@ -20,7 +19,6 @@ class Payment extends \Magento\Backend\Block\Template
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData = null;
 
@@ -28,7 +26,6 @@ class Payment extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -60,7 +56,6 @@ protected function _beforeToHtml()
      *
      * @param Info $payment
      * @return $this
-     * @since 2.0.0
      */
     public function setPayment($payment)
     {
@@ -74,7 +69,6 @@ public function setPayment($payment)
      * Prepare html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
index 3115534150b75..9be3f34146815 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Status extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Container
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +38,6 @@ protected function _construct()
      * Create url getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -51,7 +48,6 @@ public function getCreateUrl()
      * Assign url getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAssignUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 4fae56517655d..afc70b7c1b7ea 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Assign extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -15,7 +14,6 @@ class Assign extends \Magento\Backend\Block\Widget\Form\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Retrieve text for header element depending on loaded page
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
index 914046b669a07..e6e2649b192d7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
@@ -7,7 +7,6 @@
 
 /**
  * Assign order status to order state form
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -15,7 +14,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Collection factory
      *
      * @var \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -23,7 +21,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Order config
      *
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
@@ -34,7 +31,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory $collectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -65,7 +60,6 @@ protected function _construct()
      * Prepare form fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index 6172c2d983bfb..56c307abe87f8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
 {
@@ -15,7 +14,6 @@ class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Retrieve text for header element depending on loaded page
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
index 153463be879ea..09e9e82ba2873 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
@@ -8,7 +8,6 @@
 /**
  * Edit status form
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus\Form
 {
@@ -16,7 +15,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus\Form
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Modify structure of new status form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
index 6687a200b88a6..3073cea033d8b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NewStatus extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -15,7 +14,6 @@ class NewStatus extends \Magento\Backend\Block\Widget\Form\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * Retrieve text for header element depending on loaded page
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
index 362d3000101a2..363c8cb22f25a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
@@ -7,7 +7,6 @@
 
 /**
  * Create order status form
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -15,7 +14,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -27,7 +25,6 @@ protected function _construct()
      * Prepare form fields and structure
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -79,7 +76,6 @@ protected function _prepareForm()
      * @param \Magento\Sales\Model\Order\Status $model
      * @param \Magento\Framework\Data\Form $form
      * @return void
-     * @since 2.0.0
      */
     protected function _addStoresFieldset($model, $form)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
index ef94aa26850fd..669bff7cda187 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -18,7 +17,6 @@ class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Totals
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = [];
 
@@ -27,7 +25,6 @@ class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -51,7 +48,6 @@ protected function _beforeToHtml()
      * Get totals
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getTotals()
     {
@@ -65,7 +61,6 @@ protected function getTotals()
      * @param float $value
      * @param bool $grand
      * @return $this
-     * @since 2.0.0
      */
     public function addTotal($label, $value, $grand = false)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
index 50084c36938b5..8f40bac0e5582 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Adminhtml\Totals//\Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -18,7 +17,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals//\Magento\Sales\Block
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
index 54873c7c5aee9..07f8c50cd3b1b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
@@ -9,7 +9,6 @@
  * Totals item block
  *
  * @api
- * @since 2.0.0
  */
 class Item extends \Magento\Sales\Block\Adminhtml\Order\Totals
 {
@@ -17,7 +16,6 @@ class Item extends \Magento\Sales\Block\Adminhtml\Order\Totals
      * Determine display parameters before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -34,7 +32,6 @@ protected function _beforeToHtml()
      * Initialize totals object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initTotals()
     {
@@ -60,7 +57,6 @@ public function initTotals()
      * @param float $baseAmount
      * @param float $amount
      * @return string
-     * @since 2.0.0
      */
     public function displayPrices($baseAmount, $amount)
     {
@@ -74,7 +70,6 @@ public function displayPrices($baseAmount, $amount)
      * @param bool $strong
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function displayPriceAttribute($code, $strong = false, $separator = '<br/>')
     {
@@ -85,7 +80,6 @@ public function displayPriceAttribute($code, $strong = false, $separator = '<br/
      * Source order getter
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getSource()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
index 98d2bbb65842f..86766ac049714 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Tax\Block\Sales\Order\Tax
 {
@@ -18,7 +17,6 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * Tax helper
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
@@ -26,7 +24,6 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * Tax calculation
      *
      * @var \Magento\Tax\Model\Calculation
-     * @since 2.0.0
      */
     protected $_taxCalculation;
 
@@ -34,7 +31,6 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * Tax factory
      *
      * @var \Magento\Tax\Model\Sales\Order\TaxFactory
-     * @since 2.0.0
      */
     protected $_taxOrderFactory;
 
@@ -42,7 +38,6 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * Sales admin helper
      *
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     protected $_salesAdminHelper;
 
@@ -54,7 +49,6 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * @param \Magento\Tax\Model\Sales\Order\TaxFactory $taxOrderFactory
      * @param \Magento\Sales\Helper\Admin $salesAdminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      * Get full information about taxes applied to order
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFullTaxInfo()
     {
@@ -107,7 +100,6 @@ public function getFullTaxInfo()
      * @param string $amount
      * @param string $baseAmount
      * @return string
-     * @since 2.0.0
      */
     public function displayAmount($amount, $baseAmount)
     {
@@ -118,7 +110,6 @@ public function displayAmount($amount, $baseAmount)
      * Get store object for process configuration settings
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index 5cbb713fd0b25..8288d5d6c8726 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order view
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -19,7 +18,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Block group
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_Sales';
 
@@ -27,7 +25,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -35,7 +32,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Sales config
      *
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
@@ -43,7 +39,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Reorder helper
      *
      * @var \Magento\Sales\Helper\Reorder
-     * @since 2.0.0
      */
     protected $_reorderHelper;
 
@@ -53,7 +48,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Sales\Helper\Reorder $reorderHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -75,7 +69,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -271,7 +264,6 @@ protected function _construct()
      * Retrieve order model object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -282,7 +274,6 @@ public function getOrder()
      * Retrieve Order Identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -293,7 +284,6 @@ public function getOrderId()
      * Get header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -321,7 +311,6 @@ public function getHeaderText()
      * @param string $params
      * @param array $params2
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($params = '', $params2 = [])
     {
@@ -333,7 +322,6 @@ public function getUrl($params = '', $params2 = [])
      * Edit URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEditUrl()
     {
@@ -344,7 +332,6 @@ public function getEditUrl()
      * Email URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmailUrl()
     {
@@ -355,7 +342,6 @@ public function getEmailUrl()
      * Cancel URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCancelUrl()
     {
@@ -366,7 +352,6 @@ public function getCancelUrl()
      * Invoice URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInvoiceUrl()
     {
@@ -377,7 +362,6 @@ public function getInvoiceUrl()
      * Credit memo URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreditmemoUrl()
     {
@@ -388,7 +372,6 @@ public function getCreditmemoUrl()
      * Hold URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHoldUrl()
     {
@@ -399,7 +382,6 @@ public function getHoldUrl()
      * Unhold URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnholdUrl()
     {
@@ -410,7 +392,6 @@ public function getUnholdUrl()
      * Ship URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShipUrl()
     {
@@ -421,7 +402,6 @@ public function getShipUrl()
      * Comment URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCommentUrl()
     {
@@ -432,7 +412,6 @@ public function getCommentUrl()
      * Reorder URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReorderUrl()
     {
@@ -443,7 +422,6 @@ public function getReorderUrl()
      * Payment void URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVoidPaymentUrl()
     {
@@ -455,7 +433,6 @@ public function getVoidPaymentUrl()
      *
      * @param string $resourceId
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowedAction($resourceId)
     {
@@ -466,7 +443,6 @@ protected function _isAllowedAction($resourceId)
      * Return back url for view grid
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -482,7 +458,6 @@ public function getBackUrl()
      *
      * @param string $action
      * @return string
-     * @since 2.0.0
      */
     public function getReviewPaymentUrl($action)
     {
@@ -492,7 +467,6 @@ public function getReviewPaymentUrl($action)
     /**
      * @param \Magento\Sales\Model\Order $order
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function getEditMessage($order)
     {
@@ -513,7 +487,6 @@ protected function getEditMessage($order)
     /**
      * @param \Magento\Sales\Model\Order $order
      * @return array
-     * @since 2.0.0
      */
     protected function getNonEditableTypes($order)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index 0264904322542..82c3effcab62d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -9,7 +9,6 @@
  * Adminhtml sales order view plane
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Template
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/view/form.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
index 3149165045e6b..c361d8dae81d7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Giftmessage extends \Magento\Backend\Block\Widget
 {
@@ -18,7 +17,6 @@ class Giftmessage extends \Magento\Backend\Block\Widget
      * Entity for editing of gift message
      *
      * @var \Magento\Eav\Model\Entity\AbstractEntity
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -26,7 +24,6 @@ class Giftmessage extends \Magento\Backend\Block\Widget
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -34,7 +31,6 @@ class Giftmessage extends \Magento\Backend\Block\Widget
      * Message factory
      *
      * @var \Magento\GiftMessage\Model\MessageFactory
-     * @since 2.0.0
      */
     protected $_messageFactory;
 
@@ -42,7 +38,6 @@ class Giftmessage extends \Magento\Backend\Block\Widget
      * Message helper
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -52,7 +47,6 @@ class Giftmessage extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Retrieve order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -82,7 +75,6 @@ public function getOrder()
      * Giftmessage object
      *
      * @var \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     protected $_giftMessage;
 
@@ -90,7 +82,6 @@ public function getOrder()
      * Before rendering html, but after trying to load cache
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -104,7 +95,6 @@ protected function _beforeToHtml()
      * Prepares layout of block
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -121,7 +111,6 @@ protected function _prepareLayout()
      * Retrieve save button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -139,7 +128,6 @@ public function getSaveButtonHtml()
      *
      * @param \Magento\Framework\DataObject $entity
      * @return $this
-     * @since 2.0.0
      */
     public function setEntity(\Magento\Framework\DataObject $entity)
     {
@@ -151,7 +139,6 @@ public function setEntity(\Magento\Framework\DataObject $entity)
      * Retrieve entity for form
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -166,7 +153,6 @@ public function getEntity()
      * Retrieve default value for giftmessage sender
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSender()
     {
@@ -185,7 +171,6 @@ public function getDefaultSender()
      * Retrieve default value for giftmessage recipient
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultRecipient()
     {
@@ -215,7 +200,6 @@ public function getDefaultRecipient()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName($name)
     {
@@ -227,7 +211,6 @@ public function getFieldName($name)
      *
      * @param string $id
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId($id)
     {
@@ -238,7 +221,6 @@ public function getFieldId($id)
      * Retrieve field html id prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldIdPrefix()
     {
@@ -249,7 +231,6 @@ public function getFieldIdPrefix()
      * Initialize gift message for entity
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessage()
     {
@@ -270,7 +251,6 @@ protected function _initMessage()
      * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -285,7 +265,6 @@ public function getMessage()
      * Get save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -299,7 +278,6 @@ public function getSaveUrl()
      * Retrieve block html id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -310,7 +288,6 @@ public function getHtmlId()
      * Indicates that block can display giftmessages form
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayGiftmessage()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index 383f85b09c005..2b488999947d0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -9,7 +9,6 @@
  * Order history block
  *
  * @api
- * @since 2.0.0
  */
 class History extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class History extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,13 +23,11 @@ class History extends \Magento\Backend\Block\Template
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData = null;
 
     /**
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     private $adminHelper;
 
@@ -41,7 +37,6 @@ class History extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Preparing global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -78,7 +72,6 @@ protected function _prepareLayout()
      * Get stat uses
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStatuses()
     {
@@ -91,7 +84,6 @@ public function getStatuses()
      * Check allow to send order comment email
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSendCommentEmail()
     {
@@ -102,7 +94,6 @@ public function canSendCommentEmail()
      * Retrieve order model
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -113,7 +104,6 @@ public function getOrder()
      * Check allow to add comment
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canAddComment()
     {
@@ -124,7 +114,6 @@ public function canAddComment()
      * Submit URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubmitUrl()
     {
@@ -136,7 +125,6 @@ public function getSubmitUrl()
      *
      * @param  \Magento\Sales\Model\Order\Status\History $history
      * @return bool
-     * @since 2.0.0
      */
     public function isCustomerNotificationNotApplicable(\Magento\Sales\Model\Order\Status\History $history)
     {
@@ -149,7 +137,6 @@ public function isCustomerNotificationNotApplicable(\Magento\Sales\Model\Order\S
      * @param array|string $data
      * @param null|array $allowedTags
      * @return string
-     * @since 2.0.0
      */
     public function escapeHtml($data, $allowedTags = null)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index f3fcfbda8e52a..2c480a6f51ebd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -14,7 +14,6 @@
  * Class Info
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -22,7 +21,6 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Customer service
      *
      * @var \Magento\Customer\Api\CustomerMetadataInterface
-     * @since 2.0.0
      */
     protected $metadata;
 
@@ -30,7 +28,6 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Group service
      *
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
@@ -38,13 +35,11 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Metadata element factory
      *
      * @var \Magento\Customer\Model\Metadata\ElementFactory
-     * @since 2.0.0
      */
     protected $_metadataElementFactory;
 
     /**
      * @var Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -59,7 +54,6 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * @param \Magento\Customer\Model\Metadata\ElementFactory $elementFactory
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +77,6 @@ public function __construct(
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -105,7 +98,6 @@ protected function _beforeToHtml()
      * Get order store name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getOrderStoreName()
     {
@@ -127,7 +119,6 @@ public function getOrderStoreName()
      * Return name of the customer group.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerGroupName()
     {
@@ -149,7 +140,6 @@ public function getCustomerGroupName()
      * Get URL to edit the customer.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerViewUrl()
     {
@@ -165,7 +155,6 @@ public function getCustomerViewUrl()
      *
      * @param int $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($orderId)
     {
@@ -179,7 +168,6 @@ public function getViewUrl($orderId)
      * @param array $data
      * @param int $sortOrder
      * @return int
-     * @since 2.0.0
      */
     protected function _prepareAccountDataSortOrder(array $data, $sortOrder)
     {
@@ -195,7 +183,6 @@ protected function _prepareAccountDataSortOrder(array $data, $sortOrder)
      * Value is option style array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomerAccountData()
     {
@@ -231,7 +218,6 @@ public function getCustomerAccountData()
      * @param \Magento\Sales\Model\Order\Address $address
      * @param string $label
      * @return string
-     * @since 2.0.0
      */
     public function getAddressEditLink($address, $label = '')
     {
@@ -250,7 +236,6 @@ public function getAddressEditLink($address, $label = '')
      * Whether Customer IP address should be displayed on sales documents
      *
      * @return bool
-     * @since 2.0.0
      */
     public function shouldDisplayCustomerIp()
     {
@@ -265,7 +250,6 @@ public function shouldDisplayCustomerIp()
      * Check if is single store mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
@@ -278,7 +262,6 @@ public function isSingleStoreMode()
      * @param mixed $store
      * @param string $createdAt
      * @return \DateTime
-     * @since 2.0.0
      */
     public function getCreatedAtStoreDate($store, $createdAt)
     {
@@ -290,7 +273,6 @@ public function getCreatedAtStoreDate($store, $createdAt)
      *
      * @param mixed $store
      * @return string
-     * @since 2.0.0
      */
     public function getTimezoneForStore($store)
     {
@@ -305,7 +287,6 @@ public function getTimezoneForStore($store)
      *
      * @param string $createdAt
      * @return \DateTime
-     * @since 2.0.0
      */
     public function getOrderAdminDate($createdAt)
     {
@@ -317,7 +298,6 @@ public function getOrderAdminDate($createdAt)
      *
      * @param Address $address
      * @return null|string
-     * @since 2.0.0
      */
     public function getFormattedAddress(Address $address)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
index abd3fde02e87a..b2a888c516a6c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
@@ -11,7 +11,6 @@
  * Adminhtml order items grid
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -30,7 +29,6 @@ public function getColumns()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -45,7 +43,6 @@ protected function _beforeToHtml()
      * Retrieve order items collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index 40d5f641aa747..a6129207fa1ee 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -11,7 +11,6 @@
  * Adminhtml sales order item renderer
  *
  * @api
- * @since 2.0.0
  */
 class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer
 {
@@ -19,7 +18,6 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
      * Message helper
      *
      * @var \Magento\GiftMessage\Helper\Message
-     * @since 2.0.0
      */
     protected $_messageHelper;
 
@@ -27,7 +25,6 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
      * Checkout helper
      *
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $_checkoutHelper;
 
@@ -35,7 +32,6 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
      * Giftmessage object
      *
      * @var \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     protected $_giftMessage = [];
 
@@ -47,7 +43,6 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\Defa
      * @param \Magento\GiftMessage\Helper\Message $messageHelper
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      * Get order item
      *
      * @return Item
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -79,7 +73,6 @@ public function getItem()
      *
      * @param string $id
      * @return string
-     * @since 2.0.0
      */
     public function getFieldId($id)
     {
@@ -90,7 +83,6 @@ public function getFieldId($id)
      * Retrieve field html id prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldIdPrefix()
     {
@@ -101,7 +93,6 @@ public function getFieldIdPrefix()
      * Indicate that block can display container
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayContainer()
     {
@@ -112,7 +103,6 @@ public function canDisplayContainer()
      * Retrieve default value for giftmessage sender
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSender()
     {
@@ -131,7 +121,6 @@ public function getDefaultSender()
      * Retrieve default value for giftmessage recipient
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultRecipient()
     {
@@ -161,7 +150,6 @@ public function getDefaultRecipient()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function getFieldName($name)
     {
@@ -172,7 +160,6 @@ public function getFieldName($name)
      * Initialize gift message for entity
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessage()
     {
@@ -195,7 +182,6 @@ protected function _initMessage()
      * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -210,7 +196,6 @@ public function getMessage()
      * Retrieve save url
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -224,7 +209,6 @@ public function getSaveUrl()
      * Retrieve block html id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -235,7 +219,6 @@ public function getHtmlId()
      * Indicates that block can display giftmessages form
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplayGiftmessage()
     {
@@ -251,7 +234,6 @@ public function canDisplayGiftmessage()
      *
      * @param Item $item
      * @return string
-     * @since 2.0.0
      */
     public function displaySubtotalInclTax($item)
     {
@@ -266,7 +248,6 @@ public function displaySubtotalInclTax($item)
      *
      * @param Item|\Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     public function displayPriceInclTax(\Magento\Framework\DataObject $item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
index e747f8bee76ab..11624c86b6d80 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Messages extends \Magento\Framework\View\Element\Messages
 {
@@ -21,7 +20,6 @@ class Messages extends \Magento\Framework\View\Element\Messages
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
@@ -33,7 +31,6 @@ class Messages extends \Magento\Framework\View\Element\Messages
      * @param InterpretationStrategyInterface $interpretationStrategy
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Retrieve order model instance
      *
      * @return Order
-     * @since 2.0.0
      */
     protected function _getOrder()
     {
@@ -70,7 +66,6 @@ protected function _getOrder()
      * Preparing global layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
index 4dbad65342d80..fd567b6aba110 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
@@ -9,14 +9,12 @@
  * Order Credit Memos grid
  *
  * @api
- * @since 2.0.0
  */
 class Creditmemos extends \Magento\Framework\View\Element\Text\ListText implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -25,7 +23,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -34,7 +31,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -43,7 +39,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index b7d48ab9b60fa..e7dfd6c6e4816 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -9,7 +9,6 @@
  * Order history tab
  *
  * @api
- * @since 2.0.0
  */
 class History extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
@@ -17,7 +16,6 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
      * Template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/view/tab/history.phtml';
 
@@ -25,13 +23,11 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     private $adminHelper;
 
@@ -40,7 +36,6 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Retrieve order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -72,7 +66,6 @@ public function getOrder()
      * and avoid generating it dynamically
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFullHistory()
     {
@@ -158,7 +151,6 @@ public function getFullHistory()
      * @param string $dateType
      * @param int $format
      * @return string
-     * @since 2.0.0
      */
     public function getItemCreatedAt(array $item, $dateType = 'date', $format = \IntlDateFormatter::MEDIUM)
     {
@@ -176,7 +168,6 @@ public function getItemCreatedAt(array $item, $dateType = 'date', $format = \Int
      *
      * @param array $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemTitle(array $item)
     {
@@ -189,7 +180,6 @@ public function getItemTitle(array $item)
      * @param array $item
      * @param bool $isSimpleCheck
      * @return bool
-     * @since 2.0.0
      */
     public function isItemNotified(array $item, $isSimpleCheck = true)
     {
@@ -204,7 +194,6 @@ public function isItemNotified(array $item, $isSimpleCheck = true)
      *
      * @param array $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemComment(array $item)
     {
@@ -221,7 +210,6 @@ public function getItemComment(array $item)
      * @param \DateTimeInterface $created
      * @param string $comment
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareHistoryItem($label, $notified, $created, $comment = '')
     {
@@ -230,7 +218,6 @@ protected function _prepareHistoryItem($label, $notified, $created, $comment = '
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -239,7 +226,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -250,7 +236,6 @@ public function getTabTitle()
      * Get Tab Class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -261,7 +246,6 @@ public function getTabClass()
      * Get Class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -272,7 +256,6 @@ public function getClass()
      * Get Tab Url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -281,7 +264,6 @@ public function getTabUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -290,7 +272,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -302,7 +283,6 @@ public function isHidden()
      *
      * @param array $historyItem
      * @return bool
-     * @since 2.0.0
      */
     public function isCustomerNotificationNotApplicable($historyItem)
     {
@@ -316,7 +296,6 @@ public function isCustomerNotificationNotApplicable($historyItem)
      * @param mixed $a
      * @param mixed $b
      * @return int
-     * @since 2.0.0
      */
     public static function sortHistoryByTimestamp($a, $b)
     {
@@ -335,7 +314,6 @@ public static function sortHistoryByTimestamp($a, $b)
      *
      * @param int $createdAt
      * @return \DateTime
-     * @since 2.0.0
      */
     public function getOrderAdminDate($createdAt)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
index 7057e8875e709..1a3e8d5eb50d5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -19,7 +18,6 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder implements
      * Retrieve order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -30,7 +28,6 @@ public function getOrder()
      * Retrieve source model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -41,7 +38,6 @@ public function getSource()
      * Retrieve order totals block settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderTotalData()
     {
@@ -56,7 +52,6 @@ public function getOrderTotalData()
      * Get order info data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrderInfoData()
     {
@@ -67,7 +62,6 @@ public function getOrderInfoData()
      * Get tracking html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTrackingHtml()
     {
@@ -78,7 +72,6 @@ public function getTrackingHtml()
      * Get items html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemsHtml()
     {
@@ -89,7 +82,6 @@ public function getItemsHtml()
      * Retrieve gift options container block html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGiftOptionsHtml()
     {
@@ -100,7 +92,6 @@ public function getGiftOptionsHtml()
      * Get payment html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentHtml()
     {
@@ -112,7 +103,6 @@ public function getPaymentHtml()
      *
      * @param int $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($orderId)
     {
@@ -125,7 +115,6 @@ public function getViewUrl($orderId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -134,7 +123,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -143,7 +131,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -152,7 +139,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
index 3ee9656e9b4d4..7e5d8d635b0b2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
@@ -9,14 +9,12 @@
  * Order Invoices grid
  *
  * @api
- * @since 2.0.0
  */
 class Invoices extends \Magento\Framework\View\Element\Text\ListText implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -25,7 +23,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -34,7 +31,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -43,7 +39,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
index c74a1325a25a7..acc0af7ea3473 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
@@ -9,7 +9,6 @@
  * Order Shipments grid
  *
  * @api
- * @since 2.0.0
  */
 class Shipments extends \Magento\Framework\View\Element\Text\ListText implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -18,7 +17,6 @@ class Shipments extends \Magento\Framework\View\Element\Text\ListText implements
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -28,7 +26,6 @@ class Shipments extends \Magento\Framework\View\Element\Text\ListText implements
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Retrieve order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -52,7 +48,6 @@ public function getOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -61,7 +56,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -70,7 +64,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -82,7 +75,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
index 4aed239bf0371..aafdeb0209dbe 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
@@ -9,14 +9,12 @@
  * Order transactions tab
  *
  * @api
- * @since 2.0.0
  */
 class Transactions extends \Magento\Framework\View\Element\Text\ListText implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
@@ -24,7 +22,6 @@ class Transactions extends \Magento\Framework\View\Element\Text\ListText impleme
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -33,7 +30,6 @@ class Transactions extends \Magento\Framework\View\Element\Text\ListText impleme
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Retrieve order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -59,7 +54,6 @@ public function getOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -68,7 +62,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -77,7 +70,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -86,7 +78,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
index c48d8e6f76654..a0f2e5388a94a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
@@ -9,7 +9,6 @@
  * Order view tabs
  *
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -17,7 +16,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      *
      * @return \Magento\Sales\Model\Order
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -65,7 +61,6 @@ public function getOrder()
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
index b07cd062ea940..e6e5d6ec3df3f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
@@ -9,7 +9,6 @@
  * Adminhtml alert queue grid block action item renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -17,7 +16,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * Array to store all options data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_actions = [];
 
@@ -25,7 +23,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * Sales reorder
      *
      * @var \Magento\Sales\Helper\Reorder
-     * @since 2.0.0
      */
     protected $_salesReorder = null;
 
@@ -33,7 +30,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Sales\Helper\Reorder $salesReorder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
@@ -73,7 +68,6 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _getEscapedValue($value)
     {
@@ -85,7 +79,6 @@ protected function _getEscapedValue($value)
      *
      * @param array $actions
      * @return string
-     * @since 2.0.0
      */
     protected function _actionsToHtml(array $actions = [])
     {
@@ -108,7 +101,6 @@ protected function _actionsToHtml(array $actions = [])
      *
      * @param array $actionArray
      * @return void
-     * @since 2.0.0
      */
     public function addToActions($actionArray)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
index 5bba7ce99dbb3..5d3bcafc6da91 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
 {
@@ -19,7 +18,6 @@ class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
      * Order config
      *
      * @var \Magento\Sales\Model\Order\ConfigFactory
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
@@ -29,7 +27,6 @@ class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Sales\Model\Order\ConfigFactory $orderConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Add fields to base fieldset which are general to sales reports
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
index 949309a0ab1e0..5e76234b0c615 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
 {
@@ -19,7 +18,6 @@ class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
      * Flag that keep info should we render specific dependent element or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_renderDependentElement = false;
 
@@ -27,7 +25,6 @@ class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
      * Rule factory
      *
      * @var \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory
-     * @since 2.0.0
      */
     protected $_reportRule;
 
@@ -38,7 +35,6 @@ class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
      * @param \Magento\Sales\Model\Order\ConfigFactory $orderConfig
      * @param \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory $reportRule
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Prepare form
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -107,7 +102,6 @@ protected function _prepareForm()
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     protected function _afterToHtml($html)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
index c31d74d9a52bb..0607903977076 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
@@ -11,7 +11,6 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
 {
@@ -20,7 +19,6 @@ class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index a8ef2bacdc836..fbb78970a4de0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -8,19 +8,16 @@
 /**
  * Class Link
  * @package Magento\Sales\Block\Adminhtml\Rss\Order\Grid
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rss/order/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -28,7 +25,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -50,7 +45,6 @@ public function getLink()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -61,7 +55,6 @@ public function getLabel()
      * Check whether status notification is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -70,7 +63,6 @@ public function isRssAllowed()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Shipment.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php
index 800ac78649d26..2226ec63fff55 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Shipment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php
@@ -9,7 +9,6 @@
  * Adminhtml sales shipments block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipment extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Shipment extends \Magento\Backend\Block\Widget\Grid\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
index e7be9306f612f..22745ce442c45 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Block\Adminhtml\System\Config\Form\Fieldset\Order\Statuses
  *
- * @since 2.0.0
  */
 class Statuses extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
@@ -16,7 +15,6 @@ class Statuses extends \Magento\Config\Block\System\Config\Form\Fieldset
      * Dummy element
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_dummyElement;
 
@@ -24,13 +22,11 @@ class Statuses extends \Magento\Config\Block\System\Config\Form\Fieldset
      * Field renderer
      *
      * @var \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     protected $_fieldRenderer;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_values;
 
@@ -38,7 +34,6 @@ class Statuses extends \Magento\Config\Block\System\Config\Form\Fieldset
      * Order status collection
      *
      * @var \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderStatusCollection;
 
@@ -48,7 +43,6 @@ class Statuses extends \Magento\Config\Block\System\Config\Form\Fieldset
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory $orderStatusCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -84,7 +77,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      * Get dummy element
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _getDummyElement()
     {
@@ -98,7 +90,6 @@ protected function _getDummyElement()
      * Get field renderer
      *
      * @return \Magento\Config\Block\System\Config\Form\Field
-     * @since 2.0.0
      */
     protected function _getFieldRenderer()
     {
@@ -118,7 +109,6 @@ protected function _getFieldRenderer()
      * @param string $status
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getFieldHtml($fieldset, $id, $status)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 9611e9b92548b..cb467f76b7fcf 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Block\Adminhtml\Totals
  *
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
@@ -16,7 +15,6 @@ class Totals extends \Magento\Sales\Block\Order\Totals
      * Admin helper
      *
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     protected $_adminHelper;
 
@@ -25,7 +23,6 @@ class Totals extends \Magento\Sales\Block\Order\Totals
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $total
      * @return string
-     * @since 2.0.0
      */
     public function formatValue($total)
     {
@@ -56,7 +52,6 @@ public function formatValue($total)
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php
index 0c2186870e7cb..21ccf616323e2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Transactions extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Transactions extends \Magento\Backend\Block\Widget\Grid\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
index 5c6bce1cc9dc4..f7b3fdf3c27c0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Detail extends \Magento\Backend\Block\Widget\Container
 {
@@ -21,7 +20,6 @@ class Detail extends \Magento\Backend\Block\Widget\Container
      * Transaction model
      *
      * @var \Magento\Sales\Model\Order\Payment\Transaction
-     * @since 2.0.0
      */
     protected $_txn;
 
@@ -29,19 +27,16 @@ class Detail extends \Magento\Backend\Block\Widget\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     private $adminHelper;
 
     /**
      * @var OrderPaymentRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderPaymentRepository;
 
@@ -51,7 +46,6 @@ class Detail extends \Magento\Backend\Block\Widget\Container
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param \Magento\Sales\Api\OrderPaymentRepositoryInterface $orderPaymentRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      * Add control buttons
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -105,7 +98,6 @@ protected function _construct()
      * Retrieve header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -124,7 +116,6 @@ public function getHeaderText()
      * Render block html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
index b7644ea3cf7a4..7f5f9d6834b48 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Collection factory
      *
      * @var \Magento\Framework\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -36,7 +33,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Framework\Data\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Initialize default sorting and html ID
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +62,6 @@ protected function _construct()
      * Prepare collection for grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -85,7 +79,6 @@ protected function _prepareCollection()
      * Add columns to grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -121,7 +114,6 @@ protected function _prepareColumns()
      * Retrieve Transaction addtitional info
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTransactionAdditionalInfo()
     {
diff --git a/app/code/Magento/Sales/Block/Guest/Link.php b/app/code/Magento/Sales/Block/Guest/Link.php
index c5a35b4945d00..587df8956900a 100644
--- a/app/code/Magento/Sales/Block/Guest/Link.php
+++ b/app/code/Magento/Sales/Block/Guest/Link.php
@@ -12,13 +12,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link\Current
 {
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -27,7 +25,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link\Current
      * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Items/AbstractItems.php
index 31cc33495aa11..7680d90cdd499 100644
--- a/app/code/Magento/Sales/Block/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Items/AbstractItems.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class AbstractItems extends \Magento\Framework\View\Element\Template
 {
@@ -26,7 +25,6 @@ class AbstractItems extends \Magento\Framework\View\Element\Template
      * @return \Magento\Framework\View\Element\AbstractBlock
      * @throws \RuntimeException
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getItemRenderer($type)
     {
@@ -52,7 +50,6 @@ public function getItemRenderer($type)
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
@@ -64,7 +61,6 @@ protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $r
      *
      * @param \Magento\Framework\DataObject $item
      * @return string
-     * @since 2.0.0
      */
     protected function _getItemType(\Magento\Framework\DataObject $item)
     {
@@ -83,7 +79,6 @@ protected function _getItemType(\Magento\Framework\DataObject $item)
      *
      * @param   \Magento\Framework\DataObject $item
      * @return  string
-     * @since 2.0.0
      */
     public function getItemHtml(\Magento\Framework\DataObject $item)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Comments.php b/app/code/Magento/Sales/Block/Order/Comments.php
index 0c4fac9581916..0b6d2d2cf9cd2 100644
--- a/app/code/Magento/Sales/Block/Order/Comments.php
+++ b/app/code/Magento/Sales/Block/Order/Comments.php
@@ -7,25 +7,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Comments extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_invoiceCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_memoCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_shipmentCollectionFactory;
 
@@ -33,7 +29,6 @@ class Comments extends \Magento\Framework\View\Element\Template
      * Current entity (model instance) with getCommentsCollection() method
      *
      * @var \Magento\Sales\Model\AbstractModel
-     * @since 2.0.0
      */
     protected $_entity;
 
@@ -41,7 +36,6 @@ class Comments extends \Magento\Framework\View\Element\Template
      * Current comments collection
      *
      * @var \Magento\Sales\Model\ResourceModel\Order\Comment\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_commentCollection;
 
@@ -51,7 +45,6 @@ class Comments extends \Magento\Framework\View\Element\Template
      * @param \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\CollectionFactory $memoCollectionFactory
      * @param \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\CollectionFactory $shipmentCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -71,7 +64,6 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\AbstractModel $entity
      * @return $this
-     * @since 2.0.0
      */
     public function setEntity($entity)
     {
@@ -85,7 +77,6 @@ public function setEntity($entity)
      * Gets comments parent model instance
      *
      * @return \Magento\Sales\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getEntity()
     {
@@ -97,7 +88,6 @@ public function getEntity()
      *
      * @return \Magento\Sales\Model\ResourceModel\Order\Comment\Collection\AbstractCollection
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getComments()
     {
@@ -123,7 +113,6 @@ public function getComments()
      * Returns whether there are comments to show on frontend
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasComments()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo.php b/app/code/Magento/Sales/Block/Order/Creditmemo.php
index 92ae1ec8fb608..6bbafd15df277 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo.php
@@ -12,25 +12,21 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/creditmemo.phtml';
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
@@ -40,7 +36,6 @@ class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -68,7 +62,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -79,7 +72,6 @@ public function getPaymentInfoHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -90,7 +82,6 @@ public function getOrder()
      * Return back url for logged in and guest users
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -104,7 +95,6 @@ public function getBackUrl()
      * Return back title for logged in and guest users
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getBackTitle()
     {
@@ -117,7 +107,6 @@ public function getBackTitle()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getInvoiceUrl($order)
     {
@@ -127,7 +116,6 @@ public function getInvoiceUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getShipmentUrl($order)
     {
@@ -137,7 +125,6 @@ public function getShipmentUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($order)
     {
@@ -147,7 +134,6 @@ public function getViewUrl($order)
     /**
      * @param object $creditmemo
      * @return string
-     * @since 2.0.0
      */
     public function getPrintCreditmemoUrl($creditmemo)
     {
@@ -157,7 +143,6 @@ public function getPrintCreditmemoUrl($creditmemo)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllCreditmemosUrl($order)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo/Items.php b/app/code/Magento/Sales/Block/Order/Creditmemo/Items.php
index e1683db10e91c..5f354b0953365 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo/Items.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,7 +18,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -52,7 +48,6 @@ public function getOrder()
     /**
      * @param object $creditmemo
      * @return string
-     * @since 2.0.0
      */
     public function getPrintCreditmemoUrl($creditmemo)
     {
@@ -62,7 +57,6 @@ public function getPrintCreditmemoUrl($creditmemo)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllCreditmemosUrl($order)
     {
@@ -74,7 +68,6 @@ public function getPrintAllCreditmemosUrl($order)
      *
      * @param   \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return  string
-     * @since 2.0.0
      */
     public function getTotalsHtml($creditmemo)
     {
@@ -92,7 +85,6 @@ public function getTotalsHtml($creditmemo)
      *
      * @param   \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return  string
-     * @since 2.0.0
      */
     public function getCommentsHtml($creditmemo)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
index 95e5027a3abf5..e1e6b85542b58 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
@@ -20,7 +19,6 @@ class Totals extends \Magento\Sales\Block\Order\Totals
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -33,13 +31,11 @@ public function __construct(
 
     /**
      * @var Creditmemo|null
-     * @since 2.0.0
      */
     protected $_creditmemo = null;
 
     /**
      * @return Creditmemo|null
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -58,7 +54,6 @@ public function getCreditmemo()
     /**
      * @param Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemo($creditmemo)
     {
@@ -70,7 +65,6 @@ public function setCreditmemo($creditmemo)
      * Get totals source object
      *
      * @return Creditmemo
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -81,7 +75,6 @@ public function getSource()
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php b/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
index d77f57e8cf43f..78f537aa13402 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,7 +18,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
index bb1a9908af809..f71a81cc058c8 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -22,7 +21,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
      * @return \Magento\Sales\Block\Items\AbstractItems
-     * @since 2.0.0
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items.php b/app/code/Magento/Sales/Block/Order/Email/Items.php
index 1b4842b4d00c9..0cd56ad21fb98 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
index 349f092a2f4be..330ce6af1ae2b 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class DefaultItems extends \Magento\Framework\View\Element\Template
 {
@@ -22,7 +21,6 @@ class DefaultItems extends \Magento\Framework\View\Element\Template
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -31,7 +29,6 @@ public function getOrder()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getItemOptions()
     {
@@ -54,7 +51,6 @@ public function getItemOptions()
     /**
      * @param string|array $value
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($value)
     {
@@ -75,7 +71,6 @@ public function getValueHtml($value)
     /**
      * @param mixed $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getSku($item)
     {
@@ -90,7 +85,6 @@ public function getSku($item)
      * Return product additional information block
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getProductAdditionalInformationBlock()
     {
@@ -102,7 +96,6 @@ public function getProductAdditionalInformationBlock()
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemPrice($item)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
index a40286b2f2e3c..9759ec85aaf13 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class DefaultOrder extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class DefaultOrder extends \Magento\Framework\View\Element\Template
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -29,7 +27,6 @@ public function getOrder()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getItemOptions()
     {
@@ -52,7 +49,6 @@ public function getItemOptions()
     /**
      * @param string|array $value
      * @return string
-     * @since 2.0.0
      */
     public function getValueHtml($value)
     {
@@ -73,7 +69,6 @@ public function getValueHtml($value)
     /**
      * @param mixed $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getSku($item)
     {
@@ -88,7 +83,6 @@ public function getSku($item)
      * Return product additional information block
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getProductAdditionalInformationBlock()
     {
@@ -100,7 +94,6 @@ public function getProductAdditionalInformationBlock()
      *
      * @param OrderItem $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemPrice(OrderItem $item)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
index a570eb9940724..905819966c4e5 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -22,7 +21,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
      * @return \Magento\Sales\Block\Items\AbstractItems
-     * @since 2.0.0
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index 0596e167c5a1c..de4c1c76e193d 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -12,43 +12,37 @@
  * Sales order history block
  *
  * @api
- * @since 2.0.0
  */
 class History extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/history.phtml';
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderCollectionFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $orders;
 
     /**
      * @var CollectionFactoryInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $orderCollectionFactory;
 
@@ -58,7 +52,6 @@ class History extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -75,7 +68,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -86,8 +78,8 @@ protected function _construct()
     /**
      * @return CollectionFactoryInterface
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getOrderCollectionFactory()
     {
@@ -99,7 +91,6 @@ private function getOrderCollectionFactory()
 
     /**
      * @return bool|\Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     public function getOrders()
     {
@@ -122,7 +113,6 @@ public function getOrders()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -142,7 +132,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPagerHtml()
     {
@@ -152,7 +141,6 @@ public function getPagerHtml()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($order)
     {
@@ -162,7 +150,6 @@ public function getViewUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getTrackUrl($order)
     {
@@ -172,7 +159,6 @@ public function getTrackUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getReorderUrl($order)
     {
@@ -181,7 +167,6 @@ public function getReorderUrl($order)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Order/History/Container.php b/app/code/Magento/Sales/Block/Order/History/Container.php
index 6a96848927f07..6ca91a905a908 100644
--- a/app/code/Magento/Sales/Block/Order/History/Container.php
+++ b/app/code/Magento/Sales/Block/Order/History/Container.php
@@ -9,13 +9,13 @@
  * Sales order history extra container block
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Container extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $order;
 
@@ -24,7 +24,7 @@ class Container extends \Magento\Framework\View\Element\Template
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function setOrder(\Magento\Sales\Api\Data\OrderInterface $order)
     {
@@ -36,7 +36,7 @@ public function setOrder(\Magento\Sales\Api\Data\OrderInterface $order)
      * Get order
      *
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getOrder()
     {
@@ -50,7 +50,7 @@ private function getOrder()
      * @param bool $useCache
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getChildHtml($alias = '', $useCache = false)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Info.php b/app/code/Magento/Sales/Block/Order/Info.php
index 5ff3ab6a28116..d3db2271db521 100644
--- a/app/code/Magento/Sales/Block/Order/Info.php
+++ b/app/code/Magento/Sales/Block/Order/Info.php
@@ -16,13 +16,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/info.phtml';
 
@@ -30,19 +28,16 @@ class Info extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var AddressRenderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -52,7 +47,6 @@ class Info extends \Magento\Framework\View\Element\Template
      * @param PaymentHelper $paymentHelper
      * @param AddressRenderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         TemplateContext $context,
@@ -70,7 +64,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -81,7 +74,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -92,7 +84,6 @@ public function getPaymentInfoHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -104,7 +95,6 @@ public function getOrder()
      *
      * @param Address $address
      * @return null|string
-     * @since 2.0.0
      */
     public function getFormattedAddress(Address $address)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons.php b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
index 1679efab9c546..0837dce94d5d6 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Buttons extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/info/buttons.phtml';
 
@@ -27,13 +25,11 @@ class Buttons extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -42,7 +38,6 @@ class Buttons extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -72,7 +66,6 @@ public function getOrder()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl($order)
     {
@@ -87,7 +80,6 @@ public function getPrintUrl($order)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return string
-     * @since 2.0.0
      */
     public function getReorderUrl($order)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index 43f9e073f251d..0aadde0405e84 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -9,25 +9,21 @@
  * Block of links in Order view page
  *
  * @api
- * @since 2.0.0
  */
 class Rss extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/info/buttons/rss.phtml';
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -36,7 +32,6 @@ class Rss extends \Magento\Framework\View\Element\Template
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -51,7 +46,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -60,7 +54,6 @@ public function getLink()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
@@ -71,7 +64,6 @@ public function getLabel()
      * Check whether status notification is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -86,7 +78,6 @@ public function isRssAllowed()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function getUrlKey($order)
     {
@@ -100,7 +91,6 @@ protected function getUrlKey($order)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Invoice.php b/app/code/Magento/Sales/Block/Order/Invoice.php
index 11e234cc4685e..2b51814ed3cb0 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice.php
@@ -11,25 +11,21 @@
  * Sales order view block
  *
  * @api
- * @since 2.0.0
  */
 class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/invoice.phtml';
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
@@ -39,7 +35,6 @@ class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -67,7 +61,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -78,7 +71,6 @@ public function getPaymentInfoHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -89,7 +81,6 @@ public function getOrder()
      * Return back url for logged in and guest users
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -103,7 +94,6 @@ public function getBackUrl()
      * Return back title for logged in and guest users
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getBackTitle()
     {
@@ -116,7 +106,6 @@ public function getBackTitle()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($order)
     {
@@ -126,7 +115,6 @@ public function getViewUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getShipmentUrl($order)
     {
@@ -136,7 +124,6 @@ public function getShipmentUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getCreditmemoUrl($order)
     {
@@ -146,7 +133,6 @@ public function getCreditmemoUrl($order)
     /**
      * @param object $invoice
      * @return string
-     * @since 2.0.0
      */
     public function getPrintInvoiceUrl($invoice)
     {
@@ -156,7 +142,6 @@ public function getPrintInvoiceUrl($invoice)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllInvoicesUrl($order)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Invoice/Items.php
index aeeefeec18d31..be4926d015169 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -21,7 +20,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -29,7 +27,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -54,7 +50,6 @@ public function getOrder()
     /**
      * @param object $invoice
      * @return string
-     * @since 2.0.0
      */
     public function getPrintInvoiceUrl($invoice)
     {
@@ -64,7 +59,6 @@ public function getPrintInvoiceUrl($invoice)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllInvoicesUrl($order)
     {
@@ -76,7 +70,6 @@ public function getPrintAllInvoicesUrl($order)
      *
      * @param   \Magento\Sales\Model\Order\Invoice $invoice
      * @return  string
-     * @since 2.0.0
      */
     public function getInvoiceTotalsHtml($invoice)
     {
@@ -94,7 +87,6 @@ public function getInvoiceTotalsHtml($invoice)
      *
      * @param   \Magento\Sales\Model\Order\Invoice $invoice
      * @return  string
-     * @since 2.0.0
      */
     public function getInvoiceCommentsHtml($invoice)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Invoice/Totals.php b/app/code/Magento/Sales/Block/Order/Invoice/Totals.php
index 6f8d7bab4b54e..f14c99ac9e36e 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice/Totals.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
@@ -17,7 +16,6 @@ class Totals extends \Magento\Sales\Block\Order\Totals
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -30,13 +28,11 @@ public function __construct(
 
     /**
      * @var Order|null
-     * @since 2.0.0
      */
     protected $_invoice = null;
 
     /**
      * @return Order
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -55,7 +51,6 @@ public function getInvoice()
     /**
      * @param Order $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoice($invoice)
     {
@@ -67,7 +62,6 @@ public function setInvoice($invoice)
      * Get totals source object
      *
      * @return Order
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -78,7 +72,6 @@ public function getSource()
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 3425f6bad1d54..171f86b0ac00f 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -16,7 +16,6 @@
  * Order item render block
  *
  * @api
- * @since 2.0.0
  */
 class DefaultRenderer extends \Magento\Framework\View\Element\Template
 {
@@ -24,13 +23,11 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Catalog\Model\Product\OptionFactory
-     * @since 2.0.0
      */
     protected $_productOptionFactory;
 
@@ -39,7 +36,6 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
     /**
      * @param \Magento\Framework\DataObject $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(\Magento\Framework\DataObject $item)
     {
@@ -65,7 +60,6 @@ public function setItem(\Magento\Framework\DataObject $item)
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -76,7 +70,6 @@ public function getItem()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -85,7 +78,6 @@ public function getOrder()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -98,7 +90,6 @@ public function getOrderItem()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getItemOptions()
     {
@@ -138,7 +129,6 @@ public function getItemOptions()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getFormatedOptionValue($optionValue)
     {
@@ -196,7 +186,6 @@ public function getFormatedOptionValue($optionValue)
      * Return sku of order item.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -207,7 +196,6 @@ public function getSku()
      * Return product additional information block
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getProductAdditionalInformationBlock()
     {
@@ -219,7 +207,6 @@ public function getProductAdditionalInformationBlock()
      *
      * @param string $sku
      * @return string
-     * @since 2.0.0
      */
     public function prepareSku($sku)
     {
@@ -231,7 +218,6 @@ public function prepareSku($sku)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item child item in case of bundle product
      * @return string
-     * @since 2.0.0
      */
     public function getItemPriceHtml($item = null)
     {
@@ -248,7 +234,6 @@ public function getItemPriceHtml($item = null)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item child item in case of bundle product
      * @return string
-     * @since 2.0.0
      */
     public function getItemRowTotalHtml($item = null)
     {
@@ -265,7 +250,6 @@ public function getItemRowTotalHtml($item = null)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -283,7 +267,6 @@ public function getTotalAmount($item)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item child item in case of bundle product
      * @return string
-     * @since 2.0.0
      */
     public function getItemRowTotalAfterDiscountHtml($item = null)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Items.php b/app/code/Magento/Sales/Block/Order/Items.php
index e91edd04dc765..b9ad498a04b8a 100644
--- a/app/code/Magento/Sales/Block/Order/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -21,7 +20,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -50,7 +48,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @param \Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory|null $itemCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -134,7 +131,6 @@ public function getPagerHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Link.php b/app/code/Magento/Sales/Block/Order/Link.php
index 09ecd40c57736..e9c9c521de0f2 100644
--- a/app/code/Magento/Sales/Block/Order/Link.php
+++ b/app/code/Magento/Sales/Block/Order/Link.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link\Current
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
@@ -25,7 +23,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link\Current
      * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     private function getOrder()
     {
@@ -52,7 +48,6 @@ private function getOrder()
      * @inheritdoc
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -63,7 +58,6 @@ public function getHref()
      * @inheritdoc
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php b/app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php
index e739ffee61c6e..ac1f63ed0b751 100644
--- a/app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php
@@ -11,7 +11,6 @@
  * Sales order details block
  *
  * @api
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,19 +18,16 @@ class Creditmemo extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -41,7 +37,6 @@ class Creditmemo extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -69,7 +63,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -78,7 +71,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -87,7 +79,6 @@ public function getPrintUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -96,7 +87,6 @@ public function getPaymentInfoHtml()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -105,7 +95,6 @@ public function getOrder()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -115,7 +104,6 @@ public function getCreditmemo()
     /**
      * @param AbstractBlock $renderer
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareItem(AbstractBlock $renderer)
     {
@@ -128,7 +116,6 @@ protected function _prepareItem(AbstractBlock $renderer)
      *
      * @param   \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return  string
-     * @since 2.0.0
      */
     public function getTotalsHtml($creditmemo)
     {
@@ -147,7 +134,6 @@ public function getTotalsHtml($creditmemo)
      * @param \Magento\Sales\Model\Order\Address $address
      * @param string $format
      * @return null|string
-     * @since 2.0.0
      */
     public function formatAddress(\Magento\Sales\Model\Order\Address $address, $format)
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
index 8a592b50a04e9..dcd3dbf3e7eeb 100644
--- a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
@@ -11,7 +11,6 @@
  * Sales order details block
  *
  * @api
- * @since 2.0.0
  */
 class Invoice extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,19 +18,16 @@ class Invoice extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -41,7 +37,6 @@ class Invoice extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -69,7 +63,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -78,7 +71,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -87,7 +79,6 @@ public function getPrintUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -96,7 +87,6 @@ public function getPaymentInfoHtml()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -105,7 +95,6 @@ public function getOrder()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -115,7 +104,6 @@ public function getInvoice()
     /**
      * @param AbstractBlock $renderer
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareItem(AbstractBlock $renderer)
     {
@@ -128,7 +116,6 @@ protected function _prepareItem(AbstractBlock $renderer)
      *
      * @param   \Magento\Sales\Model\Order\Invoice $invoice
      * @return  string
-     * @since 2.0.0
      */
     public function getInvoiceTotalsHtml($invoice)
     {
@@ -147,7 +134,6 @@ public function getInvoiceTotalsHtml($invoice)
      * @param \Magento\Sales\Model\Order\Address $address
      * @param string $format
      * @return null|string
-     * @since 2.0.0
      */
     public function formatAddress(\Magento\Sales\Model\Order\Address $address, $format)
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintOrder/Shipment.php b/app/code/Magento/Sales/Block/Order/PrintOrder/Shipment.php
index 05e52613a146c..6e375a5510253 100644
--- a/app/code/Magento/Sales/Block/Order/PrintOrder/Shipment.php
+++ b/app/code/Magento/Sales/Block/Order/PrintOrder/Shipment.php
@@ -11,7 +11,6 @@
  * Sales order details block
  *
  * @api
- * @since 2.0.0
  */
 class Shipment extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,7 +18,6 @@ class Shipment extends \Magento\Sales\Block\Items\AbstractItems
      * Tracks for Shippings
      *
      * @var array
-     * @since 2.0.0
      */
     protected $tracks = [];
 
@@ -27,7 +25,6 @@ class Shipment extends \Magento\Sales\Block\Items\AbstractItems
      * Order shipments collection
      *
      * @var array|\Magento\Sales\Model\ResourceModel\Order\Shipment\Collection
-     * @since 2.0.0
      */
     protected $shipmentsCollection;
 
@@ -35,19 +32,16 @@ class Shipment extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -57,7 +51,6 @@ class Shipment extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -76,7 +69,6 @@ public function __construct(
      * Load all tracks and save it to local cache by shipments
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -99,7 +91,6 @@ protected function _beforeToHtml()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -110,7 +101,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -119,7 +109,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -128,7 +117,6 @@ public function getPrintUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -137,7 +125,6 @@ public function getPaymentInfoHtml()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -146,7 +133,6 @@ public function getOrder()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -156,7 +142,6 @@ public function getShipment()
     /**
      * @param AbstractBlock $renderer
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareItem(AbstractBlock $renderer)
     {
@@ -169,7 +154,6 @@ protected function _prepareItem(AbstractBlock $renderer)
      * Retrieve order shipments collection
      *
      * @return array|\Magento\Sales\Model\ResourceModel\Order\Shipment\Collection
-     * @since 2.0.0
      */
     public function getShipmentsCollection()
     {
@@ -181,7 +165,6 @@ public function getShipmentsCollection()
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return array
-     * @since 2.0.0
      */
     public function getShipmentTracks($shipment)
     {
@@ -197,7 +180,6 @@ public function getShipmentTracks($shipment)
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return string
-     * @since 2.0.0
      */
     public function getShipmentAddressFormattedHtml($shipment)
     {
@@ -213,7 +195,6 @@ public function getShipmentAddressFormattedHtml($shipment)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return string
-     * @since 2.0.0
      */
     public function getBillingAddressFormattedHtml($order)
     {
@@ -229,7 +210,6 @@ public function getBillingAddressFormattedHtml($order)
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return array
-     * @since 2.0.0
      */
     public function getShipmentItems($shipment)
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintShipment.php b/app/code/Magento/Sales/Block/Order/PrintShipment.php
index fcb60b7fe3b53..6fc497326a409 100644
--- a/app/code/Magento/Sales/Block/Order/PrintShipment.php
+++ b/app/code/Magento/Sales/Block/Order/PrintShipment.php
@@ -11,7 +11,6 @@
  * Order information for print
  *
  * @api
- * @since 2.0.0
  */
 class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -19,19 +18,16 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -41,7 +37,6 @@ class PrintShipment extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -69,7 +63,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -78,7 +71,6 @@ public function getPaymentInfoHtml()
 
     /**
      * @return \Magento\Sales\Model\Order|null
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -113,7 +105,6 @@ public function getItems()
     /**
      * @param AbstractBlock $renderer
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareItem(AbstractBlock $renderer)
     {
@@ -126,7 +117,6 @@ protected function _prepareItem(AbstractBlock $renderer)
      *
      * @param Address $address
      * @return null|string
-     * @since 2.0.0
      */
     public function getFormattedAddress(\Magento\Sales\Model\Order\Address $address)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Recent.php b/app/code/Magento/Sales/Block/Order/Recent.php
index 5d5598c9c1da2..3946cc3b0ec71 100644
--- a/app/code/Magento/Sales/Block/Order/Recent.php
+++ b/app/code/Magento/Sales/Block/Order/Recent.php
@@ -9,25 +9,21 @@
  * Sales order history block
  *
  * @api
- * @since 2.0.0
  */
 class Recent extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderCollectionFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
@@ -37,7 +33,6 @@ class Recent extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +74,6 @@ protected function _construct()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($order)
     {
@@ -90,7 +83,6 @@ public function getViewUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getTrackUrl($order)
     {
@@ -99,7 +91,6 @@ public function getTrackUrl($order)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -112,7 +103,6 @@ protected function _toHtml()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getReorderUrl($order)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
index 27d9fd4c97522..3f5ec82aec962 100644
--- a/app/code/Magento/Sales/Block/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Framework\View\Element\Template
 {
@@ -20,13 +19,11 @@ class Totals extends \Magento\Framework\View\Element\Template
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totals;
 
     /**
      * @var Order|null
-     * @since 2.0.0
      */
     protected $_order = null;
 
@@ -34,7 +31,6 @@ class Totals extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -42,7 +38,6 @@ class Totals extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Initialize self totals and children blocks totals before html building
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -74,7 +68,6 @@ protected function _beforeToHtml()
      * Get order object
      *
      * @return Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -93,7 +86,6 @@ public function getOrder()
     /**
      * @param Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($order)
     {
@@ -105,7 +97,6 @@ public function setOrder($order)
      * Get totals source object
      *
      * @return Order
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -116,7 +107,6 @@ public function getSource()
      * Initialize order totals array
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTotals()
     {
@@ -192,7 +182,6 @@ protected function _initTotals()
      * @param   \Magento\Framework\DataObject $total
      * @param   null|string $after
      * @return  $this
-     * @since 2.0.0
      */
     public function addTotal(\Magento\Framework\DataObject $total, $after = null)
     {
@@ -231,7 +220,6 @@ public function addTotal(\Magento\Framework\DataObject $total, $after = null)
      * @param   \Magento\Framework\DataObject $total
      * @param   null|string $before
      * @return  $this
-     * @since 2.0.0
      */
     public function addTotalBefore(\Magento\Framework\DataObject $total, $before = null)
     {
@@ -269,7 +257,6 @@ public function addTotalBefore(\Magento\Framework\DataObject $total, $before = n
      *
      * @param string $code
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotal($code)
     {
@@ -284,7 +271,6 @@ public function getTotal($code)
      *
      * @param   string $code
      * @return  $this
-     * @since 2.0.0
      */
     public function removeTotal($code)
     {
@@ -303,7 +289,6 @@ public function removeTotal($code)
      * @param   array $order
      * @return  $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function applySortOrder($order)
     {
@@ -315,7 +300,6 @@ public function applySortOrder($order)
      *
      * @param array|null $area
      * @return array
-     * @since 2.0.0
      */
     public function getTotals($area = null)
     {
@@ -339,7 +323,6 @@ public function getTotals($area = null)
      *
      * @param   \Magento\Framework\DataObject $total
      * @return  string
-     * @since 2.0.0
      */
     public function formatValue($total)
     {
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index 116a6699b2b3b..e9e46085374a4 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -11,13 +11,11 @@
  * Sales order view block
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/view.phtml';
 
@@ -25,7 +23,6 @@ class View extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -37,7 +34,6 @@ class View extends \Magento\Framework\View\Element\Template
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
@@ -47,7 +43,6 @@ class View extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -76,7 +70,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -87,7 +80,6 @@ public function getPaymentInfoHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -98,7 +90,6 @@ public function getOrder()
      * Return back url for logged in and guest users
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -112,7 +103,6 @@ public function getBackUrl()
      * Return back title for logged in and guest users
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getBackTitle()
     {
@@ -125,7 +115,6 @@ public function getBackTitle()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getInvoiceUrl($order)
     {
@@ -135,7 +124,6 @@ public function getInvoiceUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getShipmentUrl($order)
     {
@@ -145,7 +133,6 @@ public function getShipmentUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getCreditmemoUrl($order)
     {
diff --git a/app/code/Magento/Sales/Block/Reorder/Sidebar.php b/app/code/Magento/Sales/Block/Reorder/Sidebar.php
index dfb19e2507ca6..b2313fbe7fd6c 100644
--- a/app/code/Magento/Sales/Block/Reorder/Sidebar.php
+++ b/app/code/Magento/Sales/Block/Reorder/Sidebar.php
@@ -11,13 +11,11 @@
  * Last ordered items sidebar
  *
  * @api
- * @since 2.0.0
  */
 class Sidebar extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -25,7 +23,6 @@ class Sidebar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * message when we submit form from secure page to unsecure
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormActionUrl()
     {
@@ -52,7 +48,6 @@ public function getFormActionUrl()
      * Render "My Orders" sidebar block
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
index 6462882b1baca..695775febc1a8 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class State extends \Magento\Backend\Block\Widget\Grid\Column
 {
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -21,7 +19,6 @@ class State extends \Magento\Backend\Block\Widget\Grid\Column
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Sales\Model\Order\Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      * Add decorated status to column
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFrameCallback()
     {
@@ -53,7 +49,6 @@ public function getFrameCallback()
      * @param bool $isExport
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function decorateState($value, $row, $column, $isExport)
     {
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
index fd7866c0c5ca4..a272494e1ff9e 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
 {
@@ -15,7 +14,6 @@ class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
      * Add decorated action to column
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFrameCallback()
     {
@@ -31,7 +29,6 @@ public function getFrameCallback()
      * @param bool $isExport
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function decorateAction($value, $row, $column, $isExport)
     {
diff --git a/app/code/Magento/Sales/Block/Widget/Guest/Form.php b/app/code/Magento/Sales/Block/Widget/Guest/Form.php
index 8b0e1d7bb3a62..6ef1ed913b7ae 100644
--- a/app/code/Magento/Sales/Block/Widget/Guest/Form.php
+++ b/app/code/Magento/Sales/Block/Widget/Guest/Form.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
 {
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -27,7 +25,6 @@ class Form extends \Magento\Framework\View\Element\Template implements \Magento\
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Check whether module is available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnable()
     {
@@ -54,7 +50,6 @@ public function isEnable()
      * Select element for choosing registry type
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypeSelectHtml()
     {
@@ -76,7 +71,6 @@ public function getTypeSelectHtml()
      * Get Form Options for Guest
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getFormOptions()
     {
@@ -95,7 +89,6 @@ protected function _getFormOptions()
      * Return quick search form action url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionUrl()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Creditmemo.php b/app/code/Magento/Sales/Controller/AbstractController/Creditmemo.php
index de80fd52a4100..6eb6d5eb8b788 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Creditmemo.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\Creditmemo
  *
- * @since 2.0.0
  */
 abstract class Creditmemo extends \Magento\Sales\Controller\AbstractController\View
 {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Invoice.php b/app/code/Magento/Sales/Controller/AbstractController/Invoice.php
index 1ef77394afac5..be28f33608992 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Invoice.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Invoice.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\Invoice
  *
- * @since 2.0.0
  */
 abstract class Invoice extends \Magento\Sales\Controller\AbstractController\View
 {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php b/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
index 8a8a8303a9219..ae0280328d4ed 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
@@ -14,43 +14,36 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\OrderLoader
  *
- * @since 2.0.0
  */
 class OrderLoader implements OrderLoaderInterface
 {
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var OrderViewAuthorizationInterface
-     * @since 2.0.0
      */
     protected $orderAuthorization;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
     /**
      * @var ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var RedirectFactory
-     * @since 2.0.0
      */
     protected $redirectFactory;
 
@@ -61,7 +54,6 @@ class OrderLoader implements OrderLoaderInterface
      * @param \Magento\Framework\UrlInterface $url
      * @param ForwardFactory $resultForwardFactory
      * @param RedirectFactory $redirectFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
@@ -82,7 +74,6 @@ public function __construct(
     /**
      * @param RequestInterface $request
      * @return bool|\Magento\Framework\Controller\Result\Forward|\Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function load(RequestInterface $request)
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/OrderLoaderInterface.php b/app/code/Magento/Sales/Controller/AbstractController/OrderLoaderInterface.php
index 95b2869f9307a..c1e96e86e11fc 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/OrderLoaderInterface.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/OrderLoaderInterface.php
@@ -11,7 +11,6 @@
 /**
  * Interface \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
  *
- * @since 2.0.0
  */
 interface OrderLoaderInterface
 {
@@ -20,7 +19,6 @@ interface OrderLoaderInterface
      *
      * @param RequestInterface $request
      * @return bool|\Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function load(RequestInterface $request);
 }
diff --git a/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorization.php b/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorization.php
index 5e6444147ecc5..e8b3a0ea0e71d 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorization.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorization.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\OrderViewAuthorization
  *
- * @since 2.0.0
  */
 class OrderViewAuthorization implements OrderViewAuthorizationInterface
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $orderConfig;
 
     /**
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canView(\Magento\Sales\Model\Order $order)
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorizationInterface.php b/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorizationInterface.php
index 59298e2cecb1d..1527c1d3b436c 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorizationInterface.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/OrderViewAuthorizationInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Sales\Controller\AbstractController\OrderViewAuthorizationInterface
  *
- * @since 2.0.0
  */
 interface OrderViewAuthorizationInterface
 {
@@ -18,7 +17,6 @@ interface OrderViewAuthorizationInterface
      *
      * @param \Magento\Sales\Model\Order $order
      * @return bool
-     * @since 2.0.0
      */
     public function canView(\Magento\Sales\Model\Order $order);
 }
diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php b/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php
index f8c05f69814a5..d5044b4149a13 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\PrintAction
  *
- * @since 2.0.0
  */
 abstract class PrintAction extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
-     * @since 2.0.0
      */
     protected $orderLoader;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -32,7 +29,6 @@ abstract class PrintAction extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param OrderLoaderInterface $orderLoader
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Print Order Action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php b/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php
index ed1d9071e1d90..984de7d251800 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\PrintCreditmemo
  *
- * @since 2.0.0
  */
 abstract class PrintCreditmemo extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var OrderViewAuthorizationInterface
-     * @since 2.0.0
      */
     protected $orderAuthorization;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
@@ -47,7 +42,6 @@ abstract class PrintCreditmemo extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Registry $registry
      * @param PageFactory $resultPageFactory
      * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -67,7 +61,6 @@ public function __construct(
      * Print Creditmemo Action
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php b/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php
index 950fcf4e4a4ed..9a31497278b5d 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\PrintInvoice
  *
- * @since 2.0.0
  */
 abstract class PrintInvoice extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var OrderViewAuthorizationInterface
-     * @since 2.0.0
      */
     protected $orderAuthorization;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -39,7 +35,6 @@ abstract class PrintInvoice extends \Magento\Framework\App\Action\Action
      * @param OrderViewAuthorizationInterface $orderAuthorization
      * @param \Magento\Framework\Registry $registry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Print Invoice Action
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php b/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php
index 1d596aa3a04e3..5a98cdbcd7e54 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\PrintShipment
  *
- * @since 2.0.0
  */
 abstract class PrintShipment extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var OrderViewAuthorizationInterface
-     * @since 2.0.0
      */
     protected $orderAuthorization;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -39,7 +35,6 @@ abstract class PrintShipment extends \Magento\Framework\App\Action\Action
      * @param OrderViewAuthorizationInterface $orderAuthorization
      * @param \Magento\Framework\Registry $registry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Print Shipment Action
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
index d14b423f692f0..7df4acad36a05 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\Reorder
  *
- * @since 2.0.0
  */
 abstract class Reorder extends Action\Action
 {
     /**
      * @var \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
-     * @since 2.0.0
      */
     protected $orderLoader;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -32,7 +29,6 @@ abstract class Reorder extends Action\Action
      * @param Action\Context $context
      * @param OrderLoaderInterface $orderLoader
      * @param Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Action for reorder
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Shipment.php b/app/code/Magento/Sales/Controller/AbstractController/Shipment.php
index e465932835eda..ebefb7e71f5e5 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Shipment.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Shipment.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\Shipment
  *
- * @since 2.0.0
  */
 abstract class Shipment extends \Magento\Sales\Controller\AbstractController\View
 {
diff --git a/app/code/Magento/Sales/Controller/AbstractController/View.php b/app/code/Magento/Sales/Controller/AbstractController/View.php
index cb3c5cad867da..30558a41609f5 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/View.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/View.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Sales\Controller\AbstractController\View
  *
- * @since 2.0.0
  */
 abstract class View extends Action\Action
 {
     /**
      * @var \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
-     * @since 2.0.0
      */
     protected $orderLoader;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -32,7 +29,6 @@ abstract class View extends Action\Action
      * @param Action\Context $context
      * @param OrderLoaderInterface $orderLoader
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Order view page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
index ec5d8bbd2dc48..ac34af6f4ce6e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
@@ -9,7 +9,6 @@
  * Class Email
  *
  * @package Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo
- * @since 2.0.0
  */
 class Email extends \Magento\Backend\App\Action
 {
@@ -24,7 +23,6 @@ class Email extends \Magento\Backend\App\Action
      * Notify user
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php
index fbfc98416ce3e..721efd2eb76a0 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\App\Action
 {
@@ -21,14 +20,12 @@ class Grid extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Creditmemo grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php
index 5528b85070929..d2e69df224099 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
@@ -21,14 +20,12 @@ class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Init layout, menu and breadcrumb
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -57,7 +53,6 @@ protected function _initAction()
      * Creditmemos grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
index 329aa18872ff7..83486704984f7 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
@@ -18,7 +18,6 @@
 /**
  * Class Pdfcreditmemos
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -31,19 +30,16 @@ class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Order\AbstractM
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var Creditmemo
-     * @since 2.0.0
      */
     protected $pdfCreditmemo;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -54,7 +50,6 @@ class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Order\AbstractM
      * @param DateTime $dateTime
      * @param FileFactory $fileFactory
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -76,7 +71,6 @@ public function __construct(
      * @return ResponseInterface
      * @throws \Exception
      * @throws \Zend_Pdf_Exception
-     * @since 2.0.0
      */
     public function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
index 73f475ffc8249..c30b6918dcd20 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Backend\App\Action
 {
@@ -25,19 +24,16 @@ class PrintAction extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
@@ -46,7 +42,6 @@ class PrintAction extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
index d1c217a1b7c36..d8c5547fb1378 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Backend\App\Action
 {
@@ -21,14 +20,12 @@ class View extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Creditmemo information page
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Email.php
index c8f6eaf75a714..d76b10c9deefc 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Email.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\Email
  *
- * @since 2.0.0
  */
 class Email extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Email
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Grid.php
index 6e57d3e04fd57..4d84f9dccf6df 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Grid.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Grid
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
index a2bf507b29fe1..0fd550a5d9d29 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCredi
      * Index page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Pdfcreditmemos.php
index 651a646ad8b9d..c15066589c3f8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Pdfcreditmemos.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\Pdfcreditmemos
  *
- * @since 2.0.0
  */
 class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Pdfcreditmemos
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/PrintAction.php
index eda899a2c63f4..1d1d61d5e1126 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/PrintAction.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\PrintAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/View.php
index e986e9c97ee5b..ca99bdc23f0f1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/View.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Creditmemo\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\View
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
index fffb04216f9d8..e491dd78db617 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
@@ -10,7 +10,6 @@
  * Class Email
  *
  * @package Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice
- * @since 2.0.0
  */
 abstract class Email extends \Magento\Backend\App\Action
 {
@@ -23,14 +22,12 @@ abstract class Email extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Notify user
      *
      * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php
index ddd91501e9f35..036cad062c982 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Grid
  *
- * @since 2.0.0
  */
 abstract class Grid extends \Magento\Backend\App\Action
 {
@@ -22,14 +21,12 @@ abstract class Grid extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Order grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php
index 03fd10869df01..8494d45deb655 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index
  *
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -22,14 +21,12 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Init layout, menu and breadcrumb
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -59,7 +55,6 @@ protected function _initAction()
      * Invoices grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
index dc18acb3bac96..a949ceca53961 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
@@ -18,7 +18,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -31,19 +30,16 @@ abstract class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Order\Abs
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var Invoice
-     * @since 2.0.0
      */
     protected $pdfInvoice;
 
@@ -54,7 +50,6 @@ abstract class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Order\Abs
      * @param FileFactory $fileFactory
      * @param Invoice $pdfInvoice
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -77,7 +72,6 @@ public function __construct(
      * @param AbstractCollection $collection
      * @return ResponseInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
index 63b6e8e00eb7d..bdf1ee1de1b86 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\PrintAction
  *
- * @since 2.0.0
  */
 abstract class PrintAction extends \Magento\Backend\App\Action
 {
@@ -25,13 +24,11 @@ abstract class PrintAction extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -39,7 +36,6 @@ abstract class PrintAction extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
 
     /**
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
index a764851e128c8..eb7f8ebbc17a3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
  *
- * @since 2.0.0
  */
 abstract class View extends \Magento\Backend\App\Action
 {
@@ -28,13 +27,11 @@ abstract class View extends \Magento\Backend\App\Action
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -48,7 +45,6 @@ abstract class View extends \Magento\Backend\App\Action
      * @param Context $context
      * @param Registry $registry
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      * Invoice information page
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -81,7 +76,6 @@ public function execute()
 
     /**
      * @return \Magento\Sales\Model\Order\Invoice|bool
-     * @since 2.0.0
      */
     protected function getInvoice()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Email.php
index eed5569ea2e70..8b8aa9c092d87 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Email.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\Email
  *
- * @since 2.0.0
  */
 class Email extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Email
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Grid.php
index 823faead7ba0b..75662b641ce5e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Grid
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
index 0a7786f1e19c7..d0bfc4439f49e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Pdfinvoices.php
index b6d5101d80752..4a8d01cc8d814 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Pdfinvoices.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\Pdfinvoices
  *
- * @since 2.0.0
  */
 class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Pdfinvoices
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/PrintAction.php
index 5df8c8928e701..9e913370c9298 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/PrintAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\PrintAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
index 01355d65fe949..29431915f4e80 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Invoice\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
index 8edbcbeed6756..c2299374c798c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
@@ -18,7 +18,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Order extends \Magento\Backend\App\Action
 {
@@ -33,7 +32,6 @@ abstract class Order extends \Magento\Backend\App\Action
      * Array of actions which can be processed without secret key validation
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_publicActions = ['view', 'index'];
 
@@ -41,61 +39,51 @@ abstract class Order extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $_translateInline;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var OrderManagementInterface
-     * @since 2.0.0
      */
     protected $orderManagement;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -114,7 +102,6 @@ abstract class Order extends \Magento\Backend\App\Action
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -146,7 +133,6 @@ public function __construct(
      * Init layout, menu and breadcrumb
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -161,7 +147,6 @@ protected function _initAction()
      * Initialize order model instance
      *
      * @return \Magento\Sales\Api\Data\OrderInterface|false
-     * @since 2.0.0
      */
     protected function _initOrder()
     {
@@ -184,7 +169,6 @@ protected function _initOrder()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidPostRequest()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
index 7c0dd276fdde9..2757deec53483 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
@@ -16,32 +16,27 @@
  * Class AbstractMassStatus
  * @deprecated 2.2.0
  * Never extend from this action. Implement mass-action logic in the "execute" method of your controller.
- * @since 2.0.0
  */
 abstract class AbstractMassAction extends \Magento\Backend\App\Action
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $redirectUrl = '*/*/';
 
     /**
      * @var \Magento\Ui\Component\MassAction\Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var object
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @param Context $context
      * @param Filter $filter
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter)
     {
@@ -54,7 +49,6 @@ public function __construct(Context $context, Filter $filter)
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -74,7 +68,6 @@ public function execute()
      * TODO: Technical dept referrer url should be implement as a part of Action configuration in in appropriate way
      *
      * @return null|string
-     * @since 2.0.0
      */
     protected function getComponentRefererUrl()
     {
@@ -86,7 +79,6 @@ protected function getComponentRefererUrl()
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     abstract protected function massAction(AbstractCollection $collection);
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
index b993acf689709..a3a1e5e9becc1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\AddComment
  *
- * @since 2.0.0
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -27,7 +26,6 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
      * Add order comment action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php
index 785d070544c3f..de9977cedb0fa 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Address
  *
- * @since 2.0.0
  */
 class Address extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -24,7 +23,6 @@ class Address extends \Magento\Sales\Controller\Adminhtml\Order
      * Edit order address form
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
index c5cc9fcc3fc43..d1c9ce517cd22 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\AddressSave
  *
- * @since 2.0.0
  */
 class AddressSave extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -24,7 +23,6 @@ class AddressSave extends \Magento\Sales\Controller\Adminhtml\Order
      * Save order address
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
index e1dd49f717c4a..f8c0fce1637f5 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -24,7 +23,6 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Order
      * Cancel order
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
index bfa6bd5a865e5..8496c4f28d8bc 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
@@ -14,13 +14,11 @@
 /**
  * Class CommentsHistory
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -40,7 +38,6 @@ class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -76,7 +73,6 @@ public function __construct(
      * Generate order history for ajax request
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 9da5b5408915b..9cbcc28442bdd 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -14,25 +14,21 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Create extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -42,7 +38,6 @@ abstract class Create extends \Magento\Backend\App\Action
      * @param \Magento\Framework\Escaper $escaper
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Retrieve session object
      *
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -73,7 +67,6 @@ protected function _getSession()
      * Retrieve quote object
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function _getQuote()
     {
@@ -84,7 +77,6 @@ protected function _getQuote()
      * Retrieve order create model
      *
      * @return \Magento\Sales\Model\AdminOrder\Create
-     * @since 2.0.0
      */
     protected function _getOrderCreateModel()
     {
@@ -95,7 +87,6 @@ protected function _getOrderCreateModel()
      * Retrieve gift message save model
      *
      * @return \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected function _getGiftmessageSaveModel()
     {
@@ -106,7 +97,6 @@ protected function _getGiftmessageSaveModel()
      * Initialize order creation session data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSession()
     {
@@ -138,7 +128,6 @@ protected function _initSession()
      * Processing request data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _processData()
     {
@@ -153,7 +142,6 @@ protected function _processData()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _processActionData($action = null)
     {
@@ -353,7 +341,6 @@ protected function _processActionData($action = null)
      *
      * @param array $items
      * @return array
-     * @since 2.0.0
      */
     protected function _processFiles($items)
     {
@@ -372,7 +359,6 @@ protected function _processFiles($items)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _reloadQuote()
     {
@@ -385,7 +371,6 @@ protected function _reloadQuote()
      * Acl check for admin
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
@@ -396,7 +381,6 @@ protected function _isAllowed()
      * Get acl resource
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getAclResource()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php
index cc9f302114feb..a99d8c978f1b8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
  *
- * @since 2.0.0
  */
 class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Adds configured product to quote
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php
index 10c65148fb682..603338c0aceaa 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Cancel order create
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php
index 2034db9c1fde5..deeebc5409153 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
  *
- * @since 2.0.0
  */
 class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Cr
      * Ajax handler to response configuration fieldset of composite product in order
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
index 3f2377ea1c8c7..e2d57e615441e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
  *
- * @since 2.0.0
  */
 class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Crea
      * Ajax handler to response configuration fieldset of composite product in quote items
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
index c64d629c94864..ecbbec0745d04 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Index page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
index 1973ad4af10c7..e4b8d9f864ae4 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
  *
- * @since 2.0.0
  */
 class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * @var RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -30,7 +28,6 @@ class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
      * @param RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -54,7 +51,6 @@ public function __construct(
      * Loading page block
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php
index fae50cbb2e5c3..967b60bb53796 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
  *
- * @since 2.0.0
  */
 class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -16,7 +15,6 @@ class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Process data and display index page
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
index aa4d4efa0ea1c..1eed2f00f9cfe 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
  *
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
index 273a99077fd26..65b85198509c9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -20,7 +19,6 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
index 65e7919827ff4..4c0f94976c1af 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * @var RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -30,7 +28,6 @@ class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
      * @param RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * to prevent popup alert with resend data question
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
index 06fdc2b152d22..b685a926e4144 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Create\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
@@ -18,7 +17,6 @@ class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Start order create action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
index 457f8e81a895d..72b64251e9360 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\AddComment
  *
- * @since 2.0.0
  */
 class AddComment extends \Magento\Backend\App\Action
 {
@@ -24,31 +23,26 @@ class AddComment extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var CreditmemoCommentSender
-     * @since 2.0.0
      */
     protected $creditmemoCommentSender;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $pagePageFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -59,7 +53,6 @@ class AddComment extends \Magento\Backend\App\Action
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -81,7 +74,6 @@ public function __construct(
      * Add comment to creditmemo history
      *
      * @return \Magento\Framework\Controller\Result\Raw|\Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
index b1f02253b7c21..298751c6ffb67 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Backend\App\Action
 {
@@ -23,14 +22,12 @@ class Cancel extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Cancel creditmemo action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Email.php
index 769d364706019..8775fc54bfcdb 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Email.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Email
  *
- * @since 2.0.0
  */
 class Email extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Email
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Grid.php
index aa2f1da49b6d9..b2ea770159606 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Grid.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Grid
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Index.php
index 12f2ddbe11d49..0ceaead6da42f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
index 469249be5ac35..52b3316a02347 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Backend\App\Action
 {
@@ -23,19 +22,16 @@ class NewAction extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -44,7 +40,6 @@ class NewAction extends \Magento\Backend\App\Action
      * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Creditmemo create page
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Pdfcreditmemos.php
index 451b4e29c20fd..e068ebf4fd464 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Pdfcreditmemos.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Pdfcreditmemos
  *
- * @since 2.0.0
  */
 class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Pdfcreditmemos
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
index 371aae6442080..164422709a0fd 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\PrintAction
 {
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
@@ -34,7 +31,6 @@ class PrintAction extends \Magento\Sales\Controller\Adminhtml\Creditmemo\Abstrac
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Create pdf for current creditmemo
      *
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index a2e1f13f0e9c2..d412883cb1612 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\App\Action
 {
@@ -25,19 +24,16 @@ class Save extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var CreditmemoSender
-     * @since 2.0.0
      */
     protected $creditmemoSender;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -46,7 +42,6 @@ class Save extends \Magento\Backend\App\Action
      * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
      * @param CreditmemoSender $creditmemoSender
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -68,7 +63,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
index 542d5f1f46fe1..b3dfbc2f112b2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Backend\App\Action
 {
@@ -23,7 +22,6 @@ class Start extends \Magento\Backend\App\Action
      * Start create creditmemo action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
index bdef419b9985c..4a4d65cd96334 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\UpdateQty
  *
- * @since 2.0.0
  */
 class UpdateQty extends \Magento\Backend\App\Action
 {
@@ -23,25 +22,21 @@ class UpdateQty extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $pagePageFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -51,7 +46,6 @@ class UpdateQty extends \Magento\Backend\App\Action
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -71,7 +65,6 @@ public function __construct(
      * Update items qty action
      *
      * @return \Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php
index dfdadf20a15e5..4e5061aaf6bc6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Backend\App\Action
 {
@@ -23,19 +22,16 @@ class View extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
-     * @since 2.0.0
      */
     protected $creditmemoLoader;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -44,7 +40,6 @@ class View extends \Magento\Backend\App\Action
      * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Creditmemo information page
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
index 4d1709becbcca..057e72b6176d3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
@@ -22,61 +22,51 @@
  * @method string getCreditmemo()
  * @method int getInvoiceId()
  * @method int getOrderId()
- * @since 2.0.0
  */
 class CreditmemoLoader extends DataObject
 {
     /**
      * @var CreditmemoRepositoryInterface;
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
     /**
      * @var CreditmemoFactory;
-     * @since 2.0.0
      */
     protected $creditmemoFactory;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $invoiceRepository;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $backendSession;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration;
 
@@ -92,7 +82,6 @@ class CreditmemoLoader extends DataObject
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         CreditmemoRepositoryInterface $creditmemoRepository,
@@ -122,7 +111,6 @@ public function __construct(
      * Get requested items qtys and return to stock flags
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getItemData()
     {
@@ -143,7 +131,6 @@ protected function _getItemData()
      * Check if creditmeno can be created for order
      * @param \Magento\Sales\Model\Order $order
      * @return bool
-     * @since 2.0.0
      */
     protected function _canCreditmemo($order)
     {
@@ -168,7 +155,6 @@ protected function _canCreditmemo($order)
     /**
      * @param \Magento\Sales\Model\Order $order
      * @return $this|bool
-     * @since 2.0.0
      */
     protected function _initInvoice($order)
     {
@@ -188,7 +174,6 @@ protected function _initInvoice($order)
      *
      * @return \Magento\Sales\Model\Order\Creditmemo|false
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php
index 11d19924aa5ab..37600a6147d1d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Creditmemos
  *
- * @since 2.0.0
  */
 class Creditmemos extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -23,7 +22,6 @@ class Creditmemos extends \Magento\Sales\Controller\Adminhtml\Order
      * Generate credit memos grid for ajax request
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/AddConfigured.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/AddConfigured.php
index 3ebe07c2d893f..56703e3f1c9e8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/AddConfigured.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/AddConfigured.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\AddConfigured
  *
- * @since 2.0.0
  */
 class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Cancel.php
index 9027fff1979f5..7d344a12ebe80 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureProductToAdd.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureProductToAdd.php
index 1e53973da12c6..93a4a96672835 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureProductToAdd.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureProductToAdd.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\ConfigureProductToAdd
  *
- * @since 2.0.0
  */
 class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureQuoteItems.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureQuoteItems.php
index 008674d2b9619..81faf1c440499 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureQuoteItems.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ConfigureQuoteItems.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\ConfigureQuoteItems
  *
- * @since 2.0.0
  */
 class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php
index 273afd180fed4..44a5ea924ec5e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
 {
@@ -23,7 +22,6 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
      * Index page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/LoadBlock.php
index a12f831d6a03a..40c96879081a9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/LoadBlock.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/LoadBlock.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\LoadBlock
  *
- * @since 2.0.0
  */
 class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ProcessData.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ProcessData.php
index ed49c1953db30..8a5155d043d06 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ProcessData.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ProcessData.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\ProcessData
  *
- * @since 2.0.0
  */
 class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Reorder.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Reorder.php
index adb74ce8d5636..ca8ced653e9bb 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Reorder.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Reorder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\Reorder
  *
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Save.php
index 1c8f6ade9c0e2..2b77fe047a3c7 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create\Save
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ShowUpdateResult.php
index 1caf2bbe08f60..0c7602d0d9724 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ShowUpdateResult.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/ShowUpdateResult.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\ShowUpdateResult
  *
- * @since 2.0.0
  */
 class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
index 52c2fe3353d77..2bfb2d631f510 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Edit\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create\Start
 {
@@ -23,7 +22,6 @@ class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create\Start
      * Start edit order initialization
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
index 07b3817dbd4bc..46b1e429d2c39 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Email
  *
- * @since 2.0.0
  */
 class Email extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -23,7 +22,6 @@ class Email extends \Magento\Sales\Controller\Adminhtml\Order
      * Notify user
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php
index 75b07d2f15d9a..7869e861853b5 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -16,7 +15,6 @@ class Grid extends \Magento\Sales\Controller\Adminhtml\Order
      * Order grid
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
index 70867ffb72a54..ea92609a9a3ac 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Hold
  *
- * @since 2.0.0
  */
 class Hold extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -23,7 +22,6 @@ class Hold extends \Magento\Sales\Controller\Adminhtml\Order
      * Hold order
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
index 68533bfd7f3ad..9dec07f47a9b9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order
      * Orders grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
index d4229d52d8833..0b42861bb3de9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
@@ -19,31 +19,26 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\AddComment
  *
- * @since 2.0.0
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
     /**
      * @var InvoiceCommentSender
-     * @since 2.0.0
      */
     protected $invoiceCommentSender;
 
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
@@ -55,7 +50,6 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInv
      * @param JsonFactory $resultJsonFactory
      * @param PageFactory $resultPageFactory
      * @param RawFactory $resultRawFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -77,7 +71,6 @@ public function __construct(
      * Add comment to invoice action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
index 4400bf5403aec..96d2503de7021 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Cancel
  *
- * @since 2.0.0
  */
 class Cancel extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
@@ -17,7 +16,6 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice
      * Cancel invoice action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
index c5a72572369f0..ecf667c1ea5b3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Capture
  *
- * @since 2.0.0
  */
 class Capture extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
@@ -17,7 +16,6 @@ class Capture extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoic
      * Capture invoice action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Email.php
index dd52e38b41bff..c27cd4ebaf7d3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Email.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Email
  *
- * @since 2.0.0
  */
 class Email extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Email
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Grid.php
index 2ee372f8c853a..cd80dbd501037 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Grid
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Index.php
index 4ceb2d9172b4d..a5a2471c041ae 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
index 703da26ffd3c2..a07d8c5e5fde6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Backend\App\Action
 {
@@ -27,19 +26,16 @@ class NewAction extends \Magento\Backend\App\Action
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var InvoiceService
-     * @since 2.0.0
      */
     private $invoiceService;
 
@@ -48,7 +44,6 @@ class NewAction extends \Magento\Backend\App\Action
      * @param Registry $registry
      * @param PageFactory $resultPageFactory
      * @param InvoiceService $invoiceService
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      *
      * @param int $orderId
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function _redirectToOrder($orderId)
     {
@@ -81,7 +75,6 @@ protected function _redirectToOrder($orderId)
      * Invoice create page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Pdfinvoices.php
index 6a903a57ff1f7..39e22ff1f2d85 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Pdfinvoices.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Pdfinvoices
  *
- * @since 2.0.0
  */
 class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Pdfinvoices
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
index b5aafe89d351d..8d8fb6f2af68d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\PrintAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index ec833e6852ebc..63c266150384a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -17,7 +17,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\App\Action
 {
@@ -30,31 +29,26 @@ class Save extends \Magento\Backend\App\Action
 
     /**
      * @var InvoiceSender
-     * @since 2.0.0
      */
     protected $invoiceSender;
 
     /**
      * @var ShipmentSender
-     * @since 2.0.0
      */
     protected $shipmentSender;
 
     /**
      * @var ShipmentFactory
-     * @since 2.0.0
      */
     protected $shipmentFactory;
 
     /**
      * @var Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var InvoiceService
-     * @since 2.0.0
      */
     private $invoiceService;
 
@@ -65,7 +59,6 @@ class Save extends \Magento\Backend\App\Action
      * @param ShipmentSender $shipmentSender
      * @param ShipmentFactory $shipmentFactory
      * @param InvoiceService $invoiceService
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -88,7 +81,6 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return \Magento\Sales\Model\Order\Shipment|false
-     * @since 2.0.0
      */
     protected function _prepareShipment($invoice)
     {
@@ -116,7 +108,6 @@ protected function _prepareShipment($invoice)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
index 2a5a86478f78b..8ba609a212f06 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
@@ -17,7 +16,6 @@ class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\
      * Start create invoice action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
index d1def68b079cd..cdb4114f70976 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
@@ -18,31 +18,26 @@
 /**
  * Class UpdateQty
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
     /**
      * @var JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var RawFactory
-     * @since 2.0.0
      */
     protected $resultRawFactory;
 
     /**
      * @var InvoiceService
-     * @since 2.0.0
      */
     private $invoiceService;
 
@@ -54,7 +49,6 @@ class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvo
      * @param JsonFactory $resultJsonFactory
      * @param RawFactory $resultRawFactory
      * @param InvoiceService $invoiceService
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      * Update items qty action
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
index cbe8e2431c0e5..0b3eaea784995 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
@@ -13,14 +13,12 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoice\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -29,7 +27,6 @@ class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\V
      * @param Registry $registry
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Invoice information page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php
index ae67696c15b81..2e0bf20dfe28d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Invoices
  *
- * @since 2.0.0
  */
 class Invoices extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -16,7 +15,6 @@ class Invoices extends \Magento\Sales\Controller\Adminhtml\Order
      * Generate invoices grid for ajax request
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
index f16675c84d630..84f4c5da20478 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\MassCancel
  *
- * @since 2.0.0
  */
 class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -21,7 +20,6 @@ class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassA
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -34,7 +32,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
index 210e290964a90..9939cd9e0d89e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
@@ -13,13 +13,11 @@
 
 /**
  * Class MassHold
- * @since 2.0.0
  */
 class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
     /**
      * @var OrderManagementInterface
-     * @since 2.0.0
      */
     protected $orderManagement;
 
@@ -28,7 +26,6 @@ class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAct
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param OrderManagementInterface $orderManagement
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
index 2b8d2bee77c1c..6cba46c2e9717 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\MassUnhold
  *
- * @since 2.0.0
  */
 class MassUnhold extends AbstractMassAction
 {
@@ -21,7 +20,6 @@ class MassUnhold extends AbstractMassAction
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
     {
@@ -34,7 +32,6 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
index 3ab04b138cf54..277b1dda4ccb7 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
@@ -11,13 +11,13 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\PdfDocumentsMassAction
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 abstract class PdfDocumentsMassAction extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $orderCollectionFactory;
 
@@ -26,7 +26,7 @@ abstract class PdfDocumentsMassAction extends \Magento\Sales\Controller\Adminhtm
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute()
     {
@@ -45,8 +45,8 @@ public function execute()
      * Get Order Collection Factory
      *
      * @return \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getOrderCollection()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
index 52d07199ca859..312807d500065 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
@@ -20,31 +20,26 @@
 /**
  * Class Pdfcreditmemos
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Order\PdfDocumentsMassAction
 {
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var Creditmemo
-     * @since 2.0.0
      */
     protected $pdfCreditmemo;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -55,7 +50,6 @@ class Pdfcreditmemos extends \Magento\Sales\Controller\Adminhtml\Order\PdfDocume
      * @param DateTime $dateTime
      * @param FileFactory $fileFactory
      * @param Creditmemo $pdfCreditmemo
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -77,7 +71,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
index e0b75e5c8e568..d68cfe696b0ef 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
@@ -23,55 +23,46 @@
 /**
  * Class Pdfdocs
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Pdfdocs extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var Invoice
-     * @since 2.0.0
      */
     protected $pdfInvoice;
 
     /**
      * @var Shipment
-     * @since 2.0.0
      */
     protected $pdfShipment;
 
     /**
      * @var Creditmemo
-     * @since 2.0.0
      */
     protected $pdfCreditmemo;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var ShipmentCollectionFactory
-     * @since 2.0.0
      */
     protected $shipmentCollectionFactory;
 
     /**
      * @var InvoiceCollectionFactory
-     * @since 2.0.0
      */
     protected $invoiceCollectionFactory;
 
     /**
      * @var CreditmemoCollectionFactory
-     * @since 2.0.0
      */
     protected $creditmemoCollectionFactory;
 
@@ -89,7 +80,6 @@ class Pdfdocs extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassActi
      * @param OrderCollectionFactory $orderCollectionFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -123,7 +113,6 @@ public function __construct(
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
index a78a99e562637..f8685d0a72d65 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
@@ -19,31 +19,26 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Order\PdfDocumentsMassAction
 {
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var Invoice
-     * @since 2.0.0
      */
     protected $pdfInvoice;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -54,7 +49,6 @@ class Pdfinvoices extends \Magento\Sales\Controller\Adminhtml\Order\PdfDocuments
      * @param DateTime $dateTime
      * @param FileFactory $fileFactory
      * @param Invoice $pdfInvoice
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -76,7 +70,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
index 7c386f272a0b0..b6b67fdf69d00 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
@@ -18,25 +18,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var Shipment
-     * @since 2.0.0
      */
     protected $pdfShipment;
 
@@ -54,7 +50,6 @@ class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMas
      * @param FileFactory $fileFactory
      * @param Shipment $shipment
      * @param ShipmentCollectionFactory $shipmentCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -78,7 +73,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
index 9055552b6431a..8b49ed81ad5bd 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment
  *
- * @since 2.0.0
  */
 class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -27,7 +26,6 @@ class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order
      * Either denies or approves a payment that is in "review" state
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php
index 0b531bfcfdbdd..b850811b4231a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Shipments
  *
- * @since 2.0.0
  */
 class Shipments extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -16,7 +15,6 @@ class Shipments extends \Magento\Sales\Controller\Adminhtml\Order
      * Generate shipments grid for ajax request
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
index ce8fea60656ba..be822436a9a06 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
@@ -7,7 +7,6 @@
 
 /**
  * Order status management controller
- * @since 2.0.0
  */
 abstract class Status extends \Magento\Backend\App\Action
 {
@@ -22,14 +21,12 @@ abstract class Status extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Initialize status model based on status code in request
      *
      * @return \Magento\Sales\Model\Order\Status|false
-     * @since 2.0.0
      */
     protected function _initStatus()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
index 92cd0062a0d2f..0ba1e19bf5aad 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\Assign
  *
- * @since 2.0.0
  */
 class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -27,7 +25,6 @@ class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * @param Context $context
      * @param Registry $coreRegistry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Assign status to state form
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
index 306f754aedc91..f57a6cc2526b2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\AssignPost
  *
- * @since 2.0.0
  */
 class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
@@ -17,7 +16,6 @@ class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * Save status assignment to state
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
index e83efbaba3460..e89be11113c86 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -27,7 +25,6 @@ class Edit extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * @param Context $context
      * @param Registry $coreRegistry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Editing existing status form
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
index dd9b8f13cad3d..4f5475b3e6f5e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -27,7 +25,6 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * @param Context $context
      * @param Registry $coreRegistry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Statuses grid page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
index 4bc9543c5abcb..ccfd75ab4e095 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -27,7 +25,6 @@ class NewAction extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * @param Context $context
      * @param Registry $coreRegistry
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * New status form
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
index 605f40ff286d3..2cb4417edc66d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
@@ -17,7 +16,6 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * Save status form processing
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
index 4eaf1ad4904a7..fc4cc904083ef 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Status\Unassign
  *
- * @since 2.0.0
  */
 class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php
index 8139607670304..e68d0da166536 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Transactions
  *
- * @since 2.0.0
  */
 class Transactions extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -18,7 +17,6 @@ class Transactions extends \Magento\Sales\Controller\Adminhtml\Order
      * Order transactions grid ajax action
      *
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
index c792e8dede8c3..44eb20d2adaf8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\Unhold
  *
- * @since 2.0.0
  */
 class Unhold extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -23,7 +22,6 @@ class Unhold extends \Magento\Sales\Controller\Adminhtml\Order
      * Unhold order
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
index 77680f1dad6d4..7007ede1a915b 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -25,7 +24,6 @@ class View extends \Magento\Sales\Controller\Adminhtml\Order
      * View order detail
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
index 078a3507ce1ce..f6213454e516c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
@@ -9,7 +9,6 @@
  * Adminhtml sales order view gift messages controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Giftmessage extends \Magento\Backend\App\Action
 {
@@ -17,7 +16,6 @@ abstract class Giftmessage extends \Magento\Backend\App\Action
      * Retrieve gift message save model
      *
      * @return \Magento\GiftMessage\Model\Save
-     * @since 2.0.0
      */
     protected function _getGiftmessageSaveModel()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
index 26a8032e3b24f..10990be781034 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\View\Giftmessage\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\View\Giftmessage
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
index f62d3b69430fc..2294205fd1a31 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Order\VoidPayment
  *
- * @since 2.0.0
  */
 class VoidPayment extends \Magento\Sales\Controller\Adminhtml\Order
 {
@@ -16,7 +15,6 @@ class VoidPayment extends \Magento\Sales\Controller\Adminhtml\Order
      * Attempt to void the order payment
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php
index 787d5eba29733..b5a0b8a54ba2a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index
  *
- * @since 2.0.0
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -25,14 +24,12 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Shipments grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
index f0976da3acf50..b324aeb446107 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
@@ -19,7 +19,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Pdfshipments
  *
- * @since 2.0.0
  */
 abstract class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -32,19 +31,16 @@ abstract class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\Ab
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var Shipment
-     * @since 2.0.0
      */
     protected $pdfShipment;
 
@@ -55,7 +51,6 @@ abstract class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\Ab
      * @param FileFactory $fileFactory
      * @param Shipment $shipment
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -76,7 +71,6 @@ public function __construct(
      * @param AbstractCollection $collection
      * @return $this|ResponseInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
index f19744a0e01ad..a5cae0296a8f8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\PrintAction
  *
- * @since 2.0.0
  */
 abstract class PrintAction extends \Magento\Backend\App\Action
 {
@@ -28,13 +27,11 @@ abstract class PrintAction extends \Magento\Backend\App\Action
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -42,7 +39,6 @@ abstract class PrintAction extends \Magento\Backend\App\Action
      * @param Context $context
      * @param FileFactory $fileFactory
      * @param ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -56,7 +52,6 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
index ab09e04041784..cdff335f2c94c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\View
  *
- * @since 2.0.0
  */
 abstract class View extends \Magento\Backend\App\Action
 {
@@ -25,14 +24,12 @@ abstract class View extends \Magento\Backend\App\Action
 
     /**
      * @var ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @param Context $context
      * @param ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Shipment information page
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
index c1a934a47ae94..63cea87bfe237 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Pdfshipments.php
index 6f6dea2528129..c74cbb8321d23 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Pdfshipments.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\Pdfshipments
  *
- * @since 2.0.0
  */
 class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Pdfshipments
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/PrintAction.php
index c4f9b4f91d77d..bb2091639cff6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/PrintAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\PrintAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/View.php
index fbff1ad8d1ab2..7aec4269e1577 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/View.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Shipment\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\View
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
index 486b6c426580b..d5c1186964076 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
@@ -15,7 +15,6 @@
  * Adminhtml sales transactions controller
  *
  * @author Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Transactions extends \Magento\Backend\App\Action
 {
@@ -30,25 +29,21 @@ abstract class Transactions extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
     /**
      * @var OrderPaymentRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderPaymentRepository;
 
@@ -58,7 +53,6 @@ abstract class Transactions extends \Magento\Backend\App\Action
      * @param PageFactory $resultPageFactory
      * @param LayoutFactory $resultLayoutFactory
      * @param OrderPaymentRepositoryInterface $orderPaymentRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -78,7 +72,6 @@ public function __construct(
      * Initialize payment transaction model
      *
      * @return \Magento\Sales\Model\Order\Payment\Transaction|bool
-     * @since 2.0.0
      */
     protected function _initTransaction()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
index 8482541304b69..0bb97786adc04 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Transactions\Fetch
  *
- * @since 2.0.0
  */
 class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions
 {
@@ -28,7 +27,6 @@ class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions
      * Fetch transaction details action
      *
      * @return Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php
index f15767924246f..29aa602ad5a92 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Transactions\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Sales\Controller\Adminhtml\Transactions
 {
@@ -20,7 +19,6 @@ class Grid extends \Magento\Sales\Controller\Adminhtml\Transactions
      * Ajax grid action
      *
      * @return Layout
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
index 71e0ef0c79d8b..2615b723c4246 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Transactions\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Transactions
 {
     /**
      * @return Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php
index ce2471eac992c..a03873273bc6a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Adminhtml\Transactions\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\Adminhtml\Transactions
 {
@@ -20,7 +19,6 @@ class View extends \Magento\Sales\Controller\Adminhtml\Transactions
      * View Transaction Details action
      *
      * @return Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index 5bb17f4ab5b4a..ec5fdbe8cb59f 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -15,26 +15,22 @@
 /**
  * Class DownloadCustomOption
  * @package Magento\Sales\Controller\Download
- * @since 2.0.0
  */
 class DownloadCustomOption extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Sales\Model\Download
-     * @since 2.0.0
      */
     protected $download;
 
     /**
      * @var \Magento\Framework\Unserialize\Unserialize
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $unserialize;
 
@@ -50,7 +46,6 @@ class DownloadCustomOption extends \Magento\Framework\App\Action\Action
      * @param \Magento\Sales\Model\Download $download
      * @param \Magento\Framework\Unserialize\Unserialize $unserialize
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -74,7 +69,6 @@ public function __construct(
      * @return void|\Magento\Framework\Controller\Result\Forward
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -126,7 +120,6 @@ public function execute()
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     protected function endExecute()
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/Creditmemo.php b/app/code/Magento/Sales/Controller/Guest/Creditmemo.php
index e0656ae163b0b..7579d15a0c477 100644
--- a/app/code/Magento/Sales/Controller/Guest/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/Guest/Creditmemo.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Guest\Creditmemo
  *
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Sales\Controller\Guest\View
 {
diff --git a/app/code/Magento/Sales/Controller/Guest/Form.php b/app/code/Magento/Sales/Controller/Guest/Form.php
index 423f62e1ce411..2ade5c30a059f 100644
--- a/app/code/Magento/Sales/Controller/Guest/Form.php
+++ b/app/code/Magento/Sales/Controller/Guest/Form.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Sales\Controller\Guest\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Order view form page
      *
      * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/Invoice.php b/app/code/Magento/Sales/Controller/Guest/Invoice.php
index 5c07630b4017d..1bc67da199398 100644
--- a/app/code/Magento/Sales/Controller/Guest/Invoice.php
+++ b/app/code/Magento/Sales/Controller/Guest/Invoice.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Guest\Invoice
  *
- * @since 2.0.0
  */
 class Invoice extends \Magento\Sales\Controller\Guest\View
 {
diff --git a/app/code/Magento/Sales/Controller/Guest/OrderLoader.php b/app/code/Magento/Sales/Controller/Guest/OrderLoader.php
index 6ffb01f09af1f..9b6efc6ee541e 100644
--- a/app/code/Magento/Sales/Controller/Guest/OrderLoader.php
+++ b/app/code/Magento/Sales/Controller/Guest/OrderLoader.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Sales\Controller\Guest\OrderLoader
  *
- * @since 2.0.0
  */
 class OrderLoader implements OrderLoaderInterface
 {
     /**
      * @var \Magento\Sales\Helper\Guest
-     * @since 2.0.0
      */
     protected $guestHelper;
 
     /**
      * @param \Magento\Sales\Helper\Guest $guestHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Helper\Guest $guestHelper
@@ -34,7 +31,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load(RequestInterface $request)
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/OrderViewAuthorization.php b/app/code/Magento/Sales/Controller/Guest/OrderViewAuthorization.php
index 16e23734156eb..74c62297e7763 100644
--- a/app/code/Magento/Sales/Controller/Guest/OrderViewAuthorization.php
+++ b/app/code/Magento/Sales/Controller/Guest/OrderViewAuthorization.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Sales\Controller\Guest\OrderViewAuthorization
  *
- * @since 2.0.0
  */
 class OrderViewAuthorization implements OrderViewAuthorizationInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Registry $registry)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Registry $registry)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canView(\Magento\Sales\Model\Order $order)
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/PrintAction.php b/app/code/Magento/Sales/Controller/Guest/PrintAction.php
index 57273fff34fdf..d7757e99cf466 100644
--- a/app/code/Magento/Sales/Controller/Guest/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Guest/PrintAction.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Controller\Guest\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\AbstractController\PrintAction
 {
@@ -20,7 +19,6 @@ class PrintAction extends \Magento\Sales\Controller\AbstractController\PrintActi
      * @param Context $context
      * @param OrderLoader $orderLoader
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
diff --git a/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php b/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php
index bd7944da2d203..8632f65fed893 100644
--- a/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php
+++ b/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Sales\Controller\Guest\PrintCreditmemo
  *
- * @since 2.0.0
  */
 class PrintCreditmemo extends \Magento\Sales\Controller\AbstractController\PrintCreditmemo
 {
     /**
      * @var OrderLoader
-     * @since 2.0.0
      */
     protected $orderLoader;
 
     /**
      * @var CreditmemoRepositoryInterface;
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
@@ -36,7 +33,6 @@ class PrintCreditmemo extends \Magento\Sales\Controller\AbstractController\Print
      * @param PageFactory $resultPageFactory
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param OrderLoader $orderLoader
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -59,7 +55,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php b/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php
index cc715d1c34e6b..30e04c8836968 100644
--- a/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php
+++ b/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Sales\Controller\Guest\PrintInvoice
  *
- * @since 2.0.0
  */
 class PrintInvoice extends \Magento\Sales\Controller\AbstractController\PrintInvoice
 {
     /**
      * @var OrderLoader
-     * @since 2.0.0
      */
     protected $orderLoader;
 
@@ -28,7 +26,6 @@ class PrintInvoice extends \Magento\Sales\Controller\AbstractController\PrintInv
      * @param \Magento\Framework\Registry $registry
      * @param PageFactory $resultPageFactory
      * @param OrderLoader $orderLoader
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/PrintShipment.php b/app/code/Magento/Sales/Controller/Guest/PrintShipment.php
index 7640ce63ff9b8..2a8a03d616421 100644
--- a/app/code/Magento/Sales/Controller/Guest/PrintShipment.php
+++ b/app/code/Magento/Sales/Controller/Guest/PrintShipment.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Sales\Controller\Guest\PrintShipment
  *
- * @since 2.0.0
  */
 class PrintShipment extends \Magento\Sales\Controller\AbstractController\PrintShipment
 {
     /**
      * @var OrderLoader
-     * @since 2.0.0
      */
     protected $orderLoader;
 
@@ -28,7 +26,6 @@ class PrintShipment extends \Magento\Sales\Controller\AbstractController\PrintSh
      * @param \Magento\Framework\Registry $registry
      * @param PageFactory $resultPageFactory
      * @param OrderLoader $orderLoader
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +45,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Guest/Reorder.php b/app/code/Magento/Sales/Controller/Guest/Reorder.php
index e4f2ac5a7eb04..530d29698b5f9 100644
--- a/app/code/Magento/Sales/Controller/Guest/Reorder.php
+++ b/app/code/Magento/Sales/Controller/Guest/Reorder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Guest\Reorder
  *
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Controller\AbstractController\Reorder
 {
@@ -17,7 +16,6 @@ class Reorder extends \Magento\Sales\Controller\AbstractController\Reorder
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Sales\Controller\Guest\OrderLoader $orderLoader
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
diff --git a/app/code/Magento/Sales/Controller/Guest/Shipment.php b/app/code/Magento/Sales/Controller/Guest/Shipment.php
index e35b717c1c6e1..6f1d508ec497f 100644
--- a/app/code/Magento/Sales/Controller/Guest/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Guest/Shipment.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Controller\Guest\Shipment
  *
- * @since 2.0.0
  */
 class Shipment extends \Magento\Sales\Controller\Guest\View
 {
diff --git a/app/code/Magento/Sales/Controller/Guest/View.php b/app/code/Magento/Sales/Controller/Guest/View.php
index 1c60738e30753..e38cd520ac170 100644
--- a/app/code/Magento/Sales/Controller/Guest/View.php
+++ b/app/code/Magento/Sales/Controller/Guest/View.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Sales\Controller\Guest\View
  *
- * @since 2.0.0
  */
 class View extends Action\Action
 {
     /**
      * @var \Magento\Sales\Helper\Guest
-     * @since 2.0.0
      */
     protected $guestHelper;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -33,7 +30,6 @@ class View extends Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Sales\Helper\Guest $guestHelper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
index e07c2444986c2..c14d9206ed80e 100644
--- a/app/code/Magento/Sales/Controller/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\Creditmemo
  *
- * @since 2.0.0
  */
 class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php
index 72c162de1d5ea..6afa8b6d45e79 100644
--- a/app/code/Magento/Sales/Controller/Order/History.php
+++ b/app/code/Magento/Sales/Controller/Order/History.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\Sales\Controller\Order\History
  *
- * @since 2.0.0
  */
 class History extends \Magento\Framework\App\Action\Action implements OrderInterface
 {
     /**
      * @var PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Customer order history
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Controller/Order/Invoice.php b/app/code/Magento/Sales/Controller/Order/Invoice.php
index 487d6a2aa7621..ee1ca919e910b 100644
--- a/app/code/Magento/Sales/Controller/Order/Invoice.php
+++ b/app/code/Magento/Sales/Controller/Order/Invoice.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\Invoice
  *
- * @since 2.0.0
  */
 class Invoice extends \Magento\Sales\Controller\AbstractController\Invoice implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
index ecab5ff64f8d1..2c80be228395d 100644
--- a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
+++ b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Sales\Controller\Order\Plugin\Authentication
  *
- * @since 2.0.0
  */
 class Authentication
 {
     /**
      * @var \Magento\Customer\Model\Url
-     * @since 2.0.0
      */
     protected $customerUrl;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Url $customerUrl,
@@ -47,7 +43,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request)
     {
diff --git a/app/code/Magento/Sales/Controller/Order/PrintAction.php b/app/code/Magento/Sales/Controller/Order/PrintAction.php
index fe13e4b6fc25c..ad4c0dd5ac779 100644
--- a/app/code/Magento/Sales/Controller/Order/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Order/PrintAction.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\AbstractController\PrintAction implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/PrintCreditmemo.php b/app/code/Magento/Sales/Controller/Order/PrintCreditmemo.php
index ec636bf631bf8..87b1bd613947c 100644
--- a/app/code/Magento/Sales/Controller/Order/PrintCreditmemo.php
+++ b/app/code/Magento/Sales/Controller/Order/PrintCreditmemo.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\PrintCreditmemo
  *
- * @since 2.0.0
  */
 class PrintCreditmemo extends \Magento\Sales\Controller\AbstractController\PrintCreditmemo implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/PrintInvoice.php b/app/code/Magento/Sales/Controller/Order/PrintInvoice.php
index ca01e80437b20..64186ac876c74 100644
--- a/app/code/Magento/Sales/Controller/Order/PrintInvoice.php
+++ b/app/code/Magento/Sales/Controller/Order/PrintInvoice.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\PrintInvoice
  *
- * @since 2.0.0
  */
 class PrintInvoice extends \Magento\Sales\Controller\AbstractController\PrintInvoice implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/PrintShipment.php b/app/code/Magento/Sales/Controller/Order/PrintShipment.php
index 021903cb1645a..2ad0f35ea6da7 100644
--- a/app/code/Magento/Sales/Controller/Order/PrintShipment.php
+++ b/app/code/Magento/Sales/Controller/Order/PrintShipment.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\PrintShipment
  *
- * @since 2.0.0
  */
 class PrintShipment extends \Magento\Sales\Controller\AbstractController\PrintShipment implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/Reorder.php b/app/code/Magento/Sales/Controller/Order/Reorder.php
index 98eb584f3b185..9f871641776b8 100644
--- a/app/code/Magento/Sales/Controller/Order/Reorder.php
+++ b/app/code/Magento/Sales/Controller/Order/Reorder.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\Reorder
  *
- * @since 2.0.0
  */
 class Reorder extends \Magento\Sales\Controller\AbstractController\Reorder implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/Shipment.php b/app/code/Magento/Sales/Controller/Order/Shipment.php
index 203956aa0f427..98e66531aa7b3 100644
--- a/app/code/Magento/Sales/Controller/Order/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Order/Shipment.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\Shipment
  *
- * @since 2.0.0
  */
 class Shipment extends \Magento\Sales\Controller\AbstractController\Shipment implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Order/View.php b/app/code/Magento/Sales/Controller/Order/View.php
index c8a83f7749fce..d8b2384ceaa2b 100644
--- a/app/code/Magento/Sales/Controller/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Order/View.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sales\Controller\Order\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/OrderInterface.php b/app/code/Magento/Sales/Controller/OrderInterface.php
index fa1c4ddc138fe..ed12d8eb45d25 100644
--- a/app/code/Magento/Sales/Controller/OrderInterface.php
+++ b/app/code/Magento/Sales/Controller/OrderInterface.php
@@ -11,7 +11,6 @@
 /**
  * Interface \Magento\Sales\Controller\OrderInterface
  *
- * @since 2.0.0
  */
 interface OrderInterface extends ActionInterface
 {
diff --git a/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php b/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
index 28b0398550d5b..021e7b66cd13f 100644
--- a/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
+++ b/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
@@ -9,7 +9,6 @@
 
 /**
  * Class CleanExpiredQuotes
- * @since 2.0.0
  */
 class CleanExpiredQuotes
 {
@@ -17,26 +16,22 @@ class CleanExpiredQuotes
 
     /**
      * @var StoresConfig
-     * @since 2.0.0
      */
     protected $storesConfig;
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory
-     * @since 2.0.0
      */
     protected $quoteCollectionFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $expireQuotesFilterFields = [];
 
     /**
      * @param StoresConfig $storesConfig
      * @param \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         StoresConfig $storesConfig,
@@ -50,7 +45,6 @@ public function __construct(
      * Clean expired quotes (cron process)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -77,7 +71,6 @@ public function execute()
      * Retrieve expire quotes additional fields to filter
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getExpireQuotesAdditionalFilterFields()
     {
@@ -89,7 +82,6 @@ protected function getExpireQuotesAdditionalFilterFields()
      *
      * @param array $fields
      * @return void
-     * @since 2.0.0
      */
     public function setExpireQuotesAdditionalFilterFields(array $fields)
     {
diff --git a/app/code/Magento/Sales/Cron/GridAsyncInsert.php b/app/code/Magento/Sales/Cron/GridAsyncInsert.php
index fd74defa71a0d..ca494837a785b 100644
--- a/app/code/Magento/Sales/Cron/GridAsyncInsert.php
+++ b/app/code/Magento/Sales/Cron/GridAsyncInsert.php
@@ -10,19 +10,16 @@
  *
  * Performs handling cron jobs related to indexing
  * of Order, Invoice, Shipment and Creditmemo grids.
- * @since 2.0.0
  */
 class GridAsyncInsert
 {
     /**
      * @var \Magento\Sales\Model\GridAsyncInsert
-     * @since 2.0.0
      */
     protected $asyncInsert;
 
     /**
      * @param \Magento\Sales\Model\GridAsyncInsert $asyncInsert
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\GridAsyncInsert $asyncInsert
@@ -42,7 +39,6 @@ public function __construct(
      * in global settings.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Cron/SendEmails.php b/app/code/Magento/Sales/Cron/SendEmails.php
index 6dad11318e0dc..e66348a16c06c 100644
--- a/app/code/Magento/Sales/Cron/SendEmails.php
+++ b/app/code/Magento/Sales/Cron/SendEmails.php
@@ -10,7 +10,6 @@
  *
  * Performs handling of cron jobs related to sending emails to customers
  * after creation/modification of Order, Invoice, Shipment or Creditmemo.
- * @since 2.0.0
  */
 class SendEmails
 {
@@ -18,13 +17,11 @@ class SendEmails
      * Global configuration storage.
      *
      * @var \Magento\Sales\Model\EmailSenderHandler
-     * @since 2.0.0
      */
     protected $emailSenderHandler;
 
     /**
      * @param \Magento\Sales\Model\EmailSenderHandler $emailSenderHandler
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Model\EmailSenderHandler $emailSenderHandler)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Sales\Model\EmailSenderHandler $emailSender
      * in global settings.
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
index 0e2795071aac8..036f54b892895 100644
--- a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
+++ b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
@@ -11,7 +11,6 @@
  * Returns information for "Recently Ordered" widget.
  * It contains list of 5 salable products from the last placed order.
  * Qty of products to display is limited by LastOrderedItems::SIDEBAR_ORDER_LIMIT constant.
- * @since 2.0.0
  */
 class LastOrderedItems implements SectionSourceInterface
 {
@@ -22,37 +21,31 @@ class LastOrderedItems implements SectionSourceInterface
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected $orders;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -68,7 +61,6 @@ class LastOrderedItems implements SectionSourceInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
@@ -88,7 +80,6 @@ public function __construct(
      * Init last placed customer order for display on front
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initOrders()
     {
@@ -107,7 +98,6 @@ protected function initOrders()
      * Get list of last ordered products
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getItems()
     {
@@ -138,7 +128,6 @@ protected function getItems()
      *
      * @param  \Magento\Sales\Model\Order\Item $orderItem
      * @return boolean
-     * @since 2.0.0
      */
     protected function isItemAvailableForReorder(\Magento\Sales\Model\Order\Item $orderItem)
     {
@@ -157,7 +146,6 @@ protected function isItemAvailableForReorder(\Magento\Sales\Model\Order\Item $or
      * Last order getter
      *
      * @return \Magento\Sales\Model\Order|void
-     * @since 2.0.0
      */
     protected function getLastOrder()
     {
@@ -171,7 +159,6 @@ protected function getLastOrder()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
diff --git a/app/code/Magento/Sales/Exception/CouldNotInvoiceException.php b/app/code/Magento/Sales/Exception/CouldNotInvoiceException.php
index 06fcb56911f17..7881232d72b1d 100644
--- a/app/code/Magento/Sales/Exception/CouldNotInvoiceException.php
+++ b/app/code/Magento/Sales/Exception/CouldNotInvoiceException.php
@@ -12,7 +12,7 @@
  * Class CouldNotInvoiceException
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CouldNotInvoiceException extends LocalizedException implements CouldNotInvoiceExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Exception/CouldNotRefundException.php b/app/code/Magento/Sales/Exception/CouldNotRefundException.php
index 2421c9123227b..3205c595c88c5 100644
--- a/app/code/Magento/Sales/Exception/CouldNotRefundException.php
+++ b/app/code/Magento/Sales/Exception/CouldNotRefundException.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CouldNotRefundException extends LocalizedException implements CouldNotRefundExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Exception/CouldNotShipException.php b/app/code/Magento/Sales/Exception/CouldNotShipException.php
index 03a00b06d387b..1cfc502a05ac6 100644
--- a/app/code/Magento/Sales/Exception/CouldNotShipException.php
+++ b/app/code/Magento/Sales/Exception/CouldNotShipException.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CouldNotShipException extends LocalizedException implements CouldNotShipExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Exception/DocumentValidationException.php b/app/code/Magento/Sales/Exception/DocumentValidationException.php
index daa01d337275e..aebe878acfecd 100644
--- a/app/code/Magento/Sales/Exception/DocumentValidationException.php
+++ b/app/code/Magento/Sales/Exception/DocumentValidationException.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class DocumentValidationException extends LocalizedException implements DocumentValidationExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 9b22be14efec1..9c6d676eedb8f 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Sales\Helper\Admin
  *
- * @since 2.0.0
  */
 class Admin extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -42,7 +37,6 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -66,7 +60,6 @@ public function __construct(
      * @param   bool $strong
      * @param   string $separator
      * @return  string
-     * @since 2.0.0
      */
     public function displayPriceAttribute($dataObject, $code, $strong = false, $separator = '<br/>')
     {
@@ -92,7 +85,6 @@ public function displayPriceAttribute($dataObject, $code, $strong = false, $sepa
      * @param   bool $strong
      * @param   string $separator
      * @return  string
-     * @since 2.0.0
      */
     public function displayPrices($dataObject, $basePrice, $price, $strong = false, $separator = '<br/>')
     {
@@ -127,7 +119,6 @@ public function displayPrices($dataObject, $basePrice, $price, $strong = false,
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function applySalableProductTypesFilter($collection)
     {
@@ -155,7 +146,6 @@ public function applySalableProductTypesFilter($collection)
      * @param string $data
      * @param null|array $allowedTags
      * @return string
-     * @since 2.0.0
      */
     public function escapeHtmlWithLinks($data, $allowedTags = null)
     {
diff --git a/app/code/Magento/Sales/Helper/Data.php b/app/code/Magento/Sales/Helper/Data.php
index 61497404d6a0c..5f6beead7a09c 100644
--- a/app/code/Magento/Sales/Helper/Data.php
+++ b/app/code/Magento/Sales/Helper/Data.php
@@ -11,7 +11,6 @@
  * Sales module base helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewOrderConfirmationEmail($store = null)
     {
@@ -36,7 +34,6 @@ public function canSendNewOrderConfirmationEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewOrderEmail($store = null)
     {
@@ -48,7 +45,6 @@ public function canSendNewOrderEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendOrderCommentEmail($store = null)
     {
@@ -64,7 +60,6 @@ public function canSendOrderCommentEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewShipmentEmail($store = null)
     {
@@ -80,7 +75,6 @@ public function canSendNewShipmentEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendShipmentCommentEmail($store = null)
     {
@@ -96,7 +90,6 @@ public function canSendShipmentCommentEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewInvoiceEmail($store = null)
     {
@@ -112,7 +105,6 @@ public function canSendNewInvoiceEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendInvoiceCommentEmail($store = null)
     {
@@ -128,7 +120,6 @@ public function canSendInvoiceCommentEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendNewCreditmemoEmail($store = null)
     {
@@ -144,7 +135,6 @@ public function canSendNewCreditmemoEmail($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function canSendCreditmemoCommentEmail($store = null)
     {
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index c8f5608f3d8bc..4516dd29018f5 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -11,7 +11,6 @@
 /**
  * Sales module base helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Guest extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -19,43 +18,36 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\RedirectFactory
-     * @since 2.0.0
      */
     protected $resultRedirectFactory;
 
@@ -76,7 +68,6 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $_storeManager;
 
@@ -92,7 +83,6 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         App\Helper\Context $context,
@@ -127,7 +117,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function loadValidOrder(App\RequestInterface $request)
     {
@@ -209,7 +198,6 @@ public function loadValidOrder(App\RequestInterface $request)
      *
      * @param \Magento\Framework\View\Result\Page $resultPage
      * @return void
-     * @since 2.0.0
      */
     public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
     {
@@ -233,7 +221,6 @@ public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
      *
      * @param string $cookieValue
      * @return void
-     * @since 2.0.0
      */
     private function setGuestViewCookie($cookieValue)
     {
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index 24cd07a39b4f6..6eaeb30102375 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -10,7 +10,6 @@
 
 /**
  * Sales module base helper
- * @since 2.0.0
  */
 class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -18,13 +17,11 @@ class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
@@ -32,7 +29,6 @@ class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isAllow()
     {
@@ -60,7 +55,6 @@ public function isAllow()
      *
      * @param \Magento\Store\Model\Store|int|null $store
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed($store = null)
     {
@@ -75,7 +69,6 @@ public function isAllowed($store = null)
      *
      * @param int $orderId
      * @return bool
-     * @since 2.0.0
      */
     public function canReorder($orderId)
     {
diff --git a/app/code/Magento/Sales/Model/AbstractModel.php b/app/code/Magento/Sales/Model/AbstractModel.php
index 36d3e3e305120..7f9153fe78e1c 100644
--- a/app/code/Magento/Sales/Model/AbstractModel.php
+++ b/app/code/Magento/Sales/Model/AbstractModel.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractModel extends AbstractExtensibleModel
 {
@@ -26,7 +25,6 @@ abstract class AbstractModel extends AbstractExtensibleModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -52,7 +50,6 @@ public function __construct(
      * Returns _eventObject
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEventObject()
     {
diff --git a/app/code/Magento/Sales/Model/AbstractNotifier.php b/app/code/Magento/Sales/Model/AbstractNotifier.php
index e97d0bad5f08f..dfa7e12c083a4 100644
--- a/app/code/Magento/Sales/Model/AbstractNotifier.php
+++ b/app/code/Magento/Sales/Model/AbstractNotifier.php
@@ -13,25 +13,21 @@
 /**
  * Class Notifier
  * @package Magento\Sales\Model
- * @since 2.0.0
  */
 abstract class AbstractNotifier extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $historyCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Sender
-     * @since 2.0.0
      */
     protected $sender;
 
@@ -39,7 +35,6 @@ abstract class AbstractNotifier extends \Magento\Framework\Model\AbstractModel
      * @param CollectionFactory $historyCollectionFactory
      * @param Logger $logger
      * @param Sender $sender
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $historyCollectionFactory,
@@ -57,7 +52,6 @@ public function __construct(
      * @param AbstractModel $model
      * @return bool
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function notify(\Magento\Sales\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index ea207bcc0ffb3..dcaf911b8d5af 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -18,7 +18,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\Model\Cart\CartInterface
 {
@@ -31,7 +30,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Quote session object
      *
      * @var \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -39,7 +37,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Quote customer wishlist model object
      *
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $_wishlist;
 
@@ -47,7 +44,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Sales Quote instance
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_cart;
 
@@ -55,7 +51,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Catalog Compare List instance
      *
      * @var \Magento\Catalog\Model\Product\Compare\ListCompare
-     * @since 2.0.0
      */
     protected $_compareList;
 
@@ -63,7 +58,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Re-collect quote flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_needCollect;
 
@@ -71,7 +65,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Re-collect cart flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_needCollectCart = false;
 
@@ -79,7 +72,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Collect (import) data and validate it flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isValidate = false;
 
@@ -87,7 +79,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Array of validate errors
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errors = [];
 
@@ -95,7 +86,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Quote associated with the model
      *
      * @var \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
@@ -103,13 +93,11 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -117,109 +105,91 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var Product\Quote\Initializer
-     * @since 2.0.0
      */
     protected $quoteInitializer;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
-     * @since 2.0.0
      */
     protected $addressRepository;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Model\Metadata\FormFactory
-     * @since 2.0.0
      */
     protected $_metadataFormFactory;
 
     /**
      * @var \Magento\Customer\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @var \Magento\Sales\Model\AdminOrder\EmailSender
-     * @since 2.0.0
      */
     protected $emailSender;
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\Updater
-     * @since 2.0.0
      */
     protected $quoteItemUpdater;
 
     /**
      * @var \Magento\Framework\DataObject\Factory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
@@ -227,37 +197,31 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * Constructor
      *
      * @var \Magento\Customer\Model\Customer\Mapper
-     * @since 2.0.0
      */
     protected $customerMapper;
 
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
-     * @since 2.0.0
      */
     protected $quoteRepository;
 
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
-     * @since 2.0.0
      */
     protected $quoteManagement;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @var \Magento\Sales\Api\OrderManagementInterface
-     * @since 2.0.0
      */
     protected $orderManagement;
 
     /**
      * @var \Magento\Quote\Model\QuoteFactory
-     * @since 2.0.0
      */
     protected $quoteFactory;
 
@@ -300,7 +264,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -370,7 +333,6 @@ public function __construct(
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsValidate($flag)
     {
@@ -383,7 +345,6 @@ public function setIsValidate($flag)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsValidate()
     {
@@ -395,7 +356,6 @@ public function getIsValidate()
      *
      * @param int|\Magento\Quote\Model\Quote\Item $item
      * @return \Magento\Quote\Model\Quote\Item|false
-     * @since 2.0.0
      */
     protected function _getQuoteItem($item)
     {
@@ -412,7 +372,6 @@ protected function _getQuoteItem($item)
      * Initialize data for price rules
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initRuleData()
     {
@@ -435,7 +394,6 @@ public function initRuleData()
      *
      * @param   bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setRecollect($flag)
     {
@@ -448,7 +406,6 @@ public function setRecollect($flag)
      * Set recollect totals flag for quote
      *
      * @return $this
-     * @since 2.0.0
      */
     public function recollectCart()
     {
@@ -465,7 +422,6 @@ public function recollectCart()
      * Quote saving
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveQuote()
     {
@@ -485,7 +441,6 @@ public function saveQuote()
      * Retrieve session model object of quote
      *
      * @return \Magento\Backend\Model\Session\Quote
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -496,7 +451,6 @@ public function getSession()
      * Retrieve quote object model
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -512,7 +466,6 @@ public function getQuote()
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
-     * @since 2.0.0
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
     {
@@ -528,7 +481,6 @@ public function setQuote(\Magento\Quote\Model\Quote $quote)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function initFromOrder(\Magento\Sales\Model\Order $order)
     {
@@ -621,7 +573,6 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return void
-     * @since 2.0.0
      */
     protected function _initBillingAddressFromOrder(\Magento\Sales\Model\Order $order)
     {
@@ -639,7 +590,6 @@ protected function _initBillingAddressFromOrder(\Magento\Sales\Model\Order $orde
      *
      * @param \Magento\Sales\Model\Order $order
      * @return void
-     * @since 2.0.0
      */
     protected function _initShippingAddressFromOrder(\Magento\Sales\Model\Order $order)
     {
@@ -663,7 +613,6 @@ protected function _initShippingAddressFromOrder(\Magento\Sales\Model\Order $ord
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @param int $qty
      * @return \Magento\Quote\Model\Quote\Item|string|$this
-     * @since 2.0.0
      */
     public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $qty = null)
     {
@@ -717,7 +666,6 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
      *
      * @param bool $cacheReload pass cached wishlist object and get new one
      * @return \Magento\Wishlist\Model\Wishlist|false Return false if customer ID is not specified
-     * @since 2.0.0
      */
     public function getCustomerWishlist($cacheReload = false)
     {
@@ -745,7 +693,6 @@ public function getCustomerWishlist($cacheReload = false)
      * Retrieve customer cart quote object model
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     public function getCustomerCart()
     {
@@ -774,7 +721,6 @@ public function getCustomerCart()
      * Retrieve customer compare list model object
      *
      * @return \Magento\Catalog\Model\Product\Compare\ListCompare
-     * @since 2.0.0
      */
     public function getCustomerCompareList()
     {
@@ -796,7 +742,6 @@ public function getCustomerCompareList()
      * Retrieve current customer group ID.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -818,7 +763,6 @@ public function getCustomerGroupId()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function moveQuoteItem($item, $moveTo, $qty)
     {
@@ -952,7 +896,6 @@ public function moveQuoteItem($item, $moveTo, $qty)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function applySidebarData($data)
     {
@@ -1014,7 +957,6 @@ public function applySidebarData($data)
      * @param int $itemId
      * @param string $from
      * @return $this
-     * @since 2.0.0
      */
     public function removeItem($itemId, $from)
     {
@@ -1050,7 +992,6 @@ public function removeItem($itemId, $from)
      *
      * @param int $item
      * @return $this
-     * @since 2.0.0
      */
     public function removeQuoteItem($item)
     {
@@ -1069,7 +1010,6 @@ public function removeQuoteItem($item)
      * @param array|float|int|\Magento\Framework\DataObject $config
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addProduct($product, $config = 1)
     {
@@ -1112,7 +1052,6 @@ public function addProduct($product, $config = 1)
      *
      * @param array $products
      * @return $this
-     * @since 2.0.0
      */
     public function addProducts(array $products)
     {
@@ -1136,7 +1075,6 @@ public function addProducts(array $products)
      * @param array $items
      * @return $this
      * @throws \Exception|\Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function updateQuoteItems($items)
     {
@@ -1181,7 +1119,6 @@ public function updateQuoteItems($items)
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function _parseOptions(\Magento\Quote\Model\Quote\Item $item, $additionalOptions)
     {
@@ -1248,7 +1185,6 @@ protected function _parseOptions(\Magento\Quote\Model\Quote\Item $item, $additio
      * @return $this
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function _assignOptionsToItem(\Magento\Quote\Model\Quote\Item $item, $options)
     {
@@ -1306,7 +1242,6 @@ protected function _assignOptionsToItem(\Magento\Quote\Model\Quote\Item $item, $
      *
      * @param \Magento\Quote\Model\Quote\Item $item
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareOptionsForRequest($item)
     {
@@ -1339,7 +1274,6 @@ protected function _prepareOptionsForRequest($item)
      *
      * @param float|int $price
      * @return float|int
-     * @since 2.0.0
      */
     protected function _parseCustomPrice($price)
     {
@@ -1353,7 +1287,6 @@ protected function _parseCustomPrice($price)
      * Retrieve oreder quote shipping address
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -1365,7 +1298,6 @@ public function getShippingAddress()
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return CustomerForm
-     * @since 2.0.0
      */
     protected function _createCustomerForm(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -1387,7 +1319,6 @@ protected function _createCustomerForm(\Magento\Customer\Api\Data\CustomerInterf
      * @param \Magento\Quote\Model\Quote\Address $address
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address, array $data)
     {
@@ -1447,7 +1378,6 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
      *
      * @param \Magento\Quote\Model\Quote\Address|array $address
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress($address)
     {
@@ -1485,7 +1415,6 @@ public function setShippingAddress($address)
      * @param bool $flag If true - don't save in address book and actually copy data across billing and shipping
      *                   addresses
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAsBilling($flag)
     {
@@ -1506,7 +1435,6 @@ public function setShippingAsBilling($flag)
      * Retrieve quote billing address
      *
      * @return \Magento\Quote\Model\Quote\Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -1518,7 +1446,6 @@ public function getBillingAddress()
      *
      * @param array $address
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress($address)
     {
@@ -1557,7 +1484,6 @@ public function setBillingAddress($address)
      *
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingMethod($method)
     {
@@ -1571,7 +1497,6 @@ public function setShippingMethod($method)
      * Empty shipping method and clear shipping rates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetShippingMethod()
     {
@@ -1585,7 +1510,6 @@ public function resetShippingMethod()
      * Collect shipping data for quote shipping address
      *
      * @return $this
-     * @since 2.0.0
      */
     public function collectShippingRates()
     {
@@ -1599,7 +1523,6 @@ public function collectShippingRates()
      * Calculate totals
      *
      * @return void
-     * @since 2.0.0
      */
     public function collectRates()
     {
@@ -1611,7 +1534,6 @@ public function collectRates()
      *
      * @param string $method
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentMethod($method)
     {
@@ -1624,7 +1546,6 @@ public function setPaymentMethod($method)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setPaymentData($data)
     {
@@ -1641,7 +1562,6 @@ public function setPaymentData($data)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function applyCoupon($code)
     {
@@ -1662,7 +1582,6 @@ public function applyCoupon($code)
      *
      * @param array $accountData
      * @return $this
-     * @since 2.0.0
      */
     public function setAccountData($accountData)
     {
@@ -1707,7 +1626,6 @@ public function setAccountData($accountData)
      * @return  $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function importPostData($data)
     {
@@ -1758,7 +1676,6 @@ public function importPostData($data)
      *
      * @param \Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     protected function _customerIsInStore($store)
     {
@@ -1774,7 +1691,6 @@ protected function _customerIsInStore($store)
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function _validateCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -1814,7 +1730,6 @@ protected function _validateCustomerData(\Magento\Customer\Api\Data\CustomerInte
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function _prepareCustomer()
     {
@@ -1882,7 +1797,6 @@ public function _prepareCustomer()
      * @return void
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
     {
@@ -1937,7 +1851,6 @@ protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
      * Prepare item otions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareQuoteItems()
     {
@@ -1961,7 +1874,6 @@ protected function _prepareQuoteItems()
      * Create new order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function createOrder()
     {
@@ -2011,7 +1923,6 @@ public function createOrder()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _validate()
     {
@@ -2070,7 +1981,6 @@ protected function _validate()
      * Retrieve or generate new customer email.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getNewCustomerEmail()
     {
diff --git a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
index f0c2dc07d272c..8ba0b5b071395 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
@@ -12,25 +12,21 @@
 
 /**
  * Class EmailSender
- * @since 2.0.0
  */
 class EmailSender
 {
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $orderSender;
 
@@ -38,7 +34,6 @@ class EmailSender
      * @param ManagerInterface $messageManager
      * @param Logger $logger
      * @param OrderSender $orderSender
-     * @since 2.0.0
      */
     public function __construct(ManagerInterface $messageManager, Logger $logger, OrderSender $orderSender)
     {
@@ -53,7 +48,6 @@ public function __construct(ManagerInterface $messageManager, Logger $logger, Or
      *
      * @param Order $order
      * @return bool
-     * @since 2.0.0
      */
     public function send(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php b/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php
index 367632f280a0f..f0800fcd508c5 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Sales\Model\AdminOrder\Product\Quote\Initializer
  *
- * @since 2.0.0
  */
 class Initializer
 {
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
     /**
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -40,7 +37,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Framework\DataObject $config
      * @return \Magento\Quote\Model\Quote\Item|string
-     * @since 2.0.0
      */
     public function init(
         \Magento\Quote\Model\Quote $quote,
diff --git a/app/code/Magento/Sales/Model/Config.php b/app/code/Magento/Sales/Model/Config.php
index dbd82a61d36c3..9123fff4c84c4 100644
--- a/app/code/Magento/Sales/Model/Config.php
+++ b/app/code/Magento/Sales/Model/Config.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Model\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Sales\Model\ConfigInterface
 {
@@ -20,20 +19,17 @@ class Config implements \Magento\Sales\Model\ConfigInterface
      * Modules configuration model
      *
      * @var \Magento\Sales\Model\Config\Data
-     * @since 2.0.0
      */
     protected $_dataContainer;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @param \Magento\Sales\Model\Config\Data $dataContainer
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Model\Config\Data $dataContainer, \Magento\Framework\App\State $appState)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Sales\Model\Config\Data $dataContainer, \Ma
      * @param string $group
      * @param string $code
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsRenderer($section, $group, $code)
     {
@@ -63,7 +58,6 @@ public function getTotalsRenderer($section, $group, $code)
      * @param string $section
      * @param string $group
      * @return array
-     * @since 2.0.0
      */
     public function getGroupTotals($section, $group)
     {
@@ -75,7 +69,6 @@ public function getGroupTotals($section, $group)
      * Get available product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableProductTypes()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php b/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php
index ff40f83e636c2..e3e2926c2106b 100644
--- a/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php
+++ b/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php
@@ -8,7 +8,6 @@
 /**
  * Backend model for global configuration value
  * 'sales_email/general/async_sending'.
- * @since 2.0.0
  */
 class AsyncSending extends \Magento\Framework\App\Config\Value
 {
@@ -22,7 +21,6 @@ class AsyncSending extends \Magento\Framework\App\Config\Value
      * - config_data_sales_email_general_async_sending_disabled
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Backend/Grid/AsyncIndexing.php b/app/code/Magento/Sales/Model/Config/Backend/Grid/AsyncIndexing.php
index 43d0d9163104a..7d20d9e2f6f59 100644
--- a/app/code/Magento/Sales/Model/Config/Backend/Grid/AsyncIndexing.php
+++ b/app/code/Magento/Sales/Model/Config/Backend/Grid/AsyncIndexing.php
@@ -8,7 +8,6 @@
 /**
  * Backend model for global configuration value
  * 'dev/grid/async_indexing'.
- * @since 2.0.0
  */
 class AsyncIndexing extends \Magento\Framework\App\Config\Value
 {
@@ -22,7 +21,6 @@ class AsyncIndexing extends \Magento\Framework\App\Config\Value
      * - config_data_dev_grid_async_indexing_disabled
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Converter.php b/app/code/Magento/Sales/Model/Config/Converter.php
index b4f7b9a41a155..f900ac04d8ce6 100644
--- a/app/code/Magento/Sales/Model/Config/Converter.php
+++ b/app/code/Magento/Sales/Model/Config/Converter.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Model\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -23,7 +22,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @return array
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Sales/Model/Config/Data.php b/app/code/Magento/Sales/Model/Config/Data.php
index fcd16fe34bc3a..a853079c0c78e 100644
--- a/app/code/Magento/Sales/Model/Config/Data.php
+++ b/app/code/Magento/Sales/Model/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides sales configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
@@ -20,7 +19,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Config\Reader $reader,
diff --git a/app/code/Magento/Sales/Model/Config/Ordered.php b/app/code/Magento/Sales/Model/Config/Ordered.php
index 5f846e1ff20a7..a2f0cd1e29c95 100644
--- a/app/code/Magento/Sales/Model/Config/Ordered.php
+++ b/app/code/Magento/Sales/Model/Config/Ordered.php
@@ -13,7 +13,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Ordered extends \Magento\Framework\App\Config\Base
 {
@@ -21,7 +20,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Cache key for collectors
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_collectorsCacheKey = null;
 
@@ -29,7 +27,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Configuration group where to collect registered totals
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configGroup;
 
@@ -37,7 +34,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Configuration section where to collect registered totals
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configSection;
 
@@ -45,7 +41,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Prepared models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_models = [];
 
@@ -53,7 +48,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Models configuration
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_modelsConfig = [];
 
@@ -61,25 +55,21 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * Sorted models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_collectors = [];
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Sales\Model\Config
-     * @since 2.0.0
      */
     protected $_salesConfig;
 
@@ -95,7 +85,6 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Framework\Simplexml\Element $sourceData
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
@@ -115,7 +104,6 @@ public function __construct(
      * Initialize total models configuration and objects
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initModels()
     {
@@ -137,7 +125,6 @@ protected function _initModels()
      * @param array $totalConfig
      * @return mixed
      * @abstract
-     * @since 2.0.0
      */
     abstract protected function _initModelInstance($class, $totalCode, $totalConfig);
 
@@ -147,7 +134,6 @@ abstract protected function _initModelInstance($class, $totalCode, $totalConfig)
      * @param   string $code
      * @param   \Magento\Framework\App\Config\Element $totalConfig
      * @return  array
-     * @since 2.0.0
      */
     protected function _prepareConfigArray($code, $totalConfig)
     {
@@ -162,7 +148,6 @@ protected function _prepareConfigArray($code, $totalConfig)
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     private function _getSortedCollectorCodes(array $config)
     {
@@ -201,7 +186,6 @@ function ($a, $b) {
      * Collectors array is array of total models ordered based on configuration settings
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initCollectors()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Reader.php b/app/code/Magento/Sales/Model/Config/Reader.php
index ba572b60532d4..40b9c99818651 100644
--- a/app/code/Magento/Sales/Model/Config/Reader.php
+++ b/app/code/Magento/Sales/Model/Config/Reader.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Model\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -21,7 +20,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/section' => 'name',
@@ -40,7 +38,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Sales/Model/Config/SchemaLocator.php b/app/code/Magento/Sales/Model/Config/SchemaLocator.php
index e509948735e0d..060d4a5ae4712 100644
--- a/app/code/Magento/Sales/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Sales/Model/Config/SchemaLocator.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -22,7 +21,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
@@ -30,13 +28,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -47,7 +43,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -58,7 +53,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Source/Order/Status.php b/app/code/Magento/Sales/Model/Config/Source/Order/Status.php
index 244f86dc27119..2b42f6d406035 100644
--- a/app/code/Magento/Sales/Model/Config/Source/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Config/Source/Order/Status.php
@@ -12,7 +12,6 @@
 /**
  * Class Status
  * @api
- * @since 2.0.0
  */
 class Status implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,7 +19,6 @@ class Status implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_stateStatuses = [
         \Magento\Sales\Model\Order::STATE_NEW,
@@ -33,13 +31,11 @@ class Status implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @param \Magento\Sales\Model\Order\Config $orderConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Model\Order\Config $orderConfig)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Sales\Model\Order\Config $orderConfig)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Model/Config/Source/Order/Status/NewStatus.php b/app/code/Magento/Sales/Model/Config/Source/Order/Status/NewStatus.php
index 05f15185ce71a..c88090630db70 100644
--- a/app/code/Magento/Sales/Model/Config/Source/Order/Status/NewStatus.php
+++ b/app/code/Magento/Sales/Model/Config/Source/Order/Status/NewStatus.php
@@ -7,13 +7,11 @@
 
 /**
  * Order Statuses source model
- * @since 2.0.0
  */
 class NewStatus extends \Magento\Sales\Model\Config\Source\Order\Status
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_stateStatuses = \Magento\Sales\Model\Order::STATE_NEW;
 }
diff --git a/app/code/Magento/Sales/Model/Config/Source/Order/Status/Newprocessing.php b/app/code/Magento/Sales/Model/Config/Source/Order/Status/Newprocessing.php
index e79e58d851181..a8c808192110f 100644
--- a/app/code/Magento/Sales/Model/Config/Source/Order/Status/Newprocessing.php
+++ b/app/code/Magento/Sales/Model/Config/Source/Order/Status/Newprocessing.php
@@ -7,13 +7,11 @@
 
 /**
  * Order Statuses source model
- * @since 2.0.0
  */
 class Newprocessing extends \Magento\Sales\Model\Config\Source\Order\Status
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_stateStatuses = [
         \Magento\Sales\Model\Order::STATE_NEW,
diff --git a/app/code/Magento/Sales/Model/Config/Source/Order/Status/Processing.php b/app/code/Magento/Sales/Model/Config/Source/Order/Status/Processing.php
index 76e5b1ecbb09a..a5023d5d049b1 100644
--- a/app/code/Magento/Sales/Model/Config/Source/Order/Status/Processing.php
+++ b/app/code/Magento/Sales/Model/Config/Source/Order/Status/Processing.php
@@ -7,13 +7,11 @@
 
 /**
  * Order Statuses source model
- * @since 2.0.0
  */
 class Processing extends \Magento\Sales\Model\Config\Source\Order\Status
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_stateStatuses = \Magento\Sales\Model\Order::STATE_PROCESSING;
 }
diff --git a/app/code/Magento/Sales/Model/ConfigInterface.php b/app/code/Magento/Sales/Model/ConfigInterface.php
index 08d84f91eecf0..f7faaa92b452d 100644
--- a/app/code/Magento/Sales/Model/ConfigInterface.php
+++ b/app/code/Magento/Sales/Model/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ConfigInterface
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      * @param string $group
      * @param string $code
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsRenderer($section, $group, $code);
 
@@ -30,7 +28,6 @@ public function getTotalsRenderer($section, $group, $code);
      * @param string $section
      * @param string $group
      * @return array
-     * @since 2.0.0
      */
     public function getGroupTotals($section, $group);
 
@@ -38,7 +35,6 @@ public function getGroupTotals($section, $group);
      * Get available product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableProductTypes();
 }
diff --git a/app/code/Magento/Sales/Model/Convert/Order.php b/app/code/Magento/Sales/Model/Convert/Order.php
index 08760b5dbec4f..0a35aa29da801 100644
--- a/app/code/Magento/Sales/Model/Convert/Order.php
+++ b/app/code/Magento/Sales/Model/Convert/Order.php
@@ -11,7 +11,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Order extends \Magento\Framework\DataObject
 {
@@ -19,43 +18,36 @@ class Order extends \Magento\Framework\DataObject
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $invoiceRepository;
 
     /**
      * @var \Magento\Sales\Model\Order\Invoice\ItemFactory
-     * @since 2.0.0
      */
     protected $_invoiceItemFactory;
 
     /**
      * @var \Magento\Sales\Api\ShipmentRepositoryInterface
-     * @since 2.0.0
      */
     protected $shipmentRepository;
 
     /**
      * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
     /**
      * @var \Magento\Sales\Model\Order\Creditmemo\ItemFactory
-     * @since 2.0.0
      */
     protected $_creditmemoItemFactory;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $_objectCopyService;
 
@@ -71,7 +63,6 @@ class Order extends \Magento\Framework\DataObject
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -100,7 +91,6 @@ public function __construct(
      *
      * @param   \Magento\Sales\Model\Order $order
      * @return  \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function toInvoice(\Magento\Sales\Model\Order $order)
     {
@@ -126,7 +116,6 @@ public function toInvoice(\Magento\Sales\Model\Order $order)
      *
      * @param   \Magento\Sales\Model\Order\Item $item
      * @return  \Magento\Sales\Model\Order\Invoice\Item
-     * @since 2.0.0
      */
     public function itemToInvoiceItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -147,7 +136,6 @@ public function itemToInvoiceItem(\Magento\Sales\Model\Order\Item $item)
      *
      * @param   \Magento\Sales\Model\Order $order
      * @return  \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function toShipment(\Magento\Sales\Model\Order $order)
     {
@@ -173,7 +161,6 @@ public function toShipment(\Magento\Sales\Model\Order $order)
      *
      * @param   \Magento\Sales\Model\Order\Item $item
      * @return  \Magento\Sales\Model\Order\Shipment\Item
-     * @since 2.0.0
      */
     public function itemToShipmentItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -194,7 +181,6 @@ public function itemToShipmentItem(\Magento\Sales\Model\Order\Item $item)
      *
      * @param   \Magento\Sales\Model\Order $order
      * @return  \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function toCreditmemo(\Magento\Sales\Model\Order $order)
     {
@@ -220,7 +206,6 @@ public function toCreditmemo(\Magento\Sales\Model\Order $order)
      *
      * @param   \Magento\Sales\Model\Order\Item $item
      * @return  \Magento\Sales\Model\Order\Creditmemo\Item
-     * @since 2.0.0
      */
     public function itemToCreditmemoItem(\Magento\Sales\Model\Order\Item $item)
     {
diff --git a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportBestsellersData.php b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportBestsellersData.php
index d96ffa92801bf..5f468b0d0b1f4 100644
--- a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportBestsellersData.php
+++ b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportBestsellersData.php
@@ -10,25 +10,21 @@
 
 /**
  * Class AggregateSalesReportBestsellersData
- * @since 2.0.0
  */
 class AggregateSalesReportBestsellersData
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\BestsellersFactory
-     * @since 2.0.0
      */
     protected $bestsellersFactory;
 
@@ -36,7 +32,6 @@ class AggregateSalesReportBestsellersData
      * @param ResolverInterface $localeResolver
      * @param TimezoneInterface $timezone
      * @param \Magento\Sales\Model\ResourceModel\Report\BestsellersFactory $bestsellersFactory
-     * @since 2.0.0
      */
     public function __construct(
         ResolverInterface $localeResolver,
@@ -52,7 +47,6 @@ public function __construct(
      * Refresh bestsellers report statistics for last day
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportInvoicedData.php b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportInvoicedData.php
index 15a4d105e10cd..99f8cf4833eae 100644
--- a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportInvoicedData.php
+++ b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportInvoicedData.php
@@ -7,25 +7,21 @@
 
 /**
  * Class AggregateSalesReportInvoicedData
- * @since 2.0.0
  */
 class AggregateSalesReportInvoicedData
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\InvoicedFactory
-     * @since 2.0.0
      */
     protected $invoicedFactory;
 
@@ -33,7 +29,6 @@ class AggregateSalesReportInvoicedData
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
      * @param \Magento\Sales\Model\ResourceModel\Report\InvoicedFactory $invoicedFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
@@ -49,7 +44,6 @@ public function __construct(
      * Refresh sales invoiced report statistics for last day
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportOrderData.php b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportOrderData.php
index 22eadb1ce1077..324a08f687a4f 100644
--- a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportOrderData.php
+++ b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportOrderData.php
@@ -7,25 +7,21 @@
 
 /**
  * Class AggregateSalesReportOrderData
- * @since 2.0.0
  */
 class AggregateSalesReportOrderData
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -33,7 +29,6 @@ class AggregateSalesReportOrderData
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $orderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
@@ -49,7 +44,6 @@ public function __construct(
      * Refresh sales order report statistics for last day
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportRefundedData.php b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportRefundedData.php
index 1f3e3557abbe9..d29d9533f9a00 100644
--- a/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportRefundedData.php
+++ b/app/code/Magento/Sales/Model/CronJob/AggregateSalesReportRefundedData.php
@@ -10,25 +10,21 @@
 
 /**
  * Class AggregateSalesReportRefundedData
- * @since 2.0.0
  */
 class AggregateSalesReportRefundedData
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\RefundedFactory
-     * @since 2.0.0
      */
     protected $refundedFactory;
 
@@ -36,7 +32,6 @@ class AggregateSalesReportRefundedData
      * @param ResolverInterface $localeResolver
      * @param TimezoneInterface $timezone
      * @param \Magento\Sales\Model\ResourceModel\Report\RefundedFactory $refundedFactory
-     * @since 2.0.0
      */
     public function __construct(
         ResolverInterface $localeResolver,
@@ -52,7 +47,6 @@ public function __construct(
      * Refresh sales refunded report statistics for last day
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index 50c173aac773c..7d93a98886807 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Sales\Model\CronJob\CleanExpiredOrders
  *
- * @since 2.0.0
  */
 class CleanExpiredOrders
 {
     /**
      * @var StoresConfig
-     * @since 2.0.0
      */
     protected $storesConfig;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $orderCollectionFactory;
 
     /**
      * @param StoresConfig $storesConfig
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         StoresConfig $storesConfig,
@@ -44,7 +40,6 @@ public function __construct(
      * Clean expired quotes (cron process)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/Download.php b/app/code/Magento/Sales/Model/Download.php
index a4ce9140accc4..1eb44c76e18a2 100644
--- a/app/code/Magento/Sales/Model/Download.php
+++ b/app/code/Magento/Sales/Model/Download.php
@@ -11,37 +11,31 @@
 /**
  * Class \Magento\Sales\Model\Download
  *
- * @since 2.0.0
  */
 class Download
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_rootDir;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_fileStorageDatabase;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
-     * @since 2.0.0
      */
     protected $_storageDatabaseFactory;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $rootDirBasePath;
 
@@ -51,7 +45,6 @@ class Download
      * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageDatabaseFactory
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param string $rootDirBasePath
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -73,7 +66,6 @@ public function __construct(
      * @param array $info
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function downloadFile($info)
     {
@@ -97,7 +89,6 @@ public function downloadFile($info)
     /**
      * @param string $relativePath
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCanProcessed($relativePath)
     {
@@ -114,7 +105,6 @@ protected function _isCanProcessed($relativePath)
      * @param string $filePath
      * @param string $relativePath
      * @return bool
-     * @since 2.0.0
      */
     protected function _processDatabaseFile($filePath, $relativePath)
     {
diff --git a/app/code/Magento/Sales/Model/EmailSenderHandler.php b/app/code/Magento/Sales/Model/EmailSenderHandler.php
index 6af1e9f13bf20..73d4eacdd1fc8 100644
--- a/app/code/Magento/Sales/Model/EmailSenderHandler.php
+++ b/app/code/Magento/Sales/Model/EmailSenderHandler.php
@@ -10,7 +10,6 @@
  *
  * Performs handling of cron jobs related to sending emails to customers
  * after creation/modification of Order, Invoice, Shipment or Creditmemo.
- * @since 2.0.0
  */
 class EmailSenderHandler
 {
@@ -18,7 +17,6 @@ class EmailSenderHandler
      * Email sender model.
      *
      * @var \Magento\Sales\Model\Order\Email\Sender
-     * @since 2.0.0
      */
     protected $emailSender;
 
@@ -26,7 +24,6 @@ class EmailSenderHandler
      * Entity resource model.
      *
      * @var \Magento\Sales\Model\ResourceModel\EntityAbstract
-     * @since 2.0.0
      */
     protected $entityResource;
 
@@ -34,7 +31,6 @@ class EmailSenderHandler
      * Entity collection model.
      *
      * @var \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $entityCollection;
 
@@ -42,7 +38,6 @@ class EmailSenderHandler
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
@@ -51,7 +46,6 @@ class EmailSenderHandler
      * @param \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource
      * @param \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Sender $emailSender,
@@ -68,7 +62,6 @@ public function __construct(
     /**
      * Handles asynchronous email sending
      * @return void
-     * @since 2.0.0
      */
     public function sendEmails()
     {
diff --git a/app/code/Magento/Sales/Model/EntityInterface.php b/app/code/Magento/Sales/Model/EntityInterface.php
index 51a44503b23bb..39bb270c9ca61 100644
--- a/app/code/Magento/Sales/Model/EntityInterface.php
+++ b/app/code/Magento/Sales/Model/EntityInterface.php
@@ -9,13 +9,11 @@
 /**
  * Interface EntityInterface
  * @api
- * @since 2.0.0
  */
 interface EntityInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId();
 }
diff --git a/app/code/Magento/Sales/Model/EntityStorage.php b/app/code/Magento/Sales/Model/EntityStorage.php
index c597a2f97e6b3..3fc0837e7cd58 100644
--- a/app/code/Magento/Sales/Model/EntityStorage.php
+++ b/app/code/Magento/Sales/Model/EntityStorage.php
@@ -10,13 +10,11 @@
 
 /**
  * Class EntityStorage store only one type of entity per instance
- * @since 2.0.0
  */
 class EntityStorage
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -24,7 +22,6 @@ class EntityStorage
      * Using for mapping hashes of identifying fields to entity ids
      *
      * @var array
-     * @since 2.0.0
      */
     protected $storageMapper = [];
 
@@ -41,7 +38,6 @@ class EntityStorage
      * @param string $storageName
      * @return void
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function addByIdentifyingFields(FrameworkAbstractModel $object, array $identifyingFields, $storageName)
     {
@@ -60,7 +56,6 @@ public function addByIdentifyingFields(FrameworkAbstractModel $object, array $id
      *
      * @param \Magento\Framework\Model\AbstractModel $entity
      * @return void
-     * @since 2.0.0
      */
     public function add($entity)
     {
@@ -72,7 +67,6 @@ public function add($entity)
      *
      * @param int $id
      * @return bool|FrameworkAbstractModel
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -88,7 +82,6 @@ public function get($id)
      * @param array $identifyingFields
      * @param string $storageName
      * @return bool|FrameworkAbstractModel
-     * @since 2.0.0
      */
     public function getByIdentifyingFields(array $identifyingFields, $storageName)
     {
@@ -104,7 +97,6 @@ public function getByIdentifyingFields(array $identifyingFields, $storageName)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function remove($id)
     {
@@ -118,7 +110,6 @@ public function remove($id)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function has($id)
     {
@@ -130,7 +121,6 @@ public function has($id)
      *
      * @param array $fields
      * @return string
-     * @since 2.0.0
      */
     protected function getHash(array $fields)
     {
diff --git a/app/code/Magento/Sales/Model/Grid/Child/CollectionUpdater.php b/app/code/Magento/Sales/Model/Grid/Child/CollectionUpdater.php
index 1600e2110932d..7241710b3ab9b 100644
--- a/app/code/Magento/Sales/Model/Grid/Child/CollectionUpdater.php
+++ b/app/code/Magento/Sales/Model/Grid/Child/CollectionUpdater.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Sales\Model\Grid\Child\CollectionUpdater
  *
- * @since 2.0.0
  */
 class CollectionUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registryManager;
 
     /**
      * @param \Magento\Framework\Registry $registryManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $registryManager
@@ -34,7 +31,6 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection $argument
      * @return \Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection
-     * @since 2.0.0
      */
     public function update($argument)
     {
diff --git a/app/code/Magento/Sales/Model/Grid/CollectionUpdater.php b/app/code/Magento/Sales/Model/Grid/CollectionUpdater.php
index 7d6aa6e791839..0e376f9ce35ee 100644
--- a/app/code/Magento/Sales/Model/Grid/CollectionUpdater.php
+++ b/app/code/Magento/Sales/Model/Grid/CollectionUpdater.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Sales\Model\Grid\CollectionUpdater
  *
- * @since 2.0.0
  */
 class CollectionUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registryManager;
 
     /**
      * @param \Magento\Framework\Registry $registryManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Registry $registryManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Registry $registryManager)
      *
      * @param \Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection $argument
      * @return \Magento\Sales\Model\ResourceModel\Transaction\Grid\Collection
-     * @since 2.0.0
      */
     public function update($argument)
     {
diff --git a/app/code/Magento/Sales/Model/GridAsyncInsert.php b/app/code/Magento/Sales/Model/GridAsyncInsert.php
index b8e80afa0eddb..43b4b3a5b346d 100644
--- a/app/code/Magento/Sales/Model/GridAsyncInsert.php
+++ b/app/code/Magento/Sales/Model/GridAsyncInsert.php
@@ -10,7 +10,6 @@
  *
  * Performs handling of events and cron jobs related to indexing
  * of Order, Invoice, Shipment and Creditmemo grids.
- * @since 2.0.0
  */
 class GridAsyncInsert
 {
@@ -18,7 +17,6 @@ class GridAsyncInsert
      * Entity grid model.
      *
      * @var \Magento\Sales\Model\ResourceModel\GridInterface
-     * @since 2.0.0
      */
     protected $entityGrid;
 
@@ -26,14 +24,12 @@ class GridAsyncInsert
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @param \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid,
@@ -55,7 +51,6 @@ public function __construct(
      * in global settings.
      *
      * @return void
-     * @since 2.0.0
      */
     public function asyncInsert()
     {
diff --git a/app/code/Magento/Sales/Model/Increment.php b/app/code/Magento/Sales/Model/Increment.php
index d004706ef3323..0f25e8557f86b 100644
--- a/app/code/Magento/Sales/Model/Increment.php
+++ b/app/code/Magento/Sales/Model/Increment.php
@@ -10,25 +10,21 @@
 /**
  * Class Increment
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Increment
 {
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $incrementValue;
 
     /**
      * @param EavConfig $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         EavConfig $eavConfig
@@ -40,7 +36,6 @@ public function __construct(
      * Returns current increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentValue()
     {
@@ -54,7 +49,6 @@ public function getCurrentValue()
      * @return string
      * @throws \Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getNextValue($storeId)
     {
diff --git a/app/code/Magento/Sales/Model/InvoiceOrder.php b/app/code/Magento/Sales/Model/InvoiceOrder.php
index 3b5ee86a4d71d..248ccf658440b 100644
--- a/app/code/Magento/Sales/Model/InvoiceOrder.php
+++ b/app/code/Magento/Sales/Model/InvoiceOrder.php
@@ -23,67 +23,67 @@
 /**
  * Class InvoiceOrder
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.2.0
+ * @since 2.1.2
  */
 class InvoiceOrder implements InvoiceOrderInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $resourceConnection;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderRepository;
 
     /**
      * @var InvoiceDocumentFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $invoiceDocumentFactory;
 
     /**
      * @var PaymentAdapterInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $paymentAdapter;
 
     /**
      * @var OrderStateResolverInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderStateResolver;
 
     /**
      * @var OrderConfig
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $config;
 
     /**
      * @var InvoiceRepository
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $invoiceRepository;
 
     /**
      * @var InvoiceOrderValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceOrderValidator;
 
     /**
      * @var NotifierInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $notifierInterface;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $logger;
 
@@ -100,7 +100,7 @@ class InvoiceOrder implements InvoiceOrderInterface
      * @param NotifierInterface $notifierInterface
      * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         ResourceConnection $resourceConnection,
@@ -140,7 +140,7 @@ public function __construct(
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \DomainException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 1367102cdc480..f6f7dad53e5df 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -49,7 +49,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Order extends AbstractModel implements EntityInterface, OrderInterface
 {
@@ -109,55 +108,46 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order';
 
     /**
      * @var InvoiceCollection
-     * @since 2.0.0
      */
     protected $_invoices;
 
     /**
      * @var TrackCollection
-     * @since 2.0.0
      */
     protected $_tracks;
 
     /**
      * @var ShipmentCollection
-     * @since 2.0.0
      */
     protected $_shipments;
 
     /**
      * @var CreditmemoCollection
-     * @since 2.0.0
      */
     protected $_creditmemos;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_relatedObjects = [];
 
     /**
      * @var Currency
-     * @since 2.0.0
      */
     protected $_orderCurrency = null;
 
     /**
      * @var Currency|null
-     * @since 2.0.0
      */
     protected $_baseCurrency = null;
 
@@ -165,7 +155,6 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * Array of action flags for canUnhold, canEdit, etc.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_actionFlag = [];
 
@@ -173,7 +162,6 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * Flag: if after order placing we can send new email to the customer.
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_canSendNewEmailFlag = true;
 
@@ -181,122 +169,102 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * Identifier for history item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $entityType = 'order';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     protected $_orderConfig;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
      * @deprecated 2.2.0 Remove unused dependency.
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $productListFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderItemCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var \Magento\Sales\Model\Service\InvoiceService
-     * @since 2.0.0
      */
     protected $invoiceManagement;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Status\HistoryFactory
-     * @since 2.0.0
      */
     protected $_orderHistoryFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory
-     * @since 2.0.0
      */
     protected $_addressCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_paymentCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory
-     * @since 2.0.0
      */
     protected $_historyCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory
-     * @since 2.0.0
      */
     protected $_invoiceCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_shipmentCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory
-     * @since 2.0.0
      */
     protected $_memoCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory
-     * @since 2.0.0
      */
     protected $_trackCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
-     * @since 2.0.0
      */
     protected $salesOrderCollectionFactory;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $timezone;
 
@@ -329,7 +297,6 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -395,7 +362,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -407,7 +373,6 @@ protected function _construct()
      *
      * @param string $key data key
      * @return $this
-     * @since 2.0.0
      */
     public function unsetData($key = null)
     {
@@ -423,7 +388,6 @@ public function unsetData($key = null)
      *
      * @param string $action
      * @return boolean|null
-     * @since 2.0.0
      */
     public function getActionFlag($action)
     {
@@ -439,7 +403,6 @@ public function getActionFlag($action)
      * @param string $action
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setActionFlag($action, $flag)
     {
@@ -452,7 +415,6 @@ public function setActionFlag($action, $flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCanSendNewEmailFlag()
     {
@@ -464,7 +426,6 @@ public function getCanSendNewEmailFlag()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setCanSendNewEmailFlag($flag)
     {
@@ -477,7 +438,6 @@ public function setCanSendNewEmailFlag($flag)
      *
      * @param string $incrementId
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function loadByIncrementId($incrementId)
     {
@@ -490,7 +450,6 @@ public function loadByIncrementId($incrementId)
      * @param string $incrementId
      * @param string $storeId
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function loadByIncrementIdAndStoreId($incrementId, $storeId)
     {
@@ -508,7 +467,6 @@ public function loadByIncrementIdAndStoreId($incrementId, $storeId)
      *
      * @param array $filters
      * @return \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.0.0
      */
     protected function getSalesOrderCollection(array $filters = [])
     {
@@ -526,7 +484,6 @@ protected function getSalesOrderCollection(array $filters = [])
      * @param string $attribute
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function loadByAttribute($attribute, $value)
     {
@@ -538,7 +495,6 @@ public function loadByAttribute($attribute, $value)
      * Retrieve store model instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -555,7 +511,6 @@ public function getStore()
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function canCancel()
     {
@@ -595,7 +550,6 @@ public function canCancel()
     /**
      * Getter whether the payment can be voided
      * @return bool
-     * @since 2.0.0
      */
     public function canVoidPayment()
     {
@@ -606,7 +560,6 @@ public function canVoidPayment()
      * Check whether order could be canceled by states and flags
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _canVoidOrder()
     {
@@ -618,7 +571,6 @@ protected function _canVoidOrder()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function canInvoice()
     {
@@ -646,7 +598,6 @@ public function canInvoice()
      * Retrieve order credit memo (refund) availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreditmemo()
     {
@@ -686,7 +637,6 @@ public function canCreditmemo()
      * Retrieve order hold availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canHold()
     {
@@ -711,7 +661,6 @@ public function canHold()
      * Retrieve order unhold availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canUnhold()
     {
@@ -725,7 +674,6 @@ public function canUnhold()
      * Check if comment can be added to order history
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canComment()
     {
@@ -740,7 +688,6 @@ public function canComment()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function canShip()
     {
@@ -768,7 +715,6 @@ public function canShip()
      * Retrieve order edit availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canEdit()
     {
@@ -804,7 +750,6 @@ public function canEdit()
      * Retrieve order reorder availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canReorder()
     {
@@ -815,7 +760,6 @@ public function canReorder()
      * Check the ability to reorder ignoring the availability in stock or status of the ordered products
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canReorderIgnoreSalable()
     {
@@ -828,7 +772,6 @@ public function canReorderIgnoreSalable()
      * @param bool $ignoreSalable
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _canReorder($ignoreSalable = false)
     {
@@ -874,7 +817,6 @@ protected function _canReorder($ignoreSalable = false)
      * - fetch transaction information
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPaymentReview()
     {
@@ -885,7 +827,6 @@ public function isPaymentReview()
      * Check whether payment can be accepted or denied
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -896,7 +837,6 @@ public function canReviewPayment()
      * Check whether there can be a transaction update fetched for payment in review state
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canFetchPaymentReviewUpdate()
     {
@@ -907,7 +847,6 @@ public function canFetchPaymentReviewUpdate()
      * Retrieve order configuration model
      *
      * @return \Magento\Sales\Model\Order\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -918,7 +857,6 @@ public function getConfig()
      * Place order payments
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _placePayment()
     {
@@ -928,7 +866,6 @@ protected function _placePayment()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPayment()
     {
@@ -954,7 +891,6 @@ public function getPayment()
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Sales\Api\Data\OrderAddressInterface $address = null)
     {
@@ -975,7 +911,6 @@ public function setBillingAddress(\Magento\Sales\Api\Data\OrderAddressInterface
      *
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $address
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Sales\Api\Data\OrderAddressInterface $address = null)
     {
@@ -995,7 +930,6 @@ public function setShippingAddress(\Magento\Sales\Api\Data\OrderAddressInterface
      * Retrieve order billing address
      *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -1011,7 +945,6 @@ public function getBillingAddress()
      * Retrieve order shipping address
      *
      * @return \Magento\Sales\Model\Order\Address|null
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -1028,7 +961,6 @@ public function getShippingAddress()
      *
      * @param string $state
      * @return $this
-     * @since 2.0.0
      */
     public function setState($state)
     {
@@ -1039,7 +971,6 @@ public function setState($state)
      * Retrieve label of order status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatusLabel()
     {
@@ -1053,7 +984,6 @@ public function getStatusLabel()
      * @param  string $comment
      * @param  bool $isCustomerNotified
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusToHistory($status, $comment = '', $isCustomerNotified = false)
     {
@@ -1068,7 +998,6 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified =
      * @param string $comment
      * @param bool|string $status
      * @return OrderStatusHistoryInterface
-     * @since 2.0.0
      */
     public function addStatusHistoryComment($comment, $status = false)
     {
@@ -1095,7 +1024,6 @@ public function addStatusHistoryComment($comment, $status = false)
      *
      * @param string $entityName
      * @return $this
-     * @since 2.0.0
      */
     public function setHistoryEntityName($entityName)
     {
@@ -1107,7 +1035,6 @@ public function setHistoryEntityName($entityName)
      * Return order entity type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -1118,7 +1045,6 @@ public function getEntityType()
      * Place order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function place()
     {
@@ -1131,7 +1057,6 @@ public function place()
     /**
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function hold()
     {
@@ -1150,7 +1075,6 @@ public function hold()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function unhold()
     {
@@ -1169,7 +1093,6 @@ public function unhold()
      * Cancel order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -1187,7 +1110,6 @@ public function cancel()
      * Is order status in DB "Fraud detected"
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFraudDetected()
     {
@@ -1203,7 +1125,6 @@ public function isFraudDetected()
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function registerCancellation($comment = '', $graceful = true)
     {
@@ -1250,7 +1171,6 @@ public function registerCancellation($comment = '', $graceful = true)
      * Retrieve tracking numbers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingNumbers()
     {
@@ -1265,7 +1185,6 @@ public function getTrackingNumbers()
      *
      * @param bool $asObject return carrier code and shipping method data as object
      * @return string|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getShippingMethod($asObject = false)
     {
@@ -1282,7 +1201,6 @@ public function getShippingMethod($asObject = false)
 
     /**
      * @return Collection
-     * @since 2.0.0
      */
     public function getAddressesCollection()
     {
@@ -1298,7 +1216,6 @@ public function getAddressesCollection()
     /**
      * @param mixed $addressId
      * @return false
-     * @since 2.0.0
      */
     public function getAddressById($addressId)
     {
@@ -1313,7 +1230,6 @@ public function getAddressById($addressId)
     /**
      * @param \Magento\Sales\Model\Order\Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function addAddress(\Magento\Sales\Model\Order\Address $address)
     {
@@ -1329,7 +1245,6 @@ public function addAddress(\Magento\Sales\Model\Order\Address $address)
      * @param array $filterByTypes
      * @param bool $nonChildrenOnly
      * @return ImportCollection
-     * @since 2.0.0
      */
     public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false)
     {
@@ -1355,7 +1270,6 @@ public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false
      *
      * @param int $limit
      * @return ImportCollection
-     * @since 2.0.0
      */
     public function getParentItemsRandomCollection($limit = 1)
     {
@@ -1368,7 +1282,6 @@ public function getParentItemsRandomCollection($limit = 1)
      * @param int $limit
      * @param bool $nonChildrenOnly
      * @return ImportCollection
-     * @since 2.0.0
      */
     protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
     {
@@ -1402,7 +1315,6 @@ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
 
     /**
      * @return \Magento\Sales\Model\Order\Item[]
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -1417,7 +1329,6 @@ public function getAllItems()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllVisibleItems()
     {
@@ -1435,7 +1346,6 @@ public function getAllVisibleItems()
      *
      * @param int $itemId
      * @return \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -1451,7 +1361,6 @@ public function getItemById($itemId)
     /**
      * @param mixed $quoteItemId
      * @return  \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function getItemByQuoteItemId($quoteItemId)
     {
@@ -1466,7 +1375,6 @@ public function getItemByQuoteItemId($quoteItemId)
     /**
      * @param \Magento\Sales\Model\Order\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -1481,7 +1389,6 @@ public function addItem(\Magento\Sales\Model\Order\Item $item)
 
     /**
      * @return PaymentCollection
-     * @since 2.0.0
      */
     public function getPaymentsCollection()
     {
@@ -1496,7 +1403,6 @@ public function getPaymentsCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllPayments()
     {
@@ -1512,7 +1418,6 @@ public function getAllPayments()
     /**
      * @param mixed $paymentId
      * @return Payment|false
-     * @since 2.0.0
      */
     public function getPaymentById($paymentId)
     {
@@ -1526,7 +1431,6 @@ public function getPaymentById($paymentId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $payment = null)
     {
@@ -1546,7 +1450,6 @@ public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $paymen
      * Return collection of order status history items.
      *
      * @return HistoryCollection
-     * @since 2.0.0
      */
     public function getStatusHistoryCollection()
     {
@@ -1565,7 +1468,6 @@ public function getStatusHistoryCollection()
      * Return array of order status history items without deleted.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllStatusHistory()
     {
@@ -1582,7 +1484,6 @@ public function getAllStatusHistory()
      * Return collection of visible on frontend order status history items.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVisibleStatusHistory()
     {
@@ -1598,7 +1499,6 @@ public function getVisibleStatusHistory()
     /**
      * @param mixed $statusId
      * @return string|false
-     * @since 2.0.0
      */
     public function getStatusHistoryById($statusId)
     {
@@ -1618,7 +1518,6 @@ public function getStatusHistoryById($statusId)
      *
      * @param \Magento\Sales\Model\Order\Status\History $history
      * @return $this
-     * @since 2.0.0
      */
     public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $history)
     {
@@ -1633,7 +1532,6 @@ public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $hist
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRealOrderId()
     {
@@ -1648,7 +1546,6 @@ public function getRealOrderId()
      * Get currency model instance. Will be used currency with which order placed
      *
      * @return Currency
-     * @since 2.0.0
      */
     public function getOrderCurrency()
     {
@@ -1665,7 +1562,6 @@ public function getOrderCurrency()
      * @param   float $price
      * @param   bool  $addBrackets
      * @return  string
-     * @since 2.0.0
      */
     public function formatPrice($price, $addBrackets = false)
     {
@@ -1677,7 +1573,6 @@ public function formatPrice($price, $addBrackets = false)
      * @param int $precision
      * @param bool $addBrackets
      * @return string
-     * @since 2.0.0
      */
     public function formatPricePrecision($price, $precision, $addBrackets = false)
     {
@@ -1689,7 +1584,6 @@ public function formatPricePrecision($price, $precision, $addBrackets = false)
      *
      * @param   float $price
      * @return  string
-     * @since 2.0.0
      */
     public function formatPriceTxt($price)
     {
@@ -1700,7 +1594,6 @@ public function formatPriceTxt($price)
      * Retrieve order website currency for working with base prices
      *
      * @return Currency
-     * @since 2.0.0
      */
     public function getBaseCurrency()
     {
@@ -1713,7 +1606,6 @@ public function getBaseCurrency()
     /**
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatBasePrice($price)
     {
@@ -1724,7 +1616,6 @@ public function formatBasePrice($price)
      * @param float $price
      * @param int $precision
      * @return string
-     * @since 2.0.0
      */
     public function formatBasePricePrecision($price, $precision)
     {
@@ -1733,7 +1624,6 @@ public function formatBasePricePrecision($price, $precision)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isCurrencyDifferent()
     {
@@ -1744,7 +1634,6 @@ public function isCurrencyDifferent()
      * Retrieve order total due value
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalDue()
     {
@@ -1757,7 +1646,6 @@ public function getTotalDue()
      * Retrieve order total due value
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalDue()
     {
@@ -1770,7 +1658,6 @@ public function getBaseTotalDue()
      * @param string $key
      * @param null|string|int $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -1787,7 +1674,6 @@ public function getData($key = '', $index = null)
      * Retrieve order invoices collection
      *
      * @return InvoiceCollection
-     * @since 2.0.0
      */
     public function getInvoiceCollection()
     {
@@ -1808,7 +1694,6 @@ public function getInvoiceCollection()
      *
      * @param InvoiceCollection $invoices
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoiceCollection(InvoiceCollection $invoices)
     {
@@ -1820,7 +1705,6 @@ public function setInvoiceCollection(InvoiceCollection $invoices)
      * Retrieve order shipments collection
      *
      * @return ShipmentCollection|false
-     * @since 2.0.0
      */
     public function getShipmentsCollection()
     {
@@ -1838,7 +1722,6 @@ public function getShipmentsCollection()
      * Retrieve order creditmemos collection
      *
      * @return CreditmemoCollection|false
-     * @since 2.0.0
      */
     public function getCreditmemosCollection()
     {
@@ -1856,7 +1739,6 @@ public function getCreditmemosCollection()
      * Retrieve order tracking numbers collection
      *
      * @return TrackCollection
-     * @since 2.0.0
      */
     public function getTracksCollection()
     {
@@ -1874,7 +1756,6 @@ public function getTracksCollection()
      * Check order invoices availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasInvoices()
     {
@@ -1885,7 +1766,6 @@ public function hasInvoices()
      * Check order shipments availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasShipments()
     {
@@ -1896,7 +1776,6 @@ public function hasShipments()
      * Check order creditmemos availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasCreditmemos()
     {
@@ -1909,7 +1788,6 @@ public function hasCreditmemos()
      * Used for order saving
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedObjects()
     {
@@ -1918,7 +1796,6 @@ public function getRelatedObjects()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerName()
     {
@@ -1935,7 +1812,6 @@ public function getCustomerName()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function addRelatedObject(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -1948,7 +1824,6 @@ public function addRelatedObject(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param   string $format date format type (short|medium|long|full)
      * @return  string
-     * @since 2.0.0
      */
     public function getCreatedAtFormatted($format)
     {
@@ -1963,7 +1838,6 @@ public function getCreatedAtFormatted($format)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEmailCustomerNote()
     {
@@ -1975,7 +1849,6 @@ public function getEmailCustomerNote()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreGroupName()
     {
@@ -1991,7 +1864,6 @@ public function getStoreGroupName()
      * so after another load it will be complete new object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -2015,7 +1887,6 @@ public function reset()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsNotVirtual()
     {
@@ -2027,7 +1898,6 @@ public function getIsNotVirtual()
      *
      * @param array $qtys
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function prepareInvoice($qtys = [])
     {
@@ -2038,7 +1908,6 @@ public function prepareInvoice($qtys = [])
      * Check whether order is canceled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCanceled()
     {
@@ -2051,7 +1920,6 @@ public function isCanceled()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId()
     {
@@ -2060,7 +1928,6 @@ public function getIncrementId()
 
     /**
      * @return \Magento\Sales\Api\Data\OrderItemInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -2076,7 +1943,6 @@ public function getItems()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setItems($items)
     {
@@ -2085,7 +1951,6 @@ public function setItems($items)
 
     /**
      * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
-     * @since 2.0.0
      */
     public function getAddresses()
     {
@@ -2100,7 +1965,6 @@ public function getAddresses()
 
     /**
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null
-     * @since 2.0.0
      */
     public function getStatusHistories()
     {
@@ -2117,7 +1981,6 @@ public function getStatusHistories()
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -2129,7 +1992,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes)
     {
@@ -2142,7 +2004,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderExtensionInt
      * Returns adjustment_negative
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getAdjustmentNegative()
     {
@@ -2153,7 +2014,6 @@ public function getAdjustmentNegative()
      * Returns adjustment_positive
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getAdjustmentPositive()
     {
@@ -2164,7 +2024,6 @@ public function getAdjustmentPositive()
      * Returns applied_rule_ids
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAppliedRuleIds()
     {
@@ -2175,7 +2034,6 @@ public function getAppliedRuleIds()
      * Returns base_adjustment_negative
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseAdjustmentNegative()
     {
@@ -2186,7 +2044,6 @@ public function getBaseAdjustmentNegative()
      * Returns base_adjustment_positive
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseAdjustmentPositive()
     {
@@ -2197,7 +2054,6 @@ public function getBaseAdjustmentPositive()
      * Returns base_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -2208,7 +2064,6 @@ public function getBaseCurrencyCode()
      * Returns base_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -2219,7 +2074,6 @@ public function getBaseDiscountAmount()
      * Returns base_discount_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountCanceled()
     {
@@ -2230,7 +2084,6 @@ public function getBaseDiscountCanceled()
      * Returns base_discount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountInvoiced()
     {
@@ -2241,7 +2094,6 @@ public function getBaseDiscountInvoiced()
      * Returns base_discount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountRefunded()
     {
@@ -2252,7 +2104,6 @@ public function getBaseDiscountRefunded()
      * Returns base_grand_total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseGrandTotal()
     {
@@ -2263,7 +2114,6 @@ public function getBaseGrandTotal()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -2274,7 +2124,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_discount_tax_compensation_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationInvoiced()
     {
@@ -2285,7 +2134,6 @@ public function getBaseDiscountTaxCompensationInvoiced()
      * Returns base_discount_tax_compensation_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationRefunded()
     {
@@ -2296,7 +2144,6 @@ public function getBaseDiscountTaxCompensationRefunded()
      * Returns base_shipping_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -2307,7 +2154,6 @@ public function getBaseShippingAmount()
      * Returns base_shipping_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingCanceled()
     {
@@ -2318,7 +2164,6 @@ public function getBaseShippingCanceled()
      * Returns base_shipping_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountAmount()
     {
@@ -2329,7 +2174,6 @@ public function getBaseShippingDiscountAmount()
      * Returns base_shipping_discount_tax_compensation_amnt
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt()
     {
@@ -2340,7 +2184,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt()
      * Returns base_shipping_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax()
     {
@@ -2351,7 +2194,6 @@ public function getBaseShippingInclTax()
      * Returns base_shipping_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingInvoiced()
     {
@@ -2362,7 +2204,6 @@ public function getBaseShippingInvoiced()
      * Returns base_shipping_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingRefunded()
     {
@@ -2373,7 +2214,6 @@ public function getBaseShippingRefunded()
      * Returns base_shipping_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount()
     {
@@ -2384,7 +2224,6 @@ public function getBaseShippingTaxAmount()
      * Returns base_shipping_tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingTaxRefunded()
     {
@@ -2395,7 +2234,6 @@ public function getBaseShippingTaxRefunded()
      * Returns base_subtotal
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -2406,7 +2244,6 @@ public function getBaseSubtotal()
      * Returns base_subtotal_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalCanceled()
     {
@@ -2417,7 +2254,6 @@ public function getBaseSubtotalCanceled()
      * Returns base_subtotal_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax()
     {
@@ -2428,7 +2264,6 @@ public function getBaseSubtotalInclTax()
      * Returns base_subtotal_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalInvoiced()
     {
@@ -2439,7 +2274,6 @@ public function getBaseSubtotalInvoiced()
      * Returns base_subtotal_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalRefunded()
     {
@@ -2450,7 +2284,6 @@ public function getBaseSubtotalRefunded()
      * Returns base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -2461,7 +2294,6 @@ public function getBaseTaxAmount()
      * Returns base_tax_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxCanceled()
     {
@@ -2472,7 +2304,6 @@ public function getBaseTaxCanceled()
      * Returns base_tax_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxInvoiced()
     {
@@ -2483,7 +2314,6 @@ public function getBaseTaxInvoiced()
      * Returns base_tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxRefunded()
     {
@@ -2494,7 +2324,6 @@ public function getBaseTaxRefunded()
      * Returns base_total_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalCanceled()
     {
@@ -2505,7 +2334,6 @@ public function getBaseTotalCanceled()
      * Returns base_total_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalInvoiced()
     {
@@ -2516,7 +2344,6 @@ public function getBaseTotalInvoiced()
      * Returns base_total_invoiced_cost
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalInvoicedCost()
     {
@@ -2527,7 +2354,6 @@ public function getBaseTotalInvoicedCost()
      * Returns base_total_offline_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalOfflineRefunded()
     {
@@ -2538,7 +2364,6 @@ public function getBaseTotalOfflineRefunded()
      * Returns base_total_online_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalOnlineRefunded()
     {
@@ -2549,7 +2374,6 @@ public function getBaseTotalOnlineRefunded()
      * Returns base_total_paid
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalPaid()
     {
@@ -2560,7 +2384,6 @@ public function getBaseTotalPaid()
      * Returns base_total_qty_ordered
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalQtyOrdered()
     {
@@ -2571,7 +2394,6 @@ public function getBaseTotalQtyOrdered()
      * Returns base_total_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalRefunded()
     {
@@ -2582,7 +2404,6 @@ public function getBaseTotalRefunded()
      * Returns base_to_global_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate()
     {
@@ -2593,7 +2414,6 @@ public function getBaseToGlobalRate()
      * Returns base_to_order_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToOrderRate()
     {
@@ -2604,7 +2424,6 @@ public function getBaseToOrderRate()
      * Returns billing_address_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getBillingAddressId()
     {
@@ -2615,7 +2434,6 @@ public function getBillingAddressId()
      * Returns can_ship_partially
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCanShipPartially()
     {
@@ -2626,7 +2444,6 @@ public function getCanShipPartially()
      * Returns can_ship_partially_item
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCanShipPartiallyItem()
     {
@@ -2637,7 +2454,6 @@ public function getCanShipPartiallyItem()
      * Returns coupon_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCouponCode()
     {
@@ -2648,7 +2464,6 @@ public function getCouponCode()
      * Returns created_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -2657,7 +2472,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -2668,7 +2482,6 @@ public function setCreatedAt($createdAt)
      * Returns customer_dob
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerDob()
     {
@@ -2679,7 +2492,6 @@ public function getCustomerDob()
      * Returns customer_email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerEmail()
     {
@@ -2690,7 +2502,6 @@ public function getCustomerEmail()
      * Returns customer_firstname
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerFirstname()
     {
@@ -2701,7 +2512,6 @@ public function getCustomerFirstname()
      * Returns customer_gender
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerGender()
     {
@@ -2712,7 +2522,6 @@ public function getCustomerGender()
      * Returns customer_group_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerGroupId()
     {
@@ -2723,7 +2532,6 @@ public function getCustomerGroupId()
      * Returns customer_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -2734,7 +2542,6 @@ public function getCustomerId()
      * Returns customer_is_guest
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerIsGuest()
     {
@@ -2745,7 +2552,6 @@ public function getCustomerIsGuest()
      * Returns customer_lastname
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerLastname()
     {
@@ -2756,7 +2562,6 @@ public function getCustomerLastname()
      * Returns customer_middlename
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerMiddlename()
     {
@@ -2767,7 +2572,6 @@ public function getCustomerMiddlename()
      * Returns customer_note
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerNote()
     {
@@ -2778,7 +2582,6 @@ public function getCustomerNote()
      * Returns customer_note_notify
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerNoteNotify()
     {
@@ -2789,7 +2592,6 @@ public function getCustomerNoteNotify()
      * Returns customer_prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerPrefix()
     {
@@ -2800,7 +2602,6 @@ public function getCustomerPrefix()
      * Returns customer_suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerSuffix()
     {
@@ -2811,7 +2612,6 @@ public function getCustomerSuffix()
      * Returns customer_taxvat
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomerTaxvat()
     {
@@ -2822,7 +2622,6 @@ public function getCustomerTaxvat()
      * Returns discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -2833,7 +2632,6 @@ public function getDiscountAmount()
      * Returns discount_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountCanceled()
     {
@@ -2844,7 +2642,6 @@ public function getDiscountCanceled()
      * Returns discount_description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDiscountDescription()
     {
@@ -2855,7 +2652,6 @@ public function getDiscountDescription()
      * Returns discount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountInvoiced()
     {
@@ -2866,7 +2662,6 @@ public function getDiscountInvoiced()
      * Returns discount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountRefunded()
     {
@@ -2877,7 +2672,6 @@ public function getDiscountRefunded()
      * Returns edit_increment
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEditIncrement()
     {
@@ -2888,7 +2682,6 @@ public function getEditIncrement()
      * Returns email_sent
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEmailSent()
     {
@@ -2899,7 +2692,6 @@ public function getEmailSent()
      * Returns ext_customer_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getExtCustomerId()
     {
@@ -2910,7 +2702,6 @@ public function getExtCustomerId()
      * Returns ext_order_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getExtOrderId()
     {
@@ -2921,7 +2712,6 @@ public function getExtOrderId()
      * Returns forced_shipment_with_invoice
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getForcedShipmentWithInvoice()
     {
@@ -2932,7 +2722,6 @@ public function getForcedShipmentWithInvoice()
      * Returns global_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode()
     {
@@ -2943,7 +2732,6 @@ public function getGlobalCurrencyCode()
      * Returns grand_total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getGrandTotal()
     {
@@ -2954,7 +2742,6 @@ public function getGrandTotal()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -2965,7 +2752,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns discount_tax_compensation_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationInvoiced()
     {
@@ -2976,7 +2762,6 @@ public function getDiscountTaxCompensationInvoiced()
      * Returns discount_tax_compensation_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationRefunded()
     {
@@ -2987,7 +2772,6 @@ public function getDiscountTaxCompensationRefunded()
      * Returns hold_before_state
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getHoldBeforeState()
     {
@@ -2998,7 +2782,6 @@ public function getHoldBeforeState()
      * Returns hold_before_status
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getHoldBeforeStatus()
     {
@@ -3009,7 +2792,6 @@ public function getHoldBeforeStatus()
      * Returns is_virtual
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getIsVirtual()
     {
@@ -3020,7 +2802,6 @@ public function getIsVirtual()
      * Returns order_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode()
     {
@@ -3031,7 +2812,6 @@ public function getOrderCurrencyCode()
      * Returns original_increment_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getOriginalIncrementId()
     {
@@ -3042,7 +2822,6 @@ public function getOriginalIncrementId()
      * Returns payment_authorization_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPaymentAuthorizationAmount()
     {
@@ -3053,7 +2832,6 @@ public function getPaymentAuthorizationAmount()
      * Returns payment_auth_expiration
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPaymentAuthExpiration()
     {
@@ -3064,7 +2842,6 @@ public function getPaymentAuthExpiration()
      * Returns protect_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getProtectCode()
     {
@@ -3075,7 +2852,6 @@ public function getProtectCode()
      * Returns quote_address_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getQuoteAddressId()
     {
@@ -3086,7 +2862,6 @@ public function getQuoteAddressId()
      * Returns quote_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getQuoteId()
     {
@@ -3097,7 +2872,6 @@ public function getQuoteId()
      * Returns relation_child_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRelationChildId()
     {
@@ -3108,7 +2882,6 @@ public function getRelationChildId()
      * Returns relation_child_real_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRelationChildRealId()
     {
@@ -3119,7 +2892,6 @@ public function getRelationChildRealId()
      * Returns relation_parent_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRelationParentId()
     {
@@ -3130,7 +2902,6 @@ public function getRelationParentId()
      * Returns relation_parent_real_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRelationParentRealId()
     {
@@ -3141,7 +2912,6 @@ public function getRelationParentRealId()
      * Returns remote_ip
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRemoteIp()
     {
@@ -3152,7 +2922,6 @@ public function getRemoteIp()
      * Returns shipping_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -3163,7 +2932,6 @@ public function getShippingAmount()
      * Returns shipping_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingCanceled()
     {
@@ -3174,7 +2942,6 @@ public function getShippingCanceled()
      * Returns shipping_description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getShippingDescription()
     {
@@ -3185,7 +2952,6 @@ public function getShippingDescription()
      * Returns shipping_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountAmount()
     {
@@ -3196,7 +2962,6 @@ public function getShippingDiscountAmount()
      * Returns shipping_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount()
     {
@@ -3207,7 +2972,6 @@ public function getShippingDiscountTaxCompensationAmount()
      * Returns shipping_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingInclTax()
     {
@@ -3218,7 +2982,6 @@ public function getShippingInclTax()
      * Returns shipping_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingInvoiced()
     {
@@ -3229,7 +2992,6 @@ public function getShippingInvoiced()
      * Returns shipping_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingRefunded()
     {
@@ -3240,7 +3002,6 @@ public function getShippingRefunded()
      * Returns shipping_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingTaxAmount()
     {
@@ -3251,7 +3012,6 @@ public function getShippingTaxAmount()
      * Returns shipping_tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingTaxRefunded()
     {
@@ -3262,7 +3022,6 @@ public function getShippingTaxRefunded()
      * Returns state
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getState()
     {
@@ -3273,7 +3032,6 @@ public function getState()
      * Returns status
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -3284,7 +3042,6 @@ public function getStatus()
      * Returns store_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode()
     {
@@ -3295,7 +3052,6 @@ public function getStoreCurrencyCode()
      * Returns store_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -3306,7 +3062,6 @@ public function getStoreId()
      * Returns store_name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStoreName()
     {
@@ -3317,7 +3072,6 @@ public function getStoreName()
      * Returns store_to_base_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToBaseRate()
     {
@@ -3328,7 +3082,6 @@ public function getStoreToBaseRate()
      * Returns store_to_order_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToOrderRate()
     {
@@ -3339,7 +3092,6 @@ public function getStoreToOrderRate()
      * Returns subtotal
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -3350,7 +3102,6 @@ public function getSubtotal()
      * Returns subtotal_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalCanceled()
     {
@@ -3361,7 +3112,6 @@ public function getSubtotalCanceled()
      * Returns subtotal_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalInclTax()
     {
@@ -3372,7 +3122,6 @@ public function getSubtotalInclTax()
      * Returns subtotal_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalInvoiced()
     {
@@ -3383,7 +3132,6 @@ public function getSubtotalInvoiced()
      * Returns subtotal_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalRefunded()
     {
@@ -3394,7 +3142,6 @@ public function getSubtotalRefunded()
      * Returns tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -3405,7 +3152,6 @@ public function getTaxAmount()
      * Returns tax_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxCanceled()
     {
@@ -3416,7 +3162,6 @@ public function getTaxCanceled()
      * Returns tax_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxInvoiced()
     {
@@ -3427,7 +3172,6 @@ public function getTaxInvoiced()
      * Returns tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxRefunded()
     {
@@ -3438,7 +3182,6 @@ public function getTaxRefunded()
      * Returns total_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalCanceled()
     {
@@ -3449,7 +3192,6 @@ public function getTotalCanceled()
      * Returns total_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalInvoiced()
     {
@@ -3460,7 +3202,6 @@ public function getTotalInvoiced()
      * Returns total_item_count
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getTotalItemCount()
     {
@@ -3471,7 +3212,6 @@ public function getTotalItemCount()
      * Returns total_offline_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalOfflineRefunded()
     {
@@ -3482,7 +3222,6 @@ public function getTotalOfflineRefunded()
      * Returns total_online_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalOnlineRefunded()
     {
@@ -3493,7 +3232,6 @@ public function getTotalOnlineRefunded()
      * Returns total_paid
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalPaid()
     {
@@ -3504,7 +3242,6 @@ public function getTotalPaid()
      * Returns total_qty_ordered
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalQtyOrdered()
     {
@@ -3515,7 +3252,6 @@ public function getTotalQtyOrdered()
      * Returns total_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalRefunded()
     {
@@ -3526,7 +3262,6 @@ public function getTotalRefunded()
      * Returns updated_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -3537,7 +3272,6 @@ public function getUpdatedAt()
      * Returns weight
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeight()
     {
@@ -3548,7 +3282,6 @@ public function getWeight()
      * Returns x_forwarded_for
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getXForwardedFor()
     {
@@ -3557,7 +3290,6 @@ public function getXForwardedFor()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStatusHistories(array $statusHistories = null)
     {
@@ -3566,7 +3298,6 @@ public function setStatusHistories(array $statusHistories = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStatus($status)
     {
@@ -3575,7 +3306,6 @@ public function setStatus($status)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCouponCode($code)
     {
@@ -3584,7 +3314,6 @@ public function setCouponCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProtectCode($code)
     {
@@ -3593,7 +3322,6 @@ public function setProtectCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingDescription($description)
     {
@@ -3602,7 +3330,6 @@ public function setShippingDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVirtual($isVirtual)
     {
@@ -3611,7 +3338,6 @@ public function setIsVirtual($isVirtual)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($id)
     {
@@ -3620,7 +3346,6 @@ public function setStoreId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -3629,7 +3354,6 @@ public function setCustomerId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -3638,7 +3362,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountCanceled($baseDiscountCanceled)
     {
@@ -3647,7 +3370,6 @@ public function setBaseDiscountCanceled($baseDiscountCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     {
@@ -3656,7 +3378,6 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded)
     {
@@ -3665,7 +3386,6 @@ public function setBaseDiscountRefunded($baseDiscountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount)
     {
@@ -3674,7 +3394,6 @@ public function setBaseGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount)
     {
@@ -3683,7 +3402,6 @@ public function setBaseShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingCanceled($baseShippingCanceled)
     {
@@ -3692,7 +3410,6 @@ public function setBaseShippingCanceled($baseShippingCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingInvoiced($baseShippingInvoiced)
     {
@@ -3701,7 +3418,6 @@ public function setBaseShippingInvoiced($baseShippingInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingRefunded($baseShippingRefunded)
     {
@@ -3710,7 +3426,6 @@ public function setBaseShippingRefunded($baseShippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -3719,7 +3434,6 @@ public function setBaseShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
     {
@@ -3728,7 +3442,6 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount)
     {
@@ -3737,7 +3450,6 @@ public function setBaseSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalCanceled($baseSubtotalCanceled)
     {
@@ -3746,7 +3458,6 @@ public function setBaseSubtotalCanceled($baseSubtotalCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalInvoiced($baseSubtotalInvoiced)
     {
@@ -3755,7 +3466,6 @@ public function setBaseSubtotalInvoiced($baseSubtotalInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalRefunded($baseSubtotalRefunded)
     {
@@ -3764,7 +3474,6 @@ public function setBaseSubtotalRefunded($baseSubtotalRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -3773,7 +3482,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxCanceled($baseTaxCanceled)
     {
@@ -3782,7 +3490,6 @@ public function setBaseTaxCanceled($baseTaxCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced)
     {
@@ -3791,7 +3498,6 @@ public function setBaseTaxInvoiced($baseTaxInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxRefunded($baseTaxRefunded)
     {
@@ -3800,7 +3506,6 @@ public function setBaseTaxRefunded($baseTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -3809,7 +3514,6 @@ public function setBaseToGlobalRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate)
     {
@@ -3818,7 +3522,6 @@ public function setBaseToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalCanceled($baseTotalCanceled)
     {
@@ -3827,7 +3530,6 @@ public function setBaseTotalCanceled($baseTotalCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalInvoiced($baseTotalInvoiced)
     {
@@ -3836,7 +3538,6 @@ public function setBaseTotalInvoiced($baseTotalInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalInvoicedCost($baseTotalInvoicedCost)
     {
@@ -3845,7 +3546,6 @@ public function setBaseTotalInvoicedCost($baseTotalInvoicedCost)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded)
     {
@@ -3854,7 +3554,6 @@ public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded)
     {
@@ -3863,7 +3562,6 @@ public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalPaid($baseTotalPaid)
     {
@@ -3872,7 +3570,6 @@ public function setBaseTotalPaid($baseTotalPaid)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalQtyOrdered($baseTotalQtyOrdered)
     {
@@ -3881,7 +3578,6 @@ public function setBaseTotalQtyOrdered($baseTotalQtyOrdered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalRefunded($baseTotalRefunded)
     {
@@ -3890,7 +3586,6 @@ public function setBaseTotalRefunded($baseTotalRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -3899,7 +3594,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountCanceled($discountCanceled)
     {
@@ -3908,7 +3602,6 @@ public function setDiscountCanceled($discountCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountInvoiced($discountInvoiced)
     {
@@ -3917,7 +3610,6 @@ public function setDiscountInvoiced($discountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountRefunded($discountRefunded)
     {
@@ -3926,7 +3618,6 @@ public function setDiscountRefunded($discountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGrandTotal($amount)
     {
@@ -3935,7 +3626,6 @@ public function setGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAmount($amount)
     {
@@ -3944,7 +3634,6 @@ public function setShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingCanceled($shippingCanceled)
     {
@@ -3953,7 +3642,6 @@ public function setShippingCanceled($shippingCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingInvoiced($shippingInvoiced)
     {
@@ -3962,7 +3650,6 @@ public function setShippingInvoiced($shippingInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingRefunded($shippingRefunded)
     {
@@ -3971,7 +3658,6 @@ public function setShippingRefunded($shippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount)
     {
@@ -3980,7 +3666,6 @@ public function setShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingTaxRefunded($shippingTaxRefunded)
     {
@@ -3989,7 +3674,6 @@ public function setShippingTaxRefunded($shippingTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate)
     {
@@ -3998,7 +3682,6 @@ public function setStoreToBaseRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate)
     {
@@ -4007,7 +3690,6 @@ public function setStoreToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotal($amount)
     {
@@ -4016,7 +3698,6 @@ public function setSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalCanceled($subtotalCanceled)
     {
@@ -4025,7 +3706,6 @@ public function setSubtotalCanceled($subtotalCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalInvoiced($subtotalInvoiced)
     {
@@ -4034,7 +3714,6 @@ public function setSubtotalInvoiced($subtotalInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalRefunded($subtotalRefunded)
     {
@@ -4043,7 +3722,6 @@ public function setSubtotalRefunded($subtotalRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -4052,7 +3730,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxCanceled($taxCanceled)
     {
@@ -4061,7 +3738,6 @@ public function setTaxCanceled($taxCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxInvoiced($taxInvoiced)
     {
@@ -4070,7 +3746,6 @@ public function setTaxInvoiced($taxInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxRefunded($taxRefunded)
     {
@@ -4079,7 +3754,6 @@ public function setTaxRefunded($taxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalCanceled($totalCanceled)
     {
@@ -4088,7 +3762,6 @@ public function setTotalCanceled($totalCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalInvoiced($totalInvoiced)
     {
@@ -4097,7 +3770,6 @@ public function setTotalInvoiced($totalInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalOfflineRefunded($totalOfflineRefunded)
     {
@@ -4106,7 +3778,6 @@ public function setTotalOfflineRefunded($totalOfflineRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalOnlineRefunded($totalOnlineRefunded)
     {
@@ -4115,7 +3786,6 @@ public function setTotalOnlineRefunded($totalOnlineRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalPaid($totalPaid)
     {
@@ -4124,7 +3794,6 @@ public function setTotalPaid($totalPaid)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalQtyOrdered($totalQtyOrdered)
     {
@@ -4133,7 +3802,6 @@ public function setTotalQtyOrdered($totalQtyOrdered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalRefunded($totalRefunded)
     {
@@ -4142,7 +3810,6 @@ public function setTotalRefunded($totalRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCanShipPartially($flag)
     {
@@ -4151,7 +3818,6 @@ public function setCanShipPartially($flag)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCanShipPartiallyItem($flag)
     {
@@ -4160,7 +3826,6 @@ public function setCanShipPartiallyItem($flag)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerIsGuest($customerIsGuest)
     {
@@ -4169,7 +3834,6 @@ public function setCustomerIsGuest($customerIsGuest)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerNoteNotify($customerNoteNotify)
     {
@@ -4178,7 +3842,6 @@ public function setCustomerNoteNotify($customerNoteNotify)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBillingAddressId($id)
     {
@@ -4187,7 +3850,6 @@ public function setBillingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerGroupId($id)
     {
@@ -4196,7 +3858,6 @@ public function setCustomerGroupId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEditIncrement($editIncrement)
     {
@@ -4205,7 +3866,6 @@ public function setEditIncrement($editIncrement)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent)
     {
@@ -4214,7 +3874,6 @@ public function setEmailSent($emailSent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice)
     {
@@ -4223,7 +3882,6 @@ public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPaymentAuthExpiration($paymentAuthExpiration)
     {
@@ -4232,7 +3890,6 @@ public function setPaymentAuthExpiration($paymentAuthExpiration)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuoteAddressId($id)
     {
@@ -4241,7 +3898,6 @@ public function setQuoteAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuoteId($id)
     {
@@ -4250,7 +3906,6 @@ public function setQuoteId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdjustmentNegative($adjustmentNegative)
     {
@@ -4259,7 +3914,6 @@ public function setAdjustmentNegative($adjustmentNegative)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdjustmentPositive($adjustmentPositive)
     {
@@ -4268,7 +3922,6 @@ public function setAdjustmentPositive($adjustmentPositive)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAdjustmentNegative($baseAdjustmentNegative)
     {
@@ -4277,7 +3930,6 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAdjustmentPositive($baseAdjustmentPositive)
     {
@@ -4286,7 +3938,6 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountAmount($amount)
     {
@@ -4295,7 +3946,6 @@ public function setBaseShippingDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -4304,7 +3954,6 @@ public function setBaseSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalDue($baseTotalDue)
     {
@@ -4313,7 +3962,6 @@ public function setBaseTotalDue($baseTotalDue)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPaymentAuthorizationAmount($amount)
     {
@@ -4322,7 +3970,6 @@ public function setPaymentAuthorizationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingDiscountAmount($amount)
     {
@@ -4331,7 +3978,6 @@ public function setShippingDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount)
     {
@@ -4340,7 +3986,6 @@ public function setSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalDue($totalDue)
     {
@@ -4349,7 +3994,6 @@ public function setTotalDue($totalDue)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeight($weight)
     {
@@ -4358,7 +4002,6 @@ public function setWeight($weight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerDob($customerDob)
     {
@@ -4367,7 +4010,6 @@ public function setCustomerDob($customerDob)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIncrementId($id)
     {
@@ -4376,7 +4018,6 @@ public function setIncrementId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAppliedRuleIds($appliedRuleIds)
     {
@@ -4385,7 +4026,6 @@ public function setAppliedRuleIds($appliedRuleIds)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code)
     {
@@ -4394,7 +4034,6 @@ public function setBaseCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerEmail($customerEmail)
     {
@@ -4403,7 +4042,6 @@ public function setCustomerEmail($customerEmail)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerFirstname($customerFirstname)
     {
@@ -4412,7 +4050,6 @@ public function setCustomerFirstname($customerFirstname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerLastname($customerLastname)
     {
@@ -4421,7 +4058,6 @@ public function setCustomerLastname($customerLastname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerMiddlename($customerMiddlename)
     {
@@ -4430,7 +4066,6 @@ public function setCustomerMiddlename($customerMiddlename)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerPrefix($customerPrefix)
     {
@@ -4439,7 +4074,6 @@ public function setCustomerPrefix($customerPrefix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerSuffix($customerSuffix)
     {
@@ -4448,7 +4082,6 @@ public function setCustomerSuffix($customerSuffix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerTaxvat($customerTaxvat)
     {
@@ -4457,7 +4090,6 @@ public function setCustomerTaxvat($customerTaxvat)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountDescription($description)
     {
@@ -4466,7 +4098,6 @@ public function setDiscountDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtCustomerId($id)
     {
@@ -4475,7 +4106,6 @@ public function setExtCustomerId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtOrderId($id)
     {
@@ -4484,7 +4114,6 @@ public function setExtOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -4493,7 +4122,6 @@ public function setGlobalCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setHoldBeforeState($holdBeforeState)
     {
@@ -4502,7 +4130,6 @@ public function setHoldBeforeState($holdBeforeState)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setHoldBeforeStatus($holdBeforeStatus)
     {
@@ -4511,7 +4138,6 @@ public function setHoldBeforeStatus($holdBeforeStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code)
     {
@@ -4520,7 +4146,6 @@ public function setOrderCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOriginalIncrementId($id)
     {
@@ -4529,7 +4154,6 @@ public function setOriginalIncrementId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRelationChildId($id)
     {
@@ -4538,7 +4162,6 @@ public function setRelationChildId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRelationChildRealId($realId)
     {
@@ -4547,7 +4170,6 @@ public function setRelationChildRealId($realId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRelationParentId($id)
     {
@@ -4556,7 +4178,6 @@ public function setRelationParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRelationParentRealId($realId)
     {
@@ -4565,7 +4186,6 @@ public function setRelationParentRealId($realId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRemoteIp($remoteIp)
     {
@@ -4574,7 +4194,6 @@ public function setRemoteIp($remoteIp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code)
     {
@@ -4583,7 +4202,6 @@ public function setStoreCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreName($storeName)
     {
@@ -4592,7 +4210,6 @@ public function setStoreName($storeName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setXForwardedFor($xForwardedFor)
     {
@@ -4601,7 +4218,6 @@ public function setXForwardedFor($xForwardedFor)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerNote($customerNote)
     {
@@ -4610,7 +4226,6 @@ public function setCustomerNote($customerNote)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -4619,7 +4234,6 @@ public function setUpdatedAt($timestamp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalItemCount($totalItemCount)
     {
@@ -4628,7 +4242,6 @@ public function setTotalItemCount($totalItemCount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerGender($customerGender)
     {
@@ -4637,7 +4250,6 @@ public function setCustomerGender($customerGender)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -4646,7 +4258,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -4655,7 +4266,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -4664,7 +4274,6 @@ public function setShippingDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -4673,7 +4282,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
     {
@@ -4682,7 +4290,6 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
     {
@@ -4694,7 +4301,6 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
     {
@@ -4706,7 +4312,6 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
     {
@@ -4718,7 +4323,6 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount)
     {
@@ -4727,7 +4331,6 @@ public function setShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -4740,7 +4343,6 @@ public function setBaseShippingInclTax($amount)
      * @param string $shippingMethod
      * @return $this
      * @internal
-     * @since 2.0.0
      */
     public function setShippingMethod($shippingMethod)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 31a73b82d22a2..074188a37a2fc 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -19,7 +19,6 @@
  * @method Address setCustomerAddressData(\Magento\Customer\Api\Data\AddressInterface $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Address extends AbstractModel implements OrderAddressInterface, AddressModelInterface
 {
@@ -32,31 +31,26 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $order;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_address';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'address';
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
@@ -70,7 +64,6 @@ class Address extends AbstractModel implements OrderAddressInterface, AddressMod
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -101,7 +94,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -115,7 +107,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -127,7 +118,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      * Return 2 letter state code if available, otherwise full region name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getRegionCode()
     {
@@ -148,7 +138,6 @@ public function getRegionCode()
      * Get full customer name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -172,7 +161,6 @@ public function getName()
      *
      * @param string[]|string $value
      * @return string
-     * @since 2.0.0
      */
     protected function implodeStreetValue($value)
     {
@@ -188,7 +176,6 @@ protected function implodeStreetValue($value)
      * @param array|string $key
      * @param null $value
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -205,7 +192,6 @@ public function setData($key, $value = null)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function implodeStreetField(array $data)
     {
@@ -221,7 +207,6 @@ protected function implodeStreetField(array $data)
      * To be used in controllers for views data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function explodeStreetAddress()
     {
@@ -236,7 +221,6 @@ public function explodeStreetAddress()
      * Get order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -250,7 +234,6 @@ public function getOrder()
      * Retrieve street field of an address
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getStreet()
     {
@@ -265,7 +248,6 @@ public function getStreet()
      *
      * @param int $number
      * @return string
-     * @since 2.0.0
      */
     public function getStreetLine($number)
     {
@@ -279,7 +261,6 @@ public function getStreetLine($number)
      * Returns address_type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddressType()
     {
@@ -290,7 +271,6 @@ public function getAddressType()
      * Returns city
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCity()
     {
@@ -301,7 +281,6 @@ public function getCity()
      * Returns company
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompany()
     {
@@ -312,7 +291,6 @@ public function getCompany()
      * Returns country_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCountryId()
     {
@@ -323,7 +301,6 @@ public function getCountryId()
      * Returns customer_address_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerAddressId()
     {
@@ -334,7 +311,6 @@ public function getCustomerAddressId()
      * Returns customer_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -345,7 +321,6 @@ public function getCustomerId()
      * Returns email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -356,7 +331,6 @@ public function getEmail()
      * Returns entity_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityId()
     {
@@ -368,7 +342,6 @@ public function getEntityId()
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId)
     {
@@ -379,7 +352,6 @@ public function setEntityId($entityId)
      * Returns fax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFax()
     {
@@ -390,7 +362,6 @@ public function getFax()
      * Returns firstname
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstname()
     {
@@ -401,7 +372,6 @@ public function getFirstname()
      * Returns lastname
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastname()
     {
@@ -412,7 +382,6 @@ public function getLastname()
      * Returns middlename
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMiddlename()
     {
@@ -423,7 +392,6 @@ public function getMiddlename()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -434,7 +402,6 @@ public function getParentId()
      * Returns postcode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostcode()
     {
@@ -445,7 +412,6 @@ public function getPostcode()
      * Returns prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -456,7 +422,6 @@ public function getPrefix()
      * Returns region
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRegion()
     {
@@ -467,7 +432,6 @@ public function getRegion()
      * Returns region_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRegionId()
     {
@@ -478,7 +442,6 @@ public function getRegionId()
      * Returns suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -489,7 +452,6 @@ public function getSuffix()
      * Returns telephone
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTelephone()
     {
@@ -500,7 +462,6 @@ public function getTelephone()
      * Returns vat_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVatId()
     {
@@ -511,7 +472,6 @@ public function getVatId()
      * Returns vat_is_valid
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVatIsValid()
     {
@@ -522,7 +482,6 @@ public function getVatIsValid()
      * Returns vat_request_date
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVatRequestDate()
     {
@@ -533,7 +492,6 @@ public function getVatRequestDate()
      * Returns vat_request_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVatRequestId()
     {
@@ -544,7 +502,6 @@ public function getVatRequestId()
      * Returns vat_request_success
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVatRequestSuccess()
     {
@@ -553,7 +510,6 @@ public function getVatRequestSuccess()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -562,7 +518,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerAddressId($id)
     {
@@ -571,7 +526,6 @@ public function setCustomerAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegionId($id)
     {
@@ -580,7 +534,6 @@ public function setRegionId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStreet($street)
     {
@@ -589,7 +542,6 @@ public function setStreet($street)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -598,7 +550,6 @@ public function setCustomerId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFax($fax)
     {
@@ -607,7 +558,6 @@ public function setFax($fax)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegion($region)
     {
@@ -616,7 +566,6 @@ public function setRegion($region)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPostcode($postcode)
     {
@@ -625,7 +574,6 @@ public function setPostcode($postcode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLastname($lastname)
     {
@@ -634,7 +582,6 @@ public function setLastname($lastname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCity($city)
     {
@@ -643,7 +590,6 @@ public function setCity($city)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmail($email)
     {
@@ -652,7 +598,6 @@ public function setEmail($email)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTelephone($telephone)
     {
@@ -661,7 +606,6 @@ public function setTelephone($telephone)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCountryId($id)
     {
@@ -670,7 +614,6 @@ public function setCountryId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFirstname($firstname)
     {
@@ -679,7 +622,6 @@ public function setFirstname($firstname)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAddressType($addressType)
     {
@@ -688,7 +630,6 @@ public function setAddressType($addressType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -697,7 +638,6 @@ public function setPrefix($prefix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMiddlename($middlename)
     {
@@ -706,7 +646,6 @@ public function setMiddlename($middlename)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -715,7 +654,6 @@ public function setSuffix($suffix)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCompany($company)
     {
@@ -724,7 +662,6 @@ public function setCompany($company)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatId($id)
     {
@@ -733,7 +670,6 @@ public function setVatId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatIsValid($vatIsValid)
     {
@@ -742,7 +678,6 @@ public function setVatIsValid($vatIsValid)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatRequestId($id)
     {
@@ -751,7 +686,6 @@ public function setVatRequestId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRegionCode($regionCode)
     {
@@ -760,7 +694,6 @@ public function setRegionCode($regionCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatRequestDate($vatRequestDate)
     {
@@ -769,7 +702,6 @@ public function setVatRequestDate($vatRequestDate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setVatRequestSuccess($vatRequestSuccess)
     {
@@ -780,7 +712,6 @@ public function setVatRequestSuccess($vatRequestSuccess)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\OrderAddressExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -792,7 +723,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address/Renderer.php b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
index 8b5e5bb6431ca..f798865306812 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Renderer.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
@@ -13,19 +13,16 @@
 /**
  * Class Renderer used for formatting an order address
  * @api
- * @since 2.0.0
  */
 class Renderer
 {
     /**
      * @var AddressConfig
-     * @since 2.0.0
      */
     protected $addressConfig;
 
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -34,7 +31,6 @@ class Renderer
      *
      * @param AddressConfig $addressConfig
      * @param EventManager $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         AddressConfig $addressConfig,
@@ -50,7 +46,6 @@ public function __construct(
      * @param Address $address
      * @param string $type
      * @return string|null
-     * @since 2.0.0
      */
     public function format(Address $address, $type)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index 13176d590a303..0daf0387b4def 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -13,13 +13,11 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'parent_id' => 'Parent Order Id',
@@ -35,13 +33,11 @@ class Validator
 
     /**
      * @var DirectoryHelper
-     * @since 2.0.0
      */
     protected $directoryHelper;
 
     /**
      * @var CountryFactory
-     * @since 2.0.0
      */
     protected $countryFactory;
 
@@ -55,7 +51,6 @@ class Validator
      * @param DirectoryHelper $directoryHelper
      * @param CountryFactory  $countryFactory
      * @param EavConfig       $eavConfig
-     * @since 2.0.0
      */
     public function __construct(
         DirectoryHelper $directoryHelper,
@@ -84,7 +79,6 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\Order\Address $address
      * @return array
-     * @since 2.0.0
      */
     public function validate(Address $address)
     {
@@ -111,7 +105,6 @@ public function validate(Address $address)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      *
      * @param Address $address
-     * @since 2.0.0
      */
     public function validateForCustomer(Address $address)
     {
@@ -172,7 +165,6 @@ public function validateForCustomer(Address $address)
      *
      * @param mixed $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isEmpty($value)
     {
@@ -184,7 +176,6 @@ protected function isEmpty($value)
      *
      * @param string $countryId
      * @return bool
-     * @since 2.0.0
      */
     protected function isZipRequired($countryId)
     {
@@ -196,7 +187,6 @@ protected function isZipRequired($countryId)
      *
      * @param string $countryId
      * @return bool
-     * @since 2.0.0
      */
     protected function isStateRequired($countryId)
     {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index c4dded92eb408..a2c98746ef7b1 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -17,25 +17,21 @@
  * Repository class for @see \Magento\Sales\Api\Data\OrderAddressInterface
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInterface
 {
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory = null;
 
     /**
      * @var \Magento\Sales\Api\Data\OrderAddressInterface[]
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -50,7 +46,6 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
      * @param Metadata $metadata
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metadata,
@@ -69,7 +64,6 @@ public function __construct(
      * @return \Magento\Sales\Api\Data\OrderAddressInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -95,7 +89,6 @@ public function get($id)
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -113,7 +106,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $entity
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
     {
@@ -133,7 +125,6 @@ public function delete(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -148,7 +139,6 @@ public function deleteById($id)
      * @param \Magento\Sales\Api\Data\OrderAddressInterface $entity
      * @return \Magento\Sales\Api\Data\OrderAddressInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
     {
@@ -166,7 +156,6 @@ public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
      * Creates new order address instance.
      *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Admin/Item.php b/app/code/Magento/Sales/Model/Order/Admin/Item.php
index 6ab7eac57fffe..650bd21d9af01 100644
--- a/app/code/Magento/Sales/Model/Order/Admin/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Admin/Item.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Admin\Item
  *
- * @since 2.0.0
  */
 class Item
 {
@@ -18,7 +17,6 @@ class Item
      * @param \Magento\Sales\Model\Order\Item $item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku(\Magento\Sales\Model\Order\Item $item)
     {
@@ -31,7 +29,6 @@ public function getSku(\Magento\Sales\Model\Order\Item $item)
      * @param \Magento\Sales\Model\Order\Item $item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName(\Magento\Sales\Model\Order\Item $item)
     {
@@ -44,7 +41,6 @@ public function getName(\Magento\Sales\Model\Order\Item $item)
      * @param \Magento\Sales\Model\Order\Item $item
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId(\Magento\Sales\Model\Order\Item $item)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index a49afd0d193ee..5d02437d6d959 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -9,13 +9,11 @@
  * Order configuration model
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Status\Collection
-     * @since 2.0.0
      */
     protected $collection;
 
@@ -23,37 +21,31 @@ class Config
      * Statuses per state array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $stateStatuses;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $statuses;
 
     /**
      * @var Status
-     * @since 2.0.0
      */
     protected $orderStatusFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory
-     * @since 2.0.0
      */
     protected $orderStatusCollectionFactory;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $maskStatusesMapping = [
         \Magento\Framework\App\Area::AREA_FRONTEND => [
@@ -68,7 +60,6 @@ class Config
      * @param \Magento\Sales\Model\Order\StatusFactory $orderStatusFactory
      * @param \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory $orderStatusCollectionFactory
      * @param \Magento\Framework\App\State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Order\StatusFactory $orderStatusFactory,
@@ -82,7 +73,6 @@ public function __construct(
 
     /**
      * @return \Magento\Sales\Model\ResourceModel\Order\Status\Collection
-     * @since 2.0.0
      */
     protected function _getCollection()
     {
@@ -95,7 +85,6 @@ protected function _getCollection()
     /**
      * @param string $state
      * @return Status|null
-     * @since 2.0.0
      */
     protected function _getState($state)
     {
@@ -112,7 +101,6 @@ protected function _getState($state)
      *
      * @param   string $state
      * @return  string
-     * @since 2.0.0
      */
     public function getStateDefaultStatus($state)
     {
@@ -130,7 +118,6 @@ public function getStateDefaultStatus($state)
      *
      * @param   string $code
      * @return  string
-     * @since 2.0.0
      */
     public function getStatusLabel($code)
     {
@@ -145,7 +132,6 @@ public function getStatusLabel($code)
      * @param string $area
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function maskStatusForArea($area, $code)
     {
@@ -160,7 +146,6 @@ protected function maskStatusForArea($area, $code)
      *
      * @param   string $state
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getStateLabel($state)
     {
@@ -175,7 +160,6 @@ public function getStateLabel($state)
      * Retrieve all statuses
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStatuses()
     {
@@ -187,7 +171,6 @@ public function getStatuses()
      * Order states getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStates()
     {
@@ -208,7 +191,6 @@ public function getStates()
      * @param mixed $state
      * @param bool $addLabels
      * @return array
-     * @since 2.0.0
      */
     public function getStateStatuses($state, $addLabels = true)
     {
@@ -243,7 +225,6 @@ public function getStateStatuses($state, $addLabels = true)
      * Retrieve states which are visible on front end
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVisibleOnFrontStatuses()
     {
@@ -254,7 +235,6 @@ public function getVisibleOnFrontStatuses()
      * Get order statuses, invisible on frontend
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInvisibleOnFrontStatuses()
     {
@@ -267,7 +247,6 @@ public function getInvisibleOnFrontStatuses()
      *
      * @param bool $visibility
      * @return array
-     * @since 2.0.0
      */
     protected function _getStatuses($visibility)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index f5bef642e7d61..a627d01d4b251 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -28,7 +28,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInterface
 {
@@ -46,19 +45,16 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      * Identifier for order history item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $entityType = 'creditmemo';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_states;
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
@@ -66,67 +62,56 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      * Calculator instances for delta rounding of prices
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_calculators = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'creditmemo';
 
     /**
      * @var \Magento\Sales\Model\Order\Creditmemo\Config
-     * @since 2.0.0
      */
     protected $_creditmemoConfig;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_cmItemCollectionFactory;
 
     /**
      * @var \Magento\Framework\Math\CalculatorFactory
-     * @since 2.0.0
      */
     protected $_calculatorFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Sales\Model\Order\Creditmemo\CommentFactory
-     * @since 2.0.0
      */
     protected $_commentFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_commentCollectionFactory;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -147,7 +132,6 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -189,7 +173,6 @@ public function __construct(
      * Initialize creditmemo resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -200,7 +183,6 @@ protected function _construct()
      * Retrieve Creditmemo configuration model
      *
      * @return \Magento\Sales\Model\Order\Creditmemo\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -211,7 +193,6 @@ public function getConfig()
      * Retrieve creditmemo store instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -223,7 +204,6 @@ public function getStore()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -236,7 +216,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      * Retrieve the order the creditmemo for created for
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -250,7 +229,6 @@ public function getOrder()
      * Return order entity type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -261,7 +239,6 @@ public function getEntityType()
      * Retrieve billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -272,7 +249,6 @@ public function getBillingAddress()
      * Retrieve shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -281,7 +257,6 @@ public function getShippingAddress()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
@@ -297,7 +272,6 @@ public function getItemsCollection()
 
     /**
      * @return \Magento\Sales\Model\Order\Creditmemo\Item[]
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -313,7 +287,6 @@ public function getAllItems()
     /**
      * @param mixed $itemId
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -330,7 +303,6 @@ public function getItemById($itemId)
      *
      * @param mixed $orderId
      * @return \Magento\Sales\Model\Order\Creditmemo\Item|bool
-     * @since 2.0.0
      */
     public function getItemByOrderId($orderId)
     {
@@ -345,7 +317,6 @@ public function getItemByOrderId($orderId)
     /**
      * @param \Magento\Sales\Model\Order\Creditmemo\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Sales\Model\Order\Creditmemo\Item $item)
     {
@@ -360,7 +331,6 @@ public function addItem(\Magento\Sales\Model\Order\Creditmemo\Item $item)
      * Creditmemo totals collecting
      *
      * @return $this
-     * @since 2.0.0
      */
     public function collectTotals()
     {
@@ -377,7 +347,6 @@ public function collectTotals()
      * @param string $type
      * @param bool $negative Indicates if we perform addition (true) or subtraction (false) of rounded value
      * @return float
-     * @since 2.0.0
      */
     public function roundPrice($price, $type = 'regular', $negative = false)
     {
@@ -392,7 +361,6 @@ public function roundPrice($price, $type = 'regular', $negative = false)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -409,7 +377,6 @@ public function canRefund()
      * Returns assigned invoice
      *
      * @return Invoice|null
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -421,7 +388,6 @@ public function getInvoice()
      *
      * @param Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoice(Invoice $invoice)
     {
@@ -433,7 +399,6 @@ public function setInvoice(Invoice $invoice)
      * Check creditmemo cancel action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCancel()
     {
@@ -444,7 +409,6 @@ public function canCancel()
      * Check invoice void action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -472,7 +436,6 @@ public function canVoid()
      * Retrieve Creditmemo states array
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getStates()
     {
@@ -491,7 +454,6 @@ public static function getStates()
      *
      * @param   int $stateId
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getStateName($stateId = null)
     {
@@ -511,7 +473,6 @@ public function getStateName($stateId = null)
     /**
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAmount($amount)
     {
@@ -528,7 +489,6 @@ public function setShippingAmount($amount)
     /**
      * @param string $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentPositive($amount)
     {
@@ -549,7 +509,6 @@ public function setAdjustmentPositive($amount)
     /**
      * @param string $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAdjustmentNegative($amount)
     {
@@ -571,7 +530,6 @@ public function setAdjustmentNegative($amount)
      * Checking if the creditmemo is last
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLast()
     {
@@ -605,7 +563,6 @@ public function isLast()
      * @param bool $visibleOnFront
      *
      * @return \Magento\Sales\Model\Order\Creditmemo\Comment
-     * @since 2.0.0
      */
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
@@ -627,7 +584,6 @@ public function addComment($comment, $notify = false, $visibleOnFront = false)
      * @param bool $reload
      * @return \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\Collection
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCommentsCollection($reload = false)
     {
@@ -654,7 +610,6 @@ public function getCommentsCollection($reload = false)
      *
      * @param array|null $filter
      * @return \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection
-     * @since 2.0.0
      */
     public function getFilteredCollectionItems($filter = null)
     {
@@ -665,7 +620,6 @@ public function getFilteredCollectionItems($filter = null)
      * Returns increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId()
     {
@@ -674,7 +628,6 @@ public function getIncrementId()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isValidGrandTotal()
     {
@@ -685,7 +638,6 @@ public function isValidGrandTotal()
      * Return creditmemo items
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -702,7 +654,6 @@ public function getItems()
      * Return creditmemo comments
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface[]|null
-     * @since 2.0.0
      */
     public function getComments()
     {
@@ -721,7 +672,6 @@ public function getComments()
      * Returns discount_description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDiscountDescription()
     {
@@ -730,7 +680,6 @@ public function getDiscountDescription()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItems($items)
     {
@@ -741,7 +690,6 @@ public function setItems($items)
      * Returns adjustment
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAdjustment()
     {
@@ -752,7 +700,6 @@ public function getAdjustment()
      * Returns adjustment_negative
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAdjustmentNegative()
     {
@@ -763,7 +710,6 @@ public function getAdjustmentNegative()
      * Returns adjustment_positive
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAdjustmentPositive()
     {
@@ -774,7 +720,6 @@ public function getAdjustmentPositive()
      * Returns base_adjustment
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAdjustment()
     {
@@ -785,7 +730,6 @@ public function getBaseAdjustment()
      * Returns base_adjustment_negative
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAdjustmentNegative()
     {
@@ -797,7 +741,6 @@ public function getBaseAdjustmentNegative()
      *
      * @param float $baseAdjustmentNegative
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentNegative($baseAdjustmentNegative)
     {
@@ -808,7 +751,6 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative)
      * Returns base_adjustment_positive
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAdjustmentPositive()
     {
@@ -820,7 +762,6 @@ public function getBaseAdjustmentPositive()
      *
      * @param float $baseAdjustmentPositive
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAdjustmentPositive($baseAdjustmentPositive)
     {
@@ -831,7 +772,6 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive)
      * Returns base_currency_code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -842,7 +782,6 @@ public function getBaseCurrencyCode()
      * Returns base_discount_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -853,7 +792,6 @@ public function getBaseDiscountAmount()
      * Returns base_grand_total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseGrandTotal()
     {
@@ -864,7 +802,6 @@ public function getBaseGrandTotal()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -875,7 +812,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_shipping_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -886,7 +822,6 @@ public function getBaseShippingAmount()
      * Returns base_shipping_discount_tax_compensation_amnt
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt()
     {
@@ -897,7 +832,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt()
      * Returns base_shipping_incl_tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax()
     {
@@ -908,7 +842,6 @@ public function getBaseShippingInclTax()
      * Returns base_shipping_tax_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount()
     {
@@ -919,7 +852,6 @@ public function getBaseShippingTaxAmount()
      * Returns base_subtotal
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -930,7 +862,6 @@ public function getBaseSubtotal()
      * Returns base_subtotal_incl_tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax()
     {
@@ -941,7 +872,6 @@ public function getBaseSubtotalInclTax()
      * Returns base_tax_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -952,7 +882,6 @@ public function getBaseTaxAmount()
      * Returns base_to_global_rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate()
     {
@@ -963,7 +892,6 @@ public function getBaseToGlobalRate()
      * Returns base_to_order_rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseToOrderRate()
     {
@@ -974,7 +902,6 @@ public function getBaseToOrderRate()
      * Returns billing_address_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getBillingAddressId()
     {
@@ -985,7 +912,6 @@ public function getBillingAddressId()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -994,7 +920,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -1005,7 +930,6 @@ public function setCreatedAt($createdAt)
      * Returns creditmemo_status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCreditmemoStatus()
     {
@@ -1016,7 +940,6 @@ public function getCreditmemoStatus()
      * Returns discount_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -1027,7 +950,6 @@ public function getDiscountAmount()
      * Returns email_sent
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEmailSent()
     {
@@ -1038,7 +960,6 @@ public function getEmailSent()
      * Returns global_currency_code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode()
     {
@@ -1049,7 +970,6 @@ public function getGlobalCurrencyCode()
      * Returns grand_total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getGrandTotal()
     {
@@ -1060,7 +980,6 @@ public function getGrandTotal()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -1071,7 +990,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns invoice_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getInvoiceId()
     {
@@ -1082,7 +1000,6 @@ public function getInvoiceId()
      * Returns order_currency_code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode()
     {
@@ -1093,7 +1010,6 @@ public function getOrderCurrencyCode()
      * Returns order_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -1104,7 +1020,6 @@ public function getOrderId()
      * Returns shipping_address_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getShippingAddressId()
     {
@@ -1115,7 +1030,6 @@ public function getShippingAddressId()
      * Returns shipping_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -1126,7 +1040,6 @@ public function getShippingAmount()
      * Returns shipping_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount()
     {
@@ -1137,7 +1050,6 @@ public function getShippingDiscountTaxCompensationAmount()
      * Returns shipping_incl_tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingInclTax()
     {
@@ -1148,7 +1060,6 @@ public function getShippingInclTax()
      * Returns shipping_tax_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingTaxAmount()
     {
@@ -1159,7 +1070,6 @@ public function getShippingTaxAmount()
      * Returns state
      *
      * @return int
-     * @since 2.0.0
      */
     public function getState()
     {
@@ -1170,7 +1080,6 @@ public function getState()
      * Returns store_currency_code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode()
     {
@@ -1181,7 +1090,6 @@ public function getStoreCurrencyCode()
      * Returns store_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -1192,7 +1100,6 @@ public function getStoreId()
      * Returns store_to_base_rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getStoreToBaseRate()
     {
@@ -1203,7 +1110,6 @@ public function getStoreToBaseRate()
      * Returns store_to_order_rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getStoreToOrderRate()
     {
@@ -1214,7 +1120,6 @@ public function getStoreToOrderRate()
      * Returns subtotal
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -1225,7 +1130,6 @@ public function getSubtotal()
      * Returns subtotal_incl_tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSubtotalInclTax()
     {
@@ -1236,7 +1140,6 @@ public function getSubtotalInclTax()
      * Returns tax_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -1247,7 +1150,6 @@ public function getTaxAmount()
      * Returns transaction_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTransactionId()
     {
@@ -1259,7 +1161,6 @@ public function getTransactionId()
      *
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId)
     {
@@ -1270,7 +1171,6 @@ public function setTransactionId($transactionId)
      * Returns updated_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -1279,7 +1179,6 @@ public function getUpdatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComments($comments)
     {
@@ -1288,7 +1187,6 @@ public function setComments($comments)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($id)
     {
@@ -1297,7 +1195,6 @@ public function setStoreId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -1306,7 +1203,6 @@ public function setBaseShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate)
     {
@@ -1315,7 +1211,6 @@ public function setStoreToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -1324,7 +1219,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate)
     {
@@ -1333,7 +1227,6 @@ public function setBaseToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGrandTotal($amount)
     {
@@ -1342,7 +1235,6 @@ public function setGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -1351,7 +1243,6 @@ public function setBaseSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount)
     {
@@ -1360,7 +1251,6 @@ public function setSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount)
     {
@@ -1369,7 +1259,6 @@ public function setBaseShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate)
     {
@@ -1378,7 +1267,6 @@ public function setStoreToBaseRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -1387,7 +1275,6 @@ public function setBaseToGlobalRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAdjustment($baseAdjustment)
     {
@@ -1396,7 +1283,6 @@ public function setBaseAdjustment($baseAdjustment)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount)
     {
@@ -1405,7 +1291,6 @@ public function setBaseSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -1414,7 +1299,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotal($amount)
     {
@@ -1423,7 +1307,6 @@ public function setSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdjustment($adjustment)
     {
@@ -1432,7 +1315,6 @@ public function setAdjustment($adjustment)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount)
     {
@@ -1441,7 +1323,6 @@ public function setBaseGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -1450,7 +1331,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount)
     {
@@ -1459,7 +1339,6 @@ public function setShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -1468,7 +1347,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -1477,7 +1355,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent)
     {
@@ -1486,7 +1363,6 @@ public function setEmailSent($emailSent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreditmemoStatus($creditmemoStatus)
     {
@@ -1495,7 +1371,6 @@ public function setCreditmemoStatus($creditmemoStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setState($state)
     {
@@ -1504,7 +1379,6 @@ public function setState($state)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAddressId($id)
     {
@@ -1513,7 +1387,6 @@ public function setShippingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBillingAddressId($id)
     {
@@ -1522,7 +1395,6 @@ public function setBillingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setInvoiceId($id)
     {
@@ -1531,7 +1403,6 @@ public function setInvoiceId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code)
     {
@@ -1540,7 +1411,6 @@ public function setStoreCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code)
     {
@@ -1549,7 +1419,6 @@ public function setOrderCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code)
     {
@@ -1558,7 +1427,6 @@ public function setBaseCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -1567,7 +1435,6 @@ public function setGlobalCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIncrementId($id)
     {
@@ -1576,7 +1443,6 @@ public function setIncrementId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1585,7 +1451,6 @@ public function setUpdatedAt($timestamp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -1594,7 +1459,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -1603,7 +1467,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -1612,7 +1475,6 @@ public function setShippingDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -1621,7 +1483,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount)
     {
@@ -1630,7 +1491,6 @@ public function setShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -1639,7 +1499,6 @@ public function setBaseShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountDescription($description)
     {
@@ -1650,7 +1509,6 @@ public function setDiscountDescription($description)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\CreditmemoExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1662,7 +1520,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index 3c91592fbaf2b..8920208b3c944 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -13,7 +13,6 @@
  * @api
  * @method \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment getResource()
- * @since 2.0.0
  */
 class Comment extends AbstractModel implements CreditmemoCommentInterface
 {
@@ -21,13 +20,11 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
      * Creditmemo instance
      *
      * @var \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     protected $_creditmemo;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -41,7 +38,6 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -69,7 +65,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +78,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemo(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
@@ -97,7 +91,6 @@ public function setCreditmemo(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
      * @codeCoverageIgnore
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -108,7 +101,6 @@ public function getCreditmemo()
      * Get store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -124,7 +116,6 @@ public function getStore()
      * Returns comment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -135,7 +126,6 @@ public function getComment()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -144,7 +134,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -155,7 +144,6 @@ public function setCreatedAt($createdAt)
      * Returns is_customer_notified
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsCustomerNotified()
     {
@@ -166,7 +154,6 @@ public function getIsCustomerNotified()
      * Returns is_visible_on_front
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -177,7 +164,6 @@ public function getIsVisibleOnFront()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -186,7 +172,6 @@ public function getParentId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -195,7 +180,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified)
     {
@@ -204,7 +188,6 @@ public function setIsCustomerNotified($isCustomerNotified)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -213,7 +196,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComment($comment)
     {
@@ -224,7 +206,6 @@ public function setComment($comment)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -236,7 +217,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
index ba5200aab0b7a..091bcdf594875 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
@@ -17,7 +16,6 @@ class Validator
      * Required field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'parent_id' => 'Parent Creditmemo Id',
@@ -29,7 +27,6 @@ class Validator
      *
      * @param \Magento\Sales\Model\Order\Creditmemo\Comment $comment
      * @return array
-     * @since 2.0.0
      */
     public function validate(Comment $comment)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CommentCreation.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CommentCreation.php
index 372ac581c3b2a..f606b6e308295 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/CommentCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/CommentCreation.php
@@ -9,25 +9,25 @@
 
 /**
  * Class CommentCreation
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CommentCreation implements CreditmemoCommentCreationInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $extensionAttributes;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $comment;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $isVisibleOnFront;
 
@@ -35,7 +35,7 @@ class CommentCreation implements CreditmemoCommentCreationInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes()
     {
@@ -47,7 +47,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationExtensionInterface $extensionAttributes
@@ -58,7 +58,7 @@ public function setExtensionAttributes(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getComment()
     {
@@ -67,7 +67,7 @@ public function getComment()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setComment($comment)
     {
@@ -77,7 +77,7 @@ public function setComment($comment)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIsVisibleOnFront()
     {
@@ -86,7 +86,7 @@ public function getIsVisibleOnFront()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Config.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Config.php
index f2adc37af8f58..6d070c4691251 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Sales\Model\Order\Total\Config\Base
 {
@@ -17,13 +16,11 @@ class Config extends \Magento\Sales\Model\Order\Total\Config\Base
      * Cache key for collectors
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_collectorsCacheKey = 'sorted_order_creditmemo_collectors';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configSection = 'order_creditmemo';
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CreationArguments.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CreationArguments.php
index 565a660ee653a..71de645fab373 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/CreationArguments.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/CreationArguments.php
@@ -9,37 +9,37 @@
 
 /**
  * Class CreationArguments
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreationArguments implements CreditmemoCreationArgumentsInterface
 {
     /**
      * @var float|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shippingAmount;
 
     /**
      * @var float|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $adjustmentPositive;
 
     /**
      * @var float|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $adjustmentNegative;
 
     /**
      * @var \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $extensionAttributes;
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getShippingAmount()
     {
@@ -48,7 +48,7 @@ public function getShippingAmount()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAdjustmentPositive()
     {
@@ -57,7 +57,7 @@ public function getAdjustmentPositive()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getAdjustmentNegative()
     {
@@ -66,7 +66,7 @@ public function getAdjustmentNegative()
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setShippingAmount($amount)
     {
@@ -76,7 +76,7 @@ public function setShippingAmount($amount)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setAdjustmentPositive($amount)
     {
@@ -86,7 +86,7 @@ public function setAdjustmentPositive($amount)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setAdjustmentNegative($amount)
     {
@@ -96,7 +96,7 @@ public function setAdjustmentNegative($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes()
     {
@@ -105,7 +105,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidator.php
index 91ff420368b13..3b4c3c698da7a 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidator.php
@@ -9,20 +9,20 @@
 
 /**
  * Class CreditmemoValidator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreditmemoValidator implements CreditmemoValidatorInterface
 {
     /**
      * @var \Magento\Sales\Model\Validator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validator;
 
     /**
      * InvoiceValidatorRunner constructor.
      * @param \Magento\Sales\Model\Validator $validator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Sales\Model\Validator $validator)
     {
@@ -31,7 +31,7 @@ public function __construct(\Magento\Sales\Model\Validator $validator)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(CreditmemoInterface $entity, array $validators)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidatorInterface.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidatorInterface.php
index ef828e52deed5..f6249c48d5bfe 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/CreditmemoValidatorInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * Interface CreditmemoValidatorInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CreditmemoValidatorInterface
 {
@@ -21,7 +21,7 @@ interface CreditmemoValidatorInterface
      * @param ValidatorInterface[] $validators
      * @return ValidatorResultInterface
      * @throws DocumentValidationException
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(CreditmemoInterface $entity, array $validators);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index e82b4357d43f1..c215a65038517 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -15,37 +15,31 @@
  * @method \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item getResource()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Item extends AbstractModel implements CreditmemoItemInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_creditmemo_item';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'creditmemo_item';
 
     /**
      * @var \Magento\Sales\Model\Order\Creditmemo|null
-     * @since 2.0.0
      */
     protected $_creditmemo = null;
 
     /**
      * @var \Magento\Sales\Model\Order\Item|null
-     * @since 2.0.0
      */
     protected $_orderItem = null;
 
     /**
      * @var \Magento\Sales\Model\Order\ItemFactory
-     * @since 2.0.0
      */
     protected $_orderItemFactory;
 
@@ -58,7 +52,6 @@ class Item extends AbstractModel implements CreditmemoItemInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -86,7 +79,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -98,7 +90,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemo(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
@@ -110,7 +101,6 @@ public function setCreditmemo(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
      * Retrieve creditmemo instance
      *
      * @return \Magento\Sales\Model\Order\Creditmemo
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -122,7 +112,6 @@ public function getCreditmemo()
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -135,7 +124,6 @@ public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
      * Retrieve order item instance
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -168,7 +156,6 @@ private function isQtyAvailable($qty, \Magento\Sales\Model\Order\Item $orderItem
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -180,7 +167,6 @@ public function setQty($qty)
      * Applying qty to order item
      *
      * @return \Magento\Sales\Model\Order\Creditmemo\Item
-     * @since 2.0.0
      */
     public function register()
     {
@@ -230,7 +216,6 @@ private function processQty()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -255,7 +240,6 @@ public function cancel()
      * Invoice item row total calculation
      *
      * @return \Magento\Sales\Model\Order\Invoice\Item
-     * @since 2.0.0
      */
     public function calcRowTotal()
     {
@@ -293,7 +277,6 @@ public function calcRowTotal()
      * Checking if the item is last
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLast()
     {
@@ -309,7 +292,6 @@ public function isLast()
      * Returns additional_data
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -320,7 +302,6 @@ public function getAdditionalData()
      * Returns base_cost
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseCost()
     {
@@ -331,7 +312,6 @@ public function getBaseCost()
      * Returns base_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -342,7 +322,6 @@ public function getBaseDiscountAmount()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -353,7 +332,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBasePrice()
     {
@@ -364,7 +342,6 @@ public function getBasePrice()
      * Returns base_price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBasePriceInclTax()
     {
@@ -375,7 +352,6 @@ public function getBasePriceInclTax()
      * Returns base_row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotal()
     {
@@ -386,7 +362,6 @@ public function getBaseRowTotal()
      * Returns base_row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax()
     {
@@ -397,7 +372,6 @@ public function getBaseRowTotalInclTax()
      * Returns base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -408,7 +382,6 @@ public function getBaseTaxAmount()
      * Returns base_weee_tax_applied_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedAmount()
     {
@@ -419,7 +392,6 @@ public function getBaseWeeeTaxAppliedAmount()
      * Returns base_weee_tax_applied_row_amnt
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedRowAmnt()
     {
@@ -430,7 +402,6 @@ public function getBaseWeeeTaxAppliedRowAmnt()
      * Returns base_weee_tax_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxDisposition()
     {
@@ -441,7 +412,6 @@ public function getBaseWeeeTaxDisposition()
      * Returns base_weee_tax_row_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxRowDisposition()
     {
@@ -452,7 +422,6 @@ public function getBaseWeeeTaxRowDisposition()
      * Returns description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -463,7 +432,6 @@ public function getDescription()
      * Returns discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -474,7 +442,6 @@ public function getDiscountAmount()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -485,7 +452,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -496,7 +462,6 @@ public function getName()
      * Returns order_item_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderItemId()
     {
@@ -507,7 +472,6 @@ public function getOrderItemId()
      * Returns parent_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -518,7 +482,6 @@ public function getParentId()
      * Returns price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -529,7 +492,6 @@ public function getPrice()
      * Returns price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -540,7 +502,6 @@ public function getPriceInclTax()
      * Returns product_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -551,7 +512,6 @@ public function getProductId()
      * Returns qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -562,7 +522,6 @@ public function getQty()
      * Returns row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -573,7 +532,6 @@ public function getRowTotal()
      * Returns row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotalInclTax()
     {
@@ -584,7 +542,6 @@ public function getRowTotalInclTax()
      * Returns sku
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -595,7 +552,6 @@ public function getSku()
      * Returns tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -606,7 +562,6 @@ public function getTaxAmount()
      * Returns weee_tax_applied
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied()
     {
@@ -617,7 +572,6 @@ public function getWeeeTaxApplied()
      * Returns weee_tax_applied_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount()
     {
@@ -628,7 +582,6 @@ public function getWeeeTaxAppliedAmount()
      * Returns weee_tax_applied_row_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedRowAmount()
     {
@@ -639,7 +592,6 @@ public function getWeeeTaxAppliedRowAmount()
      * Returns weee_tax_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxDisposition()
     {
@@ -650,7 +602,6 @@ public function getWeeeTaxDisposition()
      * Returns weee_tax_row_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxRowDisposition()
     {
@@ -661,7 +612,6 @@ public function getWeeeTaxRowDisposition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -670,7 +620,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePrice($price)
     {
@@ -679,7 +628,6 @@ public function setBasePrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -688,7 +636,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount)
     {
@@ -697,7 +644,6 @@ public function setBaseRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -706,7 +652,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotal($amount)
     {
@@ -715,7 +660,6 @@ public function setRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -724,7 +668,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount)
     {
@@ -733,7 +676,6 @@ public function setPriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -742,7 +684,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount)
     {
@@ -751,7 +692,6 @@ public function setBasePriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost)
     {
@@ -760,7 +700,6 @@ public function setBaseCost($baseCost)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -769,7 +708,6 @@ public function setPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount)
     {
@@ -778,7 +716,6 @@ public function setBaseRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount)
     {
@@ -787,7 +724,6 @@ public function setRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductId($id)
     {
@@ -796,7 +732,6 @@ public function setProductId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderItemId($id)
     {
@@ -805,7 +740,6 @@ public function setOrderItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -814,7 +748,6 @@ public function setAdditionalData($additionalData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -823,7 +756,6 @@ public function setDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -832,7 +764,6 @@ public function setSku($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -841,7 +772,6 @@ public function setName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -850,7 +780,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -859,7 +788,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition)
     {
@@ -868,7 +796,6 @@ public function setWeeeTaxDisposition($weeeTaxDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     {
@@ -877,7 +804,6 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     {
@@ -886,7 +812,6 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     {
@@ -895,7 +820,6 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied)
     {
@@ -904,7 +828,6 @@ public function setWeeeTaxApplied($weeeTaxApplied)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedAmount($amount)
     {
@@ -913,7 +836,6 @@ public function setBaseWeeeTaxAppliedAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     {
@@ -922,7 +844,6 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($amount)
     {
@@ -931,7 +852,6 @@ public function setWeeeTaxAppliedAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedRowAmount($amount)
     {
@@ -942,7 +862,6 @@ public function setWeeeTaxAppliedRowAmount($amount)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -954,7 +873,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
index 9311dece12c96..c99adeb2573c2 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
@@ -15,19 +15,19 @@
 
 /**
  * Class CreationQuantityValidator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreationQuantityValidator implements ValidatorInterface
 {
     /**
      * @var OrderItemRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderItemRepository;
 
     /**
      * @var OrderInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $context;
 
@@ -35,7 +35,7 @@ class CreationQuantityValidator implements ValidatorInterface
      * ItemCreationQuantityValidator constructor.
      * @param OrderItemRepositoryInterface $orderItemRepository
      * @param mixed $context
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(OrderItemRepositoryInterface $orderItemRepository, $context = null)
     {
@@ -45,7 +45,7 @@ public function __construct(OrderItemRepositoryInterface $orderItemRepository, $
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($entity)
     {
@@ -69,7 +69,7 @@ public function validate($entity)
      * @param Item $orderItem
      * @param int $qty
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isQtyAvailable(Item $orderItem, $qty)
     {
@@ -79,7 +79,7 @@ private function isQtyAvailable(Item $orderItem, $qty)
     /**
      * @param OrderItemInterface $orderItem
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isItemPartOfContextOrder(OrderItemInterface $orderItem)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
index 22b14a0c021b0..8f374d3abe961 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
@@ -9,31 +9,31 @@
 
 /**
  * Class LineItem
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ItemCreation implements CreditmemoItemCreationInterface
 {
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderItemId;
 
     /**
      * @var float
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $qty;
 
     /**
      * @var \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getOrderItemId()
     {
@@ -42,7 +42,7 @@ public function getOrderItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setOrderItemId($orderItemId)
     {
@@ -52,7 +52,7 @@ public function setOrderItemId($orderItemId)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getQty()
     {
@@ -61,7 +61,7 @@ public function getQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setQty($qty)
     {
@@ -73,7 +73,7 @@ public function setQty($qty)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getExtensionAttributes()
     {
@@ -85,7 +85,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\CreditmemoItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidator.php
index ddf2038902536..015bc8e840a3f 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidator.php
@@ -10,20 +10,20 @@
 
 /**
  * Class ItemCreationValidator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ItemCreationValidator implements ItemCreationValidatorInterface
 {
     /**
      * @var \Magento\Sales\Model\Validator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validator;
 
     /**
      * InvoiceValidatorRunner constructor.
      * @param \Magento\Sales\Model\Validator $validator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Sales\Model\Validator $validator)
     {
@@ -32,7 +32,7 @@ public function __construct(\Magento\Sales\Model\Validator $validator)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         CreditmemoItemCreationInterface $entity,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidatorInterface.php b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidatorInterface.php
index 93544b66028ac..68cd0f237157b 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreationValidatorInterface.php
@@ -11,7 +11,7 @@
 
 /**
  * Interface ItemCreationValidatorInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface ItemCreationValidatorInterface
 {
@@ -20,7 +20,7 @@ interface ItemCreationValidatorInterface
      * @param array $validators
      * @param OrderInterface|null $context
      * @return ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(CreditmemoItemCreationInterface $item, array $validators, OrderInterface $context = null);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php
index 394f3a163e4f0..8591779c18196 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php
@@ -9,19 +9,19 @@
  * CreditMemo notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Notifier implements \Magento\Sales\Model\Order\Creditmemo\NotifierInterface
 {
     /**
      * @var \Magento\Sales\Model\Order\CreditMemo\SenderInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $senders;
 
     /**
      * @param \Magento\Sales\Model\Order\CreditMemo\SenderInterface[] $senders
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $senders = [])
     {
@@ -30,7 +30,7 @@ public function __construct(array $senders = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php b/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php
index 44d6e5a5a4a64..c561aa11a5acf 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php
@@ -9,7 +9,7 @@
  * Interface for CreditMemo notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface NotifierInterface
 {
@@ -22,7 +22,7 @@ interface NotifierInterface
      * @param bool $forceSyncMode
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/RefundOperation.php b/app/code/Magento/Sales/Model/Order/Creditmemo/RefundOperation.php
index 103edfc0b83cd..4848d74ae4dc1 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/RefundOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/RefundOperation.php
@@ -12,26 +12,26 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\RefundOperation
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundOperation
 {
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $eventManager;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $priceCurrency;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,7 +46,7 @@ public function __construct(
      * @param OrderInterface $order
      * @param bool $online
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(CreditmemoInterface $creditmemo, OrderInterface $order, $online = false)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index d5fce65d57529..7d394bb34bcfd 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -10,31 +10,31 @@
 
 /**
  * Email notification sender for Creditmemo.
- * @since 2.2.0
+ * @since 2.1.3
  */
 class EmailSender extends Sender implements SenderInterface
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoResource;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $globalConfig;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $eventManager;
 
@@ -48,7 +48,7 @@ class EmailSender extends Sender implements SenderInterface
      * @param \Magento\Sales\Model\ResourceModel\Order\Creditmemo $creditmemoResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Container\Template $templateContainer,
@@ -92,7 +92,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,7 +145,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/SenderInterface.php b/app/code/Magento/Sales/Model/Order/Creditmemo/SenderInterface.php
index b84c04f045b65..65dc810e46b86 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/SenderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/SenderInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface for notification sender for CreditMemo.
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface SenderInterface
 {
@@ -20,7 +20,7 @@ interface SenderInterface
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
index 7788f57b9fe06..5f213f70cbbea 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
@@ -10,7 +10,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTotal
 {
@@ -20,7 +19,6 @@ abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTo
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Cost.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Cost.php
index cc2e1c9ebdabd..6ff84b2a18f3a 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Cost.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Cost.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\Total\Cost
  *
- * @since 2.0.0
  */
 class Cost extends AbstractTotal
 {
@@ -17,7 +16,6 @@ class Cost extends AbstractTotal
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
index 50032f7298fb1..ec35dd26dd282 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\Total\Discount
  *
- * @since 2.0.0
  */
 class Discount extends AbstractTotal
 {
     /**
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Grand.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Grand.php
index cd0fd0298cc30..ee360e247cb9e 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Grand.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Grand.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\Total\Grand
  *
- * @since 2.0.0
  */
 class Grand extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
 {
     /**
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
index 6aa6f07d6a356..0b79fa0b5db8e 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -9,13 +9,11 @@
 
 /**
  * Order creditmemo shipping total calculation model
- * @since 2.0.0
  */
 class Shipping extends AbstractTotal
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -30,7 +28,6 @@ class Shipping extends AbstractTotal
     /**
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         PriceCurrencyInterface $priceCurrency,
@@ -44,7 +41,6 @@ public function __construct(
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Subtotal.php
index 71b3801cfe502..2881ef7b8de73 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Subtotal.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\Total\Subtotal
  *
- * @since 2.0.0
  */
 class Subtotal extends AbstractTotal
 {
@@ -17,7 +16,6 @@ class Subtotal extends AbstractTotal
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
index 8d422eea63fe0..04fa614dd46a3 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Creditmemo\Total\Tax
  *
- * @since 2.0.0
  */
 class Tax extends AbstractTotal
 {
@@ -19,7 +18,6 @@ class Tax extends AbstractTotal
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
index 9302822a3921a..34ee16feac044 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
@@ -17,25 +17,25 @@
 
 /**
  * Class QuantityValidator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class QuantityValidator implements ValidatorInterface
 {
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var InvoiceRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceRepository;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $priceCurrency;
 
@@ -45,7 +45,7 @@ class QuantityValidator implements ValidatorInterface
      * @param OrderRepositoryInterface $orderRepository
      * @param InvoiceRepositoryInterface $invoiceRepository
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
@@ -59,7 +59,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($entity)
     {
@@ -116,7 +116,7 @@ public function validate($entity)
      *
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canRefundShipping(OrderInterface $order)
     {
@@ -127,7 +127,7 @@ private function canRefundShipping(OrderInterface $order)
      * @param CreditmemoInterface $creditmemo
      * @param OrderInterface $order
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getInvoiceQtysRefundLimits(CreditmemoInterface $creditmemo, OrderInterface $order)
     {
@@ -166,7 +166,7 @@ private function getInvoiceQtysRefundLimits(CreditmemoInterface $creditmemo, Ord
     /**
      * @param OrderInterface $order
      * @return OrderItemInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getOrderItems(OrderInterface $order)
     {
@@ -182,7 +182,7 @@ private function getOrderItems(OrderInterface $order)
      * @param Item $orderItem
      * @param int $qty
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isQtyAvailable(Item $orderItem, $qty)
     {
@@ -196,7 +196,7 @@ private function isQtyAvailable(Item $orderItem, $qty)
      * @param double $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canRefundItem(\Magento\Sales\Model\Order\Item $item, $qty, array $invoiceQtysRefundLimits)
     {
@@ -213,7 +213,7 @@ private function canRefundItem(\Magento\Sales\Model\Order\Item $item, $qty, arra
      * @param \Magento\Sales\Model\Order\Item $item
      * @param array $invoiceQtysRefundLimits
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canRefundNoDummyItem(\Magento\Sales\Model\Order\Item $item, array $invoiceQtysRefundLimits = [])
     {
@@ -231,7 +231,7 @@ private function canRefundNoDummyItem(\Magento\Sales\Model\Order\Item $item, arr
      * @param int $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canRefundDummyItem(\Magento\Sales\Model\Order\Item $item, $qty, array $invoiceQtysRefundLimits)
     {
@@ -253,7 +253,7 @@ private function canRefundDummyItem(\Magento\Sales\Model\Order\Item $item, $qty,
      * @param int $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canRefundRequestedQty(
         \Magento\Sales\Model\Order\Item $item,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/TotalsValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/TotalsValidator.php
index 821f67cdb4d5a..0e9ff0de9ca78 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/TotalsValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/TotalsValidator.php
@@ -10,13 +10,13 @@
 
 /**
  * Class TotalsValidator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class TotalsValidator implements ValidatorInterface
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $priceCurrency;
 
@@ -24,7 +24,7 @@ class TotalsValidator implements ValidatorInterface
      * TotalsValidator constructor.
      *
      * @param PriceCurrencyInterface $priceCurrency
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(PriceCurrencyInterface $priceCurrency)
     {
@@ -33,7 +33,7 @@ public function __construct(PriceCurrencyInterface $priceCurrency)
 
     /**
      * @inheritDoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($entity)
     {
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
index cf4423b0cb7bb..f3aec43ff462d 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
@@ -9,31 +9,31 @@
  * Class CreditmemoDocumentFactory
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreditmemoDocumentFactory
 {
     /**
      * @var \Magento\Sales\Model\Order\CreditmemoFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoFactory;
 
     /**
      * @var \Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $commentFactory;
 
     /**
      * @var \Magento\Framework\EntityManager\HydratorPool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $hydratorPool;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
@@ -44,7 +44,7 @@ class CreditmemoDocumentFactory
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory $commentFactory
      * @param \Magento\Framework\EntityManager\HydratorPool $hydratorPool
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory,
@@ -64,7 +64,7 @@ public function __construct(
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getCreditmemoCreationData(
         array $items = [],
@@ -90,7 +90,7 @@ private function getCreditmemoCreationData(
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment
      * @param bool $appendComment
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function attachComment(
         \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
@@ -117,7 +117,7 @@ private function attachComment(
      * @param bool|null $appendComment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function createFromOrder(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -141,7 +141,7 @@ public function createFromOrder(
      * @param bool|null $appendComment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function createFromInvoice(
         \Magento\Sales\Api\Data\InvoiceInterface $invoice,
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 33dcf91f66ae3..8232e2ef1d290 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for @see \Magento\Sales\Model\Order\Creditmemo
- * @since 2.0.0
  */
 class CreditmemoFactory
 {
@@ -15,13 +14,11 @@ class CreditmemoFactory
      * Quote convert object
      *
      * @var \Magento\Sales\Model\Convert\Order
-     * @since 2.0.0
      */
     protected $convertor;
 
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $taxConfig;
 
@@ -44,7 +41,6 @@ class CreditmemoFactory
      * @param \Magento\Sales\Model\Convert\OrderFactory $convertOrderFactory
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Convert\OrderFactory $convertOrderFactory,
@@ -64,7 +60,6 @@ public function __construct(
      * @param \Magento\Sales\Model\Order $order
      * @param array $data
      * @return Creditmemo
-     * @since 2.0.0
      */
     public function createByOrder(\Magento\Sales\Model\Order $order, array $data = [])
     {
@@ -115,7 +110,6 @@ public function createByOrder(\Magento\Sales\Model\Order $order, array $data = [
      * @return Creditmemo
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function createByInvoice(\Magento\Sales\Model\Order\Invoice $invoice, array $data = [])
     {
@@ -211,7 +205,6 @@ public function createByInvoice(\Magento\Sales\Model\Order\Invoice $invoice, arr
      * @param array $invoiceQtysRefundLimits
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [])
     {
@@ -248,7 +241,6 @@ protected function canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [
      * @param \Magento\Sales\Model\Order\Item $item
      * @param array $invoiceQtysRefundLimits
      * @return bool
-     * @since 2.0.0
      */
     protected function canRefundNoDummyItem($item, $invoiceQtysRefundLimits = [])
     {
@@ -267,7 +259,6 @@ protected function canRefundNoDummyItem($item, $invoiceQtysRefundLimits = [])
      * @param Creditmemo $creditmemo
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function initData($creditmemo, $data)
     {
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
index f7d558da9089f..3b0193362564c 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
@@ -13,25 +13,21 @@
 /**
  * Class CreditmemoNotifier
  * @package Magento\Sales\Model
- * @since 2.0.0
  */
 class CreditmemoNotifier extends \Magento\Sales\Model\AbstractNotifier
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $historyCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var CreditmemoSender
-     * @since 2.0.0
      */
     protected $sender;
 
@@ -39,7 +35,6 @@ class CreditmemoNotifier extends \Magento\Sales\Model\AbstractNotifier
      * @param CollectionFactory $historyCollectionFactory
      * @param Logger $logger
      * @param CreditmemoSender $sender
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $historyCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
index 5cf1f76038f92..1aa812d32a413 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
@@ -18,19 +18,16 @@
 /**
  * Repository class for @see \Magento\Sales\Api\Data\CreditmemoInterface
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CreditmemoRepository implements \Magento\Sales\Api\CreditmemoRepositoryInterface
 {
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory = null;
 
@@ -38,7 +35,6 @@ class CreditmemoRepository implements \Magento\Sales\Api\CreditmemoRepositoryInt
      * \Magento\Sales\Api\Data\CreditmemoInterface[]
      *
      * @var array
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -53,7 +49,6 @@ class CreditmemoRepository implements \Magento\Sales\Api\CreditmemoRepositoryInt
      * @param Metadata $metadata
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metadata,
@@ -72,7 +67,6 @@ public function __construct(
      * @return \Magento\Sales\Api\Data\CreditmemoInterface Credit memo interface.
      * @throws InputException
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -94,7 +88,6 @@ public function get($id)
      * Create credit memo instance
      *
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
-     * @since 2.0.0
      */
     public function create()
     {
@@ -106,7 +99,6 @@ public function create()
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\CreditmemoSearchResultInterface Credit memo search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -123,7 +115,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $entity The credit memo.
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
     {
@@ -142,7 +133,6 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $entity The credit memo.
      * @return \Magento\Sales\Api\Data\CreditmemoInterface Credit memo interface.
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
     {
diff --git a/app/code/Magento/Sales/Model/Order/CustomerManagement.php b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
index fe53fe367c6fd..a84d90693e087 100644
--- a/app/code/Magento/Sales/Model/Order/CustomerManagement.php
+++ b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
@@ -10,43 +10,36 @@
 
 /**
  * Class CustomerManagement
- * @since 2.0.0
  */
 class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
-     * @since 2.0.0
      */
     protected $addressFactory;
 
     /**
      * @var \Magento\Customer\Api\Data\RegionInterfaceFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var \Magento\Framework\DataObject\Copy
-     * @since 2.0.0
      */
     protected $objectCopyService;
 
@@ -57,7 +50,6 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory
      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DataObject\Copy $objectCopyService,
@@ -77,7 +69,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create($orderId)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
index 2a442cde43f86..6dc810b0ecbfd 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
@@ -13,13 +13,11 @@
  * Class Container
  *
  * @api
- * @since 2.0.0
  */
 abstract class Container implements IdentityInterface
 {
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -27,32 +25,27 @@ abstract class Container implements IdentityInterface
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var Store
-     * @since 2.0.0
      */
     protected $store;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $customerName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $customerEmail;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -68,7 +61,6 @@ public function __construct(
      * @param string $path
      * @param int $storeId
      * @return mixed
-     * @since 2.0.0
      */
     protected function getConfigValue($path, $storeId)
     {
@@ -84,7 +76,6 @@ protected function getConfigValue($path, $storeId)
      *
      * @param Store $store
      * @return void
-     * @since 2.0.0
      */
     public function setStore(Store $store)
     {
@@ -95,7 +86,6 @@ public function setStore(Store $store)
      * Return store
      *
      * @return Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -111,7 +101,6 @@ public function getStore()
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function setCustomerName($name)
     {
@@ -123,7 +112,6 @@ public function setCustomerName($name)
      *
      * @param string $email
      * @return void
-     * @since 2.0.0
      */
     public function setCustomerEmail($email)
     {
@@ -134,7 +122,6 @@ public function setCustomerEmail($email)
      * Return customer name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerName()
     {
@@ -145,7 +132,6 @@ public function getCustomerName()
      * Return customer email
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerEmail()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
index 92b5df08e3fc9..fd61b6d6746b7 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity
  *
- * @since 2.0.0
  */
 class CreditmemoCommentIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class CreditmemoCommentIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
index 1700bdf2ad971..83ae432ce264c 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity
  *
- * @since 2.0.0
  */
 class CreditmemoIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class CreditmemoIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php b/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
index bcd43ddebc3da..55ce24e23e1ec 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
@@ -10,82 +10,69 @@
 /**
  * Interface \Magento\Sales\Model\Order\Email\Container\IdentityInterface
  *
- * @since 2.0.0
  */
 interface IdentityInterface
 {
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled();
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo();
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod();
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId();
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId();
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerEmail();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerName();
 
     /**
      * @return Store
-     * @since 2.0.0
      */
     public function getStore();
 
     /**
      * @param Store $store
      * @return mixed
-     * @since 2.0.0
      */
     public function setStore(Store $store);
 
     /**
      * @param string $email
      * @return mixed
-     * @since 2.0.0
      */
     public function setCustomerEmail($email);
 
     /**
      * @param string $name
      * @return mixed
-     * @since 2.0.0
      */
     public function setCustomerName($name);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
index 1487afa51f7c8..a28eae0a8350d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity
  *
- * @since 2.0.0
  */
 class InvoiceCommentIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class InvoiceCommentIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
index cdf6a1618b533..49cd0b8438c3b 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity
  *
- * @since 2.0.0
  */
 class InvoiceIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class InvoiceIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
index 44e51191c70cd..f17d99dfe3ddf 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity
  *
- * @since 2.0.0
  */
 class OrderCommentIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class OrderCommentIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
index 60030046e46b7..3aef514a4e306 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\OrderIdentity
  *
- * @since 2.0.0
  */
 class OrderIdentity extends Container implements IdentityInterface
 {
@@ -24,7 +23,6 @@ class OrderIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -39,7 +37,6 @@ public function isEnabled()
      * Return email copy_to list
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -54,7 +51,6 @@ public function getEmailCopyTo()
      * Return copy method
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -65,7 +61,6 @@ public function getCopyMethod()
      * Return guest template id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -76,7 +71,6 @@ public function getGuestTemplateId()
      * Return template id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -87,7 +81,6 @@ public function getTemplateId()
      * Return email identity
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
index c4ee68456cc0c..55c371d5df299 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity
  *
- * @since 2.0.0
  */
 class ShipmentCommentIdentity extends Container implements IdentityInterface
 {
@@ -21,7 +20,6 @@ class ShipmentCommentIdentity extends Container implements IdentityInterface
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -34,7 +32,6 @@ public function isEnabled()
 
     /**
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -47,7 +44,6 @@ public function getEmailCopyTo()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -56,7 +52,6 @@ public function getCopyMethod()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -65,7 +60,6 @@ public function getGuestTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -74,7 +68,6 @@ public function getTemplateId()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
index 7c04df5b1f8e5..162c8c070bfe6 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity
  *
- * @since 2.0.0
  */
 class ShipmentIdentity extends Container implements IdentityInterface
 {
@@ -27,7 +26,6 @@ class ShipmentIdentity extends Container implements IdentityInterface
      * Is email enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -42,7 +40,6 @@ public function isEnabled()
      * Return list of copy_to emails
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getEmailCopyTo()
     {
@@ -57,7 +54,6 @@ public function getEmailCopyTo()
      * Return email copy method
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getCopyMethod()
     {
@@ -68,7 +64,6 @@ public function getCopyMethod()
      * Return guest template id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getGuestTemplateId()
     {
@@ -79,7 +74,6 @@ public function getGuestTemplateId()
      * Return template id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
@@ -90,7 +84,6 @@ public function getTemplateId()
      * Return email identity
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailIdentity()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Template.php b/app/code/Magento/Sales/Model/Order/Email/Container/Template.php
index 065fc498a4ee1..7e3417e435789 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Template.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Template.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\Container\Template
  *
- * @since 2.0.0
  */
 class Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $vars;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $templateId;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $id;
 
@@ -41,7 +36,6 @@ class Template
      *
      * @param array $vars
      * @return void
-     * @since 2.0.0
      */
     public function setTemplateVars(array $vars)
     {
@@ -53,7 +47,6 @@ public function setTemplateVars(array $vars)
      *
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     public function setTemplateOptions(array $options)
     {
@@ -64,7 +57,6 @@ public function setTemplateOptions(array $options)
      * Get email template variables
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTemplateVars()
     {
@@ -75,7 +67,6 @@ public function getTemplateVars()
      * Get email template options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTemplateOptions()
     {
@@ -87,7 +78,6 @@ public function getTemplateOptions()
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function setTemplateId($id)
     {
@@ -98,7 +88,6 @@ public function setTemplateId($id)
      * Get email template id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTemplateId()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 7ea83279254c7..f92b87e75fa3e 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -13,7 +13,6 @@
 /**
  * Class NotifySender
  * @api
- * @since 2.0.0
  */
 abstract class NotifySender extends Sender
 {
@@ -23,7 +22,6 @@ abstract class NotifySender extends Sender
      * @param Order $order
      * @param bool $notify
      * @return bool
-     * @since 2.0.0
      */
     protected function checkAndSend(Order $order, $notify = true)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
index 6b8edab69a2a7..6205d75d584c2 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender.php
@@ -14,37 +14,31 @@
  * Class Sender
  * @api
  *
- * @since 2.0.0
  */
 abstract class Sender
 {
     /**
      * @var \Magento\Sales\Model\Order\Email\SenderBuilderFactory
-     * @since 2.0.0
      */
     protected $senderBuilderFactory;
 
     /**
      * @var Template
-     * @since 2.0.0
      */
     protected $templateContainer;
 
     /**
      * @var IdentityInterface
-     * @since 2.0.0
      */
     protected $identityContainer;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -54,7 +48,6 @@ abstract class Sender
      * @param SenderBuilderFactory $senderBuilderFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param Renderer $addressRenderer
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -73,7 +66,6 @@ public function __construct(
     /**
      * @param Order $order
      * @return bool
-     * @since 2.0.0
      */
     protected function checkAndSend(Order $order)
     {
@@ -99,7 +91,6 @@ protected function checkAndSend(Order $order)
     /**
      * @param Order $order
      * @return void
-     * @since 2.0.0
      */
     protected function prepareTemplate(Order $order)
     {
@@ -120,7 +111,6 @@ protected function prepareTemplate(Order $order)
 
     /**
      * @return Sender
-     * @since 2.0.0
      */
     protected function getSender()
     {
@@ -134,7 +124,6 @@ protected function getSender()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getTemplateOptions()
     {
@@ -147,7 +136,6 @@ protected function getTemplateOptions()
     /**
      * @param Order $order
      * @return string|null
-     * @since 2.0.0
      */
     protected function getFormattedShippingAddress($order)
     {
@@ -159,7 +147,6 @@ protected function getFormattedShippingAddress($order)
     /**
      * @param Order $order
      * @return string|null
-     * @since 2.0.0
      */
     protected function getFormattedBillingAddress($order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
index 2ef7438f5e1fc..510bc54dc05b3 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
@@ -15,13 +15,11 @@
 
 /**
  * Class CreditmemoCommentSender
- * @since 2.0.0
  */
 class CreditmemoCommentSender extends NotifySender
 {
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -29,7 +27,6 @@ class CreditmemoCommentSender extends NotifySender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -40,7 +37,6 @@ class CreditmemoCommentSender extends NotifySender
      * @param \Psr\Log\LoggerInterface $logger
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -62,7 +58,6 @@ public function __construct(
      * @param bool $notify
      * @param string $comment
      * @return bool
-     * @since 2.0.0
      */
     public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 03d7413905ed0..a4ecd2aa7d000 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -19,19 +19,16 @@
  * Class CreditmemoSender
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CreditmemoSender extends Sender
 {
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var CreditmemoResource
-     * @since 2.0.0
      */
     protected $creditmemoResource;
 
@@ -39,13 +36,11 @@ class CreditmemoSender extends Sender
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -53,7 +48,6 @@ class CreditmemoSender extends Sender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -67,7 +61,6 @@ class CreditmemoSender extends Sender
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -102,7 +95,6 @@ public function __construct(
      * @param Creditmemo $creditmemo
      * @param bool $forceSyncMode
      * @return bool
-     * @since 2.0.0
      */
     public function send(Creditmemo $creditmemo, $forceSyncMode = false)
     {
@@ -149,7 +141,6 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
index 7f644e71c1769..8f6401ff1cb88 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
@@ -15,13 +15,11 @@
 
 /**
  * Class InvoiceCommentSender
- * @since 2.0.0
  */
 class InvoiceCommentSender extends NotifySender
 {
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -29,7 +27,6 @@ class InvoiceCommentSender extends NotifySender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -40,7 +37,6 @@ class InvoiceCommentSender extends NotifySender
      * @param \Psr\Log\LoggerInterface $logger
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -62,7 +58,6 @@ public function __construct(
      * @param bool $notify
      * @param string $comment
      * @return bool
-     * @since 2.0.0
      */
     public function send(Invoice $invoice, $notify = true, $comment = '')
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index c5a91a27f4d51..c3083ddae2dd8 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -19,19 +19,16 @@
  * Class InvoiceSender
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InvoiceSender extends Sender
 {
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var InvoiceResource
-     * @since 2.0.0
      */
     protected $invoiceResource;
 
@@ -39,13 +36,11 @@ class InvoiceSender extends Sender
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -53,7 +48,6 @@ class InvoiceSender extends Sender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -67,7 +61,6 @@ class InvoiceSender extends Sender
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -102,7 +95,6 @@ public function __construct(
      * @param Invoice $invoice
      * @param bool $forceSyncMode
      * @return bool
-     * @since 2.0.0
      */
     public function send(Invoice $invoice, $forceSyncMode = false)
     {
@@ -149,7 +141,6 @@ public function send(Invoice $invoice, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
index e2b3bbc73987d..c8c1eb10d4864 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
@@ -14,13 +14,11 @@
 
 /**
  * Class OrderCommentSender
- * @since 2.0.0
  */
 class OrderCommentSender extends NotifySender
 {
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -28,7 +26,6 @@ class OrderCommentSender extends NotifySender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -39,7 +36,6 @@ class OrderCommentSender extends NotifySender
      * @param \Psr\Log\LoggerInterface $logger
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -61,7 +57,6 @@ public function __construct(
      * @param bool $notify
      * @param string $comment
      * @return bool
-     * @since 2.0.0
      */
     public function send(Order $order, $notify = true, $comment = '')
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
index 42f60f718a311..e98f400973c6d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -17,19 +17,16 @@
 /**
  * Class OrderSender
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OrderSender extends Sender
 {
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var OrderResource
-     * @since 2.0.0
      */
     protected $orderResource;
 
@@ -37,13 +34,11 @@ class OrderSender extends Sender
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -51,7 +46,6 @@ class OrderSender extends Sender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -65,7 +59,6 @@ class OrderSender extends Sender
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -100,7 +93,6 @@ public function __construct(
      * @param Order $order
      * @param bool $forceSyncMode
      * @return bool
-     * @since 2.0.0
      */
     public function send(Order $order, $forceSyncMode = false)
     {
@@ -127,7 +119,6 @@ public function send(Order $order, $forceSyncMode = false)
      *
      * @param Order $order
      * @return void
-     * @since 2.0.0
      */
     protected function prepareTemplate(Order $order)
     {
@@ -156,7 +147,6 @@ protected function prepareTemplate(Order $order)
      *
      * @param Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
index d9d4ceb93e9a9..80c2ed356061b 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -15,13 +15,11 @@
 
 /**
  * Class ShipmentCommentSender
- * @since 2.0.0
  */
 class ShipmentCommentSender extends NotifySender
 {
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -29,7 +27,6 @@ class ShipmentCommentSender extends NotifySender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -40,7 +37,6 @@ class ShipmentCommentSender extends NotifySender
      * @param \Psr\Log\LoggerInterface $logger
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -62,7 +58,6 @@ public function __construct(
      * @param bool $notify
      * @param string $comment
      * @return bool
-     * @since 2.0.0
      */
     public function send(Shipment $shipment, $notify = true, $comment = '')
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 19ce8a606277b..ff2311067ba0a 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -19,19 +19,16 @@
  * Class ShipmentSender
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ShipmentSender extends Sender
 {
     /**
      * @var PaymentHelper
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
     /**
      * @var ShipmentResource
-     * @since 2.0.0
      */
     protected $shipmentResource;
 
@@ -39,13 +36,11 @@ class ShipmentSender extends Sender
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @var Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -53,7 +48,6 @@ class ShipmentSender extends Sender
      * Application Event Dispatcher
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -67,7 +61,6 @@ class ShipmentSender extends Sender
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -102,7 +95,6 @@ public function __construct(
      * @param Shipment $shipment
      * @param bool $forceSyncMode
      * @return bool
-     * @since 2.0.0
      */
     public function send(Shipment $shipment, $forceSyncMode = false)
     {
@@ -149,7 +141,6 @@ public function send(Shipment $shipment, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 33620e0afac7c..ba5f91f988163 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Sales\Model\Order\Email\SenderBuilder
  *
- * @since 2.0.0
  */
 class SenderBuilder
 {
     /**
      * @var Template
-     * @since 2.0.0
      */
     protected $templateContainer;
 
     /**
      * @var IdentityInterface
-     * @since 2.0.0
      */
     protected $identityContainer;
 
     /**
      * @var TransportBuilder
-     * @since 2.0.0
      */
     protected $transportBuilder;
 
@@ -38,7 +34,6 @@ class SenderBuilder
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
-     * @since 2.0.0
      */
     public function __construct(
         Template $templateContainer,
@@ -54,7 +49,6 @@ public function __construct(
      * Prepare and send email message
      *
      * @return void
-     * @since 2.0.0
      */
     public function send()
     {
@@ -81,7 +75,6 @@ public function send()
      * Prepare and send copy email message
      *
      * @return void
-     * @since 2.0.0
      */
     public function sendCopyTo()
     {
@@ -103,7 +96,6 @@ public function sendCopyTo()
      * Configure email template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configureEmailTemplate()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php b/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
index 0bd3d38153286..f767220ba0dda 100644
--- a/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
+++ b/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Sales\Model\Order\Grid\Massaction\ItemsUpdater
  *
- * @since 2.0.0
  */
 class ItemsUpdater implements \Magento\Framework\View\Layout\Argument\UpdaterInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
     /**
      * @param \Magento\Framework\AuthorizationInterface $authorization
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\AuthorizationInterface $authorization)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\AuthorizationInterface $authoriza
      * Remove massaction items in case they disallowed for user
      * @param mixed $argument
      * @return mixed
-     * @since 2.0.0
      */
     public function update($argument)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php b/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
index d385a878271e8..e57506630accc 100644
--- a/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
+++ b/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
@@ -7,13 +7,11 @@
 
 /**
  * Sales orders grid row url generator
- * @since 2.0.0
  */
 class UrlGenerator extends \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
@@ -21,7 +19,6 @@ class UrlGenerator extends \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $args
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\UrlInterface $backendUrl,
@@ -36,7 +33,6 @@ public function __construct(
      * Generate row url
      * @param \Magento\Framework\DataObject $item
      * @return bool|string
-     * @since 2.0.0
      */
     public function getUrl($item)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index 0b0c9908fa27b..622bc7783c119 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
 {
@@ -48,19 +47,16 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
      * Identifier for history item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $entityType = 'invoice';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_states;
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
@@ -68,25 +64,21 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
      * Calculator instances for delta rounding of prices
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rounders = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_saveBeforeDestruct = false;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'invoice';
 
@@ -94,43 +86,36 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
      * Whether the pay() was called
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_wasPayCalled = false;
 
     /**
      * @var \Magento\Sales\Model\Order\Invoice\Config
-     * @since 2.0.0
      */
     protected $_invoiceConfig;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Framework\Math\CalculatorFactory
-     * @since 2.0.0
      */
     protected $_calculatorFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_invoiceItemCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Invoice\CommentFactory
-     * @since 2.0.0
      */
     protected $_invoiceCommentFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_commentCollectionFactory;
 
@@ -149,7 +134,6 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -187,7 +171,6 @@ public function __construct(
      * Initialize invoice resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -199,7 +182,6 @@ protected function _construct()
      *
      * @param string $incrementId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIncrementId($incrementId)
     {
@@ -216,7 +198,6 @@ public function loadByIncrementId($incrementId)
      * Retrieve invoice configuration model
      *
      * @return \Magento\Sales\Model\Order\Invoice\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -227,7 +208,6 @@ public function getConfig()
      * Retrieve store model instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -239,7 +219,6 @@ public function getStore()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -252,7 +231,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      * Retrieve the order the invoice for created for
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -266,7 +244,6 @@ public function getOrder()
      * Return order history item identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -277,7 +254,6 @@ public function getEntityType()
      * Retrieve billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -288,7 +264,6 @@ public function getBillingAddress()
      * Retrieve shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -299,7 +274,6 @@ public function getShippingAddress()
      * Check invoice cancel state
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCanceled()
     {
@@ -310,7 +284,6 @@ public function isCanceled()
      * Check invoice capture action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -323,7 +296,6 @@ public function canCapture()
      * Check invoice void action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -339,7 +311,6 @@ public function canVoid()
      * Check invoice cancel action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCancel()
     {
@@ -350,7 +321,6 @@ public function canCancel()
      * Check invoice refund action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -367,7 +337,6 @@ public function canRefund()
      * Capture invoice
      *
      * @return $this
-     * @since 2.0.0
      */
     public function capture()
     {
@@ -382,7 +351,6 @@ public function capture()
      * Pay invoice
      *
      * @return $this
-     * @since 2.0.0
      */
     public function pay()
     {
@@ -404,7 +372,6 @@ public function pay()
      * Whether pay() method was called (whether order and payment totals were updated)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function wasPayCalled()
     {
@@ -415,7 +382,6 @@ public function wasPayCalled()
      * Void invoice
      *
      * @return $this
-     * @since 2.0.0
      */
     public function void()
     {
@@ -428,7 +394,6 @@ public function void()
      * Cancel invoice action
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -482,7 +447,6 @@ public function cancel()
      * Invoice totals collecting
      *
      * @return $this
-     * @since 2.0.0
      */
     public function collectTotals()
     {
@@ -499,7 +463,6 @@ public function collectTotals()
      * @param string $type
      * @param bool $negative Indicates if we perform addition (true) or subtraction (false) of rounded value
      * @return float
-     * @since 2.0.0
      */
     public function roundPrice($price, $type = 'regular', $negative = false)
     {
@@ -516,7 +479,6 @@ public function roundPrice($price, $type = 'regular', $negative = false)
      * Get invoice items collection
      *
      * @return \Magento\Sales\Model\ResourceModel\Order\Invoice\Item\Collection
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
@@ -534,7 +496,6 @@ public function getItemsCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -550,7 +511,6 @@ public function getAllItems()
     /**
      * @param int|string $itemId
      * @return bool|\Magento\Sales\Model\Order\Invoice\Item
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -565,7 +525,6 @@ public function getItemById($itemId)
     /**
      * @param \Magento\Sales\Model\Order\Invoice\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Sales\Model\Order\Invoice\Item $item)
     {
@@ -581,7 +540,6 @@ public function addItem(\Magento\Sales\Model\Order\Invoice\Item $item)
      * Retrieve invoice states array
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getStates()
     {
@@ -600,7 +558,6 @@ public static function getStates()
      *
      * @param   int|null $stateId
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getStateName($stateId = null)
     {
@@ -625,7 +582,6 @@ public function getStateName($stateId = null)
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function register()
     {
@@ -701,7 +657,6 @@ public function register()
      * Checking if the invoice is last
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLast()
     {
@@ -721,7 +676,6 @@ public function isLast()
      * @param bool $notify
      * @param bool $visibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
@@ -745,7 +699,6 @@ public function addComment($comment, $notify = false, $visibleOnFront = false)
     /**
      * @param bool $reload
      * @return \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment\Collection
-     * @since 2.0.0
      */
     public function getCommentsCollection($reload = false)
     {
@@ -773,7 +726,6 @@ public function getCommentsCollection($reload = false)
      * Reset invoice object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -791,7 +743,6 @@ public function reset()
      * Before object save manipulations
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave()
     {
@@ -802,7 +753,6 @@ protected function _beforeSave()
      * After object save manipulation
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave()
     {
@@ -813,7 +763,6 @@ protected function _afterSave()
      * Returns invoice items
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -831,7 +780,6 @@ public function getItems()
      * Return invoice comments
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentInterface[]|null
-     * @since 2.0.0
      */
     public function getComments()
     {
@@ -851,7 +799,6 @@ public function getComments()
      * Returns increment id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId()
     {
@@ -862,7 +809,6 @@ public function getIncrementId()
      * Returns base_total_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTotalRefunded()
     {
@@ -873,7 +819,6 @@ public function getBaseTotalRefunded()
      * Returns discount_description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDiscountDescription()
     {
@@ -882,7 +827,6 @@ public function getDiscountDescription()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItems($items)
     {
@@ -893,7 +837,6 @@ public function setItems($items)
      * Returns base_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -904,7 +847,6 @@ public function getBaseCurrencyCode()
      * Returns base_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -915,7 +857,6 @@ public function getBaseDiscountAmount()
      * Returns base_grand_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseGrandTotal()
     {
@@ -926,7 +867,6 @@ public function getBaseGrandTotal()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -937,7 +877,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_shipping_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -948,7 +887,6 @@ public function getBaseShippingAmount()
      * Returns base_shipping_discount_tax_compensation_amnt
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingDiscountTaxCompensationAmnt()
     {
@@ -959,7 +897,6 @@ public function getBaseShippingDiscountTaxCompensationAmnt()
      * Returns base_shipping_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingInclTax()
     {
@@ -970,7 +907,6 @@ public function getBaseShippingInclTax()
      * Returns base_shipping_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseShippingTaxAmount()
     {
@@ -981,7 +917,6 @@ public function getBaseShippingTaxAmount()
      * Returns base_subtotal
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotal()
     {
@@ -992,7 +927,6 @@ public function getBaseSubtotal()
      * Returns base_subtotal_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseSubtotalInclTax()
     {
@@ -1003,7 +937,6 @@ public function getBaseSubtotalInclTax()
      * Returns base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -1014,7 +947,6 @@ public function getBaseTaxAmount()
      * Returns base_to_global_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToGlobalRate()
     {
@@ -1025,7 +957,6 @@ public function getBaseToGlobalRate()
      * Returns base_to_order_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseToOrderRate()
     {
@@ -1036,7 +967,6 @@ public function getBaseToOrderRate()
      * Returns billing_address_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getBillingAddressId()
     {
@@ -1047,7 +977,6 @@ public function getBillingAddressId()
      * Returns can_void_flag
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCanVoidFlag()
     {
@@ -1058,7 +987,6 @@ public function getCanVoidFlag()
      * Returns created_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -1067,7 +995,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -1078,7 +1005,6 @@ public function setCreatedAt($createdAt)
      * Returns discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -1089,7 +1015,6 @@ public function getDiscountAmount()
      * Returns email_sent
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEmailSent()
     {
@@ -1100,7 +1025,6 @@ public function getEmailSent()
      * Returns global_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getGlobalCurrencyCode()
     {
@@ -1111,7 +1035,6 @@ public function getGlobalCurrencyCode()
      * Returns grand_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGrandTotal()
     {
@@ -1122,7 +1045,6 @@ public function getGrandTotal()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -1133,7 +1055,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns is_used_for_refund
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getIsUsedForRefund()
     {
@@ -1144,7 +1065,6 @@ public function getIsUsedForRefund()
      * Returns order_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getOrderCurrencyCode()
     {
@@ -1155,7 +1075,6 @@ public function getOrderCurrencyCode()
      * Returns order_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -1166,7 +1085,6 @@ public function getOrderId()
      * Returns shipping_address_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getShippingAddressId()
     {
@@ -1177,7 +1095,6 @@ public function getShippingAddressId()
      * Returns shipping_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -1188,7 +1105,6 @@ public function getShippingAmount()
      * Returns shipping_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingDiscountTaxCompensationAmount()
     {
@@ -1199,7 +1115,6 @@ public function getShippingDiscountTaxCompensationAmount()
      * Returns shipping_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingInclTax()
     {
@@ -1210,7 +1125,6 @@ public function getShippingInclTax()
      * Returns shipping_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getShippingTaxAmount()
     {
@@ -1221,7 +1135,6 @@ public function getShippingTaxAmount()
      * Returns state
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getState()
     {
@@ -1232,7 +1145,6 @@ public function getState()
      * Returns store_currency_code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStoreCurrencyCode()
     {
@@ -1243,7 +1155,6 @@ public function getStoreCurrencyCode()
      * Returns store_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -1254,7 +1165,6 @@ public function getStoreId()
      * Returns store_to_base_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToBaseRate()
     {
@@ -1265,7 +1175,6 @@ public function getStoreToBaseRate()
      * Returns store_to_order_rate
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getStoreToOrderRate()
     {
@@ -1276,7 +1185,6 @@ public function getStoreToOrderRate()
      * Returns subtotal
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -1287,7 +1195,6 @@ public function getSubtotal()
      * Returns subtotal_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getSubtotalInclTax()
     {
@@ -1298,7 +1205,6 @@ public function getSubtotalInclTax()
      * Returns tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -1309,7 +1215,6 @@ public function getTaxAmount()
      * Returns total_qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalQty()
     {
@@ -1320,7 +1225,6 @@ public function getTotalQty()
      * Returns transaction_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTransactionId()
     {
@@ -1332,7 +1236,6 @@ public function getTransactionId()
      *
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId)
     {
@@ -1343,7 +1246,6 @@ public function setTransactionId($transactionId)
      * Returns updated_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -1352,7 +1254,6 @@ public function getUpdatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComments($comments)
     {
@@ -1361,7 +1262,6 @@ public function setComments($comments)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1370,7 +1270,6 @@ public function setUpdatedAt($timestamp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($id)
     {
@@ -1379,7 +1278,6 @@ public function setStoreId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseGrandTotal($amount)
     {
@@ -1388,7 +1286,6 @@ public function setBaseGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingTaxAmount($amount)
     {
@@ -1397,7 +1294,6 @@ public function setShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -1406,7 +1302,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -1415,7 +1310,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToOrderRate($rate)
     {
@@ -1424,7 +1318,6 @@ public function setStoreToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -1433,7 +1326,6 @@ public function setBaseShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -1442,7 +1334,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToOrderRate($rate)
     {
@@ -1451,7 +1342,6 @@ public function setBaseToOrderRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGrandTotal($amount)
     {
@@ -1460,7 +1350,6 @@ public function setGrandTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAmount($amount)
     {
@@ -1469,7 +1358,6 @@ public function setShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotalInclTax($amount)
     {
@@ -1478,7 +1366,6 @@ public function setSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -1487,7 +1374,6 @@ public function setBaseSubtotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreToBaseRate($rate)
     {
@@ -1496,7 +1382,6 @@ public function setStoreToBaseRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount)
     {
@@ -1505,7 +1390,6 @@ public function setBaseShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalQty($qty)
     {
@@ -1514,7 +1398,6 @@ public function setTotalQty($qty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -1523,7 +1406,6 @@ public function setBaseToGlobalRate($rate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSubtotal($amount)
     {
@@ -1532,7 +1414,6 @@ public function setSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseSubtotal($amount)
     {
@@ -1541,7 +1422,6 @@ public function setBaseSubtotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -1550,7 +1430,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBillingAddressId($id)
     {
@@ -1559,7 +1438,6 @@ public function setBillingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsUsedForRefund($isUsedForRefund)
     {
@@ -1568,7 +1446,6 @@ public function setIsUsedForRefund($isUsedForRefund)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -1577,7 +1454,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent)
     {
@@ -1586,7 +1462,6 @@ public function setEmailSent($emailSent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCanVoidFlag($canVoidFlag)
     {
@@ -1595,7 +1470,6 @@ public function setCanVoidFlag($canVoidFlag)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setState($state)
     {
@@ -1604,7 +1478,6 @@ public function setState($state)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAddressId($id)
     {
@@ -1613,7 +1486,6 @@ public function setShippingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreCurrencyCode($code)
     {
@@ -1622,7 +1494,6 @@ public function setStoreCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderCurrencyCode($code)
     {
@@ -1631,7 +1502,6 @@ public function setOrderCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($code)
     {
@@ -1640,7 +1510,6 @@ public function setBaseCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -1649,7 +1518,6 @@ public function setGlobalCurrencyCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIncrementId($id)
     {
@@ -1658,7 +1526,6 @@ public function setIncrementId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -1667,7 +1534,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -1676,7 +1542,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -1685,7 +1550,6 @@ public function setShippingDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -1694,7 +1558,6 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingInclTax($amount)
     {
@@ -1703,7 +1566,6 @@ public function setShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -1712,7 +1574,6 @@ public function setBaseShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTotalRefunded($amount)
     {
@@ -1721,7 +1582,6 @@ public function setBaseTotalRefunded($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountDescription($description)
     {
@@ -1732,7 +1592,6 @@ public function setDiscountDescription($description)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\InvoiceExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1744,7 +1603,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index 06fe83c587206..e3db2df9159a2 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -12,7 +12,6 @@
 /**
  * @method \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment getResource()
- * @since 2.0.0
  */
 class Comment extends AbstractModel implements InvoiceCommentInterface
 {
@@ -20,13 +19,11 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
      * Invoice instance
      *
      * @var \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     protected $_invoice;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -40,7 +37,6 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -68,7 +64,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoice(\Magento\Sales\Model\Order\Invoice $invoice)
     {
@@ -92,7 +86,6 @@ public function setInvoice(\Magento\Sales\Model\Order\Invoice $invoice)
      * Retrieve invoice instance
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -103,7 +96,6 @@ public function getInvoice()
      * Get store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -117,7 +109,6 @@ public function getStore()
      * Returns comment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -128,7 +119,6 @@ public function getComment()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -137,7 +127,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -148,7 +137,6 @@ public function setCreatedAt($createdAt)
      * Returns is_customer_notified
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsCustomerNotified()
     {
@@ -159,7 +147,6 @@ public function getIsCustomerNotified()
      * Returns is_visible_on_front
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -170,7 +157,6 @@ public function getIsVisibleOnFront()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -181,7 +167,6 @@ public function getParentId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -190,7 +175,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified)
     {
@@ -199,7 +183,6 @@ public function setIsCustomerNotified($isCustomerNotified)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -208,7 +191,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComment($comment)
     {
@@ -219,7 +201,6 @@ public function setComment($comment)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -231,7 +212,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
index f95c3cbb6e0c5..316764dc6d61c 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
@@ -17,7 +16,6 @@ class Validator
      * Required field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'parent_id' => 'Parent Invoice Id',
@@ -29,7 +27,6 @@ class Validator
      *
      * @param \Magento\Sales\Model\Order\Invoice\Comment $comment
      * @return array
-     * @since 2.0.0
      */
     public function validate(Comment $comment)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/CommentCreation.php b/app/code/Magento/Sales/Model/Order/Invoice/CommentCreation.php
index 4b2923a3f481c..94b4b32fb055e 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/CommentCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/CommentCreation.php
@@ -10,26 +10,26 @@
 
 /**
  * Class InvoiceCommentCreation
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CommentCreation implements InvoiceCommentCreationInterface
 {
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $comment;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $isVisibleOnFront;
 
     /**
      * @var \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
@@ -37,7 +37,7 @@ class CommentCreation implements InvoiceCommentCreationInterface
      * Gets the comment for the invoice.
      *
      * @return string Comment.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getComment()
     {
@@ -49,7 +49,7 @@ public function getComment()
      *
      * @param string $comment
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setComment($comment)
     {
@@ -61,7 +61,7 @@ public function setComment($comment)
      * Gets the is-visible-on-storefront flag value for the invoice.
      *
      * @return int Is-visible-on-storefront flag value.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getIsVisibleOnFront()
     {
@@ -73,7 +73,7 @@ public function getIsVisibleOnFront()
      *
      * @param int $isVisibleOnFront
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -85,7 +85,7 @@ public function setIsVisibleOnFront($isVisibleOnFront)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -97,7 +97,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCommentCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Config.php b/app/code/Magento/Sales/Model/Order/Invoice/Config.php
index 5e17f8ccd212e..be7e252ed9e26 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Config.php
@@ -9,7 +9,6 @@
  * Order invoice configuration model
  *
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Sales\Model\Order\Total\Config\Base
 {
@@ -17,13 +16,11 @@ class Config extends \Magento\Sales\Model\Order\Total\Config\Base
      * Cache key for collectors
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_collectorsCacheKey = 'sorted_order_invoice_collectors';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_configSection = 'order_invoice';
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/CreationArguments.php b/app/code/Magento/Sales/Model/Order/Invoice/CreationArguments.php
index ec5cf74449fd4..3c4dfe9a115a3 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/CreationArguments.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/CreationArguments.php
@@ -9,19 +9,19 @@
  * Creation arguments for Invoice.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CreationArguments implements \Magento\Sales\Api\Data\InvoiceCreationArgumentsInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\InvoiceCreationArgumentsExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -30,7 +30,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Grid/Row/UrlGenerator.php b/app/code/Magento/Sales/Model/Order/Invoice/Grid/Row/UrlGenerator.php
index 334f4a1c40119..21ffae51f9cc8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Grid/Row/UrlGenerator.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Grid/Row/UrlGenerator.php
@@ -7,13 +7,11 @@
 
 /**
  * Sales orders grid row url generator
- * @since 2.0.0
  */
 class UrlGenerator extends \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $_authorization;
 
@@ -21,7 +19,6 @@ class UrlGenerator extends \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $args
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\UrlInterface $backendUrl,
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $item
      * @return bool|string
-     * @since 2.0.0
      */
     public function getUrl($item)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidator.php b/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidator.php
index e35f5cc3a5ff8..7ead54b53498e 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidator.php
@@ -9,20 +9,20 @@
 
 /**
  * Class InvoiceValidatorRunner
- * @since 2.2.0
+ * @since 2.1.2
  */
 class InvoiceValidator implements InvoiceValidatorInterface
 {
     /**
      * @var \Magento\Sales\Model\Validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $validator;
 
     /**
      * InvoiceValidatorRunner constructor.
      * @param \Magento\Sales\Model\Validator $validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(\Magento\Sales\Model\Validator $validator)
     {
@@ -31,7 +31,7 @@ public function __construct(\Magento\Sales\Model\Validator $validator)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(InvoiceInterface $entity, array $validators)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidatorInterface.php b/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidatorInterface.php
index 973bb9c038910..964eb169475c8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/InvoiceValidatorInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * Interface InvoiceValidatorInterface
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceValidatorInterface
 {
@@ -21,7 +21,7 @@ interface InvoiceValidatorInterface
      * @param ValidatorInterface[] $validators
      * @return ValidatorResultInterface
      * @throws DocumentValidationException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(InvoiceInterface $entity, array $validators);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/Order/Invoice/Item.php
index 4d77de4897f36..3d78405e9a5b4 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Item.php
@@ -33,31 +33,26 @@
  * @method \Magento\Sales\Model\Order\Invoice\Item setWeeeTaxApplied(string $value)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Item extends AbstractModel implements InvoiceItemInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_invoice_item';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'invoice_item';
 
     /**
      * @var \Magento\Sales\Model\Order\Item|null
-     * @since 2.0.0
      */
     protected $_orderItem = null;
 
     /**
      * @var \Magento\Sales\Model\Order\ItemFactory
-     * @since 2.0.0
      */
     protected $_orderItemFactory;
 
@@ -70,7 +65,6 @@ class Item extends AbstractModel implements InvoiceItemInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -98,7 +92,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -110,7 +103,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoice(\Magento\Sales\Api\Data\InvoiceInterface $invoice)
     {
@@ -123,7 +115,6 @@ public function setInvoice(\Magento\Sales\Api\Data\InvoiceInterface $invoice)
      * @codeCoverageIgnore
      *
      * @return \Magento\Sales\Model\Order\Invoice
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -135,7 +126,6 @@ public function getInvoice()
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -148,7 +138,6 @@ public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
      * Retrieve order item instance
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -169,7 +158,6 @@ public function getOrderItem()
      *
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -180,7 +168,6 @@ public function setQty($qty)
      * Applying qty to order item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function register()
     {
@@ -208,7 +195,6 @@ public function register()
      * Cancelling invoice item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -236,7 +222,6 @@ public function cancel()
      * Invoice item row total calculation
      *
      * @return $this
-     * @since 2.0.0
      */
     public function calcRowTotal()
     {
@@ -273,7 +258,6 @@ public function calcRowTotal()
      * Checking if the item is last
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLast()
     {
@@ -289,7 +273,6 @@ public function isLast()
      * Returns additional_data
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -300,7 +283,6 @@ public function getAdditionalData()
      * Returns base_cost
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseCost()
     {
@@ -311,7 +293,6 @@ public function getBaseCost()
      * Returns base_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -322,7 +303,6 @@ public function getBaseDiscountAmount()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -333,7 +313,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBasePrice()
     {
@@ -344,7 +323,6 @@ public function getBasePrice()
      * Returns base_price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBasePriceInclTax()
     {
@@ -355,7 +333,6 @@ public function getBasePriceInclTax()
      * Returns base_row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotal()
     {
@@ -366,7 +343,6 @@ public function getBaseRowTotal()
      * Returns base_row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax()
     {
@@ -377,7 +353,6 @@ public function getBaseRowTotalInclTax()
      * Returns base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -388,7 +363,6 @@ public function getBaseTaxAmount()
      * Returns description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -399,7 +373,6 @@ public function getDescription()
      * Returns discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -410,7 +383,6 @@ public function getDiscountAmount()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -421,7 +393,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -432,7 +403,6 @@ public function getName()
      * Returns order_item_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderItemId()
     {
@@ -443,7 +413,6 @@ public function getOrderItemId()
      * Returns parent_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -454,7 +423,6 @@ public function getParentId()
      * Returns price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -465,7 +433,6 @@ public function getPrice()
      * Returns price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -476,7 +443,6 @@ public function getPriceInclTax()
      * Returns product_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -487,7 +453,6 @@ public function getProductId()
      * Returns qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -498,7 +463,6 @@ public function getQty()
      * Returns row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -509,7 +473,6 @@ public function getRowTotal()
      * Returns row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotalInclTax()
     {
@@ -520,7 +483,6 @@ public function getRowTotalInclTax()
      * Returns sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -531,7 +493,6 @@ public function getSku()
      * Returns tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -540,7 +501,6 @@ public function getTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -549,7 +509,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePrice($price)
     {
@@ -558,7 +517,6 @@ public function setBasePrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -567,7 +525,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount)
     {
@@ -576,7 +533,6 @@ public function setBaseRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -585,7 +541,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotal($amount)
     {
@@ -594,7 +549,6 @@ public function setRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -603,7 +557,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount)
     {
@@ -612,7 +565,6 @@ public function setPriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -621,7 +573,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount)
     {
@@ -630,7 +581,6 @@ public function setBasePriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost)
     {
@@ -639,7 +589,6 @@ public function setBaseCost($baseCost)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -648,7 +597,6 @@ public function setPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount)
     {
@@ -657,7 +605,6 @@ public function setBaseRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount)
     {
@@ -666,7 +613,6 @@ public function setRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductId($id)
     {
@@ -675,7 +621,6 @@ public function setProductId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderItemId($id)
     {
@@ -684,7 +629,6 @@ public function setOrderItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -693,7 +637,6 @@ public function setAdditionalData($additionalData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -702,7 +645,6 @@ public function setDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -711,7 +653,6 @@ public function setSku($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -720,7 +661,6 @@ public function setName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -729,7 +669,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -740,7 +679,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -752,7 +690,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Invoice/ItemCreation.php
index 6e0af7957b94c..c1e48d17c0512 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/ItemCreation.php
@@ -10,31 +10,31 @@
 
 /**
  * Class LineItem
- * @since 2.2.0
+ * @since 2.1.2
  */
 class ItemCreation implements InvoiceItemCreationInterface
 {
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderItemId;
 
     /**
      * @var float
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $qty;
 
     /**
      * @var \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getOrderItemId()
     {
@@ -43,7 +43,7 @@ public function getOrderItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setOrderItemId($orderItemId)
     {
@@ -52,7 +52,7 @@ public function setOrderItemId($orderItemId)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getQty()
     {
@@ -61,7 +61,7 @@ public function getQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setQty($qty)
     {
@@ -72,7 +72,7 @@ public function setQty($qty)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -84,7 +84,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\InvoiceItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Notifier.php b/app/code/Magento/Sales/Model/Order/Invoice/Notifier.php
index 0e650529dbf49..5b8868356c8eb 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Notifier.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Notifier.php
@@ -9,19 +9,19 @@
  * Invoice notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class Notifier implements \Magento\Sales\Model\Order\Invoice\NotifierInterface
 {
     /**
      * @var \Magento\Sales\Model\Order\Invoice\SenderInterface[]
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $senders;
 
     /**
      * @param \Magento\Sales\Model\Order\Invoice\SenderInterface[] $senders
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(array $senders = [])
     {
@@ -30,7 +30,7 @@ public function __construct(array $senders = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/NotifierInterface.php b/app/code/Magento/Sales/Model/Order/Invoice/NotifierInterface.php
index b072b6434da92..d0d267a50e61a 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/NotifierInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/NotifierInterface.php
@@ -10,7 +10,7 @@
  * Interface for Invoice notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface NotifierInterface
 {
@@ -23,7 +23,7 @@ interface NotifierInterface
      * @param bool $forceSyncMode
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/PayOperation.php b/app/code/Magento/Sales/Model/Order/Invoice/PayOperation.php
index 5353a18cd1fcc..f8c5b745ad9bd 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/PayOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/PayOperation.php
@@ -7,19 +7,19 @@
 
 /**
  * Invoice pay operation.
- * @since 2.2.0
+ * @since 2.1.2
  */
 class PayOperation
 {
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $eventManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         \Magento\Framework\Model\Context $context
@@ -33,7 +33,7 @@ public function __construct(
      * @param bool $capture
      *
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function execute(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -80,7 +80,7 @@ public function execute(
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface[] $items
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function calculateOrderItemsTotals($items)
     {
@@ -104,7 +104,7 @@ private function calculateOrderItemsTotals($items)
      * @param \Magento\Sales\Api\Data\InvoiceInterface $invoice
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function canCapture(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -122,7 +122,7 @@ private function canCapture(
      * @param \Magento\Sales\Api\Data\InvoiceInterface $invoice
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function calculateOrderTotals(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index 967ec28722db2..310018624b7ab 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -10,31 +10,31 @@
 
 /**
  * Email notification sender for Invoice.
- * @since 2.2.0
+ * @since 2.1.2
  */
 class EmailSender extends Sender implements SenderInterface
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $invoiceResource;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $globalConfig;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $eventManager;
 
@@ -48,7 +48,7 @@ class EmailSender extends Sender implements SenderInterface
      * @param \Magento\Sales\Model\ResourceModel\Order\Invoice $invoiceResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Container\Template $templateContainer,
@@ -92,7 +92,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,7 +145,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/SenderInterface.php b/app/code/Magento/Sales/Model/Order/Invoice/SenderInterface.php
index a5dbb063d45ab..80f1c5d664ea9 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/SenderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/SenderInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface for notification sender for Invoice.
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface SenderInterface
 {
@@ -20,7 +20,7 @@ interface SenderInterface
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
index 650de388f3153..a25890b5bf1ca 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
@@ -9,7 +9,6 @@
  * Base class for invoice total
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTotal
 {
@@ -19,7 +18,6 @@ abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTo
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Cost.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Cost.php
index 2ef2209caff54..19c891885207d 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Cost.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Cost.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Invoice\Total\Cost
  *
- * @since 2.0.0
  */
 class Cost extends AbstractTotal
 {
@@ -17,7 +16,6 @@ class Cost extends AbstractTotal
      *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
index 2a0d7bad6ed1e..7e99b7a812ea9 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Sales\Model\Order\Invoice\Total\Discount
  *
- * @since 2.0.0
  */
 class Discount extends AbstractTotal
 {
     /**
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
index 0ea191dcac136..91bac3936b17e 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Sales\Model\Order\Invoice\Total\Grand
  *
- * @since 2.0.0
  */
 class Grand extends AbstractTotal
 {
     /**
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Shipping.php
index 3465028038411..551cc8c6075a8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Shipping.php
@@ -9,14 +9,12 @@
  * Order invoice shipping total calculation model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends AbstractTotal
 {
     /**
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
index 33c651a4f36b7..f31f5d275b6a9 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Invoice\Total\Subtotal
  *
- * @since 2.0.0
  */
 class Subtotal extends AbstractTotal
 {
@@ -17,7 +16,6 @@ class Subtotal extends AbstractTotal
      *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index 2e0c26f83bb85..6d15e16ab8985 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Invoice\Total\Tax
  *
- * @since 2.0.0
  */
 class Tax extends AbstractTotal
 {
@@ -19,7 +18,6 @@ class Tax extends AbstractTotal
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
@@ -127,7 +125,6 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
      *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return bool
-     * @since 2.0.0
      */
     protected function _canIncludeShipping($invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php b/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
index 5ccf4ef58d16c..c6b3046da97db 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
@@ -15,19 +15,19 @@
 
 /**
  * Class CanRefund
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CanRefund implements ValidatorInterface
 {
     /**
      * @var OrderPaymentRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentRepository;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
@@ -36,7 +36,7 @@ class CanRefund implements ValidatorInterface
      *
      * @param OrderPaymentRepositoryInterface $paymentRepository
      * @param OrderRepositoryInterface $orderRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         OrderPaymentRepositoryInterface $paymentRepository,
@@ -48,7 +48,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($entity)
     {
@@ -65,7 +65,7 @@ public function validate($entity)
     /**
      * @param InvoiceInterface $invoice
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isPaymentAllowRefund(InvoiceInterface $invoice)
     {
@@ -81,7 +81,7 @@ private function isPaymentAllowRefund(InvoiceInterface $invoice)
     /**
      * @param InvoiceInterface $entity
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isGrandTotalEnoughToRefund(InvoiceInterface $entity)
     {
@@ -92,7 +92,7 @@ private function isGrandTotalEnoughToRefund(InvoiceInterface $entity)
      * @param MethodInterface $method
      * @param InfoInterface $payment
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canPartialRefund(MethodInterface $method, InfoInterface $payment)
     {
@@ -105,7 +105,7 @@ private function canPartialRefund(MethodInterface $method, InfoInterface $paymen
      * @param InvoiceInterface $invoice
      * @param MethodInterface $method
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canFullRefund(InvoiceInterface $invoice, MethodInterface $method)
     {
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceDocumentFactory.php b/app/code/Magento/Sales/Model/Order/InvoiceDocumentFactory.php
index 73105726265da..725ede864fa23 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceDocumentFactory.php
@@ -17,20 +17,20 @@
  * Class InvoiceDocumentFactory
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class InvoiceDocumentFactory
 {
     /**
      * @var InvoiceService
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $invoiceService;
 
     /**
      * InvoiceDocumentFactory constructor.
      * @param InvoiceService $invoiceService
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         InvoiceService $invoiceService
@@ -46,7 +46,7 @@ public function __construct(
      * @param InvoiceCreationArgumentsInterface|null $arguments
      * @return InvoiceInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function create(
         OrderInterface $order,
@@ -74,7 +74,7 @@ public function create(
      *
      * @param InvoiceItemCreationInterface[] $items
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function itemsToArray($items = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
index 790525f49a05f..a5005a9afea0b 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
@@ -13,25 +13,21 @@
 /**
  * Class InvoiceNotifier
  * @package Magento\Sales\Model
- * @since 2.0.0
  */
 class InvoiceNotifier extends \Magento\Sales\Model\AbstractNotifier
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $historyCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var InvoiceSender
-     * @since 2.0.0
      */
     protected $sender;
 
@@ -39,7 +35,6 @@ class InvoiceNotifier extends \Magento\Sales\Model\AbstractNotifier
      * @param CollectionFactory $historyCollectionFactory
      * @param Logger $logger
      * @param InvoiceSender $sender
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $historyCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php b/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
index 6984646afa7af..198df5183d7c0 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
@@ -14,20 +14,20 @@
 
 /**
  * Interface InvoiceValidatorInterface
- * @since 2.2.0
+ * @since 2.1.2
  */
 class InvoiceQuantityValidator implements ValidatorInterface
 {
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderRepository;
 
     /**
      * InvoiceValidator constructor.
      * @param OrderRepositoryInterface $orderRepository
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(OrderRepositoryInterface $orderRepository)
     {
@@ -36,7 +36,7 @@ public function __construct(OrderRepositoryInterface $orderRepository)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($invoice)
     {
@@ -53,7 +53,7 @@ public function validate($invoice)
      * @param InvoiceInterface $invoice
      * @param OrderInterface $order
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function checkQtyAvailability(InvoiceInterface $invoice, OrderInterface $order)
     {
@@ -88,7 +88,7 @@ private function checkQtyAvailability(InvoiceInterface $invoice, OrderInterface
     /**
      * @param InvoiceInterface $invoice
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getInvoiceQty(InvoiceInterface $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
index 633d594e22da2..783249037ae1d 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
@@ -14,7 +14,6 @@
 
 /**
  * Class InvoiceRepository
- * @since 2.0.0
  */
 class InvoiceRepository implements InvoiceRepositoryInterface
 {
@@ -22,19 +21,16 @@ class InvoiceRepository implements InvoiceRepositoryInterface
      * \Magento\Sales\Api\Data\InvoiceInterface[]
      *
      * @var array
-     * @since 2.0.0
      */
     protected $registry = [];
 
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory;
 
@@ -49,7 +45,6 @@ class InvoiceRepository implements InvoiceRepositoryInterface
      * @param Metadata $invoiceMetadata
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $invoiceMetadata,
@@ -68,7 +63,6 @@ public function __construct(
      * @return mixed
      * @throws NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -88,7 +82,6 @@ public function get($id)
 
     /**
      * @return \Magento\Sales\Api\Data\InvoiceInterface
-     * @since 2.0.0
      */
     public function create()
     {
@@ -100,7 +93,6 @@ public function create()
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Sales\Api\Data\InvoiceInterface[]
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -116,7 +108,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $entity
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\InvoiceInterface $entity)
     {
@@ -130,7 +121,6 @@ public function delete(\Magento\Sales\Api\Data\InvoiceInterface $entity)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -143,7 +133,6 @@ public function deleteById($id)
      *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $entity
      * @return \Magento\Sales\Api\Data\InvoiceInterface
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\InvoiceInterface $entity)
     {
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceStatisticInterface.php b/app/code/Magento/Sales/Model/Order/InvoiceStatisticInterface.php
index 05f743fa0a9b5..7f26bf5580ca3 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceStatisticInterface.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceStatisticInterface.php
@@ -13,7 +13,7 @@
  * Interface OrderStatisticInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface InvoiceStatisticInterface
 {
@@ -21,7 +21,7 @@ interface InvoiceStatisticInterface
      * @param OrderInterface $order
      * @param InvoiceInterface $invoice
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function register(OrderInterface $order, InvoiceInterface $invoice);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index 39a4098f7d7f3..9afe05bedbc45 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -22,7 +22,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Item extends AbstractModel implements OrderItemInterface
 {
@@ -55,21 +54,16 @@ class Item extends AbstractModel implements OrderItemInterface
 
     // When qty ordered = qty returned // not used at the moment
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    // When qty ordered = qty returned // not used at the moment
     protected $_eventPrefix = 'sales_order_item';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'item';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_statuses = null;
 
@@ -77,31 +71,26 @@ class Item extends AbstractModel implements OrderItemInterface
      * Order instance
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_children = [];
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -128,7 +117,6 @@ class Item extends AbstractModel implements OrderItemInterface
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -163,7 +151,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -175,7 +162,6 @@ protected function _construct()
      *
      * @param Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function setParentItem($item)
     {
@@ -191,7 +177,6 @@ public function setParentItem($item)
      * Get parent item
      *
      * @return OrderItemInterface|null
-     * @since 2.0.0
      */
     public function getParentItem()
     {
@@ -202,7 +187,6 @@ public function getParentItem()
      * Check item invoice availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canInvoice()
     {
@@ -213,7 +197,6 @@ public function canInvoice()
      * Check item ship availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShip()
     {
@@ -224,7 +207,6 @@ public function canShip()
      * Check item refund availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -235,7 +217,6 @@ public function canRefund()
      * Retrieve item qty available for ship
      *
      * @return float|integer
-     * @since 2.0.0
      */
     public function getQtyToShip()
     {
@@ -250,7 +231,6 @@ public function getQtyToShip()
      * Retrieve item qty available for ship
      *
      * @return float|integer
-     * @since 2.0.0
      */
     public function getSimpleQtyToShip()
     {
@@ -262,7 +242,6 @@ public function getSimpleQtyToShip()
      * Retrieve item qty available for invoice
      *
      * @return float|integer
-     * @since 2.0.0
      */
     public function getQtyToInvoice()
     {
@@ -278,7 +257,6 @@ public function getQtyToInvoice()
      * Retrieve item qty available for refund
      *
      * @return float|integer
-     * @since 2.0.0
      */
     public function getQtyToRefund()
     {
@@ -293,7 +271,6 @@ public function getQtyToRefund()
      * Retrieve item qty available for cancel
      *
      * @return float|integer
-     * @since 2.0.0
      */
     public function getQtyToCancel()
     {
@@ -306,7 +283,6 @@ public function getQtyToCancel()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -319,7 +295,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      * Retrieve order model object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -337,7 +312,6 @@ public function getOrder()
      * @return int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getStatusId()
     {
@@ -387,7 +361,6 @@ public function getStatusId()
      * Retrieve backordered qty of children items
      *
      * @return float|null
-     * @since 2.0.0
      */
     protected function _getQtyChildrenBackordered()
     {
@@ -403,7 +376,6 @@ protected function _getQtyChildrenBackordered()
      * Retrieve status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -415,7 +387,6 @@ public function getStatus()
      *
      * @param string $statusId
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public static function getStatusName($statusId)
     {
@@ -432,7 +403,6 @@ public static function getStatusName($statusId)
      * Cancel order item
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -454,7 +424,6 @@ public function cancel()
      * Retrieve order item statuses array
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getStatuses()
     {
@@ -478,7 +447,6 @@ public static function getStatuses()
      * Redeclare getter for back compatibility
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getOriginalPrice()
     {
@@ -494,7 +462,6 @@ public function getOriginalPrice()
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setProductOptions(array $options = null)
     {
@@ -506,7 +473,6 @@ public function setProductOptions(array $options = null)
      * Get product options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductOptions()
     {
@@ -523,7 +489,6 @@ public function getProductOptions()
      *
      * @param string $code
      * @return array
-     * @since 2.0.0
      */
     public function getProductOptionByCode($code = null)
     {
@@ -541,7 +506,6 @@ public function getProductOptionByCode($code = null)
      * Return real product type of item or NULL if item is not composite
      *
      * @return string | null
-     * @since 2.0.0
      */
     public function getRealProductType()
     {
@@ -557,7 +521,6 @@ public function getRealProductType()
      *
      * @param Item $item
      * @return void
-     * @since 2.0.0
      */
     public function addChildItem($item)
     {
@@ -572,7 +535,6 @@ public function addChildItem($item)
      * Return children items of this item
      *
      * @return array
-     * @since 2.0.0
      */
     public function getChildrenItems()
     {
@@ -584,7 +546,6 @@ public function getChildrenItems()
      * type was for this product
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isChildrenCalculated()
     {
@@ -609,7 +570,6 @@ public function isChildrenCalculated()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getForceApplyDiscountToParentItem()
     {
@@ -627,7 +587,6 @@ public function getForceApplyDiscountToParentItem()
      * type was for this product
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShipSeparately()
     {
@@ -655,7 +614,6 @@ public function isShipSeparately()
      * @param bool $shipment
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isDummy($shipment = false)
     {
@@ -700,7 +658,6 @@ public function isDummy($shipment = false)
      * product view page with keys and options for configured product
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getBuyRequest()
     {
@@ -717,7 +674,6 @@ public function getBuyRequest()
      * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product|null
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -736,7 +692,6 @@ public function getProduct()
      * Retrieve store model instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -753,7 +708,6 @@ public function getStore()
      * Returns additional_data
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -764,7 +718,6 @@ public function getAdditionalData()
      * Returns amount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getAmountRefunded()
     {
@@ -775,7 +728,6 @@ public function getAmountRefunded()
      * Returns applied_rule_ids
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAppliedRuleIds()
     {
@@ -786,7 +738,6 @@ public function getAppliedRuleIds()
      * Returns base_amount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseAmountRefunded()
     {
@@ -797,7 +748,6 @@ public function getBaseAmountRefunded()
      * Returns base_cost
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseCost()
     {
@@ -808,7 +758,6 @@ public function getBaseCost()
      * Returns base_discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountAmount()
     {
@@ -819,7 +768,6 @@ public function getBaseDiscountAmount()
      * Returns base_discount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountInvoiced()
     {
@@ -830,7 +778,6 @@ public function getBaseDiscountInvoiced()
      * Returns base_discount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountRefunded()
     {
@@ -841,7 +788,6 @@ public function getBaseDiscountRefunded()
      * Returns base_discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationAmount()
     {
@@ -852,7 +798,6 @@ public function getBaseDiscountTaxCompensationAmount()
      * Returns base_discount_tax_compensation_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationInvoiced()
     {
@@ -863,7 +808,6 @@ public function getBaseDiscountTaxCompensationInvoiced()
      * Returns base_discount_tax_compensation_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseDiscountTaxCompensationRefunded()
     {
@@ -874,7 +818,6 @@ public function getBaseDiscountTaxCompensationRefunded()
      * Returns base_original_price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseOriginalPrice()
     {
@@ -885,7 +828,6 @@ public function getBaseOriginalPrice()
      * Returns base_price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBasePrice()
     {
@@ -896,7 +838,6 @@ public function getBasePrice()
      * Returns base_price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBasePriceInclTax()
     {
@@ -907,7 +848,6 @@ public function getBasePriceInclTax()
      * Returns base_row_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowInvoiced()
     {
@@ -918,7 +858,6 @@ public function getBaseRowInvoiced()
      * Returns base_row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotal()
     {
@@ -929,7 +868,6 @@ public function getBaseRowTotal()
      * Returns base_row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseRowTotalInclTax()
     {
@@ -940,7 +878,6 @@ public function getBaseRowTotalInclTax()
      * Returns base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxAmount()
     {
@@ -951,7 +888,6 @@ public function getBaseTaxAmount()
      * Returns base_tax_before_discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxBeforeDiscount()
     {
@@ -962,7 +898,6 @@ public function getBaseTaxBeforeDiscount()
      * Returns base_tax_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxInvoiced()
     {
@@ -973,7 +908,6 @@ public function getBaseTaxInvoiced()
      * Returns base_tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseTaxRefunded()
     {
@@ -984,7 +918,6 @@ public function getBaseTaxRefunded()
      * Returns base_weee_tax_applied_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedAmount()
     {
@@ -995,7 +928,6 @@ public function getBaseWeeeTaxAppliedAmount()
      * Returns base_weee_tax_applied_row_amnt
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAppliedRowAmnt()
     {
@@ -1006,7 +938,6 @@ public function getBaseWeeeTaxAppliedRowAmnt()
      * Returns base_weee_tax_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxDisposition()
     {
@@ -1017,7 +948,6 @@ public function getBaseWeeeTaxDisposition()
      * Returns base_weee_tax_row_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxRowDisposition()
     {
@@ -1028,7 +958,6 @@ public function getBaseWeeeTaxRowDisposition()
      * Returns created_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -1037,7 +966,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -1048,7 +976,6 @@ public function setCreatedAt($createdAt)
      * Returns description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -1059,7 +986,6 @@ public function getDescription()
      * Returns discount_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -1070,7 +996,6 @@ public function getDiscountAmount()
      * Returns discount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountInvoiced()
     {
@@ -1081,7 +1006,6 @@ public function getDiscountInvoiced()
      * Returns discount_percent
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountPercent()
     {
@@ -1092,7 +1016,6 @@ public function getDiscountPercent()
      * Returns discount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountRefunded()
     {
@@ -1103,7 +1026,6 @@ public function getDiscountRefunded()
      * Returns event_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getEventId()
     {
@@ -1114,7 +1036,6 @@ public function getEventId()
      * Returns ext_order_item_id
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getExtOrderItemId()
     {
@@ -1125,7 +1046,6 @@ public function getExtOrderItemId()
      * Returns free_shipping
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getFreeShipping()
     {
@@ -1136,7 +1056,6 @@ public function getFreeShipping()
      * Returns gw_base_price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBasePrice()
     {
@@ -1147,7 +1066,6 @@ public function getGwBasePrice()
      * Returns gw_base_price_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBasePriceInvoiced()
     {
@@ -1158,7 +1076,6 @@ public function getGwBasePriceInvoiced()
      * Returns gw_base_price_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBasePriceRefunded()
     {
@@ -1169,7 +1086,6 @@ public function getGwBasePriceRefunded()
      * Returns gw_base_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmount()
     {
@@ -1180,7 +1096,6 @@ public function getGwBaseTaxAmount()
      * Returns gw_base_tax_amount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmountInvoiced()
     {
@@ -1191,7 +1106,6 @@ public function getGwBaseTaxAmountInvoiced()
      * Returns gw_base_tax_amount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwBaseTaxAmountRefunded()
     {
@@ -1202,7 +1116,6 @@ public function getGwBaseTaxAmountRefunded()
      * Returns gw_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getGwId()
     {
@@ -1213,7 +1126,6 @@ public function getGwId()
      * Returns gw_price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwPrice()
     {
@@ -1224,7 +1136,6 @@ public function getGwPrice()
      * Returns gw_price_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwPriceInvoiced()
     {
@@ -1235,7 +1146,6 @@ public function getGwPriceInvoiced()
      * Returns gw_price_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwPriceRefunded()
     {
@@ -1246,7 +1156,6 @@ public function getGwPriceRefunded()
      * Returns gw_tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwTaxAmount()
     {
@@ -1257,7 +1166,6 @@ public function getGwTaxAmount()
      * Returns gw_tax_amount_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwTaxAmountInvoiced()
     {
@@ -1268,7 +1176,6 @@ public function getGwTaxAmountInvoiced()
      * Returns gw_tax_amount_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getGwTaxAmountRefunded()
     {
@@ -1279,7 +1186,6 @@ public function getGwTaxAmountRefunded()
      * Returns discount_tax_compensation_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -1290,7 +1196,6 @@ public function getDiscountTaxCompensationAmount()
      * Returns discount_tax_compensation_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationCanceled()
     {
@@ -1301,7 +1206,6 @@ public function getDiscountTaxCompensationCanceled()
      * Returns discount_tax_compensation_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationInvoiced()
     {
@@ -1312,7 +1216,6 @@ public function getDiscountTaxCompensationInvoiced()
      * Returns discount_tax_compensation_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationRefunded()
     {
@@ -1323,7 +1226,6 @@ public function getDiscountTaxCompensationRefunded()
      * Returns is_qty_decimal
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getIsQtyDecimal()
     {
@@ -1334,7 +1236,6 @@ public function getIsQtyDecimal()
      * Returns is_virtual
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getIsVirtual()
     {
@@ -1345,7 +1246,6 @@ public function getIsVirtual()
      * Returns item_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getItemId()
     {
@@ -1356,7 +1256,6 @@ public function getItemId()
      * Returns locked_do_invoice
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getLockedDoInvoice()
     {
@@ -1367,7 +1266,6 @@ public function getLockedDoInvoice()
      * Returns locked_do_ship
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getLockedDoShip()
     {
@@ -1378,7 +1276,6 @@ public function getLockedDoShip()
      * Returns name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -1389,7 +1286,6 @@ public function getName()
      * Returns no_discount
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getNoDiscount()
     {
@@ -1400,7 +1296,6 @@ public function getNoDiscount()
      * Returns order_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -1411,7 +1306,6 @@ public function getOrderId()
      * Returns parent_item_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getParentItemId()
     {
@@ -1422,7 +1316,6 @@ public function getParentItemId()
      * Returns price
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -1433,7 +1326,6 @@ public function getPrice()
      * Returns price_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -1444,7 +1336,6 @@ public function getPriceInclTax()
      * Returns product_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -1455,7 +1346,6 @@ public function getProductId()
      * Returns product_type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getProductType()
     {
@@ -1466,7 +1356,6 @@ public function getProductType()
      * Returns qty_backordered
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyBackordered()
     {
@@ -1477,7 +1366,6 @@ public function getQtyBackordered()
      * Returns qty_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyCanceled()
     {
@@ -1488,7 +1376,6 @@ public function getQtyCanceled()
      * Returns qty_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyInvoiced()
     {
@@ -1499,7 +1386,6 @@ public function getQtyInvoiced()
      * Returns qty_ordered
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyOrdered()
     {
@@ -1510,7 +1396,6 @@ public function getQtyOrdered()
      * Returns qty_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyRefunded()
     {
@@ -1521,7 +1406,6 @@ public function getQtyRefunded()
      * Returns qty_returned
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyReturned()
     {
@@ -1532,7 +1416,6 @@ public function getQtyReturned()
      * Returns qty_shipped
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getQtyShipped()
     {
@@ -1543,7 +1426,6 @@ public function getQtyShipped()
      * Returns quote_item_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getQuoteItemId()
     {
@@ -1554,7 +1436,6 @@ public function getQuoteItemId()
      * Returns row_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowInvoiced()
     {
@@ -1565,7 +1446,6 @@ public function getRowInvoiced()
      * Returns row_total
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -1576,7 +1456,6 @@ public function getRowTotal()
      * Returns row_total_incl_tax
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowTotalInclTax()
     {
@@ -1587,7 +1466,6 @@ public function getRowTotalInclTax()
      * Returns row_weight
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getRowWeight()
     {
@@ -1598,7 +1476,6 @@ public function getRowWeight()
      * Returns sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -1609,7 +1486,6 @@ public function getSku()
      * Returns store_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -1620,7 +1496,6 @@ public function getStoreId()
      * Returns tax_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -1631,7 +1506,6 @@ public function getTaxAmount()
      * Returns tax_before_discount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxBeforeDiscount()
     {
@@ -1642,7 +1516,6 @@ public function getTaxBeforeDiscount()
      * Returns tax_canceled
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxCanceled()
     {
@@ -1653,7 +1526,6 @@ public function getTaxCanceled()
      * Returns tax_invoiced
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxInvoiced()
     {
@@ -1664,7 +1536,6 @@ public function getTaxInvoiced()
      * Returns tax_percent
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxPercent()
     {
@@ -1675,7 +1546,6 @@ public function getTaxPercent()
      * Returns tax_refunded
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTaxRefunded()
     {
@@ -1686,7 +1556,6 @@ public function getTaxRefunded()
      * Returns updated_at
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -1697,7 +1566,6 @@ public function getUpdatedAt()
      * Returns weee_tax_applied
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getWeeeTaxApplied()
     {
@@ -1708,7 +1576,6 @@ public function getWeeeTaxApplied()
      * Returns weee_tax_applied_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount()
     {
@@ -1719,7 +1586,6 @@ public function getWeeeTaxAppliedAmount()
      * Returns weee_tax_applied_row_amount
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedRowAmount()
     {
@@ -1730,7 +1596,6 @@ public function getWeeeTaxAppliedRowAmount()
      * Returns weee_tax_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxDisposition()
     {
@@ -1741,7 +1606,6 @@ public function getWeeeTaxDisposition()
      * Returns weee_tax_row_disposition
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeeeTaxRowDisposition()
     {
@@ -1752,7 +1616,6 @@ public function getWeeeTaxRowDisposition()
      * Returns weight
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getWeight()
     {
@@ -1761,7 +1624,6 @@ public function getWeight()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1770,7 +1632,6 @@ public function setUpdatedAt($timestamp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItemId($id)
     {
@@ -1779,7 +1640,6 @@ public function setItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -1788,7 +1648,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentItemId($id)
     {
@@ -1797,7 +1656,6 @@ public function setParentItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuoteItemId($id)
     {
@@ -1806,7 +1664,6 @@ public function setQuoteItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($id)
     {
@@ -1815,7 +1672,6 @@ public function setStoreId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductId($id)
     {
@@ -1824,7 +1680,6 @@ public function setProductId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductType($productType)
     {
@@ -1833,7 +1688,6 @@ public function setProductType($productType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeight($weight)
     {
@@ -1842,7 +1696,6 @@ public function setWeight($weight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVirtual($isVirtual)
     {
@@ -1851,7 +1704,6 @@ public function setIsVirtual($isVirtual)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -1860,7 +1712,6 @@ public function setSku($sku)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -1869,7 +1720,6 @@ public function setName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -1878,7 +1728,6 @@ public function setDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAppliedRuleIds($appliedRuleIds)
     {
@@ -1887,7 +1736,6 @@ public function setAppliedRuleIds($appliedRuleIds)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -1896,7 +1744,6 @@ public function setAdditionalData($additionalData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsQtyDecimal($isQtyDecimal)
     {
@@ -1905,7 +1752,6 @@ public function setIsQtyDecimal($isQtyDecimal)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setNoDiscount($noDiscount)
     {
@@ -1914,7 +1760,6 @@ public function setNoDiscount($noDiscount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyBackordered($qtyBackordered)
     {
@@ -1923,7 +1768,6 @@ public function setQtyBackordered($qtyBackordered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyCanceled($qtyCanceled)
     {
@@ -1932,7 +1776,6 @@ public function setQtyCanceled($qtyCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyInvoiced($qtyInvoiced)
     {
@@ -1941,7 +1784,6 @@ public function setQtyInvoiced($qtyInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyOrdered($qtyOrdered)
     {
@@ -1950,7 +1792,6 @@ public function setQtyOrdered($qtyOrdered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyRefunded($qtyRefunded)
     {
@@ -1959,7 +1800,6 @@ public function setQtyRefunded($qtyRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyShipped($qtyShipped)
     {
@@ -1968,7 +1808,6 @@ public function setQtyShipped($qtyShipped)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseCost($baseCost)
     {
@@ -1977,7 +1816,6 @@ public function setBaseCost($baseCost)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -1986,7 +1824,6 @@ public function setPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePrice($price)
     {
@@ -1995,7 +1832,6 @@ public function setBasePrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOriginalPrice($price)
     {
@@ -2004,7 +1840,6 @@ public function setOriginalPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseOriginalPrice($price)
     {
@@ -2013,7 +1848,6 @@ public function setBaseOriginalPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent)
     {
@@ -2022,7 +1856,6 @@ public function setTaxPercent($taxPercent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxAmount($amount)
     {
@@ -2031,7 +1864,6 @@ public function setTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxAmount($amount)
     {
@@ -2040,7 +1872,6 @@ public function setBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxInvoiced($taxInvoiced)
     {
@@ -2049,7 +1880,6 @@ public function setTaxInvoiced($taxInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced)
     {
@@ -2058,7 +1888,6 @@ public function setBaseTaxInvoiced($baseTaxInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountPercent($discountPercent)
     {
@@ -2067,7 +1896,6 @@ public function setDiscountPercent($discountPercent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountAmount($amount)
     {
@@ -2076,7 +1904,6 @@ public function setDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -2085,7 +1912,6 @@ public function setBaseDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountInvoiced($discountInvoiced)
     {
@@ -2094,7 +1920,6 @@ public function setDiscountInvoiced($discountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     {
@@ -2103,7 +1928,6 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountRefunded($amountRefunded)
     {
@@ -2112,7 +1936,6 @@ public function setAmountRefunded($amountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountRefunded($baseAmountRefunded)
     {
@@ -2121,7 +1944,6 @@ public function setBaseAmountRefunded($baseAmountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotal($amount)
     {
@@ -2130,7 +1952,6 @@ public function setRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotal($amount)
     {
@@ -2139,7 +1960,6 @@ public function setBaseRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowInvoiced($rowInvoiced)
     {
@@ -2148,7 +1968,6 @@ public function setRowInvoiced($rowInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowInvoiced($baseRowInvoiced)
     {
@@ -2157,7 +1976,6 @@ public function setBaseRowInvoiced($baseRowInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowWeight($rowWeight)
     {
@@ -2166,7 +1984,6 @@ public function setRowWeight($rowWeight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount)
     {
@@ -2175,7 +1992,6 @@ public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxBeforeDiscount($taxBeforeDiscount)
     {
@@ -2184,7 +2000,6 @@ public function setTaxBeforeDiscount($taxBeforeDiscount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtOrderItemId($id)
     {
@@ -2193,7 +2008,6 @@ public function setExtOrderItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLockedDoInvoice($flag)
     {
@@ -2202,7 +2016,6 @@ public function setLockedDoInvoice($flag)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLockedDoShip($flag)
     {
@@ -2211,7 +2024,6 @@ public function setLockedDoShip($flag)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPriceInclTax($amount)
     {
@@ -2220,7 +2032,6 @@ public function setPriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBasePriceInclTax($amount)
     {
@@ -2229,7 +2040,6 @@ public function setBasePriceInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($amount)
     {
@@ -2238,7 +2048,6 @@ public function setRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseRowTotalInclTax($amount)
     {
@@ -2247,7 +2056,6 @@ public function setBaseRowTotalInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -2256,7 +2064,6 @@ public function setDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -2265,7 +2072,6 @@ public function setBaseDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
     {
@@ -2274,7 +2080,6 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
     {
@@ -2286,7 +2091,6 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
     {
@@ -2295,7 +2099,6 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
     {
@@ -2307,7 +2110,6 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxCanceled($taxCanceled)
     {
@@ -2316,7 +2118,6 @@ public function setTaxCanceled($taxCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationCanceled($discountTaxCompensationCanceled)
     {
@@ -2325,7 +2126,6 @@ public function setDiscountTaxCompensationCanceled($discountTaxCompensationCance
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTaxRefunded($taxRefunded)
     {
@@ -2334,7 +2134,6 @@ public function setTaxRefunded($taxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseTaxRefunded($baseTaxRefunded)
     {
@@ -2343,7 +2142,6 @@ public function setBaseTaxRefunded($baseTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDiscountRefunded($discountRefunded)
     {
@@ -2352,7 +2150,6 @@ public function setDiscountRefunded($discountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded)
     {
@@ -2361,7 +2158,6 @@ public function setBaseDiscountRefunded($baseDiscountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwId($id)
     {
@@ -2370,7 +2166,6 @@ public function setGwId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBasePrice($price)
     {
@@ -2379,7 +2174,6 @@ public function setGwBasePrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwPrice($price)
     {
@@ -2388,7 +2182,6 @@ public function setGwPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmount($amount)
     {
@@ -2397,7 +2190,6 @@ public function setGwBaseTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwTaxAmount($amount)
     {
@@ -2406,7 +2198,6 @@ public function setGwTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBasePriceInvoiced($gwBasePriceInvoiced)
     {
@@ -2415,7 +2206,6 @@ public function setGwBasePriceInvoiced($gwBasePriceInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwPriceInvoiced($gwPriceInvoiced)
     {
@@ -2424,7 +2214,6 @@ public function setGwPriceInvoiced($gwPriceInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced)
     {
@@ -2433,7 +2222,6 @@ public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced)
     {
@@ -2442,7 +2230,6 @@ public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBasePriceRefunded($gwBasePriceRefunded)
     {
@@ -2451,7 +2238,6 @@ public function setGwBasePriceRefunded($gwBasePriceRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwPriceRefunded($gwPriceRefunded)
     {
@@ -2460,7 +2246,6 @@ public function setGwPriceRefunded($gwPriceRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded)
     {
@@ -2469,7 +2254,6 @@ public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGwTaxAmountRefunded($gwTaxAmountRefunded)
     {
@@ -2478,7 +2262,6 @@ public function setGwTaxAmountRefunded($gwTaxAmountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFreeShipping($freeShipping)
     {
@@ -2487,7 +2270,6 @@ public function setFreeShipping($freeShipping)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQtyReturned($qtyReturned)
     {
@@ -2496,7 +2278,6 @@ public function setQtyReturned($qtyReturned)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEventId($id)
     {
@@ -2505,7 +2286,6 @@ public function setEventId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedAmount($amount)
     {
@@ -2514,7 +2294,6 @@ public function setBaseWeeeTaxAppliedAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     {
@@ -2523,7 +2302,6 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedAmount($amount)
     {
@@ -2532,7 +2310,6 @@ public function setWeeeTaxAppliedAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxAppliedRowAmount($amount)
     {
@@ -2541,7 +2318,6 @@ public function setWeeeTaxAppliedRowAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxApplied($weeeTaxApplied)
     {
@@ -2550,7 +2326,6 @@ public function setWeeeTaxApplied($weeeTaxApplied)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition)
     {
@@ -2559,7 +2334,6 @@ public function setWeeeTaxDisposition($weeeTaxDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     {
@@ -2568,7 +2342,6 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     {
@@ -2577,7 +2350,6 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     {
@@ -2586,7 +2358,6 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductOption()
     {
@@ -2595,7 +2366,6 @@ public function getProductOption()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterface $productOption)
     {
@@ -2606,7 +2376,6 @@ public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterfac
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\OrderItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -2618,7 +2387,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
index 92e54a342dc5c..d26a1b6a09cd8 100644
--- a/app/code/Magento/Sales/Model/Order/ItemRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ItemRepository.php
@@ -23,49 +23,41 @@
 /**
  * Repository class for @see OrderItemInterface
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ItemRepository implements OrderItemRepositoryInterface
 {
     /**
      * @var DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var OrderItemSearchResultInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory;
 
     /**
      * @var ProductOptionFactory
-     * @since 2.0.0
      */
     protected $productOptionFactory;
 
     /**
      * @var ProductOptionExtensionFactory
-     * @since 2.0.0
      */
     protected $extensionFactory;
 
     /**
      * @var ProductOptionProcessorInterface[]
-     * @since 2.0.0
      */
     protected $processorPool;
 
     /**
      * @var OrderItemInterface[]
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -84,7 +76,6 @@ class ItemRepository implements OrderItemRepositoryInterface
      * @param ProductOptionExtensionFactory $extensionFactory
      * @param array $processorPool
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectFactory $objectFactory,
@@ -111,7 +102,6 @@ public function __construct(
      * @return OrderItemInterface
      * @throws InputException
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -136,7 +126,6 @@ public function get($id)
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @return OrderItemInterface[]
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -157,7 +146,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      *
      * @param OrderItemInterface $entity
      * @return bool
-     * @since 2.0.0
      */
     public function delete(OrderItemInterface $entity)
     {
@@ -171,7 +159,6 @@ public function delete(OrderItemInterface $entity)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -184,7 +171,6 @@ public function deleteById($id)
      *
      * @param OrderItemInterface $entity
      * @return OrderItemInterface
-     * @since 2.0.0
      */
     public function save(OrderItemInterface $entity)
     {
@@ -203,7 +189,6 @@ public function save(OrderItemInterface $entity)
      *
      * @param OrderItemInterface $orderItem
      * @return $this
-     * @since 2.0.0
      */
     protected function addProductOption(OrderItemInterface $orderItem)
     {
@@ -236,7 +221,6 @@ protected function addProductOption(OrderItemInterface $orderItem)
      * @param OrderItemInterface $orderItem
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function setProductOption(OrderItemInterface $orderItem, array $data)
     {
@@ -262,7 +246,6 @@ protected function setProductOption(OrderItemInterface $orderItem, array $data)
      *
      * @param OrderItemInterface $entity
      * @return DataObject
-     * @since 2.0.0
      */
     protected function getBuyRequest(OrderItemInterface $entity)
     {
diff --git a/app/code/Magento/Sales/Model/Order/OrderStateResolverInterface.php b/app/code/Magento/Sales/Model/Order/OrderStateResolverInterface.php
index da7ab87ef3695..9d01c91fce9e5 100644
--- a/app/code/Magento/Sales/Model/Order/OrderStateResolverInterface.php
+++ b/app/code/Magento/Sales/Model/Order/OrderStateResolverInterface.php
@@ -12,7 +12,7 @@
  * Interface OrderStateResolverInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface OrderStateResolverInterface
 {
@@ -23,7 +23,7 @@ interface OrderStateResolverInterface
      * @param OrderInterface $order
      * @param array $arguments
      * @return string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getStateForOrder(OrderInterface $order, array $arguments = []);
 }
diff --git a/app/code/Magento/Sales/Model/Order/OrderValidator.php b/app/code/Magento/Sales/Model/Order/OrderValidator.php
index df813ff2c091c..91de2354dad02 100644
--- a/app/code/Magento/Sales/Model/Order/OrderValidator.php
+++ b/app/code/Magento/Sales/Model/Order/OrderValidator.php
@@ -10,20 +10,20 @@
 
 /**
  * Class OrderValidator
- * @since 2.2.0
+ * @since 2.1.2
  */
 class OrderValidator implements OrderValidatorInterface
 {
     /**
      * @var \Magento\Sales\Model\Validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $validator;
 
     /**
      * OrderValidator constructor.
      * @param \Magento\Sales\Model\Validator $validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(\Magento\Sales\Model\Validator $validator)
     {
@@ -32,7 +32,7 @@ public function __construct(\Magento\Sales\Model\Validator $validator)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(OrderInterface $entity, array $validators)
     {
diff --git a/app/code/Magento/Sales/Model/Order/OrderValidatorInterface.php b/app/code/Magento/Sales/Model/Order/OrderValidatorInterface.php
index 234ddf4e44816..9cc261dc98434 100644
--- a/app/code/Magento/Sales/Model/Order/OrderValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/Order/OrderValidatorInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * Interface OrderValidatorInterface
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface OrderValidatorInterface
 {
@@ -21,7 +21,7 @@ interface OrderValidatorInterface
      * @param ValidatorInterface[] $validators
      * @return ValidatorResultInterface
      * @throws DocumentValidationException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(OrderInterface $entity, array $validators);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 02760f03b6dd0..6c8a8771ad660 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -27,7 +27,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Payment extends Info implements OrderPaymentInterface
 {
@@ -48,26 +47,22 @@ class Payment extends Info implements OrderPaymentInterface
      * Order model object
      *
      * @var Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * Whether can void
      * @var string
-     * @since 2.0.0
      */
     protected $_canVoidLookup = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_payment';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'payment';
 
@@ -75,49 +70,41 @@ class Payment extends Info implements OrderPaymentInterface
      * Transaction additional information container
      *
      * @var array
-     * @since 2.0.0
      */
     protected $transactionAdditionalInfo = [];
 
     /**
      * @var \Magento\Sales\Model\Order\CreditmemoFactory
-     * @since 2.0.0
      */
     protected $creditmemoFactory;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Sales\Api\TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
     /**
      * @var \Magento\Sales\Model\Order\Payment\Transaction\ManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface
-     * @since 2.0.0
      */
     protected $transactionBuilder;
 
     /**
      * @var Payment\Processor
-     * @since 2.0.0
      */
     protected $orderPaymentProcessor;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
@@ -152,7 +139,6 @@ class Payment extends Info implements OrderPaymentInterface
      * @param array $data
      * @param CreditmemoManager $creditmemoManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -198,7 +184,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -212,7 +197,6 @@ protected function _construct()
      *
      * @param Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(Order $order)
     {
@@ -225,7 +209,6 @@ public function setOrder(Order $order)
      *
      * @codeCoverageIgnore
      * @return Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -241,7 +224,6 @@ public function getOrder()
      *
      * @param string $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId)
     {
@@ -253,7 +235,6 @@ public function setTransactionId($transactionId)
      * Return transaction id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTransactionId()
     {
@@ -265,7 +246,6 @@ public function getTransactionId()
      *
      * @param bool $isClosed
      * @return $this
-     * @since 2.0.0
      */
     public function setIsTransactionClosed($isClosed)
     {
@@ -277,7 +257,6 @@ public function setIsTransactionClosed($isClosed)
      * Returns transaction parent
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTransactionId()
     {
@@ -299,7 +278,6 @@ public function setParentTransactionId($txnId)
      * Check order payment capture action availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCapture()
     {
@@ -323,7 +301,6 @@ public function canCapture()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canRefund()
     {
@@ -332,7 +309,6 @@ public function canRefund()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canRefundPartialPerInvoice()
     {
@@ -341,7 +317,6 @@ public function canRefundPartialPerInvoice()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canCapturePartial()
     {
@@ -355,7 +330,6 @@ public function canCapturePartial()
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function place()
     {
@@ -420,7 +394,6 @@ public function place()
      * @param string $orderStatus
      * @param bool $isCustomerNotified
      * @return void
-     * @since 2.0.0
      */
     protected function updateOrder(Order $order, $orderState, $orderStatus, $isCustomerNotified)
     {
@@ -453,7 +426,6 @@ protected function updateOrder(Order $order, $orderState, $orderStatus, $isCusto
      * @param string $action
      * @param Order $order
      * @return void
-     * @since 2.0.0
      */
     protected function processAction($action, Order $order)
     {
@@ -488,7 +460,6 @@ protected function processAction($action, Order $order)
      * @param null|Invoice $invoice
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function capture($invoice = null)
     {
@@ -505,7 +476,6 @@ public function capture($invoice = null)
      * @param float $amount
      * @param bool $skipFraudDetection
      * @return $this
-     * @since 2.0.0
      */
     public function registerCaptureNotification($amount, $skipFraudDetection = false)
     {
@@ -518,7 +488,6 @@ public function registerCaptureNotification($amount, $skipFraudDetection = false
      * @param float $amount
      * @return $this
      * @see self::_authorize()
-     * @since 2.0.0
      */
     public function registerAuthorizationNotification($amount)
     {
@@ -530,7 +499,6 @@ public function registerAuthorizationNotification($amount)
      *
      * @param Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function pay($invoice)
     {
@@ -551,7 +519,6 @@ public function pay($invoice)
      *
      * @param Invoice $invoice
      * @return $this
-     * @since 2.0.0
      */
     public function cancelInvoice($invoice)
     {
@@ -575,7 +542,6 @@ public function cancelInvoice($invoice)
      * register this invoice and capture
      *
      * @return Invoice
-     * @since 2.0.0
      */
     protected function _invoice()
     {
@@ -594,7 +560,6 @@ protected function _invoice()
      * Check order payment void availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canVoid()
     {
@@ -614,7 +579,6 @@ public function canVoid()
      * @param \Magento\Framework\DataObject $document
      * @return $this
      * @see self::_void()
-     * @since 2.0.0
      */
     public function void(\Magento\Framework\DataObject $document)
     {
@@ -629,7 +593,6 @@ public function void(\Magento\Framework\DataObject $document)
      * @param float $amount
      * @return $this
      * @see self::_void()
-     * @since 2.0.0
      */
     public function registerVoidNotification($amount = null)
     {
@@ -644,7 +607,6 @@ public function registerVoidNotification($amount = null)
      *
      * @param Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemo(Creditmemo $creditmemo)
     {
@@ -656,7 +618,6 @@ public function setCreditmemo(Creditmemo $creditmemo)
      * Returns Creditmemo assigned for this payment
      *
      * @return Creditmemo|null
-     * @since 2.0.0
      */
     public function getCreditmemo()
     {
@@ -676,7 +637,6 @@ public function getCreditmemo()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function refund($creditmemo)
     {
@@ -782,7 +742,6 @@ public function refund($creditmemo)
      * @param float $amount
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function registerRefundNotification($amount)
     {
@@ -859,7 +818,6 @@ public function registerRefundNotification($amount)
      *
      * @param Creditmemo $creditmemo
      * @return $this
-     * @since 2.0.0
      */
     public function cancelCreditmemo($creditmemo)
     {
@@ -883,7 +841,6 @@ public function cancelCreditmemo($creditmemo)
      * Adds void transaction if needed
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cancel()
     {
@@ -909,7 +866,6 @@ public function cancel()
      * Check order payment review availability
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canReviewPayment()
     {
@@ -918,7 +874,6 @@ public function canReviewPayment()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canFetchTransactionInfo()
     {
@@ -929,7 +884,6 @@ public function canFetchTransactionInfo()
      * Accept online a payment that is in review state
      *
      * @return $this
-     * @since 2.0.0
      */
     public function accept()
     {
@@ -962,7 +916,6 @@ public function accept()
      * @param bool $isOnline
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deny($isOnline = true)
     {
@@ -1003,7 +956,6 @@ public function deny($isOnline = true)
      * @param bool $isOnline
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function update($isOnline = true)
     {
@@ -1044,7 +996,6 @@ public function update($isOnline = true)
      * Triggers invoice pay and updates base_amount_paid_online total.
      *
      * @param \Magento\Sales\Model\Order\Invoice|false $invoice
-     * @since 2.0.0
      */
     protected function updateBaseAmountPaidOnlineTotal($invoice)
     {
@@ -1059,7 +1010,6 @@ protected function updateBaseAmountPaidOnlineTotal($invoice)
      * Sets order state to 'processing' with appropriate message
      *
      * @param \Magento\Framework\Phrase|string $message
-     * @since 2.0.0
      */
     protected function setOrderStateProcessing($message)
     {
@@ -1073,7 +1023,6 @@ protected function setOrderStateProcessing($message)
      *
      * @param Invoice|false $invoice
      * @param string $message
-     * @since 2.0.0
      */
     protected function cancelInvoiceAndRegisterCancellation($invoice, $message)
     {
@@ -1089,7 +1038,6 @@ protected function cancelInvoiceAndRegisterCancellation($invoice, $message)
      *
      * @param string $message
      * @param int|null $transactionId
-     * @since 2.0.0
      */
     protected function setOrderStatePaymentReview($message, $transactionId)
     {
@@ -1123,7 +1071,6 @@ protected function setOrderStatePaymentReview($message, $transactionId)
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     protected function _order($amount)
     {
@@ -1140,7 +1087,6 @@ protected function _order($amount)
      * @param float $amount
      *
      * @return $this
-     * @since 2.0.0
      */
     public function authorize($isOnline, $amount)
     {
@@ -1159,7 +1105,6 @@ public function authorize($isOnline, $amount)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
     {
@@ -1215,7 +1160,6 @@ protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
      * @param \Magento\Sales\Model\AbstractModel $salesDocument
      * @param bool $failSafe
      * @return null|Transaction
-     * @since 2.0.0
      */
     public function addTransaction($type, $salesDocument = null, $failSafe = false)
     {
@@ -1231,7 +1175,6 @@ public function addTransaction($type, $salesDocument = null, $failSafe = false)
     }
 
     /**
-     * @since 2.0.0
      */
     public function addTransactionCommentsToOrder($transaction, $message)
     {
@@ -1245,7 +1188,6 @@ public function addTransactionCommentsToOrder($transaction, $message)
      *
      * @param Transaction $transactionTo
      * @return $this
-     * @since 2.0.0
      */
     public function importTransactionInfo(Transaction $transactionTo)
     {
@@ -1272,7 +1214,6 @@ public function importTransactionInfo(Transaction $transactionTo)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function _updateTotals($data)
     {
@@ -1290,7 +1231,6 @@ protected function _updateTotals($data)
      * @param Transaction|null $transaction
      * @param string $message
      * @return string
-     * @since 2.0.0
      */
     protected function _appendTransactionToMessage($transaction, $message)
     {
@@ -1307,7 +1247,6 @@ protected function _appendTransactionToMessage($transaction, $message)
      *
      * @param string|\Magento\Sales\Model\Order\Status\History $messagePrependTo
      * @return string|\Magento\Sales\Model\Order\Status\History
-     * @since 2.0.0
      */
     public function prependMessage($messagePrependTo)
     {
@@ -1336,7 +1275,6 @@ public function prependMessage($messagePrependTo)
      * @param string|float $amount
      * @param bool $asFloat
      * @return string|float
-     * @since 2.0.0
      */
     public function formatAmount($amount, $asFloat = false)
     {
@@ -1348,7 +1286,6 @@ public function formatAmount($amount, $asFloat = false)
      * Format price with currency sign
      * @param float $amount
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($amount)
     {
@@ -1358,7 +1295,6 @@ public function formatPrice($amount)
     /**
      * Lookup an authorization transaction using parent transaction id, if set
      * @return Transaction|false
-     * @since 2.0.0
      */
     public function getAuthorizationTransaction()
     {
@@ -1374,7 +1310,6 @@ public function getAuthorizationTransaction()
      *
      * @param float $amountToCapture
      * @return bool
-     * @since 2.0.0
      */
     public function isCaptureFinal($amountToCapture)
     {
@@ -1386,7 +1321,6 @@ public function isCaptureFinal($amountToCapture)
      * Check whether payment currency corresponds to order currency
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSameCurrency()
     {
@@ -1399,7 +1333,6 @@ public function isSameCurrency()
      * @param string $key
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setTransactionAdditionalInfo($key, $value)
     {
@@ -1410,7 +1343,6 @@ public function setTransactionAdditionalInfo($key, $value)
      * Additional transaction info setter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTransactionAdditionalInfo()
     {
@@ -1421,7 +1353,6 @@ public function getTransactionAdditionalInfo()
      * Reset transaction additional info property
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetTransactionAdditionalInfo()
     {
@@ -1436,7 +1367,6 @@ public function resetTransactionAdditionalInfo()
      * @param $baseGrandTotal
      * @param false|Invoice $invoice
      * @return mixed
-     * @since 2.0.0
      */
     protected function prepareCreditMemo($amount, $baseGrandTotal, $invoice)
     {
@@ -1463,7 +1393,6 @@ protected function prepareCreditMemo($amount, $baseGrandTotal, $invoice)
      * Checks if transaction exists
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function checkIfTransactionExists()
     {
@@ -1478,7 +1407,6 @@ protected function checkIfTransactionExists()
      *
      * @param string $transactionId
      * @return Invoice|false
-     * @since 2.0.0
      */
     protected function _getInvoiceForTransactionId($transactionId)
     {
@@ -1521,7 +1449,6 @@ private function getOrderStateResolver()
      * Returns account_status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAccountStatus()
     {
@@ -1532,7 +1459,6 @@ public function getAccountStatus()
      * Returns additional_data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -1543,7 +1469,6 @@ public function getAdditionalData()
      * Returns address_status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddressStatus()
     {
@@ -1554,7 +1479,6 @@ public function getAddressStatus()
      * Returns amount_authorized
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmountAuthorized()
     {
@@ -1565,7 +1489,6 @@ public function getAmountAuthorized()
      * Returns amount_canceled
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmountCanceled()
     {
@@ -1576,7 +1499,6 @@ public function getAmountCanceled()
      * Returns amount_ordered
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmountOrdered()
     {
@@ -1587,7 +1509,6 @@ public function getAmountOrdered()
      * Returns amount_paid
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmountPaid()
     {
@@ -1598,7 +1519,6 @@ public function getAmountPaid()
      * Returns amount_refunded
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmountRefunded()
     {
@@ -1609,7 +1529,6 @@ public function getAmountRefunded()
      * Returns anet_trans_method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAnetTransMethod()
     {
@@ -1620,7 +1539,6 @@ public function getAnetTransMethod()
      * Returns base_amount_authorized
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountAuthorized()
     {
@@ -1631,7 +1549,6 @@ public function getBaseAmountAuthorized()
      * Returns base_amount_canceled
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountCanceled()
     {
@@ -1642,7 +1559,6 @@ public function getBaseAmountCanceled()
      * Returns base_amount_ordered
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountOrdered()
     {
@@ -1653,7 +1569,6 @@ public function getBaseAmountOrdered()
      * Returns base_amount_paid
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountPaid()
     {
@@ -1664,7 +1579,6 @@ public function getBaseAmountPaid()
      * Returns base_amount_paid_online
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountPaidOnline()
     {
@@ -1675,7 +1589,6 @@ public function getBaseAmountPaidOnline()
      * Returns base_amount_refunded
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountRefunded()
     {
@@ -1686,7 +1599,6 @@ public function getBaseAmountRefunded()
      * Returns base_amount_refunded_online
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmountRefundedOnline()
     {
@@ -1697,7 +1609,6 @@ public function getBaseAmountRefundedOnline()
      * Returns base_shipping_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingAmount()
     {
@@ -1708,7 +1619,6 @@ public function getBaseShippingAmount()
      * Returns base_shipping_captured
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingCaptured()
     {
@@ -1719,7 +1629,6 @@ public function getBaseShippingCaptured()
      * Returns base_shipping_refunded
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseShippingRefunded()
     {
@@ -1730,7 +1639,6 @@ public function getBaseShippingRefunded()
      * Returns cc_approval
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcApproval()
     {
@@ -1741,7 +1649,6 @@ public function getCcApproval()
      * Returns cc_avs_status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcAvsStatus()
     {
@@ -1752,7 +1659,6 @@ public function getCcAvsStatus()
      * Returns cc_cid_status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcCidStatus()
     {
@@ -1763,7 +1669,6 @@ public function getCcCidStatus()
      * Returns cc_debug_request_body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcDebugRequestBody()
     {
@@ -1774,7 +1679,6 @@ public function getCcDebugRequestBody()
      * Returns cc_debug_response_body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcDebugResponseBody()
     {
@@ -1785,7 +1689,6 @@ public function getCcDebugResponseBody()
      * Returns cc_debug_response_serialized
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcDebugResponseSerialized()
     {
@@ -1796,7 +1699,6 @@ public function getCcDebugResponseSerialized()
      * Returns cc_exp_month
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcExpMonth()
     {
@@ -1807,7 +1709,6 @@ public function getCcExpMonth()
      * Returns cc_exp_year
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcExpYear()
     {
@@ -1818,7 +1719,6 @@ public function getCcExpYear()
      * Returns cc_last_4
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcLast4()
     {
@@ -1829,7 +1729,6 @@ public function getCcLast4()
      * Returns cc_number_enc
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcNumberEnc()
     {
@@ -1840,7 +1739,6 @@ public function getCcNumberEnc()
      * Returns cc_owner
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcOwner()
     {
@@ -1851,7 +1749,6 @@ public function getCcOwner()
      * Returns cc_secure_verify
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcSecureVerify()
     {
@@ -1863,7 +1760,6 @@ public function getCcSecureVerify()
      *
      * @return string
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsIssue()
     {
@@ -1875,7 +1771,6 @@ public function getCcSsIssue()
      *
      * @return string
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsStartMonth()
     {
@@ -1887,7 +1782,6 @@ public function getCcSsStartMonth()
      *
      * @return string
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function getCcSsStartYear()
     {
@@ -1898,7 +1792,6 @@ public function getCcSsStartYear()
      * Returns cc_status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcStatus()
     {
@@ -1909,7 +1802,6 @@ public function getCcStatus()
      * Returns cc_status_description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcStatusDescription()
     {
@@ -1920,7 +1812,6 @@ public function getCcStatusDescription()
      * Returns cc_trans_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcTransId()
     {
@@ -1931,7 +1822,6 @@ public function getCcTransId()
      * Returns cc_type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCcType()
     {
@@ -1942,7 +1832,6 @@ public function getCcType()
      * Returns echeck_account_name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEcheckAccountName()
     {
@@ -1953,7 +1842,6 @@ public function getEcheckAccountName()
      * Returns echeck_account_type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEcheckAccountType()
     {
@@ -1964,7 +1852,6 @@ public function getEcheckAccountType()
      * Returns echeck_bank_name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEcheckBankName()
     {
@@ -1975,7 +1862,6 @@ public function getEcheckBankName()
      * Returns echeck_routing_number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEcheckRoutingNumber()
     {
@@ -1986,7 +1872,6 @@ public function getEcheckRoutingNumber()
      * Returns echeck_type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEcheckType()
     {
@@ -1997,7 +1882,6 @@ public function getEcheckType()
      * Returns last_trans_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastTransId()
     {
@@ -2008,7 +1892,6 @@ public function getLastTransId()
      * Returns method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -2019,7 +1902,6 @@ public function getMethod()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -2030,7 +1912,6 @@ public function getParentId()
      * Returns po_number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPoNumber()
     {
@@ -2041,7 +1922,6 @@ public function getPoNumber()
      * Returns protection_eligibility
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProtectionEligibility()
     {
@@ -2052,7 +1932,6 @@ public function getProtectionEligibility()
      * Returns quote_payment_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQuotePaymentId()
     {
@@ -2063,7 +1942,6 @@ public function getQuotePaymentId()
      * Returns shipping_amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingAmount()
     {
@@ -2074,7 +1952,6 @@ public function getShippingAmount()
      * Returns shipping_captured
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingCaptured()
     {
@@ -2085,7 +1962,6 @@ public function getShippingCaptured()
      * Returns shipping_refunded
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingRefunded()
     {
@@ -2094,7 +1970,6 @@ public function getShippingRefunded()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -2103,7 +1978,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingCaptured($baseShippingCaptured)
     {
@@ -2112,7 +1986,6 @@ public function setBaseShippingCaptured($baseShippingCaptured)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingCaptured($shippingCaptured)
     {
@@ -2121,7 +1994,6 @@ public function setShippingCaptured($shippingCaptured)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountRefunded($amountRefunded)
     {
@@ -2130,7 +2002,6 @@ public function setAmountRefunded($amountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountPaid($baseAmountPaid)
     {
@@ -2139,7 +2010,6 @@ public function setBaseAmountPaid($baseAmountPaid)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountCanceled($amountCanceled)
     {
@@ -2148,7 +2018,6 @@ public function setAmountCanceled($amountCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountAuthorized($baseAmountAuthorized)
     {
@@ -2157,7 +2026,6 @@ public function setBaseAmountAuthorized($baseAmountAuthorized)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountPaidOnline($baseAmountPaidOnline)
     {
@@ -2166,7 +2034,6 @@ public function setBaseAmountPaidOnline($baseAmountPaidOnline)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountRefundedOnline($baseAmountRefundedOnline)
     {
@@ -2175,7 +2042,6 @@ public function setBaseAmountRefundedOnline($baseAmountRefundedOnline)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingAmount($amount)
     {
@@ -2184,7 +2050,6 @@ public function setBaseShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAmount($amount)
     {
@@ -2193,7 +2058,6 @@ public function setShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountPaid($amountPaid)
     {
@@ -2202,7 +2066,6 @@ public function setAmountPaid($amountPaid)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountAuthorized($amountAuthorized)
     {
@@ -2211,7 +2074,6 @@ public function setAmountAuthorized($amountAuthorized)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountOrdered($baseAmountOrdered)
     {
@@ -2220,7 +2082,6 @@ public function setBaseAmountOrdered($baseAmountOrdered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseShippingRefunded($baseShippingRefunded)
     {
@@ -2229,7 +2090,6 @@ public function setBaseShippingRefunded($baseShippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingRefunded($shippingRefunded)
     {
@@ -2238,7 +2098,6 @@ public function setShippingRefunded($shippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountRefunded($baseAmountRefunded)
     {
@@ -2247,7 +2106,6 @@ public function setBaseAmountRefunded($baseAmountRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmountOrdered($amountOrdered)
     {
@@ -2256,7 +2114,6 @@ public function setAmountOrdered($amountOrdered)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBaseAmountCanceled($baseAmountCanceled)
     {
@@ -2265,7 +2122,6 @@ public function setBaseAmountCanceled($baseAmountCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuotePaymentId($id)
     {
@@ -2274,7 +2130,6 @@ public function setQuotePaymentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -2283,7 +2138,6 @@ public function setAdditionalData($additionalData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcExpMonth($ccExpMonth)
     {
@@ -2293,7 +2147,6 @@ public function setCcExpMonth($ccExpMonth)
     /**
      * {@inheritdoc}
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function setCcSsStartYear($ccSsStartYear)
     {
@@ -2302,7 +2155,6 @@ public function setCcSsStartYear($ccSsStartYear)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEcheckBankName($echeckBankName)
     {
@@ -2311,7 +2163,6 @@ public function setEcheckBankName($echeckBankName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMethod($method)
     {
@@ -2320,7 +2171,6 @@ public function setMethod($method)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcDebugRequestBody($ccDebugRequestBody)
     {
@@ -2329,7 +2179,6 @@ public function setCcDebugRequestBody($ccDebugRequestBody)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcSecureVerify($ccSecureVerify)
     {
@@ -2338,7 +2187,6 @@ public function setCcSecureVerify($ccSecureVerify)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProtectionEligibility($protectionEligibility)
     {
@@ -2347,7 +2195,6 @@ public function setProtectionEligibility($protectionEligibility)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcApproval($ccApproval)
     {
@@ -2356,7 +2203,6 @@ public function setCcApproval($ccApproval)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcLast4($ccLast4)
     {
@@ -2365,7 +2211,6 @@ public function setCcLast4($ccLast4)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcStatusDescription($description)
     {
@@ -2374,7 +2219,6 @@ public function setCcStatusDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEcheckType($echeckType)
     {
@@ -2383,7 +2227,6 @@ public function setEcheckType($echeckType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
     {
@@ -2393,7 +2236,6 @@ public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
     /**
      * {@inheritdoc}
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function setCcSsStartMonth($ccSsStartMonth)
     {
@@ -2402,7 +2244,6 @@ public function setCcSsStartMonth($ccSsStartMonth)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEcheckAccountType($echeckAccountType)
     {
@@ -2411,7 +2252,6 @@ public function setEcheckAccountType($echeckAccountType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLastTransId($id)
     {
@@ -2420,7 +2260,6 @@ public function setLastTransId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcCidStatus($ccCidStatus)
     {
@@ -2429,7 +2268,6 @@ public function setCcCidStatus($ccCidStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcOwner($ccOwner)
     {
@@ -2438,7 +2276,6 @@ public function setCcOwner($ccOwner)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcType($ccType)
     {
@@ -2447,7 +2284,6 @@ public function setCcType($ccType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPoNumber($poNumber)
     {
@@ -2456,7 +2292,6 @@ public function setPoNumber($poNumber)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcExpYear($ccExpYear)
     {
@@ -2465,7 +2300,6 @@ public function setCcExpYear($ccExpYear)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcStatus($ccStatus)
     {
@@ -2474,7 +2308,6 @@ public function setCcStatus($ccStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEcheckRoutingNumber($echeckRoutingNumber)
     {
@@ -2483,7 +2316,6 @@ public function setEcheckRoutingNumber($echeckRoutingNumber)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAccountStatus($accountStatus)
     {
@@ -2492,7 +2324,6 @@ public function setAccountStatus($accountStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAnetTransMethod($anetTransMethod)
     {
@@ -2501,7 +2332,6 @@ public function setAnetTransMethod($anetTransMethod)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcDebugResponseBody($ccDebugResponseBody)
     {
@@ -2511,7 +2341,6 @@ public function setCcDebugResponseBody($ccDebugResponseBody)
     /**
      * {@inheritdoc}
      * @deprecated 2.1.0 unused
-     * @since 2.0.0
      */
     public function setCcSsIssue($ccSsIssue)
     {
@@ -2520,7 +2349,6 @@ public function setCcSsIssue($ccSsIssue)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEcheckAccountName($echeckAccountName)
     {
@@ -2529,7 +2357,6 @@ public function setEcheckAccountName($echeckAccountName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcAvsStatus($ccAvsStatus)
     {
@@ -2538,7 +2365,6 @@ public function setCcAvsStatus($ccAvsStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcNumberEnc($ccNumberEnc)
     {
@@ -2547,7 +2373,6 @@ public function setCcNumberEnc($ccNumberEnc)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCcTransId($id)
     {
@@ -2556,7 +2381,6 @@ public function setCcTransId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAddressStatus($addressStatus)
     {
@@ -2567,7 +2391,6 @@ public function setAddressStatus($addressStatus)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -2579,7 +2402,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes)
     {
@@ -2591,7 +2413,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderPaymentExten
      *
      * @param bool|int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsTransactionPending($flag)
     {
@@ -2604,7 +2425,6 @@ public function setIsTransactionPending($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsTransactionPending()
     {
@@ -2616,7 +2436,6 @@ public function getIsTransactionPending()
      *
      * @param bool|int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsFraudDetected($flag)
     {
@@ -2629,7 +2448,6 @@ public function setIsFraudDetected($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsFraudDetected()
     {
@@ -2641,7 +2459,6 @@ public function getIsFraudDetected()
      *
      * @param int|bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setShouldCloseParentTransaction($flag)
     {
@@ -2654,7 +2471,6 @@ public function setShouldCloseParentTransaction($flag)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getShouldCloseParentTransaction()
     {
@@ -2665,7 +2481,6 @@ public function getShouldCloseParentTransaction()
      * Set payment parent transaction id and current transaction id if it not set
      * @param Transaction $transaction
      * @return void
-     * @since 2.0.0
      */
     private function setTransactionIdsForRefund(Transaction $transaction)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Info.php b/app/code/Magento/Sales/Model/Order/Payment/Info.php
index 6729dd4ca3490..ef8d129df105a 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Info.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Info.php
@@ -14,7 +14,6 @@
  *
  * Payment information model
  * @api
- * @since 2.0.0
  */
 class Info extends AbstractModel implements InfoInterface
 {
@@ -22,7 +21,6 @@ class Info extends AbstractModel implements InfoInterface
      * Additional information container
      *
      * @var array
-     * @since 2.0.0
      */
     protected $additionalInformation = [];
 
@@ -30,13 +28,11 @@ class Info extends AbstractModel implements InfoInterface
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $paymentData;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
@@ -50,7 +46,6 @@ class Info extends AbstractModel implements InfoInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -82,7 +77,6 @@ public function __construct(
      * @param string $key
      * @param mixed $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -108,7 +102,6 @@ public function getData($key = '', $index = null)
      *
      * @return \Magento\Payment\Model\MethodInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getMethodInstance()
     {
@@ -134,7 +127,6 @@ public function getMethodInstance()
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data)
     {
@@ -146,7 +138,6 @@ public function encrypt($data)
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data)
     {
@@ -162,7 +153,6 @@ public function decrypt($data)
      * @param mixed $value
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAdditionalInformation($key, $value = null)
     {
@@ -183,7 +173,6 @@ public function setAdditionalInformation($key, $value = null)
      *
      * @param string $key
      * @return array|null|mixed
-     * @since 2.0.0
      */
     public function getAdditionalInformation($key = null)
     {
@@ -199,7 +188,6 @@ public function getAdditionalInformation($key = null)
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsAdditionalInformation($key = null)
     {
@@ -219,7 +207,6 @@ public function unsAdditionalInformation($key = null)
      *
      * @param mixed|null $key
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdditionalInformation($key = null)
     {
@@ -235,7 +222,6 @@ public function hasAdditionalInformation($key = null)
      * if property empty
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initAdditionalInformation()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php
index d11ae3aa4a394..54b29b595dce7 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php
@@ -15,31 +15,26 @@
 
 /**
  * Class AbstractOperation
- * @since 2.0.0
  */
 abstract class AbstractOperation
 {
     /**
      * @var CommandInterface
-     * @since 2.0.0
      */
     protected $stateCommand;
 
     /**
      * @var BuilderInterface
-     * @since 2.0.0
      */
     protected $transactionBuilder;
 
     /**
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var EventManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -48,7 +43,6 @@ abstract class AbstractOperation
      * @param BuilderInterface $transactionBuilder
      * @param ManagerInterface $transactionManager
      * @param EventManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         CommandInterface $stateCommand,
@@ -68,7 +62,6 @@ public function __construct(
      *
      * @param OrderPaymentInterface $payment
      * @return Invoice
-     * @since 2.0.0
      */
     protected function invoice(OrderPaymentInterface $payment)
     {
@@ -91,7 +84,6 @@ protected function invoice(OrderPaymentInterface $payment)
      * @param OrderPaymentInterface $payment
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function updateTotals(OrderPaymentInterface $payment, $data)
     {
@@ -109,7 +101,6 @@ protected function updateTotals(OrderPaymentInterface $payment, $data)
      * @param OrderInterface $order
      * @param string $transactionId
      * @return false|Invoice
-     * @since 2.0.0
      */
     protected function getInvoiceForTransactionId(OrderInterface $order, $transactionId)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/AuthorizeOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/AuthorizeOperation.php
index 26a5d5913811d..421377b5cce7d 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/AuthorizeOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/AuthorizeOperation.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\Operations\AuthorizeOperation
  *
- * @since 2.0.0
  */
 class AuthorizeOperation extends AbstractOperation
 {
@@ -24,7 +23,6 @@ class AuthorizeOperation extends AbstractOperation
      * @param bool $isOnline
      * @param string|float $amount
      * @return OrderPaymentInterface
-     * @since 2.0.0
      */
     public function authorize(OrderPaymentInterface $payment, $isOnline, $amount)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/CaptureOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/CaptureOperation.php
index 16f29df387213..0c3f5b59a76a5 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/CaptureOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/CaptureOperation.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\Operations\CaptureOperation
  *
- * @since 2.0.0
  */
 class CaptureOperation extends AbstractOperation
 {
@@ -25,7 +24,6 @@ class CaptureOperation extends AbstractOperation
      * @param InvoiceInterface|null $invoice
      * @return OrderPaymentInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function capture(OrderPaymentInterface $payment, $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/OrderOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/OrderOperation.php
index 4bda3d6da2f9b..bd0adbda029e4 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/OrderOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/OrderOperation.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Order
- * @since 2.0.0
  */
 class OrderOperation extends AbstractOperation
 {
@@ -19,7 +18,6 @@ class OrderOperation extends AbstractOperation
      * @param OrderPaymentInterface $payment
      * @param string|float $amount
      * @return OrderPaymentInterface
-     * @since 2.0.0
      */
     public function order(OrderPaymentInterface $payment, $amount)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/RegisterCaptureNotificationOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/RegisterCaptureNotificationOperation.php
index 692529a070720..d011dd2751333 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/RegisterCaptureNotificationOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/RegisterCaptureNotificationOperation.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\Operations\RegisterCaptureNotificationOperation
  *
- * @since 2.0.0
  */
 class RegisterCaptureNotificationOperation extends AbstractOperation
 {
@@ -24,7 +23,6 @@ class RegisterCaptureNotificationOperation extends AbstractOperation
      * @param string|float $amount
      * @param bool|int $skipFraudDetection
      * @return OrderPaymentInterface
-     * @since 2.0.0
      */
     public function registerCaptureNotification(OrderPaymentInterface $payment, $amount, $skipFraudDetection = false)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Processor.php b/app/code/Magento/Sales/Model/Order/Payment/Processor.php
index 1ddf5efdb584d..5f06aef2eebf2 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Processor.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Processor.php
@@ -16,31 +16,26 @@
 
 /**
  * Class Processor using for process payment
- * @since 2.0.0
  */
 class Processor
 {
     /**
      * @var AuthorizeOperation
-     * @since 2.0.0
      */
     protected $authorizeOperation;
 
     /**
      * @var CaptureOperation
-     * @since 2.0.0
      */
     protected $captureOperation;
 
     /**
      * @var OrderOperation
-     * @since 2.0.0
      */
     protected $orderOperation;
 
     /**
      * @var RegisterCaptureNotificationOperation
-     * @since 2.0.0
      */
     protected $registerCaptureNotification;
 
@@ -51,7 +46,6 @@ class Processor
      * @param CaptureOperation $captureOperation
      * @param OrderOperation $orderOperation
      * @param RegisterCaptureNotificationOperation $registerCaptureNotification
-     * @since 2.0.0
      */
     public function __construct(
         AuthorizeOperation $authorizeOperation,
@@ -72,7 +66,6 @@ public function __construct(
      * @param bool $isOnline
      * @param float $amount
      * @return OrderPaymentInterface|Payment
-     * @since 2.0.0
      */
     public function authorize(OrderPaymentInterface $payment, $isOnline, $amount)
     {
@@ -86,7 +79,6 @@ public function authorize(OrderPaymentInterface $payment, $isOnline, $amount)
      * @param InvoiceInterface $invoice
      * @return OrderPaymentInterface|Payment
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function capture(OrderPaymentInterface $payment, $invoice)
     {
@@ -99,7 +91,6 @@ public function capture(OrderPaymentInterface $payment, $invoice)
      * @param OrderPaymentInterface $payment
      * @param float $amount
      * @return OrderPaymentInterface|Payment
-     * @since 2.0.0
      */
     public function order(OrderPaymentInterface $payment, $amount)
     {
@@ -113,7 +104,6 @@ public function order(OrderPaymentInterface $payment, $amount)
      * @param string|float $amount
      * @param bool|int $skipFraudDetection
      * @return OrderPaymentInterface
-     * @since 2.0.0
      */
     public function registerCaptureNotification(
         OrderPaymentInterface $payment,
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
index 4e95376a55424..c5e53aa6370f0 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
@@ -14,7 +14,6 @@
 
 /**
  * Class Repository
- * @since 2.0.0
  */
 class Repository implements OrderPaymentRepositoryInterface
 {
@@ -22,19 +21,16 @@ class Repository implements OrderPaymentRepositoryInterface
      * Magento\Sales\Model\Order\Payment\Transaction[]
      *
      * @var array
-     * @since 2.0.0
      */
     private $registry = [];
 
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metaData;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory;
 
@@ -48,7 +44,6 @@ class Repository implements OrderPaymentRepositoryInterface
      * @param Metadata $metaData
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metaData,
@@ -65,7 +60,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
      * @return \Magento\Sales\Api\Data\OrderPaymentSearchResultInterface Order payment search result interface.
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -83,7 +77,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Order payment interface.
      * @throws NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -105,7 +98,6 @@ public function get($id)
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface $entity The order payment ID.
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderPaymentInterface $entity)
     {
@@ -118,7 +110,6 @@ public function delete(\Magento\Sales\Api\Data\OrderPaymentInterface $entity)
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface $entity The order payment ID.
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Order payment interface.
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderPaymentInterface $entity)
     {
@@ -130,7 +121,6 @@ public function save(\Magento\Sales\Api\Data\OrderPaymentInterface $entity)
      * Creates new Order Payment instance.
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentInterface Transaction interface.
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
index 0c92562a47f8a..9be0035483c2d 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand
  *
- * @since 2.0.0
  */
 class AuthorizeCommand implements CommandInterface
 {
@@ -39,7 +38,6 @@ public function __construct(StatusResolver $statusResolver = null)
      * @param string|float $amount
      * @param OrderInterface $order
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
@@ -75,7 +73,6 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
      * @param string $status
      * @param string $state
      * @return void
-     * @since 2.0.0
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
index bb6e5cbca1bb4..c65cfdfd11de2 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\State\CaptureCommand
  *
- * @since 2.0.0
  */
 class CaptureCommand implements CommandInterface
 {
@@ -39,7 +38,6 @@ public function __construct(StatusResolver $statusResolver = null)
      * @param string|float $amount
      * @param OrderInterface $order
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
@@ -75,7 +73,6 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
      * @param string $status
      * @param string $state
      * @return void
-     * @since 2.0.0
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CommandInterface.php b/app/code/Magento/Sales/Model/Order/Payment/State/CommandInterface.php
index 8c4edb990647b..93272623b76e3 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/CommandInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/CommandInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Interface CommandInterface using for payment related changes of order state
- * @since 2.0.0
  */
 interface CommandInterface
 {
@@ -21,7 +20,6 @@ interface CommandInterface
      * @param string|float|int $amount
      * @param OrderInterface $order
      * @return string
-     * @since 2.0.0
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
index 9599f56865494..8bd426fee9f22 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\State\OrderCommand
  *
- * @since 2.0.0
  */
 class OrderCommand implements CommandInterface
 {
@@ -39,7 +38,6 @@ public function __construct(StatusResolver $statusResolver = null)
      * @param string|float $amount
      * @param OrderInterface $order
      * @return string
-     * @since 2.0.0
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
@@ -75,7 +73,6 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
      * @param string $status
      * @param string $state
      * @return void
-     * @since 2.0.0
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
index 942b61e36bd34..da27df889bf34 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\State\RegisterCaptureNotificationCommand
  *
- * @since 2.0.0
  */
 class RegisterCaptureNotificationCommand implements CommandInterface
 {
@@ -39,7 +38,6 @@ public function __construct(StatusResolver $statusResolver = null)
      * @param string|float|int $amount
      * @param OrderInterface $order
      * @return string
-     * @since 2.0.0
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
@@ -75,7 +73,6 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
      * @param string $status
      * @param string $state
      * @return void
-     * @since 2.0.0
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 420d36495fe55..9019deccbe82b 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -24,7 +24,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Transaction extends AbstractModel implements TransactionInterface
 {
@@ -37,14 +36,12 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Order instance
      *
      * @var \Magento\Sales\Model\Order\Payment
-     * @since 2.0.0
      */
     protected $_order = null;
 
     /**
      * Parent transaction instance
      * @var \Magento\Sales\Model\Order\Payment\Transaction
-     * @since 2.0.0
      */
     protected $_parentTransaction = null;
 
@@ -52,7 +49,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Child transactions, assoc array of transaction_id => instance
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_children = null;
 
@@ -62,7 +58,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Used for quicker search of child transactions using isset() as opposite to foreaching $_children
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_identifiedChildren = null;
 
@@ -70,7 +65,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Whether to perform automatic actions on transactions, such as auto-closing and putting as a parent
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_transactionsAutoLinking = true;
 
@@ -78,7 +72,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Whether to throw exceptions on different operations
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFailsafe = false;
 
@@ -86,7 +79,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Whether transaction has children
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasChild = null;
 
@@ -95,7 +87,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      *
      * @var string
      * @see \Magento\Framework\Model\AbstractModel::$_eventPrefix
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_payment_transaction';
 
@@ -104,7 +95,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      *
      * @var string
      * @see \Magento\Framework\Model\AbstractModel::$_eventObject
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_payment_transaction';
 
@@ -112,37 +102,31 @@ class Transaction extends AbstractModel implements TransactionInterface
      * Order website id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_orderWebsiteId = null;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory
-     * @since 2.0.0
      */
     protected $_dateFactory;
 
     /**
      * @var TransactionFactory
-     * @since 2.0.0
      */
     protected $_transactionFactory;
 
     /**
      * @var \Magento\Sales\Api\OrderPaymentRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderPaymentRepository;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
@@ -158,7 +142,6 @@ class Transaction extends AbstractModel implements TransactionInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -194,7 +177,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -207,7 +189,6 @@ protected function _construct()
      *
      * @param string $txnId
      * @return $this
-     * @since 2.0.0
      */
     public function setTxnId($txnId)
     {
@@ -223,7 +204,6 @@ public function setTxnId($txnId)
      * @param string $txnId
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setParentTxnId($parentTxnId, $txnId = null)
     {
@@ -243,7 +223,6 @@ public function setParentTxnId($parentTxnId, $txnId = null)
      *
      * @param string $txnType
      * @return $this
-     * @since 2.0.0
      */
     public function setTxnType($txnType)
     {
@@ -257,7 +236,6 @@ public function setTxnType($txnType)
      *
      * @param bool $shouldLoad
      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
-     * @since 2.0.0
      */
     public function getParentTransaction($shouldLoad = true)
     {
@@ -298,7 +276,6 @@ public function getParentTransaction($shouldLoad = true)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildTransactions($types = null, $txnId = null, $recursive = false)
     {
@@ -357,7 +334,6 @@ public function getChildTransactions($types = null, $txnId = null, $recursive =
      * @param bool $dryRun
      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
      * @throws \Exception
-     * @since 2.0.0
      */
     public function closeAuthorization($shouldSave = true, $dryRun = false)
     {
@@ -398,7 +374,6 @@ public function closeAuthorization($shouldSave = true, $dryRun = false)
      * @param bool $shouldSave
      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
      * @see self::closeAuthorization()
-     * @since 2.0.0
      */
     public function closeCapture($shouldSave = true)
     {
@@ -425,7 +400,6 @@ public function closeCapture($shouldSave = true)
      * Basically checks whether the authorization exists and it is not affected by a capture or void
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canVoidAuthorizationCompletely()
     {
@@ -446,7 +420,6 @@ public function canVoidAuthorizationCompletely()
      *
      * @param bool $whetherHasChild
      * @return $this|bool
-     * @since 2.0.0
      */
     public function hasChildTransaction($whetherHasChild = null)
     {
@@ -472,7 +445,6 @@ public function hasChildTransaction($whetherHasChild = null)
      * @param mixed $value
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAdditionalInformation($key, $value)
     {
@@ -492,7 +464,6 @@ public function setAdditionalInformation($key, $value)
      *
      * @param string $key
      * @return array|null|mixed
-     * @since 2.0.0
      */
     public function getAdditionalInformation($key = null)
     {
@@ -511,7 +482,6 @@ public function getAdditionalInformation($key = null)
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsAdditionalInformation($key = null)
     {
@@ -534,7 +504,6 @@ public function unsAdditionalInformation($key = null)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function close($shouldSave = true)
     {
@@ -570,7 +539,6 @@ public function close($shouldSave = true)
      * Attempts to get ID from set order payment object, if any, or from data by key 'order_id'
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -592,7 +560,6 @@ public function getOrderId()
      * Retrieve order instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -610,7 +577,6 @@ public function getOrder()
      * @param \Magento\Sales\Model\Order|null|boolean $order
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setOrder($order = null)
     {
@@ -634,7 +600,6 @@ public function setOrder($order = null)
      *
      * @param bool|null $setFailsafe
      * @return $this|bool
-     * @since 2.0.0
      */
     public function isFailsafe($setFailsafe = null)
     {
@@ -649,7 +614,6 @@ public function isFailsafe($setFailsafe = null)
      * Verify data required for saving
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -674,7 +638,6 @@ public function beforeSave()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _loadChildren()
     {
@@ -732,7 +695,6 @@ protected function _loadChildren()
      *
      * TODO: implement that there should be only one void per authorization
      * @return bool
-     * @since 2.0.0
      */
     protected function _isVoided()
     {
@@ -744,7 +706,6 @@ protected function _isVoided()
      * Check whether this transaction is voided
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVoided()
     {
@@ -755,7 +716,6 @@ public function isVoided()
      * Retrieve transaction types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTransactionTypes()
     {
@@ -772,7 +732,6 @@ public function getTransactionTypes()
      * Retrieve order website id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderWebsiteId()
     {
@@ -788,7 +747,6 @@ public function getOrderWebsiteId()
      * @param string $txnType
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _verifyTxnType($txnType = null)
     {
@@ -815,7 +773,6 @@ protected function _verifyTxnType($txnType = null)
      * @param bool $dryRun
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _verifyPaymentObject($dryRun = false)
     {
@@ -834,7 +791,6 @@ protected function _verifyPaymentObject($dryRun = false)
      * @param string $txnId
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _verifyTxnId($txnId)
     {
@@ -849,7 +805,6 @@ protected function _verifyTxnId($txnId)
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _verifyThisTransactionExists()
     {
@@ -865,7 +820,6 @@ protected function _verifyThisTransactionExists()
      * Returns transaction_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTransactionId()
     {
@@ -874,7 +828,6 @@ public function getTransactionId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTransactionId($id)
     {
@@ -885,7 +838,6 @@ public function setTransactionId($id)
      * Returns method
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -896,7 +848,6 @@ public function getMethod()
      * Returns increment_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId()
     {
@@ -907,7 +858,6 @@ public function getIncrementId()
      * Returns parent_id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -918,7 +868,6 @@ public function getParentId()
      * Returns payment_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPaymentId()
     {
@@ -929,7 +878,6 @@ public function getPaymentId()
      * Returns txn_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTxnId()
     {
@@ -940,7 +888,6 @@ public function getTxnId()
      * Get HTML format for transaction id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlTxnId()
     {
@@ -952,7 +899,6 @@ public function getHtmlTxnId()
      * Returns parent_txn_id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentTxnId()
     {
@@ -963,7 +909,6 @@ public function getParentTxnId()
      * Returns txn_type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTxnType()
     {
@@ -974,7 +919,6 @@ public function getTxnType()
      * Returns is_closed
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsClosed()
     {
@@ -985,7 +929,6 @@ public function getIsClosed()
      * Gets the created-at timestamp for the transaction.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -994,7 +937,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -1003,7 +945,6 @@ public function setCreatedAt($createdAt)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -1012,7 +953,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -1021,7 +961,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPaymentId($id)
     {
@@ -1030,7 +969,6 @@ public function setPaymentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsClosed($isClosed)
     {
@@ -1041,7 +979,6 @@ public function setIsClosed($isClosed)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\TransactionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1053,7 +990,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
index 0ef1f4c9e1761..9a91403ab2302 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
@@ -15,61 +15,51 @@
 
 /**
  * Class Builder build transaction
- * @since 2.0.0
  */
 class Builder implements BuilderInterface
 {
     /**
      * @var OrderPaymentInterface
-     * @since 2.0.0
      */
     protected $payment;
 
     /**
      * @var OrderInterface
-     * @since 2.0.0
      */
     protected $order;
 
     /**
      * @var AbstractModel
-     * @since 2.0.0
      */
     protected $document;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $failSafe = false;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $message;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $transactionId;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $transactionAdditionalInfo = [];
 
     /**
      * @var TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
     /**
      * @param TransactionRepositoryInterface $transactionRepository
-     * @since 2.0.0
      */
     public function __construct(TransactionRepositoryInterface $transactionRepository)
     {
@@ -78,7 +68,6 @@ public function __construct(TransactionRepositoryInterface $transactionRepositor
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPayment(OrderPaymentInterface $payment)
     {
@@ -88,7 +77,6 @@ public function setPayment(OrderPaymentInterface $payment)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrder(OrderInterface $order)
     {
@@ -98,7 +86,6 @@ public function setOrder(OrderInterface $order)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSalesDocument(\Magento\Sales\Model\AbstractModel $document)
     {
@@ -108,7 +95,6 @@ public function setSalesDocument(\Magento\Sales\Model\AbstractModel $document)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFailSafe($failSafe)
     {
@@ -118,7 +104,6 @@ public function setFailSafe($failSafe)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMessage($message)
     {
@@ -128,7 +113,6 @@ public function setMessage($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId)
     {
@@ -138,7 +122,6 @@ public function setTransactionId($transactionId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalInformation(array $value)
     {
@@ -148,7 +131,6 @@ public function setAdditionalInformation(array $value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addAdditionalInformation($key, $value)
     {
@@ -158,7 +140,6 @@ public function addAdditionalInformation($key, $value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -176,7 +157,6 @@ public function reset()
      * Checks if payment was set
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isPaymentExists()
     {
@@ -192,7 +172,6 @@ protected function isPaymentExists()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build($type)
     {
@@ -239,7 +218,6 @@ public function build($type)
      *
      * @param TransactionInterface $transaction
      * @return TransactionInterface
-     * @since 2.0.0
      */
     protected function linkWithParentTransaction(TransactionInterface $transaction)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
index 3160954bc37e2..e5bcc306f25ee 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
@@ -14,7 +14,6 @@
  * Interface BuilderInterface
  * Create transaction,
  * prepare its insertion into hierarchy and add its information to payment and comments
- * @since 2.0.0
  */
 interface BuilderInterface
 {
@@ -23,7 +22,6 @@ interface BuilderInterface
      *
      * @param OrderPaymentInterface $payment
      * @return $this
-     * @since 2.0.0
      */
     public function setPayment(OrderPaymentInterface $payment);
 
@@ -32,7 +30,6 @@ public function setPayment(OrderPaymentInterface $payment);
      *
      * @param OrderInterface $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(OrderInterface $order);
 
@@ -44,7 +41,6 @@ public function setOrder(OrderInterface $order);
      *
      * @param \Magento\Sales\Model\AbstractModel $document
      * @return $this
-     * @since 2.0.0
      */
     public function setSalesDocument(\Magento\Sales\Model\AbstractModel $document);
 
@@ -54,7 +50,6 @@ public function setSalesDocument(\Magento\Sales\Model\AbstractModel $document);
      *
      * @param bool $failSafe
      * @return $this
-     * @since 2.0.0
      */
     public function setFailSafe($failSafe);
 
@@ -63,7 +58,6 @@ public function setFailSafe($failSafe);
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     public function setMessage($message);
 
@@ -73,7 +67,6 @@ public function setMessage($message);
      *
      * @param string|null $transactionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTransactionId($transactionId);
 
@@ -82,7 +75,6 @@ public function setTransactionId($transactionId);
      *
      * @param array $value
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditionalInformation(array $value);
 
@@ -92,7 +84,6 @@ public function setAdditionalInformation(array $value);
      * @param string $key
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function addAdditionalInformation($key, $value);
 
@@ -100,7 +91,6 @@ public function addAdditionalInformation($key, $value);
      * Resets state
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset();
 
@@ -110,7 +100,6 @@ public function reset();
      *
      * @param string $type
      * @return TransactionInterface
-     * @since 2.0.0
      */
     public function build($type);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Manager.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Manager.php
index 83f271ed7df3d..f72a69d227180 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Manager.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Manager.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Sales\Model\Order\Payment\Transaction\Manager
  *
- * @since 2.0.0
  */
 class Manager implements ManagerInterface
 {
     /**
      * @var \Magento\Sales\Api\TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
     /**
      * @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Sales\Api\TransactionRepositoryInterface $t
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAuthorizationTransaction($parentTransactionId, $paymentId, $orderId)
     {
@@ -61,7 +57,6 @@ public function getAuthorizationTransaction($parentTransactionId, $paymentId, $o
      * @param int $paymentId
      * @param int $orderId
      * @return bool
-     * @since 2.0.0
      */
     public function isTransactionExists($transactionId, $paymentId, $orderId)
     {
@@ -76,7 +71,6 @@ public function isTransactionExists($transactionId, $paymentId, $orderId)
      * @param string $type
      * @param bool|Transaction $transactionBasedOn
      * @return string|null
-     * @since 2.0.0
      */
     public function generateTransactionId(OrderPaymentInterface $payment, $type, $transactionBasedOn = false)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/ManagerInterface.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/ManagerInterface.php
index 31292dee69b4b..1ef48226e5944 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/ManagerInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/ManagerInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * Manage payment transaction
- * @since 2.0.0
  */
 interface ManagerInterface
 {
@@ -22,7 +21,6 @@ interface ManagerInterface
      * @param int $paymentId
      * @param int $orderId
      * @return false|Transaction
-     * @since 2.0.0
      */
     public function getAuthorizationTransaction($parentTransactionId, $paymentId, $orderId);
 
@@ -33,7 +31,6 @@ public function getAuthorizationTransaction($parentTransactionId, $paymentId, $o
      * @param int $paymentId
      * @param int $orderId
      * @return bool
-     * @since 2.0.0
      */
     public function isTransactionExists($transactionId, $paymentId, $orderId);
 
@@ -45,7 +42,6 @@ public function isTransactionExists($transactionId, $paymentId, $orderId);
      * @param string $type
      * @param bool|Transaction $transactionBasedOn
      * @return string|null
-     * @since 2.0.0
      */
     public function generateTransactionId(OrderPaymentInterface $payment, $type, $transactionBasedOn = false);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
index 9211bf2a2867a..4bdc8c5a29580 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
@@ -26,7 +26,6 @@
 /**
  * Repository class for \Magento\Sales\Model\Order\Payment\Transaction
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Repository implements TransactionRepositoryInterface
 {
@@ -34,37 +33,31 @@ class Repository implements TransactionRepositoryInterface
      * Collection Result Factory
      *
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     private $searchResultFactory = null;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     private $filterBuilder;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     private $searchCriteriaBuilder;
 
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     private $metaData;
 
     /**
      * @var SortOrderBuilder
-     * @since 2.0.0
      */
     private $sortOrderBuilder;
 
     /**
      * @var EntityStorage
-     * @since 2.0.0
      */
     private $entityStorage;
 
@@ -83,7 +76,6 @@ class Repository implements TransactionRepositoryInterface
      * @param Metadata $metaData
      * @param EntityStorageFactory $entityStorageFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         SearchResultFactory $searchResultFactory,
@@ -105,7 +97,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -129,7 +120,6 @@ public function get($id)
      * @return bool|\Magento\Framework\Model\AbstractModel|mixed
      * @throws \Magento\Framework\Exception\InputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getByTransactionType($transactionType, $paymentId, $orderId)
     {
@@ -177,7 +167,6 @@ public function getByTransactionType($transactionType, $paymentId, $orderId)
      * @param int $orderId
      * @return bool|\Magento\Framework\Api\ExtensibleDataInterface|\Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getByTransactionId($transactionId, $paymentId, $orderId)
     {
@@ -203,7 +192,6 @@ public function getByTransactionId($transactionId, $paymentId, $orderId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -218,7 +206,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\TransactionInterface $entity)
     {
@@ -229,7 +216,6 @@ public function delete(\Magento\Sales\Api\Data\TransactionInterface $entity)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\TransactionInterface $entity)
     {
@@ -242,7 +228,6 @@ public function save(\Magento\Sales\Api\Data\TransactionInterface $entity)
      * Creates new Transaction instance.
      *
      * @return \Magento\Sales\Api\Data\TransactionInterface Transaction interface.
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Sales/Model/Order/PaymentAdapter.php b/app/code/Magento/Sales/Model/Order/PaymentAdapter.php
index 9111665af617d..c5881a04b9021 100644
--- a/app/code/Magento/Sales/Model/Order/PaymentAdapter.php
+++ b/app/code/Magento/Sales/Model/Order/PaymentAdapter.php
@@ -11,19 +11,19 @@
 
 /**
  * @inheritdoc
- * @since 2.2.0
+ * @since 2.1.2
  */
 class PaymentAdapter implements PaymentAdapterInterface
 {
     /**
      * @var PayOperation
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $payOperation;
 
     /**
      * @param PayOperation $payOperation
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         PayOperation $payOperation
@@ -33,7 +33,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function pay(
         OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php b/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php
index 19d79770e5e59..fd475fce6dab0 100644
--- a/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php
+++ b/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php
@@ -13,7 +13,7 @@
  * Can be used as extension point.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface PaymentAdapterInterface
 {
@@ -22,7 +22,7 @@ interface PaymentAdapterInterface
      * @param InvoiceInterface $invoice
      * @param bool $capture
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function pay(OrderInterface $order, InvoiceInterface $invoice, $capture);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 65eb603d86b77..d98e7cf8da64b 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -16,7 +16,6 @@
  * @api
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractPdf extends \Magento\Framework\DataObject
 {
@@ -24,7 +23,6 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
      * Y coordinate
      *
      * @var int
-     * @since 2.0.0
      */
     public $y;
 
@@ -34,7 +32,6 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
      * renderer => the renderer model
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_renderers = [];
 
@@ -51,7 +48,6 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
      * Zend PDF object
      *
      * @var \Zend_Pdf
-     * @since 2.0.0
      */
     protected $_pdf;
 
@@ -59,7 +55,6 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
      * Retrieve PDF
      *
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     abstract public function getPdf();
 
@@ -67,19 +62,16 @@ abstract public function getPdf();
      * Payment data
      *
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentData;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -87,49 +79,41 @@ abstract public function getPdf();
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $_mediaDirectory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $_rootDirectory;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $_pdfConfig;
 
     /**
      * @var \Magento\Sales\Model\Order\Pdf\Total\Factory
-     * @since 2.0.0
      */
     protected $_pdfTotalFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Pdf\ItemsFactory
-     * @since 2.0.0
      */
     protected $_pdfItemsFactory;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Renderer
-     * @since 2.0.0
      */
     protected $addressRenderer;
 
@@ -146,7 +130,6 @@ abstract public function getPdf();
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentData,
@@ -188,7 +171,6 @@ public function __construct(
      * @param  \Zend_Pdf_Resource_Font $font
      * @param  float $fontSize Font size in points
      * @return float
-     * @since 2.0.0
      */
     public function widthForStringUsingFontSize($string, $font, $fontSize)
     {
@@ -222,7 +204,6 @@ public function widthForStringUsingFontSize($string, $font, $fontSize)
      * @param  int $fontSize
      * @param  int $padding
      * @return int
-     * @since 2.0.0
      */
     public function getAlignRight($string, $x, $columnWidth, \Zend_Pdf_Resource_Font $font, $fontSize, $padding = 5)
     {
@@ -239,7 +220,6 @@ public function getAlignRight($string, $x, $columnWidth, \Zend_Pdf_Resource_Font
      * @param  \Zend_Pdf_Resource_Font $font
      * @param  int $fontSize
      * @return int
-     * @since 2.0.0
      */
     public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Font $font, $fontSize)
     {
@@ -254,7 +234,6 @@ public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Fon
      * @param null $store
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function insertLogo(&$page, $store = null)
     {
@@ -309,7 +288,6 @@ protected function insertLogo(&$page, $store = null)
      * @param \Zend_Pdf_Page &$page
      * @param null $store
      * @return void
-     * @since 2.0.0
      */
     protected function insertAddress(&$page, $store = null)
     {
@@ -347,7 +325,6 @@ protected function insertAddress(&$page, $store = null)
      *
      * @param  string $address
      * @return array
-     * @since 2.0.0
      */
     protected function _formatAddress($address)
     {
@@ -369,7 +346,6 @@ protected function _formatAddress($address)
      * @param  array $address
      * @return int Height
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _calcAddressHeight($address)
     {
@@ -398,7 +374,6 @@ protected function _calcAddressHeight($address)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function insertOrder(&$page, $obj, $putOrderId = true)
     {
@@ -642,7 +617,6 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
      * @param  \Zend_Pdf_Page $page
      * @param  string $text
      * @return void
-     * @since 2.0.0
      */
     public function insertDocumentNumber(\Zend_Pdf_Page $page, $text)
     {
@@ -658,7 +632,6 @@ public function insertDocumentNumber(\Zend_Pdf_Page $page, $text)
      * @param  array $a
      * @param  array $b
      * @return int
-     * @since 2.0.0
      */
     protected function _sortTotalsList($a, $b)
     {
@@ -677,7 +650,6 @@ protected function _sortTotalsList($a, $b)
      * Return total list
      *
      * @return \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal[] Array of totals
-     * @since 2.0.0
      */
     protected function _getTotalsList()
     {
@@ -700,7 +672,6 @@ protected function _getTotalsList()
      * @param  \Zend_Pdf_Page $page
      * @param  \Magento\Sales\Model\AbstractModel $source
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     protected function insertTotals($page, $source)
     {
@@ -743,7 +714,6 @@ protected function insertTotals($page, $source)
      *
      * @param  \Magento\Framework\DataObject $item
      * @return array
-     * @since 2.0.0
      */
     protected function _parseItemDescription($item)
     {
@@ -760,7 +730,6 @@ protected function _parseItemDescription($item)
      * Before getPdf processing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _beforeGetPdf()
     {
@@ -771,7 +740,6 @@ protected function _beforeGetPdf()
      * After getPdf processing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterGetPdf()
     {
@@ -784,7 +752,6 @@ protected function _afterGetPdf()
      * @param  array|string $value
      * @param  \Magento\Sales\Model\Order $order
      * @return string
-     * @since 2.0.0
      */
     protected function _formatOptionValue($value, $order)
     {
@@ -810,7 +777,6 @@ protected function _formatOptionValue($value, $order)
      *
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     protected function _initRenderer($type)
     {
@@ -826,7 +792,6 @@ protected function _initRenderer($type)
      * @param  string $type
      * @return \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getRenderer($type)
     {
@@ -852,7 +817,6 @@ protected function _getRenderer($type)
      *
      * @param  string $type
      * @return \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-     * @since 2.0.0
      */
     public function getRenderer($type)
     {
@@ -866,7 +830,6 @@ public function getRenderer($type)
      * @param  \Zend_Pdf_Page $page
      * @param  \Magento\Sales\Model\Order $order
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     protected function _drawItem(\Magento\Framework\DataObject $item, \Zend_Pdf_Page $page, \Magento\Sales\Model\Order $order)
     {
@@ -889,7 +852,6 @@ protected function _drawItem(\Magento\Framework\DataObject $item, \Zend_Pdf_Page
      * @param  \Zend_Pdf_Page $object
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontRegular($object, $size = 7)
     {
@@ -906,7 +868,6 @@ protected function _setFontRegular($object, $size = 7)
      * @param  \Zend_Pdf_Page $object
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontBold($object, $size = 7)
     {
@@ -923,7 +884,6 @@ protected function _setFontBold($object, $size = 7)
      * @param  \Zend_Pdf_Page $object
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontItalic($object, $size = 7)
     {
@@ -939,7 +899,6 @@ protected function _setFontItalic($object, $size = 7)
      *
      * @param  \Zend_Pdf $pdf
      * @return $this
-     * @since 2.0.0
      */
     protected function _setPdf(\Zend_Pdf $pdf)
     {
@@ -952,7 +911,6 @@ protected function _setPdf(\Zend_Pdf $pdf)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     protected function _getPdf()
     {
@@ -968,7 +926,6 @@ protected function _getPdf()
      *
      * @param  array $settings
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     public function newPage(array $settings = [])
     {
@@ -1007,7 +964,6 @@ public function newPage(array $settings = [])
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSettings = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Config.php b/app/code/Magento/Sales/Model/Order/Pdf/Config.php
index a328749a741cc..fb52ed60653e0 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Config.php
@@ -9,19 +9,16 @@
 
 /**
  * Class Config
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\Config\DataInterface
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
     /**
      * @param \Magento\Framework\Config\DataInterface $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\DataInterface $dataStorage)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Config\DataInterface $dataStorage
      *
      * @param string $pageType
      * @return array
-     * @since 2.0.0
      */
     public function getRenderersPerProduct($pageType)
     {
@@ -44,7 +40,6 @@ public function getRenderersPerProduct($pageType)
      * Get list of settings for showing totals in PDF
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Config/Converter.php b/app/code/Magento/Sales/Model/Order/Pdf/Config/Converter.php
index daab32f4bcf8b..8252059e9970e 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Config/Converter.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Pdf\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Config/Reader.php b/app/code/Magento/Sales/Model/Order/Pdf/Config/Reader.php
index 1ab8b773c19c4..75ad8638ab48d 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Config/Reader.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Pdf\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/renderers/page' => 'type',
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Config/SchemaLocator.php b/app/code/Magento/Sales/Model/Order/Pdf/Config/SchemaLocator.php
index f0e68c0ffc26b..d95c294360dcb 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Config/SchemaLocator.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Pdf\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,7 +19,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged configs
      *
      * @var string
-     * @since 2.0.0
      */
     private $_schema;
 
@@ -28,13 +26,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for individual configs
      *
      * @var string
-     * @since 2.0.0
      */
     private $_schemaFile;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -54,7 +49,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index 47b407d72c828..6e2265315245d 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -8,13 +8,11 @@
 /**
  * Sales Order Creditmemo PDF model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Creditmemo extends AbstractPdf
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -35,7 +33,6 @@ class Creditmemo extends AbstractPdf
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @internal param \Magento\Framework\TranslateInterface $translate
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentData,
@@ -74,7 +71,6 @@ public function __construct(
      *
      * @param  \Zend_Pdf_Page $page
      * @return void
-     * @since 2.0.0
      */
     protected function _drawHeader(\Zend_Pdf_Page $page)
     {
@@ -137,7 +133,6 @@ protected function _drawHeader(\Zend_Pdf_Page $page)
      *
      * @param  array $creditmemos
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     public function getPdf($creditmemos = [])
     {
@@ -198,7 +193,6 @@ public function getPdf($creditmemos = [])
      *
      * @param  array $settings
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     public function newPage(array $settings = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index 9fe1bebbc1d0e..2912969a99718 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -10,19 +10,16 @@
 /**
  * Sales Order Invoice PDF model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Invoice extends AbstractPdf
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -42,7 +39,6 @@ class Invoice extends AbstractPdf
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentData,
@@ -81,7 +77,6 @@ public function __construct(
      *
      * @param \Zend_Pdf_Page $page
      * @return void
-     * @since 2.0.0
      */
     protected function _drawHeader(\Zend_Pdf_Page $page)
     {
@@ -119,7 +114,6 @@ protected function _drawHeader(\Zend_Pdf_Page $page)
      *
      * @param array|Collection $invoices
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     public function getPdf($invoices = [])
     {
@@ -180,7 +174,6 @@ public function getPdf($invoices = [])
      *
      * @param  array $settings
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     public function newPage(array $settings = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index 7ec797fe0242e..a18c50a2b5584 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
 {
@@ -20,7 +19,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Order model
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
@@ -28,7 +26,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Source model (invoice, shipment, creditmemo)
      *
      * @var \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -36,7 +33,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Item object
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_item;
 
@@ -44,7 +40,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Pdf object
      *
      * @var \Magento\Sales\Model\Order\Pdf\AbstractPdf
-     * @since 2.0.0
      */
     protected $_pdf;
 
@@ -52,7 +47,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Pdf current page
      *
      * @var \Zend_Pdf_Page
-     * @since 2.0.0
      */
     protected $_pdfPage;
 
@@ -60,19 +54,16 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $_rootDirectory;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
@@ -85,7 +76,6 @@ abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -108,7 +98,6 @@ public function __construct(
      *
      * @param  \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -121,7 +110,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      *
      * @param  \Magento\Framework\Model\AbstractModel $source
      * @return $this
-     * @since 2.0.0
      */
     public function setSource(\Magento\Framework\Model\AbstractModel $source)
     {
@@ -134,7 +122,6 @@ public function setSource(\Magento\Framework\Model\AbstractModel $source)
      *
      * @param  \Magento\Framework\DataObject $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem(\Magento\Framework\DataObject $item)
     {
@@ -147,7 +134,6 @@ public function setItem(\Magento\Framework\DataObject $item)
      *
      * @param  \Magento\Sales\Model\Order\Pdf\AbstractPdf $pdf
      * @return $this
-     * @since 2.0.0
      */
     public function setPdf(\Magento\Sales\Model\Order\Pdf\AbstractPdf $pdf)
     {
@@ -160,7 +146,6 @@ public function setPdf(\Magento\Sales\Model\Order\Pdf\AbstractPdf $pdf)
      *
      * @param  \Zend_Pdf_Page $page
      * @return $this
-     * @since 2.0.0
      */
     public function setPage(\Zend_Pdf_Page $page)
     {
@@ -173,7 +158,6 @@ public function setPage(\Zend_Pdf_Page $page)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -188,7 +172,6 @@ public function getOrder()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -203,7 +186,6 @@ public function getSource()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -218,7 +200,6 @@ public function getItem()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Sales\Model\Order\Pdf\AbstractPdf
-     * @since 2.0.0
      */
     public function getPdf()
     {
@@ -233,7 +214,6 @@ public function getPdf()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     public function getPage()
     {
@@ -247,7 +227,6 @@ public function getPage()
      * Draw item line
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function draw();
 
@@ -256,7 +235,6 @@ abstract public function draw();
      *
      * @param array|string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _formatOptionValue($value)
     {
@@ -291,7 +269,6 @@ protected function _formatOptionValue($value)
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItemPricesForDisplay()
     {
@@ -332,7 +309,6 @@ public function getItemPricesForDisplay()
      * Retrieve item options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItemOptions()
     {
@@ -357,7 +333,6 @@ public function getItemOptions()
      *
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontRegular($size = 7)
     {
@@ -373,7 +348,6 @@ protected function _setFontRegular($size = 7)
      *
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontBold($size = 7)
     {
@@ -389,7 +363,6 @@ protected function _setFontBold($size = 7)
      *
      * @param  int $size
      * @return \Zend_Pdf_Resource_Font
-     * @since 2.0.0
      */
     protected function _setFontItalic($size = 7)
     {
@@ -405,7 +378,6 @@ protected function _setFontItalic($size = 7)
      *
      * @param mixed $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getSku($item)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 1d4bbffcc3364..11908864236f6 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales Order Creditmemo Pdf default items renderer
- * @since 2.0.0
  */
 class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
 {
@@ -15,7 +14,6 @@ class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractIte
      * Core string
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -29,7 +27,6 @@ class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractIte
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Draw process
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index faa341d8ea569..bb6078e425900 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales Order Invoice Pdf default items renderer
- * @since 2.0.0
  */
 class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
 {
@@ -15,7 +14,6 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * Core string
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -29,7 +27,6 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Draw item line
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index 937d9a950ebfa..0e6f345e19bc3 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales Order Shipment Pdf default items renderer
- * @since 2.0.0
  */
 class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
 {
@@ -15,7 +14,6 @@ class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * Core string
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -29,7 +27,6 @@ class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -59,7 +56,6 @@ public function __construct(
      * Draw item line
      *
      * @return void
-     * @since 2.0.0
      */
     public function draw()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/ItemsFactory.php b/app/code/Magento/Sales/Model/Order/Pdf/ItemsFactory.php
index 8905cd003be93..81abce2854b1f 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/ItemsFactory.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/ItemsFactory.php
@@ -9,7 +9,6 @@
  * Factory class for \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
  *
  * @internal
- * @since 2.0.0
  */
 class ItemsFactory
 {
@@ -17,7 +16,6 @@ class ItemsFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -25,7 +23,6 @@ class ItemsFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $instanceName
      * @param array $data
      * @return \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
-     * @since 2.0.0
      */
     public function get($instanceName, array $data = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index fb493ce2b8443..be74efda2d265 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -8,19 +8,16 @@
 /**
  * Sales Order Shipment PDF model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Shipment extends AbstractPdf
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -40,7 +37,6 @@ class Shipment extends AbstractPdf
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentData,
@@ -79,7 +75,6 @@ public function __construct(
      *
      * @param  \Zend_Pdf_Page $page
      * @return void
-     * @since 2.0.0
      */
     protected function _drawHeader(\Zend_Pdf_Page $page)
     {
@@ -111,7 +106,6 @@ protected function _drawHeader(\Zend_Pdf_Page $page)
      *
      * @param \Magento\Sales\Model\Order\Shipment[] $shipments
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     public function getPdf($shipments = [])
     {
@@ -169,7 +163,6 @@ public function getPdf($shipments = [])
      *
      * @param  array $settings
      * @return \Zend_Pdf_Page
-     * @since 2.0.0
      */
     public function newPage(array $settings = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
index 040e00f0586c9..5cfd864c71ccd 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -12,25 +12,21 @@
  * Sales Order Total PDF model
  *
  * @method \Magento\Sales\Model\Order getOrder()
- * @since 2.0.0
  */
 class DefaultTotal extends \Magento\Framework\DataObject
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxHelper;
 
     /**
      * @var \Magento\Tax\Model\Calculation
-     * @since 2.0.0
      */
     protected $_taxCalculation;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory
-     * @since 2.0.0
      */
     protected $_taxOrdersFactory;
 
@@ -41,7 +37,6 @@ class DefaultTotal extends \Magento\Framework\DataObject
      * @param \Magento\Tax\Model\Calculation $taxCalculation
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $ordersFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxHelper,
@@ -66,7 +61,6 @@ public function __construct(
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
@@ -99,7 +93,6 @@ public function getTotalsForDisplay()
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getFullTaxInfo()
     {
@@ -148,7 +141,6 @@ public function getFullTaxInfo()
      * Check if we can display total information in PDF
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canDisplay()
     {
@@ -160,7 +152,6 @@ public function canDisplay()
      * Get Total amount from source
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -171,7 +162,6 @@ public function getAmount()
      * Get title description from source
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getTitleDescription()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
index ac8fb9c2f0f76..7f22a0c29cb84 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Sales\Model\Order\Pdf\Total\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -22,13 +20,11 @@ class Factory
      * Default total model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultTotalModel = \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal::class;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($class = null, $arguments = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/RefundAdapter.php b/app/code/Magento/Sales/Model/Order/RefundAdapter.php
index 7ae21f2eed487..8a20738b0e71b 100644
--- a/app/code/Magento/Sales/Model/Order/RefundAdapter.php
+++ b/app/code/Magento/Sales/Model/Order/RefundAdapter.php
@@ -11,19 +11,19 @@
 
 /**
  * @inheritdoc
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundAdapter implements RefundAdapterInterface
 {
     /**
      * @var RefundOperation
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $refundOperation;
 
     /**
      * @param RefundOperation $refundOperation
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         RefundOperation $refundOperation
@@ -33,7 +33,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function refund(
         CreditmemoInterface $creditmemo,
diff --git a/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php b/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php
index 951b39109fc1b..5870c04ff4147 100644
--- a/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php
+++ b/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php
@@ -13,7 +13,7 @@
  * Can be used as extension point.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface RefundAdapterInterface
 {
@@ -22,7 +22,7 @@ interface RefundAdapterInterface
      * @param OrderInterface $order
      * @param bool $isOnline
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function refund(
         CreditmemoInterface $creditmemo,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index f2187a5923f27..638b4f24a4f90 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -23,7 +23,6 @@
  * @method bool getCustomerNoteNotify()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Shipment extends AbstractModel implements EntityInterface, ShipmentInterface
 {
@@ -52,55 +51,46 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
      * Order entity type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $entityType = 'shipment';
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'shipment';
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Item\CollectionFactory
-     * @since 2.0.0
      */
     protected $_shipmentItemCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory
-     * @since 2.0.0
      */
     protected $_trackCollectionFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment\CommentFactory
-     * @since 2.0.0
      */
     protected $_commentFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\CollectionFactory
-     * @since 2.0.0
      */
     protected $_commentCollectionFactory;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
@@ -118,7 +108,6 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -154,7 +143,6 @@ public function __construct(
      * Initialize shipment resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -166,7 +154,6 @@ protected function _construct()
      *
      * @param string $incrementId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIncrementId($incrementId)
     {
@@ -184,7 +171,6 @@ public function loadByIncrementId($incrementId)
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -197,7 +183,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      * Retrieve hash code of current order
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProtectCode()
     {
@@ -208,7 +193,6 @@ public function getProtectCode()
      * Retrieve the order the shipment for created for
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -224,7 +208,6 @@ public function getOrder()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -235,7 +218,6 @@ public function getEntityType()
      * Retrieve billing address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -246,7 +228,6 @@ public function getBillingAddress()
      * Retrieve shipping address
      *
      * @return Address
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -258,7 +239,6 @@ public function getShippingAddress()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function register()
     {
@@ -290,7 +270,6 @@ public function register()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemsCollection()
     {
@@ -309,7 +288,6 @@ public function getItemsCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllItems()
     {
@@ -325,7 +303,6 @@ public function getAllItems()
     /**
      * @param string|int $itemId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Item
-     * @since 2.0.0
      */
     public function getItemById($itemId)
     {
@@ -340,7 +317,6 @@ public function getItemById($itemId)
     /**
      * @param \Magento\Sales\Model\Order\Shipment\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
     {
@@ -355,7 +331,6 @@ public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
      * Retrieve tracks collection.
      *
      * @return \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection
-     * @since 2.0.0
      */
     public function getTracksCollection()
     {
@@ -373,7 +348,6 @@ public function getTracksCollection()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllTracks()
     {
@@ -389,7 +363,6 @@ public function getAllTracks()
     /**
      * @param string|int $trackId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Track
-     * @since 2.0.0
      */
     public function getTrackById($trackId)
     {
@@ -404,7 +377,6 @@ public function getTrackById($trackId)
     /**
      * @param \Magento\Sales\Model\Order\Shipment\Track $track
      * @return $this
-     * @since 2.0.0
      */
     public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
     {
@@ -438,7 +410,6 @@ public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
      * @param bool $notify
      * @param bool $visibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
@@ -464,7 +435,6 @@ public function addComment($comment, $notify = false, $visibleOnFront = false)
      *
      * @param bool $reload
      * @return \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\Collection
-     * @since 2.0.0
      */
     public function getCommentsCollection($reload = false)
     {
@@ -487,7 +457,6 @@ public function getCommentsCollection($reload = false)
      * Retrieve store model instance
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -499,7 +468,6 @@ public function getStore()
      *
      * @param string $label label representation (image or pdf file)
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingLabel($label)
     {
@@ -511,7 +479,6 @@ public function setShippingLabel($label)
      * Get shipping label and decode by db adapter
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getShippingLabel()
     {
@@ -528,7 +495,6 @@ public function getShippingLabel()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncrementId()
     {
@@ -541,7 +507,6 @@ public function getIncrementId()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPackages()
     {
@@ -551,7 +516,6 @@ public function getPackages()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setPackages(array $packages = null)
     {
@@ -562,7 +526,6 @@ public function setPackages(array $packages = null)
      * Returns items
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -585,7 +548,6 @@ public function getItems()
      *
      * @param mixed $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems($items)
     {
@@ -596,7 +558,6 @@ public function setItems($items)
      * Returns tracks
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[]
-     * @since 2.0.0
      */
     public function getTracks()
     {
@@ -619,7 +580,6 @@ public function getTracks()
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface[] $tracks
      * @return $this
-     * @since 2.0.0
      */
     public function setTracks($tracks)
     {
@@ -630,7 +590,6 @@ public function setTracks($tracks)
      * Returns billing_address_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getBillingAddressId()
     {
@@ -641,7 +600,6 @@ public function getBillingAddressId()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -650,7 +608,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -661,7 +618,6 @@ public function setCreatedAt($createdAt)
      * Returns customer_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -672,7 +628,6 @@ public function getCustomerId()
      * Returns email_sent
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEmailSent()
     {
@@ -683,7 +638,6 @@ public function getEmailSent()
      * Returns order_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -694,7 +648,6 @@ public function getOrderId()
      * Returns shipment_status
      *
      * @return int
-     * @since 2.0.0
      */
     public function getShipmentStatus()
     {
@@ -705,7 +658,6 @@ public function getShipmentStatus()
      * Returns shipping_address_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getShippingAddressId()
     {
@@ -716,7 +668,6 @@ public function getShippingAddressId()
      * Returns store_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -727,7 +678,6 @@ public function getStoreId()
      * Returns total_qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalQty()
     {
@@ -738,7 +688,6 @@ public function getTotalQty()
      * Returns total_weight
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalWeight()
     {
@@ -749,7 +698,6 @@ public function getTotalWeight()
      * Returns updated_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -760,7 +708,6 @@ public function getUpdatedAt()
      * Returns comments
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentInterface[]
-     * @since 2.0.0
      */
     public function getComments()
     {
@@ -785,7 +732,6 @@ public function getComments()
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
-     * @since 2.0.0
      */
     public function setComments($comments = null)
     {
@@ -794,7 +740,6 @@ public function setComments($comments = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreId($id)
     {
@@ -803,7 +748,6 @@ public function setStoreId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalWeight($totalWeight)
     {
@@ -812,7 +756,6 @@ public function setTotalWeight($totalWeight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTotalQty($qty)
     {
@@ -821,7 +764,6 @@ public function setTotalQty($qty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmailSent($emailSent)
     {
@@ -830,7 +772,6 @@ public function setEmailSent($emailSent)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -839,7 +780,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomerId($id)
     {
@@ -848,7 +788,6 @@ public function setCustomerId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShippingAddressId($id)
     {
@@ -857,7 +796,6 @@ public function setShippingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBillingAddressId($id)
     {
@@ -866,7 +804,6 @@ public function setBillingAddressId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setShipmentStatus($shipmentStatus)
     {
@@ -875,7 +812,6 @@ public function setShipmentStatus($shipmentStatus)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIncrementId($id)
     {
@@ -884,7 +820,6 @@ public function setIncrementId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -895,7 +830,6 @@ public function setUpdatedAt($timestamp)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\ShipmentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -907,7 +841,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index a2fd8874122a6..0dbfe0fff9a42 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -12,7 +12,6 @@
 /**
  * @method \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment getResource()
- * @since 2.0.0
  */
 class Comment extends AbstractModel implements ShipmentCommentInterface
 {
@@ -20,13 +19,11 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
      * Shipment instance
      *
      * @var \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     protected $_shipment;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -40,7 +37,6 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -68,7 +64,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -82,7 +77,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return $this
-     * @since 2.0.0
      */
     public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
     {
@@ -96,7 +90,6 @@ public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
      * @codeCoverageIgnore
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -107,7 +100,6 @@ public function getShipment()
      * Get store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -123,7 +115,6 @@ public function getStore()
      * Returns comment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -134,7 +125,6 @@ public function getComment()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -143,7 +133,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -154,7 +143,6 @@ public function setCreatedAt($createdAt)
      * Returns is_customer_notified
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsCustomerNotified()
     {
@@ -165,7 +153,6 @@ public function getIsCustomerNotified()
      * Returns is_visible_on_front
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -176,7 +163,6 @@ public function getIsVisibleOnFront()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -185,7 +171,6 @@ public function getParentId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -194,7 +179,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($isCustomerNotified)
     {
@@ -203,7 +187,6 @@ public function setIsCustomerNotified($isCustomerNotified)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -212,7 +195,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComment($comment)
     {
@@ -223,7 +205,6 @@ public function setComment($comment)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -235,7 +216,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCommentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
index 29b941546e317..3ccc65bf27512 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
@@ -17,7 +16,6 @@ class Validator
      * Required field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'parent_id' => 'Parent Shipment Id',
@@ -29,7 +27,6 @@ class Validator
      *
      * @param \Magento\Sales\Model\Order\Shipment\Comment $comment
      * @return array
-     * @since 2.0.0
      */
     public function validate(Comment $comment)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/CommentCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/CommentCreation.php
index 3c1486ab4f470..b2f3881a86d76 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/CommentCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/CommentCreation.php
@@ -9,25 +9,25 @@
 
 /**
  * Class CommentCreation
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CommentCreation implements ShipmentCommentCreationInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $comment;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $isVisibleOnFront;
 
@@ -35,7 +35,7 @@ class CommentCreation implements ShipmentCommentCreationInterface
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -47,7 +47,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCommentCreationExtensionInterface $extensionAttributes
@@ -60,7 +60,7 @@ public function setExtensionAttributes(
      * Gets the comment for the invoice.
      *
      * @return string Comment.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getComment()
     {
@@ -72,7 +72,7 @@ public function getComment()
      *
      * @param string $comment
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setComment($comment)
     {
@@ -84,7 +84,7 @@ public function setComment($comment)
      * Gets the is-visible-on-storefront flag value for the invoice.
      *
      * @return int Is-visible-on-storefront flag value.
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getIsVisibleOnFront()
     {
@@ -96,7 +96,7 @@ public function getIsVisibleOnFront()
      *
      * @param int $isVisibleOnFront
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/CreationArguments.php b/app/code/Magento/Sales/Model/Order/Shipment/CreationArguments.php
index d8a6dc4424826..419f3c1823db0 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/CreationArguments.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/CreationArguments.php
@@ -9,19 +9,19 @@
  * Creation arguments for Shipment.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CreationArguments implements \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -30,7 +30,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index 49850ba382914..add6197b63b96 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -17,37 +17,31 @@
  * @method \Magento\Sales\Model\ResourceModel\Order\Shipment\Item _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Shipment\Item getResource()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Item extends AbstractModel implements ShipmentItemInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_shipment_item';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'shipment_item';
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment|null
-     * @since 2.0.0
      */
     protected $_shipment = null;
 
     /**
      * @var \Magento\Sales\Model\Order\Item|null
-     * @since 2.0.0
      */
     protected $_orderItem = null;
 
     /**
      * @var \Magento\Sales\Model\Order\ItemFactory
-     * @since 2.0.0
      */
     protected $_orderItemFactory;
 
@@ -60,7 +54,6 @@ class Item extends AbstractModel implements ShipmentItemInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -88,7 +81,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -102,7 +94,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return $this
-     * @since 2.0.0
      */
     public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
     {
@@ -116,7 +107,6 @@ public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
      * @codeCoverageIgnore
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -128,7 +118,6 @@ public function getShipment()
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
     {
@@ -141,7 +130,6 @@ public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
      * Retrieve order item instance
      *
      * @return \Magento\Sales\Model\Order\Item
-     * @since 2.0.0
      */
     public function getOrderItem()
     {
@@ -161,7 +149,6 @@ public function getOrderItem()
      * @param float $qty
      * @return \Magento\Sales\Model\Order\Invoice\Item
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -174,7 +161,6 @@ public function setQty($qty)
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function register()
     {
@@ -188,7 +174,6 @@ public function register()
      * Returns additional_data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdditionalData()
     {
@@ -199,7 +184,6 @@ public function getAdditionalData()
      * Returns description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -210,7 +194,6 @@ public function getDescription()
      * Returns name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -221,7 +204,6 @@ public function getName()
      * Returns order_item_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderItemId()
     {
@@ -232,7 +214,6 @@ public function getOrderItemId()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -243,7 +224,6 @@ public function getParentId()
      * Returns price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -254,7 +234,6 @@ public function getPrice()
      * Returns product_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -265,7 +244,6 @@ public function getProductId()
      * Returns qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -276,7 +254,6 @@ public function getQty()
      * Returns row_total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -287,7 +264,6 @@ public function getRowTotal()
      * Returns sku
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSku()
     {
@@ -298,7 +274,6 @@ public function getSku()
      * Returns weight
      *
      * @return float
-     * @since 2.0.0
      */
     public function getWeight()
     {
@@ -307,7 +282,6 @@ public function getWeight()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -316,7 +290,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRowTotal($amount)
     {
@@ -325,7 +298,6 @@ public function setRowTotal($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -334,7 +306,6 @@ public function setPrice($price)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeight($weight)
     {
@@ -343,7 +314,6 @@ public function setWeight($weight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setProductId($id)
     {
@@ -352,7 +322,6 @@ public function setProductId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderItemId($id)
     {
@@ -361,7 +330,6 @@ public function setOrderItemId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAdditionalData($additionalData)
     {
@@ -370,7 +338,6 @@ public function setAdditionalData($additionalData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -379,7 +346,6 @@ public function setDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -388,7 +354,6 @@ public function setName($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSku($sku)
     {
@@ -399,7 +364,6 @@ public function setSku($sku)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -411,7 +375,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
index a67b32936e0e0..7bd824ede0f0c 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
@@ -9,25 +9,25 @@
 
 /**
  * Class ItemCreation
- * @since 2.2.0
+ * @since 2.1.2
  */
 class ItemCreation implements ShipmentItemCreationInterface
 {
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderItemId;
 
     /**
      * @var float
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $qty;
 
     /**
      * @var \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
@@ -35,7 +35,7 @@ class ItemCreation implements ShipmentItemCreationInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getOrderItemId()
     {
@@ -44,7 +44,7 @@ public function getOrderItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setOrderItemId($orderItemId)
     {
@@ -53,7 +53,7 @@ public function setOrderItemId($orderItemId)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getQty()
     {
@@ -62,7 +62,7 @@ public function getQty()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setQty($qty)
     {
@@ -73,7 +73,7 @@ public function setQty($qty)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface|null
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -85,7 +85,7 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentItemCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Notifier.php b/app/code/Magento/Sales/Model/Order/Shipment/Notifier.php
index df91f4f00871a..3a52c76b70487 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Notifier.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Notifier.php
@@ -9,19 +9,19 @@
  * Shipment notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class Notifier implements \Magento\Sales\Model\Order\Shipment\NotifierInterface
 {
     /**
      * @var \Magento\Sales\Model\Order\Shipment\SenderInterface[]
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $senders;
 
     /**
      * @param \Magento\Sales\Model\Order\Shipment\SenderInterface[] $senders
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(array $senders = [])
     {
@@ -30,7 +30,7 @@ public function __construct(array $senders = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/NotifierInterface.php b/app/code/Magento/Sales/Model/Order/Shipment/NotifierInterface.php
index 33fcfdfa4515d..8748e01bb7916 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/NotifierInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/NotifierInterface.php
@@ -9,7 +9,7 @@
  * Interface for Shipment notifier.
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface NotifierInterface
 {
@@ -22,7 +22,7 @@ interface NotifierInterface
      * @param bool $forceSyncMode
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function notify(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
index 640225aa0b7ca..9ef6b3c129514 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
@@ -11,7 +11,7 @@
 /**
  * Class \Magento\Sales\Model\Order\Shipment\OrderRegistrar
  *
- * @since 2.2.0
+ * @since 2.1.2
  */
 class OrderRegistrar implements \Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface
 {
@@ -19,7 +19,7 @@ class OrderRegistrar implements \Magento\Sales\Model\Order\Shipment\OrderRegistr
      * @param OrderInterface $order
      * @param ShipmentInterface $shipment
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function register(OrderInterface $order, ShipmentInterface $shipment)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrarInterface.php b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrarInterface.php
index bbb80dc88df4d..9e7c003a84968 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrarInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrarInterface.php
@@ -14,7 +14,7 @@
  * Calculate order shipped data based on created shipment
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface OrderRegistrarInterface
 {
@@ -22,7 +22,7 @@ interface OrderRegistrarInterface
      * @param OrderInterface $order
      * @param ShipmentInterface $shipment
      * @return OrderInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function register(OrderInterface $order, ShipmentInterface $shipment);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Package.php b/app/code/Magento/Sales/Model/Order/Shipment/Package.php
index 5d74c0554c09d..7af2dda0c97ca 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Package.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Package.php
@@ -8,19 +8,19 @@
 /**
  * Class Package
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class Package implements \Magento\Sales\Api\Data\ShipmentPackageInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\ShipmentPackageExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -29,7 +29,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentPackageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/PackageCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/PackageCreation.php
index c6169d0ddfab9..79d878a3af797 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/PackageCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/PackageCreation.php
@@ -8,19 +8,19 @@
 /**
  * Class PackageCreation
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class PackageCreation implements \Magento\Sales\Api\Data\ShipmentPackageCreationInterface
 {
     /**
      * @var \Magento\Sales\Api\Data\ShipmentPackageCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -29,7 +29,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentPackageCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index 08269a4911c6c..78e7621961799 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -10,31 +10,31 @@
 
 /**
  * Email notification sender for Shipment.
- * @since 2.2.0
+ * @since 2.1.2
  */
 class EmailSender extends Sender implements SenderInterface
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $paymentHelper;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $shipmentResource;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $globalConfig;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $eventManager;
 
@@ -48,7 +48,7 @@ class EmailSender extends Sender implements SenderInterface
      * @param \Magento\Sales\Model\ResourceModel\Order\Shipment $shipmentResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Container\Template $templateContainer,
@@ -92,7 +92,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,7 +145,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/SenderInterface.php b/app/code/Magento/Sales/Model/Order/Shipment/SenderInterface.php
index 19e723af1117c..a213ca49f49b5 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/SenderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/SenderInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface for notification sender for Shipment.
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface SenderInterface
 {
@@ -20,7 +20,7 @@ interface SenderInterface
      * @param bool $forceSyncMode
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidator.php b/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidator.php
index 7499d7a10f634..6d94e006b4c97 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidator.php
@@ -9,20 +9,20 @@
 
 /**
  * Class ShipmentValidator
- * @since 2.2.0
+ * @since 2.1.2
  */
 class ShipmentValidator implements ShipmentValidatorInterface
 {
     /**
      * @var \Magento\Sales\Model\Validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $validator;
 
     /**
      * ShipmentValidator constructor.
      * @param \Magento\Sales\Model\Validator $validator
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(\Magento\Sales\Model\Validator $validator)
     {
@@ -31,7 +31,7 @@ public function __construct(\Magento\Sales\Model\Validator $validator)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(ShipmentInterface $entity, array $validators)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidatorInterface.php b/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidatorInterface.php
index 51f9c3fc115a0..68675a5a7e0c4 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/ShipmentValidatorInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * Interface ShipmentValidatorInterface
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ShipmentValidatorInterface
 {
@@ -21,7 +21,7 @@ interface ShipmentValidatorInterface
      * @param ValidatorInterface[] $validators
      * @return ValidatorResultInterface
      * @throws DocumentValidationException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate(ShipmentInterface $shipment, array $validators);
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index 21293c7967bf4..7857391ca445d 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -17,7 +17,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Track extends AbstractModel implements ShipmentTrackInterface
 {
@@ -28,31 +27,26 @@ class Track extends AbstractModel implements ShipmentTrackInterface
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment|null
-     * @since 2.0.0
      */
     protected $_shipment = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_track';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'track';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Sales\Api\ShipmentRepositoryInterface
-     * @since 2.0.0
      */
     protected $shipmentRepository;
 
@@ -67,7 +61,6 @@ class Track extends AbstractModel implements ShipmentTrackInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -97,7 +90,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -110,7 +102,6 @@ protected function _construct()
      * @codeCoverageIgnore
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNumber()
     {
@@ -124,7 +115,6 @@ public function getNumber()
      *
      * @param string $number
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setNumber($number)
     {
@@ -138,7 +128,6 @@ public function setNumber($number)
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return $this
-     * @since 2.0.0
      */
     public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
     {
@@ -151,7 +140,6 @@ public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
      *
      * @return \Magento\Sales\Model\Order\Shipment
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -170,7 +158,6 @@ public function getShipment()
      * Check whether custom carrier was used for this track
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCustom()
     {
@@ -181,7 +168,6 @@ public function isCustom()
      * Retrieve hash code of current order
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProtectCode()
     {
@@ -192,7 +178,6 @@ public function getProtectCode()
      * Get store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -206,7 +191,6 @@ public function getStore()
      * Get store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -220,7 +204,6 @@ public function getStoreId()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function addData(array $data)
     {
@@ -237,7 +220,6 @@ public function addData(array $data)
      * Returns track_number
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTrackNumber()
     {
@@ -248,7 +230,6 @@ public function getTrackNumber()
      * Returns carrier_code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierCode()
     {
@@ -259,7 +240,6 @@ public function getCarrierCode()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -268,7 +248,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -279,7 +258,6 @@ public function setCreatedAt($createdAt)
      * Returns description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -290,7 +268,6 @@ public function getDescription()
      * Returns order_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getOrderId()
     {
@@ -301,7 +278,6 @@ public function getOrderId()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -312,7 +288,6 @@ public function getParentId()
      * Returns qty
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty()
     {
@@ -323,7 +298,6 @@ public function getQty()
      * Returns title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -334,7 +308,6 @@ public function getTitle()
      * Returns updated_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -345,7 +318,6 @@ public function getUpdatedAt()
      * Returns weight
      *
      * @return float
-     * @since 2.0.0
      */
     public function getWeight()
     {
@@ -354,7 +326,6 @@ public function getWeight()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUpdatedAt($timestamp)
     {
@@ -363,7 +334,6 @@ public function setUpdatedAt($timestamp)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -372,7 +342,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setWeight($weight)
     {
@@ -381,7 +350,6 @@ public function setWeight($weight)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -390,7 +358,6 @@ public function setQty($qty)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setOrderId($id)
     {
@@ -399,7 +366,6 @@ public function setOrderId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTrackNumber($trackNumber)
     {
@@ -408,7 +374,6 @@ public function setTrackNumber($trackNumber)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -417,7 +382,6 @@ public function setDescription($description)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -426,7 +390,6 @@ public function setTitle($title)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCarrierCode($code)
     {
@@ -437,7 +400,6 @@ public function setCarrierCode($code)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -449,7 +411,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentTrackExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php b/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
index 453938aeb2012..ddd193f3c50fd 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
@@ -17,7 +16,6 @@ class Validator
      * Required field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'parent_id' => 'Parent Track Id',
@@ -31,7 +29,6 @@ class Validator
      *
      * @param \Magento\Sales\Model\Order\Shipment\Track $track
      * @return array
-     * @since 2.0.0
      */
     public function validate(Track $track)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/TrackCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/TrackCreation.php
index 075269cee6303..2f59da057ba19 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/TrackCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/TrackCreation.php
@@ -9,31 +9,31 @@
 
 /**
  * Class TrackCreation
- * @since 2.2.0
+ * @since 2.1.2
  */
 class TrackCreation implements ShipmentTrackCreationInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $trackNumber;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $title;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $carrierCode;
 
     /**
      * @var \Magento\Sales\Api\Data\ShipmentTrackCreationExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $extensionAttributes;
 
@@ -41,7 +41,7 @@ class TrackCreation implements ShipmentTrackCreationInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getTrackNumber()
     {
@@ -50,7 +50,7 @@ public function getTrackNumber()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setTrackNumber($trackNumber)
     {
@@ -60,7 +60,7 @@ public function setTrackNumber($trackNumber)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getTitle()
     {
@@ -69,7 +69,7 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setTitle($title)
     {
@@ -79,7 +79,7 @@ public function setTitle($title)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getCarrierCode()
     {
@@ -88,7 +88,7 @@ public function getCarrierCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setCarrierCode($carrierCode)
     {
@@ -98,7 +98,7 @@ public function setCarrierCode($carrierCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getExtensionAttributes()
     {
@@ -107,7 +107,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShipmentTrackCreationExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php b/app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php
index 763c7a31dd1ce..2abc8c535e302 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php
@@ -16,20 +16,20 @@
 
 /**
  * Class QuantityValidator
- * @since 2.2.0
+ * @since 2.1.2
  */
 class QuantityValidator implements ValidatorInterface
 {
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderRepository;
 
     /**
      * InvoiceValidator constructor.
      * @param OrderRepositoryInterface $orderRepository
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository
@@ -42,7 +42,7 @@ public function __construct(
      * @return array
      * @throws DocumentValidationException
      * @throws NoSuchEntityException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity)
     {
@@ -89,7 +89,7 @@ public function validate($entity)
     /**
      * @param OrderInterface $order
      * @return OrderItemInterface[]
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getOrderItems(OrderInterface $order)
     {
@@ -105,7 +105,7 @@ private function getOrderItems(OrderInterface $order)
      * @param Item $orderItem
      * @param int $qty
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isQtyAvailable(Item $orderItem, $qty)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Validation/TrackValidator.php b/app/code/Magento/Sales/Model/Order/Shipment/Validation/TrackValidator.php
index c0e32c4b4a1a9..85d459f51e4d7 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Validation/TrackValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Validation/TrackValidator.php
@@ -10,14 +10,14 @@
 
 /**
  * Class TrackRequiredField
- * @since 2.2.0
+ * @since 2.1.2
  */
 class TrackValidator implements ValidatorInterface
 {
     /**
      * @param object|ShipmentInterface $entity
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity)
     {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
index d152fb385d172..69af51b3dccaa 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
@@ -19,25 +19,25 @@
  * Class ShipmentDocumentFactory
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.2
  */
 class ShipmentDocumentFactory
 {
     /**
      * @var ShipmentFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $shipmentFactory;
 
     /**
      * @var TrackFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $trackFactory;
 
     /**
      * @var HydratorPool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $hydratorPool;
 
@@ -47,7 +47,7 @@ class ShipmentDocumentFactory
      * @param ShipmentFactory $shipmentFactory
      * @param HydratorPool $hydratorPool
      * @param TrackFactory $trackFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         ShipmentFactory $shipmentFactory,
@@ -70,7 +70,7 @@ public function __construct(
      * @param ShipmentPackageCreationInterface[] $packages
      * @param ShipmentCreationArgumentsInterface|null $arguments
      * @return ShipmentInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function create(
         OrderInterface $order,
@@ -105,7 +105,7 @@ public function create(
      * @param ShipmentInterface $shipment
      * @param ShipmentTrackCreationInterface[] $tracks
      * @return ShipmentInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $shipment, array $tracks)
     {
@@ -123,7 +123,7 @@ private function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $shipme
      *
      * @param ShipmentItemCreationInterface[] $items
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function itemsToArray(array $items = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index d946282b006e2..bd967b37a71a4 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -12,7 +12,6 @@
 
 /**
  * Factory class for @see \Magento\Sales\Api\Data\ShipmentInterface
- * @since 2.0.0
  */
 class ShipmentFactory
 {
@@ -20,7 +19,6 @@ class ShipmentFactory
      * Order converter.
      *
      * @var \Magento\Sales\Model\Convert\Order
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -28,7 +26,6 @@ class ShipmentFactory
      * Shipment track factory.
      *
      * @var \Magento\Sales\Model\Order\Shipment\TrackFactory
-     * @since 2.0.0
      */
     protected $trackFactory;
 
@@ -36,7 +33,6 @@ class ShipmentFactory
      * Instance name to create.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -54,7 +50,6 @@ class ShipmentFactory
      * @param \Magento\Sales\Model\Convert\OrderFactory $convertOrderFactory
      * @param \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\Convert\OrderFactory $convertOrderFactory,
@@ -75,7 +70,6 @@ public function __construct(
      * @param array $items
      * @param array|null $tracks
      * @return \Magento\Sales\Api\Data\ShipmentInterface
-     * @since 2.0.0
      */
     public function create(\Magento\Sales\Model\Order $order, array $items = [], $tracks = null)
     {
@@ -97,7 +91,6 @@ public function create(\Magento\Sales\Model\Order $order, array $items = [], $tr
      * @return \Magento\Sales\Api\Data\ShipmentInterface
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function prepareItems(
         \Magento\Sales\Api\Data\ShipmentInterface $shipment,
@@ -164,7 +157,6 @@ protected function prepareItems(
      * @param array $tracks
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Sales\Api\Data\ShipmentInterface
-     * @since 2.0.0
      */
     protected function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $shipment, array $tracks)
     {
@@ -193,7 +185,6 @@ protected function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $ship
      * @param array $items
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function canShipItem($item, array $items = [])
     {
@@ -242,7 +233,7 @@ protected function canShipItem($item, array $items = [])
      * @param Item $item
      * @param string|int|float $qty
      * @return float|int
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function castQty(\Magento\Sales\Model\Order\Item $item, $qty)
     {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
index 155c7c492f79d..23506a2ef1c2b 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
@@ -17,25 +17,21 @@
  * Repository class for @see \Magento\Sales\Api\Data\ShipmentInterface
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ShipmentRepository implements \Magento\Sales\Api\ShipmentRepositoryInterface
 {
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory = null;
 
     /**
      * @var \Magento\Sales\Api\Data\ShipmentInterface[]
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -49,7 +45,6 @@ class ShipmentRepository implements \Magento\Sales\Api\ShipmentRepositoryInterfa
      * @param Metadata $metadata
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metadata,
@@ -68,7 +63,6 @@ public function __construct(
      * @return \Magento\Sales\Api\Data\ShipmentInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -94,7 +88,6 @@ public function get($id)
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Sales\Api\Data\ShipmentInterface[]
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -112,7 +105,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Sales\Api\Data\ShipmentInterface $entity
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\ShipmentInterface $entity)
     {
@@ -132,7 +124,6 @@ public function delete(\Magento\Sales\Api\Data\ShipmentInterface $entity)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -147,7 +138,6 @@ public function deleteById($id)
      * @param \Magento\Sales\Api\Data\ShipmentInterface $entity
      * @return \Magento\Sales\Api\Data\ShipmentInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\ShipmentInterface $entity)
     {
@@ -165,7 +155,6 @@ public function save(\Magento\Sales\Api\Data\ShipmentInterface $entity)
      * Creates new shipment instance.
      *
      * @return \Magento\Sales\Api\Data\ShipmentInterface
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipping.php b/app/code/Magento/Sales/Model/Order/Shipping.php
index 1f9e033cbe57f..b8dbe1bd0fed0 100644
--- a/app/code/Magento/Sales/Model/Order/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Shipping.php
@@ -11,13 +11,13 @@
 /**
  * Class \Magento\Sales\Model\Order\Shipping
  *
- * @since 2.1.0
+ * @since 2.0.3
  */
 class Shipping extends AbstractExtensibleModel implements ShippingInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getAddress()
     {
@@ -26,7 +26,7 @@ public function getAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getMethod()
     {
@@ -35,7 +35,7 @@ public function getMethod()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getTotal()
     {
@@ -44,7 +44,7 @@ public function getTotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setAddress(\Magento\Sales\Api\Data\OrderAddressInterface $address)
     {
@@ -53,7 +53,7 @@ public function setAddress(\Magento\Sales\Api\Data\OrderAddressInterface $addres
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setMethod($method)
     {
@@ -62,7 +62,7 @@ public function setMethod($method)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setTotal(\Magento\Sales\Api\Data\TotalInterface $total)
     {
@@ -71,7 +71,7 @@ public function setTotal(\Magento\Sales\Api\Data\TotalInterface $total)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes()
     {
@@ -80,7 +80,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShippingExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/ShippingAssignment.php b/app/code/Magento/Sales/Model/Order/ShippingAssignment.php
index 9447640a83666..eacc957a350fa 100644
--- a/app/code/Magento/Sales/Model/Order/ShippingAssignment.php
+++ b/app/code/Magento/Sales/Model/Order/ShippingAssignment.php
@@ -11,13 +11,13 @@
 /**
  * Class \Magento\Sales\Model\Order\ShippingAssignment
  *
- * @since 2.1.0
+ * @since 2.0.3
  */
 class ShippingAssignment extends AbstractExtensibleModel implements ShippingAssignmentInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShipping()
     {
@@ -26,7 +26,7 @@ public function getShipping()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getItems()
     {
@@ -35,7 +35,7 @@ public function getItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getStockId()
     {
@@ -44,7 +44,7 @@ public function getStockId()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShipping(\Magento\Sales\Api\Data\ShippingInterface $shipping)
     {
@@ -53,7 +53,7 @@ public function setShipping(\Magento\Sales\Api\Data\ShippingInterface $shipping)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setItems(array $items)
     {
@@ -62,7 +62,7 @@ public function setItems(array $items)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setStockId($stockId = null)
     {
@@ -71,7 +71,7 @@ public function setStockId($stockId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes()
     {
@@ -80,7 +80,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/ShippingAssignmentBuilder.php b/app/code/Magento/Sales/Model/Order/ShippingAssignmentBuilder.php
index 32fa4cd01fd8a..a9200d2a11a21 100644
--- a/app/code/Magento/Sales/Model/Order/ShippingAssignmentBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/ShippingAssignmentBuilder.php
@@ -12,31 +12,31 @@
 /**
  * Class ShippingAssignmentBuilder
  * @package Magento\Sales\Model\Order
- * @since 2.1.0
+ * @since 2.0.3
  */
 class ShippingAssignmentBuilder
 {
     /**
      * @var OrderFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $orderFactory;
 
     /**
      * @var ShippingAssignmentInterfaceFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $shippingAssignmentFactory;
 
     /**
      * @var ShippingBuilderFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $shippingBuilderFactory;
 
     /**
      * @var int|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $orderId = null;
 
@@ -46,7 +46,7 @@ class ShippingAssignmentBuilder
      * @param OrderFactory $orderFactory
      * @param ShippingAssignmentInterfaceFactory $shippingAssignmentFactory
      * @param ShippingBuilderFactory $shippingBuilderFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(
         OrderFactory $orderFactory,
@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @param int $orderId
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setOrderId($orderId)
     {
@@ -70,7 +70,7 @@ public function setOrderId($orderId)
 
     /**
      * @return int|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function getOrderId()
     {
@@ -79,7 +79,7 @@ private function getOrderId()
 
     /**
      * @return ShippingAssignmentInterface[]|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function create()
     {
diff --git a/app/code/Magento/Sales/Model/Order/ShippingBuilder.php b/app/code/Magento/Sales/Model/Order/ShippingBuilder.php
index 6a5ae24fff33c..f7995e8e71e8e 100644
--- a/app/code/Magento/Sales/Model/Order/ShippingBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/ShippingBuilder.php
@@ -15,37 +15,37 @@
 /**
  * Class ShippingBuilder
  * @package Magento\Sales\Model\Order
- * @since 2.1.0
+ * @since 2.0.3
  */
 class ShippingBuilder
 {
     /**
      * @var int|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $orderId = null;
 
     /**
      * @var Order
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $order;
 
     /**
      * @var OrderFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $orderFactory;
 
     /**
      * @var ShippingInterfaceFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $shippingFactory;
 
     /**
      * @var TotalInterfaceFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $totalFactory;
 
@@ -55,7 +55,7 @@ class ShippingBuilder
      * @param OrderFactory $orderFactory
      * @param ShippingInterfaceFactory $shippingFactory
      * @param TotalInterfaceFactory $totalFactory
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(
         OrderFactory $orderFactory,
@@ -70,7 +70,7 @@ public function __construct(
     /**
      * @param int $orderId
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setOrderId($orderId)
     {
@@ -79,7 +79,7 @@ public function setOrderId($orderId)
 
     /**
      * @return ShippingInterface|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function create()
     {
@@ -102,7 +102,7 @@ public function create()
 
     /**
      * @return int|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function getOrderId()
     {
@@ -111,7 +111,7 @@ private function getOrderId()
 
     /**
      * @return TotalInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function getTotal()
     {
diff --git a/app/code/Magento/Sales/Model/Order/ShippingTotal.php b/app/code/Magento/Sales/Model/Order/ShippingTotal.php
index d587a152804bf..5c0e4b9867685 100644
--- a/app/code/Magento/Sales/Model/Order/ShippingTotal.php
+++ b/app/code/Magento/Sales/Model/Order/ShippingTotal.php
@@ -11,13 +11,13 @@
 /**
  * Class \Magento\Sales\Model\Order\ShippingTotal
  *
- * @since 2.1.0
+ * @since 2.0.3
  */
 class ShippingTotal extends AbstractExtensibleModel implements TotalInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingAmount()
     {
@@ -26,7 +26,7 @@ public function getBaseShippingAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingCanceled()
     {
@@ -35,7 +35,7 @@ public function getBaseShippingCanceled()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingDiscountAmount()
     {
@@ -44,7 +44,7 @@ public function getBaseShippingDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingDiscountTaxCompensationAmnt()
     {
@@ -53,7 +53,7 @@ public function getBaseShippingDiscountTaxCompensationAmnt()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingInclTax()
     {
@@ -62,7 +62,7 @@ public function getBaseShippingInclTax()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingInvoiced()
     {
@@ -71,7 +71,7 @@ public function getBaseShippingInvoiced()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingRefunded()
     {
@@ -80,7 +80,7 @@ public function getBaseShippingRefunded()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingTaxAmount()
     {
@@ -89,7 +89,7 @@ public function getBaseShippingTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getBaseShippingTaxRefunded()
     {
@@ -98,7 +98,7 @@ public function getBaseShippingTaxRefunded()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingAmount()
     {
@@ -107,7 +107,7 @@ public function getShippingAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingCanceled()
     {
@@ -116,7 +116,7 @@ public function getShippingCanceled()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingDiscountAmount()
     {
@@ -125,7 +125,7 @@ public function getShippingDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingDiscountTaxCompensationAmount()
     {
@@ -134,7 +134,7 @@ public function getShippingDiscountTaxCompensationAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingInclTax()
     {
@@ -143,7 +143,7 @@ public function getShippingInclTax()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingInvoiced()
     {
@@ -152,7 +152,7 @@ public function getShippingInvoiced()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingRefunded()
     {
@@ -161,7 +161,7 @@ public function getShippingRefunded()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingTaxAmount()
     {
@@ -170,7 +170,7 @@ public function getShippingTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getShippingTaxRefunded()
     {
@@ -179,7 +179,7 @@ public function getShippingTaxRefunded()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingAmount($amount)
     {
@@ -188,7 +188,7 @@ public function setBaseShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingCanceled($baseShippingCanceled)
     {
@@ -197,7 +197,7 @@ public function setBaseShippingCanceled($baseShippingCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingDiscountAmount($amount)
     {
@@ -206,7 +206,7 @@ public function setBaseShippingDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -215,7 +215,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -224,7 +224,7 @@ public function setBaseShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingInvoiced($baseShippingInvoiced)
     {
@@ -233,7 +233,7 @@ public function setBaseShippingInvoiced($baseShippingInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingRefunded($baseShippingRefunded)
     {
@@ -242,7 +242,7 @@ public function setBaseShippingRefunded($baseShippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -251,7 +251,7 @@ public function setBaseShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
     {
@@ -260,7 +260,7 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingAmount($amount)
     {
@@ -269,7 +269,7 @@ public function setShippingAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingCanceled($shippingCanceled)
     {
@@ -278,7 +278,7 @@ public function setShippingCanceled($shippingCanceled)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingDiscountAmount($amount)
     {
@@ -287,7 +287,7 @@ public function setShippingDiscountAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -296,7 +296,7 @@ public function setShippingDiscountTaxCompensationAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingInclTax($amount)
     {
@@ -305,7 +305,7 @@ public function setShippingInclTax($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingInvoiced($shippingInvoiced)
     {
@@ -314,7 +314,7 @@ public function setShippingInvoiced($shippingInvoiced)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingRefunded($shippingRefunded)
     {
@@ -323,7 +323,7 @@ public function setShippingRefunded($shippingRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingTaxAmount($amount)
     {
@@ -332,7 +332,7 @@ public function setShippingTaxAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setShippingTaxRefunded($shippingTaxRefunded)
     {
@@ -341,7 +341,7 @@ public function setShippingTaxRefunded($shippingTaxRefunded)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function getExtensionAttributes()
     {
@@ -350,7 +350,7 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\TotalExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/StateResolver.php b/app/code/Magento/Sales/Model/Order/StateResolver.php
index f0a87ff7cbe50..395e9f9293721 100644
--- a/app/code/Magento/Sales/Model/Order/StateResolver.php
+++ b/app/code/Magento/Sales/Model/Order/StateResolver.php
@@ -10,7 +10,7 @@
 
 /**
  * Class OrderStateResolver
- * @since 2.2.0
+ * @since 2.1.2
  */
 class StateResolver implements OrderStateResolverInterface
 {
@@ -19,7 +19,7 @@ class StateResolver implements OrderStateResolverInterface
      *
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isOrderComplete(OrderInterface $order)
     {
@@ -36,7 +36,7 @@ private function isOrderComplete(OrderInterface $order)
      * @param OrderInterface $order
      * @param array $arguments
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isOrderClosed(OrderInterface $order, $arguments)
     {
@@ -54,7 +54,7 @@ private function isOrderClosed(OrderInterface $order, $arguments)
      * @param OrderInterface $order
      * @param array $arguments
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isOrderProcessing(OrderInterface $order, $arguments)
     {
@@ -70,7 +70,7 @@ private function isOrderProcessing(OrderInterface $order, $arguments)
      *
      * @param OrderInterface $order
      * @return string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getInitialOrderState(OrderInterface $order)
     {
@@ -81,7 +81,7 @@ private function getInitialOrderState(OrderInterface $order)
      * @param OrderInterface $order
      * @param array $arguments
      * @return string
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function getStateForOrder(OrderInterface $order, array $arguments = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index 014c1a92b0114..bdd15d4d844c6 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -12,13 +12,11 @@
  *
  * @method string getStatus()
  * @method string getLabel()
- * @since 2.0.0
  */
 class Status extends \Magento\Sales\Model\AbstractModel
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -31,7 +29,6 @@ class Status extends \Magento\Sales\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -57,7 +54,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +68,6 @@ protected function _construct()
      * @param bool $visibleOnFront
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function assignState($state, $isDefault = false, $visibleOnFront = false)
     {
@@ -93,7 +88,6 @@ public function assignState($state, $isDefault = false, $visibleOnFront = false)
      * @param string $state
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function validateBeforeUnassign($state)
     {
@@ -111,7 +105,6 @@ protected function validateBeforeUnassign($state)
      * @param string $state
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function unassignState($state)
     {
@@ -131,7 +124,6 @@ public function unassignState($state)
      * Getter for status labels per store
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreLabels()
     {
@@ -148,7 +140,6 @@ public function getStoreLabels()
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getStoreLabel($store = null)
     {
@@ -166,7 +157,6 @@ public function getStoreLabel($store = null)
      *
      * @param string $state
      * @return $this
-     * @since 2.0.0
      */
     public function loadDefaultByState($state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index b882444d290b1..66ff050c33af6 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -16,7 +16,6 @@
  * @method \Magento\Sales\Model\ResourceModel\Order\Status\History _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Status\History getResource()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class History extends AbstractModel implements OrderStatusHistoryInterface
 {
@@ -26,25 +25,21 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
      * Order instance
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_status_history';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'status_history';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -58,7 +53,6 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -86,7 +80,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -98,7 +91,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder(\Magento\Sales\Model\Order $order)
     {
@@ -112,7 +104,6 @@ public function setOrder(\Magento\Sales\Model\Order $order)
      *
      * @param  mixed $flag OPTIONAL (notification is not applicable by default)
      * @return $this
-     * @since 2.0.0
      */
     public function setIsCustomerNotified($flag = null)
     {
@@ -127,7 +118,6 @@ public function setIsCustomerNotified($flag = null)
      * Customer Notification Applicable check method
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCustomerNotificationNotApplicable()
     {
@@ -140,7 +130,6 @@ public function isCustomerNotificationNotApplicable()
      * @codeCoverageIgnore
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -151,7 +140,6 @@ public function getOrder()
      * Retrieve status label
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getStatusLabel()
     {
@@ -165,7 +153,6 @@ public function getStatusLabel()
      * Get store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -179,7 +166,6 @@ public function getStore()
      * Set order again if required
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -198,7 +184,6 @@ public function beforeSave()
      * Returns comment
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -209,7 +194,6 @@ public function getComment()
      * Returns created_at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -218,7 +202,6 @@ public function getCreatedAt()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -229,7 +212,6 @@ public function setCreatedAt($createdAt)
      * Returns entity_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEntityId()
     {
@@ -240,7 +222,6 @@ public function getEntityId()
      * Returns entity_name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEntityName()
     {
@@ -251,7 +232,6 @@ public function getEntityName()
      * Returns is_customer_notified
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsCustomerNotified()
     {
@@ -262,7 +242,6 @@ public function getIsCustomerNotified()
      * Returns is_visible_on_front
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsVisibleOnFront()
     {
@@ -273,7 +252,6 @@ public function getIsVisibleOnFront()
      * Returns parent_id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getParentId()
     {
@@ -284,7 +262,6 @@ public function getParentId()
      * Returns status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -293,7 +270,6 @@ public function getStatus()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setParentId($id)
     {
@@ -302,7 +278,6 @@ public function setParentId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsVisibleOnFront($isVisibleOnFront)
     {
@@ -311,7 +286,6 @@ public function setIsVisibleOnFront($isVisibleOnFront)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setComment($comment)
     {
@@ -320,7 +294,6 @@ public function setComment($comment)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStatus($status)
     {
@@ -329,7 +302,6 @@ public function setStatus($status)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEntityName($entityName)
     {
@@ -340,7 +312,6 @@ public function setEntityName($entityName)
      * {@inheritdoc}
      *
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -352,7 +323,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Sales\Api\Data\OrderStatusHistoryExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Status/History/Validator.php b/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
index 51c511c910ab7..0ba5a6aeb11ce 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
@@ -10,20 +10,17 @@
 /**
  * Class Validator
  * @package Magento\Sales\Model\Order\Status\History
- * @since 2.0.0
  */
 class Validator
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $requiredFields = ['parent_id' => 'Order Id'];
 
     /**
      * @param History $history
      * @return array
-     * @since 2.0.0
      */
     public function validate(History $history)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Tax.php b/app/code/Magento/Sales/Model/Order/Tax.php
index 00cc9b11cbc32..7df41a703e733 100644
--- a/app/code/Magento/Sales/Model/Order/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Tax.php
@@ -31,13 +31,11 @@
  * @method \Magento\Sales\Model\Order\Tax setBaseRealAmount(float $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Tax/Item.php b/app/code/Magento/Sales/Model/Order/Tax/Item.php
index 929e05a9d7341..67ff18e50663d 100644
--- a/app/code/Magento/Sales/Model/Order/Tax/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Tax/Item.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales Order Tax Item model
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface
@@ -23,7 +22,6 @@ class Item extends \Magento\Framework\Model\AbstractExtensibleModel implements
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -41,7 +38,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItemId()
     {
@@ -50,7 +46,6 @@ public function getItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAssociatedItemId()
     {
@@ -59,7 +54,6 @@ public function getAssociatedItemId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAppliedTaxes()
     {
@@ -71,7 +65,6 @@ public function getAppliedTaxes()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -83,7 +76,6 @@ public function setType($type)
      *
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($itemId)
     {
@@ -95,7 +87,6 @@ public function setItemId($itemId)
      *
      * @param int $associatedItemId
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemId($associatedItemId)
     {
@@ -107,7 +98,6 @@ public function setAssociatedItemId($associatedItemId)
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null)
     {
@@ -118,7 +108,6 @@ public function setAppliedTaxes(array $appliedTaxes = null)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -130,7 +119,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Sales/Model/Order/Total.php b/app/code/Magento/Sales/Model/Order/Total.php
index c7e72537c3625..9ffd8daff09f8 100644
--- a/app/code/Magento/Sales/Model/Order/Total.php
+++ b/app/code/Magento/Sales/Model/Order/Total.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Sales\Model\Order\Total
  *
- * @since 2.0.0
  */
 class Total extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
index 0263e364764ed..ee84ba2db912f 100644
--- a/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
@@ -10,7 +10,6 @@
  * @api
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractTotal extends \Magento\Framework\DataObject
 {
@@ -20,7 +19,6 @@ abstract class AbstractTotal extends \Magento\Framework\DataObject
      *
      * @param   array $config
      * @return  array
-     * @since 2.0.0
      */
     public function processConfigArray($config)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
index d9bebb2bbaf7f..8204a5c784b8b 100644
--- a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
+++ b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
@@ -9,7 +9,6 @@
 
 /**
  * Configuration class for totals
- * @since 2.0.0
  */
 class Base extends \Magento\Sales\Model\Config\Ordered
 {
@@ -17,7 +16,6 @@ class Base extends \Magento\Sales\Model\Config\Ordered
      * Cache key for collectors
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_collectorsCacheKey = 'sorted_collectors';
 
@@ -25,7 +23,6 @@ class Base extends \Magento\Sales\Model\Config\Ordered
      * Total models list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totalModels = [];
 
@@ -33,13 +30,11 @@ class Base extends \Magento\Sales\Model\Config\Ordered
      * Configuration path where to collect registered totals
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configGroup = 'totals';
 
     /**
      * @var \Magento\Sales\Model\Order\TotalFactory
-     * @since 2.0.0
      */
     protected $_orderTotalFactory;
 
@@ -50,7 +45,6 @@ class Base extends \Magento\Sales\Model\Config\Ordered
      * @param \Magento\Sales\Model\Order\TotalFactory $orderTotalFactory
      * @param \Magento\Framework\Simplexml\Element|mixed $sourceData
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
@@ -72,7 +66,6 @@ public function __construct(
      * @param array $totalConfig
      * @return \Magento\Sales\Model\Order\Total\AbstractTotal
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _initModelInstance($class, $totalCode, $totalConfig)
     {
@@ -94,7 +87,6 @@ protected function _initModelInstance($class, $totalCode, $totalConfig)
      * Retrieve total calculation models
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotalModels()
     {
diff --git a/app/code/Magento/Sales/Model/Order/TotalFactory.php b/app/code/Magento/Sales/Model/Order/TotalFactory.php
index 9caeb94a4285a..e901fc205905d 100644
--- a/app/code/Magento/Sales/Model/Order/TotalFactory.php
+++ b/app/code/Magento/Sales/Model/Order/TotalFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Sales\Model\Order\Total\AbstractTotal
- * @since 2.0.0
  */
 class TotalFactory
 {
@@ -15,7 +14,6 @@ class TotalFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class TotalFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $instanceName
      * @param array $data
      * @return \Magento\Sales\Model\Order\Total\AbstractTotal
-     * @since 2.0.0
      */
     public function create($instanceName, array $data = [])
     {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
index be63ec99f6a4c..744c2fe9a40a9 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
@@ -11,14 +11,14 @@
 
 /**
  * Class CanInvoice
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CanInvoice implements ValidatorInterface
 {
     /**
      * @param OrderInterface $entity
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity)
     {
@@ -36,7 +36,7 @@ public function validate($entity)
     /**
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isStateReadyForInvoice(OrderInterface $order)
     {
@@ -55,7 +55,7 @@ private function isStateReadyForInvoice(OrderInterface $order)
     /**
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function canInvoice(OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanRefund.php b/app/code/Magento/Sales/Model/Order/Validation/CanRefund.php
index b672091726706..ff901ebe1f116 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/CanRefund.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/CanRefund.php
@@ -12,13 +12,13 @@
 
 /**
  * Class CanRefund
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CanRefund implements ValidatorInterface
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $priceCurrency;
 
@@ -26,7 +26,7 @@ class CanRefund implements ValidatorInterface
      * CanRefund constructor.
      *
      * @param PriceCurrencyInterface $priceCurrency
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(PriceCurrencyInterface $priceCurrency)
     {
@@ -35,7 +35,7 @@ public function __construct(PriceCurrencyInterface $priceCurrency)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($entity)
     {
@@ -63,7 +63,7 @@ public function validate($entity)
      *
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isTotalPaidEnoughForRefund(OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanShip.php b/app/code/Magento/Sales/Model/Order/Validation/CanShip.php
index d132800755c90..ef4a2daab66ad 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/CanShip.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/CanShip.php
@@ -11,14 +11,14 @@
 
 /**
  * Class CanShip
- * @since 2.2.0
+ * @since 2.1.2
  */
 class CanShip implements ValidatorInterface
 {
     /**
      * @param OrderInterface $entity
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity)
     {
@@ -35,7 +35,7 @@ public function validate($entity)
     /**
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function isStateReadyForShipment(OrderInterface $order)
     {
@@ -53,7 +53,7 @@ private function isStateReadyForShipment(OrderInterface $order)
     /**
      * @param OrderInterface $order
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function canShip(OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
index 74882f5816f8f..f72f24de3155a 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
@@ -18,25 +18,25 @@
 /**
  * Class InvoiceOrder
  * Validation for invoice order operation
- * @since 2.2.0
+ * @since 2.1.3
  */
 class InvoiceOrder implements InvoiceOrderInterface
 {
     /**
      * @var InvoiceValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceValidator;
 
     /**
      * @var OrderValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderValidator;
 
     /**
      * @var ValidatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultMerger;
 
@@ -45,7 +45,7 @@ class InvoiceOrder implements InvoiceOrderInterface
      * @param InvoiceValidatorInterface $invoiceValidator
      * @param OrderValidatorInterface $orderValidator
      * @param ValidatorResultMerger $validatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         InvoiceValidatorInterface $invoiceValidator,
@@ -59,7 +59,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php
index 59323775efa02..259c092aba2d7 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php
@@ -15,7 +15,7 @@
  * Interface InvoiceOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface InvoiceOrderInterface
 {
@@ -29,7 +29,7 @@ interface InvoiceOrderInterface
      * @param InvoiceCommentCreationInterface|null $comment
      * @param InvoiceCreationArgumentsInterface|null $arguments
      * @return ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
index 5c0dc43a34c1e..909c44d4b952b 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
@@ -19,37 +19,37 @@
 
 /**
  * Class RefundInvoice
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundInvoice implements RefundInvoiceInterface
 {
     /**
      * @var OrderValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderValidator;
 
     /**
      * @var CreditmemoValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoValidator;
 
     /**
      * @var ItemCreationValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $itemCreationValidator;
 
     /**
      * @var InvoiceValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceValidator;
 
     /**
      * @var ValidatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultMerger;
 
@@ -60,7 +60,7 @@ class RefundInvoice implements RefundInvoiceInterface
      * @param ItemCreationValidatorInterface $itemCreationValidator
      * @param InvoiceValidatorInterface $invoiceValidator
      * @param ValidatorResultMerger $validatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         OrderValidatorInterface $orderValidator,
@@ -78,7 +78,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         InvoiceInterface $invoice,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php
index a21de1f77a74a..0be9bb3afdda2 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php
@@ -14,7 +14,7 @@
  * Interface RefundInvoiceInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface RefundInvoiceInterface
 {
@@ -29,7 +29,7 @@ interface RefundInvoiceInterface
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         InvoiceInterface $invoice,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundOrder.php b/app/code/Magento/Sales/Model/Order/Validation/RefundOrder.php
index 3726c3c33862b..56ae47a3d2db6 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/RefundOrder.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/RefundOrder.php
@@ -17,31 +17,31 @@
 
 /**
  * Class RefundOrder
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundOrder implements RefundOrderInterface
 {
     /**
      * @var OrderValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderValidator;
 
     /**
      * @var CreditmemoValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoValidator;
 
     /**
      * @var ItemCreationValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $itemCreationValidator;
 
     /**
      * @var ValidatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultMerger;
 
@@ -52,7 +52,7 @@ class RefundOrder implements RefundOrderInterface
      * @param CreditmemoValidatorInterface $creditmemoValidator
      * @param ItemCreationValidatorInterface $itemCreationValidator
      * @param ValidatorResultMerger $validatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         OrderValidatorInterface $orderValidator,
@@ -68,7 +68,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php
index 819c8a20ece15..20030b8531e00 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php
@@ -13,7 +13,7 @@
  * Interface RefundOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface RefundOrderInterface
 {
@@ -26,7 +26,7 @@ interface RefundOrderInterface
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
      * @param \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface|null $arguments
      * @return ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php b/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
index 195ab1ab51394..06f4e99369e66 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
@@ -15,25 +15,25 @@
 
 /**
  * Class ShipOrder
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ShipOrder implements ShipOrderInterface
 {
     /**
      * @var OrderValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderValidator;
 
     /**
      * @var ShipmentValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shipmentValidator;
 
     /**
      * @var ValidatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultMerger;
 
@@ -43,7 +43,7 @@ class ShipOrder implements ShipOrderInterface
      * @param OrderValidatorInterface $orderValidator
      * @param ShipmentValidatorInterface $shipmentValidator
      * @param ValidatorResultMerger $validatorResultMerger
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         OrderValidatorInterface $orderValidator,
@@ -66,7 +66,7 @@ public function __construct(
      * @param array $packages
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Model\ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         $order,
diff --git a/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php
index 90047c1dcdab2..97aeae4514fcc 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php
@@ -12,7 +12,7 @@
  * Interface ShipOrderInterface
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface ShipOrderInterface
 {
@@ -27,7 +27,7 @@ interface ShipOrderInterface
      * @param array $packages
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Model\ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate(
         $order,
diff --git a/app/code/Magento/Sales/Model/OrderNotifier.php b/app/code/Magento/Sales/Model/OrderNotifier.php
index ffd5dccbd5308..b4ae3449156ac 100644
--- a/app/code/Magento/Sales/Model/OrderNotifier.php
+++ b/app/code/Magento/Sales/Model/OrderNotifier.php
@@ -13,25 +13,21 @@
 /**
  * Class OrderNotifier
  * @package Magento\Sales\Model
- * @since 2.0.0
  */
 class OrderNotifier extends \Magento\Sales\Model\AbstractNotifier
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $historyCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var OrderSender
-     * @since 2.0.0
      */
     protected $sender;
 
@@ -39,7 +35,6 @@ class OrderNotifier extends \Magento\Sales\Model\AbstractNotifier
      * @param CollectionFactory $historyCollectionFactory
      * @param Logger $logger
      * @param OrderSender $sender
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $historyCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index 8135f70e8a2bc..9389f95ede011 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -21,19 +21,16 @@
  * Repository class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
 {
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory = null;
 
@@ -45,7 +42,7 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
 
     /**
      * @var ShippingAssignmentBuilder
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $shippingAssignmentBuilder;
 
@@ -57,7 +54,6 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
 
     /**
      * @var OrderInterface[]
-     * @since 2.0.0
      */
     protected $registry = [];
 
@@ -68,7 +64,6 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory|null $orderExtensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metadata,
@@ -91,7 +86,6 @@ public function __construct(
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -115,7 +109,6 @@ public function get($id)
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Sales\Api\Data\OrderSearchResultInterface
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -134,7 +127,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $entity
      * @return bool
-     * @since 2.0.0
      */
     public function delete(\Magento\Sales\Api\Data\OrderInterface $entity)
     {
@@ -148,7 +140,6 @@ public function delete(\Magento\Sales\Api\Data\OrderInterface $entity)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -161,7 +152,6 @@ public function deleteById($id)
      *
      * @param \Magento\Sales\Api\Data\OrderInterface $entity
      * @return \Magento\Sales\Api\Data\OrderInterface
-     * @since 2.0.0
      */
     public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     {
@@ -183,7 +173,7 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     /**
      * @param OrderInterface $order
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function setShippingAssignments(OrderInterface $order)
     {
@@ -206,8 +196,8 @@ private function setShippingAssignments(OrderInterface $order)
      * Get the new ShippingAssignmentBuilder dependency for application code
      *
      * @return ShippingAssignmentBuilder
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.3
+     * @since 2.0.3
      */
     private function getShippingAssignmentBuilderDependency()
     {
@@ -227,7 +217,7 @@ private function getShippingAssignmentBuilderDependency()
      * @return void
      * @deprecated 2.2.0
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.1.0
+     * @since 2.0.8
      */
     protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
diff --git a/app/code/Magento/Sales/Model/RefundInvoice.php b/app/code/Magento/Sales/Model/RefundInvoice.php
index b7ab1690812c3..43dfb4c0fc97b 100644
--- a/app/code/Magento/Sales/Model/RefundInvoice.php
+++ b/app/code/Magento/Sales/Model/RefundInvoice.php
@@ -21,73 +21,73 @@
 /**
  * Class RefundInvoice
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundInvoice implements RefundInvoiceInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resourceConnection;
 
     /**
      * @var OrderStateResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderStateResolver;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var InvoiceRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceRepository;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoRepository;
 
     /**
      * @var RefundAdapterInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $refundAdapter;
 
     /**
      * @var CreditmemoDocumentFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoDocumentFactory;
 
     /**
      * @var NotifierInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $notifier;
 
     /**
      * @var OrderConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $logger;
 
     /**
      * @var RefundInvoiceValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validator;
 
@@ -106,7 +106,7 @@ class RefundInvoice implements RefundInvoiceInterface
      * @param OrderConfig $config
      * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ResourceConnection $resourceConnection,
@@ -136,7 +136,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(
         $invoiceId,
diff --git a/app/code/Magento/Sales/Model/RefundOrder.php b/app/code/Magento/Sales/Model/RefundOrder.php
index a290ef320cffd..b7d5f0d20cc7a 100644
--- a/app/code/Magento/Sales/Model/RefundOrder.php
+++ b/app/code/Magento/Sales/Model/RefundOrder.php
@@ -20,67 +20,67 @@
 /**
  * Class RefundOrder
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RefundOrder implements RefundOrderInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resourceConnection;
 
     /**
      * @var OrderStateResolverInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderStateResolver;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoRepository;
 
     /**
      * @var RefundAdapterInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $refundAdapter;
 
     /**
      * @var CreditmemoDocumentFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoDocumentFactory;
 
     /**
      * @var RefundOrderValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validator;
 
     /**
      * @var NotifierInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $notifier;
 
     /**
      * @var OrderConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $config;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $logger;
 
@@ -98,7 +98,7 @@ class RefundOrder implements RefundOrderInterface
      * @param OrderConfig $config
      * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ResourceConnection $resourceConnection,
@@ -126,7 +126,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
index 61182829a7cae..e8121c4fdfd74 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -11,31 +11,26 @@
 /**
  * Class AbstractGrid
  * @api
- * @since 2.0.0
  */
 abstract class AbstractGrid extends AbstractDb implements GridInterface
 {
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $gridTableName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $orderTableName = 'sales_order';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $addressTableName = 'sales_order_address';
 
@@ -43,7 +38,6 @@ abstract class AbstractGrid extends AbstractDb implements GridInterface
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +49,6 @@ protected function _construct()
      *
      * @todo: make method protected
      * @return AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -69,7 +62,6 @@ public function getConnection()
      * Returns grid table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridTable()
     {
@@ -82,7 +74,6 @@ public function getGridTable()
      * @param int|string $value
      * @param null|string $field
      * @return int
-     * @since 2.0.0
      */
     public function purge($value, $field = null)
     {
@@ -102,7 +93,6 @@ public function purge($value, $field = null)
      * @deprecated 2.2.0 this method is not used in abstract model but only in single child so
      * this deprecation is a part of cleaning abstract classes.
      * @see \Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider
-     * @since 2.0.0
      */
     protected function getLastUpdatedAtValue($default = '0000-00-00 00:00:00')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Attribute.php b/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
index c7f8a791f2295..b1799e0e342c2 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
@@ -14,32 +14,27 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Attribute
  *
- * @since 2.0.0
  */
 class Attribute
 {
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @param AppResource $resource
      * @param EventManager $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         AppResource $resource,
@@ -51,7 +46,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function getConnection()
     {
@@ -67,7 +61,6 @@ protected function getConnection()
      * @param AbstractModel $object
      * @param string $attribute
      * @return \Magento\Sales\Model\ResourceModel\Attribute
-     * @since 2.0.0
      */
     protected function _beforeSaveAttribute(AbstractModel $object, $attribute)
     {
@@ -91,7 +84,6 @@ protected function _beforeSaveAttribute(AbstractModel $object, $attribute)
      * @param string $attribute
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function saveAttribute(AbstractModel $object, $attribute)
     {
@@ -131,7 +123,6 @@ public function saveAttribute(AbstractModel $object, $attribute)
      * @param AbstractModel $object
      * @param string $attribute
      * @return \Magento\Sales\Model\ResourceModel\Attribute
-     * @since 2.0.0
      */
     protected function _afterSaveAttribute(AbstractModel $object, $attribute)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php
index 4728ccca8887a..ca9a3b545f301 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
 {
     /**
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_countSelect;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaInterface
-     * @since 2.0.0
      */
     protected $searchCriteria;
 
@@ -31,7 +28,6 @@ abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel
      *
      * @param \Magento\Framework\DB\Select $countSelect
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectCountSql(\Magento\Framework\DB\Select $countSelect)
     {
@@ -43,7 +39,6 @@ public function setSelectCountSql(\Magento\Framework\DB\Select $countSelect)
      * get select count sql
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -59,7 +54,6 @@ public function getSelectCountSql()
      * @param string|\Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _attributeToField($attribute)
     {
@@ -81,7 +75,6 @@ protected function _attributeToField($attribute)
      *
      * @param string $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSelect($attribute)
     {
@@ -96,7 +89,6 @@ public function addAttributeToSelect($attribute)
      * @param string|\Magento\Eav\Model\Entity\Attribute $attribute
      * @param array|int|string|null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToFilter($attribute, $condition = null)
     {
@@ -111,7 +103,6 @@ public function addAttributeToFilter($attribute, $condition = null)
      * @param string $attribute
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSort($attribute, $dir = 'asc')
     {
@@ -126,7 +117,6 @@ public function addAttributeToSort($attribute, $dir = 'asc')
      * @param int $pageNum
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPage($pageNum, $pageSize)
     {
@@ -141,7 +131,6 @@ public function setPage($pageNum, $pageSize)
      * @param int $limit
      * @param int $offset
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
@@ -162,7 +151,6 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
      * @param int $limit
      * @param int $offset
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds($limit = null, $offset = null)
     {
@@ -173,7 +161,6 @@ public function getAllIds($limit = null, $offset = null)
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface|null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -186,7 +173,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
     {
@@ -198,7 +184,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -211,7 +196,6 @@ public function getTotalCount()
      * @param int $totalCount
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -223,7 +207,6 @@ public function setTotalCount($totalCount)
      *
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
index 8e95412446d6c..fdfabfb27927f 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -16,7 +16,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class EntityAbstract extends AbstractDb
 {
@@ -24,7 +23,6 @@ abstract class EntityAbstract extends AbstractDb
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_resource';
 
@@ -32,7 +30,6 @@ abstract class EntityAbstract extends AbstractDb
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'resource';
 
@@ -40,25 +37,21 @@ abstract class EntityAbstract extends AbstractDb
      * Use additional is object new check for this resource
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useIsObjectNew = true;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory
-     * @since 2.0.0
      */
     protected $_eavEntityTypeFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Attribute
-     * @since 2.0.0
      */
     protected $attribute;
 
     /**
      * @var Manager
-     * @since 2.0.0
      */
     protected $sequenceManager;
 
@@ -69,7 +62,6 @@ abstract class EntityAbstract extends AbstractDb
      * @param Attribute $attribute
      * @param Manager $sequenceManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -94,7 +86,6 @@ public function __construct(
      * @param string $attribute
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function saveAttribute(\Magento\Framework\Model\AbstractModel $object, $attribute)
     {
@@ -108,7 +99,6 @@ public function saveAttribute(\Magento\Framework\Model\AbstractModel $object, $a
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -127,7 +117,6 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -149,7 +138,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -174,7 +162,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function updateObject(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -186,7 +173,6 @@ protected function updateObject(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function saveNewObject(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -204,7 +190,6 @@ protected function saveNewObject(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid.php b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
index 2a974e4da3afc..1163bdbeeafaf 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
@@ -12,37 +12,31 @@
 
 /**
  * Class Grid
- * @since 2.0.0
  */
 class Grid extends AbstractGrid
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $gridTableName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $mainTableName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $orderIdField;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $joins;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $columns;
 
@@ -61,7 +55,6 @@ class Grid extends AbstractGrid
      * @param array $columns
      * @param string $connectionName
      * @param NotSyncedDataProviderInterface $notSyncedDataProvider
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -91,7 +84,6 @@ public function __construct(
      * @param int|string $value
      * @param null|string $field
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function refresh($value, $field = null)
     {
@@ -114,7 +106,6 @@ public function refresh($value, $field = null)
      * Only orders created/updated since the last method call will be added.
      *
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function refreshBySchedule()
     {
@@ -137,7 +128,6 @@ public function refreshBySchedule()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getOrderIdField()
     {
@@ -148,7 +138,6 @@ public function getOrderIdField()
      * Returns select object
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function getGridOriginSelect()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
index 9e6a449e92446..82d436cb6e047 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
@@ -12,14 +12,12 @@
 /**
  * Class Collection
  * Collection for displaying grid of sales documents
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements SearchResultInterface
 {
 
     /**
      * @var AggregationInterface
-     * @since 2.0.0
      */
     protected $aggregations;
 
@@ -37,7 +35,6 @@ class Collection extends AbstractCollection implements SearchResultInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -68,7 +65,6 @@ public function __construct(
 
     /**
      * @return AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations()
     {
@@ -78,7 +74,6 @@ public function getAggregations()
     /**
      * @param AggregationInterface $aggregations
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregations($aggregations)
     {
@@ -92,7 +87,6 @@ public function setAggregations($aggregations)
      * @param int $limit
      * @param int $offset
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds($limit = null, $offset = null)
     {
@@ -103,7 +97,6 @@ public function getAllIds($limit = null, $offset = null)
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface|null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -116,7 +109,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
     {
@@ -127,7 +119,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -140,7 +131,6 @@ public function getTotalCount()
      * @param int $totalCount
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -153,7 +143,6 @@ public function setTotalCount($totalCount)
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php b/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
index 58d28484a739e..fc492b4ba3707 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
@@ -9,7 +9,6 @@
 /**
  * @api
  * Interface GridInterface
- * @since 2.0.0
  */
 interface GridInterface
 {
@@ -21,7 +20,6 @@ interface GridInterface
      * @param int|string $value
      * @param null|string $field
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function refresh($value, $field = null);
 
@@ -31,7 +29,6 @@ public function refresh($value, $field = null);
      * Only rows created/updated since the last method call should be added.
      *
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function refreshBySchedule();
 
@@ -39,7 +36,6 @@ public function refreshBySchedule();
      * @param int|string $value
      * @param null|string $field
      * @return int
-     * @since 2.0.0
      */
     public function purge($value, $field = null);
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/GridPool.php b/app/code/Magento/Sales/Model/ResourceModel/GridPool.php
index 4e6f7ecf0c87d..aacf096708697 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/GridPool.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/GridPool.php
@@ -9,19 +9,16 @@
 /**
  * Class GridPool
  * @api
- * @since 2.0.0
  */
 class GridPool
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Grid[]
-     * @since 2.0.0
      */
     protected $grids;
 
     /**
      * @param array $grids
-     * @since 2.0.0
      */
     public function __construct(array $grids)
     {
@@ -33,7 +30,6 @@ public function __construct(array $grids)
      *
      * @param int $orderId
      * @return $this
-     * @since 2.0.0
      */
     public function refreshByOrderId($orderId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Helper.php b/app/code/Magento/Sales/Model/ResourceModel/Helper.php
index 85e1bc58c3481..0e3ed48ab81f9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Helper.php
@@ -9,13 +9,11 @@
 
 /**
  * Sales Mysql resource helper model
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper implements HelperInterface
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_reportsResourceHelper;
 
@@ -23,7 +21,6 @@ class Helper extends \Magento\Framework\DB\Helper implements HelperInterface
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Reports\Model\ResourceModel\Helper $reportsResourceHelper
      * @param string $modulePrefix
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -42,7 +39,6 @@ public function __construct(
      * @param string $mainTable
      * @param string $aggregationTable
      * @return $this
-     * @since 2.0.0
      */
     public function getBestsellersReportUpdateRatingPos(
         $aggregation,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/HelperInterface.php b/app/code/Magento/Sales/Model/ResourceModel/HelperInterface.php
index eadb320afca89..373d04ab9831d 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/HelperInterface.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/HelperInterface.php
@@ -11,7 +11,6 @@
  * Sales resource helper interface
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 interface HelperInterface
 {
@@ -23,7 +22,6 @@ interface HelperInterface
      * @param string $mainTable
      * @param string $aggregationTable
      * @return $this
-     * @since 2.0.0
      */
     public function getBestsellersReportUpdateRatingPos(
         $aggregation,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Metadata.php b/app/code/Magento/Sales/Model/ResourceModel/Metadata.php
index a849d5b2422fb..301a14debf6a9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Metadata.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Metadata.php
@@ -7,25 +7,21 @@
 
 /**
  * Class Metadata
- * @since 2.0.0
  */
 class Metadata
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $resourceClassName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $modelClassName;
 
@@ -33,7 +29,6 @@ class Metadata
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $resourceClassName
      * @param string $modelClassName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +42,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getMapper()
     {
@@ -56,7 +50,6 @@ public function getMapper()
 
     /**
      * @return \Magento\Framework\Api\ExtensibleDataInterface
-     * @since 2.0.0
      */
     public function getNewInstance()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order.php
index b67140bbd1de4..105ef7a4d3285 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order.php
@@ -19,7 +19,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Order extends SalesResource implements OrderResourceInterface
 {
@@ -27,7 +26,6 @@ class Order extends SalesResource implements OrderResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_resource';
 
@@ -35,13 +33,11 @@ class Order extends SalesResource implements OrderResourceInterface
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'resource';
 
     /**
      * @var StateHandler
-     * @since 2.0.0
      */
     protected $stateHandler;
 
@@ -49,7 +45,6 @@ class Order extends SalesResource implements OrderResourceInterface
      * Model Initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -64,7 +59,6 @@ protected function _construct()
      * @param RelationComposite $entityRelationComposite
      * @param StateHandler $stateHandler
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -93,7 +87,6 @@ public function __construct(
      * @param array $productTypeIds
      * @param bool $isProductTypeIn
      * @return array
-     * @since 2.0.0
      */
     public function aggregateProductsByTypes($orderId, $productTypeIds = [], $isProductTypeIn = false)
     {
@@ -123,7 +116,6 @@ public function aggregateProductsByTypes($orderId, $productTypeIds = [], $isProd
      *
      * @param \Magento\Sales\Model\Order $object
      * @return int
-     * @since 2.0.0
      */
     protected function calculateItems(\Magento\Sales\Model\Order $object)
     {
@@ -147,7 +139,6 @@ protected function calculateItems(\Magento\Sales\Model\Order $object)
     /**
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -175,7 +166,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
index 0fbae22ed71b0..c55f734311674 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
@@ -11,7 +11,6 @@
 
 /**
  * Flat sales order address resource
- * @since 2.0.0
  */
 class Address extends SalesResource implements OrderAddressResourceInterface
 {
@@ -19,19 +18,16 @@ class Address extends SalesResource implements OrderAddressResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_address_resource';
 
     /**
      * @var \Magento\Sales\Model\Order\Address\Validator
-     * @since 2.0.0
      */
     protected $_validator;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\GridPool
-     * @since 2.0.0
      */
     protected $gridPool;
 
@@ -44,7 +40,6 @@ class Address extends SalesResource implements OrderAddressResourceInterface
      * @param \Magento\Sales\Model\Order\Address\Validator $validator
      * @param \Magento\Sales\Model\ResourceModel\GridPool $gridPool
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -72,7 +67,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -83,7 +77,6 @@ protected function _construct()
      * Return configuration for all attributes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllAttributes()
     {
@@ -109,7 +102,6 @@ public function getAllAttributes()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
index 7d94f6988babf..8af6c03b44275 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
@@ -12,7 +12,6 @@
  * Flat sales order payment collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements OrderAddressSearchResultInterface
 {
@@ -20,7 +19,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_address_collection';
 
@@ -28,7 +26,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_address_collection';
 
@@ -36,7 +33,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
      * Redeclare after load method for dispatch event
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Billing.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Billing.php
index 2e01705665fee..226b9cdf8a48b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Billing.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Billing.php
@@ -9,7 +9,6 @@
  * Order billing address backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Billing extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Billing extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
      *
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -33,7 +31,6 @@ public function beforeSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Child.php
index c2cea187f66c4..ce02450980315 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Child.php
@@ -9,7 +9,6 @@
  * Invoice backend model for child attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Shipping.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Shipping.php
index 5e6d670eb50ef..0ecc757ab7613 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Shipping.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Attribute/Backend/Shipping.php
@@ -9,7 +9,6 @@
  * Order shipping address backend
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Shipping extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacke
      *
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
@@ -33,7 +31,6 @@ public function beforeSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
index b0d15ea638cd7..298d04eab40d4 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
@@ -13,13 +13,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements OrderSearchResultInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'entity_id';
 
@@ -27,7 +25,6 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_collection';
 
@@ -35,13 +32,11 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_collection';
 
     /**
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_coreResourceHelper;
 
@@ -54,7 +49,6 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
      * @param \Magento\Framework\DB\Helper $coreResourceHelper
      * @param string|null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -82,7 +76,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -103,7 +96,6 @@ protected function _construct()
      * Add items count expr to collection select, backward capability with eav structure
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addItemCountExpr()
     {
@@ -120,7 +112,6 @@ public function addItemCountExpr()
      * Minimize usual count select
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -136,7 +127,6 @@ public function getSelectCountSql()
      * @param int $limit
      * @param int $offset
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
@@ -150,7 +140,6 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
      * Create correlation map
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addAddressFields()
     {
@@ -213,7 +202,6 @@ protected function _addAddressFields()
      * Add addresses information to select
      *
      * @return \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function addAddressFields()
     {
@@ -228,7 +216,6 @@ public function addAddressFields()
      * @return $this
      *
      * @see self::_getConditionSql for $condition
-     * @since 2.0.0
      */
     public function addFieldToSearchFilter($field, $condition = null)
     {
@@ -243,7 +230,6 @@ public function addFieldToSearchFilter($field, $condition = null)
      * @param array $attributes
      * @param array|int|string|null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeToSearchFilter($attributes, $condition = null)
     {
@@ -265,7 +251,6 @@ public function addAttributeToSearchFilter($attributes, $condition = null)
      *
      * @param int|int[] $agreements
      * @return $this
-     * @since 2.0.0
      */
     public function addBillingAgreementsFilter($agreements)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/AbstractCollection.php
index f9d606a66f6a1..da46e8fc068a1 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/AbstractCollection.php
@@ -9,7 +9,6 @@
  * Flat sales order collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Col
      * Order object
      *
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $_salesOrder = null;
 
@@ -25,7 +23,6 @@ abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Col
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'parent_id';
 
@@ -34,7 +31,6 @@ abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Col
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function setSalesOrder($order)
     {
@@ -53,7 +49,6 @@ public function setSalesOrder($order)
      * Retrieve sales order as parent collection object
      *
      * @return \Magento\Sales\Model\Order|null
-     * @since 2.0.0
      */
     public function getSalesOrder()
     {
@@ -65,7 +60,6 @@ public function getSalesOrder()
      *
      * @param int|\Magento\Sales\Model\Order|array $order
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderFilter($order)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/Factory.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/Factory.php
index 952f7d2e7dae9..46837ccc1e853 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/Factory.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection/Factory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Collection\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return AbstractCollection
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php
index 21c9ce2af3464..b9e5ea8d04955 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php
@@ -8,7 +8,7 @@
 
 /**
  * Class CollectionFactory
- * @since 2.2.0
+ * @since 2.1.1
  */
 class CollectionFactory implements CollectionFactoryInterface
 {
@@ -16,7 +16,7 @@ class CollectionFactory implements CollectionFactoryInterface
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $objectManager = null;
 
@@ -24,7 +24,7 @@ class CollectionFactory implements CollectionFactoryInterface
      * Instance name to create
      *
      * @var string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $instanceName = null;
 
@@ -33,7 +33,7 @@ class CollectionFactory implements CollectionFactoryInterface
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -45,7 +45,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function create($customerId = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactoryInterface.php b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactoryInterface.php
index fea67ff5853b5..13ece3373adf3 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactoryInterface.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactoryInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * Class CollectionFactoryInterface
- * @since 2.2.0
+ * @since 2.1.1
  */
 interface CollectionFactoryInterface
 {
@@ -17,7 +17,7 @@ interface CollectionFactoryInterface
      *
      * @param int $customerId
      * @return \Magento\Sales\Model\ResourceModel\Order\Collection
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function create($customerId = null);
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Comment/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Comment/Collection/AbstractCollection.php
index ee78d21400ec5..152e3ef68537b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Comment/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Comment/Collection/AbstractCollection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ abstract class AbstractCollection extends \Magento\Sales\Model\ResourceModel\Col
      *
      * @param \Magento\Framework\Model\AbstractModel|int $parent
      * @return $this
-     * @since 2.0.0
      */
     public function setParentFilter($parent)
     {
@@ -34,7 +32,6 @@ public function setParentFilter($parent)
      *
      * @param int $flag
      * @return $this
-     * @since 2.0.0
      */
     public function addVisibleOnFrontFilter($flag = 1)
     {
@@ -46,7 +43,6 @@ public function addVisibleOnFrontFilter($flag = 1)
      *
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAtOrder($direction = 'desc')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
index 25a56d75a047b..f95a3206ce786 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
@@ -16,7 +16,6 @@
  * Flat sales order creditmemo resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Creditmemo extends SalesResource implements CreditmemoResourceInterface
 {
@@ -24,7 +23,6 @@ class Creditmemo extends SalesResource implements CreditmemoResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_resource';
 
@@ -32,7 +30,6 @@ class Creditmemo extends SalesResource implements CreditmemoResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +41,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Attribute/Backend/Child.php
index 74d1f8c02816e..245299d1d0677 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Attribute/Backend/Child.php
@@ -9,7 +9,6 @@
  * Invoice backend model for child attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php
index 0b5c036e92def..b6c9640cb4fa9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements CreditmemoSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInt
      * Id field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'entity_id';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInt
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInt
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_creditmemo_collection';
 
@@ -45,7 +41,6 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInt
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -53,7 +48,6 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInt
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +61,6 @@ protected function _construct()
      * Used to emulate after load functionality for each item without loading them
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -80,7 +73,6 @@ protected function _afterLoad()
      *
      * @param array|null $filter
      * @return $this
-     * @since 2.0.0
      */
     public function getFiltered($filter = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
index ed4b442e12229..5d9e69eb3db4b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
@@ -13,7 +13,6 @@
  * Flat sales order creditmemo comment resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comment extends EntityAbstract implements CreditmemoCommentResourceInterface
 {
@@ -21,7 +20,6 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_comment_resource';
 
@@ -29,7 +27,6 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa
      * Validator
      *
      * @var \Magento\Sales\Model\Order\Creditmemo\Comment\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -41,7 +38,6 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Creditmemo\Comment\Validator $validator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php
index 127e40d42b691..dc0813557379f 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements CreditmemoCommentSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements CreditmemoCommentSearchRe
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_comment_collection';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements CreditmemoCommentSearchRe
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_creditmemo_comment_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements CreditmemoCommentSearchRe
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      *
      * @param int $creditmemoId
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemoFilter($creditmemoId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php
index ec98e4680494d..989aa6b6205aa 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php
@@ -14,7 +14,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php
index b59d9ab9f3a77..858a0d52b44a7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php
@@ -7,19 +7,16 @@
 
 /**
  * Sales creditmemo statuses option array
- * @since 2.0.0
  */
 class StatusList implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
     /**
      * @param \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Sales\Api\CreditmemoRepositoryInterface $cr
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php
index cf992b86ad788..d7b23cc49f371 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php
@@ -12,7 +12,6 @@
  * Flat sales order creditmemo item resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends SalesResource implements CreditmemoItemResourceInterface
 {
@@ -20,7 +19,6 @@ class Item extends SalesResource implements CreditmemoItemResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_item_resource';
 
@@ -28,7 +26,6 @@ class Item extends SalesResource implements CreditmemoItemResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +35,6 @@ protected function _construct()
     /**
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php
index 1c8845057e6d5..081e990647fe9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php
@@ -9,7 +9,6 @@
  * Flat sales order creditmemo items collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_creditmemo_item_collection';
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_creditmemo_item_collection';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -48,7 +44,6 @@ protected function _construct()
      *
      * @param int $creditmemoId
      * @return $this
-     * @since 2.0.0
      */
     public function setCreditmemoFilter($creditmemoId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php
index 7edf434ebffca..6ff022aa33fc4 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php
@@ -14,7 +14,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation.php
index dda6f3968b365..60b3398b03a15 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation.php
@@ -10,26 +10,22 @@
 
 /**
  * Class Relation
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
     /**
      * @var Item
-     * @since 2.0.0
      */
     protected $creditmemoItemResource;
 
     /**
      * @var Comment
-     * @since 2.0.0
      */
     protected $creditmemoCommentResource;
 
     /**
      * @param Item $creditmemoItemResource
      * @param Comment $creditmemoCommentResource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item $creditmemoItemResource,
@@ -45,7 +41,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php
index 59baf965b3589..bfd48e5fcb1a7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php
@@ -10,26 +10,22 @@
 
 /**
  * Class Relation
- * @deprecated 2.2.0
- * @since 2.0.0
+ * @deprecated 2.1.3
  */
 class Refund implements RelationInterface
 {
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $invoiceRepository;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -37,7 +33,6 @@ class Refund implements RelationInterface
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
@@ -55,7 +50,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -76,7 +70,6 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return void
-     * @since 2.0.0
      */
     protected function prepareOrder(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
@@ -143,7 +136,6 @@ protected function prepareOrder(\Magento\Sales\Model\Order\Creditmemo $creditmem
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return void
-     * @since 2.0.0
      */
     protected function prepareInvoice(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
@@ -161,7 +153,6 @@ protected function prepareInvoice(\Magento\Sales\Model\Order\Creditmemo $creditm
      *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return void
-     * @since 2.0.0
      */
     protected function preparePayment(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Customer/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Customer/Collection.php
index 430e1818dc8f1..4862fe43875a2 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Customer/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Customer/Collection.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Customer\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
index 08c6eabccc354..1e8125b6cfee8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
@@ -12,7 +12,7 @@
 
 /**
  * Order grid collection
- * @since 2.1.0
+ * @since 2.0.11
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
index ee1be2364101f..0fec004a25fae 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
@@ -11,19 +11,16 @@
 
 /**
  * Class Address
- * @since 2.0.0
  */
 class Address
 {
     /**
      * @var Attribute
-     * @since 2.0.0
      */
     protected $attribute;
 
     /**
      * @param Attribute $attribute
-     * @since 2.0.0
      */
     public function __construct(
         Attribute $attribute
@@ -36,7 +33,6 @@ public function __construct(
      *
      * @param Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function removeEmptyAddresses(Order $order)
     {
@@ -56,7 +52,6 @@ public function removeEmptyAddresses(Order $order)
      * @param Order $order
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function process(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index 4458e10c61808..c7bac874fa330 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -10,7 +10,6 @@
 
 /**
  * Class State
- * @since 2.0.0
  */
 class State
 {
@@ -21,7 +20,6 @@ class State
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function check(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
index 26bc6a9f07c32..848f88118ed32 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
@@ -14,7 +14,6 @@
 
 /**
  * Flat sales order invoice resource
- * @since 2.0.0
  */
 class Invoice extends SalesResource implements InvoiceResourceInterface
 {
@@ -22,7 +21,6 @@ class Invoice extends SalesResource implements InvoiceResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_resource';
 
@@ -30,7 +28,6 @@ class Invoice extends SalesResource implements InvoiceResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +39,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php
index ea40518abd00f..69df9d24e66e0 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php
@@ -9,7 +9,6 @@
  * Invoice backend model for child attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php
index 58c36d4d459f3..1205ae98588f5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php
@@ -9,7 +9,6 @@
  * Invoice backend model for item attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Item extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php
index 78935b720c091..84e15dc104947 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php
@@ -9,7 +9,6 @@
  * Invoice backend model for order attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Order extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Order extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php
index dbf191e473d32..4edcfc50d079b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements InvoiceSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterf
      * Id field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'entity_id';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterf
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterf
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_invoice_collection';
 
@@ -45,7 +41,6 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterf
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -53,7 +48,6 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterf
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +61,6 @@ protected function _construct()
      * Used to emulate after load functionality for each item without loading them
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
index e35e94cfff3de..eb4f9c43f1d58 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
@@ -13,7 +13,6 @@
  * Flat sales order invoice comment resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
 {
@@ -21,7 +20,6 @@ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_comment_resource';
 
@@ -29,7 +27,6 @@ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
      * Validator
      *
      * @var \Magento\Sales\Model\Order\Invoice\Comment\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -41,7 +38,6 @@ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Invoice\Comment\Validator $validator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php
index 0a517548722d3..0cd30fce7495a 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements InvoiceCommentSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements InvoiceCommentSearchResul
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_comment_collection';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements InvoiceCommentSearchResul
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_invoice_comment_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements InvoiceCommentSearchResul
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      *
      * @param int $invoiceId
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoiceFilter($invoiceId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
index 40a22c580aade..ed3c9521cd476 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
@@ -15,7 +15,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -34,7 +34,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php
index 36b0bc5c22bf2..f6160bd243326 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php
@@ -7,19 +7,16 @@
 
 /**
  * Sales invoices statuses option array
- * @since 2.0.0
  */
 class StatusList implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $invoiceRepository;
 
     /**
      * @param \Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Sales\Api\InvoiceRepositoryInterface $invoi
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php
index 5ae5ddd091ca7..d5295d33d2aba 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php
@@ -12,7 +12,6 @@
  * Flat sales order invoice item resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends SalesResource implements InvoiceItemResourceInterface
 {
@@ -20,7 +19,6 @@ class Item extends SalesResource implements InvoiceItemResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_item_resource';
 
@@ -28,7 +26,6 @@ class Item extends SalesResource implements InvoiceItemResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +37,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -57,7 +53,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php
index 21f589fe312c4..0bf3553967746 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_invoice_item_collection';
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_invoice_item_collection';
 
@@ -34,7 +31,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -49,7 +45,6 @@ protected function _construct()
      *
      * @param int $invoiceId
      * @return $this
-     * @since 2.0.0
      */
     public function setInvoiceFilter($invoiceId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php
index 3e3f3017f17f4..5ec463f63a8fa 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php
@@ -14,7 +14,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
index 540658108cc41..fb689401890c8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
@@ -12,26 +12,22 @@
 
 /**
  * Class Relation
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
     /**
      * @var InvoiceItemResource
-     * @since 2.0.0
      */
     protected $invoiceItemResource;
 
     /**
      * @var InvoiceCommentResource
-     * @since 2.0.0
      */
     protected $invoiceCommentResource;
 
     /**
      * @param InvoiceItemResource $invoiceItemResource
      * @param InvoiceCommentResource $invoiceCommentResource
-     * @since 2.0.0
      */
     public function __construct(
         InvoiceItemResource $invoiceItemResource,
@@ -47,7 +43,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item.php
index de1001173d3ee..16c8dd5bde81b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item.php
@@ -10,7 +10,6 @@
 
 /**
  * Flat sales order item resource
- * @since 2.0.0
  */
 class Item extends SalesResource implements OrderItemResourceInterface
 {
@@ -18,7 +17,6 @@ class Item extends SalesResource implements OrderItemResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_item_resource';
 
@@ -26,7 +24,6 @@ class Item extends SalesResource implements OrderItemResourceInterface
      * Fields that should be serialized before persistence
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = ['product_options' => [[], []]];
 
@@ -34,7 +31,6 @@ class Item extends SalesResource implements OrderItemResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +42,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
index 15e0eed05d4c0..b4b35f8d74ee8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\OrderItemSearchResultInterface
 {
@@ -20,7 +19,6 @@ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\O
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_item_collection';
 
@@ -28,7 +26,6 @@ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\O
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_item_collection';
 
@@ -36,7 +33,6 @@ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\O
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -44,7 +40,6 @@ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\O
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +50,6 @@ protected function _construct()
      * Assign parent items on after collection load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -76,7 +70,6 @@ protected function _afterLoad()
      * Set random items order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRandomOrder()
     {
@@ -89,7 +82,6 @@ public function setRandomOrder()
      *
      * @param mixed $item
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($item)
     {
@@ -108,7 +100,6 @@ public function addIdFilter($item)
      *
      * @param array $typeIds
      * @return $this
-     * @since 2.0.0
      */
     public function filterByTypes($typeIds)
     {
@@ -121,7 +112,6 @@ public function filterByTypes($typeIds)
      *
      * @param int $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function filterByParent($parentId = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
index 6176296306fac..1574f6e47c7cc 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
@@ -10,7 +10,6 @@
 
 /**
  * Flat sales order payment resource
- * @since 2.0.0
  */
 class Payment extends SalesResource
 {
@@ -18,7 +17,6 @@ class Payment extends SalesResource
      * Serializeable field: additional_information
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = ['additional_information' => [null, []]];
 
@@ -26,7 +24,6 @@ class Payment extends SalesResource
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_payment_resource';
 
@@ -34,7 +31,6 @@ class Payment extends SalesResource
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +42,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
index d83e8af8f479a..521db7f1f3a45 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
@@ -10,7 +10,6 @@
 
 /**
  * Flat sales order payment collection
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements OrderPaymentSearchResultInterface
 {
@@ -18,7 +17,6 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_payment_collection';
 
@@ -26,7 +24,6 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_payment_collection';
 
@@ -38,7 +35,6 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
      * @param null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -64,7 +60,6 @@ public function __construct(
      * Model initialization\
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +73,6 @@ protected function _construct()
      * Unserialize additional_information in each item
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
index 6e26cb4f9b6a7..b543fad9616db 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
@@ -12,7 +12,6 @@
  * Sales transaction resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Transaction extends EntityAbstract implements TransactionResourceInterface
 {
@@ -20,7 +19,6 @@ class Transaction extends EntityAbstract implements TransactionResourceInterface
      * Serializeable field: additional_information
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = ['additional_information' => [null, []]];
 
@@ -28,7 +26,6 @@ class Transaction extends EntityAbstract implements TransactionResourceInterface
      * Initialize main table and the primary key field name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -41,7 +38,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order\Payment\Transaction $transaction
      * @return void
-     * @since 2.0.0
      */
     public function injectAsParent(\Magento\Sales\Model\Order\Payment\Transaction $transaction)
     {
@@ -87,7 +83,6 @@ public function injectAsParent(\Magento\Sales\Model\Order\Payment\Transaction $t
      * @param int $paymentId
      * @param string $txnId
      * @return \Magento\Sales\Model\Order\Payment\Transaction
-     * @since 2.0.0
      */
     public function loadObjectByTxnId(
         \Magento\Sales\Model\Order\Payment\Transaction $transaction,
@@ -112,7 +107,6 @@ public function loadObjectByTxnId(
      *
      * @param int $orderId
      * @return string
-     * @since 2.0.0
      */
     public function getOrderWebsiteId($orderId)
     {
@@ -137,7 +131,6 @@ public function getOrderWebsiteId($orderId)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Sales\Model\Order\Payment\Transaction $transaction
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transaction)
     {
@@ -180,7 +173,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transacti
      * @param bool $isRow
      * @param string $txnType
      * @return array|string
-     * @since 2.0.0
      */
     private function _lookupByTxnId($orderId, $paymentId, $txnId, $columns, $isRow = false, $txnType = null)
     {
@@ -202,7 +194,6 @@ private function _lookupByTxnId($orderId, $paymentId, $txnId, $columns, $isRow =
      * @param string $txnId
      * @param string|array|\Zend_Db_Expr $columns
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     private function _getLoadByUniqueKeySelect($orderId, $paymentId, $txnId, $columns = '*')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php
index f02c3e8cbed38..e068da8fb08d7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php
@@ -12,7 +12,6 @@
  * Payment transactions collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements TransactionSearchResultInterface
 {
@@ -20,7 +19,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Order ID filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_orderId = null;
 
@@ -28,7 +26,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Columns of order info that should be selected
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_addOrderInformation = [];
 
@@ -36,7 +33,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Columns of payment info that should be selected
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_addPaymentInformation = [];
 
@@ -44,7 +40,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Order Store ids
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
@@ -52,7 +47,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Payment ID filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_paymentId = null;
 
@@ -60,7 +54,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Parent ID filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_parentId = null;
 
@@ -68,7 +61,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Filter by transaction type
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_txnTypes = null;
 
@@ -76,7 +68,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -84,7 +75,6 @@ class Collection extends AbstractCollection implements TransactionSearchResultIn
      * Initialize collection items factory class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -101,7 +91,6 @@ protected function _construct()
      *
      * @param string[] $keys
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderInformation(array $keys)
     {
@@ -114,7 +103,6 @@ public function addOrderInformation(array $keys)
      *
      * @param array $keys
      * @return $this
-     * @since 2.0.0
      */
     public function addPaymentInformation(array $keys)
     {
@@ -127,7 +115,6 @@ public function addPaymentInformation(array $keys)
      *
      * @param int $orderId
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderIdFilter($orderId)
     {
@@ -141,7 +128,6 @@ public function addOrderIdFilter($orderId)
      *
      * @param \Magento\Sales\Model\Order\Payment|int $payment
      * @return $this
-     * @since 2.0.0
      */
     public function addPaymentIdFilter($payment)
     {
@@ -158,7 +144,6 @@ public function addPaymentIdFilter($payment)
      *
      * @param int $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function addParentIdFilter($parentId)
     {
@@ -171,7 +156,6 @@ public function addParentIdFilter($parentId)
      *
      * @param string[]|string $txnType
      * @return $this
-     * @since 2.0.0
      */
     public function addTxnTypeFilter($txnType)
     {
@@ -187,7 +171,6 @@ public function addTxnTypeFilter($txnType)
      *
      * @param int|int[] $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
@@ -200,7 +183,6 @@ public function addStoreFilter($storeIds)
      * Render additional filters and joins
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
@@ -240,7 +222,6 @@ protected function _renderFiltersBefore()
      * Unserialize additional_information in each item
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Plugin/Authorization.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Plugin/Authorization.php
index 95008b2b5309f..28dd332f0bb1d 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Plugin/Authorization.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Plugin/Authorization.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization
  *
- * @since 2.0.0
  */
 class Authorization
 {
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
     /**
      * @param UserContextInterface $userContext
-     * @since 2.0.0
      */
     public function __construct(
         UserContextInterface $userContext
@@ -61,7 +58,6 @@ public function afterLoad(
      *
      * @param \Magento\Sales\Model\Order $order
      * @return bool
-     * @since 2.0.0
      */
     protected function isAllowed(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
index f06a12e893d4a..bb55944d08263 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
@@ -14,31 +14,26 @@
 
 /**
  * Class Relation
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
     /**
      * @var AddressHandler
-     * @since 2.0.0
      */
     protected $addressHandler;
 
     /**
      * @var OrderItemRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderItemRepository;
 
     /**
      * @var OrderPaymentResource
-     * @since 2.0.0
      */
     protected $orderPaymentResource;
 
     /**
      * @var OrderStatusHistoryResource
-     * @since 2.0.0
      */
     protected $orderStatusHistoryResource;
 
@@ -47,7 +42,6 @@ class Relation implements RelationInterface
      * @param OrderItemRepositoryInterface $orderItemRepository
      * @param OrderPaymentResource $orderPaymentResource
      * @param OrderStatusHistoryResource $orderStatusHistoryResource
-     * @since 2.0.0
      */
     public function __construct(
         AddressHandler $addressHandler,
@@ -67,7 +61,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
index 286c6cd1e414d..19d9b6f300eba 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
@@ -11,19 +11,16 @@
  * Order Rss Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class OrderStatus
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @param ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(ResourceConnection $resource)
     {
@@ -35,7 +32,6 @@ public function __construct(ResourceConnection $resource)
      *
      * @param int $orderId
      * @return array
-     * @since 2.0.0
      */
     public function getAllCommentCollection($orderId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
index 429eb8073fc7e..d2d45b62250ed 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
@@ -15,7 +15,6 @@
  * Flat sales order shipment resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipment extends SalesResource implements ShipmentResourceInterface
 {
@@ -23,7 +22,6 @@ class Shipment extends SalesResource implements ShipmentResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_resource';
 
@@ -31,7 +29,6 @@ class Shipment extends SalesResource implements ShipmentResourceInterface
      * Fields that should be serialized before persistence
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = ['packages' => [[], []]];
 
@@ -39,7 +36,6 @@ class Shipment extends SalesResource implements ShipmentResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php
index 673e4dfa9474e..b06d484c5c5ad 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php
@@ -9,7 +9,6 @@
  * Invoice backend model for child attribute
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -18,7 +17,6 @@ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
index f71ced27df344..8fcb625801533 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
@@ -13,13 +13,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements ShipmentSearchResultInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'entity_id';
 
@@ -27,7 +25,6 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_collection';
 
@@ -35,7 +32,6 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_shipment_collection';
 
@@ -43,7 +39,6 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter
      * Order field for setOrderFilter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -51,7 +46,6 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -65,7 +59,6 @@ protected function _construct()
      * Used to emulate after load functionality for each item without loading them
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
index 9d67827528c50..f8ff8268e4118 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
@@ -13,7 +13,6 @@
  * Flat sales order shipment comment resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Comment extends EntityAbstract implements ShipmentCommentResourceInterface
 {
@@ -21,7 +20,6 @@ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_comment_resource';
 
@@ -29,7 +27,6 @@ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface
      * Validator
      *
      * @var \Magento\Sales\Model\Order\Shipment\Comment\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -41,7 +38,6 @@ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Shipment\Comment\Validator $validator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php
index 92b693c5ad22e..2bc877bdfa69e 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements ShipmentCommentSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements ShipmentCommentSearchResu
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_comment_collection';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements ShipmentCommentSearchResu
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_shipment_comment_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements ShipmentCommentSearchResu
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
      *
      * @param int $shipmentId
      * @return $this
-     * @since 2.0.0
      */
     public function setShipmentFilter($shipmentId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php
index e5899f1719fe9..147bfb6a983d8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php
@@ -14,7 +14,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Shipment\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php
index b8f84d457784e..e5e4292d897b5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php
@@ -12,7 +12,6 @@
  * Flat sales order shipment item resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Item extends SalesResource implements ShipmentItemResourceInterface
 {
@@ -20,7 +19,6 @@ class Item extends SalesResource implements ShipmentItemResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_item_resource';
 
@@ -28,7 +26,6 @@ class Item extends SalesResource implements ShipmentItemResourceInterface
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +37,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php
index 4b840a4d27e91..a868a10384672 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php
@@ -9,7 +9,6 @@
  * Flat sales order shipment items collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_item_collection';
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_shipment_item_collection';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -48,7 +44,6 @@ protected function _construct()
      *
      * @param int $shipmentId
      * @return $this
-     * @since 2.0.0
      */
     public function setShipmentFilter($shipmentId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php
index a376bc6ee85e3..fa99d2564f498 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php
@@ -14,7 +14,7 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection
  *
- * @since 2.1.0
+ * @since 2.0.12
  */
 class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
-     * @since 2.1.0
+     * @since 2.0.12
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
index b426c0348ff33..5851b2d936139 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
@@ -13,25 +13,21 @@
 
 /**
  * Class Relation
- * @since 2.0.0
  */
 class Relation implements RelationInterface
 {
     /**
      * @var ShipmentItemResource
-     * @since 2.0.0
      */
     protected $shipmentItemResource;
 
     /**
      * @var ShipmentTrackResource
-     * @since 2.0.0
      */
     protected $shipmentTrackResource;
 
     /**
      * @var ShipmentCommentResource
-     * @since 2.0.0
      */
     protected $shipmentCommentResource;
 
@@ -39,7 +35,6 @@ class Relation implements RelationInterface
      * @param Item $shipmentItemResource
      * @param Track $shipmentTrackResource
      * @param Comment $shipmentCommentResource
-     * @since 2.0.0
      */
     public function __construct(
         ShipmentItemResource $shipmentItemResource,
@@ -57,7 +52,6 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
index faa5f2c42ae75..4879df7d5f44a 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
@@ -13,7 +13,6 @@
  * Flat sales order shipment comment resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Track extends SalesResource implements ShipmentTrackResourceInterface
 {
@@ -21,7 +20,6 @@ class Track extends SalesResource implements ShipmentTrackResourceInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_track_resource';
 
@@ -29,7 +27,6 @@ class Track extends SalesResource implements ShipmentTrackResourceInterface
      * Validator
      *
      * @var \Magento\Sales\Model\Order\Shipment\Track\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -41,7 +38,6 @@ class Track extends SalesResource implements ShipmentTrackResourceInterface
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Shipment\Track\Validator $validator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -67,7 +63,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -80,7 +75,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php
index 82e6185305606..bed4297479270 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements ShipmentTrackSearchResultInterface
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection implements ShipmentTrackSearchResult
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_shipment_track_collection';
 
@@ -29,7 +27,6 @@ class Collection extends AbstractCollection implements ShipmentTrackSearchResult
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_shipment_track_collection';
 
@@ -37,7 +34,6 @@ class Collection extends AbstractCollection implements ShipmentTrackSearchResult
      * Order field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField = 'order_id';
 
@@ -45,7 +41,6 @@ class Collection extends AbstractCollection implements ShipmentTrackSearchResult
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -60,7 +55,6 @@ protected function _construct()
      *
      * @param int $shipmentId
      * @return $this
-     * @since 2.0.0
      */
     public function setShipmentFilter($shipmentId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
index 37b31e3bac7f4..140ffdea262be 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
@@ -16,7 +16,6 @@
  * Order status resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -24,7 +23,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Status labels table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $labelsTable;
 
@@ -32,7 +30,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Status state table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $stateTable;
 
@@ -40,7 +37,6 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +53,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -88,7 +83,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param \Magento\Sales\Model\Order\Status $status
      * @return array
-     * @since 2.0.0
      */
     public function getStoreLabels(\Magento\Sales\Model\Order\Status $status)
     {
@@ -107,7 +101,6 @@ public function getStoreLabels(\Magento\Sales\Model\Order\Status $status)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -136,7 +129,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @param bool $isDefault
      * @param bool $visibleOnFront
      * @return $this
-     * @since 2.0.0
      */
     public function assignState($status, $state, $isDefault, $visibleOnFront = false)
     {
@@ -166,7 +158,6 @@ public function assignState($status, $state, $isDefault, $visibleOnFront = false
      * @param string $state
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function unassignState($status, $state)
     {
@@ -207,7 +198,6 @@ public function unassignState($status, $state)
      *
      * @param string $state
      * @return bool
-     * @since 2.0.0
      */
     public function checkIsStateLast($state)
     {
@@ -224,7 +214,6 @@ public function checkIsStateLast($state)
      *
      * @param string $status
      * @return bool
-     * @since 2.0.0
      */
     public function checkIsStatusUsed($status)
     {
@@ -243,7 +232,6 @@ public function checkIsStatusUsed($status)
      * @param string $state
      * @param string $status
      * @return bool
-     * @since 2.0.0
      */
     protected function checkIsStateDefault($state, $status)
     {
@@ -263,7 +251,6 @@ protected function checkIsStateDefault($state, $status)
      * @param string $state
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function getStatusByState($state)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php
index ea6f0bbc3f5a8..476a8282e73e8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php
@@ -9,7 +9,6 @@
  * Flat sales order status history collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Get collection data as options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -39,7 +36,6 @@ public function toOptionArray()
      * Get collection data as options hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -50,7 +46,6 @@ public function toOptionHash()
      * Join order states table
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinStates()
     {
@@ -71,7 +66,6 @@ public function joinStates()
      *
      * @param string $state
      * @return $this
-     * @since 2.0.0
      */
     public function addStateFilter($state)
     {
@@ -85,7 +79,6 @@ public function addStateFilter($state)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function orderByLabel($dir = 'ASC')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
index 2e50cd3269b26..95fa9e11ce509 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
@@ -14,13 +14,11 @@
  * Flat sales order status history resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class History extends EntityAbstract implements OrderStatusHistoryResourceInterface
 {
     /**
      * @var Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -32,7 +30,6 @@ class History extends EntityAbstract implements OrderStatusHistoryResourceInterf
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param Validator $validator
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -58,7 +55,6 @@ public function __construct(
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_status_history_resource';
 
@@ -66,7 +62,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -79,7 +74,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php
index cf364860e46a6..aff98dd3f47c3 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php
@@ -14,7 +14,6 @@
  * Flat sales order status history collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection implements OrderStatusHistorySearchResultInterface
 {
@@ -22,7 +21,6 @@ class Collection extends AbstractCollection implements OrderStatusHistorySearchR
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_order_status_history_collection';
 
@@ -30,7 +28,6 @@ class Collection extends AbstractCollection implements OrderStatusHistorySearchR
      * Event object
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'order_status_history_collection';
 
@@ -38,7 +35,6 @@ class Collection extends AbstractCollection implements OrderStatusHistorySearchR
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      *
      * @param AbstractModel $instance
      * @return \Magento\Sales\Model\Order\Status\History|null
-     * @since 2.0.0
      */
     public function getUnnotifiedForInstance($instance)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php
index 6fca73fc72be2..b46a131857775 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php
@@ -9,7 +9,6 @@
  * Order Tax Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Sales\Model\ResourceModel\EntityAbstract
 {
@@ -17,7 +16,6 @@ class Tax extends \Magento\Sales\Model\ResourceModel\EntityAbstract
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php
index 4b0eca89efcce..788dd5e8b7a40 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php
@@ -9,7 +9,6 @@
  * Order Tax Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractC
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param \Magento\Sales\Model\Order $order
      * @return $this
-     * @since 2.0.0
      */
     public function loadByOrder($order)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Item.php
index 7dca37e05adfb..9a4e89fe265aa 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Item.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Item.php
@@ -7,7 +7,6 @@
 
 /**
  * Sales order tax resource model
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -27,7 +25,6 @@ protected function _construct()
      *
      * @param int $orderId
      * @return array
-     * @since 2.0.0
      */
     public function getTaxItemsByOrderId($orderId)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report.php b/app/code/Magento/Sales/Model/ResourceModel/Report.php
index ac7e20e229c70..9f7f4be2bfda4 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report.php
@@ -9,7 +9,6 @@
  * Sales report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract
 {
@@ -17,7 +16,6 @@ class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      * @param string $table
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function init($table, $field = 'id')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php
index aa49e858143ea..1202fd269ada4 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php
@@ -9,7 +9,6 @@
  * Order report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class AbstractReport extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers.php
index b89605c36aa48..e37e8ab843e73 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers.php
@@ -8,7 +8,6 @@
 /**
  * Bestsellers report resource model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Bestsellers extends AbstractReport
 {
@@ -20,13 +19,11 @@ class Bestsellers extends AbstractReport
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_productResource;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Helper
-     * @since 2.0.0
      */
     protected $_salesResourceHelper;
 
@@ -34,7 +31,6 @@ class Bestsellers extends AbstractReport
      * Ignored product types list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $ignoredProductTypes = [
         \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE => \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
@@ -52,7 +48,6 @@ class Bestsellers extends AbstractReport
      * @param array $ignoredProductTypes
      * @param string $connectionName
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -84,7 +79,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -99,7 +93,6 @@ protected function _construct()
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -216,7 +209,6 @@ public function aggregate($from = null, $to = null)
      *
      * @param string $aggregation
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateRatingPos($aggregation)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers/Collection.php
index 56928546a2498..7f0aaff02d104 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Bestsellers/Collection.php
@@ -10,7 +10,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Rating limit
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_ratingLimit = 5;
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Selected columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -34,7 +31,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Tables per period
      *
      * @var array
-     * @since 2.0.0
      */
     protected $tableForPeriod = [
         'daily'   => 'sales_bestsellers_aggregated_daily',
@@ -49,7 +45,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -67,7 +62,6 @@ public function __construct(
      * Return ordered filed
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getOrderedField()
     {
@@ -79,7 +73,6 @@ protected function getOrderedField()
      *
      * @param string $period
      * @return mixed
-     * @since 2.0.0
      */
     public function getTableByAggregationPeriod($period)
     {
@@ -90,7 +83,6 @@ public function getTableByAggregationPeriod($period)
      * Retrieve selected columns
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -123,7 +115,6 @@ protected function _getSelectedColumns()
      * @param string $from
      * @param string $to
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _makeBoundarySelect($from, $to)
     {
@@ -156,7 +147,6 @@ protected function _makeBoundarySelect($from, $to)
      * Init collection select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyAggregatedTable()
     {
@@ -208,7 +198,6 @@ protected function _applyAggregatedTable()
      * Get SQL for get record count
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -223,7 +212,6 @@ public function getSelectCountSql()
      *
      * @param  int|int[] $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreRestrictions($storeIds)
     {
@@ -256,7 +244,6 @@ public function addStoreRestrictions($storeIds)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
index f7b131ba2b10b..86d86255a0c29 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
@@ -9,7 +9,6 @@
  * Report collection abstract model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Col
      * Order status
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderStatus = null;
 
@@ -28,7 +26,6 @@ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Col
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param null $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -47,7 +44,6 @@ public function __construct(
      *
      * @param string $orderStatus
      * @return $this
-     * @since 2.0.0
      */
     public function addOrderStatusFilter($orderStatus)
     {
@@ -59,7 +55,6 @@ public function addOrderStatusFilter($orderStatus)
      * Apply order status filter
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyOrderStatusFilter()
     {
@@ -78,7 +73,6 @@ protected function _applyOrderStatusFilter()
      * Order status filter is custom for this collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyCustomFilter()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php
index 642b87cf21102..b121d802377df 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php
@@ -9,7 +9,6 @@
  * Invoice report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Invoiced extends AbstractReport
 {
@@ -17,7 +16,6 @@ class Invoiced extends AbstractReport
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -49,7 +46,6 @@ public function aggregate($from = null, $to = null)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _aggregateByInvoiceCreatedAt($from, $to)
     {
@@ -173,7 +169,6 @@ protected function _aggregateByInvoiceCreatedAt($from, $to)
      * @param string|null $from
      * @param string|null $to
      * @return $this
-     * @since 2.0.0
      */
     protected function _aggregateByOrderCreatedAt($from, $to)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php
index 2a9cbf11ac5fb..584f17846c1c7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php
@@ -9,7 +9,6 @@
  * Sales report invoiced collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Invoiced extends Order
 {
@@ -20,7 +19,6 @@ class Invoiced extends Order
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php
index 28b91a3c5df45..c65d94edce18c 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php
@@ -9,7 +9,6 @@
  * Sales report invoiced collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Period format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -25,7 +23,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Columns for select
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -36,7 +33,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -54,7 +50,6 @@ public function __construct(
      * Retrieve columns for select
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -90,7 +85,6 @@ protected function _getSelectedColumns()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order.php
index 7fdabe5b28068..cbacafb21dfdb 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order.php
@@ -7,19 +7,16 @@
 
 /**
  * Order entity resource model
- * @since 2.0.0
  */
 class Order extends AbstractReport
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Order\CreatedatFactory
-     * @since 2.0.0
      */
     protected $_createDatFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Order\UpdatedatFactory
-     * @since 2.0.0
      */
     protected $_updateDatFactory;
 
@@ -33,7 +30,6 @@ class Order extends AbstractReport
      * @param \Magento\Sales\Model\ResourceModel\Report\Order\CreatedatFactory $createDatFactory
      * @param \Magento\Sales\Model\ResourceModel\Report\Order\UpdatedatFactory $updateDatFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -63,7 +59,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +71,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php
index 66f27c23bb613..2debe3b0a4df7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php
@@ -9,7 +9,6 @@
  * Report order collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Period format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'sales_order_aggregated_created';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Selected columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -44,7 +40,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -62,7 +57,6 @@ public function __construct(
      * Get selected columns
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -111,7 +105,6 @@ protected function _getSelectedColumns()
      * Apply custom columns before load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php
index d90d95e653b16..9c0df9a9b4b58 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php
@@ -9,7 +9,6 @@
  * Order entity resource model with aggregation by created at
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Createdat extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
 {
@@ -17,7 +16,6 @@ class Createdat extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -47,7 +44,6 @@ public function aggregate($from = null, $to = null)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _aggregateByField($aggregationField, $from, $to)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php
index af27fa8c0886c..3d75f5530538d 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php
@@ -9,7 +9,6 @@
  * Order entity resource model with aggregation by updated at
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Updatedat extends Createdat
 {
@@ -17,7 +16,6 @@ class Updatedat extends Createdat
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php
index cc5671d48dd47..81cb917a906eb 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php
@@ -9,7 +9,6 @@
  * Report order updated_at collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collect
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'sales_order_aggregated_updated';
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php
index e16a3450c2372..89a4e759c43a7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php
@@ -9,7 +9,6 @@
  * Refund report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Refunded extends AbstractReport
 {
@@ -17,7 +16,6 @@ class Refunded extends AbstractReport
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -48,7 +45,6 @@ public function aggregate($from = null, $to = null)
      * @param string|null $to
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _aggregateByOrderCreatedAt($from, $to)
     {
@@ -137,7 +133,6 @@ protected function _aggregateByOrderCreatedAt($from, $to)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _aggregateByRefundCreatedAt($from, $to)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php
index 70f594880b1fb..3c2d5890481d9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php
@@ -9,7 +9,6 @@
  * Sales report refunded collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Period format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -25,7 +23,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Selected columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -36,7 +33,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -54,7 +50,6 @@ public function __construct(
      * Retrieve selected columns
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -91,7 +86,6 @@ protected function _getSelectedColumns()
      * Apply custom columns before load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php
index 471f7805af534..e64049c900ed8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php
@@ -9,7 +9,6 @@
  * Sales report refunded collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Refunded extends Order
 {
@@ -20,7 +19,6 @@ class Refunded extends Order
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php
index 91a3d4f5696ab..0f04239ce663c 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php
@@ -9,7 +9,6 @@
  * Shipping report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipping extends AbstractReport
 {
@@ -17,7 +16,6 @@ class Shipping extends AbstractReport
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param string|int|\DateTime|array|null $from
      * @param string|int|\DateTime|array|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -47,7 +44,6 @@ public function aggregate($from = null, $to = null)
      * @param string|null $to
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _aggregateByOrderCreatedAt($from, $to)
     {
@@ -141,7 +137,6 @@ protected function _aggregateByOrderCreatedAt($from, $to)
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _aggregateByShippingCreatedAt($from, $to)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php
index 25fcc616128f0..670c467a89356 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php
@@ -9,7 +9,6 @@
  * Sales report shipping collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Period format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -25,7 +23,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * Selected columns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -36,7 +33,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\Abstrac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -54,7 +50,6 @@ public function __construct(
      * Get selected columns
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -95,7 +90,6 @@ protected function _getSelectedColumns()
      * Apply custom columns before load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php
index 7b60972f57676..8ae1522f3dc62 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php
@@ -9,7 +9,6 @@
  * Sales report shipping collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Shipment extends Order
 {
@@ -20,7 +19,6 @@ class Shipment extends Order
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
index fac97cf933a59..82839684b08b7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * Sales Collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Totals data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_totals = ['lifetime' => 0, 'base_lifetime' => 0, 'base_avgsale' => 0, 'num_orders' => 0];
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Customer Id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_customerId;
 
@@ -37,7 +34,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Order state value
      *
      * @var null|string|array
-     * @since 2.0.0
      */
     protected $_state = null;
 
@@ -45,19 +41,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Order state condition
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderStateCondition = null;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $_storeCollectionFactory;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -68,7 +61,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param ManagerInterface $eventManager
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -90,7 +82,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -103,7 +94,6 @@ protected function _construct()
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerIdFilter($customerId)
     {
@@ -116,7 +106,6 @@ public function setCustomerIdFilter($customerId)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
@@ -129,7 +118,6 @@ public function addStoreFilter($storeIds)
      * @param string|array $state
      * @param bool $exclude
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderStateFilter($state, $exclude = false)
     {
@@ -142,7 +130,6 @@ public function setOrderStateFilter($state, $exclude = false)
      * Before load action
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -186,7 +173,6 @@ protected function _beforeLoad()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -235,7 +221,6 @@ public function load($printQuery = false, $logQuery = false)
      * Retrieve totals data converted into \Magento\Framework\DataObject
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getTotals()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
index b6cce33087467..44fce0e3411d5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Sales\Model\ResourceModel\Status\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Order\Status\Collection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Status\Collect
      * Join order states table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/Collection.php
index b35cac6dd509c..0af772f5e6f99 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/Collection.php
@@ -8,7 +8,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\Collection
 {
@@ -16,7 +15,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Payment\Transa
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registryManager = null;
 
@@ -29,7 +27,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Payment\Transa
      * @param \Magento\Framework\Registry $registryManager
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -57,7 +54,6 @@ public function __construct(
      * Resource initialization
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php
index f36ebc217c205..f9dc1d023f5a2 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php
@@ -9,19 +9,16 @@
 
 /**
  * Sales transaction types option array
- * @since 2.0.0
  */
 class TypeList implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var TransactionRepositoryInterface
-     * @since 2.0.0
      */
     protected $transactionRepository;
 
     /**
      * @param TransactionRepositoryInterface $transactionRepository
-     * @since 2.0.0
      */
     public function __construct(TransactionRepositoryInterface $transactionRepository)
     {
@@ -32,7 +29,6 @@ public function __construct(TransactionRepositoryInterface $transactionRepositor
      * Return option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Model/Rss/NewOrder.php b/app/code/Magento/Sales/Model/Rss/NewOrder.php
index ad49259141cff..64e255057cbd4 100644
--- a/app/code/Magento/Sales/Model/Rss/NewOrder.php
+++ b/app/code/Magento/Sales/Model/Rss/NewOrder.php
@@ -10,13 +10,11 @@
 /**
  * Class NewOrder
  * @package Magento\Sales\Model\Rss
- * @since 2.0.0
  */
 class NewOrder implements DataProviderInterface
 {
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -24,26 +22,22 @@ class NewOrder implements DataProviderInterface
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * System event manager
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -51,13 +45,11 @@ class NewOrder implements DataProviderInterface
      * Parent layout of the block
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
@@ -69,7 +61,6 @@ class NewOrder implements DataProviderInterface
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\View\LayoutInterface $layout
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
@@ -93,7 +84,6 @@ public function __construct(
      * Check if RSS feed allowed
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -104,7 +94,6 @@ public function isAllowed()
      * Get RSS feed items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -143,7 +132,6 @@ public function getRssData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCacheKey()
     {
@@ -152,7 +140,6 @@ public function getCacheKey()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -161,7 +148,6 @@ public function getCacheLifetime()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -170,7 +156,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index 3eaae0dd3be25..d45c0e664f9d2 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -10,7 +10,6 @@
 /**
  * Class OrderStatus
  * @package Magento\Sales\Model\Rss
- * @since 2.0.0
  */
 class OrderStatus implements DataProviderInterface
 {
@@ -18,49 +17,41 @@ class OrderStatus implements DataProviderInterface
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected $order;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Rss\OrderStatusFactory
-     * @since 2.0.0
      */
     protected $orderResourceFactory;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
@@ -72,7 +63,6 @@ class OrderStatus implements DataProviderInterface
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -96,7 +86,6 @@ public function __construct(
      * Check if RSS feed allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -108,7 +97,6 @@ public function isAllowed()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -121,7 +109,6 @@ public function getRssData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCacheKey()
     {
@@ -135,7 +122,6 @@ public function getCacheKey()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -144,7 +130,6 @@ public function getCacheLifetime()
 
     /**
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     protected function getOrder()
     {
@@ -181,7 +166,6 @@ protected function getOrder()
      * Get RSS feed items
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getEntries()
     {
@@ -224,7 +208,6 @@ protected function getEntries()
      * Get data for Header esction of RSS feed
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getHeader()
     {
@@ -236,7 +219,6 @@ protected function getHeader()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -245,7 +227,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
index 87e5eb5537efe..6c05b8f984832 100644
--- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php
+++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
@@ -9,73 +9,65 @@
 /**
  * Class CreditmemoService
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterface
 {
     /**
      * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
     /**
      * @var \Magento\Sales\Api\CreditmemoCommentRepositoryInterface
-     * @since 2.0.0
      */
     protected $commentRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Sales\Model\Order\CreditmemoNotifier
-     * @since 2.0.0
      */
     protected $creditmemoNotifier;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resource;
 
     /**
      * @var \Magento\Sales\Model\Order\RefundAdapterInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $refundAdapter;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceRepository;
 
@@ -87,7 +79,6 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
      * @param \Magento\Sales\Model\Order\CreditmemoNotifier $creditmemoNotifier
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository,
@@ -113,7 +104,6 @@ public function __construct(
      * @param int $id Credit Memo Id
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function cancel($id)
     {
@@ -137,7 +127,6 @@ public function cancel($id)
      *
      * @param int $id
      * @return \Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterface
-     * @since 2.0.0
      */
     public function getCommentsList($id)
     {
@@ -153,7 +142,6 @@ public function getCommentsList($id)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id)
     {
@@ -168,7 +156,6 @@ public function notify($id)
      * @param bool $offlineRequested
      * @return \Magento\Sales\Api\Data\CreditmemoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function refund(
         \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
@@ -209,7 +196,6 @@ public function refund(
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo)
     {
@@ -239,8 +225,8 @@ protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface
     /**
      * @return \Magento\Sales\Model\Order\RefundAdapterInterface
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getRefundAdapter()
     {
@@ -254,8 +240,8 @@ private function getRefundAdapter()
     /**
      * @return \Magento\Framework\App\ResourceConnection|mixed
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getResource()
     {
@@ -269,8 +255,8 @@ private function getResource()
     /**
      * @return \Magento\Sales\Api\OrderRepositoryInterface
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getOrderRepository()
     {
@@ -284,8 +270,8 @@ private function getOrderRepository()
     /**
      * @return \Magento\Sales\Api\InvoiceRepositoryInterface
      *
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getInvoiceRepository()
     {
diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index b23d9e22ffb1e..c5874048716ff 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -10,7 +10,6 @@
 
 /**
  * Class InvoiceService
- * @since 2.0.0
  */
 class InvoiceService implements InvoiceManagementInterface
 {
@@ -18,7 +17,6 @@ class InvoiceService implements InvoiceManagementInterface
      * Repository
      *
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $repository;
 
@@ -26,7 +24,6 @@ class InvoiceService implements InvoiceManagementInterface
      * Repository
      *
      * @var \Magento\Sales\Api\InvoiceCommentRepositoryInterface
-     * @since 2.0.0
      */
     protected $commentRepository;
 
@@ -34,7 +31,6 @@ class InvoiceService implements InvoiceManagementInterface
      * Search Criteria Builder
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $criteriaBuilder;
 
@@ -42,7 +38,6 @@ class InvoiceService implements InvoiceManagementInterface
      * Filter Builder
      *
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -50,19 +45,16 @@ class InvoiceService implements InvoiceManagementInterface
      * Invoice Notifier
      *
      * @var \Magento\Sales\Model\Order\InvoiceNotifier
-     * @since 2.0.0
      */
     protected $invoiceNotifier;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var \Magento\Sales\Model\Convert\Order
-     * @since 2.0.0
      */
     protected $orderConverter;
 
@@ -76,7 +68,6 @@ class InvoiceService implements InvoiceManagementInterface
      * @param \Magento\Sales\Model\Order\InvoiceNotifier $notifier
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Sales\Model\Convert\Order $orderConverter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\InvoiceRepositoryInterface $repository,
@@ -98,7 +89,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setCapture($id)
     {
@@ -107,7 +97,6 @@ public function setCapture($id)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getCommentsList($id)
     {
@@ -120,7 +109,6 @@ public function getCommentsList($id)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function notify($id)
     {
@@ -130,7 +118,6 @@ public function notify($id)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setVoid($id)
     {
@@ -142,7 +129,6 @@ public function setVoid($id)
      * @param array $qtys
      * @return \Magento\Sales\Model\Order\Invoice
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function prepareInvoice(Order $order, array $qtys = [])
     {
@@ -213,7 +199,6 @@ private function prepareItemsQty(Order $order, array $qtys = [])
      * @param \Magento\Sales\Api\Data\OrderItemInterface $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $item)
     {
@@ -255,7 +240,6 @@ protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $i
      * @param float $qty
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function setInvoiceItemQuantity(\Magento\Sales\Api\Data\InvoiceItemInterface $item, $qty)
     {
diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php
index 79335ccf74e92..d187f7d8e4d24 100644
--- a/app/code/Magento/Sales/Model/Service/OrderService.php
+++ b/app/code/Magento/Sales/Model/Service/OrderService.php
@@ -11,49 +11,41 @@
  * Class OrderService
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OrderService implements OrderManagementInterface
 {
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
     /**
      * @var \Magento\Sales\Api\OrderStatusHistoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $historyRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $criteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Sales\Model\OrderNotifier
-     * @since 2.0.0
      */
     protected $notifier;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender
-     * @since 2.0.0
      */
     protected $orderCommentSender;
 
@@ -67,7 +59,6 @@ class OrderService implements OrderManagementInterface
      * @param \Magento\Sales\Model\OrderNotifier $notifier
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
@@ -92,7 +83,6 @@ public function __construct(
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function cancel($id)
     {
@@ -110,7 +100,6 @@ public function cancel($id)
      *
      * @param int $id
      * @return \Magento\Sales\Api\Data\OrderStatusHistorySearchResultInterface
-     * @since 2.0.0
      */
     public function getCommentsList($id)
     {
@@ -127,7 +116,6 @@ public function getCommentsList($id)
      * @param int $id
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface $statusHistory
      * @return bool
-     * @since 2.0.0
      */
     public function addComment($id, \Magento\Sales\Api\Data\OrderStatusHistoryInterface $statusHistory)
     {
@@ -145,7 +133,6 @@ public function addComment($id, \Magento\Sales\Api\Data\OrderStatusHistoryInterf
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id)
     {
@@ -158,7 +145,6 @@ public function notify($id)
      *
      * @param int $id
      * @return string
-     * @since 2.0.0
      */
     public function getStatus($id)
     {
@@ -170,7 +156,6 @@ public function getStatus($id)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function hold($id)
     {
@@ -184,7 +169,6 @@ public function hold($id)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function unHold($id)
     {
@@ -197,7 +181,6 @@ public function unHold($id)
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function place(\Magento\Sales\Api\Data\OrderInterface $order)
     {
@@ -229,7 +212,6 @@ public function place(\Magento\Sales\Api\Data\OrderInterface $order)
      * @param bool $shouldProtectState
      * @return \Magento\Sales\Model\Service\OrderService
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setState(
         \Magento\Sales\Api\Data\OrderInterface $order,
diff --git a/app/code/Magento/Sales/Model/Service/ShipmentService.php b/app/code/Magento/Sales/Model/Service/ShipmentService.php
index 7fd845a46392f..851b96130ae0f 100644
--- a/app/code/Magento/Sales/Model/Service/ShipmentService.php
+++ b/app/code/Magento/Sales/Model/Service/ShipmentService.php
@@ -9,7 +9,6 @@
 
 /**
  * Class ShipmentService
- * @since 2.0.0
  */
 class ShipmentService implements ShipmentManagementInterface
 {
@@ -17,7 +16,6 @@ class ShipmentService implements ShipmentManagementInterface
      * Repository
      *
      * @var \Magento\Sales\Api\ShipmentCommentRepositoryInterface
-     * @since 2.0.0
      */
     protected $commentRepository;
 
@@ -25,7 +23,6 @@ class ShipmentService implements ShipmentManagementInterface
      * Search Criteria Builder
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $criteriaBuilder;
 
@@ -33,7 +30,6 @@ class ShipmentService implements ShipmentManagementInterface
      * Filter Builder
      *
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -41,7 +37,6 @@ class ShipmentService implements ShipmentManagementInterface
      * Repository
      *
      * @var \Magento\Sales\Api\ShipmentRepositoryInterface
-     * @since 2.0.0
      */
     protected $repository;
 
@@ -49,7 +44,6 @@ class ShipmentService implements ShipmentManagementInterface
      * Shipment Notifier
      *
      * @var \Magento\Shipping\Model\ShipmentNotifier
-     * @since 2.0.0
      */
     protected $notifier;
 
@@ -61,7 +55,6 @@ class ShipmentService implements ShipmentManagementInterface
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Sales\Api\ShipmentRepositoryInterface $repository
      * @param \Magento\Shipping\Model\ShipmentNotifier $notifier
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\ShipmentCommentRepositoryInterface $commentRepository,
@@ -82,7 +75,6 @@ public function __construct(
      *
      * @param int $id
      * @return string
-     * @since 2.0.0
      */
     public function getLabel($id)
     {
@@ -93,7 +85,6 @@ public function getLabel($id)
      * Returns list of comments attached to shipment
      * @param int $id
      * @return \Magento\Sales\Api\Data\ShipmentCommentSearchResultInterface
-     * @since 2.0.0
      */
     public function getCommentsList($id)
     {
@@ -109,7 +100,6 @@ public function getCommentsList($id)
      *
      * @param int $id
      * @return bool
-     * @since 2.0.0
      */
     public function notify($id)
     {
diff --git a/app/code/Magento/Sales/Model/ShipOrder.php b/app/code/Magento/Sales/Model/ShipOrder.php
index 68c571f10ef91..c5ae98db4697b 100644
--- a/app/code/Magento/Sales/Model/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -20,67 +20,67 @@
 /**
  * Class ShipOrder
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.2.0
+ * @since 2.1.2
  */
 class ShipOrder implements ShipOrderInterface
 {
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $resourceConnection;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderRepository;
 
     /**
      * @var ShipmentDocumentFactory
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $shipmentDocumentFactory;
 
     /**
      * @var OrderStateResolverInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderStateResolver;
 
     /**
      * @var OrderConfig
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $config;
 
     /**
      * @var ShipmentRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $shipmentRepository;
 
     /**
      * @var ShipOrderValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $shipOrderValidator;
 
     /**
      * @var NotifierInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $notifierInterface;
 
     /**
      * @var LoggerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $logger;
 
     /**
      * @var OrderRegistrarInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $orderRegistrar;
 
@@ -96,7 +96,7 @@ class ShipOrder implements ShipOrderInterface
      * @param OrderRegistrarInterface $orderRegistrar
      * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         ResourceConnection $resourceConnection,
@@ -137,7 +137,7 @@ public function __construct(
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \DomainException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function execute(
         $orderId,
diff --git a/app/code/Magento/Sales/Model/Spi/CreditmemoCommentResourceInterface.php b/app/code/Magento/Sales/Model/Spi/CreditmemoCommentResourceInterface.php
index e5c92f1cb263c..7f70b11299e89 100644
--- a/app/code/Magento/Sales/Model/Spi/CreditmemoCommentResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/CreditmemoCommentResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface CreditmemoCommentResourceInterface
 {
@@ -16,7 +15,6 @@ interface CreditmemoCommentResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/CreditmemoItemResourceInterface.php b/app/code/Magento/Sales/Model/Spi/CreditmemoItemResourceInterface.php
index 72e9017000abe..098ae169e2c8a 100644
--- a/app/code/Magento/Sales/Model/Spi/CreditmemoItemResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/CreditmemoItemResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface CreditmemoItemResourceInterface
 {
@@ -16,7 +15,6 @@ interface CreditmemoItemResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/CreditmemoResourceInterface.php b/app/code/Magento/Sales/Model/Spi/CreditmemoResourceInterface.php
index 52ff89a3b5d65..eabd6c46fa3a2 100644
--- a/app/code/Magento/Sales/Model/Spi/CreditmemoResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/CreditmemoResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface CreditmemoResourceInterface
 {
@@ -16,7 +15,6 @@ interface CreditmemoResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/InvoiceCommentResourceInterface.php b/app/code/Magento/Sales/Model/Spi/InvoiceCommentResourceInterface.php
index 62ef8e9fcbebd..0c9e9e2839ad7 100644
--- a/app/code/Magento/Sales/Model/Spi/InvoiceCommentResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/InvoiceCommentResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface InvoiceCommentResourceInterface
 {
@@ -16,7 +15,6 @@ interface InvoiceCommentResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/InvoiceItemResourceInterface.php b/app/code/Magento/Sales/Model/Spi/InvoiceItemResourceInterface.php
index 1c40eae5f13d2..19cafc2b79fa1 100644
--- a/app/code/Magento/Sales/Model/Spi/InvoiceItemResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/InvoiceItemResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface InvoiceItemResourceInterface
 {
@@ -16,7 +15,6 @@ interface InvoiceItemResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/InvoiceResourceInterface.php b/app/code/Magento/Sales/Model/Spi/InvoiceResourceInterface.php
index ae7b59fe1e72e..ca644ade96ac9 100644
--- a/app/code/Magento/Sales/Model/Spi/InvoiceResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/InvoiceResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface InvoiceResourceInterface
 {
@@ -16,7 +15,6 @@ interface InvoiceResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/OrderAddressResourceInterface.php b/app/code/Magento/Sales/Model/Spi/OrderAddressResourceInterface.php
index 1894d46a5c654..05edbdbd91b51 100644
--- a/app/code/Magento/Sales/Model/Spi/OrderAddressResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/OrderAddressResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface OrderAddressResourceInterface
 {
@@ -16,7 +15,6 @@ interface OrderAddressResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/OrderItemResourceInterface.php b/app/code/Magento/Sales/Model/Spi/OrderItemResourceInterface.php
index bb7531618049d..79227dff7b964 100644
--- a/app/code/Magento/Sales/Model/Spi/OrderItemResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/OrderItemResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface OrderItemResourceInterface
 {
@@ -16,7 +15,6 @@ interface OrderItemResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/OrderPaymentResourceInterface.php b/app/code/Magento/Sales/Model/Spi/OrderPaymentResourceInterface.php
index 1f307645252e9..e44f60a7e05a5 100644
--- a/app/code/Magento/Sales/Model/Spi/OrderPaymentResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/OrderPaymentResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface OrderPaymentResourceInterface
 {
@@ -16,7 +15,6 @@ interface OrderPaymentResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/OrderResourceInterface.php b/app/code/Magento/Sales/Model/Spi/OrderResourceInterface.php
index 2017da77d91ea..059c75cfa7047 100644
--- a/app/code/Magento/Sales/Model/Spi/OrderResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/OrderResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface OrderResourceInterface
 {
@@ -16,7 +15,6 @@ interface OrderResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/OrderStatusHistoryResourceInterface.php b/app/code/Magento/Sales/Model/Spi/OrderStatusHistoryResourceInterface.php
index fb4b19e8fc226..870e6d3368a34 100644
--- a/app/code/Magento/Sales/Model/Spi/OrderStatusHistoryResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/OrderStatusHistoryResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface OrderStatusHistoryResourceInterface
 {
@@ -16,7 +15,6 @@ interface OrderStatusHistoryResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/ShipmentCommentResourceInterface.php b/app/code/Magento/Sales/Model/Spi/ShipmentCommentResourceInterface.php
index 23f4a708be494..8f10f88a735ca 100644
--- a/app/code/Magento/Sales/Model/Spi/ShipmentCommentResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/ShipmentCommentResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface ShipmentCommentResourceInterface
 {
@@ -16,7 +15,6 @@ interface ShipmentCommentResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/ShipmentItemResourceInterface.php b/app/code/Magento/Sales/Model/Spi/ShipmentItemResourceInterface.php
index a8761969a07ce..cf11cdf95ef59 100644
--- a/app/code/Magento/Sales/Model/Spi/ShipmentItemResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/ShipmentItemResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface ShipmentItemResourceInterface
 {
@@ -16,7 +15,6 @@ interface ShipmentItemResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/ShipmentResourceInterface.php b/app/code/Magento/Sales/Model/Spi/ShipmentResourceInterface.php
index 11d8723c93708..9c7137e6a08c1 100644
--- a/app/code/Magento/Sales/Model/Spi/ShipmentResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/ShipmentResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface ShipmentResourceInterface
 {
@@ -16,7 +15,6 @@ interface ShipmentResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/ShipmentTrackResourceInterface.php b/app/code/Magento/Sales/Model/Spi/ShipmentTrackResourceInterface.php
index 9c4631b4827ce..383c36ce050c2 100644
--- a/app/code/Magento/Sales/Model/Spi/ShipmentTrackResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/ShipmentTrackResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface ShipmentTrackResourceInterface
 {
@@ -16,7 +15,6 @@ interface ShipmentTrackResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Spi/TransactionResourceInterface.php b/app/code/Magento/Sales/Model/Spi/TransactionResourceInterface.php
index 8fed3ea873845..aecfcb9be95f7 100644
--- a/app/code/Magento/Sales/Model/Spi/TransactionResourceInterface.php
+++ b/app/code/Magento/Sales/Model/Spi/TransactionResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResourceInterface
- * @since 2.0.0
  */
 interface TransactionResourceInterface
 {
@@ -16,7 +15,6 @@ interface TransactionResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -27,7 +25,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -36,7 +33,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/Sales/Model/Status/ListFactory.php b/app/code/Magento/Sales/Model/Status/ListFactory.php
index c596e58929eeb..81352e2590f7a 100644
--- a/app/code/Magento/Sales/Model/Status/ListFactory.php
+++ b/app/code/Magento/Sales/Model/Status/ListFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class ListFactory
  * @internal
- * @since 2.0.0
  */
 class ListFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return \Magento\Sales\Model\Status\ListStatus
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Sales/Model/Status/ListStatus.php b/app/code/Magento/Sales/Model/Status/ListStatus.php
index c6ecb3b6bf0e9..e3311285f9158 100644
--- a/app/code/Magento/Sales/Model/Status/ListStatus.php
+++ b/app/code/Magento/Sales/Model/Status/ListStatus.php
@@ -11,7 +11,6 @@
  * to owner object of this model.
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class ListStatus
 {
@@ -19,7 +18,6 @@ class ListStatus
      * Status information entities
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_items = [];
 
@@ -31,7 +29,6 @@ class ListStatus
      * @param string|null $message Status message
      * @param \Magento\Framework\DataObject|null $additionalData Any additional data, that caller would like to store
      * @return $this
-     * @since 2.0.0
      */
     public function addItem($origin = null, $code = null, $message = null, $additionalData = null)
     {
@@ -48,7 +45,6 @@ public function addItem($origin = null, $code = null, $message = null, $addition
      * Retrieves all items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -63,7 +59,6 @@ public function getItems()
      *
      * @param array $params
      * @return array
-     * @since 2.0.0
      */
     public function removeItemsByParams($params)
     {
@@ -99,7 +94,6 @@ public function removeItemsByParams($params)
      *
      * @param int|array $indexes
      * @return array
-     * @since 2.0.0
      */
     public function removeItems($indexes)
     {
@@ -133,7 +127,6 @@ public function removeItems($indexes)
      * Clears list from all items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
diff --git a/app/code/Magento/Sales/Model/Validator.php b/app/code/Magento/Sales/Model/Validator.php
index 023d73daa9f9b..ca8c42bf47924 100644
--- a/app/code/Magento/Sales/Model/Validator.php
+++ b/app/code/Magento/Sales/Model/Validator.php
@@ -12,19 +12,19 @@
  * Class Validator
  *
  * @internal
- * @since 2.2.0
+ * @since 2.1.2
  */
 class Validator
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $objectManager;
 
     /**
      * @var ValidatorResultInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultFactory;
 
@@ -33,7 +33,7 @@ class Validator
      *
      * @param ObjectManagerInterface $objectManager
      * @param ValidatorResultInterfaceFactory $validatorResult
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -49,7 +49,7 @@ public function __construct(
      * @param object|null $context
      * @return ValidatorResultInterface
      * @throws ConfigurationMismatchException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity, array $validators, $context = null)
     {
diff --git a/app/code/Magento/Sales/Model/ValidatorInterface.php b/app/code/Magento/Sales/Model/ValidatorInterface.php
index 464c756a90565..4567b6720e26f 100644
--- a/app/code/Magento/Sales/Model/ValidatorInterface.php
+++ b/app/code/Magento/Sales/Model/ValidatorInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * Interface ValidatorInterface
- * @since 2.2.0
+ * @since 2.1.2
  */
 interface ValidatorInterface
 {
@@ -19,7 +19,7 @@ interface ValidatorInterface
      * @return \Magento\Framework\Phrase[]
      * @throws DocumentValidationException
      * @throws NoSuchEntityException
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function validate($entity);
 }
diff --git a/app/code/Magento/Sales/Model/ValidatorResult.php b/app/code/Magento/Sales/Model/ValidatorResult.php
index e205bb761c4b2..50ef9530a7311 100644
--- a/app/code/Magento/Sales/Model/ValidatorResult.php
+++ b/app/code/Magento/Sales/Model/ValidatorResult.php
@@ -7,19 +7,19 @@
 
 /**
  * Class ValidatorResult
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ValidatorResult implements ValidatorResultInterface
 {
     /**
      * @var \string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $messages = [];
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function addMessage($message)
     {
@@ -28,7 +28,7 @@ public function addMessage($message)
 
     /**
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function hasMessages()
     {
@@ -37,7 +37,7 @@ public function hasMessages()
 
     /**
      * @return \string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getMessages()
     {
diff --git a/app/code/Magento/Sales/Model/ValidatorResultInterface.php b/app/code/Magento/Sales/Model/ValidatorResultInterface.php
index 221137e3a6106..ebbe894072be4 100644
--- a/app/code/Magento/Sales/Model/ValidatorResultInterface.php
+++ b/app/code/Magento/Sales/Model/ValidatorResultInterface.php
@@ -8,26 +8,26 @@
 /**
  * Interface ValidatorResultInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface ValidatorResultInterface
 {
     /**
      * @param string $message
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function addMessage($message);
 
     /**
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function hasMessages();
 
     /**
      * @return \string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getMessages();
 }
diff --git a/app/code/Magento/Sales/Model/ValidatorResultMerger.php b/app/code/Magento/Sales/Model/ValidatorResultMerger.php
index e7f213b646b3f..ade7fb3709e05 100644
--- a/app/code/Magento/Sales/Model/ValidatorResultMerger.php
+++ b/app/code/Magento/Sales/Model/ValidatorResultMerger.php
@@ -7,13 +7,13 @@
 
 /**
  * Class ValidatorResultMerger
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ValidatorResultMerger
 {
     /**
      * @var ValidatorResultInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $validatorResultInterfaceFactory;
 
@@ -21,7 +21,7 @@ class ValidatorResultMerger
      * ValidatorResultMerger constructor.
      *
      * @param ValidatorResultInterfaceFactory $validatorResultInterfaceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(ValidatorResultInterfaceFactory $validatorResultInterfaceFactory)
     {
@@ -35,7 +35,7 @@ public function __construct(ValidatorResultInterfaceFactory $validatorResultInte
      * @param ValidatorResultInterface $second
      * @param \string[] $validatorMessages
      * @return ValidatorResultInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function merge(ValidatorResultInterface $first, ValidatorResultInterface $second, ... $validatorMessages)
     {
diff --git a/app/code/Magento/Sales/Observer/Backend/CatalogPriceRule.php b/app/code/Magento/Sales/Observer/Backend/CatalogPriceRule.php
index c99bcc28162eb..5d3d3550374de 100644
--- a/app/code/Magento/Sales/Observer/Backend/CatalogPriceRule.php
+++ b/app/code/Magento/Sales/Observer/Backend/CatalogPriceRule.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Sales\Observer\Backend\CatalogPriceRule
  *
- * @since 2.0.0
  */
 class CatalogPriceRule implements ObserverInterface
 {
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote $quote
-     * @since 2.0.0
      */
     public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/Backend/CatalogProductSaveAfterObserver.php b/app/code/Magento/Sales/Observer/Backend/CatalogProductSaveAfterObserver.php
index fe567b965d5cc..986be66105b10 100644
--- a/app/code/Magento/Sales/Observer/Backend/CatalogProductSaveAfterObserver.php
+++ b/app/code/Magento/Sales/Observer/Backend/CatalogProductSaveAfterObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Sales\Observer\Backend\CatalogProductSaveAfterObserver
  *
- * @since 2.0.0
  */
 class CatalogProductSaveAfterObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote $quote
-     * @since 2.0.0
      */
     public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
      * @param int $productId
      * @param int $status
      * @return void
-     * @since 2.0.0
      */
     protected function _recollectQuotes($productId, $status)
     {
@@ -49,7 +45,6 @@ protected function _recollectQuotes($productId, $status)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php b/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
index 7f14d740a9bf1..c0d4caed1adfd 100644
--- a/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
+++ b/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Sales\Observer\Backend\SubtractQtyFromQuotesObserver
  *
- * @since 2.0.0
  */
 class SubtractQtyFromQuotesObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote
-     * @since 2.0.0
      */
     protected $_quote;
 
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote $quote
-     * @since 2.0.0
      */
     public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php b/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
index fc1201035444d..8195eba96d750 100644
--- a/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
+++ b/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
@@ -14,7 +14,6 @@
 
 /**
  * Class AddVatRequestParamsOrderComment
- * @since 2.0.0
  */
 class AddVatRequestParamsOrderComment implements ObserverInterface
 {
@@ -22,13 +21,11 @@ class AddVatRequestParamsOrderComment implements ObserverInterface
      * Customer address
      *
      * @var CustomerAddress
-     * @since 2.0.0
      */
     protected $customerAddressHelper;
 
     /**
      * @param CustomerAddress $customerAddressHelper
-     * @since 2.0.0
      */
     public function __construct(CustomerAddress $customerAddressHelper)
     {
@@ -40,7 +37,6 @@ public function __construct(CustomerAddress $customerAddressHelper)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
@@ -72,7 +68,6 @@ public function execute(Observer $observer)
      * @param Order $order
      * @param \Magento\Store\Model\Store|string|int|null $store
      * @return Address|null
-     * @since 2.0.0
      */
     protected function _getVatRequiredSalesAddress($order, $store = null)
     {
diff --git a/app/code/Magento/Sales/Observer/Frontend/RestoreCustomerGroupId.php b/app/code/Magento/Sales/Observer/Frontend/RestoreCustomerGroupId.php
index e5a1282fc13fa..be2fabfba93cb 100644
--- a/app/code/Magento/Sales/Observer/Frontend/RestoreCustomerGroupId.php
+++ b/app/code/Magento/Sales/Observer/Frontend/RestoreCustomerGroupId.php
@@ -14,7 +14,6 @@
 
 /**
  * Class RestoreCustomerGroupId
- * @since 2.0.0
  */
 class RestoreCustomerGroupId implements ObserverInterface
 {
@@ -22,13 +21,11 @@ class RestoreCustomerGroupId implements ObserverInterface
      * Customer address
      *
      * @var CustomerAddress
-     * @since 2.0.0
      */
     protected $customerAddressHelper;
 
     /**
      * @param CustomerAddress $customerAddressHelper
-     * @since 2.0.0
      */
     public function __construct(CustomerAddress $customerAddressHelper)
     {
@@ -40,7 +37,6 @@ public function __construct(CustomerAddress $customerAddressHelper)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/GridAsyncInsertObserver.php b/app/code/Magento/Sales/Observer/GridAsyncInsertObserver.php
index 254df0237b73f..1cb7fc7c7f997 100644
--- a/app/code/Magento/Sales/Observer/GridAsyncInsertObserver.php
+++ b/app/code/Magento/Sales/Observer/GridAsyncInsertObserver.php
@@ -12,19 +12,16 @@
  *
  * Performs handling of events related to indexing
  * of Order, Invoice, Shipment and Creditmemo grids.
- * @since 2.0.0
  */
 class GridAsyncInsertObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Sales\Model\GridAsyncInsert
-     * @since 2.0.0
      */
     protected $asyncInsert;
 
     /**
      * @param \Magento\Sales\Model\GridAsyncInsert $asyncInsert
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\GridAsyncInsert $asyncInsert
@@ -46,7 +43,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/GridProcessAddressChange.php b/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
index 9ed08fd0c808d..488461a16ae16 100644
--- a/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
+++ b/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
@@ -12,20 +12,17 @@
 
 /**
  * Class GridProcessAddressChange
- * @since 2.0.0
  */
 class GridProcessAddressChange implements ObserverInterface
 {
 
     /**
      * @var GridPool
-     * @since 2.0.0
      */
     protected $gridPool;
 
     /**
      * @param GridPool $gridPool
-     * @since 2.0.0
      */
     public function __construct(
         GridPool $gridPool
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/GridSyncInsertObserver.php b/app/code/Magento/Sales/Observer/GridSyncInsertObserver.php
index 4c25f4500af52..1c2af122efaea 100644
--- a/app/code/Magento/Sales/Observer/GridSyncInsertObserver.php
+++ b/app/code/Magento/Sales/Observer/GridSyncInsertObserver.php
@@ -12,7 +12,6 @@
  *
  * Performs handling of events and cron jobs related to indexing
  * of Order, Invoice, Shipment and Creditmemo grids.
- * @since 2.0.0
  */
 class GridSyncInsertObserver implements ObserverInterface
 {
@@ -20,7 +19,6 @@ class GridSyncInsertObserver implements ObserverInterface
      * Entity grid model.
      *
      * @var \Magento\Sales\Model\ResourceModel\GridInterface
-     * @since 2.0.0
      */
     protected $entityGrid;
 
@@ -28,14 +26,12 @@ class GridSyncInsertObserver implements ObserverInterface
      * Global configuration storage.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $globalConfig;
 
     /**
      * @param \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid,
@@ -61,7 +57,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/GridSyncRemoveObserver.php b/app/code/Magento/Sales/Observer/GridSyncRemoveObserver.php
index bec75d248cc23..2b44f5217f8ca 100644
--- a/app/code/Magento/Sales/Observer/GridSyncRemoveObserver.php
+++ b/app/code/Magento/Sales/Observer/GridSyncRemoveObserver.php
@@ -12,7 +12,6 @@
  *
  * Performs handling of events and cron jobs related to indexing
  * of Order, Invoice, Shipment and Creditmemo grids.
- * @since 2.0.0
  */
 class GridSyncRemoveObserver implements ObserverInterface
 {
@@ -20,13 +19,11 @@ class GridSyncRemoveObserver implements ObserverInterface
      * Entity grid model.
      *
      * @var \Magento\Sales\Model\ResourceModel\GridInterface
-     * @since 2.0.0
      */
     protected $entityGrid;
 
     /**
      * @param \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\GridInterface $entityGrid
@@ -47,7 +44,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Observer/Virtual/SendEmails.php b/app/code/Magento/Sales/Observer/Virtual/SendEmails.php
index c76d81c880b25..257bbfe834751 100644
--- a/app/code/Magento/Sales/Observer/Virtual/SendEmails.php
+++ b/app/code/Magento/Sales/Observer/Virtual/SendEmails.php
@@ -12,7 +12,6 @@
  *
  * Performs handling of cron jobs related to sending emails to customers
  * after creation/modification of Order, Invoice, Shipment or Creditmemo.
- * @since 2.0.0
  */
 class SendEmails implements ObserverInterface
 {
@@ -20,13 +19,11 @@ class SendEmails implements ObserverInterface
      * Global configuration storage.
      *
      * @var \Magento\Sales\Model\EmailSenderHandler
-     * @since 2.0.0
      */
     protected $emailSenderHandler;
 
     /**
      * @param \Magento\Sales\Model\EmailSenderHandler $emailSenderHandler
-     * @since 2.0.0
      */
     public function __construct(\Magento\Sales\Model\EmailSenderHandler $emailSenderHandler)
     {
@@ -47,7 +44,6 @@ public function __construct(\Magento\Sales\Model\EmailSenderHandler $emailSender
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Sales/Setup/InstallData.php b/app/code/Magento/Sales/Setup/InstallData.php
index 869cdb7b1c755..d4fef6a690513 100644
--- a/app/code/Magento/Sales/Setup/InstallData.php
+++ b/app/code/Magento/Sales/Setup/InstallData.php
@@ -16,7 +16,6 @@
  * Class InstallData
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -24,19 +23,16 @@ class InstallData implements InstallDataInterface
      * Sales setup factory
      *
      * @var SalesSetupFactory
-     * @since 2.0.0
      */
     private $salesSetupFactory;
 
     /**
      * @var Builder
-     * @since 2.0.0
      */
     private $sequenceBuilder;
 
     /**
      * @var SequenceConfig
-     * @since 2.0.0
      */
     private $sequenceConfig;
 
@@ -44,7 +40,6 @@ class InstallData implements InstallDataInterface
      * @param SalesSetupFactory $salesSetupFactory
      * @param Builder $sequenceBuilder
      * @param SequenceConfig $sequenceConfig
-     * @since 2.0.0
      */
     public function __construct(
         SalesSetupFactory $salesSetupFactory,
@@ -59,7 +54,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php
index cbfb9666e4b3f..3c1da7add06ec 100644
--- a/app/code/Magento/Sales/Setup/InstallSchema.php
+++ b/app/code/Magento/Sales/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Sales/Setup/SalesSetup.php b/app/code/Magento/Sales/Setup/SalesSetup.php
index 244d224015083..1056161939671 100644
--- a/app/code/Magento/Sales/Setup/SalesSetup.php
+++ b/app/code/Magento/Sales/Setup/SalesSetup.php
@@ -18,7 +18,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class SalesSetup extends EavSetup
 {
@@ -44,19 +43,17 @@ class SalesSetup extends EavSetup
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'sales';
 
@@ -68,7 +65,6 @@ class SalesSetup extends EavSetup
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
      * @param ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -86,7 +82,6 @@ public function __construct(
      * List of entities converted from EAV to flat data structure
      *
      * @var $_flatEntityTables array
-     * @since 2.0.0
      */
     protected $_flatEntityTables = [
         'order' => 'sales_order',
@@ -110,7 +105,6 @@ public function __construct(
      * List of entities used with separate grid table
      *
      * @var string[] $_flatEntitiesGrid
-     * @since 2.0.0
      */
     protected $_flatEntitiesGrid = ['order', 'invoice', 'shipment', 'creditmemo'];
 
@@ -119,7 +113,6 @@ public function __construct(
      *
      * @param string $table
      * @return bool
-     * @since 2.0.0
      */
     protected function _flatTableExist($table)
     {
@@ -138,7 +131,6 @@ protected function _flatTableExist($table)
      * @param string $code
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -163,7 +155,6 @@ public function addAttribute($entityTypeId, $code, array $attr)
      * @param string $attribute
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     protected function _addFlatAttribute($table, $attribute, $attr)
     {
@@ -189,7 +180,6 @@ protected function _addFlatAttribute($table, $attribute, $attr)
      * @param array $attr
      * @param string $entityTypeId
      * @return $this
-     * @since 2.0.0
      */
     protected function _addGridAttribute($table, $attribute, $attr, $entityTypeId)
     {
@@ -212,7 +202,6 @@ protected function _addGridAttribute($table, $attribute, $attr, $entityTypeId)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getAttributeColumnDefinition($code, $data)
     {
@@ -256,7 +245,6 @@ protected function _getAttributeColumnDefinition($code, $data)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultEntities()
     {
@@ -301,7 +289,6 @@ public function getDefaultEntities()
      * Get config model
      *
      * @return ScopeConfigInterface
-     * @since 2.0.0
      */
     public function getConfigModel()
     {
@@ -310,7 +297,6 @@ public function getConfigModel()
 
     /**
      * @return EncryptorInterface
-     * @since 2.0.0
      */
     public function getEncryptor()
     {
diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
index 90c2b4d7a5a74..d4aa7b4c46200 100644
--- a/app/code/Magento/Sales/Setup/UpgradeData.php
+++ b/app/code/Magento/Sales/Setup/UpgradeData.php
@@ -15,7 +15,6 @@
 
 /**
  * Data upgrade script
- * @since 2.0.0
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -23,13 +22,11 @@ class UpgradeData implements UpgradeDataInterface
      * Sales setup factory
      *
      * @var SalesSetupFactory
-     * @since 2.0.0
      */
     private $salesSetupFactory;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $eavConfig;
 
@@ -45,7 +42,6 @@ class UpgradeData implements UpgradeDataInterface
      * @param SalesSetupFactory $salesSetupFactory
      * @param Config $eavConfig
      * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @since 2.0.0
      */
     public function __construct(
         SalesSetupFactory $salesSetupFactory,
@@ -59,7 +55,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
index d0922be82c16c..ceb7dcfdd3a46 100644
--- a/app/code/Magento/Sales/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -17,7 +17,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'sales';
 
@@ -114,7 +114,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
     /**
      * @param SchemaSetupInterface $installer
      * @return void
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function addColumnBaseGrandTotal(SchemaSetupInterface $installer)
     {
@@ -135,7 +135,7 @@ private function addColumnBaseGrandTotal(SchemaSetupInterface $installer)
     /**
      * @param SchemaSetupInterface $installer
      * @return void
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
index 3d4aaa98d1aa9..23a6e7a41a5b7 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
@@ -13,13 +13,11 @@
 
 /**
  * Class Address
- * @since 2.0.0
  */
 class Address extends Column
 {
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -29,7 +27,6 @@ class Address extends Column
      * @param Escaper $escaper
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -47,7 +44,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
index 5abb2ebf03ae0..86b86f1984e77 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
@@ -12,13 +12,11 @@
 
 /**
  * Class State
- * @since 2.0.0
  */
 class State extends Column
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $states;
 
@@ -30,7 +28,6 @@ class State extends Column
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State/Options.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State/Options.php
index 2be6aa148cb40..f9b3ae6d44ff3 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State/Options.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State/Options.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.0.0
      */
     protected $creditmemoRepository;
 
@@ -30,7 +27,6 @@ class Options implements OptionSourceInterface
      * Constructor
      *
      * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @since 2.0.0
      */
     public function __construct(CreditmemoRepositoryInterface $creditmemoRepository)
     {
@@ -41,7 +37,6 @@ public function __construct(CreditmemoRepositoryInterface $creditmemoRepository)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
index f91e8c928ef4b..1144321ac0b56 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
@@ -14,13 +14,11 @@
 
 /**
  * Class CustomerGroup
- * @since 2.0.0
  */
 class CustomerGroup extends Column
 {
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
@@ -32,7 +30,6 @@ class CustomerGroup extends Column
      * @param UiComponentFactory $uiComponentFactory
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -50,7 +47,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
index c5cdc210ac294..174a81e90e2a0 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
@@ -12,13 +12,11 @@
 
 /**
  * Class State
- * @since 2.0.0
  */
 class State extends Column
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $states;
 
@@ -30,7 +28,6 @@ class State extends Column
      * @param InvoiceRepositoryInterface $invoiceRepository
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State/Options.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State/Options.php
index 0ce74b766c34c..589d36c7fcc29 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State/Options.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State/Options.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var InvoiceRepositoryInterface
-     * @since 2.0.0
      */
     protected $invoiceRepository;
 
@@ -30,7 +27,6 @@ class Options implements OptionSourceInterface
      * Constructor
      *
      * @param InvoiceRepositoryInterface $invoiceRepository
-     * @since 2.0.0
      */
     public function __construct(InvoiceRepositoryInterface $invoiceRepository)
     {
@@ -41,7 +37,6 @@ public function __construct(InvoiceRepositoryInterface $invoiceRepository)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
index 8716f9aef9909..e107301886373 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
@@ -12,13 +12,11 @@
 
 /**
  * Class PaymentMethod
- * @since 2.0.0
  */
 class PaymentMethod extends Column
 {
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $paymentHelper;
 
@@ -30,7 +28,6 @@ class PaymentMethod extends Column
      * @param Data $paymentHelper
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
index dbc2e54d029d7..2c7d655471b66 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
@@ -12,13 +12,11 @@
 
 /**
  * Class Price
- * @since 2.0.0
  */
 class Price extends Column
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceFormatter;
 
@@ -30,7 +28,6 @@ class Price extends Column
      * @param PriceCurrencyInterface $priceFormatter
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
index e4cf0ef2997f4..80906a98b29ae 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
@@ -12,13 +12,11 @@
 
 /**
  * Class Price
- * @since 2.0.0
  */
 class PurchasedPrice extends Column
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceFormatter;
 
@@ -30,7 +28,6 @@ class PurchasedPrice extends Column
      * @param PriceCurrencyInterface $priceFormatter
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
index 8a09f4b8fac39..2fd792fb4ae25 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
@@ -12,13 +12,11 @@
 
 /**
  * Class Status
- * @since 2.0.0
  */
 class Status extends Column
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $statuses;
 
@@ -30,7 +28,6 @@ class Status extends Column
      * @param CollectionFactory $collectionFactory
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return void
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php
index 8d0c736fed65f..e091d4966282a 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -30,7 +27,6 @@ class Options implements OptionSourceInterface
      * Constructor
      *
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $collectionFactory)
     {
@@ -41,7 +37,6 @@ public function __construct(CollectionFactory $collectionFactory)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/ViewAction.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/ViewAction.php
index 9e800a2d91a55..0088c15b4734d 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/ViewAction.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/ViewAction.php
@@ -12,13 +12,11 @@
 
 /**
  * Class ViewAction
- * @since 2.0.0
  */
 class ViewAction extends Column
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -30,7 +28,6 @@ class ViewAction extends Column
      * @param UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
index 8a51fcea2e2a6..8508e730eae9b 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -10,37 +10,37 @@
 
 /**
  * Class ReturnProcessor
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ReturnProcessor
 {
     /**
      * @var \Magento\CatalogInventory\Api\StockManagementInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $stockManagement;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $stockIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $priceIndexer;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
     /**
      * @var \Magento\Sales\Api\OrderItemRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderItemRepository;
 
@@ -51,7 +51,7 @@ class ReturnProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Api\OrderItemRepositoryInterface $orderItemRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\CatalogInventory\Api\StockManagementInterface $stockManagement,
@@ -73,7 +73,7 @@ public function __construct(
      * @param array $returnToStockItems
      * @param bool $isAutoReturn
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function execute(
         CreditmemoInterface $creditmemo,
@@ -118,7 +118,7 @@ public function execute(
      * @param int[] $returnToStockItems
      * @param int $parentItemId
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canReturnItem(
         \Magento\Sales\Api\Data\CreditmemoItemInterface $item,
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnValidator.php b/app/code/Magento/SalesInventory/Model/Order/ReturnValidator.php
index a3cae04cf06ce..6d8d92102b0af 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnValidator.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnValidator.php
@@ -13,20 +13,20 @@
 
 /**
  * Class ReturnProcessor
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ReturnValidator
 {
     /**
      * @var OrderItemRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderItemRepository;
 
     /**
      * ReturnValidator constructor.
      * @param OrderItemRepositoryInterface $orderItemRepository
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(OrderItemRepositoryInterface $orderItemRepository)
     {
@@ -37,7 +37,7 @@ public function __construct(OrderItemRepositoryInterface $orderItemRepository)
      * @param int[] $returnToStockItems
      * @param CreditmemoInterface $creditmemo
      * @return \Magento\Framework\Phrase|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function validate($returnToStockItems, CreditmemoInterface $creditmemo)
     {
@@ -61,7 +61,7 @@ public function validate($returnToStockItems, CreditmemoInterface $creditmemo)
      * @param CreditmemoItemInterface[] $creditmemoItems
      * @param OrderItemInterface $orderItem
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isOrderItemPartOfCreditmemo(array $creditmemoItems, OrderItemInterface $orderItem)
     {
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php
index 50ea8a302a6d0..74203be2f3acd 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php
@@ -7,37 +7,37 @@
 
 /**
  * Class ReturnToStockInvoice
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ReturnToStockInvoice
 {
     /**
      * @var \Magento\SalesInventory\Model\Order\ReturnProcessor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $returnProcessor;
 
     /**
      * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoRepository;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var \Magento\Sales\Api\InvoiceRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $invoiceRepository;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $stockConfiguration;
 
@@ -48,7 +48,7 @@ class ReturnToStockInvoice
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\SalesInventory\Model\Order\ReturnProcessor $returnProcessor,
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
index fc7a1807e6587..0e7c1ba86c9a6 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
@@ -13,31 +13,31 @@
 
 /**
  * Class ReturnToStock
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ReturnToStockOrder
 {
     /**
      * @var ReturnProcessor
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $returnProcessor;
 
     /**
      * @var CreditmemoRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $creditmemoRepository;
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var StockConfigurationInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $stockConfiguration;
 
@@ -48,7 +48,7 @@ class ReturnToStockOrder
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param OrderRepositoryInterface $orderRepository
      * @param StockConfigurationInterface $stockConfiguration
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ReturnProcessor $returnProcessor,
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
index 59d802dc6cd5d..eef66a09af426 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
@@ -15,20 +15,20 @@
 
 /**
  * Class CreditmemoCreationArguments
- * @since 2.2.0
+ * @since 2.1.3
  */
 class InvoiceRefundCreationArguments
 {
     /**
      * @var ReturnValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $returnValidator;
 
     /**
      * InvoiceRefundCreationArguments constructor.
      * @param ReturnValidator $returnValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ReturnValidator $returnValidator
@@ -83,7 +83,7 @@ public function afterValidate(
     /**
      * @param CreditmemoCreationArgumentsInterface|null $arguments
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isReturnToStockItems($arguments)
     {
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
index 01a19c2f34692..8f3e88760b175 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
@@ -15,20 +15,20 @@
 
 /**
  * Class OrderRefundCreationArguments
- * @since 2.2.0
+ * @since 2.1.3
  */
 class OrderRefundCreationArguments
 {
     /**
      * @var ReturnValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $returnValidator;
 
     /**
      * OrderRefundCreationArguments constructor.
      * @param ReturnValidator $returnValidator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ReturnValidator $returnValidator
@@ -77,7 +77,7 @@ public function afterValidate(
     /**
      * @param CreditmemoCreationArgumentsInterface|null $arguments
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function isReturnToStockItems($arguments)
     {
diff --git a/app/code/Magento/SalesRule/Api/CouponManagementInterface.php b/app/code/Magento/SalesRule/Api/CouponManagementInterface.php
index ed1d4db9cf0dd..ec888bb3ce546 100644
--- a/app/code/Magento/SalesRule/Api/CouponManagementInterface.php
+++ b/app/code/Magento/SalesRule/Api/CouponManagementInterface.php
@@ -9,7 +9,6 @@
  * Coupon management interface
  *
  * @api
- * @since 2.0.0
  */
 interface CouponManagementInterface
 {
@@ -19,7 +18,6 @@ interface CouponManagementInterface
      * @param \Magento\SalesRule\Api\Data\CouponGenerationSpecInterface $couponSpec
      * @return string[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function generate(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterface $couponSpec);
 
@@ -31,7 +29,6 @@ public function generate(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterfa
      * @return \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteByIds(array $ids, $ignoreInvalidCoupons = true);
 
@@ -43,7 +40,6 @@ public function deleteByIds(array $ids, $ignoreInvalidCoupons = true);
      * @return \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteByCodes(array $codes, $ignoreInvalidCoupons = true);
 }
diff --git a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
index 4a3c312e1a0a6..50d7b9b575965 100644
--- a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
+++ b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
@@ -9,7 +9,6 @@
  * Coupon CRUD interface
  *
  * @api
- * @since 2.0.0
  */
 interface CouponRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface CouponRepositoryInterface
      * @throws \Magento\Framework\Exception\InputException If there is a problem with the input
      * @throws \Magento\Framework\Exception\NoSuchEntityException If a coupon ID is sent but the coupon does not exist
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon);
 
@@ -32,7 +30,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon);
      * @return \Magento\SalesRule\Api\Data\CouponInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $couponId is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($couponId);
 
@@ -46,7 +43,6 @@ public function getById($couponId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\SalesRule\Api\Data\CouponSearchResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -57,7 +53,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($couponId);
 }
diff --git a/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php b/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
index 748ce8745c065..8af7507295931 100644
--- a/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
@@ -9,7 +9,6 @@
  * Interface ConditionInterface
  *
  * @api
- * @since 2.0.0
  */
 interface ConditionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -20,14 +19,12 @@ interface ConditionInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Get condition type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConditionType();
 
     /**
      * @param string $conditionType
      * @return $this
-     * @since 2.0.0
      */
     public function setConditionType($conditionType);
 
@@ -35,7 +32,6 @@ public function setConditionType($conditionType);
      * Return list of conditions
      *
      * @return \Magento\SalesRule\Api\Data\ConditionInterface[]|null
-     * @since 2.0.0
      */
     public function getConditions();
 
@@ -44,7 +40,6 @@ public function getConditions();
      *
      * @param \Magento\SalesRule\Api\Data\ConditionInterface[]|null $conditions
      * @return $this
-     * @since 2.0.0
      */
     public function setConditions(array $conditions = null);
 
@@ -52,7 +47,6 @@ public function setConditions(array $conditions = null);
      * Return the aggregator type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAggregatorType();
 
@@ -61,7 +55,6 @@ public function getAggregatorType();
      *
      * @param string $aggregatorType
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregatorType($aggregatorType);
 
@@ -69,7 +62,6 @@ public function setAggregatorType($aggregatorType);
      * Return the operator of the condition
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOperator();
 
@@ -78,7 +70,6 @@ public function getOperator();
      *
      * @param string $operator
      * @return $this
-     * @since 2.0.0
      */
     public function setOperator($operator);
 
@@ -86,7 +77,6 @@ public function setOperator($operator);
      * Return the attribute name of the condition
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeName();
 
@@ -95,7 +85,6 @@ public function getAttributeName();
      *
      * @param string $attributeName
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeName($attributeName);
 
@@ -103,7 +92,6 @@ public function setAttributeName($attributeName);
      * Return the value of the condition
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -112,7 +100,6 @@ public function getValue();
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -120,7 +107,6 @@ public function setValue($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\ConditionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -129,7 +115,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\SalesRule\Api\Data\ConditionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\ConditionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Api/Data/CouponGenerationSpecInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponGenerationSpecInterface.php
index 20425d9353d31..0928e31aed60e 100644
--- a/app/code/Magento/SalesRule/Api/Data/CouponGenerationSpecInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/CouponGenerationSpecInterface.php
@@ -9,7 +9,6 @@
  * CouponGenerationSpecInterface
  *
  * @api
- * @since 2.0.0
  */
 interface CouponGenerationSpecInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -21,7 +20,6 @@ interface CouponGenerationSpecInterface extends \Magento\Framework\Api\Extensibl
      * Get the id of the rule associated with the coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRuleId();
 
@@ -30,7 +28,6 @@ public function getRuleId();
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId);
 
@@ -38,7 +35,6 @@ public function setRuleId($ruleId);
      * Get format of generated coupon code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormat();
 
@@ -47,7 +43,6 @@ public function getFormat();
      *
      * @param string $format
      * @return $this
-     * @since 2.0.0
      */
     public function setFormat($format);
 
@@ -55,7 +50,6 @@ public function setFormat($format);
      * Number of coupons to generate
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQuantity();
 
@@ -64,7 +58,6 @@ public function getQuantity();
      *
      * @param int $quantity
      * @return $this
-     * @since 2.0.0
      */
     public function setQuantity($quantity);
 
@@ -72,7 +65,6 @@ public function setQuantity($quantity);
      * Get length of coupon code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLength();
 
@@ -81,7 +73,6 @@ public function getLength();
      *
      * @param int $length
      * @return $this
-     * @since 2.0.0
      */
     public function setLength($length);
 
@@ -89,7 +80,6 @@ public function setLength($length);
      * Get the prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix();
 
@@ -98,7 +88,6 @@ public function getPrefix();
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix);
 
@@ -106,7 +95,6 @@ public function setPrefix($prefix);
      * Get the suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix();
 
@@ -115,7 +103,6 @@ public function getSuffix();
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix);
 
@@ -123,7 +110,6 @@ public function setSuffix($suffix);
      * Get the spacing where the delimiter should exist
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getDelimiterAtEvery();
 
@@ -132,7 +118,6 @@ public function getDelimiterAtEvery();
      *
      * @param int $delimiterAtEvery
      * @return $this
-     * @since 2.0.0
      */
     public function setDelimiterAtEvery($delimiterAtEvery);
 
@@ -140,7 +125,6 @@ public function setDelimiterAtEvery($delimiterAtEvery);
      * Get the delimiter
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDelimiter();
 
@@ -149,7 +133,6 @@ public function getDelimiter();
      *
      * @param string $delimiter
      * @return $this
-     * @since 2.0.0
      */
     public function setDelimiter($delimiter);
 
@@ -157,7 +140,6 @@ public function setDelimiter($delimiter);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -166,7 +148,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
index 11e7c27845724..152b5762061a5 100644
--- a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
@@ -9,7 +9,6 @@
  * Interface CouponInterface
  *
  * @api
- * @since 2.0.0
  */
 interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -20,7 +19,6 @@ interface CouponInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Get coupon id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCouponId();
 
@@ -29,7 +27,6 @@ public function getCouponId();
      *
      * @param int $couponId
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponId($couponId);
 
@@ -37,7 +34,6 @@ public function setCouponId($couponId);
      * Get the id of the rule associated with the coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRuleId();
 
@@ -46,7 +42,6 @@ public function getRuleId();
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId);
 
@@ -54,7 +49,6 @@ public function setRuleId($ruleId);
      * Get coupon code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -63,7 +57,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -71,7 +64,6 @@ public function setCode($code);
      * Get usage limit
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getUsageLimit();
 
@@ -80,7 +72,6 @@ public function getUsageLimit();
      *
      * @param int $usageLimit
      * @return $this
-     * @since 2.0.0
      */
     public function setUsageLimit($usageLimit);
 
@@ -88,7 +79,6 @@ public function setUsageLimit($usageLimit);
      * Get usage limit per customer
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getUsagePerCustomer();
 
@@ -97,7 +87,6 @@ public function getUsagePerCustomer();
      *
      * @param int $usagePerCustomer
      * @return $this
-     * @since 2.0.0
      */
     public function setUsagePerCustomer($usagePerCustomer);
 
@@ -105,14 +94,12 @@ public function setUsagePerCustomer($usagePerCustomer);
      * Get the number of times the coupon has been used
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimesUsed();
 
     /**
      * @param int $timesUsed
      * @return $this
-     * @since 2.0.0
      */
     public function setTimesUsed($timesUsed);
 
@@ -120,7 +107,6 @@ public function setTimesUsed($timesUsed);
      * Get expiration date
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getExpirationDate();
 
@@ -129,7 +115,6 @@ public function getExpirationDate();
      *
      * @param string $expirationDate
      * @return $this
-     * @since 2.0.0
      */
     public function setExpirationDate($expirationDate);
 
@@ -138,7 +123,6 @@ public function setExpirationDate($expirationDate);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsPrimary();
 
@@ -147,7 +131,6 @@ public function getIsPrimary();
      *
      * @param bool $isPrimary
      * @return $this
-     * @since 2.0.0
      */
     public function setIsPrimary($isPrimary);
 
@@ -155,7 +138,6 @@ public function setIsPrimary($isPrimary);
      * Date when the coupon is created
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -164,7 +146,6 @@ public function getCreatedAt();
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -172,14 +153,12 @@ public function setCreatedAt($createdAt);
      * Type of coupon
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getType();
 
     /**
      * @param int $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -187,7 +166,6 @@ public function setType($type);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\CouponExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -196,7 +174,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\SalesRule\Api\Data\CouponExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\CouponExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Api/Data/CouponMassDeleteResultInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponMassDeleteResultInterface.php
index 5c7ccb9afe9f0..c8a97d4aa852c 100644
--- a/app/code/Magento/SalesRule/Api/Data/CouponMassDeleteResultInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/CouponMassDeleteResultInterface.php
@@ -9,7 +9,6 @@
  * Coupon mass delete results interface.
  *
  * @api
- * @since 2.0.0
  */
 interface CouponMassDeleteResultInterface
 {
@@ -17,7 +16,6 @@ interface CouponMassDeleteResultInterface
      * Get list of failed items.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getFailedItems();
 
@@ -26,7 +24,6 @@ public function getFailedItems();
      *
      * @param string[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setFailedItems(array $items);
 
@@ -34,7 +31,6 @@ public function setFailedItems(array $items);
      * Get list of missing items.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getMissingItems();
 
@@ -43,7 +39,6 @@ public function getMissingItems();
      *
      * @param string[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setMissingItems(array $items);
 }
diff --git a/app/code/Magento/SalesRule/Api/Data/CouponSearchResultInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponSearchResultInterface.php
index c2482def79db8..1a50bdc3a9184 100644
--- a/app/code/Magento/SalesRule/Api/Data/CouponSearchResultInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/CouponSearchResultInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CouponSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -16,7 +15,6 @@ interface CouponSearchResultInterface extends \Magento\Framework\Api\SearchResul
      * Get rules.
      *
      * @return \Magento\SalesRule\Api\Data\CouponInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param \Magento\SalesRule\Api\Data\CouponInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 }
diff --git a/app/code/Magento/SalesRule/Api/Data/RuleInterface.php b/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
index 9577d13ba61c5..73e926f039bf7 100644
--- a/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
@@ -9,7 +9,6 @@
  * Interface RuleInterface
  *
  * @api
- * @since 2.0.0
  */
 interface RuleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -30,7 +29,6 @@ interface RuleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      * Return rule id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getRuleId();
 
@@ -39,7 +37,6 @@ public function getRuleId();
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId);
 
@@ -47,7 +44,6 @@ public function setRuleId($ruleId);
      * Get rule name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName();
 
@@ -56,7 +52,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -64,7 +59,6 @@ public function setName($name);
      * Get display label
      *
      * @return \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null
-     * @since 2.0.0
      */
     public function getStoreLabels();
 
@@ -73,7 +67,6 @@ public function getStoreLabels();
      *
      * @param \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null $storeLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabels(array $storeLabels = null);
 
@@ -81,7 +74,6 @@ public function setStoreLabels(array $storeLabels = null);
      * Get description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -90,7 +82,6 @@ public function getDescription();
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description);
 
@@ -98,7 +89,6 @@ public function setDescription($description);
      * Get a list of websites the rule applies to
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getWebsiteIds();
 
@@ -107,7 +97,6 @@ public function getWebsiteIds();
      *
      * @param int[] $websiteIds
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteIds(array $websiteIds);
 
@@ -115,7 +104,6 @@ public function setWebsiteIds(array $websiteIds);
      * Get ids of customer groups that the rule applies to
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getCustomerGroupIds();
 
@@ -124,7 +112,6 @@ public function getCustomerGroupIds();
      *
      * @param int[] $customerGroupIds
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupIds(array $customerGroupIds);
 
@@ -132,7 +119,6 @@ public function setCustomerGroupIds(array $customerGroupIds);
      * Get the start date when the coupon is active
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFromDate();
 
@@ -141,7 +127,6 @@ public function getFromDate();
      *
      * @param string $fromDate
      * @return $this
-     * @since 2.0.0
      */
     public function setFromDate($fromDate);
 
@@ -149,7 +134,6 @@ public function setFromDate($fromDate);
      * Get the end date when the coupon is active
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getToDate();
 
@@ -158,7 +142,6 @@ public function getToDate();
      *
      * @param string $fromDate
      * @return $this
-     * @since 2.0.0
      */
     public function setToDate($fromDate);
 
@@ -166,7 +149,6 @@ public function setToDate($fromDate);
      * Get number of uses per customer
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUsesPerCustomer();
 
@@ -175,7 +157,6 @@ public function getUsesPerCustomer();
      *
      * @param int $usesPerCustomer
      * @return $this
-     * @since 2.0.0
      */
     public function setUsesPerCustomer($usesPerCustomer);
 
@@ -184,7 +165,6 @@ public function setUsesPerCustomer($usesPerCustomer);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -193,7 +173,6 @@ public function getIsActive();
      *
      * @param bool $isActive
      * @return bool
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 
@@ -201,7 +180,6 @@ public function setIsActive($isActive);
      * Get condition for the rule
      *
      * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
-     * @since 2.0.0
      */
     public function getCondition();
 
@@ -210,7 +188,6 @@ public function getCondition();
      *
      * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function setCondition(ConditionInterface $condition = null);
 
@@ -218,7 +195,6 @@ public function setCondition(ConditionInterface $condition = null);
      * Get action condition
      *
      * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
-     * @since 2.0.0
      */
     public function getActionCondition();
 
@@ -227,7 +203,6 @@ public function getActionCondition();
      *
      * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $actionCondition
      * @return $this
-     * @since 2.0.0
      */
     public function setActionCondition(ConditionInterface $actionCondition = null);
 
@@ -236,7 +211,6 @@ public function setActionCondition(ConditionInterface $actionCondition = null);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getStopRulesProcessing();
 
@@ -245,7 +219,6 @@ public function getStopRulesProcessing();
      *
      * @param bool $stopRulesProcessing
      * @return $this
-     * @since 2.0.0
      */
     public function setStopRulesProcessing($stopRulesProcessing);
 
@@ -254,14 +227,12 @@ public function setStopRulesProcessing($stopRulesProcessing);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAdvanced();
 
     /**
      * @param bool $isAdvanced
      * @return $this
-     * @since 2.0.0
      */
     public function setIsAdvanced($isAdvanced);
 
@@ -269,7 +240,6 @@ public function setIsAdvanced($isAdvanced);
      * Return product ids
      *
      * @return int[]|null
-     * @since 2.0.0
      */
     public function getProductIds();
 
@@ -278,7 +248,6 @@ public function getProductIds();
      *
      * @param int[]|null $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function setProductIds(array $productIds = null);
 
@@ -286,14 +255,12 @@ public function setProductIds(array $productIds = null);
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 
     /**
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder);
 
@@ -301,7 +268,6 @@ public function setSortOrder($sortOrder);
      * Get simple action of the rule
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSimpleAction();
 
@@ -310,7 +276,6 @@ public function getSimpleAction();
      *
      * @param string $simpleAction
      * @return $this
-     * @since 2.0.0
      */
     public function setSimpleAction($simpleAction);
 
@@ -318,7 +283,6 @@ public function setSimpleAction($simpleAction);
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -327,7 +291,6 @@ public function getDiscountAmount();
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount);
 
@@ -335,7 +298,6 @@ public function setDiscountAmount($discountAmount);
      * Return maximum qty discount is applied
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getDiscountQty();
 
@@ -344,7 +306,6 @@ public function getDiscountQty();
      *
      * @param float $discountQty
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountQty($discountQty);
 
@@ -352,7 +313,6 @@ public function setDiscountQty($discountQty);
      * Get discount step
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDiscountStep();
 
@@ -361,7 +321,6 @@ public function getDiscountStep();
      *
      * @param int $discountStep
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountStep($discountStep);
 
@@ -370,7 +329,6 @@ public function setDiscountStep($discountStep);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getApplyToShipping();
 
@@ -379,7 +337,6 @@ public function getApplyToShipping();
      *
      * @param bool $applyToShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setApplyToShipping($applyToShipping);
 
@@ -387,7 +344,6 @@ public function setApplyToShipping($applyToShipping);
      * Return how many times the rule has been used
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimesUsed();
 
@@ -396,7 +352,6 @@ public function getTimesUsed();
      *
      * @param int $timesUsed
      * @return $this
-     * @since 2.0.0
      */
     public function setTimesUsed($timesUsed);
 
@@ -405,7 +360,6 @@ public function setTimesUsed($timesUsed);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsRss();
 
@@ -414,7 +368,6 @@ public function getIsRss();
      *
      * @param bool $isRss
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRss($isRss);
 
@@ -422,7 +375,6 @@ public function setIsRss($isRss);
      * Get coupon type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCouponType();
 
@@ -431,7 +383,6 @@ public function getCouponType();
      *
      * @param string $couponType
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponType($couponType);
 
@@ -440,7 +391,6 @@ public function setCouponType($couponType);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseAutoGeneration();
 
@@ -449,7 +399,6 @@ public function getUseAutoGeneration();
      *
      * @param bool $useAutoGeneration
      * @return $this
-     * @since 2.0.0
      */
     public function setUseAutoGeneration($useAutoGeneration);
 
@@ -457,7 +406,6 @@ public function setUseAutoGeneration($useAutoGeneration);
      * Return limit of uses per coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUsesPerCoupon();
 
@@ -466,7 +414,6 @@ public function getUsesPerCoupon();
      *
      * @param int $usesPerCoupon
      * @return $this
-     * @since 2.0.0
      */
     public function setUsesPerCoupon($usesPerCoupon);
 
@@ -474,7 +421,6 @@ public function setUsesPerCoupon($usesPerCoupon);
      * When to grant free shipping
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSimpleFreeShipping();
 
@@ -483,7 +429,6 @@ public function getSimpleFreeShipping();
      *
      * @param string $simpleFreeShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setSimpleFreeShipping($simpleFreeShipping);
 
@@ -491,7 +436,6 @@ public function setSimpleFreeShipping($simpleFreeShipping);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -500,7 +444,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/SalesRule/Api/Data/RuleLabelInterface.php b/app/code/Magento/SalesRule/Api/Data/RuleLabelInterface.php
index 54b4e835708e7..2bc0d7850b2ac 100644
--- a/app/code/Magento/SalesRule/Api/Data/RuleLabelInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/RuleLabelInterface.php
@@ -9,7 +9,6 @@
  * Interface RuleLabelInterface
  *
  * @api
- * @since 2.0.0
  */
 interface RuleLabelInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface RuleLabelInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Get storeId
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -26,7 +24,6 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -34,7 +31,6 @@ public function setStoreId($storeId);
      * Return the label for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel();
 
@@ -43,7 +39,6 @@ public function getStoreLabel();
      *
      * @param string $storeLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabel($storeLabel);
 
@@ -51,7 +46,6 @@ public function setStoreLabel($storeLabel);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -60,7 +54,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Api/Data/RuleSearchResultInterface.php b/app/code/Magento/SalesRule/Api/Data/RuleSearchResultInterface.php
index 3296270e43066..e2bccba0837c5 100644
--- a/app/code/Magento/SalesRule/Api/Data/RuleSearchResultInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/RuleSearchResultInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RuleSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -16,7 +15,6 @@ interface RuleSearchResultInterface extends \Magento\Framework\Api\SearchResults
      * Get rules.
      *
      * @return \Magento\SalesRule\Api\Data\RuleInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -25,7 +23,6 @@ public function getItems();
      *
      * @param \Magento\SalesRule\Api\Data\RuleInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 }
diff --git a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
index 5563be3313d92..a28c3d06b0aab 100644
--- a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
+++ b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
@@ -9,7 +9,6 @@
  * Sales rule CRUD interface
  *
  * @api
- * @since 2.0.0
  */
 interface RuleRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface RuleRepositoryInterface
      * @throws \Magento\Framework\Exception\InputException If there is a problem with the input
      * @throws \Magento\Framework\Exception\NoSuchEntityException If a rule ID is sent but the rule does not exist
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule);
 
@@ -32,7 +30,6 @@ public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule);
      * @return \Magento\SalesRule\Api\Data\RuleInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $id is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($ruleId);
 
@@ -46,7 +43,6 @@ public function getById($ruleId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\SalesRule\Api\Data\RuleSearchResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -57,7 +53,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($ruleId);
 }
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
index 21d9949c0d9b3..f0c5f7e6491c8 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Quote extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Quote extends \Magento\Backend\Block\Widget\Grid\Container
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
index 6e6230700c43e..48e2a2b9085bf 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Actions
  *
- * @since 2.0.0
  */
 class Actions extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Ui\Component\Layout\Tabs\TabInterface
@@ -19,20 +18,17 @@ class Actions extends \Magento\Backend\Block\Widget\Form\Generic implements
      * Core registry
      *
      * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
-     * @since 2.0.0
      */
     protected $_rendererFieldset;
 
     /**
      * @var \Magento\Rule\Block\Actions
-     * @since 2.0.0
      */
     protected $_ruleActions;
 
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_sourceYesno;
 
@@ -59,7 +55,6 @@ class Actions extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset
      * @param array $data
      * @param \Magento\SalesRule\Model\RuleFactory|null $ruleFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -108,7 +103,6 @@ public function isAjaxLoaded()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -117,7 +111,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -126,7 +119,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -135,7 +127,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -146,7 +137,6 @@ public function isHidden()
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php
index be58f03e3ee82..81143f0cf2d26 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Conditions
  *
- * @since 2.0.0
  */
 class Conditions extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Ui\Component\Layout\Tabs\TabInterface
@@ -19,13 +18,11 @@ class Conditions extends \Magento\Backend\Block\Widget\Form\Generic implements
      * Core registry
      *
      * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
-     * @since 2.0.0
      */
     protected $_rendererFieldset;
 
     /**
      * @var \Magento\Rule\Block\Conditions
-     * @since 2.0.0
      */
     protected $_conditions;
 
@@ -51,7 +48,6 @@ class Conditions extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset
      * @param array $data
      * @param \Magento\SalesRule\Model\RuleFactory|null $ruleFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -99,7 +95,6 @@ public function isAjaxLoaded()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -108,7 +103,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -117,7 +111,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -126,7 +119,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -137,7 +129,6 @@ public function isHidden()
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
index 87569b876ab57..405999f4c1c75 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
@@ -9,13 +9,11 @@
  * "Manage Coupons Codes" Tab
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Coupons extends \Magento\Framework\View\Element\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -24,7 +22,6 @@ public function getTabLabel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -33,7 +30,6 @@ public function getTabTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -42,7 +38,6 @@ public function canShowTab()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
index 03816def4c795..2f82c112d57f2 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
@@ -9,7 +9,6 @@
  * Coupons generation parameters form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Sales rule coupon
      *
      * @var \Magento\SalesRule\Helper\Coupon
-     * @since 2.0.0
      */
     protected $_salesRuleCoupon = null;
 
@@ -27,7 +25,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\SalesRule\Helper\Coupon $salesRuleCoupon
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -175,7 +171,6 @@ protected function _prepareForm()
      * Retrieve URL to Generate Action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGenerateUrl()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
index 764a5d7b27ab2..b72603a46eb60 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -12,7 +12,6 @@
  * Coupon codes grid
  *
  * @api
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -20,13 +19,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory
-     * @since 2.0.0
      */
     protected $_salesRuleCoupon;
 
@@ -36,7 +33,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory $salesRuleCoupon
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +62,6 @@ protected function _construct()
      * Prepare collection for grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -87,7 +81,6 @@ protected function _prepareCollection()
      * Define grid columns
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -131,7 +124,6 @@ protected function _prepareColumns()
      * Configure grid mass actions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -157,7 +149,6 @@ protected function _prepareMassaction()
      * Get grid url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php
index 3a707d5b9cee3..e17bb7c304663 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php
@@ -9,14 +9,12 @@
  * Coupon codes grid "Used" column renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Used extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
     /**
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php
index 81f6cdc7d70d2..a397a8a0f2ffd 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Labels
  *
- * @since 2.0.0
  */
 class Labels extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Ui\Component\Layout\Tabs\TabInterface
@@ -79,7 +78,6 @@ public function isAjaxLoaded()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -89,7 +87,6 @@ public function getTabLabel()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -99,7 +96,6 @@ public function getTabTitle()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -109,7 +105,6 @@ public function canShowTab()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -120,7 +115,6 @@ public function isHidden()
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -157,7 +151,6 @@ protected function _prepareForm()
      * @param \Magento\Framework\Data\Form $form
      * @param array $labels
      * @return \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     protected function _createStoreSpecificFieldset($form, $labels)
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
index 84883ab3179ae..ef29414082ef8 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\SalesRule\Block\Adminhtml\Promo\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
@@ -23,7 +21,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Block constructor, prepare grid params
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      * Prepare rules collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -73,7 +68,6 @@ protected function _prepareCollection()
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element Form Element
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function prepareElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
@@ -109,7 +103,6 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      * Grid Row JS Callback
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowClickCallback()
     {
@@ -137,7 +130,6 @@ function (grid, event) {
      * Prepare columns for rules grid
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -195,7 +187,6 @@ protected function _prepareColumns()
      * Prepare grid URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/SalesRule/Block/Rss/Discounts.php b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
index d2b57bcbb71ed..d939c5d272e8d 100644
--- a/app/code/Magento/SalesRule/Block/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
@@ -10,25 +10,21 @@
 
 /**
  * Review form block
- * @since 2.0.0
  */
 class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\SalesRule\Model\Rss\Discounts
-     * @since 2.0.0
      */
     protected $rssModel;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -38,7 +34,6 @@ class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements
      * @param \Magento\SalesRule\Model\Rss\Discounts $rssModel
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +60,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -120,7 +113,6 @@ public function getRssData()
      * Get customer group id
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getCustomerGroupId()
     {
@@ -133,7 +125,6 @@ protected function getCustomerGroupId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -146,7 +137,6 @@ protected function getStoreId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -155,7 +145,6 @@ public function getCacheLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -167,7 +156,6 @@ public function isAllowed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -185,7 +173,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/SalesRule/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/SalesRule/Block/Widget/Form/Element/Dependence.php
index ff73fcf02fe6c..526236955e6a4 100644
--- a/app/code/Magento/SalesRule/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/SalesRule/Block/Widget/Form/Element/Dependence.php
@@ -9,7 +9,6 @@
  * Form element dependencies mapper
  * Assumes that one element may depend on other element values.
  * Will toggle as "enabled" only if all elements it depends from toggle as true.
- * @since 2.0.0
  */
 class Dependence extends \Magento\Backend\Block\Widget\Form\Element\Dependence
 {
@@ -18,7 +17,6 @@ class Dependence extends \Magento\Backend\Block\Widget\Form\Element\Dependence
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Config\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -31,7 +29,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
index fb4e7dbeb0982..2acf5ca3b22cc 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
  *
- * @since 2.0.0
  */
 abstract class Quote extends \Magento\Backend\App\Action
 {
@@ -23,19 +22,16 @@ abstract class Quote extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     * @since 2.0.0
      */
     protected $_dateFilter;
 
@@ -44,7 +40,6 @@ abstract class Quote extends \Magento\Backend\App\Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Initiate rule
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initRule()
     {
@@ -85,7 +79,6 @@ protected function _initRule()
      * Initiate action
      *
      * @return this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php
index f562eb46e7aad..6f6a321e3a4b6 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ApplyRules
  *
- * @since 2.0.0
  */
 class ApplyRules extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class ApplyRules extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * Apply rules action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php
index 74aa227058592..dfbed88d1a331 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class Chooser extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * Chooser source action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php
index 076a2be4eeebd..71dce12707e57 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\CouponsGrid
  *
- * @since 2.0.0
  */
 class CouponsGrid extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class CouponsGrid extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * Coupon codes grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
index 44e6c6368f77d..6989fca4035fa 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\CouponsMassDelete
  *
- * @since 2.0.0
  */
 class CouponsMassDelete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class CouponsMassDelete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Qu
      * Coupons mass delete action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
index 22947c1a4fd59..afbbc3478dfc1 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * Delete promo quote action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
index 1dc85fe431dac..e301f44bf400b 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -46,7 +45,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php
index 2da1ff1bafb14..08396d63ac9ec 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsCsv
  *
- * @since 2.0.0
  */
 class ExportCouponsCsv extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -19,7 +18,6 @@ class ExportCouponsCsv extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo
      * Export coupon codes as CSV file
      *
      * @return \Magento\Framework\App\ResponseInterface|null
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php
index 8d5d2429b3e21..eb7a63bfd1d37 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsXml
  *
- * @since 2.0.0
  */
 class ExportCouponsXml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -19,7 +18,6 @@ class ExportCouponsXml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo
      * Export coupon codes as excel xml file
      *
      * @return \Magento\Framework\App\ResponseInterface|null
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index 09819c58ae8c8..04510879f0107 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Generate
  *
- * @since 2.0.0
  */
 class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -47,7 +46,6 @@ public function __construct(
      * Generate Coupons action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
index 829299f95669f..6e3f9a985fdcb 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * Index action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
index 25d98cc62b98e..272c5874494f2 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * New promo quote action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php
index f636c524dd044..9f6257a73f1e3 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\NewActionHtml
  *
- * @since 2.0.0
  */
 class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * New action html action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
index 361086768c114..fadd62a9d07ee 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\NewConditionHtml
  *
- * @since 2.0.0
  */
 class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -17,7 +16,6 @@ class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo
      * New condition html action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
index 3178043a72333..f8082aec03e58 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
@@ -19,7 +18,6 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Cron/AggregateSalesReportCouponsData.php b/app/code/Magento/SalesRule/Cron/AggregateSalesReportCouponsData.php
index f62a0c5f2653c..88dc8c288c077 100644
--- a/app/code/Magento/SalesRule/Cron/AggregateSalesReportCouponsData.php
+++ b/app/code/Magento/SalesRule/Cron/AggregateSalesReportCouponsData.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\SalesRule\Cron\AggregateSalesReportCouponsData
  *
- * @since 2.0.0
  */
 class AggregateSalesReportCouponsData
 {
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Report\Rule
-     * @since 2.0.0
      */
     protected $_reportRule;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
@@ -34,7 +30,6 @@ class AggregateSalesReportCouponsData
      * @param \Magento\SalesRule\Model\ResourceModel\Report\Rule $reportRule
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\ResourceModel\Report\Rule $reportRule,
@@ -50,7 +45,6 @@ public function __construct(
      * Refresh sales coupons report statistics for last day
      *
      * @return $this
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 164ec3e1a0e72..c5c64b0384cf4 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -12,7 +12,6 @@
  * Helper for coupon codes creating and managing
  *
  * @api
- * @since 2.0.0
  */
 class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -45,14 +44,12 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_couponParameters;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param array $couponParameters
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -66,7 +63,6 @@ public function __construct(
      * Get all possible coupon codes formats
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormatsList()
     {
@@ -81,7 +77,6 @@ public function getFormatsList()
      * Get default coupon code length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultLength()
     {
@@ -92,7 +87,6 @@ public function getDefaultLength()
      * Get default coupon code format
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultFormat()
     {
@@ -103,7 +97,6 @@ public function getDefaultFormat()
      * Get default coupon code prefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultPrefix()
     {
@@ -114,7 +107,6 @@ public function getDefaultPrefix()
      * Get default coupon code suffix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultSuffix()
     {
@@ -125,7 +117,6 @@ public function getDefaultSuffix()
      * Get dashes occurrences frequency in coupon code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultDashInterval()
     {
@@ -137,7 +128,6 @@ public function getDefaultDashInterval()
      *
      * @param string $format
      * @return array|bool
-     * @since 2.0.0
      */
     public function getCharset($format)
     {
@@ -148,7 +138,6 @@ public function getCharset($format)
      * Retrieve Separator
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCodeSeparator()
     {
diff --git a/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php b/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
index 9b3dfdf64cd0e..e16d7d6332f42 100644
--- a/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
+++ b/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
@@ -16,37 +16,31 @@
 /**
  * Class \Magento\SalesRule\Model\Converter\ToDataModel
  *
- * @since 2.0.0
  */
 class ToDataModel
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Api\Data\RuleInterfaceFactory
-     * @since 2.0.0
      */
     protected $ruleDataFactory;
 
     /**
      * @var \Magento\SalesRule\Api\Data\ConditionInterfaceFactory
-     * @since 2.0.0
      */
     protected $conditionDataFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\SalesRule\Api\Data\RuleLabelInterfaceFactory
-     * @since 2.0.0
      */
     protected $ruleLabelFactory;
 
@@ -70,7 +64,6 @@ class ToDataModel
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param Json $serializer Optional parameter for backward compatibility
      * @param RuleExtensionFactory|null $extensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
@@ -96,7 +89,6 @@ public function __construct(
      *
      * @param Rule $ruleModel
      * @return RuleDataModel
-     * @since 2.0.0
      */
     public function toDataModel(Rule $ruleModel)
     {
@@ -115,7 +107,6 @@ public function toDataModel(Rule $ruleModel)
      * @param RuleDataModel $dataModel
      * @param Rule $ruleModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapConditions(RuleDataModel $dataModel, Rule $ruleModel)
     {
@@ -134,7 +125,6 @@ protected function mapConditions(RuleDataModel $dataModel, Rule $ruleModel)
      * @param RuleDataModel $dataModel
      * @param Rule $ruleModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapActionConditions(RuleDataModel $dataModel, Rule $ruleModel)
     {
@@ -152,7 +142,6 @@ protected function mapActionConditions(RuleDataModel $dataModel, Rule $ruleModel
     /**
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapStoreLabels(RuleDataModel $dataModel)
     {
@@ -173,7 +162,6 @@ protected function mapStoreLabels(RuleDataModel $dataModel)
     /**
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapCouponType(RuleDataModel $dataModel)
     {
@@ -216,7 +204,6 @@ private function convertExtensionAttributesToObject(array $data)
      * @param RuleDataModel $dataModel
      * @param Rule $ruleModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapFields(RuleDataModel $dataModel, Rule $ruleModel)
     {
@@ -232,7 +219,6 @@ protected function mapFields(RuleDataModel $dataModel, Rule $ruleModel)
      *
      * @param array $input
      * @return Condition
-     * @since 2.0.0
      */
     public function arrayToConditionDataModel(array $input)
     {
diff --git a/app/code/Magento/SalesRule/Model/Converter/ToModel.php b/app/code/Magento/SalesRule/Model/Converter/ToModel.php
index 168ee0a68ce4f..b7ca4cabe7268 100644
--- a/app/code/Magento/SalesRule/Model/Converter/ToModel.php
+++ b/app/code/Magento/SalesRule/Model/Converter/ToModel.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\SalesRule\Model\Converter\ToModel
  *
- * @since 2.0.0
  */
 class ToModel
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
@@ -46,7 +42,6 @@ public function __construct(
      * @param \Magento\SalesRule\Model\Rule $ruleModel
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapConditions(\Magento\SalesRule\Model\Rule $ruleModel, RuleDataModel $dataModel)
     {
@@ -63,7 +58,6 @@ protected function mapConditions(\Magento\SalesRule\Model\Rule $ruleModel, RuleD
      * @param \Magento\SalesRule\Model\Rule $ruleModel
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapActionConditions(\Magento\SalesRule\Model\Rule $ruleModel, RuleDataModel $dataModel)
     {
@@ -80,7 +74,6 @@ protected function mapActionConditions(\Magento\SalesRule\Model\Rule $ruleModel,
      * @param Rule $ruleModel
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapStoreLabels(Rule $ruleModel, RuleDataModel $dataModel)
     {
@@ -99,7 +92,6 @@ protected function mapStoreLabels(Rule $ruleModel, RuleDataModel $dataModel)
     /**
      * @param Rule $ruleModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapCouponType(Rule $ruleModel)
     {
@@ -126,7 +118,6 @@ protected function mapCouponType(Rule $ruleModel)
      * @param \Magento\SalesRule\Model\Rule $ruleModel
      * @param RuleDataModel $dataModel
      * @return $this
-     * @since 2.0.0
      */
     protected function mapFields(\Magento\SalesRule\Model\Rule $ruleModel, RuleDataModel $dataModel)
     {
@@ -143,7 +134,6 @@ protected function mapFields(\Magento\SalesRule\Model\Rule $ruleModel, RuleDataM
      * @param Condition $condition
      * @param string $key
      * @return array
-     * @since 2.0.0
      */
     public function dataModelToArray(Condition $condition, $key = 'conditions')
     {
@@ -171,7 +161,6 @@ public function dataModelToArray(Condition $condition, $key = 'conditions')
      * @return $this|Rule
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function toModel(RuleDataModel $dataModel)
     {
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index 7d6eda779337d..1fc100d4db5ca 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -11,7 +11,6 @@
  * @api
  * @method \Magento\SalesRule\Model\ResourceModel\Coupon _getResource()
  * @method \Magento\SalesRule\Model\ResourceModel\Coupon getResource()
- * @since 2.0.0
  */
 class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\SalesRule\Api\Data\CouponInterface
@@ -31,7 +30,6 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +42,6 @@ protected function _construct()
      *
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return $this
-     * @since 2.0.0
      */
     public function setRule(\Magento\SalesRule\Model\Rule $rule)
     {
@@ -57,7 +54,6 @@ public function setRule(\Magento\SalesRule\Model\Rule $rule)
      *
      * @param \Magento\SalesRule\Model\Rule|int $rule
      * @return $this
-     * @since 2.0.0
      */
     public function loadPrimaryByRule($rule)
     {
@@ -70,7 +66,6 @@ public function loadPrimaryByRule($rule)
      *
      * @param string $couponCode
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode($couponCode)
     {
@@ -84,7 +79,6 @@ public function loadByCode($couponCode)
      * Get coupon id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCouponId()
     {
@@ -96,7 +90,6 @@ public function getCouponId()
      *
      * @param int $couponId
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponId($couponId)
     {
@@ -107,7 +100,6 @@ public function setCouponId($couponId)
      * Get the id of the rule associated with the coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRuleId()
     {
@@ -119,7 +111,6 @@ public function getRuleId()
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId)
     {
@@ -130,7 +121,6 @@ public function setRuleId($ruleId)
      * Get coupon code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -142,7 +132,6 @@ public function getCode()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -153,7 +142,6 @@ public function setCode($code)
      * Get usage limit
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getUsageLimit()
     {
@@ -165,7 +153,6 @@ public function getUsageLimit()
      *
      * @param int $usageLimit
      * @return $this
-     * @since 2.0.0
      */
     public function setUsageLimit($usageLimit)
     {
@@ -176,7 +163,6 @@ public function setUsageLimit($usageLimit)
      * Get usage limit per customer
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getUsagePerCustomer()
     {
@@ -188,7 +174,6 @@ public function getUsagePerCustomer()
      *
      * @param int $usagePerCustomer
      * @return $this
-     * @since 2.0.0
      */
     public function setUsagePerCustomer($usagePerCustomer)
     {
@@ -199,7 +184,6 @@ public function setUsagePerCustomer($usagePerCustomer)
      * Get the number of times the coupon has been used
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimesUsed()
     {
@@ -209,7 +193,6 @@ public function getTimesUsed()
     /**
      * @param int $timesUsed
      * @return $this
-     * @since 2.0.0
      */
     public function setTimesUsed($timesUsed)
     {
@@ -220,7 +203,6 @@ public function setTimesUsed($timesUsed)
      * Get expiration date
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getExpirationDate()
     {
@@ -232,7 +214,6 @@ public function getExpirationDate()
      *
      * @param string $expirationDate
      * @return $this
-     * @since 2.0.0
      */
     public function setExpirationDate($expirationDate)
     {
@@ -244,7 +225,6 @@ public function setExpirationDate($expirationDate)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsPrimary()
     {
@@ -256,7 +236,6 @@ public function getIsPrimary()
      *
      * @param bool $isPrimary
      * @return $this
-     * @since 2.0.0
      */
     public function setIsPrimary($isPrimary)
     {
@@ -267,7 +246,6 @@ public function setIsPrimary($isPrimary)
      * Date when the coupon is created
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -279,7 +257,6 @@ public function getCreatedAt()
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -290,7 +267,6 @@ public function setCreatedAt($createdAt)
      * Type of coupon
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -300,7 +276,6 @@ public function getType()
     /**
      * @param int $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -311,7 +286,6 @@ public function setType($type)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\CouponExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -323,7 +297,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\SalesRule\Api\Data\CouponExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\CouponExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
index 684525c2051fb..7f01ad3644a5f 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Coupon\Codegenerator
  *
- * @since 2.0.0
  */
 class Codegenerator extends \Magento\Framework\DataObject implements CodegeneratorInterface
 {
@@ -36,7 +35,6 @@ class Codegenerator extends \Magento\Framework\DataObject implements Codegenerat
      * Retrieve generated code
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateCode()
     {
@@ -54,7 +52,6 @@ public function generateCode()
      * Getting actual code length
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getActualLength()
     {
@@ -68,7 +65,6 @@ protected function getActualLength()
      * Retrieve delimiter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDelimiter()
     {
diff --git a/app/code/Magento/SalesRule/Model/Coupon/CodegeneratorInterface.php b/app/code/Magento/SalesRule/Model/Coupon/CodegeneratorInterface.php
index d8384c374a2a7..6453a02cfcc1c 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/CodegeneratorInterface.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/CodegeneratorInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CodegeneratorInterface
 {
@@ -15,7 +14,6 @@ interface CodegeneratorInterface
      * Retrieve generated code
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateCode();
 
@@ -23,7 +21,6 @@ public function generateCode();
      * Retrieve delimiter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDelimiter();
 }
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
index f423548ed523d..a03840e7bb9be 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
@@ -11,7 +11,6 @@
  * @method \Magento\SalesRule\Model\ResourceModel\Coupon getResource()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Massgenerator extends \Magento\Framework\Model\AbstractModel implements
     \Magento\SalesRule\Model\Coupon\CodegeneratorInterface
@@ -29,13 +28,11 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements
     /**
      * Count of generated Coupons
      * @var int
-     * @since 2.0.0
      */
     protected $generatedCount = 0;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $generatedCodes = [];
 
@@ -43,25 +40,21 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements
      * Sales rule coupon
      *
      * @var \Magento\SalesRule\Helper\Coupon
-     * @since 2.0.0
      */
     protected $salesRuleCoupon;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $date;
 
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $couponFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -75,7 +68,6 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -99,7 +91,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -110,7 +101,6 @@ protected function _construct()
      * Generate coupon code
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateCode()
     {
@@ -141,7 +131,6 @@ public function generateCode()
      * Retrieve delimiter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDelimiter()
     {
@@ -157,7 +146,6 @@ public function getDelimiter()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function generatePool()
     {
@@ -208,7 +196,6 @@ public function generatePool()
      * Increase the length of Code if probability is low
      *
      * @return void
-     * @since 2.0.0
      */
     protected function increaseLength()
     {
@@ -234,7 +221,6 @@ protected function increaseLength()
      *
      * @param array $data
      * @return bool
-     * @since 2.0.0
      */
     public function validateData($data)
     {
@@ -252,7 +238,6 @@ public function validateData($data)
      * Return the generated coupon codes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGeneratedCodes()
     {
@@ -263,7 +248,6 @@ public function getGeneratedCodes()
      * Retrieve count of generated Coupons
      *
      * @return int
-     * @since 2.0.0
      */
     public function getGeneratedCount()
     {
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 4ed5102d195b0..66b5049a7dcc2 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -15,43 +15,36 @@
  * Coupon CRUD class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CouponRepository implements \Magento\SalesRule\Api\CouponRepositoryInterface
 {
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $couponFactory;
 
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Api\Data\CouponSearchResultInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Spi\CouponResourceInterface
-     * @since 2.0.0
      */
     protected $resourceModel;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -70,7 +63,6 @@ class CouponRepository implements \Magento\SalesRule\Api\CouponRepositoryInterfa
      * @param Spi\CouponResourceInterface $resourceModel
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\CouponFactory $couponFactory,
@@ -98,7 +90,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\InputException If there is a problem with the input
      * @throws \Magento\Framework\Exception\NoSuchEntityException If a coupon ID is sent but the coupon does not exist
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)
     {
@@ -149,7 +140,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)
      * @return \Magento\SalesRule\Api\Data\CouponInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If $couponId is not found
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($couponId)
     {
@@ -167,7 +157,6 @@ public function getById($couponId)
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\SalesRule\Api\Data\CouponSearchResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -191,7 +180,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($couponId)
     {
@@ -214,7 +202,6 @@ public function deleteById($couponId)
      * @param Collection $collection
      * @deprecated 2.2.0
      * @return void
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
diff --git a/app/code/Magento/SalesRule/Model/Data/Condition.php b/app/code/Magento/SalesRule/Model/Data/Condition.php
index d44803aa1c053..97226b0cc6dfc 100644
--- a/app/code/Magento/SalesRule/Model/Data/Condition.php
+++ b/app/code/Magento/SalesRule/Model/Data/Condition.php
@@ -13,7 +13,6 @@
  * Class Condition
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Condition extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\SalesRule\Api\Data\ConditionInterface
@@ -29,7 +28,6 @@ class Condition extends \Magento\Framework\Api\AbstractExtensibleObject implemen
      * Get condition type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConditionType()
     {
@@ -39,7 +37,6 @@ public function getConditionType()
     /**
      * @param string $conditionType
      * @return $this
-     * @since 2.0.0
      */
     public function setConditionType($conditionType)
     {
@@ -50,7 +47,6 @@ public function setConditionType($conditionType)
      * Return list of conditions
      *
      * @return ConditionInterface[]|null
-     * @since 2.0.0
      */
     public function getConditions()
     {
@@ -62,7 +58,6 @@ public function getConditions()
      *
      * @param ConditionInterface[]|null $conditions
      * @return $this
-     * @since 2.0.0
      */
     public function setConditions(array $conditions = null)
     {
@@ -73,7 +68,6 @@ public function setConditions(array $conditions = null)
      * Return the aggregator type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAggregatorType()
     {
@@ -85,7 +79,6 @@ public function getAggregatorType()
      *
      * @param string $aggregatorType
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregatorType($aggregatorType)
     {
@@ -96,7 +89,6 @@ public function setAggregatorType($aggregatorType)
      * Return the operator of the condition
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOperator()
     {
@@ -108,7 +100,6 @@ public function getOperator()
      *
      * @param string $operator
      * @return $this
-     * @since 2.0.0
      */
     public function setOperator($operator)
     {
@@ -119,7 +110,6 @@ public function setOperator($operator)
      * Return the attribute name of the condition
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeName()
     {
@@ -131,7 +121,6 @@ public function getAttributeName()
      *
      * @param string $attributeName
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeName($attributeName)
     {
@@ -142,7 +131,6 @@ public function setAttributeName($attributeName)
      * Return the value of the condition
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -154,7 +142,6 @@ public function getValue()
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -165,7 +152,6 @@ public function setValue($value)
      * {@inheritdoc}
      *
      * @return \Magento\SalesRule\Api\Data\ConditionExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -177,7 +163,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\SalesRule\Api\Data\ConditionExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\ConditionExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Model/Data/CouponGenerationSpec.php b/app/code/Magento/SalesRule/Model/Data/CouponGenerationSpec.php
index 64dee26217d14..69cb0b345c68a 100644
--- a/app/code/Magento/SalesRule/Model/Data/CouponGenerationSpec.php
+++ b/app/code/Magento/SalesRule/Model/Data/CouponGenerationSpec.php
@@ -11,7 +11,6 @@
  * Class CouponGenerationSpec
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CouponGenerationSpec extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\SalesRule\Api\Data\CouponGenerationSpecInterface
@@ -29,7 +28,6 @@ class CouponGenerationSpec extends \Magento\Framework\Api\AbstractExtensibleObje
      * Get the id of the rule associated with the coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRuleId()
     {
@@ -41,7 +39,6 @@ public function getRuleId()
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId)
     {
@@ -52,7 +49,6 @@ public function setRuleId($ruleId)
      * Get format of generated coupon code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormat()
     {
@@ -64,7 +60,6 @@ public function getFormat()
      *
      * @param string $format
      * @return $this
-     * @since 2.0.0
      */
     public function setFormat($format)
     {
@@ -75,7 +70,6 @@ public function setFormat($format)
      * Number of coupons to generate
      *
      * @return int
-     * @since 2.0.0
      */
     public function getQuantity()
     {
@@ -87,7 +81,6 @@ public function getQuantity()
      *
      * @param int $quantity
      * @return $this
-     * @since 2.0.0
      */
     public function setQuantity($quantity)
     {
@@ -98,7 +91,6 @@ public function setQuantity($quantity)
      * Get length of coupon code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLength()
     {
@@ -110,7 +102,6 @@ public function getLength()
      *
      * @param int $length
      * @return $this
-     * @since 2.0.0
      */
     public function setLength($length)
     {
@@ -121,7 +112,6 @@ public function setLength($length)
      * Get the prefix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPrefix()
     {
@@ -133,7 +123,6 @@ public function getPrefix()
      *
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -144,7 +133,6 @@ public function setPrefix($prefix)
      * Get the suffix
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSuffix()
     {
@@ -156,7 +144,6 @@ public function getSuffix()
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -167,7 +154,6 @@ public function setSuffix($suffix)
      * Get the spacing where the delimiter should exist
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getDelimiterAtEvery()
     {
@@ -179,7 +165,6 @@ public function getDelimiterAtEvery()
      *
      * @param int $delimiterAtEvery
      * @return $this
-     * @since 2.0.0
      */
     public function setDelimiterAtEvery($delimiterAtEvery)
     {
@@ -190,7 +175,6 @@ public function setDelimiterAtEvery($delimiterAtEvery)
      * Get the delimiter
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDelimiter()
     {
@@ -202,7 +186,6 @@ public function getDelimiter()
      *
      * @param string $delimiter
      * @return $this
-     * @since 2.0.0
      */
     public function setDelimiter($delimiter)
     {
@@ -213,7 +196,6 @@ public function setDelimiter($delimiter)
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -225,7 +207,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\CouponGenerationSpecExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Model/Data/CouponMassDeleteResult.php b/app/code/Magento/SalesRule/Model/Data/CouponMassDeleteResult.php
index 8e9bc8830335f..5b1ec1e27a000 100644
--- a/app/code/Magento/SalesRule/Model/Data/CouponMassDeleteResult.php
+++ b/app/code/Magento/SalesRule/Model/Data/CouponMassDeleteResult.php
@@ -9,7 +9,6 @@
  * Class CouponMassDeleteResult
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class CouponMassDeleteResult extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
@@ -19,7 +18,6 @@ class CouponMassDeleteResult extends \Magento\Framework\Api\AbstractSimpleObject
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFailedItems()
     {
@@ -28,7 +26,6 @@ public function getFailedItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFailedItems(array $items)
     {
@@ -37,7 +34,6 @@ public function setFailedItems(array $items)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMissingItems()
     {
@@ -46,7 +42,6 @@ public function getMissingItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setMissingItems(array $items)
     {
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index 3ad7f03793fa8..72465b285032e 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -15,7 +15,6 @@
  *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\SalesRule\Api\Data\RuleInterface
@@ -52,7 +51,6 @@ class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
      * Return rule id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getRuleId()
     {
@@ -64,7 +62,6 @@ public function getRuleId()
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function setRuleId($ruleId)
     {
@@ -75,7 +72,6 @@ public function setRuleId($ruleId)
      * Get rule name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -87,7 +83,6 @@ public function getName()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -98,7 +93,6 @@ public function setName($name)
      * Get description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -110,7 +104,6 @@ public function getDescription()
      *
      * @param string $description
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -121,7 +114,6 @@ public function setDescription($description)
      * Get the start date when the coupon is active
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFromDate()
     {
@@ -133,7 +125,6 @@ public function getFromDate()
      *
      * @param string $fromDate
      * @return $this
-     * @since 2.0.0
      */
     public function setFromDate($fromDate)
     {
@@ -144,7 +135,6 @@ public function setFromDate($fromDate)
      * Get the end date when the coupon is active
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getToDate()
     {
@@ -156,7 +146,6 @@ public function getToDate()
      *
      * @param string $toDate
      * @return $this
-     * @since 2.0.0
      */
     public function setToDate($toDate)
     {
@@ -167,7 +156,6 @@ public function setToDate($toDate)
      * Get number of uses per customer
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUsesPerCustomer()
     {
@@ -179,7 +167,6 @@ public function getUsesPerCustomer()
      *
      * @param int $usesPerCustomer
      * @return $this
-     * @since 2.0.0
      */
     public function setUsesPerCustomer($usesPerCustomer)
     {
@@ -191,7 +178,6 @@ public function setUsesPerCustomer($usesPerCustomer)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -203,7 +189,6 @@ public function getIsActive()
      *
      * @param bool $isActive
      * @return bool
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
@@ -214,7 +199,6 @@ public function setIsActive($isActive)
      * Get condition for the rule
      *
      * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
-     * @since 2.0.0
      */
     public function getCondition()
     {
@@ -226,7 +210,6 @@ public function getCondition()
      *
      * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $condition
      * @return $this
-     * @since 2.0.0
      */
     public function setCondition(ConditionInterface $condition = null)
     {
@@ -237,7 +220,6 @@ public function setCondition(ConditionInterface $condition = null)
      * Get action condition
      *
      * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
-     * @since 2.0.0
      */
     public function getActionCondition()
     {
@@ -249,7 +231,6 @@ public function getActionCondition()
      *
      * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $actionCondition
      * @return $this
-     * @since 2.0.0
      */
     public function setActionCondition(ConditionInterface $actionCondition = null)
     {
@@ -261,7 +242,6 @@ public function setActionCondition(ConditionInterface $actionCondition = null)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getStopRulesProcessing()
     {
@@ -273,7 +253,6 @@ public function getStopRulesProcessing()
      *
      * @param bool $stopRulesProcessing
      * @return $this
-     * @since 2.0.0
      */
     public function setStopRulesProcessing($stopRulesProcessing)
     {
@@ -285,7 +264,6 @@ public function setStopRulesProcessing($stopRulesProcessing)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsAdvanced()
     {
@@ -295,7 +273,6 @@ public function getIsAdvanced()
     /**
      * @param bool $isAdvanced
      * @return $this
-     * @since 2.0.0
      */
     public function setIsAdvanced($isAdvanced)
     {
@@ -306,7 +283,6 @@ public function setIsAdvanced($isAdvanced)
      * Get display label
      *
      * @return \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null
-     * @since 2.0.0
      */
     public function getStoreLabels()
     {
@@ -318,7 +294,6 @@ public function getStoreLabels()
      *
      * @param \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null $storeLabels
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabels(array $storeLabels = null)
     {
@@ -329,7 +304,6 @@ public function setStoreLabels(array $storeLabels = null)
      * Get a list of websites the rule applies to
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getWebsiteIds()
     {
@@ -341,7 +315,6 @@ public function getWebsiteIds()
      *
      * @param int[] $websites
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteIds(array $websites)
     {
@@ -352,7 +325,6 @@ public function setWebsiteIds(array $websites)
      * Get ids of customer groups that the rule applies to
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getCustomerGroupIds()
     {
@@ -364,7 +336,6 @@ public function getCustomerGroupIds()
      *
      * @param int[] $customerGroups
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerGroupIds(array $customerGroups)
     {
@@ -375,7 +346,6 @@ public function setCustomerGroupIds(array $customerGroups)
      * Return product ids
      *
      * @return int[]|null
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -387,7 +357,6 @@ public function getProductIds()
      *
      * @param int[]|null $productIds
      * @return $this
-     * @since 2.0.0
      */
     public function setProductIds(array $productIds = null)
     {
@@ -398,7 +367,6 @@ public function setProductIds(array $productIds = null)
      * Get sort order
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -408,7 +376,6 @@ public function getSortOrder()
     /**
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrder($sortOrder)
     {
@@ -419,7 +386,6 @@ public function setSortOrder($sortOrder)
      * Get simple action of the rule
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSimpleAction()
     {
@@ -431,7 +397,6 @@ public function getSimpleAction()
      *
      * @param string $simpleAction
      * @return $this
-     * @since 2.0.0
      */
     public function setSimpleAction($simpleAction)
     {
@@ -442,7 +407,6 @@ public function setSimpleAction($simpleAction)
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -454,7 +418,6 @@ public function getDiscountAmount()
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount)
     {
@@ -465,7 +428,6 @@ public function setDiscountAmount($discountAmount)
      * Return maximum qty discount is applied
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountQty()
     {
@@ -477,7 +439,6 @@ public function getDiscountQty()
      *
      * @param float $discountQty
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountQty($discountQty)
     {
@@ -488,7 +449,6 @@ public function setDiscountQty($discountQty)
      * Get discount step
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDiscountStep()
     {
@@ -500,7 +460,6 @@ public function getDiscountStep()
      *
      * @param int $discountStep
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountStep($discountStep)
     {
@@ -512,7 +471,6 @@ public function setDiscountStep($discountStep)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getApplyToShipping()
     {
@@ -524,7 +482,6 @@ public function getApplyToShipping()
      *
      * @param bool $applyToShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setApplyToShipping($applyToShipping)
     {
@@ -535,7 +492,6 @@ public function setApplyToShipping($applyToShipping)
      * Return how many times the rule has been used
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimesUsed()
     {
@@ -547,7 +503,6 @@ public function getTimesUsed()
      *
      * @param int $timesUsed
      * @return $this
-     * @since 2.0.0
      */
     public function setTimesUsed($timesUsed)
     {
@@ -559,7 +514,6 @@ public function setTimesUsed($timesUsed)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsRss()
     {
@@ -571,7 +525,6 @@ public function getIsRss()
      *
      * @param bool $isRss
      * @return $this
-     * @since 2.0.0
      */
     public function setIsRss($isRss)
     {
@@ -582,7 +535,6 @@ public function setIsRss($isRss)
      * Get coupon type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCouponType()
     {
@@ -594,7 +546,6 @@ public function getCouponType()
      *
      * @param string $couponType
      * @return $this
-     * @since 2.0.0
      */
     public function setCouponType($couponType)
     {
@@ -606,7 +557,6 @@ public function setCouponType($couponType)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseAutoGeneration()
     {
@@ -618,7 +568,6 @@ public function getUseAutoGeneration()
      *
      * @param bool $useAutoGeneration
      * @return $this
-     * @since 2.0.0
      */
     public function setUseAutoGeneration($useAutoGeneration)
     {
@@ -629,7 +578,6 @@ public function setUseAutoGeneration($useAutoGeneration)
      * Return limit of uses per coupon
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUsesPerCoupon()
     {
@@ -641,7 +589,6 @@ public function getUsesPerCoupon()
      *
      * @param int $usesPerCoupon
      * @return $this
-     * @since 2.0.0
      */
     public function setUsesPerCoupon($usesPerCoupon)
     {
@@ -652,7 +599,6 @@ public function setUsesPerCoupon($usesPerCoupon)
      * When to grant free shipping
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSimpleFreeShipping()
     {
@@ -664,7 +610,6 @@ public function getSimpleFreeShipping()
      *
      * @param string $simpleFreeShipping
      * @return $this
-     * @since 2.0.0
      */
     public function setSimpleFreeShipping($simpleFreeShipping)
     {
@@ -675,7 +620,6 @@ public function setSimpleFreeShipping($simpleFreeShipping)
      * {@inheritdoc}
      *
      * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -687,7 +631,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Model/Data/RuleLabel.php b/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
index f1c65ee4475eb..a491c3ea225cb 100644
--- a/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
+++ b/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
@@ -11,7 +11,6 @@
  * Class Rule label
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class RuleLabel extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\SalesRule\Api\Data\RuleLabelInterface
@@ -23,7 +22,6 @@ class RuleLabel extends \Magento\Framework\Api\AbstractExtensibleObject implemen
      * Get storeId
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -35,7 +33,6 @@ public function getStoreId()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -46,7 +43,6 @@ public function setStoreId($storeId)
      * Return the label for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel()
     {
@@ -58,7 +54,6 @@ public function getStoreLabel()
      *
      * @param string $storeLabel
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreLabel($storeLabel)
     {
@@ -69,7 +64,6 @@ public function setStoreLabel($storeLabel)
      * {@inheritdoc}
      *
      * @return \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -81,7 +75,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\SalesRule\Api\Data\RuleLabelExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 8eab01e62bdb1..1a75e8fe7066b 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\SalesRule\Model\Plugin\QuoteConfigProductAttributes
  *
- * @since 2.0.0
  */
 class QuoteConfigProductAttributes
 {
     /**
      * @var RuleResource
-     * @since 2.0.0
      */
     protected $_ruleResource;
 
     /**
      * @param RuleResource $ruleResource
-     * @since 2.0.0
      */
     public function __construct(RuleResource $ruleResource)
     {
@@ -39,7 +36,6 @@ public function __construct(RuleResource $ruleResource)
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetProductAttributes(\Magento\Quote\Model\Quote\Config $subject, array $attributeKeys)
     {
diff --git a/app/code/Magento/SalesRule/Model/Plugin/ResourceModel/Rule.php b/app/code/Magento/SalesRule/Model/Plugin/ResourceModel/Rule.php
index 111e4d12c695c..5890ba770686f 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/ResourceModel/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/ResourceModel/Rule.php
@@ -9,7 +9,6 @@
  * Class Rule
  * @package Magento\SalesRule\Model\Plugin\ResourceModel
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Rule
 {
@@ -19,7 +18,6 @@ class Rule
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\AbstractModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundLoadCustomerGroupIds(
         \Magento\SalesRule\Model\ResourceModel\Rule $subject,
@@ -35,7 +33,6 @@ public function aroundLoadCustomerGroupIds(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\AbstractModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundLoadWebsiteIds(
         \Magento\SalesRule\Model\ResourceModel\Rule $subject,
diff --git a/app/code/Magento/SalesRule/Model/Plugin/Rule.php b/app/code/Magento/SalesRule/Model/Plugin/Rule.php
index 2f54137bd9666..5d552e75781c7 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/Rule.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Plugin\Rule
  *
- * @since 2.0.0
  */
 class Rule
 {
@@ -17,7 +16,6 @@ class Rule
      * @param \Closure $proceed
      * @return \Magento\SalesRule\Model\Rule
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundLoadRelations(
         \Magento\SalesRule\Model\Rule $subject,
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index f16ea49d11793..e7aa1a5bf5722 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Quote\Discount
  *
- * @since 2.0.0
  */
 class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
@@ -16,7 +15,6 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * Discount calculation object
      *
      * @var \Magento\SalesRule\Model\Validator
-     * @since 2.0.0
      */
     protected $calculator;
 
@@ -24,19 +22,16 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -45,7 +40,6 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\SalesRule\Model\Validator $validator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -68,7 +62,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -159,7 +152,6 @@ public function collect(
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     protected function aggregateItemDiscount(
         \Magento\Quote\Model\Quote\Item\AbstractItem $item,
@@ -175,7 +167,6 @@ protected function aggregateItemDiscount(
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return $this
-     * @since 2.0.0
      */
     protected function distributeDiscount(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -217,7 +208,6 @@ protected function distributeDiscount(\Magento\Quote\Model\Quote\Item\AbstractIt
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
index 76474c4f6cbbc..5068f53f23bc9 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
@@ -11,7 +11,6 @@
  * SalesRule Resource Coupon
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     \Magento\SalesRule\Model\Spi\CouponResourceInterface
@@ -20,7 +19,6 @@ class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
      * Constructor adds unique fields
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      *
      * @param AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeSave(AbstractModel $object)
     {
@@ -58,7 +55,6 @@ public function _beforeSave(AbstractModel $object)
      * @param \Magento\SalesRule\Model\Coupon $object
      * @param \Magento\SalesRule\Model\Rule|int $rule
      * @return bool
-     * @since 2.0.0
      */
     public function loadPrimaryByRule(\Magento\SalesRule\Model\Coupon $object, $rule)
     {
@@ -95,7 +91,6 @@ public function loadPrimaryByRule(\Magento\SalesRule\Model\Coupon $object, $rule
      *
      * @param string $code
      * @return bool
-     * @since 2.0.0
      */
     public function exists($code)
     {
@@ -115,7 +110,6 @@ public function exists($code)
      *
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return $this
-     * @since 2.0.0
      */
     public function updateSpecificCoupons(\Magento\SalesRule\Model\Rule $rule)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php
index de5dce61f73da..22f87a6f29016 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php
@@ -13,7 +13,6 @@
  * SalesRule Model Resource Coupon_Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends AbstractCollection
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -34,7 +32,6 @@ protected function _construct()
      *
      * @param Rule|int $rule
      * @return $this
-     * @since 2.0.0
      */
     public function addRuleToFilter($rule)
     {
@@ -54,7 +51,6 @@ public function addRuleToFilter($rule)
      *
      * @param array $ruleIds
      * @return $this
-     * @since 2.0.0
      */
     public function addRuleIdsToFilter(array $ruleIds)
     {
@@ -66,7 +62,6 @@ public function addRuleIdsToFilter(array $ruleIds)
      * Filter collection to be filled with auto-generated coupons only
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addGeneratedCouponsFilter()
     {
@@ -80,7 +75,6 @@ public function addGeneratedCouponsFilter()
      * @param AbstractCollection $collection
      * @param Column $column
      * @return void
-     * @since 2.0.0
      */
     public function addIsUsedFilterCallback($collection, $column)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
index d23f4aa822028..6407f04611a36 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
@@ -9,7 +9,6 @@
  * SalesRule Model Resource Coupon_Usage
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param int $customerId
      * @param mixed $couponId
      * @return void
-     * @since 2.0.0
      */
     public function updateCustomerCouponTimesUsed($customerId, $couponId)
     {
@@ -68,7 +65,6 @@ public function updateCustomerCouponTimesUsed($customerId, $couponId)
      * @param int $customerId
      * @param mixed $couponId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerCoupon(\Magento\Framework\DataObject $object, $customerId, $couponId)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php
index 78645294bf6a5..049547e65c4a2 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php
@@ -9,7 +9,6 @@
  * Sales report coupons collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Period format for report (day, month, year)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'salesrule_coupon_aggregated';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Array of columns that should be aggregated
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -41,13 +37,11 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Array where rules ids stored
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rulesIdsFilter;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory $ruleFactory
-     * @since 2.0.0
      */
     protected $_ruleFactory;
 
@@ -59,7 +53,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * @param \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory $ruleFactory
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param mixed $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -79,7 +72,6 @@ public function __construct(
      * Collect columns for collection
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -125,7 +117,6 @@ protected function _getSelectedColumns()
      * Add selected data
      *
      * @return Collection
-     * @since 2.0.0
      */
     protected function _applyAggregatedTable()
     {
@@ -149,7 +140,6 @@ protected function _applyAggregatedTable()
      *
      * @param array $rulesList
      * @return Collection
-     * @since 2.0.0
      */
     public function addRuleFilter(array $rulesList)
     {
@@ -161,7 +151,6 @@ public function addRuleFilter(array $rulesList)
      * Apply filtering by rules ids
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyRulesFilter()
     {
@@ -190,7 +179,6 @@ protected function _applyRulesFilter()
      * Apply collection custom filter
      *
      * @return \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected function _applyCustomFilter()
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php
index c04fd3129c78d..fb3f420a325e6 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php
@@ -9,19 +9,16 @@
  * Rule report resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rule extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Report\Rule\CreatedatFactory
-     * @since 2.0.0
      */
     protected $_createdatFactory;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Report\Rule\UpdatedatFactory
-     * @since 2.0.0
      */
     protected $_updatedatFactory;
 
@@ -35,7 +32,6 @@ class Rule extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
      * @param \Magento\SalesRule\Model\ResourceModel\Report\Rule\CreatedatFactory $createdatFactory
      * @param \Magento\SalesRule\Model\ResourceModel\Report\Rule\UpdatedatFactory $updatedatFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -65,7 +61,6 @@ public function __construct(
      * Resource Report Rule constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -78,7 +73,6 @@ protected function _construct()
      * @param mixed|null $from
      * @param mixed|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -93,7 +87,6 @@ public function aggregate($from = null, $to = null)
      * Get all unique Rule Names from aggregated coupons usage data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUniqRulesNamesList()
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
index 136067ccc2430..540ba7e2ea55a 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
@@ -12,7 +12,6 @@
  * Rule report resource model with aggregation by created at
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
@@ -20,7 +19,6 @@ class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractRepo
      * Resource Report Rule constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * @param mixed|null $from
      * @param mixed|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -49,7 +46,6 @@ public function aggregate($from = null, $to = null)
      * @param mixed $to
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.php
index 705238e04874b..2f599dd0d78ae 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.php
@@ -9,7 +9,6 @@
  * Rule report resource model with aggregation by updated at
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Updatedat extends \Magento\SalesRule\Model\ResourceModel\Report\Rule\Createdat
 {
@@ -17,7 +16,6 @@ class Updatedat extends \Magento\SalesRule\Model\ResourceModel\Report\Rule\Creat
      * Resource Report Rule constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      * @param mixed|null $from
      * @param mixed|null $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.php
index e1f74cc96bb1c..0e408787beb7f 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.php
@@ -9,7 +9,6 @@
  * Sales report coupons collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\SalesRule\Model\ResourceModel\Report\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\SalesRule\Model\ResourceModel\Report\Collectio
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'salesrule_coupon_aggregated_updated';
 }
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
index 4a74cb1ed73c3..fc6ef3b416892 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
@@ -16,7 +16,6 @@
 /**
  * Sales Rule resource model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Rule extends AbstractResource
 {
@@ -24,19 +23,16 @@ class Rule extends AbstractResource
      * Store associated with rule entities information map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_associatedEntitiesMap = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $customerGroupIds = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $websiteIds = [];
 
@@ -44,13 +40,11 @@ class Rule extends AbstractResource
      * Magento string lib
      *
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon
-     * @since 2.0.0
      */
     protected $_resourceCoupon;
 
@@ -74,7 +68,6 @@ class Rule extends AbstractResource
      * @param \Magento\Framework\DataObject|null $associatedEntityMapInstance
      * @param Json $serializer Optional parameter for backward compatibility
      * @param MetadataPool $metadataPool Optional parameter for backward compatibility
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -100,7 +93,6 @@ public function __construct(
      * Initialize main table and table id field
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -111,7 +103,6 @@ protected function _construct()
      * @param AbstractModel $object
      * @return void
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function loadCustomerGroupIds(AbstractModel $object)
     {
@@ -125,7 +116,6 @@ public function loadCustomerGroupIds(AbstractModel $object)
      * @param AbstractModel $object
      * @return void
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function loadWebsiteIds(AbstractModel $object)
     {
@@ -141,7 +131,6 @@ public function loadWebsiteIds(AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeSave(AbstractModel $object)
     {
@@ -176,7 +165,6 @@ public function load(AbstractModel $object, $value, $field = null)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -206,7 +194,6 @@ protected function _afterSave(AbstractModel $object)
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param int $customerId
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerUses($rule, $customerId)
     {
@@ -229,7 +216,6 @@ public function getCustomerUses($rule, $customerId)
      * @param array $labels
      * @throws \Exception
      * @return $this
-     * @since 2.0.0
      */
     public function saveStoreLabels($ruleId, $labels)
     {
@@ -269,7 +255,6 @@ public function saveStoreLabels($ruleId, $labels)
      *
      * @param int $ruleId
      * @return array
-     * @since 2.0.0
      */
     public function getStoreLabels($ruleId)
     {
@@ -288,7 +273,6 @@ public function getStoreLabels($ruleId)
      * @param int $ruleId
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getStoreLabel($ruleId, $storeId)
     {
@@ -309,7 +293,6 @@ public function getStoreLabel($ruleId, $storeId)
      * Return codes of all product attributes currently used in promo rules
      *
      * @return array
-     * @since 2.0.0
      */
     public function getActiveAttributes()
     {
@@ -331,7 +314,6 @@ public function getActiveAttributes()
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param mixed $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function setActualProductAttributes($rule, $attributes)
     {
@@ -381,7 +363,6 @@ public function setActualProductAttributes($rule, $attributes)
      *
      * @param string $serializedString
      * @return array
-     * @since 2.0.0
      */
     public function getProductAttributes($serializedString)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index f6a2083a2d05f..b0e4325becd78 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      * Store associated with rule entities information map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_associatedEntitiesMap;
 
@@ -34,7 +32,6 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -53,7 +50,6 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @param Json $serializer Optional parameter for backward compatibility
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -75,7 +71,6 @@ public function __construct(
      * Set resource model and determine field mapping
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -144,7 +139,6 @@ protected function _afterLoad()
      * @use $this->addWebsiteGroupDateFilter()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return $this
-     * @since 2.0.0
      */
     public function setValidationFilter(
         $websiteId,
@@ -240,7 +234,6 @@ public function setValidationFilter(
      * @param string|null $now
      * @use $this->addWebsiteFilter()
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now = null)
     {
@@ -282,7 +275,6 @@ public function addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now = n
      * Add primary coupon to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initSelect()
     {
@@ -300,7 +292,6 @@ public function _initSelect()
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function addAttributeInConditionFilter($attributeCode)
     {
@@ -339,7 +330,6 @@ public function addAttributeInConditionFilter($attributeCode)
      * Excludes price rules with generated specific coupon codes from collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addAllowedSalesRulesFilter()
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.php
index 53ceaa152f333..374c3fe505cdc 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.php
@@ -9,7 +9,6 @@
  * SalesRule Rule Customer Model Resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Customer extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * @param int $customerId
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerRule($rule, $customerId, $ruleId)
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.php
index d7ea2ae3b1711..d4b92110b955b 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.php
@@ -9,7 +9,6 @@
  * SalesRule Model Resource Rule Customer_Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Quote/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Quote/Collection.php
index 34c16956cffbd..473860d98e783 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Quote/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Quote/Collection.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\SalesRule\Model\ResourceModel\Rule\Quote\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\SalesRule\Model\ResourceModel\Rule\Collection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\SalesRule\Model\ResourceModel\Rule\Collection
      * Add websites for load
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _initSelect()
     {
diff --git a/app/code/Magento/SalesRule/Model/Rss/Discounts.php b/app/code/Magento/SalesRule/Model/Rss/Discounts.php
index 45694de3d39ce..aa478a2635ed9 100644
--- a/app/code/Magento/SalesRule/Model/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Model/Rss/Discounts.php
@@ -8,26 +8,22 @@
 /**
  * Class Discounts
  * @package Magento\SalesRule\Model\Rss
- * @since 2.0.0
  */
 class Discounts
 {
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
@@ -41,7 +37,6 @@ public function __construct(
      * @param int $websiteId
      * @param int $customerGroupId
      * @return \Magento\SalesRule\Model\ResourceModel\Rule\Collection
-     * @since 2.0.0
      */
     public function getDiscountCollection($websiteId, $customerGroupId)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index d7a3066c72743..d7de31ac2c5c2 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -65,7 +65,6 @@
  * @method int getRuleId()
  * @method \Magento\SalesRule\Model\Rule setRuleId(int $ruleId)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Rule extends \Magento\Rule\Model\AbstractModel
 {
@@ -97,7 +96,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Store coupon code generator instance
      *
      * @var \Magento\SalesRule\Model\Coupon\CodegeneratorInterface
-     * @since 2.0.0
      */
     protected $_couponCodeGenerator;
 
@@ -105,7 +103,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'salesrule_rule';
 
@@ -115,7 +112,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * In observe method you can use $observer->getEvent()->getRule() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'rule';
 
@@ -123,7 +119,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Rule's primary coupon
      *
      * @var \Magento\SalesRule\Model\Coupon
-     * @since 2.0.0
      */
     protected $_primaryCoupon;
 
@@ -131,7 +126,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Rule's subordinate coupons
      *
      * @var \Magento\SalesRule\Model\Coupon[]
-     * @since 2.0.0
      */
     protected $_coupons;
 
@@ -139,7 +133,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Coupon types cache for lazy getter
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_couponTypes;
 
@@ -147,43 +140,36 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * Store already validated addresses and validation results
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_validatedAddresses = [];
 
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $_couponFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Coupon\CodegeneratorFactory
-     * @since 2.0.0
      */
     protected $_codegenFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Rule\Condition\CombineFactory
-     * @since 2.0.0
      */
     protected $_condCombineFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory
-     * @since 2.0.0
      */
     protected $_condProdCombineF;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\Collection
-     * @since 2.0.0
      */
     protected $_couponCollection;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -208,7 +194,6 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -252,7 +237,6 @@ public function __construct(
      * Set resource model and Id field name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -265,7 +249,6 @@ protected function _construct()
      * Set coupon code and uses per coupon
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -277,7 +260,6 @@ protected function _afterLoad()
      * Load all relative data
      *
      * @return void
-     * @since 2.0.0
      */
     public function loadRelations()
     {
@@ -288,7 +270,6 @@ public function loadRelations()
      * Load coupon code
      *
      * @return void
-     * @since 2.0.0
      */
     public function loadCouponCode()
     {
@@ -302,7 +283,6 @@ public function loadCouponCode()
      * Save/delete coupon
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -334,7 +314,6 @@ public function afterSave()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function loadPost(array $data)
     {
@@ -351,7 +330,6 @@ public function loadPost(array $data)
      * Get rule condition combine model instance
      *
      * @return \Magento\SalesRule\Model\Rule\Condition\Combine
-     * @since 2.0.0
      */
     public function getConditionsInstance()
     {
@@ -362,7 +340,6 @@ public function getConditionsInstance()
      * Get rule condition product combine model instance
      *
      * @return \Magento\SalesRule\Model\Rule\Condition\Product\Combine
-     * @since 2.0.0
      */
     public function getActionsInstance()
     {
@@ -373,7 +350,6 @@ public function getActionsInstance()
      * Returns code generator instance for auto generated coupons
      *
      * @return \Magento\SalesRule\Model\Coupon\CodegeneratorInterface
-     * @since 2.0.0
      */
     public function getCouponCodeGenerator()
     {
@@ -388,7 +364,6 @@ public function getCouponCodeGenerator()
      *
      * @param \Magento\SalesRule\Model\Coupon\CodegeneratorInterface $codeGenerator
      * @return void
-     * @since 2.0.0
      */
     public function setCouponCodeGenerator(\Magento\SalesRule\Model\Coupon\CodegeneratorInterface $codeGenerator)
     {
@@ -399,7 +374,6 @@ public function setCouponCodeGenerator(\Magento\SalesRule\Model\Coupon\Codegener
      * Retrieve rule's primary coupon
      *
      * @return \Magento\SalesRule\Model\Coupon
-     * @since 2.0.0
      */
     public function getPrimaryCoupon()
     {
@@ -415,7 +389,6 @@ public function getPrimaryCoupon()
      * Get sales rule customer group Ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomerGroupIds()
     {
@@ -431,7 +404,6 @@ public function getCustomerGroupIds()
      *
      * @param \Magento\Store\Model\Store|int|bool|null $store
      * @return string|bool
-     * @since 2.0.0
      */
     public function getStoreLabel($store = null)
     {
@@ -451,7 +423,6 @@ public function getStoreLabel($store = null)
      * Set if not yet and retrieve rule store labels
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreLabels()
     {
@@ -467,7 +438,6 @@ public function getStoreLabels()
      * Retrieve subordinate coupons
      *
      * @return \Magento\SalesRule\Model\Coupon[]
-     * @since 2.0.0
      */
     public function getCoupons()
     {
@@ -482,7 +452,6 @@ public function getCoupons()
      * Retrieve coupon types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCouponTypes()
     {
@@ -512,7 +481,6 @@ public function getCouponTypes()
      * @throws \Exception|\Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
     {
@@ -594,7 +562,6 @@ public function getToDate()
      *
      * @param Address $address
      * @return bool
-     * @since 2.0.0
      */
     public function hasIsValidForAddress($address)
     {
@@ -608,7 +575,6 @@ public function hasIsValidForAddress($address)
      * @param Address $address
      * @param bool $validationResult
      * @return $this
-     * @since 2.0.0
      */
     public function setIsValidForAddress($address, $validationResult)
     {
@@ -623,7 +589,6 @@ public function setIsValidForAddress($address, $validationResult)
      * @param Address $address
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsValidForAddress($address)
     {
@@ -636,7 +601,6 @@ public function getIsValidForAddress($address)
      *
      * @param Address $address
      * @return string
-     * @since 2.0.0
      */
     private function _getAddressId($address)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Collection.php b/app/code/Magento/SalesRule/Model/Rule/Action/Collection.php
index 0bd26cd5ed6b8..770ece905d4d8 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Rule\Model\Action\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Rule\Model\Action\Collection
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Rule\Model\ActionFactory $actionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -31,7 +29,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/AbstractDiscount.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/AbstractDiscount.php
index 8b42acfaa2298..1eab372b97cc1 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/AbstractDiscount.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/AbstractDiscount.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\AbstractDiscount
  *
- * @since 2.0.0
  */
 abstract class AbstractDiscount implements DiscountInterface
 {
     /**
      * @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory
-     * @since 2.0.0
      */
     protected $discountFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -34,7 +30,6 @@ abstract class AbstractDiscount implements DiscountInterface
      * @param \Magento\SalesRule\Model\Validator $validator
      * @param DataFactory $discountDataFactory
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\Validator $validator,
@@ -51,7 +46,6 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     abstract public function calculate($rule, $item, $qty);
 
@@ -59,7 +53,6 @@ abstract public function calculate($rule, $item, $qty);
      * @param float $qty
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return float
-     * @since 2.0.0
      */
     public function fixQuantity($qty, $rule)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
index cfe884efa998d..212f233a5565a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\BuyXGetY
  *
- * @since 2.0.0
  */
 class BuyXGetY extends AbstractDiscount
 {
@@ -17,7 +16,6 @@ class BuyXGetY extends AbstractDiscount
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByFixed.php
index 5f6ac3afb0484..d4cc01200dc4e 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByFixed.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\ByFixed
  *
- * @since 2.0.0
  */
 class ByFixed extends AbstractDiscount
 {
@@ -17,7 +16,6 @@ class ByFixed extends AbstractDiscount
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
@@ -35,7 +33,6 @@ public function calculate($rule, $item, $qty)
      * @param float $qty
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return float
-     * @since 2.0.0
      */
     public function fixQuantity($qty, $rule)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
index 6e52e1624352e..674f0db84144d 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\ByPercent
  *
- * @since 2.0.0
  */
 class ByPercent extends AbstractDiscount
 {
@@ -17,7 +16,6 @@ class ByPercent extends AbstractDiscount
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
@@ -31,7 +29,6 @@ public function calculate($rule, $item, $qty)
      * @param float $qty
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return float
-     * @since 2.0.0
      */
     public function fixQuantity($qty, $rule)
     {
@@ -49,7 +46,6 @@ public function fixQuantity($qty, $rule)
      * @param float $qty
      * @param float $rulePercent
      * @return Data
-     * @since 2.0.0
      */
     protected function _calculate($rule, $item, $qty, $rulePercent)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
index 0d46dd15ef0d6..bcb0aafbf9f38 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory
  *
- * @since 2.0.0
  */
 class CalculatorFactory
 {
@@ -16,13 +15,11 @@ class CalculatorFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $classByType = [
         \Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION =>
@@ -40,7 +37,6 @@ class CalculatorFactory
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $discountRules
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $discountRules = [])
     {
@@ -52,7 +48,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\DiscountInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($type)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index ffbf5a84aa894..603e292c95583 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed
  *
- * @since 2.0.0
  */
 class CartFixed extends AbstractDiscount
 {
@@ -16,7 +15,6 @@ class CartFixed extends AbstractDiscount
      * Store information about addresses which cart fixed rule applied for
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $_cartFixedRuleUsedForAddress = [];
 
@@ -25,7 +23,6 @@ class CartFixed extends AbstractDiscount
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
@@ -92,7 +89,6 @@ public function calculate($rule, $item, $qty)
      * @param int $ruleId
      * @param int $itemId
      * @return void
-     * @since 2.0.0
      */
     protected function setCartFixedRuleUsedForAddress($ruleId, $itemId)
     {
@@ -104,7 +100,6 @@ protected function setCartFixedRuleUsedForAddress($ruleId, $itemId)
      *
      * @param int $ruleId
      * @return int|null
-     * @since 2.0.0
      */
     protected function getCartFixedRuleUsedForAddress($ruleId)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
index cc85b238cc478..a4c7b527aa6cb 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
@@ -7,37 +7,31 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Data
 {
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $amount;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $baseAmount;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $originalAmount;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $baseOriginalAmount;
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -50,7 +44,6 @@ public function __construct()
     /**
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount)
     {
@@ -60,7 +53,6 @@ public function setAmount($amount)
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -70,7 +62,6 @@ public function getAmount()
     /**
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmount($baseAmount)
     {
@@ -80,7 +71,6 @@ public function setBaseAmount($baseAmount)
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmount()
     {
@@ -90,7 +80,6 @@ public function getBaseAmount()
     /**
      * @param float $originalAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setOriginalAmount($originalAmount)
     {
@@ -102,7 +91,6 @@ public function setOriginalAmount($originalAmount)
      * Get discount for original price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getOriginalAmount()
     {
@@ -112,7 +100,6 @@ public function getOriginalAmount()
     /**
      * @param float $baseOriginalAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseOriginalAmount($baseOriginalAmount)
     {
@@ -124,7 +111,6 @@ public function setBaseOriginalAmount($baseOriginalAmount)
      * Get discount for original price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseOriginalAmount()
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/DiscountInterface.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/DiscountInterface.php
index 748b6ca4f0803..05d78c6495e2b 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/DiscountInterface.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/DiscountInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DiscountInterface
 {
@@ -16,7 +15,6 @@ interface DiscountInterface
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty);
 
@@ -24,7 +22,6 @@ public function calculate($rule, $item, $qty);
      * @param float $qty
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return float
-     * @since 2.0.0
      */
     public function fixQuantity($qty, $rule);
 }
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToFixed.php
index 991aa0eab2c02..13a9ea5aa02a9 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToFixed.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\ToFixed
  *
- * @since 2.0.0
  */
 class ToFixed extends AbstractDiscount
 {
@@ -17,7 +16,6 @@ class ToFixed extends AbstractDiscount
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToPercent.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToPercent.php
index 62653dd643d64..46fb313fbac6c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToPercent.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ToPercent.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Discount\ToPercent
  *
- * @since 2.0.0
  */
 class ToPercent extends ByPercent
 {
@@ -17,7 +16,6 @@ class ToPercent extends ByPercent
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return Data
-     * @since 2.0.0
      */
     public function calculate($rule, $item, $qty)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Product.php b/app/code/Magento/SalesRule/Model/Rule/Action/Product.php
index 376042c162793..005d73f33d93a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Product.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Action\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Rule\Model\Action\AbstractAction
 {
@@ -16,7 +15,6 @@ class Product extends \Magento\Rule\Model\Action\AbstractAction
      * Load attribute options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -28,7 +26,6 @@ public function loadAttributeOptions()
      * Load operator options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadOperatorOptions()
     {
@@ -47,7 +44,6 @@ public function loadOperatorOptions()
      * Return html
      *
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index 4ac15284a0c82..8f0e4b5bfa88a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Condition\Address
  *
- * @since 2.0.0
  */
 class Address extends \Magento\Rule\Model\Condition\AbstractCondition
 {
     /**
      * @var \Magento\Directory\Model\Config\Source\Country
-     * @since 2.0.0
      */
     protected $_directoryCountry;
 
     /**
      * @var \Magento\Directory\Model\Config\Source\Allregion
-     * @since 2.0.0
      */
     protected $_directoryAllregion;
 
     /**
      * @var \Magento\Shipping\Model\Config\Source\Allmethods
-     * @since 2.0.0
      */
     protected $_shippingAllmethods;
 
     /**
      * @var \Magento\Payment\Model\Config\Source\Allmethods
-     * @since 2.0.0
      */
     protected $_paymentAllmethods;
 
@@ -43,7 +38,6 @@ class Address extends \Magento\Rule\Model\Condition\AbstractCondition
      * @param \Magento\Shipping\Model\Config\Source\Allmethods $shippingAllmethods
      * @param \Magento\Payment\Model\Config\Source\Allmethods $paymentAllmethods
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -64,7 +58,6 @@ public function __construct(
      * Load attribute options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -88,7 +81,6 @@ public function loadAttributeOptions()
      * Get attribute element
      *
      * @return $this
-     * @since 2.0.0
      */
     public function getAttributeElement()
     {
@@ -101,7 +93,6 @@ public function getAttributeElement()
      * Get input type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInputType()
     {
@@ -124,7 +115,6 @@ public function getInputType()
      * Get value element type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementType()
     {
@@ -142,7 +132,6 @@ public function getValueElementType()
      * Get value select options
      *
      * @return array|mixed
-     * @since 2.0.0
      */
     public function getValueSelectOptions()
     {
@@ -177,7 +166,6 @@ public function getValueSelectOptions()
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Combine.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Combine.php
index cd5e9c9348a8c..f125fa7fac434 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Combine.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Combine.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Combine extends \Magento\Rule\Model\Condition\Combine
 {
@@ -15,13 +14,11 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\SalesRule\Model\Rule\Condition\Address
-     * @since 2.0.0
      */
     protected $_conditionAddress;
 
@@ -30,7 +27,6 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\SalesRule\Model\Rule\Condition\Address $conditionAddress
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Get new child select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
index cab694401a799..362ec109ef09a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -9,7 +9,6 @@
  * Product rule condition data model
  *
  * @author Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
 {
@@ -18,7 +17,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
      *
      * @param array $attributes
      * @return void
-     * @since 2.0.0
      */
     protected function _addSpecialAttributes(array &$attributes)
     {
@@ -33,7 +31,6 @@ protected function _addSpecialAttributes(array &$attributes)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
index b0c47956a2fe6..c4dbc7f23cbfc 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Combine extends \Magento\Rule\Model\Condition\Combine
 {
     /**
      * @var \Magento\SalesRule\Model\Rule\Condition\Product
-     * @since 2.0.0
      */
     protected $_ruleConditionProd;
 
@@ -23,7 +21,6 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
      * @param \Magento\Rule\Model\Condition\Context $context
      * @param \Magento\SalesRule\Model\Rule\Condition\Product $ruleConditionProduct
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Get new child select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNewChildSelectOptions()
     {
@@ -80,7 +76,6 @@ public function getNewChildSelectOptions()
      *
      * @param Collection $productCollection
      * @return $this
-     * @since 2.0.0
      */
     public function collectValidatedAttributes($productCollection)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
index 41b80468a60fe..5592f00a7195f 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Condition\Product\Found
  *
- * @since 2.0.0
  */
 class Found extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
 {
@@ -16,7 +15,6 @@ class Found extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
      * @param \Magento\Rule\Model\Condition\Context $context
      * @param \Magento\SalesRule\Model\Rule\Condition\Product $ruleConditionProduct
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -31,7 +29,6 @@ public function __construct(
      * Load value options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadValueOptions()
     {
@@ -43,7 +40,6 @@ public function loadValueOptions()
      * Return as html
      *
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -64,7 +60,6 @@ public function asHtml()
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 06490b713e494..2d31f2191fcc5 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\SalesRule\Model\Rule\Condition\Product\Subselect
  *
- * @since 2.0.0
  */
 class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
 {
@@ -16,7 +15,6 @@ class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
      * @param \Magento\Rule\Model\Condition\Context $context
      * @param \Magento\SalesRule\Model\Rule\Condition\Product $ruleConditionProduct
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Rule\Model\Condition\Context $context,
@@ -33,7 +31,6 @@ public function __construct(
      * @param array $arr
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function loadArray($arr, $key = 'conditions')
     {
@@ -49,7 +46,6 @@ public function loadArray($arr, $key = 'conditions')
      * @param string $containerKey
      * @param string $itemKey
      * @return string
-     * @since 2.0.0
      */
     public function asXml($containerKey = 'conditions', $itemKey = 'condition')
     {
@@ -70,7 +66,6 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
      * Load attribute options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadAttributeOptions()
     {
@@ -82,7 +77,6 @@ public function loadAttributeOptions()
      * Load value options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadValueOptions()
     {
@@ -93,7 +87,6 @@ public function loadValueOptions()
      * Load operator options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadOperatorOptions()
     {
@@ -116,7 +109,6 @@ public function loadOperatorOptions()
      * Get value element type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValueElementType()
     {
@@ -127,7 +119,6 @@ public function getValueElementType()
      * Return as html
      *
      * @return string
-     * @since 2.0.0
      */
     public function asHtml()
     {
@@ -149,7 +140,6 @@ public function asHtml()
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Customer.php b/app/code/Magento/SalesRule/Model/Rule/Customer.php
index 27b8d2db13ae6..b9b940ca1cd3c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Customer.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Customer.php
@@ -18,7 +18,6 @@
  * @method \Magento\SalesRule\Model\Rule\Customer setTimesUsed(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Customer extends \Magento\Framework\Model\AbstractModel
 {
@@ -26,7 +25,6 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -40,7 +38,6 @@ protected function _construct()
      * @param int $customerId
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerRule($customerId, $ruleId)
     {
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index 347409f3ba63b..8ab808d34095a 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -15,61 +15,51 @@
  * Sales rule CRUD class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Api\Data\RuleInterfaceFactory
-     * @since 2.0.0
      */
     protected $ruleDataFactory;
 
     /**
      * @var \Magento\SalesRule\Api\Data\ConditionInterfaceFactory
-     * @since 2.0.0
      */
     protected $conditionDataFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Converter\ToDataModel
-     * @since 2.0.0
      */
     protected $toDataModelConverter;
 
     /**
      * @var \Magento\SalesRule\Model\Converter\ToModel
-     * @since 2.0.0
      */
     protected $toModelConverter;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var \Magento\SalesRule\Api\Data\RuleSearchResultInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
-     * @since 2.0.0
      */
     protected $ruleCollectionFactory;
 
@@ -92,7 +82,6 @@ class RuleRepository implements \Magento\SalesRule\Api\RuleRepositoryInterface
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
@@ -120,7 +109,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
     {
@@ -133,7 +121,6 @@ public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($id)
     {
@@ -151,7 +138,6 @@ public function getById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -183,7 +169,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($id)
     {
@@ -203,7 +188,6 @@ public function deleteById($id)
      * @param Collection $collection
      * @deprecated 2.2.0
      * @return void
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 2c2e93e255c2a..06a4e252bf60e 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -10,7 +10,6 @@
 /**
  * Class RulesApplier
  * @package Magento\SalesRule\Model\Validator
- * @since 2.0.0
  */
 class RulesApplier
 {
@@ -18,13 +17,11 @@ class RulesApplier
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\SalesRule\Model\Utility
-     * @since 2.0.0
      */
     protected $validatorUtility;
 
@@ -32,7 +29,6 @@ class RulesApplier
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\SalesRule\Model\Utility $utility
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory,
@@ -53,7 +49,6 @@ public function __construct(
      * @param mixed $couponCode
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function applyRules($item, $rules, $skipValidation, $couponCode)
     {
@@ -97,7 +92,6 @@ public function applyRules($item, $rules, $skipValidation, $couponCode)
      * @param Address $address
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return $this
-     * @since 2.0.0
      */
     public function addDiscountDescription($address, $rule)
     {
@@ -127,7 +121,6 @@ public function addDiscountDescription($address, $rule)
      * @param \Magento\Quote\Model\Quote\Address $address
      * @param mixed $couponCode
      * @return $this
-     * @since 2.0.0
      */
     protected function applyRule($item, $rule, $address, $couponCode)
     {
@@ -144,7 +137,6 @@ protected function applyRule($item, $rule, $address, $couponCode)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
-     * @since 2.0.0
      */
     protected function getDiscountData($item, $rule)
     {
@@ -171,7 +163,6 @@ protected function getDiscountData($item, $rule)
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return $this
-     * @since 2.0.0
      */
     protected function setDiscountData($discountData, $item)
     {
@@ -190,7 +181,6 @@ protected function setDiscountData($discountData, $item)
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param mixed $couponCode
      * @return $this
-     * @since 2.0.0
      */
     public function maintainAddressCouponCode($address, $rule, $couponCode)
     {
@@ -213,7 +203,6 @@ public function maintainAddressCouponCode($address, $rule, $couponCode)
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param float $qty
      * @return $this
-     * @since 2.0.0
      */
     protected function eventFix(
         \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData,
@@ -243,7 +232,6 @@ protected function eventFix(
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param int[] $appliedRuleIds
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedRuleIds(\Magento\Quote\Model\Quote\Item\AbstractItem $item, array $appliedRuleIds)
     {
diff --git a/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php b/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
index 07f1eba92ab01..79bb7cbe1ab0a 100644
--- a/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
+++ b/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
@@ -8,43 +8,36 @@
 /**
  * Coupon management service class
  *
- * @since 2.0.0
  */
 class CouponManagementService implements \Magento\SalesRule\Api\CouponManagementInterface
 {
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $couponFactory;
 
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Coupon\Massgenerator
-     * @since 2.0.0
      */
     protected $couponGenerator;
 
     /**
      * @var \Magento\SalesRule\Model\Spi\CouponResourceInterface
-     * @since 2.0.0
      */
     protected $resourceModel;
 
     /**
      * var \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterfaceFactory
-     * @since 2.0.0
      */
     protected $couponMassDeleteResultFactory;
 
@@ -55,7 +48,6 @@ class CouponManagementService implements \Magento\SalesRule\Api\CouponManagement
      * @param \Magento\SalesRule\Model\Coupon\Massgenerator $couponGenerator
      * @param \Magento\SalesRule\Model\Spi\CouponResourceInterface $resourceModel
      * @param \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterfaceFactory $couponMassDeleteResultFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\CouponFactory $couponFactory,
@@ -80,7 +72,6 @@ public function __construct(
      * @return string[]
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function generate(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterface $couponSpec)
     {
@@ -122,7 +113,6 @@ public function generate(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterfa
      *
      * @param \Magento\SalesRule\Api\Data\CouponGenerationSpecInterface $couponSpec
      * @return array
-     * @since 2.0.0
      */
     protected function convertCouponSpec(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterface $couponSpec)
     {
@@ -154,7 +144,6 @@ protected function convertCouponSpec(\Magento\SalesRule\Api\Data\CouponGeneratio
      * @param bool $ignoreInvalidCoupons
      * @return \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteByIds(array $ids, $ignoreInvalidCoupons = true)
     {
@@ -168,7 +157,6 @@ public function deleteByIds(array $ids, $ignoreInvalidCoupons = true)
      * @param bool $ignoreInvalidCoupons
      * @return \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteByCodes(array $codes, $ignoreInvalidCoupons = true)
     {
@@ -183,7 +171,6 @@ public function deleteByCodes(array $codes, $ignoreInvalidCoupons = true)
      * @param bool $ignoreInvalid
      * @return \Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function massDelete($fieldName, array $fieldValues, $ignoreInvalid)
     {
diff --git a/app/code/Magento/SalesRule/Model/Spi/CouponResourceInterface.php b/app/code/Magento/SalesRule/Model/Spi/CouponResourceInterface.php
index f9f5cf87a4b92..90ab16a950ed9 100644
--- a/app/code/Magento/SalesRule/Model/Spi/CouponResourceInterface.php
+++ b/app/code/Magento/SalesRule/Model/Spi/CouponResourceInterface.php
@@ -9,7 +9,6 @@
  * Interface ResourceInterface
  *
  * @api
- * @since 2.0.0
  */
 interface CouponResourceInterface
 {
@@ -18,7 +17,6 @@ interface CouponResourceInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object);
 
@@ -29,7 +27,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object);
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string|null $field field to load by (defaults to model id)
      * @return mixed
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null);
 
@@ -38,7 +35,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return mixed
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php
index 384e96a24eb30..04e9b525f5274 100644
--- a/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php
+++ b/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php
@@ -9,7 +9,6 @@
  * Options for Code Format Field in Auto Generated Specific Coupon Codes configuration section
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Format implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,13 +16,11 @@ class Format implements \Magento\Framework\Option\ArrayInterface
      * Sales rule coupon
      *
      * @var \Magento\SalesRule\Helper\Coupon
-     * @since 2.0.0
      */
     protected $_salesRuleCoupon = null;
 
     /**
      * @param \Magento\SalesRule\Helper\Coupon $salesRuleCoupon
-     * @since 2.0.0
      */
     public function __construct(\Magento\SalesRule\Helper\Coupon $salesRuleCoupon)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\SalesRule\Helper\Coupon $salesRuleCoupon)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/SalesRule/Model/Utility.php b/app/code/Magento/SalesRule/Model/Utility.php
index 54c736eefe659..a3876a9d7e046 100644
--- a/app/code/Magento/SalesRule/Model/Utility.php
+++ b/app/code/Magento/SalesRule/Model/Utility.php
@@ -12,49 +12,41 @@
  * Class Utility
  *
  * @package Magento\SalesRule\Model
- * @since 2.0.0
  */
 class Utility
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_roundingDeltas = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_baseRoundingDeltas = [];
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\UsageFactory
-     * @since 2.0.0
      */
     protected $usageFactory;
 
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @since 2.0.0
      */
     protected $couponFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Rule\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
     /**
      * @var \Magento\Framework\DataObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -64,7 +56,6 @@ class Utility
      * @param Rule\CustomerFactory $customerFactory
      * @param \Magento\Framework\DataObjectFactory $objectFactory
      * @param PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\ResourceModel\Coupon\UsageFactory $usageFactory,
@@ -88,7 +79,6 @@ public function __construct(
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function canProcessRule($rule, $address)
     {
@@ -167,7 +157,6 @@ public function canProcessRule($rule, $address)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
      * @return void
-     * @since 2.0.0
      */
     public function minFix(
         \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData,
@@ -193,7 +182,6 @@ public function minFix(
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return $this
-     * @since 2.0.0
      */
     public function deltaRoundingFix(
         \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData,
@@ -228,7 +216,6 @@ public function deltaRoundingFix(
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemPrice($item)
     {
@@ -242,7 +229,6 @@ public function getItemPrice($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemBasePrice($item)
     {
@@ -256,7 +242,6 @@ public function getItemBasePrice($item)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return int
-     * @since 2.0.0
      */
     public function getItemQty($item, $rule)
     {
@@ -272,7 +257,6 @@ public function getItemQty($item, $rule)
      * @param array|string $a2
      * @param bool $asString
      * @return array|string
-     * @since 2.0.0
      */
     public function mergeIds($a1, $a2, $asString = true)
     {
@@ -291,7 +275,6 @@ public function mergeIds($a1, $a2, $asString = true)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function resetRoundingDeltas()
     {
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index bbf22a9e9a1a2..0801fe4d98538 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -23,7 +23,6 @@
  * @method mixed getCustomerGroupId()
  * @method Validator setCustomerGroupId($id)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Validator extends \Magento\Framework\Model\AbstractModel
 {
@@ -31,7 +30,6 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * Rule source collection
      *
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection
-     * @since 2.0.0
      */
     protected $_rules;
 
@@ -40,7 +38,6 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * Used for clearing applied rule ids in Quote and in Address
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFirstTimeResetRun = true;
 
@@ -48,7 +45,6 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * Information about item totals for rules
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rulesItemTotals = [];
 
@@ -56,7 +52,6 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * Skip action rules validation flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_skipActionsValidation = false;
 
@@ -64,43 +59,36 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * Catalog data
      *
      * @var \Magento\Catalog\Helper\Data|null
-     * @since 2.0.0
      */
     protected $_catalogData = null;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Utility
-     * @since 2.0.0
      */
     protected $validatorUtility;
 
     /**
      * @var \Magento\SalesRule\Model\RulesApplier
-     * @since 2.0.0
      */
     protected $rulesApplier;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var Validator\Pool
-     * @since 2.0.0
      */
     protected $validators;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -126,7 +114,6 @@ class Validator extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -161,7 +148,6 @@ public function __construct(
      * @param int $customerGroupId
      * @param string $couponCode
      * @return $this
-     * @since 2.0.0
      */
     public function init($websiteId, $customerGroupId, $couponCode)
     {
@@ -175,7 +161,6 @@ public function init($websiteId, $customerGroupId, $couponCode)
      *
      * @param Address|null $address
      * @return \Magento\SalesRule\Model\ResourceModel\Rule\Collection
-     * @since 2.0.0
      */
     protected function _getRules(Address $address = null)
     {
@@ -226,7 +211,6 @@ protected function getAddressId(Address $address)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setSkipActionsValidation($flag)
     {
@@ -239,7 +223,6 @@ public function setSkipActionsValidation($flag)
      *
      * @param AbstractItem $item
      * @return bool
-     * @since 2.0.0
      */
     public function canApplyRules(AbstractItem $item)
     {
@@ -258,7 +241,6 @@ public function canApplyRules(AbstractItem $item)
      *
      * @param Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function reset(Address $address)
     {
@@ -277,7 +259,6 @@ public function reset(Address $address)
      *
      * @param AbstractItem $item
      * @return $this
-     * @since 2.0.0
      */
     public function process(AbstractItem $item)
     {
@@ -307,7 +288,6 @@ public function process(AbstractItem $item)
      * @param Address $address
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function processShippingAmount(Address $address)
     {
@@ -397,7 +377,6 @@ public function processShippingAmount(Address $address)
      * @param mixed $items
      * @param Address $address
      * @return $this
-     * @since 2.0.0
      */
     public function initTotals($items, Address $address)
     {
@@ -449,7 +428,6 @@ public function initTotals($items, Address $address)
      *
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemPrice($item)
     {
@@ -463,7 +441,6 @@ public function getItemPrice($item)
      *
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemOriginalPrice($item)
     {
@@ -475,7 +452,6 @@ public function getItemOriginalPrice($item)
      *
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemBasePrice($item)
     {
@@ -488,7 +464,6 @@ public function getItemBasePrice($item)
      *
      * @param AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getItemBaseOriginalPrice($item)
     {
@@ -501,7 +476,6 @@ public function getItemBaseOriginalPrice($item)
      * @param Address $address
      * @param string $separator
      * @return $this
-     * @since 2.0.0
      */
     public function prepareDescription($address, $separator = ', ')
     {
@@ -527,7 +501,6 @@ public function prepareDescription($address, $separator = ', ')
      * @param array $items
      * @param Address $address
      * @return array $items
-     * @since 2.0.0
      */
     public function sortItemsByPriority($items, Address $address = null)
     {
@@ -553,7 +526,6 @@ public function sortItemsByPriority($items, Address $address = null)
      * @param int $key
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getRuleItemTotalsInfo($key)
     {
@@ -567,7 +539,6 @@ public function getRuleItemTotalsInfo($key)
     /**
      * @param int $key
      * @return $this
-     * @since 2.0.0
      */
     public function decrementRuleItemTotalsCount($key)
     {
@@ -581,7 +552,6 @@ public function decrementRuleItemTotalsCount($key)
      *
      * @param AbstractItem $item
      * @return bool
-     * @since 2.0.0
      */
     public function canApplyDiscount(AbstractItem $item)
     {
diff --git a/app/code/Magento/SalesRule/Model/Validator/Pool.php b/app/code/Magento/SalesRule/Model/Validator/Pool.php
index f27cf3bce0fba..b1039ca59c4c3 100644
--- a/app/code/Magento/SalesRule/Model/Validator/Pool.php
+++ b/app/code/Magento/SalesRule/Model/Validator/Pool.php
@@ -8,19 +8,16 @@
 
 /**
  * Class Pool collects custom validators for items before SalesRules are applied
- * @since 2.0.0
  */
 class Pool
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $validators = [];
 
     /**
      * @param array $validators
-     * @since 2.0.0
      */
     public function __construct(array $validators = [])
     {
@@ -32,7 +29,6 @@ public function __construct(array $validators = [])
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getValidators($type)
     {
diff --git a/app/code/Magento/SalesRule/Observer/AddSalesRuleNameToOrderObserver.php b/app/code/Magento/SalesRule/Observer/AddSalesRuleNameToOrderObserver.php
index b5532fab56265..e4eb80215ccef 100644
--- a/app/code/Magento/SalesRule/Observer/AddSalesRuleNameToOrderObserver.php
+++ b/app/code/Magento/SalesRule/Observer/AddSalesRuleNameToOrderObserver.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\SalesRule\Observer\AddSalesRuleNameToOrderObserver
  *
- * @since 2.0.0
  */
 class AddSalesRuleNameToOrderObserver implements ObserverInterface
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $_ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Coupon
-     * @since 2.0.0
      */
     protected $_coupon;
 
     /**
      * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
      * @param \Magento\SalesRule\Model\Coupon $coupon
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
@@ -45,7 +41,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesRule/Observer/CatalogAttributeDeleteAfterObserver.php b/app/code/Magento/SalesRule/Observer/CatalogAttributeDeleteAfterObserver.php
index 07c529f5e85cc..d2151c57ff0c4 100644
--- a/app/code/Magento/SalesRule/Observer/CatalogAttributeDeleteAfterObserver.php
+++ b/app/code/Magento/SalesRule/Observer/CatalogAttributeDeleteAfterObserver.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\SalesRule\Observer\CatalogAttributeDeleteAfterObserver
  *
- * @since 2.0.0
  */
 class CatalogAttributeDeleteAfterObserver implements ObserverInterface
 {
     /**
      * @var \Magento\SalesRule\Observer\CheckSalesRulesAvailability
-     * @since 2.0.0
      */
     protected $checkSalesRulesAvailability;
 
     /**
      * @param CheckSalesRulesAvailability $checkSalesRulesAvailability
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Observer\CheckSalesRulesAvailability $checkSalesRulesAvailability
@@ -37,7 +34,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesRule/Observer/CatalogAttributeSaveAfterObserver.php b/app/code/Magento/SalesRule/Observer/CatalogAttributeSaveAfterObserver.php
index fe515b5d93156..26ddae7c7a17e 100644
--- a/app/code/Magento/SalesRule/Observer/CatalogAttributeSaveAfterObserver.php
+++ b/app/code/Magento/SalesRule/Observer/CatalogAttributeSaveAfterObserver.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\SalesRule\Observer\CatalogAttributeSaveAfterObserver
  *
- * @since 2.0.0
  */
 class CatalogAttributeSaveAfterObserver implements ObserverInterface
 {
     /**
      * @var \Magento\SalesRule\Observer\CheckSalesRulesAvailability
-     * @since 2.0.0
      */
     protected $checkSalesRulesAvailability;
 
     /**
      * @param CheckSalesRulesAvailability $checkSalesRulesAvailability
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Observer\CheckSalesRulesAvailability $checkSalesRulesAvailability
@@ -36,7 +33,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
index 43c44eceb127d..8b7db60957e84 100644
--- a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
+++ b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\SalesRule\Observer\CheckSalesRulesAvailability
  *
- * @since 2.0.0
  */
 class CheckSalesRulesAvailability
 {
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $collectionFactory,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function checkSalesRulesAvailability($attributeCode)
     {
@@ -81,7 +76,6 @@ public function checkSalesRulesAvailability($attributeCode)
      * @param \Magento\Rule\Model\Condition\Combine $combine
      * @param string $attributeCode
      * @return void
-     * @since 2.0.0
      */
     protected function _removeAttributeFromConditions($combine, $attributeCode)
     {
diff --git a/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php b/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php
index b2b1e9f0e3a05..e4eba7669e936 100644
--- a/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php
+++ b/app/code/Magento/SalesRule/Observer/SalesOrderAfterPlaceObserver.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\SalesRule\Observer\SalesOrderAfterPlaceObserver
  *
- * @since 2.0.0
  */
 class SalesOrderAfterPlaceObserver implements ObserverInterface
 {
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $_ruleFactory;
 
     /**
      * @var \Magento\SalesRule\Model\RuleFactory
-     * @since 2.0.0
      */
     protected $_ruleCustomerFactory;
 
     /**
      * @var \Magento\SalesRule\Model\Coupon
-     * @since 2.0.0
      */
     protected $_coupon;
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\Usage
-     * @since 2.0.0
      */
     protected $_couponUsage;
 
@@ -44,7 +39,6 @@ class SalesOrderAfterPlaceObserver implements ObserverInterface
      * @param \Magento\SalesRule\Model\Rule\CustomerFactory $ruleCustomerFactory
      * @param \Magento\SalesRule\Model\Coupon $coupon
      * @param \Magento\SalesRule\Model\ResourceModel\Coupon\Usage $couponUsage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
@@ -62,7 +56,6 @@ public function __construct(
      * @param EventObserver $observer
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesRule/Setup/InstallData.php b/app/code/Magento/SalesRule/Setup/InstallData.php
index 12019f53f49b8..6d234aa803ddc 100644
--- a/app/code/Magento/SalesRule/Setup/InstallData.php
+++ b/app/code/Magento/SalesRule/Setup/InstallData.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/SalesRule/Setup/InstallSchema.php b/app/code/Magento/SalesRule/Setup/InstallSchema.php
index 7f6a794bed2b5..e49933c211d20 100644
--- a/app/code/Magento/SalesRule/Setup/InstallSchema.php
+++ b/app/code/Magento/SalesRule/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/SalesSequence/Model/Builder.php b/app/code/Magento/SalesSequence/Model/Builder.php
index 2089a3b75f973..8e6f0438ec88c 100644
--- a/app/code/Magento/SalesSequence/Model/Builder.php
+++ b/app/code/Magento/SalesSequence/Model/Builder.php
@@ -16,37 +16,31 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var resourceMetadata
-     * @since 2.0.0
      */
     protected $resourceMetadata;
 
     /**
      * @var ProfileFactory
-     * @since 2.0.0
      */
     protected $profileFactory;
 
     /**
      * @var MetaFactory
-     * @since 2.0.0
      */
     protected $metaFactory;
 
     /**
      * @var AppResource
-     * @since 2.0.0
      */
     protected $appResource;
 
     /**
      * @var DdlSequence
-     * @since 2.0.0
      */
     protected $ddlSequence;
 
@@ -54,7 +48,6 @@ class Builder
      * List of required sequence attribute
      *
      * @var array
-     * @since 2.0.0
      */
     protected $required = [
         'entityType',
@@ -65,7 +58,6 @@ class Builder
      * Default pattern for sequence creation, full list of attributes that can be defined by customer
      *
      * @var array
-     * @since 2.0.0
      */
     protected $pattern = [
         'entity_type',
@@ -82,13 +74,11 @@ class Builder
      * Concrete data of sequence
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -99,7 +89,6 @@ class Builder
      * @param AppResource $appResource
      * @param DdlSequence $ddlSequence
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(
         ResourceMetadata $resourceMetadata,
@@ -121,7 +110,6 @@ public function __construct(
     /**
      * @param string $entityType
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityType($entityType)
     {
@@ -132,7 +120,6 @@ public function setEntityType($entityType)
     /**
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -143,7 +130,6 @@ public function setStoreId($storeId)
     /**
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setPrefix($prefix)
     {
@@ -154,7 +140,6 @@ public function setPrefix($prefix)
     /**
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function setSuffix($suffix)
     {
@@ -165,7 +150,6 @@ public function setSuffix($suffix)
     /**
      * @param int $startValue
      * @return $this
-     * @since 2.0.0
      */
     public function setStartValue($startValue)
     {
@@ -176,7 +160,6 @@ public function setStartValue($startValue)
     /**
      * @param int $step
      * @return $this
-     * @since 2.0.0
      */
     public function setStep($step)
     {
@@ -187,7 +170,6 @@ public function setStep($step)
     /**
      * @param int $maxValue
      * @return $this
-     * @since 2.0.0
      */
     public function setMaxValue($maxValue)
     {
@@ -198,7 +180,6 @@ public function setMaxValue($maxValue)
     /**
      * @param int $warningValue
      * @return $this
-     * @since 2.0.0
      */
     public function setWarningValue($warningValue)
     {
@@ -210,7 +191,6 @@ public function setWarningValue($warningValue)
      * Returns sequence table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSequenceName()
     {
@@ -229,7 +209,6 @@ protected function getSequenceName()
      * @throws \Exception
      * @throws \Magento\Framework\Exception\AlreadyExistsException
      * @return void
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/app/code/Magento/SalesSequence/Model/Config.php b/app/code/Magento/SalesSequence/Model/Config.php
index a2ed6634533e6..e11e3aa034152 100644
--- a/app/code/Magento/SalesSequence/Model/Config.php
+++ b/app/code/Magento/SalesSequence/Model/Config.php
@@ -9,7 +9,6 @@
  * Class Config - configuration container for sequence
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -22,7 +21,6 @@ class Config
      * maxValue represents last available increment id in system
      *
      * @var array
-     * @since 2.0.0
      */
     protected $defaultValues = [
         'prefix' => '',
@@ -38,7 +36,6 @@ class Config
      *
      * @param string|null $key
      * @return mixed
-     * @since 2.0.0
      */
     public function get($key = null)
     {
diff --git a/app/code/Magento/SalesSequence/Model/EntityPool.php b/app/code/Magento/SalesSequence/Model/EntityPool.php
index 7ba6265320429..58969feb414f4 100644
--- a/app/code/Magento/SalesSequence/Model/EntityPool.php
+++ b/app/code/Magento/SalesSequence/Model/EntityPool.php
@@ -9,19 +9,16 @@
  * Class EntityPool
  *
  * Pool of entities that require sequence
- * @since 2.0.0
  */
 class EntityPool
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $entities;
 
     /**
      * @param array $entities
-     * @since 2.0.0
      */
     public function __construct(array $entities = [])
     {
@@ -32,7 +29,6 @@ public function __construct(array $entities = [])
      * Retrieve entities that require sequence
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEntities()
     {
diff --git a/app/code/Magento/SalesSequence/Model/Manager.php b/app/code/Magento/SalesSequence/Model/Manager.php
index c75459b41d433..5c36757a88663 100644
--- a/app/code/Magento/SalesSequence/Model/Manager.php
+++ b/app/code/Magento/SalesSequence/Model/Manager.php
@@ -10,26 +10,22 @@
 /**
  * Class Manager
  * @api
- * @since 2.0.0
  */
 class Manager
 {
     /**
      * @var ResourceSequenceMeta
-     * @since 2.0.0
      */
     protected $resourceSequenceMeta;
 
     /**
      * @var SequenceFactory
-     * @since 2.0.0
      */
     protected $sequenceFactory;
 
     /**
      * @param ResourceSequenceMeta $resourceSequenceMeta
      * @param SequenceFactory $sequenceFactory
-     * @since 2.0.0
      */
     public function __construct(
         ResourceSequenceMeta $resourceSequenceMeta,
@@ -45,7 +41,6 @@ public function __construct(
      * @param string $entityType
      * @param int $storeId
      * @return \Magento\Framework\DB\Sequence\SequenceInterface
-     * @since 2.0.0
      */
     public function getSequence($entityType, $storeId)
     {
diff --git a/app/code/Magento/SalesSequence/Model/Meta.php b/app/code/Magento/SalesSequence/Model/Meta.php
index b78c38e39c382..ef635e4935a47 100644
--- a/app/code/Magento/SalesSequence/Model/Meta.php
+++ b/app/code/Magento/SalesSequence/Model/Meta.php
@@ -11,13 +11,11 @@
  * Class Meta
  *
  * @api
- * @since 2.0.0
  */
 class Meta extends AbstractModel
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/SalesSequence/Model/Profile.php b/app/code/Magento/SalesSequence/Model/Profile.php
index dbf5e4a98a92c..11f741bca069c 100644
--- a/app/code/Magento/SalesSequence/Model/Profile.php
+++ b/app/code/Magento/SalesSequence/Model/Profile.php
@@ -11,13 +11,11 @@
  * Class Profile
  *
  * @api
- * @since 2.0.0
  */
 class Profile extends AbstractModel
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
index 7b5f7ef9b0644..a3c11a04371c2 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
@@ -16,7 +16,6 @@
  * Class Meta represents metadata for sequence as sequence table and store id
  *
  * @api
- * @since 2.0.0
  */
 class Meta extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -24,19 +23,16 @@ class Meta extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_sequence_meta';
 
     /**
      * @var ResourceProfile
-     * @since 2.0.0
      */
     protected $resourceProfile;
 
     /**
      * @var MetaFactory
-     * @since 2.0.0
      */
     protected $metaFactory;
 
@@ -45,7 +41,6 @@ class Meta extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param MetaFactory $metaFactory
      * @param ResourceProfile $resourceProfile
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         DatabaseContext $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +70,6 @@ protected function _construct()
      * @param int $storeId
      * @return \Magento\SalesSequence\Model\Meta
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadByEntityTypeAndStore($entityType, $storeId)
     {
@@ -102,7 +95,6 @@ public function loadByEntityTypeAndStore($entityType, $storeId)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -120,7 +112,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      * @return $this
      * @throws Exception
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -140,7 +131,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
index bb85847e68e50..3092e535e08fd 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
@@ -13,7 +13,6 @@
  * Class Profile represents profile data for sequence as prefix, suffix, start value etc.
  *
  * @api
- * @since 2.0.0
  */
 class Profile extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Profile extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'sales_sequence_profile';
 
@@ -29,7 +27,6 @@ class Profile extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +35,6 @@ protected function _construct()
 
     /**
      * @var ProfileFactory
-     * @since 2.0.0
      */
     protected $profileFactory;
 
@@ -46,7 +42,6 @@ protected function _construct()
      * @param DatabaseContext $context
      * @param ProfileFactory $profileFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         DatabaseContext $context,
@@ -63,7 +58,6 @@ public function __construct(
      * @param int $metadataId
      * @return \Magento\SalesSequence\Model\Profile
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadActiveProfile($metadataId)
     {
diff --git a/app/code/Magento/SalesSequence/Model/Sequence.php b/app/code/Magento/SalesSequence/Model/Sequence.php
index edcc1c8c4c925..3e8fb4cd1ffb0 100644
--- a/app/code/Magento/SalesSequence/Model/Sequence.php
+++ b/app/code/Magento/SalesSequence/Model/Sequence.php
@@ -12,7 +12,6 @@
  * Class Sequence represents sequence in logic
  *
  * @api
- * @since 2.0.0
  */
 class Sequence implements SequenceInterface
 {
@@ -23,25 +22,21 @@ class Sequence implements SequenceInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $lastIncrementId;
 
     /**
      * @var Meta
-     * @since 2.0.0
      */
     private $meta;
 
     /**
      * @var false|\Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $pattern;
 
@@ -49,7 +44,6 @@ class Sequence implements SequenceInterface
      * @param Meta $meta
      * @param AppResource $resource
      * @param string $pattern
-     * @since 2.0.0
      */
     public function __construct(
         Meta $meta,
@@ -65,7 +59,6 @@ public function __construct(
      * Retrieve current value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentValue()
     {
@@ -85,7 +78,6 @@ public function getCurrentValue()
      * Retrieve next value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextValue()
     {
@@ -98,7 +90,6 @@ public function getNextValue()
      * Calculate current value depends on start value
      *
      * @return string
-     * @since 2.0.0
      */
     private function calculateCurrentValue()
     {
diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
index 8cd5ae934b92c..cc828e7d36a45 100644
--- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
@@ -13,25 +13,21 @@
 
 /**
  * Class CreateSequence
- * @since 2.0.0
  */
 class SequenceCreatorObserver implements ObserverInterface
 {
     /**
      * @var Builder
-     * @since 2.0.0
      */
     private $sequenceBuilder;
 
     /**
      * @var EntityPool
-     * @since 2.0.0
      */
     private $entityPool;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $sequenceConfig;
 
@@ -41,7 +37,6 @@ class SequenceCreatorObserver implements ObserverInterface
      * @param Builder $sequenceBuilder
      * @param EntityPool $entityPool
      * @param Config $sequenceConfig
-     * @since 2.0.0
      */
     public function __construct(
         Builder $sequenceBuilder,
@@ -56,7 +51,6 @@ public function __construct(
     /**
      * @param EventObserver $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesSequence/Setup/InstallData.php b/app/code/Magento/SalesSequence/Setup/InstallData.php
index 5c07c37908760..5b694708197c1 100644
--- a/app/code/Magento/SalesSequence/Setup/InstallData.php
+++ b/app/code/Magento/SalesSequence/Setup/InstallData.php
@@ -16,6 +16,7 @@ class InstallData implements InstallDataInterface
 {
     /**
      * @var SequenceCreator
+     * @since 2.2.0
      */
     private $sequenceCreator;
 
diff --git a/app/code/Magento/SalesSequence/Setup/InstallSchema.php b/app/code/Magento/SalesSequence/Setup/InstallSchema.php
index e25b1f054ea35..1db562f880a06 100644
--- a/app/code/Magento/SalesSequence/Setup/InstallSchema.php
+++ b/app/code/Magento/SalesSequence/Setup/InstallSchema.php
@@ -11,20 +11,18 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private static $connectionName = 'sales';
 
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/SalesSequence/Setup/RecurringData.php b/app/code/Magento/SalesSequence/Setup/RecurringData.php
index d190bad6f67c6..78d1cf74de364 100644
--- a/app/code/Magento/SalesSequence/Setup/RecurringData.php
+++ b/app/code/Magento/SalesSequence/Setup/RecurringData.php
@@ -11,16 +11,19 @@
 
 /**
  * Recurring data upgrade for SalesSequence module.
+ * @since 2.2.0
  */
 class RecurringData implements InstallDataInterface
 {
     /**
      * @var SequenceCreator
+     * @since 2.2.0
      */
     private $sequenceCreator;
 
     /**
      * @param SequenceCreator $sequenceCreator
+     * @since 2.2.0
      */
     public function __construct(
         SequenceCreator $sequenceCreator
@@ -30,6 +33,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     * @since 2.2.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
index b0cbf545957bd..a3cf576432ed7 100644
--- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
@@ -12,6 +12,7 @@
 
 /**
  * Initial creating sequences.
+ * @since 2.2.0
  */
 class SequenceCreator
 {
@@ -19,16 +20,19 @@ class SequenceCreator
      * Sales setup factory
      *
      * @var EntityPool
+     * @since 2.2.0
      */
     private $entityPool;
 
     /**
      * @var Builder
+     * @since 2.2.0
      */
     private $sequenceBuilder;
 
     /**
      * @var SequenceConfig
+     * @since 2.2.0
      */
     private $sequenceConfig;
 
@@ -36,6 +40,7 @@ class SequenceCreator
      * @param EntityPool $entityPool
      * @param Builder $sequenceBuilder
      * @param SequenceConfig $sequenceConfig
+     * @since 2.2.0
      */
     public function __construct(
         EntityPool $entityPool,
@@ -49,6 +54,7 @@ public function __construct(
 
     /**
      * Creates sales sequences.
+     * @since 2.2.0
      */
     public function create()
     {
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index d773e489db0f1..175d824d3cca5 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -16,32 +16,27 @@
 
 /**
  * Command for deployment of Sample Data
- * @since 2.0.0
  */
 class SampleDataDeployCommand extends Command
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var \Magento\SampleData\Model\Dependency
-     * @since 2.0.0
      */
     private $sampleDataDependency;
 
     /**
      * @var \Symfony\Component\Console\Input\ArrayInputFactory
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $arrayInputFactory;
 
     /**
      * @var \Composer\Console\ApplicationFactory
-     * @since 2.0.0
      */
     private $applicationFactory;
 
@@ -50,7 +45,6 @@ class SampleDataDeployCommand extends Command
      * @param \Magento\SampleData\Model\Dependency $sampleDataDependency
      * @param \Symfony\Component\Console\Input\ArrayInputFactory $arrayInputFactory
      * @param \Composer\Console\ApplicationFactory $applicationFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -67,7 +61,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -78,7 +71,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -119,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      *
      * @return void
      * @throws \Exception
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function createAuthFile()
     {
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
index ab70f0f63c418..faabc8496301d 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
@@ -19,32 +19,27 @@
 
 /**
  * Command for remove Sample Data packages
- * @since 2.0.0
  */
 class SampleDataRemoveCommand extends Command
 {
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var Dependency
-     * @since 2.0.0
      */
     private $sampleDataDependency;
 
     /**
      * @var ArrayInputFactory
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $arrayInputFactory;
 
     /**
      * @var ApplicationFactory
-     * @since 2.0.0
      */
     private $applicationFactory;
 
@@ -53,7 +48,6 @@ class SampleDataRemoveCommand extends Command
      * @param Dependency $sampleDataDependency
      * @param ArrayInputFactory $arrayInputFactory
      * @param ApplicationFactory $applicationFactory
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -70,7 +64,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -81,7 +74,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
index b98039bfedb44..e454800af66b6 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
@@ -13,25 +13,21 @@
 
 /**
  * Command for reset Sample Data modules version
- * @since 2.0.0
  */
 class SampleDataResetCommand extends Command
 {
     /**
      * @var Dependency
-     * @since 2.0.0
      */
     private $sampleDataDependency;
 
     /**
      * @var \Magento\Framework\Module\ModuleResource
-     * @since 2.0.0
      */
     private $moduleResource;
 
     /**
      * @var \Magento\Framework\Module\PackageInfo
-     * @since 2.0.0
      */
     private $packageInfo;
 
@@ -39,7 +35,6 @@ class SampleDataResetCommand extends Command
      * @param Dependency $sampleDataDependency
      * @param \Magento\Framework\Module\ModuleResource $moduleResource
      * @param \Magento\Framework\Module\PackageInfo $packageInfo
-     * @since 2.0.0
      */
     public function __construct(
         Dependency $sampleDataDependency,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -65,7 +59,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/SampleData/Console/CommandList.php b/app/code/Magento/SampleData/Console/CommandList.php
index 801bd1bb62e24..4a1cd4a8c75b3 100644
--- a/app/code/Magento/SampleData/Console/CommandList.php
+++ b/app/code/Magento/SampleData/Console/CommandList.php
@@ -9,7 +9,6 @@
 
 /**
  * Class CommandList
- * @since 2.0.0
  */
 class CommandList implements \Magento\Framework\Console\CommandListInterface
 {
@@ -17,13 +16,11 @@ class CommandList implements \Magento\Framework\Console\CommandListInterface
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * Gets list of command classes
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function getCommandsClasses()
     {
@@ -46,7 +42,6 @@ protected function getCommandsClasses()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCommands()
     {
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
index 54a2d0345ef5c..19b4fe8e1568c 100644
--- a/app/code/Magento/SampleData/Model/Dependency.php
+++ b/app/code/Magento/SampleData/Model/Dependency.php
@@ -13,7 +13,6 @@
 
 /**
  * Sample Data dependency
- * @since 2.0.0
  */
 class Dependency
 {
@@ -24,25 +23,21 @@ class Dependency
 
     /**
      * @var ComposerInformation
-     * @since 2.0.0
      */
     protected $composerInformation;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var PackageFactory
-     * @since 2.0.0
      */
     private $packageFactory;
 
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -51,7 +46,6 @@ class Dependency
      * @param Filesystem $filesystem
      * @param PackageFactory $packageFactory
      * @param ComponentRegistrar $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(
         ComposerInformation $composerInformation,
@@ -69,7 +63,6 @@ public function __construct(
      * Retrieve list of sample data packages from suggests
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSampleDataPackages()
     {
@@ -88,7 +81,6 @@ public function getSampleDataPackages()
      * Retrieve suggested sample data packages from modules composer.json
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getSuggestsFromModules()
     {
@@ -115,7 +107,6 @@ protected function getSuggestsFromModules()
      *
      * @param string $file
      * @return Package
-     * @since 2.0.0
      */
     protected function getModuleComposerPackage($file)
     {
diff --git a/app/code/Magento/SampleData/Setup/InstallData.php b/app/code/Magento/SampleData/Setup/InstallData.php
index bc60ec91ed014..edb1bd76cc978 100644
--- a/app/code/Magento/SampleData/Setup/InstallData.php
+++ b/app/code/Magento/SampleData/Setup/InstallData.php
@@ -9,19 +9,16 @@
 
 /**
  * Class PostInstallSampleData
- * @since 2.0.0
  */
 class InstallData implements Setup\InstallDataInterface
 {
     /**
      * @var \Magento\Framework\Setup\SampleData\State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @param \Magento\Framework\Setup\SampleData\State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Setup\SampleData\State $state
@@ -31,7 +28,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function install(Setup\ModuleDataSetupInterface $setup, Setup\ModuleContextInterface $moduleContext)
     {
diff --git a/app/code/Magento/Search/Api/SearchInterface.php b/app/code/Magento/Search/Api/SearchInterface.php
index 5d1b5f1b7a78a..b47e066a75809 100644
--- a/app/code/Magento/Search/Api/SearchInterface.php
+++ b/app/code/Magento/Search/Api/SearchInterface.php
@@ -10,7 +10,6 @@
 /**
  * Search API for all requests
  * @api
- * @since 2.0.0
  */
 interface SearchInterface extends FrameworkSearchInterface
 {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
index 6fd4e928e91f2..9d953712e2b38 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
@@ -9,31 +9,26 @@
  * Dashboard last search keywords block
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Last extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Search\Model\ResourceModel\Query\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
     /**
      * @var \Magento\Search\Model\ResourceModel\Query\CollectionFactory
-     * @since 2.0.0
      */
     protected $_queriesFactory;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
@@ -43,7 +38,6 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +53,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +62,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -93,7 +85,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -127,7 +118,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
index 43b8926989b68..27435fb08109f 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
@@ -9,31 +9,26 @@
  *  Dashboard last search keywords block
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Top extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
      * @var \Magento\Search\Model\ResourceModel\Query\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
     /**
      * @var \Magento\Search\Model\ResourceModel\Query\CollectionFactory
-     * @since 2.0.0
      */
     protected $_queriesFactory;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
@@ -43,7 +38,6 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +53,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +62,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -94,7 +86,6 @@ protected function _prepareCollection()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -128,7 +119,6 @@ protected function _prepareColumns()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Reports/Search.php b/app/code/Magento/Search/Block/Adminhtml/Reports/Search.php
index 63fdd48623067..76a77fd628870 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Reports/Search.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Reports/Search.php
@@ -9,7 +9,6 @@
  * Adminhtml search report page content block
  *
  * @api
- * @since 2.0.0
  */
 class Search extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Search extends \Magento\Backend\Block\Widget\Grid\Container
      * Initialize Grid Container
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term.php b/app/code/Magento/Search/Block/Adminhtml/Term.php
index dba0daba3fc77..4a535eac4de2a 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Term extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
index 9604446931c46..2a61285c2bfcb 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
@@ -9,7 +9,6 @@
  * Admin term edit block
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +50,6 @@ protected function _construct()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
index ab7dc9eea4372..cb121407bc8a1 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Search\Block\Adminhtml\Term\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -29,7 +27,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Init Form properties
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -60,7 +56,6 @@ protected function _construct()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Search/Block/Term.php b/app/code/Magento/Search/Block/Term.php
index fd16546796267..73fbcd0f32a86 100644
--- a/app/code/Magento/Search/Block/Term.php
+++ b/app/code/Magento/Search/Block/Term.php
@@ -17,25 +17,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Term extends Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_terms;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_minPopularity;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_maxPopularity;
 
@@ -43,7 +39,6 @@ class Term extends Template
      * Url factory
      *
      * @var UrlFactory
-     * @since 2.0.0
      */
     protected $_urlFactory;
 
@@ -51,7 +46,6 @@ class Term extends Template
      * Query collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_queryCollectionFactory;
 
@@ -60,7 +54,6 @@ class Term extends Template
      * @param CollectionFactory $queryCollectionFactory
      * @param UrlFactory $urlFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -77,7 +70,6 @@ public function __construct(
      * Load terms and try to sort it by names
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadTerms()
     {
@@ -116,7 +108,6 @@ protected function _loadTerms()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getTerms()
     {
@@ -127,7 +118,6 @@ public function getTerms()
     /**
      * @param \Magento\Framework\DataObject $obj
      * @return string
-     * @since 2.0.0
      */
     public function getSearchUrl($obj)
     {
@@ -143,7 +133,6 @@ public function getSearchUrl($obj)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getMaxPopularity()
     {
@@ -152,7 +141,6 @@ public function getMaxPopularity()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getMinPopularity()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term.php b/app/code/Magento/Search/Controller/Adminhtml/Term.php
index 1a0672edce3a4..8cbc264463851 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term
  *
- * @since 2.0.0
  */
 abstract class Term extends Action
 {
@@ -24,7 +23,6 @@ abstract class Term extends Action
 
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function createPage()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
index 962ee123fe417..b1adf76e12a9d 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\Delete
  *
- * @since 2.0.0
  */
 class Delete extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
index 9e82c05810e94..929455eb0e5f6 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\Edit
  *
- * @since 2.0.0
  */
 class Edit extends TermController
 {
@@ -21,14 +20,12 @@ class Edit extends TermController
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $coreRegistry;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -41,7 +38,6 @@ public function __construct(
     /**
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
index 8a95bd8e8e6ad..2c38117e5cd08 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\ExportSearchCsv
  *
- * @since 2.0.0
  */
 class ExportSearchCsv extends TermController
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Export search report grid to CSV format
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
index 60857cbe32f85..8c04ccc3e6e80 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\ExportSearchExcel
  *
- * @since 2.0.0
  */
 class ExportSearchExcel extends TermController
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Export search report to Excel XML format
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
index 35a784f80def4..29daf60b44fd7 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\Index
  *
- * @since 2.0.0
  */
 class Index extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
index 04fad18cc0dca..8d874f670f50a 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\MassDelete
  *
- * @since 2.0.0
  */
 class MassDelete extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
index 97023d6a5a321..4c30f0b265b98 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
index c8238cd985b1c..179cc443ddf57 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\Report
  *
- * @since 2.0.0
  */
 class Report extends ReportsIndexController
 {
@@ -26,7 +25,6 @@ class Report extends ReportsIndexController
      * Search terms report action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
index 8fa6968bdd256..06aa7a568d096 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Search\Controller\Adminhtml\Term\Save
  *
- * @since 2.0.0
  */
 class Save extends TermController
 {
     /**
      * @var QueryFactory
-     * @since 2.0.0
      */
     private $queryFactory;
 
     /**
      * @param Context $context
      * @param QueryFactory $queryFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -73,7 +69,6 @@ public function execute()
      *
      * @return \Magento\Search\Model\Query
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function loadQuery()
     {
@@ -104,7 +99,6 @@ private function loadQuery()
      *
      * @param array $data
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     private function proceedToEdit($data)
     {
diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php
index 03db8431e00ca..ce29f8869d571 100644
--- a/app/code/Magento/Search/Controller/Ajax/Suggest.php
+++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php
@@ -13,20 +13,17 @@
 /**
  * Class \Magento\Search\Controller\Ajax\Suggest
  *
- * @since 2.0.0
  */
 class Suggest extends Action
 {
     /**
      * @var  \Magento\Search\Model\AutocompleteInterface
-     * @since 2.0.0
      */
     private $autocomplete;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Search\Model\AutocompleteInterface $autocomplete
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index 6cd3da246cfd7..3a69bf8a29012 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -15,20 +15,17 @@
 /**
  * Class \Magento\Search\Controller\Term\Popular
  *
- * @since 2.0.0
  */
 class Popular extends Action
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(Context $context, ScopeConfigInterface $scopeConfig)
     {
@@ -41,7 +38,6 @@ public function __construct(Context $context, ScopeConfigInterface $scopeConfig)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -58,7 +54,6 @@ public function dispatch(RequestInterface $request)
 
     /**
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index 16eea6402afa6..5efc0913d7583 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -17,7 +17,6 @@
 /**
  * Search helper
  * @api
- * @since 2.0.0
  */
 class Data extends AbstractHelper
 {
@@ -25,7 +24,6 @@ class Data extends AbstractHelper
      * Note messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = [];
 
@@ -33,7 +31,6 @@ class Data extends AbstractHelper
      * Magento string lib
      *
      * @var String
-     * @since 2.0.0
      */
     protected $string;
 
@@ -64,7 +61,6 @@ class Data extends AbstractHelper
      * @param StringUtils $string
      * @param Escaper $escaper
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -83,7 +79,6 @@ public function __construct(
      * Is a minimum query length
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMinQueryLength()
     {
@@ -96,7 +91,6 @@ public function isMinQueryLength()
      * Retrieve HTML escaped search query
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedQueryText()
     {
@@ -111,7 +105,6 @@ public function getEscapedQueryText()
      *
      * @param   string $query
      * @return  string
-     * @since 2.0.0
      */
     public function getResultUrl($query = null)
     {
@@ -125,7 +118,6 @@ public function getResultUrl($query = null)
      * Retrieve suggest url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSuggestUrl()
     {
@@ -139,7 +131,6 @@ public function getSuggestUrl()
      * Retrieve search term url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSearchTermUrl()
     {
@@ -151,7 +142,6 @@ public function getSearchTermUrl()
      *
      * @param mixed $store
      * @return int|string
-     * @since 2.0.0
      */
     public function getMinQueryLength($store = null)
     {
@@ -167,7 +157,6 @@ public function getMinQueryLength($store = null)
      *
      * @param mixed $store
      * @return int|string
-     * @since 2.0.0
      */
     public function getMaxQueryLength($store = null)
     {
@@ -183,7 +172,6 @@ public function getMaxQueryLength($store = null)
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     public function addNoteMessage($message)
     {
@@ -196,7 +184,6 @@ public function addNoteMessage($message)
      *
      * @param array $messages
      * @return $this
-     * @since 2.0.0
      */
     public function setNoteMessages(array $messages)
     {
@@ -208,7 +195,6 @@ public function setNoteMessages(array $messages)
      * Retrieve Current Note messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNoteMessages()
     {
@@ -221,7 +207,6 @@ public function getNoteMessages()
      * @param mixed $store
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function checkNotes($store = null)
     {
@@ -239,7 +224,6 @@ public function checkNotes($store = null)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getQueryParamName()
     {
diff --git a/app/code/Magento/Search/Model/AdapterFactory.php b/app/code/Magento/Search/Model/AdapterFactory.php
index 709e5bdd7cc4c..d0308daf9eb5b 100644
--- a/app/code/Magento/Search/Model/AdapterFactory.php
+++ b/app/code/Magento/Search/Model/AdapterFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AdapterFactory
 {
@@ -15,7 +14,6 @@ class AdapterFactory
      * Scope configuration
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -23,7 +21,6 @@ class AdapterFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -31,13 +28,11 @@ class AdapterFactory
      * Config path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $path;
 
     /**
      * Config Scope
-     * @since 2.0.0
      */
     protected $scope;
 
@@ -45,7 +40,6 @@ class AdapterFactory
      * Pool of existing adapters
      *
      * @var array
-     * @since 2.0.0
      */
     private $adapterPool;
 
@@ -55,7 +49,6 @@ class AdapterFactory
      * @param array $adapters
      * @param string $path
      * @param string $scopeType
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -76,7 +69,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\AdapterInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php b/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php
index 8048bd2b50e23..950a937fa98d0 100644
--- a/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php
+++ b/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php
@@ -9,7 +9,6 @@
  * All registered search adapters
  *
  * @api
- * @since 2.0.0
  */
 class Engine implements \Magento\Framework\Option\ArrayInterface
 {
@@ -17,7 +16,6 @@ class Engine implements \Magento\Framework\Option\ArrayInterface
      * Engines list
      *
      * @var array
-     * @since 2.0.0
      */
     private $engines;
 
@@ -25,7 +23,6 @@ class Engine implements \Magento\Framework\Option\ArrayInterface
      * Construct
      *
      * @param array $engines
-     * @since 2.0.0
      */
     public function __construct(
         array $engines
@@ -35,7 +32,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Search/Model/Autocomplete.php b/app/code/Magento/Search/Model/Autocomplete.php
index 6ec185e5d7e71..a7149b74033fb 100644
--- a/app/code/Magento/Search/Model/Autocomplete.php
+++ b/app/code/Magento/Search/Model/Autocomplete.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Search\Model\Autocomplete
  *
- * @since 2.0.0
  */
 class Autocomplete implements AutocompleteInterface
 {
     /**
      * @var Autocomplete\DataProviderInterface[]
-     * @since 2.0.0
      */
     private $dataProviders;
 
     /**
      * @param array $dataProviders
-     * @since 2.0.0
      */
     public function __construct(
         array $dataProviders
@@ -31,7 +28,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Search/Model/Autocomplete/DataProviderInterface.php b/app/code/Magento/Search/Model/Autocomplete/DataProviderInterface.php
index 5617615c79c72..34483bd50457b 100644
--- a/app/code/Magento/Search/Model/Autocomplete/DataProviderInterface.php
+++ b/app/code/Magento/Search/Model/Autocomplete/DataProviderInterface.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
     /**
      * @return ItemInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/app/code/Magento/Search/Model/Autocomplete/Item.php b/app/code/Magento/Search/Model/Autocomplete/Item.php
index 24efaa56b00fc..cb37593c032b3 100644
--- a/app/code/Magento/Search/Model/Autocomplete/Item.php
+++ b/app/code/Magento/Search/Model/Autocomplete/Item.php
@@ -9,14 +9,12 @@
 /**
  * Class \Magento\Search\Model\Autocomplete\Item
  *
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\DataObject implements ItemInterface
 {
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/Search/Model/Autocomplete/ItemFactory.php b/app/code/Magento/Search/Model/Autocomplete/ItemFactory.php
index 044d58d661697..7b750101ed0f8 100644
--- a/app/code/Magento/Search/Model/Autocomplete/ItemFactory.php
+++ b/app/code/Magento/Search/Model/Autocomplete/ItemFactory.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Search\Model\Autocomplete\ItemFactory
  *
- * @since 2.0.0
  */
 class ItemFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager
@@ -34,7 +31,6 @@ public function __construct(
     /**
      * @param array $data
      * @return Item
-     * @since 2.0.0
      */
     public function create(array $data)
     {
diff --git a/app/code/Magento/Search/Model/Autocomplete/ItemInterface.php b/app/code/Magento/Search/Model/Autocomplete/ItemInterface.php
index c42bada4383e2..7cdfb0946ef49 100644
--- a/app/code/Magento/Search/Model/Autocomplete/ItemInterface.php
+++ b/app/code/Magento/Search/Model/Autocomplete/ItemInterface.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ItemInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toArray();
 }
diff --git a/app/code/Magento/Search/Model/AutocompleteInterface.php b/app/code/Magento/Search/Model/AutocompleteInterface.php
index 56147ff25a6db..d13d47dda92b9 100644
--- a/app/code/Magento/Search/Model/AutocompleteInterface.php
+++ b/app/code/Magento/Search/Model/AutocompleteInterface.php
@@ -10,13 +10,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AutocompleteInterface
 {
     /**
      * @return ItemInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 6e7bc14c4db17..6b9fb4dfad027 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -42,7 +42,6 @@
  * @method \Magento\Search\Model\Query setIsQueryTextShort(bool $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Query extends AbstractModel implements QueryInterface
 {
@@ -50,7 +49,6 @@ class Query extends AbstractModel implements QueryInterface
      * Event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'search_query';
 
@@ -58,7 +56,6 @@ class Query extends AbstractModel implements QueryInterface
      * Event object key name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'search_query';
 
@@ -72,7 +69,6 @@ class Query extends AbstractModel implements QueryInterface
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -80,7 +76,6 @@ class Query extends AbstractModel implements QueryInterface
      * Store manager
      *
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -88,7 +83,6 @@ class Query extends AbstractModel implements QueryInterface
      * Search collection factory
      *
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_searchCollectionFactory;
 
@@ -96,7 +90,6 @@ class Query extends AbstractModel implements QueryInterface
      * Query collection factory
      *
      * @var QueryCollectionFactory
-     * @since 2.0.0
      */
     protected $_queryCollectionFactory;
 
@@ -112,7 +105,6 @@ class Query extends AbstractModel implements QueryInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param DbCollection $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -136,7 +128,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -147,7 +138,6 @@ protected function _construct()
      * Retrieve search collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getSearchCollection()
     {
@@ -158,7 +148,6 @@ public function getSearchCollection()
      * Retrieve collection of suggest queries
      *
      * @return QueryCollection
-     * @since 2.0.0
      */
     public function getSuggestCollection()
     {
@@ -180,7 +169,6 @@ public function getSuggestCollection()
      * @param string $text
      * @return $this
      * @deprecated 2.1.0 "synonym for" feature has been removed
-     * @since 2.0.0
      */
     public function loadByQuery($text)
     {
@@ -193,7 +181,6 @@ public function loadByQuery($text)
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function loadByQueryText($text)
     {
@@ -208,7 +195,6 @@ public function loadByQueryText($text)
      *
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -219,7 +205,6 @@ public function setStoreId($storeId)
      * Retrieve store Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -233,7 +218,6 @@ public function getStoreId()
      * Prepare save query for result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -253,7 +237,6 @@ public function prepare()
      * @return $this
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveIncrementalPopularity()
     {
@@ -269,7 +252,6 @@ public function saveIncrementalPopularity()
      * @return $this
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveNumResults($numResults)
     {
@@ -283,7 +265,6 @@ public function saveNumResults($numResults)
      * Retrieve minimum query length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMinQueryLength()
     {
@@ -298,7 +279,6 @@ public function getMinQueryLength()
      * Retrieve maximum query length
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaxQueryLength()
     {
@@ -312,7 +292,6 @@ public function getMaxQueryLength()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getQueryText()
     {
@@ -322,7 +301,6 @@ public function getQueryText()
     /**
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isQueryTextExceeded()
     {
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index acf8016f69b5d..f507846179755 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class QueryFactory implements QueryFactoryInterface
 {
@@ -24,31 +23,26 @@ class QueryFactory implements QueryFactoryInterface
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
     /**
      * @var Query
-     * @since 2.0.0
      */
     private $query;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var StdlibString
-     * @since 2.0.0
      */
     private $string;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
@@ -63,7 +57,6 @@ class QueryFactory implements QueryFactoryInterface
      * @param ObjectManagerInterface $objectManager
      * @param StdlibString $string
      * @param Data|null $queryHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -80,7 +73,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get()
     {
@@ -105,7 +97,6 @@ public function get()
      *
      * @param array $data
      * @return Query
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
@@ -116,7 +107,6 @@ public function create(array $data = [])
      * Retrieve search query text
      *
      * @return string
-     * @since 2.0.0
      */
     private function getRawQueryText()
     {
@@ -130,7 +120,6 @@ private function getRawQueryText()
      * @param string $queryText
      * @param int|string $maxQueryLength
      * @return string
-     * @since 2.0.0
      */
     private function getPreparedQueryText($queryText, $maxQueryLength)
     {
@@ -144,7 +133,6 @@ private function getPreparedQueryText($queryText, $maxQueryLength)
      * @param string $queryText
      * @param int|string $maxQueryLength
      * @return bool
-     * @since 2.0.0
      */
     private function isQueryTooLong($queryText, $maxQueryLength)
     {
diff --git a/app/code/Magento/Search/Model/QueryFactoryInterface.php b/app/code/Magento/Search/Model/QueryFactoryInterface.php
index 27b5e3147a304..e55650461f781 100644
--- a/app/code/Magento/Search/Model/QueryFactoryInterface.php
+++ b/app/code/Magento/Search/Model/QueryFactoryInterface.php
@@ -8,13 +8,11 @@
 
 /**
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 interface QueryFactoryInterface
 {
     /**
      * @return QueryInterface
-     * @since 2.0.0
      */
     public function get();
 }
diff --git a/app/code/Magento/Search/Model/QueryInterface.php b/app/code/Magento/Search/Model/QueryInterface.php
index bbdd902739d7a..a0f569cf187a1 100644
--- a/app/code/Magento/Search/Model/QueryInterface.php
+++ b/app/code/Magento/Search/Model/QueryInterface.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface QueryInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getQueryText();
 }
diff --git a/app/code/Magento/Search/Model/QueryResult.php b/app/code/Magento/Search/Model/QueryResult.php
index f6bf0bb005963..33b730b3aff19 100644
--- a/app/code/Magento/Search/Model/QueryResult.php
+++ b/app/code/Magento/Search/Model/QueryResult.php
@@ -7,26 +7,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class QueryResult
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $queryText;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $resultsCount;
 
     /**
      * @param string $queryText
      * @param string $resultsCount
-     * @since 2.0.0
      */
     public function __construct($queryText, $resultsCount)
     {
@@ -36,7 +32,6 @@ public function __construct($queryText, $resultsCount)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getQueryText()
     {
@@ -45,7 +40,6 @@ public function getQueryText()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getResultsCount()
     {
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query.php b/app/code/Magento/Search/Model/ResourceModel/Query.php
index 1a72b4eebd362..36e7a23ecddb1 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query.php
@@ -17,7 +17,6 @@
  * Search query resource model
 
  * @api
- * @since 2.0.0
  */
 class Query extends AbstractDb
 {
@@ -25,13 +24,11 @@ class Query extends AbstractDb
      * Date
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -40,7 +37,6 @@ class Query extends AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * @param AbstractModel $object
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function loadByQueryText(AbstractModel $object, $value)
     {
@@ -90,7 +85,6 @@ public function loadByQueryText(AbstractModel $object, $value)
      * @param null|string $field
      * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @SuppressWarnings("unused")
-     * @since 2.0.0
      */
     public function load(AbstractModel $object, $value, $field = null)
     {
@@ -109,7 +103,6 @@ public function load(AbstractModel $object, $value, $field = null)
      * @param string $value
      * @return $this
      * @deprecated 2.1.0 "synonym for" feature has been removed
-     * @since 2.0.0
      */
     public function loadByQuery(AbstractModel $object, $value)
     {
@@ -120,7 +113,6 @@ public function loadByQuery(AbstractModel $object, $value)
     /**
      * @param AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeSave(AbstractModel $object)
     {
@@ -132,7 +124,6 @@ public function _beforeSave(AbstractModel $object)
      * Init resource data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -146,7 +137,6 @@ protected function _construct()
      * @return void
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveIncrementalPopularity(QueryModel $query)
     {
@@ -170,7 +160,6 @@ public function saveIncrementalPopularity(QueryModel $query)
      * @return void
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function saveNumResults(QueryModel $query)
     {
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
index 571f7393ed019..d417bdec9adf5 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
@@ -11,7 +11,6 @@
  * Search query collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store for filter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId;
 
@@ -27,7 +25,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -35,7 +32,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Search resource helper
      *
      * @var \Magento\Framework\DB\Helper
-     * @since 2.0.0
      */
     protected $_resourceHelper;
 
@@ -48,7 +44,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -69,7 +64,6 @@ public function __construct(
      * Init model for collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -81,7 +75,6 @@ protected function _construct()
      *
      * @param Store|int $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($store)
     {
@@ -96,7 +89,6 @@ public function setStoreId($store)
      * Retrieve Store ID Filter
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -108,7 +100,6 @@ public function getStoreId()
      *
      * @param string $query
      * @return $this
-     * @since 2.0.0
      */
     public function setQueryFilter($query)
     {
@@ -135,7 +126,6 @@ public function setQueryFilter($query)
      *
      * @param int|array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setPopularQueryFilter($storeIds = null)
     {
@@ -166,7 +156,6 @@ public function setPopularQueryFilter($storeIds = null)
      * Set Recent Queries Order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRecentQueryFilter()
     {
@@ -179,7 +168,6 @@ public function setRecentQueryFilter()
      *
      * @param array|int $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
diff --git a/app/code/Magento/Search/Model/Search.php b/app/code/Magento/Search/Model/Search.php
index 364bafb12d208..73181698b3ed7 100644
--- a/app/code/Magento/Search/Model/Search.php
+++ b/app/code/Magento/Search/Model/Search.php
@@ -10,7 +10,6 @@
 
 /**
  * Search extended implementation for WebApi
- * @since 2.0.0
  */
 class Search extends FrameworkSearch implements SearchInterface
 {
diff --git a/app/code/Magento/Search/Model/SearchCollectionFactory.php b/app/code/Magento/Search/Model/SearchCollectionFactory.php
index 6761ebc583871..ea37821e8007f 100644
--- a/app/code/Magento/Search/Model/SearchCollectionFactory.php
+++ b/app/code/Magento/Search/Model/SearchCollectionFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SearchCollectionFactory
 {
@@ -16,7 +15,6 @@ class SearchCollectionFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class SearchCollectionFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -33,7 +30,6 @@ class SearchCollectionFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Search\Model\SearchCollectionInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Search/Model/SearchCollectionInterface.php b/app/code/Magento/Search/Model/SearchCollectionInterface.php
index 7b1cc871b1099..1bd617156de7b 100644
--- a/app/code/Magento/Search/Model/SearchCollectionInterface.php
+++ b/app/code/Magento/Search/Model/SearchCollectionInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface SearchCollectionInterface extends \Traversable, \Countable
 {
@@ -17,7 +16,6 @@ interface SearchCollectionInterface extends \Traversable, \Countable
      *
      * @param string $term
      * @return self
-     * @since 2.0.0
      */
     public function addSearchFilter($term);
 }
diff --git a/app/code/Magento/Search/Model/SearchEngine.php b/app/code/Magento/Search/Model/SearchEngine.php
index 1d8875dd67a9f..562be67f84989 100644
--- a/app/code/Magento/Search/Model/SearchEngine.php
+++ b/app/code/Magento/Search/Model/SearchEngine.php
@@ -11,13 +11,11 @@
 
 /**
  * Search Engine
- * @since 2.0.0
  */
 class SearchEngine implements SearchEngineInterface
 {
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $adapter = null;
 
@@ -25,13 +23,11 @@ class SearchEngine implements SearchEngineInterface
      * Adapter factory
      *
      * @var AdapterFactory
-     * @since 2.0.0
      */
     private $adapterFactory;
 
     /**
      * @param AdapterFactory $adapterFactory
-     * @since 2.0.0
      */
     public function __construct(AdapterFactory $adapterFactory)
     {
@@ -40,7 +36,6 @@ public function __construct(AdapterFactory $adapterFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function search(RequestInterface $request)
     {
@@ -51,7 +46,6 @@ public function search(RequestInterface $request)
      * Get adapter
      *
      * @return AdapterInterface
-     * @since 2.0.0
      */
     protected function getConnection()
     {
diff --git a/app/code/Magento/Search/Setup/InstallSchema.php b/app/code/Magento/Search/Setup/InstallSchema.php
index cd9c82b0f63b7..5aba160381d0a 100644
--- a/app/code/Magento/Search/Setup/InstallSchema.php
+++ b/app/code/Magento/Search/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Search/Setup/UpgradeSchema.php b/app/code/Magento/Search/Setup/UpgradeSchema.php
index e795157714c75..ba725d968ca33 100644
--- a/app/code/Magento/Search/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Search/Setup/UpgradeSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Security/Model/Plugin/AccountManagement.php b/app/code/Magento/Security/Model/Plugin/AccountManagement.php
index 568192859548d..6f198c2e28774 100644
--- a/app/code/Magento/Security/Model/Plugin/AccountManagement.php
+++ b/app/code/Magento/Security/Model/Plugin/AccountManagement.php
@@ -30,7 +30,7 @@ class AccountManagement
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.4
      */
     protected $passwordRequestEvent;
 
diff --git a/app/code/Magento/SendFriend/Block/Plugin/Catalog/Product/View.php b/app/code/Magento/SendFriend/Block/Plugin/Catalog/Product/View.php
index 119dd2734cceb..4472dad82fcdd 100644
--- a/app/code/Magento/SendFriend/Block/Plugin/Catalog/Product/View.php
+++ b/app/code/Magento/SendFriend/Block/Plugin/Catalog/Product/View.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\SendFriend\Block\Plugin\Catalog\Product\View
  *
- * @since 2.0.0
  */
 class View
 {
     /**
      * @var \Magento\SendFriend\Model\SendFriend
-     * @since 2.0.0
      */
     protected $_sendfriend;
 
     /**
      * @param \Magento\SendFriend\Model\SendFriend $sendfriend
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\SendFriend\Model\SendFriend $sendfriend
@@ -34,7 +31,6 @@ public function __construct(
      * @param bool $result
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterCanEmailToFriend(\Magento\Catalog\Block\Product\View $subject, $result)
     {
diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
index 8c464fcf12dd0..f1abe40e0c299 100644
--- a/app/code/Magento/SendFriend/Block/Send.php
+++ b/app/code/Magento/SendFriend/Block/Send.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Send extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Send extends \Magento\Framework\View\Element\Template
      * SendFriend data
      *
      * @var \Magento\SendFriend\Helper\Data
-     * @since 2.0.0
      */
     protected $_sendfriendData = null;
 
@@ -28,31 +26,26 @@ class Send extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
     /**
      * @var \Magento\SendFriend\Model\SendFriend
-     * @since 2.0.0
      */
     protected $sendfriend;
 
@@ -65,7 +58,6 @@ class Send extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\SendFriend\Model\SendFriend $sendfriend
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -91,7 +83,6 @@ public function __construct(
      * Retrieve username for form field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserName()
     {
@@ -116,7 +107,6 @@ public function getUserName()
      * Retrieve sender email address
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -139,7 +129,6 @@ public function getEmail()
      * Retrieve Message text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -150,7 +139,6 @@ public function getMessage()
      * Retrieve Form data or empty \Magento\Framework\DataObject
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFormData()
     {
@@ -168,7 +156,6 @@ public function getFormData()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setFormData($data)
     {
@@ -183,7 +170,6 @@ public function setFormData($data)
      * Retrieve Current Product Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getProductId()
     {
@@ -194,7 +180,6 @@ public function getProductId()
      * Retrieve current category id for product
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCategoryId()
     {
@@ -205,7 +190,6 @@ public function getCategoryId()
      * Retrieve Max Recipients
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaxRecipients()
     {
@@ -216,7 +200,6 @@ public function getMaxRecipients()
      * Retrieve Send URL for Form Action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSendUrl()
     {
@@ -233,7 +216,6 @@ public function getSendUrl()
      * Check if user is allowed to send
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canSend()
     {
diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php
index 7fc0197f752eb..732bcef8b957a 100644
--- a/app/code/Magento/SendFriend/Controller/Product.php
+++ b/app/code/Magento/SendFriend/Controller/Product.php
@@ -13,7 +13,6 @@
  * Email to a Friend Product Controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class Product extends \Magento\Framework\App\Action\Action
 {
@@ -21,25 +20,21 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\SendFriend\Model\SendFriend
-     * @since 2.0.0
      */
     protected $sendFriend;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -49,7 +44,6 @@ abstract class Product extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\SendFriend\Model\SendFriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -72,7 +66,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
      * @throws \Magento\Framework\Exception\NotFoundException
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -100,7 +93,6 @@ public function dispatch(RequestInterface $request)
      * Initialize Product Instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _initProduct()
     {
diff --git a/app/code/Magento/SendFriend/Controller/Product/Send.php b/app/code/Magento/SendFriend/Controller/Product/Send.php
index ba1a307726e48..ab93707e3dfdf 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Send.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Send.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\SendFriend\Controller\Product\Send
  *
- * @since 2.0.0
  */
 class Send extends \Magento\SendFriend\Controller\Product
 {
     /**
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $catalogSession;
 
@@ -27,7 +25,6 @@ class Send extends \Magento\SendFriend\Controller\Product
      * @param \Magento\SendFriend\Model\SendFriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -51,7 +48,6 @@ public function __construct(
      * Show Send to a Friend Form
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index dac1226ca1389..b0e554f96c045 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\SendFriend\Controller\Product\Sendmail
  *
- * @since 2.0.0
  */
 class Sendmail extends \Magento\SendFriend\Controller\Product
 {
     /**
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
     /**
      * @var \Magento\Catalog\Model\Session
-     * @since 2.0.0
      */
     protected $catalogSession;
 
@@ -38,7 +35,6 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/SendFriend/Helper/Data.php b/app/code/Magento/SendFriend/Helper/Data.php
index 4a31b8d254b10..5c3f27d07d83d 100644
--- a/app/code/Magento/SendFriend/Helper/Data.php
+++ b/app/code/Magento/SendFriend/Helper/Data.php
@@ -14,7 +14,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -41,7 +40,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param int $store
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($store = null)
     {
@@ -53,7 +51,6 @@ public function isEnabled($store = null)
      *
      * @param int $store
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowForGuest($store = null)
     {
@@ -65,7 +62,6 @@ public function isAllowForGuest($store = null)
      *
      * @param int $store
      * @return int
-     * @since 2.0.0
      */
     public function getMaxRecipients($store = null)
     {
@@ -77,7 +73,6 @@ public function getMaxRecipients($store = null)
      *
      * @param int $store
      * @return int
-     * @since 2.0.0
      */
     public function getMaxEmailPerPeriod($store = null)
     {
@@ -88,7 +83,6 @@ public function getMaxEmailPerPeriod($store = null)
      * Retrieve Limitation Period in seconds (1 hour)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPeriod()
     {
@@ -100,7 +94,6 @@ public function getPeriod()
      *
      * @param int $store
      * @return int
-     * @since 2.0.0
      */
     public function getLimitBy($store = null)
     {
@@ -112,7 +105,6 @@ public function getLimitBy($store = null)
      *
      * @param int $store
      * @return mixed
-     * @since 2.0.0
      */
     public function getEmailTemplate($store = null)
     {
@@ -124,7 +116,6 @@ public function getEmailTemplate($store = null)
      *
      * @see self::COOKIE_NAME
      * @return string
-     * @since 2.0.0
      */
     public function getCookieName()
     {
diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
index d850369da1984..f3a305f49f40b 100644
--- a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class SendFriend extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class SendFriend extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param int $websiteId
      * @return int
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getSendCount($object, $ip, $startTime, $websiteId = null)
     {
@@ -61,7 +58,6 @@ public function getSendCount($object, $ip, $startTime, $websiteId = null)
      * @param int $startTime
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function addSendItem($ip, $startTime, $websiteId)
     {
@@ -77,7 +73,6 @@ public function addSendItem($ip, $startTime, $websiteId)
      *
      * @param int $time
      * @return $this
-     * @since 2.0.0
      */
     public function deleteLogsBefore($time)
     {
diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.php
index 5ac18817943a4..0ee376a6d2cd9 100644
--- a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.php
+++ b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.php
@@ -11,7 +11,6 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -19,7 +18,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Init resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index c60bb823f88f9..a541c3e546207 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -21,7 +21,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class SendFriend extends \Magento\Framework\Model\AbstractModel
 {
@@ -29,7 +28,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Recipient Names
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_names = [];
 
@@ -37,7 +35,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Recipient Emails
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_emails = [];
 
@@ -45,7 +42,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Sender data array
      *
      * @var \Magento\Framework\DataObject|array
-     * @since 2.0.0
      */
     protected $_sender = [];
 
@@ -53,7 +49,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Product Instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_product;
 
@@ -61,7 +56,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Count of sent in last period
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_sentCount;
 
@@ -69,7 +63,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Last values for Cookie
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_lastCookieValue = [];
 
@@ -77,7 +70,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * SendFriend data
      *
      * @var \Magento\SendFriend\Helper\Data
-     * @since 2.0.0
      */
     protected $_sendfriendData = null;
 
@@ -85,43 +77,36 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * Catalog image
      *
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $_catalogImage = null;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $remoteAddress;
 
@@ -140,7 +125,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -172,7 +156,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -182,7 +165,6 @@ protected function _construct()
     /**
      * @return $this
      * @throws CoreException
-     * @since 2.0.0
      */
     public function send()
     {
@@ -244,7 +226,6 @@ public function send()
      * @return bool|string[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -295,7 +276,6 @@ public function validate()
      * @param array $recipients
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function setRecipients($recipients)
     {
@@ -338,7 +318,6 @@ public function setRecipients($recipients)
      * Retrieve Recipients object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getRecipients()
     {
@@ -355,7 +334,6 @@ public function getRecipients()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -367,7 +345,6 @@ public function setProduct($product)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -383,7 +360,6 @@ public function getProduct()
      *
      * @param array $sender
      * @return $this
-     * @since 2.0.0
      */
     public function setSender($sender)
     {
@@ -399,7 +375,6 @@ public function setSender($sender)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getSender()
     {
@@ -416,7 +391,6 @@ public function getSender()
      * Get max allowed uses of "Send to Friend" function per hour
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getMaxSendsToFriend()
     {
@@ -427,7 +401,6 @@ public function getMaxSendsToFriend()
      * Get max allowed recipients for "Send to a Friend" function
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getMaxRecipients()
     {
@@ -438,7 +411,6 @@ public function getMaxRecipients()
      * Check if user is allowed to email product to a friend
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canEmailToFriend()
     {
@@ -449,7 +421,6 @@ public function canEmailToFriend()
      * Check if user is exceed limit
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isExceedLimit()
     {
@@ -461,7 +432,6 @@ public function isExceedLimit()
      *
      * @param bool $useCache - flag, is allow to use value of attribute of model if it is processed last time
      * @return int
-     * @since 2.0.0
      */
     public function getSentCount($useCache = true)
     {
@@ -483,7 +453,6 @@ public function getSentCount($useCache = true)
      * Increase count of sent
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _incrementSentCount()
     {
@@ -502,7 +471,6 @@ protected function _incrementSentCount()
      *
      * @param bool $increment - flag, increase count before return value
      * @return int
-     * @since 2.0.0
      */
     protected function _sentCountByCookies($increment = false)
     {
@@ -541,7 +509,6 @@ protected function _sentCountByCookies($increment = false)
      *
      * @param bool $increment - flag, increase count before return value
      * @return int
-     * @since 2.0.0
      */
     protected function _sentCountByIp($increment = false)
     {
diff --git a/app/code/Magento/SendFriend/Model/Source/Checktype.php b/app/code/Magento/SendFriend/Model/Source/Checktype.php
index 69ca24b51510b..84cbbc6574973 100644
--- a/app/code/Magento/SendFriend/Model/Source/Checktype.php
+++ b/app/code/Magento/SendFriend/Model/Source/Checktype.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\SendFriend\Model\Source\Checktype
  *
- * @since 2.0.0
  */
 class Checktype implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class Checktype implements \Magento\Framework\Option\ArrayInterface
      * Retrieve Check Type Option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/SendFriend/Setup/InstallSchema.php b/app/code/Magento/SendFriend/Setup/InstallSchema.php
index 9f1389e23f58d..0e5db032da32e 100644
--- a/app/code/Magento/SendFriend/Setup/InstallSchema.php
+++ b/app/code/Magento/SendFriend/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Create.php b/app/code/Magento/Shipping/Block/Adminhtml/Create.php
index f05d4cac3a472..afee09169bdd7 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Create.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Create.php
@@ -9,7 +9,6 @@
  * Adminhtml shipment create
  *
  * @api
- * @since 2.0.0
  */
 class Create extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Create extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -64,7 +59,6 @@ public function getShipment()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -74,7 +68,6 @@ public function getHeaderText()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
index 9819a0debf1b4..12dbf9b090d0a 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
@@ -9,7 +9,6 @@
  * Adminhtml shipment create form
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -28,7 +26,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -39,7 +36,6 @@ public function getSource()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -48,7 +44,6 @@ public function getShipment()
 
     /**
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -58,7 +53,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentHtml()
     {
@@ -67,7 +61,6 @@ public function getPaymentHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getItemsHtml()
     {
@@ -76,7 +69,6 @@ public function getItemsHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Create/Items.php b/app/code/Magento/Shipping/Block/Adminhtml/Create/Items.php
index f408110311d1c..099bb60bb771b 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Create/Items.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Create/Items.php
@@ -9,7 +9,6 @@
  * Adminhtml shipment items grid
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -17,13 +16,11 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Sales data
      *
      * @var \Magento\Sales\Helper\Data
-     * @since 2.0.0
      */
     protected $_salesData;
 
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -35,7 +32,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * @param \Magento\Sales\Helper\Data $salesData
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -66,7 +61,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -77,7 +71,6 @@ public function getSource()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -88,7 +81,6 @@ public function getShipment()
      * Prepare child blocks
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -110,7 +102,6 @@ protected function _beforeToHtml()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -121,7 +112,6 @@ public function formatPrice($price)
      * Retrieve HTML of update button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateButtonHtml()
     {
@@ -132,7 +122,6 @@ public function getUpdateButtonHtml()
      * Get url for update
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdateUrl()
     {
@@ -143,7 +132,6 @@ public function getUpdateUrl()
      * Check possibility to send shipment email
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canSendShipmentEmail()
     {
@@ -154,7 +142,6 @@ public function canSendShipmentEmail()
      * Checks the possibility of creating shipping label by current carrier
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateShippingLabel()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index efd3f4ab221ec..d00a28f187c2c 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -9,7 +9,6 @@
  * Adminhtml shipment packaging
  *
  * @api
- * @since 2.0.0
  */
 class Packaging extends \Magento\Backend\Block\Template
 {
@@ -17,7 +16,6 @@ class Packaging extends \Magento\Backend\Block\Template
      * Source size model
      *
      * @var \Magento\Shipping\Model\Carrier\Source\GenericInterface
-     * @since 2.0.0
      */
     protected $_sourceSizeModel;
 
@@ -25,19 +23,16 @@ class Packaging extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -48,7 +43,6 @@ class Packaging extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -80,7 +73,6 @@ public function getShipment()
      * Configuration for popup window for packaging
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigDataJson()
     {
@@ -145,7 +137,6 @@ public function getConfigDataJson()
      * Return container types of carrier
      *
      * @return array
-     * @since 2.0.0
      */
     public function getContainers()
     {
@@ -175,7 +166,6 @@ public function getContainers()
      * Get codes of customizable container types of carrier
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCustomizableContainers()
     {
@@ -192,7 +182,6 @@ protected function _getCustomizableContainers()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getContainerTypeByCode($code)
     {
@@ -211,7 +200,6 @@ public function getContainerTypeByCode($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypeByCode($code)
     {
@@ -232,7 +220,6 @@ public function getDeliveryConfirmationTypeByCode($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getContentTypeByCode($code)
     {
@@ -247,7 +234,6 @@ public function getContentTypeByCode($code)
      * Get packed products in packages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPackages()
     {
@@ -260,7 +246,6 @@ public function getPackages()
      * @param string $itemId
      * @param string $itemsOf
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getShipmentItem($itemId, $itemsOf)
     {
@@ -281,7 +266,6 @@ public function getShipmentItem($itemId, $itemsOf)
      * Can display customs value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayCustomsValue()
     {
@@ -304,7 +288,6 @@ public function displayCustomsValue()
      * Return delivery confirmation types of current carrier
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes()
     {
@@ -322,7 +305,6 @@ public function getDeliveryConfirmationTypes()
      * Print button for creating pdf
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrintButton()
     {
@@ -334,7 +316,6 @@ public function getPrintButton()
      * Check whether girth is allowed for current carrier
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isGirthAllowed()
     {
@@ -347,7 +328,6 @@ public function isGirthAllowed()
      * Is display girth value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayGirthValue()
     {
@@ -358,7 +338,6 @@ public function isDisplayGirthValue()
      * Return content types of package
      *
      * @return array
-     * @since 2.0.0
      */
     public function getContentTypes()
     {
@@ -388,7 +367,6 @@ public function getContentTypes()
      * Get Currency Code for Custom Value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomValueCurrencyCode()
     {
@@ -401,7 +379,6 @@ public function getCustomValueCurrencyCode()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function displayPrice($price)
     {
@@ -413,7 +390,6 @@ public function displayPrice($price)
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function displayCustomsPrice($price)
     {
@@ -426,7 +402,6 @@ public function displayCustomsPrice($price)
      *
      * @param int $itemId
      * @return int|null
-     * @since 2.0.0
      */
     public function getQtyOrderedItem($itemId)
     {
@@ -441,7 +416,6 @@ public function getQtyOrderedItem($itemId)
      * Get source size model
      *
      * @return \Magento\Shipping\Model\Carrier\Source\GenericInterface
-     * @since 2.0.0
      */
     public function getSourceSizeModel()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index ff7979d8c7a74..6bd82c76f33d5 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Shipping\Block\Adminhtml\Order\Packaging\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Backend\Block\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/packaging/grid.phtml';
 
@@ -22,13 +20,11 @@ class Grid extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment\ItemFactory
-     * @since 2.0.0
      */
     protected $_shipmentItemFactory;
 
@@ -37,7 +33,6 @@ class Grid extends \Magento\Backend\Block\Template
      * @param \Magento\Sales\Model\Order\Shipment\ItemFactory $shipmentItemFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -54,7 +49,6 @@ public function __construct(
      * Return collection of shipment items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -72,7 +66,6 @@ public function getCollection()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -83,7 +76,6 @@ public function getShipment()
      * Can display customs value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayCustomsValue()
     {
@@ -107,7 +99,6 @@ public function displayCustomsValue()
      *
      * @param   float $value
      * @return  string
-     * @since 2.0.0
      */
     public function formatPrice($value)
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking.php
index e0b85003d2faa..a5ab75669b9a4 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking.php
@@ -9,7 +9,6 @@
  * Shipment tracking control form
  *
  * @api
- * @since 2.0.0
  */
 class Tracking extends \Magento\Backend\Block\Template
 {
@@ -17,13 +16,11 @@ class Tracking extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Shipping\Model\Config
-     * @since 2.0.0
      */
     protected $_shippingConfig;
 
@@ -32,7 +29,6 @@ class Tracking extends \Magento\Backend\Block\Template
      * @param \Magento\Shipping\Model\Config $shippingConfig
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Prepares layout of block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -64,7 +59,6 @@ protected function _prepareLayout()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -75,7 +69,6 @@ public function getShipment()
      * Retrieve carriers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCarriers()
     {
@@ -92,7 +85,6 @@ public function getCarriers()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getCarriersInstances()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/Invoice.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/Invoice.php
index 5ab7e9942e853..64178adf2f6ca 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/Invoice.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/Invoice.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Invoice extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
 {
@@ -19,7 +18,6 @@ class Invoice extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
      * Retrieve invoice
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getInvoice()
     {
@@ -30,7 +28,6 @@ public function getInvoice()
      * Retrieve carriers
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getCarriersInstances()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index dbf4f2929c064..e0c32dda37bc5 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -9,13 +9,11 @@
  * Shipment tracking control form
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
 {
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -25,7 +23,6 @@ class View extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Prepares layout of block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -58,7 +54,6 @@ protected function _prepareLayout()
      * Retrieve save url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubmitUrl()
     {
@@ -69,7 +64,6 @@ public function getSubmitUrl()
      * Retrieve save button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -81,7 +75,6 @@ public function getSaveButtonHtml()
      *
      * @param \Magento\Sales\Model\Order\Shipment\Track $track
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveUrl($track)
     {
@@ -94,7 +87,6 @@ public function getRemoveUrl($track)
     /**
      * @param string $code
      * @return \Magento\Framework\Phrase|string|bool
-     * @since 2.0.0
      */
     public function getCarrierTitle($code)
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View.php b/app/code/Magento/Shipping/Block/Adminhtml/View.php
index c86b1bb5835e9..4f8dbb2ffb0b8 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -18,7 +17,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -26,7 +24,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -81,7 +77,6 @@ protected function _construct()
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -90,7 +85,6 @@ public function getShipment()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -113,7 +107,6 @@ public function getHeaderText()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -128,7 +121,6 @@ public function getBackUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEmailUrl()
     {
@@ -137,7 +129,6 @@ public function getEmailUrl()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPrintUrl()
     {
@@ -147,7 +138,6 @@ public function getPrintUrl()
     /**
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function updateBackButtonUrl($flag)
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php
index ecac833913ca4..d00e388c2a438 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Comments extends \Magento\Backend\Block\Text\ListText
 {
@@ -21,7 +20,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -29,7 +27,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -55,7 +51,6 @@ public function getShipment()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -66,7 +61,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getSource()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
index cffd4695633fd..976d828a5cc46 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -29,7 +27,6 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -57,7 +53,6 @@ public function getShipment()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -68,7 +63,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -80,7 +74,6 @@ public function getSource()
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getCreateLabelButton()
     {
@@ -101,7 +94,6 @@ public function getCreateLabelButton()
      * Get print label button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrintLabelButton()
     {
@@ -118,7 +110,6 @@ public function getPrintLabelButton()
      * Show packages button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShowPackagesButton()
     {
@@ -133,7 +124,6 @@ public function getShowPackagesButton()
      * Check is carrier has functionality of creation shipping labels
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateShippingLabel()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Items.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Items.php
index ebd6c8be86448..bdd382d496eed 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Items.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Items.php
@@ -10,7 +10,6 @@
  * Adminhtml sales item renderer
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
 {
@@ -18,7 +17,6 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
      * Retrieve shipment model instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getShipment()
     {
@@ -29,7 +27,6 @@ public function getShipment()
      * Retrieve invoice order
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -40,7 +37,6 @@ public function getOrder()
      * Retrieve source
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @since 2.0.0
      */
     public function getSource()
     {
diff --git a/app/code/Magento/Shipping/Block/Items.php b/app/code/Magento/Shipping/Block/Items.php
index 3ab44bebf75f8..49c29a13de0d0 100644
--- a/app/code/Magento/Shipping/Block/Items.php
+++ b/app/code/Magento/Shipping/Block/Items.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -21,7 +20,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -29,7 +27,6 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -54,7 +50,6 @@ public function getOrder()
     /**
      * @param object $shipment
      * @return string
-     * @since 2.0.0
      */
     public function getPrintShipmentUrl($shipment)
     {
@@ -64,7 +59,6 @@ public function getPrintShipmentUrl($shipment)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllShipmentsUrl($order)
     {
@@ -76,7 +70,6 @@ public function getPrintAllShipmentsUrl($order)
      *
      * @param   \Magento\Sales\Model\Order\Shipment $shipment
      * @return  string
-     * @since 2.0.0
      */
     public function getCommentsHtml($shipment)
     {
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index b949b5203d2e3..564009eca5b44 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -11,13 +11,11 @@
  * Sales order view block
  *
  * @api
- * @since 2.0.0
  */
 class Shipment extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'order/shipment.phtml';
 
@@ -25,19 +23,16 @@ class Shipment extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Payment\Helper\Data
-     * @since 2.0.0
      */
     protected $_paymentHelper;
 
@@ -47,7 +42,6 @@ class Shipment extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -65,7 +59,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -76,7 +69,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPaymentInfoHtml()
     {
@@ -87,7 +79,6 @@ public function getPaymentInfoHtml()
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -98,7 +89,6 @@ public function getOrder()
      * Return back url for logged in and guest users
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -112,7 +102,6 @@ public function getBackUrl()
      * Return back title for logged in and guest users
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getBackTitle()
     {
@@ -125,7 +114,6 @@ public function getBackTitle()
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getInvoiceUrl($order)
     {
@@ -135,7 +123,6 @@ public function getInvoiceUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getViewUrl($order)
     {
@@ -145,7 +132,6 @@ public function getViewUrl($order)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getCreditmemoUrl($order)
     {
@@ -155,7 +141,6 @@ public function getCreditmemoUrl($order)
     /**
      * @param object $shipment
      * @return string
-     * @since 2.0.0
      */
     public function getPrintShipmentUrl($shipment)
     {
@@ -165,7 +150,6 @@ public function getPrintShipmentUrl($shipment)
     /**
      * @param object $order
      * @return string
-     * @since 2.0.0
      */
     public function getPrintAllShipmentsUrl($order)
     {
diff --git a/app/code/Magento/Shipping/Block/Tracking/Ajax.php b/app/code/Magento/Shipping/Block/Tracking/Ajax.php
index c9f9d4c875016..d32e9efd7f863 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Ajax.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Ajax.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Shipping\Block\Tracking\Ajax
  *
- * @since 2.0.0
  */
 class Ajax extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Shipping/Block/Tracking/Link.php b/app/code/Magento/Shipping/Block/Tracking/Link.php
index 50daf96417dba..9f2e19853d45b 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Link.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Link.php
@@ -9,7 +9,6 @@
  * Tracking info link
  *
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link
 {
@@ -17,7 +16,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -25,7 +23,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link
      * Shipping data
      *
      * @var \Magento\Shipping\Helper\Data
-     * @since 2.0.0
      */
     protected $_shippingData;
 
@@ -34,7 +31,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Shipping\Helper\Data $shippingData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
     /**
      * @param \Magento\Sales\Model\AbstractModel $model
      * @return string
-     * @since 2.0.0
      */
     public function getWindowUrl($model)
     {
@@ -61,7 +56,6 @@ public function getWindowUrl($model)
      * Retrieve current order model instance
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 4248faf78483e..74c4e52d93093 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Popup extends \Magento\Framework\View\Element\Template
 {
@@ -20,13 +19,11 @@ class Popup extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var DateTimeFormatterInterface
-     * @since 2.0.0
      */
     protected $dateTimeFormatter;
 
@@ -35,7 +32,6 @@ class Popup extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $registry
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Retrieve array of tracking info
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingInfo()
     {
@@ -68,7 +63,6 @@ public function getTrackingInfo()
      * @param string $date
      * @param string $time
      * @return string
-     * @since 2.0.0
      */
     public function formatDeliveryDateTime($date, $time)
     {
@@ -80,7 +74,6 @@ public function formatDeliveryDateTime($date, $time)
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function formatDeliveryDate($date)
     {
@@ -94,7 +87,6 @@ public function formatDeliveryDate($date)
      * @param string $time
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function formatDeliveryTime($time, $date = null)
     {
@@ -111,7 +103,6 @@ public function formatDeliveryTime($time, $date = null)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getContactUsEnabled()
     {
@@ -123,7 +114,6 @@ public function getContactUsEnabled()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreSupportEmail()
     {
@@ -135,7 +125,6 @@ public function getStoreSupportEmail()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getContactUs()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
index e453ddfc2979c..4ff7bbdb2d73c 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddComment
  *
- * @since 2.0.0
  */
 class AddComment extends \Magento\Backend\App\Action
 {
@@ -26,19 +25,16 @@ class AddComment extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var ShipmentCommentSender
-     * @since 2.0.0
      */
     protected $shipmentCommentSender;
 
     /**
      * @var LayoutFactory
-     * @since 2.0.0
      */
     protected $resultLayoutFactory;
 
@@ -47,7 +43,6 @@ class AddComment extends \Magento\Backend\App\Action
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param ShipmentCommentSender $shipmentCommentSender
      * @param LayoutFactory $resultLayoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * Add comment to shipment history
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
index 48f985cee7bb5..ecd4968d342c1 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack
  *
- * @since 2.0.0
  */
 class AddTrack extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ class AddTrack extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
index fe9b9ccf1fcb3..d9633e1432339 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\CreateLabel
  *
- * @since 2.0.0
  */
 class CreateLabel extends \Magento\Backend\App\Action
 {
@@ -24,13 +23,11 @@ class CreateLabel extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var \Magento\Shipping\Model\Shipping\LabelGenerator
-     * @since 2.0.0
      */
     protected $labelGenerator;
 
@@ -38,7 +35,6 @@ class CreateLabel extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Create shipping label action for specific shipment
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php
index cd200782da6d1..1f5d6e2cb7a89 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php
@@ -13,7 +13,6 @@
  * Class Email
  *
  * @package Magento\Shipping\Controller\Adminhtml\Order\Shipment
- * @since 2.0.0
  */
 class Email extends \Magento\Backend\App\Action
 {
@@ -26,14 +25,12 @@ class Email extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Send email with shipment data to customer
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php
index 86ff9032e6cd6..e9e8342bea684 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\GetShippingItemsGrid
  *
- * @since 2.0.0
  */
 class GetShippingItemsGrid extends \Magento\Backend\App\Action
 {
@@ -25,14 +24,12 @@ class GetShippingItemsGrid extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Return grid with shipping items for Ajax request
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Index.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Index.php
index 519b0571cb4b0..abd63de1dbdd2 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Index.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
index 6f4ee6a11d2ad..bfe3dc1f94f06 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
@@ -20,7 +20,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -33,25 +32,21 @@ class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\A
 
     /**
      * @var LabelGenerator
-     * @since 2.0.0
      */
     protected $labelGenerator;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var ShipmentCollectionFactory
-     * @since 2.0.0
      */
     protected $shipmentCollectionFactory;
 
@@ -62,7 +57,6 @@ class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\A
      * @param FileFactory $fileFactory
      * @param LabelGenerator $labelGenerator
      * @param ShipmentCollectionFactory $shipmentCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -85,7 +79,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
index 37f8bf01184ce..8a927cfad38da 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ class NewAction extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Shipment create page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Pdfshipments.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Pdfshipments.php
index 9b71da43637ac..f2f101468b350 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Pdfshipments.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Pdfshipments.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Pdfshipments
  *
- * @since 2.0.0
  */
 class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Pdfshipments
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintAction.php
index 56d0eac409eac..8fb063cff69b2 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintAction.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\PrintAction
  *
- * @since 2.0.0
  */
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\PrintAction
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
index 3af261e06be4f..5bf02467b89fd 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\PrintLabel
  *
- * @since 2.0.0
  */
 class PrintLabel extends \Magento\Backend\App\Action
 {
@@ -26,19 +25,16 @@ class PrintLabel extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var \Magento\Shipping\Model\Shipping\LabelGenerator
-     * @since 2.0.0
      */
     protected $labelGenerator;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
@@ -47,7 +43,6 @@ class PrintLabel extends \Magento\Backend\App\Action
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * Print label for one specific shipment
      *
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
index 7b1974cce2634..9e8e57a68631c 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\PrintPackage
  *
- * @since 2.0.0
  */
 class PrintPackage extends \Magento\Backend\App\Action
 {
@@ -26,13 +25,11 @@ class PrintPackage extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
@@ -40,7 +37,6 @@ class PrintPackage extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Create pdf document with information about packages
      *
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php
index 032ef7905ce38..5d65a2cf21b24 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\RemoveTrack
  *
- * @since 2.0.0
  */
 class RemoveTrack extends \Magento\Backend\App\Action
 {
@@ -24,14 +23,12 @@ class RemoveTrack extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Remove tracking number from shipment
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 5b392600de259..29adf5fb48d51 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\App\Action
 {
@@ -25,25 +24,22 @@ class Save extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var \Magento\Shipping\Model\Shipping\LabelGenerator
-     * @since 2.0.0
      */
     protected $labelGenerator;
 
     /**
      * @var \Magento\Sales\Model\Order\Email\Sender\ShipmentSender
-     * @since 2.0.0
      */
     protected $shipmentSender;
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $shipmentValidator;
 
@@ -52,7 +48,6 @@ class Save extends \Magento\Backend\App\Action
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
      * @param \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -71,7 +66,6 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\Order\Shipment $shipment
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveShipment($shipment)
     {
@@ -95,7 +89,6 @@ protected function _saveShipment($shipment)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -198,8 +191,8 @@ public function execute()
 
     /**
      * @return \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.2
+     * @since 2.1.2
      */
     private function getShipmentValidator()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
index 5e835c6017b8c..8cb739ccddd38 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Start
  *
- * @since 2.0.0
  */
 class Start extends \Magento\Backend\App\Action
 {
@@ -24,7 +23,6 @@ class Start extends \Magento\Backend\App\Action
      * Start create shipment action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php
index ba75750eda4fe..1af5cac9fe5d8 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Order\Shipment\View
  *
- * @since 2.0.0
  */
 class View extends \Magento\Backend\App\Action
 {
@@ -24,19 +23,16 @@ class View extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
-     * @since 2.0.0
      */
     protected $shipmentLoader;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
@@ -45,7 +41,6 @@ class View extends \Magento\Backend\App\Action
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -63,7 +58,6 @@ public function __construct(
      * Shipment information page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
index 8e559de39628c..0c6be6fd57756 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
@@ -19,43 +19,36 @@
  * @method int getShipmentId()
  * @method array getShipment()
  * @method array getTracking()
- * @since 2.0.0
  */
 class ShipmentLoader extends DataObject
 {
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Sales\Api\ShipmentRepositoryInterface
-     * @since 2.0.0
      */
     protected $shipmentRepository;
 
     /**
      * @var \Magento\Sales\Model\Order\ShipmentFactory
-     * @since 2.0.0
      */
     protected $shipmentFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment\TrackFactory
-     * @since 2.0.0
      */
     protected $trackFactory;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
-     * @since 2.0.0
      */
     protected $orderRepository;
 
@@ -67,7 +60,6 @@ class ShipmentLoader extends DataObject
      * @param \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Message\ManagerInterface $messageManager,
@@ -91,7 +83,6 @@ public function __construct(
      * Initialize shipment items QTY
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getItemQtys()
     {
@@ -105,7 +96,6 @@ protected function getItemQtys()
      *
      * @return bool|\Magento\Sales\Model\Order\Shipment
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
index 3dd1d8231cfd6..3af4fefa6a8d5 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
@@ -20,7 +20,6 @@
 /**
  * Class \Magento\Shipping\Controller\Adminhtml\Shipment\MassPrintShippingLabel
  *
- * @since 2.0.0
  */
 class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
@@ -33,13 +32,11 @@ class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\A
 
     /**
      * @var LabelGenerator
-     * @since 2.0.0
      */
     protected $labelGenerator;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -49,7 +46,6 @@ class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\A
      * @param FileFactory $fileFactory
      * @param LabelGenerator $labelGenerator
      * @param CollectionFactory $collectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -70,7 +66,6 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
-     * @since 2.0.0
      */
     protected function massAction(AbstractCollection $collection)
     {
diff --git a/app/code/Magento/Shipping/Controller/Tracking/Popup.php b/app/code/Magento/Shipping/Controller/Tracking/Popup.php
index 4c62368dba757..f3134c9eb2bc0 100644
--- a/app/code/Magento/Shipping/Controller/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Controller/Tracking/Popup.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Shipping\Controller\Tracking\Popup
  *
- * @since 2.0.0
  */
 class Popup extends \Magento\Framework\App\Action\Action
 {
@@ -19,19 +18,16 @@ class Popup extends \Magento\Framework\App\Action\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Shipping\Model\InfoFactory
-     * @since 2.0.0
      */
     protected $_shippingInfoFactory;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
@@ -40,7 +36,6 @@ class Popup extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Shipping\Model\InfoFactory $shippingInfoFactory
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @return void
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Shipping/Helper/Carrier.php b/app/code/Magento/Shipping/Helper/Carrier.php
index c7f8d95211ab0..b126ec2c1b178 100644
--- a/app/code/Magento/Shipping/Helper/Carrier.php
+++ b/app/code/Magento/Shipping/Helper/Carrier.php
@@ -7,7 +7,6 @@
 
 /**
  * Carrier helper
- * @since 2.0.0
  */
 class Carrier extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,14 +24,12 @@ class Carrier extends \Magento\Framework\App\Helper\AbstractHelper
      * Locale interface
      *
      * @var \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      *
      * @param int|\Magento\Store\Model\Store|null $store
      * @return array
-     * @since 2.0.0
      */
     public function getOnlineCarrierCodes($store = null)
     {
@@ -71,7 +67,6 @@ public function getOnlineCarrierCodes($store = null)
      * @param string $configPath
      * @param null $store
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierConfigValue($carrierCode, $configPath, $store = null)
     {
@@ -89,7 +84,6 @@ public function getCarrierConfigValue($carrierCode, $configPath, $store = null)
      * @param string $sourceWeightMeasure
      * @param string $toWeightMeasure
      * @return int|null|string
-     * @since 2.0.0
      */
     public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure)
     {
@@ -109,7 +103,6 @@ public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeas
      * @param  string $sourceDimensionMeasure
      * @param  string $toDimensionMeasure
      * @return int|null|string
-     * @since 2.0.0
      */
     public function convertMeasureDimension($value, $sourceDimensionMeasure, $toDimensionMeasure)
     {
@@ -127,7 +120,6 @@ public function convertMeasureDimension($value, $sourceDimensionMeasure, $toDime
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public function getMeasureWeightName($key)
     {
@@ -144,7 +136,6 @@ public function getMeasureWeightName($key)
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public function getMeasureDimensionName($key)
     {
@@ -162,7 +153,6 @@ public function getMeasureDimensionName($key)
      * @param string $countryCode
      * @param null|int $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isCountryInEU($countryCode, $storeId = null)
     {
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index 6f0eb2b28ade9..11e0d787efdb8 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Shipping\Helper\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -22,20 +21,17 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Allowed hash keys
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedHashKeys = ['ship_id', 'order_id', 'track_id'];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param  string $hash
      * @return array
-     * @since 2.0.0
      */
     public function decodeTrackingHash($hash)
     {
@@ -68,7 +63,6 @@ public function decodeTrackingHash($hash)
      * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Shipment|\Magento\Sales\Model\Order\Shipment\Track $model
      * @param  string $method Optional - method of a model to get id
      * @return string
-     * @since 2.0.0
      */
     protected function _getTrackingUrl($key, $model, $method = 'getId')
     {
@@ -87,7 +81,6 @@ protected function _getTrackingUrl($key, $model, $method = 'getId')
      *
      * @param \Magento\Sales\Model\AbstractModel $model
      * @return string
-     * @since 2.0.0
      */
     public function getTrackingPopupUrlBySalesModel($model)
     {
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index df478ca4e861b..d25e175c61d0c 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -15,7 +15,6 @@
  * Class AbstractCarrier
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractCarrier extends \Magento\Framework\DataObject implements AbstractCarrierInterface
 {
@@ -25,7 +24,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Carrier's code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code;
 
@@ -33,7 +31,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Rates result
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_rates;
 
@@ -41,7 +38,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Number of boxes in package
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_numBoxes = 1;
 
@@ -49,7 +45,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Free Method config path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_freeMethod = 'free_method';
 
@@ -57,7 +52,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Whether this carrier has fixed rates calculation
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFixed = false;
 
@@ -65,7 +59,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Container types that could be customized
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customizableContainerTypes = [];
 
@@ -87,7 +80,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Fields that should be replaced in debug with '***'
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debugReplacePrivateDataKeys = [];
 
@@ -95,19 +87,16 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory
-     * @since 2.0.0
      */
     protected $_rateErrorFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -116,7 +105,6 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -135,7 +123,6 @@ public function __construct(
      *
      * @param   string $field
      * @return  false|string
-     * @since 2.0.0
      */
     public function getConfigData($field)
     {
@@ -158,7 +145,6 @@ public function getConfigData($field)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @api
-     * @since 2.0.0
      */
     public function getConfigFlag($field)
     {
@@ -181,7 +167,6 @@ public function getConfigFlag($field)
      * @param Request $request
      * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function requestToShipment($request)
     {
@@ -195,7 +180,6 @@ public function requestToShipment($request)
      * @param Request $request
      * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function returnOfShipment($request)
     {
@@ -208,7 +192,6 @@ public function returnOfShipment($request)
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -222,7 +205,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
      * @return array|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getAllowedContainers(\Magento\Framework\DataObject $params = null)
     {
@@ -275,7 +257,6 @@ protected function _getAllowedContainers(\Magento\Framework\DataObject $params =
      * Get Container Types, that could be customized
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getCustomizableContainerTypes()
     {
@@ -288,7 +269,6 @@ public function getCustomizableContainerTypes()
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -299,7 +279,6 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|false|\Magento\Framework\Model\AbstractModel
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function checkAvailableShipCountries(\Magento\Framework\DataObject $request)
     {
@@ -349,7 +328,6 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
     {
@@ -360,7 +338,6 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
      * Determine whether current carrier enabled for activity
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isActive()
     {
@@ -373,7 +350,6 @@ public function isActive()
      * Whether this carrier has fixed rates calculation
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFixed()
     {
@@ -384,7 +360,6 @@ public function isFixed()
      * Check if carrier has shipping tracking option available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTrackingAvailable()
     {
@@ -395,7 +370,6 @@ public function isTrackingAvailable()
      * Check if carrier has shipping label option available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isShippingLabelsAvailable()
     {
@@ -406,7 +380,6 @@ public function isShippingLabelsAvailable()
      *  Retrieve sort order of current carrier
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -418,7 +391,6 @@ public function getSortOrder()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _updateFreeMethodQuote($request)
     {
@@ -478,7 +450,6 @@ protected function _updateFreeMethodQuote($request)
      *
      * @param float $cost
      * @return float final price for shipping method
-     * @since 2.0.0
      */
     public function getFinalPriceWithHandlingFee($cost)
     {
@@ -510,7 +481,6 @@ public function getFinalPriceWithHandlingFee($cost)
      * @param string $handlingType
      * @param float $handlingFee
      * @return float
-     * @since 2.0.0
      */
     protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
     {
@@ -528,7 +498,6 @@ protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
      * @param string $handlingType
      * @param float $handlingFee
      * @return float
-     * @since 2.0.0
      */
     protected function _getPerorderPrice($cost, $handlingType, $handlingFee)
     {
@@ -544,7 +513,6 @@ protected function _getPerorderPrice($cost, $handlingType, $handlingFee)
      *
      * @param int $weight in some measure
      * @return int
-     * @since 2.0.0
      */
     public function getTotalNumOfBoxes($weight)
     {
@@ -565,7 +533,6 @@ public function getTotalNumOfBoxes($weight)
      * Is state province required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStateProvinceRequired()
     {
@@ -576,7 +543,6 @@ public function isStateProvinceRequired()
      * Check if city option required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCityRequired()
     {
@@ -589,7 +555,6 @@ public function isCityRequired()
      * @param string|null $countryId
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isZipCodeRequired($countryId = null)
     {
@@ -601,7 +566,6 @@ public function isZipCodeRequired($countryId = null)
      *
      * @param mixed $debugData
      * @return void
-     * @since 2.0.0
      */
     protected function _debug($debugData)
     {
@@ -616,7 +580,6 @@ protected function _debug($debugData)
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @api
-     * @since 2.0.0
      */
     public function getDebugFlag()
     {
@@ -628,7 +591,6 @@ public function getDebugFlag()
      *
      * @param mixed $debugData
      * @return void
-     * @since 2.0.0
      */
     public function debugData($debugData)
     {
@@ -639,7 +601,6 @@ public function debugData($debugData)
      * Getter for carrier code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierCode()
     {
@@ -652,7 +613,6 @@ public function getCarrierCode()
      * @param \Magento\Framework\DataObject $params
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getContentTypes(\Magento\Framework\DataObject $params)
     {
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
index 778f057ba3ba1..ee59fae657ea5 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface AbstractCarrierInterface
- * @since 2.0.0
  */
 interface AbstractCarrierInterface
 {
@@ -19,7 +18,6 @@ interface AbstractCarrierInterface
      * @param   string $field
      * @return  mixed
      * @api
-     * @since 2.0.0
      */
     public function getConfigData($field);
 
@@ -29,7 +27,6 @@ public function getConfigData($field);
      * @param RateRequest $request
      * @return \Magento\Framework\DataObject|bool|null
      * @api
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request);
 
@@ -40,7 +37,6 @@ public function collectRates(RateRequest $request);
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @api
-     * @since 2.0.0
      */
     public function requestToShipment($request);
 
@@ -51,7 +47,6 @@ public function requestToShipment($request);
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @api
-     * @since 2.0.0
      */
     public function returnOfShipment($request);
 
@@ -61,7 +56,6 @@ public function returnOfShipment($request);
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null);
 
@@ -70,7 +64,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null);
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getCustomizableContainerTypes();
 
@@ -80,7 +73,6 @@ public function getCustomizableContainerTypes();
      * @param \Magento\Framework\DataObject|null $params
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $params = null);
 
@@ -88,7 +80,6 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|false|\Magento\Framework\Model\AbstractModel
      * @api
-     * @since 2.0.0
      */
     public function checkAvailableShipCountries(\Magento\Framework\DataObject $request);
 
@@ -98,7 +89,6 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return $this|\Magento\Framework\DataObject|boolean
      * @api
-     * @since 2.0.0
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request);
 
@@ -107,7 +97,6 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isActive();
 
@@ -116,7 +105,6 @@ public function isActive();
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isFixed();
 
@@ -125,7 +113,6 @@ public function isFixed();
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isTrackingAvailable();
 
@@ -134,7 +121,6 @@ public function isTrackingAvailable();
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isShippingLabelsAvailable();
 
@@ -143,7 +129,6 @@ public function isShippingLabelsAvailable();
      *
      * @return string|null
      * @api
-     * @since 2.0.0
      */
     public function getSortOrder();
 
@@ -153,7 +138,6 @@ public function getSortOrder();
      * @param float $cost
      * @return float final price for shipping method
      * @api
-     * @since 2.0.0
      */
     public function getFinalPriceWithHandlingFee($cost);
 
@@ -163,7 +147,6 @@ public function getFinalPriceWithHandlingFee($cost);
      * @param int|float $weight
      * @return int|float weight
      * @api
-     * @since 2.0.0
      */
     public function getTotalNumOfBoxes($weight);
 
@@ -172,7 +155,6 @@ public function getTotalNumOfBoxes($weight);
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isStateProvinceRequired();
 
@@ -181,7 +163,6 @@ public function isStateProvinceRequired();
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isCityRequired();
 
@@ -191,7 +172,6 @@ public function isCityRequired();
      * @param string|null $countryId
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isZipCodeRequired($countryId = null);
 
@@ -201,7 +181,6 @@ public function isZipCodeRequired($countryId = null);
      * @param mixed $debugData
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function debugData($debugData);
 
@@ -210,7 +189,6 @@ public function debugData($debugData);
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getCarrierCode();
 
@@ -220,7 +198,6 @@ public function getCarrierCode();
      * @param \Magento\Framework\DataObject $params
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getContentTypes(\Magento\Framework\DataObject $params);
 }
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 518d9ff53aa91..7bd27b6d2839f 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -16,7 +16,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractCarrierOnline extends AbstractCarrier
 {
@@ -32,7 +31,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * Array of quotes
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_quotesCache = [];
 
@@ -40,7 +38,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * Flag for check carriers for activity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_activeFlag = 'active';
 
@@ -48,67 +45,56 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * Directory data
      *
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryData = null;
 
     /**
      * @var \Magento\Shipping\Model\Simplexml\ElementFactory
-     * @since 2.0.0
      */
     protected $_xmlElFactory;
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory
-     * @since 2.0.0
      */
     protected $_rateMethodFactory;
 
     /**
      * @var \Magento\Shipping\Model\Tracking\ResultFactory
-     * @since 2.0.0
      */
     protected $_trackFactory;
 
     /**
      * @var \Magento\Shipping\Model\Tracking\Result\ErrorFactory
-     * @since 2.0.0
      */
     protected $_trackErrorFactory;
 
     /**
      * @var \Magento\Shipping\Model\Tracking\Result\StatusFactory
-     * @since 2.0.0
      */
     protected $_trackStatusFactory;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -116,7 +102,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * Raw rate request data
      *
      * @var \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     protected $_rawRequest = null;
 
@@ -124,7 +109,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * The security scanner XML document
      *
      * @var Security
-     * @since 2.0.0
      */
     protected $xmlSecurity;
 
@@ -147,7 +131,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -188,7 +171,6 @@ public function __construct(
      * @param string $code
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function setActiveFlag($code = 'active')
     {
@@ -201,7 +183,6 @@ public function setActiveFlag($code = 'active')
      * Return code of carrier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCarrierCode()
     {
@@ -214,7 +195,6 @@ public function getCarrierCode()
      * @param string $tracking
      * @return string|false
      * @api
-     * @since 2.0.0
      */
     public function getTrackingInfo($tracking)
     {
@@ -237,7 +217,6 @@ public function getTrackingInfo($tracking)
      * All \Magento\Usa carriers have shipping tracking option available
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isTrackingAvailable()
     {
@@ -248,7 +227,6 @@ public function isTrackingAvailable()
      * Check if city option required
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCityRequired()
     {
@@ -260,7 +238,6 @@ public function isCityRequired()
      *
      * @param string|null $countryId
      * @return bool
-     * @since 2.0.0
      */
     public function isZipCodeRequired($countryId = null)
     {
@@ -275,7 +252,6 @@ public function isZipCodeRequired($countryId = null)
      * Check if carrier has shipping label option available
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isShippingLabelsAvailable()
     {
@@ -291,7 +267,6 @@ public function isShippingLabelsAvailable()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @api
-     * @since 2.0.0
      */
     public function getAllItems(RateRequest $request)
     {
@@ -327,7 +302,6 @@ public function getAllItems(RateRequest $request)
      * @return $this|bool|\Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
     {
@@ -394,7 +368,6 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
      *
      * @param string|array $requestParams
      * @return string
-     * @since 2.0.0
      */
     protected function _getQuotesCacheKey($requestParams)
     {
@@ -416,7 +389,6 @@ protected function _getQuotesCacheKey($requestParams)
      *
      * @param string|array $requestParams
      * @return null|string
-     * @since 2.0.0
      */
     protected function _getCachedQuotes($requestParams)
     {
@@ -431,7 +403,6 @@ protected function _getCachedQuotes($requestParams)
      * @param string|array $requestParams
      * @param string $response
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCachedQuotes($requestParams, $response)
     {
@@ -446,7 +417,6 @@ protected function _setCachedQuotes($requestParams, $response)
      *
      * @param string|object $name service name or object with implemented __toString() method
      * @return string              prepared service name
-     * @since 2.0.0
      */
     protected function _prepareServiceName($name)
     {
@@ -462,7 +432,6 @@ protected function _prepareServiceName($name)
      *
      * @param \Magento\Framework\DataObject $request
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -481,7 +450,6 @@ protected function _prepareShipmentRequest(\Magento\Framework\DataObject $reques
      * @param Request $request
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function requestToShipment($request)
     {
@@ -530,7 +498,6 @@ public function requestToShipment($request)
      * @param Request $request
      * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function returnOfShipment($request)
     {
@@ -584,7 +551,6 @@ public function returnOfShipment($request)
      * @todo implement rollback logic
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @api
-     * @since 2.0.0
      */
     public function rollBack($data)
     {
@@ -596,7 +562,6 @@ public function rollBack($data)
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     abstract protected function _doShipmentRequest(\Magento\Framework\DataObject $request);
 
@@ -605,7 +570,6 @@ abstract protected function _doShipmentRequest(\Magento\Framework\DataObject $re
      *
      * @param string $countyId
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isUSCountry($countyId)
     {
@@ -638,7 +602,6 @@ protected function _isUSCountry($countyId)
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @api
-     * @since 2.0.0
      */
     public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
     {
@@ -649,7 +612,6 @@ public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
      * @param \Magento\Framework\DataObject|null $request
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function setRawRequest($request)
     {
@@ -665,7 +627,6 @@ public function setRawRequest($request)
      * @param string $method
      * @return float|string
      * @api
-     * @since 2.0.0
      */
     public function getMethodPrice($cost, $method = '')
     {
@@ -689,7 +650,6 @@ public function getMethodPrice($cost, $method = '')
      * @throws LocalizedException
      *
      * @api
-     * @since 2.0.0
      */
     public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
     {
@@ -705,7 +665,6 @@ public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
     /**
      * Checks if shipping method can collect rates
      * @return bool
-     * @since 2.0.0
      */
     public function canCollectRates()
     {
@@ -717,7 +676,6 @@ public function canCollectRates()
      * @param Error $errors
      *
      * @return void
-     * @since 2.0.0
      */
     protected function debugErrors($errors)
     {
@@ -731,7 +689,6 @@ protected function debugErrors($errors)
      * Get error messages
      *
      * @return bool|Error
-     * @since 2.0.0
      */
     protected function getErrorMessage()
     {
diff --git a/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php b/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
index e66d2815e7e08..0cdbd5c078567 100644
--- a/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
+++ b/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Shipping\Model\Carrier\CarrierInterface
  *
- * @since 2.0.0
  */
 interface CarrierInterface
 {
@@ -17,7 +16,6 @@ interface CarrierInterface
      *
      * @return boolean
      * @api
-     * @since 2.0.0
      */
     public function isTrackingAvailable();
 
@@ -26,7 +24,6 @@ public function isTrackingAvailable();
      *
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getAllowedMethods();
 }
diff --git a/app/code/Magento/Shipping/Model/Carrier/Source/GenericDefault.php b/app/code/Magento/Shipping/Model/Carrier/Source/GenericDefault.php
index 5072b6c1bacf1..96e0f959dd089 100644
--- a/app/code/Magento/Shipping/Model/Carrier/Source/GenericDefault.php
+++ b/app/code/Magento/Shipping/Model/Carrier/Source/GenericDefault.php
@@ -9,13 +9,11 @@
  * Class GenericDefault
  * Default implementation of generic carrier source
  *
- * @since 2.0.0
  */
 class GenericDefault implements GenericInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Carrier/Source/GenericInterface.php b/app/code/Magento/Shipping/Model/Carrier/Source/GenericInterface.php
index 0c16a8dbeb139..b4a1815a4f427 100644
--- a/app/code/Magento/Shipping/Model/Carrier/Source/GenericInterface.php
+++ b/app/code/Magento/Shipping/Model/Carrier/Source/GenericInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface GenericInterface
- * @since 2.0.0
  */
 interface GenericInterface extends OptionSourceInterface
 {
diff --git a/app/code/Magento/Shipping/Model/CarrierFactory.php b/app/code/Magento/Shipping/Model/CarrierFactory.php
index 04466ea58a917..d6aa42465eef2 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactory.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class CarrierFactory
- * @since 2.0.0
  */
 class CarrierFactory implements CarrierFactoryInterface
 {
@@ -15,20 +14,17 @@ class CarrierFactory implements CarrierFactoryInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param string $carrierCode
      * @return bool|Carrier\AbstractCarrier
-     * @since 2.0.0
      */
     public function get($carrierCode)
     {
@@ -65,7 +60,6 @@ public function get($carrierCode)
      * @param string $carrierCode
      * @param int|null $storeId
      * @return bool|Carrier\AbstractCarrier
-     * @since 2.0.0
      */
     public function create($carrierCode, $storeId = null)
     {
@@ -90,7 +84,6 @@ public function create($carrierCode, $storeId = null)
      *
      * @param string $carrierCode
      * @return bool|Carrier\AbstractCarrier
-     * @since 2.0.0
      */
     public function getIfActive($carrierCode)
     {
@@ -108,7 +101,6 @@ public function getIfActive($carrierCode)
      * @param string $carrierCode
      * @param null|int $storeId
      * @return bool|Carrier\AbstractCarrier
-     * @since 2.0.0
      */
     public function createIfActive($carrierCode, $storeId = null)
     {
diff --git a/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php b/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
index 787f981154405..cc5da64698c97 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CarrierFactoryInterface
- * @since 2.0.0
  */
 interface CarrierFactoryInterface
 {
@@ -19,7 +18,6 @@ interface CarrierFactoryInterface
      * @param string $carrierCode
      * @return bool|AbstractCarrierInterface
      * @api
-     * @since 2.0.0
      */
     public function get($carrierCode);
 
@@ -30,7 +28,6 @@ public function get($carrierCode);
      * @param int|null $storeId
      * @return bool|AbstractCarrierInterface
      * @api
-     * @since 2.0.0
      */
     public function create($carrierCode, $storeId = null);
 
@@ -40,7 +37,6 @@ public function create($carrierCode, $storeId = null);
      * @param string $carrierCode
      * @return bool|AbstractCarrierInterface
      * @api
-     * @since 2.0.0
      */
     public function getIfActive($carrierCode);
 
@@ -51,7 +47,6 @@ public function getIfActive($carrierCode);
      * @param null|int $storeId
      * @return bool|AbstractCarrierInterface
      * @api
-     * @since 2.0.0
      */
     public function createIfActive($carrierCode, $storeId = null);
 }
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index 800f565945b6d..5f477387b1542 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -11,7 +11,6 @@
 /**
  * Class Config
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\DataObject
 {
@@ -30,13 +29,11 @@ class Config extends \Magento\Framework\DataObject
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -46,7 +43,6 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -63,7 +59,6 @@ public function __construct(
      *
      * @param   mixed $store
      * @return  array
-     * @since 2.0.0
      */
     public function getActiveCarriers($store = null)
     {
@@ -85,7 +80,6 @@ public function getActiveCarriers($store = null)
      *
      * @param   mixed $store
      * @return  array
-     * @since 2.0.0
      */
     public function getAllCarriers($store = null)
     {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
index f8c24cc691618..134fdb9c25807 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Shipping\Model\Config\Source\Allmethods
  *
- * @since 2.0.0
  */
 class Allmethods implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,20 +15,17 @@ class Allmethods implements \Magento\Framework\Option\ArrayInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Shipping\Model\Config
-     * @since 2.0.0
      */
     protected $_shippingConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Shipping\Model\Config $shippingConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -45,7 +41,6 @@ public function __construct(
      *
      * @param bool $isActiveOnlyFlag
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($isActiveOnlyFlag = false)
     {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php b/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php
index 0865458d7cb7f..70aac9c8696ba 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Shipping\Model\Config\Source\Allspecificcountries
  *
- * @since 2.0.0
  */
 class Allspecificcountries implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Online/Mode.php b/app/code/Magento/Shipping/Model/Config/Source/Online/Mode.php
index fee491d43d094..5abbb8d986a76 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Online/Mode.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Online/Mode.php
@@ -9,7 +9,6 @@
 
 /**
  * Shippers Modesource model
- * @since 2.0.0
  */
 class Mode implements OptionSourceInterface
 {
@@ -17,7 +16,6 @@ class Mode implements OptionSourceInterface
      * Returns array to be used in packages request type on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Online/Requesttype.php b/app/code/Magento/Shipping/Model/Config/Source/Online/Requesttype.php
index 19d8b48684cf3..87e8d07dd562a 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Online/Requesttype.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Online/Requesttype.php
@@ -9,7 +9,6 @@
 
 /**
  * Source model for Shippers Request Type
- * @since 2.0.0
  */
 class Requesttype implements OptionSourceInterface
 {
@@ -17,7 +16,6 @@ class Requesttype implements OptionSourceInterface
      * Returns array to be used in packages request type on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Info.php b/app/code/Magento/Shipping/Model/Info.php
index d18b42814a789..172156f14c0d4 100644
--- a/app/code/Magento/Shipping/Model/Info.php
+++ b/app/code/Magento/Shipping/Model/Info.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Shipping\Model\Info
  *
- * @since 2.0.0
  */
 class Info extends \Magento\Framework\DataObject
 {
@@ -21,7 +20,6 @@ class Info extends \Magento\Framework\DataObject
      * Tracking info
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_trackingInfo = [];
 
@@ -29,31 +27,26 @@ class Info extends \Magento\Framework\DataObject
      * Shipping data
      *
      * @var \Magento\Shipping\Helper\Data
-     * @since 2.0.0
      */
     protected $_shippingData;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $_orderFactory;
 
     /**
      * @var \Magento\Sales\Api\ShipmentRepositoryInterface
-     * @since 2.0.0
      */
     protected $shipmentRepository;
 
     /**
      * @var \Magento\Shipping\Model\Order\TrackFactory
-     * @since 2.0.0
      */
     protected $_trackFactory;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory
-     * @since 2.0.0
      */
     protected $_trackCollectionFactory;
 
@@ -64,7 +57,6 @@ class Info extends \Magento\Framework\DataObject
      * @param \Magento\Shipping\Model\Order\TrackFactory $trackFactory
      * @param \Magento\Shipping\Model\ResourceModel\Order\Track\CollectionFactory $trackCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Shipping\Helper\Data $shippingData,
@@ -87,7 +79,6 @@ public function __construct(
      *
      * @param array $hash
      * @return $this
-     * @since 2.0.0
      */
     public function loadByHash($hash)
     {
@@ -113,7 +104,6 @@ public function loadByHash($hash)
      * Retrieve tracking info
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingInfo()
     {
@@ -124,7 +114,6 @@ public function getTrackingInfo()
      * Instantiate order model
      *
      * @return \Magento\Sales\Model\Order|bool
-     * @since 2.0.0
      */
     protected function _initOrder()
     {
@@ -142,7 +131,6 @@ protected function _initOrder()
      * Instantiate ship model
      *
      * @return Shipment|bool
-     * @since 2.0.0
      */
     protected function _initShipment()
     {
@@ -159,7 +147,6 @@ protected function _initShipment()
      * Retrieve all tracking by order id
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingInfoByOrder()
     {
@@ -186,7 +173,6 @@ public function getTrackingInfoByOrder()
      * Retrieve all tracking by ship id
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingInfoByShip()
     {
@@ -210,7 +196,6 @@ public function getTrackingInfoByShip()
      * Retrieve tracking by tracking entity id
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTrackingInfoByTrackId()
     {
@@ -225,7 +210,6 @@ public function getTrackingInfoByTrackId()
     /**
      * @param Shipment $shipment
      * @return \Magento\Shipping\Model\ResourceModel\Order\Track\Collection
-     * @since 2.0.0
      */
     protected function _getTracksCollection(Shipment $shipment)
     {
diff --git a/app/code/Magento/Shipping/Model/Observer.php b/app/code/Magento/Shipping/Model/Observer.php
index 5c6158a1e0627..6f4010c0db34b 100644
--- a/app/code/Magento/Shipping/Model/Observer.php
+++ b/app/code/Magento/Shipping/Model/Observer.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\Shipping\Model\Observer
  *
- * @since 2.0.0
  */
 class Observer
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\ShippingFactory
-     * @since 2.0.0
      */
     protected $_shippingFactory;
 
     /**
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Sales\Model\ResourceModel\Report\ShippingFactory $shippingFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
@@ -41,7 +37,6 @@ public function __construct(
      * Refresh sales shipment report statistics for last day
      *
      * @return $this
-     * @since 2.0.0
      */
     public function aggregateSalesReportShipmentData()
     {
diff --git a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
index b037145148442..e5e206f40275c 100644
--- a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
+++ b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
@@ -9,7 +9,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
 {
@@ -17,25 +16,21 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
      * Carrier helper
      *
      * @var \Magento\Shipping\Helper\Carrier
-     * @since 2.0.0
      */
     protected $_carrierHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -57,7 +52,6 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentData,
@@ -101,7 +95,6 @@ public function __construct(
      *
      * @param  null $shipment
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     public function getPdf($shipment = null)
     {
@@ -136,7 +129,6 @@ public function getPdf($shipment = null)
      *
      * @param  \Zend_Pdf_Page $page
      * @return \Magento\Shipping\Model\Order\Pdf\Packaging
-     * @since 2.0.0
      */
     protected function _drawHeaderBlock(\Zend_Pdf_Page $page)
     {
@@ -160,7 +152,6 @@ protected function _drawHeaderBlock(\Zend_Pdf_Page $page)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _drawPackageBlock(\Zend_Pdf_Page $page)
     {
diff --git a/app/code/Magento/Shipping/Model/Order/Track.php b/app/code/Magento/Shipping/Model/Order/Track.php
index ad6202cf8de32..e3514da355d77 100644
--- a/app/code/Magento/Shipping/Model/Order/Track.php
+++ b/app/code/Magento/Shipping/Model/Order/Track.php
@@ -21,13 +21,11 @@
  * @method string getCreatedAt()
  * @method string getUpdatedAt()
  * @method \Magento\Sales\Api\Data\ShipmentTrackExtensionInterface getExtensionAttributes()
- * @since 2.0.0
  */
 class Track extends \Magento\Sales\Model\Order\Shipment\Track
 {
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
@@ -44,7 +42,6 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -76,7 +73,6 @@ public function __construct(
      * Retrieve detail for shipment track
      *
      * @return \Magento\Framework\Phrase|string
-     * @since 2.0.0
      */
     public function getNumberDetail()
     {
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index 35f1e09689126..4ffe64ce85e2f 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -10,7 +10,6 @@
  * Container for Rates
  *
  * @api
- * @since 2.0.0
  */
 class Result
 {
@@ -18,7 +17,6 @@ class Result
      * Shipping method rates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates = [];
 
@@ -26,19 +24,16 @@ class Result
      * Shipping errors
      *
      * @var null|bool
-     * @since 2.0.0
      */
     protected $_error = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -49,7 +44,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      * Reset result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -62,7 +56,6 @@ public function reset()
      *
      * @param bool $error
      * @return void
-     * @since 2.0.0
      */
     public function setError($error)
     {
@@ -73,7 +66,6 @@ public function setError($error)
      * Get Error
      *
      * @return null|bool
-     * @since 2.0.0
      */
     public function getError()
     {
@@ -85,7 +77,6 @@ public function getError()
      *
      * @param \Magento\Quote\Model\Quote\Address\RateResult\AbstractResult|\Magento\Shipping\Model\Rate\Result $result
      * @return $this
-     * @since 2.0.0
      */
     public function append($result)
     {
@@ -107,7 +98,6 @@ public function append($result)
      * Return all quotes in the result
      *
      * @return \Magento\Quote\Model\Quote\Address\RateResult\Method[]
-     * @since 2.0.0
      */
     public function getAllRates()
     {
@@ -119,7 +109,6 @@ public function getAllRates()
      *
      * @param int $id
      * @return \Magento\Quote\Model\Quote\Address\RateResult\Method|null
-     * @since 2.0.0
      */
     public function getRateById($id)
     {
@@ -131,7 +120,6 @@ public function getRateById($id)
      *
      * @param string $carrier
      * @return array
-     * @since 2.0.0
      */
     public function getRatesByCarrier($carrier)
     {
@@ -148,7 +136,6 @@ public function getRatesByCarrier($carrier)
      * Converts object to array
      *
      * @return array
-     * @since 2.0.0
      */
     public function asArray()
     {
@@ -183,7 +170,6 @@ public function asArray()
      * Get cheapest rate
      *
      * @return null|\Magento\Quote\Model\Quote\Address\RateResult\Method
-     * @since 2.0.0
      */
     public function getCheapestRate()
     {
@@ -203,7 +189,6 @@ public function getCheapestRate()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function sortRatesByPrice()
     {
@@ -231,7 +216,6 @@ public function sortRatesByPrice()
      *
      * @param int $packageCount
      * @return $this
-     * @since 2.0.0
      */
     public function updateRatePrice($packageCount)
     {
diff --git a/app/code/Magento/Shipping/Model/ResourceModel/Order/Track/Collection.php b/app/code/Magento/Shipping/Model/ResourceModel/Order/Track/Collection.php
index 510a3815a9b44..4156abd5d8c9a 100644
--- a/app/code/Magento/Shipping/Model/ResourceModel/Order/Track/Collection.php
+++ b/app/code/Magento/Shipping/Model/ResourceModel/Order/Track/Collection.php
@@ -9,7 +9,6 @@
  * Flat sales order shipment tracks collection
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Shipment\Track
      * Model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Shipping/Model/Shipment/Request.php b/app/code/Magento/Shipping/Model/Shipment/Request.php
index 321794f093e39..23f7924dc0c3a 100644
--- a/app/code/Magento/Shipping/Model/Shipment/Request.php
+++ b/app/code/Magento/Shipping/Model/Shipment/Request.php
@@ -62,7 +62,6 @@
  * @method float getPackageWeight()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Request extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php b/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php
index 62aa297012e5f..6a67c5b9c8f97 100644
--- a/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php
+++ b/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php
@@ -62,7 +62,6 @@
  * @method float getPackageWeight()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class ReturnShipment extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Shipping/Model/ShipmentNotifier.php b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
index 17820d4abe1d1..6a317c068bbc4 100644
--- a/app/code/Magento/Shipping/Model/ShipmentNotifier.php
+++ b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
@@ -13,25 +13,21 @@
 /**
  * Class ShipmentNotifier
  * @package Magento\Shipping\Model
- * @since 2.0.0
  */
 class ShipmentNotifier extends \Magento\Sales\Model\AbstractNotifier
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $historyCollectionFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var ShipmentSender
-     * @since 2.0.0
      */
     protected $sender;
 
@@ -39,7 +35,6 @@ class ShipmentNotifier extends \Magento\Sales\Model\AbstractNotifier
      * @param CollectionFactory $historyCollectionFactory
      * @param Logger $logger
      * @param ShipmentSender $sender
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $historyCollectionFactory,
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index 15f30f241e603..25d8f6b54d785 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -12,7 +12,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Shipping implements RateCollectorInterface
 {
@@ -20,7 +19,6 @@ class Shipping implements RateCollectorInterface
      * Default shipping orig for requests
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_orig = null;
 
@@ -28,7 +26,6 @@ class Shipping implements RateCollectorInterface
      * Cached result
      *
      * @var \Magento\Shipping\Model\Rate\Result
-     * @since 2.0.0
      */
     protected $_result = null;
 
@@ -36,7 +33,6 @@ class Shipping implements RateCollectorInterface
      * Part of carrier xml config path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_availabilityConfigField = 'active';
 
@@ -44,55 +40,46 @@ class Shipping implements RateCollectorInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Shipping\Model\Config
-     * @since 2.0.0
      */
     protected $_shippingConfig;
 
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $_carrierFactory;
 
     /**
      * @var \Magento\Shipping\Model\Rate\ResultFactory
-     * @since 2.0.0
      */
     protected $_rateResultFactory;
 
     /**
      * @var \Magento\Quote\Model\Quote\Address\RateRequestFactory
-     * @since 2.0.0
      */
     protected $_shipmentRequestFactory;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @var \Magento\Framework\Math\Division
-     * @since 2.0.0
      */
     protected $mathDivision;
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @since 2.0.0
      */
     protected $stockRegistry;
 
@@ -115,7 +102,6 @@ class Shipping implements RateCollectorInterface
      * @param RateRequestFactory $rateRequestFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -145,7 +131,6 @@ public function __construct(
      * Get shipping rate result model
      *
      * @return \Magento\Shipping\Model\Rate\Result
-     * @since 2.0.0
      */
     public function getResult()
     {
@@ -160,7 +145,6 @@ public function getResult()
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setOrigData($data)
     {
@@ -171,7 +155,6 @@ public function setOrigData($data)
      * Reset cached result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetResult()
     {
@@ -183,7 +166,6 @@ public function resetResult()
      * Retrieve configuration model
      *
      * @return \Magento\Shipping\Model\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -196,7 +178,6 @@ public function getConfig()
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return $this
      * @todo make it ordered
-     * @since 2.0.0
      */
     public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
     {
@@ -268,7 +249,6 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function collectCarrierRates($carrierCode, $request)
     {
@@ -350,7 +330,6 @@ public function collectCarrierRates($carrierCode, $request)
      * @return array [int, float]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function composePackagesForCarrier($carrier, $request)
     {
@@ -447,7 +426,6 @@ public function composePackagesForCarrier($carrier, $request)
      * @param array $items
      * @param float $maxWeight
      * @return array
-     * @since 2.0.0
      */
     protected function _makePieces($items, $maxWeight)
     {
@@ -494,7 +472,6 @@ protected function _makePieces($items, $maxWeight)
      * @param \Magento\Framework\DataObject $address
      * @param null|bool|array $limitCarrier
      * @return $this
-     * @since 2.0.0
      */
     public function collectRatesByAddress(\Magento\Framework\DataObject $address, $limitCarrier = null)
     {
@@ -528,7 +505,6 @@ public function collectRatesByAddress(\Magento\Framework\DataObject $address, $l
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCarrierAvailabilityConfigField($code = 'active')
     {
diff --git a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
index 3af1973520bb4..dad67505b540c 100644
--- a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
+++ b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
@@ -11,37 +11,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class LabelGenerator
 {
     /**
      * @var \Magento\Shipping\Model\CarrierFactory
-     * @since 2.0.0
      */
     protected $carrierFactory;
 
     /**
      * @var \Magento\Shipping\Model\Shipping\LabelsFactory
-     * @since 2.0.0
      */
     protected $labelFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Sales\Model\Order\Shipment\TrackFactory
-     * @since 2.0.0
      */
     protected $trackFactory;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -51,7 +45,6 @@ class LabelGenerator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
@@ -72,7 +65,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(\Magento\Sales\Model\Order\Shipment $shipment, RequestInterface $request)
     {
@@ -118,7 +110,6 @@ public function create(\Magento\Sales\Model\Order\Shipment $shipment, RequestInt
      * @param string $carrierTitle
      *
      * @return void
-     * @since 2.0.0
      */
     private function addTrackingNumbersToShipment(
         \Magento\Sales\Model\Order\Shipment $shipment,
@@ -145,7 +136,6 @@ private function addTrackingNumbersToShipment(
      *
      * @param array $labelsContent
      * @return \Zend_Pdf
-     * @since 2.0.0
      */
     public function combineLabelsPdf(array $labelsContent)
     {
@@ -171,7 +161,6 @@ public function combineLabelsPdf(array $labelsContent)
      *
      * @param string $imageString
      * @return \Zend_Pdf_Page|false
-     * @since 2.0.0
      */
     public function createPdfPageFromImageString($imageString)
     {
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 2f5b3ac5fc22b..b1709b0a16998 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -19,19 +19,16 @@
 /**
  * Shipping labels model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Labels extends \Magento\Shipping\Model\Shipping
 {
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Shipping\Model\Shipment\Request
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -48,7 +45,6 @@ class Labels extends \Magento\Shipping\Model\Shipping
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Shipping\Model\Shipment\Request $request
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -86,7 +82,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function requestToShipment(Shipment $orderShipment)
     {
@@ -176,7 +171,6 @@ public function requestToShipment(Shipment $orderShipment)
      * @param $regionCode
      * @param $originStreet
      * @return void
-     * @since 2.0.0
      */
     protected function setShipperDetails(
         Request $request,
@@ -230,7 +224,6 @@ protected function setShipperDetails(
      * @param \Magento\Shipping\Model\Shipment\Request $request
      * @param \Magento\Sales\Model\Order\Address $address
      * @return void
-     * @since 2.0.0
      */
     protected function setRecipientDetails(Request $request, Address $address)
     {
diff --git a/app/code/Magento/Shipping/Model/Simplexml/Element.php b/app/code/Magento/Shipping/Model/Simplexml/Element.php
index 8d8b490dd8e73..1f1898c122306 100644
--- a/app/code/Magento/Shipping/Model/Simplexml/Element.php
+++ b/app/code/Magento/Shipping/Model/Simplexml/Element.php
@@ -8,7 +8,6 @@
 /**
  * Extends SimpleXML to add valuable functionality to \SimpleXMLElement class
  *
- * @since 2.0.0
  */
 class Element extends \Magento\Framework\Simplexml\Element
 {
@@ -19,7 +18,6 @@ class Element extends \Magento\Framework\Simplexml\Element
      * @param string $value If specified, the value of the attribute.
      * @param string $namespace If specified, the namespace to which the attribute belongs.
      * @return void
-     * @since 2.0.0
      */
     public function addAttribute($name, $value = null, $namespace = null)
     {
@@ -36,7 +34,6 @@ public function addAttribute($name, $value = null, $namespace = null)
      * @param string $value If specified, the value of the child element.
      * @param string $namespace If specified, the namespace to which the child element belongs.
      * @return \Magento\Shipping\Model\Simplexml\Element
-     * @since 2.0.0
      */
     public function addChild($name, $value = null, $namespace = null)
     {
@@ -51,7 +48,6 @@ public function addChild($name, $value = null, $namespace = null)
      *
      * @param string|null $value
      * @return string
-     * @since 2.0.0
      */
     public function xmlentities($value = null)
     {
diff --git a/app/code/Magento/Shipping/Model/Source/HandlingAction.php b/app/code/Magento/Shipping/Model/Source/HandlingAction.php
index 4c1d2d89f0a14..99e365120230c 100644
--- a/app/code/Magento/Shipping/Model/Source/HandlingAction.php
+++ b/app/code/Magento/Shipping/Model/Source/HandlingAction.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Shipping\Model\Source\HandlingAction
  *
- * @since 2.0.0
  */
 class HandlingAction implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Source/HandlingType.php b/app/code/Magento/Shipping/Model/Source/HandlingType.php
index 57ca58956dd0b..f3fabd4caaecc 100644
--- a/app/code/Magento/Shipping/Model/Source/HandlingType.php
+++ b/app/code/Magento/Shipping/Model/Source/HandlingType.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Shipping\Model\Source\HandlingType
  *
- * @since 2.0.0
  */
 class HandlingType implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result.php b/app/code/Magento/Shipping/Model/Tracking/Result.php
index e80ae048c4261..ddfd330d55480 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Shipping\Model\Tracking\Result
  *
- * @since 2.0.0
  */
 class Result
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_trackings = [];
 
     /**
      * @var null|array
-     * @since 2.0.0
      */
     protected $_error = null;
 
@@ -31,7 +28,6 @@ class Result
      * Reset tracking
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -42,7 +38,6 @@ public function reset()
     /**
      * @param array $error
      * @return void
-     * @since 2.0.0
      */
     public function setError($error)
     {
@@ -51,7 +46,6 @@ public function setError($error)
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getError()
     {
@@ -63,7 +57,6 @@ public function getError()
      *
      * @param AbstractResult|RateResult $result
      * @return $this
-     * @since 2.0.0
      */
     public function append($result)
     {
@@ -82,7 +75,6 @@ public function append($result)
      * Return all trackings in the result
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTrackings()
     {
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/AbstractResult.php b/app/code/Magento/Shipping/Model/Tracking/Result/AbstractResult.php
index c5ef907f919ab..cc0bec3a59299 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/AbstractResult.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/AbstractResult.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Shipping\Model\Tracking\Result\AbstractResult
  *
- * @since 2.0.0
  */
 class AbstractResult extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
index 161ca857375c0..22f8183523728 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Shipping\Model\Tracking\Result\Error
  *
- * @since 2.0.0
  */
 class Error extends \Magento\Shipping\Model\Tracking\Result\AbstractResult
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllData()
     {
@@ -23,7 +21,6 @@ public function getAllData()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/Status.php b/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
index 507100934f874..cb24bd8ebb0e8 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
@@ -9,13 +9,11 @@
  * Fields:
  * - carrier: carrier code
  * - carrierTitle: carrier title
- * @since 2.0.0
  */
 class Status extends \Magento\Shipping\Model\Tracking\Result\AbstractResult
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllData()
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index 0833150eca5ec..d1b5fd1df45c4 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -9,7 +9,6 @@
  * Sitemap edit form container
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Init container
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +68,6 @@ protected function _construct()
      * Get edit form container header text
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
index 762f526dc6400..5e90cf6e12f6e 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
@@ -9,13 +9,11 @@
  * Sitemap edit form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
@@ -25,7 +23,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Init form
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
index 2499c239bb0ff..d1e60e8f75e46 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
@@ -7,14 +7,12 @@
 
 /**
  * Sitemap grid action column renderer
- * @since 2.0.0
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
     /**
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index c47e473666fce..3794ded934dfc 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -17,19 +17,16 @@
 /**
  * Class \Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Link
  *
- * @since 2.0.0
  */
 class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Sitemap\Model\SitemapFactory
-     * @since 2.0.0
      */
     protected $_sitemapFactory;
 
@@ -45,7 +42,6 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * @param \Magento\Framework\Filesystem $filesystem
      * @param array $data
      * @param DocumentRoot $documentRoot
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -66,7 +62,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
index 76563245de4b5..9400415d6681a 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Time
  *
- * @since 2.0.0
  */
 class Time extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -27,7 +25,6 @@ class Time extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
index e0977ddc9ed59..56115f91af4ed 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
@@ -9,7 +9,6 @@
  * Adminhtml catalog (google) sitemaps block
  *
  * @api
- * @since 2.0.0
  */
 class Sitemap extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Sitemap extends \Magento\Backend\Block\Widget\Grid\Container
      * Block constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
index ac5254a22dcd1..de8aa701c4afc 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
@@ -7,7 +7,6 @@
 
 /**
  * XML sitemap controller
- * @since 2.0.0
  */
 abstract class Sitemap extends \Magento\Backend\App\Action
 {
@@ -22,7 +21,6 @@ abstract class Sitemap extends \Magento\Backend\App\Action
      * Init actions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
index e803f86d5b9be..6372c133325f1 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -47,7 +46,6 @@ public function __construct(
      * Delete action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
index 678869dc9d6e3..914491415a311 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -17,14 +16,12 @@ class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      *
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 71f232f23613f..645d0226022e8 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\Generate
  *
- * @since 2.0.0
  */
 class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -17,7 +16,6 @@ class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
      * Generate sitemap
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
index a131802acdc73..9e6d4608c6dca 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -19,7 +18,6 @@ class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
      * Index action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
index f3b92cc85a313..5505ad9acd360 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
      * Create new sitemap
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
index 2f4dbf228e0cb..f37342403d3d4 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Sitemap\Controller\Adminhtml\Sitemap\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -22,7 +21,6 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
      * @param array $data
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function validatePath(array $data)
     {
@@ -52,7 +50,6 @@ protected function validatePath(array $data)
      *
      * @param \Magento\Sitemap\Model\Sitemap $model
      * @return void
-     * @since 2.0.0
      */
     protected function clearSiteMap(\Magento\Sitemap\Model\Sitemap $model)
     {
@@ -76,7 +73,6 @@ protected function clearSiteMap(\Magento\Sitemap\Model\Sitemap $model)
      *
      * @param array $data
      * @return string|bool
-     * @since 2.0.0
      */
     protected function saveData($data)
     {
@@ -109,7 +105,6 @@ protected function saveData($data)
      *
      * @param string|bool $id
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     protected function getResult($id)
     {
@@ -141,7 +136,6 @@ protected function getResult($id)
      * Save action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index 785960505f793..27ae6236d01b6 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Sitemap\Helper\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -73,7 +72,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getMaximumLinesNumber($storeId)
     {
@@ -89,7 +87,6 @@ public function getMaximumLinesNumber($storeId)
      *
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getMaximumFileSize($storeId)
     {
@@ -105,7 +102,6 @@ public function getMaximumFileSize($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryChangefreq($storeId)
     {
@@ -121,7 +117,6 @@ public function getCategoryChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getProductChangefreq($storeId)
     {
@@ -137,7 +132,6 @@ public function getProductChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getPageChangefreq($storeId)
     {
@@ -153,7 +147,6 @@ public function getPageChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getCategoryPriority($storeId)
     {
@@ -169,7 +162,6 @@ public function getCategoryPriority($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getProductPriority($storeId)
     {
@@ -185,7 +177,6 @@ public function getProductPriority($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getPagePriority($storeId)
     {
@@ -201,7 +192,6 @@ public function getPagePriority($storeId)
      *
      * @param int $storeId
      * @return int
-     * @since 2.0.0
      */
     public function getEnableSubmissionRobots($storeId)
     {
@@ -217,7 +207,6 @@ public function getEnableSubmissionRobots($storeId)
      *
      * @param int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getProductImageIncludePolicy($storeId)
     {
@@ -232,7 +221,6 @@ public function getProductImageIncludePolicy($storeId)
      * Get list valid paths for generate a sitemap XML file
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getValidPaths()
     {
diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Priority.php b/app/code/Magento/Sitemap/Model/Config/Backend/Priority.php
index 3beeed75f5ab1..dffab0fc3e22b 100644
--- a/app/code/Magento/Sitemap/Model/Config/Backend/Priority.php
+++ b/app/code/Magento/Sitemap/Model/Config/Backend/Priority.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Sitemap\Model\Config\Backend\Priority
  *
- * @since 2.0.0
  */
 class Priority extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php b/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php
index c417c2257ff4b..0fae7be46e661 100644
--- a/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php
+++ b/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Sitemap\Model\Config\Source\Frequency
  *
- * @since 2.0.0
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 5ca366411911d..3ae3061310a0b 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -9,7 +9,6 @@
  * Sitemap module observer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Observer
 {
@@ -42,31 +41,26 @@ class Observer
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -76,7 +70,6 @@ class Observer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -98,7 +91,6 @@ public function __construct(
      * @return void
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function scheduledGenerateSitemaps()
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
index bd29719e6c190..a77a158a9ed24 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
@@ -11,7 +11,6 @@
  * Sitemap resource catalog collection model
  *
  * @api
- * @since 2.0.0
  */
 class Category extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -19,7 +18,6 @@ class Category extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Collection Zend Db select
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_select;
 
@@ -27,19 +25,16 @@ class Category extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Attribute cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesCache = [];
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category
-     * @since 2.0.0
      */
     protected $_categoryResource;
 
@@ -55,7 +50,6 @@ class Category extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -72,7 +66,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -84,7 +77,6 @@ protected function _construct()
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId
      * @return array|bool
-     * @since 2.0.0
      */
     public function getCollection($storeId)
     {
@@ -141,7 +133,6 @@ public function getCollection($storeId)
      *
      * @param array $categoryRow
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareCategory(array $categoryRow)
     {
@@ -162,7 +153,6 @@ protected function _prepareCategory(array $categoryRow)
      * @param mixed $value
      * @param string $type
      * @return \Magento\Framework\DB\Select|bool
-     * @since 2.0.0
      */
     protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 28dab1b3c688d..061999a0c2bad 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -14,7 +14,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -24,7 +23,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Collection Zend Db select
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_select;
 
@@ -32,7 +30,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Attribute cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_attributesCache = [];
 
@@ -46,31 +43,26 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Sitemap data
      *
      * @var \Magento\Sitemap\Helper\Data
-     * @since 2.0.0
      */
     protected $_sitemapData = null;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
-     * @since 2.0.0
      */
     protected $_productResource;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Source\Status
-     * @since 2.0.0
      */
     protected $_productStatus;
 
@@ -83,7 +75,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
      * @deprecated 2.2.0 unused
-     * @since 2.0.0
      */
     protected $_mediaConfig;
 
@@ -113,7 +104,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\Product $productModel
      * @param \Magento\Catalog\Helper\Image $catalogImageHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -145,7 +135,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -160,7 +149,6 @@ protected function _construct()
      * @param mixed $value
      * @param string $type
      * @return \Magento\Framework\DB\Select|bool
-     * @since 2.0.0
      */
     protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
     {
@@ -206,7 +194,6 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
      * @param int $storeId
      * @param string $attributeCode
      * @return void
-     * @since 2.0.0
      */
     protected function _joinAttribute($storeId, $attributeCode)
     {
@@ -239,7 +226,6 @@ protected function _joinAttribute($storeId, $attributeCode)
      *
      * @param string $attributeCode
      * @return array
-     * @since 2.0.0
      */
     protected function _getAttribute($attributeCode)
     {
@@ -263,7 +249,6 @@ protected function _getAttribute($attributeCode)
      *
      * @param null|string|bool|int|Store $storeId
      * @return array|bool
-     * @since 2.0.0
      */
     public function getCollection($storeId)
     {
@@ -339,7 +324,6 @@ public function getCollection($storeId)
      * @param array $productRow
      * @param int $storeId
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareProduct(array $productRow, $storeId)
     {
@@ -361,7 +345,6 @@ protected function _prepareProduct(array $productRow, $storeId)
      * @param \Magento\Framework\DataObject $product
      * @param int $storeId
      * @return void
-     * @since 2.0.0
      */
     protected function _loadProductImages($product, $storeId)
     {
@@ -407,7 +390,6 @@ protected function _loadProductImages($product, $storeId)
      * @param \Magento\Framework\DataObject $product
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     protected function _getAllProductImages($product, $storeId)
     {
@@ -438,7 +420,6 @@ protected function _getAllProductImages($product, $storeId)
      * @return \Magento\Catalog\Model\Product\Media\Config
      * @deprecated 2.2.0 No longer used, as we're getting full image URL from getProductImageUrl method
      * @see getProductImageUrl()
-     * @since 2.0.0
      */
     protected function _getMediaConfig()
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
index ddac92290116b..c344d705b3484 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
@@ -17,7 +17,6 @@
  * Sitemap cms page collection model
  *
  * @api
- * @since 2.0.0
  */
 class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -55,7 +54,6 @@ public function __construct(
      * Init resource model (catalog/category)
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +74,6 @@ public function getConnection()
      *
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getCollection($storeId)
     {
@@ -115,7 +112,6 @@ public function getCollection($storeId)
      *
      * @param array $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _prepareObject(array $data)
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap.php b/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap.php
index b207ca5b7ebc2..6806999e8d400 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap.php
@@ -9,7 +9,6 @@
  * Sitemap resource model
  *
  * @api
- * @since 2.0.0
  */
 class Sitemap extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Sitemap extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php b/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php
index d879f1f8e9ca3..dfc81a954ee44 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Init collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -30,7 +28,6 @@ public function _construct()
      *
      * @param array|int[] $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds)
     {
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 315b862d53e5c..46299c6d50be9 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -31,7 +31,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -49,7 +48,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Real file path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_filePath;
 
@@ -57,7 +55,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Sitemap items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_sitemapItems = [];
 
@@ -65,7 +62,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Current sitemap increment
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_sitemapIncrement = 0;
 
@@ -73,7 +69,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Sitemap start and end tags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_tags = [];
 
@@ -81,7 +76,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Number of lines in sitemap
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_lineCount = 0;
 
@@ -89,7 +83,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Current sitemap file size
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_fileSize = 0;
 
@@ -97,19 +90,16 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * New line possible symbols
      *
      * @var array
-     * @since 2.0.0
      */
     private $_crlf = ["win" => "\r\n", "unix" => "\n", "mac" => "\r"];
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var \Magento\Framework\Filesystem\File\Write
-     * @since 2.0.0
      */
     protected $_stream;
 
@@ -117,55 +107,46 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * Sitemap data
      *
      * @var \Magento\Sitemap\Helper\Data
-     * @since 2.0.0
      */
     protected $_sitemapData;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
     /**
      * @var \Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
     /**
      * @var \Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Sitemap\Model\ResourceModel\Cms\PageFactory
-     * @since 2.0.0
      */
     protected $_cmsFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_dateModel;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -197,7 +178,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * @param array $data
      * @param DocumentRoot|null $documentRoot
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -236,7 +216,6 @@ public function __construct(
      * Init model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -248,7 +227,6 @@ protected function _construct()
      *
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getStream()
     {
@@ -314,7 +292,6 @@ public function collectSitemapItems()
      * Initialize sitemap
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initSitemapItems()
     {
@@ -345,7 +322,6 @@ protected function _initSitemapItems()
      *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -399,7 +375,6 @@ public function beforeSave()
      * @see http://www.sitemaps.org/protocol.html
      *
      * @return $this
-     * @since 2.0.0
      */
     public function generateXml()
     {
@@ -457,7 +432,6 @@ public function generateXml()
      * Generate sitemap index XML file
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _createSitemapIndex()
     {
@@ -473,7 +447,6 @@ protected function _createSitemapIndex()
      * Get current date time
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrentDateTime()
     {
@@ -485,7 +458,6 @@ protected function _getCurrentDateTime()
      *
      * @param string $row
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSplitRequired($row)
     {
@@ -517,7 +489,6 @@ protected function _isSplitRequired($row)
      *
      * Sitemap PageMap
      * @see http://support.google.com/customsearch/bin/answer.py?hl=en&answer=1628213
-     * @since 2.0.0
      */
     protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $priority = null, $images = null)
     {
@@ -559,7 +530,6 @@ protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $pr
      * @param string $sitemapFilename
      * @param null|string $lastmod
      * @return string
-     * @since 2.0.0
      */
     protected function _getSitemapIndexRow($sitemapFilename, $lastmod = null)
     {
@@ -579,7 +549,6 @@ protected function _getSitemapIndexRow($sitemapFilename, $lastmod = null)
      * @param string $type
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _createSitemap($fileName = null, $type = self::TYPE_URL)
     {
@@ -601,7 +570,6 @@ protected function _createSitemap($fileName = null, $type = self::TYPE_URL)
      *
      * @param string $row
      * @return void
-     * @since 2.0.0
      */
     protected function _writeSitemapRow($row)
     {
@@ -613,7 +581,6 @@ protected function _writeSitemapRow($row)
      *
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     protected function _finalizeSitemap($type = self::TYPE_URL)
     {
@@ -632,7 +599,6 @@ protected function _finalizeSitemap($type = self::TYPE_URL)
      *
      * @param int $index
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrentSitemapFilename($index)
     {
@@ -643,7 +609,6 @@ protected function _getCurrentSitemapFilename($index)
      * Get base dir
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBaseDir()
     {
@@ -655,7 +620,6 @@ protected function _getBaseDir()
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function _getStoreBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LINK)
     {
@@ -671,7 +635,6 @@ protected function _getStoreBaseUrl($type = \Magento\Framework\UrlInterface::URL
      * @param string $url
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl($url, $type = \Magento\Framework\UrlInterface::URL_TYPE_LINK)
     {
@@ -685,7 +648,6 @@ protected function _getUrl($url, $type = \Magento\Framework\UrlInterface::URL_TY
      * @return string
      * @deprecated 2.2.0 No longer used, as we're generating product image URLs inside collection instead
      * @see \Magento\Sitemap\Model\ResourceModel\Catalog\Product::_loadProductImages()
-     * @since 2.0.0
      */
     protected function _getMediaUrl($url)
     {
@@ -697,7 +659,6 @@ protected function _getMediaUrl($url)
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     protected function _getFormattedLastmodDate($date)
     {
@@ -708,7 +669,6 @@ protected function _getFormattedLastmodDate($date)
      * Get Document root of Magento instance
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDocumentRoot()
     {
@@ -719,7 +679,6 @@ protected function _getDocumentRoot()
      * Get domain from store base url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getStoreBaseDomain()
     {
@@ -748,7 +707,6 @@ protected function _getStoreBaseDomain()
      * @param string $sitemapPath
      * @param string $sitemapFileName
      * @return string
-     * @since 2.0.0
      */
     public function getSitemapUrl($sitemapPath, $sitemapFileName)
     {
@@ -761,7 +719,6 @@ public function getSitemapUrl($sitemapPath, $sitemapFileName)
      * @return bool
      * @deprecated 2.2.0 Because the robots.txt file is not generated anymore,
      *             this method is not needed and will be removed in major release.
-     * @since 2.0.0
      */
     protected function _isEnabledSubmissionRobots()
     {
@@ -778,7 +735,6 @@ protected function _isEnabledSubmissionRobots()
      * @return void
      * @deprecated 2.2.0 Because the robots.txt file is not generated anymore,
      *             this method is not needed and will be removed in major release.
-     * @since 2.0.0
      */
     protected function _addSitemapToRobotsTxt($sitemapFileName)
     {
@@ -805,7 +761,6 @@ protected function _addSitemapToRobotsTxt($sitemapFileName)
      *
      * @param string $text
      * @return string
-     * @since 2.0.0
      */
     private function _findNewLinesDelimiter($text)
     {
diff --git a/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php b/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php
index c45afec791b5b..f267889f38573 100644
--- a/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php
+++ b/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IncludeImage implements \Magento\Framework\Option\ArrayInterface
 {
@@ -31,7 +30,6 @@ class IncludeImage implements \Magento\Framework\Option\ArrayInterface
      * Retrieve options array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Sitemap/Setup/InstallSchema.php b/app/code/Magento/Sitemap/Setup/InstallSchema.php
index ddd478de7e1cb..eaf4effeb3684 100644
--- a/app/code/Magento/Sitemap/Setup/InstallSchema.php
+++ b/app/code/Magento/Sitemap/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Store/Api/Data/GroupInterface.php b/app/code/Magento/Store/Api/Data/GroupInterface.php
index a65f00833cecf..f97219ee93a8b 100644
--- a/app/code/Magento/Store/Api/Data/GroupInterface.php
+++ b/app/code/Magento/Store/Api/Data/GroupInterface.php
@@ -9,72 +9,61 @@
  * Group interface
  *
  * @api
- * @since 2.0.0
  */
 interface GroupInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
     /**
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRootCategoryId();
 
     /**
      * @param int $rootCategoryId
      * @return $this
-     * @since 2.0.0
      */
     public function setRootCategoryId($rootCategoryId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultStoreId();
 
     /**
      * @param int $defaultStoreId
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultStoreId($defaultStoreId);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
     /**
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -100,7 +89,6 @@ public function setCode($code);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Store\Api\Data\GroupExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -109,7 +97,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index d3c892a44bbf3..4d9012377cd75 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -9,7 +9,6 @@
  * StoreConfig interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreConfigInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface StoreConfigInterface extends \Magento\Framework\Api\ExtensibleDataInte
      * Get store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -26,7 +24,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -34,7 +31,6 @@ public function setId($id);
      * Get store code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -43,7 +39,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -51,7 +46,6 @@ public function setCode($code);
      * Get website id of the store
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
@@ -60,7 +54,6 @@ public function getWebsiteId();
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 
@@ -68,7 +61,6 @@ public function setWebsiteId($websiteId);
      * Get store locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale();
 
@@ -77,7 +69,6 @@ public function getLocale();
      *
      * @param string $locale
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale);
 
@@ -85,7 +76,6 @@ public function setLocale($locale);
      * Get base currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode();
 
@@ -94,7 +84,6 @@ public function getBaseCurrencyCode();
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode);
 
@@ -102,7 +91,6 @@ public function setBaseCurrencyCode($baseCurrencyCode);
      * Get default display currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencyCode();
 
@@ -111,7 +99,6 @@ public function getDefaultDisplayCurrencyCode();
      *
      * @param string $defaultDisplayCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencyCode($defaultDisplayCurrencyCode);
 
@@ -119,7 +106,6 @@ public function setDefaultDisplayCurrencyCode($defaultDisplayCurrencyCode);
      * Get timezone of the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTimezone();
 
@@ -128,7 +114,6 @@ public function getTimezone();
      *
      * @param string $timezone
      * @return $this
-     * @since 2.0.0
      */
     public function setTimezone($timezone);
 
@@ -136,7 +121,6 @@ public function setTimezone($timezone);
      * Return the unit of weight
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWeightUnit();
 
@@ -145,7 +129,6 @@ public function getWeightUnit();
      *
      * @param string $weightUnit
      * @return $this
-     * @since 2.0.0
      */
     public function setWeightUnit($weightUnit);
 
@@ -153,7 +136,6 @@ public function setWeightUnit($weightUnit);
      * Get base URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl();
 
@@ -162,7 +144,6 @@ public function getBaseUrl();
      *
      * @param string $baseUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseUrl($baseUrl);
 
@@ -170,7 +151,6 @@ public function setBaseUrl($baseUrl);
      * Get base link URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseLinkUrl();
 
@@ -179,7 +159,6 @@ public function getBaseLinkUrl();
      *
      * @param string $baseLinkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseLinkUrl($baseLinkUrl);
 
@@ -187,7 +166,6 @@ public function setBaseLinkUrl($baseLinkUrl);
      * Get base static URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseStaticUrl();
 
@@ -196,7 +174,6 @@ public function getBaseStaticUrl();
      *
      * @param string $baseStaticUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseStaticUrl($baseStaticUrl);
 
@@ -204,7 +181,6 @@ public function setBaseStaticUrl($baseStaticUrl);
      * Get base media URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaUrl();
 
@@ -213,7 +189,6 @@ public function getBaseMediaUrl();
      *
      * @param string $baseMediaUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseMediaUrl($baseMediaUrl);
 
@@ -221,7 +196,6 @@ public function setBaseMediaUrl($baseMediaUrl);
      * Get secure base URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseUrl();
 
@@ -230,7 +204,6 @@ public function getSecureBaseUrl();
      *
      * @param string $secureBaseUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseUrl($secureBaseUrl);
 
@@ -238,7 +211,6 @@ public function setSecureBaseUrl($secureBaseUrl);
      * Get secure base link URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseLinkUrl();
 
@@ -247,7 +219,6 @@ public function getSecureBaseLinkUrl();
      *
      * @param string $secureBaseLinkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseLinkUrl($secureBaseLinkUrl);
 
@@ -255,7 +226,6 @@ public function setSecureBaseLinkUrl($secureBaseLinkUrl);
      * Get secure base static URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseStaticUrl();
 
@@ -264,7 +234,6 @@ public function getSecureBaseStaticUrl();
      *
      * @param string $secureBaseStaticUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseStaticUrl($secureBaseStaticUrl);
 
@@ -272,7 +241,6 @@ public function setSecureBaseStaticUrl($secureBaseStaticUrl);
      * Get secure base media URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseMediaUrl();
 
@@ -281,7 +249,6 @@ public function getSecureBaseMediaUrl();
      *
      * @param string $secureBaseMediaUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseMediaUrl($secureBaseMediaUrl);
 
@@ -289,7 +256,6 @@ public function setSecureBaseMediaUrl($secureBaseMediaUrl);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Store\Api\Data\StoreConfigExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -298,7 +264,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Api/Data/StoreInterface.php b/app/code/Magento/Store/Api/Data/StoreInterface.php
index be37d9c31d81a..69c53f430a4b6 100644
--- a/app/code/Magento/Store/Api/Data/StoreInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreInterface.php
@@ -9,33 +9,28 @@
  * Store interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
     /**
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -43,7 +38,6 @@ public function setCode($code);
      * Retrieve store name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -52,33 +46,28 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId();
 
     /**
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStoreGroupId();
 
     /**
      * @param int $storeGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreGroupId($storeGroupId);
 
@@ -86,7 +75,6 @@ public function setStoreGroupId($storeGroupId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Store\Api\Data\StoreExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -95,7 +83,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Api/Data/WebsiteInterface.php b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
index 4fafe18fe59c3..1fb2ed22f2ea9 100644
--- a/app/code/Magento/Store/Api/Data/WebsiteInterface.php
+++ b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
@@ -9,33 +9,28 @@
  * Website interface
  *
  * @api
- * @since 2.0.0
  */
 interface WebsiteInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
     /**
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -43,7 +38,6 @@ public function setCode($code);
      * Rethreive website name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -52,20 +46,17 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultGroupId();
 
     /**
      * @param int $defaultGroupId
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultGroupId($defaultGroupId);
 
@@ -73,7 +64,6 @@ public function setDefaultGroupId($defaultGroupId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Store\Api\Data\WebsiteExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -82,7 +72,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Api/GroupRepositoryInterface.php b/app/code/Magento/Store/Api/GroupRepositoryInterface.php
index 10afdadfc7368..eb57383540b7c 100644
--- a/app/code/Magento/Store/Api/GroupRepositoryInterface.php
+++ b/app/code/Magento/Store/Api/GroupRepositoryInterface.php
@@ -11,7 +11,6 @@
  * Group repository interface
  *
  * @api
- * @since 2.0.0
  */
 interface GroupRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface GroupRepositoryInterface
      * @param int $id
      * @return \Magento\Store\Api\Data\GroupInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($id);
 
@@ -29,7 +27,6 @@ public function get($id);
      * Retrieve list of all groups
      *
      * @return \Magento\Store\Api\Data\GroupInterface[]
-     * @since 2.0.0
      */
     public function getList();
 
@@ -37,7 +34,6 @@ public function getList();
      * Clear cached entities
      *
      * @return void
-     * @since 2.0.0
      */
     public function clean();
 }
diff --git a/app/code/Magento/Store/Api/StoreConfigManagerInterface.php b/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
index baf5c8ec26e9d..f1327606d1b7d 100644
--- a/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
+++ b/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
@@ -12,14 +12,12 @@
  * Store config manager interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreConfigManagerInterface
 {
     /**
      * @param string[] $storeCodes
      * @return \Magento\Store\Api\Data\StoreConfigInterface[]
-     * @since 2.0.0
      */
     public function getStoreConfigs(array $storeCodes = null);
 }
diff --git a/app/code/Magento/Store/Api/StoreCookieManagerInterface.php b/app/code/Magento/Store/Api/StoreCookieManagerInterface.php
index 742102c35ee7b..8c7331527108b 100644
--- a/app/code/Magento/Store/Api/StoreCookieManagerInterface.php
+++ b/app/code/Magento/Store/Api/StoreCookieManagerInterface.php
@@ -12,27 +12,23 @@
  * Store cookie manager interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreCookieManagerInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCodeFromCookie();
 
     /**
      * @param StoreInterface $store
      * @return void
-     * @since 2.0.0
      */
     public function setStoreCookie(StoreInterface $store);
 
     /**
      * @param StoreInterface $store
      * @return void
-     * @since 2.0.0
      */
     public function deleteStoreCookie(StoreInterface $store);
 }
diff --git a/app/code/Magento/Store/Api/StoreManagementInterface.php b/app/code/Magento/Store/Api/StoreManagementInterface.php
index 1131fad25d7e7..ee4730394e792 100644
--- a/app/code/Magento/Store/Api/StoreManagementInterface.php
+++ b/app/code/Magento/Store/Api/StoreManagementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface StoreManagementInterface
 {
@@ -15,7 +14,6 @@ interface StoreManagementInterface
      * Provide the number of store count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount();
 }
diff --git a/app/code/Magento/Store/Api/StoreRepositoryInterface.php b/app/code/Magento/Store/Api/StoreRepositoryInterface.php
index 6ec98558a3c87..9c1462de15db8 100644
--- a/app/code/Magento/Store/Api/StoreRepositoryInterface.php
+++ b/app/code/Magento/Store/Api/StoreRepositoryInterface.php
@@ -12,7 +12,6 @@
  * Store repository interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreRepositoryInterface
 {
@@ -22,7 +21,6 @@ interface StoreRepositoryInterface
      * @param string $code
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($code);
 
@@ -33,7 +31,6 @@ public function get($code);
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws NoSuchEntityException
      * @throws StoreIsInactiveException
-     * @since 2.0.0
      */
     public function getActiveStoreByCode($code);
 
@@ -44,7 +41,6 @@ public function getActiveStoreByCode($code);
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws NoSuchEntityException
      * @throws StoreIsInactiveException
-     * @since 2.0.0
      */
     public function getActiveStoreById($id);
 
@@ -54,7 +50,6 @@ public function getActiveStoreById($id);
      * @param int $id
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($id);
 
@@ -62,7 +57,6 @@ public function getById($id);
      * Retrieve list of all stores
      *
      * @return \Magento\Store\Api\Data\StoreInterface[]
-     * @since 2.0.0
      */
     public function getList();
 
@@ -70,7 +64,6 @@ public function getList();
      * Clear cached entities
      *
      * @return void
-     * @since 2.0.0
      */
     public function clean();
 }
diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php
index 4efb27f628c55..a898a6daef928 100644
--- a/app/code/Magento/Store/Api/StoreResolverInterface.php
+++ b/app/code/Magento/Store/Api/StoreResolverInterface.php
@@ -9,7 +9,6 @@
  * Store resolver interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreResolverInterface
 {
@@ -22,7 +21,6 @@ interface StoreResolverInterface
      * Retrieve current store id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentStoreId();
 }
diff --git a/app/code/Magento/Store/Api/WebsiteManagementInterface.php b/app/code/Magento/Store/Api/WebsiteManagementInterface.php
index 719f260131642..ea302d7944028 100644
--- a/app/code/Magento/Store/Api/WebsiteManagementInterface.php
+++ b/app/code/Magento/Store/Api/WebsiteManagementInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface WebsiteManagementInterface
 {
@@ -15,7 +14,6 @@ interface WebsiteManagementInterface
      * Provide the number of website count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount();
 }
diff --git a/app/code/Magento/Store/Api/WebsiteRepositoryInterface.php b/app/code/Magento/Store/Api/WebsiteRepositoryInterface.php
index dcae3355f9164..7c272dc31e066 100644
--- a/app/code/Magento/Store/Api/WebsiteRepositoryInterface.php
+++ b/app/code/Magento/Store/Api/WebsiteRepositoryInterface.php
@@ -11,7 +11,6 @@
  * Website repository interface
  *
  * @api
- * @since 2.0.0
  */
 interface WebsiteRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface WebsiteRepositoryInterface
      * @param string $code
      * @return \Magento\Store\Api\Data\WebsiteInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($code);
 
@@ -31,7 +29,6 @@ public function get($code);
      * @param int $id
      * @return \Magento\Store\Api\Data\WebsiteInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($id);
 
@@ -39,7 +36,6 @@ public function getById($id);
      * Retrieve list of all websites
      *
      * @return \Magento\Store\Api\Data\WebsiteInterface[]
-     * @since 2.0.0
      */
     public function getList();
 
@@ -48,7 +44,6 @@ public function getList();
      *
      * @return \Magento\Store\Api\Data\WebsiteInterface
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function getDefault();
 
@@ -56,7 +51,6 @@ public function getDefault();
      * Clear cached entities
      *
      * @return void
-     * @since 2.0.0
      */
     public function clean();
 }
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 4ff65e311e2cc..78952240be620 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -16,31 +16,26 @@
 
 /**
  * Class ContextPlugin
- * @since 2.0.0
  */
 class Context
 {
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var StoreCookieManagerInterface
-     * @since 2.0.0
      */
     protected $storeCookieManager;
 
@@ -49,7 +44,6 @@ class Context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param StoreCookieManagerInterface $storeCookieManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Session\SessionManagerInterface $session,
diff --git a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
index 8eb0cba9d52f6..0e246941fb847 100644
--- a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
+++ b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Store\App\Action\Plugin\StoreCheck
  *
- * @since 2.0.0
  */
 class StoreCheck
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager
diff --git a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
index 56222c3a933a1..54cea5f9451fa 100644
--- a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
@@ -12,13 +12,13 @@
 
 /**
  * Config source. Retrieve all configuration for scopes from db
- * @since 2.2.0
+ * @since 2.1.3
  */
 class RuntimeConfigSource implements ConfigSourceInterface
 {
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
@@ -37,7 +37,7 @@ class RuntimeConfigSource implements ConfigSourceInterface
     /**
      * @param DeploymentConfig $deploymentConfig
      * @param ResourceConnection $resourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -54,7 +54,7 @@ public function __construct(
      * @param string $path
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -106,7 +106,7 @@ private function getEntities($table, $keyField)
      * Check whether db connection is available and can be used
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function canUseDatabase()
     {
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
index 3ba665d0c5d5c..64c7431e373e6 100644
--- a/app/code/Magento/Store/App/Config/Type/Scopes.php
+++ b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -12,7 +12,7 @@
 
 /**
  * Merge and hold scopes data from different sources
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Scopes implements ConfigTypeInterface
 {
@@ -20,13 +20,13 @@ class Scopes implements ConfigTypeInterface
 
     /**
      * @var ConfigSourceInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $source;
 
     /**
      * @var DataObject[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data;
 
@@ -52,7 +52,7 @@ class Scopes implements ConfigTypeInterface
 
     /**
      * @param ConfigSourceInterface $source
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ConfigSourceInterface $source
@@ -62,7 +62,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -118,7 +118,7 @@ private function convertIdPathToCodePath(array $patchChunks)
      * Clean cache
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean()
     {
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
index e3956ad2bd814..cac138c8ec222 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Store\App\FrontController\Plugin\RequestPreprocessor
  *
- * @since 2.0.0
  */
 class RequestPreprocessor
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\App\ResponseFactory
-     * @since 2.0.0
      */
     protected $_responseFactory;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -47,7 +42,6 @@ class RequestPreprocessor
      * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -71,7 +65,6 @@ public function __construct(
      *
      * @return \Magento\Framework\App\ResponseInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundDispatch(
         \Magento\Framework\App\FrontController $subject,
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 348e2c7ce384f..ec989ae1fc1e8 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Store\App\Request\PathInfoProcessor
  *
- * @since 2.0.0
  */
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $pathInfo
      * @return string
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo)
     {
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index 22f219dbb0bd0..df8f8193e3a79 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -12,49 +12,41 @@
 /**
  * Class \Magento\Store\App\Response\Redirect
  *
- * @since 2.0.0
  */
 class Redirect implements \Magento\Framework\App\Response\RedirectInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Encryption\UrlCoder
-     * @since 2.0.0
      */
     protected $_urlCoder;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_canUseSessionIdInParam;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
@@ -68,7 +60,6 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param bool $canUseSessionIdInParam
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -90,7 +81,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
@@ -120,7 +110,6 @@ protected function _getUrl()
      * Identify referer url via all accepted methods (HTTP_REFERER, regular or base64-encoded request param)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRefererUrl()
     {
@@ -132,7 +121,6 @@ public function getRefererUrl()
      *
      * @param   string $defaultUrl
      * @return  \Magento\Framework\App\ActionInterface
-     * @since 2.0.0
      */
     public function getRedirectUrl($defaultUrl = null)
     {
@@ -148,7 +136,6 @@ public function getRedirectUrl($defaultUrl = null)
      *
      * @param string $defaultUrl
      * @return  string
-     * @since 2.0.0
      */
     public function error($defaultUrl)
     {
@@ -167,7 +154,6 @@ public function error($defaultUrl)
      *
      * @param string $defaultUrl
      * @return string
-     * @since 2.0.0
      */
     public function success($defaultUrl)
     {
@@ -186,7 +172,6 @@ public function success($defaultUrl)
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     public function updatePathParams(array $arguments)
     {
@@ -210,7 +195,6 @@ public function updatePathParams(array $arguments)
      * @param string $path
      * @param array $arguments
      * @return void
-     * @since 2.0.0
      */
     public function redirect(\Magento\Framework\App\ResponseInterface $response, $path, $arguments = [])
     {
@@ -223,7 +207,6 @@ public function redirect(\Magento\Framework\App\ResponseInterface $response, $pa
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     protected function _isUrlInternal($url)
     {
@@ -241,7 +224,6 @@ protected function _isUrlInternal($url)
      *
      * @param string $refererUrl
      * @return string
-     * @since 2.0.0
      */
     protected function normalizeRefererUrl($refererUrl)
     {
@@ -274,7 +256,6 @@ protected function normalizeRefererUrl($refererUrl)
      *
      * @param array $refererQuery
      * @return array
-     * @since 2.0.0
      */
     protected function normalizeRefererQueryParts($refererQuery)
     {
diff --git a/app/code/Magento/Store/Block/Store/Switcher.php b/app/code/Magento/Store/Block/Store/Switcher.php
index 58b56bf015e59..e681284432000 100644
--- a/app/code/Magento/Store/Block/Store/Switcher.php
+++ b/app/code/Magento/Store/Block/Store/Switcher.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Store\Block\Store\Switcher
  *
- * @since 2.0.0
  */
 class Switcher extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_groups = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_stores = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_loaded = false;
 
@@ -40,7 +36,6 @@ class Switcher extends \Magento\Framework\View\Element\Template
      * Store factory
      *
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
@@ -48,7 +43,6 @@ class Switcher extends \Magento\Framework\View\Element\Template
      * Store group factory
      *
      * @var \Magento\Store\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $_storeGroupFactory;
 
@@ -57,7 +51,6 @@ class Switcher extends \Magento\Framework\View\Element\Template
      * @param \Magento\Store\Model\GroupFactory $storeGroupFactory
      * @param \Magento\Store\Model\StoreFactory $storeFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -72,7 +65,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -84,7 +76,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadData()
     {
@@ -118,7 +109,6 @@ protected function _loadData()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStoreCount()
     {
@@ -149,7 +139,6 @@ public function getStoreCount()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLanguageCount()
     {
@@ -164,7 +153,6 @@ public function getLanguageCount()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentStoreId()
     {
@@ -173,7 +161,6 @@ public function getCurrentStoreId()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentStoreCode()
     {
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index f3bac93c42db6..6a70c5003426d 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -14,19 +14,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Switcher extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_storeInUrl;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
@@ -36,7 +33,6 @@ class Switcher extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
 
     /**
      * @return int|null|string
-     * @since 2.0.0
      */
     public function getCurrentWebsiteId()
     {
@@ -58,7 +53,6 @@ public function getCurrentWebsiteId()
 
     /**
      * @return int|null|string
-     * @since 2.0.0
      */
     public function getCurrentGroupId()
     {
@@ -67,7 +61,6 @@ public function getCurrentGroupId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentStoreId()
     {
@@ -76,7 +69,6 @@ public function getCurrentStoreId()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRawGroups()
     {
@@ -94,7 +86,6 @@ public function getRawGroups()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRawStores()
     {
@@ -130,7 +121,6 @@ public function getRawStores()
      * Retrieve list of store groups with default urls set
      *
      * @return Group[]
-     * @since 2.0.0
      */
     public function getGroups()
     {
@@ -167,7 +157,6 @@ public function getGroups()
 
     /**
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -187,7 +176,6 @@ public function getStores()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentStoreCode()
     {
@@ -196,7 +184,6 @@ public function getCurrentStoreCode()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isStoreInUrl()
     {
@@ -210,7 +197,6 @@ public function isStoreInUrl()
      * Get store code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreCode()
     {
@@ -221,7 +207,6 @@ public function getStoreCode()
      * Get store name
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getStoreName()
     {
@@ -234,7 +219,6 @@ public function getStoreName()
      * @param \Magento\Store\Model\Store $store
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     public function getTargetStorePostData(\Magento\Store\Model\Store $store, $data = [])
     {
diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php
index b64e2708cf1a9..aa023e400460f 100644
--- a/app/code/Magento/Store/Controller/Store/SwitchAction.php
+++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php
@@ -19,31 +19,26 @@
 
 /**
  * Switch current store view.
- * @since 2.0.0
  */
 class SwitchAction extends Action
 {
     /**
      * @var StoreCookieManagerInterface
-     * @since 2.0.0
      */
     protected $storeCookieManager;
 
     /**
      * @var HttpContext
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -55,7 +50,6 @@ class SwitchAction extends Action
      * @param HttpContext $httpContext
      * @param StoreRepositoryInterface $storeRepository
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         ActionContext $context,
@@ -73,7 +67,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php
index d2c86d2837b7c..1f44b9dcec3e3 100644
--- a/app/code/Magento/Store/Model/Address/Renderer.php
+++ b/app/code/Magento/Store/Model/Address/Renderer.php
@@ -12,19 +12,16 @@
 
 /**
  * Class Renderer used for formatting a store address
- * @since 2.0.0
  */
 class Renderer
 {
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
@@ -33,7 +30,6 @@ class Renderer
      *
      * @param EventManager $eventManager
      * @param FilterManager $filterManager
-     * @since 2.0.0
      */
     public function __construct(
         EventManager $eventManager,
@@ -49,7 +45,6 @@ public function __construct(
      * @param DataObject $storeInfo
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function format(DataObject $storeInfo, $type = 'html')
     {
diff --git a/app/code/Magento/Store/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
index 45a50288df4d5..4f2fa56c63182 100644
--- a/app/code/Magento/Store/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Emulation extends \Magento\Framework\DataObject
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $_translate;
 
@@ -33,31 +30,26 @@ class Emulation extends \Magento\Framework\DataObject
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Framework\App\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $inlineConfig;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -65,13 +57,11 @@ class Emulation extends \Magento\Framework\DataObject
      * Ini
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     private $initialEnvironmentInfo;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     private $logger;
 
@@ -87,7 +77,6 @@ class Emulation extends \Magento\Framework\DataObject
      * @param \Psr\Log\LoggerInterface $logger
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -122,7 +111,6 @@ public function __construct(
      * @param string $area
      * @param bool $force A true value will ensure that environment is always emulated, regardless of current store
      * @return void
-     * @since 2.0.0
      */
     public function startEnvironmentEmulation(
         $storeId,
@@ -176,7 +164,6 @@ public function startEnvironmentEmulation(
      * Function restores initial store environment
      *
      * @return \Magento\Store\Model\App\Emulation
-     * @since 2.0.0
      */
     public function stopEnvironmentEmulation()
     {
@@ -199,7 +186,6 @@ public function stopEnvironmentEmulation()
      * Stores current environment info
      *
      * @return void
-     * @since 2.0.0
      */
     public function storeCurrentEnvironmentInfo()
     {
@@ -222,7 +208,6 @@ public function storeCurrentEnvironmentInfo()
      *
      * @param bool $initialTranslate
      * @return $this
-     * @since 2.0.0
      */
     protected function _restoreInitialInlineTranslation($initialTranslate)
     {
@@ -235,7 +220,6 @@ protected function _restoreInitialInlineTranslation($initialTranslate)
      *
      * @param array $initialDesign
      * @return $this
-     * @since 2.0.0
      */
     protected function _restoreInitialDesign(array $initialDesign)
     {
@@ -249,7 +233,6 @@ protected function _restoreInitialDesign(array $initialDesign)
      * @param string $initialLocaleCode
      * @param string $initialArea
      * @return $this
-     * @since 2.0.0
      */
     protected function _restoreInitialLocale(
         $initialLocaleCode,
diff --git a/app/code/Magento/Store/Model/Config/Converter.php b/app/code/Magento/Store/Model/Config/Converter.php
index ae03c5b48433b..27742714813b7 100644
--- a/app/code/Magento/Store/Model/Config/Converter.php
+++ b/app/code/Magento/Store/Model/Config/Converter.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Converter.
- * @since 2.0.0
  */
 class Converter extends \Magento\Framework\App\Config\Scope\Converter
 {
@@ -19,7 +18,6 @@ class Converter extends \Magento\Framework\App\Config\Scope\Converter
      * @param array $source
      * @param array $initialConfig
      * @return array
-     * @since 2.0.0
      */
     public function convert($source, $initialConfig = [])
     {
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php
index cea198f029370..2e1d1b35925cc 100644
--- a/app/code/Magento/Store/Model/Config/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Placeholder.php
@@ -7,25 +7,25 @@
 
 /**
  * Placeholder configuration values processor. Replace placeholders in configuration with config values
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Placeholder
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $request;
 
     /**
      * @var string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $urlPaths;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $urlPlaceholder;
 
@@ -33,7 +33,7 @@ class Placeholder
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string[] $urlPaths
      * @param string $urlPlaceholder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Framework\App\RequestInterface $request, $urlPaths, $urlPlaceholder)
     {
@@ -47,7 +47,7 @@ public function __construct(\Magento\Framework\App\RequestInterface $request, $u
      *
      * @param array $data
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $data = [])
     {
@@ -63,7 +63,7 @@ public function process(array $data = [])
      * @param array &$data
      * @param string $path
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _processData(&$data, $path)
     {
@@ -83,7 +83,7 @@ protected function _processData(&$data, $path)
      * @param string $value
      * @param array $data
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _processPlaceholders($value, $data)
     {
@@ -115,7 +115,7 @@ protected function _processPlaceholders($value, $data)
      *
      * @param string $value
      * @return string|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _getPlaceholder($value)
     {
@@ -138,7 +138,7 @@ protected function _getPlaceholder($value)
      * @param string $path
      * @param array $data
      * @return array|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _getValue($path, array $data)
     {
@@ -160,7 +160,7 @@ protected function _getValue($path, array $data)
      * @param string $path
      * @param string $value
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _setValue(array &$container, $path, $value)
     {
diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
index d9edfea6f960d..76d05db7d1fea 100644
--- a/app/code/Magento/Store/Model/Config/Processor/Fallback.php
+++ b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -19,49 +19,49 @@
 
 /**
  * Fallback through different scopes and merge them
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Fallback implements PostProcessorInterface
 {
     /**
      * @var Scopes
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopes;
 
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resourceConnection;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeData = [];
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteData = [];
 
     /**
      * @var Store
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeResource;
 
     /**
      * @var Website
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteResource;
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
@@ -73,7 +73,7 @@ class Fallback implements PostProcessorInterface
      * @param Store $storeResource
      * @param Website $websiteResource
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Scopes $scopes,
@@ -91,7 +91,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $data)
     {
@@ -125,7 +125,7 @@ public function process(array $data)
      * @param array $defaultConfig
      * @param array $websitesConfig
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function prepareWebsitesConfig(
         array $defaultConfig,
@@ -149,7 +149,7 @@ private function prepareWebsitesConfig(
      * @param array $websitesConfig
      * @param array $storesConfig
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function prepareStoresConfig(
         array $defaultConfig,
@@ -178,7 +178,7 @@ private function prepareStoresConfig(
      * @param array $websites Has next format: (website_code => [website_data])
      * @param int $id
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getWebsiteConfig(array $websites, $id)
     {
diff --git a/app/code/Magento/Store/Model/Config/Processor/Placeholder.php b/app/code/Magento/Store/Model/Config/Processor/Placeholder.php
index 9b09909fc899d..51b1c5f05aa8a 100644
--- a/app/code/Magento/Store/Model/Config/Processor/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Processor/Placeholder.php
@@ -12,20 +12,18 @@
 
 /**
  * Placeholder configuration values processor. Replace placeholders in configuration with config values
- * @since 2.0.0
  */
 class Placeholder implements PostProcessorInterface
 {
     /**
      * @var ConfigPlaceholder
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $configPlaceholder;
 
     /**
      * Placeholder constructor.
      * @param ConfigPlaceholder $configPlaceholder
-     * @since 2.0.0
      */
     public function __construct(ConfigPlaceholder $configPlaceholder)
     {
@@ -34,7 +32,6 @@ public function __construct(ConfigPlaceholder $configPlaceholder)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function process(array $data)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
index 00f9539b9673b..f3a8f1a46c9f1 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
@@ -12,26 +12,26 @@
 
 /**
  * Class for retrieving configuration from DB by default scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DefaultScope implements SourceInterface
 {
     /**
      * @var ScopedFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $collectionFactory;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
     /**
      * @param ScopedFactory $collectionFactory
      * @param Converter $converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ScopedFactory $collectionFactory,
@@ -46,7 +46,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
index 2eb0680821613..9ecffb29787f0 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
@@ -14,37 +14,37 @@
 
 /**
  * Class for retrieving configuration from DB by store scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Store implements SourceInterface
 {
     /**
      * @var ScopedFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $collectionFactory;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
     /**
      * @var WebsiteFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteFactory;
 
     /**
      * @var Website
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteSource;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
@@ -54,7 +54,7 @@ class Store implements SourceInterface
      * @param WebsiteFactory $websiteFactory
      * @param Website $websiteSource
      * @param StoreManagerInterface $storeManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ScopedFactory $collectionFactory,
@@ -75,7 +75,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
index 505ba4a4c7984..bbefce0212f93 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
@@ -13,31 +13,31 @@
 
 /**
  * Class for retrieving configuration from DB by website scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Website implements SourceInterface
 {
     /**
      * @var ScopedFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $collectionFactory;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
     /**
      * @var WebsiteFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteFactory;
 
     /**
      * @var DefaultScope
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $defaultScope;
 
@@ -46,7 +46,7 @@ class Website implements SourceInterface
      * @param Converter $converter
      * @param WebsiteFactory $websiteFactory
      * @param DefaultScope $defaultScope
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ScopedFactory $collectionFactory,
@@ -65,7 +65,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/DefaultScope.php b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/DefaultScope.php
index a78c705db837f..0372bfe5b2b25 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/DefaultScope.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/DefaultScope.php
@@ -12,26 +12,26 @@
 
 /**
  * Class for retrieving configuration from initial by default scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class DefaultScope implements SourceInterface
 {
     /**
      * @var Initial
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $initialConfig;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
     /**
      * @param Initial $initialConfig
      * @param Converter $converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Initial $initialConfig,
@@ -46,7 +46,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Store.php b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Store.php
index 8507c95c6c6d1..63a1bf56ecc7d 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Store.php
@@ -12,31 +12,31 @@
 
 /**
  * Class for retrieving configuration from initial config by store scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Store implements SourceInterface
 {
     /**
      * @var Initial
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $initialConfig;
 
     /**
      * @var Website
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $websiteSource;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
@@ -45,7 +45,7 @@ class Store implements SourceInterface
      * @param Website $website
      * @param StoreManagerInterface $storeManager
      * @param Converter $converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Initial $initialConfig,
@@ -64,7 +64,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Website.php b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Website.php
index 27086c6887852..d09217262c1f9 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Initial/Website.php
@@ -11,25 +11,25 @@
 
 /**
  * Class for retrieving configuration from initial config by website scope
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Website implements SourceInterface
 {
     /**
      * @var Initial
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $initialConfig;
 
     /**
      * @var DefaultScope
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $defaultScope;
 
     /**
      * @var Converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $converter;
 
@@ -37,7 +37,7 @@ class Website implements SourceInterface
      * @param Initial $initialConfig
      * @param DefaultScope $defaultScope
      * @param Converter $converter
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Initial $initialConfig,
@@ -54,7 +54,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/StoreView.php b/app/code/Magento/Store/Model/Config/StoreView.php
index d10022f2f0792..56459e56d68d2 100644
--- a/app/code/Magento/Store/Model/Config/StoreView.php
+++ b/app/code/Magento/Store/Model/Config/StoreView.php
@@ -11,25 +11,21 @@
 
 /**
  * Retrieves theme and locale info associated with store-views
- * @since 2.0.0
  */
 class StoreView
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ThemeProviderInterface
-     * @since 2.0.0
      */
     private $themeProvider;
 
@@ -37,7 +33,6 @@ class StoreView
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -53,7 +48,6 @@ public function __construct(
      * Retrieves a unique list of pairs representing the theme/locale for each store view
      *
      * @return array
-     * @since 2.0.0
      */
     public function retrieveThemeLocalePairs()
     {
@@ -85,7 +79,6 @@ public function retrieveThemeLocalePairs()
      * Retrieves a unique list of locales that are used by store views
      *
      * @return array
-     * @since 2.0.0
      */
     public function retrieveLocales()
     {
@@ -109,7 +102,6 @@ public function retrieveLocales()
      *
      * @param array $arr
      * @return array
-     * @since 2.0.0
      */
     private function removeDuplicates($arr)
     {
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index cc8b309a9ad49..6634e2cb05bd9 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -9,7 +9,6 @@
  * Class StoreConfig
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implements
     \Magento\Store\Api\Data\StoreConfigInterface
@@ -35,7 +34,6 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
      * Get store id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -47,7 +45,6 @@ public function getId()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -58,7 +55,6 @@ public function setId($id)
      * Get store code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -70,7 +66,6 @@ public function getCode()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -81,7 +76,6 @@ public function setCode($code)
      * Get website id of the store
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -93,7 +87,6 @@ public function getWebsiteId()
      *
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -104,7 +97,6 @@ public function setWebsiteId($websiteId)
      * Get store locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -116,7 +108,6 @@ public function getLocale()
      *
      * @param string $locale
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale)
     {
@@ -127,7 +118,6 @@ public function setLocale($locale)
      * Get base currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -139,7 +129,6 @@ public function getBaseCurrencyCode()
      *
      * @param string $baseCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseCurrencyCode($baseCurrencyCode)
     {
@@ -150,7 +139,6 @@ public function setBaseCurrencyCode($baseCurrencyCode)
      * Get default display currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultDisplayCurrencyCode()
     {
@@ -162,7 +150,6 @@ public function getDefaultDisplayCurrencyCode()
      *
      * @param string $defaultDisplayCurrencyCode
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDisplayCurrencyCode($defaultDisplayCurrencyCode)
     {
@@ -173,7 +160,6 @@ public function setDefaultDisplayCurrencyCode($defaultDisplayCurrencyCode)
      * Return the unit of weight
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWeightUnit()
     {
@@ -185,7 +171,6 @@ public function getWeightUnit()
      *
      * @param string $weightUnit
      * @return $this
-     * @since 2.0.0
      */
     public function setWeightUnit($weightUnit)
     {
@@ -196,7 +181,6 @@ public function setWeightUnit($weightUnit)
      * Get base URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -208,7 +192,6 @@ public function getBaseUrl()
      *
      * @param string $baseUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseUrl($baseUrl)
     {
@@ -219,7 +202,6 @@ public function setBaseUrl($baseUrl)
      * Get base link URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseLinkUrl()
     {
@@ -231,7 +213,6 @@ public function getBaseLinkUrl()
      *
      * @param string $baseLinkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseLinkUrl($baseLinkUrl)
     {
@@ -242,7 +223,6 @@ public function setBaseLinkUrl($baseLinkUrl)
      * Get timezone of the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTimezone()
     {
@@ -254,7 +234,6 @@ public function getTimezone()
      *
      * @param string $timezone
      * @return $this
-     * @since 2.0.0
      */
     public function setTimezone($timezone)
     {
@@ -265,7 +244,6 @@ public function setTimezone($timezone)
      * Get base static URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseStaticUrl()
     {
@@ -277,7 +255,6 @@ public function getBaseStaticUrl()
      *
      * @param string $baseStaticUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseStaticUrl($baseStaticUrl)
     {
@@ -288,7 +265,6 @@ public function setBaseStaticUrl($baseStaticUrl)
      * Get base media URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaUrl()
     {
@@ -300,7 +276,6 @@ public function getBaseMediaUrl()
      *
      * @param string $baseMediaUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseMediaUrl($baseMediaUrl)
     {
@@ -311,7 +286,6 @@ public function setBaseMediaUrl($baseMediaUrl)
      * Get secure base URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseUrl()
     {
@@ -323,7 +297,6 @@ public function getSecureBaseUrl()
      *
      * @param string $secureBaseUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseUrl($secureBaseUrl)
     {
@@ -334,7 +307,6 @@ public function setSecureBaseUrl($secureBaseUrl)
      * Get secure base link URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseLinkUrl()
     {
@@ -346,7 +318,6 @@ public function getSecureBaseLinkUrl()
      *
      * @param string $secureBaseLinkUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseLinkUrl($secureBaseLinkUrl)
     {
@@ -357,7 +328,6 @@ public function setSecureBaseLinkUrl($secureBaseLinkUrl)
      * Get secure base static URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseStaticUrl()
     {
@@ -369,7 +339,6 @@ public function getSecureBaseStaticUrl()
      *
      * @param string $secureBaseStaticUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseStaticUrl($secureBaseStaticUrl)
     {
@@ -380,7 +349,6 @@ public function setSecureBaseStaticUrl($secureBaseStaticUrl)
      * Get secure base media URL for the store
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecureBaseMediaUrl()
     {
@@ -392,7 +360,6 @@ public function getSecureBaseMediaUrl()
      *
      * @param string $secureBaseMediaUrl
      * @return $this
-     * @since 2.0.0
      */
     public function setSecureBaseMediaUrl($secureBaseMediaUrl)
     {
@@ -403,7 +370,6 @@ public function setSecureBaseMediaUrl($secureBaseMediaUrl)
      * {@inheritdoc}
      *
      * @return \Magento\Store\Api\Data\StoreConfigExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -415,7 +381,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index b6a18156aa768..e985af7fcbc23 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -17,7 +17,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Framework\DataObject\IdentityInterface,
@@ -30,19 +29,16 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_cacheTag = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'store_group';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'store_group';
 
@@ -50,7 +46,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Group Store collection array
      *
      * @var \Magento\Store\Model\ResourceModel\Store\Collection[]
-     * @since 2.0.0
      */
     protected $_stores;
 
@@ -58,7 +53,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Group store ids array
      *
      * @var int[]
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
@@ -66,7 +60,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Group store codes array
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_storeCodes = [];
 
@@ -74,7 +67,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * The number of stores in a group
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storesCount = 0;
 
@@ -82,31 +74,26 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * Group default store
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_defaultStore;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $_isReadOnly = false;
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config\Data
-     * @since 2.0.0
      */
     protected $_configDataResource;
 
     /**
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_storeListFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -122,7 +109,6 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -154,7 +140,6 @@ public function __construct(
      * Init model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -165,7 +150,6 @@ protected function _construct()
      * Load store collection and set internal data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadStores()
     {
@@ -187,7 +171,6 @@ protected function _loadStores()
      *
      * @param \Magento\Store\Model\Store[] $stores
      * @return void
-     * @since 2.0.0
      */
     public function setStores($stores)
     {
@@ -208,7 +191,6 @@ public function setStores($stores)
      * Retrieve new (not loaded) Store collection object with group filter
      *
      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     public function getStoreCollection()
     {
@@ -219,7 +201,6 @@ public function getStoreCollection()
      * Retrieve website store objects
      *
      * @return \Magento\Store\Model\ResourceModel\Store\Collection[]
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -233,7 +214,6 @@ public function getStores()
      * Retrieve website store ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -247,7 +227,6 @@ public function getStoreIds()
      * Retrieve website store codes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreCodes()
     {
@@ -259,7 +238,6 @@ public function getStoreCodes()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStoresCount()
     {
@@ -273,7 +251,6 @@ public function getStoresCount()
      * Retrieve default store model
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getDefaultStore()
     {
@@ -293,7 +270,6 @@ public function getDefaultStore()
      *
      * @param string $locale
      * @return \Magento\Store\Model\Store|null
-     * @since 2.0.0
      */
     public function getDefaultStoreByLocale($locale)
     {
@@ -314,7 +290,6 @@ public function getDefaultStoreByLocale($locale)
      *
      * @param string $locale
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getStoresByLocale($locale)
     {
@@ -333,7 +308,6 @@ public function getStoresByLocale($locale)
      *
      * @param Website $website
      * @return void
-     * @since 2.0.0
      */
     public function setWebsite(Website $website)
     {
@@ -344,7 +318,6 @@ public function setWebsite(Website $website)
      * Retrieve website model
      *
      * @return Website|bool
-     * @since 2.0.0
      */
     public function getWebsite()
     {
@@ -358,7 +331,6 @@ public function getWebsite()
      * Is can delete group
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCanDelete()
     {
@@ -371,7 +343,6 @@ public function isCanDelete()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultStoreId()
     {
@@ -380,7 +351,6 @@ public function getDefaultStoreId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setDefaultStoreId($defaultStoreId)
     {
@@ -389,7 +359,6 @@ public function setDefaultStoreId($defaultStoreId)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getRootCategoryId()
     {
@@ -398,7 +367,6 @@ public function getRootCategoryId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setRootCategoryId($rootCategoryId)
     {
@@ -407,7 +375,6 @@ public function setRootCategoryId($rootCategoryId)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -416,7 +383,6 @@ public function getWebsiteId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -425,7 +391,6 @@ public function setWebsiteId($websiteId)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -463,7 +428,6 @@ public function afterDelete()
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function isReadOnly($value = null)
     {
@@ -477,7 +441,6 @@ public function isReadOnly($value = null)
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -486,7 +449,6 @@ public function getIdentities()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -495,7 +457,6 @@ public function getName()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -522,7 +483,6 @@ public function setCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -531,7 +491,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Model/GroupRepository.php b/app/code/Magento/Store/Model/GroupRepository.php
index 3f4c9b3d8a169..30b6e8a9e0ef0 100644
--- a/app/code/Magento/Store/Model/GroupRepository.php
+++ b/app/code/Magento/Store/Model/GroupRepository.php
@@ -13,44 +13,38 @@
  * Information Expert in store groups handling
  *
  * @package Magento\Store\Model
- * @since 2.0.0
  */
 class GroupRepository implements \Magento\Store\Api\GroupRepositoryInterface
 {
     /**
      * @var GroupFactory
-     * @since 2.0.0
      */
     protected $groupFactory;
 
     /**
      * @var \Magento\Store\Api\Data\GroupInterface[]
-     * @since 2.0.0
      */
     protected $entities = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $allLoaded = false;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Group\CollectionFactory
-     * @since 2.0.0
      */
     protected $groupCollectionFactory;
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $appConfig;
 
     /**
      * @param GroupFactory $groupFactory
      * @param \Magento\Store\Model\ResourceModel\Group\CollectionFactory $groupCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         GroupFactory $groupFactory,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($id)
     {
@@ -83,7 +76,6 @@ public function get($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -103,7 +95,6 @@ public function getList()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -114,9 +105,9 @@ public function clean()
     /**
      * Retrieve application config.
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfig()
     {
diff --git a/app/code/Magento/Store/Model/Information.php b/app/code/Magento/Store/Model/Information.php
index 2444d2ada2231..9375e91ee42ee 100644
--- a/app/code/Magento/Store/Model/Information.php
+++ b/app/code/Magento/Store/Model/Information.php
@@ -15,7 +15,6 @@
  * Store information class used to retrieve and format store information as set in store config
  *
  * @api
- * @since 2.0.0
  */
 class Information
 {
@@ -43,21 +42,16 @@ class Information
     const XML_PATH_STORE_INFO_VAT_NUMBER = 'general/store_information/merchant_vat_number';
     /**#@-*/
 
-    /**
-     * @var Renderer
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $renderer;
 
     /**
      * @var CountryFactory
-     * @since 2.0.0
      */
     protected $countryFactory;
 
     /**
      * @var RegionFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
@@ -65,7 +59,6 @@ class Information
      * @param Renderer $renderer
      * @param RegionFactory $regionFactory
      * @param CountryFactory $countryFactory
-     * @since 2.0.0
      */
     public function __construct(
         Renderer $renderer,
@@ -82,7 +75,6 @@ public function __construct(
      *
      * @param Store $store
      * @return DataObject
-     * @since 2.0.0
      */
     public function getStoreInformationObject(Store $store)
     {
@@ -115,7 +107,6 @@ public function getStoreInformationObject(Store $store)
      *
      * @param Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedAddress(Store $store)
     {
diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
index d43695ac2ed7d..0a48aa26f356a 100644
--- a/app/code/Magento/Store/Model/PathConfig.php
+++ b/app/code/Magento/Store/Model/PathConfig.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Store\Model\PathConfig
  *
- * @since 2.0.0
  */
 class PathConfig implements \Magento\Framework\App\Router\PathConfigInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var \Magento\Framework\Url\SecurityInfoInterface
-     * @since 2.0.0
      */
     private $urlSecurityInfo;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -34,7 +30,6 @@ class PathConfig implements \Magento\Framework\App\Router\PathConfigInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -51,7 +46,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
     {
@@ -64,7 +58,6 @@ public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $req
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function shouldBeSecure($path)
     {
@@ -91,7 +84,6 @@ public function shouldBeSecure($path)
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultPath()
     {
diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
index 952d9955a9b8e..b40bf49536f4f 100644
--- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php
+++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
@@ -17,25 +17,21 @@
 
 /**
  * Class StoreCookie
- * @since 2.0.0
  */
 class StoreCookie
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var StoreCookieManagerInterface
-     * @since 2.0.0
      */
     protected $storeCookieManager;
 
     /**
      * @var StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
@@ -50,7 +46,6 @@ class StoreCookie
      * @param StoreCookieManagerInterface $storeCookieManager
      * @param StoreRepositoryInterface $storeRepository
      * @param StoreResolverInterface $storeResolver
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -71,7 +66,7 @@ public function __construct(
      * @param \Magento\Framework\App\RequestInterface $request
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function beforeDispatch(
         \Magento\Framework\App\FrontController $subject,
diff --git a/app/code/Magento/Store/Model/Resolver/Store.php b/app/code/Magento/Store/Model/Resolver/Store.php
index d5f113c6a377e..8162bd65907b7 100644
--- a/app/code/Magento/Store/Model/Resolver/Store.php
+++ b/app/code/Magento/Store/Model/Resolver/Store.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Store\Model\Resolver\Store
  *
- * @since 2.0.0
  */
 class Store implements \Magento\Framework\App\ScopeResolverInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
     /**
      * {@inheritdoc}
      * @throws \Magento\Framework\Exception\State\InitException
-     * @since 2.0.0
      */
     public function getScope($scopeId = null)
     {
@@ -46,7 +42,6 @@ public function getScope($scopeId = null)
      * Retrieve a list of available stores
      *
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getScopes()
     {
diff --git a/app/code/Magento/Store/Model/Resolver/Website.php b/app/code/Magento/Store/Model/Resolver/Website.php
index fb2839bbcab3a..996cb22c9002f 100644
--- a/app/code/Magento/Store/Model/Resolver/Website.php
+++ b/app/code/Magento/Store/Model/Resolver/Website.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Store\Model\Resolver\Website
  *
- * @since 2.0.0
  */
 class Website implements \Magento\Framework\App\ScopeResolverInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -31,7 +28,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @throws \Magento\Framework\Exception\State\InitException
-     * @since 2.0.0
      */
     public function getScope($scopeId = null)
     {
@@ -47,7 +43,6 @@ public function getScope($scopeId = null)
      * Retrieve a list of available websites
      *
      * @return \Magento\Store\Model\Website[]
-     * @since 2.0.0
      */
     public function getScopes()
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Config/Collection/Scoped.php b/app/code/Magento/Store/Model/ResourceModel/Config/Collection/Scoped.php
index 15d8a2c4e4771..494b98b59b030 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Config/Collection/Scoped.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Config/Collection/Scoped.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Store\Model\ResourceModel\Config\Collection\Scoped
  *
- * @since 2.0.0
  */
 class Scoped extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Scoped extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abstra
      * Scope to filter by
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_scope;
 
@@ -26,7 +24,6 @@ class Scoped extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abstra
      * Scope id to filter by
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_scopeId;
 
@@ -39,7 +36,6 @@ class Scoped extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abstra
      * @param string $scope
      * @param mixed $connection
      * @param mixed $scopeId
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -60,7 +56,6 @@ public function __construct(
      * Initialize select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Group.php b/app/code/Magento/Store/Model/ResourceModel/Group.php
index a3dd86061c08c..cc57fa457f432 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Group.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Group.php
@@ -9,7 +9,6 @@
  * Store group resource model
  *
  * @api
- * @since 2.0.0
  */
 class Group extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Group extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -58,7 +55,6 @@ protected function _initUniqueFields()
      * @param int $websiteId
      * @param int $groupId
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateWebsiteDefaultGroup($websiteId, $groupId)
     {
@@ -83,7 +79,6 @@ protected function _updateWebsiteDefaultGroup($websiteId, $groupId)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _changeWebsite(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -114,7 +109,6 @@ protected function _changeWebsite(\Magento\Framework\Model\AbstractModel $model)
      * @param int $groupId
      * @param int $websiteId
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateStoreWebsite($groupId, $websiteId)
     {
@@ -130,7 +124,6 @@ protected function _updateStoreWebsite($groupId, $websiteId)
      * @param int $groupId
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveDefaultStore($groupId, $storeId)
     {
@@ -148,7 +141,6 @@ protected function _saveDefaultStore($groupId, $storeId)
      *
      * @param bool $countAdmin
      * @return int
-     * @since 2.0.0
      */
     public function countAll($countAdmin = false)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Group/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Group/Collection.php
index 234326b156ada..cb9a6f31879fc 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Group/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Group/Collection.php
@@ -9,7 +9,6 @@
  * Store group collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param boolean $loadDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setLoadDefault($loadDefault)
     {
@@ -42,7 +39,6 @@ public function setLoadDefault($loadDefault)
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLoadDefault()
     {
@@ -53,7 +49,6 @@ public function getLoadDefault()
      * Add disable default store group filter to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setWithoutDefaultFilter()
     {
@@ -64,7 +59,6 @@ public function setWithoutDefaultFilter()
      * Filter to discard stores without views
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setWithoutStoreViewFilter()
     {
@@ -87,7 +81,6 @@ public function setWithoutAssignedCategoryFilter()
      * Load collection data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeLoad()
     {
@@ -102,7 +95,6 @@ public function _beforeLoad()
      * Convert collection items to array for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -114,7 +106,6 @@ public function toOptionArray()
      *
      * @param int|array $website
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($website)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Store.php b/app/code/Magento/Store/Model/ResourceModel/Store.php
index 346997a05747e..f4fd3219df5a0 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Store.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Store.php
@@ -9,20 +9,17 @@
  * Store Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $configCache;
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Define main table and primary key
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
      *
      * @param bool $countAdmin
      * @return int
-     * @since 2.0.0
      */
     public function countAll($countAdmin = false)
     {
@@ -66,7 +61,6 @@ public function countAll($countAdmin = false)
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -79,7 +73,6 @@ protected function _initUniqueFields()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -95,7 +88,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -115,7 +107,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
      * @param int $groupId
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateGroupDefaultStore($groupId, $storeId)
     {
@@ -144,7 +135,6 @@ protected function _updateGroupDefaultStore($groupId, $storeId)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -171,7 +161,7 @@ protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
      * Read information about all stores
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function readAllStores()
     {
@@ -189,7 +179,6 @@ public function readAllStores()
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Store/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Store/Collection.php
index 78b6347c3d93e..1a3c7b92a5499 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Store/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Store/Collection.php
@@ -9,7 +9,6 @@
  * Stores collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Name prefix of events that are dispatched by model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'store_collection';
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Name of event parameter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'store_collection';
 
@@ -33,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *  Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +42,6 @@ protected function _construct()
      *
      * @param bool $loadDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setLoadDefault($loadDefault)
     {
@@ -59,7 +54,6 @@ public function setLoadDefault($loadDefault)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLoadDefault()
     {
@@ -70,7 +64,6 @@ public function getLoadDefault()
      * Add disable default store filter to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setWithoutDefaultFilter()
     {
@@ -84,7 +77,6 @@ public function setWithoutDefaultFilter()
      *
      * @param int|array $groupId
      * @return $this
-     * @since 2.0.0
      */
     public function addGroupFilter($groupId)
     {
@@ -108,7 +100,6 @@ public function addStatusFilter($status)
      *
      * @param int|array $store
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($store)
     {
@@ -120,7 +111,6 @@ public function addIdFilter($store)
      *
      * @param int|array $website
      * @return $this
-     * @since 2.0.0
      */
     public function addWebsiteFilter($website)
     {
@@ -132,7 +122,6 @@ public function addWebsiteFilter($website)
      *
      * @param int|array $category
      * @return $this
-     * @since 2.0.0
      */
     public function addCategoryFilter($category)
     {
@@ -146,7 +135,6 @@ public function addCategoryFilter($category)
      * Convert items array to array for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -157,7 +145,6 @@ public function toOptionArray()
      * Convert items array to hash for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -170,7 +157,6 @@ public function toOptionHash()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -198,7 +184,6 @@ public function load($printQuery = false, $logQuery = false)
      *
      * @param array $categories
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCategoryIds(array $categories)
     {
@@ -212,7 +197,6 @@ public function loadByCategoryIds(array $categories)
      * Add store root category data to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addRootCategoryIdAttribute()
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website.php b/app/code/Magento/Store/Model/ResourceModel/Website.php
index 234721168be4f..75a5826db1d20 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website.php
@@ -12,7 +12,6 @@
  * Website Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,7 +19,6 @@ class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -46,7 +43,7 @@ protected function _initUniqueFields()
      * [website_code => [website_data (website_id, code, name, etc...)]]
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function readAllWebsites()
     {
@@ -68,7 +65,6 @@ public function readAllWebsites()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -89,7 +85,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -106,7 +101,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -126,7 +120,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
      *
      * @param bool $includeDefault include/exclude default admin website
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getDefaultStoresSelect($includeDefault = false)
     {
@@ -155,7 +148,6 @@ public function getDefaultStoresSelect($includeDefault = false)
      *
      * @param bool $includeDefault
      * @return int
-     * @since 2.0.0
      */
     public function countAll($includeDefault = false)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
index 7259477e1bfd8..19d27e1b498c6 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
@@ -9,7 +9,6 @@
  * Websites collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Map field to alias
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = ['fields' => ['website_id' => 'main_table.website_id']];
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +34,6 @@ protected function _construct()
      * Apply custom filtering
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
@@ -52,7 +48,6 @@ protected function _renderFiltersBefore()
      *
      * @param bool $loadDefault
      * @return $this
-     * @since 2.0.0
      */
     public function setLoadDefault($loadDefault)
     {
@@ -65,7 +60,6 @@ public function setLoadDefault($loadDefault)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getLoadDefault()
     {
@@ -76,7 +70,6 @@ public function getLoadDefault()
      * Convert items array to array for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -87,7 +80,6 @@ public function toOptionArray()
      * Convert items array to hash for select options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -99,7 +91,6 @@ public function toOptionHash()
      *
      * @param int $ids|array
      * @return $this
-     * @since 2.0.0
      */
     public function addIdFilter($ids)
     {
@@ -121,7 +112,6 @@ public function addIdFilter($ids)
      * @param boolean $printQuery
      * @param boolean $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -139,7 +129,6 @@ public function load($printQuery = false, $logQuery = false)
      * sort ordering and store's name.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinGroupAndStore()
     {
@@ -172,7 +161,6 @@ public function joinGroupAndStore()
      *
      * @param int|array $groupIds
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByGroupIds($groupIds)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
index cc956a339f03f..e42b226653b44 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Grid collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Store\Model\ResourceModel\Website\Collection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Store\Model\ResourceModel\Website\Collection
      * Join website and store names
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Store/Model/ScopeInterface.php b/app/code/Magento/Store/Model/ScopeInterface.php
index 5b7703aec4498..d427e326a2003 100644
--- a/app/code/Magento/Store/Model/ScopeInterface.php
+++ b/app/code/Magento/Store/Model/ScopeInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ScopeInterface
 {
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index 84a5705ccce35..aafeeb2833143 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Store\Model\Service\StoreConfigManager
  *
- * @since 2.0.0
  */
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $storeCollectionFactory;
 
     /**
      * @var \Magento\Store\Model\Data\StoreConfigFactory
-     * @since 2.0.0
      */
     protected $storeConfigFactory;
 
@@ -28,7 +25,6 @@ class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterfa
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -36,7 +32,6 @@ class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterfa
      * Map the setters to config path
      *
      * @var array
-     * @since 2.0.0
      */
     protected $configPaths = [
         'setLocale' => 'general/locale/code',
@@ -50,7 +45,6 @@ class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterfa
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\Data\StoreConfigFactory $storeConfigFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory,
@@ -65,7 +59,6 @@ public function __construct(
     /**
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
      * @return \Magento\Store\Api\Data\StoreConfigInterface[]
-     * @since 2.0.0
      */
     public function getStoreConfigs(array $storeCodes = null)
     {
@@ -84,7 +77,6 @@ public function getStoreConfigs(array $storeCodes = null)
     /**
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Store\Api\Data\StoreConfigInterface
-     * @since 2.0.0
      */
     protected function getStoreConfig($store)
     {
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index aca694062e7f5..387c7b3943926 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -33,7 +33,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Store extends AbstractExtensibleModel implements
     AppScopeInterface,
@@ -130,7 +129,6 @@ class Store extends AbstractExtensibleModel implements
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $_configCacheType;
 
@@ -138,7 +136,6 @@ class Store extends AbstractExtensibleModel implements
      * Cache flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_cacheTag = true;
 
@@ -146,7 +143,6 @@ class Store extends AbstractExtensibleModel implements
      * Event prefix for model events
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'store';
 
@@ -154,7 +150,6 @@ class Store extends AbstractExtensibleModel implements
      * Event object name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'store';
 
@@ -162,7 +157,6 @@ class Store extends AbstractExtensibleModel implements
      * Price filter
      *
      * @var \Magento\Directory\Model\Currency\Filter
-     * @since 2.0.0
      */
     protected $_priceFilter;
 
@@ -170,7 +164,6 @@ class Store extends AbstractExtensibleModel implements
      * Store configuration cache
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_configCache = null;
 
@@ -178,7 +171,6 @@ class Store extends AbstractExtensibleModel implements
      * Base nodes of store configuration cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configCacheBaseNodes = [];
 
@@ -186,7 +178,6 @@ class Store extends AbstractExtensibleModel implements
      * Directory cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dirCache = [];
 
@@ -194,7 +185,6 @@ class Store extends AbstractExtensibleModel implements
      * URL cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_urlCache = [];
 
@@ -202,7 +192,6 @@ class Store extends AbstractExtensibleModel implements
      * Base URL cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_baseUrlCache = [];
 
@@ -210,7 +199,6 @@ class Store extends AbstractExtensibleModel implements
      * Session entity
      *
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -218,7 +206,6 @@ class Store extends AbstractExtensibleModel implements
      * Flag that shows that backend URLs are secure
      *
      * @var boolean|null
-     * @since 2.0.0
      */
     protected $_isAdminSecure = null;
 
@@ -226,7 +213,6 @@ class Store extends AbstractExtensibleModel implements
      * Flag that shows that frontend URLs are secure
      *
      * @var boolean|null
-     * @since 2.0.0
      */
     protected $_isFrontSecure = null;
 
@@ -234,7 +220,6 @@ class Store extends AbstractExtensibleModel implements
      * Store frontend name
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_frontendName = null;
 
@@ -242,7 +227,6 @@ class Store extends AbstractExtensibleModel implements
      * Readonly flag
      *
      * @var bool
-     * @since 2.0.0
      */
     private $_isReadOnly = false;
 
@@ -250,25 +234,21 @@ class Store extends AbstractExtensibleModel implements
      * Url model for current store
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCustomEntryPoint = false;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config\Data
-     * @since 2.0.0
      */
     protected $_configDataResource;
 
@@ -276,7 +256,6 @@ class Store extends AbstractExtensibleModel implements
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_coreFileStorageDatabase = null;
 
@@ -284,7 +263,6 @@ class Store extends AbstractExtensibleModel implements
      * Filesystem instance
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -292,49 +270,41 @@ class Store extends AbstractExtensibleModel implements
      * Store Config
      *
      * @var \Magento\Framework\App\Config\ReinitableConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_currencyInstalled;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $_httpContext;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $currencyFactory;
 
     /**
      * @var \Magento\Store\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Store\Api\WebsiteRepositoryInterface
-     * @since 2.0.0
      */
     protected $websiteRepository;
 
     /**
      * @var \Magento\Store\Model\Information
-     * @since 2.0.0
      */
     protected $information;
 
@@ -377,7 +347,6 @@ class Store extends AbstractExtensibleModel implements
      * @param array $data optional generic object data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -435,7 +404,6 @@ public function __construct(
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -448,7 +416,6 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -464,7 +431,6 @@ public function __wakeup()
      * Initialize object
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -475,7 +441,6 @@ protected function _construct()
      * Retrieve store session object
      *
      * @return \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected function _getSession()
     {
@@ -490,7 +455,6 @@ protected function _getSession()
      * Validation rules for store
      *
      * @return \Zend_Validate_Interface|null
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -519,7 +483,6 @@ protected function _getValidationRulesBeforeSave()
      * @param   mixed $key
      * @param   string $field
      * @return  $this
-     * @since 2.0.0
      */
     public function load($key, $field = null)
     {
@@ -534,7 +497,6 @@ public function load($key, $field = null)
      * Retrieve Store code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -543,7 +505,6 @@ public function getCode()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -552,7 +513,6 @@ public function setCode($code)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -561,7 +521,6 @@ public function getName()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -573,7 +532,6 @@ public function setName($name)
      *
      * @param   string $path
      * @return  string|null
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -589,7 +547,6 @@ public function getConfig($path)
      *
      * @param Website $website
      * @return void
-     * @since 2.0.0
      */
     public function setWebsite(Website $website)
     {
@@ -600,7 +557,6 @@ public function setWebsite(Website $website)
      * Retrieve store website
      *
      * @return Website|bool
-     * @since 2.0.0
      */
     public function getWebsite()
     {
@@ -616,7 +572,6 @@ public function getWebsite()
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
@@ -639,7 +594,6 @@ public function getUrl($route = '', $params = [])
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getBaseUrl($type = UrlInterface::URL_TYPE_LINK, $secure = null)
     {
@@ -709,7 +663,6 @@ public function getBaseUrl($type = UrlInterface::URL_TYPE_LINK, $secure = null)
      * Retrieve base media directory path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseMediaDir()
     {
@@ -720,7 +673,6 @@ public function getBaseMediaDir()
      * Retrieve base static directory path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseStaticDir()
     {
@@ -732,7 +684,6 @@ public function getBaseStaticDir()
      *
      * @param   string $url
      * @return  string
-     * @since 2.0.0
      */
     protected function _updatePathUseRewrites($url)
     {
@@ -751,7 +702,6 @@ protected function _updatePathUseRewrites($url)
      * Check if used entry point is custom
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCustomEntryPoint()
     {
@@ -767,7 +717,6 @@ protected function _isCustomEntryPoint()
      * @param Filesystem $filesystem
      * @param bool $secure
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _getMediaScriptUrl(Filesystem $filesystem, $secure)
     {
@@ -783,7 +732,6 @@ protected function _getMediaScriptUrl(Filesystem $filesystem, $secure)
      *
      * @param   string $url
      * @return  string
-     * @since 2.0.0
      */
     protected function _updatePathUseStoreView($url)
     {
@@ -797,7 +745,6 @@ protected function _updatePathUseStoreView($url)
      * Returns whether url forming scheme prepends url path with store view code
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isUseStoreInUrl()
     {
@@ -809,7 +756,6 @@ public function isUseStoreInUrl()
      * Get store identifier
      *
      * @return  int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -820,7 +766,6 @@ public function getId()
      * Check if frontend URLs should be secure
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isFrontUrlSecure()
     {
@@ -833,7 +778,6 @@ public function isFrontUrlSecure()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isUrlSecure()
     {
@@ -844,7 +788,6 @@ public function isUrlSecure()
      * Check if request was secure
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCurrentlySecure()
     {
@@ -874,7 +817,6 @@ public function isCurrentlySecure()
      * Retrieve store base currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -889,7 +831,6 @@ public function getBaseCurrencyCode()
      * Retrieve store base currency
      *
      * @return Currency
-     * @since 2.0.0
      */
     public function getBaseCurrency()
     {
@@ -905,7 +846,6 @@ public function getBaseCurrency()
      * Get default store currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultCurrencyCode()
     {
@@ -917,7 +857,6 @@ public function getDefaultCurrencyCode()
      * Retrieve store default currency
      *
      * @return Currency
-     * @since 2.0.0
      */
     public function getDefaultCurrency()
     {
@@ -934,7 +873,6 @@ public function getDefaultCurrency()
      *
      * @param   string $code
      * @return  string
-     * @since 2.0.0
      */
     public function setCurrentCurrencyCode($code)
     {
@@ -952,7 +890,6 @@ public function setCurrentCurrencyCode($code)
      * Get current store currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentCurrencyCode()
     {
@@ -983,7 +920,6 @@ public function getCurrentCurrencyCode()
      *
      * @param bool $skipBaseNotAllowed
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableCurrencyCodes($skipBaseNotAllowed = false)
     {
@@ -1017,7 +953,6 @@ public function getAvailableCurrencyCodes($skipBaseNotAllowed = false)
      * Array of installed currencies for the scope
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedCurrencies()
     {
@@ -1028,7 +963,6 @@ public function getAllowedCurrencies()
      * Retrieve store current currency
      *
      * @return Currency
-     * @since 2.0.0
      */
     public function getCurrentCurrency()
     {
@@ -1051,7 +985,6 @@ public function getCurrentCurrency()
      * Retrieve current currency rate
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCurrentCurrencyRate()
     {
@@ -1062,7 +995,6 @@ public function getCurrentCurrencyRate()
      * Retrieve root category identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRootCategoryId()
     {
@@ -1077,7 +1009,6 @@ public function getRootCategoryId()
      *
      * @param Group $group
      * @return Store
-     * @since 2.0.0
      */
     public function setGroup(Group $group)
     {
@@ -1089,7 +1020,6 @@ public function setGroup(Group $group)
      * Retrieve group model
      *
      * @return Group|bool
-     * @since 2.0.0
      */
     public function getGroup()
     {
@@ -1103,7 +1033,6 @@ public function getGroup()
      * Retrieve website identifier
      *
      * @return string|int|null
-     * @since 2.0.0
      */
     public function getWebsiteId()
     {
@@ -1113,9 +1042,9 @@ public function getWebsiteId()
     /**
      * Reinit Stores on after save
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return $this
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function afterSave()
     {
@@ -1125,7 +1054,6 @@ public function afterSave()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setWebsiteId($websiteId)
     {
@@ -1136,7 +1064,6 @@ public function setWebsiteId($websiteId)
      * Retrieve group identifier
      *
      * @return string|int|null
-     * @since 2.0.0
      */
     public function getGroupId()
     {
@@ -1147,7 +1074,6 @@ public function getGroupId()
      * Retrieve store group identifier
      *
      * @return string|int|null
-     * @since 2.0.0
      */
     public function getStoreGroupId()
     {
@@ -1156,7 +1082,6 @@ public function getStoreGroupId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setStoreGroupId($storeGroupId)
     {
@@ -1167,7 +1092,6 @@ public function setStoreGroupId($storeGroupId)
      * Retrieve default group identifier
      *
      * @return string|int|null
-     * @since 2.0.0
      */
     public function getDefaultGroupId()
     {
@@ -1178,7 +1102,6 @@ public function getDefaultGroupId()
      * Check if store can be deleted
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCanDelete()
     {
@@ -1210,7 +1133,6 @@ public function isDefault()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getCurrentUrl($fromStore = true)
     {
@@ -1265,7 +1187,6 @@ public function getCurrentUrl($fromStore = true)
      * Check if store is active
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isActive()
     {
@@ -1276,7 +1197,6 @@ public function isActive()
      * Protect delete from non admin area
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -1288,7 +1208,6 @@ public function beforeDelete()
      * Rewrite in order to clear configuration cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -1313,7 +1232,6 @@ public function afterDelete()
      * Reinit and reset Config Data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetConfig()
     {
@@ -1330,7 +1248,6 @@ public function resetConfig()
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function isReadOnly($value = null)
     {
@@ -1344,7 +1261,6 @@ public function isReadOnly($value = null)
      * Retrieve store group name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendName()
     {
@@ -1360,7 +1276,6 @@ public function getFrontendName()
      * Retrieve formatted store address from config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormattedAddress()
     {
@@ -1371,7 +1286,6 @@ public function getFormattedAddress()
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -1380,7 +1294,6 @@ public function getIdentities()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getStorePath()
     {
@@ -1408,7 +1321,6 @@ public function getScopeTypeName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -1417,7 +1329,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Model/StoreCookieManager.php b/app/code/Magento/Store/Model/StoreCookieManager.php
index 8276a9ab17254..c0681f4e5f433 100644
--- a/app/code/Magento/Store/Model/StoreCookieManager.php
+++ b/app/code/Magento/Store/Model/StoreCookieManager.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Store\Model\StoreCookieManager
  *
- * @since 2.0.0
  */
 class StoreCookieManager implements StoreCookieManagerInterface
 {
@@ -25,20 +24,17 @@ class StoreCookieManager implements StoreCookieManagerInterface
 
     /**
      * @var CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $cookieMetadataFactory;
 
     /**
      * @var CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param CookieManagerInterface $cookieManager
-     * @since 2.0.0
      */
     public function __construct(
         CookieMetadataFactory $cookieMetadataFactory,
@@ -50,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreCodeFromCookie()
     {
@@ -59,7 +54,6 @@ public function getStoreCodeFromCookie()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStoreCookie(StoreInterface $store)
     {
@@ -73,7 +67,6 @@ public function setStoreCookie(StoreInterface $store)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteStoreCookie(StoreInterface $store)
     {
diff --git a/app/code/Magento/Store/Model/StoreIsInactiveException.php b/app/code/Magento/Store/Model/StoreIsInactiveException.php
index 3c8cb856ca7cf..545fb0e9d81b7 100644
--- a/app/code/Magento/Store/Model/StoreIsInactiveException.php
+++ b/app/code/Magento/Store/Model/StoreIsInactiveException.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class StoreIsInactiveException extends LocalizedException
 {
@@ -18,7 +17,6 @@ class StoreIsInactiveException extends LocalizedException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
diff --git a/app/code/Magento/Store/Model/StoreManagement.php b/app/code/Magento/Store/Model/StoreManagement.php
index 257fee076db3e..0f4005ff1e5c7 100644
--- a/app/code/Magento/Store/Model/StoreManagement.php
+++ b/app/code/Magento/Store/Model/StoreManagement.php
@@ -10,19 +10,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class StoreManagement implements StoreManagementInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $storesFactory;
 
     /**
      * @param CollectionFactory $storesFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $storesFactory)
     {
@@ -31,7 +28,6 @@ public function __construct(CollectionFactory $storesFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
index 15292ae2a9f53..e6e8df9b3a997 100644
--- a/app/code/Magento/Store/Model/StoreManager.php
+++ b/app/code/Magento/Store/Model/StoreManager.php
@@ -13,7 +13,6 @@
  * Service contract, which manage scopes
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StoreManager implements
     \Magento\Store\Model\StoreManagerInterface,
@@ -36,19 +35,16 @@ class StoreManager implements
 
     /**
      * @var \Magento\Store\Api\StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
     /**
      * @var \Magento\Store\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Store\Api\WebsiteRepositoryInterface
-     * @since 2.0.0
      */
     protected $websiteRepository;
 
@@ -56,19 +52,16 @@ class StoreManager implements
      * Scope config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var StoreResolverInterface
-     * @since 2.0.0
      */
     protected $storeResolver;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -76,7 +69,6 @@ class StoreManager implements
      * Default store code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $currentStoreId = null;
 
@@ -84,7 +76,6 @@ class StoreManager implements
      * Flag that shows that system has only one store view
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasSingleStore;
 
@@ -92,7 +83,6 @@ class StoreManager implements
      * Flag is single store mode allowed
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isSingleStoreAllowed;
 
@@ -104,7 +94,6 @@ class StoreManager implements
      * @param StoreResolverInterface $storeResolver
      * @param \Magento\Framework\Cache\FrontendInterface $cache
      * @param bool $isSingleStoreAllowed
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
@@ -126,7 +115,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCurrentStore($store)
     {
@@ -135,7 +123,6 @@ public function setCurrentStore($store)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsSingleStoreModeAllowed($value)
     {
@@ -144,7 +131,6 @@ public function setIsSingleStoreModeAllowed($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function hasSingleStore()
     {
@@ -154,7 +140,6 @@ public function hasSingleStore()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isSingleStoreMode()
     {
@@ -163,7 +148,6 @@ public function isSingleStoreMode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStore($storeId = null)
     {
@@ -188,7 +172,6 @@ public function getStore($storeId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStores($withDefault = false, $codeKey = false)
     {
@@ -208,7 +191,6 @@ public function getStores($withDefault = false, $codeKey = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getWebsite($websiteId = null)
     {
@@ -229,7 +211,6 @@ public function getWebsite($websiteId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getWebsites($withDefault = false, $codeKey = false)
     {
@@ -249,7 +230,6 @@ public function getWebsites($withDefault = false, $codeKey = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function reinitStores()
     {
@@ -263,7 +243,6 @@ public function reinitStores()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultStoreView()
     {
@@ -274,7 +253,6 @@ public function getDefaultStoreView()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGroup($groupId = null)
     {
@@ -290,7 +268,6 @@ public function getGroup($groupId = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGroups($withDefault = false)
     {
@@ -311,7 +288,6 @@ function ($item) {
      * if Magento has only one store view but it does not check the store view collection
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isSingleStoreModeEnabled()
     {
diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php
index d6f41b93c89f9..40802d4ec4cc0 100644
--- a/app/code/Magento/Store/Model/StoreManagerInterface.php
+++ b/app/code/Magento/Store/Model/StoreManagerInterface.php
@@ -10,7 +10,6 @@
  * Store manager interface
  *
  * @api
- * @since 2.0.0
  */
 interface StoreManagerInterface
 {
@@ -24,7 +23,6 @@ interface StoreManagerInterface
      *
      * @param bool $value
      * @return void
-     * @since 2.0.0
      */
     public function setIsSingleStoreModeAllowed($value);
 
@@ -32,7 +30,6 @@ public function setIsSingleStoreModeAllowed($value);
      * Check if store has only one store view
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasSingleStore();
 
@@ -40,7 +37,6 @@ public function hasSingleStore();
      * Check if system is run in the single store mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSingleStoreMode();
 
@@ -49,7 +45,6 @@ public function isSingleStoreMode();
      *
      * @param null|string|bool|int|\Magento\Store\Api\Data\StoreInterface $storeId
      * @return \Magento\Store\Api\Data\StoreInterface
-     * @since 2.0.0
      */
     public function getStore($storeId = null);
 
@@ -59,7 +54,6 @@ public function getStore($storeId = null);
      * @param bool $withDefault
      * @param bool $codeKey
      * @return \Magento\Store\Api\Data\StoreInterface[]
-     * @since 2.0.0
      */
     public function getStores($withDefault = false, $codeKey = false);
 
@@ -69,7 +63,6 @@ public function getStores($withDefault = false, $codeKey = false);
      * @param null|bool|int|string|\Magento\Store\Api\Data\WebsiteInterface $websiteId
      * @return \Magento\Store\Api\Data\WebsiteInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getWebsite($websiteId = null);
 
@@ -79,7 +72,6 @@ public function getWebsite($websiteId = null);
      * @param bool $withDefault
      * @param bool $codeKey
      * @return \Magento\Store\Api\Data\WebsiteInterface[]
-     * @since 2.0.0
      */
     public function getWebsites($withDefault = false, $codeKey = false);
 
@@ -87,7 +79,6 @@ public function getWebsites($withDefault = false, $codeKey = false);
      * Reinitialize store list
      *
      * @return void
-     * @since 2.0.0
      */
     public function reinitStores();
 
@@ -95,7 +86,6 @@ public function reinitStores();
      * Retrieve default store for default group and website
      *
      * @return \Magento\Store\Api\Data\StoreInterface|null
-     * @since 2.0.0
      */
     public function getDefaultStoreView();
 
@@ -104,7 +94,6 @@ public function getDefaultStoreView();
      *
      * @param null|\Magento\Store\Api\Data\GroupInterface|string $groupId
      * @return \Magento\Store\Api\Data\GroupInterface
-     * @since 2.0.0
      */
     public function getGroup($groupId = null);
 
@@ -113,7 +102,6 @@ public function getGroup($groupId = null);
      *
      * @param bool $withDefault
      * @return \Magento\Store\Api\Data\GroupInterface[]
-     * @since 2.0.0
      */
     public function getGroups($withDefault = false);
 
@@ -122,7 +110,6 @@ public function getGroups($withDefault = false);
      *
      * @param string $store
      * @return void
-     * @since 2.0.0
      */
     public function setCurrentStore($store);
 }
diff --git a/app/code/Magento/Store/Model/StoreRepository.php b/app/code/Magento/Store/Model/StoreRepository.php
index 865b97b3835ac..bef2100dc93ed 100644
--- a/app/code/Magento/Store/Model/StoreRepository.php
+++ b/app/code/Magento/Store/Model/StoreRepository.php
@@ -11,50 +11,43 @@
 
 /**
  * Information Expert in stores handling
- * @since 2.0.0
  */
 class StoreRepository implements \Magento\Store\Api\StoreRepositoryInterface
 {
     /**
      * @var StoreFactory
-     * @since 2.0.0
      */
     protected $storeFactory;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $storeCollectionFactory;
 
     /**
      * @var \Magento\Store\Api\Data\StoreInterface[]
-     * @since 2.0.0
      */
     protected $entities = [];
 
     /**
      * @var \Magento\Store\Api\Data\StoreInterface[]
-     * @since 2.0.0
      */
     protected $entitiesById = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $allLoaded = false;
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $appConfig;
 
     /**
      * @param StoreFactory $storeFactory
      * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         StoreFactory $storeFactory,
@@ -66,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($code)
     {
@@ -89,7 +81,6 @@ public function get($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActiveStoreByCode($code)
     {
@@ -103,7 +94,6 @@ public function getActiveStoreByCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($id)
     {
@@ -127,7 +117,6 @@ public function getById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActiveStoreById($id)
     {
@@ -141,7 +130,6 @@ public function getActiveStoreById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -163,9 +151,9 @@ public function getList()
     /**
      * Retrieve application config.
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfig()
     {
@@ -177,7 +165,6 @@ private function getAppConfig()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean()
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
index 636b5802dec35..dc22ff4173051 100644
--- a/app/code/Magento/Store/Model/StoreResolver.php
+++ b/app/code/Magento/Store/Model/StoreResolver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Store\Model\StoreResolver
  *
- * @since 2.0.0
  */
 class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
 {
@@ -21,43 +20,37 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
 
     /**
      * @var \Magento\Store\Api\StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
     /**
      * @var \Magento\Store\Api\StoreCookieManagerInterface
-     * @since 2.0.0
      */
     protected $storeCookieManager;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Store\Model\StoreResolver\ReaderList
-     * @since 2.0.0
      */
     protected $readerList;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $runMode;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $scopeCode;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $request;
 
@@ -75,7 +68,6 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
      * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList
      * @param string $runMode
      * @param null $scopeCode
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
@@ -97,7 +89,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCurrentStoreId()
     {
@@ -130,7 +121,6 @@ public function getCurrentStoreId()
      * Get stores data
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getStoresData()
     {
@@ -149,7 +139,6 @@ protected function getStoresData()
      * Read stores data. First element is allowed store ids, second is default store id
      *
      * @return array
-     * @since 2.0.0
      */
     protected function readStoresData()
     {
@@ -163,7 +152,6 @@ protected function readStoresData()
      * @param string $storeCode
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     protected function getRequestedStoreByCode($storeCode)
     {
@@ -182,7 +170,6 @@ protected function getRequestedStoreByCode($storeCode)
      * @param int $id
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     protected function getDefaultStoreById($id)
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver/Group.php b/app/code/Magento/Store/Model/StoreResolver/Group.php
index ed01e63b44fc3..fc375ae6c4740 100644
--- a/app/code/Magento/Store/Model/StoreResolver/Group.php
+++ b/app/code/Magento/Store/Model/StoreResolver/Group.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\Store\Model\StoreResolver\Group
  *
- * @since 2.0.0
  */
 class Group implements ReaderInterface
 {
     /**
      * @var \Magento\Store\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Store\Api\StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
     /**
      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
      * @param \Magento\Store\Api\GroupRepositoryInterface $groupRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
@@ -39,7 +35,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllowedStoreIds($scopeCode)
     {
@@ -54,7 +49,6 @@ public function getAllowedStoreIds($scopeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultStoreId($scopeCode)
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver/ReaderInterface.php b/app/code/Magento/Store/Model/StoreResolver/ReaderInterface.php
index 34a121e8747ad..81715001b224d 100644
--- a/app/code/Magento/Store/Model/StoreResolver/ReaderInterface.php
+++ b/app/code/Magento/Store/Model/StoreResolver/ReaderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Store\Model\StoreResolver\ReaderInterface
  *
- * @since 2.0.0
  */
 interface ReaderInterface
 {
@@ -17,7 +16,6 @@ interface ReaderInterface
      *
      * @param string $scopeCode
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedStoreIds($scopeCode);
 
@@ -26,7 +24,6 @@ public function getAllowedStoreIds($scopeCode);
      *
      * @param string $scopeCode
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultStoreId($scopeCode);
 }
diff --git a/app/code/Magento/Store/Model/StoreResolver/ReaderList.php b/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
index 9ab7e0be7c821..ed40dfcce0156 100644
--- a/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
+++ b/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Store\Model\StoreResolver\ReaderList
  *
- * @since 2.0.0
  */
 class ReaderList
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $resolverMap;
 
@@ -31,7 +28,6 @@ class ReaderList
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $resolverMap
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param string $runMode
      * @return ReaderInterface
-     * @since 2.0.0
      */
     public function getReader($runMode)
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver/Store.php b/app/code/Magento/Store/Model/StoreResolver/Store.php
index b6c35472c7465..2d5f8ff8dad15 100644
--- a/app/code/Magento/Store/Model/StoreResolver/Store.php
+++ b/app/code/Magento/Store/Model/StoreResolver/Store.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Store\Model\StoreResolver\Store
  *
- * @since 2.0.0
  */
 class Store implements ReaderInterface
 {
     /**
      * @var \Magento\Store\Api\StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
     /**
      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Api\StoreRepositoryInterface $storeRepository)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Store\Api\StoreRepositoryInterface $storeRe
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllowedStoreIds($scopeCode)
     {
@@ -44,7 +40,6 @@ public function getAllowedStoreIds($scopeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultStoreId($scopeCode)
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php
index dc83d17911bbe..a7fbc7791716d 100644
--- a/app/code/Magento/Store/Model/StoreResolver/Website.php
+++ b/app/code/Magento/Store/Model/StoreResolver/Website.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Store\Model\StoreResolver\Website
  *
- * @since 2.0.0
  */
 class Website implements ReaderInterface
 {
     /**
      * @var \Magento\Store\Api\WebsiteRepositoryInterface
-     * @since 2.0.0
      */
     protected $websiteRepository;
 
     /**
      * @var \Magento\Store\Api\GroupRepositoryInterface
-     * @since 2.0.0
      */
     protected $groupRepository;
 
     /**
      * @var \Magento\Store\Api\StoreRepositoryInterface
-     * @since 2.0.0
      */
     protected $storeRepository;
 
@@ -34,7 +30,6 @@ class Website implements ReaderInterface
      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
      * @param \Magento\Store\Api\WebsiteRepositoryInterface $websiteRepository
      * @param \Magento\Store\Api\GroupRepositoryInterface $groupRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
@@ -48,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllowedStoreIds($scopeCode)
     {
@@ -64,7 +58,6 @@ public function getAllowedStoreIds($scopeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultStoreId($scopeCode)
     {
diff --git a/app/code/Magento/Store/Model/StoresConfig.php b/app/code/Magento/Store/Model/StoresConfig.php
index db5ae2e09229f..cc95028b83875 100644
--- a/app/code/Magento/Store/Model/StoresConfig.php
+++ b/app/code/Magento/Store/Model/StoresConfig.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Store\Model\StoresConfig
  *
- * @since 2.0.0
  */
 class StoresConfig
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     public function getStoresConfigByPath($path)
     {
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index 1f1c43d4ba189..a649befacc636 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -11,7 +11,6 @@
  * Core System Store Model
  *
  * @api
- * @since 2.0.0
  */
 class Store extends \Magento\Framework\DataObject implements OptionSourceInterface
 {
@@ -20,7 +19,6 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
      * websiteId => \Magento\Store\Model\Website
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_websiteCollection = [];
 
@@ -29,7 +27,6 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
      * groupId => \Magento\Store\Model\Group
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_groupCollection = [];
 
@@ -38,19 +35,16 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
      * storeId => \Magento\Store\Model\Store
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeCollection;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $_isAdminScopeAllowed = true;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -59,7 +53,6 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
      * Load Website, Group and Store collections
      *
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -71,7 +64,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      * Load/Reload Website collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadWebsiteCollection()
     {
@@ -83,7 +75,6 @@ protected function _loadWebsiteCollection()
      * Load/Reload Group collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadGroupCollection()
     {
@@ -100,7 +91,6 @@ protected function _loadGroupCollection()
      * Load/Reload Store collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadStoreCollection()
     {
@@ -116,7 +106,6 @@ protected function _loadStoreCollection()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getStoreValuesForForm($empty = false, $all = false)
     {
@@ -175,7 +164,6 @@ public function getStoreValuesForForm($empty = false, $all = false)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [], $websiteIds = [])
     {
@@ -227,7 +215,6 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [
      * @param bool $empty
      * @param bool $all
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteValuesForForm($empty = false, $all = false)
     {
@@ -251,7 +238,6 @@ public function getWebsiteValuesForForm($empty = false, $all = false)
      * @param bool $withDefault
      * @param string $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteOptionHash($withDefault = false, $attribute = 'name')
     {
@@ -268,7 +254,6 @@ public function getWebsiteOptionHash($withDefault = false, $attribute = 'name')
      * @param bool $withDefault
      * @param string $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getStoreOptionHash($withDefault = false, $attribute = 'name')
     {
@@ -284,7 +269,6 @@ public function getStoreOptionHash($withDefault = false, $attribute = 'name')
      *
      * @param string $attribute
      * @return array
-     * @since 2.0.0
      */
     public function getStoreGroupOptionHash($attribute = 'name')
     {
@@ -300,7 +284,6 @@ public function getStoreGroupOptionHash($attribute = 'name')
      *
      * @param int $websiteId
      * @return string|null
-     * @since 2.0.0
      */
     public function getWebsiteName($websiteId)
     {
@@ -317,7 +300,6 @@ public function getWebsiteName($websiteId)
      *
      * @param int $groupId
      * @return string|null
-     * @since 2.0.0
      */
     public function getGroupName($groupId)
     {
@@ -334,7 +316,6 @@ public function getGroupName($groupId)
      *
      * @param int $storeId
      * @return string|null
-     * @since 2.0.0
      */
     public function getStoreName($storeId)
     {
@@ -349,7 +330,6 @@ public function getStoreName($storeId)
      *
      * @param  int $storeId
      * @return \Magento\Store\Model\Store|null
-     * @since 2.0.0
      */
     public function getStoreData($storeId)
     {
@@ -364,7 +344,6 @@ public function getStoreData($storeId)
      *
      * @param  int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getStoreNameWithWebsite($storeId)
     {
@@ -390,7 +369,6 @@ public function getStoreNameWithWebsite($storeId)
      * Retrieve Website collection as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWebsiteCollection()
     {
@@ -401,7 +379,6 @@ public function getWebsiteCollection()
      * Retrieve Group collection as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGroupCollection()
     {
@@ -412,7 +389,6 @@ public function getGroupCollection()
      * Retrieve Store collection as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreCollection()
     {
@@ -425,7 +401,6 @@ public function getStoreCollection()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function reload($type = null)
     {
@@ -456,7 +431,6 @@ public function reload($type = null)
      *
      * @param  int $storeId
      * @return string
-     * @since 2.0.0
      */
     public function getStoreNamePath($storeId)
     {
@@ -482,7 +456,6 @@ public function getStoreNamePath($storeId)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIsAdminScopeAllowed($value)
     {
@@ -494,7 +467,6 @@ public function setIsAdminScopeAllowed($value)
      * Return array of options as value-label pairs
      *
      * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 15b548ca50459..766b6d117cf09 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -23,7 +23,6 @@
  * @method \Magento\Store\Model\Website setIsDefault($value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Website extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Framework\DataObject\IdentityInterface,
@@ -36,19 +35,16 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_cacheTag = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'website';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'website';
 
@@ -56,7 +52,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Cache configuration array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_configCache = [];
 
@@ -64,7 +59,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website Group Collection array
      *
      * @var \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     protected $_groups;
 
@@ -72,7 +66,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website group ids array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_groupIds = [];
 
@@ -80,7 +73,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * The number of groups in a website
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_groupsCount;
 
@@ -88,7 +80,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website Store collection array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_stores;
 
@@ -96,7 +87,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website store ids array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
@@ -104,7 +94,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website store codes array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeCodes = [];
 
@@ -112,7 +101,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * The number of stores in a website
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storesCount = 0;
 
@@ -120,7 +108,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website default group
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_defaultGroup;
 
@@ -128,7 +115,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * Website default store
      *
      * @var Store
-     * @since 2.0.0
      */
     protected $_defaultStore;
 
@@ -136,49 +122,41 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * is can delete website
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCanDelete;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $_isReadOnly = false;
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config\Data
-     * @since 2.0.0
      */
     protected $_configDataResource;
 
     /**
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
-     * @since 2.0.0
      */
     protected $storeListFactory;
 
     /**
      * @var \Magento\Store\Model\GroupFactory
-     * @since 2.0.0
      */
     protected $_storeGroupFactory;
 
     /**
      * @var WebsiteFactory
-     * @since 2.0.0
      */
     protected $_websiteFactory;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -198,7 +176,6 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -238,7 +215,6 @@ public function __construct(
      * init model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -251,7 +227,6 @@ protected function _construct()
      * @param int|string $id
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function load($id, $field = null)
     {
@@ -267,7 +242,6 @@ public function load($id, $field = null)
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfig($path)
     {
@@ -289,7 +263,6 @@ public function getConfig($path)
      * Load group collection and set internal data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadGroups()
     {
@@ -310,7 +283,6 @@ protected function _loadGroups()
      *
      * @param array $groups
      * @return $this
-     * @since 2.0.0
      */
     public function setGroups($groups)
     {
@@ -331,7 +303,6 @@ public function setGroups($groups)
      * Retrieve new (not loaded) Group collection object with website filter
      *
      * @return \Magento\Store\Model\ResourceModel\Group\Collection
-     * @since 2.0.0
      */
     public function getGroupCollection()
     {
@@ -343,7 +314,6 @@ public function getGroupCollection()
      * Retrieve website groups
      *
      * @return \Magento\Store\Model\Store[]
-     * @since 2.0.0
      */
     public function getGroups()
     {
@@ -357,7 +327,6 @@ public function getGroups()
      * Retrieve website group ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGroupIds()
     {
@@ -371,7 +340,6 @@ public function getGroupIds()
      * Retrieve number groups in a website
      *
      * @return int
-     * @since 2.0.0
      */
     public function getGroupsCount()
     {
@@ -385,7 +353,6 @@ public function getGroupsCount()
      * Retrieve default group model
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getDefaultGroup()
     {
@@ -402,7 +369,6 @@ public function getDefaultGroup()
      * Load store collection and set internal data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadStores()
     {
@@ -424,7 +390,6 @@ protected function _loadStores()
      *
      * @param array $stores
      * @return void
-     * @since 2.0.0
      */
     public function setStores($stores)
     {
@@ -445,7 +410,6 @@ public function setStores($stores)
      * Retrieve new (not loaded) Store collection object with website filter
      *
      * @return \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     public function getStoreCollection()
     {
@@ -456,7 +420,6 @@ public function getStoreCollection()
      * Retrieve website store objects
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStores()
     {
@@ -470,7 +433,6 @@ public function getStores()
      * Retrieve website store ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -484,7 +446,6 @@ public function getStoreIds()
      * Retrieve website store codes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreCodes()
     {
@@ -498,7 +459,6 @@ public function getStoreCodes()
      * Retrieve number stores in a website
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStoresCount()
     {
@@ -512,7 +472,6 @@ public function getStoresCount()
      * Can delete website
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCanDelete()
     {
@@ -530,7 +489,6 @@ public function isCanDelete()
      * Retrieve unique website-group-store key for collection with groups and stores
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWebsiteGroupStore()
     {
@@ -539,7 +497,6 @@ public function getWebsiteGroupStore()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultGroupId()
     {
@@ -548,7 +505,6 @@ public function getDefaultGroupId()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setDefaultGroupId($defaultGroupId)
     {
@@ -557,7 +513,6 @@ public function setDefaultGroupId($defaultGroupId)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -566,7 +521,6 @@ public function getCode()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -575,7 +529,6 @@ public function setCode($code)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -584,7 +537,6 @@ public function getName()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -593,7 +545,6 @@ public function setName($name)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -612,7 +563,6 @@ public function beforeDelete()
      * Rewrite in order to clear configuration cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -640,7 +590,6 @@ public function afterSave()
      * Retrieve website base currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseCurrencyCode()
     {
@@ -663,7 +612,6 @@ public function getBaseCurrencyCode()
      * Retrieve website base currency
      *
      * @return \Magento\Directory\Model\Currency
-     * @since 2.0.0
      */
     public function getBaseCurrency()
     {
@@ -679,7 +627,6 @@ public function getBaseCurrency()
      * Retrieve Default Website Store or null
      *
      * @return Store
-     * @since 2.0.0
      */
     public function getDefaultStore()
     {
@@ -694,7 +641,6 @@ public function getDefaultStore()
      *
      * @param bool $withDefault include/exclude default admin website
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getDefaultStoresSelect($withDefault = false)
     {
@@ -706,7 +652,6 @@ public function getDefaultStoresSelect($withDefault = false)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function isReadOnly($value = null)
     {
@@ -720,7 +665,6 @@ public function isReadOnly($value = null)
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
@@ -747,7 +691,6 @@ public function getScopeTypeName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -756,7 +699,6 @@ public function getExtensionAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Model/WebsiteManagement.php b/app/code/Magento/Store/Model/WebsiteManagement.php
index c96a88f834e64..704293827f7c2 100644
--- a/app/code/Magento/Store/Model/WebsiteManagement.php
+++ b/app/code/Magento/Store/Model/WebsiteManagement.php
@@ -10,19 +10,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class WebsiteManagement implements WebsiteManagementInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $websitesFactory;
 
     /**
      * @param CollectionFactory $websitesFactory
-     * @since 2.0.0
      */
     public function __construct(CollectionFactory $websitesFactory)
     {
@@ -31,7 +28,6 @@ public function __construct(CollectionFactory $websitesFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
index a34f88e086b0d..68a5a9a2e0cab 100644
--- a/app/code/Magento/Store/Model/WebsiteRepository.php
+++ b/app/code/Magento/Store/Model/WebsiteRepository.php
@@ -12,56 +12,48 @@
 
 /**
  * Information Expert in store websites handling
- * @since 2.0.0
  */
 class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
 {
     /**
      * @var WebsiteFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $websiteCollectionFactory;
 
     /**
      * @var \Magento\Store\Api\Data\WebsiteInterface[]
-     * @since 2.0.0
      */
     protected $entities = [];
 
     /**
      * @var \Magento\Store\Api\Data\WebsiteInterface[]
-     * @since 2.0.0
      */
     protected $entitiesById = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $allLoaded = false;
 
     /**
      * @var \Magento\Store\Api\Data\WebsiteInterface[]
-     * @since 2.0.0
      */
     protected $default;
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $appConfig;
 
     /**
      * @param WebsiteFactory $factory
      * @param CollectionFactory $websiteCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         WebsiteFactory $factory,
@@ -73,7 +65,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($code)
     {
@@ -96,7 +87,6 @@ public function get($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getById($id)
     {
@@ -119,7 +109,6 @@ public function getById($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList()
     {
@@ -139,7 +128,6 @@ public function getList()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefault()
     {
@@ -163,7 +151,6 @@ public function getDefault()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean()
     {
@@ -176,9 +163,9 @@ public function clean()
     /**
      * Retrieve application config.
      *
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfig()
     {
@@ -191,7 +178,7 @@ private function getAppConfig()
     /**
      * Initialize default website.
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function initDefaultWebsite()
     {
diff --git a/app/code/Magento/Store/Setup/InstallSchema.php b/app/code/Magento/Store/Setup/InstallSchema.php
index f62cc39f231b3..2fd2895ef19e4 100644
--- a/app/code/Magento/Store/Setup/InstallSchema.php
+++ b/app/code/Magento/Store/Setup/InstallSchema.php
@@ -14,7 +14,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
@@ -41,7 +40,6 @@ private function getDefaultCategory()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
index 6a088888ade98..cf0c06a27f3c2 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
@@ -14,7 +14,6 @@
 
 /**
  * Class Store
- * @since 2.0.0
  */
 class Store extends Column
 {
@@ -22,7 +21,6 @@ class Store extends Column
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -30,7 +28,6 @@ class Store extends Column
      * System store
      *
      * @var SystemStore
-     * @since 2.0.0
      */
     protected $systemStore;
 
@@ -56,7 +53,6 @@ class Store extends Column
      * @param array $components
      * @param array $data
      * @param string $storeKey
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -78,7 +74,6 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -96,7 +91,6 @@ public function prepareDataSource(array $dataSource)
      *
      * @param array $item
      * @return string
-     * @since 2.0.0
      */
     protected function prepareItem(array $item)
     {
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
index 3e6669ad321c4..1fc13390e30b5 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Options
- * @since 2.0.0
  */
 class Options implements OptionSourceInterface
 {
@@ -19,7 +18,6 @@ class Options implements OptionSourceInterface
      * Escaper
      *
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -27,19 +25,16 @@ class Options implements OptionSourceInterface
      * System store
      *
      * @var SystemStore
-     * @since 2.0.0
      */
     protected $systemStore;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $currentOptions = [];
 
@@ -48,7 +43,6 @@ class Options implements OptionSourceInterface
      *
      * @param SystemStore $systemStore
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(SystemStore $systemStore, Escaper $escaper)
     {
@@ -60,7 +54,6 @@ public function __construct(SystemStore $systemStore, Escaper $escaper)
      * Get options
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -79,7 +72,6 @@ public function toOptionArray()
      * Generate current options
      *
      * @return void
-     * @since 2.0.0
      */
     protected function generateCurrentOptions()
     {
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
index 415892816018d..affa32653d88e 100644
--- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -10,25 +10,21 @@
 
 /**
  * Plugin for \Magento\Framework\Url\RouteParamsResolver
- * @since 2.0.0
  */
 class RouteParamsResolver
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     protected $queryParamsResolver;
 
@@ -38,7 +34,6 @@ class RouteParamsResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
index 32b84ac41f106..bfca3e7341ef2 100644
--- a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
+++ b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
@@ -10,19 +10,16 @@
 
 /**
  * Plugin for \Magento\Framework\Url\SecurityInfo
- * @since 2.0.0
  */
 class SecurityInfo
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * @param string $url
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsSecure(\Magento\Framework\Url\SecurityInfo $subject, \Closure $proceed, $url)
     {
diff --git a/app/code/Magento/Swagger/Controller/Index/Index.php b/app/code/Magento/Swagger/Controller/Index/Index.php
index e475c75e50fc5..e10a9235c4181 100644
--- a/app/code/Magento/Swagger/Controller/Index/Index.php
+++ b/app/code/Magento/Swagger/Controller/Index/Index.php
@@ -8,19 +8,16 @@
 /**
  * Class Index
  * @package Magento\Swagger\Controller\Index
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     private $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     private $pageFactory;
 
@@ -28,7 +25,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Result\PageFactory $pageFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
index 3220b0565e4c1..5043411e05319 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
@@ -9,13 +9,11 @@
 
 /**
  * Backend swatch abstract block
- * @since 2.0.0
  */
 abstract class AbstractSwatch extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options
 {
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $mediaConfig;
 
@@ -23,7 +21,6 @@ abstract class AbstractSwatch extends \Magento\Eav\Block\Adminhtml\Attribute\Edi
      * Helper to move image from tmp to catalog
      *
      * @var \Magento\Swatches\Helper\Media
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
@@ -35,7 +32,6 @@ abstract class AbstractSwatch extends \Magento\Eav\Block\Adminhtml\Attribute\Edi
      * @param string $inputType
      * @param array $defaultValues
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareUserDefinedAttributeOptionValues($option, $inputType, $defaultValues)
     {
@@ -64,7 +60,6 @@ protected function _prepareUserDefinedAttributeOptionValues($option, $inputType,
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param \Magento\Swatches\Helper\Media $swatchHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -89,7 +84,6 @@ public function __construct(
      * @param integer $storeId
      * @param integer $optionId
      * @return array
-     * @since 2.0.0
      */
     protected function createStoreValues($storeId, $optionId)
     {
@@ -107,7 +101,6 @@ protected function createStoreValues($storeId, $optionId)
      *
      * @param int $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getStoreOptionValues($storeId)
     {
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Text.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Text.php
index e4b9419ae386f..e2a16a020f6b5 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Text.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Text.php
@@ -9,13 +9,11 @@
  * Block Class for Text Swatch
  *
  * @api
- * @since 2.0.0
  */
 class Text extends AbstractSwatch
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Swatches::catalog/product/attribute/text.phtml';
 
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
index e6a24e96c610a..2437f095025ab 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
@@ -9,13 +9,11 @@
  * Block Class for Visual Swatch
  *
  * @api
- * @since 2.0.0
  */
 class Visual extends AbstractSwatch
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Swatches::catalog/product/attribute/visual.phtml';
 
@@ -28,7 +26,6 @@ class Visual extends AbstractSwatch
      * @param integer $storeId
      * @param integer $optionId
      * @return array
-     * @since 2.0.0
      */
     protected function createStoreValues($storeId, $optionId)
     {
@@ -88,7 +85,6 @@ public function getJsonConfig()
      * @codeCoverageIgnore
      * @param null $swatchStoreValue
      * @return string
-     * @since 2.0.0
      */
     protected function reformatSwatchLabels($swatchStoreValue = null)
     {
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
index dc213634273c1..a76739e2e419d 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
@@ -15,7 +15,6 @@
 
 /**
  * Class Form
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\Data\Form
 {
@@ -51,7 +50,6 @@ public function __construct(
     /**
      * @param array $values
      * @return $this
-     * @since 2.0.0
      */
     public function addValues($values)
     {
@@ -74,7 +72,6 @@ public function addValues($values)
     /**
      * @param array $values
      * @return array
-     * @since 2.0.0
      */
     protected function getAdditionalData(array $values)
     {
diff --git a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
index 9d94c32031d26..d27a0ae481ea3 100644
--- a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
+++ b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
@@ -15,7 +15,6 @@
  * Class RenderLayered Render Swatches at Layered Navigation
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RenderLayered extends Template
 {
@@ -28,37 +27,31 @@ class RenderLayered extends Template
      * Path to template file.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Swatches::product/layered/renderer.phtml';
 
     /**
      * @var \Magento\Eav\Model\Attribute
-     * @since 2.0.0
      */
     protected $eavAttribute;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\AbstractFilter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var AttributeFactory
-     * @since 2.0.0
      */
     protected $layerAttribute;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
     /**
      * @var \Magento\Swatches\Helper\Media
-     * @since 2.0.0
      */
     protected $mediaHelper;
 
@@ -69,7 +62,6 @@ class RenderLayered extends Template
      * @param \Magento\Swatches\Helper\Data $swatchHelper
      * @param \Magento\Swatches\Helper\Media $mediaHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -91,7 +83,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Layer\Filter\AbstractFilter $filter
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setSwatchFilter(\Magento\Catalog\Model\Layer\Filter\AbstractFilter $filter)
     {
@@ -103,7 +94,6 @@ public function setSwatchFilter(\Magento\Catalog\Model\Layer\Filter\AbstractFilt
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSwatchData()
     {
@@ -138,7 +128,6 @@ public function getSwatchData()
      * @param string $attributeCode
      * @param int $optionId
      * @return string
-     * @since 2.0.0
      */
     public function buildUrl($attributeCode, $optionId)
     {
@@ -149,7 +138,6 @@ public function buildUrl($attributeCode, $optionId)
     /**
      * @param Option $swatchOption
      * @return array
-     * @since 2.0.0
      */
     protected function getUnusedOption(Option $swatchOption)
     {
@@ -164,7 +152,6 @@ protected function getUnusedOption(Option $swatchOption)
      * @param FilterItem[] $filterItems
      * @param Option $swatchOption
      * @return array
-     * @since 2.0.0
      */
     protected function getFilterOption(array $filterItems, Option $swatchOption)
     {
@@ -181,7 +168,6 @@ protected function getFilterOption(array $filterItems, Option $swatchOption)
      * @param FilterItem $filterItem
      * @param Option $swatchOption
      * @return array
-     * @since 2.0.0
      */
     protected function getOptionViewData(FilterItem $filterItem, Option $swatchOption)
     {
@@ -202,7 +188,6 @@ protected function getOptionViewData(FilterItem $filterItem, Option $swatchOptio
     /**
      * @param FilterItem $filterItem
      * @return bool
-     * @since 2.0.0
      */
     protected function isOptionVisible(FilterItem $filterItem)
     {
@@ -211,7 +196,6 @@ protected function isOptionVisible(FilterItem $filterItem)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function isShowEmptyResults()
     {
@@ -221,7 +205,6 @@ protected function isShowEmptyResults()
     /**
      * @param FilterItem $filterItem
      * @return bool
-     * @since 2.0.0
      */
     protected function isOptionDisabled(FilterItem $filterItem)
     {
@@ -232,7 +215,6 @@ protected function isOptionDisabled(FilterItem $filterItem)
      * @param FilterItem[] $filterItems
      * @param integer $id
      * @return bool|FilterItem
-     * @since 2.0.0
      */
     protected function getFilterItemById(array $filterItems, $id)
     {
@@ -248,7 +230,6 @@ protected function getFilterItemById(array $filterItems, $id)
      * @param string $type
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     public function getSwatchPath($type, $filename)
     {
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index 525a6cbcc6b1d..0d0438050ab34 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -26,7 +26,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable implements
     \Magento\Framework\DataObject\IdentityInterface
@@ -48,35 +47,31 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
 
     /**
      * @var Product
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var SwatchData
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
     /**
      * @var Media
-     * @since 2.0.0
      */
     protected $swatchMediaHelper;
 
     /**
      * Indicate if product has one or more Swatch attributes
      *
-     * @deprecated 2.2.0 unused
+     * @deprecated 2.1.6 unused
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $isProductHasSwatchAttribute;
 
     /**
      * @var SwatchAttributesProvider
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $swatchAttributesProvider;
 
@@ -94,7 +89,6 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      * @param array $data other data
      * @param SwatchAttributesProvider $swatchAttributesProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -153,7 +147,6 @@ protected function getCacheLifetime()
      * Get Swatch config data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonSwatchConfig()
     {
@@ -180,7 +173,6 @@ public function getJsonSwatchConfig()
      * Other swatches can be shown after click button 'Show more'
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNumberSwatchesPerProduct()
     {
@@ -195,7 +187,6 @@ public function getNumberSwatchesPerProduct()
      *
      * @param Product $product
      * @return $this
-     * @since 2.0.0
      */
     public function setProduct(Product $product)
     {
@@ -207,7 +198,6 @@ public function setProduct(Product $product)
      * Override parent function
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -220,7 +210,6 @@ public function getProduct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getSwatchAttributesData()
     {
@@ -228,11 +217,10 @@ protected function getSwatchAttributesData()
     }
 
     /**
-     * @deprecated 2.2.0 Method isProductHasSwatchAttribute() is used instead of this.
+     * @deprecated 2.1.6 Method isProductHasSwatchAttribute() is used instead of this.
      *
      * @codeCoverageIgnore
      * @return void
-     * @since 2.0.0
      */
     protected function initIsProductHasSwatchAttribute()
     {
@@ -243,7 +231,7 @@ protected function initIsProductHasSwatchAttribute()
      * Check that product has at least one swatch attribute
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.6
      */
     protected function isProductHasSwatchAttribute()
     {
@@ -258,7 +246,6 @@ protected function isProductHasSwatchAttribute()
      * @param array $swatchesCollectionArray
      * @param array $attributeDataArray
      * @return array
-     * @since 2.0.0
      */
     protected function addSwatchDataForAttribute(
         array $options,
@@ -284,7 +271,6 @@ protected function addSwatchDataForAttribute(
      * @param integer $optionId
      * @param array $attributeDataArray
      * @return array
-     * @since 2.0.0
      */
     protected function addAdditionalMediaData(array $swatch, $optionId, array $attributeDataArray)
     {
@@ -305,7 +291,6 @@ protected function addAdditionalMediaData(array $swatch, $optionId, array $attri
      *
      * @param array $swatchDataArray
      * @return array
-     * @since 2.0.0
      */
     protected function extractNecessarySwatchData(array $swatchDataArray)
     {
@@ -333,7 +318,6 @@ protected function extractNecessarySwatchData(array $swatchDataArray)
      * @param string $attributeCode
      * @param integer $optionId
      * @return array
-     * @since 2.0.0
      */
     protected function getVariationMedia($attributeCode, $optionId)
     {
@@ -364,7 +348,6 @@ protected function getVariationMedia($attributeCode, $optionId)
      * @param Product $childProduct
      * @param string $imageType
      * @return string
-     * @since 2.0.0
      */
     protected function getSwatchProductImage(Product $childProduct, $imageType)
     {
@@ -384,7 +367,6 @@ protected function getSwatchProductImage(Product $childProduct, $imageType)
      * @param Product $product
      * @param string $imageType
      * @return bool
-     * @since 2.0.0
      */
     protected function isProductHasImage(Product $product, $imageType)
     {
@@ -394,7 +376,7 @@ protected function isProductHasImage(Product $product, $imageType)
     /**
      * @param array $attributeData
      * @return array
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function getConfigurableOptionsIds(array $attributeData)
     {
@@ -416,7 +398,7 @@ protected function getConfigurableOptionsIds(array $attributeData)
      * Produce and return block's html output
      *
      * @return string
-     * @since 2.1.0
+     * @since 2.2.0
      */
     public function toHtml()
     {
@@ -431,7 +413,6 @@ public function toHtml()
      * Return HTML code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -444,7 +425,6 @@ protected function _toHtml()
      * Template for product with swatches is different from product without swatches
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getRendererTemplate()
     {
@@ -453,9 +433,8 @@ protected function getRendererTemplate()
     }
 
     /**
-     * @deprecated 2.2.0 Now is used _toHtml() directly
+     * @deprecated 2.1.6 Now is used _toHtml() directly
      * @return string
-     * @since 2.0.0
      */
     protected function getHtmlOutput()
     {
@@ -464,7 +443,6 @@ protected function getHtmlOutput()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMediaCallback()
     {
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
index 9a7aaf3e52b81..2277b17fceb40 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -11,13 +11,11 @@
  * Swatch renderer block in Category page
  *
  * @api
- * @since 2.0.0
  */
 class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getRendererTemplate()
     {
@@ -30,7 +28,7 @@ protected function getRendererTemplate()
      * Produce and return block's html output
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.6
      */
     protected function _toHtml()
     {
@@ -44,7 +42,6 @@ protected function _toHtml()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getSwatchAttributesData()
     {
@@ -62,7 +59,6 @@ protected function getSwatchAttributesData()
      * Composes configuration for js
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsonConfig()
     {
diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php b/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php
index 8f28615fa33a9..d15291d5a0e45 100644
--- a/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php
+++ b/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php
@@ -9,7 +9,6 @@
 
 /**
  * Class to show swatch image and save it on disk
- * @since 2.0.0
  */
 class Show extends \Magento\Backend\App\Action
 {
@@ -24,31 +23,26 @@ class Show extends \Magento\Backend\App\Action
      * Helper to move image from tmp to catalog
      *
      * @var \Magento\Swatches\Helper\Media
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
     /**
      * @var \Magento\Framework\Image\AdapterFactory
-     * @since 2.0.0
      */
     protected $adapterFactory;
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $uploaderFactory;
 
@@ -59,7 +53,6 @@ class Show extends \Magento\Backend\App\Action
      * @param \Magento\Catalog\Model\Product\Media\Config $config
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -81,7 +74,6 @@ public function __construct(
      * Image upload action in iframe
      *
      * @return string
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
index a8a64f2ef3a11..dfda76372df1f 100644
--- a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
+++ b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Save
- * @since 2.0.0
  */
 class Save
 {
@@ -21,7 +20,6 @@ class Save
      * @param RequestInterface $request
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeDispatch(Attribute\Save $subject, RequestInterface $request)
     {
diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
index 4979c5c40ad50..079ba8f897127 100644
--- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
@@ -11,19 +11,16 @@
 
 /**
  * Class Media
- * @since 2.0.0
  */
 class Media extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Catalog\Model\Product Factory
-     * @since 2.0.0
      */
     protected $productModelFactory;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.0.0
      */
     private $swatchHelper;
 
@@ -31,7 +28,6 @@ class Media extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param \Magento\Catalog\Model\ProductFactory $productModelFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Get product media for specified configurable product variation
      *
      * @return string
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index b50b6ec9f0ee3..ef6c542393300 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -24,7 +24,6 @@
  * Class Helper Data
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Data
 {
@@ -40,25 +39,21 @@ class Data
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $productCollectionFactory;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var SwatchCollectionFactory
-     * @since 2.0.0
      */
     protected $swatchCollectionFactory;
 
@@ -66,7 +61,6 @@ class Data
      * Catalog Image Helper
      *
      * @var Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
@@ -80,7 +74,7 @@ class Data
 
     /**
      * @var SwatchAttributesProvider
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $swatchAttributesProvider;
 
@@ -88,7 +82,6 @@ class Data
      * Data key which should populated to Attribute entity from "additional_data" field
      *
      * @var array
-     * @since 2.0.0
      */
     protected $eavAttributeAdditionalDataKeys = [
         Swatch::SWATCH_INPUT_TYPE_KEY,
@@ -112,7 +105,6 @@ class Data
      * @param Image $imageHelper
      * @param Json|null $serializer
      * @param SwatchAttributesProvider $swatchAttributesProvider
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
@@ -136,7 +128,6 @@ public function __construct(
     /**
      * @param Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function assembleAdditionalDataEavAttribute(Attribute $attribute)
     {
@@ -164,7 +155,6 @@ public function assembleAdditionalDataEavAttribute(Attribute $attribute)
     /**
      * @param Attribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     private function populateAdditionalDataEavAttribute(Attribute $attribute)
     {
@@ -187,7 +177,7 @@ private function populateAdditionalDataEavAttribute(Attribute $attribute)
      * @param ModelProduct $configurableProduct
      * @param array $requiredAttributes
      * @return bool|Product
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function loadFirstVariation($attributeCode, ModelProduct $configurableProduct, array $requiredAttributes)
     {
@@ -210,7 +200,6 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
      * @param Product $configurableProduct
      * @param array $requiredAttributes
      * @return bool|Product
-     * @since 2.0.0
      */
     public function loadFirstVariationWithSwatchImage(Product $configurableProduct, array $requiredAttributes)
     {
@@ -221,7 +210,6 @@ public function loadFirstVariationWithSwatchImage(Product $configurableProduct,
      * @param Product $configurableProduct
      * @param array $requiredAttributes
      * @return bool|Product
-     * @since 2.0.0
      */
     public function loadFirstVariationWithImage(Product $configurableProduct, array $requiredAttributes)
     {
@@ -234,7 +222,6 @@ public function loadFirstVariationWithImage(Product $configurableProduct, array
      * @param Product $parentProduct
      * @param array $attributes
      * @return bool|Product
-     * @since 2.0.0
      */
     public function loadVariationByFallback(Product $parentProduct, array $attributes)
     {
@@ -278,7 +265,6 @@ public function loadVariationByFallback(Product $parentProduct, array $attribute
      * @param ProductCollection $productCollection
      * @param array $attributes
      * @return void
-     * @since 2.0.0
      */
     private function addFilterByAttributes(ProductCollection $productCollection, array $attributes)
     {
@@ -291,7 +277,6 @@ private function addFilterByAttributes(ProductCollection $productCollection, arr
      * @param ProductCollection $productCollection
      * @param integer $parentId
      * @return void
-     * @since 2.0.0
      */
     private function addFilterByParent(ProductCollection $productCollection, $parentId)
     {
@@ -317,7 +302,6 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      * ]
      * @param ModelProduct $product
      * @return array
-     * @since 2.0.0
      */
     public function getProductMediaGallery(ModelProduct $product)
     {
@@ -348,7 +332,6 @@ public function getProductMediaGallery(ModelProduct $product)
     /**
      * @param ModelProduct $product
      * @return array
-     * @since 2.0.0
      */
     private function getGalleryImages(ModelProduct $product)
     {
@@ -370,7 +353,6 @@ private function getGalleryImages(ModelProduct $product)
      * @param ModelProduct $product
      * @param string $imageFile
      * @return array
-     * @since 2.0.0
      */
     private function getAllSizeImages(ModelProduct $product, $imageFile)
     {
@@ -392,7 +374,6 @@ private function getAllSizeImages(ModelProduct $product, $imageFile)
      *
      * @param Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute[]
-     * @since 2.0.0
      */
     private function getSwatchAttributes(Product $product)
     {
@@ -405,7 +386,6 @@ private function getSwatchAttributes(Product $product)
      *
      * @param Product $product
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute[]
-     * @since 2.0.0
      */
     public function getAttributesFromConfigurable(Product $product)
     {
@@ -428,7 +408,6 @@ public function getAttributesFromConfigurable(Product $product)
      *
      * @param Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getSwatchAttributesAsArray(Product $product)
     {
@@ -457,7 +436,6 @@ public function getSwatchAttributesAsArray(Product $product)
      *
      * @param array $optionIds
      * @return array
-     * @since 2.0.0
      */
     public function getSwatchesByOptionsId(array $optionIds)
     {
@@ -521,7 +499,6 @@ private function setCachedSwatches(array $optionIds, array $swatches)
      * @param array $fallbackValues
      * @param array $swatches
      * @return array
-     * @since 2.0.0
      */
     private function addFallbackOptions(array $fallbackValues, array $swatches)
     {
@@ -542,7 +519,6 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
      *
      * @param Product $product
      * @return bool
-     * @since 2.0.0
      */
     public function isProductHasSwatch(Product $product)
     {
@@ -555,7 +531,6 @@ public function isProductHasSwatch(Product $product)
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isSwatchAttribute(Attribute $attribute)
     {
@@ -568,7 +543,6 @@ public function isSwatchAttribute(Attribute $attribute)
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isVisualSwatch(Attribute $attribute)
     {
@@ -583,7 +557,6 @@ public function isVisualSwatch(Attribute $attribute)
      *
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     public function isTextSwatch(Attribute $attribute)
     {
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index 8c58e7b377263..1123c1c06d3e4 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -13,7 +13,6 @@
  * Helper to move images from tmp to catalog directory
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Media extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -25,13 +24,11 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
-     * @since 2.0.0
      */
     protected $mediaConfig;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
@@ -39,7 +36,6 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      * Core file storage database
      *
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $fileStorageDb = null;
 
@@ -47,31 +43,26 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Image\Factory
-     * @since 2.0.0
      */
     protected $imageFactory;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
-     * @since 2.0.0
      */
     protected $themeCollection;
 
     /**
      * @var \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     protected $viewConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $swatchImageTypes = ['swatch_image', 'swatch_thumb'];
 
@@ -89,7 +80,6 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Image\Factory $imageFactory
      * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
      * @param \Magento\Framework\View\ConfigInterface $configInterface
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
@@ -113,7 +103,6 @@ public function __construct(
      * @param string $swatchType
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getSwatchAttributeImage($swatchType, $file)
     {
@@ -131,7 +120,6 @@ public function getSwatchAttributeImage($swatchType, $file)
      *
      * @param string $file
      * @return string path
-     * @since 2.0.0
      */
     public function moveImageFromTmp($file)
     {
@@ -166,7 +154,6 @@ public function moveImageFromTmp($file)
      *
      * @param <type> $file
      * @return string
-     * @since 2.0.0
      */
     protected function getUniqueFileName($file)
     {
@@ -189,7 +176,6 @@ protected function getUniqueFileName($file)
      *
      * @param string $imageUrl
      * @return $this
-     * @since 2.0.0
      */
     public function generateSwatchVariations($imageUrl)
     {
@@ -212,7 +198,6 @@ public function generateSwatchVariations($imageUrl)
      * @param \Magento\Framework\Image $image
      * @param bool $isSwatch
      * @return $this
-     * @since 2.0.0
      */
     protected function setupImageProperties(\Magento\Framework\Image $image, $isSwatch = false)
     {
@@ -234,7 +219,6 @@ protected function setupImageProperties(\Magento\Framework\Image $image, $isSwat
      * @param string $imageUrl
      * @param string $swatchType
      * @return array
-     * @since 2.0.0
      */
     protected function generateNamePath($imageConfig, $imageUrl, $swatchType)
     {
@@ -252,7 +236,6 @@ protected function generateNamePath($imageConfig, $imageUrl, $swatchType)
      * @param string $swatchType
      * @param null $imageConfig
      * @return string
-     * @since 2.0.0
      */
     public function getFolderNameSize($swatchType, $imageConfig = null)
     {
@@ -266,7 +249,6 @@ public function getFolderNameSize($swatchType, $imageConfig = null)
      * Merged config from view.xml
      *
      * @return array
-     * @since 2.0.0
      */
     public function getImageConfig()
     {
@@ -289,7 +271,6 @@ public function getImageConfig()
      *
      * @param string $imageUrl
      * @return array
-     * @since 2.0.0
      */
     protected function prepareFileName($imageUrl)
     {
@@ -303,7 +284,6 @@ protected function prepareFileName($imageUrl)
      * Url type http://url/pub/media/attribute/swatch/
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSwatchMediaUrl()
     {
@@ -317,7 +297,6 @@ public function getSwatchMediaUrl()
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeSwatchPath($file)
     {
@@ -328,7 +307,6 @@ public function getAttributeSwatchPath($file)
      * Media swatch path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSwatchMediaPath()
     {
@@ -340,7 +318,6 @@ public function getSwatchMediaPath()
      *
      * @param string $swatchType
      * @return string
-     * @since 2.0.0
      */
     public function getSwatchCachePath($swatchType)
     {
@@ -352,7 +329,6 @@ public function getSwatchCachePath($swatchType)
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     protected function prepareFile($file)
     {
diff --git a/app/code/Magento/Swatches/Model/AttributesList.php b/app/code/Magento/Swatches/Model/AttributesList.php
index aa316c6d0d2d8..8a1b380f1db0b 100644
--- a/app/code/Magento/Swatches/Model/AttributesList.php
+++ b/app/code/Magento/Swatches/Model/AttributesList.php
@@ -9,26 +9,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AttributesList implements AttributesListInterface
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.0.0
      */
     protected $dataHelper;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param \Magento\Swatches\Helper\Data $dataHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     public function getAttributes($ids)
     {
diff --git a/app/code/Magento/Swatches/Model/Form/Element/AbstractSwatch.php b/app/code/Magento/Swatches/Model/Form/Element/AbstractSwatch.php
index b0298a35a081d..93a58e7783692 100644
--- a/app/code/Magento/Swatches/Model/Form/Element/AbstractSwatch.php
+++ b/app/code/Magento/Swatches/Model/Form/Element/AbstractSwatch.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Swatches\Model\Form\Element\AbstractSwatch
  *
- * @since 2.0.0
  */
 class AbstractSwatch extends \Magento\Framework\Data\Form\Element\Select
 {
@@ -17,7 +16,6 @@ class AbstractSwatch extends \Magento\Framework\Data\Form\Element\Select
      *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getValues()
     {
diff --git a/app/code/Magento/Swatches/Model/Form/Element/SwatchText.php b/app/code/Magento/Swatches/Model/Form/Element/SwatchText.php
index 3221f94da1f13..df8c522aecb6c 100644
--- a/app/code/Magento/Swatches/Model/Form/Element/SwatchText.php
+++ b/app/code/Magento/Swatches/Model/Form/Element/SwatchText.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Swatches\Model\Form\Element\SwatchText
  *
- * @since 2.0.0
  */
 class SwatchText extends AbstractSwatch
 {
diff --git a/app/code/Magento/Swatches/Model/Form/Element/SwatchVisual.php b/app/code/Magento/Swatches/Model/Form/Element/SwatchVisual.php
index e7a56a3f3c241..de5d172d92135 100644
--- a/app/code/Magento/Swatches/Model/Form/Element/SwatchVisual.php
+++ b/app/code/Magento/Swatches/Model/Form/Element/SwatchVisual.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Swatches\Model\Form\Element\SwatchVisual
  *
- * @since 2.0.0
  */
 class SwatchVisual extends AbstractSwatch
 {
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 5c1f87c6e70d8..8bdfef25a9d9e 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -13,7 +13,6 @@
 
 /**
  * Plugin model for Catalog Resource Attribute
- * @since 2.0.0
  */
 class EavAttribute
 {
@@ -26,19 +25,16 @@ class EavAttribute
 
     /**
      * @var \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory
-     * @since 2.0.0
      */
     protected $swatchCollectionFactory;
 
     /**
      * @var \Magento\Swatches\Model\SwatchFactory
-     * @since 2.0.0
      */
     protected $swatchFactory;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
@@ -46,7 +42,6 @@ class EavAttribute
      * Array which contains links for new created attributes for swatches
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dependencyArray = [];
 
@@ -54,7 +49,6 @@ class EavAttribute
      * Swatch existing status
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isSwatchExists;
 
@@ -71,7 +65,6 @@ class EavAttribute
      * @param \Magento\Swatches\Model\SwatchFactory $swatchFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory $collectionFactory,
@@ -108,7 +101,6 @@ public function beforeBeforeSave(Attribute $attribute)
      * @param Attribute $attribute
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function afterAfterSave(Attribute $attribute)
     {
@@ -124,7 +116,6 @@ public function afterAfterSave(Attribute $attribute)
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function setProperOptionsArray(Attribute $attribute)
     {
@@ -152,7 +143,6 @@ protected function setProperOptionsArray(Attribute $attribute)
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function convertSwatchToDropdown(Attribute $attribute)
     {
@@ -174,7 +164,6 @@ protected function convertSwatchToDropdown(Attribute $attribute)
      * @param Attribute $attribute
      * @return Attribute
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function processSwatchOptions(Attribute $attribute)
     {
@@ -194,7 +183,6 @@ protected function processSwatchOptions(Attribute $attribute)
      *
      * @param array $optionsArray
      * @return array
-     * @since 2.0.0
      */
     protected function prepareOptionIds(array $optionsArray)
     {
@@ -216,7 +204,6 @@ protected function prepareOptionIds(array $optionsArray)
      * @param array $optionsArray
      * @param array $attributeSavedOptions
      * @return void
-     * @since 2.0.0
      */
     protected function prepareOptionLinks(array $optionsArray, array $attributeSavedOptions)
     {
@@ -237,7 +224,6 @@ protected function prepareOptionLinks(array $optionsArray, array $attributeSaved
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function saveSwatchParams(Attribute $attribute)
     {
@@ -253,7 +239,6 @@ protected function saveSwatchParams(Attribute $attribute)
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function processVisualSwatch(Attribute $attribute)
     {
@@ -279,7 +264,6 @@ protected function processVisualSwatch(Attribute $attribute)
     /**
      * @param string $value
      * @return int
-     * @since 2.0.0
      */
     private function determineSwatchType($value)
     {
@@ -297,7 +281,6 @@ private function determineSwatchType($value)
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function processTextualSwatch(Attribute $attribute)
     {
@@ -335,7 +318,6 @@ protected function processTextualSwatch(Attribute $attribute)
      *
      * @param integer $optionId
      * @return int
-     * @since 2.0.0
      */
     protected function getAttributeOptionId($optionId)
     {
@@ -351,7 +333,6 @@ protected function getAttributeOptionId($optionId)
      * @param Attribute $attribute
      * @param integer $optionId
      * @return bool
-     * @since 2.0.0
      */
     protected function isOptionForDelete(Attribute $attribute, $optionId)
     {
@@ -365,7 +346,6 @@ protected function isOptionForDelete(Attribute $attribute, $optionId)
      * @param int $optionId
      * @param int $storeId
      * @return Swatch
-     * @since 2.0.0
      */
     protected function loadSwatchIfExists($optionId, $storeId)
     {
@@ -390,7 +370,6 @@ protected function loadSwatchIfExists($optionId, $storeId)
      * @param integer $type
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function saveSwatchData($swatch, $optionId, $storeId, $type, $value)
     {
@@ -411,7 +390,6 @@ protected function saveSwatchData($swatch, $optionId, $storeId, $type, $value)
      *
      * @param Attribute $attribute
      * @return void
-     * @since 2.0.0
      */
     protected function saveDefaultSwatchOptionValue(Attribute $attribute)
     {
@@ -438,7 +416,6 @@ protected function saveDefaultSwatchOptionValue(Attribute $attribute)
      * @param Attribute $attribute
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     protected function validateOptions(Attribute $attribute)
     {
@@ -460,7 +437,6 @@ protected function validateOptions(Attribute $attribute)
      * @param array $options
      * @param Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     protected function isOptionsValid(array $options, Attribute $attribute)
     {
diff --git a/app/code/Magento/Swatches/Model/Plugin/FilterRenderer.php b/app/code/Magento/Swatches/Model/Plugin/FilterRenderer.php
index 320a73bcd363c..e2d452dd9ddaa 100644
--- a/app/code/Magento/Swatches/Model/Plugin/FilterRenderer.php
+++ b/app/code/Magento/Swatches/Model/Plugin/FilterRenderer.php
@@ -7,13 +7,11 @@
 
 /**
  * Class FilterRenderer
- * @since 2.0.0
  */
 class FilterRenderer
 {
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -21,20 +19,17 @@ class FilterRenderer
      * Path to RenderLayered Block
      *
      * @var string
-     * @since 2.0.0
      */
     protected $block = \Magento\Swatches\Block\LayeredNavigation\RenderLayered::class;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.0.0
      */
     protected $swatchHelper;
 
     /**
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Swatches\Helper\Data $swatchHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
@@ -51,7 +46,6 @@ public function __construct(
      * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function aroundRender(
         \Magento\LayeredNavigation\Block\Navigation\FilterRenderer $subject,
diff --git a/app/code/Magento/Swatches/Model/Plugin/Product.php b/app/code/Magento/Swatches/Model/Plugin/Product.php
index da5326b70aa7a..89d21d644eef2 100644
--- a/app/code/Magento/Swatches/Model/Plugin/Product.php
+++ b/app/code/Magento/Swatches/Model/Plugin/Product.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Product for changing image roles list
- * @since 2.0.0
  */
 class Product
 {
@@ -17,7 +16,6 @@ class Product
      * @param \Magento\Catalog\Model\Product $product
      * @param array|string $imageRoles
      * @return array
-     * @since 2.0.0
      */
     public function afterGetMediaAttributes(\Magento\Catalog\Model\Product $product, $imageRoles)
     {
diff --git a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
index 3dfc598ed13ab..0569a249260f6 100644
--- a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
+++ b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
@@ -7,7 +7,6 @@
 
 /**
  * Class ProductImage replace original configurable product with first child
- * @since 2.0.0
  */
 class ProductImage
 {
@@ -22,19 +21,16 @@ class ProductImage
      * Data helper to get child product image
      *
      * @var \Magento\Swatches\Helper\Data $productHelper
-     * @since 2.0.0
      */
     protected $swatchHelperData;
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @since 2.0.0
      */
     protected $eavConfig;
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
@@ -42,7 +38,6 @@ class ProductImage
      * @param \Magento\Swatches\Helper\Data $swatchesHelperData
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Request\Http $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Swatches\Helper\Data $swatchesHelperData,
@@ -63,7 +58,6 @@ public function __construct(
      * @param string $location
      * @param array $attributes
      * @return array
-     * @since 2.0.0
      */
     public function beforeGetImage(
         \Magento\Catalog\Block\Product\AbstractProduct $subject,
@@ -88,7 +82,6 @@ public function beforeGetImage(
      * @param \Magento\Catalog\Model\Product $parentProduct
      * @param array $filterArray
      * @return bool|\Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function loadSimpleVariation(\Magento\Catalog\Model\Product $parentProduct, array $filterArray)
     {
@@ -107,7 +100,6 @@ protected function loadSimpleVariation(\Magento\Catalog\Model\Product $parentPro
      *
      * @param array $request
      * @return array
-     * @since 2.0.0
      */
     protected function getFilterArray(array $request)
     {
@@ -129,7 +121,6 @@ protected function getFilterArray(array $request)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return bool
-     * @since 2.0.0
      */
     protected function canReplaceImageWithSwatch($attribute)
     {
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index cb331c7056a41..26f08d3ad6c13 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -10,7 +10,6 @@
  * @codeCoverageIgnore
  * Swatch Resource Model
  * @api
- * @since 2.0.0
  */
 class Swatch extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Swatch extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      * @param string $defaultValue
      * @param integer $id
      * @return void
-     * @since 2.0.0
      */
     public function saveDefaultSwatchOption($id, $defaultValue)
     {
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch/Collection.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch/Collection.php
index c66b9ab99523b..dc08677545692 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch/Collection.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch/Collection.php
@@ -9,7 +9,6 @@
  * @codeCoverageIgnore
  * Swatch Resource Collection
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Standard collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId)
     {
@@ -42,7 +39,6 @@ public function addStoreFilter($storeId)
      *
      * @param array $optionsIds
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterByOptionsIds(array $optionsIds)
     {
diff --git a/app/code/Magento/Swatches/Model/Swatch.php b/app/code/Magento/Swatches/Model/Swatch.php
index 05e5a46251292..a340fcd741537 100644
--- a/app/code/Magento/Swatches/Model/Swatch.php
+++ b/app/code/Magento/Swatches/Model/Swatch.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Swatch extends \Magento\Framework\Model\AbstractModel
 {
@@ -56,7 +55,6 @@ class Swatch extends \Magento\Framework\Model\AbstractModel
      *
      * @codeCoverageIgnore
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Swatches/Model/SwatchAttributeCodes.php b/app/code/Magento/Swatches/Model/SwatchAttributeCodes.php
index ed764a8b97c3c..0f4ff0b7789be 100644
--- a/app/code/Magento/Swatches/Model/SwatchAttributeCodes.php
+++ b/app/code/Magento/Swatches/Model/SwatchAttributeCodes.php
@@ -11,25 +11,25 @@
 
 /**
  * Class SwatchAttributeCodes for getting codes of swatch attributes.
- * @since 2.2.0
+ * @since 2.1.6
  */
 class SwatchAttributeCodes
 {
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $cacheKey;
 
     /**
      * @var CacheInterface
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $cache;
 
     /**
      * @var ResourceConnection
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $resourceConnection;
 
@@ -37,13 +37,13 @@ class SwatchAttributeCodes
      * Key is attribute_id, value is attribute_code
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $swatchAttributeCodes;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $cacheTags;
 
@@ -54,7 +54,7 @@ class SwatchAttributeCodes
      * @param ResourceConnection $resourceConnection
      * @param string $cacheKey
      * @param array $cacheTags
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function __construct(
         CacheInterface $cache,
@@ -73,7 +73,7 @@ public function __construct(
      * Key is attribute_id, value is attribute_code
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function getCodes()
     {
@@ -122,7 +122,7 @@ private function getSwatchAttributeCodes()
      * Builds a "Select" object which loads all EAV attributes that has "swatch" options
      *
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private function getAttributeIdsSelect()
     {
diff --git a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
index 384e968bf9bcb..32717d73701c1 100644
--- a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
+++ b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
@@ -11,33 +11,33 @@
 
 /**
  * Provide list of swatch attributes for product.
- * @since 2.2.0
+ * @since 2.1.6
  */
 class SwatchAttributesProvider
 {
     /**
      * @var Configurable
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $typeConfigurable;
 
     /**
      * @var SwatchAttributeCodes
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $swatchAttributeCodes;
 
     /**
      * Key is productId, value is list of attributes
      * @var Attribute[]
-     * @since 2.2.0
+     * @since 2.1.6
      */
     private $attributesPerProduct;
 
     /**
      * @param Configurable $typeConfigurable
      * @param SwatchAttributeCodes $swatchAttributeCodes
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function __construct(
         Configurable $typeConfigurable,
@@ -53,7 +53,7 @@ public function __construct(
      *
      * @param Product $product
      * @return Attribute[]
-     * @since 2.2.0
+     * @since 2.1.6
      */
     public function provide(Product $product)
     {
diff --git a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
index dc09b397802b3..cfef5ab499e5d 100644
--- a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
@@ -12,26 +12,22 @@
 
 /**
  * Observer model
- * @since 2.0.0
  */
 class AddFieldsToAttributeObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Config\Model\Config\Source\Yesno
-     * @since 2.0.0
      */
     protected $yesNo;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
      * @param Source\Yesno $yesNo
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager, Source\Yesno $yesNo)
     {
@@ -42,7 +38,6 @@ public function __construct(Manager $moduleManager, Source\Yesno $yesNo)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
index 23a291b8202d5..3a517bd835146 100644
--- a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
@@ -12,19 +12,16 @@
 
 /**
  * Observer model
- * @since 2.0.0
  */
 class AddSwatchAttributeTypeObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(Manager $moduleManager)
     {
@@ -34,7 +31,6 @@ public function __construct(Manager $moduleManager)
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php b/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
index 60746d891cb54..73ff5f4cc4a20 100644
--- a/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
+++ b/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
@@ -11,26 +11,26 @@
 /**
  * Class \Magento\Swatches\Plugin\Catalog\CacheInvalidate
  *
- * @since 2.1.0
+ * @since 2.0.11
  */
 class CacheInvalidate
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $typeList;
 
     /**
      * @var \Magento\Swatches\Helper\Data
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $swatchHelper;
 
     /**
      * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
      * @param \Magento\Swatches\Helper\Data $swatchHelper
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function __construct(
         \Magento\Framework\App\Cache\TypeListInterface $typeList,
@@ -44,7 +44,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $result
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function afterSave(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject,
diff --git a/app/code/Magento/Swatches/Setup/InstallData.php b/app/code/Magento/Swatches/Setup/InstallData.php
index a4a7f29e0cc1a..eab2fd68607bd 100644
--- a/app/code/Magento/Swatches/Setup/InstallData.php
+++ b/app/code/Magento/Swatches/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * Class InstallData
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * EAV setup factory
      *
      * @var EavSetupFactory
-     * @since 2.0.0
      */
     private $eavSetupFactory;
 
@@ -29,7 +27,6 @@ class InstallData implements InstallDataInterface
      * Init
      *
      * @param EavSetupFactory $eavSetupFactory
-     * @since 2.0.0
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
     {
@@ -43,7 +40,6 @@ public function __construct(EavSetupFactory $eavSetupFactory)
      * @param ModuleDataSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Swatches/Setup/InstallSchema.php b/app/code/Magento/Swatches/Setup/InstallSchema.php
index 89c1670918d0b..2ba29c8ba46f3 100644
--- a/app/code/Magento/Swatches/Setup/InstallSchema.php
+++ b/app/code/Magento/Swatches/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * Class InstallSchema adds new table `eav_attribute_option_swatch`
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $contextInterface)
     {
diff --git a/app/code/Magento/Tax/Api/Data/AppliedTaxInterface.php b/app/code/Magento/Tax/Api/Data/AppliedTaxInterface.php
index 8529e606e29d1..6b8fede5b4dc1 100644
--- a/app/code/Magento/Tax/Api/Data/AppliedTaxInterface.php
+++ b/app/code/Magento/Tax/Api/Data/AppliedTaxInterface.php
@@ -8,7 +8,6 @@
 /**
  * Applied tax interface.
  * @api
- * @since 2.0.0
  */
 interface AppliedTaxInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -16,7 +15,6 @@ interface AppliedTaxInterface extends \Magento\Framework\Api\ExtensibleDataInter
      * Get tax rate key
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxRateKey();
 
@@ -25,7 +23,6 @@ public function getTaxRateKey();
      *
      * @param string $taxRateKey
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRateKey($taxRateKey);
 
@@ -33,7 +30,6 @@ public function setTaxRateKey($taxRateKey);
      * Get percent
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPercent();
 
@@ -42,7 +38,6 @@ public function getPercent();
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent);
 
@@ -50,7 +45,6 @@ public function setPercent($percent);
      * Get amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmount();
 
@@ -59,7 +53,6 @@ public function getAmount();
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount);
 
@@ -67,7 +60,6 @@ public function setAmount($amount);
      * Get rates
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxRateInterface[]|null
-     * @since 2.0.0
      */
     public function getRates();
 
@@ -76,7 +68,6 @@ public function getRates();
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxRateInterface[] $rates
      * @return $this
-     * @since 2.0.0
      */
     public function setRates(array $rates = null);
 
@@ -84,7 +75,6 @@ public function setRates(array $rates = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -93,7 +83,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\AppliedTaxExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php b/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php
index 6a0ae02c38a53..d142dbc4d4fcb 100644
--- a/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php
+++ b/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php
@@ -9,7 +9,6 @@
 /**
  * Applied tax rate interface.
  * @api
- * @since 2.0.0
  */
 interface AppliedTaxRateInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface AppliedTaxRateInterface extends \Magento\Framework\Api\ExtensibleDataI
      * Get code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -26,7 +24,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -34,7 +31,6 @@ public function setCode($code);
      * Get Title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -43,7 +39,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -51,7 +46,6 @@ public function setTitle($title);
      * Get Tax Percent
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPercent();
 
@@ -60,7 +54,6 @@ public function getPercent();
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent);
 
@@ -68,7 +61,6 @@ public function setPercent($percent);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -77,7 +69,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/GrandTotalDetailsInterface.php b/app/code/Magento/Tax/Api/Data/GrandTotalDetailsInterface.php
index 1f8d6da23e54d..54050a6a99b10 100644
--- a/app/code/Magento/Tax/Api/Data/GrandTotalDetailsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/GrandTotalDetailsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface GrandTotalDetailsInterface
  * @api
- * @since 2.0.0
  */
 interface GrandTotalDetailsInterface
 {
@@ -16,14 +15,12 @@ interface GrandTotalDetailsInterface
      * Get tax amount value
      *
      * @return float|string
-     * @since 2.0.0
      */
     public function getAmount();
 
     /**
      * @param string|float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount);
 
@@ -31,14 +28,12 @@ public function setAmount($amount);
      * Applied tax rates info
      *
      * @return \Magento\Tax\Api\Data\GrandTotalRatesInterface[]
-     * @since 2.0.0
      */
     public function getRates();
 
     /**
      * @param \Magento\Tax\Api\Data\GrandTotalRatesInterface[] $rates
      * @return $this
-     * @since 2.0.0
      */
     public function setRates($rates);
 
@@ -46,14 +41,12 @@ public function setRates($rates);
      * Details group identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getGroupId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setGroupId($id);
 }
diff --git a/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php b/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php
index 42c17b06435df..61158eccd087a 100644
--- a/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php
+++ b/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface GrandTotalRatesInterface
  * @api
- * @since 2.0.0
  */
 interface GrandTotalRatesInterface
 {
@@ -16,14 +15,12 @@ interface GrandTotalRatesInterface
      * Get tax percentage value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPercent();
 
     /**
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent);
 
@@ -31,14 +28,12 @@ public function setPercent($percent);
      * Tax rate title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
     /**
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 }
diff --git a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsAppliedTaxInterface.php b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsAppliedTaxInterface.php
index f62531d73b8a8..f6f4e7b02f028 100644
--- a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsAppliedTaxInterface.php
+++ b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsAppliedTaxInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface OrderTaxDetailsAppliedTaxInterface
  * @api
- * @since 2.0.0
  */
 interface OrderTaxDetailsAppliedTaxInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface OrderTaxDetailsAppliedTaxInterface extends \Magento\Framework\Api\Exte
      * Get code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -27,7 +25,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -35,7 +32,6 @@ public function setCode($code);
      * Get Title
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -44,7 +40,6 @@ public function getTitle();
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -52,7 +47,6 @@ public function setTitle($title);
      * Get Tax Percent
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getPercent();
 
@@ -61,7 +55,6 @@ public function getPercent();
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent);
 
@@ -69,7 +62,6 @@ public function setPercent($percent);
      * Get tax amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getAmount();
 
@@ -78,7 +70,6 @@ public function getAmount();
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount);
 
@@ -86,7 +77,6 @@ public function setAmount($amount);
      * Get tax amount in base currency
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmount();
 
@@ -95,7 +85,6 @@ public function getBaseAmount();
      *
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmount($baseAmount);
 
@@ -103,7 +92,6 @@ public function setBaseAmount($baseAmount);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -112,7 +100,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsInterface.php b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsInterface.php
index 52f01c6f4f9e9..16b12bdead394 100644
--- a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface OrderTaxDetailsInterface
  * @api
- * @since 2.0.0
  */
 interface OrderTaxDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface OrderTaxDetailsInterface extends \Magento\Framework\Api\ExtensibleData
      * Get applied taxes at order level
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[] | null
-     * @since 2.0.0
      */
     public function getAppliedTaxes();
 
@@ -27,7 +25,6 @@ public function getAppliedTaxes();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null);
 
@@ -35,7 +32,6 @@ public function setAppliedTaxes(array $appliedTaxes = null);
      * Get order item tax details
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] | null
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -44,7 +40,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
@@ -52,7 +47,6 @@ public function setItems(array $items = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -61,7 +55,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsItemInterface.php b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsItemInterface.php
index 5169e591b3884..50ae26688ac06 100644
--- a/app/code/Magento/Tax/Api/Data/OrderTaxDetailsItemInterface.php
+++ b/app/code/Magento/Tax/Api/Data/OrderTaxDetailsItemInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface OrderTaxDetailsItemInterface
  * @api
- * @since 2.0.0
  */
 interface OrderTaxDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface OrderTaxDetailsItemInterface extends \Magento\Framework\Api\Extensible
      * Get type (shipping, product, weee, gift wrapping, etc)
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getType();
 
@@ -27,7 +25,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -35,7 +32,6 @@ public function setType($type);
      * Return item id if this item is a product
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getItemId();
 
@@ -44,7 +40,6 @@ public function getItemId();
      *
      * @param int $itemId
      * @return $this
-     * @since 2.0.0
      */
     public function setItemId($itemId);
 
@@ -52,7 +47,6 @@ public function setItemId($itemId);
      * Return associated item id if this item is associated with another item, null otherwise
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAssociatedItemId();
 
@@ -61,7 +55,6 @@ public function getAssociatedItemId();
      *
      * @param int $associatedItemId
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemId($associatedItemId);
 
@@ -69,7 +62,6 @@ public function setAssociatedItemId($associatedItemId);
      * Get applied taxes
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[]|null
-     * @since 2.0.0
      */
     public function getAppliedTaxes();
 
@@ -78,7 +70,6 @@ public function getAppliedTaxes();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null);
 
@@ -86,7 +77,6 @@ public function setAppliedTaxes(array $appliedTaxes = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -95,7 +85,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\OrderTaxDetailsItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Api/Data/QuoteDetailsInterface.php b/app/code/Magento/Tax/Api/Data/QuoteDetailsInterface.php
index 15637fbcd45cc..78524eb984f75 100644
--- a/app/code/Magento/Tax/Api/Data/QuoteDetailsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/QuoteDetailsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Quote details interface.
  * @api
- * @since 2.0.0
  */
 interface QuoteDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface QuoteDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get customer billing address
      *
      * @return \Magento\Customer\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     public function getBillingAddress();
 
@@ -26,7 +24,6 @@ public function getBillingAddress();
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $billingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Customer\Api\Data\AddressInterface $billingAddress = null);
 
@@ -34,7 +31,6 @@ public function setBillingAddress(\Magento\Customer\Api\Data\AddressInterface $b
      * Get customer shipping address
      *
      * @return \Magento\Customer\Api\Data\AddressInterface|null
-     * @since 2.0.0
      */
     public function getShippingAddress();
 
@@ -43,7 +39,6 @@ public function getShippingAddress();
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $shippingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Customer\Api\Data\AddressInterface $shippingAddress = null);
 
@@ -51,7 +46,6 @@ public function setShippingAddress(\Magento\Customer\Api\Data\AddressInterface $
      * Get customer tax class key
      *
      * @return \Magento\Tax\Api\Data\TaxClassKeyInterface|null
-     * @since 2.0.0
      */
     public function getCustomerTaxClassKey();
 
@@ -60,7 +54,6 @@ public function getCustomerTaxClassKey();
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterface $customerTaxClassKey
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $customerTaxClassKey = null);
 
@@ -68,7 +61,6 @@ public function setCustomerTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterfac
      * Get customer id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCustomerId();
 
@@ -77,7 +69,6 @@ public function getCustomerId();
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId);
 
@@ -85,7 +76,6 @@ public function setCustomerId($customerId);
      * Get customer data
      *
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]|null
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -94,7 +84,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
@@ -102,7 +91,6 @@ public function setItems(array $items = null);
      * Get customer tax class id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerTaxClassId();
 
@@ -111,7 +99,6 @@ public function getCustomerTaxClassId();
      *
      * @param int $customerTaxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassId($customerTaxClassId);
 
@@ -119,7 +106,6 @@ public function setCustomerTaxClassId($customerTaxClassId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\QuoteDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -128,7 +114,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\QuoteDetailsExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php b/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
index 5a608bc2dd752..e951512ebcc06 100644
--- a/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
+++ b/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
@@ -8,7 +8,6 @@
 /**
  * Quote details item interface.
  * @api
- * @since 2.0.0
  */
 interface QuoteDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -16,7 +15,6 @@ interface QuoteDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDat
      * Get code (sku or shipping code)
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -25,7 +23,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -33,7 +30,6 @@ public function setCode($code);
      * Get type (e.g., shipping, product, wee, gift wrapping, etc.)
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getType();
 
@@ -42,7 +38,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -50,7 +45,6 @@ public function setType($type);
      * Get tax class key
      *
      * @return \Magento\Tax\Api\Data\TaxClassKeyInterface
-     * @since 2.0.0
      */
     public function getTaxClassKey();
 
@@ -59,7 +53,6 @@ public function getTaxClassKey();
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterface $taxClassKey
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $taxClassKey = null);
 
@@ -67,7 +60,6 @@ public function setTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $taxCl
      * Get unit price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getUnitPrice();
 
@@ -76,7 +68,6 @@ public function getUnitPrice();
      *
      * @param float $unitPrice
      * @return $this
-     * @since 2.0.0
      */
     public function setUnitPrice($unitPrice);
 
@@ -84,7 +75,6 @@ public function setUnitPrice($unitPrice);
      * Get quantity
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQuantity();
 
@@ -93,7 +83,6 @@ public function getQuantity();
      *
      * @param float $quantity
      * @return $this
-     * @since 2.0.0
      */
     public function setQuantity($quantity);
 
@@ -102,7 +91,6 @@ public function setQuantity($quantity);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsTaxIncluded();
 
@@ -111,7 +99,6 @@ public function getIsTaxIncluded();
      *
      * @param bool $isTaxIncluded
      * @return $this
-     * @since 2.0.0
      */
     public function setIsTaxIncluded($isTaxIncluded);
 
@@ -119,7 +106,6 @@ public function setIsTaxIncluded($isTaxIncluded);
      * Get short description
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getShortDescription();
 
@@ -128,7 +114,6 @@ public function getShortDescription();
      *
      * @param string $shortDescription
      * @return $this
-     * @since 2.0.0
      */
     public function setShortDescription($shortDescription);
 
@@ -136,7 +121,6 @@ public function setShortDescription($shortDescription);
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -145,7 +129,6 @@ public function getDiscountAmount();
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount);
 
@@ -153,7 +136,6 @@ public function setDiscountAmount($discountAmount);
      * Get parent code if this item is a child, null if this is a top level item.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getParentCode();
 
@@ -162,7 +144,6 @@ public function getParentCode();
      *
      * @param string $parentCode
      * @return $this
-     * @since 2.0.0
      */
     public function setParentCode($parentCode);
 
@@ -170,7 +151,6 @@ public function setParentCode($parentCode);
      * Get associated item code if this item is associated with another item, null otherwise
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAssociatedItemCode();
 
@@ -179,7 +159,6 @@ public function getAssociatedItemCode();
      *
      * @param int $associatedItemCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemCode($associatedItemCode);
 
@@ -187,7 +166,6 @@ public function setAssociatedItemCode($associatedItemCode);
      * Get associated item tax class id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTaxClassId();
 
@@ -196,7 +174,6 @@ public function getTaxClassId();
      *
      * @param int $taxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassId($taxClassId);
 
@@ -204,7 +181,6 @@ public function setTaxClassId($taxClassId);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -213,7 +189,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Api/Data/TaxClassInterface.php b/app/code/Magento/Tax/Api/Data/TaxClassInterface.php
index 00bf182a34237..1fba9edbab818 100644
--- a/app/code/Magento/Tax/Api/Data/TaxClassInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxClassInterface.php
@@ -10,7 +10,6 @@
 /**
  * Tax class interface.
  * @api
- * @since 2.0.0
  */
 interface TaxClassInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface TaxClassInterface extends \Magento\Framework\Api\ExtensibleDataInterfa
      * Get tax class ID.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getClassId();
 
@@ -27,7 +25,6 @@ public function getClassId();
      *
      * @param int $classId
      * @return $this
-     * @since 2.0.0
      */
     public function setClassId($classId);
 
@@ -35,7 +32,6 @@ public function setClassId($classId);
      * Get tax class name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClassName();
 
@@ -44,7 +40,6 @@ public function getClassName();
      *
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function setClassName($className);
 
@@ -52,7 +47,6 @@ public function setClassName($className);
      * Get tax class type.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClassType();
 
@@ -61,7 +55,6 @@ public function getClassType();
      *
      * @param string $classType
      * @return $this
-     * @since 2.0.0
      */
     public function setClassType($classType);
 
@@ -69,7 +62,6 @@ public function setClassType($classType);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxClassExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -78,7 +70,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxClassExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxClassExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxClassKeyInterface.php b/app/code/Magento/Tax/Api/Data/TaxClassKeyInterface.php
index 680e50e35eb09..ff9450a75b3d4 100644
--- a/app/code/Magento/Tax/Api/Data/TaxClassKeyInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxClassKeyInterface.php
@@ -11,7 +11,6 @@
 /**
  * Tax class key interface.
  * @api
- * @since 2.0.0
  */
 interface TaxClassKeyInterface extends ExtensibleDataInterface
 {
@@ -26,7 +25,6 @@ interface TaxClassKeyInterface extends ExtensibleDataInterface
      * Get type of tax class key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -35,7 +33,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -43,7 +40,6 @@ public function setType($type);
      * Get value of tax class key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -52,7 +48,6 @@ public function getValue();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -60,7 +55,6 @@ public function setValue($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxClassKeyExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -69,7 +63,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxClassKeyExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php
index 1bf5951703d4c..c9ce32556af16 100644
--- a/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for tax class search results.
  * @api
- * @since 2.0.0
  */
 interface TaxClassSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface TaxClassSearchResultsInterface extends \Magento\Framework\Api\SearchRe
      * Get items
      *
      * @return \Magento\Tax\Api\Data\TaxClassInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\TaxClassInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxDetailsInterface.php b/app/code/Magento/Tax/Api/Data/TaxDetailsInterface.php
index 7e289e30c9520..4e819d242af80 100644
--- a/app/code/Magento/Tax/Api/Data/TaxDetailsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxDetailsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Tax details interface.
  * @api
- * @since 2.0.0
  */
 interface TaxDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface TaxDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInter
      * Get subtotal
      *
      * @return float
-     * @since 2.0.0
      */
     public function getSubtotal();
 
@@ -26,7 +24,6 @@ public function getSubtotal();
      *
      * @param float $subtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($subtotal);
 
@@ -34,7 +31,6 @@ public function setSubtotal($subtotal);
      * Get tax amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTaxAmount();
 
@@ -43,7 +39,6 @@ public function getTaxAmount();
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount);
 
@@ -51,7 +46,6 @@ public function setTaxAmount($taxAmount);
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -60,7 +54,6 @@ public function getDiscountTaxCompensationAmount();
      *
      * @param float $discountTaxCompensationAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount);
 
@@ -68,7 +61,6 @@ public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
      * Get applied taxes
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxInterface[] | null
-     * @since 2.0.0
      */
     public function getAppliedTaxes();
 
@@ -77,7 +69,6 @@ public function getAppliedTaxes();
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null);
 
@@ -85,7 +76,6 @@ public function setAppliedTaxes(array $appliedTaxes = null);
      * Get TaxDetails items
      *
      * @return \Magento\Tax\Api\Data\TaxDetailsItemInterface[] | null
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -94,7 +84,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
@@ -102,7 +91,6 @@ public function setItems(array $items = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -111,7 +99,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxDetailsExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxDetailsItemInterface.php b/app/code/Magento/Tax/Api/Data/TaxDetailsItemInterface.php
index e61397ce3ab33..5b83e5a615e8f 100644
--- a/app/code/Magento/Tax/Api/Data/TaxDetailsItemInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxDetailsItemInterface.php
@@ -9,7 +9,6 @@
 /**
  * Tax details items interface.
  * @api
- * @since 2.0.0
  */
 interface TaxDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -17,7 +16,6 @@ interface TaxDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDataI
      * Get code (sku or shipping code)
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -26,7 +24,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -34,7 +31,6 @@ public function setCode($code);
      * Get type (shipping, product, weee, gift wrapping, etc
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getType();
 
@@ -43,7 +39,6 @@ public function getType();
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -51,7 +46,6 @@ public function setType($type);
      * Get tax_percent
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTaxPercent();
 
@@ -60,7 +54,6 @@ public function getTaxPercent();
      *
      * @param float $taxPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent);
 
@@ -68,7 +61,6 @@ public function setTaxPercent($taxPercent);
      * Get price
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -77,7 +69,6 @@ public function getPrice();
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price);
 
@@ -85,7 +76,6 @@ public function setPrice($price);
      * Get price including tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getPriceInclTax();
 
@@ -94,7 +84,6 @@ public function getPriceInclTax();
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax);
 
@@ -102,7 +91,6 @@ public function setPriceInclTax($priceInclTax);
      * Get row total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowTotal();
 
@@ -111,7 +99,6 @@ public function getRowTotal();
      *
      * @param float $rowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($rowTotal);
 
@@ -119,7 +106,6 @@ public function setRowTotal($rowTotal);
      * Get row total including tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowTotalInclTax();
 
@@ -128,7 +114,6 @@ public function getRowTotalInclTax();
      *
      * @param float $rowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($rowTotalInclTax);
 
@@ -136,7 +121,6 @@ public function setRowTotalInclTax($rowTotalInclTax);
      * Get row tax amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowTax();
 
@@ -145,7 +129,6 @@ public function getRowTax();
      *
      * @param float $rowTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTax($rowTax);
 
@@ -153,7 +136,6 @@ public function setRowTax($rowTax);
      * Get taxable amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTaxableAmount();
 
@@ -162,7 +144,6 @@ public function getTaxableAmount();
      *
      * @param float $taxableAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxableAmount($taxableAmount);
 
@@ -170,7 +151,6 @@ public function setTaxableAmount($taxableAmount);
      * Get discount amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountAmount();
 
@@ -179,7 +159,6 @@ public function getDiscountAmount();
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount);
 
@@ -187,7 +166,6 @@ public function setDiscountAmount($discountAmount);
      * Get discount tax compensation amount
      *
      * @return float
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -196,7 +174,6 @@ public function getDiscountTaxCompensationAmount();
      *
      * @param float $discountTaxCompensationAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount);
 
@@ -204,7 +181,6 @@ public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
      * Get applied taxes
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxInterface[] | null
-     * @since 2.0.0
      */
     public function getAppliedTaxes();
 
@@ -213,7 +189,6 @@ public function getAppliedTaxes();
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null);
 
@@ -221,7 +196,6 @@ public function setAppliedTaxes(array $appliedTaxes = null);
      * Return associated item code if this item is associated with another item, null otherwise
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getAssociatedItemCode();
 
@@ -230,7 +204,6 @@ public function getAssociatedItemCode();
      *
      * @param int $associatedItemCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemCode($associatedItemCode);
 
@@ -238,7 +211,6 @@ public function setAssociatedItemCode($associatedItemCode);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -247,7 +219,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRateInterface.php b/app/code/Magento/Tax/Api/Data/TaxRateInterface.php
index 6f16cc0c1a6e8..af7c368310753 100644
--- a/app/code/Magento/Tax/Api/Data/TaxRateInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxRateInterface.php
@@ -10,7 +10,6 @@
 /**
  * Tax rate interface.
  * @api
- * @since 2.0.0
  */
 interface TaxRateInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface TaxRateInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
      * Get id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -27,7 +25,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -35,7 +32,6 @@ public function setId($id);
      * Get country id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxCountryId();
 
@@ -44,7 +40,6 @@ public function getTaxCountryId();
      *
      * @param string $taxCountryId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxCountryId($taxCountryId);
 
@@ -52,7 +47,6 @@ public function setTaxCountryId($taxCountryId);
      * Get region id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getTaxRegionId();
 
@@ -61,7 +55,6 @@ public function getTaxRegionId();
      *
      * @param int $taxRegionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRegionId($taxRegionId);
 
@@ -69,7 +62,6 @@ public function setTaxRegionId($taxRegionId);
      * Get region name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRegionName();
 
@@ -78,7 +70,6 @@ public function getRegionName();
      *
      * @param string $regionName
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionName($regionName);
 
@@ -86,7 +77,6 @@ public function setRegionName($regionName);
      * Get postcode
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxPostcode();
 
@@ -95,7 +85,6 @@ public function getTaxPostcode();
      *
      * @param string $taxPostCode
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPostcode($taxPostCode);
 
@@ -103,7 +92,6 @@ public function setTaxPostcode($taxPostCode);
      * Get zip is range
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getZipIsRange();
 
@@ -112,7 +100,6 @@ public function getZipIsRange();
      *
      * @param int $zipIsRange
      * @return $this
-     * @since 2.0.0
      */
     public function setZipIsRange($zipIsRange);
 
@@ -120,7 +107,6 @@ public function setZipIsRange($zipIsRange);
      * Get zip range from
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getZipFrom();
 
@@ -129,7 +115,6 @@ public function getZipFrom();
      *
      * @param int $zipFrom
      * @return $this
-     * @since 2.0.0
      */
     public function setZipFrom($zipFrom);
 
@@ -137,7 +122,6 @@ public function setZipFrom($zipFrom);
      * Get zip range to
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getZipTo();
 
@@ -146,7 +130,6 @@ public function getZipTo();
      *
      * @param int $zipTo
      * @return $this
-     * @since 2.0.0
      */
     public function setZipTo($zipTo);
 
@@ -154,7 +137,6 @@ public function setZipTo($zipTo);
      * Get tax rate in percentage
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRate();
 
@@ -163,7 +145,6 @@ public function getRate();
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setRate($rate);
 
@@ -171,7 +152,6 @@ public function setRate($rate);
      * Get tax rate code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -180,7 +160,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -188,7 +167,6 @@ public function setCode($code);
      * Get tax rate titles
      *
      * @return \Magento\Tax\Api\Data\TaxRateTitleInterface[]|null
-     * @since 2.0.0
      */
     public function getTitles();
 
@@ -197,7 +175,6 @@ public function getTitles();
      *
      * @param \Magento\Tax\Api\Data\TaxRateTitleInterface[] $titles
      * @return $this
-     * @since 2.0.0
      */
     public function setTitles(array $titles = null);
 
@@ -205,7 +182,6 @@ public function setTitles(array $titles = null);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxRateExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -214,7 +190,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxRateExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRateExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php
index bb514a9403599..bd9efcda567ee 100644
--- a/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface for tax rate search results.
  * @api
- * @since 2.0.0
  */
 interface TaxRateSearchResultsInterface extends SearchResultsInterface
 {
@@ -20,7 +19,6 @@ interface TaxRateSearchResultsInterface extends SearchResultsInterface
      * Get items
      *
      * @return \Magento\Tax\Api\Data\TaxRateInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -29,7 +27,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\TaxRateInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRateTitleInterface.php b/app/code/Magento/Tax/Api/Data/TaxRateTitleInterface.php
index f9fc24e57806e..e93acf39a3c24 100644
--- a/app/code/Magento/Tax/Api/Data/TaxRateTitleInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxRateTitleInterface.php
@@ -10,7 +10,6 @@
 /**
  * Tax rate title interface.
  * @api
- * @since 2.0.0
  */
 interface TaxRateTitleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +17,6 @@ interface TaxRateTitleInterface extends \Magento\Framework\Api\ExtensibleDataInt
      * Get store id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStoreId();
 
@@ -27,7 +25,6 @@ public function getStoreId();
      *
      * @param string $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId);
 
@@ -35,7 +32,6 @@ public function setStoreId($storeId);
      * Get title value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -44,7 +40,6 @@ public function getValue();
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function setValue($value);
 
@@ -52,7 +47,6 @@ public function setValue($value);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -61,7 +55,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRateTitleExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRuleInterface.php b/app/code/Magento/Tax/Api/Data/TaxRuleInterface.php
index 2c8eaf8a13d45..72dc9af1d1778 100644
--- a/app/code/Magento/Tax/Api/Data/TaxRuleInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxRuleInterface.php
@@ -11,7 +11,6 @@
 /**
  * Tax rule interface.
  * @api
- * @since 2.0.0
  */
 interface TaxRuleInterface extends ExtensibleDataInterface
 {
@@ -19,7 +18,6 @@ interface TaxRuleInterface extends ExtensibleDataInterface
      * Get id
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getId();
 
@@ -28,7 +26,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -36,7 +33,6 @@ public function setId($id);
      * Get tax rule code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -45,7 +41,6 @@ public function getCode();
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code);
 
@@ -53,7 +48,6 @@ public function setCode($code);
      * Get priority
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPriority();
 
@@ -62,7 +56,6 @@ public function getPriority();
      *
      * @param int $priority
      * @return $this
-     * @since 2.0.0
      */
     public function setPriority($priority);
 
@@ -70,7 +63,6 @@ public function setPriority($priority);
      * Get sort order.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPosition();
 
@@ -79,7 +71,6 @@ public function getPosition();
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position);
 
@@ -87,7 +78,6 @@ public function setPosition($position);
      * Get customer tax class id
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getCustomerTaxClassIds();
 
@@ -96,7 +86,6 @@ public function getCustomerTaxClassIds();
      *
      * @param int[] $customerTaxClassIds
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassIds(array $customerTaxClassIds = null);
 
@@ -104,7 +93,6 @@ public function setCustomerTaxClassIds(array $customerTaxClassIds = null);
      * Get product tax class id
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getProductTaxClassIds();
 
@@ -113,7 +101,6 @@ public function getProductTaxClassIds();
      *
      * @param int[] $productTaxClassIds
      * @return $this
-     * @since 2.0.0
      */
     public function setProductTaxClassIds(array $productTaxClassIds = null);
 
@@ -121,7 +108,6 @@ public function setProductTaxClassIds(array $productTaxClassIds = null);
      * Get tax rate ids
      *
      * @return int[]
-     * @since 2.0.0
      */
     public function getTaxRateIds();
 
@@ -130,7 +116,6 @@ public function getTaxRateIds();
      *
      * @param int[] $taxRateIds
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRateIds(array $taxRateIds = null);
 
@@ -138,7 +123,6 @@ public function setTaxRateIds(array $taxRateIds = null);
      * Get calculate subtotal.
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getCalculateSubtotal();
 
@@ -147,7 +131,6 @@ public function getCalculateSubtotal();
      *
      * @param bool $calculateSubtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setCalculateSubtotal($calculateSubtotal);
 
@@ -155,7 +138,6 @@ public function setCalculateSubtotal($calculateSubtotal);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Tax\Api\Data\TaxRuleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -164,7 +146,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Tax\Api\Data\TaxRuleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRuleExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php
index 23f8e993950e9..6fec8f6a69d0b 100644
--- a/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php
+++ b/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface for tax rule search results.
  * @api
- * @since 2.0.0
  */
 interface TaxRuleSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -17,7 +16,6 @@ interface TaxRuleSearchResultsInterface extends \Magento\Framework\Api\SearchRes
      * Get items
      *
      * @return \Magento\Tax\Api\Data\TaxRuleInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -26,7 +24,6 @@ public function getItems();
      *
      * @param \Magento\Tax\Api\Data\TaxRuleInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/OrderTaxManagementInterface.php b/app/code/Magento/Tax/Api/OrderTaxManagementInterface.php
index f64165f03279b..39763972ab661 100644
--- a/app/code/Magento/Tax/Api/OrderTaxManagementInterface.php
+++ b/app/code/Magento/Tax/Api/OrderTaxManagementInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface OrderTaxManagementInterface
  * @api
- * @since 2.0.0
  */
 interface OrderTaxManagementInterface
 {
@@ -18,7 +17,6 @@ interface OrderTaxManagementInterface
      * @param int $orderId
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function getOrderTaxDetails($orderId);
 }
diff --git a/app/code/Magento/Tax/Api/TaxCalculationInterface.php b/app/code/Magento/Tax/Api/TaxCalculationInterface.php
index c22cbddc3e76f..0d1bf13823029 100644
--- a/app/code/Magento/Tax/Api/TaxCalculationInterface.php
+++ b/app/code/Magento/Tax/Api/TaxCalculationInterface.php
@@ -9,7 +9,6 @@
 /**
  * Tax calculation interface.
  * @api
- * @since 2.0.0
  */
 interface TaxCalculationInterface
 {
@@ -28,7 +27,6 @@ interface TaxCalculationInterface
      * @param null|int $storeId
      * @param bool $round
      * @return \Magento\Tax\Api\Data\TaxDetailsInterface
-     * @since 2.0.0
      */
     public function calculateTax(
         \Magento\Tax\Api\Data\QuoteDetailsInterface $quoteDetails,
@@ -43,7 +41,6 @@ public function calculateTax(
      * @param int $customerId
      * @param string $storeId
      * @return float
-     * @since 2.0.0
      */
     public function getDefaultCalculatedRate($productTaxClassID, $customerId = null, $storeId = null);
 
@@ -54,7 +51,6 @@ public function getDefaultCalculatedRate($productTaxClassID, $customerId = null,
      * @param int $customerId
      * @param string $storeId
      * @return float
-     * @since 2.0.0
      */
     public function getCalculatedRate($productTaxClassID, $customerId = null, $storeId = null);
 }
diff --git a/app/code/Magento/Tax/Api/TaxClassManagementInterface.php b/app/code/Magento/Tax/Api/TaxClassManagementInterface.php
index 1dae9ef68441e..174ea6b50de78 100644
--- a/app/code/Magento/Tax/Api/TaxClassManagementInterface.php
+++ b/app/code/Magento/Tax/Api/TaxClassManagementInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface for managing classes rates.
  * @api
- * @since 2.0.0
  */
 interface TaxClassManagementInterface
 {
@@ -27,7 +26,6 @@ interface TaxClassManagementInterface
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterface|null $taxClassKey
      * @param string $taxClassType
      * @return int|null
-     * @since 2.0.0
      */
     public function getTaxClassId($taxClassKey, $taxClassType = self::TYPE_PRODUCT);
 }
diff --git a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
index 74b15941ff1c3..d90231958cabc 100644
--- a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Tax class CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface TaxClassRepositoryInterface
 {
@@ -20,7 +19,6 @@ interface TaxClassRepositoryInterface
      * @param int $taxClassId
      * @return \Magento\Tax\Api\Data\TaxClassInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with $taxClassId does not exist
-     * @since 2.0.0
      */
     public function get($taxClassId);
 
@@ -34,7 +32,6 @@ public function get($taxClassId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Tax\Api\Data\TaxClassSearchResultsInterface containing Data\TaxClassInterface
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -45,7 +42,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return string id for the newly created Tax class
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Tax\Api\Data\TaxClassInterface $taxClass);
 
@@ -56,7 +52,6 @@ public function save(\Magento\Tax\Api\Data\TaxClassInterface $taxClass);
      * @return bool True if the tax class was deleted, false otherwise
      * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with $taxClassId does not exist
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(\Magento\Tax\Api\Data\TaxClassInterface $taxClass);
 
@@ -67,7 +62,6 @@ public function delete(\Magento\Tax\Api\Data\TaxClassInterface $taxClass);
      * @return bool True if the tax class was deleted, false otherwise
      * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with $taxClassId does not exist
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
-     * @since 2.0.0
      */
     public function deleteById($taxClassId);
 }
diff --git a/app/code/Magento/Tax/Api/TaxRateManagementInterface.php b/app/code/Magento/Tax/Api/TaxRateManagementInterface.php
index 4eac5b840a787..86937a2038bb3 100644
--- a/app/code/Magento/Tax/Api/TaxRateManagementInterface.php
+++ b/app/code/Magento/Tax/Api/TaxRateManagementInterface.php
@@ -11,7 +11,6 @@
 /**
  * Interface for managing tax rates.
  * @api
- * @since 2.0.0
  */
 interface TaxRateManagementInterface
 {
@@ -21,7 +20,6 @@ interface TaxRateManagementInterface
      * @param int $customerTaxClassId
      * @param int $productTaxClassId
      * @return TaxRateInterface[]
-     * @since 2.0.0
      */
     public function getRatesByCustomerAndProductTaxClassId($customerTaxClassId, $productTaxClassId);
 }
diff --git a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
index 8c6765d60493b..00b323ba6aef4 100644
--- a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Tax rate CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface TaxRateRepositoryInterface
 {
@@ -21,7 +20,6 @@ interface TaxRateRepositoryInterface
      * @return \Magento\Tax\Api\Data\TaxRateInterface
      * @throws \Magento\Framework\Exception\InputException If input is invalid or required input is missing.
      * @throws \Exception If something went wrong while creating the TaxRate.
-     * @since 2.0.0
      */
     public function save(\Magento\Tax\Api\Data\TaxRateInterface $taxRate);
 
@@ -31,7 +29,6 @@ public function save(\Magento\Tax\Api\Data\TaxRateInterface $taxRate);
      * @param int $rateId
      * @return \Magento\Tax\Api\Data\TaxRateInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public function get($rateId);
 
@@ -42,7 +39,6 @@ public function get($rateId);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If no TaxRate with the given ID can be found.
      * @throws \Exception If something went wrong while performing the delete.
-     * @since 2.0.0
      */
     public function deleteById($rateId);
 
@@ -56,7 +52,6 @@ public function deleteById($rateId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Tax\Api\Data\TaxRateSearchResultsInterface containing Data\TaxRateInterface objects
      * @throws \Magento\Framework\Exception\InputException If there is a problem with the input
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -67,7 +62,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If no TaxRate with the given ID can be found.
      * @throws \Exception If something went wrong while performing the delete.
-     * @since 2.0.0
      */
     public function delete(\Magento\Tax\Api\Data\TaxRateInterface $taxRate);
 }
diff --git a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
index cfce53428c875..2bc9ee1aa1991 100644
--- a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
@@ -9,7 +9,6 @@
 /**
  * Tax rule CRUD interface.
  * @api
- * @since 2.0.0
  */
 interface TaxRuleRepositoryInterface
 {
@@ -18,7 +17,6 @@ interface TaxRuleRepositoryInterface
      *
      * @param int $ruleId
      * @return \Magento\Tax\Api\Data\TaxRuleInterface
-     * @since 2.0.0
      */
     public function get($ruleId);
 
@@ -29,7 +27,6 @@ public function get($ruleId);
      * @return \Magento\Tax\Api\Data\TaxRuleInterface $rule
      * @throws \Magento\Framework\Exception\InputException If input is invalid or required input is missing.
      * @throws \Exception If something went wrong while performing the update.
-     * @since 2.0.0
      */
     public function save(\Magento\Tax\Api\Data\TaxRuleInterface $rule);
 
@@ -40,7 +37,6 @@ public function save(\Magento\Tax\Api\Data\TaxRuleInterface $rule);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If no TaxRate with the given ID can be found.
      * @throws \Exception If something went wrong while performing the delete.
-     * @since 2.0.0
      */
     public function delete(\Magento\Tax\Api\Data\TaxRuleInterface $rule);
 
@@ -51,7 +47,6 @@ public function delete(\Magento\Tax\Api\Data\TaxRuleInterface $rule);
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If no TaxRate with the given ID can be found.
      * @throws \Exception If something went wrong while performing the delete.
-     * @since 2.0.0
      */
     public function deleteById($ruleId);
 
@@ -65,7 +60,6 @@ public function deleteById($ruleId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Tax\Api\Data\TaxRuleSearchResultsInterface containing TaxRuleInterface objects
      * @throws \Magento\Framework\Exception\InputException If there is a problem with the input
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 }
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
index 883c77299b0f3..931f765a6bffc 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Tax\Block\Adminhtml\Frontend\Region\Updater
  *
- * @since 2.0.0
  */
 class Updater extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
@@ -24,7 +22,6 @@ class Updater extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
index a8c21fb68d038..414176a5e9ed2 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
@@ -16,31 +16,26 @@
  * Sales Order items price column renderer
  *
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var \Magento\Tax\Block\Item\Price\Renderer
-     * @since 2.0.0
      */
     protected $itemPriceRenderer;
 
     /**
      * @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
-     * @since 2.0.0
      */
     protected $defaultColumnRenderer;
 
     /**
      * @var Item|QuoteItem|InvoiceItem|CreditmemoItem
-     * @since 2.0.0
      */
     protected $item;
 
@@ -50,7 +45,6 @@ class Renderer extends \Magento\Backend\Block\Template
      * @param TaxHelper $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +64,6 @@ public function __construct(
      *
      * @param Item|QuoteItem|InvoiceItem|CreditmemoItem $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem($item)
     {
@@ -84,7 +77,6 @@ public function setItem($item)
      * Return order item or quote item
      *
      * @return Item|QuoteItem
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -95,7 +87,6 @@ public function getItem()
      * Return whether display setting is to display price including tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceInclTax()
     {
@@ -106,7 +97,6 @@ public function displayPriceInclTax()
      * Return whether display setting is to display price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceExclTax()
     {
@@ -117,7 +107,6 @@ public function displayPriceExclTax()
      * Return whether display setting is to display both price including tax and price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBothPrices()
     {
@@ -129,7 +118,6 @@ public function displayBothPrices()
      *
      * @param Item|QuoteItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -141,7 +129,6 @@ public function getTotalAmount($item)
      *
      * @param Item|QuoteItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($item)
     {
@@ -153,7 +140,6 @@ public function getBaseTotalAmount($item)
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -166,7 +152,6 @@ public function formatPrice($price)
      * @param float $basePrice
      * @param float $displayPrice
      * @return string
-     * @since 2.0.0
      */
     public function displayPrices($basePrice, $displayPrice)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 3003fe3bc93dd..0057ef02e7899 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -19,7 +19,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -27,13 +26,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @var null
-     * @since 2.0.0
      */
     protected $_titles = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rate/form.phtml';
 
@@ -41,43 +38,36 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data|null
-     * @since 2.0.0
      */
     protected $_taxData = null;
 
     /**
      * @var \Magento\Tax\Block\Adminhtml\Rate\Title\FieldsetFactory
-     * @since 2.0.0
      */
     protected $_fieldsetFactory;
 
     /**
      * @var \Magento\Directory\Model\Config\Source\Country
-     * @since 2.0.0
      */
     protected $_country;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @var \Magento\Tax\Api\TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $_taxRateRepository;
 
     /**
      * @var \Magento\Tax\Model\TaxRateCollection
-     * @since 2.0.0
      */
     protected $_taxRateCollection;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rate\Converter
-     * @since 2.0.0
      */
     protected $_taxRateConverter;
 
@@ -94,7 +84,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -121,7 +110,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -134,7 +122,6 @@ protected function _construct()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
index 7f7603691cc86..81dc19be0fdb0 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
@@ -14,14 +14,12 @@
 /**
  * Class \Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
      * @param \Magento\Framework\DataObject $row
      * @return int|string
-     * @since 2.0.0
      */
     protected function _getValue(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
index a05503e2dcf66..e1e866c06571b 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
@@ -12,37 +12,31 @@
  * Tax Rate Titles Renderer
  *
  * @author Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Title extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_titles;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rate/title.phtml';
 
     /**
      * @var \Magento\Store\Model\StoreFactory
-     * @since 2.0.0
      */
     protected $_storeFactory;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Tax\Api\TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $_taxRateRepository;
 
@@ -54,7 +48,6 @@ class Title extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -73,7 +66,6 @@ public function __construct(
      * Return the tax rate titles associated with a store view.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTitles()
     {
@@ -101,7 +93,6 @@ public function getTitles()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getStores()
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
index 26ce9f1afb097..218822a341338 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Tax\Block\Adminhtml\Rate\Title\Fieldset
  *
- * @since 2.0.0
  */
 class Fieldset extends \Magento\Framework\Data\Form\Element\Fieldset
 {
     /**
      * @var \Magento\Tax\Block\Adminhtml\Rate\Title
-     * @since 2.0.0
      */
     protected $_title;
 
@@ -30,7 +28,6 @@ class Fieldset extends \Magento\Framework\Data\Form\Element\Fieldset
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Tax\Block\Adminhtml\Rate\Title $title
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBasicChildrenHtml()
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index e87717058ec9c..faf39fe441e31 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -15,25 +15,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\ContainerInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'toolbar/rate/add.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $toolbar;
 
@@ -42,7 +38,6 @@ class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Bl
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @param \Magento\Backend\Block\Widget\Button\ToolbarInterface $toolbar
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
 
     /**
      * {$@inheritdoc}
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -67,7 +61,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
 
     /**
      * {$@inheritdoc}
-     * @since 2.0.0
      */
     public function removeButton($buttonId)
     {
@@ -77,7 +70,6 @@ public function removeButton($buttonId)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -96,7 +88,6 @@ protected function _prepareLayout()
 
     /**
      * {$@inheritdoc}
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -106,7 +97,6 @@ public function updateButton($buttonId, $key, $data)
 
     /**
      * {$@inheritdoc}
-     * @since 2.0.0
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 068f9f0975afe..7b51e0cd5ea33 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Tax\Block\Adminhtml\Rate\Toolbar\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\ContainerInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'toolbar/rate/save.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
-     * @since 2.0.0
      */
     protected $buttonList;
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ToolbarInterface
-     * @since 2.0.0
      */
     protected $toolbar;
 
@@ -41,7 +37,6 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @param \Magento\Backend\Block\Widget\Button\ToolbarInterface $toolbar
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +67,6 @@ protected function _construct()
      * @param integer $sortOrder
      * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null)
      * @return $this
-     * @since 2.0.0
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -86,7 +79,6 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
      *
      * @param string $buttonId
      * @return $this
-     * @since 2.0.0
      */
     public function removeButton($buttonId)
     {
@@ -101,7 +93,6 @@ public function removeButton($buttonId)
      * @param string|null $key
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -111,7 +102,6 @@ public function updateButton($buttonId, $key, $data)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -165,7 +155,6 @@ protected function _prepareLayout()
      *
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rule.php b/app/code/Magento/Tax/Block/Adminhtml/Rule.php
index e49da7a6e8a9f..67447b8617b22 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rule.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Rule extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
index 92587950fba1d..90655c3c5279b 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -19,7 +18,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Init class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
index b07b60c5494fd..f64c3c2ba85b7 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
@@ -13,43 +13,36 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Tax\Model\Rate\Source
-     * @since 2.0.0
      */
     protected $rateSource;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var \Magento\Tax\Api\TaxRuleRepositoryInterface
-     * @since 2.0.0
      */
     protected $ruleService;
 
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxClassService;
 
     /**
      * @var \Magento\Tax\Model\TaxClass\Source\Customer
-     * @since 2.0.0
      */
     protected $customerTaxClassSource;
 
     /**
      * @var \Magento\Tax\Model\TaxClass\Source\Product
-     * @since 2.0.0
      */
     protected $productTaxClassSource;
 
@@ -63,7 +56,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Tax\Model\TaxClass\Source\Customer $customerTaxClassSource
      * @param \Magento\Tax\Model\TaxClass\Source\Product $productTaxClassSource
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -89,7 +81,6 @@ public function __construct(
      * Init class
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -105,7 +96,6 @@ protected function _construct()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -290,7 +280,6 @@ public function getTaxRatesSelectConfig($formValues)
      *
      * @param string $classType
      * @return array
-     * @since 2.0.0
      */
     public function getTaxClassSelectConfig($classType)
     {
@@ -313,7 +302,6 @@ public function getTaxClassSelectConfig($classType)
      * Retrieve Tax Rate delete URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxRateDeleteUrl()
     {
@@ -324,7 +312,6 @@ public function getTaxRateDeleteUrl()
      * Retrieve Tax Rate save URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxRateSaveUrl()
     {
@@ -335,7 +322,6 @@ public function getTaxRateSaveUrl()
      * Retrieve Tax Rate load URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTaxRateLoadUrl()
     {
@@ -358,7 +344,6 @@ public function getTaxRatesPageUrl()
      *
      * @param \Magento\Tax\Api\Data\TaxRuleInterface $taxRule
      * @return array
-     * @since 2.0.0
      */
     protected function extractTaxRuleData($taxRule)
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Discount.php b/app/code/Magento/Tax/Block/Checkout/Discount.php
index 49fb514137d22..c474c7a6580b5 100644
--- a/app/code/Magento/Tax/Block/Checkout/Discount.php
+++ b/app/code/Magento/Tax/Block/Checkout/Discount.php
@@ -7,13 +7,11 @@
 
 /**
  * Subtotal Total Row Renderer
- * @since 2.0.0
  */
 class Discount extends \Magento\Checkout\Block\Total\DefaultTotal
 {
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -25,7 +23,6 @@ class Discount extends \Magento\Checkout\Block\Total\DefaultTotal
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
index 344b191a480cb..68de4cb24a487 100644
--- a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
@@ -7,7 +7,6 @@
 
 /**
  * Subtotal Total Row Renderer
- * @since 2.0.0
  */
 class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
 {
@@ -15,13 +14,11 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      * Path to template file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'checkout/grandtotal.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -33,7 +30,6 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Check if we have include tax amount between grandtotal incl/excl tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function includeTax()
     {
@@ -67,7 +62,6 @@ public function includeTax()
      * Get grandtotal exclude tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalExclTax()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index a310868cfb594..e9098035053be 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -7,7 +7,6 @@
 
 /**
  * Subtotal Total Row Renderer
- * @since 2.0.0
  */
 class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
 {
@@ -15,13 +14,11 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
      * Template path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'checkout/shipping.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -33,7 +30,6 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Check if we need display shipping include and exclude tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
@@ -64,7 +59,6 @@ public function displayBoth()
      * Check if we need display shipping include tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayIncludeTax()
     {
@@ -75,7 +69,6 @@ public function displayIncludeTax()
      * Get shipping amount include tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingIncludeTax()
     {
@@ -86,7 +79,6 @@ public function getShippingIncludeTax()
      * Get shipping amount exclude tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingExcludeTax()
     {
@@ -97,7 +89,6 @@ public function getShippingExcludeTax()
      * Get label for shipping include tax
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getIncludeTaxLabel()
     {
@@ -111,7 +102,6 @@ public function getIncludeTaxLabel()
      * Get label for shipping exclude tax
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getExcludeTaxLabel()
     {
@@ -125,7 +115,6 @@ public function getExcludeTaxLabel()
      * Determine shipping visibility based on selected method.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShipping()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping/Price.php b/app/code/Magento/Tax/Block/Checkout/Shipping/Price.php
index 2973c068e282b..88f49ad447f4d 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping/Price.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping/Price.php
@@ -10,13 +10,11 @@
 /**
  * Class Price
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Price extends \Magento\Checkout\Block\Shipping\Price
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -27,7 +25,6 @@ class Price extends \Magento\Checkout\Block\Shipping\Price
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -52,7 +49,6 @@ public function __construct(
      *
      * @param bool $flag
      * @return float
-     * @since 2.0.0
      */
     protected function getShippingPriceWithFlag($flag)
     {
@@ -75,7 +71,6 @@ protected function getShippingPriceWithFlag($flag)
      * Get shipping price excluding tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPriceExclTax()
     {
@@ -86,7 +81,6 @@ public function getShippingPriceExclTax()
      * Get shipping price including tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPriceInclTax()
     {
@@ -97,7 +91,6 @@ public function getShippingPriceInclTax()
      * Return flag whether to display shipping price including tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingPriceInclTax()
     {
@@ -108,7 +101,6 @@ public function displayShippingPriceInclTax()
      * Return flag whether to display shipping price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingPriceExclTax()
     {
@@ -119,7 +111,6 @@ public function displayShippingPriceExclTax()
      * Return flag whether to display shipping price including and excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingBothPrices()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Subtotal.php b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
index 7ea00eb205c1b..7a9059df08bab 100644
--- a/app/code/Magento/Tax/Block/Checkout/Subtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
@@ -7,7 +7,6 @@
 
 /**
  * Subtotal Total Row Renderer
- * @since 2.0.0
  */
 class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
 {
@@ -15,13 +14,11 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      * Template path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'checkout/subtotal.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -33,7 +30,6 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $layoutProcessors
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function displayBoth()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Tax.php b/app/code/Magento/Tax/Block/Checkout/Tax.php
index 658c0eb878d7d..70bd3f69692fa 100644
--- a/app/code/Magento/Tax/Block/Checkout/Tax.php
+++ b/app/code/Magento/Tax/Block/Checkout/Tax.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Tax\Block\Checkout\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'checkout/tax.phtml';
 }
diff --git a/app/code/Magento/Tax/Block/Item/Price/Renderer.php b/app/code/Magento/Tax/Block/Item/Price/Renderer.php
index 341add7756892..5aa1d3215c333 100644
--- a/app/code/Magento/Tax/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Item/Price/Renderer.php
@@ -19,25 +19,21 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Renderer extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var QuoteItem|OrderItem|InvoiceItem|CreditMemoItem
-     * @since 2.0.0
      */
     protected $item;
 
     /**
      * @var string|int|null
-     * @since 2.0.0
      */
     protected $storeId = null;
 
@@ -45,13 +41,11 @@ class Renderer extends \Magento\Framework\View\Element\Template
      * Set the display area, e.g., cart, sales, etc.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $zone = null;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -60,7 +54,6 @@ class Renderer extends \Magento\Framework\View\Element\Template
      * @param TaxHelper $taxHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -81,7 +74,6 @@ public function __construct(
      *
      * @param QuoteItem|OrderItem|InvoiceItem|CreditMemoItem $item
      * @return $this
-     * @since 2.0.0
      */
     public function setItem($item)
     {
@@ -94,7 +86,6 @@ public function setItem($item)
      * Get display zone
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getZone()
     {
@@ -106,7 +97,6 @@ public function getZone()
      *
      * @param string $zone
      * @return $this
-     * @since 2.0.0
      */
     public function setZone($zone)
     {
@@ -116,7 +106,6 @@ public function setZone($zone)
 
     /**
      * @return int|null|string
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -127,7 +116,6 @@ public function getStoreId()
      * Get quote or order item
      *
      * @return CreditMemoItem|InvoiceItem|OrderItem|QuoteItem
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -138,7 +126,6 @@ public function getItem()
      * Return whether display setting is to display price including tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceInclTax()
     {
@@ -157,7 +144,6 @@ public function displayPriceInclTax()
      * Return whether display setting is to display price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceExclTax()
     {
@@ -176,7 +162,6 @@ public function displayPriceExclTax()
      * Return whether display setting is to display both price including tax and price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBothPrices()
     {
@@ -196,7 +181,6 @@ public function displayBothPrices()
      *
      * @param float $price
      * @return string
-     * @since 2.0.0
      */
     public function formatPrice($price)
     {
@@ -220,7 +204,6 @@ public function formatPrice($price)
      * on item type
      *
      * @return float
-     * @since 2.0.0
      */
     public function getItemDisplayPriceExclTax()
     {
@@ -237,7 +220,6 @@ public function getItemDisplayPriceExclTax()
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -254,7 +236,6 @@ public function getTotalAmount($item)
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($item)
     {
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index c2cb05ce7f182..8b08064dc7e9b 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\View\Element\Template
 {
@@ -21,19 +20,16 @@ class Tax extends \Magento\Framework\View\Element\Template
      * Tax configuration model
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var Order
-     * @since 2.0.0
      */
     protected $_order;
 
     /**
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_source;
 
@@ -41,7 +37,6 @@ class Tax extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Check if we nedd display full tax total info
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayFullSummary()
     {
@@ -67,7 +61,6 @@ public function displayFullSummary()
      * Get data (totals) source model
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -78,7 +71,6 @@ public function getSource()
      * Initialize all order totals relates with tax
      *
      * @return \Magento\Tax\Block\Sales\Order\Tax
-     * @since 2.0.0
      */
     public function initTotals()
     {
@@ -106,7 +98,6 @@ public function initTotals()
      *
      * @param string $after
      * @return \Magento\Tax\Block\Sales\Order\Tax
-     * @since 2.0.0
      */
     protected function _addTax($after = 'discount')
     {
@@ -119,7 +110,6 @@ protected function _addTax($after = 'discount')
      * Get order store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -129,7 +119,6 @@ public function getStore()
     /**
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _initSubtotal()
     {
@@ -210,7 +199,6 @@ protected function _initSubtotal()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initShipping()
     {
@@ -272,7 +260,6 @@ protected function _initShipping()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _initDiscount()
     {
@@ -286,7 +273,6 @@ protected function _initDiscount()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initGrandTotal()
     {
@@ -331,7 +317,6 @@ protected function _initGrandTotal()
 
     /**
      * @return Order
-     * @since 2.0.0
      */
     public function getOrder()
     {
@@ -340,7 +325,6 @@ public function getOrder()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getLabelProperties()
     {
@@ -349,7 +333,6 @@ public function getLabelProperties()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValueProperties()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate.php
index 7fdd7e4edf323..85e0b64245f6c 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate.php
@@ -12,7 +12,6 @@
  * Adminhtml tax rate controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Rate extends \Magento\Backend\App\Action
 {
@@ -25,19 +24,16 @@ abstract class Rate extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rate\Converter
-     * @since 2.0.0
      */
     protected $_taxRateConverter;
 
     /**
      * @var \Magento\Tax\Api\TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $_taxRateRepository;
 
@@ -46,7 +42,6 @@ abstract class Rate extends \Magento\Backend\App\Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter
      * @param \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      *
      * @param array $rateData
      * @return array
-     * @since 2.0.0
      */
     protected function _processRateData($rateData)
     {
@@ -84,7 +78,6 @@ protected function _processRateData($rateData)
      * Initialize action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function initResultPage()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php
index bcbc0e408df98..09e56be2cfc15 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\Add
  *
- * @since 2.0.0
  */
 class Add extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -19,7 +18,6 @@ class Add extends \Magento\Tax\Controller\Adminhtml\Rate
      * Show Add Form
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php
index 4354e8a1d0a39..9455afcdd5ff9 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\AjaxDelete
  *
- * @since 2.0.0
  */
 class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -19,7 +18,6 @@ class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Rate
      * Delete Tax Rate via AJAX
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
index 5348b751137f1..e4cebbc47a2aa 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad
  *
- * @since 2.0.0
  */
 class AjaxLoad extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -20,7 +19,6 @@ class AjaxLoad extends \Magento\Tax\Controller\Adminhtml\Rate
      * Json needed for the Ajax Edit Form
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
index 676eef8c41ee3..e73a09d998f8e 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\AjaxSave
  *
- * @since 2.0.0
  */
 class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -19,7 +18,6 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
      * Save Tax Rate via AJAX
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
index d2284eec71a25..d5a9b398a586b 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -20,7 +19,6 @@ class Delete extends \Magento\Tax\Controller\Adminhtml\Rate
      * Delete Rate and Data
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
index 545e3fc393ecc..b928e8dc3031f 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Tax\Controller\Adminhtml\Rate
      * Show Edit Form
      *
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
index aaa4ffb5be783..d1e894e6240ec 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Tax\Controller\Adminhtml\Rate
      * Show Main Grid
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
index fd466cbb69614..bd2e818bfd9b0 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rate\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Tax\Controller\Adminhtml\Rate
 {
@@ -20,7 +19,6 @@ class Save extends \Magento\Tax\Controller\Adminhtml\Rate
      * Save Rate and Data
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
index 8ae0573019211..300c6e29e9389 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule
  *
- * @since 2.0.0
  */
 abstract class Rule extends \Magento\Backend\App\Action
 {
@@ -32,19 +31,16 @@ abstract class Rule extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Tax\Api\TaxRuleRepositoryInterface
-     * @since 2.0.0
      */
     protected $ruleService;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxRuleInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxRuleDataObjectFactory;
 
@@ -53,7 +49,6 @@ abstract class Rule extends \Magento\Backend\App\Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Tax\Api\TaxRuleRepositoryInterface $ruleService
      * @param \Magento\Tax\Api\Data\TaxRuleInterfaceFactory $taxRuleDataObjectFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -71,7 +66,6 @@ public function __construct(
      * Initialize action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function initResultPage()
     {
@@ -88,7 +82,6 @@ protected function initResultPage()
      * @param array $postData
      * @return \Magento\Tax\Api\Data\TaxRuleInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function populateTaxRule($postData)
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
index 5d4b7655bea01..f809f792b8141 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
index bb4a9e1dcb4bc..bf328722a4d91 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
index d94af120c7c69..c57e899d8c603 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php
index 96880a03da6c5..c80df70934520 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php
index 1ef3f2276a879..9ef223b165413 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Rule\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
index 79c052aa7eabd..b184004b99dda 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
@@ -12,7 +12,6 @@
  * Adminhtml common tax class controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 abstract class Tax extends \Magento\Backend\App\Action
 {
@@ -25,13 +24,11 @@ abstract class Tax extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxClassRepository;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxClassInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxClassDataObjectFactory;
 
@@ -39,7 +36,6 @@ abstract class Tax extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassService
      * @param \Magento\Tax\Api\Data\TaxClassInterfaceFactory $taxClassDataObjectFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      * @param string $className
      * @return string processed class name
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function _processClassName($className)
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php
index 978236d5a39a1..759dff89e97f1 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Tax\AjaxDelete
  *
- * @since 2.0.0
  */
 class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Tax
 {
@@ -19,7 +18,6 @@ class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Tax
      * Delete Tax Class via AJAX
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php
index 9abc52b745573..d8e841d8a1b0b 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Tax\AjaxSave
  *
- * @since 2.0.0
  */
 class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Tax
 {
@@ -19,7 +18,6 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Tax
      * Save Tax Class via AJAX
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
index a4c2cf883d26d..c27115ee78c89 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Tax\Controller\Adminhtml\Tax\IgnoreTaxNotification
  *
- * @since 2.0.0
  */
 class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
@@ -27,7 +25,6 @@ class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
      * @param \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassService
      * @param \Magento\Tax\Api\Data\TaxClassInterfaceFactory $taxClassDataObjectFactory
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * Set tax ignore notification flag and redirect back
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Tax/Controller/RegistryConstants.php b/app/code/Magento/Tax/Controller/RegistryConstants.php
index e9dd896b468b2..0f768c8350f3e 100644
--- a/app/code/Magento/Tax/Controller/RegistryConstants.php
+++ b/app/code/Magento/Tax/Controller/RegistryConstants.php
@@ -8,7 +8,6 @@
 /**
  * Declarations of core registry keys used by the Tax module
  *
- * @since 2.0.0
  */
 class RegistryConstants
 {
diff --git a/app/code/Magento/Tax/CustomerData/CheckoutTotalsJsLayoutDataProvider.php b/app/code/Magento/Tax/CustomerData/CheckoutTotalsJsLayoutDataProvider.php
index 30f934c052f42..a5b22dad53ae9 100644
--- a/app/code/Magento/Tax/CustomerData/CheckoutTotalsJsLayoutDataProvider.php
+++ b/app/code/Magento/Tax/CustomerData/CheckoutTotalsJsLayoutDataProvider.php
@@ -10,19 +10,16 @@
 
 /**
  * Checkout totals js layout data provider
- * @since 2.0.0
  */
 class CheckoutTotalsJsLayoutDataProvider implements JsLayoutDataProviderInterface
 {
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $taxConfig;
 
     /**
      * @param \Magento\Tax\Model\Config $taxConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig
@@ -32,7 +29,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -61,7 +57,6 @@ public function getData()
      * Get totals config
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getTotalsConfig()
     {
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 926bb5000f721..0f3e56b7bf9e4 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -25,7 +25,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @codingStandardsIgnoreFile
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -43,7 +42,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Tax configuration object
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -51,7 +49,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Postcode cut to this length when creating search templates
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_postCodeSubStringLength = 10;
 
@@ -59,49 +56,41 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Json Helper
      *
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory
-     * @since 2.0.0
      */
     protected $_orderTaxCollectionFactory;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Catalog\Helper\Data
-     * @since 2.0.0
      */
     protected $catalogHelper;
 
     /**
      * @var OrderTaxManagementInterface
-     * @since 2.0.0
      */
     protected $orderTaxManagement;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -126,7 +115,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -158,7 +146,6 @@ public function __construct(
      * Return max postcode length to create search templates
      *
      * @return int $len
-     * @since 2.0.0
      */
     public function getPostCodeSubStringLength()
     {
@@ -174,7 +161,6 @@ public function getPostCodeSubStringLength()
      * Get tax configuration object
      *
      * @return Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -186,7 +172,6 @@ public function getConfig()
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function priceIncludesTax($store = null)
     {
@@ -198,7 +183,6 @@ public function priceIncludesTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function applyTaxAfterDiscount($store = null)
     {
@@ -213,7 +197,6 @@ public function applyTaxAfterDiscount($store = null)
      *
      * @param  null|int|string|Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getPriceDisplayType($store = null)
     {
@@ -226,7 +209,6 @@ public function getPriceDisplayType($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function needPriceConversion($store = null)
     {
@@ -238,7 +220,6 @@ public function needPriceConversion($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayFullSummary($store = null)
     {
@@ -250,7 +231,6 @@ public function displayFullSummary($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayZeroTax($store = null)
     {
@@ -262,7 +242,6 @@ public function displayZeroTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartPriceInclTax($store = null)
     {
@@ -274,7 +253,6 @@ public function displayCartPriceInclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartPriceExclTax($store = null)
     {
@@ -286,7 +264,6 @@ public function displayCartPriceExclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartBothPrices($store = null)
     {
@@ -298,7 +275,6 @@ public function displayCartBothPrices($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesPriceInclTax($store = null)
     {
@@ -310,7 +286,6 @@ public function displaySalesPriceInclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesPriceExclTax($store = null)
     {
@@ -322,7 +297,6 @@ public function displaySalesPriceExclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesBothPrices($store = null)
     {
@@ -334,7 +308,6 @@ public function displaySalesBothPrices($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalBoth($store = null)
     {
@@ -346,7 +319,6 @@ public function displaySalesSubtotalBoth($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalInclTax($store = null)
     {
@@ -358,7 +330,6 @@ public function displaySalesSubtotalInclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalExclTax($store = null)
     {
@@ -370,7 +341,6 @@ public function displaySalesSubtotalExclTax($store = null)
      *
      * @param  null|int|string|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getPriceFormat($store = null)
     {
@@ -388,7 +358,6 @@ public function getPriceFormat($store = null)
      * Check if we have display in catalog prices including tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceIncludingTax()
     {
@@ -399,7 +368,6 @@ public function displayPriceIncludingTax()
      * Check if we have display in catalog prices excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceExcludingTax()
     {
@@ -411,7 +379,6 @@ public function displayPriceExcludingTax()
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayBothPrices($store = null)
     {
@@ -423,7 +390,6 @@ public function displayBothPrices($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function shippingPriceIncludesTax($store = null)
     {
@@ -435,7 +401,6 @@ public function shippingPriceIncludesTax($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getShippingPriceDisplayType($store = null)
     {
@@ -446,7 +411,6 @@ public function getShippingPriceDisplayType($store = null)
      * Returns whether the shipping price should display with taxes included
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingPriceIncludingTax()
     {
@@ -457,7 +421,6 @@ public function displayShippingPriceIncludingTax()
      * Returns whether the shipping price should display without taxes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingPriceExcludingTax()
     {
@@ -468,7 +431,6 @@ public function displayShippingPriceExcludingTax()
      * Returns whether the shipping price should display both with and without taxes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayShippingBothPrices()
     {
@@ -480,7 +442,6 @@ public function displayShippingBothPrices()
      *
      * @param  null|string|bool|int|Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getShippingTaxClass($store)
     {
@@ -496,7 +457,6 @@ public function getShippingTaxClass($store)
      * @param  int|null                   $ctc
      * @param  null|string|bool|int|Store $store
      * @return float
-     * @since 2.0.0
      */
     public function getShippingPrice($price, $includingTax = null, $shippingAddress = null, $ctc = null, $store = null)
     {
@@ -527,7 +487,6 @@ public function getShippingPrice($price, $includingTax = null, $shippingAddress
      *
      * @param  null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function discountTax($store = null)
     {
@@ -539,7 +498,6 @@ public function discountTax($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return string|null
-     * @since 2.0.0
      */
     public function getTaxBasedOn($store = null)
     {
@@ -555,7 +513,6 @@ public function getTaxBasedOn($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function applyTaxOnCustomPrice($store = null)
     {
@@ -571,7 +528,6 @@ public function applyTaxOnCustomPrice($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function applyTaxOnOriginalPrice($store = null)
     {
@@ -590,7 +546,6 @@ public function applyTaxOnOriginalPrice($store = null)
      *
      * @param  null|int|string|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getCalculationSequence($store = null)
     {
@@ -602,7 +557,6 @@ public function getCalculationSequence($store = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getCalculationAlgorithm($store = null)
     {
@@ -624,7 +578,6 @@ public function getCalculationAlgorithm($store = null)
      *
      * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Invoice|\Magento\Sales\Model\Order\Creditmemo $source
      * @return array
-     * @since 2.0.0
      */
     public function getCalculatedTaxes($source)
     {
@@ -667,7 +620,6 @@ public function getCalculatedTaxes($source)
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
      * @param  float                        $ratio
      * @return array
-     * @since 2.0.0
      */
     private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
     {
@@ -699,7 +651,6 @@ private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $
      *
      * @param  \Magento\Sales\Model\Order $order
      * @return array
-     * @since 2.0.0
      */
     protected function _getTaxRateSubtotals($order)
     {
@@ -710,7 +661,6 @@ protected function _getTaxRateSubtotals($order)
      * Retrieve default customer tax class from config
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultCustomerTaxClass()
     {
@@ -724,7 +674,6 @@ public function getDefaultCustomerTaxClass()
      * Retrieve default product tax class from config
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDefaultProductTaxClass()
     {
@@ -739,7 +688,6 @@ public function getDefaultProductTaxClass()
      *
      * @param  null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isCrossBorderTradeEnabled($store = null)
     {
@@ -749,7 +697,6 @@ public function isCrossBorderTradeEnabled($store = null)
     /**
      * @param  EntityInterface $current
      * @return array
-     * @since 2.0.0
      */
     protected function calculateTaxForOrder(EntityInterface $current)
     {
@@ -773,7 +720,6 @@ protected function calculateTaxForOrder(EntityInterface $current)
      * @param  EntityInterface $salesItem
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function calculateTaxForItems(EntityInterface $order, EntityInterface $salesItem)
     {
@@ -837,7 +783,6 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
      *
      * @param null|int|string|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isCatalogPriceDisplayAffectedByTax($store = null)
     {
diff --git a/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php b/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
index 098932d5c4990..2a6e41b2f5527 100644
--- a/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
+++ b/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Tax\Model\AggregateSalesReportTaxData
  *
- * @since 2.0.0
  */
 class AggregateSalesReportTaxData
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\Report\TaxFactory
-     * @since 2.0.0
      */
     protected $reportTaxFactory;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -35,7 +31,6 @@ class AggregateSalesReportTaxData
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Tax\Model\ResourceModel\Report\TaxFactory $reportTaxFactory
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -51,7 +46,6 @@ public function __construct(
      * Refresh sales tax report statistics for last day
      *
      * @return $this
-     * @since 2.0.0
      */
     public function invoke()
     {
diff --git a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
index 2f094ffdd035c..382a66cc8c932 100644
--- a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
@@ -8,31 +8,26 @@
 
 /**
  * Class ContextPlugin
- * @since 2.0.0
  */
 class ContextPlugin
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Proxy
-     * @since 2.0.0
      */
     protected $taxCalculation;
 
@@ -40,7 +35,6 @@ class ContextPlugin
      * Module manager
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -48,7 +42,6 @@ class ContextPlugin
      * Cache config
      *
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
@@ -59,7 +52,6 @@ class ContextPlugin
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\PageCache\Model\Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index ec70807731a0f..030b2974ce978 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -23,7 +23,6 @@
  * Tax Calculation Model
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Calculation extends \Magento\Framework\Model\AbstractModel
 {
@@ -66,7 +65,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Identifier constant for unit based calculation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rates = [];
 
@@ -74,7 +72,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Identifier constant for row based calculation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ctc = [];
 
@@ -82,7 +79,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Identifier constant for total based calculation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ptc = [];
 
@@ -90,7 +86,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Cache to hold the rates
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rateCache = [];
 
@@ -98,7 +93,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Store the rate calculation process
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rateCalculationProcess = [];
 
@@ -106,13 +100,11 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Hold the customer
      *
      * @var CustomerDataObject|bool
-     * @since 2.0.0
      */
     protected $_customer;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_defaultCustomerTaxClass;
 
@@ -120,31 +112,26 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory
-     * @since 2.0.0
      */
     protected $_classesFactory;
 
@@ -152,37 +139,31 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Tax configuration object
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var CustomerAccountManagement
-     * @since 2.0.0
      */
     protected $customerAccountManagement;
 
     /**
      * @var CustomerGroupManagement
-     * @since 2.0.0
      */
     protected $customerGroupManagement;
 
     /**
      * @var CustomerGroupRepository
-     * @since 2.0.0
      */
     protected $customerGroupRepository;
 
     /**
      * @var CustomerRepository
-     * @since 2.0.0
      */
     protected $customerRepository;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -190,7 +171,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Filter Builder
      *
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -198,7 +178,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Search Criteria Builder
      *
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -206,7 +185,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * Tax Class Repository
      *
      * @var TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxClassRepository;
 
@@ -231,7 +209,6 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -273,7 +250,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -285,7 +261,6 @@ protected function _construct()
      *
      * @param null|Store|string|int $store
      * @return int
-     * @since 2.0.0
      */
     public function getDefaultCustomerTaxClass($store = null)
     {
@@ -302,7 +277,6 @@ public function getDefaultCustomerTaxClass($store = null)
      *
      * @param   int $ruleId
      * @return  $this
-     * @since 2.0.0
      */
     public function deleteByRuleId($ruleId)
     {
@@ -315,7 +289,6 @@ public function deleteByRuleId($ruleId)
      *
      * @param   int $ruleId
      * @return  array
-     * @since 2.0.0
      */
     public function getRates($ruleId)
     {
@@ -330,7 +303,6 @@ public function getRates($ruleId)
      *
      * @param   int $ruleId
      * @return  array
-     * @since 2.0.0
      */
     public function getCustomerTaxClasses($ruleId)
     {
@@ -345,7 +317,6 @@ public function getCustomerTaxClasses($ruleId)
      *
      * @param   int $ruleId
      * @return  array
-     * @since 2.0.0
      */
     public function getProductTaxClasses($ruleId)
     {
@@ -359,7 +330,6 @@ public function getProductTaxClasses($ruleId)
      * Aggregate tax calculation data to array
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _formCalculationProcess()
     {
@@ -382,7 +352,6 @@ protected function _formCalculationProcess()
      *
      * @param   \Magento\Framework\DataObject $request
      * @return  float
-     * @since 2.0.0
      */
     public function getRate($request)
     {
@@ -414,7 +383,6 @@ public function getRate($request)
      *
      * @param   \Magento\Framework\DataObject $request
      * @return  string
-     * @since 2.0.0
      */
     protected function _getRequestCacheKey($request)
     {
@@ -441,7 +409,6 @@ protected function _getRequestCacheKey($request)
      * @param \Magento\Framework\DataObject $request
      * @param null|string|bool|int|Store $store
      * @return float
-     * @since 2.0.0
      */
     public function getStoreRate($request, $store = null)
     {
@@ -454,7 +421,6 @@ public function getStoreRate($request, $store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function getRateOriginRequest($store = null)
     {
@@ -491,7 +457,6 @@ protected function getRateOriginRequest($store = null)
      * @param null|int|string|Store $store
      * @param int $customerId
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getDefaultRateRequest($store = null, $customerId = null)
     {
@@ -508,7 +473,6 @@ public function getDefaultRateRequest($store = null, $customerId = null)
      *
      * @param   null|int|string|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     protected function _isCrossBorderTradeEnabled($store = null)
     {
@@ -534,7 +498,6 @@ protected function _isCrossBorderTradeEnabled($store = null)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getRateRequest(
         $shippingAddress = null,
@@ -660,7 +623,6 @@ public function getRateRequest(
      *
      * @param   \Magento\Framework\DataObject $request
      * @return  array
-     * @since 2.0.0
      */
     public function getAppliedRates($request)
     {
@@ -680,7 +642,6 @@ public function getAppliedRates($request)
      *
      * @param array $rates
      * @return array
-     * @since 2.0.0
      */
     public function reproduceProcess($rates)
     {
@@ -696,7 +657,6 @@ public function reproduceProcess($rates)
      * @param   boolean $priceIncludeTax
      * @param   boolean $round
      * @return  float
-     * @since 2.0.0
      */
     public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round = true)
     {
@@ -720,7 +680,6 @@ public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round
      *
      * @param   float $price
      * @return  float
-     * @since 2.0.0
      */
     public function round($price)
     {
@@ -732,7 +691,6 @@ public function round($price)
      * @param array $shippingAddress
      * @param int $customerTaxClassId
      * @return array
-     * @since 2.0.0
      */
     public function getTaxRates($billingAddress, $shippingAddress, $customerTaxClassId)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
index 2364a8d6b0f7a..b634fbe1d4872 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Tax\Model\Calculation\AbstractAggregateCalculator
  *
- * @since 2.0.0
  */
 abstract class AbstractAggregateCalculator extends AbstractCalculator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -93,7 +91,6 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -184,7 +181,6 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
      * @param bool $round
      * @param QuoteDetailsItemInterface $item
      * @return float
-     * @since 2.0.0
      */
     abstract protected function roundAmount(
         $amount,
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
index 23fcc3b7cb9a4..8cfe3079424d4 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -16,7 +16,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractCalculator
 {
@@ -30,19 +29,13 @@ abstract class AbstractCalculator
     const KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING = 'tax_before_discount';
     /**#@-*/
 
-    /**
-     * Tax details item data object factory
-     *
-     * @var TaxDetailsItemInterfaceFactory
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $taxDetailsItemDataObjectFactory;
 
     /**
      * Tax calculation tool
      *
      * @var Calculation
-     * @since 2.0.0
      */
     protected $calculationTool;
 
@@ -50,7 +43,6 @@ abstract class AbstractCalculator
      * Store id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $storeId;
 
@@ -58,7 +50,6 @@ abstract class AbstractCalculator
      * Customer tax class id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $customerTaxClassId;
 
@@ -66,7 +57,6 @@ abstract class AbstractCalculator
      * Customer id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $customerId;
 
@@ -74,7 +64,6 @@ abstract class AbstractCalculator
      * Shipping Address
      *
      * @var CustomerAddress
-     * @since 2.0.0
      */
     protected $shippingAddress;
 
@@ -82,7 +71,6 @@ abstract class AbstractCalculator
      * Billing Address
      *
      * @var CustomerAddress
-     * @since 2.0.0
      */
     protected $billingAddress;
 
@@ -90,7 +78,6 @@ abstract class AbstractCalculator
      * Tax configuration object
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -105,7 +92,6 @@ abstract class AbstractCalculator
      *  store (->getStore())
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     private $addressRateRequest = null;
 
@@ -119,7 +105,6 @@ abstract class AbstractCalculator
      *          'rate' => 'rounding delta',
      *      ],
      *  ]
-     * @since 2.0.0
      */
     protected $roundingDeltas;
 
@@ -127,19 +112,16 @@ abstract class AbstractCalculator
      * Tax Class Service
      *
      * @var TaxClassManagementInterface
-     * @since 2.0.0
      */
     protected $taxClassManagement;
 
     /**
      * @var AppliedTaxInterfaceFactory
-     * @since 2.0.0
      */
     protected $appliedTaxDataObjectFactory;
 
     /**
      * @var AppliedTaxRateInterfaceFactory
-     * @since 2.0.0
      */
     protected $appliedTaxRateDataObjectFactory;
 
@@ -154,7 +136,6 @@ abstract class AbstractCalculator
      * @param \Magento\Tax\Model\Config $config
      * @param int $storeId
      * @param \Magento\Framework\DataObject $addressRateRequest
-     * @since 2.0.0
      */
     public function __construct(
         TaxClassManagementInterface $taxClassService,
@@ -182,7 +163,6 @@ public function __construct(
      * @codeCoverageIgnoreStart
      * @param CustomerAddress $billingAddress
      * @return void
-     * @since 2.0.0
      */
     public function setBillingAddress(CustomerAddress $billingAddress)
     {
@@ -194,7 +174,6 @@ public function setBillingAddress(CustomerAddress $billingAddress)
      *
      * @param CustomerAddress $shippingAddress
      * @return void
-     * @since 2.0.0
      */
     public function setShippingAddress(CustomerAddress $shippingAddress)
     {
@@ -206,7 +185,6 @@ public function setShippingAddress(CustomerAddress $shippingAddress)
      *
      * @param int $customerTaxClassId
      * @return void
-     * @since 2.0.0
      */
     public function setCustomerTaxClassId($customerTaxClassId)
     {
@@ -218,7 +196,6 @@ public function setCustomerTaxClassId($customerTaxClassId)
      *
      * @param int $customerId
      * @return void
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -234,7 +211,6 @@ public function setCustomerId($customerId)
      * @param int $quantity
      * @param bool $round
      * @return TaxDetailsItemInterface
-     * @since 2.0.0
      */
     public function calculate(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -252,7 +228,6 @@ public function calculate(QuoteDetailsItemInterface $item, $quantity, $round = t
      * @param int $quantity
      * @param bool $round
      * @return TaxDetailsItemInterface
-     * @since 2.0.0
      */
     abstract protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true);
 
@@ -263,7 +238,6 @@ abstract protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $i
      * @param int $quantity
      * @param bool $round
      * @return TaxDetailsItemInterface
-     * @since 2.0.0
      */
     abstract protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true);
 
@@ -278,7 +252,6 @@ abstract protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface
      *  store (->getStore())
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function getAddressRateRequest()
     {
@@ -300,7 +273,6 @@ protected function getAddressRateRequest()
      * @param float $rate
      * @param float $storeRate
      * @return bool
-     * @since 2.0.0
      */
     protected function isSameRateAsStore($rate, $storeRate)
     {
@@ -327,7 +299,6 @@ protected function isSameRateAsStore($rate, $storeRate)
      *      ],
      *  ]
      * @return \Magento\Tax\Api\Data\AppliedTaxInterface
-     * @since 2.0.0
      */
     protected function getAppliedTax($rowTax, $appliedRate)
     {
@@ -377,7 +348,6 @@ protected function getAppliedTax($rowTax, $appliedRate)
      *      ],
      *  ]
      * @return \Magento\Tax\Api\Data\AppliedTaxInterface[]
-     * @since 2.0.0
      */
     protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)
     {
@@ -432,7 +402,6 @@ protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)
      * @param string $type
      * @param bool $round
      * @return float
-     * @since 2.0.0
      */
     protected function deltaRound($price, $rate, $direction, $type = self::KEY_REGULAR_DELTA_ROUNDING, $round = true)
     {
@@ -463,7 +432,6 @@ protected function deltaRound($price, $rate, $direction, $type = self::KEY_REGUL
      * @param float $customerRate
      * @param boolean $round
      * @return float
-     * @since 2.0.0
      */
     protected function calculatePriceInclTax($storePriceInclTax, $storeRate, $customerRate, $round = true)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/CalculatorFactory.php b/app/code/Magento/Tax/Model/Calculation/CalculatorFactory.php
index e20d93aced542..f499ba45fe7ee 100644
--- a/app/code/Magento/Tax/Model/Calculation/CalculatorFactory.php
+++ b/app/code/Magento/Tax/Model/Calculation/CalculatorFactory.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Model\Calculation\CalculatorFactory
  *
- * @since 2.0.0
  */
 class CalculatorFactory
 {
@@ -32,7 +31,6 @@ class CalculatorFactory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -40,7 +38,6 @@ class CalculatorFactory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -58,7 +55,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param null|int $customerId
      * @return \Magento\Tax\Model\Calculation\AbstractCalculator
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(
         $type,
diff --git a/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php b/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
index 8d4d3a5ccbbd4..f0a7a182c2dc0 100644
--- a/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
+++ b/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
@@ -11,7 +11,6 @@
 
 /**
  * Grand Total Tax Details Model
- * @since 2.0.0
  */
 class GrandTotalDetails extends AbstractSimpleObject implements GrandTotalDetailsInterface
 {
@@ -25,7 +24,6 @@ class GrandTotalDetails extends AbstractSimpleObject implements GrandTotalDetail
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGroupId()
     {
@@ -34,7 +32,6 @@ public function getGroupId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGroupId($id)
     {
@@ -43,7 +40,6 @@ public function setGroupId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -52,7 +48,6 @@ public function getAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAmount($amount)
     {
@@ -61,7 +56,6 @@ public function setAmount($amount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRates()
     {
@@ -70,7 +64,6 @@ public function getRates()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRates($rates)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php b/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
index a21ff3ea8f1a1..be7fe9c5473be 100644
--- a/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
+++ b/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
@@ -11,7 +11,6 @@
 
 /**
  * Grand Total Tax Details Model
- * @since 2.0.0
  */
 class GrandTotalRates extends AbstractSimpleObject implements GrandTotalRatesInterface
 {
@@ -24,7 +23,6 @@ class GrandTotalRates extends AbstractSimpleObject implements GrandTotalRatesInt
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -33,7 +31,6 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -42,7 +39,6 @@ public function setTitle($title)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPercent()
     {
@@ -51,7 +47,6 @@ public function getPercent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPercent($percent)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index 2b4f63b892167..cbdf2218e931a 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -19,7 +19,6 @@
  * @method \Magento\Tax\Model\ResourceModel\Calculation\Rate _getResource()
  * @method \Magento\Tax\Model\ResourceModel\Calculation\Rate getResource()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements TaxRateInterface
 {
@@ -39,34 +38,25 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements T
     const KEY_TITLES          = 'titles';
     /**#@-*/
 
-    /**
-     * List of tax titles
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_titles = null;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rate\Title
-     * @since 2.0.0
      */
     protected $_titleModel = null;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $_regionFactory;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rate\TitleFactory
-     * @since 2.0.0
      */
     protected $_titleFactory;
     /**
      * @var Region
-     * @since 2.0.0
      */
     protected $directoryRegion;
 
@@ -82,7 +72,6 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements T
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -114,7 +103,6 @@ public function __construct(
      * Magento model constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -128,7 +116,6 @@ protected function _construct()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -198,7 +185,6 @@ public function beforeSave()
      * Save rate titles
      *
      * @return \Magento\Tax\Model\Calculation\Rate
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -212,7 +198,6 @@ public function afterSave()
      *
      * @return \Magento\Tax\Model\Calculation\Rate
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -229,7 +214,6 @@ public function beforeDelete()
      * redeclared for dispatch tax_settings_change_after event
      *
      * @return \Magento\Tax\Model\Calculation\Rate
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -242,7 +226,6 @@ public function afterDelete()
      *
      * @param array|null $titles
      * @return void
-     * @since 2.0.0
      */
     public function saveTitles($titles = null)
     {
@@ -272,7 +255,6 @@ public function saveTitles($titles = null)
      * Returns a tax title
      *
      * @return \Magento\Tax\Model\Calculation\Rate\Title
-     * @since 2.0.0
      */
     public function getTitleModel()
     {
@@ -284,7 +266,6 @@ public function getTitleModel()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitles()
     {
@@ -301,7 +282,6 @@ public function getTitles()
      * Deletes all tax rates
      *
      * @return \Magento\Tax\Model\Calculation\Rate
-     * @since 2.0.0
      */
     public function deleteAllRates()
     {
@@ -315,7 +295,6 @@ public function deleteAllRates()
      *
      * @param  string $code
      * @return \Magento\Tax\Model\Calculation\Rate
-     * @since 2.0.0
      */
     public function loadByCode($code)
     {
@@ -327,7 +306,6 @@ public function loadByCode($code)
      * Check if rate exists in tax rule
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _isInRule()
     {
@@ -336,7 +314,6 @@ protected function _isInRule()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRegionName()
     {
@@ -350,7 +327,6 @@ public function getRegionName()
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxCalculationRateId()
     {
@@ -359,7 +335,6 @@ public function getTaxCalculationRateId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxCountryId()
     {
@@ -368,7 +343,6 @@ public function getTaxCountryId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxRegionId()
     {
@@ -377,7 +351,6 @@ public function getTaxRegionId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxPostcode()
     {
@@ -386,7 +359,6 @@ public function getTaxPostcode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getZipFrom()
     {
@@ -395,7 +367,6 @@ public function getZipFrom()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getZipTo()
     {
@@ -404,7 +375,6 @@ public function getZipTo()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRate()
     {
@@ -413,7 +383,6 @@ public function getRate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -422,7 +391,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getZipIsRange()
     {
@@ -434,7 +402,6 @@ public function getZipIsRange()
      *
      * @param string $taxCountryId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxCountryId($taxCountryId)
     {
@@ -446,7 +413,6 @@ public function setTaxCountryId($taxCountryId)
      *
      * @param int $taxRegionId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRegionId($taxRegionId)
     {
@@ -458,7 +424,6 @@ public function setTaxRegionId($taxRegionId)
      *
      * @param string $regionName
      * @return $this
-     * @since 2.0.0
      */
     public function setRegionName($regionName)
     {
@@ -470,7 +435,6 @@ public function setRegionName($regionName)
      *
      * @param string $taxPostCode
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPostcode($taxPostCode)
     {
@@ -482,7 +446,6 @@ public function setTaxPostcode($taxPostCode)
      *
      * @param int $zipIsRange
      * @return $this
-     * @since 2.0.0
      */
     public function setZipIsRange($zipIsRange)
     {
@@ -494,7 +457,6 @@ public function setZipIsRange($zipIsRange)
      *
      * @param int $zipFrom
      * @return $this
-     * @since 2.0.0
      */
     public function setZipFrom($zipFrom)
     {
@@ -506,7 +468,6 @@ public function setZipFrom($zipFrom)
      *
      * @param int $zipTo
      * @return $this
-     * @since 2.0.0
      */
     public function setZipTo($zipTo)
     {
@@ -518,7 +479,6 @@ public function setZipTo($zipTo)
      *
      * @param float $rate
      * @return $this
-     * @since 2.0.0
      */
     public function setRate($rate)
     {
@@ -530,7 +490,6 @@ public function setRate($rate)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -542,7 +501,6 @@ public function setCode($code)
      *
      * @param \Magento\Tax\Api\Data\TaxRateTitleInterface[] $titles
      * @return $this
-     * @since 2.0.0
      */
     public function setTitles(array $titles = null)
     {
@@ -555,7 +513,6 @@ public function setTitles(array $titles = null)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxRateExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -567,7 +524,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxRateExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRateExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php b/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
index 5f2cc642d64f9..ac5fbce078497 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
@@ -9,26 +9,22 @@
  * Tax Rate Model converter.
  *
  * Converts a Tax Rate Model to a Data Object or vice versa.
- * @since 2.0.0
  */
 class Converter
 {
     /**
      * @var \Magento\Tax\Api\Data\TaxRateInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxRateDataObjectFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxRateTitleInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxRateTitleDataObjectFactory;
 
     /**
      * @param \Magento\Tax\Api\Data\TaxRateInterfaceFactory $taxRateDataObjectFactory
      * @param \Magento\Tax\Api\Data\TaxRateTitleInterfaceFactory $taxRateTitleDataObjectFactory,
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Api\Data\TaxRateInterfaceFactory $taxRateDataObjectFactory,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param \Magento\Tax\Api\Data\TaxRateInterface $taxRate
      * @return array
-     * @since 2.0.0
      */
     public function createTitleArrayFromServiceObject(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
     {
@@ -65,7 +60,6 @@ public function createTitleArrayFromServiceObject(\Magento\Tax\Api\Data\TaxRateI
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function createArrayFromServiceObject(
         \Magento\Tax\Api\Data\TaxRateInterface $taxRate,
@@ -121,7 +115,6 @@ public function createArrayFromServiceObject(
      *
      * @param array $formData
      * @return \Magento\Tax\Api\Data\TaxRateInterface
-     * @since 2.0.0
      */
     public function populateTaxRateData($formData)
     {
@@ -154,7 +147,6 @@ public function populateTaxRateData($formData)
      * @param array $formData the form to get data from
      * @param string $fieldName the key
      * @return null|string
-     * @since 2.0.0
      */
     protected function extractFormData($formData, $fieldName)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate/Title.php b/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
index 062a3bcf17c67..4bcfb72236531 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
@@ -20,7 +20,6 @@
 /**
  * Class \Magento\Tax\Model\Calculation\Rate\Title
  *
- * @since 2.0.0
  */
 class Title extends \Magento\Framework\Model\AbstractExtensibleModel implements TaxRateTitleInterface
 {
@@ -34,7 +33,6 @@ class Title extends \Magento\Framework\Model\AbstractExtensibleModel implements
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -44,7 +42,6 @@ protected function _construct()
     /**
      * @param int $rateId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteByRateId($rateId)
     {
@@ -55,7 +52,6 @@ public function deleteByRateId($rateId)
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -64,7 +60,6 @@ public function getStoreId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -76,7 +71,6 @@ public function getValue()
      *
      * @param string $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -88,7 +82,6 @@ public function setStoreId($storeId)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -101,7 +94,6 @@ public function setValue($value)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -113,7 +105,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRateTitleExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/RateFactory.php b/app/code/Magento/Tax/Model/Calculation/RateFactory.php
index 6b235f0f3307d..aba2c67aea7aa 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateFactory.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateFactory.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Tax\Model\Calculation\RateFactory
  *
- * @since 2.0.0
  */
 class RateFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return \Magento\Tax\Model\Calculation\Rate
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/RateRegistry.php b/app/code/Magento/Tax/Model/Calculation/RateRegistry.php
index b46e13fbbdf75..a7b6ccf83cf34 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateRegistry.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateRegistry.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Tax\Model\Calculation\RateRegistry
  *
- * @since 2.0.0
  */
 class RateRegistry
 {
@@ -21,7 +20,6 @@ class RateRegistry
      * Tax rate model factory
      *
      * @var  TaxRateModelFactory
-     * @since 2.0.0
      */
     private $taxRateModelFactory;
 
@@ -29,7 +27,6 @@ class RateRegistry
      * Tax rate models
      *
      * @var TaxRateModel[]
-     * @since 2.0.0
      */
     private $taxRateRegistryById = [];
 
@@ -37,7 +34,6 @@ class RateRegistry
      * Constructor
      *
      * @param TaxRateModelFactory $taxModelRateFactory
-     * @since 2.0.0
      */
     public function __construct(
         TaxRateModelFactory $taxModelRateFactory
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param TaxRateModel $taxRateModel
      * @return void
-     * @since 2.0.0
      */
     public function registerTaxRate(TaxRateModel $taxRateModel)
     {
@@ -63,7 +58,6 @@ public function registerTaxRate(TaxRateModel $taxRateModel)
      * @param int $taxRateId
      * @return TaxRateModel
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieveTaxRate($taxRateId)
     {
@@ -85,7 +79,6 @@ public function retrieveTaxRate($taxRateId)
      *
      * @param int $taxRateId
      * @return void
-     * @since 2.0.0
      */
     public function removeTaxRate($taxRateId)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/RateRepository.php b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
index 921fab2ab830c..bef18ecd9c924 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateRepository.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
@@ -18,7 +18,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
 {
@@ -28,7 +27,6 @@ class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
      * Tax rate model and tax rate data object converter
      *
      * @var  Converter
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -36,43 +34,36 @@ class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
      * Tax rate registry
      *
      * @var  RateRegistry
-     * @since 2.0.0
      */
     protected $rateRegistry;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxRuleSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     private $taxRateSearchResultsFactory;
 
     /**
      * @var RateFactory
-     * @since 2.0.0
      */
     private $rateFactory;
 
     /**
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $countryFactory;
 
     /**
      * @var \Magento\Directory\Model\RegionFactory
-     * @since 2.0.0
      */
     protected $regionFactory;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\Calculation\Rate
-     * @since 2.0.0
      */
     protected $resourceModel;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -92,7 +83,6 @@ class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
      * @param \Magento\Tax\Model\ResourceModel\Calculation\Rate $rateResource
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Converter $converter,
@@ -118,7 +108,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
     {
@@ -139,7 +128,6 @@ public function save(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($rateId)
     {
@@ -148,7 +136,6 @@ public function get($rateId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
     {
@@ -157,7 +144,6 @@ public function delete(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($rateId)
     {
@@ -169,7 +155,6 @@ public function deleteById($rateId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -200,7 +185,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return void
      * @deprecated 2.2.0
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
     {
@@ -222,7 +206,6 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
      * @deprecated 2.2.0
      * @param string $field a field name that should be translated to a DB column name.
      * @return string
-     * @since 2.0.0
      */
     protected function translateField($field)
     {
@@ -243,7 +226,6 @@ protected function translateField($field)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     private function validate(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
index ec63a4e99e695..340140271413b 100644
--- a/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Calculation\RowBaseCalculator
  *
- * @since 2.0.0
  */
 class RowBaseCalculator extends AbstractAggregateCalculator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function roundAmount(
         $amount,
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule.php b/app/code/Magento/Tax/Model/Calculation/Rule.php
index 269d8510fd711..e718e03bfe90c 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule.php
@@ -14,7 +14,6 @@
  *
  * @method \Magento\Tax\Model\ResourceModel\Calculation\Rule _getResource()
  * @method \Magento\Tax\Model\ResourceModel\Calculation\Rule getResource()
- * @since 2.0.0
  */
 class Rule extends \Magento\Framework\Model\AbstractExtensibleModel implements TaxRuleInterface
 {
@@ -32,31 +31,23 @@ class Rule extends \Magento\Framework\Model\AbstractExtensibleModel implements T
     const KEY_CALCULATE_SUBTOTAL     = 'calculate_subtotal';
     /**#@-*/
 
-    /**
-     * Prefix of model events names
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_eventPrefix = 'tax_rule';
 
     /**
      * Tax Model Class
      *
      * @var \Magento\Tax\Model\ClassModel
-     * @since 2.0.0
      */
     protected $_taxClass;
 
     /**
      * @var \Magento\Tax\Model\Calculation
-     * @since 2.0.0
      */
     protected $_calculation;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rule\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -64,7 +55,6 @@ class Rule extends \Magento\Framework\Model\AbstractExtensibleModel implements T
      * Name of object id field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'tax_calculation_rule_id';
 
@@ -80,7 +70,6 @@ class Rule extends \Magento\Framework\Model\AbstractExtensibleModel implements T
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -114,7 +103,6 @@ public function __construct(
      * Re-declared for populate rate calculations
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -129,7 +117,6 @@ public function afterSave()
      * Re-declared for dispatch tax_settings_change_after event
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -139,7 +126,6 @@ public function afterDelete()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function saveCalculationData()
     {
@@ -165,7 +151,6 @@ public function saveCalculationData()
 
     /**
      * @return \Magento\Tax\Model\Calculation
-     * @since 2.0.0
      */
     public function getCalculationModel()
     {
@@ -174,7 +159,6 @@ public function getCalculationModel()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRates()
     {
@@ -183,7 +167,6 @@ public function getRates()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getCustomerTaxClasses()
     {
@@ -192,7 +175,6 @@ public function getCustomerTaxClasses()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getProductTaxClasses()
     {
@@ -207,7 +189,6 @@ public function getProductTaxClasses()
      * @param array $customerTaxClassIds
      * @param array $productTaxClassIds
      * @return array
-     * @since 2.0.0
      */
     public function fetchRuleCodes($rateId, $customerTaxClassIds, $productTaxClassIds)
     {
@@ -217,7 +198,6 @@ public function fetchRuleCodes($rateId, $customerTaxClassIds, $productTaxClassId
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -226,7 +206,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPosition()
     {
@@ -235,7 +214,6 @@ public function getPosition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCalculateSubtotal()
     {
@@ -244,7 +222,6 @@ public function getCalculateSubtotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPriority()
     {
@@ -255,7 +232,6 @@ public function getPriority()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerTaxClassIds()
     {
@@ -269,7 +245,6 @@ public function getCustomerTaxClassIds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProductTaxClassIds()
     {
@@ -283,7 +258,6 @@ public function getProductTaxClassIds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxRateIds()
     {
@@ -300,7 +274,6 @@ public function getTaxRateIds()
      *
      * @param array|null $values
      * @return array|null
-     * @since 2.0.0
      */
     protected function _getUniqueValues($values)
     {
@@ -312,7 +285,6 @@ protected function _getUniqueValues($values)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -324,7 +296,6 @@ protected function _getValidationRulesBeforeSave()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -336,7 +307,6 @@ public function setCode($code)
      *
      * @param int $priority
      * @return $this
-     * @since 2.0.0
      */
     public function setPriority($priority)
     {
@@ -348,7 +318,6 @@ public function setPriority($priority)
      *
      * @param int $position
      * @return $this
-     * @since 2.0.0
      */
     public function setPosition($position)
     {
@@ -360,7 +329,6 @@ public function setPosition($position)
      *
      * @param int[] $customerTaxClassIds
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassIds(array $customerTaxClassIds = null)
     {
@@ -372,7 +340,6 @@ public function setCustomerTaxClassIds(array $customerTaxClassIds = null)
      *
      * @param int[] $productTaxClassIds
      * @return $this
-     * @since 2.0.0
      */
     public function setProductTaxClassIds(array $productTaxClassIds = null)
     {
@@ -384,7 +351,6 @@ public function setProductTaxClassIds(array $productTaxClassIds = null)
      *
      * @param int[] $taxRateIds
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRateIds(array $taxRateIds = null)
     {
@@ -396,7 +362,6 @@ public function setTaxRateIds(array $taxRateIds = null)
      *
      * @param bool $calculateSubtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setCalculateSubtotal($calculateSubtotal)
     {
@@ -407,7 +372,6 @@ public function setCalculateSubtotal($calculateSubtotal)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxRuleExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -419,7 +383,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxRuleExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxRuleExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
index e789fc4747524..f8a155f6942ff 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Tax\Model\Calculation\Rule\Validator
  *
- * @since 2.0.0
  */
 class Validator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * @var ClassModelRegistry
-     * @since 2.0.0
      */
     protected $classModelRegistry;
 
     /**
      * @param ClassModelRegistry $classModelRegistry
-     * @since 2.0.0
      */
     public function __construct(ClassModelRegistry $classModelRegistry)
     {
@@ -43,7 +40,6 @@ public function __construct(ClassModelRegistry $classModelRegistry)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -157,7 +153,6 @@ public function isValid($value)
      * @param string $message
      * @param array $params
      * @return void
-     * @since 2.0.0
      */
     protected function addErrorMessage(&$messages, $message, $params)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/TaxRuleRegistry.php b/app/code/Magento/Tax/Model/Calculation/TaxRuleRegistry.php
index 7abe3a305e5f7..4cb0f06d506d8 100644
--- a/app/code/Magento/Tax/Model/Calculation/TaxRuleRegistry.php
+++ b/app/code/Magento/Tax/Model/Calculation/TaxRuleRegistry.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Tax\Model\Calculation\TaxRuleRegistry
  *
- * @since 2.0.0
  */
 class TaxRuleRegistry
 {
     /**
      * @var \Magento\Tax\Model\Calculation\RuleFactory
-     * @since 2.0.0
      */
     private $taxRuleModelFactory;
 
     /**
      * @var array taxRuleId => TaxRuleModel
-     * @since 2.0.0
      */
     private $registry = [];
 
@@ -33,7 +30,6 @@ class TaxRuleRegistry
      * Constructor
      *
      * @param TaxRuleModelFactory $taxRuleModelFactory
-     * @since 2.0.0
      */
     public function __construct(
         TaxRuleModelFactory $taxRuleModelFactory
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param TaxRuleModel $taxRuleModel
      * @return void
-     * @since 2.0.0
      */
     public function registerTaxRule(TaxRuleModel $taxRuleModel)
     {
@@ -59,7 +54,6 @@ public function registerTaxRule(TaxRuleModel $taxRuleModel)
      * @param int $taxRuleId
      * @return TaxRuleModel
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieveTaxRule($taxRuleId)
     {
@@ -80,7 +74,6 @@ public function retrieveTaxRule($taxRuleId)
      *
      * @param int $taxRuleId
      * @return void
-     * @since 2.0.0
      */
     public function removeTaxRule($taxRuleId)
     {
diff --git a/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
index a66d145800450..af2ce88877007 100644
--- a/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Calculation\TotalBaseCalculator
  *
- * @since 2.0.0
  */
 class TotalBaseCalculator extends AbstractAggregateCalculator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function roundAmount(
         $amount,
diff --git a/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
index b8c1ab9be86f8..d4a34a155a8b7 100644
--- a/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Tax\Model\Calculation\UnitBaseCalculator
  *
- * @since 2.0.0
  */
 class UnitBaseCalculator extends AbstractCalculator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function roundAmount(
         $amount,
@@ -38,7 +36,6 @@ protected function roundAmount(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -112,7 +109,6 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
diff --git a/app/code/Magento/Tax/Model/ClassModel.php b/app/code/Magento/Tax/Model/ClassModel.php
index 51b78360566f6..d657b4848939a 100644
--- a/app/code/Magento/Tax/Model/ClassModel.php
+++ b/app/code/Magento/Tax/Model/ClassModel.php
@@ -14,7 +14,6 @@
  *
  * @method \Magento\Tax\Model\ResourceModel\TaxClass _getResource()
  * @method \Magento\Tax\Model\ResourceModel\TaxClass getResource()
- * @since 2.0.0
  */
 class ClassModel extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Tax\Api\Data\TaxClassInterface
@@ -39,7 +38,6 @@ class ClassModel extends \Magento\Framework\Model\AbstractExtensibleModel implem
 
     /**
      * @var \Magento\Tax\Model\TaxClass\Factory
-     * @since 2.0.0
      */
     protected $_classFactory;
 
@@ -52,7 +50,6 @@ class ClassModel extends \Magento\Framework\Model\AbstractExtensibleModel implem
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -78,7 +75,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -90,7 +86,6 @@ public function _construct()
      *
      * @return bool
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     protected function checkClassCanBeDeleted()
     {
@@ -126,7 +121,6 @@ protected function checkClassCanBeDeleted()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -137,7 +131,6 @@ public function beforeDelete()
     /**
      * @codeCoverageIgnoreStart
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getClassId()
     {
@@ -146,7 +139,6 @@ public function getClassId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getClassName()
     {
@@ -155,7 +147,6 @@ public function getClassName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getClassType()
     {
@@ -167,7 +158,6 @@ public function getClassType()
      *
      * @param int $classId
      * @return $this
-     * @since 2.0.0
      */
     public function setClassId($classId)
     {
@@ -179,7 +169,6 @@ public function setClassId($classId)
      *
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function setClassName($className)
     {
@@ -191,7 +180,6 @@ public function setClassName($className)
      *
      * @param string $classType
      * @return $this
-     * @since 2.0.0
      */
     public function setClassType($classType)
     {
@@ -204,7 +192,6 @@ public function setClassType($classType)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxClassExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -216,7 +203,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxClassExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxClassExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/ClassModelRegistry.php b/app/code/Magento/Tax/Model/ClassModelRegistry.php
index b69b65a4f1c7d..668d104f3ccfb 100644
--- a/app/code/Magento/Tax/Model/ClassModelRegistry.php
+++ b/app/code/Magento/Tax/Model/ClassModelRegistry.php
@@ -12,7 +12,6 @@
 
 /**
  * Registry for the tax class models
- * @since 2.0.0
  */
 class ClassModelRegistry
 {
@@ -20,7 +19,6 @@ class ClassModelRegistry
      * Tax class model factory
      *
      * @var TaxClassModelFactory
-     * @since 2.0.0
      */
     private $taxClassModelFactory;
 
@@ -28,7 +26,6 @@ class ClassModelRegistry
      * Tax class models
      *
      * @var TaxClassModel[]
-     * @since 2.0.0
      */
     private $taxClassRegistryById = [];
 
@@ -36,7 +33,6 @@ class ClassModelRegistry
      * Initialize dependencies
      *
      * @param TaxClassModelFactory $taxClassModelFactory
-     * @since 2.0.0
      */
     public function __construct(TaxClassModelFactory $taxClassModelFactory)
     {
@@ -48,7 +44,6 @@ public function __construct(TaxClassModelFactory $taxClassModelFactory)
      *
      * @param TaxClassModel $taxClassModel
      * @return void
-     * @since 2.0.0
      */
     public function registerTaxClass(TaxClassModel $taxClassModel)
     {
@@ -61,7 +56,6 @@ public function registerTaxClass(TaxClassModel $taxClassModel)
      * @param int $taxClassId
      * @return TaxClassModel
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function retrieve($taxClassId)
     {
@@ -83,7 +77,6 @@ public function retrieve($taxClassId)
      *
      * @param int $taxClassId
      * @return void
-     * @since 2.0.0
      */
     public function remove($taxClassId)
     {
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index be4d9055cf28f..37c73f0d48324 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Config
 {
@@ -118,7 +117,6 @@ class Config
 
     /**
      * @var bool|null
-     * @since 2.0.0
      */
     protected $_priceIncludesTax = null;
 
@@ -126,13 +124,11 @@ class Config
      * Flag which notify what we need use shipping prices exclude tax for calculations
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_needUseShippingExcludeTax = false;
 
     /**
      * @var $_shippingPriceIncludeTax bool
-     * @since 2.0.0
      */
     protected $_shippingPriceIncludeTax = null;
 
@@ -140,13 +136,11 @@ class Config
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -158,7 +152,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function priceIncludesTax($store = null)
     {
@@ -177,7 +170,6 @@ public function priceIncludesTax($store = null)
      *
      * @param bool|null $value
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceIncludesTax($value)
     {
@@ -194,7 +186,6 @@ public function setPriceIncludesTax($value)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function applyTaxAfterDiscount($store = null)
     {
@@ -213,7 +204,6 @@ public function applyTaxAfterDiscount($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getPriceDisplayType($store = null)
     {
@@ -229,7 +219,6 @@ public function getPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function discountTax($store = null)
     {
@@ -246,7 +235,6 @@ public function discountTax($store = null)
      *
      * @param   null|int|string|Store $store
      * @return  string
-     * @since 2.0.0
      */
     public function getCalculationSequence($store = null)
     {
@@ -271,7 +259,6 @@ public function getCalculationSequence($store = null)
      *
      * @param   bool $flag
      * @return  \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     public function setNeedUseShippingExcludeTax($flag)
     {
@@ -284,7 +271,6 @@ public function setNeedUseShippingExcludeTax($flag)
      *
      * @return bool $flag
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getNeedUseShippingExcludeTax()
     {
@@ -296,7 +282,6 @@ public function getNeedUseShippingExcludeTax()
      *
      * @param   null|string|bool|int|Store $store
      * @return  string
-     * @since 2.0.0
      */
     public function getAlgorithm($store = null)
     {
@@ -312,7 +297,6 @@ public function getAlgorithm($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getShippingTaxClass($store = null)
     {
@@ -328,7 +312,6 @@ public function getShippingTaxClass($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getShippingPriceDisplayType($store = null)
     {
@@ -344,7 +327,6 @@ public function getShippingPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function shippingPriceIncludesTax($store = null)
     {
@@ -363,7 +345,6 @@ public function shippingPriceIncludesTax($store = null)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingPriceIncludeTax($flag)
     {
@@ -374,7 +355,6 @@ public function setShippingPriceIncludeTax($flag)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartPricesInclTax($store = null)
     {
@@ -388,7 +368,6 @@ public function displayCartPricesInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartPricesExclTax($store = null)
     {
@@ -402,7 +381,6 @@ public function displayCartPricesExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartPricesBoth($store = null)
     {
@@ -416,7 +394,6 @@ public function displayCartPricesBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartSubtotalInclTax($store = null)
     {
@@ -430,7 +407,6 @@ public function displayCartSubtotalInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartSubtotalExclTax($store = null)
     {
@@ -444,7 +420,6 @@ public function displayCartSubtotalExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartSubtotalBoth($store = null)
     {
@@ -458,7 +433,6 @@ public function displayCartSubtotalBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartShippingInclTax($store = null)
     {
@@ -472,7 +446,6 @@ public function displayCartShippingInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartShippingExclTax($store = null)
     {
@@ -486,7 +459,6 @@ public function displayCartShippingExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartShippingBoth($store = null)
     {
@@ -501,7 +473,6 @@ public function displayCartShippingBoth($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displayCartDiscountInclTax($store = null)
     {
@@ -516,7 +487,6 @@ public function displayCartDiscountInclTax($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displayCartDiscountExclTax($store = null)
     {
@@ -531,7 +501,6 @@ public function displayCartDiscountExclTax($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displayCartDiscountBoth($store = null)
     {
@@ -545,7 +514,6 @@ public function displayCartDiscountBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartTaxWithGrandTotal($store = null)
     {
@@ -559,7 +527,6 @@ public function displayCartTaxWithGrandTotal($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartFullSummary($store = null)
     {
@@ -573,7 +540,6 @@ public function displayCartFullSummary($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displayCartZeroTax($store = null)
     {
@@ -587,7 +553,6 @@ public function displayCartZeroTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesPricesInclTax($store = null)
     {
@@ -601,7 +566,6 @@ public function displaySalesPricesInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesPricesExclTax($store = null)
     {
@@ -615,7 +579,6 @@ public function displaySalesPricesExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesPricesBoth($store = null)
     {
@@ -629,7 +592,6 @@ public function displaySalesPricesBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalInclTax($store = null)
     {
@@ -643,7 +605,6 @@ public function displaySalesSubtotalInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalExclTax($store = null)
     {
@@ -657,7 +618,6 @@ public function displaySalesSubtotalExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesSubtotalBoth($store = null)
     {
@@ -671,7 +631,6 @@ public function displaySalesSubtotalBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesShippingInclTax($store = null)
     {
@@ -685,7 +644,6 @@ public function displaySalesShippingInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesShippingExclTax($store = null)
     {
@@ -699,7 +657,6 @@ public function displaySalesShippingExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesShippingBoth($store = null)
     {
@@ -714,7 +671,6 @@ public function displaySalesShippingBoth($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displaySalesDiscountInclTax($store = null)
     {
@@ -729,7 +685,6 @@ public function displaySalesDiscountInclTax($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displaySalesDiscountExclTax($store = null)
     {
@@ -744,7 +699,6 @@ public function displaySalesDiscountExclTax($store = null)
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function displaySalesDiscountBoth($store = null)
     {
@@ -758,7 +712,6 @@ public function displaySalesDiscountBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesTaxWithGrandTotal($store = null)
     {
@@ -772,7 +725,6 @@ public function displaySalesTaxWithGrandTotal($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesFullSummary($store = null)
     {
@@ -786,7 +738,6 @@ public function displaySalesFullSummary($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function displaySalesZeroTax($store = null)
     {
@@ -802,7 +753,6 @@ public function displaySalesZeroTax($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function crossBorderTradeEnabled($store = null)
     {
@@ -838,7 +788,6 @@ public function isWrongApplyDiscountSettingIgnored($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isWrongDisplaySettingsIgnored($store = null)
     {
@@ -854,7 +803,6 @@ public function isWrongDisplaySettingsIgnored($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isWrongDiscountSettingsIgnored($store = null)
     {
@@ -870,7 +818,6 @@ public function isWrongDiscountSettingsIgnored($store = null)
      *
      * @param null|string|bool|int|Store $store
      * @return string
-     * @since 2.0.0
      */
     public function getInfoUrl($store = null)
     {
@@ -888,7 +835,6 @@ public function getInfoUrl($store = null)
      * @param null|int|string|Store $store
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function needPriceConversion($store = null)
     {
diff --git a/app/code/Magento/Tax/Model/Config/Notification.php b/app/code/Magento/Tax/Model/Config/Notification.php
index 961925629cabb..aba6f9df06265 100644
--- a/app/code/Magento/Tax/Model/Config/Notification.php
+++ b/app/code/Magento/Tax/Model/Config/Notification.php
@@ -10,7 +10,6 @@
 
 /**
  * Tax Config Notification
- * @since 2.0.0
  */
 class Notification extends \Magento\Framework\App\Config\Value
 {
@@ -22,7 +21,6 @@ class Notification extends \Magento\Framework\App\Config\Value
 
     /**
      * @var \Magento\Config\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected $resourceConfig;
 
@@ -35,7 +33,6 @@ class Notification extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -55,7 +52,6 @@ public function __construct(
      * Prepare and store cron settings after save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -72,7 +68,6 @@ public function afterSave()
      *
      * @param string $path
      * @return \Magento\Tax\Model\Config\Notification
-     * @since 2.0.0
      */
     protected function _resetNotificationFlag($path)
     {
diff --git a/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php b/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
index 9ffec1e004e01..c025ca23d0927 100644
--- a/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
+++ b/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Config\Price\IncludePrice
  *
- * @since 2.0.0
  */
 class IncludePrice extends \Magento\Framework\App\Config\Value
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Tax/Model/Config/Source/Apply/On.php b/app/code/Magento/Tax/Model/Config/Source/Apply/On.php
index 84827d72b2f5f..06c9e4b61323e 100644
--- a/app/code/Magento/Tax/Model/Config/Source/Apply/On.php
+++ b/app/code/Magento/Tax/Model/Config/Source/Apply/On.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Config\Source\Apply\On
  *
- * @since 2.0.0
  */
 class On implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/Config/Source/Basedon.php b/app/code/Magento/Tax/Model/Config/Source/Basedon.php
index e1d0571da37d1..bf9b44c1a6736 100644
--- a/app/code/Magento/Tax/Model/Config/Source/Basedon.php
+++ b/app/code/Magento/Tax/Model/Config/Source/Basedon.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Config\Source\Basedon
  *
- * @since 2.0.0
  */
 class Basedon implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/Config/Source/Catalog.php b/app/code/Magento/Tax/Model/Config/Source/Catalog.php
index 16ea561193e11..009408a2dcecd 100644
--- a/app/code/Magento/Tax/Model/Config/Source/Catalog.php
+++ b/app/code/Magento/Tax/Model/Config/Source/Catalog.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Config\Source\Catalog
  *
- * @since 2.0.0
  */
 class Catalog implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/Config/TaxClass.php b/app/code/Magento/Tax/Model/Config/TaxClass.php
index 70dbc7d609dab..e389b837eaa26 100644
--- a/app/code/Magento/Tax/Model/Config/TaxClass.php
+++ b/app/code/Magento/Tax/Model/Config/TaxClass.php
@@ -7,19 +7,16 @@
 
 /**
  * TaxClass Config
- * @since 2.0.0
  */
 class TaxClass extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var \Magento\Config\Model\ResourceModel\Config
-     * @since 2.0.0
      */
     protected $resourceConfig;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $attributeFactory;
 
@@ -33,7 +30,6 @@ class TaxClass extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Update the default product tax class
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Tax/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Tax/Model/Layout/DepersonalizePlugin.php
index 2f9d34c9f6588..ad17406c34b75 100644
--- a/app/code/Magento/Tax/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Tax/Model/Layout/DepersonalizePlugin.php
@@ -10,44 +10,37 @@
 
 /**
  * Class DepersonalizePlugin
- * @since 2.0.0
  */
 class DepersonalizePlugin
 {
     /**
      * @var DepersonalizeChecker
-     * @since 2.0.0
      */
     protected $depersonalizeChecker;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $defaultTaxShippingAddress;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $defaultTaxBillingAddress;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $customerTaxClassId;
 
     /**
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         DepersonalizeChecker $depersonalizeChecker,
@@ -62,7 +55,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @return array
-     * @since 2.0.0
      */
     public function beforeGenerateXml(\Magento\Framework\View\LayoutInterface $subject)
     {
@@ -80,7 +72,6 @@ public function beforeGenerateXml(\Magento\Framework\View\LayoutInterface $subje
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @param \Magento\Framework\View\LayoutInterface $result
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
     {
diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
index 71e983bc4132f..53bdabee32c22 100644
--- a/app/code/Magento/Tax/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Tax\Model\Plugin\OrderSave
  *
- * @since 2.0.0
  */
 class OrderSave
 {
     /**
      * @var \Magento\Tax\Model\Sales\Order\TaxFactory
-     * @since 2.0.0
      */
     protected $orderTaxFactory;
 
     /**
      * @var \Magento\Sales\Model\Order\Tax\ItemFactory
-     * @since 2.0.0
      */
     protected $taxItemFactory;
 
     /**
      * @param \Magento\Tax\Model\Sales\Order\TaxFactory $orderTaxFactory
      * @param \Magento\Sales\Model\Order\Tax\ItemFactory $taxItemFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Sales\Order\TaxFactory $orderTaxFactory,
@@ -46,7 +42,6 @@ public function __construct(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(
         \Magento\Sales\Api\OrderRepositoryInterface $subject,
@@ -62,7 +57,6 @@ public function afterSave(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
index 411be22b70e9d..faf95537a3845 100644
--- a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
+++ b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -12,37 +12,31 @@
 /**
  * Class \Magento\Tax\Model\Quote\GrandTotalDetailsPlugin
  *
- * @since 2.0.0
  */
 class GrandTotalDetailsPlugin
 {
     /**
      * @var \Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory
-     * @since 2.0.0
      */
     private $detailsFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory
-     * @since 2.0.0
      */
     private $ratesFactory;
 
     /**
      * @var TotalSegmentExtensionFactory
-     * @since 2.0.0
      */
     private $totalSegmentExtensionFactory;
 
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     private $taxConfig;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $code;
 
@@ -60,7 +54,6 @@ class GrandTotalDetailsPlugin
      * @param TotalSegmentExtensionFactory $totalSegmentExtensionFactory
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory $detailsFactory,
@@ -80,7 +73,6 @@ public function __construct(
     /**
      * @param array $rates
      * @return array
-     * @since 2.0.0
      */
     protected function getRatesData($rates)
     {
diff --git a/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php b/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
index 7f6fbb4d5e87c..4854f2de45146 100644
--- a/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
+++ b/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Tax\Model\Quote\ToOrderConverter
  *
- * @since 2.0.0
  */
 class ToOrderConverter
 {
     /**
      * @var QuoteAddress
-     * @since 2.0.0
      */
     protected $quoteAddress;
 
     /**
      * @var \Magento\Sales\Api\Data\OrderExtensionFactory
-     * @since 2.0.0
      */
     protected $orderExtensionFactory;
 
     /**
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory
@@ -44,7 +40,6 @@ public function __construct(
      * @param array $additional
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $address, $additional = [])
     {
@@ -57,7 +52,6 @@ public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $addres
      * @param OrderInterface $order
      * @return OrderInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterConvert(QuoteAddressToOrder $subject, OrderInterface $order)
     {
diff --git a/app/code/Magento/Tax/Model/Rate/Source.php b/app/code/Magento/Tax/Model/Rate/Source.php
index 86bd3ad5ebaea..cd22541599cc3 100644
--- a/app/code/Magento/Tax/Model/Rate/Source.php
+++ b/app/code/Magento/Tax/Model/Rate/Source.php
@@ -14,31 +14,26 @@
 
 /**
  * Tax rate source model.
- * @since 2.0.0
  */
 class Source implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var \Magento\Tax\Api\TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxRateRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Convert\DataObject
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -55,7 +50,6 @@ class Source implements \Magento\Framework\Data\OptionSourceInterface
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param Converter $converter
      * @param RateProvider $rateProvider
-     * @since 2.0.0
      */
     public function __construct(
         TaxRateRepositoryInterface $taxRateRepository,
@@ -73,7 +67,6 @@ public function __construct(
      * Retrieve all tax rates as an options array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
index 4db4f519dd8c2..b404c1937f4e9 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Calculation
  *
- * @since 2.0.0
  */
 class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -25,7 +24,6 @@ class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Rates cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ratesCache = [];
 
@@ -33,13 +31,11 @@ class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -48,7 +44,6 @@ class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +71,6 @@ protected function _construct()
      *
      * @param int $ruleId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteByRuleId($ruleId)
     {
@@ -94,7 +87,6 @@ public function deleteByRuleId($ruleId)
      * @param  string $field
      * @param  int $ruleId
      * @return array
-     * @since 2.0.0
      */
     public function getCalculationsById($field, $ruleId)
     {
@@ -109,7 +101,6 @@ public function getCalculationsById($field, $ruleId)
      *
      * @param \Magento\Framework\DataObject $request
      * @return array
-     * @since 2.0.0
      */
     public function getRateInfo($request)
     {
@@ -125,7 +116,6 @@ public function getRateInfo($request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return int
-     * @since 2.0.0
      */
     public function getRate($request)
     {
@@ -140,7 +130,6 @@ public function getRate($request)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getCalculationProcess($request, $rates = null)
     {
@@ -231,7 +220,6 @@ public function getCalculationProcess($request, $rates = null)
      * @param float|int $percent
      * @param float|int $rate
      * @return float
-     * @since 2.0.0
      */
     protected function _collectPercent($percent, $rate)
     {
@@ -244,7 +232,6 @@ protected function _collectPercent($percent, $rate)
      * @param string $postcode
      * @param string|null $exactPostcode
      * @return string[]
-     * @since 2.0.0
      */
     protected function _createSearchPostCodeTemplates($postcode, $exactPostcode = null)
     {
@@ -279,7 +266,6 @@ protected function _createSearchPostCodeTemplates($postcode, $exactPostcode = nu
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _getRates($request)
     {
@@ -434,7 +420,6 @@ protected function _getRates($request)
      *
      * @param array $rates
      * @return int
-     * @since 2.0.0
      */
     protected function _calculateRate($rates)
     {
@@ -471,7 +456,6 @@ protected function _calculateRate($rates)
      *
      * @param \Magento\Framework\DataObject $request
      * @return array
-     * @since 2.0.0
      */
     public function getRateIds($request)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Collection.php
index 517e6dd2b7282..1dd699cca311d 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Collection.php
@@ -9,7 +9,6 @@
  * Tax Calculation Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate.php
index cea00bf9c063f..69707b1b3197d 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Calculation\Rate
  *
- * @since 2.0.0
  */
 class Rate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -22,7 +21,6 @@ class Rate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -45,7 +42,6 @@ protected function _initUniqueFields()
      * Delete all rates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function deleteAllRates()
     {
@@ -58,7 +54,6 @@ public function deleteAllRates()
      *
      * @param  int $rateId
      * @return array
-     * @since 2.0.0
      */
     public function isInRule($rateId)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
index be42b88520431..47c1010382e18 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Calculation\Rate\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -23,7 +22,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -35,7 +33,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -54,7 +51,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -68,7 +64,6 @@ protected function _construct()
      * Join country table to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinCountryTable()
     {
@@ -85,7 +80,6 @@ public function joinCountryTable()
      * Join Region Table
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinRegionTable()
     {
@@ -102,7 +96,6 @@ public function joinRegionTable()
      *
      * @param \Magento\Store\Model\Store|string|int $store
      * @return $this
-     * @since 2.0.0
      */
     public function joinTitle($store = null)
     {
@@ -123,7 +116,6 @@ public function joinTitle($store = null)
      * Joins store titles for rates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function joinStoreTitles()
     {
@@ -151,7 +143,6 @@ public function joinStoreTitles()
      *
      * @param int $rateId
      * @return $this
-     * @since 2.0.0
      */
     public function addRateFilter($rateId)
     {
@@ -166,7 +157,6 @@ public function addRateFilter($rateId)
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -177,7 +167,6 @@ public function toOptionArray()
      * Retrieve option hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -191,7 +180,6 @@ public function toOptionHash()
      * @see fetchItem()
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHashOptimized()
     {
@@ -206,7 +194,6 @@ public function toOptionHashOptimized()
      * Get rates array without memory leak
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionRates()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title.php
index 8d3df387312c0..535336a513c68 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title.php
@@ -9,7 +9,6 @@
  * Tax Rate Title Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Title extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Title extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      *
      * @param int $rateId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteByRateId($rateId)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title/Collection.php
index 5d25c8e52a8dd..32cc3ae7f491c 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Title/Collection.php
@@ -9,7 +9,6 @@
  * Tax Rate Title Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      *
      * @param int $rateId
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rate\Title\Collection
-     * @since 2.0.0
      */
     public function loadByRateId($rateId)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
index bb25fad2daff6..e509f477bcd8d 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
@@ -9,7 +9,6 @@
  * Tax rate resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Rule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Rule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -43,7 +40,6 @@ protected function _initUniqueFields()
      * @param array $customerTaxClassIds
      * @param array $productTaxClassIds
      * @return array
-     * @since 2.0.0
      */
     public function fetchRuleCodes($rateId, $customerTaxClassIds, $productTaxClassIds)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule/Collection.php
index 5f9a312d13132..2d355b6cc48c9 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule/Collection.php
@@ -9,7 +9,6 @@
  * Tax rule collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -31,7 +29,6 @@ protected function _construct()
      * Process loaded collection data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadData()
     {
@@ -47,7 +44,6 @@ protected function _afterLoadData()
      *
      * @param string $alias table alias
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
-     * @since 2.0.0
      */
     public function joinCalculationData($alias)
     {
@@ -71,7 +67,6 @@ public function joinCalculationData($alias)
      * @param string $dataField
      * @param string $dataTitleField
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
-     * @since 2.0.0
      */
     protected function _add(
         $itemTable,
@@ -123,7 +118,6 @@ protected function _add(
      * Add product tax classes to result
      *
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
-     * @since 2.0.0
      */
     public function addProductTaxClassesToResult()
     {
@@ -134,7 +128,6 @@ public function addProductTaxClassesToResult()
      * Add customer tax classes to result
      *
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
-     * @since 2.0.0
      */
     public function addCustomerTaxClassesToResult()
     {
@@ -145,7 +138,6 @@ public function addCustomerTaxClassesToResult()
      * Add rates to result
      *
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
-     * @since 2.0.0
      */
     public function addRatesToResult()
     {
@@ -166,7 +158,6 @@ public function addRatesToResult()
      * @param int $id
      * @return \Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setClassTypeFilter($type, $id)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Collection.php
index a72791283aeb1..c8ef4d4076520 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Collection.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Report\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
 {
     /**
      * @var \Zend_Db_Expr
-     * @since 2.0.0
      */
     protected $_periodFormat;
 
@@ -28,13 +26,11 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'tax_order_aggregated_created';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_selectedColumns = [];
 
@@ -45,7 +41,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
      * @param mixed $connection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -61,7 +56,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getSelectedColumns()
     {
@@ -98,7 +92,6 @@ protected function _getSelectedColumns()
      * Apply custom columns before load
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
index 7037687c2a613..a2f319678f816 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Report\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
     /**
      * @var \Magento\Tax\Model\ResourceModel\Report\Tax\CreatedatFactory
-     * @since 2.0.0
      */
     protected $_createdAtFactory;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\Report\Tax\UpdatedatFactory
-     * @since 2.0.0
      */
     protected $_updatedAtFactory;
 
@@ -38,7 +35,6 @@ class Tax extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
      * @param \Magento\Tax\Model\ResourceModel\Report\Tax\CreatedatFactory $createdAtFactory
      * @param \Magento\Tax\Model\ResourceModel\Report\Tax\UpdatedatFactory $updatedAtFactory
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -68,7 +64,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -81,7 +76,6 @@ protected function _construct()
      * @param mixed $from
      * @param mixed $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
index 4ece1a9a82d20..8a8a110c4528b 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Report\Tax\Createdat
  *
- * @since 2.0.0
  */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
@@ -22,7 +21,6 @@ class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractRepo
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param mixed $from
      * @param mixed $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
@@ -50,7 +47,6 @@ public function aggregate($from = null, $to = null)
      * @param mixed $to
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Updatedat.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Updatedat.php
index bc42bfaeb627a..73a01cd65076f 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Updatedat.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Updatedat.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Report\Tax\Updatedat
  *
- * @since 2.0.0
  */
 class Updatedat extends \Magento\Tax\Model\ResourceModel\Report\Tax\Createdat
 {
@@ -22,7 +21,6 @@ class Updatedat extends \Magento\Tax\Model\ResourceModel\Report\Tax\Createdat
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -35,7 +33,6 @@ protected function _construct()
      * @param mixed $from
      * @param mixed $to
      * @return $this
-     * @since 2.0.0
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Updatedat/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Updatedat/Collection.php
index b8f1e44f81c75..ad46128328c93 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Updatedat/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Updatedat/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\Report\Updatedat\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Tax\Model\ResourceModel\Report\Collection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Tax\Model\ResourceModel\Report\Collection
      * Aggregated Data Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_aggregationTable = 'tax_order_aggregated_updated';
 }
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax.php b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax.php
index 44e0f893b39b7..71147e29ef590 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax.php
@@ -9,7 +9,6 @@
  * Sales order tax resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax/Collection.php
index b3dcb6d2f8da3..a65598f5b491d 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/Tax/Collection.php
@@ -9,7 +9,6 @@
  * Order Tax Collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\DataObject $order
      * @return \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\Collection
-     * @since 2.0.0
      */
     public function loadByOrder($order)
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/TaxClass.php b/app/code/Magento/Tax/Model/ResourceModel/TaxClass.php
index 93a13db310cd4..653f8c473e552 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/TaxClass.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/TaxClass.php
@@ -9,7 +9,6 @@
  * Tax class resource
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class TaxClass extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -17,7 +16,6 @@ class TaxClass extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -28,7 +26,6 @@ public function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/TaxClass/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/TaxClass/Collection.php
index 026c11efa4d49..a2d5f0ac51e60 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/TaxClass/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/TaxClass/Collection.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Tax\Model\ResourceModel\TaxClass\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -34,7 +32,6 @@ public function _construct()
      *
      * @param int $classTypeId
      * @return $this
-     * @since 2.0.0
      */
     public function setClassTypeFilter($classTypeId)
     {
@@ -45,7 +42,6 @@ public function setClassTypeFilter($classTypeId)
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -56,7 +52,6 @@ public function toOptionArray()
      * Retrieve option hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Order/Details.php b/app/code/Magento/Tax/Model/Sales/Order/Details.php
index df165e3d8a5bf..735ae54ce5a6f 100644
--- a/app/code/Magento/Tax/Model/Sales/Order/Details.php
+++ b/app/code/Magento/Tax/Model/Sales/Order/Details.php
@@ -9,7 +9,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Details extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Tax\Api\Data\OrderTaxDetailsInterface
@@ -23,7 +22,6 @@ class Details extends \Magento\Framework\Model\AbstractExtensibleModel implement
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAppliedTaxes()
     {
@@ -32,7 +30,6 @@ public function getAppliedTaxes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -44,7 +41,6 @@ public function getItems()
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null)
     {
@@ -56,7 +52,6 @@ public function setAppliedTaxes(array $appliedTaxes = null)
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -67,7 +62,6 @@ public function setItems(array $items = null)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -79,7 +73,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\OrderTaxDetailsExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Order/Tax.php b/app/code/Magento/Tax/Model/Sales/Order/Tax.php
index 1a05b0bf7ed76..72e33e687fb11 100644
--- a/app/code/Magento/Tax/Model/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Order/Tax.php
@@ -19,7 +19,6 @@
  * @method float getBaseRealAmount()
  * @method \Magento\Tax\Model\Sales\Order\Tax setBaseRealAmount(float $value)
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface
@@ -37,7 +36,6 @@ class Tax extends \Magento\Framework\Model\AbstractExtensibleModel implements
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -46,7 +44,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -55,7 +52,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -64,7 +60,6 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPercent()
     {
@@ -73,7 +68,6 @@ public function getPercent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -82,7 +76,6 @@ public function getAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseAmount()
     {
@@ -94,7 +87,6 @@ public function getBaseAmount()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -106,7 +98,6 @@ public function setCode($code)
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -118,7 +109,6 @@ public function setTitle($title)
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent)
     {
@@ -130,7 +120,6 @@ public function setPercent($percent)
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount)
     {
@@ -142,7 +131,6 @@ public function setAmount($amount)
      *
      * @param float $baseAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setBaseAmount($baseAmount)
     {
@@ -174,7 +162,6 @@ public function setRates($rates)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -186,7 +173,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
index f7f5e26306063..66aaca9c4458e 100644
--- a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
+++ b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
@@ -16,37 +16,31 @@
 /**
  * Class \Magento\Tax\Model\Sales\Order\TaxManagement
  *
- * @since 2.0.0
  */
 class TaxManagement implements \Magento\Tax\Api\OrderTaxManagementInterface
 {
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Tax\ItemFactory
-     * @since 2.0.0
      */
     protected $orderItemTaxFactory;
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
-     * @since 2.0.0
      */
     protected $orderFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\OrderTaxDetailsInterfaceFactory
-     * @since 2.0.0
      */
     protected $orderTaxDetailsDataObjectFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\OrderTaxDetailsItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $itemDataObjectFactory;
 
     /**
      * @var TaxDetailsDataObjectFactory
-     * @since 2.0.0
      */
     protected $appliedTaxDataObjectFactory;
 
@@ -56,7 +50,6 @@ class TaxManagement implements \Magento\Tax\Api\OrderTaxManagementInterface
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsInterfaceFactory $orderTaxDetailsDataObjectFactory
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterfaceFactory $itemDataObjectFactory
      * @param TaxDetailsDataObjectFactory $appliedTaxDataObjectFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
@@ -79,7 +72,6 @@ public function __construct(
      * @param array $itemAppliedTax
      * @param AppliedTax $existingAppliedTax
      * @return AppliedTax
-     * @since 2.0.0
      */
     protected function convertToAppliedTaxDataObject(
         TaxDetailsDataObjectFactory $appliedTaxDataObjectFactory,
@@ -107,7 +99,6 @@ protected function convertToAppliedTaxDataObject(
      * @param TaxDetailsDataObjectFactory $appliedTaxDataObjectFactory
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $items
      * @return AppliedTax[]
-     * @since 2.0.0
      */
     protected function aggregateAppliedTaxes(TaxDetailsDataObjectFactory $appliedTaxDataObjectFactory, $items)
     {
@@ -144,7 +135,6 @@ protected function aggregateAppliedTaxes(TaxDetailsDataObjectFactory $appliedTax
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOrderTaxDetails($orderId)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Pdf/Grandtotal.php b/app/code/Magento/Tax/Model/Sales/Pdf/Grandtotal.php
index ae5a0094f33d3..e6d8d3f4de688 100644
--- a/app/code/Magento/Tax/Model/Sales/Pdf/Grandtotal.php
+++ b/app/code/Magento/Tax/Model/Sales/Pdf/Grandtotal.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Sales\Pdf\Grandtotal
  *
- * @since 2.0.0
  */
 class Grandtotal extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
 {
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -24,7 +22,6 @@ class Grandtotal extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $ordersFactory
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxHelper,
@@ -47,7 +44,6 @@ public function __construct(
      *  )
      * )
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Pdf/Shipping.php b/app/code/Magento/Tax/Model/Sales/Pdf/Shipping.php
index 9f2244d6f445b..a4e8bdcf7455a 100644
--- a/app/code/Magento/Tax/Model/Sales/Pdf/Shipping.php
+++ b/app/code/Magento/Tax/Model/Sales/Pdf/Shipping.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Sales\Pdf\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
 {
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -24,7 +22,6 @@ class Shipping extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $ordersFactory
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxHelper,
@@ -47,7 +44,6 @@ public function __construct(
      *  )
      * )
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Pdf/Subtotal.php b/app/code/Magento/Tax/Model/Sales/Pdf/Subtotal.php
index 774a71c4d0f14..693d99d1e581c 100644
--- a/app/code/Magento/Tax/Model/Sales/Pdf/Subtotal.php
+++ b/app/code/Magento/Tax/Model/Sales/Pdf/Subtotal.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Tax\Model\Sales\Pdf\Subtotal
  *
- * @since 2.0.0
  */
 class Subtotal extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
 {
@@ -22,7 +21,6 @@ class Subtotal extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      *  )
      * )
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Pdf/Tax.php b/app/code/Magento/Tax/Model/Sales/Pdf/Tax.php
index a5f33539d3b69..cd66370571eb2 100644
--- a/app/code/Magento/Tax/Model/Sales/Pdf/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Pdf/Tax.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Tax\Model\Sales\Pdf\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
 {
     /**
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_taxConfig;
 
@@ -24,7 +22,6 @@ class Tax extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $ordersFactory
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxHelper,
@@ -47,7 +44,6 @@ public function __construct(
      *  )
      * )
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Quote/ItemDetails.php b/app/code/Magento/Tax/Model/Sales/Quote/ItemDetails.php
index e94ed3119f1f5..a03c3879554cb 100644
--- a/app/code/Magento/Tax/Model/Sales/Quote/ItemDetails.php
+++ b/app/code/Magento/Tax/Model/Sales/Quote/ItemDetails.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ItemDetails extends AbstractExtensibleModel implements QuoteDetailsItemInterface
 {
@@ -32,7 +31,6 @@ class ItemDetails extends AbstractExtensibleModel implements QuoteDetailsItemInt
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -41,7 +39,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -50,7 +47,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxClassKey()
     {
@@ -59,7 +55,6 @@ public function getTaxClassKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUnitPrice()
     {
@@ -68,7 +63,6 @@ public function getUnitPrice()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQuantity()
     {
@@ -77,7 +71,6 @@ public function getQuantity()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsTaxIncluded()
     {
@@ -86,7 +79,6 @@ public function getIsTaxIncluded()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShortDescription()
     {
@@ -95,7 +87,6 @@ public function getShortDescription()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -104,7 +95,6 @@ public function getDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getParentCode()
     {
@@ -113,7 +103,6 @@ public function getParentCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAssociatedItemCode()
     {
@@ -122,7 +111,6 @@ public function getAssociatedItemCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxClassId()
     {
@@ -134,7 +122,6 @@ public function getTaxClassId()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -146,7 +133,6 @@ public function setCode($code)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -158,7 +144,6 @@ public function setType($type)
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterface $taxClassKey
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $taxClassKey = null)
     {
@@ -170,7 +155,6 @@ public function setTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $taxCl
      *
      * @param float $unitPrice
      * @return $this
-     * @since 2.0.0
      */
     public function setUnitPrice($unitPrice)
     {
@@ -182,7 +166,6 @@ public function setUnitPrice($unitPrice)
      *
      * @param float $quantity
      * @return $this
-     * @since 2.0.0
      */
     public function setQuantity($quantity)
     {
@@ -194,7 +177,6 @@ public function setQuantity($quantity)
      *
      * @param bool $isTaxIncluded
      * @return $this
-     * @since 2.0.0
      */
     public function setIsTaxIncluded($isTaxIncluded)
     {
@@ -206,7 +188,6 @@ public function setIsTaxIncluded($isTaxIncluded)
      *
      * @param string $shortDescription
      * @return $this
-     * @since 2.0.0
      */
     public function setShortDescription($shortDescription)
     {
@@ -218,7 +199,6 @@ public function setShortDescription($shortDescription)
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount)
     {
@@ -230,7 +210,6 @@ public function setDiscountAmount($discountAmount)
      *
      * @param string $parentCode
      * @return $this
-     * @since 2.0.0
      */
     public function setParentCode($parentCode)
     {
@@ -242,7 +221,6 @@ public function setParentCode($parentCode)
      *
      * @param int $associatedItemCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemCode($associatedItemCode)
     {
@@ -254,7 +232,6 @@ public function setAssociatedItemCode($associatedItemCode)
      *
      * @param int $taxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxClassId($taxClassId)
     {
@@ -265,7 +242,6 @@ public function setTaxClassId($taxClassId)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -277,7 +253,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Tax/Model/Sales/Quote/QuoteDetails.php b/app/code/Magento/Tax/Model/Sales/Quote/QuoteDetails.php
index 3eae8700c95dd..12b6131aad4f1 100644
--- a/app/code/Magento/Tax/Model/Sales/Quote/QuoteDetails.php
+++ b/app/code/Magento/Tax/Model/Sales/Quote/QuoteDetails.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class QuoteDetails extends AbstractExtensibleModel implements QuoteDetailsInterface
 {
@@ -27,7 +26,6 @@ class QuoteDetails extends AbstractExtensibleModel implements QuoteDetailsInterf
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBillingAddress()
     {
@@ -36,7 +34,6 @@ public function getBillingAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getShippingAddress()
     {
@@ -45,7 +42,6 @@ public function getShippingAddress()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerTaxClassKey()
     {
@@ -54,7 +50,6 @@ public function getCustomerTaxClassKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -63,7 +58,6 @@ public function getCustomerId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -72,7 +66,6 @@ public function getItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomerTaxClassId()
     {
@@ -84,7 +77,6 @@ public function getCustomerTaxClassId()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $billingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setBillingAddress(\Magento\Customer\Api\Data\AddressInterface $billingAddress = null)
     {
@@ -96,7 +88,6 @@ public function setBillingAddress(\Magento\Customer\Api\Data\AddressInterface $b
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $shippingAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setShippingAddress(\Magento\Customer\Api\Data\AddressInterface $shippingAddress = null)
     {
@@ -108,7 +99,6 @@ public function setShippingAddress(\Magento\Customer\Api\Data\AddressInterface $
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterface $customerTaxClassKey
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterface $customerTaxClassKey = null)
     {
@@ -120,7 +110,6 @@ public function setCustomerTaxClassKey(\Magento\Tax\Api\Data\TaxClassKeyInterfac
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -132,7 +121,6 @@ public function setCustomerId($customerId)
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -144,7 +132,6 @@ public function setItems(array $items = null)
      *
      * @param int $customerTaxClassId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerTaxClassId($customerTaxClassId)
     {
@@ -155,7 +142,6 @@ public function setCustomerTaxClassId($customerTaxClassId)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\QuoteDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -167,7 +153,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\QuoteDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\QuoteDetailsExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index e905a746819f1..1fcaf0e413cd5 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -27,7 +27,6 @@
 /**
  * Tax totals calculation model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CommonTaxCollector extends AbstractTotal
 {
@@ -88,19 +87,13 @@ class CommonTaxCollector extends AbstractTotal
     const KEY_TAX_DETAILS_APPLIED_TAXES = 'applied_taxes';
     /**#@-*/
 
-    /**
-     * Tax configuration object
-     *
-     * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_config;
 
     /**
      * Counter that is used to construct temporary ids for taxable items
      *
      * @var int
-     * @since 2.0.0
      */
     protected $counter = 0;
 
@@ -108,7 +101,6 @@ class CommonTaxCollector extends AbstractTotal
      * Tax calculation service, the collector will call the service which performs the actual calculation
      *
      * @var \Magento\Tax\Api\TaxCalculationInterface
-     * @since 2.0.0
      */
     protected $taxCalculationService;
 
@@ -116,31 +108,26 @@ class CommonTaxCollector extends AbstractTotal
      * Factory to create QuoteDetails as input to tax calculation service
      *
      * @var \Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory
-     * @since 2.0.0
      */
     protected $quoteDetailsDataObjectFactory;
 
     /**
      * @var CustomerAddressFactory
-     * @since 2.0.0
      */
     protected $customerAddressFactory;
 
     /**
      * @var CustomerAddressRegionFactory
-     * @since 2.0.0
      */
     protected $customerAddressRegionFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxClassKeyDataObjectFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $quoteDetailsItemDataObjectFactory;
 
@@ -154,7 +141,6 @@ class CommonTaxCollector extends AbstractTotal
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
      * @param CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig,
@@ -179,7 +165,6 @@ public function __construct(
      *
      * @param QuoteAddress $address
      * @return CustomerAddress
-     * @since 2.0.0
      */
     public function mapAddress(QuoteAddress $address)
     {
@@ -204,7 +189,6 @@ public function mapAddress(QuoteAddress $address)
      * @param bool $useBaseCurrency
      * @param string $parentCode
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
-     * @since 2.0.0
      */
     public function mapItem(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
@@ -256,7 +240,6 @@ public function mapItem(
      * @param bool $priceIncludesTax
      * @param bool $useBaseCurrency
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
-     * @since 2.0.0
      */
     public function mapItemExtraTaxables(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
@@ -305,7 +288,6 @@ public function mapItemExtraTaxables(
      * @param bool $useBaseCurrency
      * @param bool $priceIncludesTax
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
-     * @since 2.0.0
      */
     public function mapItems(
         ShippingAssignmentInterface $shippingAssignment,
@@ -367,7 +349,6 @@ public function mapItems(
      * @param QuoteDetailsInterface $quoteDetails
      * @param QuoteAddress $address
      * @return QuoteDetailsInterface
-     * @since 2.0.0
      */
     public function populateAddressData(QuoteDetailsInterface $quoteDetails, QuoteAddress $address)
     {
@@ -381,7 +362,6 @@ public function populateAddressData(QuoteDetailsInterface $quoteDetails, QuoteAd
      * @param QuoteAddress\Total $total
      * @param bool $useBaseCurrency
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
-     * @since 2.0.0
      */
     public function getShippingDataObject(
         ShippingAssignmentInterface $shippingAssignment,
@@ -433,7 +413,6 @@ public function getShippingDataObject(
      * @param ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterface[] $itemDataObjects
      * @return \Magento\Tax\Api\Data\QuoteDetailsInterface
-     * @since 2.0.0
      */
     protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssignment, $itemDataObjects)
     {
@@ -464,7 +443,6 @@ protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssi
      * @param TaxDetailsInterface $taxDetails
      * @param TaxDetailsInterface $baseTaxDetails
      * @return array
-     * @since 2.0.0
      */
     protected function organizeItemTaxDetailsByType(
         TaxDetailsInterface $taxDetails,
@@ -500,7 +478,6 @@ protected function organizeItemTaxDetailsByType(
      * @param array $itemTaxDetails
      * @param QuoteAddress\Total $total
      * @return $this
-     * @since 2.0.0
      */
     protected function processProductItems(
         ShippingAssignmentInterface $shippingAssignment,
@@ -565,7 +542,6 @@ protected function processProductItems(
      * @param QuoteAddress\Total $total
      * @param array $itemsByType
      * @return $this
-     * @since 2.0.0
      */
     protected function processAppliedTaxes(
         QuoteAddress\Total $total,
@@ -646,7 +622,6 @@ protected function processAppliedTaxes(
      * @param TaxDetailsItemInterface $baseItemTaxDetails
      * @param Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetails, $store)
     {
@@ -688,7 +663,6 @@ public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetai
      * @param TaxDetailsItemInterface $shippingTaxDetails
      * @param TaxDetailsItemInterface $baseShippingTaxDetails
      * @return $this
-     * @since 2.0.0
      */
     protected function processShippingTaxInfo(
         ShippingAssignmentInterface $shippingAssignment,
@@ -725,7 +699,6 @@ protected function processShippingTaxInfo(
      * @param \Magento\Tax\Api\Data\AppliedTaxInterface[] $baseAppliedTaxes
      * @param array $extraInfo
      * @return array
-     * @since 2.0.0
      */
     public function convertAppliedTaxes($appliedTaxes, $baseAppliedTaxes, $extraInfo = [])
     {
@@ -776,7 +749,6 @@ public function convertAppliedTaxes($appliedTaxes, $baseAppliedTaxes, $extraInfo
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _saveAppliedTaxes(
         QuoteAddress\Total $total,
@@ -828,7 +800,6 @@ protected function _saveAppliedTaxes(
      * Determine whether to include shipping in tax calculation
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function includeShipping()
     {
@@ -839,7 +810,6 @@ protected function includeShipping()
      * Determine whether to include item in tax calculation
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function includeItems()
     {
@@ -850,7 +820,6 @@ protected function includeItems()
      * Determine whether to include item in tax calculation
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function includeExtraTax()
     {
@@ -861,7 +830,6 @@ protected function includeExtraTax()
      * Determine whether to save applied tax in address
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function saveAppliedTaxes()
     {
@@ -873,7 +841,6 @@ protected function saveAppliedTaxes()
      * id for an item.
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getNextIncrement()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
index 823f5aea9a1bb..0d975259b4d64 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Model\Sales\Total\Quote\Shipping
  *
- * @since 2.0.0
  */
 class Shipping extends CommonTaxCollector
 {
@@ -22,7 +21,6 @@ class Shipping extends CommonTaxCollector
      * @param ShippingAssignmentInterface $shippingAssignment
      * @param Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -64,7 +62,6 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
index 506e859f03a76..e2eb396ecb750 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Tax\Model\Sales\Total\Quote\Subtotal
  *
- * @since 2.0.0
  */
 class Subtotal extends CommonTaxCollector
 {
@@ -27,7 +26,6 @@ class Subtotal extends CommonTaxCollector
      * @param ShippingAssignmentInterface $shippingAssignment
      * @param Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -67,7 +65,6 @@ public function collect(
      * @param Address\Total $total
      * @return null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index e9e54757dd752..d22b47314374c 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -17,7 +17,6 @@
 /**
  * Tax totals calculation model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tax extends CommonTaxCollector
 {
@@ -25,7 +24,6 @@ class Tax extends CommonTaxCollector
      * Counter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $counter = 0;
 
@@ -33,7 +31,6 @@ class Tax extends CommonTaxCollector
      * Tax module helper
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
@@ -41,7 +38,6 @@ class Tax extends CommonTaxCollector
      * Tax configuration object
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -49,7 +45,6 @@ class Tax extends CommonTaxCollector
      * Discount tax compensationes array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_discountTaxCompensationes = [];
 
@@ -71,7 +66,6 @@ class Tax extends CommonTaxCollector
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
      * @param \Magento\Tax\Helper\Data $taxData
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig,
@@ -106,7 +100,6 @@ public function __construct(
      * @param Address\Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -153,7 +146,6 @@ public function collect(
      *
      * @param Address\Total $total
      * @return void
-     * @since 2.0.0
      */
     protected function clearValues(Address\Total $total)
     {
@@ -176,7 +168,6 @@ protected function clearValues(Address\Total $total)
      * @param Address\Total $total
      * @param bool $useBaseCurrency
      * @return \Magento\Tax\Api\Data\TaxDetailsInterface
-     * @since 2.0.0
      */
     protected function getQuoteTaxDetails($shippingAssignment, $total, $useBaseCurrency)
     {
@@ -217,7 +208,6 @@ protected function getQuoteTaxDetails($shippingAssignment, $total, $useBaseCurre
      * @param Address $address
      * @param bool $useBaseCurrency
      * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
-     * @since 2.0.0
      */
     public function mapQuoteExtraTaxables(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
@@ -260,7 +250,6 @@ public function mapQuoteExtraTaxables(
      * @param array $itemsByType
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function processExtraTaxables(Address\Total $total, array $itemsByType)
     {
@@ -315,7 +304,6 @@ protected function processExtraTaxables(Address\Total $total, array $itemsByType
      * @return array|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -376,7 +364,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return null
-     * @since 2.0.0
      */
     protected function enhanceTotalData(
         \Magento\Quote\Model\Quote $quote,
@@ -416,7 +403,6 @@ protected function enhanceTotalData(
      * @param   array $config
      * @param   store $store
      * @return  array
-     * @since 2.0.0
      */
     public function processConfigArray($config, $store)
     {
@@ -436,7 +422,6 @@ public function processConfigArray($config, $store)
      * Get Tax label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php b/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php
index 7c8fc2881881b..fc02761d9664a 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\Algorithm
  *
- * @since 2.0.0
  */
 class Algorithm implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * Initialize the options array
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -33,7 +30,6 @@ public function __construct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Apply.php b/app/code/Magento/Tax/Model/System/Config/Source/Apply.php
index 983ba21314429..6df8837c2b52b 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Apply.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Apply.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\Apply
  *
- * @since 2.0.0
  */
 class Apply implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * Initialize the options array
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -32,7 +29,6 @@ public function __construct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php b/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php
index 8ab836e4cafbf..050f28f4a67e1 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\PriceType
  *
- * @since 2.0.0
  */
 class PriceType implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -32,7 +29,6 @@ public function __construct()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
index 64db8abbe3cf5..fb403c8687752 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
@@ -8,20 +8,17 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\Tax\Country
  *
- * @since 2.0.0
  */
 class Country extends \Magento\Directory\Model\Config\Source\Country
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @param bool $noEmpty
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($noEmpty = false)
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php
index 3442d49c04cee..611458c62ef2c 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\Tax\Display\Type
  *
- * @since 2.0.0
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_options;
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
index 5729a442c2cef..473949b0f748e 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Tax\Model\System\Config\Source\Tax\Region
  *
- * @since 2.0.0
  */
 class Region implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
-     * @since 2.0.0
      */
     protected $_regionsFactory;
 
     /**
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionsFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionsFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Directory\Model\ResourceModel\Region\Collec
      * @param bool $noEmpty
      * @param string|array|null $country
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($noEmpty = false, $country = null)
     {
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index 02c4b4222a714..54f4705c98d72 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -7,7 +7,6 @@
 
 /**
  * Notifications class
- * @since 2.0.0
  */
 class Notifications implements \Magento\Framework\Notification\MessageInterface
 {
@@ -16,13 +15,11 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -30,7 +27,6 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * Tax configuration object
      *
      * @var \Magento\Tax\Model\Config
-     * @since 2.0.0
      */
     protected $taxConfig;
 
@@ -40,7 +36,6 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * @var array
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\RoundingErrors
-     * @since 2.0.0
      */
     protected $storesWithInvalidDisplaySettings;
 
@@ -50,7 +45,6 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * @var array
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\DiscountErrors
-     * @since 2.0.0
      */
     protected $storesWithInvalidDiscountSettings;
 
@@ -65,7 +59,6 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param NotificationInterface[] $notifications
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -84,7 +77,6 @@ public function __construct(
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getIdentity()
     {
@@ -93,7 +85,6 @@ public function getIdentity()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isDisplayed()
     {
@@ -107,7 +98,6 @@ public function isDisplayed()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -133,7 +123,6 @@ public function getText()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getSeverity()
     {
@@ -144,7 +133,6 @@ public function getSeverity()
      * Get URL for the tax notification documentation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInfoUrl()
     {
@@ -155,7 +143,6 @@ public function getInfoUrl()
      * Get URL to the admin tax configuration page
      *
      * @return string
-     * @since 2.0.0
      */
     public function getManageUrl()
     {
@@ -173,7 +160,6 @@ public function getManageUrl()
      * @return bool
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\RoundingErrors::checkSettings
-     * @since 2.0.0
      */
     public function checkDisplaySettings($store = null)
     {
@@ -201,7 +187,6 @@ public function checkDisplaySettings($store = null)
      * @return bool
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\DiscountErrors::checkSettings
-     * @since 2.0.0
      */
     public function checkDiscountSettings($store = null)
     {
@@ -214,7 +199,6 @@ public function checkDiscountSettings($store = null)
      * @param string $section
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getIgnoreTaxNotificationUrl($section)
     {
@@ -228,7 +212,6 @@ public function getIgnoreTaxNotificationUrl($section)
      * @return array
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\RoundingErrors::getStoresWithWrongSettings
-     * @since 2.0.0
      */
     public function getStoresWithWrongDisplaySettings()
     {
@@ -250,7 +233,6 @@ public function getStoresWithWrongDisplaySettings()
      * @return array
      * @deprecated 2.2.0
      * @see \Magento\Tax\Model\System\Message\Notification\DiscountErrors::getStoresWithWrongSettings
-     * @since 2.0.0
      */
     public function getStoresWithWrongDiscountSettings()
     {
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index 3aba595da82de..ac18dfec6c7ed 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -22,7 +22,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class TaxCalculation implements TaxCalculationInterface
 {
@@ -30,7 +29,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Tax Details factory
      *
      * @var TaxDetailsInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxDetailsDataObjectFactory;
 
@@ -38,7 +36,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Tax configuration object
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -46,7 +43,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Tax calculation model
      *
      * @var Calculation
-     * @since 2.0.0
      */
     protected $calculationTool;
 
@@ -54,7 +50,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Array to hold discount compensations for items
      *
      * @var array
-     * @since 2.0.0
      */
     protected $discountTaxCompensations;
 
@@ -62,13 +57,11 @@ class TaxCalculation implements TaxCalculationInterface
      * Tax details item factory
      *
      * @var TaxDetailsItemInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxDetailsItemDataObjectFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -76,7 +69,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Item code to Item object array.
      *
      * @var QuoteDetailsItemInterface[]
-     * @since 2.0.0
      */
     private $keyedItems;
 
@@ -84,7 +76,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Parent item code to children item array.
      *
      * @var QuoteDetailsItemInterface[][]
-     * @since 2.0.0
      */
     private $parentToChildren;
 
@@ -92,7 +83,6 @@ class TaxCalculation implements TaxCalculationInterface
      * Tax Class Management
      *
      * @var TaxClassManagementInterface
-     * @since 2.0.0
      */
     protected $taxClassManagement;
 
@@ -100,13 +90,11 @@ class TaxCalculation implements TaxCalculationInterface
      * Calculator Factory
      *
      * @var CalculatorFactory
-     * @since 2.0.0
      */
     protected $calculatorFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
@@ -119,7 +107,6 @@ class TaxCalculation implements TaxCalculationInterface
      * @param StoreManagerInterface $storeManager
      * @param TaxClassManagementInterface $taxClassManagement
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         Calculation $calculation,
@@ -143,7 +130,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function calculateTax(
         \Magento\Tax\Api\Data\QuoteDetailsInterface $quoteDetails,
@@ -215,7 +201,6 @@ public function calculateTax(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultCalculatedRate(
         $productTaxClassID,
@@ -227,7 +212,6 @@ public function getDefaultCalculatedRate(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCalculatedRate(
         $productTaxClassID,
@@ -245,7 +229,6 @@ public function getCalculatedRate(
      * @param string|null $storeId
      * @param bool $isDefault
      * @return float
-     * @since 2.0.0
      */
     protected function getRate(
         $productTaxClassID,
@@ -270,7 +253,6 @@ protected function getRate(
      *
      * @param QuoteDetailsItemInterface[] $items
      * @return void
-     * @since 2.0.0
      */
     private function computeRelationships($items)
     {
@@ -292,7 +274,6 @@ private function computeRelationships($items)
      * @param AbstractCalculator $calculator
      * @param bool $round
      * @return TaxDetailsItemInterface
-     * @since 2.0.0
      */
     protected function processItem(
         QuoteDetailsItemInterface $item,
@@ -309,7 +290,6 @@ protected function processItem(
      * @param TaxDetailsItemInterface[] $children
      * @param int $quantity
      * @return TaxDetailsItemInterface
-     * @since 2.0.0
      */
     protected function calculateParent($children, $quantity)
     {
@@ -344,7 +324,6 @@ protected function calculateParent($children, $quantity)
      * @param array $taxDetailsData
      * @param TaxDetailsItemInterface $item
      * @return array
-     * @since 2.0.0
      */
     protected function aggregateItemData($taxDetailsData, TaxDetailsItemInterface $item)
     {
@@ -398,7 +377,6 @@ protected function aggregateItemData($taxDetailsData, TaxDetailsItemInterface $i
      *
      * @param QuoteDetailsItemInterface $item
      * @return float
-     * @since 2.0.0
      */
     protected function getTotalQuantity(QuoteDetailsItemInterface $item)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/AbstractType.php b/app/code/Magento/Tax/Model/TaxClass/AbstractType.php
index 172a4a241a181..336f18b61534f 100644
--- a/app/code/Magento/Tax/Model/TaxClass/AbstractType.php
+++ b/app/code/Magento/Tax/Model/TaxClass/AbstractType.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Tax\Model\TaxClass\AbstractType
  *
- * @since 2.0.0
  */
 abstract class AbstractType extends \Magento\Framework\DataObject implements Type\TypeInterface
 {
     /**
      * @var \Magento\Tax\Model\Calculation\Rule
-     * @since 2.0.0
      */
     protected $_calculationRule;
 
@@ -26,14 +24,12 @@ abstract class AbstractType extends \Magento\Framework\DataObject implements Typ
      * Class Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_classType;
 
     /**
      * @param \Magento\Tax\Model\Calculation\Rule $calculationRule
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Tax\Model\Calculation\Rule $calculationRule, array $data = [])
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Tax\Model\Calculation\Rule $calculationRule
      * Get Collection of Tax Rules that are assigned to this tax class
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getAssignedToRules()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Factory.php b/app/code/Magento/Tax/Model/TaxClass/Factory.php
index eb7d85b98a8ea..40ba7cb752714 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Factory.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Factory.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Tax\Model\TaxClass\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -26,7 +24,6 @@ class Factory
      * Type to class map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_types = [
         \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER => \Magento\Tax\Model\TaxClass\Type\Customer::class,
@@ -35,7 +32,6 @@ class Factory
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param \Magento\Tax\Model\ClassModel $taxClass
      * @return \Magento\Tax\Model\TaxClass\Type\TypeInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(\Magento\Tax\Model\ClassModel $taxClass)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Key.php b/app/code/Magento/Tax/Model/TaxClass/Key.php
index e52e5ad7377b3..8b8eb294e1c4f 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Key.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Key.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Key extends AbstractExtensibleModel implements TaxClassKeyInterface
 {
@@ -23,7 +22,6 @@ class Key extends AbstractExtensibleModel implements TaxClassKeyInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -32,7 +30,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -44,7 +41,6 @@ public function getValue()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -56,7 +52,6 @@ public function setType($type)
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -67,7 +62,6 @@ public function setValue($value)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxClassKeyExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -79,7 +73,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxClassKeyExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxClassKeyExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Management.php b/app/code/Magento/Tax/Model/TaxClass/Management.php
index ee526f9defbf7..f49e55deba88c 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Management.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Management.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Tax\Model\TaxClass\Management
  *
- * @since 2.0.0
  */
 class Management implements \Magento\Tax\Api\TaxClassManagementInterface
 {
@@ -23,7 +22,6 @@ class Management implements \Magento\Tax\Api\TaxClassManagementInterface
      * Filter Builder
      *
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -31,7 +29,6 @@ class Management implements \Magento\Tax\Api\TaxClassManagementInterface
      * Search Criteria Builder
      *
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -39,7 +36,6 @@ class Management implements \Magento\Tax\Api\TaxClassManagementInterface
      * Tax class repository
      *
      * @var \Magento\Tax\Model\TaxClass\Repository
-     * @since 2.0.0
      */
     protected $classRepository;
 
@@ -47,7 +43,6 @@ class Management implements \Magento\Tax\Api\TaxClassManagementInterface
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FilterBuilder $filterBuilder
      * @param Repository $classRepository
-     * @since 2.0.0
      */
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
@@ -61,7 +56,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxClassId($taxClassKey, $taxClassType = self::TYPE_PRODUCT)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Repository.php b/app/code/Magento/Tax/Model/TaxClass/Repository.php
index 66c0a8f0eecf5..0c0bbcf52e559 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Repository.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Repository.php
@@ -22,25 +22,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Repository implements \Magento\Tax\Api\TaxClassRepositoryInterface
 {
     /**
      * @var TaxClassCollectionFactory
-     * @since 2.0.0
      */
     protected $taxClassCollectionFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxClassSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
     /**
      * @var ClassModelRegistry
-     * @since 2.0.0
      */
     protected $classModelRegistry;
 
@@ -50,7 +46,6 @@ class Repository implements \Magento\Tax\Api\TaxClassRepositoryInterface
      * Search Criteria Builder
      *
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -58,19 +53,16 @@ class Repository implements \Magento\Tax\Api\TaxClassRepositoryInterface
      * Filter Builder
      *
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Tax\Model\ResourceModel\TaxClass
-     * @since 2.0.0
      */
     protected $taxClassResource;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -89,7 +81,6 @@ class Repository implements \Magento\Tax\Api\TaxClassRepositoryInterface
      * @param \Magento\Tax\Model\ResourceModel\TaxClass $taxClassResource
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
@@ -113,7 +104,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Tax\Api\Data\TaxClassInterface $taxClass)
     {
@@ -146,7 +136,6 @@ public function save(\Magento\Tax\Api\Data\TaxClassInterface $taxClass)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($taxClassId)
     {
@@ -155,7 +144,6 @@ public function get($taxClassId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(\Magento\Tax\Api\Data\TaxClassInterface $taxClass)
     {
@@ -173,7 +161,6 @@ public function delete(\Magento\Tax\Api\Data\TaxClassInterface $taxClass)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($taxClassId)
     {
@@ -187,7 +174,6 @@ public function deleteById($taxClassId)
      * @param \Magento\Tax\Api\Data\TaxClassInterface $taxClass
      * @return void
      * @throws InputException
-     * @since 2.0.0
      */
     protected function validateTaxClassData(\Magento\Tax\Api\Data\TaxClassInterface $taxClass)
     {
@@ -218,7 +204,6 @@ protected function validateTaxClassData(\Magento\Tax\Api\Data\TaxClassInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -239,7 +224,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param TaxClassCollection $collection
      * @return void
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, TaxClassCollection $collection)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php b/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
index 6f4a27dbbdf19..80e1293984bb8 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
@@ -12,25 +12,21 @@
 
 /**
  * Customer tax class source model.
- * @since 2.0.0
  */
 class Customer extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxClassRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -40,7 +36,6 @@ class Customer extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * @param \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassRepository,
@@ -57,7 +52,6 @@ public function __construct(
      *
      * @return array
      * @throws StateException
-     * @since 2.0.0
      */
     public function getAllOptions()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Source/Product.php b/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
index 89c7b627a1982..9cd08d1ee69d6 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
@@ -12,31 +12,26 @@
 
 /**
  * Product tax class source model.
- * @since 2.0.0
  */
 class Product extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface
-     * @since 2.0.0
      */
     protected $_taxClassRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $_searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $_filterBuilder;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory
-     * @since 2.0.0
      */
     protected $_optionFactory;
 
@@ -48,7 +43,6 @@ class Product extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      * @param \Magento\Tax\Api\TaxClassRepositoryInterface $taxClassRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory $classesFactory,
@@ -69,7 +63,6 @@ public function __construct(
      *
      * @param bool $withEmpty
      * @return array
-     * @since 2.0.0
      */
     public function getAllOptions($withEmpty = true)
     {
@@ -103,7 +96,6 @@ public function getAllOptions($withEmpty = true)
      *
      * @param string|integer $value
      * @return string
-     * @since 2.0.0
      */
     public function getOptionText($value)
     {
@@ -121,7 +113,6 @@ public function getOptionText($value)
      * Retrieve flat column definition
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFlatColumns()
     {
@@ -144,7 +135,6 @@ public function getFlatColumns()
      *
      * @param   int $store
      * @return  \Magento\Framework\DB\Select|null
-     * @since 2.0.0
      */
     public function getFlatUpdateSelect($store)
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
index de7ece80ab364..fe8791f0cf7b6 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
@@ -10,25 +10,21 @@
 
 /**
  * Customer Tax Class
- * @since 2.0.0
  */
 class Customer extends \Magento\Tax\Model\TaxClass\AbstractType
 {
     /**
      * @var CustomerGroupRepository
-     * @since 2.0.0
      */
     protected $customerGroupRepository;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
@@ -36,7 +32,6 @@ class Customer extends \Magento\Tax\Model\TaxClass\AbstractType
      * Class Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_classType = \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER;
 
@@ -46,7 +41,6 @@ class Customer extends \Magento\Tax\Model\TaxClass\AbstractType
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Calculation\Rule $calculationRule,
@@ -63,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAssignedToObjects()
     {
@@ -83,7 +76,6 @@ public function isAssignedToObjects()
      * Get Name of Objects that use this Tax Class Type
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getObjectTypeName()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
index cff3cbf3723f8..88fc1250dbb5e 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Tax\Model\TaxClass\Type\Product
  *
- * @since 2.0.0
  */
 class Product extends \Magento\Tax\Model\TaxClass\AbstractType
 {
     /**
      * @var \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected $_modelProduct;
 
@@ -26,7 +24,6 @@ class Product extends \Magento\Tax\Model\TaxClass\AbstractType
      * Class Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_classType = \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT;
 
@@ -34,7 +31,6 @@ class Product extends \Magento\Tax\Model\TaxClass\AbstractType
      * @param \Magento\Tax\Model\Calculation\Rule $calculationRule
      * @param \Magento\Catalog\Model\Product $modelProduct
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Model\Calculation\Rule $calculationRule,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAssignedToObjects()
     {
@@ -59,7 +54,6 @@ public function isAssignedToObjects()
      * Get Name of Objects that use this Tax Class Type
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getObjectTypeName()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/TypeInterface.php b/app/code/Magento/Tax/Model/TaxClass/Type/TypeInterface.php
index 2d64d17b8694b..299b8f8638cce 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/TypeInterface.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/TypeInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Tax\Model\TaxClass\Type\TypeInterface
  *
- * @since 2.0.0
  */
 interface TypeInterface
 {
@@ -20,7 +19,6 @@ interface TypeInterface
      * Check are any objects assigned to the tax class
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAssignedToObjects();
 
@@ -28,7 +26,6 @@ public function isAssignedToObjects();
      * Get Collection of Tax Rules that are assigned to this tax class
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getAssignedToRules();
 
@@ -36,7 +33,6 @@ public function getAssignedToRules();
      * Get Name of Objects that use this Tax Class Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getObjectTypeName();
 }
diff --git a/app/code/Magento/Tax/Model/TaxConfigProvider.php b/app/code/Magento/Tax/Model/TaxConfigProvider.php
index 4c7b3419931f4..1fa40be9526b4 100644
--- a/app/code/Magento/Tax/Model/TaxConfigProvider.php
+++ b/app/code/Magento/Tax/Model/TaxConfigProvider.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Tax\Model\TaxConfigProvider
  *
- * @since 2.0.0
  */
 class TaxConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var TaxHelper
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $taxConfig;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var CheckoutSession
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
@@ -46,7 +41,6 @@ class TaxConfigProvider implements ConfigProviderInterface
      * @param Config $taxConfig
      * @param CheckoutSession $checkoutSession
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         TaxHelper $taxHelper,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -100,7 +93,6 @@ public function getConfig()
      * Shipping mode: 'both', 'including', 'excluding'
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayShippingMode()
     {
@@ -117,7 +109,6 @@ public function getDisplayShippingMode()
      * Return flag whether to display shipping price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayShippingPriceExclTax()
     {
@@ -128,7 +119,6 @@ public function isDisplayShippingPriceExclTax()
      * Return flag whether to display shipping price including and excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayShippingBothPrices()
     {
@@ -139,7 +129,6 @@ public function isDisplayShippingBothPrices()
      * Get review item price display mode
      *
      * @return string 'both', 'including', 'excluding'
-     * @since 2.0.0
      */
     public function getReviewItemPriceDisplayMode()
     {
@@ -156,7 +145,6 @@ public function getReviewItemPriceDisplayMode()
      * Get review item price display mode
      *
      * @return string 'both', 'including', 'excluding'
-     * @since 2.0.0
      */
     public function getReviewTotalsDisplayMode()
     {
@@ -173,7 +161,6 @@ public function getReviewTotalsDisplayMode()
      * Show tax details in checkout totals section flag
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFullTaxSummaryDisplayed()
     {
@@ -184,7 +171,6 @@ public function isFullTaxSummaryDisplayed()
      * Display tax in grand total section or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isTaxDisplayedInGrandTotal()
     {
@@ -195,7 +181,6 @@ public function isTaxDisplayedInGrandTotal()
      * Reload totals(taxes) on billing address update
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function reloadOnBillingAddress()
     {
diff --git a/app/code/Magento/Tax/Model/TaxDetails/AppliedTax.php b/app/code/Magento/Tax/Model/TaxDetails/AppliedTax.php
index 9aaf3485a5aa8..f36de79ba6368 100644
--- a/app/code/Magento/Tax/Model/TaxDetails/AppliedTax.php
+++ b/app/code/Magento/Tax/Model/TaxDetails/AppliedTax.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class AppliedTax extends AbstractExtensibleModel implements AppliedTaxInterface
 {
@@ -25,7 +24,6 @@ class AppliedTax extends AbstractExtensibleModel implements AppliedTaxInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxRateKey()
     {
@@ -34,7 +32,6 @@ public function getTaxRateKey()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPercent()
     {
@@ -43,7 +40,6 @@ public function getPercent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -52,7 +48,6 @@ public function getAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRates()
     {
@@ -64,7 +59,6 @@ public function getRates()
      *
      * @param string $taxRateKey
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxRateKey($taxRateKey)
     {
@@ -76,7 +70,6 @@ public function setTaxRateKey($taxRateKey)
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent)
     {
@@ -88,7 +81,6 @@ public function setPercent($percent)
      *
      * @param float $amount
      * @return $this
-     * @since 2.0.0
      */
     public function setAmount($amount)
     {
@@ -100,7 +92,6 @@ public function setAmount($amount)
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxRateInterface[] $rates
      * @return $this
-     * @since 2.0.0
      */
     public function setRates(array $rates = null)
     {
@@ -111,7 +102,6 @@ public function setRates(array $rates = null)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -123,7 +113,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\AppliedTaxExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/TaxDetails/AppliedTaxRate.php b/app/code/Magento/Tax/Model/TaxDetails/AppliedTaxRate.php
index 14ac801a8e2d9..0e0ec13f13497 100644
--- a/app/code/Magento/Tax/Model/TaxDetails/AppliedTaxRate.php
+++ b/app/code/Magento/Tax/Model/TaxDetails/AppliedTaxRate.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class AppliedTaxRate extends AbstractExtensibleModel implements AppliedTaxRateInterface
 {
@@ -24,7 +23,6 @@ class AppliedTaxRate extends AbstractExtensibleModel implements AppliedTaxRateIn
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -33,7 +31,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -42,7 +39,6 @@ public function getTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPercent()
     {
@@ -54,7 +50,6 @@ public function getPercent()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -66,7 +61,6 @@ public function setCode($code)
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -78,7 +72,6 @@ public function setTitle($title)
      *
      * @param float $percent
      * @return $this
-     * @since 2.0.0
      */
     public function setPercent($percent)
     {
@@ -89,7 +82,6 @@ public function setPercent($percent)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -101,7 +93,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\AppliedTaxRateExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/TaxDetails/ItemDetails.php b/app/code/Magento/Tax/Model/TaxDetails/ItemDetails.php
index 1d842d8ecdc2c..767d383e395fe 100644
--- a/app/code/Magento/Tax/Model/TaxDetails/ItemDetails.php
+++ b/app/code/Magento/Tax/Model/TaxDetails/ItemDetails.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ItemDetails extends AbstractExtensibleModel implements TaxDetailsItemInterface
 {
@@ -34,7 +33,6 @@ class ItemDetails extends AbstractExtensibleModel implements TaxDetailsItemInter
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -43,7 +41,6 @@ public function getCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -52,7 +49,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxPercent()
     {
@@ -61,7 +57,6 @@ public function getTaxPercent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -70,7 +65,6 @@ public function getPrice()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPriceInclTax()
     {
@@ -79,7 +73,6 @@ public function getPriceInclTax()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowTotal()
     {
@@ -88,7 +81,6 @@ public function getRowTotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowTotalInclTax()
     {
@@ -97,7 +89,6 @@ public function getRowTotalInclTax()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRowTax()
     {
@@ -106,7 +97,6 @@ public function getRowTax()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxableAmount()
     {
@@ -115,7 +105,6 @@ public function getTaxableAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDiscountAmount()
     {
@@ -124,7 +113,6 @@ public function getDiscountAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -133,7 +121,6 @@ public function getDiscountTaxCompensationAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAppliedTaxes()
     {
@@ -142,7 +129,6 @@ public function getAppliedTaxes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAssociatedItemCode()
     {
@@ -154,7 +140,6 @@ public function getAssociatedItemCode()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -166,7 +151,6 @@ public function setCode($code)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -178,7 +162,6 @@ public function setType($type)
      *
      * @param float $taxPercent
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxPercent($taxPercent)
     {
@@ -190,7 +173,6 @@ public function setTaxPercent($taxPercent)
      *
      * @param float $price
      * @return $this
-     * @since 2.0.0
      */
     public function setPrice($price)
     {
@@ -202,7 +184,6 @@ public function setPrice($price)
      *
      * @param float $priceInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setPriceInclTax($priceInclTax)
     {
@@ -214,7 +195,6 @@ public function setPriceInclTax($priceInclTax)
      *
      * @param float $rowTotal
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotal($rowTotal)
     {
@@ -226,7 +206,6 @@ public function setRowTotal($rowTotal)
      *
      * @param float $rowTotalInclTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTotalInclTax($rowTotalInclTax)
     {
@@ -238,7 +217,6 @@ public function setRowTotalInclTax($rowTotalInclTax)
      *
      * @param float $rowTax
      * @return $this
-     * @since 2.0.0
      */
     public function setRowTax($rowTax)
     {
@@ -250,7 +228,6 @@ public function setRowTax($rowTax)
      *
      * @param float $taxableAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxableAmount($taxableAmount)
     {
@@ -262,7 +239,6 @@ public function setTaxableAmount($taxableAmount)
      *
      * @param float $discountAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountAmount($discountAmount)
     {
@@ -274,7 +250,6 @@ public function setDiscountAmount($discountAmount)
      *
      * @param float $discountTaxCompensationAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
     {
@@ -289,7 +264,6 @@ public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null)
     {
@@ -301,7 +275,6 @@ public function setAppliedTaxes(array $appliedTaxes = null)
      *
      * @param int $associatedItemCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAssociatedItemCode($associatedItemCode)
     {
@@ -312,7 +285,6 @@ public function setAssociatedItemCode($associatedItemCode)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -324,7 +296,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxDetailsItemExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/TaxDetails/TaxDetails.php b/app/code/Magento/Tax/Model/TaxDetails/TaxDetails.php
index 37078d9350abd..bba6807c95451 100644
--- a/app/code/Magento/Tax/Model/TaxDetails/TaxDetails.php
+++ b/app/code/Magento/Tax/Model/TaxDetails/TaxDetails.php
@@ -10,7 +10,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class TaxDetails extends AbstractExtensibleModel implements TaxDetailsInterface
 {
@@ -26,7 +25,6 @@ class TaxDetails extends AbstractExtensibleModel implements TaxDetailsInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSubtotal()
     {
@@ -35,7 +33,6 @@ public function getSubtotal()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTaxAmount()
     {
@@ -44,7 +41,6 @@ public function getTaxAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDiscountTaxCompensationAmount()
     {
@@ -53,7 +49,6 @@ public function getDiscountTaxCompensationAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAppliedTaxes()
     {
@@ -62,7 +57,6 @@ public function getAppliedTaxes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -74,7 +68,6 @@ public function getItems()
      *
      * @param float $subtotal
      * @return $this
-     * @since 2.0.0
      */
     public function setSubtotal($subtotal)
     {
@@ -86,7 +79,6 @@ public function setSubtotal($subtotal)
      *
      * @param float $taxAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setTaxAmount($taxAmount)
     {
@@ -98,7 +90,6 @@ public function setTaxAmount($taxAmount)
      *
      * @param float $discountTaxCompensationAmount
      * @return $this
-     * @since 2.0.0
      */
     public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
     {
@@ -113,7 +104,6 @@ public function setDiscountTaxCompensationAmount($discountTaxCompensationAmount)
      *
      * @param \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes
      * @return $this
-     * @since 2.0.0
      */
     public function setAppliedTaxes(array $appliedTaxes = null)
     {
@@ -125,7 +115,6 @@ public function setAppliedTaxes(array $appliedTaxes = null)
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsItemInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -136,7 +125,6 @@ public function setItems(array $items = null)
      * {@inheritdoc}
      *
      * @return \Magento\Tax\Api\Data\TaxDetailsExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -148,7 +136,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Tax\Api\Data\TaxDetailsExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Tax\Api\Data\TaxDetailsExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Tax/Model/TaxRateCollection.php b/app/code/Magento/Tax/Model/TaxRateCollection.php
index 05bb123cd9c9f..218682ffb6688 100644
--- a/app/code/Magento/Tax/Model/TaxRateCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRateCollection.php
@@ -16,20 +16,17 @@
 
 /**
  * Tax rate collection for a grid backed by Services
- * @since 2.0.0
  */
 
 class TaxRateCollection extends AbstractServiceCollection
 {
     /**
      * @var TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxRateRepository;
 
     /**
      * @var \Magento\Tax\Model\Calculation\Rate\Converter
-     * @since 2.0.0
      */
     protected $rateConverter;
 
@@ -42,7 +39,6 @@ class TaxRateCollection extends AbstractServiceCollection
      * @param SortOrderBuilder $sortOrderBuilder
      * @param TaxRateRepositoryInterface $rateService
      * @param \Magento\Tax\Model\Calculation\Rate\Converter $rateConverter
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -59,7 +55,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -80,7 +75,6 @@ public function loadData($printQuery = false, $logQuery = false)
      *
      * @param TaxRate $taxRate Input data for creating the item.
      * @return \Magento\Framework\DataObject Collection item that represents a tax rate
-     * @since 2.0.0
      */
     protected function createTaxRateCollectionItem(TaxRate $taxRate)
     {
diff --git a/app/code/Magento/Tax/Model/TaxRateManagement.php b/app/code/Magento/Tax/Model/TaxRateManagement.php
index de9755ba0109a..7d3d89283ec43 100644
--- a/app/code/Magento/Tax/Model/TaxRateManagement.php
+++ b/app/code/Magento/Tax/Model/TaxRateManagement.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Tax\Model\TaxRateManagement
  *
- * @since 2.0.0
  */
 class TaxRateManagement implements TaxRateManagementInterface
 {
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var TaxRuleRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxRuleRepository;
 
     /**
      * @var TaxRateRepositoryInterface
-     * @since 2.0.0
      */
     protected $taxRateRepository;
 
@@ -48,7 +43,6 @@ class TaxRateManagement implements TaxRateManagementInterface
      * @param TaxRateRepositoryInterface $taxRateRepository
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @since 2.0.0
      */
     public function __construct(
         TaxRuleRepositoryInterface $taxRuleRepository,
@@ -64,7 +58,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRatesByCustomerAndProductTaxClassId($customerTaxClassId, $productTaxClassId)
     {
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
index 981b1cdba9a0f..33aaf3b22b6d6 100644
--- a/app/code/Magento/Tax/Model/TaxRuleCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -16,13 +16,11 @@
 
 /**
  * Tax rule collection for a grid backed by Services
- * @since 2.0.0
  */
 class TaxRuleCollection extends AbstractServiceCollection
 {
     /**
      * @var TaxRuleRepositoryInterface
-     * @since 2.0.0
      */
     protected $ruleService;
 
@@ -34,7 +32,6 @@ class TaxRuleCollection extends AbstractServiceCollection
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param SortOrderBuilder $sortOrderBuilder
      * @param TaxRuleRepositoryInterface $ruleService
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -49,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -70,7 +66,6 @@ public function loadData($printQuery = false, $logQuery = false)
      *
      * @param TaxRuleInterface $taxRule Input data for creating the item.
      * @return \Magento\Framework\DataObject Collection item that represents a tax rule
-     * @since 2.0.0
      */
     protected function createTaxRuleCollectionItem(TaxRuleInterface $taxRule)
     {
diff --git a/app/code/Magento/Tax/Model/TaxRuleRepository.php b/app/code/Magento/Tax/Model/TaxRuleRepository.php
index c126d2f6d34b4..a2ebf23c53271 100644
--- a/app/code/Magento/Tax/Model/TaxRuleRepository.php
+++ b/app/code/Magento/Tax/Model/TaxRuleRepository.php
@@ -23,43 +23,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class TaxRuleRepository implements TaxRuleRepositoryInterface
 {
     /**
      * @var TaxRuleRegistry
-     * @since 2.0.0
      */
     protected $taxRuleRegistry;
 
     /**
      * @var TaxRuleSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $taxRuleSearchResultsFactory;
 
     /**
      * @var RuleFactory
-     * @since 2.0.0
      */
     protected $taxRuleModelFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var ResourceRule
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
@@ -77,7 +70,6 @@ class TaxRuleRepository implements TaxRuleRepositoryInterface
      * @param ResourceRule $resource
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface | null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         TaxRuleRegistry $taxRuleRegistry,
@@ -99,7 +91,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($ruleId)
     {
@@ -108,7 +99,6 @@ public function get($ruleId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(TaxRuleInterface $rule)
     {
@@ -131,7 +121,6 @@ public function save(TaxRuleInterface $rule)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function delete(TaxRuleInterface $rule)
     {
@@ -143,7 +132,6 @@ public function delete(TaxRuleInterface $rule)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteById($ruleId)
     {
@@ -153,7 +141,6 @@ public function deleteById($ruleId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -177,7 +164,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @return void
      * @deprecated 2.2.0
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
     {
@@ -213,7 +199,6 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
      * @param string $field a field name that should be translated to a DB column name.
      * @deprecated 2.2.0
      * @return string
-     * @since 2.0.0
      */
     protected function translateField($field)
     {
diff --git a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
index c0b2c27f014a7..4b0dd6654eb7e 100644
--- a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\Tax\Observer\AfterAddressSaveObserver
  *
- * @since 2.0.0
  */
 class AfterAddressSaveObserver implements ObserverInterface
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -36,7 +33,6 @@ class AfterAddressSaveObserver implements ObserverInterface
      * Module manager
      *
      * @var Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -44,7 +40,6 @@ class AfterAddressSaveObserver implements ObserverInterface
      * Cache config
      *
      * @var Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
@@ -53,7 +48,6 @@ class AfterAddressSaveObserver implements ObserverInterface
      * @param Data $taxHelper
      * @param Manager $moduleManager
      * @param Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
@@ -71,7 +65,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
index 86bb77a0a2788..c83d24921803a 100644
--- a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
+++ b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\Tax\Observer\CustomerLoggedInObserver
  *
- * @since 2.0.0
  */
 class CustomerLoggedInObserver implements ObserverInterface
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -36,7 +33,6 @@ class CustomerLoggedInObserver implements ObserverInterface
      * Module manager
      *
      * @var Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -44,13 +40,11 @@ class CustomerLoggedInObserver implements ObserverInterface
      * Cache config
      *
      * @var Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
     /**
      * @var GroupRepositoryInterface
-     * @since 2.0.0
      */
     private $groupRepository;
 
@@ -60,7 +54,6 @@ class CustomerLoggedInObserver implements ObserverInterface
      * @param Data $taxHelper
      * @param Manager $moduleManager
      * @param Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         GroupRepositoryInterface $groupRepository,
@@ -80,7 +73,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Tax/Observer/UpdateProductOptionsObserver.php b/app/code/Magento/Tax/Observer/UpdateProductOptionsObserver.php
index 4150250922803..ca81142e7e4bc 100644
--- a/app/code/Magento/Tax/Observer/UpdateProductOptionsObserver.php
+++ b/app/code/Magento/Tax/Observer/UpdateProductOptionsObserver.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Tax\Observer\UpdateProductOptionsObserver
  *
- * @since 2.0.0
  */
 class UpdateProductOptionsObserver implements ObserverInterface
 {
@@ -19,20 +18,17 @@ class UpdateProductOptionsObserver implements ObserverInterface
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxData;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxData,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
index 04b29637d2d55..662ee40596aa9 100644
--- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
@@ -9,37 +9,31 @@
 /**
  * Class \Magento\Tax\Plugin\Checkout\CustomerData\Cart
  *
- * @since 2.0.0
  */
 class Cart
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $checkoutHelper;
 
     /**
      * @var \Magento\Tax\Block\Item\Price\Renderer
-     * @since 2.0.0
      */
     protected $itemPriceRenderer;
 
     /**
      * @var \Magento\Quote\Model\Quote|null
-     * @since 2.0.0
      */
     protected $quote = null;
 
     /**
      * @var array|null
-     * @since 2.0.0
      */
     protected $totals = null;
 
@@ -47,7 +41,6 @@ class Cart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Tax\Block\Item\Price\Renderer $itemPriceRenderer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -66,7 +59,6 @@ public function __construct(
      * @param array $result
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject, $result)
     {
@@ -90,7 +82,6 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
      * Get subtotal, including tax
      *
      * @return float
-     * @since 2.0.0
      */
     protected function getSubtotalInclTax()
     {
@@ -106,7 +97,6 @@ protected function getSubtotalInclTax()
      * Get subtotal, excluding tax
      *
      * @return float
-     * @since 2.0.0
      */
     protected function getSubtotalExclTax()
     {
@@ -122,7 +112,6 @@ protected function getSubtotalExclTax()
      * Get totals
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTotals()
     {
@@ -137,7 +126,6 @@ public function getTotals()
      * Get active quote
      *
      * @return \Magento\Quote\Model\Quote
-     * @since 2.0.0
      */
     protected function getQuote()
     {
@@ -153,7 +141,6 @@ protected function getQuote()
      * @param int $id
      * @param array $itemsHaystack
      * @return \Magento\Quote\Model\Quote\Item | bool
-     * @since 2.0.0
      */
     protected function findItemById($id, $itemsHaystack)
     {
diff --git a/app/code/Magento/Tax/Pricing/Adjustment.php b/app/code/Magento/Tax/Pricing/Adjustment.php
index a7c8cdfc7f28b..e8cbabeeb2197 100644
--- a/app/code/Magento/Tax/Pricing/Adjustment.php
+++ b/app/code/Magento/Tax/Pricing/Adjustment.php
@@ -12,7 +12,6 @@
 
 /**
  * Tax pricing adjustment model
- * @since 2.0.0
  */
 class Adjustment implements AdjustmentInterface
 {
@@ -23,7 +22,6 @@ class Adjustment implements AdjustmentInterface
 
     /**
      * @var TaxHelper
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -31,13 +29,11 @@ class Adjustment implements AdjustmentInterface
      * \Magento\Catalog\Helper\Data
      *
      * @var CatalogHelper
-     * @since 2.0.0
      */
     protected $catalogHelper;
 
     /**
      * @var int|null
-     * @since 2.0.0
      */
     protected $sortOrder;
 
@@ -45,7 +41,6 @@ class Adjustment implements AdjustmentInterface
      * @param TaxHelper $taxHelper
      * @param \Magento\Catalog\Helper\Data $catalogHelper
      * @param int|null $sortOrder
-     * @since 2.0.0
      */
     public function __construct(TaxHelper $taxHelper, \Magento\Catalog\Helper\Data $catalogHelper, $sortOrder = null)
     {
@@ -58,7 +53,6 @@ public function __construct(TaxHelper $taxHelper, \Magento\Catalog\Helper\Data $
      * Get adjustment code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode()
     {
@@ -69,7 +63,6 @@ public function getAdjustmentCode()
      * Define if adjustment is included in base price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInBasePrice()
     {
@@ -80,7 +73,6 @@ public function isIncludedInBasePrice()
      * Define if adjustment is included in display price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInDisplayPrice()
     {
@@ -94,7 +86,6 @@ public function isIncludedInDisplayPrice()
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function extractAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -124,7 +115,6 @@ public function extractAdjustment($amount, SaleableInterface $saleableItem, $con
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function applyAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -146,7 +136,6 @@ public function applyAdjustment($amount, SaleableInterface $saleableItem, $conte
      *
      * @param string $adjustmentCode
      * @return bool
-     * @since 2.0.0
      */
     public function isExcludedWith($adjustmentCode)
     {
@@ -157,7 +146,6 @@ public function isExcludedWith($adjustmentCode)
      * Return sort order position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Tax/Pricing/Render/Adjustment.php b/app/code/Magento/Tax/Pricing/Render/Adjustment.php
index 7ef2e33fcc1d8..8613e62f2983e 100644
--- a/app/code/Magento/Tax/Pricing/Render/Adjustment.php
+++ b/app/code/Magento/Tax/Pricing/Render/Adjustment.php
@@ -13,13 +13,11 @@
 /**
  * @method string getIdSuffix()
  * @method string getDisplayLabel()
- * @since 2.0.0
  */
 class Adjustment extends AbstractAdjustment
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -28,7 +26,6 @@ class Adjustment extends AbstractAdjustment
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Tax\Helper\Data $helper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function apply()
     {
@@ -70,7 +66,6 @@ protected function apply()
      * Obtain code of adjustment type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode()
     {
@@ -81,7 +76,6 @@ public function getAdjustmentCode()
      * Define if both prices should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayBothPrices()
     {
@@ -94,7 +88,6 @@ public function displayBothPrices()
      * @param array $exclude
      * @param bool $includeContainer
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayAmountExclTax($exclude = null, $includeContainer = false)
     {
@@ -114,7 +107,6 @@ public function getDisplayAmountExclTax($exclude = null, $includeContainer = fal
      *
      * @param array $exclude
      * @return float
-     * @since 2.0.0
      */
     public function getRawAmount($exclude = null)
     {
@@ -130,7 +122,6 @@ public function getRawAmount($exclude = null)
      * Returns the list of default exclusions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultExclusions()
     {
@@ -142,7 +133,6 @@ public function getDefaultExclusions()
      *
      * @param bool $includeContainer
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayAmount($includeContainer = true)
     {
@@ -154,7 +144,6 @@ public function getDisplayAmount($includeContainer = true)
      *
      * @param string $prefix
      * @return string
-     * @since 2.0.0
      */
     public function buildIdWithPrefix($prefix)
     {
@@ -169,7 +158,6 @@ public function buildIdWithPrefix($prefix)
      * Should be displayed price including tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceIncludingTax()
     {
@@ -180,7 +168,6 @@ public function displayPriceIncludingTax()
      * Should be displayed price excluding tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceExcludingTax()
     {
diff --git a/app/code/Magento/Tax/Setup/InstallData.php b/app/code/Magento/Tax/Setup/InstallData.php
index 5c48bec8cd759..655ca8ad22a10 100644
--- a/app/code/Magento/Tax/Setup/InstallData.php
+++ b/app/code/Magento/Tax/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -21,7 +20,6 @@ class InstallData implements InstallDataInterface
      * Tax setup factory
      *
      * @var TaxSetupFactory
-     * @since 2.0.0
      */
     private $taxSetupFactory;
 
@@ -34,7 +32,6 @@ class InstallData implements InstallDataInterface
     /**
      * @param TaxSetupFactory $taxSetupFactory
      * @param RegionFactory $directoryRegionFactory
-     * @since 2.0.0
      */
     public function __construct(
         TaxSetupFactory $taxSetupFactory,
@@ -46,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Tax/Setup/InstallSchema.php b/app/code/Magento/Tax/Setup/InstallSchema.php
index cf907fe464cc3..4282b67b17773 100644
--- a/app/code/Magento/Tax/Setup/InstallSchema.php
+++ b/app/code/Magento/Tax/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Tax/Setup/TaxSetup.php b/app/code/Magento/Tax/Setup/TaxSetup.php
index 6e58c23c4986d..60959626ed755 100644
--- a/app/code/Magento/Tax/Setup/TaxSetup.php
+++ b/app/code/Magento/Tax/Setup/TaxSetup.php
@@ -11,13 +11,11 @@
 
 /**
  * Tax Setup Resource Model
- * @since 2.0.0
  */
 class TaxSetup
 {
     /**
      * @var \Magento\Sales\Setup\SalesSetup
-     * @since 2.0.0
      */
     protected $salesSetup;
 
@@ -25,7 +23,6 @@ class TaxSetup
      * Product type config
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $productTypeConfig;
 
@@ -35,7 +32,6 @@ class TaxSetup
      * @param ModuleDataSetupInterface $setup
      * @param SalesSetupFactory $salesSetupFactory
      * @param ConfigInterface $productTypeConfig
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -50,7 +46,6 @@ public function __construct(
      * Get taxable product types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTaxableItems()
     {
@@ -64,7 +59,6 @@ public function getTaxableItems()
      * @param string $code
      * @param array $attr
      * @return $this
-     * @since 2.0.0
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -81,7 +75,6 @@ public function addAttribute($entityTypeId, $code, array $attr)
      * @param mixed $value
      * @param int $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function updateAttribute($entityTypeId, $id, $field, $value = null, $sortOrder = null)
     {
diff --git a/app/code/Magento/Tax/Setup/UpgradeData.php b/app/code/Magento/Tax/Setup/UpgradeData.php
index 7d4e4e84cedc9..402da01b9db33 100644
--- a/app/code/Magento/Tax/Setup/UpgradeData.php
+++ b/app/code/Magento/Tax/Setup/UpgradeData.php
@@ -15,7 +15,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -23,7 +22,6 @@ class UpgradeData implements UpgradeDataInterface
      * Tax setup factory
      *
      * @var TaxSetupFactory
-     * @since 2.0.0
      */
     private $taxSetupFactory;
 
@@ -54,7 +52,6 @@ class UpgradeData implements UpgradeDataInterface
      * @param TaxRateRepositoryInterface $taxRateRepository
      * @param SearchCriteriaFactory $searchCriteriaFactory
      * @param RegionFactory $directoryRegionFactory
-     * @since 2.0.0
      */
     public function __construct(
         TaxSetupFactory $taxSetupFactory,
@@ -70,7 +67,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php
index 7b89481017c00..dbc036f2c91c2 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\TaxImportExport\Block\Adminhtml\Rate\Grid\Renderer\Country
  *
- * @since 2.0.0
  */
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Country
 {
@@ -23,7 +22,6 @@ class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Country
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function renderExport(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
index 18646168ca633..bb30c8eafb38f 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
@@ -7,20 +7,17 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ImportExport extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'importExport.phtml';
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
     {
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
index 44ab8bcb22326..1d5337c3929ea 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExportHeader
  *
- * @since 2.0.0
  */
 class ImportExportHeader extends \Magento\Backend\Block\Widget
 {
@@ -20,7 +19,6 @@ class ImportExportHeader extends \Magento\Backend\Block\Widget
      * Block's template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'importExportHeader.phtml';
 }
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php
index 248dc0778884c..008689b9ac6c7 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php
@@ -7,7 +7,6 @@
 
 /**
  * Adminhtml tax rate controller
- * @since 2.0.0
  */
 abstract class Rate extends \Magento\Backend\App\Action
 {
@@ -20,14 +19,12 @@ abstract class Rate extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
index 57ccc90697c2c..2ffb37e335646 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\TaxImportExport\Controller\Adminhtml\Rate\ExportCsv
  *
- * @since 2.0.0
  */
 class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
 {
@@ -20,7 +19,6 @@ class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      * Export rates grid to CSV format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
index 18f671a40871a..c3fb3515d4637 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\TaxImportExport\Controller\Adminhtml\Rate\ExportPost
  *
- * @since 2.0.0
  */
 class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
 {
@@ -19,7 +18,6 @@ class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      * Export action from import/export tax
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -92,7 +90,6 @@ public function execute()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
index c225a30cd9bfd..70dbf156ba3d7 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\TaxImportExport\Controller\Adminhtml\Rate\ExportXml
  *
- * @since 2.0.0
  */
 class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
 {
@@ -20,7 +19,6 @@ class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      * Export rates grid to XML format
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
index 5b79a373cc5e7..d48b1af0ecd93 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\TaxImportExport\Controller\Adminhtml\Rate\ImportExport
  *
- * @since 2.0.0
  */
 class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
 {
@@ -25,7 +24,6 @@ class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      * Import and export Page
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
index 381f7c2f71515..407ceb1d2b5ea 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\TaxImportExport\Controller\Adminhtml\Rate\ImportPost
  *
- * @since 2.0.0
  */
 class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
 {
@@ -18,7 +17,6 @@ class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      * import action from import/export tax
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -47,7 +45,6 @@ public function execute()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
index 195de3383eabc..cad8c5cdbabf7 100644
--- a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
+++ b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -9,7 +9,6 @@
  * Tax Rate CSV Import Handler
  *
  * @api
- * @since 2.0.0
  */
 class CsvImportHandler
 {
@@ -17,7 +16,6 @@ class CsvImportHandler
      * Collection of publicly available stores
      *
      * @var \Magento\Store\Model\ResourceModel\Store\Collection
-     * @since 2.0.0
      */
     protected $_publicStores;
 
@@ -27,7 +25,6 @@ class CsvImportHandler
      * The instance is used to retrieve regions based on country code
      *
      * @var \Magento\Directory\Model\ResourceModel\Region\Collection
-     * @since 2.0.0
      */
     protected $_regionCollection;
 
@@ -35,7 +32,6 @@ class CsvImportHandler
      * Country factory
      *
      * @var \Magento\Directory\Model\CountryFactory
-     * @since 2.0.0
      */
     protected $_countryFactory;
 
@@ -43,7 +39,6 @@ class CsvImportHandler
      * Tax rate factory
      *
      * @var \Magento\Tax\Model\Calculation\RateFactory
-     * @since 2.0.0
      */
     protected $_taxRateFactory;
 
@@ -51,7 +46,6 @@ class CsvImportHandler
      * CSV Processor
      *
      * @var \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     protected $csvProcessor;
 
@@ -61,7 +55,6 @@ class CsvImportHandler
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
      * @param \Magento\Tax\Model\Calculation\RateFactory $taxRateFactory
      * @param \Magento\Framework\File\Csv $csvProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\ResourceModel\Store\Collection $storeCollection,
@@ -82,7 +75,6 @@ public function __construct(
      * Retrieve a list of fields required for CSV file (order is important!)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRequiredCsvFields()
     {
@@ -105,7 +97,6 @@ public function getRequiredCsvFields()
      * @param array $file file info retrieved from $_FILES array
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function importFromCsvFile($file)
     {
@@ -135,7 +126,6 @@ public function importFromCsvFile($file)
      *
      * @param array $fileFields
      * @return string[] filtered fields
-     * @since 2.0.0
      */
     protected function _filterFileFields(array $fileFields)
     {
@@ -164,7 +154,6 @@ protected function _filterFileFields(array $fileFields)
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _filterRateData(array $rateRawData, array $invalidFields, array $validFields)
     {
@@ -196,7 +185,6 @@ protected function _filterRateData(array $rateRawData, array $invalidFields, arr
      *
      * @param string[] $validFields list of valid CSV file fields
      * @return array
-     * @since 2.0.0
      */
     protected function _composeStoreCache($validFields)
     {
@@ -220,7 +208,6 @@ protected function _composeStoreCache($validFields)
      *
      * @param string $storeCode
      * @return boolean
-     * @since 2.0.0
      */
     protected function _isStoreCodeValid($storeCode)
     {
@@ -242,7 +229,6 @@ protected function _isStoreCodeValid($storeCode)
      * @param array $storesCache cache of stores related to tax rate titles
      * @return array regions cache populated with regions related to country of imported tax rate
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _importRate(array $rateData, array $regionsCache, array $storesCache)
     {
@@ -295,7 +281,6 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
      * @param string $countryCode
      * @param array $regionsCache
      * @return array
-     * @since 2.0.0
      */
     protected function _addCountryRegionsToCache($countryCode, array $regionsCache)
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
index bc91bb630524a..437959b265fad 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
@@ -9,7 +9,6 @@
  *  Container for theme grid
  *
  * @api
- * @since 2.0.0
  */
 class Theme extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Theme extends \Magento\Backend\Block\Widget\Grid\Container
      * Initialize grid container and prepare controls
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -35,7 +33,6 @@ public function _construct()
      * Prepare header for container
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
index 88f6b11da13c9..e9cfc0faba380 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -19,7 +18,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Prepare layout
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -98,7 +94,6 @@ protected function _prepareLayout()
      * Prepare header for container
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -116,7 +111,6 @@ public function getHeaderText()
      * Get current theme
      *
      * @return \Magento\Theme\Model\Theme
-     * @since 2.0.0
      */
     protected function _getCurrentTheme()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
index ebb07437fe57d..a2587975846af 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
@@ -10,14 +10,12 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -25,7 +23,6 @@ abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form\Generic im
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -35,7 +32,6 @@ abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form\Generic im
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Get theme that is edited currently
      *
      * @return \Magento\Theme\Model\Theme
-     * @since 2.0.0
      */
     protected function _getCurrentTheme()
     {
@@ -63,7 +58,6 @@ protected function _getCurrentTheme()
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -74,7 +68,6 @@ public function getTabTitle()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -85,7 +78,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
index 2543ac40bc568..3f458ac44af05 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
@@ -9,7 +9,6 @@
  * Theme Edit Form
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Initialize theme form
      *
      * @return \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form|\Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/File.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/File.php
index bcbef7a867501..982caa8d56be9 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/File.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/File.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form\Element\File
  *
- * @since 2.0.0
  */
 class File extends \Magento\Framework\Data\Form\Element\File
 {
@@ -20,7 +19,6 @@ class File extends \Magento\Framework\Data\Form\Element\File
      * Additional html attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_htmlAttributes = ['accept', 'multiple'];
 
@@ -28,7 +26,6 @@ class File extends \Magento\Framework\Data\Form\Element\File
      * Html attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
index 858baea735942..acb76d1ee19d4 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
@@ -10,7 +10,6 @@
  * Image form element that generates correct thumbnail image URL for theme preview image
  *
  * @method \Magento\Theme\Model\Theme getTheme()
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
@@ -18,7 +17,6 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
      * Get image preview url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Links.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Links.php
index b453ea8c307f4..f0ae67f75b677 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Links.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Links.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form\Element\Links
  *
- * @since 2.0.0
  */
 class Links extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Links extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
      * Generates element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -68,7 +65,6 @@ public function getElementHtml()
      *
      * @param array $option
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml(array $option)
     {
@@ -95,7 +91,6 @@ protected function _optionToHtml(array $option)
      * Prepare array of anchor attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index cfe97d44bef3c..5934919d90f31 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -16,7 +16,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\AbstractTab
 {
@@ -24,7 +23,6 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
      * Uploader service
      *
      * @var \Magento\Theme\Model\Uploader\Service
-     * @since 2.0.0
      */
     protected $_uploaderService;
 
@@ -32,13 +30,11 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
      * Theme custom css file
      *
      * @var \Magento\Theme\Model\Theme\File
-     * @since 2.0.0
      */
     protected $_customCssFile;
 
     /**
      * @var \Magento\Framework\Encryption\UrlCoder
-     * @since 2.0.0
      */
     protected $urlCoder;
 
@@ -50,7 +46,6 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
      * @param \Magento\Theme\Model\Uploader\Service $uploaderService
      * @param \Magento\Framework\Encryption\UrlCoder $urlCoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,7 +65,6 @@ public function __construct(
      * Create a form element with necessary controls
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -103,7 +97,6 @@ protected function _prepareForm()
      * Set theme css fieldset
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addThemeCssFieldset()
     {
@@ -143,7 +136,6 @@ protected function _addThemeCssFieldset()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _addCustomCssFieldset()
     {
@@ -254,7 +246,6 @@ protected function _addCustomCssFieldset()
      * Get note string for css file to Upload
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getUploadCssFileNote()
     {
@@ -276,7 +267,6 @@ protected function _getUploadCssFileNote()
      * Set additional form field type for theme preview image
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -289,7 +279,6 @@ protected function _getAdditionalElementTypes()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -302,7 +291,6 @@ public function getTabLabel()
      * @param string $fileId
      * @param int $themeId
      * @return string
-     * @since 2.0.0
      */
     public function getDownloadUrl($fileId, $themeId)
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
index a2c91ab9866c7..46bef2eb4d2f7 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
@@ -13,7 +13,6 @@
  * Theme form, general tab
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class General extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\AbstractTab
 {
@@ -21,13 +20,11 @@ class General extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Ab
      * Whether theme is editable
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isThemeEditable = false;
 
     /**
      * @var \Magento\Framework\File\Size
-     * @since 2.0.0
      */
     protected $_fileSize;
 
@@ -40,7 +37,6 @@ class General extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Ab
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Create a form element with necessary controls
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -96,7 +91,6 @@ protected function _prepareForm()
      * @param ThemeInterface $theme
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _addThemeFieldset($form, $formData, ThemeInterface $theme)
     {
@@ -214,7 +208,6 @@ protected function _addThemeFieldset($form, $formData, ThemeInterface $theme)
      *
      * @param string $text
      * @return string
-     * @since 2.0.0
      */
     protected function _filterFieldNote($text)
     {
@@ -225,7 +218,6 @@ protected function _filterFieldNote($text)
      * Field is not marked as required if theme is not editable
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFieldAttrRequired()
     {
@@ -236,7 +228,6 @@ protected function _isFieldAttrRequired()
      * Text field replaced to label if theme is not editable
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFieldTextType()
     {
@@ -247,7 +238,6 @@ protected function _getFieldTextType()
      * Set additional form field type for theme preview image
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -259,7 +249,6 @@ protected function _getAdditionalElementTypes()
      * Prepare label for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -270,7 +259,6 @@ public function getTabLabel()
      * Returns status flag about this tab can be shown or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -281,7 +269,6 @@ public function canShowTab()
      * Get theme default values
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaults()
     {
@@ -296,7 +283,6 @@ protected function _getDefaults()
      *
      * @param array $themesCollections
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultsInherited($themesCollections)
     {
@@ -318,7 +304,6 @@ protected function _getDefaultsInherited($themesCollections)
      * Get note string for theme's preview image
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getPreviewImageNote()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
index ac07b6971553b..9989d3cdc3a26 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Js extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\AbstractTab
 {
@@ -18,7 +17,6 @@ class Js extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstrac
      * Create a form element with necessary controls
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -34,7 +32,6 @@ protected function _prepareForm()
      * Set theme js fieldset
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addThemeJsFieldset()
     {
@@ -80,7 +77,6 @@ protected function _addThemeJsFieldset()
      * Set additional form field type
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdditionalElementTypes()
     {
@@ -92,7 +88,6 @@ protected function _getAdditionalElementTypes()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -103,7 +98,6 @@ public function getTabLabel()
      * Get upload js url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsUploadUrl()
     {
@@ -117,7 +111,6 @@ public function getJsUploadUrl()
      * Get note string for js file to Upload
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _getUploadJsFileNote()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tabs.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tabs.php
index 72d26cc073b8e..e03df1e10e8b7 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tabs.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tabs.php
@@ -9,7 +9,6 @@
  * Theme editor tab container
  *
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -17,7 +16,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * Initialize tabs and define tabs block settings
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
index b22ed0c8cbf93..9cd317b2048e7 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Content extends \Magento\Backend\Block\Widget\Container
 {
     /**
      * @var \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     protected $_storageHelper;
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @since 2.0.0
      */
     protected $jsonHelper;
 
@@ -31,7 +28,6 @@ class Content extends \Magento\Backend\Block\Widget\Container
      * @param \Magento\Theme\Helper\Storage $storageHelper
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Block construction
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -104,7 +99,6 @@ protected function _construct()
      * Files action source URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentsUrl()
     {
@@ -118,7 +112,6 @@ public function getContentsUrl()
      * Javascript setup object for filebrowser instance
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilebrowserSetupObject()
     {
@@ -147,7 +140,6 @@ public function getFilebrowserSetupObject()
      * New directory action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNewfolderUrl()
     {
@@ -158,7 +150,6 @@ public function getNewfolderUrl()
      * Delete directory action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDeletefolderUrl()
     {
@@ -169,7 +160,6 @@ protected function getDeletefolderUrl()
      * Delete files action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDeleteFilesUrl()
     {
@@ -180,7 +170,6 @@ public function getDeleteFilesUrl()
      * Insert file action target URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOnInsertUrl()
     {
@@ -191,7 +180,6 @@ public function getOnInsertUrl()
      * Target element ID getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTargetElementId()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Files.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Files.php
index 9cacf04be6d43..92f282852faf4 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Files.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Files.php
@@ -12,7 +12,6 @@
  * @method
  *  \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files setStorage(\Magento\Theme\Model\Wysiwyg\Storage $storage)
  * @method \Magento\Theme\Model\Wysiwyg\Storage getStorage()
- * @since 2.0.0
  */
 class Files extends \Magento\Backend\Block\Template
 {
@@ -20,7 +19,6 @@ class Files extends \Magento\Backend\Block\Template
      * Files list
      *
      * @var null|array
-     * @since 2.0.0
      */
     protected $_files;
 
@@ -28,7 +26,6 @@ class Files extends \Magento\Backend\Block\Template
      * Get files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFiles()
     {
@@ -43,7 +40,6 @@ public function getFiles()
      * Get files count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFilesCount()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 8857d00bae465..8439d5d67d9bb 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Uploader extends \Magento\Backend\Block\Media\Uploader
 {
@@ -18,13 +17,11 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
      * Path to uploader template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'browser/content/uploader.phtml';
 
     /**
      * @var \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     protected $_storageHelper;
 
@@ -33,7 +30,6 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
      * @param \Magento\Framework\File\Size $fileSize
      * @param \Magento\Theme\Helper\Storage $storageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Prepare layout
      *
      * @return \Magento\Backend\Block\Media\Uploader
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -61,7 +56,6 @@ protected function _prepareLayout()
      * Return storage helper
      *
      * @return \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     public function getHelperStorage()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
index b0ba34a946655..bb7a0a914c035 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tree extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     protected $_storageHelper;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -39,7 +36,6 @@ class Tree extends \Magento\Backend\Block\Template
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Json source URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeLoaderUrl()
     {
@@ -71,7 +66,6 @@ public function getTreeLoaderUrl()
      *
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     public function getTreeJson($data)
     {
@@ -82,7 +76,6 @@ public function getTreeJson($data)
      * Get root node name of tree
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getRootNodeName()
     {
@@ -93,7 +86,6 @@ public function getRootNodeName()
      * Return tree node full path based on current path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTreeCurrentPath()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
index 399918d1d5b18..8269d42cf312b 100644
--- a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
+++ b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
@@ -12,7 +12,6 @@
  * Html page breadcrumbs block
  *
  * @api
- * @since 2.0.0
  */
 class Breadcrumbs extends \Magento\Framework\View\Element\Template
 {
@@ -20,7 +19,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * Current template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'html/breadcrumbs.phtml';
 
@@ -28,7 +26,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * List of available breadcrumb properties
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_properties = ['label', 'title', 'link', 'first', 'last', 'readonly'];
 
@@ -36,7 +33,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * List of breadcrumbs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_crumbs;
 
@@ -44,7 +40,6 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      * Cache key info
      *
      * @var null|array
-     * @since 2.0.0
      */
     protected $_cacheKeyInfo;
 
@@ -76,7 +71,6 @@ public function __construct(
      * @param string $crumbName
      * @param array $crumbInfo
      * @return $this
-     * @since 2.0.0
      */
     public function addCrumb($crumbName, $crumbInfo)
     {
@@ -99,7 +93,6 @@ public function addCrumb($crumbName, $crumbInfo)
      * Provide string array key to share specific info item with FPC placeholder
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -116,7 +109,6 @@ public function getCacheKeyInfo()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index 9f7d4ec457ea9..d347be5d55c0c 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -11,7 +11,6 @@
  * Html page footer block
  *
  * @api
- * @since 2.0.0
  */
 class Footer extends \Magento\Framework\View\Element\Template implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -19,7 +18,6 @@ class Footer extends \Magento\Framework\View\Element\Template implements \Magent
      * Copyright information
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_copyright;
 
@@ -33,7 +31,6 @@ class Footer extends \Magento\Framework\View\Element\Template implements \Magent
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -41,7 +38,6 @@ class Footer extends \Magento\Framework\View\Element\Template implements \Magent
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Set footer data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -72,7 +67,6 @@ protected function _construct()
      * Get cache key informative items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -91,7 +85,6 @@ public function getCacheKeyInfo()
      * Retrieve copyright information
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCopyright()
     {
@@ -125,7 +118,6 @@ public function getMiscellaneousHtml()
      * Return identifiers for produced content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index cef19d1b7b634..52a107096f9e0 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -10,7 +10,6 @@
  * Html page header block
  *
  * @api
- * @since 2.0.0
  */
 class Header extends \Magento\Framework\View\Element\Template
 {
@@ -18,7 +17,6 @@ class Header extends \Magento\Framework\View\Element\Template
      * Current template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'html/header.phtml';
 
@@ -26,7 +24,6 @@ class Header extends \Magento\Framework\View\Element\Template
      * Retrieve welcome text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWelcome()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 4d627dcffab5b..65da0034733f5 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -10,7 +10,6 @@
  * Logo page header block
  *
  * @api
- * @since 2.0.0
  */
 class Logo extends \Magento\Framework\View\Element\Template
 {
@@ -18,13 +17,11 @@ class Logo extends \Magento\Framework\View\Element\Template
      * Current template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'html/header/logo.phtml';
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $_fileStorageHelper;
 
@@ -32,7 +29,6 @@ class Logo extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Check if current url is url for home page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHomePage()
     {
@@ -60,7 +55,6 @@ public function isHomePage()
      * Get logo image URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLogoSrc()
     {
@@ -74,7 +68,6 @@ public function getLogoSrc()
      * Retrieve logo text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLogoAlt()
     {
@@ -91,7 +84,6 @@ public function getLogoAlt()
      * Retrieve logo width
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLogoWidth()
     {
@@ -108,7 +100,6 @@ public function getLogoWidth()
      * Retrieve logo height
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLogoHeight()
     {
@@ -125,7 +116,6 @@ public function getLogoHeight()
      * Retrieve logo image URL
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getLogoUrl()
     {
@@ -153,7 +143,6 @@ protected function _getLogoUrl()
      *
      * @param string $filename relative path
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFile($filename)
     {
diff --git a/app/code/Magento/Theme/Block/Html/Notices.php b/app/code/Magento/Theme/Block/Html/Notices.php
index e23d7feeddc12..7f2a7213facda 100644
--- a/app/code/Magento/Theme/Block/Html/Notices.php
+++ b/app/code/Magento/Theme/Block/Html/Notices.php
@@ -9,14 +9,12 @@
  * Html page notices block
  *
  * @api
- * @since 2.0.0
  */
 class Notices extends \Magento\Framework\View\Element\Template
 {
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Element\Template\Context $context, array $data = [])
     {
@@ -27,7 +25,6 @@ public function __construct(\Magento\Framework\View\Element\Template\Context $co
      * Check if noscript notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayNoscriptNotice()
     {
@@ -41,7 +38,6 @@ public function displayNoscriptNotice()
      * Check if no local storage notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayNoLocalStorageNotice()
     {
@@ -55,7 +51,6 @@ public function displayNoLocalStorageNotice()
      * Check if demo store notice should be displayed
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function displayDemoNotice()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index 1ed72fa3af946..159f30aef036d 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -10,7 +10,6 @@
  *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @api
- * @since 2.0.0
  */
 class Pager extends \Magento\Framework\View\Element\Template
 {
@@ -18,25 +17,21 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Current template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Theme::html/pager.phtml';
 
     /**
      * @var \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_pageVarName = 'p';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_limitVarName = 'limit';
 
@@ -44,31 +39,26 @@ class Pager extends \Magento\Framework\View\Element\Template
      * The list of available pager limits
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_availableLimit = [10 => 10, 20 => 20, 50 => 50];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_displayPages = 5;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_showPerPage = true;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_limit;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_outputRequired = true;
 
@@ -76,7 +66,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Pages quantity per frame
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_frameLength = 5;
 
@@ -84,7 +73,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Next/previous page position relatively to the current frame
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_jump = 5;
 
@@ -92,7 +80,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Frame initialization flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_frameInitialized = false;
 
@@ -100,7 +87,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Start page position in frame
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_frameStart;
 
@@ -108,7 +94,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Finish page position in frame
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_frameEnd;
 
@@ -116,7 +101,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Url Fragment for pagination
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_fragment = null;
 
@@ -124,7 +108,6 @@ class Pager extends \Magento\Framework\View\Element\Template
      * Set pager data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -137,7 +120,6 @@ protected function _construct()
      * Return current page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -151,7 +133,6 @@ public function getCurrentPage()
      * Return current page limit
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLimit()
     {
@@ -175,7 +156,6 @@ public function getLimit()
      *
      * @param int $limit
      * @return $this
-     * @since 2.0.0
      */
     public function setLimit($limit)
     {
@@ -188,7 +168,6 @@ public function setLimit($limit)
      *
      * @param  \Magento\Framework\Data\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     public function setCollection($collection)
     {
@@ -205,7 +184,6 @@ public function setCollection($collection)
 
     /**
      * @return \Magento\Framework\Data\Collection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -215,7 +193,6 @@ public function getCollection()
     /**
      * @param string $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setPageVarName($varName)
     {
@@ -225,7 +202,6 @@ public function setPageVarName($varName)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getPageVarName()
     {
@@ -235,7 +211,6 @@ public function getPageVarName()
     /**
      * @param bool $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setShowPerPage($varName)
     {
@@ -245,7 +220,6 @@ public function setShowPerPage($varName)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isShowPerPage()
     {
@@ -260,7 +234,6 @@ public function isShowPerPage()
      *
      * @param string $varName
      * @return $this
-     * @since 2.0.0
      */
     public function setLimitVarName($varName)
     {
@@ -272,7 +245,6 @@ public function setLimitVarName($varName)
      * Retrieve name for pager limit data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLimitVarName()
     {
@@ -284,7 +256,6 @@ public function getLimitVarName()
      *
      * @param array $limits
      * @return $this
-     * @since 2.0.0
      */
     public function setAvailableLimit(array $limits)
     {
@@ -296,7 +267,6 @@ public function setAvailableLimit(array $limits)
      * Retrieve pager limit
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableLimit()
     {
@@ -305,7 +275,6 @@ public function getAvailableLimit()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getFirstNum()
     {
@@ -315,7 +284,6 @@ public function getFirstNum()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLastNum()
     {
@@ -327,7 +295,6 @@ public function getLastNum()
      * Retrieve total number of pages
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalNum()
     {
@@ -338,7 +305,6 @@ public function getTotalNum()
      * Check if current page is a first page in collection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFirstPage()
     {
@@ -349,7 +315,6 @@ public function isFirstPage()
      * Retrieve number of last page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLastPageNum()
     {
@@ -360,7 +325,6 @@ public function getLastPageNum()
      * Check if current page is a last page in collection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLastPage()
     {
@@ -370,7 +334,6 @@ public function isLastPage()
     /**
      * @param int $limit
      * @return bool
-     * @since 2.0.0
      */
     public function isLimitCurrent($limit)
     {
@@ -380,7 +343,6 @@ public function isLimitCurrent($limit)
     /**
      * @param int $page
      * @return bool
-     * @since 2.0.0
      */
     public function isPageCurrent($page)
     {
@@ -389,7 +351,6 @@ public function isPageCurrent($page)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getPages()
     {
@@ -416,7 +377,6 @@ public function getPages()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFirstPageUrl()
     {
@@ -427,7 +387,6 @@ public function getFirstPageUrl()
      * Retrieve previous page URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviousPageUrl()
     {
@@ -438,7 +397,6 @@ public function getPreviousPageUrl()
      * Retrieve next page URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextPageUrl()
     {
@@ -449,7 +407,6 @@ public function getNextPageUrl()
      * Retrieve last page URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastPageUrl()
     {
@@ -461,7 +418,6 @@ public function getLastPageUrl()
      *
      * @param string $page
      * @return string
-     * @since 2.0.0
      */
     public function getPageUrl($page)
     {
@@ -471,7 +427,6 @@ public function getPageUrl($page)
     /**
      * @param int $limit
      * @return string
-     * @since 2.0.0
      */
     public function getLimitUrl($limit)
     {
@@ -483,7 +438,6 @@ public function getLimitUrl($limit)
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getPagerUrl($params = [])
     {
@@ -499,7 +453,6 @@ public function getPagerUrl($params = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getPath()
     {
@@ -510,7 +463,6 @@ protected function getPath()
      * Getter for $_frameStart
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFrameStart()
     {
@@ -522,7 +474,6 @@ public function getFrameStart()
      * Getter for $_frameEnd
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFrameEnd()
     {
@@ -534,7 +485,6 @@ public function getFrameEnd()
      * Return array of pages in frame
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFramePages()
     {
@@ -547,7 +497,6 @@ public function getFramePages()
      * Return page number of Previous jump
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPreviousJumpPage()
     {
@@ -567,7 +516,6 @@ public function getPreviousJumpPage()
      * Prepare URL for Previous Jump
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviousJumpUrl()
     {
@@ -578,7 +526,6 @@ public function getPreviousJumpUrl()
      * Return page number of Next jump
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getNextJumpPage()
     {
@@ -598,7 +545,6 @@ public function getNextJumpPage()
      * Prepare URL for Next Jump
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextJumpUrl()
     {
@@ -609,7 +555,6 @@ public function getNextJumpUrl()
      * Getter for $_frameLength
      *
      * @return int
-     * @since 2.0.0
      */
     public function getFrameLength()
     {
@@ -620,7 +565,6 @@ public function getFrameLength()
      * Getter for $_jump
      *
      * @return int
-     * @since 2.0.0
      */
     public function getJump()
     {
@@ -632,7 +576,6 @@ public function getJump()
      *
      * @param int $frame
      * @return $this
-     * @since 2.0.0
      */
     public function setFrameLength($frame)
     {
@@ -653,7 +596,6 @@ public function setFrameLength($frame)
      *
      * @param int $jump
      * @return $this
-     * @since 2.0.0
      */
     public function setJump($jump)
     {
@@ -670,7 +612,6 @@ public function setJump($jump)
      * Whether to show first page in pagination or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowFirst()
     {
@@ -681,7 +622,6 @@ public function canShowFirst()
      * Whether to show last page in pagination or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowLast()
     {
@@ -692,7 +632,6 @@ public function canShowLast()
      * Whether to show link to Previous Jump
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowPreviousJump()
     {
@@ -703,7 +642,6 @@ public function canShowPreviousJump()
      * Whether to show link to Next Jump
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowNextJump()
     {
@@ -714,7 +652,6 @@ public function canShowNextJump()
      * Initialize frame data, such as frame start, frame start etc.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFrame()
     {
@@ -755,7 +692,6 @@ protected function _initFrame()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     protected function _setFrameInitialized($flag)
     {
@@ -767,7 +703,6 @@ protected function _setFrameInitialized($flag)
      * Check if frame data was initialized
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isFrameInitialized()
     {
@@ -778,7 +713,6 @@ public function isFrameInitialized()
      * Getter for alternative text for Previous link in pagination frame
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAnchorTextForPrevious()
     {
@@ -792,7 +726,6 @@ public function getAnchorTextForPrevious()
      * Getter for alternative text for Next link in pagination frame
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAnchorTextForNext()
     {
@@ -807,7 +740,6 @@ public function getAnchorTextForNext()
      *
      * @param bool $isRequired
      * @return $this
-     * @since 2.0.0
      */
     public function setIsOutputRequired($isRequired)
     {
@@ -819,7 +751,6 @@ public function setIsOutputRequired($isRequired)
      * Determine whether the pagination should be eventually rendered
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -833,7 +764,6 @@ protected function _toHtml()
      * Get the URL fragment
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFragment()
     {
@@ -845,7 +775,6 @@ public function getFragment()
      *
      * @param string|null $fragment
      * @return $this
-     * @since 2.0.0
      */
     public function setFragment($fragment)
     {
diff --git a/app/code/Magento/Theme/Block/Html/Title.php b/app/code/Magento/Theme/Block/Html/Title.php
index fb833ddaa40f4..34cf36c8b7b2d 100644
--- a/app/code/Magento/Theme/Block/Html/Title.php
+++ b/app/code/Magento/Theme/Block/Html/Title.php
@@ -15,7 +15,6 @@
  * @method string getTitleId()
  * @method string getTitleClass()
  * @api
- * @since 2.0.0
  */
 class Title extends Template
 {
@@ -23,7 +22,6 @@ class Title extends Template
      * Own page title to display on the page
      *
      * @var string
-     * @since 2.0.0
      */
     protected $pageTitle;
 
@@ -31,7 +29,6 @@ class Title extends Template
      * Provide own page title or pick it from Head Block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageTitle()
     {
@@ -45,7 +42,6 @@ public function getPageTitle()
      * Provide own page content heading
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageHeading()
     {
@@ -60,7 +56,6 @@ public function getPageHeading()
      *
      * @param string $pageTitle
      * @return void
-     * @since 2.0.0
      */
     public function setPageTitle($pageTitle)
     {
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index bdaf7b818b5d0..2a0588e075c6e 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -15,7 +15,6 @@
  * Html page top menu block
  *
  * @api
- * @since 2.0.0
  */
 class Topmenu extends Template implements IdentityInterface
 {
@@ -23,7 +22,6 @@ class Topmenu extends Template implements IdentityInterface
      * Cache identities
      *
      * @var array
-     * @since 2.0.0
      */
     protected $identities = [];
 
@@ -31,7 +29,6 @@ class Topmenu extends Template implements IdentityInterface
      * Top menu data tree
      *
      * @var \Magento\Framework\Data\Tree\Node
-     * @since 2.0.0
      */
     protected $_menu;
 
@@ -52,7 +49,6 @@ class Topmenu extends Template implements IdentityInterface
      * @param NodeFactory $nodeFactory
      * @param TreeFactory $treeFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -83,7 +79,6 @@ protected function getCacheLifetime()
      * @param string $childrenWrapClass
      * @param int $limit
      * @return string
-     * @since 2.0.0
      */
     public function getHtml($outermostClass = '', $childrenWrapClass = '', $limit = 0)
     {
@@ -111,7 +106,6 @@ public function getHtml($outermostClass = '', $childrenWrapClass = '', $limit =
      *
      * @param \Magento\Backend\Model\Menu $items
      * @return int
-     * @since 2.0.0
      */
     protected function _countItems($items)
     {
@@ -133,7 +127,6 @@ protected function _countItems($items)
      * @return array|void
      *
      * @todo: Add Depth Level limit, and better logic for columns
-     * @since 2.0.0
      */
     protected function _columnBrake($items, $limit)
     {
@@ -177,7 +170,6 @@ protected function _columnBrake($items, $limit)
      * @param string $childrenWrapClass
      * @param int $limit
      * @return string HTML code
-     * @since 2.0.0
      */
     protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit)
     {
@@ -209,7 +201,6 @@ protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getHtml(
         \Magento\Framework\Data\Tree\Node $menuTree,
@@ -273,7 +264,6 @@ protected function _getHtml(
      *
      * @param \Magento\Framework\Data\Tree\Node $item
      * @return string
-     * @since 2.0.0
      */
     protected function _getRenderedMenuItemAttributes(\Magento\Framework\Data\Tree\Node $item)
     {
@@ -290,7 +280,6 @@ protected function _getRenderedMenuItemAttributes(\Magento\Framework\Data\Tree\N
      *
      * @param \Magento\Framework\Data\Tree\Node $item
      * @return array
-     * @since 2.0.0
      */
     protected function _getMenuItemAttributes(\Magento\Framework\Data\Tree\Node $item)
     {
@@ -303,7 +292,6 @@ protected function _getMenuItemAttributes(\Magento\Framework\Data\Tree\Node $ite
      *
      * @param \Magento\Framework\Data\Tree\Node $item
      * @return array
-     * @since 2.0.0
      */
     protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
     {
@@ -342,7 +330,6 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
      *
      * @param array $identity
      * @return void
-     * @since 2.0.0
      */
     public function addIdentity($identity)
     {
@@ -355,7 +342,6 @@ public function addIdentity($identity)
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Welcome.php b/app/code/Magento/Theme/Block/Html/Welcome.php
index 3e6b0ae8ca9ac..4ab230e31db82 100644
--- a/app/code/Magento/Theme/Block/Html/Welcome.php
+++ b/app/code/Magento/Theme/Block/Html/Welcome.php
@@ -11,7 +11,6 @@
  * Html page welcome block
  *
  * @api
- * @since 2.0.0
  */
 class Welcome extends Template
 {
@@ -19,7 +18,6 @@ class Welcome extends Template
      * Get block message
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
index 92d94f98dc753..f3f1cc301eb3e 100644
--- a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
+++ b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
@@ -29,7 +29,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @since 2.0.0
  */
 class ThemeUninstallCommand extends Command
 {
@@ -44,7 +43,6 @@ class ThemeUninstallCommand extends Command
      * Maintenance Mode
      *
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -52,7 +50,6 @@ class ThemeUninstallCommand extends Command
      * Composer general dependency checker
      *
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $dependencyChecker;
 
@@ -60,7 +57,6 @@ class ThemeUninstallCommand extends Command
      * Root composer.json information
      *
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composer;
 
@@ -68,7 +64,6 @@ class ThemeUninstallCommand extends Command
      * Theme collection in filesystem
      *
      * @var Collection
-     * @since 2.0.0
      */
     private $themeCollection;
 
@@ -76,7 +71,6 @@ class ThemeUninstallCommand extends Command
      * System cache model
      *
      * @var Cache
-     * @since 2.0.0
      */
     private $cache;
 
@@ -84,7 +78,6 @@ class ThemeUninstallCommand extends Command
      * Cleaning up application state service
      *
      * @var CleanupFiles
-     * @since 2.0.0
      */
     private $cleanupFiles;
 
@@ -92,7 +85,6 @@ class ThemeUninstallCommand extends Command
      * BackupRollback factory
      *
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -100,7 +92,6 @@ class ThemeUninstallCommand extends Command
      * Theme Validator
      *
      * @var ThemeValidator
-     * @since 2.0.0
      */
     private $themeValidator;
 
@@ -108,7 +99,6 @@ class ThemeUninstallCommand extends Command
      * Package name finder
      *
      * @var ThemePackageInfo
-     * @since 2.0.0
      */
     private $themePackageInfo;
 
@@ -116,7 +106,6 @@ class ThemeUninstallCommand extends Command
      * Theme Uninstaller
      *
      * @var ThemeUninstaller
-     * @since 2.0.0
      */
     private $themeUninstaller;
 
@@ -124,7 +113,6 @@ class ThemeUninstallCommand extends Command
      * Theme Dependency Checker
      *
      * @var ThemeDependencyChecker
-     * @since 2.0.0
      */
     private $themeDependencyChecker;
 
@@ -142,7 +130,6 @@ class ThemeUninstallCommand extends Command
      * @param ThemePackageInfo $themePackageInfo
      * @param ThemeUninstaller $themeUninstaller
      * @param ThemeDependencyChecker $themeDependencyChecker
-     * @since 2.0.0
      */
     public function __construct(
         Cache $cache,
@@ -173,7 +160,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -202,7 +188,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -257,7 +242,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      *
      * @param string[] $themePaths
      * @return string[]
-     * @since 2.0.0
      */
     private function validate($themePaths)
     {
@@ -350,7 +334,6 @@ protected function getUnknownThemes($themePaths)
      *
      * @param string[] $themePaths
      * @return string[]
-     * @since 2.0.0
      */
     private function checkDependencies($themePaths)
     {
@@ -378,7 +361,6 @@ private function checkDependencies($themePaths)
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     private function cleanup(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
index 1f39fa5bd034d..25964a1e65ea3 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Theme
  *
- * @since 2.0.0
  */
 abstract class Theme extends \Magento\Backend\App\Action
 {
@@ -27,25 +26,21 @@ abstract class Theme extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_appFileSystem;
 
@@ -55,7 +50,6 @@ abstract class Theme extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Filesystem $appFileSystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
index 3535a59a1f2bb..6595a60ead014 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
@@ -11,7 +11,6 @@
 /**
  * Class Delete
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -19,7 +18,6 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Delete action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
index fac669ab7df31..aa538c6564f11 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
@@ -12,7 +12,6 @@
 /**
  * Class DownloadCss
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class DownloadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -20,7 +19,6 @@ class DownloadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Them
      * Download css file
      *
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
index 9f57820784f45..45aa74a8f0db3 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
@@ -12,7 +12,6 @@
 /**
  * Class DownloadCustomCss
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class DownloadCustomCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -20,7 +19,6 @@ class DownloadCustomCss extends \Magento\Theme\Controller\Adminhtml\System\Desig
      * Download custom css file
      *
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
index 135b7a8a965b0..f77493ed4dbfe 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class Edit
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Edit extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Edit theme
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php
index a5bc5364dbacc..85ceaa3bafbe3 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php
@@ -9,7 +9,6 @@
 /**
  * Class Grid
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Grid extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -17,7 +16,6 @@ class Grid extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Grid ajax action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
index 044cd993b3a35..a400a3af9825c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class Index
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Index action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php
index 400be9b5c29fb..f64f5ff952062 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class NewAction
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class NewAction extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Create new theme
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
index 36bb8eeaac462..33ef87a64fd3d 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class Save
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Save extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -18,7 +17,6 @@ class Save extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
index e9d5cf344234f..9a857de366f93 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
@@ -9,7 +9,6 @@
 /**
  * Class UploadCss
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class UploadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -17,7 +16,6 @@ class UploadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      * Upload css file
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
index 6209db8fd784b..fd297bbb24047 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
@@ -9,7 +9,6 @@
 /**
  * Class UploadJs
  * @depecated
- * @since 2.0.0
  */
 class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
@@ -18,7 +17,6 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
index e365d212d23b5..2e16363068f53 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
  *
- * @since 2.0.0
  */
 abstract class Files extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     protected $storage;
 
@@ -32,7 +29,6 @@ abstract class Files extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Theme\Helper\Storage $storage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Get storage
      *
      * @return \Magento\Theme\Model\Wysiwyg\Storage
-     * @since 2.0.0
      */
     protected function _getStorage()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php
index f801eac26be81..453b87d2886f5 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\Contents
  *
- * @since 2.0.0
  */
 class Contents extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class Contents extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
      * Contents action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php
index e4972b4fd1636..ac7f3445664d0 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\DeleteFiles
  *
- * @since 2.0.0
  */
 class DeleteFiles extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -18,7 +17,6 @@ class DeleteFiles extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysi
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php
index ded44cc067a7b..9e0aae9ea6bfa 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\DeleteFolder
  *
- * @since 2.0.0
  */
 class DeleteFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class DeleteFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys
      * Delete folder action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php
index 39ebdd1f0a06f..d247c3d2540a8 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Fi
      * Index action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
index 6d0256e604912..31bf9fd27cd8f 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\NewFolder
  *
- * @since 2.0.0
  */
 class NewFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class NewFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwy
      * New folder action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
index 40117e6ebd72d..55d68a01913bd 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\OnInsert
  *
- * @since 2.0.0
  */
 class OnInsert extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class OnInsert extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
      * Fire when select image
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
index 6c1ac39cce24a..d77167422f343 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\PreviewImage
  *
- * @since 2.0.0
  */
 class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -20,7 +19,6 @@ class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys
      * Preview image action
      *
      * @return ResponseInterface|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
index e1c7055558ee3..009c325199359 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\TreeJson
  *
- * @since 2.0.0
  */
 class TreeJson extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class TreeJson extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
      * Tree json action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php
index a1593ac002ef5..8573a72e797e6 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files\Upload
  *
- * @since 2.0.0
  */
 class Upload extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
@@ -17,7 +16,6 @@ class Upload extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\F
      * Files upload action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
index 96b6eb7ae86ac..4210dcd4cf71e 100644
--- a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
@@ -11,7 +11,7 @@
 
 /**
  * Plugin for putting messages to cookies
- * @since 2.1.0
+ * @since 2.0.8
  */
 class MessagePlugin
 {
@@ -22,25 +22,25 @@ class MessagePlugin
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private $cookieManager;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private $messageManager;
 
     /**
      * @var \Magento\Framework\View\Element\Message\InterpretationStrategyInterface
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private $interpretationStrategy;
 
@@ -56,7 +56,7 @@ class MessagePlugin
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.1.0
+     * @since 2.0.8
      */
     public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -82,7 +82,7 @@ public function __construct(
      * @param ResultInterface $subject
      * @param ResultInterface $result
      * @return ResultInterface
-     * @since 2.1.0
+     * @since 2.0.8
      */
     public function afterRenderResult(
         ResultInterface $subject,
@@ -138,7 +138,7 @@ private function setCookie(array $messages)
      * Return messages array and clean message manager messages
      *
      * @return array
-     * @since 2.1.0
+     * @since 2.0.8
      */
     protected function getMessages()
     {
@@ -157,7 +157,7 @@ protected function getMessages()
      * Return messages stored in cookies
      *
      * @return array
-     * @since 2.1.0
+     * @since 2.0.8
      */
     protected function getCookiesMessages()
     {
diff --git a/app/code/Magento/Theme/CustomerData/Messages.php b/app/code/Magento/Theme/CustomerData/Messages.php
index eff8f20e84a3f..adb3f7df27395 100644
--- a/app/code/Magento/Theme/CustomerData/Messages.php
+++ b/app/code/Magento/Theme/CustomerData/Messages.php
@@ -13,7 +13,6 @@
 
 /**
  * Messages section
- * @since 2.0.0
  */
 class Messages implements SectionSourceInterface
 {
@@ -21,13 +20,11 @@ class Messages implements SectionSourceInterface
      * Manager messages
      *
      * @var MessageManager
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var InterpretationStrategyInterface
-     * @since 2.0.0
      */
     private $interpretationStrategy;
 
@@ -36,7 +33,6 @@ class Messages implements SectionSourceInterface
      *
      * @param MessageManager $messageManager
      * @param InterpretationStrategyInterface $interpretationStrategy
-     * @since 2.0.0
      */
     public function __construct(
         MessageManager $messageManager,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getSectionData()
     {
diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
index 0fc3bb52d78a6..1f57cdf88880c 100644
--- a/app/code/Magento/Theme/Helper/Storage.php
+++ b/app/code/Magento/Theme/Helper/Storage.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Storage extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -56,7 +55,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * Current directory path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentPath;
 
@@ -64,7 +62,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * Current storage root path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_storageRoot;
 
@@ -72,25 +69,21 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * Magento filesystem
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\FlyweightFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $mediaDirectoryWrite;
 
@@ -99,7 +92,6 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -120,7 +112,6 @@ public function __construct(
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function convertPathToId($path)
     {
@@ -133,7 +124,6 @@ public function convertPathToId($path)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function convertIdToPath($value)
     {
@@ -150,7 +140,6 @@ public function convertIdToPath($value)
      * @param string $filename
      * @param int $maxLength
      * @return string
-     * @since 2.0.0
      */
     public function getShortFilename($filename, $maxLength = 20)
     {
@@ -161,7 +150,6 @@ public function getShortFilename($filename, $maxLength = 20)
      * Get storage root directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStorageRoot()
     {
@@ -179,7 +167,6 @@ public function getStorageRoot()
      *
      * @return \Magento\Theme\Model\Theme
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getTheme()
     {
@@ -196,7 +183,6 @@ protected function _getTheme()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getStorageType()
     {
@@ -215,7 +201,6 @@ public function getStorageType()
      * Relative url to static content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRelativeUrl()
     {
@@ -234,7 +219,6 @@ public function getRelativeUrl()
      * Get current path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentPath()
     {
@@ -258,7 +242,6 @@ public function getCurrentPath()
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getThumbnailDirectory($path)
     {
@@ -271,7 +254,6 @@ public function getThumbnailDirectory($path)
      * @param string $imageName
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getThumbnailPath($imageName)
     {
@@ -286,7 +268,6 @@ public function getThumbnailPath($imageName)
      * Request params for selected theme
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRequestParams()
     {
@@ -305,7 +286,6 @@ public function getRequestParams()
      *
      * @return string[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAllowedExtensionsByType()
     {
@@ -319,7 +299,6 @@ public function getAllowedExtensionsByType()
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getStorageTypeName()
     {
@@ -332,7 +311,6 @@ public function getStorageTypeName()
      * Get session model
      *
      * @return \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     public function getSession()
     {
diff --git a/app/code/Magento/Theme/Helper/Theme.php b/app/code/Magento/Theme/Helper/Theme.php
index de41d3c159693..7300a809590ea 100644
--- a/app/code/Magento/Theme/Helper/Theme.php
+++ b/app/code/Magento/Theme/Helper/Theme.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Helper\Theme
  *
- * @since 2.0.0
  */
 class Theme extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -20,13 +19,11 @@ class Theme extends \Magento\Framework\App\Helper\AbstractHelper
      * Layout merge factory
      *
      * @var \Magento\Framework\View\Layout\ProcessorFactory
-     * @since 2.0.0
      */
     protected $_layoutProcessorFactory;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -34,7 +31,6 @@ class Theme extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return \Magento\Framework\View\Asset\LocalInterface[]
-     * @since 2.0.0
      */
     public function getCssAssets($theme)
     {
diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php
index f2b0e6fd0ff84..03b819122878b 100644
--- a/app/code/Magento/Theme/Model/Config.php
+++ b/app/code/Magento/Theme/Model/Config.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Theme\Model\Config
  *
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\App\Config\Storage\WriterInterface
-     * @since 2.0.0
      */
     protected $_configWriter;
 
     /**
      * @var \Magento\Framework\App\Config\ValueInterface
-     * @since 2.0.0
      */
     protected $_configData;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -40,19 +36,16 @@ class Config
      * Application event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_configCache;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_layoutCache;
 
@@ -63,7 +56,6 @@ class Config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Cache\FrontendInterface $configCache
      * @param \Magento\Framework\Cache\FrontendInterface $layoutCache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ValueInterface $configData,
@@ -88,7 +80,6 @@ public function __construct(
      * @param array $stores
      * @param string $scope
      * @return $this
-     * @since 2.0.0
      */
     public function assignToStore(
         $theme,
@@ -124,7 +115,6 @@ public function assignToStore(
      * @param string $scope
      * @param string $configPath
      * @return \Magento\Config\Model\ResourceModel\Config\Data\Collection
-     * @since 2.0.0
      */
     protected function _getAssignedScopesCollection($scope, $configPath)
     {
@@ -145,7 +135,6 @@ protected function _getAssignedScopesCollection($scope, $configPath)
      * @param string $scope
      * @param bool &$isReassigned
      * @return $this
-     * @since 2.0.0
      */
     protected function _unassignThemeFromStores($themeId, $stores, $scope, &$isReassigned)
     {
@@ -167,7 +156,6 @@ protected function _unassignThemeFromStores($themeId, $stores, $scope, &$isReass
      * @param string $scope
      * @param bool &$isReassigned
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignThemeToStores($themeId, $stores, $scope, &$isReassigned)
     {
@@ -187,7 +175,6 @@ protected function _assignThemeToStores($themeId, $stores, $scope, &$isReassigne
      * @param string $themeId
      * @param bool &$isReassigned
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignThemeToDefaultScope($themeId, &$isReassigned)
     {
diff --git a/app/code/Magento/Theme/Model/Config/Customization.php b/app/code/Magento/Theme/Model/Config/Customization.php
index eeda79540be48..6a6872d794b1b 100644
--- a/app/code/Magento/Theme/Model/Config/Customization.php
+++ b/app/code/Magento/Theme/Model/Config/Customization.php
@@ -7,25 +7,21 @@
 
 /**
  * Theme customization config model
- * @since 2.0.0
  */
 class Customization
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ThemeProviderInterface
-     * @since 2.0.0
      */
     protected $themeProvider;
 
@@ -34,7 +30,6 @@ class Customization
      *
      * @var array
      * @see self::_prepareThemeCustomizations()
-     * @since 2.0.0
      */
     protected $_assignedTheme;
 
@@ -43,7 +38,6 @@ class Customization
      *
      * @var array
      * @see self::_prepareThemeCustomizations()
-     * @since 2.0.0
      */
     protected $_unassignedTheme;
 
@@ -51,7 +45,6 @@ class Customization
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -68,7 +61,6 @@ public function __construct(
      *
      * @see self::_prepareThemeCustomizations()
      * @return array
-     * @since 2.0.0
      */
     public function getAssignedThemeCustomizations()
     {
@@ -83,7 +75,6 @@ public function getAssignedThemeCustomizations()
      *
      * @see self::_prepareThemeCustomizations()
      * @return array
-     * @since 2.0.0
      */
     public function getUnassignedThemeCustomizations()
     {
@@ -97,7 +88,6 @@ public function getUnassignedThemeCustomizations()
      * Return stores grouped by assigned themes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoresByThemes()
     {
@@ -120,7 +110,6 @@ public function getStoresByThemes()
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param null|\Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     public function isThemeAssignedToStore($theme, $store = null)
     {
@@ -135,7 +124,6 @@ public function isThemeAssignedToStore($theme, $store = null)
      * Check if there are any themes assigned
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasThemeAssigned()
     {
@@ -148,7 +136,6 @@ public function hasThemeAssigned()
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param \Magento\Store\Model\Store $store
      * @return bool
-     * @since 2.0.0
      */
     protected function _isThemeAssignedToSpecificStore($theme, $store)
     {
@@ -160,7 +147,6 @@ protected function _isThemeAssignedToSpecificStore($theme, $store)
      *
      * @param \Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     protected function _getConfigurationThemeId($store)
     {
@@ -178,7 +164,6 @@ protected function _getConfigurationThemeId($store)
      * It can be set to website or as default theme and be used by store-view via config fallback mechanism.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareThemeCustomizations()
     {
diff --git a/app/code/Magento/Theme/Model/CopyService.php b/app/code/Magento/Theme/Model/CopyService.php
index 3320461c56777..1bcff1aefdb7e 100644
--- a/app/code/Magento/Theme/Model/CopyService.php
+++ b/app/code/Magento/Theme/Model/CopyService.php
@@ -15,43 +15,36 @@
 /**
  * Class \Magento\Theme\Model\CopyService
  *
- * @since 2.0.0
  */
 class CopyService
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
     /**
      * @var \Magento\Widget\Model\Layout\Link
-     * @since 2.0.0
      */
     protected $_link;
 
     /**
      * @var \Magento\Widget\Model\Layout\UpdateFactory
-     * @since 2.0.0
      */
     protected $_updateFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\Customization\Path
-     * @since 2.0.0
      */
     protected $_customizationPath;
 
@@ -62,7 +55,6 @@ class CopyService
      * @param \Magento\Widget\Model\Layout\UpdateFactory $updateFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\View\Design\Theme\Customization\Path $customization
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -86,7 +78,6 @@ public function __construct(
      * @param ThemeInterface $source
      * @param ThemeInterface $target
      * @return void
-     * @since 2.0.0
      */
     public function copy(ThemeInterface $source, ThemeInterface $target)
     {
@@ -101,7 +92,6 @@ public function copy(ThemeInterface $source, ThemeInterface $target)
      * @param ThemeInterface $source
      * @param ThemeInterface $target
      * @return void
-     * @since 2.0.0
      */
     protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInterface $target)
     {
@@ -132,7 +122,6 @@ protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInter
      * @param ThemeInterface $source
      * @param ThemeInterface $target
      * @return void
-     * @since 2.0.0
      */
     protected function _copyLayoutCustomization(ThemeInterface $source, ThemeInterface $target)
     {
@@ -167,7 +156,6 @@ protected function _copyLayoutCustomization(ThemeInterface $source, ThemeInterfa
      * @param ThemeInterface $source
      * @param ThemeInterface $target
      * @return void
-     * @since 2.0.0
      */
     protected function _copyFilesystemCustomization(ThemeInterface $source, ThemeInterface $target)
     {
@@ -192,7 +180,6 @@ protected function _copyFilesystemCustomization(ThemeInterface $source, ThemeInt
      * @param string $sourceDir
      * @param string $targetDir
      * @return void
-     * @since 2.0.0
      */
     protected function _copyFilesRecursively($baseDir, $sourceDir, $targetDir)
     {
@@ -211,7 +198,6 @@ protected function _copyFilesRecursively($baseDir, $sourceDir, $targetDir)
      *
      * @param string $targetDir
      * @return void
-     * @since 2.0.0
      */
     protected function _deleteFilesRecursively($targetDir)
     {
diff --git a/app/code/Magento/Theme/Model/Design.php b/app/code/Magento/Theme/Model/Design.php
index 5931e69efaa5f..d69c3793ecfe7 100644
--- a/app/code/Magento/Theme/Model/Design.php
+++ b/app/code/Magento/Theme/Model/Design.php
@@ -23,7 +23,6 @@
  * @method \Magento\Theme\Model\Design setDateFrom(string $value)
  * @method string getDateTo()
  * @method \Magento\Theme\Model\Design setDateTo(string $value)
- * @since 2.0.0
  */
 class Design extends AbstractModel implements IdentityInterface, DesignInterface
 {
@@ -36,7 +35,6 @@ class Design extends AbstractModel implements IdentityInterface, DesignInterface
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'core_design';
 
@@ -46,19 +44,16 @@ class Design extends AbstractModel implements IdentityInterface, DesignInterface
      * When you use true - all cache will be clean
      *
      * @var string|bool
-     * @since 2.0.0
      */
     protected $_cacheTag = self::CACHE_TAG;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
@@ -77,7 +72,6 @@ class Design extends AbstractModel implements IdentityInterface, DesignInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -99,7 +93,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -112,7 +105,6 @@ protected function _construct()
      * @param string $storeId
      * @param string|null $date
      * @return $this
-     * @since 2.0.0
      */
     public function loadChange($storeId, $date = null)
     {
@@ -144,7 +136,6 @@ public function loadChange($storeId, $date = null)
      *
      * @param \Magento\Framework\View\DesignInterface $packageInto
      * @return $this
-     * @since 2.0.0
      */
     public function changeDesign(\Magento\Framework\View\DesignInterface $packageInto)
     {
@@ -159,7 +150,6 @@ public function changeDesign(\Magento\Framework\View\DesignInterface $packageInt
      * Get identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php b/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
index 46e7995107f7c..72428340540bd 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Theme\Model\Design\Backend\Exceptions
  *
- * @since 2.0.0
  */
 class Exceptions extends ArraySerialized
 {
@@ -19,7 +18,6 @@ class Exceptions extends ArraySerialized
      * Design package instance
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design = null;
 
@@ -35,7 +33,6 @@ class Exceptions extends ArraySerialized
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -67,7 +64,6 @@ public function __construct(
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * if there is no field value, search value is empty or regular expression is not valid
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -109,7 +105,6 @@ public function beforeSave()
      * @param string $search
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException on invalid regular expression
-     * @since 2.0.0
      */
     protected function _composeRegexp($search)
     {
@@ -131,7 +126,6 @@ protected function _composeRegexp($search)
      *
      * @param string $search
      * @return bool
-     * @since 2.0.0
      */
     protected function _isRegexp($search)
     {
diff --git a/app/code/Magento/Theme/Model/Design/Backend/Theme.php b/app/code/Magento/Theme/Model/Design/Backend/Theme.php
index b80474ccb00e2..3f21e00affb49 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Theme.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Theme.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Theme\Model\Design\Backend\Theme
  *
- * @since 2.0.0
  */
 class Theme extends Value
 {
@@ -18,7 +17,6 @@ class Theme extends Value
      * Design package instance
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design = null;
 
@@ -40,7 +38,6 @@ class Theme extends Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -60,7 +57,6 @@ public function __construct(
      * Validate specified value against frontend area
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -106,7 +102,6 @@ public function getValue()
      * {@inheritdoc}. In addition, it sets status 'invalidate' for blocks and other output caches
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Theme/Model/Design/Config/DataProvider.php b/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
index b268f869fd196..ccbf71d37fa2c 100644
--- a/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
+++ b/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
@@ -46,19 +46,19 @@ class DataProvider extends AbstractDataProvider
 
     /**
      * @var SettingChecker
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $settingChecker;
 
     /**
      * @var RequestInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $request;
 
     /**
      * @var ScopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeCodeResolver;
 
@@ -114,7 +114,7 @@ public function getData()
 
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getMeta()
     {
@@ -200,9 +200,9 @@ private function getSearchEngineRobotsMetadata($scope, array $fields = [])
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return ScopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getScopeCodeResolver()
     {
@@ -213,9 +213,9 @@ private function getScopeCodeResolver()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return SettingChecker
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getSettingChecker()
     {
@@ -226,9 +226,9 @@ private function getSettingChecker()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return RequestInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getRequest()
     {
diff --git a/app/code/Magento/Theme/Model/Favicon/Favicon.php b/app/code/Magento/Theme/Model/Favicon/Favicon.php
index 2254fc2eb34e3..e1b9703c9d9cc 100644
--- a/app/code/Magento/Theme/Model/Favicon/Favicon.php
+++ b/app/code/Magento/Theme/Model/Favicon/Favicon.php
@@ -9,37 +9,31 @@
 
 /**
  * Favicon implementation
- * @since 2.0.0
  */
 class Favicon implements \Magento\Framework\View\Page\FaviconInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $faviconFile;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
-     * @since 2.0.0
      */
     protected $fileStorageDatabase;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
@@ -48,7 +42,6 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDatabase
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -64,7 +57,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFaviconFile()
     {
@@ -76,7 +68,6 @@ public function getFaviconFile()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultFavicon()
     {
@@ -85,7 +76,6 @@ public function getDefaultFavicon()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function prepareFaviconFile()
     {
@@ -110,7 +100,6 @@ protected function prepareFaviconFile()
      *
      * @param string $filename relative file path
      * @return bool
-     * @since 2.0.0
      */
     protected function checkIsFile($filename)
     {
diff --git a/app/code/Magento/Theme/Model/Layout/Config.php b/app/code/Magento/Theme/Model/Layout/Config.php
index 087542c405493..8d5b9ca469994 100644
--- a/app/code/Magento/Theme/Model/Layout/Config.php
+++ b/app/code/Magento/Theme/Model/Layout/Config.php
@@ -7,7 +7,6 @@
 
 /**
  * Page layout config model
- * @since 2.0.0
  */
 class Config
 {
@@ -15,13 +14,11 @@ class Config
      * Available page layouts
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_pageLayouts;
 
     /**
      * @var \Magento\Framework\Config\DataInterface
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
@@ -29,7 +26,6 @@ class Config
      * Constructor
      *
      * @param \Magento\Framework\Config\DataInterface $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\DataInterface $dataStorage)
     {
@@ -40,7 +36,6 @@ public function __construct(\Magento\Framework\Config\DataInterface $dataStorage
      * Initialize page layouts list
      *
      * @return \Magento\Theme\Model\Layout\Config
-     * @since 2.0.0
      */
     protected function _initPageLayouts()
     {
@@ -58,7 +53,6 @@ protected function _initPageLayouts()
      * Retrieve available page layouts
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getPageLayouts()
     {
@@ -71,7 +65,6 @@ public function getPageLayouts()
      *
      * @param string $layoutCode
      * @return \Magento\Framework\DataObject|boolean
-     * @since 2.0.0
      */
     public function getPageLayout($layoutCode)
     {
@@ -88,7 +81,6 @@ public function getPageLayout($layoutCode)
      * Retrieve page layout handles
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPageLayoutHandles()
     {
diff --git a/app/code/Magento/Theme/Model/Layout/Config/Converter.php b/app/code/Magento/Theme/Model/Layout/Config/Converter.php
index 627b2f67792db..4fbdd50fc0cbc 100644
--- a/app/code/Magento/Theme/Model/Layout/Config/Converter.php
+++ b/app/code/Magento/Theme/Model/Layout/Config/Converter.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Theme\Model\Layout\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/app/code/Magento/Theme/Model/Layout/Config/Reader.php b/app/code/Magento/Theme/Model/Layout/Config/Reader.php
index c7fbb3fc35d88..3af91703ddf0d 100644
--- a/app/code/Magento/Theme/Model/Layout/Config/Reader.php
+++ b/app/code/Magento/Theme/Model/Layout/Config/Reader.php
@@ -7,7 +7,6 @@
 
 /**
  * Page layout config reader
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -15,7 +14,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/page_layouts/layout' => 'id'];
 }
diff --git a/app/code/Magento/Theme/Model/Layout/Config/SchemaLocator.php b/app/code/Magento/Theme/Model/Layout/Config/SchemaLocator.php
index 4b66bed54fe1a..81658cf3c4563 100644
--- a/app/code/Magento/Theme/Model/Layout/Config/SchemaLocator.php
+++ b/app/code/Magento/Theme/Model/Layout/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Layout\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,13 +19,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
     /**
      * @param UrnResolver $urnResolver
-     * @since 2.0.0
      */
     public function __construct(UrnResolver $urnResolver)
     {
@@ -37,7 +34,6 @@ public function __construct(UrnResolver $urnResolver)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -48,7 +44,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Theme/Model/Layout/Source/Layout.php b/app/code/Magento/Theme/Model/Layout/Source/Layout.php
index 64d1ac60ee81d..f0f630bda1b49 100644
--- a/app/code/Magento/Theme/Model/Layout/Source/Layout.php
+++ b/app/code/Magento/Theme/Model/Layout/Source/Layout.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Theme\Model\Layout\Source\Layout
  *
- * @since 2.0.0
  */
 class Layout implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Theme\Model\Layout\Config
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @param \Magento\Theme\Model\Layout\Config $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Theme\Model\Layout\Config $config)
     {
@@ -31,14 +28,12 @@ public function __construct(\Magento\Theme\Model\Layout\Config $config)
      * Page layout options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = null;
 
     /**
      * Default option
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultValue = null;
 
@@ -46,7 +41,6 @@ public function __construct(\Magento\Theme\Model\Layout\Config $config)
      * Retrieve page layout options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -68,7 +62,6 @@ public function getOptions()
      *
      * @param bool $withEmpty
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($withEmpty = false)
     {
@@ -88,7 +81,6 @@ public function toOptionArray($withEmpty = false)
     /**
      * Default options value getter
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 7f09e61fa5e70..98fa12ab987b6 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -9,25 +9,21 @@
 
 /**
  * Page layout config builder
- * @since 2.0.0
  */
 class Builder implements \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
 {
     /**
      * @var \Magento\Framework\View\PageLayout\ConfigFactory
-     * @since 2.0.0
      */
     protected $configFactory;
 
     /**
      * @var \Magento\Framework\View\PageLayout\File\Collector\Aggregated
-     * @since 2.0.0
      */
     protected $fileCollector;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
-     * @since 2.0.0
      */
     protected $themeCollection;
 
@@ -35,7 +31,6 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
      * @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
      * @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
      * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\PageLayout\ConfigFactory $configFactory,
@@ -50,7 +45,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\PageLayout\Config
-     * @since 2.0.0
      */
     public function getPageLayoutsConfig()
     {
@@ -59,7 +53,6 @@ public function getPageLayoutsConfig()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getConfigFiles()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design.php b/app/code/Magento/Theme/Model/ResourceModel/Design.php
index 62c7f34468b75..ef6f8aa705ec9 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design.php
@@ -10,13 +10,11 @@
 
 /**
  * Design Change Resource Model
- * @since 2.0.0
  */
 class Design extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -24,7 +22,6 @@ class Design extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param DateTime $dateTime
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Define main table and primary key
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -52,7 +48,6 @@ protected function _construct()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -112,7 +107,6 @@ public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _checkIntersection($storeId, $dateFrom, $dateTo, $currentId)
     {
@@ -183,7 +177,6 @@ protected function _checkIntersection($storeId, $dateFrom, $dateTo, $currentId)
      * @param int $storeId
      * @param string $date
      * @return array
-     * @since 2.0.0
      */
     public function loadChange($storeId, $date)
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Design/Collection.php
index b5848385c510f..5861d5a1b339d 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * Core Design resource collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -44,7 +41,6 @@ public function __construct(
      * Core Design resource collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      * Join store data to collection
      *
      * @return \Magento\Theme\Model\ResourceModel\Design\Collection
-     * @since 2.0.0
      */
     public function joinStore()
     {
@@ -67,7 +62,6 @@ public function joinStore()
      *
      * @param null|int|string|\DateTimeInterface $date
      * @return $this
-     * @since 2.0.0
      */
     public function addDateFilter($date = null)
     {
@@ -87,7 +81,6 @@ public function addDateFilter($date = null)
      *
      * @param int|array $storeId
      * @return \Magento\Theme\Model\ResourceModel\Design\Collection
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId)
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme.php b/app/code/Magento/Theme/Model/ResourceModel/Theme.php
index fbf3147285be7..9b3a13d7a4220 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme resource model
- * @since 2.0.0
  */
 class Theme extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Theme extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
index b9a6814408a40..f2f95d24a368b 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection implements
     \Magento\Framework\View\Design\Theme\Label\ListInterface,
@@ -22,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * Add title for parent themes
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addParentTitle()
     {
@@ -50,7 +47,6 @@ public function addParentTitle()
      *
      * @param string $area
      * @return $this
-     * @since 2.0.0
      */
     public function addAreaFilter($area = \Magento\Framework\App\Area::AREA_FRONTEND)
     {
@@ -64,7 +60,6 @@ public function addAreaFilter($area = \Magento\Framework\App\Area::AREA_FRONTEND
      * @param int $typeParent
      * @param int $typeChild
      * @return $this
-     * @since 2.0.0
      */
     public function addTypeRelationFilter($typeParent, $typeChild)
     {
@@ -87,7 +82,6 @@ public function addTypeRelationFilter($typeParent, $typeChild)
      *
      * @param string|array $type
      * @return $this
-     * @since 2.0.0
      */
     public function addTypeFilter($type)
     {
@@ -99,7 +93,6 @@ public function addTypeFilter($type)
      * Filter visible themes in backend (physical and virtual only)
      *
      * @return $this
-     * @since 2.0.0
      */
     public function filterVisibleThemes()
     {
@@ -116,7 +109,6 @@ public function filterVisibleThemes()
      * Return array for select field
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -127,7 +119,6 @@ public function toOptionArray()
      * Return array for grid column
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -139,7 +130,6 @@ public function toOptionHash()
      *
      * @param string $fullPath
      * @return \Magento\Theme\Model\Theme
-     * @since 2.0.0
      */
     public function getThemeByFullPath($fullPath)
     {
@@ -156,7 +146,6 @@ public function getThemeByFullPath($fullPath)
      *
      * @param int $size
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($size = self::DEFAULT_PAGE_SIZE)
     {
@@ -168,7 +157,6 @@ public function setPageSize($size = self::DEFAULT_PAGE_SIZE)
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $themeModel
      * @return $this
-     * @since 2.0.0
      */
     public function updateChildRelations(\Magento\Framework\View\Design\ThemeInterface $themeModel)
     {
@@ -189,7 +177,6 @@ public function updateChildRelations(\Magento\Framework\View\Design\ThemeInterfa
      * @param int $page
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function filterPhysicalThemes(
         $page = null,
@@ -212,7 +199,6 @@ public function filterPhysicalThemes(
      * @param string $area
      * @param int $type
      * @return $this
-     * @since 2.0.0
      */
     public function filterThemeCustomizations(
         $area = \Magento\Framework\App\Area::AREA_FRONTEND,
@@ -224,7 +210,6 @@ public function filterThemeCustomizations(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getLabels()
     {
@@ -234,7 +219,6 @@ public function getLabels()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function loadRegisteredThemes()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Customization/Update.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Customization/Update.php
index 8623b1295c9a3..5cb0fbb7a3728 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Customization/Update.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Customization/Update.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme customization link resource model
- * @since 2.0.0
  */
 class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Data/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Data/Collection.php
index 38cf291127691..5a365501382d6 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Data/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Data/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme data collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection implements
     \Magento\Framework\View\Design\Theme\Label\ListInterface,
@@ -15,7 +14,6 @@ class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection imp
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/File.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/File.php
index e0e716fabfb95..a2627fc895fac 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/File.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/File.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme files resource model
- * @since 2.0.0
  */
 class File extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class File extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/File/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/File/Collection.php
index 35a7172a02bd2..c414b7e928b05 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/File/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/File/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme files collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection implements
     \Magento\Framework\View\Design\Theme\File\CollectionInterface
@@ -16,7 +15,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Collection initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      * @param string $field
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -44,7 +41,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
      *
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultOrder($direction = self::SORT_ORDER_ASC)
     {
@@ -56,7 +52,6 @@ public function setDefaultOrder($direction = self::SORT_ORDER_ASC)
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return $this
-     * @since 2.0.0
      */
     public function addThemeFilter(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
index 0a4fb13fd5178..f708b3c7889f3 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme grid collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection
 {
@@ -15,7 +14,6 @@ class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection
      * Add area filter
      *
      * @return \Magento\Theme\Model\ResourceModel\Theme\Collection
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Theme/Model/Theme.php b/app/code/Magento/Theme/Model/Theme.php
index e907714fa9152..9e7a486fcf865 100644
--- a/app/code/Magento/Theme/Model/Theme.php
+++ b/app/code/Magento/Theme/Model/Theme.php
@@ -32,7 +32,6 @@
  * @method ThemeInterface setCode(string $code)
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInterface
 {
@@ -40,7 +39,6 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
      * {@inheritdoc}
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'theme';
 
@@ -48,43 +46,36 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
      * {@inheritdoc}
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'theme';
 
     /**
      * @var \Magento\Framework\View\Design\Theme\FlyweightFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\Domain\Factory
-     * @since 2.0.0
      */
     protected $_domainFactory;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ImageFactory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\Validator
-     * @since 2.0.0
      */
     protected $_validator;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\Customization
-     * @since 2.0.0
      */
     protected $_customization;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\CustomizationFactory
-     * @since 2.0.0
      */
     protected $_customFactory;
 
@@ -96,7 +87,6 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
 
     /**
      * @var ThemeInterface[]
-     * @since 2.0.0
      */
     protected $inheritanceSequence;
 
@@ -115,7 +105,6 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
      * @param array $data
      * @param ThemeFactory $themeModelFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -144,7 +133,6 @@ public function __construct(
      * Init resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -155,7 +143,6 @@ protected function _construct()
      * Get theme image model
      *
      * @return \Magento\Framework\View\Design\Theme\Image
-     * @since 2.0.0
      */
     public function getThemeImage()
     {
@@ -164,7 +151,6 @@ public function getThemeImage()
 
     /**
      * @return \Magento\Framework\View\Design\Theme\Customization
-     * @since 2.0.0
      */
     public function getCustomization()
     {
@@ -178,7 +164,6 @@ public function getCustomization()
      * Check if theme is deletable
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDeletable()
     {
@@ -189,7 +174,6 @@ public function isDeletable()
      * Check if theme is editable
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEditable()
     {
@@ -200,7 +184,6 @@ public function isEditable()
      * Check if theme is virtual
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVirtual()
     {
@@ -211,7 +194,6 @@ public function isVirtual()
      * Check if theme is physical
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPhysical()
     {
@@ -222,7 +204,6 @@ public function isPhysical()
      * Check theme is visible in backend
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isVisible()
     {
@@ -233,7 +214,6 @@ public function isVisible()
      * Check is theme has child virtual themes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildThemes()
     {
@@ -249,7 +229,6 @@ public function hasChildThemes()
      * Retrieve theme instance representing the latest changes to a theme
      *
      * @return Theme|null
-     * @since 2.0.0
      */
     public function getStagingVersion()
     {
@@ -267,7 +246,6 @@ public function getStagingVersion()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getParentTheme()
     {
@@ -285,7 +263,6 @@ public function getParentTheme()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -298,7 +275,6 @@ public function getArea()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getThemePath()
     {
@@ -312,7 +288,6 @@ public function getThemePath()
      * Used as id in file-system theme collection
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFullPath()
     {
@@ -321,7 +296,6 @@ public function getFullPath()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -334,7 +308,6 @@ public function getCode()
      * @param int|null $type
      * @return \Magento\Theme\Model\Theme\Domain\Virtual|\Magento\Theme\Model\Theme\Domain\Staging
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getDomainModel($type = null)
     {
@@ -357,7 +330,6 @@ public function getDomainModel($type = null)
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validate()
     {
@@ -372,7 +344,6 @@ protected function _validate()
      * Before theme save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -384,7 +355,6 @@ public function beforeSave()
      * Update all relations after deleting theme
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -400,7 +370,6 @@ public function afterDelete()
      * Return the full theme inheritance sequence, from the root theme till a specified one
      *
      * @return ThemeInterface[]
-     * @since 2.0.0
      */
     public function getInheritedThemes()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Collection.php b/app/code/Magento/Theme/Model/Theme/Collection.php
index a4c52e1b759b5..0dc0aadbaca08 100644
--- a/app/code/Magento/Theme/Model/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/Theme/Collection.php
@@ -9,7 +9,6 @@
  * Theme filesystem collection
  *
  * @deprecated 2.2.0 since 2.2.0 There is no need for the class provided themes list to be in Theme module
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\View\Design\Theme\ThemeList
 {
diff --git a/app/code/Magento/Theme/Model/Theme/Customization/Config.php b/app/code/Magento/Theme/Model/Theme/Customization/Config.php
index f93e2a592ae97..235a4fd96ecd5 100644
--- a/app/code/Magento/Theme/Model/Theme/Customization/Config.php
+++ b/app/code/Magento/Theme/Model/Theme/Customization/Config.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Theme\Customization\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\View\Design\Theme\Customization\ConfigInterface
 {
@@ -23,13 +22,11 @@ class Config implements \Magento\Framework\View\Design\Theme\Customization\Confi
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFileTypes()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Customization/File/CustomCss.php b/app/code/Magento/Theme/Model/Theme/Customization/File/CustomCss.php
index 8fef618db1842..6154aa29813a2 100644
--- a/app/code/Magento/Theme/Model/Theme/Customization/File/CustomCss.php
+++ b/app/code/Magento/Theme/Model/Theme/Customization/File/CustomCss.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Theme\Customization\File\CustomCss
  *
- * @since 2.0.0
  */
 class CustomCss extends \Magento\Framework\View\Design\Theme\Customization\AbstractFile
 {
@@ -37,7 +36,6 @@ class CustomCss extends \Magento\Framework\View\Design\Theme\Customization\Abstr
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -46,7 +44,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -55,7 +52,6 @@ public function getContentType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareFileName(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -66,7 +62,6 @@ protected function _prepareFileName(\Magento\Framework\View\Design\Theme\FileInt
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareSortOrder(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Data.php b/app/code/Magento/Theme/Model/Theme/Data.php
index 4f4c2e78e0383..336989f065354 100644
--- a/app/code/Magento/Theme/Model/Theme/Data.php
+++ b/app/code/Magento/Theme/Model/Theme/Data.php
@@ -9,13 +9,11 @@
  * Data model for themes
  *
  * @method \Magento\Framework\View\Design\ThemeInterface setArea(string $area)
- * @since 2.0.0
  */
 class Data extends \Magento\Theme\Model\Theme
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getArea()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Data/Collection.php b/app/code/Magento/Theme/Model/Theme/Data/Collection.php
index 2c1afc9b3e71f..a6fe447c13333 100644
--- a/app/code/Magento/Theme/Model/Theme/Data/Collection.php
+++ b/app/code/Magento/Theme/Model/Theme/Data/Collection.php
@@ -9,7 +9,6 @@
 
 /**
  * Theme filesystem data collection
- * @since 2.0.0
  */
 class Collection extends \Magento\Theme\Model\Theme\Collection implements ListInterface
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Theme\Model\Theme\Collection implements ListIn
      * Model of collection item
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_itemObjectClass = \Magento\Theme\Model\Theme\Data::class;
 }
diff --git a/app/code/Magento/Theme/Model/Theme/Domain/Physical.php b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
index 69c6ce3226e60..8950982d2805e 100644
--- a/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Theme\Domain\Physical
  *
- * @since 2.0.0
  */
 class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalInterface
 {
@@ -20,25 +19,21 @@ class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalIn
      * Physical theme model instance
      *
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $_theme;
 
     /**
      * @var \Magento\Theme\Model\ThemeFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
     /**
      * @var \Magento\Theme\Model\CopyService
-     * @since 2.0.0
      */
     protected $_themeCopyService;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
-     * @since 2.0.0
      */
     protected $_themeCollection;
 
@@ -47,7 +42,6 @@ class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalIn
      * @param \Magento\Theme\Model\ThemeFactory $themeFactory
      * @param \Magento\Theme\Model\CopyService $themeCopyService
      * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\ThemeInterface $theme,
@@ -66,7 +60,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function createVirtualTheme($theme)
     {
@@ -92,7 +85,6 @@ public function createVirtualTheme($theme)
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     protected function _getVirtualThemeTitle($theme)
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Domain/Staging.php b/app/code/Magento/Theme/Model/Theme/Domain/Staging.php
index d7728a9c2bd6b..e6212b1108f27 100644
--- a/app/code/Magento/Theme/Model/Theme/Domain/Staging.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Staging.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Theme\Domain\Staging
  *
- * @since 2.0.0
  */
 class Staging implements \Magento\Framework\View\Design\Theme\Domain\StagingInterface
 {
@@ -20,20 +19,17 @@ class Staging implements \Magento\Framework\View\Design\Theme\Domain\StagingInte
      * Staging theme model instance
      *
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $_theme;
 
     /**
      * @var \Magento\Theme\Model\CopyService
-     * @since 2.0.0
      */
     protected $_themeCopyService;
 
     /**
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param \Magento\Theme\Model\CopyService $themeCopyService
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\ThemeInterface $theme,
@@ -47,7 +43,6 @@ public function __construct(
      * Copy changes from 'staging' theme
      *
      * @return \Magento\Framework\View\Design\Theme\Domain\StagingInterface
-     * @since 2.0.0
      */
     public function updateFromStagingTheme()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
index c19fdf43fc776..72f88886644de 100644
--- a/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Theme\Model\Theme\Domain\Virtual
  *
- * @since 2.0.0
  */
 class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInterface
 {
@@ -20,13 +19,11 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
      * Virtual theme model instance
      *
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $_theme;
 
     /**
      * @var \Magento\Theme\Model\ThemeFactory $themeFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
@@ -34,13 +31,11 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
      * Staging theme model instance
      *
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $_stagingTheme;
 
     /**
      * @var \Magento\Theme\Model\CopyService
-     * @since 2.0.0
      */
     protected $_themeCopyService;
 
@@ -48,7 +43,6 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
      * Theme customization config
      *
      * @var \Magento\Theme\Model\Config\Customization
-     * @since 2.0.0
      */
     protected $_customizationConfig;
 
@@ -57,7 +51,6 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
      * @param \Magento\Theme\Model\ThemeFactory $themeFactory
      * @param \Magento\Theme\Model\CopyService $themeCopyService
      * @param \Magento\Theme\Model\Config\Customization $customizationConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\ThemeInterface $theme,
@@ -75,7 +68,6 @@ public function __construct(
      * Get 'staging' theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getStagingTheme()
     {
@@ -93,7 +85,6 @@ public function getStagingTheme()
      * Get 'physical' theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getPhysicalTheme()
     {
@@ -114,7 +105,6 @@ public function getPhysicalTheme()
      * Check if theme is assigned to ANY store
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAssigned()
     {
@@ -125,7 +115,6 @@ public function isAssigned()
      * Create 'staging' theme associated with current 'virtual' theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected function _createStagingTheme()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/File.php b/app/code/Magento/Theme/Model/Theme/File.php
index 141083201ca2f..4907924ba119c 100644
--- a/app/code/Magento/Theme/Model/Theme/File.php
+++ b/app/code/Magento/Theme/Model/Theme/File.php
@@ -11,7 +11,6 @@
 
 /**
  * Theme files model class
- * @since 2.0.0
  */
 class File extends AbstractModel implements FileInterface
 {
@@ -19,7 +18,6 @@ class File extends AbstractModel implements FileInterface
      * {@inheritdoc}
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'theme_file';
 
@@ -27,31 +25,26 @@ class File extends AbstractModel implements FileInterface
      * {@inheritdoc}
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'file';
 
     /**
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $_theme;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\Customization\FileServiceFactory
-     * @since 2.0.0
      */
     protected $_fileServiceFactory;
 
     /**
      * @var CustomizationFileInterface
-     * @since 2.0.0
      */
     protected $_fileService;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\FlyweightFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
@@ -63,7 +56,6 @@ class File extends AbstractModel implements FileInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -83,7 +75,6 @@ public function __construct(
      * Theme files model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -94,7 +85,6 @@ protected function _construct()
      * {@inheritdoc}
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomizationService(CustomizationFileInterface $fileService)
     {
@@ -107,7 +97,6 @@ public function setCustomizationService(CustomizationFileInterface $fileService)
      *
      * @return CustomizationFileInterface
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function getCustomizationService()
     {
@@ -121,7 +110,6 @@ public function getCustomizationService()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
@@ -135,7 +123,6 @@ public function setTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
      * {@inheritdoc}
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getTheme()
     {
@@ -148,7 +135,6 @@ public function getTheme()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFileName($fileName)
     {
@@ -158,7 +144,6 @@ public function setFileName($fileName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFileName()
     {
@@ -167,7 +152,6 @@ public function getFileName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFullPath()
     {
@@ -176,7 +160,6 @@ public function getFullPath()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -185,7 +168,6 @@ public function getContent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFileInfo()
     {
@@ -200,7 +182,6 @@ public function getFileInfo()
      * Prepare file before it will be saved
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -214,7 +195,6 @@ public function beforeSave()
      * Prepare file before it will be deleted
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/FileProvider.php b/app/code/Magento/Theme/Model/Theme/FileProvider.php
index 1ba47020cae2a..e0b1b1ca0e5d3 100644
--- a/app/code/Magento/Theme/Model/Theme/FileProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/FileProvider.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Theme\Model\Theme\FileProvider
  *
- * @since 2.0.0
  */
 class FileProvider implements \Magento\Framework\View\Design\Theme\FileProviderInterface
 {
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\File\CollectionFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @param \Magento\Theme\Model\ResourceModel\Theme\File\CollectionFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Theme\Model\ResourceModel\Theme\File\CollectionFactory $fileFactory)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Theme\Model\ResourceModel\Theme\File\Collec
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems(\Magento\Framework\View\Design\ThemeInterface $theme, array $filters = [])
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Image/Path.php b/app/code/Magento/Theme/Model/Theme/Image/Path.php
index 4ed5cae9a4399..2e435d4498713 100644
--- a/app/code/Magento/Theme/Model/Theme/Image/Path.php
+++ b/app/code/Magento/Theme/Model/Theme/Image/Path.php
@@ -11,7 +11,6 @@
 
 /**
  * Theme Image Path
- * @since 2.0.0
  */
 class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
 {
@@ -24,19 +23,16 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
      * Media Directory
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -46,7 +42,6 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -63,7 +58,6 @@ public function __construct(
      *
      * @param ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImageUrl(ThemeInterface $theme)
     {
@@ -76,7 +70,6 @@ public function getPreviewImageUrl(ThemeInterface $theme)
      *
      * @param ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImagePath(ThemeInterface $theme)
     {
@@ -87,7 +80,6 @@ public function getPreviewImagePath(ThemeInterface $theme)
      * Return default themes preview image url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImageDefaultUrl()
     {
@@ -98,7 +90,6 @@ public function getPreviewImageDefaultUrl()
      * Get directory path for preview image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImagePreviewDirectory()
     {
@@ -109,7 +100,6 @@ public function getImagePreviewDirectory()
      * Temporary directory path to store images
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemporaryDirectory()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
index 08d4a8dc894d9..c02ba022be2ca 100644
--- a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
@@ -17,13 +17,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Registration
 {
     /**
      * @var \Magento\Theme\Model\Theme\Registration
-     * @since 2.0.0
      */
     protected $themeRegistration;
 
@@ -41,13 +39,11 @@ class Registration
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -57,7 +53,6 @@ class Registration
      * @param ThemeLoader $themeLoader
      * @param LoggerInterface $logger
      * @param AppState $appState
-     * @since 2.0.0
      */
     public function __construct(
         ThemeRegistration $themeRegistration,
@@ -81,7 +76,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeDispatch(
         AbstractAction $subject,
diff --git a/app/code/Magento/Theme/Model/Theme/Registration.php b/app/code/Magento/Theme/Model/Theme/Registration.php
index 6a508d034e011..5cd44680effce 100644
--- a/app/code/Magento/Theme/Model/Theme/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Registration.php
@@ -11,13 +11,11 @@
 
 /**
  * Theme registration model class
- * @since 2.0.0
  */
 class Registration
 {
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\Data\CollectionFactory
-     * @since 2.0.0
      */
     protected $_collectionFactory;
 
@@ -25,7 +23,6 @@ class Registration
      * Collection of themes in file-system
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_themeCollection;
 
@@ -33,7 +30,6 @@ class Registration
      * Allowed sequence relation by type, array(parent theme, child theme)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedRelations = [
         [ThemeInterface::TYPE_PHYSICAL, ThemeInterface::TYPE_VIRTUAL],
@@ -44,7 +40,6 @@ class Registration
      * Forbidden sequence relation by type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_forbiddenRelations = [
         [ThemeInterface::TYPE_VIRTUAL, ThemeInterface::TYPE_VIRTUAL],
@@ -56,7 +51,6 @@ class Registration
      *
      * @param \Magento\Theme\Model\ResourceModel\Theme\Data\CollectionFactory $collectionFactory
      * @param \Magento\Theme\Model\Theme\Data\Collection $filesystemCollection
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Theme\Model\ResourceModel\Theme\Data\CollectionFactory $collectionFactory,
@@ -70,7 +64,6 @@ public function __construct(
      * Theme registration
      *
      * @return $this
-     * @since 2.0.0
      */
     public function register()
     {
@@ -93,7 +86,6 @@ public function register()
      * @param array $inheritanceChain
      * @return $this
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _registerThemeRecursively(&$theme, $inheritanceChain = [])
     {
@@ -129,7 +121,6 @@ protected function _registerThemeRecursively(&$theme, $inheritanceChain = [])
      *
      * @param ThemeInterface $theme
      * @return $this
-     * @since 2.0.0
      */
     protected function _savePreviewImage(ThemeInterface $theme)
     {
@@ -149,7 +140,6 @@ protected function _savePreviewImage(ThemeInterface $theme)
      *
      * @param string $fullPath
      * @return ThemeInterface
-     * @since 2.0.0
      */
     public function getThemeFromDb($fullPath)
     {
@@ -160,7 +150,6 @@ public function getThemeFromDb($fullPath)
      * Checks all physical themes that they were not deleted
      *
      * @return $this
-     * @since 2.0.0
      */
     public function checkPhysicalThemes()
     {
@@ -178,7 +167,6 @@ public function checkPhysicalThemes()
      * Check whether all themes have correct parent theme by type
      *
      * @return $this
-     * @since 2.0.0
      */
     public function checkAllowedThemeRelations()
     {
@@ -202,7 +190,6 @@ public function checkAllowedThemeRelations()
      *
      * @param ThemeInterface $theme
      * @return int|null
-     * @since 2.0.0
      */
     protected function _getResetParentId(ThemeInterface $theme)
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Resolver.php b/app/code/Magento/Theme/Model/Theme/Resolver.php
index 58339b06cc7af..59a3202a0b49b 100644
--- a/app/code/Magento/Theme/Model/Theme/Resolver.php
+++ b/app/code/Magento/Theme/Model/Theme/Resolver.php
@@ -7,25 +7,21 @@
 
 /**
  * Theme resolver model
- * @since 2.0.0
  */
 class Resolver implements \Magento\Framework\View\Design\Theme\ResolverInterface
 {
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $design;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory
-     * @since 2.0.0
      */
     protected $themeFactory;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -33,7 +29,6 @@ class Resolver implements \Magento\Framework\View\Design\Theme\ResolverInterface
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $themeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\State $appState,
@@ -49,7 +44,6 @@ public function __construct(
      * Retrieve instance of a theme currently used in an area
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/SingleFile.php b/app/code/Magento/Theme/Model/Theme/SingleFile.php
index 4dc3ef7a50ea9..8e7bd017cc9ee 100644
--- a/app/code/Magento/Theme/Model/Theme/SingleFile.php
+++ b/app/code/Magento/Theme/Model/Theme/SingleFile.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Theme\Model\Theme\SingleFile
  *
- * @since 2.0.0
  */
 class SingleFile
 {
     /**
      * @var \Magento\Framework\View\Design\Theme\Customization\FileInterface
-     * @since 2.0.0
      */
     protected $_fileService;
 
     /**
      * @param \Magento\Framework\View\Design\Theme\Customization\FileInterface $fileService
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Design\Theme\Customization\FileInterface $fileService)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\View\Design\Theme\Customization\F
      * @param \Magento\Framework\View\Design\ThemeInterface $themeModel
      * @param string $fileContent
      * @return \Magento\Framework\View\Design\Theme\FileInterface
-     * @since 2.0.0
      */
     public function update(\Magento\Framework\View\Design\ThemeInterface $themeModel, $fileContent)
     {
diff --git a/app/code/Magento/Theme/Model/Theme/Source/Theme.php b/app/code/Magento/Theme/Model/Theme/Source/Theme.php
index 1b201ac3acc7e..48678f6368c19 100644
--- a/app/code/Magento/Theme/Model/Theme/Source/Theme.php
+++ b/app/code/Magento/Theme/Model/Theme/Source/Theme.php
@@ -15,19 +15,16 @@
 /**
  * Design
  *
- * @since 2.0.0
  */
 class Theme extends AbstractSource
 {
     /**
      * @var Label
-     * @since 2.0.0
      */
     protected $themeLabel;
 
     /**
      * @param Label $themeLabel
-     * @since 2.0.0
      */
     public function __construct(Label $themeLabel)
     {
@@ -39,7 +36,6 @@ public function __construct(Label $themeLabel)
      *
      * @param bool $withEmpty add empty (please select) values to result
      * @return Label[]
-     * @since 2.0.0
      */
     public function getAllOptions($withEmpty = true)
     {
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeDependencyChecker.php b/app/code/Magento/Theme/Model/Theme/ThemeDependencyChecker.php
index 0bb326716d075..6aaba752f7574 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeDependencyChecker.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeDependencyChecker.php
@@ -10,7 +10,6 @@
 
 /**
  * Class checks theme dependencies
- * @since 2.0.0
  */
 class ThemeDependencyChecker
 {
@@ -18,7 +17,6 @@ class ThemeDependencyChecker
      * Theme Collection
      *
      * @var ThemeCollection
-     * @since 2.0.0
      */
     private $themeCollection;
 
@@ -26,7 +24,6 @@ class ThemeDependencyChecker
      * Provider for themes registered in db
      *
      * @var ThemeProvider
-     * @since 2.0.0
      */
     private $themeProvider;
 
@@ -34,7 +31,6 @@ class ThemeDependencyChecker
      * Package name finder
      *
      * @var ThemePackageInfo
-     * @since 2.0.0
      */
     private $themePackageInfo;
 
@@ -44,7 +40,6 @@ class ThemeDependencyChecker
      * @param ThemeCollection $themeCollection
      * @param ThemeProvider $themeProvider
      * @param ThemePackageInfo $themePackageInfo,
-     * @since 2.0.0
      */
     public function __construct(
         ThemeCollection $themeCollection,
@@ -61,7 +56,6 @@ public function __construct(
      *
      * @param string[] $packages
      * @return string[]
-     * @since 2.0.0
      */
     public function checkChildThemeByPackagesName($packages)
     {
@@ -84,7 +78,6 @@ public function checkChildThemeByPackagesName($packages)
      *
      * @param string[] $themePaths
      * @return string[]
-     * @since 2.0.0
      */
     public function checkChildTheme($themePaths)
     {
@@ -118,7 +111,6 @@ public function checkChildTheme($themePaths)
      * Obtain a parent theme -> children themes map from the filesystem
      *
      * @return array
-     * @since 2.0.0
      */
     private function getParentChildThemeMap()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/ThemePackageInfo.php b/app/code/Magento/Theme/Model/Theme/ThemePackageInfo.php
index 83ebadb92cc0d..571cb9ca1c1e5 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemePackageInfo.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemePackageInfo.php
@@ -10,25 +10,21 @@
 
 /**
  * Maps package name to full theme path, and vice versa
- * @since 2.0.0
  */
 class ThemePackageInfo
 {
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
     /**
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $readDirFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $packageNameToFullPathMap = [];
 
@@ -44,7 +40,6 @@ class ThemePackageInfo
      * @param ComponentRegistrar $componentRegistrar
      * @param ReadFactory $readDirFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         ComponentRegistrar $componentRegistrar,
@@ -62,7 +57,6 @@ public function __construct(
      *
      * @param string $themePath
      * @return string
-     * @since 2.0.0
      */
     public function getPackageName($themePath)
     {
@@ -84,7 +78,6 @@ public function getPackageName($themePath)
      *
      * @param string $packageName
      * @return string
-     * @since 2.0.0
      */
     public function getFullThemePath($packageName)
     {
@@ -99,7 +92,6 @@ public function getFullThemePath($packageName)
      * Initialize package name to full theme path map
      *
      * @return void
-     * @since 2.0.0
      */
     private function initializeMap()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
index f2309361dd896..b791947c78de5 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
@@ -12,19 +12,16 @@
 
 /**
  * Provide data for theme grid and for theme edit page
- * @since 2.0.0
  */
 class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProviderInterface
 {
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var \Magento\Theme\Model\ThemeFactory
-     * @since 2.0.0
      */
     protected $themeFactory;
 
@@ -36,19 +33,19 @@ class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProvide
 
     /**
      * @var \Magento\Framework\View\Design\ThemeInterface[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $themes;
 
     /**
      * @var ListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $themeList;
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
@@ -65,7 +62,6 @@ class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProvide
      * @param \Magento\Theme\Model\ThemeFactory $themeFactory
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $collectionFactory,
@@ -81,7 +77,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getThemeByFullPath($fullPath)
     {
@@ -111,7 +106,6 @@ public function getThemeByFullPath($fullPath)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getThemeCustomizations(
         $area = \Magento\Framework\App\Area::AREA_FRONTEND,
@@ -125,7 +119,6 @@ public function getThemeCustomizations(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getThemeById($themeId)
     {
@@ -181,9 +174,9 @@ private function saveThemeToCache(\Magento\Theme\Model\Theme $theme, $cacheId)
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return ListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getThemeList()
     {
@@ -194,9 +187,9 @@ private function getThemeList()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getDeploymentConfig()
     {
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeUninstaller.php b/app/code/Magento/Theme/Model/Theme/ThemeUninstaller.php
index 2bea2757dfa9e..554ab422e830a 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeUninstaller.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeUninstaller.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Theme\Model\Theme\ThemeUninstaller
  *
- * @since 2.0.0
  */
 class ThemeUninstaller
 {
     /**
      * @var ThemePackageInfo
-     * @since 2.0.0
      */
     private $themePackageInfo;
 
     /**
      * @var Remove
-     * @since 2.0.0
      */
     private $remove;
 
     /**
      * @var ThemeProvider
-     * @since 2.0.0
      */
     private $themeProvider;
 
@@ -39,7 +35,6 @@ class ThemeUninstaller
      * @param ThemePackageInfo $themePackageInfo
      * @param Remove $remove
      * @param ThemeProvider $themeProvider
-     * @since 2.0.0
      */
     public function __construct(ThemePackageInfo $themePackageInfo, Remove $remove, ThemeProvider $themeProvider)
     {
@@ -54,7 +49,6 @@ public function __construct(ThemePackageInfo $themePackageInfo, Remove $remove,
      * @param OutputInterface $output
      * @param array $themePaths
      * @return void
-     * @since 2.0.0
      */
     public function uninstallRegistry(OutputInterface $output, array $themePaths)
     {
@@ -70,7 +64,6 @@ public function uninstallRegistry(OutputInterface $output, array $themePaths)
      * @param OutputInterface $output
      * @param array $themePaths
      * @return void
-     * @since 2.0.0
      */
     public function uninstallCode(OutputInterface $output, array $themePaths)
     {
diff --git a/app/code/Magento/Theme/Model/ThemeValidator.php b/app/code/Magento/Theme/Model/ThemeValidator.php
index 62961d4d3213f..83873374897b5 100644
--- a/app/code/Magento/Theme/Model/ThemeValidator.php
+++ b/app/code/Magento/Theme/Model/ThemeValidator.php
@@ -13,7 +13,6 @@
 
 /**
  * Class ThemeValidator
- * @since 2.0.0
  */
 class ThemeValidator
 {
@@ -22,7 +21,6 @@ class ThemeValidator
      * Store Manager
      *
      * @var StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -30,7 +28,6 @@ class ThemeValidator
      * Provider for themes registered in db
      *
      * @var ThemeProviderInterface $themeProvider
-     * @since 2.0.0
      */
     private $themeProvider;
 
@@ -38,7 +35,6 @@ class ThemeValidator
      * Configuration Data
      *
      * @var ValueInterface $configData
-     * @since 2.0.0
      */
     private $configData;
 
@@ -46,7 +42,6 @@ class ThemeValidator
      * @param StoreManagerInterface $storeManager
      * @param ThemeProviderInterface $themeProvider
      * @param ValueInterface $configData
-     * @since 2.0.0
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -63,7 +58,6 @@ public function __construct(
      *
      * @param string[] $themePaths
      * @return array
-     * @since 2.0.0
      */
     public function validateIsThemeInUse($themePaths)
     {
diff --git a/app/code/Magento/Theme/Model/Uploader/Service.php b/app/code/Magento/Theme/Model/Uploader/Service.php
index 9f1c310552014..350c478503f59 100644
--- a/app/code/Magento/Theme/Model/Uploader/Service.php
+++ b/app/code/Magento/Theme/Model/Uploader/Service.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Theme\Model\Uploader\Service
  *
- * @since 2.0.0
  */
 class Service
 {
@@ -22,13 +21,11 @@ class Service
      * Uploaded file path
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $_filePath;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $_tmpDirectory;
 
@@ -36,7 +33,6 @@ class Service
      * File size
      *
      * @var \Magento\Framework\File\Size
-     * @since 2.0.0
      */
     protected $_fileSize;
 
@@ -52,25 +48,21 @@ class Service
      * File uploader
      *
      * @var \Magento\MediaStorage\Model\File\Uploader
-     * @since 2.0.0
      */
     protected $_uploader;
 
     /**
      * @var \Magento\MediaStorage\Model\File\Uploader
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
     /**
      * @var  string|null
-     * @since 2.0.0
      */
     protected $_cssUploadLimit;
 
     /**
      * @var  string|null
-     * @since 2.0.0
      */
     protected $_jsUploadLimit;
 
@@ -82,7 +74,6 @@ class Service
      * @param \Magento\Framework\Convert\DataSize $dataSize
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
      * @param array $uploadLimits keys are 'css' and 'js' for file type, values defines maximum file size, example: 2M
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -109,7 +100,6 @@ public function __construct(
      * @param string $file - Key in the $_FILES array
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function uploadCssFile($file)
     {
@@ -136,7 +126,6 @@ public function uploadCssFile($file)
      * @param string $file - Key in the $_FILES array
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function uploadJsFile($file)
     {
@@ -162,7 +151,6 @@ public function uploadJsFile($file)
      *
      * @param string $filePath
      * @return string
-     * @since 2.0.0
      */
     public function getFileContent($filePath)
     {
@@ -173,7 +161,6 @@ public function getFileContent($filePath)
      * Get css upload max size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCssUploadMaxSize()
     {
@@ -184,7 +171,6 @@ public function getCssUploadMaxSize()
      * Get js upload max size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getJsUploadMaxSize()
     {
@@ -196,7 +182,6 @@ public function getJsUploadMaxSize()
      *
      * @param string $configuredLimit
      * @return int
-     * @since 2.0.0
      */
     private function _getMaxUploadSize($configuredLimit)
     {
@@ -212,7 +197,6 @@ private function _getMaxUploadSize($configuredLimit)
      * Get css upload max size in megabytes
      *
      * @return float
-     * @since 2.0.0
      */
     public function getCssUploadMaxSizeInMb()
     {
@@ -223,7 +207,6 @@ public function getCssUploadMaxSizeInMb()
      * Get js upload max size in megabytes
      *
      * @return float
-     * @since 2.0.0
      */
     public function getJsUploadMaxSizeInMb()
     {
@@ -236,7 +219,6 @@ public function getJsUploadMaxSizeInMb()
      * @param int $fileSize
      * @param int $maxFileSize
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateFileSize($fileSize, $maxFileSize)
     {
diff --git a/app/code/Magento/Theme/Model/Url/Plugin/Signature.php b/app/code/Magento/Theme/Model/Url/Plugin/Signature.php
index 21f0ee2276627..d5c3aa5af0b89 100644
--- a/app/code/Magento/Theme/Model/Url/Plugin/Signature.php
+++ b/app/code/Magento/Theme/Model/Url/Plugin/Signature.php
@@ -8,7 +8,6 @@
 
 /**
  * Plugin that activates signing of static file URLs with corresponding deployment version
- * @since 2.0.0
  */
 class Signature
 {
@@ -24,20 +23,17 @@ class Signature
 
     /**
      * @var \Magento\Framework\View\Url\ConfigInterface
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var \Magento\Framework\App\View\Deployment\Version
-     * @since 2.0.0
      */
     private $deploymentVersion;
 
     /**
      * @param \Magento\Framework\View\Url\ConfigInterface $config
      * @param \Magento\Framework\App\View\Deployment\Version $deploymentVersion
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Url\ConfigInterface $config,
@@ -76,7 +72,6 @@ public function afterGetBaseUrl(
      * Whether signing of URLs is enabled or not
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isUrlSignatureEnabled()
     {
@@ -87,7 +82,6 @@ protected function isUrlSignatureEnabled()
      * Render URL signature from the template
      *
      * @return string
-     * @since 2.0.0
      */
     protected function renderUrlSignature()
     {
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
index 78c4dc4824f10..4b49a60e8b00d 100644
--- a/app/code/Magento/Theme/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -11,7 +11,6 @@
 
 /**
  * Keeps design settings for current request
- * @since 2.0.0
  */
 class Design implements \Magento\Framework\View\DesignInterface
 {
@@ -19,7 +18,6 @@ class Design implements \Magento\Framework\View\DesignInterface
      * Package area
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_area;
 
@@ -27,7 +25,6 @@ class Design implements \Magento\Framework\View\DesignInterface
      * Package theme
      *
      * @var \Magento\Theme\Model\Theme
-     * @since 2.0.0
      */
     protected $_theme;
 
@@ -36,7 +33,6 @@ class Design implements \Magento\Framework\View\DesignInterface
      * Using only to transmit additional parameter in callback functions
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_callbackFileDir;
 
@@ -44,43 +40,36 @@ class Design implements \Magento\Framework\View\DesignInterface
      * Store list manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\FlyweightFactory
-     * @since 2.0.0
      */
     protected $_flyweightFactory;
 
     /**
      * @var \Magento\Theme\Model\ThemeFactory
-     * @since 2.0.0
      */
     protected $_themeFactory;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     private $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_locale;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -92,7 +81,6 @@ class Design implements \Magento\Framework\View\DesignInterface
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\App\State $appState
      * @param array $themes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -117,7 +105,6 @@ public function __construct(
      *
      * @param string $area
      * @return $this
-     * @since 2.0.0
      */
     public function setArea($area)
     {
@@ -130,7 +117,6 @@ public function setArea($area)
      * Retrieve package area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -147,7 +133,6 @@ public function getArea()
      * @param \Magento\Framework\View\Design\ThemeInterface|string $theme
      * @param string $area
      * @return $this
-     * @since 2.0.0
      */
     public function setDesignTheme($theme, $area = null)
     {
@@ -174,7 +159,6 @@ public function setDesignTheme($theme, $area = null)
      * @param string|null $area
      * @param array $params
      * @return string|int
-     * @since 2.0.0
      */
     public function getConfigurationDesignTheme($area = null, array $params = [])
     {
@@ -212,7 +196,6 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
      *
      * @param string $area
      * @return bool
-     * @since 2.0.0
      */
     private function _isThemePerStoreView($area)
     {
@@ -223,7 +206,6 @@ private function _isThemePerStoreView($area)
      * Set default design theme
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setDefaultDesignTheme()
     {
@@ -235,7 +217,6 @@ public function setDefaultDesignTheme()
      * Design theme model getter
      *
      * @return \Magento\Theme\Model\Theme
-     * @since 2.0.0
      */
     public function getDesignTheme()
     {
@@ -247,7 +228,6 @@ public function getDesignTheme()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getThemePath(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
@@ -267,7 +247,6 @@ public function getThemePath(\Magento\Framework\View\Design\ThemeInterface $them
      * Get locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -290,7 +269,6 @@ public function setLocale(\Magento\Framework\Locale\ResolverInterface $locale)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDesignParams()
     {
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index 6c013f97a01d2..a04ce9d61c773 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Theme\Model\Wysiwyg\Storage
  *
- * @since 2.0.0
  */
 class Storage
 {
@@ -52,37 +51,31 @@ class Storage
      * Storage helper
      *
      * @var \Magento\Theme\Helper\Storage
-     * @since 2.0.0
      */
     protected $_helper;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Image\AdapterFactory
-     * @since 2.0.0
      */
     protected $_imageFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $mediaWriteDirectory;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
@@ -95,7 +88,6 @@ class Storage
      * @param \Magento\Framework\Image\AdapterFactory $imageFactory
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -119,7 +111,6 @@ public function __construct(
      * @param string $targetPath
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function uploadFile($targetPath)
     {
@@ -155,7 +146,6 @@ public function uploadFile($targetPath)
      *
      * @param string $source
      * @return bool|string Resized filepath or false if errors were occurred
-     * @since 2.0.0
      */
     public function _createThumbnail($source)
     {
@@ -194,7 +184,6 @@ public function _createThumbnail($source)
      * @param string $path
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createFolder($name, $path)
     {
@@ -230,7 +219,6 @@ public function createFolder($name, $path)
      *
      * @param string $file
      * @return \Magento\Theme\Model\Wysiwyg\Storage
-     * @since 2.0.0
      */
     public function deleteFile($file)
     {
@@ -253,7 +241,6 @@ public function deleteFile($file)
      * @param string $currentPath
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDirsCollection($currentPath)
     {
@@ -274,7 +261,6 @@ public function getDirsCollection($currentPath)
      * Get files collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFilesCollection()
     {
@@ -307,7 +293,6 @@ public function getFilesCollection()
      * Get directories tree array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTreeArray()
     {
@@ -329,7 +314,6 @@ public function getTreeArray()
      * @param string $path
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteDirectory($path)
     {
diff --git a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
index 78da0c1910904..e2566adff1b78 100644
--- a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
+++ b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
@@ -14,31 +14,26 @@
 /**
  * Theme Observer model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ApplyThemeCustomizationObserver implements ObserverInterface
 {
     /**
      * @var Theme
-     * @since 2.0.0
      */
     private $currentTheme;
 
     /**
      * @var \Magento\Framework\View\Asset\GroupedCollection
-     * @since 2.0.0
      */
     private $pageAssets;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -47,7 +42,6 @@ class ApplyThemeCustomizationObserver implements ObserverInterface
      * @param \Magento\Framework\View\Asset\GroupedCollection $assets
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\DesignInterface $design,
@@ -67,7 +61,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php b/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
index d20bd17b00e2f..f7a06f53a4e8e 100644
--- a/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
+++ b/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Theme\Observer\CheckThemeIsAssignedObserver
  *
- * @since 2.0.0
  */
 class CheckThemeIsAssignedObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Theme\Model\Config\Customization
-     * @since 2.0.0
      */
     protected $themeConfig;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventDispatcher;
 
     /**
      * @param \Magento\Theme\Model\Config\Customization $themeConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventDispatcher
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Theme\Model\Config\Customization $themeConfig,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php b/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
index aa6bb5b4526bf..bb6161fef3955 100644
--- a/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
+++ b/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
@@ -13,25 +13,21 @@
 /**
  * Class \Magento\Theme\Observer\CleanThemeRelatedContentObserver
  *
- * @since 2.0.0
  */
 class CleanThemeRelatedContentObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Framework\View\Design\Theme\ImageFactory
-     * @since 2.0.0
      */
     protected $themeImageFactory;
 
     /**
      * @var \Magento\Widget\Model\ResourceModel\Layout\Update\Collection
-     * @since 2.0.0
      */
     protected $updateCollection;
 
     /**
      * @var \Magento\Theme\Model\Config\Customization
-     * @since 2.0.0
      */
     protected $themeConfig;
 
@@ -39,7 +35,6 @@ class CleanThemeRelatedContentObserver implements ObserverInterface
      * @param \Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory
      * @param \Magento\Widget\Model\ResourceModel\Layout\Update\Collection $updateCollection
      * @param \Magento\Theme\Model\Config\Customization $themeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory,
@@ -57,7 +52,6 @@ public function __construct(
      * @param EventObserver $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/Theme/Setup/InstallData.php b/app/code/Magento/Theme/Setup/InstallData.php
index 350a402d8271b..abcaea7c1b009 100644
--- a/app/code/Magento/Theme/Setup/InstallData.php
+++ b/app/code/Magento/Theme/Setup/InstallData.php
@@ -13,7 +13,6 @@
 
 /**
  * Register themes
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -27,7 +26,6 @@ class InstallData implements InstallDataInterface
      * Initialize dependencies
      *
      * @param Registration $themeRegistration
-     * @since 2.0.0
      */
     public function __construct(Registration $themeRegistration)
     {
@@ -36,7 +34,6 @@ public function __construct(Registration $themeRegistration)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Theme/Setup/InstallSchema.php b/app/code/Magento/Theme/Setup/InstallSchema.php
index f724b9baf15d0..b1bc59596f2a7 100644
--- a/app/code/Magento/Theme/Setup/InstallSchema.php
+++ b/app/code/Magento/Theme/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Translation/App/Config/Type/Translation.php b/app/code/Magento/Translation/App/Config/Type/Translation.php
index 3b3e01ac2e716..cddf44b9c4d39 100644
--- a/app/code/Magento/Translation/App/Config/Type/Translation.php
+++ b/app/code/Magento/Translation/App/Config/Type/Translation.php
@@ -11,7 +11,7 @@
 
 /**
  * Class which hold all translation sources and merge them
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Translation implements ConfigTypeInterface
 {
@@ -19,20 +19,20 @@ class Translation implements ConfigTypeInterface
 
     /**
      * @var DataObject[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data;
 
     /**
      * @var ConfigSourceInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $source;
 
     /**
      * Translation constructor.
      * @param ConfigSourceInterface $source
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ConfigSourceInterface $source
@@ -42,7 +42,7 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -57,7 +57,7 @@ public function get($path = '')
      * Clean cache
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean()
     {
diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
index e0160455481a4..b4ee0409065b4 100644
--- a/app/code/Magento/Translation/Block/Html/Head/Config.php
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -13,25 +13,21 @@
  * Block responsible for including Inline Translation config on the page
  *
  * @api
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
      * @var \Magento\Translation\Model\FileManager
-     * @since 2.0.0
      */
     private $fileManager;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var Inline
-     * @since 2.0.0
      */
     private $inline;
 
@@ -42,7 +38,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      * @param \Magento\Translation\Model\FileManager $fileManager
      * @param Inline $inline
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Include RequireJs configuration as an asset on the page
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -73,7 +67,6 @@ protected function _prepareLayout()
     /**
      * Include RequireJs inline translation configuration as an asset on the page
      * @return void
-     * @since 2.0.0
      */
     private function addInlineTranslationConfig()
     {
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index b27e073903ba2..316c136666cc0 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Js extends Template
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Translation\Model\FileManager
-     * @since 2.0.0
      */
     private $fileManager;
 
@@ -32,7 +29,6 @@ class Js extends Template
      * @param Config $config
      * @param \Magento\Translation\Model\FileManager $fileManager
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Is js translation set to dictionary mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function dictionaryEnabled()
     {
@@ -60,7 +55,6 @@ public function dictionaryEnabled()
      * gets current js-translation.json timestamp
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTranslationFileTimestamp()
     {
@@ -69,7 +63,6 @@ public function getTranslationFileTimestamp()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTranslationFilePath()
     {
diff --git a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
index 464283cadf07d..a1092b231479e 100644
--- a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
+++ b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
@@ -21,7 +21,6 @@
  * Command for uninstalling language and backup-code feature
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UninstallLanguageCommand extends Command
 {
@@ -37,31 +36,26 @@ class UninstallLanguageCommand extends Command
 
     /**
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $dependencyChecker;
 
     /**
      * @var Remove
-     * @since 2.0.0
      */
     private $remove;
 
     /**
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composerInfo;
 
     /**
      * @var Cache
-     * @since 2.0.0
      */
     private $cache;
 
     /**
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -73,7 +67,6 @@ class UninstallLanguageCommand extends Command
      * @param ComposerInformation $composerInfo
      * @param Cache $cache
      * @param BackupRollbackFactory $backupRollbackFactory
-     * @since 2.0.0
      */
     public function __construct(
         DependencyChecker $dependencyChecker,
@@ -93,7 +86,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -118,7 +110,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -159,7 +150,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param string $package
      *
      * @return bool
-     * @since 2.0.0
      */
     private function validate($package)
     {
diff --git a/app/code/Magento/Translation/Controller/Ajax/Index.php b/app/code/Magento/Translation/Controller/Ajax/Index.php
index 59f85de07a121..fe42560f34381 100644
--- a/app/code/Magento/Translation/Controller/Ajax/Index.php
+++ b/app/code/Magento/Translation/Controller/Ajax/Index.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Translation\Controller\Ajax\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     protected $inlineParser;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Translate\Inline\ParserInterface $inlineParser
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -37,7 +34,6 @@ public function __construct(
      * Ajax action for inline translation
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index 4902d4a78c72c..105acd5de18e1 100644
--- a/app/code/Magento/Translation/Model/FileManager.php
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -9,7 +9,6 @@
 
 /**
  * A service for handling Translation config files
- * @since 2.0.0
  */
 class FileManager
 {
@@ -20,19 +19,16 @@ class FileManager
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
     /**
      * @var \Magento\Framework\App\Filesystem\DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
     /**
      * @var \Magento\Framework\Filesystem\Driver\File
-     * @since 2.0.0
      */
     private $driverFile;
 
@@ -40,7 +36,6 @@ class FileManager
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
      * @param \Magento\Framework\Filesystem\Driver\File $driverFile,
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -56,7 +51,6 @@ public function __construct(
      * Create a view asset representing the requirejs config.config property for inline translation
      *
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function createTranslateConfigAsset()
     {
@@ -70,7 +64,6 @@ public function createTranslateConfigAsset()
      * gets current js-translation.json timestamp
      *
      * @return string|void
-     * @since 2.0.0
      */
     public function getTranslationFileTimestamp()
     {
@@ -85,7 +78,6 @@ public function getTranslationFileTimestamp()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getTranslationFileFullPath()
     {
@@ -98,7 +90,6 @@ protected function getTranslationFileFullPath()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTranslationFilePath()
     {
diff --git a/app/code/Magento/Translation/Model/Inline/Config.php b/app/code/Magento/Translation/Model/Inline/Config.php
index 3088acaf41d8c..4a08444cf3775 100644
--- a/app/code/Magento/Translation/Model/Inline/Config.php
+++ b/app/code/Magento/Translation/Model/Inline/Config.php
@@ -7,7 +7,6 @@
 
 /**
  * Inline Translation config
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
 {
@@ -15,20 +14,17 @@ class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Developer\Helper\Data
-     * @since 2.0.0
      */
     protected $devHelper;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Developer\Helper\Data $helper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isActive($scope = null)
     {
@@ -53,7 +48,6 @@ public function isActive($scope = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isDevAllowed($scope = null)
     {
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index aa74301a07fff..44df8dc771091 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -11,7 +11,6 @@
  * wrapping and client scripts for inline translation.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
 {
@@ -24,7 +23,6 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      * Response body or JSON content string
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_content;
 
@@ -32,7 +30,6 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      * Current content is JSON or Response body
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isJson = false;
 
@@ -40,7 +37,6 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      * Get max translate block in same tag
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_maxTranslateBlocks = 7;
 
@@ -48,7 +44,6 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      * List of global tags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedTagsGlobal = ['script' => 'String in Javascript', 'title' => 'Page title'];
 
@@ -56,7 +51,6 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      * List of simple tags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedTagsSimple = [
         'legend' => 'Caption for the fieldset element',
@@ -99,37 +93,31 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
 
     /**
      * @var \Magento\Translation\Model\ResourceModel\StringFactory
-     * @since 2.0.0
      */
     protected $_resourceFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Zend_Filter_Interface
-     * @since 2.0.0
      */
     protected $_inputFilter;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $_translateInline;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_appCache;
 
@@ -171,7 +159,6 @@ private function getCacheManger()
      * @param \Magento\Framework\App\Cache\TypeListInterface $appCache
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param array $relatedCacheTypes
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource,
@@ -196,7 +183,6 @@ public function __construct(
      *
      * @param array $translateParams
      * @return array
-     * @since 2.0.0
      */
     public function processAjaxPost(array $translateParams)
     {
@@ -238,7 +224,6 @@ public function processAjaxPost(array $translateParams)
      * @param array $translateParams
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _validateTranslationParams(array $translateParams)
     {
@@ -257,7 +242,6 @@ protected function _validateTranslationParams(array $translateParams)
      * @param array &$translateParams
      * @param array $fieldNames Names of fields values of which are to be filtered
      * @return void
-     * @since 2.0.0
      */
     protected function _filterTranslationParams(array &$translateParams, array $fieldNames)
     {
@@ -273,7 +257,6 @@ protected function _filterTranslationParams(array &$translateParams, array $fiel
      *
      * @param string $body
      * @return string
-     * @since 2.0.0
      */
     public function processResponseBodyString($body)
     {
@@ -290,7 +273,6 @@ public function processResponseBodyString($body)
      * Returns the body content that is being parsed.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -302,7 +284,6 @@ public function getContent()
      *
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -314,7 +295,6 @@ public function setContent($content)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsJson($flag)
     {
@@ -329,7 +309,6 @@ public function setIsJson($flag)
      * @param array $options
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getAttributeLocation($matches, $options)
     {
@@ -344,7 +323,6 @@ protected function _getAttributeLocation($matches, $options)
      * @param array $options
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getTagLocation($matches, $options)
     {
@@ -364,7 +342,6 @@ protected function _getTagLocation($matches, $options)
      * @param string $tagName
      * @param array $trArr
      * @return string
-     * @since 2.0.0
      */
     protected function _applySpecialTagsFormat($tagHtml, $tagName, $trArr)
     {
@@ -389,7 +366,6 @@ protected function _applySpecialTagsFormat($tagHtml, $tagName, $trArr)
      * @param string  $tagName
      * @param array $trArr
      * @return string
-     * @since 2.0.0
      */
     protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
     {
@@ -417,7 +393,6 @@ protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
      * @param string|array $locationCallback
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     private function _getTranslateData($regexp, &$text, $locationCallback, $options = [])
     {
@@ -442,7 +417,6 @@ private function _getTranslateData($regexp, &$text, $locationCallback, $options
      * Prepare tags inline translates
      *
      * @return void
-     * @since 2.0.0
      */
     private function _tagAttributes()
     {
@@ -454,7 +428,6 @@ private function _tagAttributes()
      *
      * @param string &$content
      * @return void
-     * @since 2.0.0
      */
     private function _prepareTagAttributesForContent(&$content)
     {
@@ -499,7 +472,6 @@ private function _prepareTagAttributesForContent(&$content)
      * @param string $name
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     private function _getHtmlAttribute($name, $value)
     {
@@ -511,7 +483,6 @@ private function _getHtmlAttribute($name, $value)
      *
      * @param string $trAttr
      * @return string
-     * @since 2.0.0
      */
     private function _addTranslateAttribute($trAttr)
     {
@@ -527,7 +498,6 @@ private function _addTranslateAttribute($trAttr)
      * Get html quote symbol
      *
      * @return string
-     * @since 2.0.0
      */
     private function _getHtmlQuote()
     {
@@ -542,7 +512,6 @@ private function _getHtmlQuote()
      * Prepare special tags
      *
      * @return void
-     * @since 2.0.0
      */
     private function _specialTags()
     {
@@ -557,7 +526,6 @@ private function _specialTags()
      * @param array $tagsList
      * @param string|array $formatCallback
      * @return void
-     * @since 2.0.0
      */
     private function _translateTags(&$content, $tagsList, $formatCallback)
     {
@@ -640,7 +608,6 @@ private function _translateTags(&$content, $tagsList, $formatCallback)
      * @param string $tagName
      * @param int $from
      * @return bool|int return false if end of tag is not found
-     * @since 2.0.0
      */
     private function _findEndOfTag($body, $tagName, $from)
     {
@@ -667,7 +634,6 @@ private function _findEndOfTag($body, $tagName, $from)
      * Prepare other text inline translates
      *
      * @return void
-     * @since 2.0.0
      */
     private function _otherText()
     {
@@ -700,7 +666,6 @@ private function _otherText()
      * @param string $data
      * @param string $text
      * @return string
-     * @since 2.0.0
      */
     protected function _getDataTranslateSpan($data, $text)
     {
@@ -718,7 +683,6 @@ protected function _getDataTranslateSpan($data, $text)
      *
      * @param mixed $tagName
      * @return string
-     * @since 2.0.0
      */
     protected function _getAdditionalHtmlAttribute($tagName = null)
     {
diff --git a/app/code/Magento/Translation/Model/Js/Config.php b/app/code/Magento/Translation/Model/Js/Config.php
index aaef3ef396d18..f0aad7a83ece7 100644
--- a/app/code/Magento/Translation/Model/Js/Config.php
+++ b/app/code/Magento/Translation/Model/Js/Config.php
@@ -10,7 +10,6 @@
 
 /**
  * Js Translation config
- * @since 2.0.0
  */
 class Config extends FrameworkJsConfig
 {
@@ -43,7 +42,6 @@ class Config extends FrameworkJsConfig
      * Core store config
      *
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -51,14 +49,12 @@ class Config extends FrameworkJsConfig
      * Patterns to match strings for translation
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $patterns;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param string[] $patterns
-     * @since 2.0.0
      */
     public function __construct(ScopeConfigInterface $scopeConfig, array $patterns)
     {
@@ -74,7 +70,6 @@ public function __construct(ScopeConfigInterface $scopeConfig, array $patterns)
      * Is Embedded Strategy selected
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEmbeddedStrategy()
     {
@@ -85,7 +80,6 @@ public function isEmbeddedStrategy()
      * Is Dictionary Strategy selected
      *
      * @return bool
-     * @since 2.0.0
      */
     public function dictionaryEnabled()
     {
@@ -96,7 +90,6 @@ public function dictionaryEnabled()
      * Retrieve translation patterns
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getPatterns()
     {
diff --git a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
index ed2aaca5c1287..ee08df7f9a98e 100644
--- a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
+++ b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Translation\Model\Js\Config\Source\Strategy
  *
- * @since 2.0.0
  */
 class Strategy implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index c2fb2727c2e24..040b3fd211b99 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -12,7 +12,6 @@
  * DataProvider for js translation
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DataProvider implements DataProviderInterface
 {
@@ -20,7 +19,6 @@ class DataProvider implements DataProviderInterface
      * Application state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -28,7 +26,6 @@ class DataProvider implements DataProviderInterface
      * Js translation configuration
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -36,7 +33,6 @@ class DataProvider implements DataProviderInterface
      * Files utility
      *
      * @var \Magento\Framework\App\Utility\Files
-     * @since 2.0.0
      */
     protected $filesUtility;
 
@@ -44,7 +40,6 @@ class DataProvider implements DataProviderInterface
      * Filesystem
      *
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     protected $fileReadFactory;
 
@@ -52,7 +47,6 @@ class DataProvider implements DataProviderInterface
      * Basic translate renderer
      *
      * @var \Magento\Framework\Phrase\Renderer\Translate
-     * @since 2.0.0
      */
     protected $translate;
 
@@ -65,7 +59,6 @@ class DataProvider implements DataProviderInterface
      * @param \Magento\Framework\Component\DirSearch $dirSearch
      * @param \Magento\Framework\View\Design\Theme\ThemePackageList $themePackageList
      * @param \Magento\Framework\App\Utility\Files|null $filesUtility
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\State $appState,
@@ -96,7 +89,6 @@ public function __construct(
      * @return array
      * @throws \Exception
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getData($themePath)
     {
@@ -137,7 +129,6 @@ public function getData($themePath)
      * @param string $content
      * @return string[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getPhrases($content)
     {
diff --git a/app/code/Magento/Translation/Model/Js/DataProviderInterface.php b/app/code/Magento/Translation/Model/Js/DataProviderInterface.php
index 45893177e6938..630804e5d76af 100644
--- a/app/code/Magento/Translation/Model/Js/DataProviderInterface.php
+++ b/app/code/Magento/Translation/Model/Js/DataProviderInterface.php
@@ -10,7 +10,6 @@
  * Provides translation data from a theme.
  *
  * @api
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
@@ -20,7 +19,6 @@ interface DataProviderInterface
      * @param string $themePath The path to the theme
      * @return array A string array where the key is the phrase and the value is the translated phrase.
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getData($themePath);
 }
diff --git a/app/code/Magento/Translation/Model/Js/PreProcessor.php b/app/code/Magento/Translation/Model/Js/PreProcessor.php
index c65c18ad34db7..e85d022627621 100644
--- a/app/code/Magento/Translation/Model/Js/PreProcessor.php
+++ b/app/code/Magento/Translation/Model/Js/PreProcessor.php
@@ -13,7 +13,6 @@
 
 /**
  * PreProcessor responsible for replacing translation calls in js files to translated strings
- * @since 2.0.0
  */
 class PreProcessor implements PreProcessorInterface
 {
@@ -21,19 +20,16 @@ class PreProcessor implements PreProcessorInterface
      * Javascript translation configuration
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var AreaList
-     * @since 2.0.0
      */
     protected $areaList;
 
     /**
      * @var TranslateInterface
-     * @since 2.0.0
      */
     protected $translate;
 
@@ -41,7 +37,6 @@ class PreProcessor implements PreProcessorInterface
      * @param Config $config
      * @param AreaList $areaList
      * @param TranslateInterface $translate
-     * @since 2.0.0
      */
     public function __construct(Config $config, AreaList $areaList, TranslateInterface $translate)
     {
@@ -55,7 +50,6 @@ public function __construct(Config $config, AreaList $areaList, TranslateInterfa
      *
      * @param Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
@@ -81,7 +75,6 @@ public function process(Chain $chain)
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     public function translate($content)
     {
@@ -96,7 +89,6 @@ public function translate($content)
      *
      * @param array $matches
      * @return string
-     * @since 2.0.0
      */
     protected function replaceCallback($matches)
     {
diff --git a/app/code/Magento/Translation/Model/Json/PreProcessor.php b/app/code/Magento/Translation/Model/Json/PreProcessor.php
index d19be15e50fbd..e29d8d768a0d6 100644
--- a/app/code/Magento/Translation/Model/Json/PreProcessor.php
+++ b/app/code/Magento/Translation/Model/Json/PreProcessor.php
@@ -15,7 +15,6 @@
 
 /**
  * PreProcessor responsible for providing js translation dictionary
- * @since 2.0.0
  */
 class PreProcessor implements PreProcessorInterface
 {
@@ -23,7 +22,6 @@ class PreProcessor implements PreProcessorInterface
      * Js translation configuration
      *
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -31,19 +29,16 @@ class PreProcessor implements PreProcessorInterface
      * Translation data provider
      *
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     protected $dataProvider;
 
     /**
      * @var AreaList
-     * @since 2.0.0
      */
     protected $areaList;
 
     /**
      * @var TranslateInterface
-     * @since 2.0.0
      */
     protected $translate;
 
@@ -52,7 +47,6 @@ class PreProcessor implements PreProcessorInterface
      * @param DataProviderInterface $dataProvider
      * @param AreaList $areaList
      * @param TranslateInterface $translate
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -71,7 +65,6 @@ public function __construct(
      *
      * @param Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
@@ -100,7 +93,6 @@ public function process(Chain $chain)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     protected function isDictionaryPath($path)
     {
diff --git a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
index 42a36b2296717..479de1d2ec1cb 100644
--- a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
+++ b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Translation\Model\ResourceModel\StringUtils
  *
- * @since 2.0.0
  */
 class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $scopeResolver;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $scope;
 
@@ -36,7 +32,6 @@ class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string $connectionName
      * @param string|null $scope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,7 +50,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +63,6 @@ protected function _construct()
      * @param String $value
      * @param String $field
      * @return array|$this
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null)
     {
@@ -95,7 +88,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      * @param String $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -109,7 +101,6 @@ protected function _getLoadSelect($field, $value, $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     public function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -130,7 +121,6 @@ public function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -151,7 +141,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -192,7 +181,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @param string $locale
      * @param int|null $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteTranslate($string, $locale = null, $storeId = null)
     {
@@ -221,7 +209,6 @@ public function deleteTranslate($string, $locale = null, $storeId = null)
      * @param String $locale
      * @param int|null $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function saveTranslate($string, $translate, $locale = null, $storeId = null)
     {
@@ -287,7 +274,6 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
      * Retrieve current store identifier
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
diff --git a/app/code/Magento/Translation/Model/ResourceModel/Translate.php b/app/code/Magento/Translation/Model/ResourceModel/Translate.php
index b1fd4cde908c3..8caa464878ffa 100644
--- a/app/code/Magento/Translation/Model/ResourceModel/Translate.php
+++ b/app/code/Magento/Translation/Model/ResourceModel/Translate.php
@@ -13,32 +13,29 @@
 /**
  * Class \Magento\Translation\Model\ResourceModel\Translate
  *
- * @since 2.0.0
  */
 class Translate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     \Magento\Framework\Translate\ResourceInterface
 {
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $scopeResolver;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $scope;
 
     /**
      * @var Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $appConfig;
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deployedConfig;
 
@@ -47,7 +44,6 @@ class Translate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb imp
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string $connectionName
      * @param null|string $scope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -64,7 +60,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -77,7 +72,6 @@ protected function _construct()
      * @param int $storeId
      * @param string $locale
      * @return array
-     * @since 2.0.0
      */
     public function getTranslationArray($storeId = null, $locale = null)
     {
@@ -111,7 +105,6 @@ public function getTranslationArray($storeId = null, $locale = null)
      * @param array $strings
      * @param int|null $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getTranslationArrayByStrings(array $strings, $storeId = null)
     {
@@ -141,7 +134,6 @@ public function getTranslationArrayByStrings(array $strings, $storeId = null)
      * Retrieve table checksum
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMainChecksum()
     {
@@ -152,7 +144,7 @@ public function getMainChecksum()
      * Get connection
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface|false
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getConnection()
     {
@@ -166,7 +158,6 @@ public function getConnection()
      * Retrieve current store identifier
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getStoreId()
     {
@@ -178,7 +169,7 @@ protected function getStoreId()
      *
      * @param int $storeId
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getStoreCode($storeId)
     {
@@ -186,9 +177,9 @@ private function getStoreCode($storeId)
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getDeployedConfig()
     {
@@ -199,9 +190,9 @@ private function getDeployedConfig()
     }
 
     /**
-     * @deprecated 2.2.0
+     * @deprecated 2.1.3
      * @return Config
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getAppConfig()
     {
diff --git a/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php b/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
index 881cbeabf97f5..810c6b713cb02 100644
--- a/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
+++ b/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
@@ -14,31 +14,31 @@
 
 /**
  * Class for reading translations from DB
- * @since 2.2.0
+ * @since 2.1.3
  */
 class InitialTranslationSource implements ConfigSourceInterface
 {
     /**
      * @var TranslateFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $translateFactory;
 
     /**
      * @var StoreManager
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $storeManager;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $data;
 
     /**
      * @var DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
@@ -46,7 +46,7 @@ class InitialTranslationSource implements ConfigSourceInterface
      * @param TranslateFactory $translateFactory
      * @param StoreManager $storeManager
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         TranslateFactory $translateFactory,
@@ -63,7 +63,7 @@ public function __construct(
      *
      * @param string $path
      * @return mixed
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
diff --git a/app/code/Magento/Translation/Model/StringUtils.php b/app/code/Magento/Translation/Model/StringUtils.php
index 4139fe7b2b964..c21367eaf3833 100644
--- a/app/code/Magento/Translation/Model/StringUtils.php
+++ b/app/code/Magento/Translation/Model/StringUtils.php
@@ -21,13 +21,11 @@
 /**
  * Class \Magento\Translation\Model\StringUtils
  *
- * @since 2.0.0
  */
 class StringUtils extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -37,7 +35,6 @@ protected function _construct()
     /**
      * @param string $string
      * @return $this
-     * @since 2.0.0
      */
     public function setString($string)
     {
@@ -49,7 +46,6 @@ public function setString($string)
      * Retrieve string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getString()
     {
diff --git a/app/code/Magento/Translation/Setup/InstallSchema.php b/app/code/Magento/Translation/Setup/InstallSchema.php
index df03bf2498450..5dd180ecd3cbf 100644
--- a/app/code/Magento/Translation/Setup/InstallSchema.php
+++ b/app/code/Magento/Translation/Setup/InstallSchema.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Ui/Api/BookmarkManagementInterface.php b/app/code/Magento/Ui/Api/BookmarkManagementInterface.php
index fd7dcf7471d81..cba4c6b79a0d8 100644
--- a/app/code/Magento/Ui/Api/BookmarkManagementInterface.php
+++ b/app/code/Magento/Ui/Api/BookmarkManagementInterface.php
@@ -9,7 +9,6 @@
  * Interface for managing bookmarks
  *
  * @api
- * @since 2.0.0
  */
 interface BookmarkManagementInterface
 {
@@ -18,7 +17,6 @@ interface BookmarkManagementInterface
      *
      * @param string $namespace
      * @return \Magento\Ui\Api\Data\BookmarkInterface[]
-     * @since 2.0.0
      */
     public function loadByNamespace($namespace);
 
@@ -28,7 +26,6 @@ public function loadByNamespace($namespace);
      * @param string $identifier
      * @param string $namespace
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function getByIdentifierNamespace($identifier, $namespace);
 }
diff --git a/app/code/Magento/Ui/Api/BookmarkRepositoryInterface.php b/app/code/Magento/Ui/Api/BookmarkRepositoryInterface.php
index 99002170cb59c..78bc09ec320f0 100644
--- a/app/code/Magento/Ui/Api/BookmarkRepositoryInterface.php
+++ b/app/code/Magento/Ui/Api/BookmarkRepositoryInterface.php
@@ -9,7 +9,6 @@
  * Bookmark CRUD interface
  *
  * @api
- * @since 2.0.0
  */
 interface BookmarkRepositoryInterface
 {
@@ -19,7 +18,6 @@ interface BookmarkRepositoryInterface
      * @param \Magento\Ui\Api\Data\BookmarkInterface $bookmark
      * @return \Magento\Ui\Api\Data\BookmarkInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function save(\Magento\Ui\Api\Data\BookmarkInterface $bookmark);
 
@@ -29,7 +27,6 @@ public function save(\Magento\Ui\Api\Data\BookmarkInterface $bookmark);
      * @param int $bookmarkId
      * @return \Magento\Ui\Api\Data\BookmarkInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getById($bookmarkId);
 
@@ -39,7 +36,6 @@ public function getById($bookmarkId);
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Ui\Api\Data\BookmarkSearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -49,7 +45,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param \Magento\Ui\Api\Data\BookmarkInterface $bookmark
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Ui\Api\Data\BookmarkInterface $bookmark);
 
@@ -60,7 +55,6 @@ public function delete(\Magento\Ui\Api\Data\BookmarkInterface $bookmark);
      * @return bool true on success
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function deleteById($bookmarkId);
 }
diff --git a/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php b/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
index 904531f9018fe..59a7e9b14cd0f 100644
--- a/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
+++ b/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
@@ -9,7 +9,6 @@
  * Bookmark extension interface
  *
  * @api
- * @since 2.0.0
  */
 interface BookmarkExtensionInterface extends \Magento\Framework\Api\ExtensionAttributesInterface
 {
diff --git a/app/code/Magento/Ui/Api/Data/BookmarkInterface.php b/app/code/Magento/Ui/Api/Data/BookmarkInterface.php
index b829373a22b6f..3acffb8dfe711 100644
--- a/app/code/Magento/Ui/Api/Data/BookmarkInterface.php
+++ b/app/code/Magento/Ui/Api/Data/BookmarkInterface.php
@@ -9,7 +9,6 @@
  * Bookmark interface
  *
  * @api
- * @since 2.0.0
  */
 interface BookmarkInterface extends BookmarkExtensionInterface
 {
@@ -31,7 +30,6 @@ interface BookmarkInterface extends BookmarkExtensionInterface
      * Get ID
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -39,7 +37,6 @@ public function getId();
      * Get user id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUserId();
 
@@ -47,7 +44,6 @@ public function getUserId();
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNamespace();
 
@@ -55,7 +51,6 @@ public function getNamespace();
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier();
 
@@ -63,7 +58,6 @@ public function getIdentifier();
      * Get title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -71,7 +65,6 @@ public function getTitle();
      * Get config content
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfig();
 
@@ -79,7 +72,6 @@ public function getConfig();
      * Get creation time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -87,7 +79,6 @@ public function getCreatedAt();
      * Get update time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt();
 
@@ -95,7 +86,6 @@ public function getUpdatedAt();
      * Get user bookmark is current
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCurrent();
 
@@ -104,7 +94,6 @@ public function isCurrent();
      *
      * @param int $id
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -113,7 +102,6 @@ public function setId($id);
      *
      * @param int $userId
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setUserId($userId);
 
@@ -122,7 +110,6 @@ public function setUserId($userId);
      *
      * @param string $namespace
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setNamespace($namespace);
 
@@ -131,7 +118,6 @@ public function setNamespace($namespace);
      *
      * @param string $identifier
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setIdentifier($identifier);
 
@@ -140,7 +126,6 @@ public function setIdentifier($identifier);
      *
      * @param string $title
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setTitle($title);
 
@@ -149,7 +134,6 @@ public function setTitle($title);
      *
      * @param string $config
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setConfig($config);
 
@@ -158,7 +142,6 @@ public function setConfig($config);
      *
      * @param string $createdAt
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt);
 
@@ -167,7 +150,6 @@ public function setCreatedAt($createdAt);
      *
      * @param string $updatedAt
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt);
 
@@ -176,7 +158,6 @@ public function setUpdatedAt($updatedAt);
      *
      * @param bool $isCurrent
      * @return \Magento\Ui\Api\Data\BookmarkInterface
-     * @since 2.0.0
      */
     public function setCurrent($isCurrent);
 
@@ -184,7 +165,6 @@ public function setCurrent($isCurrent);
      * Retrieve existing extension attributes object or create a new one
      *
      * @return \Magento\Ui\Api\Data\BookmarkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes();
 
@@ -193,7 +173,6 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(
         \Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php b/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php
index 234906f9ad8e3..00fdfa8a4b567 100644
--- a/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php
+++ b/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php
@@ -10,7 +10,6 @@
  * Interface for bookmark search results
  *
  * @api
- * @since 2.0.0
  */
 interface BookmarkSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface BookmarkSearchResultsInterface extends \Magento\Framework\Api\SearchRe
      * Get customers list
      *
      * @return \Magento\Ui\Api\Data\BookmarkInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -28,7 +26,6 @@ public function getItems();
      * @api
      * @param \Magento\Ui\Api\Data\BookmarkInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Ui/Block/Component/StepsWizard.php b/app/code/Magento/Ui/Block/Component/StepsWizard.php
index e7c543d1b1039..7fcd9a7f1220e 100644
--- a/app/code/Magento/Ui/Block/Component/StepsWizard.php
+++ b/app/code/Magento/Ui/Block/Component/StepsWizard.php
@@ -9,7 +9,6 @@
  * Multi steps wizard block
  *
  * @api
- * @since 2.0.0
  */
 class StepsWizard extends \Magento\Framework\View\Element\Template
 {
@@ -17,25 +16,21 @@ class StepsWizard extends \Magento\Framework\View\Element\Template
      * Wizard step template
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Ui::stepswizard.phtml';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $initData = [];
 
     /**
      * @var null|\Magento\Ui\Block\Component\StepsWizard\StepInterface[]
-     * @since 2.0.0
      */
     private $steps;
 
     /**
      * @return \Magento\Ui\Block\Component\StepsWizard\StepInterface[]
-     * @since 2.0.0
      */
     public function getSteps()
     {
@@ -53,7 +48,6 @@ public function getSteps()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getStepComponents()
     {
@@ -62,7 +56,6 @@ public function getStepComponents()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -71,7 +64,6 @@ public function getComponentName()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getInitData()
     {
@@ -81,7 +73,6 @@ public function getInitData()
     /**
      * @param array $initData
      * @return $this
-     * @since 2.0.0
      */
     public function setInitData($initData)
     {
diff --git a/app/code/Magento/Ui/Block/Component/StepsWizard/StepAbstract.php b/app/code/Magento/Ui/Block/Component/StepsWizard/StepAbstract.php
index cf4bf7d002dd1..d0b81f2e79b42 100644
--- a/app/code/Magento/Ui/Block/Component/StepsWizard/StepAbstract.php
+++ b/app/code/Magento/Ui/Block/Component/StepsWizard/StepAbstract.php
@@ -7,13 +7,11 @@
 
 /**
  * Abstract block for multi-step wizard UI
- * @since 2.0.0
  */
 abstract class StepAbstract extends \Magento\Framework\View\Element\Template implements StepInterface
 {
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -22,7 +20,6 @@ public function getContent()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getParentComponentName()
     {
@@ -31,7 +28,6 @@ public function getParentComponentName()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Block/Component/StepsWizard/StepInterface.php b/app/code/Magento/Ui/Block/Component/StepsWizard/StepInterface.php
index 3c01dddc7b7e3..7df1612cb60dc 100644
--- a/app/code/Magento/Ui/Block/Component/StepsWizard/StepInterface.php
+++ b/app/code/Magento/Ui/Block/Component/StepsWizard/StepInterface.php
@@ -9,7 +9,6 @@
  * Interface for multi-step wizard blocks
  *
  * @api
- * @since 2.0.0
  */
 interface StepInterface extends \Magento\Framework\View\Element\BlockInterface
 {
@@ -17,7 +16,6 @@ interface StepInterface extends \Magento\Framework\View\Element\BlockInterface
      * Get step caption
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCaption();
 
@@ -25,7 +23,6 @@ public function getCaption();
      * Get step content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -33,7 +30,6 @@ public function getContent();
      * Get step component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName();
 
@@ -41,7 +37,6 @@ public function getComponentName();
      * Get Component Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getParentComponentName();
 }
diff --git a/app/code/Magento/Ui/Block/Logger.php b/app/code/Magento/Ui/Block/Logger.php
index 1b4b40c197776..474d6ff145f10 100644
--- a/app/code/Magento/Ui/Block/Logger.php
+++ b/app/code/Magento/Ui/Block/Logger.php
@@ -12,13 +12,11 @@
  * Logger block
  *
  * @api
- * @since 2.0.0
  */
 class Logger extends Template
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -26,7 +24,6 @@ class Logger extends Template
      * @param Template\Context $context
      * @param Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Is session storage logging enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLoggingEnabled()
     {
@@ -52,7 +48,6 @@ public function isLoggingEnabled()
      * Get session storage key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSessionStorageKey()
     {
diff --git a/app/code/Magento/Ui/Component/AbstractComponent.php b/app/code/Magento/Ui/Component/AbstractComponent.php
index 1c5e2763ff107..7591641422c24 100644
--- a/app/code/Magento/Ui/Component/AbstractComponent.php
+++ b/app/code/Magento/Ui/Component/AbstractComponent.php
@@ -19,7 +19,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractComponent extends DataObject implements UiComponentInterface
 {
@@ -27,25 +26,21 @@ abstract class AbstractComponent extends DataObject implements UiComponentInterf
      * Render context
      *
      * @var ContextInterface
-     * @since 2.0.0
      */
     protected $context;
 
     /**
      * @var UiComponentInterface[]
-     * @since 2.0.0
      */
     protected $components;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $componentData = [];
 
     /**
      * @var DataSourceInterface[]
-     * @since 2.0.0
      */
     protected $dataSources = [];
 
@@ -55,7 +50,6 @@ abstract class AbstractComponent extends DataObject implements UiComponentInterf
      * @param ContextInterface $context
      * @param UiComponentInterface[] $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -72,7 +66,6 @@ public function __construct(
      * Get component context
      *
      * @return ContextInterface
-     * @since 2.0.0
      */
     public function getContext()
     {
@@ -83,7 +76,6 @@ public function getContext()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -94,7 +86,6 @@ public function getName()
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -151,7 +142,6 @@ protected function prepareChildComponent(UiComponentInterface $component)
      * Produce and return block's html output
      *
      * @return string
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -162,7 +152,6 @@ public function toHtml()
      * Render component
      *
      * @return string
-     * @since 2.0.0
      */
     public function render()
     {
@@ -176,7 +165,6 @@ public function render()
      * @param string $name
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function addComponent($name, UiComponentInterface $component)
     {
@@ -186,7 +174,6 @@ public function addComponent($name, UiComponentInterface $component)
     /**
      * @param string $name
      * @return UiComponentInterface
-     * @since 2.0.0
      */
     public function getComponent($name)
     {
@@ -197,7 +184,6 @@ public function getComponent($name)
      * Get components
      *
      * @return UiComponentInterface[]
-     * @since 2.0.0
      */
     public function getChildComponents()
     {
@@ -209,7 +195,6 @@ public function getChildComponents()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function renderChildComponent($name)
     {
@@ -224,7 +209,6 @@ public function renderChildComponent($name)
      * Get template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplate()
     {
@@ -235,7 +219,6 @@ public function getTemplate()
      * Get component configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfiguration()
     {
@@ -248,7 +231,6 @@ public function getConfiguration()
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function getJsConfig(UiComponentInterface $component)
     {
@@ -265,7 +247,6 @@ public function getJsConfig(UiComponentInterface $component)
      * @param string|array $key
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -278,7 +259,6 @@ public function setData($key, $value = null)
      * @param string $key
      * @param string|int $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -290,7 +270,6 @@ public function getData($key = '', $index = null)
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -299,7 +278,6 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataSourceData()
     {
@@ -311,7 +289,6 @@ public function getDataSourceData()
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function initObservers(array & $data = [])
     {
diff --git a/app/code/Magento/Ui/Component/Action.php b/app/code/Magento/Ui/Component/Action.php
index 8122582e7fe83..66d46fe38e0b2 100644
--- a/app/code/Magento/Ui/Component/Action.php
+++ b/app/code/Magento/Ui/Component/Action.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Action
- * @since 2.0.0
  */
 class Action extends AbstractComponent
 {
@@ -18,7 +17,6 @@ class Action extends AbstractComponent
 
     /**
      * @var array|JsonSerializable
-     * @since 2.0.0
      */
     protected $actions;
 
@@ -27,7 +25,6 @@ class Action extends AbstractComponent
      * @param array $components
      * @param array $data
      * @param array|JsonSerializable $actions
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -41,7 +38,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -56,7 +52,6 @@ public function prepare()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Bookmark.php b/app/code/Magento/Ui/Component/Bookmark.php
index 467dd2fa5f011..aa1d7a9fb5c0a 100644
--- a/app/code/Magento/Ui/Component/Bookmark.php
+++ b/app/code/Magento/Ui/Component/Bookmark.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Bookmark
- * @since 2.0.0
  */
 class Bookmark extends AbstractComponent
 {
@@ -20,19 +19,16 @@ class Bookmark extends AbstractComponent
 
     /**
      * @var BookmarkRepositoryInterface
-     * @since 2.0.0
      */
     protected $bookmarkRepository;
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var BookmarkManagementInterface
-     * @since 2.0.0
      */
     protected $bookmarkManagement;
 
@@ -42,7 +38,6 @@ class Bookmark extends AbstractComponent
      * @param BookmarkManagementInterface $bookmarkManagement
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -71,7 +65,6 @@ public function getComponentName()
      * Register component
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Container.php b/app/code/Magento/Ui/Component/Container.php
index 593d6901b6912..ee0b5074e0199 100644
--- a/app/code/Magento/Ui/Component/Container.php
+++ b/app/code/Magento/Ui/Component/Container.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Container extends AbstractComponent
 {
@@ -17,7 +16,6 @@ class Container extends AbstractComponent
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Control/Action.php b/app/code/Magento/Ui/Component/Control/Action.php
index 80f663d312107..3908f554fcc1a 100644
--- a/app/code/Magento/Ui/Component/Control/Action.php
+++ b/app/code/Magento/Ui/Component/Control/Action.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Action
- * @since 2.0.0
  */
 class Action extends AbstractComponent implements ControlInterface
 {
@@ -20,7 +19,6 @@ class Action extends AbstractComponent implements ControlInterface
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Control/ActionPool.php b/app/code/Magento/Ui/Component/Control/ActionPool.php
index c2997c1da20e3..4f7ebbebd7668 100644
--- a/app/code/Magento/Ui/Component/Control/ActionPool.php
+++ b/app/code/Magento/Ui/Component/Control/ActionPool.php
@@ -13,7 +13,6 @@
 
 /**
  * Class ActionPool
- * @since 2.0.0
  */
 class ActionPool implements ActionPoolInterface
 {
@@ -26,7 +25,6 @@ class ActionPool implements ActionPoolInterface
      * Render context
      *
      * @var Context
-     * @since 2.0.0
      */
     protected $context;
 
@@ -34,7 +32,6 @@ class ActionPool implements ActionPoolInterface
      * Actions pool
      *
      * @var Item[]
-     * @since 2.0.0
      */
     protected $items;
 
@@ -42,13 +39,11 @@ class ActionPool implements ActionPoolInterface
      * Button factory
      *
      * @var ItemFactory
-     * @since 2.0.0
      */
     protected $itemFactory;
 
     /**
      * @var AbstractBlock
-     * @since 2.0.0
      */
     protected $toolbarBlock;
 
@@ -57,7 +52,6 @@ class ActionPool implements ActionPoolInterface
      *
      * @param Context $context
      * @param ItemFactory $itemFactory
-     * @since 2.0.0
      */
     public function __construct(Context $context, ItemFactory $itemFactory)
     {
@@ -69,7 +63,6 @@ public function __construct(Context $context, ItemFactory $itemFactory)
      * Get toolbar block
      *
      * @return bool|BlockInterface
-     * @since 2.0.0
      */
     public function getToolbar()
     {
@@ -85,7 +78,6 @@ public function getToolbar()
      * @param array $data
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function add($key, array $data, UiComponentInterface $component)
     {
@@ -105,7 +97,6 @@ public function add($key, array $data, UiComponentInterface $component)
      *
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function remove($key)
     {
@@ -118,7 +109,6 @@ public function remove($key)
      * @param string $key
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function update($key, array $data)
     {
@@ -151,7 +141,6 @@ public function addHtmlBlock($type, $name = '', array $arguments = [])
      * @param string $key
      * @param UiComponentInterface $view
      * @return Container
-     * @since 2.0.0
      */
     protected function createContainer($key, UiComponentInterface $view)
     {
diff --git a/app/code/Magento/Ui/Component/Control/Button.php b/app/code/Magento/Ui/Component/Control/Button.php
index 1058b84c80adf..773e888badd0f 100644
--- a/app/code/Magento/Ui/Component/Control/Button.php
+++ b/app/code/Magento/Ui/Component/Control/Button.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Button
- * @since 2.0.0
  */
 class Button extends Template implements ControlInterface
 {
@@ -18,7 +17,6 @@ class Button extends Template implements ControlInterface
      * Define block template
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -42,7 +40,6 @@ protected function getTemplatePath()
      * Retrieve button type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -57,7 +54,6 @@ public function getType()
      * Retrieve attributes html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributesHtml()
     {
@@ -81,7 +77,6 @@ public function getAttributesHtml()
      * Retrieve onclick handler
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getOnClick()
     {
@@ -104,7 +99,6 @@ public function getOnClick()
      * @param array $classes
      * @param string $disabled
      * @return array
-     * @since 2.0.0
      */
     protected function prepareAttributes($title, $classes, $disabled)
     {
@@ -133,7 +127,6 @@ protected function prepareAttributes($title, $classes, $disabled)
      *
      * @param array $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function attributesToHtml($attributes)
     {
diff --git a/app/code/Magento/Ui/Component/Control/Container.php b/app/code/Magento/Ui/Component/Control/Container.php
index bbad81deb9f65..5f596b4651008 100644
--- a/app/code/Magento/Ui/Component/Control/Container.php
+++ b/app/code/Magento/Ui/Component/Control/Container.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Container
- * @since 2.0.0
  */
 class Container extends AbstractBlock
 {
@@ -26,7 +25,6 @@ class Container extends AbstractBlock
      * @param string $blockName
      * @param string $blockClassName
      * @return ControlInterface
-     * @since 2.0.0
      */
     protected function createButton($blockName, $blockClassName = null)
     {
@@ -41,7 +39,6 @@ protected function createButton($blockName, $blockClassName = null)
      * Render element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Ui/Component/Control/Item.php b/app/code/Magento/Ui/Component/Control/Item.php
index d070996c26698..c309d27e0b3a5 100644
--- a/app/code/Magento/Ui/Component/Control/Item.php
+++ b/app/code/Magento/Ui/Component/Control/Item.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Item
- * @since 2.0.0
  */
 class Item extends DataObject
 {
diff --git a/app/code/Magento/Ui/Component/Control/Link.php b/app/code/Magento/Ui/Component/Control/Link.php
index 1e97ac7d83000..0301de1985635 100644
--- a/app/code/Magento/Ui/Component/Control/Link.php
+++ b/app/code/Magento/Ui/Component/Control/Link.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Link
- * @since 2.0.0
  */
 class Link extends AbstractComponent implements ControlInterface
 {
@@ -20,7 +19,6 @@ class Link extends AbstractComponent implements ControlInterface
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/DataSource.php b/app/code/Magento/Ui/Component/DataSource.php
index 5fc555af2017c..bb79645f1333f 100644
--- a/app/code/Magento/Ui/Component/DataSource.php
+++ b/app/code/Magento/Ui/Component/DataSource.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DataSource extends AbstractComponent implements DataSourceInterface
 {
@@ -19,7 +18,6 @@ class DataSource extends AbstractComponent implements DataSourceInterface
 
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     protected $dataProvider;
 
@@ -30,7 +28,6 @@ class DataSource extends AbstractComponent implements DataSourceInterface
      * @param DataProviderInterface $dataProvider
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -58,7 +54,6 @@ public function getComponentName()
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -69,7 +64,6 @@ public function prepare()
 
     /**
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function getDataProvider()
     {
diff --git a/app/code/Magento/Ui/Component/ExportButton.php b/app/code/Magento/Ui/Component/ExportButton.php
index 46774f1468201..9d5f125839003 100644
--- a/app/code/Magento/Ui/Component/ExportButton.php
+++ b/app/code/Magento/Ui/Component/ExportButton.php
@@ -10,7 +10,6 @@
 
 /**
  * Class ExportButton
- * @since 2.0.0
  */
 class ExportButton extends AbstractComponent
 {
@@ -21,7 +20,6 @@ class ExportButton extends AbstractComponent
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -30,7 +28,6 @@ class ExportButton extends AbstractComponent
      * @param UrlInterface $urlBuilder
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -55,7 +51,6 @@ public function getComponentName()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php
index a6d012ebb93d4..37f9521befa93 100644
--- a/app/code/Magento/Ui/Component/Filters.php
+++ b/app/code/Magento/Ui/Component/Filters.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Filters extends AbstractComponent implements ObserverInterface
 {
@@ -23,7 +22,6 @@ class Filters extends AbstractComponent implements ObserverInterface
      * Filters created from columns
      *
      * @var UiComponentInterface[]
-     * @since 2.0.0
      */
     protected $columnFilters = [];
 
@@ -31,7 +29,6 @@ class Filters extends AbstractComponent implements ObserverInterface
      * Maps filter declaration to type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $filterMap = [
         'text' => 'filterInput',
@@ -42,13 +39,11 @@ class Filters extends AbstractComponent implements ObserverInterface
 
     /**
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -64,7 +59,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -73,7 +67,6 @@ public function getComponentName()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function update(UiComponentInterface $component)
     {
@@ -103,7 +96,6 @@ public function update(UiComponentInterface $component)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function addComponent($name, UiComponentInterface $component)
     {
@@ -113,7 +105,6 @@ public function addComponent($name, UiComponentInterface $component)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getChildComponents()
     {
diff --git a/app/code/Magento/Ui/Component/Filters/FilterModifier.php b/app/code/Magento/Ui/Component/Filters/FilterModifier.php
index 6c2a362914db7..2db85a4b0d69a 100644
--- a/app/code/Magento/Ui/Component/Filters/FilterModifier.php
+++ b/app/code/Magento/Ui/Component/Filters/FilterModifier.php
@@ -11,7 +11,6 @@
 
 /**
  * Apply modifiers to filter
- * @since 2.0.0
  */
 class FilterModifier
 {
@@ -22,19 +21,16 @@ class FilterModifier
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $allowedConditionTypes;
 
@@ -42,7 +38,6 @@ class FilterModifier
      * @param RequestInterface $request
      * @param FilterBuilder $filterBuilder
      * @param array $allowedConditionTypes
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request, FilterBuilder $filterBuilder, $allowedConditionTypes = [])
     {
@@ -61,7 +56,6 @@ public function __construct(RequestInterface $request, FilterBuilder $filterBuil
      * @param string $filterName
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function applyFilterModifier(DataProviderInterface $dataProvider, $filterName)
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php b/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
index 18077fec2edce..bb0d3ac2cf693 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
@@ -14,7 +14,6 @@
 /**
  * Abstract class AbstractFilter
  * @api
- * @since 2.0.0
  */
 abstract class AbstractFilter extends AbstractComponent
 {
@@ -32,25 +31,21 @@ abstract class AbstractFilter extends AbstractComponent
      * Filter data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $filterData;
 
     /**
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var FilterModifier
-     * @since 2.0.0
      */
     protected $filterModifier;
 
@@ -61,7 +56,6 @@ abstract class AbstractFilter extends AbstractComponent
      * @param FilterModifier $filterModifier
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -82,7 +76,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -91,7 +84,6 @@ public function getComponentName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Date.php b/app/code/Magento/Ui/Component/Filters/Type/Date.php
index 92c9d8e2cf592..da5b91369189d 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Date.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Date extends AbstractFilter
 {
@@ -22,7 +21,6 @@ class Date extends AbstractFilter
      * Wrapped component
      *
      * @var DataTypeDate
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -30,7 +28,7 @@ class Date extends AbstractFilter
      * Date format
      *
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected static $dateFormat = 'Y-m-d H:i:s';
 
@@ -38,7 +36,6 @@ class Date extends AbstractFilter
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -72,7 +69,6 @@ public function prepare()
      * Apply filter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilter()
     {
@@ -121,7 +117,6 @@ protected function applyFilter()
      * @param string $type
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilterByType($type, $value)
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/DateRange.php b/app/code/Magento/Ui/Component/Filters/Type/DateRange.php
index e1e91707d5a72..487e005628e99 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/DateRange.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/DateRange.php
@@ -10,7 +10,6 @@
 /**
  * Class DateRange
  * @api
- * @since 2.0.0
  */
 class DateRange extends Range
 {
@@ -20,7 +19,6 @@ class DateRange extends Range
      * Wrapped component
      *
      * @var DataTypeDate
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -28,7 +26,6 @@ class DateRange extends Range
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -49,7 +46,6 @@ public function prepare()
      * @param string $type
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilterByType($type, $value)
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Input.php b/app/code/Magento/Ui/Component/Filters/Type/Input.php
index fdf280d00669c..28154239ed838 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Input.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Input.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Input extends AbstractFilter
 {
@@ -21,7 +20,6 @@ class Input extends AbstractFilter
      * Wrapped component
      *
      * @var ElementInput
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -29,7 +27,6 @@ class Input extends AbstractFilter
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -63,7 +60,6 @@ public function prepare()
      * Apply filter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilter()
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Range.php b/app/code/Magento/Ui/Component/Filters/Type/Range.php
index 997969338dbff..3944330275b9b 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Range.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Range.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Range extends AbstractFilter
 {
@@ -17,7 +16,6 @@ class Range extends AbstractFilter
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -30,7 +28,6 @@ public function prepare()
      * Apply filter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilter()
     {
@@ -53,7 +50,6 @@ protected function applyFilter()
      * @param string $type
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilterByType($type, $value)
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Search.php b/app/code/Magento/Ui/Component/Filters/Type/Search.php
index 706f1e05f946c..32265c57bbb63 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Search.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Search.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Search extends \Magento\Ui\Component\Filters\Type\AbstractFilter
 {
@@ -17,7 +16,6 @@ class Search extends \Magento\Ui\Component\Filters\Type\AbstractFilter
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -30,7 +28,6 @@ public function prepare()
      * Transfer filters to dataProvider
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilter()
     {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Select.php b/app/code/Magento/Ui/Component/Filters/Type/Select.php
index 0287fe6c8e8d3..3945c8af9f0c3 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Select.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Select.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Select extends AbstractFilter
 {
@@ -25,13 +24,11 @@ class Select extends AbstractFilter
      * Wrapped component
      *
      * @var ElementSelect
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
     /**
      * @var OptionSourceInterface
-     * @since 2.0.0
      */
     protected $optionsProvider;
 
@@ -43,7 +40,6 @@ class Select extends AbstractFilter
      * @param OptionSourceInterface|null $optionsProvider
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -62,7 +58,6 @@ public function __construct(
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -96,7 +91,6 @@ public function prepare()
      * Apply filter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applyFilter()
     {
@@ -124,7 +118,6 @@ protected function applyFilter()
      * Returns options provider
      *
      * @return OptionSourceInterface
-     * @since 2.0.0
      */
     public function getOptionProvider()
     {
diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
index 5d07b9637c042..0a9028928d58f 100644
--- a/app/code/Magento/Ui/Component/Form.php
+++ b/app/code/Magento/Ui/Component/Form.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends AbstractComponent
 {
@@ -19,7 +18,6 @@ class Form extends AbstractComponent
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -28,7 +26,6 @@ class Form extends AbstractComponent
      * @param FilterBuilder $filterBuilder
      * @param UiComponentInterface[] $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -48,7 +45,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -57,7 +53,6 @@ public function getComponentName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataSourceData()
     {
diff --git a/app/code/Magento/Ui/Component/Form/AttributeMapper.php b/app/code/Magento/Ui/Component/Form/AttributeMapper.php
index 5eadcfc4d8899..3955ade498458 100644
--- a/app/code/Magento/Ui/Component/Form/AttributeMapper.php
+++ b/app/code/Magento/Ui/Component/Form/AttributeMapper.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AttributeMapper
 {
@@ -15,7 +14,6 @@ class AttributeMapper
      * Form element mapping
      *
      * @var array
-     * @since 2.0.0
      */
     private $formElementMap = [
         'text' => 'input',
@@ -26,7 +24,6 @@ class AttributeMapper
     /**
      * EAV attribute properties to fetch from meta storage
      * @var array
-     * @since 2.0.0
      */
     private $metaPropertiesMap = [
         'dataType' => 'getFrontendInput',
@@ -41,7 +38,6 @@ class AttributeMapper
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $validationRules = [
         'input_validation' => [
@@ -56,7 +52,6 @@ class AttributeMapper
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function map($attribute)
     {
diff --git a/app/code/Magento/Ui/Component/Form/Collection.php b/app/code/Magento/Ui/Component/Form/Collection.php
index af64078fe987a..5431c0148da1f 100644
--- a/app/code/Magento/Ui/Component/Form/Collection.php
+++ b/app/code/Magento/Ui/Component/Form/Collection.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends AbstractComponent implements UiComponentInterface
 {
@@ -20,7 +19,6 @@ class Collection extends AbstractComponent implements UiComponentInterface
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractElement.php b/app/code/Magento/Ui/Component/Form/Element/AbstractElement.php
index 4b327ee651b30..7803a137d1bc8 100644
--- a/app/code/Magento/Ui/Component/Form/Element/AbstractElement.php
+++ b/app/code/Magento/Ui/Component/Form/Element/AbstractElement.php
@@ -11,13 +11,11 @@
  * Class AbstractElement
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractElement extends AbstractComponent implements ElementInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -26,7 +24,6 @@ public function getHtmlId()
 
     /**
      * @return string|int
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -35,7 +32,6 @@ public function getValue()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormInputName()
     {
@@ -44,7 +40,6 @@ public function getFormInputName()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly()
     {
@@ -53,7 +48,6 @@ public function isReadonly()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCssClasses()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Checkbox.php b/app/code/Magento/Ui/Component/Form/Element/Checkbox.php
index 8598899362980..5d70e88a1e617 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Checkbox.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Checkbox.php
@@ -8,7 +8,6 @@
 /**
  * Class Checkbox
  * @api
- * @since 2.0.0
  */
 class Checkbox extends AbstractElement
 {
@@ -18,7 +17,6 @@ class Checkbox extends AbstractElement
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/AbstractDataType.php b/app/code/Magento/Ui/Component/Form/Element/DataType/AbstractDataType.php
index b02615876df0e..e6c974aab5133 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/AbstractDataType.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/AbstractDataType.php
@@ -11,7 +11,6 @@
  * Class AbstractDataType
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDataType extends AbstractComponent implements DataTypeInterface
 {
@@ -19,7 +18,6 @@ abstract class AbstractDataType extends AbstractComponent implements DataTypeInt
      * Validate value
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validate()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Boolean.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Boolean.php
index ddf6ae0a2633f..2a46e7800a65a 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Boolean.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Boolean.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Boolean
- * @since 2.0.0
  */
 class Boolean extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Boolean extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/DataTypeInterface.php b/app/code/Magento/Ui/Component/Form/Element/DataType/DataTypeInterface.php
index c33669187a9a4..ae09def8557ac 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/DataTypeInterface.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/DataTypeInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface DataTypeInterface
- * @since 2.0.0
  */
 interface DataTypeInterface extends UiComponentInterface
 {
@@ -17,7 +16,6 @@ interface DataTypeInterface extends UiComponentInterface
      * Validate data
      *
      * @return bool
-     * @since 2.0.0
      */
     public function validate();
 }
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
index 1077c26c0883b..58f9b3f53be6f 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Date
- * @since 2.0.0
  */
 class Date extends AbstractDataType
 {
@@ -22,7 +21,6 @@ class Date extends AbstractDataType
      * Current locale
      *
      * @var string
-     * @since 2.0.0
      */
     protected $locale;
 
@@ -30,7 +28,6 @@ class Date extends AbstractDataType
      * Wrapped component
      *
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -48,7 +45,6 @@ class Date extends AbstractDataType
      * @param ResolverInterface $localeResolver
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -66,7 +62,6 @@ public function __construct(
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -88,7 +83,6 @@ public function prepare()
      * Get locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -99,7 +93,6 @@ public function getLocale()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -115,7 +108,6 @@ public function getComponentName()
      * @param int $second
      * @param bool $setUtcTimeZone
      * @return \DateTime|null
-     * @since 2.0.0
      */
     public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Email.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Email.php
index 20f371baf5356..e61287570c226 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Email.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Email.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Email
- * @since 2.0.0
  */
 class Email extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Email extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
index b10976c71cd3b..c29cded7f22d1 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Media
- * @since 2.0.0
  */
 class Media extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Media extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -28,7 +26,7 @@ public function getComponentName()
      * Prepare component configuration
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Number.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Number.php
index 109e78e8d231e..6d9442e812abb 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Number.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Number.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Number extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Number extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Password.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Password.php
index dc9bd55e5d217..a3bae8df40fc5 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Password.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Password.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Password
- * @since 2.0.0
  */
 class Password extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Password extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Price.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Price.php
index 588bdc664309e..4ff5c1134e2f5 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Price.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Price.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Price
- * @since 2.0.0
  */
 class Price extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Price extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Text.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Text.php
index f614777cad14c..1ffa3c02f846c 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Text.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Text.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Text extends AbstractDataType
 {
@@ -17,7 +16,6 @@ class Text extends AbstractDataType
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php b/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
index edda981f0f81d..192d5653e760c 100644
--- a/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
+++ b/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
@@ -10,31 +10,26 @@
 /**
  * Interface ElementInterface
  * @api
- * @since 2.0.0
  */
 interface ElementInterface extends UiComponentInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFormInputName();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isReadonly();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCssClasses();
 }
diff --git a/app/code/Magento/Ui/Component/Form/Element/Input.php b/app/code/Magento/Ui/Component/Form/Element/Input.php
index 8cebeb17c505f..43827b7e0f8f1 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Input.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Input.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Input extends AbstractElement
 {
@@ -17,7 +16,6 @@ class Input extends AbstractElement
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/MultiSelect.php b/app/code/Magento/Ui/Component/Form/Element/MultiSelect.php
index c1971960fcbcd..865be414078f8 100644
--- a/app/code/Magento/Ui/Component/Form/Element/MultiSelect.php
+++ b/app/code/Magento/Ui/Component/Form/Element/MultiSelect.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class MultiSelect extends AbstractOptionsField
 {
@@ -17,7 +16,6 @@ class MultiSelect extends AbstractOptionsField
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Multiline.php b/app/code/Magento/Ui/Component/Form/Element/Multiline.php
index cc5ce3725735c..e6af9263939e7 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Multiline.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Multiline.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Multiline extends AbstractElement
 {
@@ -26,7 +25,6 @@ class Multiline extends AbstractElement
      * UI component factory
      *
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
@@ -37,7 +35,6 @@ class Multiline extends AbstractElement
      * @param UiComponentFactory $uiComponentFactory
      * @param UiComponentInterface[] $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -64,7 +60,6 @@ public function getComponentName()
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Radio.php b/app/code/Magento/Ui/Component/Form/Element/Radio.php
index 9ee1ef1309716..69936823adcdf 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Radio.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Radio.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Radio extends AbstractElement
 {
@@ -17,7 +16,6 @@ class Radio extends AbstractElement
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -27,7 +25,6 @@ public function getComponentName()
     /**
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getChecked()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Range.php b/app/code/Magento/Ui/Component/Form/Element/Range.php
index b2f600d2e95d6..24b05712cf8c9 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Range.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Range.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Range extends AbstractElement
 {
@@ -17,7 +16,6 @@ class Range extends AbstractElement
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -26,7 +24,6 @@ public function getComponentName()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Select.php b/app/code/Magento/Ui/Component/Form/Element/Select.php
index 0f7359eea3acf..460ef3f20e362 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Select.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Select.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Select extends AbstractOptionsField
 {
@@ -17,7 +16,6 @@ class Select extends AbstractOptionsField
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -26,7 +24,6 @@ public function getComponentName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsSelected($optionValue)
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/Textarea.php b/app/code/Magento/Ui/Component/Form/Element/Textarea.php
index 1b84626bc2f60..25b6b3810f89d 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Textarea.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Textarea.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Textarea extends AbstractElement
 {
@@ -17,7 +16,6 @@ class Textarea extends AbstractElement
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Field.php b/app/code/Magento/Ui/Component/Form/Field.php
index f2c601dd4bf4f..1faef0058514b 100644
--- a/app/code/Magento/Ui/Component/Form/Field.php
+++ b/app/code/Magento/Ui/Component/Form/Field.php
@@ -14,7 +14,6 @@
 /**
  * Class Field
  * @api
- * @since 2.0.0
  */
 class Field extends AbstractComponent
 {
@@ -24,7 +23,6 @@ class Field extends AbstractComponent
      * Wrapped component
      *
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -32,7 +30,6 @@ class Field extends AbstractComponent
      * UI component factory
      *
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
@@ -43,7 +40,6 @@ class Field extends AbstractComponent
      * @param UiComponentFactory $uiComponentFactory
      * @param UiComponentInterface[] $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -71,7 +66,6 @@ public function getComponentName()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
index e27ae67858342..e3ba8ebc8ca88 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Fieldset extends AbstractComponent
 {
@@ -21,7 +20,6 @@ class Fieldset extends AbstractComponent
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $collapsible = false;
 
@@ -29,7 +27,6 @@ class Fieldset extends AbstractComponent
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php b/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
index 3a3e2c55180a6..fa1e1d5a9244c 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
@@ -10,19 +10,16 @@
 
 /**
  * Class Factory
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $className = \Magento\Ui\Component\Form\Fieldset::class;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -30,7 +27,6 @@ class Factory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -42,7 +38,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return Fieldset
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Ui/Component/Layout.php b/app/code/Magento/Ui/Component/Layout.php
index 24bce84483037..d75b0a3cca266 100644
--- a/app/code/Magento/Ui/Component/Layout.php
+++ b/app/code/Magento/Ui/Component/Layout.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Layout
- * @since 2.0.0
  */
 class Layout extends AbstractComponent
 {
@@ -20,25 +19,21 @@ class Layout extends AbstractComponent
 
     /**
      * @var LayoutPool
-     * @since 2.0.0
      */
     protected $layoutPool;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $type;
 
     /**
      * @var LayoutInterface
-     * @since 2.0.0
      */
     protected $layoutTypeObject;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $structure = [];
 
@@ -50,7 +45,6 @@ class Layout extends AbstractComponent
      * @param string $type
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -68,7 +62,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -79,7 +72,6 @@ public function getComponentName()
      * Register component and build layout structure
      *
      * @inheritdoc
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -90,7 +82,6 @@ public function prepare()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getStructure()
     {
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs.php b/app/code/Magento/Ui/Component/Layout/Tabs.php
index 47f01e205bc77..6449e10bf8d91 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs.php
@@ -15,25 +15,21 @@
 
 /**
  * Class Tabs
- * @since 2.0.0
  */
 class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $navContainerName;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $structure = [];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $sortIncrement = 10;
 
@@ -43,7 +39,6 @@ class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInter
      * @param UiComponentFactory $uiComponentFactory
      * @param null|string $navContainerName
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(UiComponentFactory $uiComponentFactory, $navContainerName = null, $data = [])
     {
@@ -56,7 +51,6 @@ public function __construct(UiComponentFactory $uiComponentFactory, $navContaine
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function build(UiComponentInterface $component)
     {
@@ -81,7 +75,6 @@ public function build(UiComponentInterface $component)
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function addChildren(array &$topNode, UiComponentInterface $component, $componentType)
     {
@@ -181,7 +174,6 @@ protected function addChildren(array &$topNode, UiComponentInterface $component,
      * @param BlockWrapperInterface $childComponent
      * @param array $areas
      * @return void
-     * @since 2.0.0
      */
     protected function addWrappedBlock(BlockWrapperInterface $childComponent, array &$areas)
     {
@@ -232,7 +224,6 @@ protected function addWrappedBlock(BlockWrapperInterface $childComponent, array
      * @param string $name
      * @return UiComponentInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function createTabComponent(UiComponentInterface $childComponent, $name)
     {
@@ -256,7 +247,6 @@ protected function createTabComponent(UiComponentInterface $childComponent, $nam
      * @param UiComponentInterface $component
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     protected function prepareChildComponents(UiComponentInterface $component, $parentName)
     {
@@ -303,7 +293,6 @@ protected function prepareChildComponents(UiComponentInterface $component, $pare
      * @param string $name
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     protected function prepareConfig(array $config, $name, $parentName)
     {
@@ -325,7 +314,6 @@ protected function prepareConfig(array $config, $name, $parentName)
      * Prepare initial structure for sections
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initSections()
     {
@@ -342,7 +330,6 @@ protected function initSections()
      * Prepare initial structure for areas
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initAreas()
     {
@@ -359,7 +346,6 @@ protected function initAreas()
      * Add navigation block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addNavigationBlock()
     {
@@ -393,7 +379,6 @@ protected function addNavigationBlock()
      * Get next sort increment
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getNextSortIncrement()
     {
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs/Nav.php b/app/code/Magento/Ui/Component/Layout/Tabs/Nav.php
index 74b95e00779b5..a3a50bd8ede18 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs/Nav.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs/Nav.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Nav
- * @since 2.0.0
  */
 class Nav extends Template
 {
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs/Tab.php b/app/code/Magento/Ui/Component/Layout/Tabs/Tab.php
index eae43ec6efb32..325011491ed1a 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs/Tab.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs/Tab.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Tab
- * @since 2.0.0
  */
 class Tab extends AbstractComponent implements TabInterface
 {
@@ -19,7 +18,6 @@ class Tab extends AbstractComponent implements TabInterface
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -30,7 +28,6 @@ public function getComponentName()
      * Return Tab label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -41,7 +38,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -52,7 +48,6 @@ public function getTabTitle()
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -63,7 +58,6 @@ public function getTabClass()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -74,7 +68,6 @@ public function getTabUrl()
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded()
     {
@@ -85,7 +78,6 @@ public function isAjaxLoaded()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -96,7 +88,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs/TabInterface.php b/app/code/Magento/Ui/Component/Layout/Tabs/TabInterface.php
index 036f2c90b9629..318e729975211 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs/TabInterface.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs/TabInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface TabInterface
- * @since 2.0.0
  */
 interface TabInterface
 {
@@ -15,7 +14,6 @@ interface TabInterface
      * Return Tab label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel();
 
@@ -23,7 +21,6 @@ public function getTabLabel();
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle();
 
@@ -31,7 +28,6 @@ public function getTabTitle();
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass();
 
@@ -39,7 +35,6 @@ public function getTabClass();
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl();
 
@@ -47,7 +42,6 @@ public function getTabUrl();
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded();
 
@@ -55,7 +49,6 @@ public function isAjaxLoaded();
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab();
 
@@ -63,7 +56,6 @@ public function canShowTab();
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden();
 
@@ -71,7 +63,6 @@ public function isHidden();
      * Retrieve Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function toHtml();
 }
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs/TabWrapper.php b/app/code/Magento/Ui/Component/Layout/Tabs/TabWrapper.php
index 4a588f974ee9b..b5d79676d303a 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs/TabWrapper.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs/TabWrapper.php
@@ -9,25 +9,21 @@
 
 /**
  * Class TabWrapper
- * @since 2.0.0
  */
 class TabWrapper extends ListText implements TabInterface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $canShowTab = true;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isHidden = false;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAjaxLoaded = false;
 
@@ -35,7 +31,6 @@ class TabWrapper extends ListText implements TabInterface
      * Return Tab label
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -46,7 +41,6 @@ public function getTabLabel()
      * Return Tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -57,7 +51,6 @@ public function getTabTitle()
      * Tab class getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabClass()
     {
@@ -68,7 +61,6 @@ public function getTabClass()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
@@ -79,7 +71,6 @@ public function getTabUrl()
      * Tab should be loaded trough Ajax call
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAjaxLoaded()
     {
@@ -91,7 +82,6 @@ public function isAjaxLoaded()
      * Can show tab in tabs
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -103,7 +93,6 @@ public function canShowTab()
      * Tab is hidden
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/Ui/Component/Listing.php b/app/code/Magento/Ui/Component/Listing.php
index d2049a1dbb6a7..57e65603760ec 100644
--- a/app/code/Magento/Ui/Component/Listing.php
+++ b/app/code/Magento/Ui/Component/Listing.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Listing extends AbstractComponent
 {
@@ -17,7 +16,6 @@ class Listing extends AbstractComponent
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $columns = [];
 
@@ -25,7 +23,6 @@ class Listing extends AbstractComponent
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -34,7 +31,6 @@ public function getComponentName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataSourceData()
     {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns.php b/app/code/Magento/Ui/Component/Listing/Columns.php
index 5b4750e675806..5670bb9b7f6c5 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Columns extends AbstractComponent
 {
@@ -22,7 +21,6 @@ class Columns extends AbstractComponent
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
index b2819e802e398..0e089df16e479 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Column extends AbstractComponent implements ColumnInterface
 {
@@ -22,7 +21,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * Wrapped component
      *
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -30,7 +28,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * UI component factory
      *
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
@@ -41,7 +38,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * @param UiComponentFactory $uiComponentFactory
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -68,7 +63,6 @@ public function getComponentName()
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -106,7 +100,6 @@ public function prepare()
      *
      * @param array $items
      * @return array
-     * @since 2.0.0
      */
     public function prepareItems(array & $items)
     {
@@ -116,7 +109,6 @@ public function prepareItems(array & $items)
     /**
      * Add field to select
      * @return void
-     * @since 2.0.0
      */
     protected function addFieldToSelect()
     {
@@ -129,7 +121,6 @@ protected function addFieldToSelect()
      * Apply sorting
      *
      * @return void
-     * @since 2.0.0
      */
     protected function applySorting()
     {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/ColumnInterface.php b/app/code/Magento/Ui/Component/Listing/Columns/ColumnInterface.php
index a87e22dd11bc5..6c5b1b9f732f2 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/ColumnInterface.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/ColumnInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ColumnInterface extends UiComponentInterface
 {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index 354243a20a516..07e19337a6695 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -12,13 +12,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Date extends Column
 {
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $timezone;
 
@@ -35,7 +33,6 @@ class Date extends Column
      * @param BooleanUtils $booleanUtils
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -52,7 +49,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Ui/Component/Listing/RowInterface.php b/app/code/Magento/Ui/Component/Listing/RowInterface.php
index c7daf43ae7e22..c4a942e24179a 100644
--- a/app/code/Magento/Ui/Component/Listing/RowInterface.php
+++ b/app/code/Magento/Ui/Component/Listing/RowInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface RowInterface
  * @api
- * @since 2.0.0
  */
 interface RowInterface
 {
@@ -18,7 +17,6 @@ interface RowInterface
      * @param array $dataRow
      * @param array $data
      * @return mixed
-     * @since 2.0.0
      */
     public function getData(array $dataRow, array $data = []);
 }
diff --git a/app/code/Magento/Ui/Component/MassAction.php b/app/code/Magento/Ui/Component/MassAction.php
index cef3dd84cedf4..46eb04411a176 100644
--- a/app/code/Magento/Ui/Component/MassAction.php
+++ b/app/code/Magento/Ui/Component/MassAction.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class MassAction extends AbstractComponent
 {
@@ -15,7 +14,6 @@ class MassAction extends AbstractComponent
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -40,7 +38,6 @@ public function prepare()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
diff --git a/app/code/Magento/Ui/Component/MassAction/Columns/Column.php b/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
index 6f81655b44105..a0adc3e3b436e 100644
--- a/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Column
- * @since 2.0.0
  */
 class Column extends AbstractComponent implements ColumnInterface
 {
@@ -23,7 +22,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * Wrapped component
      *
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $wrappedComponent;
 
@@ -31,7 +29,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * UI component factory
      *
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
@@ -42,7 +39,6 @@ class Column extends AbstractComponent implements ColumnInterface
      * @param UiComponentFactory $uiComponentFactory
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -58,7 +54,6 @@ public function __construct(
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -70,7 +65,6 @@ public function getComponentName()
      *
      * @param array $items
      * @return array
-     * @since 2.0.0
      */
     public function prepareItems(array & $items)
     {
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index 11fd18aad54a0..1d120fecabe9b 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Filter
 {
@@ -25,25 +24,21 @@ class Filter
 
     /**
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var UiComponentInterface[]
-     * @since 2.0.0
      */
     protected $components = [];
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -57,7 +52,6 @@ class Filter
      * @param UiComponentFactory $factory
      * @param RequestInterface $request
      * @param FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         UiComponentFactory $factory,
@@ -74,7 +68,6 @@ public function __construct(
      *
      * @return UiComponentInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getComponent()
     {
@@ -91,7 +84,6 @@ public function getComponent()
      * @param AbstractDb $collection
      * @return AbstractDb
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getCollection(AbstractDb $collection)
     {
@@ -122,7 +114,6 @@ public function getCollection(AbstractDb $collection)
      *
      * @throws LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function applySelectionOnTargetProvider()
     {
@@ -155,7 +146,6 @@ public function applySelectionOnTargetProvider()
      * @param AbstractDb $collection
      * @return AbstractDb
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function applySelection(AbstractDb $collection)
     {
@@ -185,7 +175,6 @@ protected function applySelection(AbstractDb $collection)
      *
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function prepareComponent(UiComponentInterface $component)
     {
@@ -199,7 +188,6 @@ public function prepareComponent(UiComponentInterface $component)
      * Returns Referrer Url
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getComponentRefererUrl()
     {
diff --git a/app/code/Magento/Ui/Component/Paging.php b/app/code/Magento/Ui/Component/Paging.php
index 0c5cc9d4c0a5d..39e7b2137a3b5 100644
--- a/app/code/Magento/Ui/Component/Paging.php
+++ b/app/code/Magento/Ui/Component/Paging.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Paging extends AbstractComponent
 {
@@ -17,7 +16,6 @@ class Paging extends AbstractComponent
      * Default component data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [
         'config' => [
@@ -52,7 +50,6 @@ class Paging extends AbstractComponent
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -63,7 +60,6 @@ public function getComponentName()
      * Register component and apply paging settings to Data Provider
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -82,7 +78,6 @@ public function prepare()
      * Prepare paging options
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareOptions()
     {
@@ -102,7 +97,6 @@ protected function prepareOptions()
      *
      * @param array|null $paging
      * @return int
-     * @since 2.0.0
      */
     protected function getOffset($paging)
     {
@@ -115,7 +109,6 @@ protected function getOffset($paging)
      *
      * @param array|null $paging
      * @return int
-     * @since 2.0.0
      */
     protected function getSize($paging)
     {
diff --git a/app/code/Magento/Ui/Component/Wrapper/Block.php b/app/code/Magento/Ui/Component/Wrapper/Block.php
index 9e893d33c53af..51a39643ecf73 100644
--- a/app/code/Magento/Ui/Component/Wrapper/Block.php
+++ b/app/code/Magento/Ui/Component/Wrapper/Block.php
@@ -12,7 +12,6 @@
 
 /**
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Block extends AbstractComponent implements BlockWrapperInterface
 {
@@ -20,7 +19,6 @@ class Block extends AbstractComponent implements BlockWrapperInterface
 
     /**
      * @var BlockInterface
-     * @since 2.0.0
      */
     protected $block;
 
@@ -31,7 +29,6 @@ class Block extends AbstractComponent implements BlockWrapperInterface
      * @param BlockInterface $block
      * @param array $components
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ContextInterface $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Get wrapped block
      *
      * @return BlockInterface
-     * @since 2.0.0
      */
     public function getBlock()
     {
@@ -58,7 +54,6 @@ public function getBlock()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -67,7 +62,6 @@ public function getComponentName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function render()
     {
diff --git a/app/code/Magento/Ui/Component/Wrapper/UiComponent.php b/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
index 8abf5fd767e6e..e683aeb66c630 100644
--- a/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
+++ b/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
@@ -14,7 +14,6 @@
  * Class UiComponent
  *
  * Encapsulate UI Component to represent it as standard Layout Block
- * @since 2.0.0
  */
 class UiComponent extends Template implements ContainerInterface
 {
@@ -22,13 +21,11 @@ class UiComponent extends Template implements ContainerInterface
      * Ui component
      *
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $component;
 
     /**
      * @var BlockFactory
-     * @since 2.0.0
      */
     protected $blockWrapperFactory;
 
@@ -39,7 +36,6 @@ class UiComponent extends Template implements ContainerInterface
      * @param UiComponentInterface $component
      * @param BlockFactory $blockWrapperFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         TemplateContext $context,
@@ -57,7 +53,6 @@ public function __construct(
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
index 3516a3909b888..2b6e458486f6c 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
@@ -13,20 +13,17 @@
 /**
  * Class Render
  * @api
- * @since 2.0.0
  */
 abstract class AbstractAction extends Action implements UiActionInterface
 {
     /**
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @param Context $context
      * @param UiComponentFactory $factory
-     * @since 2.0.0
      */
     public function __construct(Context $context, UiComponentFactory $factory)
     {
@@ -38,7 +35,6 @@ public function __construct(Context $context, UiComponentFactory $factory)
      * Getting name
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function getName()
     {
@@ -49,7 +45,6 @@ protected function getName()
      * Getting component
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function getComponent()
     {
@@ -60,7 +55,6 @@ protected function getComponent()
      * Action for AJAX request
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeAjaxRequest()
     {
@@ -69,7 +63,6 @@ public function executeAjaxRequest()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
index 7f2068cae770e..c45a227b4fcac 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
@@ -13,19 +13,16 @@
 
 /**
  * Class Delete action
- * @since 2.0.0
  */
 class Delete extends AbstractAction
 {
     /**
      * @var BookmarkRepositoryInterface
-     * @since 2.0.0
      */
     protected $bookmarkRepository;
 
     /**
      * @var BookmarkManagementInterface
-     * @since 2.0.0
      */
     private $bookmarkManagement;
 
@@ -34,7 +31,6 @@ class Delete extends AbstractAction
      * @param UiComponentFactory $factory
      * @param BookmarkRepositoryInterface $bookmarkRepository
      * @param BookmarkManagementInterface $bookmarkManagement
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -51,7 +47,6 @@ public function __construct(
      * Action for AJAX request
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
index cca2c8dab6450..9e43f1d11bed0 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
@@ -19,7 +19,6 @@
  * Class Save action
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends AbstractAction
 {
@@ -34,31 +33,26 @@ class Save extends AbstractAction
 
     /**
      * @var BookmarkRepositoryInterface
-     * @since 2.0.0
      */
     protected $bookmarkRepository;
 
     /**
      * @var BookmarkManagementInterface
-     * @since 2.0.0
      */
     protected $bookmarkManagement;
 
     /**
      * @var BookmarkInterfaceFactory
-     * @since 2.0.0
      */
     protected $bookmarkFactory;
 
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
     /**
      * @var DecoderInterface
-     * @since 2.0.0
      */
     protected $jsonDecoder;
 
@@ -70,7 +64,6 @@ class Save extends AbstractAction
      * @param BookmarkInterfaceFactory $bookmarkFactory
      * @param UserContextInterface $userContext
      * @param DecoderInterface $jsonDecoder
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -93,7 +86,6 @@ public function __construct(
      * Action for AJAX request
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -145,7 +137,6 @@ public function execute()
      * @param string $title
      * @param string $config
      * @return void
-     * @since 2.0.0
      */
     protected function updateBookmark(BookmarkInterface $bookmark, $identifier, $title, $config)
     {
@@ -167,7 +158,6 @@ protected function updateBookmark(BookmarkInterface $bookmark, $identifier, $tit
      *
      * @param string $identifier
      * @return void
-     * @since 2.0.0
      */
     protected function updateCurrentBookmark($identifier)
     {
@@ -187,7 +177,6 @@ protected function updateCurrentBookmark($identifier)
      *
      * @param string $identifier
      * @return bool|BookmarkInterface
-     * @since 2.0.0
      */
     protected function checkBookmark($identifier)
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
index e5f6e220d4925..13aed8fe300e5 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
@@ -12,19 +12,16 @@
 
 /**
  * Class Render
- * @since 2.0.0
  */
 class GridToCsv extends Action
 {
     /**
      * @var ConvertToCsv
-     * @since 2.0.0
      */
     protected $converter;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -32,7 +29,6 @@ class GridToCsv extends Action
      * @param Context $context
      * @param ConvertToCsv $converter
      * @param FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
index 5da5885945e80..f00825a3e0bb9 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
@@ -12,19 +12,16 @@
 
 /**
  * Class Render
- * @since 2.0.0
  */
 class GridToXml extends Action
 {
     /**
      * @var ConvertToXml
-     * @since 2.0.0
      */
     protected $converter;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -32,7 +29,6 @@ class GridToXml extends Action
      * @param Context $context
      * @param ConvertToXml $converter
      * @param FileFactory $fileFactory
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 9571fdb420d52..0d14569742585 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Render
- * @since 2.0.0
  */
 class Render extends AbstractAction
 {
@@ -20,7 +19,6 @@ class Render extends AbstractAction
      * Action for AJAX request
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -39,7 +37,6 @@ public function execute()
      *
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     protected function prepareComponent(UiComponentInterface $component)
     {
diff --git a/app/code/Magento/Ui/Controller/UiActionInterface.php b/app/code/Magento/Ui/Controller/UiActionInterface.php
index d8785c8d8ee68..46729c3e68e96 100644
--- a/app/code/Magento/Ui/Controller/UiActionInterface.php
+++ b/app/code/Magento/Ui/Controller/UiActionInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface UiActionInterface
- * @since 2.0.0
  */
 interface UiActionInterface
 {
@@ -15,7 +14,6 @@ interface UiActionInterface
      * Execute action
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function executeAjaxRequest();
 }
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index e673a726811d3..7546c3b785c7b 100644
--- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDataProvider implements DataProviderInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractDataProvider implements DataProviderInterface
      * Data Provider name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -26,7 +24,6 @@ abstract class AbstractDataProvider implements DataProviderInterface
      * Data Provider Primary Identifier name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $primaryFieldName;
 
@@ -34,13 +31,11 @@ abstract class AbstractDataProvider implements DataProviderInterface
      * Data Provider Request Parameter Identifier name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $requestFieldName;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $meta = [];
 
@@ -48,13 +43,11 @@ abstract class AbstractDataProvider implements DataProviderInterface
      * Provider configuration data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
     /**
      * @var AbstractCollection
-     * @since 2.0.0
      */
     protected $collection;
 
@@ -64,7 +57,6 @@ abstract class AbstractDataProvider implements DataProviderInterface
      * @param string $requestFieldName
      * @param array $meta
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -82,7 +74,6 @@ public function __construct(
 
     /**
      * @return AbstractCollection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -93,7 +84,6 @@ public function getCollection()
      * Get Data Provider name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -104,7 +94,6 @@ public function getName()
      * Get primary field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrimaryFieldName()
     {
@@ -115,7 +104,6 @@ public function getPrimaryFieldName()
      * Get field name in request
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestFieldName()
     {
@@ -124,7 +112,6 @@ public function getRequestFieldName()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMeta()
     {
@@ -136,7 +123,6 @@ public function getMeta()
      *
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldSetMetaInfo($fieldSetName)
     {
@@ -146,7 +132,6 @@ public function getFieldSetMetaInfo($fieldSetName)
     /**
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldsMetaInfo($fieldSetName)
     {
@@ -157,7 +142,6 @@ public function getFieldsMetaInfo($fieldSetName)
      * @param string $fieldSetName
      * @param string $fieldName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldMetaInfo($fieldSetName, $fieldName)
     {
@@ -168,7 +152,6 @@ public function getFieldMetaInfo($fieldSetName, $fieldName)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
@@ -182,7 +165,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
      * Returns search criteria
      *
      * @return null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -194,7 +176,6 @@ public function getSearchCriteria()
      * Returns SearchResult
      *
      * @return \Magento\Framework\Api\Search\SearchResultInterface
-     * @since 2.0.0
      */
     public function getSearchResult()
     {
@@ -208,7 +189,6 @@ public function getSearchResult()
      * @param string|array $field
      * @param string|null $alias
      * @return void
-     * @since 2.0.0
      */
     public function addField($field, $alias = null)
     {
@@ -221,7 +201,6 @@ public function addField($field, $alias = null)
      * @param string $field
      * @param string $direction
      * @return void
-     * @since 2.0.0
      */
     public function addOrder($field, $direction)
     {
@@ -234,7 +213,6 @@ public function addOrder($field, $direction)
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function setLimit($offset, $size)
     {
@@ -248,7 +226,6 @@ public function setLimit($offset, $size)
      * @param string|null $field
      * @param bool $isAlias Alias identifier
      * @return void
-     * @since 2.0.0
      */
     public function removeField($field, $isAlias = false)
     {
@@ -259,7 +236,6 @@ public function removeField($field, $isAlias = false)
      * Removes all fields from select
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeAllFields()
     {
@@ -270,7 +246,6 @@ public function removeAllFields()
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -281,7 +256,6 @@ public function getData()
      * Retrieve count of loaded items
      *
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -292,7 +266,6 @@ public function count()
      * Get config data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfigData()
     {
@@ -304,7 +277,6 @@ public function getConfigData()
      *
      * @param mixed $config
      * @return void
-     * @since 2.0.0
      */
     public function setConfigData($config)
     {
diff --git a/app/code/Magento/Ui/DataProvider/AddFieldToCollection.php b/app/code/Magento/Ui/DataProvider/AddFieldToCollection.php
index f769f009cd66e..bfe205b71c648 100644
--- a/app/code/Magento/Ui/DataProvider/AddFieldToCollection.php
+++ b/app/code/Magento/Ui/DataProvider/AddFieldToCollection.php
@@ -9,13 +9,11 @@
 
 /**
  * Class AddFieldToCollection
- * @since 2.0.0
  */
 class AddFieldToCollection implements AddFieldToCollectionInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addField(Collection $collection, $field, $alias = null)
     {
diff --git a/app/code/Magento/Ui/DataProvider/AddFieldToCollectionInterface.php b/app/code/Magento/Ui/DataProvider/AddFieldToCollectionInterface.php
index f71d26c371ae6..40e563345ed4b 100644
--- a/app/code/Magento/Ui/DataProvider/AddFieldToCollectionInterface.php
+++ b/app/code/Magento/Ui/DataProvider/AddFieldToCollectionInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * AddFieldToCollection interface
- * @since 2.0.0
  */
 interface AddFieldToCollectionInterface
 {
@@ -20,7 +19,6 @@ interface AddFieldToCollectionInterface
      * @param string $field
      * @param string|null $alias
      * @return void
-     * @since 2.0.0
      */
     public function addField(Collection $collection, $field, $alias = null);
 }
diff --git a/app/code/Magento/Ui/DataProvider/AddFilterToCollectionInterface.php b/app/code/Magento/Ui/DataProvider/AddFilterToCollectionInterface.php
index e4e4892100682..9fc3ed97c0f0c 100644
--- a/app/code/Magento/Ui/DataProvider/AddFilterToCollectionInterface.php
+++ b/app/code/Magento/Ui/DataProvider/AddFilterToCollectionInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * AddFilterToCollection interface
- * @since 2.0.0
  */
 interface AddFilterToCollectionInterface
 {
@@ -18,7 +17,6 @@ interface AddFilterToCollectionInterface
      * @param string $field
      * @param string|null $condition
      * @return void
-     * @since 2.0.0
      */
     public function addFilter(Collection $collection, $field, $condition = null);
 }
diff --git a/app/code/Magento/Ui/DataProvider/EavValidationRules.php b/app/code/Magento/Ui/DataProvider/EavValidationRules.php
index 9f780d7bc12e5..a5af4b0ae2238 100644
--- a/app/code/Magento/Ui/DataProvider/EavValidationRules.php
+++ b/app/code/Magento/Ui/DataProvider/EavValidationRules.php
@@ -9,13 +9,12 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class EavValidationRules
 {
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $validationRules = [
         'email' => ['validate-email' => true],
@@ -28,7 +27,6 @@ class EavValidationRules
      * @param AbstractAttribute $attribute
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function build(AbstractAttribute $attribute, array $data)
     {
diff --git a/app/code/Magento/Ui/Model/Bookmark.php b/app/code/Magento/Ui/Model/Bookmark.php
index 320210be4c2c9..88da0e0b79c77 100644
--- a/app/code/Magento/Ui/Model/Bookmark.php
+++ b/app/code/Magento/Ui/Model/Bookmark.php
@@ -18,13 +18,11 @@
 /**
  * Domain class Bookmark
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Bookmark extends AbstractExtensibleModel implements BookmarkInterface
 {
     /**
      * @var DecoderInterface
-     * @since 2.0.0
      */
     protected $jsonDecoder;
 
@@ -37,7 +35,6 @@ class Bookmark extends AbstractExtensibleModel implements BookmarkInterface
      * @param Collection $resourceCollection
      * @param DecoderInterface $jsonDecoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -65,7 +62,6 @@ public function __construct(
      * Get Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -76,7 +72,6 @@ public function getId()
      * Get user Id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -87,7 +82,6 @@ public function getUserId()
      * Get namespace
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNamespace()
     {
@@ -98,7 +92,6 @@ public function getNamespace()
      * Get identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier()
     {
@@ -109,7 +102,6 @@ public function getIdentifier()
      * Is current
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCurrent()
     {
@@ -120,7 +112,6 @@ public function isCurrent()
      * Get title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -131,7 +122,6 @@ public function getTitle()
      * Get config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -146,7 +136,6 @@ public function getConfig()
      * Get created at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt()
     {
@@ -157,7 +146,6 @@ public function getCreatedAt()
      * Get updated at
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdatedAt()
     {
@@ -169,7 +157,6 @@ public function getUpdatedAt()
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -181,7 +168,6 @@ public function setId($id)
      *
      * @param int $userId
      * @return $this
-     * @since 2.0.0
      */
     public function setUserId($userId)
     {
@@ -193,7 +179,6 @@ public function setUserId($userId)
      *
      * @param string $namespace
      * @return $this
-     * @since 2.0.0
      */
     public function setNamespace($namespace)
     {
@@ -205,7 +190,6 @@ public function setNamespace($namespace)
      *
      * @param string $identifier
      * @return $this
-     * @since 2.0.0
      */
     public function setIdentifier($identifier)
     {
@@ -217,7 +201,6 @@ public function setIdentifier($identifier)
      *
      * @param bool $isCurrent
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrent($isCurrent)
     {
@@ -229,7 +212,6 @@ public function setCurrent($isCurrent)
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -241,7 +223,6 @@ public function setTitle($title)
      *
      * @param string $config
      * @return $this
-     * @since 2.0.0
      */
     public function setConfig($config)
     {
@@ -253,7 +234,6 @@ public function setConfig($config)
      *
      * @param string $createdAt
      * @return $this
-     * @since 2.0.0
      */
     public function setCreatedAt($createdAt)
     {
@@ -265,7 +245,6 @@ public function setCreatedAt($createdAt)
      *
      * @param string $updatedAt
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -276,7 +255,6 @@ public function setUpdatedAt($updatedAt)
      * {@inheritdoc}
      *
      * @return \Magento\Ui\Api\Data\BookmarkExtensionInterface|null
-     * @since 2.0.0
      */
     public function getExtensionAttributes()
     {
@@ -288,7 +266,6 @@ public function getExtensionAttributes()
      *
      * @param \Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     public function setExtensionAttributes(\Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Ui/Model/BookmarkManagement.php b/app/code/Magento/Ui/Model/BookmarkManagement.php
index 87fe55d0dc7c0..fcadc8a0deaa4 100644
--- a/app/code/Magento/Ui/Model/BookmarkManagement.php
+++ b/app/code/Magento/Ui/Model/BookmarkManagement.php
@@ -9,31 +9,26 @@
 /**
  * Class \Magento\Ui\Model\BookmarkManagement
  *
- * @since 2.0.0
  */
 class BookmarkManagement implements \Magento\Ui\Api\BookmarkManagementInterface
 {
     /**
      * @var \Magento\Ui\Api\BookmarkRepositoryInterface
-     * @since 2.0.0
      */
     protected $bookmarkRepository;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var \Magento\Authorization\Model\UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
@@ -42,7 +37,6 @@ class BookmarkManagement implements \Magento\Ui\Api\BookmarkManagementInterface
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Ui\Api\BookmarkRepositoryInterface $bookmarkRepository,
@@ -58,7 +52,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadByNamespace($namespace)
     {
@@ -84,7 +77,6 @@ public function loadByNamespace($namespace)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getByIdentifierNamespace($identifier, $namespace)
     {
diff --git a/app/code/Magento/Ui/Model/Config.php b/app/code/Magento/Ui/Model/Config.php
index de7498a7b47d5..5649354a62ccf 100644
--- a/app/code/Magento/Ui/Model/Config.php
+++ b/app/code/Magento/Ui/Model/Config.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Ui\Model\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -27,13 +26,11 @@ class Config
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(ScopeConfigInterface $scopeConfig)
     {
@@ -44,7 +41,6 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      * Is session storage logging enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLoggingEnabled()
     {
@@ -55,7 +51,6 @@ public function isLoggingEnabled()
      * Get session storage key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSessionStorageKey()
     {
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
index e142abbb1dabe..a8518a50b30c1 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -13,19 +13,16 @@
 
 /**
  * Class ConvertToCsv
- * @since 2.0.0
  */
 class ConvertToCsv
 {
     /**
      * @var WriteInterface
-     * @since 2.0.0
      */
     protected $directory;
 
     /**
      * @var MetadataProvider
-     * @since 2.0.0
      */
     protected $metadataProvider;
 
@@ -40,7 +37,6 @@ class ConvertToCsv
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param int $pageSize
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -59,7 +55,6 @@ public function __construct(
      *
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getCsvFile()
     {
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
index cb85e59f9206f..b707742063dbd 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -17,43 +17,36 @@
 
 /**
  * Class ConvertToXml
- * @since 2.0.0
  */
 class ConvertToXml
 {
     /**
      * @var WriteInterface
-     * @since 2.0.0
      */
     protected $directory;
 
     /**
      * @var MetadataProvider
-     * @since 2.0.0
      */
     protected $metadataProvider;
 
     /**
      * @var ExcelFactory
-     * @since 2.0.0
      */
     protected $excelFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var SearchResultIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $fields;
 
@@ -63,7 +56,6 @@ class ConvertToXml
      * @param MetadataProvider $metadataProvider
      * @param ExcelFactory $excelFactory
      * @param SearchResultIteratorFactory $iteratorFactory
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -83,7 +75,6 @@ public function __construct(
      * Returns Filters with options
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getOptions()
     {
@@ -97,7 +88,6 @@ protected function getOptions()
      * Returns DB fields list
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getFields()
     {
@@ -113,7 +103,6 @@ protected function getFields()
      *
      * @param DocumentInterface $document
      * @return array
-     * @since 2.0.0
      */
     public function getRowData(DocumentInterface $document)
     {
@@ -125,7 +114,6 @@ public function getRowData(DocumentInterface $document)
      *
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getXmlFile()
     {
@@ -179,7 +167,6 @@ public function getXmlFile()
      * @param string $componentName
      * @param array $items
      * @return void
-     * @since 2.0.0
      */
     protected function prepareItems($componentName, array $items = [])
     {
diff --git a/app/code/Magento/Ui/Model/Export/MetadataProvider.php b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
index 38f1d015c10ef..499cd06e505f6 100644
--- a/app/code/Magento/Ui/Model/Export/MetadataProvider.php
+++ b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
@@ -16,43 +16,36 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class MetadataProvider
 {
     /**
      * @var Filter
-     * @since 2.0.0
      */
     protected $filter;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $columns;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $locale;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $dateFormat;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
@@ -62,7 +55,6 @@ class MetadataProvider
      * @param ResolverInterface $localeResolver
      * @param string $dateFormat
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Filter $filter,
@@ -84,7 +76,6 @@ public function __construct(
      * @param UiComponentInterface $component
      * @return UiComponentInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function getColumnsComponent(UiComponentInterface $component)
     {
@@ -101,7 +92,6 @@ protected function getColumnsComponent(UiComponentInterface $component)
      *
      * @param UiComponentInterface $component
      * @return UiComponentInterface[]
-     * @since 2.0.0
      */
     protected function getColumns(UiComponentInterface $component)
     {
@@ -121,7 +111,6 @@ protected function getColumns(UiComponentInterface $component)
      *
      * @param UiComponentInterface $component
      * @return string[]
-     * @since 2.0.0
      */
     public function getHeaders(UiComponentInterface $component)
     {
@@ -137,7 +126,6 @@ public function getHeaders(UiComponentInterface $component)
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function getFields(UiComponentInterface $component)
     {
@@ -155,7 +143,6 @@ public function getFields(UiComponentInterface $component)
      * @param array $fields
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     public function getRowData(DocumentInterface $document, $fields, $options)
     {
@@ -182,7 +169,6 @@ public function getRowData(DocumentInterface $document, $fields, $options)
      * @param string $label
      * @param array $output
      * @return void
-     * @since 2.0.0
      */
     protected function getComplexLabel($list, $label, &$output)
     {
@@ -200,7 +186,6 @@ protected function getComplexLabel($list, $label, &$output)
      *
      * @param Select $filter
      * @return array
-     * @since 2.0.0
      */
     protected function getFilterOptions(Select $filter)
     {
@@ -223,7 +208,6 @@ protected function getFilterOptions(Select $filter)
      * Returns Filters with options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -249,7 +233,6 @@ public function getOptions()
      * @param \Magento\Framework\Api\Search\DocumentInterface $document
      * @param string $componentName
      * @return void
-     * @since 2.0.0
      */
     public function convertDate($document, $componentName)
     {
diff --git a/app/code/Magento/Ui/Model/Export/SearchResultIterator.php b/app/code/Magento/Ui/Model/Export/SearchResultIterator.php
index 0bfee2dada85e..8e1bfdde9609f 100644
--- a/app/code/Magento/Ui/Model/Export/SearchResultIterator.php
+++ b/app/code/Magento/Ui/Model/Export/SearchResultIterator.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Ui\Model\Export\SearchResultIterator
  *
- * @since 2.0.0
  */
 class SearchResultIterator implements \Iterator
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $items;
 
     /**
      * @param array $items
-     * @since 2.0.0
      */
     public function __construct(
         array $items
@@ -30,7 +27,6 @@ public function __construct(
 
     /**
      * @return array|mixed
-     * @since 2.0.0
      */
     public function current()
     {
@@ -39,7 +35,6 @@ public function current()
 
     /**
      * @return int|mixed
-     * @since 2.0.0
      */
     public function key()
     {
@@ -48,7 +43,6 @@ public function key()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -57,7 +51,6 @@ public function next()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -66,7 +59,6 @@ public function rewind()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
diff --git a/app/code/Magento/Ui/Model/Manager.php b/app/code/Magento/Ui/Model/Manager.php
index b42f54dfa4373..3c683fee2b57c 100644
--- a/app/code/Magento/Ui/Model/Manager.php
+++ b/app/code/Magento/Ui/Model/Manager.php
@@ -24,7 +24,6 @@
  * Class Manager
  * @deprecated 2.2.0
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Manager implements ManagerInterface
 {
@@ -37,7 +36,6 @@ class Manager implements ManagerInterface
      * Configuration provider for UI component
      *
      * @var ComponentDefinition
-     * @since 2.0.0
      */
     protected $componentConfigProvider;
 
@@ -45,7 +43,6 @@ class Manager implements ManagerInterface
      * Argument interpreter
      *
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     protected $argumentInterpreter;
 
@@ -53,7 +50,6 @@ class Manager implements ManagerInterface
      * DOM document merger
      *
      * @var DomMergerInterface
-     * @since 2.0.0
      */
     protected $domMerger;
 
@@ -61,7 +57,6 @@ class Manager implements ManagerInterface
      * Factory for UI config reader
      *
      * @var ReaderFactory
-     * @since 2.0.0
      */
     protected $readerFactory;
 
@@ -69,7 +64,6 @@ class Manager implements ManagerInterface
      * Component data
      *
      * @var ArrayObject
-     * @since 2.0.0
      */
     protected $componentsData;
 
@@ -77,7 +71,6 @@ class Manager implements ManagerInterface
      * Components pool
      *
      * @var ArrayObject
-     * @since 2.0.0
      */
     protected $componentsPool;
 
@@ -85,25 +78,21 @@ class Manager implements ManagerInterface
      * Factory for ArrayObject
      *
      * @var ArrayObjectFactory
-     * @since 2.0.0
      */
     protected $arrayObjectFactory;
 
     /**
      * @var AggregatedFileCollectorFactory
-     * @since 2.0.0
      */
     protected $aggregatedFileCollectorFactory;
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var UiReaderInterface[]
-     * @since 2.0.0
      */
     protected $uiReader;
 
@@ -122,7 +111,6 @@ class Manager implements ManagerInterface
      * @param CacheInterface $cache
      * @param InterpreterInterface $argumentInterpreter
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         ComponentDefinition $componentConfigProvider,
@@ -150,7 +138,6 @@ public function __construct(
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getData($name)
     {
@@ -162,7 +149,6 @@ public function getData($name)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     protected function hasData($name)
     {
@@ -175,7 +161,6 @@ protected function hasData($name)
      * @param string $name
      * @return ManagerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function prepareData($name)
     {
@@ -210,7 +195,6 @@ public function prepareData($name)
      *
      * @param array $components
      * @return array
-     * @since 2.0.0
      */
     protected function evaluateComponentArguments($components)
     {
@@ -233,7 +217,6 @@ protected function evaluateComponentArguments($components)
      * @param string $component
      * @param bool $evaluated
      * @return array
-     * @since 2.0.0
      */
     public function createRawComponentData($component, $evaluated = true)
     {
@@ -262,7 +245,6 @@ public function createRawComponentData($component, $evaluated = true)
      *
      * @param string $name
      * @return UiReaderInterface
-     * @since 2.0.0
      */
     public function getReader($name)
     {
@@ -286,7 +268,6 @@ public function getReader($name)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     protected function prepare($name)
     {
@@ -307,7 +288,6 @@ protected function prepare($name)
      * @param string $name
      * @param array $componentsPool
      * @return array
-     * @since 2.0.0
      */
     protected function createDataForComponent($name, array $componentsPool)
     {
@@ -348,7 +328,6 @@ protected function createDataForComponent($name, array $componentsPool)
      * @param string $instanceName
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     protected function addComponentIntoPool($instanceName, array $configuration)
     {
@@ -361,7 +340,6 @@ protected function addComponentIntoPool($instanceName, array $configuration)
      * @param array $componentData
      * @param array $rootComponentData
      * @return array
-     * @since 2.0.0
      */
     protected function mergeArguments(array $componentData, array $rootComponentData)
     {
@@ -381,7 +359,6 @@ protected function mergeArguments(array $componentData, array $rootComponentData
      * @param array $componentData
      * @param array $rootComponentData
      * @return array
-     * @since 2.0.0
      */
     protected function mergeAttributes(array $componentData, array $rootComponentData)
     {
@@ -403,7 +380,6 @@ protected function mergeAttributes(array $componentData, array $rootComponentDat
      * @param string|int $key
      * @param string $componentName
      * @return string
-     * @since 2.0.0
      */
     protected function createName(array $componentData, $key, $componentName)
     {
diff --git a/app/code/Magento/Ui/Model/ResourceModel/Bookmark.php b/app/code/Magento/Ui/Model/ResourceModel/Bookmark.php
index d436336c7cbc0..6161ff1a6ec62 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/Bookmark.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/Bookmark.php
@@ -9,14 +9,12 @@
 
 /**
  * Bookmark resource
- * @since 2.0.0
  */
 class Bookmark extends AbstractDb
 {
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -29,7 +27,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Ui/Model/ResourceModel/Bookmark/Collection.php b/app/code/Magento/Ui/Model/ResourceModel/Bookmark/Collection.php
index e9c3a1cf3d76c..89decc1271368 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/Bookmark/Collection.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/Bookmark/Collection.php
@@ -9,7 +9,6 @@
 
 /**
  * Bookmark Collection
- * @since 2.0.0
  */
 class Collection extends AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends AbstractCollection
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
index 1d15699078a88..8e5b64dc90f37 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
@@ -20,25 +20,21 @@
  * Class BookmarkRepository
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BookmarkRepository implements BookmarkRepositoryInterface
 {
     /**
      * @var \Magento\Ui\Api\Data\BookmarkInterfaceFactory
-     * @since 2.0.0
      */
     protected $bookmarkFactory;
 
     /**
      * @var \Magento\Ui\Model\ResourceModel\Bookmark
-     * @since 2.0.0
      */
     protected $bookmarkResourceModel;
 
     /**
      * @var \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory
-     * @since 2.0.0
      */
     protected $searchResultsFactory;
 
@@ -53,7 +49,6 @@ class BookmarkRepository implements BookmarkRepositoryInterface
      * @param Bookmark $bookmarkResourceModel
      * @param \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactory
      * @param CollectionProcessorInterface | null $collectionProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Ui\Api\Data\BookmarkInterfaceFactory $bookmarkFactory,
@@ -74,7 +69,6 @@ public function __construct(
      * @param BookmarkInterface $bookmark
      * @return BookmarkInterface
      * @throws CouldNotSaveException
-     * @since 2.0.0
      */
     public function save(BookmarkInterface $bookmark)
     {
@@ -92,7 +86,6 @@ public function save(BookmarkInterface $bookmark)
      * @param int $bookmarkId
      * @return BookmarkInterface
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function getById($bookmarkId)
     {
@@ -110,7 +103,6 @@ public function getById($bookmarkId)
      * @param SearchCriteriaInterface $searchCriteria
      * @return \Magento\Framework\Api\SearchResultsInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -138,7 +130,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      * @param BookmarkInterface $bookmark
      * @return bool true on success
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function delete(BookmarkInterface $bookmark)
     {
@@ -157,7 +148,6 @@ public function delete(BookmarkInterface $bookmark)
      * @return bool true on success
      * @throws NoSuchEntityException
      * @throws CouldNotDeleteException
-     * @since 2.0.0
      */
     public function deleteById($bookmarkId)
     {
@@ -172,7 +162,6 @@ public function deleteById($bookmarkId)
      * @return void
      * @deprecated 2.2.0
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
     {
diff --git a/app/code/Magento/Ui/Setup/InstallSchema.php b/app/code/Magento/Ui/Setup/InstallSchema.php
index a8163f025eddd..6190c870ebd12 100644
--- a/app/code/Magento/Ui/Setup/InstallSchema.php
+++ b/app/code/Magento/Ui/Setup/InstallSchema.php
@@ -12,7 +12,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
@@ -24,7 +23,6 @@ class InstallSchema implements InstallSchemaInterface
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
index e782c0c69c444..6c83b04dbb19b 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Content
- * @since 2.0.0
  */
 class Content implements ElementInterface
 {
@@ -24,7 +23,6 @@ class Content implements ElementInterface
      * @param DataObject $processedObject
      * @param DataObject $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(
         CompilerInterface $compiler,
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
index 24f35561bdfbe..d5387f15c7c0d 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Form
- * @since 2.0.0
  */
 class Form implements ElementInterface
 {
@@ -23,7 +22,6 @@ class Form implements ElementInterface
      * @param DataObject $processedObject
      * @param DataObject $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(
         CompilerInterface $compiler,
@@ -41,7 +39,6 @@ public function compile(
      *
      * @param \DOMElement $node
      * @return \DOMElement[]
-     * @since 2.0.0
      */
     protected function getChildNodes(\DOMElement $node)
     {
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
index 02b3e6215ed5f..5524fe82ca56f 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Render
- * @since 2.0.0
  */
 class Render implements ElementInterface
 {
@@ -27,7 +26,6 @@ class Render implements ElementInterface
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function compile(
         CompilerInterface $compiler,
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index e93f908179bd1..cda3106a14f49 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -14,37 +14,31 @@
 
 /**
  * Class Result
- * @since 2.0.0
  */
 class Result implements ResultInterface
 {
     /**
      * @var Template
-     * @since 2.0.0
      */
     protected $template;
 
     /**
      * @var CompilerInterface
-     * @since 2.0.0
      */
     protected $compiler;
 
     /**
      * @var UiComponentInterface
-     * @since 2.0.0
      */
     protected $component;
 
     /**
      * @var Structure
-     * @since 2.0.0
      */
     protected $structure;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -54,7 +48,6 @@ class Result implements ResultInterface
      * @param UiComponentInterface $component
      * @param Structure $structure
      * @param LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         Template $template,
@@ -74,7 +67,6 @@ public function __construct(
      * Get result document root element \DOMElement
      *
      * @return \DOMElement
-     * @since 2.0.0
      */
     public function getDocumentElement()
     {
@@ -85,7 +77,6 @@ public function getDocumentElement()
      * Append layout configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function appendLayoutConfiguration()
     {
@@ -97,7 +88,6 @@ public function appendLayoutConfiguration()
      * Returns the string representation
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -125,7 +115,6 @@ public function __toString()
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     protected function wrapContent($content)
     {
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index 9b719b4983693..e453db3e20dce 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -14,7 +14,6 @@
  * Backend shipping UPS content block
  *
  * @api
- * @since 2.0.0
  */
 class CarrierConfig extends Template
 {
@@ -22,13 +21,11 @@ class CarrierConfig extends Template
      * Shipping carrier config
      *
      * @var \Magento\Ups\Helper\Config
-     * @since 2.0.0
      */
     protected $carrierConfig;
 
     /**
      * @var \Magento\Store\Model\Website
-     * @since 2.0.0
      */
     protected $_websiteModel;
 
@@ -37,7 +34,6 @@ class CarrierConfig extends Template
      * @param \Magento\Ups\Helper\Config $carrierConfig
      * @param \Magento\Store\Model\Website $websiteModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         TemplateContext $context,
@@ -54,7 +50,6 @@ public function __construct(
      * Get shipping model
      *
      * @return \Magento\Ups\Helper\Config
-     * @since 2.0.0
      */
     public function getCarrierConfig()
     {
@@ -65,7 +60,6 @@ public function getCarrierConfig()
      * Get website model
      *
      * @return \Magento\Store\Model\Website
-     * @since 2.0.0
      */
     public function getWebsiteModel()
     {
@@ -78,7 +72,6 @@ public function getWebsiteModel()
      * @param string $path
      * @param mixed $store
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfig($path, $store = null)
     {
diff --git a/app/code/Magento/Ups/Helper/Config.php b/app/code/Magento/Ups/Helper/Config.php
index baa8bae16fa0b..e299abd80c65b 100644
--- a/app/code/Magento/Ups/Helper/Config.php
+++ b/app/code/Magento/Ups/Helper/Config.php
@@ -9,7 +9,6 @@
  * Configuration data of carrier
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -19,7 +18,6 @@ class Config
      * @param string $type
      * @param string $code
      * @return array|string|false
-     * @since 2.0.0
      */
     public function getCode($type, $code = '')
     {
@@ -42,7 +40,6 @@ public function getCode($type, $code = '')
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function getCodes()
     {
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b1e0b53a15ab6..cd9b9748446a4 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -21,7 +21,6 @@
  * UPS shipping implementation
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Carrier extends AbstractCarrierOnline implements CarrierInterface
 {
@@ -43,7 +42,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Code of the carrier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::CODE;
 
@@ -51,7 +49,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Rate request data
      *
      * @var RateRequest
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -59,7 +56,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Rate result data
      *
      * @var Result
-     * @since 2.0.0
      */
     protected $_result;
 
@@ -67,7 +63,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Base currency rate
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_baseCurrencyRate;
 
@@ -75,7 +70,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Xml access request
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_xmlAccessRequest;
 
@@ -83,7 +77,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Default cgi gateway url
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultCgiGatewayUrl = 'http://www.ups.com:80/using/services/rave/qcostcgi.cgi';
 
@@ -91,7 +84,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Test urls for shipment
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_defaultUrls = [
         'ShipConfirm' => 'https://wwwcie.ups.com/ups.app/xml/ShipConfirm',
@@ -102,7 +94,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Live urls for shipment
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_liveUrls = [
         'ShipConfirm' => 'https://onlinetools.ups.com/ups.app/xml/ShipConfirm',
@@ -113,25 +104,21 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * Container types that could be customized for UPS carrier
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customizableContainerTypes = ['CP', 'CSP'];
 
     /**
      * @var \Magento\Framework\Locale\FormatInterface
-     * @since 2.0.0
      */
     protected $_localeFormat;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $configHelper;
 
@@ -164,7 +151,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -213,7 +199,6 @@ public function __construct(
      *
      * @param RateRequest $request
      * @return  Result|Error|bool
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -237,7 +222,6 @@ public function collectRates(RateRequest $request)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function setRequest(RateRequest $request)
     {
@@ -386,7 +370,6 @@ public function setRequest(RateRequest $request)
      *
      * @param float|int $weight
      * @return float
-     * @since 2.0.0
      */
     protected function _getCorrectWeight($weight)
     {
@@ -406,7 +389,6 @@ protected function _getCorrectWeight($weight)
      * Get result of request
      *
      * @return Result
-     * @since 2.0.0
      */
     public function getResult()
     {
@@ -417,7 +399,6 @@ public function getResult()
      * Do remote request for  and handle errors
      *
      * @return Result|null
-     * @since 2.0.0
      */
     protected function _getQuotes()
     {
@@ -438,7 +419,6 @@ protected function _getQuotes()
      *
      * @param string $freeMethod
      * @return void
-     * @since 2.0.0
      */
     protected function _setFreeMethodRequest($freeMethod)
     {
@@ -455,7 +435,6 @@ protected function _setFreeMethodRequest($freeMethod)
      * Get cgi rates
      *
      * @return Result
-     * @since 2.0.0
      */
     protected function _getCgiQuotes()
     {
@@ -516,7 +495,6 @@ protected function _getCgiQuotes()
      * @param string $code
      * @param string $origin
      * @return array|bool
-     * @since 2.0.0
      */
     public function getShipmentByCode($code, $origin = null)
     {
@@ -537,7 +515,6 @@ public function getShipmentByCode($code, $origin = null)
      * @param string $response
      * @return Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _parseCgiResponse($response)
     {
@@ -610,7 +587,6 @@ protected function _parseCgiResponse($response)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _getXmlQuotes()
     {
@@ -782,7 +758,6 @@ protected function _getXmlQuotes()
      *
      * @param string $code
      * @return float
-     * @since 2.0.0
      */
     protected function _getBaseCurrencyRate($code)
     {
@@ -820,7 +795,6 @@ private function mapCurrencyCode($code)
      * @param mixed $xmlResponse
      * @return Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _parseXmlResponse($xmlResponse)
     {
@@ -924,7 +898,6 @@ protected function _parseXmlResponse($xmlResponse)
      *
      * @param string|string[] $trackings
      * @return Result
-     * @since 2.0.0
      */
     public function getTracking($trackings)
     {
@@ -946,7 +919,6 @@ public function getTracking($trackings)
      * Set xml access request
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setXMLAccessRequest()
     {
@@ -969,7 +941,6 @@ protected function setXMLAccessRequest()
      *
      * @param string[] $trackings
      * @return \Magento\Shipping\Model\Tracking\ResultFactory
-     * @since 2.0.0
      */
     protected function _getCgiTracking($trackings)
     {
@@ -1000,7 +971,6 @@ protected function _getCgiTracking($trackings)
      *
      * @param string[] $trackings
      * @return Result
-     * @since 2.0.0
      */
     protected function _getXmlTracking($trackings)
     {
@@ -1056,7 +1026,6 @@ protected function _getXmlTracking($trackings)
      * @return null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
     {
@@ -1173,7 +1142,6 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
      * Get tracking response
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -1204,7 +1172,6 @@ public function getResponse()
      * Get allowed shipping methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
@@ -1226,7 +1193,6 @@ public function getAllowedMethods()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1450,7 +1416,6 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param Element $shipmentConfirmResponse
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
     {
@@ -1505,7 +1470,6 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
      * Get ship accept url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShipAcceptUrl()
     {
@@ -1524,7 +1488,6 @@ public function getShipAcceptUrl()
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1584,7 +1547,6 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      * Get ship confirm url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getShipConfirmUrl()
     {
@@ -1610,7 +1572,6 @@ public function getShipConfirmUrl()
      * @param \Magento\Framework\DataObject|null $params
      * @return array|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1666,7 +1627,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
      * Return all container types of carrier
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesAll()
     {
@@ -1684,7 +1644,6 @@ public function getContainerTypesAll()
      * Return structured data of containers witch related with shipping methods
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesFilter()
     {
@@ -1696,7 +1655,6 @@ public function getContainerTypesFilter()
      *
      * @param \Magento\Framework\DataObject|null $params
      * @return array|bool
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1725,7 +1683,6 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * Get Container Types, that could be customized for UPS carrier
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCustomizableContainerTypes()
     {
@@ -1744,7 +1701,6 @@ public function getCustomizableContainerTypes()
      *
      * @param string|null $countyDestination
      * @return int|null
-     * @since 2.0.0
      */
     protected function _getDeliveryConfirmationLevel($countyDestination = null)
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Container.php b/app/code/Magento/Ups/Model/Config/Source/Container.php
index 5bf97a6acf733..45424abf1482e 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Container.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Container.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Container
- * @since 2.0.0
  */
 class Container extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,7 +14,6 @@ class Container extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'container_description';
 }
diff --git a/app/code/Magento/Ups/Model/Config/Source/DestType.php b/app/code/Magento/Ups/Model/Config/Source/DestType.php
index 244e8d3214c7d..b8c669904e96d 100644
--- a/app/code/Magento/Ups/Model/Config/Source/DestType.php
+++ b/app/code/Magento/Ups/Model/Config/Source/DestType.php
@@ -7,7 +7,6 @@
 
 /**
  * Class DestType
- * @since 2.0.0
  */
 class DestType extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,7 +14,6 @@ class DestType extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'dest_type_description';
 }
diff --git a/app/code/Magento/Ups/Model/Config/Source/Freemethod.php b/app/code/Magento/Ups/Model/Config/Source/Freemethod.php
index e20d1fefd5b75..ac5ba9bb5d678 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Freemethod.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Freemethod.php
@@ -7,13 +7,11 @@
 
 /**
  * Class Freemethod
- * @since 2.0.0
  */
 class Freemethod extends \Magento\Ups\Model\Config\Source\Method
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Generic.php b/app/code/Magento/Ups/Model/Config/Source/Generic.php
index fd17ed84ed2c2..1a00a0991f529 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Generic.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Generic.php
@@ -9,13 +9,11 @@
 
 /**
  * Generic source model
- * @since 2.0.0
  */
 class Generic implements GenericInterface
 {
     /**
      * @var \Magento\Ups\Helper\Config
-     * @since 2.0.0
      */
     protected $carrierConfig;
 
@@ -23,13 +21,11 @@ class Generic implements GenericInterface
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = '';
 
     /**
      * @param \Magento\Ups\Helper\Config $carrierConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Ups\Helper\Config $carrierConfig)
     {
@@ -40,7 +36,6 @@ public function __construct(\Magento\Ups\Helper\Config $carrierConfig)
      * Returns array to be used in multiselect on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Method.php b/app/code/Magento/Ups/Model/Config/Source/Method.php
index 56f2e00a263f8..291501838a910 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Method.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Method.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Method
- * @since 2.0.0
  */
 class Method extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,7 +14,6 @@ class Method extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'method';
 }
diff --git a/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php b/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
index ab04b288a44b3..faed13bb01658 100644
--- a/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
+++ b/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
@@ -7,7 +7,6 @@
 
 /**
  * Class OriginShipment
- * @since 2.0.0
  */
 class OriginShipment extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,14 +14,12 @@ class OriginShipment extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'originShipment';
 
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Pickup.php b/app/code/Magento/Ups/Model/Config/Source/Pickup.php
index 74d8c91da5c8e..f9293b8973f7e 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Pickup.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Pickup.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Pickup
- * @since 2.0.0
  */
 class Pickup extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,13 +14,11 @@ class Pickup extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'pickup';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Type.php b/app/code/Magento/Ups/Model/Config/Source/Type.php
index 2fe853c2b6172..05e6761e17ce9 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Type.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Type.php
@@ -9,13 +9,11 @@
 
 /**
  * Class Type
- * @since 2.0.0
  */
 class Type implements OptionSourceInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php b/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
index 1edac9d1d6ea9..105e18fbddc77 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Unitofmeasure
- * @since 2.0.0
  */
 class Unitofmeasure extends \Magento\Ups\Model\Config\Source\Generic
 {
@@ -15,14 +14,12 @@ class Unitofmeasure extends \Magento\Ups\Model\Config\Source\Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = 'unit_of_measure';
 
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Edit.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Edit.php
index 59eda648e37d2..c67f6cc74a4ff 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Edit.php
@@ -7,13 +7,11 @@
 
 /**
  * Block for Catalog Category URL rewrites
- * @since 2.0.0
  */
 class Edit extends \Magento\UrlRewrite\Block\Edit
 {
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
@@ -23,7 +21,6 @@ class Edit extends \Magento\UrlRewrite\Block\Edit
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Prepare layout for URL rewrite creating for category
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayoutFeatures()
     {
@@ -66,7 +62,6 @@ protected function _prepareLayoutFeatures()
      * Get or create new instance of category
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     private function _getCategory()
     {
@@ -80,7 +75,6 @@ private function _getCategory()
      * Add child category link block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCategoryLinkBlock()
     {
@@ -99,7 +93,6 @@ private function _addCategoryLinkBlock()
      * Add child category tree block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCategoryTreeBlock()
     {
@@ -110,7 +103,6 @@ private function _addCategoryTreeBlock()
      * Creates edit form block
      *
      * @return \Magento\UrlRewrite\Block\Catalog\Edit\Form
-     * @since 2.0.0
      */
     protected function _createEditFormBlock()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
index be5c38d0bccb7..a726b974eb324 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -13,7 +13,6 @@
  * Categories tree block for URL rewrites editing process
  *
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
 {
@@ -21,13 +20,11 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * List of allowed category ids
      *
      * @var []
-     * @since 2.0.0
      */
     protected $_allowedCategoryIds = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'categories.phtml';
 
@@ -35,31 +32,26 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var CategoryRepositoryInterface
-     * @since 2.0.0
      */
     protected $categoryRepository;
 
@@ -73,7 +65,6 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -101,7 +92,6 @@ public function __construct(
      * @param bool $asJson
      * @param int $recursionLevel
      * @return array
-     * @since 2.0.0
      */
     public function getTreeArray($parentId = null, $asJson = false, $recursionLevel = 3)
     {
@@ -142,7 +132,6 @@ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel
      * Get categories collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Category\Collection
-     * @since 2.0.0
      */
     public function getCategoryCollection()
     {
@@ -164,7 +153,6 @@ public function getCategoryCollection()
      *
      * @param  \Magento\Framework\Data\Tree\Node $node
      * @return array
-     * @since 2.0.0
      */
     protected function _getNodesArray($node)
     {
@@ -198,7 +186,6 @@ protected function _getNodesArray($node)
      * Get URL for categories tree ajax loader
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLoadTreeUrl()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
index 67dd3e6823259..ea5867ef666f4 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
@@ -14,31 +14,26 @@
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Form extends \Magento\UrlRewrite\Block\Edit\Form
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
@@ -57,7 +52,6 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -94,7 +88,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form $form
      * @return $this
-     * @since 2.0.0
      */
     protected function _formPostInit($form)
     {
@@ -152,7 +145,6 @@ protected function _formPostInit($form)
      * @param \Magento\Catalog\Model\Product|null $product
      * @param \Magento\Catalog\Model\Category|null $category
      * @return string
-     * @since 2.0.0
      */
     protected function getRequestPath($product = null, $category = null)
     {
@@ -165,7 +157,6 @@ protected function getRequestPath($product = null, $category = null)
      * @param \Magento\Catalog\Model\Product|null $product
      * @param \Magento\Catalog\Model\Category|null $category
      * @return string
-     * @since 2.0.0
      */
     protected function getTargetPath($product = null, $category = null)
     {
@@ -179,7 +170,6 @@ protected function getTargetPath($product = null, $category = null)
      *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getEntityStores()
     {
@@ -222,7 +212,6 @@ protected function _getEntityStores()
      * Get product model instance
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     protected function _getProduct()
     {
@@ -236,7 +225,6 @@ protected function _getProduct()
      * Get category model instance
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     protected function _getCategory()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
index 0730f77188815..fa06a47bb56ff 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
@@ -7,19 +7,16 @@
 
 /**
  * Block for Catalog Category URL rewrites editing
- * @since 2.0.0
  */
 class Edit extends \Magento\UrlRewrite\Block\Edit
 {
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Catalog\Model\CategoryFactory
-     * @since 2.0.0
      */
     protected $_categoryFactory;
 
@@ -30,7 +27,6 @@ class Edit extends \Magento\UrlRewrite\Block\Edit
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -49,7 +45,6 @@ public function __construct(
      * Prepare layout for URL rewrite creating for product
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayoutFeatures()
     {
@@ -94,7 +89,6 @@ protected function _prepareLayoutFeatures()
      * Get or create new instance of product
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     private function _getProduct()
     {
@@ -108,7 +102,6 @@ private function _getProduct()
      * Get or create new instance of category
      *
      * @return \Magento\Catalog\Model\Category
-     * @since 2.0.0
      */
     private function _getCategory()
     {
@@ -122,7 +115,6 @@ private function _getCategory()
      * Add child product link block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addProductLinkBlock()
     {
@@ -141,7 +133,6 @@ private function _addProductLinkBlock()
      * Add child category link block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCategoryLinkBlock()
     {
@@ -163,7 +154,6 @@ private function _addCategoryLinkBlock()
      * Add child products grid block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addProductsGridBlock()
     {
@@ -174,7 +164,6 @@ private function _addProductsGridBlock()
      * Add child Categories Tree block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCategoriesTreeBlock()
     {
@@ -185,7 +174,6 @@ private function _addCategoriesTreeBlock()
      * Add child Skip Categories block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addSkipCategoriesBlock()
     {
@@ -208,7 +196,6 @@ private function _addSkipCategoriesBlock()
      * Creates edit form block
      *
      * @return \Magento\UrlRewrite\Block\Catalog\Edit\Form
-     * @since 2.0.0
      */
     protected function _createEditFormBlock()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
index 1df7c0944247d..cac5752ac3bda 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
      * Disable massaction
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -29,7 +27,6 @@ protected function _prepareMassaction()
      * Prepare columns layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -63,7 +60,6 @@ protected function _prepareColumns()
      * Get URL for dispatching grid ajax requests
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -75,7 +71,6 @@ public function getGridUrl()
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit.php
index 21b9305cdb21a..c66d1064eff5d 100644
--- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit.php
@@ -7,13 +7,11 @@
 
 /**
  * Block for CMS pages URL rewrites
- * @since 2.0.0
  */
 class Edit extends \Magento\UrlRewrite\Block\Edit
 {
     /**
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
@@ -23,7 +21,6 @@ class Edit extends \Magento\UrlRewrite\Block\Edit
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Prepare layout for URL rewrite creating for CMS page
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayoutFeatures()
     {
@@ -66,7 +62,6 @@ protected function _prepareLayoutFeatures()
      * Get or create new instance of CMS page
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     private function _getCmsPage()
     {
@@ -80,7 +75,6 @@ private function _getCmsPage()
      * Add child CMS page link block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCmsPageLinkBlock()
     {
@@ -99,7 +93,6 @@ private function _addCmsPageLinkBlock()
      * Add child CMS page block
      *
      * @return void
-     * @since 2.0.0
      */
     private function _addCmsPageGridBlock()
     {
@@ -110,7 +103,6 @@ private function _addCmsPageGridBlock()
      * Creates edit form block
      *
      * @return \Magento\UrlRewrite\Block\Cms\Page\Edit\Form
-     * @since 2.0.0
      */
     protected function _createEditFormBlock()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
index 856ccfe080ec2..39d55098e120e 100644
--- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
@@ -10,19 +10,16 @@
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Form extends \Magento\UrlRewrite\Block\Edit\Form
 {
     /**
      * @var \Magento\Cms\Model\PageFactory
-     * @since 2.0.0
      */
     protected $_pageFactory;
 
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator
-     * @since 2.0.0
      */
     protected $cmsPageUrlPathGenerator;
 
@@ -39,7 +36,6 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -72,7 +68,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Data\Form $form
      * @return \Magento\UrlRewrite\Block\Cms\Page\Edit\Form
-     * @since 2.0.0
      */
     protected function _formPostInit($form)
     {
@@ -107,7 +102,6 @@ protected function _formPostInit($form)
      *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getEntityStores()
     {
@@ -133,7 +127,6 @@ protected function _getEntityStores()
      * Get CMS page model instance
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected function _getCmsPage()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
index 22ed8f055fd6e..1768ab03d513d 100644
--- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
+++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
@@ -10,7 +10,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Grid extends \Magento\Cms\Block\Adminhtml\Page\Grid
 {
@@ -18,7 +17,6 @@ class Grid extends \Magento\Cms\Block\Adminhtml\Page\Grid
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -30,7 +28,6 @@ public function _construct()
      * Disable massaction
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareMassaction()
     {
@@ -41,7 +38,6 @@ protected function _prepareMassaction()
      * Prepare columns layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -81,7 +77,6 @@ protected function _prepareColumns()
      * Get URL for dispatching grid ajax requests
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -93,7 +88,6 @@ public function getGridUrl()
      *
      * @param \Magento\Cms\Model\Page|\Magento\Framework\DataObject $row
      * @return string
-     * @since 2.0.0
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
index 0a3481a0cad2b..7311efeb114c1 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit.php
@@ -7,13 +7,11 @@
 
 /**
  * Block for URL rewrites edit page
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Container
 {
     /**
      * @var \Magento\UrlRewrite\Block\Selector
-     * @since 2.0.0
      */
     private $_selectorBlock;
 
@@ -21,7 +19,6 @@ class Edit extends \Magento\Backend\Block\Widget\Container
      * Part for building some blocks names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_controller = 'url_rewrite';
 
@@ -29,7 +26,6 @@ class Edit extends \Magento\Backend\Block\Widget\Container
      * Generated buttons html cache
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_buttonsHtml;
 
@@ -37,13 +33,11 @@ class Edit extends \Magento\Backend\Block\Widget\Container
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $_rewriteFactory;
 
@@ -52,7 +46,6 @@ class Edit extends \Magento\Backend\Block\Widget\Container
      * @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -69,7 +62,6 @@ public function __construct(
      * Prepare URL rewrite editing layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -85,7 +77,6 @@ protected function _prepareLayout()
      * Prepare featured blocks for layout of URL rewrite editing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayoutFeatures()
     {
@@ -103,7 +94,6 @@ protected function _prepareLayoutFeatures()
      * Add child edit form block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addEditFormBlock()
     {
@@ -121,7 +111,6 @@ protected function _addEditFormBlock()
      * Add reset button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addResetButton()
     {
@@ -140,7 +129,6 @@ protected function _addResetButton()
      * Add back button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addBackButton()
     {
@@ -160,7 +148,6 @@ protected function _addBackButton()
      *
      * @param string $link
      * @return void
-     * @since 2.0.0
      */
     protected function _updateBackButtonLink($link)
     {
@@ -171,7 +158,6 @@ protected function _updateBackButtonLink($link)
      * Add delete button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addDeleteButton()
     {
@@ -198,7 +184,6 @@ protected function _addDeleteButton()
      * Add save button
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addSaveButton()
     {
@@ -219,7 +204,6 @@ protected function _addSaveButton()
      * Creates edit form block
      *
      * @return \Magento\UrlRewrite\Block\Edit\Form
-     * @since 2.0.0
      */
     protected function _createEditFormBlock()
     {
@@ -234,7 +218,6 @@ protected function _createEditFormBlock()
      * Add child URL rewrite selector block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _addUrlRewriteSelectorBlock()
     {
@@ -245,7 +228,6 @@ protected function _addUrlRewriteSelectorBlock()
      * Get selector block
      *
      * @return \Magento\UrlRewrite\Block\Selector
-     * @since 2.0.0
      */
     private function _getSelectorBlock()
     {
@@ -264,7 +246,6 @@ private function _getSelectorBlock()
      * @param null $area
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getButtonsHtml($area = null)
     {
@@ -285,7 +266,6 @@ public function getButtonsHtml($area = null)
      * Get or create new instance of URL rewrite
      *
      * @return \Magento\UrlRewrite\Model\UrlRewrite
-     * @since 2.0.0
      */
     protected function _getUrlRewrite()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Edit/Form.php
index ae086b9acb46d..65312c9cc01b8 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit/Form.php
@@ -9,31 +9,26 @@
  * URL rewrites edit form
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_sessionData = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_allStores = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_requireStoresFilter = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_formValues = [];
 
@@ -41,25 +36,21 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Adminhtml data
      *
      * @var \Magento\Backend\Helper\Data
-     * @since 2.0.0
      */
     protected $_adminhtmlData = null;
 
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_systemStore;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $_rewriteFactory;
 
     /**
      * @var \Magento\UrlRewrite\Model\OptionProvider
-     * @since 2.0.0
      */
     protected $optionProvider;
 
@@ -72,7 +63,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -95,7 +85,6 @@ public function __construct(
      * Set form id and title
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -109,7 +98,6 @@ protected function _construct()
      * Set form data either from model values or from session
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
@@ -141,7 +129,6 @@ protected function _initFormValues()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -237,7 +224,6 @@ protected function _prepareForm()
      *
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareStoreElement($fieldset)
     {
@@ -282,7 +268,6 @@ protected function _prepareStoreElement($fieldset)
      *
      * @param \Magento\Framework\Data\Form $form
      * @return $this
-     * @since 2.0.0
      */
     protected function _formPostInit($form)
     {
@@ -296,7 +281,6 @@ protected function _formPostInit($form)
      * Get session data
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSessionData()
     {
@@ -310,7 +294,6 @@ protected function _getSessionData()
      * Get URL rewrite model instance
      *
      * @return \Magento\UrlRewrite\Model\UrlRewrite
-     * @since 2.0.0
      */
     protected function _getModel()
     {
@@ -324,7 +307,6 @@ protected function _getModel()
      * Get request stores
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAllStores()
     {
@@ -339,7 +321,6 @@ protected function _getAllStores()
      * Get entity stores
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getEntityStores()
     {
@@ -353,7 +334,6 @@ protected function _getEntityStores()
      *
      * @param array $entityStores
      * @return array
-     * @since 2.0.0
      */
     private function _getStoresListRestrictedByEntityStores(array $entityStores)
     {
diff --git a/app/code/Magento/UrlRewrite/Block/GridContainer.php b/app/code/Magento/UrlRewrite/Block/GridContainer.php
index 652b813786225..a0878c577c2be 100644
--- a/app/code/Magento/UrlRewrite/Block/GridContainer.php
+++ b/app/code/Magento/UrlRewrite/Block/GridContainer.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class GridContainer extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -15,13 +14,11 @@ class GridContainer extends \Magento\Backend\Block\Widget\Grid\Container
      * Part for generating appropriate grid block name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_controller = 'url_rewrite';
 
     /**
      * @var \Magento\UrlRewrite\Block\Selector
-     * @since 2.0.0
      */
     protected $_urlrewriteSelector;
 
@@ -29,7 +26,6 @@ class GridContainer extends \Magento\Backend\Block\Widget\Grid\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param Selector $urlrewriteSelector
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -44,7 +40,6 @@ public function __construct(
      * Set custom labels and headers
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +52,6 @@ protected function _construct()
      * Customize grid row URLs
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Link.php b/app/code/Magento/UrlRewrite/Block/Link.php
index 673bd3a710494..17adf6bba7c01 100644
--- a/app/code/Magento/UrlRewrite/Block/Link.php
+++ b/app/code/Magento/UrlRewrite/Block/Link.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\UrlRewrite\Block\Link
  *
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -24,7 +23,6 @@ class Link extends \Magento\Framework\View\Element\AbstractBlock
      * Render output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
index 753bc5767b3af..581a50090cbd3 100644
--- a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
+++ b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\UrlRewrite\Block\Plugin\Store\Switcher\SetRedirectUrl
  *
- * @since 2.0.0
  */
 class SetRedirectUrl
 {
     /**
      * @var \Magento\Framework\Url\Helper\Data
-     * @since 2.0.0
      */
     private $urlHelper;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     private $urlBuilder;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     private $urlFinder;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     private $request;
 
@@ -48,7 +43,6 @@ class SetRedirectUrl
      * @param UrlInterface $urlBuilder
      * @param UrlFinderInterface $urlFinder
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         UrlHelper $urlHelper,
@@ -70,7 +64,6 @@ public function __construct(
      * @param array $data
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function beforeGetTargetStorePostData(
         \Magento\Store\Block\Switcher $switcher,
@@ -92,7 +85,6 @@ public function beforeGetTargetStorePostData(
     /**
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     private function trimSlashInPath($path)
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 6c4f33f97dc3f..013d403892b92 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\UrlRewrite\Block\Selector
  *
- * @since 2.0.0
  */
 class Selector extends \Magento\Backend\Block\Template
 {
@@ -17,13 +16,11 @@ class Selector extends \Magento\Backend\Block\Template
      * key => label
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_modes;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'selector.phtml';
 
@@ -31,7 +28,6 @@ class Selector extends \Magento\Backend\Block\Template
      * Set block template and get available modes
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -47,7 +43,6 @@ protected function _construct()
      * Available modes getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getModes()
     {
@@ -58,7 +53,6 @@ public function getModes()
      * Label getter
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getSelectorLabel()
     {
@@ -70,7 +64,6 @@ public function getSelectorLabel()
      *
      * @param string $mode
      * @return bool
-     * @since 2.0.0
      */
     public function isMode($mode)
     {
@@ -81,7 +74,6 @@ public function isMode($mode)
      * Get default mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultMode()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite.php
index a9db7dfbd25f8..0fe2d1f9f95d7 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite.php
@@ -11,7 +11,6 @@
 
 /**
  * URL rewrite adminhtml controller
- * @since 2.0.0
  */
 abstract class Rewrite extends Action
 {
@@ -31,27 +30,21 @@ abstract class Rewrite extends Action
     const ENTITY_TYPE_CMS_PAGE = 'cms-page';
     /**#@-*/
 
-    /**
-     * @var Product
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_product;
 
     /**
      * @var Category
-     * @since 2.0.0
      */
     protected $_category;
 
     /**
      * @var \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected $_cmsPage;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlRewrite
-     * @since 2.0.0
      */
     protected $_urlRewrite;
 
@@ -59,7 +52,6 @@ abstract class Rewrite extends Action
      * Get Category from request
      *
      * @return Category
-     * @since 2.0.0
      */
     protected function _getCategory()
     {
@@ -86,7 +78,6 @@ protected function _getCategory()
      * Get Product from request
      *
      * @return Product
-     * @since 2.0.0
      */
     protected function _getProduct()
     {
@@ -108,7 +99,6 @@ protected function _getProduct()
      * Get CMS page from request
      *
      * @return \Magento\Cms\Model\Page
-     * @since 2.0.0
      */
     protected function _getCmsPage()
     {
@@ -130,7 +120,6 @@ protected function _getCmsPage()
      * Get URL rewrite from request
      *
      * @return \Magento\UrlRewrite\Model\UrlRewrite
-     * @since 2.0.0
      */
     protected function _getUrlRewrite()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php
index a9e851e7d6e8e..04b7ae0eaeba1 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\CategoriesJson
  *
- * @since 2.0.0
  */
 class CategoriesJson extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -17,7 +16,6 @@ class CategoriesJson extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrit
      * Ajax categories tree loader action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
index 755b390e2d81f..f3e4d8eb76c4b 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\CmsPageGrid
  *
- * @since 2.0.0
  */
 class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -17,7 +16,6 @@ class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * Ajax CMS pages grid action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
index 6b23658e328af..f274c268f689a 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * URL rewrite delete action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
index 6964198d6e96b..d76dd42a1b709 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -26,7 +25,6 @@ class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * Get current mode
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getMode()
     {
@@ -48,7 +46,6 @@ protected function _getMode()
      * Show urlrewrite edit/create page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
index f0f164a5f7946..d5348887348be 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * Show URL rewrites index page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php
index ba7c5417c5737..fe1379b3d6ba5 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\ProductGrid
  *
- * @since 2.0.0
  */
 class ProductGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
@@ -17,7 +16,6 @@ class ProductGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * Ajax products grid action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
index 4832cf9010847..203b44784efc3 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
-     * @since 2.0.0
      */
     protected $productUrlPathGenerator;
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-     * @since 2.0.0
      */
     protected $categoryUrlPathGenerator;
 
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator
-     * @since 2.0.0
      */
     protected $cmsPageUrlPathGenerator;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
@@ -47,7 +42,6 @@ class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
      * @param UrlFinderInterface $urlFinder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -69,7 +63,6 @@ public function __construct(
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _handleCatalogUrlRewrite($model)
     {
@@ -93,7 +86,6 @@ protected function _handleCatalogUrlRewrite($model)
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function getTargetPath($model)
     {
@@ -119,7 +111,6 @@ protected function getTargetPath($model)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getCanonicalTargetPath()
     {
@@ -135,7 +126,6 @@ protected function getCanonicalTargetPath()
      *
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
      * @return void
-     * @since 2.0.0
      */
     private function _handleCmsPageUrlRewrite($model)
     {
@@ -155,7 +145,6 @@ private function _handleCmsPageUrlRewrite($model)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 27c8af7296894..66ba3d9bbabe1 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -14,37 +14,31 @@
  * UrlRewrite Controller Router
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Router implements \Magento\Framework\App\RouterInterface
 {
     /**
      * @var \Magento\Framework\App\ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $response;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @since 2.0.0
      */
     protected $urlFinder;
 
@@ -54,7 +48,6 @@ class Router implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param UrlFinderInterface $urlFinder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ActionFactory $actionFactory,
@@ -75,7 +68,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ActionInterface|null
-     * @since 2.0.0
      */
     public function match(\Magento\Framework\App\RequestInterface $request)
     {
@@ -114,7 +106,6 @@ public function match(\Magento\Framework\App\RequestInterface $request)
      * @param \Magento\Framework\App\RequestInterface $request
      * @param UrlRewrite $rewrite
      * @return \Magento\Framework\App\ActionInterface|null
-     * @since 2.0.0
      */
     protected function processRedirect($request, $rewrite)
     {
@@ -132,7 +123,6 @@ protected function processRedirect($request, $rewrite)
      * @param string $url
      * @param int $code
      * @return \Magento\Framework\App\ActionInterface
-     * @since 2.0.0
      */
     protected function redirect($request, $url, $code)
     {
@@ -145,7 +135,6 @@ protected function redirect($request, $url, $code)
      * @param string $requestPath
      * @param int $storeId
      * @return UrlRewrite|null
-     * @since 2.0.0
      */
     protected function getRewrite($requestPath, $storeId)
     {
diff --git a/app/code/Magento/UrlRewrite/Helper/UrlRewrite.php b/app/code/Magento/UrlRewrite/Helper/UrlRewrite.php
index 0553dbc1b0298..8cddc6fea1c9f 100644
--- a/app/code/Magento/UrlRewrite/Helper/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Helper/UrlRewrite.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\UrlRewrite\Helper\UrlRewrite
  *
- * @since 2.0.0
  */
 class UrlRewrite extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -30,7 +29,6 @@ class UrlRewrite extends \Magento\Framework\App\Helper\AbstractHelper
      * @param string $requestPath
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _validateRequestPath($requestPath)
     {
@@ -53,7 +51,6 @@ protected function _validateRequestPath($requestPath)
      * @param string $requestPath
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function validateRequestPath($requestPath)
     {
@@ -72,7 +69,6 @@ public function validateRequestPath($requestPath)
      * @param string $suffix
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function validateSuffix($suffix)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/OptionProvider.php b/app/code/Magento/UrlRewrite/Model/OptionProvider.php
index c5ce4780e04e9..ec70dad90e7cc 100644
--- a/app/code/Magento/UrlRewrite/Model/OptionProvider.php
+++ b/app/code/Magento/UrlRewrite/Model/OptionProvider.php
@@ -11,7 +11,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class OptionProvider implements ArrayInterface
 {
@@ -27,7 +26,6 @@ class OptionProvider implements ArrayInterface
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
index 5fba9481dbfdf..15a6a33d682ea 100644
--- a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\UrlRewrite\Model\ResourceModel\UrlRewrite
  *
- * @since 2.0.0
  */
 class UrlRewrite extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class UrlRewrite extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -29,7 +27,6 @@ protected function _construct()
      * Initialize array fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -46,7 +43,6 @@ protected function _initUniqueFields()
      * @param mixed $value
      * @param \Magento\UrlRewrite\Model\UrlRewrite $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewriteCollection.php b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewriteCollection.php
index bb2017715edbb..14809e1155aaf 100644
--- a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewriteCollection.php
+++ b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewriteCollection.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection
  *
- * @since 2.0.0
  */
 class UrlRewriteCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class UrlRewriteCollection extends \Magento\Framework\Model\ResourceModel\Db\Col
      * Store Manager Model
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -30,7 +28,6 @@ class UrlRewriteCollection extends \Magento\Framework\Model\ResourceModel\Db\Col
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -49,7 +46,6 @@ public function __construct(
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -66,7 +62,6 @@ protected function _construct()
      * @param bool $withAdmin
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function addStoreFilter($store, $withAdmin = true)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
index cbc46afd65c2d..3d9ed0dc57e9c 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
@@ -11,26 +11,22 @@
 
 /**
  * Abstract db storage
- * @since 2.0.0
  */
 abstract class AbstractStorage implements StorageInterface
 {
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory
-     * @since 2.0.0
      */
     protected $urlRewriteFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
-     * @since 2.0.0
      */
     protected $dataObjectHelper;
 
     /**
      * @param UrlRewriteFactory $urlRewriteFactory
      * @param DataObjectHelper $dataObjectHelper
-     * @since 2.0.0
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -42,7 +38,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function findAllByData(array $data)
     {
@@ -60,13 +55,11 @@ public function findAllByData(array $data)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     abstract protected function doFindAllByData(array $data);
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function findOneByData(array $data)
     {
@@ -80,13 +73,11 @@ public function findOneByData(array $data)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     abstract protected function doFindOneByData(array $data);
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function replace(array $urls)
     {
@@ -102,7 +93,6 @@ public function replace(array $urls)
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urls
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
      * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException|\Exception
-     * @since 2.0.0
      */
     abstract protected function doReplace(array $urls);
 
@@ -111,7 +101,6 @@ abstract protected function doReplace(array $urls);
      *
      * @param array $data
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite
-     * @since 2.0.0
      */
     protected function createUrlRewrite($data)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index ef19dbd30c43c..77a53098f310d 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\UrlRewrite\Model\Storage\DbStorage
  *
- * @since 2.0.0
  */
 class DbStorage extends AbstractStorage
 {
@@ -32,13 +31,11 @@ class DbStorage extends AbstractStorage
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -53,7 +50,6 @@ class DbStorage extends AbstractStorage
      * @param DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Psr\Log\LoggerInterface|null $logger
-     * @since 2.0.0
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -74,7 +70,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function prepareSelect(array $data)
     {
@@ -89,7 +84,6 @@ protected function prepareSelect(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doFindAllByData(array $data)
     {
@@ -98,7 +92,6 @@ protected function doFindAllByData(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doFindOneByData(array $data)
     {
@@ -154,7 +147,6 @@ protected function doFindOneByData(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doReplace(array $urls)
     {
@@ -204,7 +196,6 @@ protected function doReplace(array $urls)
      * @return void
      * @throws \Magento\Framework\Exception\AlreadyExistsException|\Exception
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function insertMultiple($data)
     {
@@ -228,7 +219,6 @@ protected function insertMultiple($data)
      *
      * @param UrlRewrite[] $urls
      * @return array
-     * @since 2.0.0
      */
     protected function createFilterDataBasedOnUrls($urls)
     {
@@ -247,7 +237,6 @@ protected function createFilterDataBasedOnUrls($urls)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteByData(array $data)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/StorageInterface.php b/app/code/Magento/UrlRewrite/Model/StorageInterface.php
index b6abc73d752ff..461f6a672cdfe 100644
--- a/app/code/Magento/UrlRewrite/Model/StorageInterface.php
+++ b/app/code/Magento/UrlRewrite/Model/StorageInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface StorageInterface extends UrlFinderInterface, UrlPersistInterface
 {
diff --git a/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php b/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php
index 498c4b13be3e3..6c084c147e28f 100644
--- a/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php
+++ b/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Url Finder Interface
  * @api
- * @since 2.0.0
  */
 interface UrlFinderInterface
 {
@@ -17,7 +16,6 @@ interface UrlFinderInterface
      *
      * @param array $data
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
-     * @since 2.0.0
      */
     public function findOneByData(array $data);
 
@@ -26,7 +24,6 @@ public function findOneByData(array $data);
      *
      * @param array $data
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @since 2.0.0
      */
     public function findAllByData(array $data);
 }
diff --git a/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php b/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php
index dc72e31005eec..3a36b870b30b4 100644
--- a/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php
+++ b/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php
@@ -8,7 +8,6 @@
 /**
  * Url Persist Interface
  * @api
- * @since 2.0.0
  */
 interface UrlPersistInterface
 {
@@ -18,7 +17,6 @@ interface UrlPersistInterface
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urls
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
      * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException|\Exception
-     * @since 2.0.0
      */
     public function replace(array $urls);
 
@@ -28,7 +26,6 @@ public function replace(array $urls);
      * @param array $data
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function deleteByData(array $data);
 }
diff --git a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
index f9538789ed336..12108c08c2c5d 100644
--- a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
@@ -22,7 +22,6 @@
  * @method UrlRewrite setRedirectType($value)
  * @method UrlRewrite setStoreId($value)
  * @method UrlRewrite setDescription($value)
- * @since 2.0.0
  */
 class UrlRewrite extends \Magento\Framework\Model\AbstractModel
 {
@@ -58,7 +57,6 @@ public function __construct(
      * Initialize corresponding resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -69,7 +67,6 @@ protected function _construct()
     /**
      * @return array
      * @api
-     * @since 2.0.0
      */
     public function getMetadata()
     {
diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
index b4bd3f9de514d..be81aa1760f21 100644
--- a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
@@ -12,7 +12,6 @@
 /**
  * Data abstract class for url storage
  * @api
- * @since 2.0.0
  */
 class UrlRewrite extends AbstractSimpleObject
 {
@@ -31,10 +30,7 @@ class UrlRewrite extends AbstractSimpleObject
     const METADATA = 'metadata';
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $defaultValues = [
         self::REDIRECT_TYPE => 0,
         self::IS_AUTOGENERATED => 1,
@@ -68,7 +64,6 @@ public function __construct(
      *
      * @param string $key
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getByKey($key)
     {
@@ -77,7 +72,6 @@ public function getByKey($key)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getUrlRewriteId()
     {
@@ -87,7 +81,6 @@ public function getUrlRewriteId()
     /**
      * @param int $urlRewriteId
      * @return int
-     * @since 2.0.0
      */
     public function setUrlRewriteId($urlRewriteId)
     {
@@ -96,7 +89,6 @@ public function setUrlRewriteId($urlRewriteId)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getEntityId()
     {
@@ -107,7 +99,6 @@ public function getEntityId()
      * @param int $entityId
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId)
     {
@@ -116,7 +107,6 @@ public function setEntityId($entityId)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEntityType()
     {
@@ -127,7 +117,6 @@ public function getEntityType()
      * @param string $entityType
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityType($entityType)
     {
@@ -136,7 +125,6 @@ public function setEntityType($entityType)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getIsAutogenerated()
     {
@@ -148,7 +136,6 @@ public function getIsAutogenerated()
      * @param int $isAutogenerated
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setIsAutogenerated($isAutogenerated)
     {
@@ -157,7 +144,6 @@ public function setIsAutogenerated($isAutogenerated)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRequestPath()
     {
@@ -168,7 +154,6 @@ public function getRequestPath()
      * @param string $requestPath
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestPath($requestPath)
     {
@@ -177,7 +162,6 @@ public function setRequestPath($requestPath)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTargetPath()
     {
@@ -188,7 +172,6 @@ public function getTargetPath()
      * @param string $targetPath
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setTargetPath($targetPath)
     {
@@ -197,7 +180,6 @@ public function setTargetPath($targetPath)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -208,7 +190,6 @@ public function getStoreId()
      * @param int $storeId
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -217,7 +198,6 @@ public function setStoreId($storeId)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRedirectType()
     {
@@ -228,7 +208,6 @@ public function getRedirectType()
      * @param int $redirectCode
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRedirectType($redirectCode)
     {
@@ -237,7 +216,6 @@ public function setRedirectType($redirectCode)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -248,7 +226,6 @@ public function getDescription()
      * @param string $description
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -257,7 +234,6 @@ public function setDescription($description)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMetadata()
     {
@@ -269,7 +245,6 @@ public function getMetadata()
      * @param array|string $metadata
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setMetadata($metadata)
     {
@@ -283,7 +258,6 @@ public function setMetadata($metadata)
      * Convert UrlRewrite to array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
diff --git a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php b/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
index 62b22a4c0b184..a7b9ee22d14cd 100644
--- a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
+++ b/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/User/Api/Data/UserInterface.php b/app/code/Magento/User/Api/Data/UserInterface.php
index af82049484241..1c00c4575606a 100644
--- a/app/code/Magento/User/Api/Data/UserInterface.php
+++ b/app/code/Magento/User/Api/Data/UserInterface.php
@@ -9,7 +9,6 @@
  * Admin user interface.
  *
  * @api
- * @since 2.0.0
  */
 interface UserInterface
 {
@@ -17,7 +16,6 @@ interface UserInterface
      * Get ID.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -26,7 +24,6 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 
@@ -34,7 +31,6 @@ public function setId($id);
      * Get first name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFirstName();
 
@@ -43,7 +39,6 @@ public function getFirstName();
      *
      * @param string $firstName
      * @return $this
-     * @since 2.0.0
      */
     public function setFirstName($firstName);
 
@@ -51,7 +46,6 @@ public function setFirstName($firstName);
      * Get last name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLastName();
 
@@ -60,7 +54,6 @@ public function getLastName();
      *
      * @param string $lastName
      * @return $this
-     * @since 2.0.0
      */
     public function setLastName($lastName);
 
@@ -68,7 +61,6 @@ public function setLastName($lastName);
      * Get email.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEmail();
 
@@ -77,7 +69,6 @@ public function getEmail();
      *
      * @param string $email
      * @return $this
-     * @since 2.0.0
      */
     public function setEmail($email);
 
@@ -85,7 +76,6 @@ public function setEmail($email);
      * Get user name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUserName();
 
@@ -94,7 +84,6 @@ public function getUserName();
      *
      * @param string $userName
      * @return $this
-     * @since 2.0.0
      */
     public function setUserName($userName);
 
@@ -102,7 +91,6 @@ public function setUserName($userName);
      * Get password or password hash.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPassword();
 
@@ -111,7 +99,6 @@ public function getPassword();
      *
      * @param string $password
      * @return $this
-     * @since 2.0.0
      */
     public function setPassword($password);
 
@@ -119,7 +106,6 @@ public function setPassword($password);
      * Get user record creation date.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreated();
 
@@ -128,7 +114,6 @@ public function getCreated();
      *
      * @param string $created
      * @return $this
-     * @since 2.0.0
      */
     public function setCreated($created);
 
@@ -136,7 +121,6 @@ public function setCreated($created);
      * Get user record modification date.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModified();
 
@@ -145,7 +129,6 @@ public function getModified();
      *
      * @param string $modified
      * @return $this
-     * @since 2.0.0
      */
     public function setModified($modified);
 
@@ -153,7 +136,6 @@ public function setModified($modified);
      * Check if user is active.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getIsActive();
 
@@ -162,7 +144,6 @@ public function getIsActive();
      *
      * @param int $isActive
      * @return $this
-     * @since 2.0.0
      */
     public function setIsActive($isActive);
 
@@ -170,7 +151,6 @@ public function setIsActive($isActive);
      * Get user interface locale.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInterfaceLocale();
 
@@ -179,7 +159,6 @@ public function getInterfaceLocale();
      *
      * @param string $interfaceLocale
      * @return $this
-     * @since 2.0.0
      */
     public function setInterfaceLocale($interfaceLocale);
 }
diff --git a/app/code/Magento/User/Block/Adminhtml/Locks.php b/app/code/Magento/User/Block/Adminhtml/Locks.php
index ee9ffd83437bc..343c1c4d11fc3 100644
--- a/app/code/Magento/User/Block/Adminhtml/Locks.php
+++ b/app/code/Magento/User/Block/Adminhtml/Locks.php
@@ -10,7 +10,6 @@
  * Locked administrators page
  *
  * @api
- * @since 2.0.0
  */
 class Locks extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -18,7 +17,6 @@ class Locks extends \Magento\Backend\Block\Widget\Grid\Container
      * {@inheritdoc}
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/User/Block/Buttons.php b/app/code/Magento/User/Block/Buttons.php
index f9bf21b582389..286e67f25cb55 100644
--- a/app/code/Magento/User/Block/Buttons.php
+++ b/app/code/Magento/User/Block/Buttons.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Buttons extends \Magento\Backend\Block\Template
 {
@@ -15,7 +14,6 @@ class Buttons extends \Magento\Backend\Block\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -23,7 +21,6 @@ class Buttons extends \Magento\Backend\Block\Template
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -89,7 +85,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getBackButtonHtml()
     {
@@ -98,7 +93,6 @@ public function getBackButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getResetButtonHtml()
     {
@@ -107,7 +101,6 @@ public function getResetButtonHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getSaveButtonHtml()
     {
@@ -116,7 +109,6 @@ public function getSaveButtonHtml()
 
     /**
      * @return string|void
-     * @since 2.0.0
      */
     public function getDeleteButtonHtml()
     {
@@ -128,7 +120,6 @@ public function getDeleteButtonHtml()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getUser()
     {
diff --git a/app/code/Magento/User/Block/Role.php b/app/code/Magento/User/Block/Role.php
index 3d18d5ee0ba90..c61e79b3d80e3 100644
--- a/app/code/Magento/User/Block/Role.php
+++ b/app/code/Magento/User/Block/Role.php
@@ -10,19 +10,16 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Role extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_controller = 'user_role';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_blockGroup = 'Magento_User';
 
@@ -30,7 +27,6 @@ class Role extends \Magento\Backend\Block\Widget\Grid\Container
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -41,7 +37,6 @@ protected function _construct()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCreateUrl()
     {
@@ -50,7 +45,6 @@ public function getCreateUrl()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -72,7 +66,6 @@ protected function _prepareLayout()
      * Prepare output HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/User/Block/Role/Edit.php b/app/code/Magento/User/Block/Role/Edit.php
index 48509eb93908f..a4ea937d84c64 100644
--- a/app/code/Magento/User/Block/Role/Edit.php
+++ b/app/code/Magento/User/Block/Role/Edit.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -15,7 +14,6 @@ class Edit extends \Magento\Backend\Block\Widget\Tabs
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Tabs
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +50,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/User/Block/Role/Grid/User.php b/app/code/Magento/User/Block/Role/Grid/User.php
index bdb2c5c309140..091bcf919be6f 100644
--- a/app/code/Magento/User/Block/Role/Grid/User.php
+++ b/app/code/Magento/User/Block/Role/Grid/User.php
@@ -11,7 +11,6 @@
  * Acl role user grid.
  *
  * @api
- * @since 2.0.0
  */
 class User extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -19,7 +18,6 @@ class User extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,19 +25,16 @@ class User extends \Magento\Backend\Block\Widget\Grid\Extended
      * Factory for user role model
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
     /**
      * @var \Magento\User\Model\ResourceModel\Role\User\CollectionFactory
-     * @since 2.0.0
      */
     protected $_userRolesFactory;
 
@@ -57,7 +52,6 @@ class User extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Authorization\Model\RoleFactory $roleFactory
      * @param \Magento\User\Model\ResourceModel\Role\User\CollectionFactory $userRolesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -79,7 +73,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -93,7 +86,6 @@ protected function _construct()
     /**
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -117,7 +109,6 @@ protected function _addColumnFilterToCollection($column)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -130,7 +121,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -187,7 +177,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -198,7 +187,6 @@ public function getGridUrl()
     /**
      * @param bool $json
      * @return string|array
-     * @since 2.0.0
      */
     public function getUsers($json = false)
     {
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index f76aa2862369a..8432c31c6041b 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -12,13 +12,11 @@
  * Rolesedit Tab Display Block.
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'role/edit.phtml';
 
@@ -26,7 +24,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
      * Root ACL Resource
      *
      * @var \Magento\Framework\Acl\RootResource
-     * @since 2.0.0
      */
     protected $_rootResource;
 
@@ -34,7 +31,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
      * Rules collection factory
      *
      * @var \Magento\Authorization\Model\ResourceModel\Rules\CollectionFactory
-     * @since 2.0.0
      */
     protected $_rulesCollectionFactory;
 
@@ -42,7 +38,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
      * Acl builder
      *
      * @var \Magento\Authorization\Model\Acl\AclRetriever
-     * @since 2.0.0
      */
     protected $_aclRetriever;
 
@@ -50,13 +45,11 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
      * Acl resource provider
      *
      * @var \Magento\Framework\Acl\AclResource\ProviderInterface
-     * @since 2.0.0
      */
     protected $_aclResourceProvider;
 
     /**
      * @var \Magento\Integration\Helper\Data
-     * @since 2.0.0
      */
     protected $_integrationData;
 
@@ -76,7 +69,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
      * @param \Magento\Framework\Acl\AclResource\ProviderInterface $aclResourceProvider
      * @param \Magento\Integration\Helper\Data $integrationData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -128,7 +120,6 @@ public function getCoreRegistry()
      * Get tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -139,7 +130,6 @@ public function getTabLabel()
      * Get tab title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -150,7 +140,6 @@ public function getTabTitle()
      * Whether tab is available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -161,7 +150,6 @@ public function canShowTab()
      * Whether tab is visible
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -172,7 +160,6 @@ public function isHidden()
      * Check if everything is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEverythingAllowed()
     {
@@ -212,7 +199,6 @@ public function getSelectedResources()
      * Get Json Representation of Resource Tree
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTree()
     {
diff --git a/app/code/Magento/User/Block/Role/Tab/Info.php b/app/code/Magento/User/Block/Role/Tab/Info.php
index a1c51c17e2b64..8266c07e0e86c 100644
--- a/app/code/Magento/User/Block/Role/Tab/Info.php
+++ b/app/code/Magento/User/Block/Role/Tab/Info.php
@@ -9,7 +9,6 @@
  * implementing now
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
@@ -20,7 +19,6 @@ class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -29,7 +27,6 @@ public function getTabLabel()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -38,7 +35,6 @@ public function getTabTitle()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -47,7 +43,6 @@ public function canShowTab()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -56,7 +51,6 @@ public function isHidden()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function _beforeToHtml()
     {
@@ -67,7 +61,6 @@ public function _beforeToHtml()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _initForm()
     {
diff --git a/app/code/Magento/User/Block/Role/Tab/Users.php b/app/code/Magento/User/Block/Role/Tab/Users.php
index c723184f4a505..87fc72b2de59d 100644
--- a/app/code/Magento/User/Block/Role/Tab/Users.php
+++ b/app/code/Magento/User/Block/Role/Tab/Users.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\User\Block\Role\Tab\Users
  *
- * @since 2.0.0
  */
 class Users extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -16,7 +15,6 @@ class Users extends \Magento\Backend\Block\Widget\Tabs
      * User model factory
      *
      * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
-     * @since 2.0.0
      */
     protected $_userCollectionFactory;
 
@@ -26,7 +24,6 @@ class Users extends \Magento\Backend\Block\Widget\Tabs
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +54,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -71,7 +66,6 @@ protected function _prepareLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridHtml()
     {
diff --git a/app/code/Magento/User/Block/User.php b/app/code/Magento/User/Block/User.php
index 3c6987ed40d64..ce2f33812bee6 100644
--- a/app/code/Magento/User/Block/User.php
+++ b/app/code/Magento/User/Block/User.php
@@ -10,13 +10,11 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class User extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
      * @var \Magento\User\Model\ResourceModel\User
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
@@ -24,7 +22,6 @@ class User extends \Magento\Backend\Block\Widget\Grid\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\User\Model\ResourceModel\User $resourceModel
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
index 213f6bd41bdb2..f5e431f44df36 100644
--- a/app/code/Magento/User/Block/User/Edit.php
+++ b/app/code/Magento/User/Block/User/Edit.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -19,7 +18,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -27,7 +25,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -125,7 +121,6 @@ public function getObjectId()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -141,7 +136,6 @@ public function getHeaderText()
      * Return validation url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -152,7 +146,6 @@ public function getValidationUrl()
      * Return invalidate url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInvalidateUrl()
     {
diff --git a/app/code/Magento/User/Block/User/Edit/Form.php b/app/code/Magento/User/Block/User/Edit/Form.php
index fd07cd636b2c4..00f0044db1328 100644
--- a/app/code/Magento/User/Block/User/Edit/Form.php
+++ b/app/code/Magento/User/Block/User/Edit/Form.php
@@ -9,13 +9,11 @@
  * Adminhtml permissions user edit form
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
index 5615acfc99dd8..86e80b1815d1a 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
@@ -15,7 +15,6 @@
  * Cms page edit form main tab
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Main extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -23,13 +22,11 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\Locale\ListsInterface
-     * @since 2.0.0
      */
     protected $_LocaleLists;
 
@@ -49,7 +46,6 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param array $data
      * @param OptionInterface $deployedLocales Operates with deployed locales.
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -72,7 +68,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return \Magento\Backend\Block\Widget\Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -215,7 +210,6 @@ protected function _prepareForm()
      * @param string $confirmationLabel
      * @param bool $isRequired
      * @return void
-     * @since 2.0.0
      */
     protected function _addPasswordFields(
         \Magento\Framework\Data\Form\Element\Fieldset $fieldset,
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
index bbf388908ad80..38533f3f88596 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Roles extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -17,19 +16,16 @@ class Roles extends \Magento\Backend\Block\Widget\Grid\Extended
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
     /**
      * @var \Magento\Authorization\Model\ResourceModel\Role\CollectionFactory
-     * @since 2.0.0
      */
     protected $_userRolesFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -40,7 +36,6 @@ class Roles extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Authorization\Model\ResourceModel\Role\CollectionFactory $userRolesFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +69,6 @@ protected function _construct()
     /**
      * @param Column $column
      * @return $this
-     * @since 2.0.0
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -99,7 +92,6 @@ protected function _addColumnFilterToCollection($column)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection()
     {
@@ -111,7 +103,6 @@ protected function _prepareCollection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareColumns()
     {
@@ -135,7 +126,6 @@ protected function _prepareColumns()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGridUrl()
     {
@@ -146,7 +136,6 @@ public function getGridUrl()
     /**
      * @param bool $json
      * @return array|string
-     * @since 2.0.0
      */
     public function getSelectedRoles($json = false)
     {
diff --git a/app/code/Magento/User/Block/User/Edit/Tabs.php b/app/code/Magento/User/Block/User/Edit/Tabs.php
index d607ea0c0e4f1..87139e5fb3be8 100644
--- a/app/code/Magento/User/Block/User/Edit/Tabs.php
+++ b/app/code/Magento/User/Block/User/Edit/Tabs.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -18,7 +17,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * Class constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/User/Console/UnlockAdminAccountCommand.php b/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
index 1235194278f9c..a60cb37ddd7fe 100644
--- a/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
+++ b/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
@@ -13,7 +13,6 @@
 
 /**
  * Command for unlocking an account.
- * @since 2.0.0
  */
 class UnlockAdminAccountCommand extends Command
 {
@@ -25,7 +24,6 @@ class UnlockAdminAccountCommand extends Command
 
     /**
      * @var AdminUser
-     * @since 2.0.0
      */
     private $adminUser;
 
@@ -33,7 +31,6 @@ class UnlockAdminAccountCommand extends Command
      * {@inheritdoc}
      *
      * @param AdminUser $userResource
-     * @since 2.0.0
      */
     public function __construct(
         AdminUser $adminUser,
@@ -45,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -67,7 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php
index 2374cb3a4c304..aaa2681a50790 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php
@@ -9,7 +9,6 @@
 
 /**
  * \Magento\User Auth controller
- * @since 2.0.0
  */
 abstract class Auth extends \Magento\Backend\App\AbstractAction
 {
@@ -17,7 +16,6 @@ abstract class Auth extends \Magento\Backend\App\AbstractAction
      * User model factory
      *
      * @var \Magento\User\Model\UserFactory
-     * @since 2.0.0
      */
     protected $_userFactory;
 
@@ -26,7 +24,6 @@ abstract class Auth extends \Magento\Backend\App\AbstractAction
      *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\User\Model\UserFactory $userFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,7 +40,6 @@ public function __construct(
      * @param string $resetPasswordToken
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken)
     {
@@ -74,7 +70,6 @@ protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken)
      * Check if user has permissions to access this controller
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isAllowed()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
index 1b867b9621723..4d6e8a82ea06d 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\Auth\Forgotpassword
  *
- * @since 2.0.0
  */
 class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth
 {
@@ -41,7 +40,6 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php
index a627d0e62fee8..a5705ca8186e2 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\Auth\ResetPassword
  *
- * @since 2.0.0
  */
 class ResetPassword extends \Magento\User\Controller\Adminhtml\Auth
 {
@@ -19,7 +18,6 @@ class ResetPassword extends \Magento\User\Controller\Adminhtml\Auth
      * User is redirected on this action when he clicks on the corresponding link in password reset confirmation email
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
index 133f2f91e7988..c8ea40959d801 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost
  *
- * @since 2.0.0
  */
 class ResetPasswordPost extends \Magento\User\Controller\Adminhtml\Auth
 {
@@ -19,7 +18,6 @@ class ResetPasswordPost extends \Magento\User\Controller\Adminhtml\Auth
      * Used to handle data received from reset forgotten password form
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks.php b/app/code/Magento/User/Controller/Adminhtml/Locks.php
index ae09ce7da61ec..a40d534baac49 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Locks.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Locks.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\Locks
  *
- * @since 2.0.0
  */
 abstract class Locks extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php
index 47375557da362..4888e59a34f1c 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php
@@ -8,7 +8,6 @@
 
 /**
  * Locked users grid
- * @since 2.0.0
  */
 class Grid extends \Magento\User\Controller\Adminhtml\Locks
 {
@@ -16,7 +15,6 @@ class Grid extends \Magento\User\Controller\Adminhtml\Locks
      * Render AJAX-grid only
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
index 8046ee5047487..7c0e31076cace 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
@@ -8,7 +8,6 @@
 
 /**
  * Locks Index action
- * @since 2.0.0
  */
 class Index extends \Magento\User\Controller\Adminhtml\Locks
 {
@@ -16,7 +15,6 @@ class Index extends \Magento\User\Controller\Adminhtml\Locks
      * Render page with grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php b/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php
index d8f19b43ed22a..f8191d46d962b 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php
@@ -10,7 +10,6 @@
 
 /**
  * Mass Unlock Controller
- * @since 2.0.0
  */
 class MassUnlock extends \Magento\User\Controller\Adminhtml\Locks
 {
@@ -18,7 +17,6 @@ class MassUnlock extends \Magento\User\Controller\Adminhtml\Locks
      * Unlock specified users
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User.php b/app/code/Magento/User/Controller/Adminhtml/User.php
index 31b9a9dbbc255..a465b4daae6a4 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User
  *
- * @since 2.0.0
  */
 abstract class User extends \Magento\Backend\App\AbstractAction
 {
@@ -23,7 +22,6 @@ abstract class User extends \Magento\Backend\App\AbstractAction
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -31,7 +29,6 @@ abstract class User extends \Magento\Backend\App\AbstractAction
      * User model factory
      *
      * @var \Magento\User\Model\UserFactory
-     * @since 2.0.0
      */
     protected $_userFactory;
 
@@ -39,7 +36,6 @@ abstract class User extends \Magento\Backend\App\AbstractAction
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\User\Model\UserFactory $userFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -78,7 +73,6 @@ protected function _initAction()
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function _getAdminUserData(array $data)
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
index 4af32fb94bd2f..2309cb8ceaaaa 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Edit.php b/app/code/Magento/User/Controller/Adminhtml/User/Edit.php
index 757b82e2c2bac..5f570ba2967d6 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Edit.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Edit.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
index 7228ba8a9cfcf..54c01f25c1506 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php
index f5f812025fc1f..751257ec1cf32 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php
@@ -11,13 +11,11 @@
 
 /**
  * Class InvalidateToken - used to invalidate/revoke all authentication tokens for a specific user.
- * @since 2.0.0
  */
 class InvalidateToken extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @var AdminTokenServiceInterface
-     * @since 2.0.0
      */
     protected $tokenService;
 
@@ -28,7 +26,6 @@ class InvalidateToken extends \Magento\User\Controller\Adminhtml\User
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\User\Model\UserFactory $userFactory
      * @param AdminTokenServiceInterface $tokenService
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php b/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php
index 4cf69470f83b4..4ede35bfce757 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role.php b/app/code/Magento/User/Controller/Adminhtml/User/Role.php
index 615c700a29945..7e0af5f497d47 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Role
  *
- * @since 2.0.0
  */
 abstract class Role extends \Magento\Backend\App\AbstractAction
 {
@@ -25,7 +24,6 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -33,7 +31,6 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * Factory for user role model
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
@@ -41,7 +38,6 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * User model factory
      *
      * @var \Magento\User\Model\UserFactory
-     * @since 2.0.0
      */
     protected $_userFactory;
 
@@ -49,7 +45,6 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * Rules model factory
      *
      * @var \Magento\Authorization\Model\RulesFactory
-     * @since 2.0.0
      */
     protected $_rulesFactory;
 
@@ -57,13 +52,11 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * Backend auth session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $_authSession;
 
     /**
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $_filterManager;
 
@@ -75,7 +68,6 @@ abstract class Role extends \Magento\Backend\App\AbstractAction
      * @param \Magento\Authorization\Model\RulesFactory $rulesFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Filter\FilterManager $filterManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -99,7 +91,6 @@ public function __construct(
      * Preparing layout for output
      *
      * @return Role
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -116,7 +107,6 @@ protected function _initAction()
      *
      * @param string $requestVariable
      * @return \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     protected function _initRole($requestVariable = 'rid')
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php
index b1847cba2b2b8..d3a2325534a21 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Role\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -19,7 +18,6 @@ class Delete extends \Magento\User\Controller\Adminhtml\User\Role
      * Remove role action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php
index 23efd4d818106..1f25688d9176f 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php
@@ -8,7 +8,6 @@
 
 /**
  * Class EditRole
- * @since 2.0.0
  */
 class EditRole extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -16,7 +15,6 @@ class EditRole extends \Magento\User\Controller\Adminhtml\User\Role
      * Edit role action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php
index 2a5b92b93ed67..0411657b244fa 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Role\Editrolegrid
  *
- * @since 2.0.0
  */
 class Editrolegrid extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -19,7 +18,6 @@ class Editrolegrid extends \Magento\User\Controller\Adminhtml\User\Role
      * Action for ajax request from assigned users grid
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
index aa87ee599bca2..8080252d314fc 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Role\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\User\Controller\Adminhtml\User\Role
      * Show grid with roles existing in systems
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
index f4e8d2a15eb78..997ea6f8be56e 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Role\RoleGrid
  *
- * @since 2.0.0
  */
 class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -17,7 +16,6 @@ class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role
      * Action for ajax request from grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
index ba239c00c1f94..dcb4e27e68e4b 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
 {
@@ -69,7 +68,6 @@ private function getSecurityCookie()
      * Role form submit action to save or create new role
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -176,7 +174,6 @@ protected function processPreviousUsers(\Magento\Authorization\Model\Role $role)
      * @param int $userId
      * @param int $roleId
      * @return bool
-     * @since 2.0.0
      */
     protected function _addUserToRole($userId, $roleId)
     {
@@ -198,7 +195,6 @@ protected function _addUserToRole($userId, $roleId)
      * @param int $roleId
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _deleteUserFromRole($userId, $roleId)
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
index 68bf07980eacb..283949eea32ce 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\RoleGrid
  *
- * @since 2.0.0
  */
 class RoleGrid extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php
index 6b6329e5824b7..c778dbb74f6c0 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\RolesGrid
  *
- * @since 2.0.0
  */
 class RolesGrid extends \Magento\User\Controller\Adminhtml\User
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index ec873864dc46e..93d23c4f0a8d4 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -11,7 +11,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Save extends \Magento\User\Controller\Adminhtml\User
 {
@@ -41,7 +40,6 @@ private function getSecurityCookie()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -118,7 +116,6 @@ public function execute()
      * @param \Magento\User\Model\User $model
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function redirectToEdit(\Magento\User\Model\User $model, array $data)
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
index 66ad2906a16f5..32edfff72b7c3 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\User\Controller\Adminhtml\User\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\User\Controller\Adminhtml\User
 {
@@ -17,7 +16,6 @@ class Validate extends \Magento\User\Controller\Adminhtml\User
      * AJAX customer validation action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/User/Helper/Data.php b/app/code/Magento/User/Helper/Data.php
index 41f431ff47dfe..c17e8b6d7beef 100644
--- a/app/code/Magento/User/Helper/Data.php
+++ b/app/code/Magento/User/Helper/Data.php
@@ -9,7 +9,6 @@
  * User data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -20,13 +19,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
@@ -34,7 +31,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Backend\App\ConfigInterface $config
      * @param \Magento\Framework\Math\Random $mathRandom
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * Generate unique token for reset password confirmation link
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateResetPasswordLinkToken()
     {
@@ -61,7 +56,6 @@ public function generateResetPasswordLinkToken()
      * Retrieve customer reset password link expiration period in days
      *
      * @return int
-     * @since 2.0.0
      */
     public function getResetPasswordLinkExpirationPeriod()
     {
diff --git a/app/code/Magento/User/Model/Authorization/AdminSessionUserContext.php b/app/code/Magento/User/Model/Authorization/AdminSessionUserContext.php
index 32b6b260fc9a1..50cf11c586097 100644
--- a/app/code/Magento/User/Model/Authorization/AdminSessionUserContext.php
+++ b/app/code/Magento/User/Model/Authorization/AdminSessionUserContext.php
@@ -11,13 +11,11 @@
 
 /**
  * Session-based admin user context
- * @since 2.0.0
  */
 class AdminSessionUserContext implements UserContextInterface
 {
     /**
      * @var AdminSession
-     * @since 2.0.0
      */
     protected $_adminSession;
 
@@ -25,7 +23,6 @@ class AdminSessionUserContext implements UserContextInterface
      * Initialize dependencies.
      *
      * @param AdminSession $adminSession
-     * @since 2.0.0
      */
     public function __construct(AdminSession $adminSession)
     {
@@ -34,7 +31,6 @@ public function __construct(AdminSession $adminSession)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -43,7 +39,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
index 2ed2d8915ee4f..c1b7e6a1110f7 100644
--- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
+++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -8,7 +8,6 @@
 
 /**
  * User backend observer helper class
- * @since 2.0.0
  */
 class ObserverConfig
 {
@@ -16,13 +15,11 @@ class ObserverConfig
      * Backend configuration interface
      *
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $backendConfig;
 
     /**
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\ConfigInterface $backendConfig
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param array $latestPassword
      * @return bool
-     * @since 2.0.0
      */
     public function _isLatestPasswordExpired($latestPassword)
     {
@@ -49,7 +45,6 @@ public function _isLatestPasswordExpired($latestPassword)
     /**
      * Get admin lock threshold from configuration
      * @return int
-     * @since 2.0.0
      */
     public function getAdminLockThreshold()
     {
@@ -60,7 +55,6 @@ public function getAdminLockThreshold()
      * Check whether password change is forced
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPasswordChangeForced()
     {
@@ -71,7 +65,6 @@ public function isPasswordChangeForced()
      * Get admin password lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getAdminPasswordLifetime()
     {
@@ -82,7 +75,6 @@ public function getAdminPasswordLifetime()
      * Get admin maxiumum security failures from config
      *
      * @return int
-     * @since 2.0.0
      */
     public function getMaxFailures()
     {
diff --git a/app/code/Magento/User/Model/Plugin/AuthorizationRole.php b/app/code/Magento/User/Model/Plugin/AuthorizationRole.php
index fb326b59dd2ea..e08f5b7817e8d 100644
--- a/app/code/Magento/User/Model/Plugin/AuthorizationRole.php
+++ b/app/code/Magento/User/Model/Plugin/AuthorizationRole.php
@@ -10,13 +10,11 @@
 
 /**
  * Plugin for authorization role model
- * @since 2.0.0
  */
 class AuthorizationRole
 {
     /**
      * @var \Magento\User\Model\ResourceModel\User
-     * @since 2.0.0
      */
     protected $userResourceModel;
 
@@ -24,7 +22,6 @@ class AuthorizationRole
      * Initialize dependencies
      *
      * @param \Magento\User\Model\ResourceModel\User $userResourceModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\User\Model\ResourceModel\User $userResourceModel)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\User\Model\ResourceModel\User $userResource
      * @param Role $result
      * @return Role
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterSave(Role $subject, Role $result)
     {
diff --git a/app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php b/app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php
index 98cdfbb5b710f..0f64062857086 100644
--- a/app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php
+++ b/app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php
@@ -9,7 +9,6 @@
  * Admin role users collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -28,7 +26,6 @@ protected function _construct()
      * Initialize select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
index aa41c090d419c..5816f36634b45 100644
--- a/app/code/Magento/User/Model/ResourceModel/User.php
+++ b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -19,7 +19,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -27,13 +26,11 @@ class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Role model
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -58,7 +55,6 @@ class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param string $connectionName
      * @param CacheInterface $aclDataCache
      * @param ObserverConfig|null $observerConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -79,7 +75,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -90,7 +85,6 @@ protected function _construct()
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -106,7 +100,6 @@ protected function _initUniqueFields()
      *
      * @param ModelUser $user
      * @return $this
-     * @since 2.0.0
      */
     public function recordLogin(ModelUser $user)
     {
@@ -129,7 +122,6 @@ public function recordLogin(ModelUser $user)
      *
      * @param string $username
      * @return array
-     * @since 2.0.0
      */
     public function loadByUsername($username)
     {
@@ -147,7 +139,6 @@ public function loadByUsername($username)
      *
      * @param int|ModelUser $user
      * @return null|array
-     * @since 2.0.0
      */
     public function hasAssigned2Role($user)
     {
@@ -183,7 +174,6 @@ public function hasAssigned2Role($user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -200,7 +190,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param ModelUser $user
      * @return void
-     * @since 2.0.0
      */
     public function _clearUserRoles(ModelUser $user)
     {
@@ -214,7 +203,6 @@ public function _clearUserRoles(ModelUser $user)
      * @param int $parentId
      * @param ModelUser $user
      * @return void
-     * @since 2.0.0
      */
     protected function _createUserRole($parentId, ModelUser $user)
     {
@@ -250,7 +238,6 @@ protected function _createUserRole($parentId, ModelUser $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -266,7 +253,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -297,7 +283,6 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return array
-     * @since 2.0.0
      */
     public function getRoles(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -339,7 +324,6 @@ public function getRoles(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return $this
-     * @since 2.0.0
      */
     public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -367,7 +351,6 @@ public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return array
-     * @since 2.0.0
      */
     public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -398,7 +381,6 @@ public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return array
-     * @since 2.0.0
      */
     public function userExists(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -427,7 +409,6 @@ public function userExists(\Magento\Framework\Model\AbstractModel $user)
      *
      * @param \Magento\Framework\Model\AbstractModel $user
      * @return bool
-     * @since 2.0.0
      */
     public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
     {
@@ -440,7 +421,6 @@ public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function saveExtra($object, $data)
     {
@@ -459,7 +439,6 @@ public function saveExtra($object, $data)
      * Retrieve the total user count bypassing any filters applied to collections
      *
      * @return int
-     * @since 2.0.0
      */
     public function countAll()
     {
@@ -474,7 +453,6 @@ public function countAll()
      * Add validation rules to be applied before saving an entity
      *
      * @return \Zend_Validate_Interface $validator
-     * @since 2.0.0
      */
     public function getValidationRulesBeforeSave()
     {
@@ -492,7 +470,6 @@ public function getValidationRulesBeforeSave()
      *
      * @param \Magento\Authorization\Model\Role $role
      * @return bool
-     * @since 2.0.0
      */
     public function updateRoleUsersAcl(\Magento\Authorization\Model\Role $role)
     {
@@ -514,7 +491,6 @@ public function updateRoleUsersAcl(\Magento\Authorization\Model\Role $role)
      *
      * @param int|int[] $userIds
      * @return int number of affected rows
-     * @since 2.0.0
      */
     public function unlock($userIds)
     {
@@ -535,7 +511,6 @@ public function unlock($userIds)
      * @param int $exceptId
      * @param int $lifetime
      * @return int number of affected rows
-     * @since 2.0.0
      */
     public function lock($userIds, $exceptId, $lifetime)
     {
@@ -559,7 +534,6 @@ public function lock($userIds, $exceptId, $lifetime)
      * @param int|bool $setLockExpires
      * @param int|bool $setFirstFailure
      * @return void
-     * @since 2.0.0
      */
     public function updateFailure($user, $setLockExpires = false, $setFirstFailure = false)
     {
@@ -584,7 +558,6 @@ public function updateFailure($user, $setLockExpires = false, $setFirstFailure =
      * @param ModelUser $user
      * @param int $retainLimit
      * @return array
-     * @since 2.0.0
      */
     public function getOldPasswords($user, $retainLimit = 4)
     {
@@ -631,7 +604,6 @@ public function getOldPasswords($user, $retainLimit = 4)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @see \Magento\User\Model\Backend\Config\ObserverConfig::_isLatestPasswordExpired()
-     * @since 2.0.0
      */
     public function trackPassword($user, $passwordHash, $lifetime = 0)
     {
@@ -651,7 +623,6 @@ public function trackPassword($user, $passwordHash, $lifetime = 0)
      *
      * @param int $userId
      * @return array
-     * @since 2.0.0
      */
     public function getLatestPassword($userId)
     {
diff --git a/app/code/Magento/User/Model/ResourceModel/User/Collection.php b/app/code/Magento/User/Model/ResourceModel/User/Collection.php
index aebe1e56f0e04..9444f6d7492a9 100644
--- a/app/code/Magento/User/Model/ResourceModel/User/Collection.php
+++ b/app/code/Magento/User/Model/ResourceModel/User/Collection.php
@@ -9,7 +9,6 @@
  * Admin user collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php b/app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php
index 90ff12e5685df..af17ca6e1a738 100644
--- a/app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php
+++ b/app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php
@@ -9,7 +9,6 @@
  * Admin user collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\User\Model\ResourceModel\User\Collection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\User\Model\ResourceModel\User\Collection
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/User/Model/System/Config/Source/Password.php b/app/code/Magento/User/Model/System/Config/Source/Password.php
index 5ddfa3adb8223..651d04a0506f9 100644
--- a/app/code/Magento/User/Model/System/Config/Source/Password.php
+++ b/app/code/Magento/User/Model/System/Config/Source/Password.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\User\Model\System\Config\Source\Password
  *
- * @since 2.0.0
  */
 class Password extends \Magento\Framework\DataObject implements \Magento\Framework\Option\ArrayInterface
 {
@@ -22,7 +21,6 @@ class Password extends \Magento\Framework\DataObject implements \Magento\Framewo
      * Get options for select
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 8aa90f90f9e03..479895ca3c98c 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -33,7 +33,6 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @api
- * @since 2.0.0
  */
 class User extends AbstractModel implements StorageInterface, UserInterface
 {
@@ -53,7 +52,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Model event prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'admin_user';
 
@@ -61,7 +59,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Admin role
      *
      * @var \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     protected $_role;
 
@@ -69,7 +66,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Available resources flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_hasResources = true;
 
@@ -77,7 +73,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * User data
      *
      * @var \Magento\User\Helper\Data
-     * @since 2.0.0
      */
     protected $_userData = null;
 
@@ -85,7 +80,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Core store config
      *
      * @var \Magento\Backend\App\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -93,7 +87,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Factory for validator composite object
      *
      * @var \Magento\Framework\Validator\DataObjectFactory
-     * @since 2.0.0
      */
     protected $_validatorObject;
 
@@ -101,31 +94,26 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * Role model factory
      *
      * @var \Magento\Authorization\Model\RoleFactory
-     * @since 2.0.0
      */
     protected $_roleFactory;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var UserValidationRules
-     * @since 2.0.0
      */
     protected $validationRules;
 
@@ -151,7 +139,6 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * @param array $data
      * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -185,7 +172,6 @@ public function __construct(
      * Initialize user model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -194,7 +180,6 @@ protected function _construct()
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -217,7 +202,6 @@ public function __sleep()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -239,7 +223,6 @@ public function __wakeup()
      * Processing data before model save
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -264,7 +247,6 @@ public function beforeSave()
      * Whether the password saving is going to occur
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _willSavePassword()
     {
@@ -275,7 +257,6 @@ protected function _willSavePassword()
      * Add validation rules for particular fields
      *
      * @return \Zend_Validate_Interface
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -299,7 +280,6 @@ protected function _getValidationRulesBeforeSave()
      * Existing user password confirmation will be validated only when password is set
      *
      * @return bool|string[]
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -320,7 +300,7 @@ public function validate()
      * New password is compared to at least 4 previous passwords to prevent setting them again
      *
      * @return bool|string[]
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected function validatePasswordChange()
     {
@@ -346,7 +326,6 @@ protected function validatePasswordChange()
      * Process data after model is saved
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -359,7 +338,6 @@ public function afterSave()
      *
      * @param   array $data
      * @return  $this
-     * @since 2.0.0
      */
     public function saveExtra($data)
     {
@@ -374,7 +352,6 @@ public function saveExtra($data)
      * Retrieve user roles
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRoles()
     {
@@ -385,7 +362,6 @@ public function getRoles()
      * Get admin role model
      *
      * @return \Magento\Authorization\Model\Role
-     * @since 2.0.0
      */
     public function getRole()
     {
@@ -403,7 +379,6 @@ public function getRole()
      * Unassign user from his current role
      *
      * @return $this
-     * @since 2.0.0
      */
     public function deleteFromRole()
     {
@@ -415,7 +390,6 @@ public function deleteFromRole()
      * Check if such combination role/user exists
      *
      * @return bool
-     * @since 2.0.0
      */
     public function roleUserExists()
     {
@@ -427,7 +401,6 @@ public function roleUserExists()
      * Send email with reset password confirmation link
      *
      * @return $this
-     * @since 2.0.0
      */
     public function sendPasswordResetConfirmationEmail()
     {
@@ -449,7 +422,6 @@ public function sendPasswordResetConfirmationEmail()
      *
      * @return $this
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function sendPasswordResetNotificationEmail()
     {
@@ -542,7 +514,6 @@ protected function sendUserNotificationEmail($changes, $email = null)
      *
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function getName($separator = ' ')
     {
@@ -553,7 +524,6 @@ public function getName($separator = ' ')
      * Get user ACL role
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAclRole()
     {
@@ -567,7 +537,6 @@ public function getAclRole()
      * @param string $password
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function authenticate($username, $password)
     {
@@ -606,7 +575,6 @@ public function authenticate($username, $password)
      * @param string $password
      * @return bool
      * @throws \Magento\Framework\Exception\AuthenticationException
-     * @since 2.0.0
      */
     public function verifyIdentity($password)
     {
@@ -631,7 +599,6 @@ public function verifyIdentity($password)
      * @param   string $username
      * @param   string $password
      * @return  $this
-     * @since 2.0.0
      */
     public function login($username, $password)
     {
@@ -645,7 +612,6 @@ public function login($username, $password)
      * Reload current user
      *
      * @return $this
-     * @since 2.0.0
      */
     public function reload()
     {
@@ -660,7 +626,6 @@ public function reload()
      *
      * @param string $username
      * @return $this
-     * @since 2.0.0
      */
     public function loadByUsername($username)
     {
@@ -677,7 +642,6 @@ public function loadByUsername($username)
      *
      * @param int|\Magento\User\Model\User $user
      * @return null|array
-     * @since 2.0.0
      */
     public function hasAssigned2Role($user)
     {
@@ -689,7 +653,6 @@ public function hasAssigned2Role($user)
      *
      * @param string $password
      * @return string
-     * @since 2.0.0
      */
     protected function _getEncodedPassword($password)
     {
@@ -704,7 +667,6 @@ protected function _getEncodedPassword($password)
      * @param string $newToken
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function changeResetPasswordLinkToken($newToken)
     {
@@ -721,7 +683,6 @@ public function changeResetPasswordLinkToken($newToken)
      * Check if current reset password link token is expired
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isResetPasswordLinkTokenExpired()
     {
@@ -752,7 +713,6 @@ public function isResetPasswordLinkTokenExpired()
      * Check if user has available resources
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasAvailableResources()
     {
@@ -764,7 +724,6 @@ public function hasAvailableResources()
      *
      * @param bool $hasResources
      * @return $this
-     * @since 2.0.0
      */
     public function setHasAvailableResources($hasResources)
     {
@@ -774,7 +733,6 @@ public function setHasAvailableResources($hasResources)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFirstName()
     {
@@ -783,7 +741,6 @@ public function getFirstName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setFirstName($firstName)
     {
@@ -792,7 +749,6 @@ public function setFirstName($firstName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLastName()
     {
@@ -801,7 +757,6 @@ public function getLastName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLastName($lastName)
     {
@@ -810,7 +765,6 @@ public function setLastName($lastName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getEmail()
     {
@@ -819,7 +773,6 @@ public function getEmail()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEmail($email)
     {
@@ -828,7 +781,6 @@ public function setEmail($email)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserName()
     {
@@ -837,7 +789,6 @@ public function getUserName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUserName($userName)
     {
@@ -846,7 +797,6 @@ public function setUserName($userName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPassword()
     {
@@ -855,7 +805,6 @@ public function getPassword()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPassword($password)
     {
@@ -864,7 +813,6 @@ public function setPassword($password)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCreated()
     {
@@ -873,7 +821,6 @@ public function getCreated()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCreated($created)
     {
@@ -882,7 +829,6 @@ public function setCreated($created)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getModified()
     {
@@ -891,7 +837,6 @@ public function getModified()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setModified($modified)
     {
@@ -900,7 +845,6 @@ public function setModified($modified)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -909,7 +853,6 @@ public function getIsActive()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsActive($isActive)
     {
@@ -918,7 +861,6 @@ public function setIsActive($isActive)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getInterfaceLocale()
     {
@@ -927,7 +869,6 @@ public function getInterfaceLocale()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setInterfaceLocale($interfaceLocale)
     {
diff --git a/app/code/Magento/User/Model/UserValidationRules.php b/app/code/Magento/User/Model/UserValidationRules.php
index ee47f409345d8..bfd796065d37b 100644
--- a/app/code/Magento/User/Model/UserValidationRules.php
+++ b/app/code/Magento/User/Model/UserValidationRules.php
@@ -14,7 +14,6 @@
  * Class for adding validation rules to an Admin user
  *
  * @api
- * @since 2.0.0
  */
 class UserValidationRules
 {
@@ -28,7 +27,6 @@ class UserValidationRules
      *
      * @param \Magento\Framework\Validator\DataObject $validator
      * @return \Magento\Framework\Validator\DataObject
-     * @since 2.0.0
      */
     public function addUserInfoRules(\Magento\Framework\Validator\DataObject $validator)
     {
@@ -64,7 +62,6 @@ public function addUserInfoRules(\Magento\Framework\Validator\DataObject $valida
      *
      * @param \Magento\Framework\Validator\DataObject $validator
      * @return \Magento\Framework\Validator\DataObject
-     * @since 2.0.0
      */
     public function addPasswordRules(\Magento\Framework\Validator\DataObject $validator)
     {
@@ -101,7 +98,6 @@ public function addPasswordRules(\Magento\Framework\Validator\DataObject $valida
      * @param \Magento\Framework\Validator\DataObject $validator
      * @param string $passwordConfirmation
      * @return \Magento\Framework\Validator\DataObject
-     * @since 2.0.0
      */
     public function addPasswordConfirmationRule(
         \Magento\Framework\Validator\DataObject $validator,
diff --git a/app/code/Magento/User/Observer/Backend/AuthObserver.php b/app/code/Magento/User/Observer/Backend/AuthObserver.php
index bf025debd6931..bc5d6af615f13 100644
--- a/app/code/Magento/User/Observer/Backend/AuthObserver.php
+++ b/app/code/Magento/User/Observer/Backend/AuthObserver.php
@@ -21,7 +21,6 @@
 /**
  * User backend observer model for authentication
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AuthObserver implements ObserverInterface
 {
@@ -29,7 +28,6 @@ class AuthObserver implements ObserverInterface
      * Backend configuration interface
      *
      * @var ObserverConfig
-     * @since 2.0.0
      */
     protected $observerConfig;
 
@@ -37,7 +35,6 @@ class AuthObserver implements ObserverInterface
      * Admin user resource model
      *
      * @var ResourceUser
-     * @since 2.0.0
      */
     protected $userResource;
 
@@ -45,7 +42,6 @@ class AuthObserver implements ObserverInterface
      * Backend url interface
      *
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
@@ -53,7 +49,6 @@ class AuthObserver implements ObserverInterface
      * Backend authorization session
      *
      * @var Session
-     * @since 2.0.0
      */
     protected $authSession;
 
@@ -61,7 +56,6 @@ class AuthObserver implements ObserverInterface
      * Factory class for user model
      *
      * @var UserFactory
-     * @since 2.0.0
      */
     protected $userFactory;
 
@@ -69,7 +63,6 @@ class AuthObserver implements ObserverInterface
      * Encryption model
      *
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
@@ -77,7 +70,6 @@ class AuthObserver implements ObserverInterface
      * Message manager interface
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -89,7 +81,6 @@ class AuthObserver implements ObserverInterface
      * @param UserFactory $userFactory
      * @param EncryptorInterface $encryptor
      * @param ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         ObserverConfig $observerConfig,
@@ -115,7 +106,6 @@ public function __construct(
      * @param EventObserver $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
@@ -161,7 +151,6 @@ public function execute(EventObserver $observer)
      *
      * @param \Magento\User\Model\User $user
      * @return void
-     * @since 2.0.0
      */
     private function _updateLockingInformation($user)
     {
@@ -196,7 +185,6 @@ private function _updateLockingInformation($user)
      *
      * @param array $latestPassword
      * @return void
-     * @since 2.0.0
      */
     private function _checkExpiredPassword($latestPassword)
     {
diff --git a/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php b/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
index 50fa96b9ffb03..7d96c1c3b0d62 100644
--- a/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
+++ b/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * User backend observer model for passwords
- * @since 2.0.0
  */
 class ForceAdminPasswordChangeObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Backend configuration interface
      *
      * @var \Magento\User\Model\Backend\Config\ObserverConfig
-     * @since 2.0.0
      */
     protected $observerConfig;
 
@@ -27,7 +25,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Authorization interface
      *
      * @var \Magento\Framework\AuthorizationInterface
-     * @since 2.0.0
      */
     protected $authorization;
 
@@ -35,7 +32,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Backend url interface
      *
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
@@ -43,7 +39,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Backend session
      *
      * @var \Magento\Backend\Model\Session
-     * @since 2.0.0
      */
     protected $session;
 
@@ -51,7 +46,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Backend authorization session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $authSession;
 
@@ -59,7 +53,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Action flag
      *
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $actionFlag;
 
@@ -67,7 +60,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * Message manager interface
      *
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -79,7 +71,6 @@ class ForceAdminPasswordChangeObserver implements ObserverInterface
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\AuthorizationInterface $authorization,
@@ -104,7 +95,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 88624355329b6..09605372df181 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -11,7 +11,6 @@
 
 /**
  * User backend observer model for passwords
- * @since 2.0.0
  */
 class TrackAdminNewPasswordObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class TrackAdminNewPasswordObserver implements ObserverInterface
      * Backend configuration interface
      *
      * @var \Magento\User\Model\Backend\Config\ObserverConfig
-     * @since 2.0.0
      */
     protected $observerConfig;
 
@@ -27,7 +25,6 @@ class TrackAdminNewPasswordObserver implements ObserverInterface
      * Admin user resource model
      *
      * @var \Magento\User\Model\ResourceModel\User
-     * @since 2.0.0
      */
     protected $userResource;
 
@@ -35,7 +32,6 @@ class TrackAdminNewPasswordObserver implements ObserverInterface
      * Backend authorization session
      *
      * @var \Magento\Backend\Model\Auth\Session
-     * @since 2.0.0
      */
     protected $authSession;
 
@@ -43,7 +39,6 @@ class TrackAdminNewPasswordObserver implements ObserverInterface
      * Message manager interface
      *
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -52,7 +47,6 @@ class TrackAdminNewPasswordObserver implements ObserverInterface
      * @param \Magento\User\Model\ResourceModel\User $userResource
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\User\Model\Backend\Config\ObserverConfig $observerConfig,
@@ -71,7 +65,6 @@ public function __construct(
      *
      * @param EventObserver $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/User/Setup/InstallSchema.php b/app/code/Magento/User/Setup/InstallSchema.php
index 021c7093c97ec..9e006a6f21bd2 100644
--- a/app/code/Magento/User/Setup/InstallSchema.php
+++ b/app/code/Magento/User/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/User/Setup/UpgradeData.php b/app/code/Magento/User/Setup/UpgradeData.php
index 96bf436c91874..750958313fc3f 100644
--- a/app/code/Magento/User/Setup/UpgradeData.php
+++ b/app/code/Magento/User/Setup/UpgradeData.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\User\Setup\UpgradeData
  *
- * @since 2.0.0
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -39,7 +38,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -59,7 +57,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     /**
      * @param ModuleDataSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function upgradeHash($setup)
     {
diff --git a/app/code/Magento/User/Setup/UpgradeSchema.php b/app/code/Magento/User/Setup/UpgradeSchema.php
index 517dcbdf32eb8..eeb4055d771e6 100644
--- a/app/code/Magento/User/Setup/UpgradeSchema.php
+++ b/app/code/Magento/User/Setup/UpgradeSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Usps/Block/Adminhtml/Order/Packaging/Plugin/DisplayGirth.php b/app/code/Magento/Usps/Block/Adminhtml/Order/Packaging/Plugin/DisplayGirth.php
index b45652f9cbb4a..952988f2a9bfc 100644
--- a/app/code/Magento/Usps/Block/Adminhtml/Order/Packaging/Plugin/DisplayGirth.php
+++ b/app/code/Magento/Usps/Block/Adminhtml/Order/Packaging/Plugin/DisplayGirth.php
@@ -10,7 +10,6 @@
 
 /**
  * Plugin class
- * @since 2.0.0
  */
 class DisplayGirth
 {
@@ -18,7 +17,6 @@ class DisplayGirth
      * Usps data helper
      *
      * @var \Magento\Usps\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -26,7 +24,6 @@ class DisplayGirth
      * Construct
      *
      * @param \Magento\Usps\Helper\Data $helper
-     * @since 2.0.0
      */
     public function __construct(DataHelper $helper)
     {
@@ -41,7 +38,6 @@ public function __construct(DataHelper $helper)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsDisplayGirthValue(Packaging $subject, \Closure $proceed)
     {
diff --git a/app/code/Magento/Usps/Helper/Data.php b/app/code/Magento/Usps/Helper/Data.php
index e02ddb6fcf04c..4a03f2aa815f1 100644
--- a/app/code/Magento/Usps/Helper/Data.php
+++ b/app/code/Magento/Usps/Helper/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Usps data helper
- * @since 2.0.0
  */
 class Data extends AbstractHelper
 {
@@ -17,7 +16,6 @@ class Data extends AbstractHelper
      * Available shipping methods
      *
      * @var array
-     * @since 2.0.0
      */
     protected $availableShippingMethods = [
         'usps_0_FCLE', // First-Class Mail Large Envelope
@@ -45,7 +43,6 @@ class Data extends AbstractHelper
      *
      * @param string $shippingMethod
      * @return bool
-     * @since 2.0.0
      */
     public function displayGirthValue($shippingMethod)
     {
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index feb28e38ef372..9f3fe2ea63e95 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -18,7 +18,6 @@
  * USPS shipping
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
 {
@@ -67,7 +66,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Code of the carrier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code = self::CODE;
 
@@ -83,7 +81,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Rate request data
      *
      * @var \Magento\Quote\Model\Quote\Address\RateRequest|null
-     * @since 2.0.0
      */
     protected $_request = null;
 
@@ -91,7 +88,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Rate result data
      *
      * @var Result|null
-     * @since 2.0.0
      */
     protected $_result = null;
 
@@ -99,7 +95,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Default cgi gateway url
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultGatewayUrl = 'http://production.shippingapis.com/ShippingAPI.dll';
 
@@ -107,7 +102,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Container types that could be customized for USPS carrier
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_customizableContainerTypes = ['VARIABLE', 'RECTANGULAR', 'NONRECTANGULAR'];
 
@@ -115,19 +109,16 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * Carrier helper
      *
      * @var \Magento\Shipping\Helper\Carrier
-     * @since 2.0.0
      */
     protected $_carrierHelper;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var \Magento\Framework\HTTP\ZendClientFactory
-     * @since 2.0.0
      */
     protected $_httpClientFactory;
 
@@ -167,7 +158,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -218,7 +208,6 @@ public function __construct(
      *
      * @param RateRequest $request
      * @return \Magento\Quote\Model\Quote\Address\RateResult\Error|bool|Result
-     * @since 2.0.0
      */
     public function collectRates(RateRequest $request)
     {
@@ -241,7 +230,6 @@ public function collectRates(RateRequest $request)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $request)
     {
@@ -373,7 +361,6 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
      * Get result of request
      *
      * @return Result|null
-     * @since 2.0.0
      */
     public function getResult()
     {
@@ -384,7 +371,6 @@ public function getResult()
      * Get quotes
      *
      * @return Result
-     * @since 2.0.0
      */
     protected function _getQuotes()
     {
@@ -396,7 +382,6 @@ protected function _getQuotes()
      *
      * @param string $freeMethod
      * @return void
-     * @since 2.0.0
      */
     protected function _setFreeMethodRequest($freeMethod)
     {
@@ -417,7 +402,6 @@ protected function _setFreeMethodRequest($freeMethod)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _getXmlQuotes()
     {
@@ -551,7 +535,6 @@ protected function _getXmlQuotes()
      * @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _parseXmlResponse($response)
     {
@@ -656,7 +639,6 @@ protected function _parseXmlResponse($response)
      * @param string $code
      * @return array|false
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getCode($type, $code = '')
     {
@@ -998,7 +980,6 @@ public function getCode($type, $code = '')
      *
      * @param string|string[] $trackings
      * @return Result|null
-     * @since 2.0.0
      */
     public function getTracking($trackings)
     {
@@ -1017,7 +998,6 @@ public function getTracking($trackings)
      * Set tracking request
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setTrackingReqeust()
     {
@@ -1034,7 +1014,6 @@ protected function setTrackingReqeust()
      *
      * @param string[] $trackings
      * @return void
-     * @since 2.0.0
      */
     protected function _getXmlTracking($trackings)
     {
@@ -1084,7 +1063,6 @@ protected function _getXmlTracking($trackings)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _parseXmlTrackingResponse($trackingvalue, $response)
     {
@@ -1141,7 +1119,6 @@ protected function _parseXmlTrackingResponse($trackingvalue, $response)
      * Get tracking response
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -1170,7 +1147,6 @@ public function getResponse()
      * Get allowed shipping methods
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedMethods()
     {
@@ -1190,7 +1166,6 @@ public function getAllowedMethods()
      * @param string $countryId
      * @return string|false
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _getCountryName($countryId)
     {
@@ -1431,7 +1406,6 @@ protected function _getCountryName($countryId)
      *
      * @param  string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _filterServiceName($name)
     {
@@ -1452,7 +1426,6 @@ protected function _filterServiceName($name)
      *
      * @param \Magento\Framework\DataObject $request
      * @return string
-     * @since 2.0.0
      */
     protected function _formUsExpressShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1523,7 +1496,6 @@ protected function _formUsExpressShipmentRequest(\Magento\Framework\DataObject $
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _formUsSignatureConfirmationShipmentRequest(\Magento\Framework\DataObject $request, $serviceType)
     {
@@ -1609,7 +1581,6 @@ protected function _formUsSignatureConfirmationShipmentRequest(\Magento\Framewor
      *
      * @param float $weightInPounds
      * @return float[]
-     * @since 2.0.0
      */
     protected function _convertPoundOunces($weightInPounds)
     {
@@ -1630,7 +1601,6 @@ protected function _convertPoundOunces($weightInPounds)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1884,7 +1854,6 @@ protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1971,7 +1940,6 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param \Magento\Framework\DataObject|null $params
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -1986,7 +1954,6 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
      * Return all container types of carrier
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesAll()
     {
@@ -1997,7 +1964,6 @@ public function getContainerTypesAll()
      * Return structured data of containers witch related with shipping methods
      *
      * @return array|bool
-     * @since 2.0.0
      */
     public function getContainerTypesFilter()
     {
@@ -2009,7 +1975,6 @@ public function getContainerTypesFilter()
      *
      * @param \Magento\Framework\DataObject|null $params
      * @return array
-     * @since 2.0.0
      */
     public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $params = null)
     {
@@ -2030,7 +1995,6 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * @param null|string $countyDest
      * @param null|string $carrierMethodCode
      * @return bool
-     * @since 2.0.0
      */
     public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
     {
@@ -2043,7 +2007,6 @@ public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
      *
      * @param \Magento\Framework\DataObject $params
      * @return array
-     * @since 2.0.0
      */
     public function getContentTypes(\Magento\Framework\DataObject $params)
     {
@@ -2070,7 +2033,6 @@ public function getContentTypes(\Magento\Framework\DataObject $params)
      * @param string $zipString
      * @param bool $returnFull
      * @return string[]
-     * @since 2.0.0
      */
     protected function _parseZip($zipString, $returnFull = false)
     {
diff --git a/app/code/Magento/Usps/Model/Source/Container.php b/app/code/Magento/Usps/Model/Source/Container.php
index 153c7abcc2b87..9f931db1cf98d 100644
--- a/app/code/Magento/Usps/Model/Source/Container.php
+++ b/app/code/Magento/Usps/Model/Source/Container.php
@@ -7,7 +7,6 @@
 
 /**
  * Container source
- * @since 2.0.0
  */
 class Container extends Generic
 {
@@ -15,7 +14,6 @@ class Container extends Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $code = 'container';
 }
diff --git a/app/code/Magento/Usps/Model/Source/Freemethod.php b/app/code/Magento/Usps/Model/Source/Freemethod.php
index 0daad60ffe06f..7072d1e09b29b 100644
--- a/app/code/Magento/Usps/Model/Source/Freemethod.php
+++ b/app/code/Magento/Usps/Model/Source/Freemethod.php
@@ -7,13 +7,11 @@
 
 /**
  * Freemethod source
- * @since 2.0.0
  */
 class Freemethod extends Method
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Usps/Model/Source/Generic.php b/app/code/Magento/Usps/Model/Source/Generic.php
index df402367c3c18..58669832f411f 100644
--- a/app/code/Magento/Usps/Model/Source/Generic.php
+++ b/app/code/Magento/Usps/Model/Source/Generic.php
@@ -10,13 +10,11 @@
 
 /**
  * Generic source
- * @since 2.0.0
  */
 class Generic implements GenericInterface
 {
     /**
      * @var \Magento\Usps\Model\Carrier
-     * @since 2.0.0
      */
     protected $shippingUsps;
 
@@ -24,13 +22,11 @@ class Generic implements GenericInterface
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $code = '';
 
     /**
      * @param \Magento\Usps\Model\Carrier $shippingUsps
-     * @since 2.0.0
      */
     public function __construct(Carrier $shippingUsps)
     {
@@ -41,7 +37,6 @@ public function __construct(Carrier $shippingUsps)
      * Returns array to be used in multiselect on back-end
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Usps/Model/Source/Machinable.php b/app/code/Magento/Usps/Model/Source/Machinable.php
index c05e65a3457e5..9e3bb9f34ac77 100644
--- a/app/code/Magento/Usps/Model/Source/Machinable.php
+++ b/app/code/Magento/Usps/Model/Source/Machinable.php
@@ -7,7 +7,6 @@
 
 /**
  * Machinable source
- * @since 2.0.0
  */
 class Machinable extends Generic
 {
@@ -15,7 +14,6 @@ class Machinable extends Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $code = 'machinable';
 }
diff --git a/app/code/Magento/Usps/Model/Source/Method.php b/app/code/Magento/Usps/Model/Source/Method.php
index c947dfa95df54..c2668a2376ea5 100644
--- a/app/code/Magento/Usps/Model/Source/Method.php
+++ b/app/code/Magento/Usps/Model/Source/Method.php
@@ -10,7 +10,6 @@
 
 /**
 * Method source
- * @since 2.0.0
 */
 class Method extends Generic
 {
@@ -18,7 +17,6 @@ class Method extends Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $code = 'method';
 }
diff --git a/app/code/Magento/Usps/Model/Source/Size.php b/app/code/Magento/Usps/Model/Source/Size.php
index fecf0cb432827..7c6bc723f950f 100644
--- a/app/code/Magento/Usps/Model/Source/Size.php
+++ b/app/code/Magento/Usps/Model/Source/Size.php
@@ -7,7 +7,6 @@
 
 /**
  * Size source
- * @since 2.0.0
  */
 class Size extends Generic
 {
@@ -15,7 +14,6 @@ class Size extends Generic
      * Carrier code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $code = 'size';
 }
diff --git a/app/code/Magento/Usps/Setup/InstallData.php b/app/code/Magento/Usps/Setup/InstallData.php
index ee32cd6e38ac0..bea1aa665c1ba 100644
--- a/app/code/Magento/Usps/Setup/InstallData.php
+++ b/app/code/Magento/Usps/Setup/InstallData.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Variable/Block/System/Variable.php b/app/code/Magento/Variable/Block/System/Variable.php
index 106261422bcc0..fcf14828d1384 100644
--- a/app/code/Magento/Variable/Block/System/Variable.php
+++ b/app/code/Magento/Variable/Block/System/Variable.php
@@ -9,7 +9,6 @@
  * Custom Variable Block
  *
  * @api
- * @since 2.0.0
  */
 class Variable extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -17,7 +16,6 @@ class Variable extends \Magento\Backend\Block\Widget\Grid\Container
      * Block constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Variable/Block/System/Variable/Edit.php b/app/code/Magento/Variable/Block/System/Variable/Edit.php
index f7046bc2a0128..9edb4dd3428e0 100644
--- a/app/code/Magento/Variable/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Variable/Block/System/Variable/Edit.php
@@ -9,7 +9,6 @@
  * Custom Variable Edit Container
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -25,7 +23,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -55,7 +51,6 @@ protected function _construct()
      * Getter
      *
      * @return \Magento\Variable\Model\Variable
-     * @since 2.0.0
      */
     public function getVariable()
     {
@@ -67,7 +62,6 @@ public function getVariable()
      * Adding save_and_continue button
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _preparelayout()
     {
@@ -92,7 +86,6 @@ protected function _preparelayout()
      * Return form HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormHtml()
     {
@@ -107,7 +100,6 @@ public function getFormHtml()
      * Return translated header text depending on creating/editing action
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -122,7 +114,6 @@ public function getHeaderText()
      * Return validation url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -133,7 +124,6 @@ public function getValidationUrl()
      * Return save url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
@@ -144,7 +134,6 @@ public function getSaveUrl()
      * Return save and continue url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveAndContinueUrl()
     {
diff --git a/app/code/Magento/Variable/Block/System/Variable/Edit/Form.php b/app/code/Magento/Variable/Block/System/Variable/Edit/Form.php
index cb1980a6b82ef..a23eb3eec97b7 100644
--- a/app/code/Magento/Variable/Block/System/Variable/Edit/Form.php
+++ b/app/code/Magento/Variable/Block/System/Variable/Edit/Form.php
@@ -9,7 +9,6 @@
  * Custom Variable Edit Form
  *
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -17,7 +16,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Getter
      *
      * @return \Magento\Variable\Model\Variable
-     * @since 2.0.0
      */
     public function getVariable()
     {
@@ -28,7 +26,6 @@ public function getVariable()
      * Prepare form before rendering HTML
      *
      * @return \Magento\Variable\Block\System\Variable\Edit\Form
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
index 520502b18dadc..2b3a3107a15b9 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
@@ -9,7 +9,6 @@
 
 /**
  * Custom Variables admin controller
- * @since 2.0.0
  */
 abstract class Variable extends Action
 {
@@ -24,31 +23,26 @@ abstract class Variable extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
-     * @since 2.0.0
      */
     protected $resultForwardFactory;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
-     * @since 2.0.0
      */
     protected $resultJsonFactory;
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
@@ -59,7 +53,6 @@ abstract class Variable extends Action
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -81,7 +74,6 @@ public function __construct(
      * Initialize Layout and set breadcrumbs
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     protected function createPage()
     {
@@ -96,7 +88,6 @@ protected function createPage()
      * Initialize Variable object
      *
      * @return \Magento\Variable\Model\Variable
-     * @since 2.0.0
      */
     protected function _initVariable()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php
index ba639184705f4..8b59681096ba4 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Variable\Controller\Adminhtml\System\Variable\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * Delete Action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php
index 7a73a3978b825..2ce4e6a7b8af4 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php
@@ -10,7 +10,6 @@
  * Display Variables edit form page
  *
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -18,7 +17,6 @@ class Edit extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * Edit Action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
index e835e9b993b46..f15b31eef9be3 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
@@ -9,7 +9,6 @@
 /**
  * Display Variables list page
  * @api
- * @since 2.0.0
  */
 class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * Index Action
      *
      * @return \Magento\Backend\Model\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php
index f767bea0ce682..463c3d16d9fb7 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php
@@ -10,7 +10,6 @@
  * Create new variable form
  *
  * @api
- * @since 2.0.0
  */
 class NewAction extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -18,7 +17,6 @@ class NewAction extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * New Action (forward to edit action)
      *
      * @return \Magento\Backend\Model\View\Result\Forward
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php
index b6ec7784f47fb..b7934eafc0f61 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php
@@ -10,7 +10,6 @@
  * Save variable POST controller
  *
  * @api
- * @since 2.0.0
  */
 class Save extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -18,7 +17,6 @@ class Save extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * Save Action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php
index aa599e7d9306c..8ee98185b9c42 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php
@@ -9,7 +9,6 @@
 /**
  * Validate variable value before save controller
  * @api
- * @since 2.0.0
  */
 class Validate extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -17,7 +16,6 @@ class Validate extends \Magento\Variable\Controller\Adminhtml\System\Variable
      * Validate Action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
index 3d823abcb9709..e2f59c55cfad0 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
@@ -10,7 +10,6 @@
  * Retrieve variables list for WYSIWYG
  *
  * @api
- * @since 2.0.0
  */
 class WysiwygPlugin extends \Magento\Variable\Controller\Adminhtml\System\Variable
 {
@@ -18,7 +17,6 @@ class WysiwygPlugin extends \Magento\Variable\Controller\Adminhtml\System\Variab
      * WYSIWYG Plugin Action
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Variable/Model/ResourceModel/Variable.php b/app/code/Magento/Variable/Model/ResourceModel/Variable.php
index cd0e74b2c38f0..1ca2c62345c7a 100644
--- a/app/code/Magento/Variable/Model/ResourceModel/Variable.php
+++ b/app/code/Magento/Variable/Model/ResourceModel/Variable.php
@@ -12,7 +12,6 @@
  * Custom variable resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Variable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,7 +19,6 @@ class Variable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      * @param \Magento\Variable\Model\Variable $object
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode(\Magento\Variable\Model\Variable $object, $code)
     {
@@ -50,7 +47,6 @@ public function loadByCode(\Magento\Variable\Model\Variable $object, $code)
      * @param bool $withValue
      * @param integer $storeId
      * @return array
-     * @since 2.0.0
      */
     public function getVariableByCode($code, $withValue = false, $storeId = 0)
     {
@@ -71,7 +67,6 @@ public function getVariableByCode($code, $withValue = false, $storeId = 0)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -108,7 +103,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -123,7 +117,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @param \Magento\Framework\DB\Select $select
      * @param integer $storeId
      * @return \Magento\Variable\Model\ResourceModel\Variable
-     * @since 2.0.0
      */
     protected function _addValueToSelect(
         \Magento\Framework\DB\Select $select,
diff --git a/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php b/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
index 88f70d0d7d360..3b74849352274 100644
--- a/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
+++ b/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
@@ -9,7 +9,6 @@
  * Custom variable collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -17,7 +16,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store Id
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId = 0;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      *  Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -38,7 +35,6 @@ protected function _construct()
      *
      * @param integer $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -50,7 +46,6 @@ public function setStoreId($storeId)
      * Getter
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -61,7 +56,6 @@ public function getStoreId()
      * Add store values to result
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addValuesToResult()
     {
@@ -78,7 +72,6 @@ public function addValuesToResult()
      * Retrieve option array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Variable/Model/Variable.php b/app/code/Magento/Variable/Model/Variable.php
index 1e6b899108ffb..d9e7c271eb95f 100644
--- a/app/code/Magento/Variable/Model/Variable.php
+++ b/app/code/Magento/Variable/Model/Variable.php
@@ -16,7 +16,6 @@
  * @method \Magento\Variable\Model\Variable setName(string $value)
  *
  * @api
- * @since 2.0.0
  */
 class Variable extends \Magento\Framework\Model\AbstractModel
 {
@@ -26,13 +25,11 @@ class Variable extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_storeId = 0;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper = null;
 
@@ -43,7 +40,6 @@ class Variable extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Variable\Model\ResourceModel\Variable $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -61,7 +57,6 @@ public function __construct(
      * Internal Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +70,6 @@ protected function _construct()
      * @param integer $storeId
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setStoreId($storeId)
     {
@@ -88,7 +82,6 @@ public function setStoreId($storeId)
      *
      * @return integer
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getStoreId()
     {
@@ -101,7 +94,6 @@ public function getStoreId()
      * @param string $code
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function loadByCode($code)
     {
@@ -114,7 +106,6 @@ public function loadByCode($code)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getValue($type = null)
     {
@@ -136,7 +127,6 @@ public function getValue($type = null)
      * Validation of object data. Checking for unique variable code
      *
      * @return \Magento\Framework\Phrase|bool
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -155,7 +145,6 @@ public function validate()
      * @todo: extract method as separate class
      * @param bool $withGroup
      * @return array
-     * @since 2.0.0
      */
     public function getVariablesOptionArray($withGroup = false)
     {
diff --git a/app/code/Magento/Variable/Model/Variable/Config.php b/app/code/Magento/Variable/Model/Variable/Config.php
index 35f9712af4fde..2d921a994bdce 100644
--- a/app/code/Magento/Variable/Model/Variable/Config.php
+++ b/app/code/Magento/Variable/Model/Variable/Config.php
@@ -9,19 +9,16 @@
  * Variable Wysiwyg Plugin Config
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
@@ -29,7 +26,6 @@ class Config
      * Constructor
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Backend\Model\UrlInterface $url
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $config
      * @return array
-     * @since 2.0.0
      */
     public function getWysiwygPluginSettings($config)
     {
@@ -77,7 +72,6 @@ public function getWysiwygPluginSettings($config)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getWysiwygJsPluginSrc()
     {
@@ -90,7 +84,6 @@ public function getWysiwygJsPluginSrc()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getVariablesWysiwygActionUrl()
     {
diff --git a/app/code/Magento/Variable/Setup/InstallSchema.php b/app/code/Magento/Variable/Setup/InstallSchema.php
index 07cd8a680f486..65b59a24fb51a 100644
--- a/app/code/Magento/Variable/Setup/InstallSchema.php
+++ b/app/code/Magento/Variable/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
index b236f389f5ef7..88456641ea606 100644
--- a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
@@ -10,21 +10,21 @@
  * Interface PaymentTokenInterfaceFactory
  * @deprecated 2.2.0
  * @see PaymentTokenFactoryInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PaymentTokenInterfaceFactory
 {
     /**
      * Create payment token entity
      * @return PaymentTokenInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function create();
 
     /**
      * Return type of payment token
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getType();
 }
diff --git a/app/code/Magento/Vault/Api/PaymentMethodListInterface.php b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
index fd52377871166..b57de6ecbd260 100644
--- a/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
+++ b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
@@ -11,7 +11,7 @@
  * Contains methods to retrieve vault payment methods
  * This interface is consistent with \Magento\Payment\Api\PaymentMethodListInterface
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PaymentMethodListInterface
 {
@@ -19,7 +19,7 @@ interface PaymentMethodListInterface
      * Get list of available vault payments
      * @param int $storeId
      * @return VaultPaymentInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getList($storeId);
 
@@ -27,7 +27,7 @@ public function getList($storeId);
      * Get list of enabled in the configuration vault payments
      * @param int $storeId
      * @return VaultPaymentInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getActiveList($storeId);
 }
diff --git a/app/code/Magento/Vault/Block/AbstractTokenRenderer.php b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
index 1fcb45f6b6bc9..bedf83f844727 100644
--- a/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
+++ b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
@@ -12,19 +12,19 @@
 /**
  * Class AbstractTokenRenderer
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 abstract class AbstractTokenRenderer extends Template implements TokenRendererInterface, IconInterface
 {
     /**
      * @var PaymentTokenInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $token;
 
     /**
      * @var array|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $tokenDetails;
 
@@ -33,7 +33,7 @@ abstract class AbstractTokenRenderer extends Template implements TokenRendererIn
      *
      * @param PaymentTokenInterface $token
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function render(PaymentTokenInterface $token)
     {
@@ -44,7 +44,7 @@ public function render(PaymentTokenInterface $token)
 
     /**
      * @return PaymentTokenInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getToken()
     {
@@ -53,7 +53,7 @@ public function getToken()
 
     /**
      * @return array|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function getTokenDetails()
     {
diff --git a/app/code/Magento/Vault/Block/Customer/AccountTokens.php b/app/code/Magento/Vault/Block/Customer/AccountTokens.php
index 2a8d270a340c2..1df896852f7f7 100644
--- a/app/code/Magento/Vault/Block/Customer/AccountTokens.php
+++ b/app/code/Magento/Vault/Block/Customer/AccountTokens.php
@@ -11,13 +11,13 @@
  * Class AccountTokens
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class AccountTokens extends PaymentTokens
 {
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getType()
     {
diff --git a/app/code/Magento/Vault/Block/Customer/CreditCards.php b/app/code/Magento/Vault/Block/Customer/CreditCards.php
index b9149ee82a71b..b83897e611fea 100644
--- a/app/code/Magento/Vault/Block/Customer/CreditCards.php
+++ b/app/code/Magento/Vault/Block/Customer/CreditCards.php
@@ -11,13 +11,13 @@
  * Class CreditCards
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreditCards extends PaymentTokens
 {
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getType()
     {
diff --git a/app/code/Magento/Vault/Block/Customer/IconInterface.php b/app/code/Magento/Vault/Block/Customer/IconInterface.php
index 4d7c38edd0415..b1d2ce68a1417 100644
--- a/app/code/Magento/Vault/Block/Customer/IconInterface.php
+++ b/app/code/Magento/Vault/Block/Customer/IconInterface.php
@@ -7,28 +7,28 @@
 
 /**
  * Interface IconInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface IconInterface
 {
     /**
      * Get url to icon
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconUrl();
 
     /**
      * Get width of icon
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconHeight();
 
     /**
      * Get height of icon
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getIconWidth();
 }
diff --git a/app/code/Magento/Vault/Block/Customer/PaymentTokens.php b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
index b0dc948ae3865..bbe5c8d14f821 100644
--- a/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
+++ b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
@@ -12,19 +12,19 @@
 
 /**
  * Class PaymentTokens
- * @since 2.2.0
+ * @since 2.1.3
  */
 abstract class PaymentTokens extends Template
 {
     /**
      * @var PaymentTokenInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerTokens;
 
     /**
      * @var CustomerTokenManagement
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customerTokenManagement;
 
@@ -33,7 +33,7 @@ abstract class PaymentTokens extends Template
      * @param Template\Context $context
      * @param CustomerTokenManagement $customerTokenManagement
      * @param array $data
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Template\Context $context,
@@ -47,13 +47,13 @@ public function __construct(
     /**
      * Get type of token
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     abstract public function getType();
 
     /**
      * @return PaymentTokenInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getPaymentTokens()
     {
@@ -70,7 +70,7 @@ public function getPaymentTokens()
     /**
      * @param PaymentTokenInterface $token
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function renderTokenHtml(PaymentTokenInterface $token)
     {
@@ -87,7 +87,7 @@ public function renderTokenHtml(PaymentTokenInterface $token)
     /**
      * Checks if customer tokens exists
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isExistsCustomerTokens()
     {
@@ -97,7 +97,7 @@ public function isExistsCustomerTokens()
     /**
      * Get customer session tokens
      * @return PaymentTokenInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getCustomerTokens()
     {
diff --git a/app/code/Magento/Vault/Block/TokenRendererInterface.php b/app/code/Magento/Vault/Block/TokenRendererInterface.php
index 4b686bd774bae..be4ce42c19cc2 100644
--- a/app/code/Magento/Vault/Block/TokenRendererInterface.php
+++ b/app/code/Magento/Vault/Block/TokenRendererInterface.php
@@ -35,7 +35,7 @@ public function render(PaymentTokenInterface $token);
     /**
      * Get payment token
      * @return PaymentTokenInterface|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getToken();
 }
diff --git a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
index 37fefb8bfe95b..632dd4ae70c4a 100644
--- a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
@@ -14,13 +14,13 @@
  * Class AbstractPaymentTokenFactory
  * @deprecated 2.2.0
  * @see PaymentTokenFactoryInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 abstract class AbstractPaymentTokenFactory implements PaymentTokenInterfaceFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $objectManager;
 
@@ -34,7 +34,7 @@ abstract class AbstractPaymentTokenFactory implements PaymentTokenInterfaceFacto
      * AccountPaymentTokenFactory constructor.
      * @param ObjectManagerInterface $objectManager
      * @param PaymentTokenFactoryInterface $paymentTokenFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -51,7 +51,7 @@ public function __construct(
     /**
      * Create payment token entity
      * @return PaymentTokenInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function create()
     {
diff --git a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
index 0e2ee97f00fba..d9d1c0de1323d 100644
--- a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
@@ -9,7 +9,7 @@
  * Class AccountPaymentTokenFactory
  * @deprecated 2.2.0
  * @see PaymentTokenFactoryInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 class AccountPaymentTokenFactory extends AbstractPaymentTokenFactory
 {
@@ -20,7 +20,7 @@ class AccountPaymentTokenFactory extends AbstractPaymentTokenFactory
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getType()
     {
diff --git a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
index 80c449faf22f7..9a4bf7773708c 100644
--- a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
+++ b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
@@ -9,7 +9,7 @@
  * Class CreditCardTokenFactory
  * @deprecated 2.2.0
  * @see PaymentTokenFactoryInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 class CreditCardTokenFactory extends AbstractPaymentTokenFactory
 {
@@ -20,7 +20,7 @@ class CreditCardTokenFactory extends AbstractPaymentTokenFactory
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getType()
     {
diff --git a/app/code/Magento/Vault/Model/PaymentMethodList.php b/app/code/Magento/Vault/Model/PaymentMethodList.php
index 694513cdfdbe6..328ccf092c299 100644
--- a/app/code/Magento/Vault/Model/PaymentMethodList.php
+++ b/app/code/Magento/Vault/Model/PaymentMethodList.php
@@ -13,19 +13,19 @@
 
 /**
  * Contains methods to retrieve configured vault payments
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PaymentMethodList implements VaultPaymentMethodListInterface
 {
     /**
      * @var InstanceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $instanceFactory;
 
     /**
      * @var PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentMethodList;
 
@@ -33,7 +33,7 @@ class PaymentMethodList implements VaultPaymentMethodListInterface
      * PaymentMethodList constructor.
      * @param PaymentMethodListInterface $paymentMethodList
      * @param InstanceFactory $instanceFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(PaymentMethodListInterface $paymentMethodList, InstanceFactory $instanceFactory)
     {
@@ -43,7 +43,7 @@ public function __construct(PaymentMethodListInterface $paymentMethodList, Insta
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getList($storeId)
     {
@@ -52,7 +52,7 @@ public function getList($storeId)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getActiveList($storeId)
     {
@@ -63,7 +63,7 @@ public function getActiveList($storeId)
      * Filter vault methods from payments
      * @param PaymentMethodInterface[] $list
      * @return VaultPaymentInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function filterList(array $list)
     {
diff --git a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
index f52973daba46e..a1fad23f21037 100644
--- a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
@@ -82,13 +82,13 @@ class TokensConfigProvider
 
     /**
      * @var OrderRepositoryInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $orderRepository;
 
     /**
      * @var PaymentTokenManagementInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $paymentTokenManagement;
 
@@ -235,7 +235,7 @@ private function getVaultPayment($vaultPaymentCode)
     /**
      * Returns payment token entity id by order payment id
      * @return int|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getPaymentTokenEntityId()
     {
@@ -251,7 +251,7 @@ private function getPaymentTokenEntityId()
      * Using 'getReordered' for Reorder action
      * Using 'getOrder' for Edit action
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getOrderPaymentEntityId()
     {
@@ -279,8 +279,8 @@ private function getPaymentDataHelper()
     /**
      * Returns order repository instance
      * @return OrderRepositoryInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getOrderRepository()
     {
@@ -295,8 +295,8 @@ private function getOrderRepository()
     /**
      * Returns payment token management instance
      * @return PaymentTokenManagementInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getPaymentTokenManagement()
     {
diff --git a/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
index 5d25455af22ff..471b927775b95 100644
--- a/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
@@ -44,7 +44,7 @@ class TokensConfigProvider implements ConfigProviderInterface
 
     /**
      * @var PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $vaultPaymentList;
 
@@ -148,8 +148,8 @@ private function getComponentProvider($vaultProviderCode)
     /**
      * Get instance of vault payment list instance
      * @return PaymentMethodListInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getVaultPaymentList()
     {
diff --git a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
index f6758bdcd55fe..9cc2f7fc1fc4c 100644
--- a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
@@ -41,7 +41,7 @@ class VaultConfigProvider implements ConfigProviderInterface
 
     /**
      * @var PaymentMethodListInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $vaultPaymentList;
 
@@ -86,8 +86,8 @@ public function getConfig()
     /**
      * Get vault payment list instance
      * @return PaymentMethodListInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getVaultPaymentList()
     {
diff --git a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
index 7fab3a62ab752..d67ecb3f785a8 100644
--- a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
+++ b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
@@ -50,7 +50,7 @@ public function __construct(
      * @param OrderPaymentInterface $payment
      * @param OrderPaymentExtensionInterface|null $paymentExtension
      * @return OrderPaymentExtensionInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function afterGetExtensionAttributes(
         OrderPaymentInterface $payment,
diff --git a/app/code/Magento/Vault/Setup/UpgradeData.php b/app/code/Magento/Vault/Setup/UpgradeData.php
index 9e8e5fa2d620d..d5ef8c9fe5575 100644
--- a/app/code/Magento/Vault/Setup/UpgradeData.php
+++ b/app/code/Magento/Vault/Setup/UpgradeData.php
@@ -13,13 +13,13 @@
 
 /**
  * Class UpgradeData
- * @since 2.2.0
+ * @since 2.1.3
  */
 class UpgradeData implements UpgradeDataInterface
 {
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 039ac10af6f37..4314676c479f9 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -13,20 +13,17 @@
 
 /**
  * Magento Version controller
- * @since 2.0.0
  */
 class Index extends Action
 {
     /**
      * @var ProductMetadataInterface
-     * @since 2.0.0
      */
     protected $productMetadata;
 
     /**
      * @param Context $context
      * @param ProductMetadataInterface $productMetadata
-     * @since 2.0.0
      */
     public function __construct(Context $context, ProductMetadataInterface $productMetadata)
     {
@@ -39,7 +36,6 @@ public function __construct(Context $context, ProductMetadataInterface $productM
      * version from response
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php
index a9e5f4bec4758..aa543f239d7f4 100644
--- a/app/code/Magento/Webapi/Controller/PathProcessor.php
+++ b/app/code/Magento/Webapi/Controller/PathProcessor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Webapi\Controller\PathProcessor
  *
- * @since 2.0.0
  */
 class PathProcessor
 {
@@ -20,13 +19,11 @@ class PathProcessor
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     private $storeManager;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      *
      * @param string $pathInfo
      * @return array
-     * @since 2.0.0
      */
     private function stripPathBeforeStorecode($pathInfo)
     {
@@ -54,7 +50,6 @@ private function stripPathBeforeStorecode($pathInfo)
      * @param string $pathInfo
      * @return string
      * @throws NoSuchEntityException
-     * @since 2.0.0
      */
     public function process($pathInfo)
     {
diff --git a/app/code/Magento/Webapi/Controller/Rest.php b/app/code/Magento/Webapi/Controller/Rest.php
index 7375f2b98a64b..f396988d4d9ed 100644
--- a/app/code/Magento/Webapi/Controller/Rest.php
+++ b/app/code/Magento/Webapi/Controller/Rest.php
@@ -28,7 +28,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Rest implements \Magento\Framework\App\FrontControllerInterface
 {
@@ -38,38 +37,32 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
     /**
      * @var Router
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_router;
 
     /**
      * @var Route
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_route;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Response
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -83,63 +76,53 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
     /**
      * @var ServiceInputProcessor
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $serviceInputProcessor;
 
     /**
      * @var \Magento\Framework\Webapi\ErrorProcessor
-     * @since 2.0.0
      */
     protected $_errorProcessor;
 
     /**
      * @var \Magento\Webapi\Controller\PathProcessor
-     * @since 2.0.0
      */
     protected $_pathProcessor;
 
     /**
      * @var \Magento\Framework\App\AreaList
-     * @since 2.0.0
      */
     protected $areaList;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Response\FieldsFilter
-     * @since 2.0.0
      */
     protected $fieldsFilter;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var ParamsOverrider
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $paramsOverrider;
 
     /**
      * @var \Magento\Framework\Webapi\ServiceOutputProcessor
-     * @since 2.0.0
      */
     protected $serviceOutputProcessor;
 
     /**
      * @var \Magento\Webapi\Model\Rest\Swagger\Generator
-     * @since 2.0.0
      */
     protected $swaggerGenerator;
 
     /**
      * @var StoreManagerInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $storeManager;
 
@@ -176,7 +159,6 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
      *
      * TODO: Consider removal of warning suppression
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         RestRequest $request,
@@ -248,7 +230,6 @@ public function setDeploymentConfig(\Magento\Framework\App\DeploymentConfig $dep
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -273,7 +254,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      * Check if current request is schema request.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isSchemaRequest()
     {
@@ -286,7 +266,6 @@ protected function isSchemaRequest()
      * @return Route
      * @deprecated 2.1.0
      * @see \Magento\Webapi\Controller\Rest\InputParamsResolver::getRoute
-     * @since 2.0.0
      */
     protected function getCurrentRoute()
     {
@@ -303,7 +282,6 @@ protected function getCurrentRoute()
      * @return void
      * @deprecated 2.1.0
      * @see \Magento\Webapi\Controller\Rest\RequestValidator::checkPermissions
-     * @since 2.0.0
      */
     protected function checkPermissions()
     {
@@ -320,7 +298,6 @@ protected function checkPermissions()
      * Execute schema request
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processSchemaRequest()
     {
@@ -344,7 +321,6 @@ protected function processSchemaRequest()
      * @throws AuthorizationException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     protected function processApiRequest()
     {
@@ -380,7 +356,6 @@ protected function processApiRequest()
      * @return void
      * @deprecated 2.1.0
      * @see \Magento\Webapi\Controller\Rest\RequestValidator::validate
-     * @since 2.0.0
      */
     protected function validateRequest()
     {
diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php b/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php
index 63c655fdb0091..d0d2cb3b5e844 100644
--- a/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php
+++ b/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php
@@ -11,13 +11,11 @@
 
 /**
  * Replaces a "%customer_id%" value with the real customer id
- * @since 2.0.0
  */
 class ParamOverriderCustomerId implements ParamOverriderInterface
 {
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     private $userContext;
 
@@ -25,7 +23,6 @@ class ParamOverriderCustomerId implements ParamOverriderInterface
      * Constructs an object to override the customer ID parameter on a request.
      *
      * @param UserContextInterface $userContext
-     * @since 2.0.0
      */
     public function __construct(UserContextInterface $userContext)
     {
@@ -34,7 +31,6 @@ public function __construct(UserContextInterface $userContext)
 
     /**
      * {@inheritDoc}
-     * @since 2.0.0
      */
     public function getOverriddenValue()
     {
diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
index 7dacf34cd8ab4..58f9c526dfedf 100644
--- a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
+++ b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
@@ -13,13 +13,11 @@
 
 /**
  * Override parameter values
- * @since 2.0.0
  */
 class ParamsOverrider
 {
     /**
      * @var ParamOverriderInterface[]
-     * @since 2.0.0
      */
     private $paramOverriders;
 
@@ -33,7 +31,6 @@ class ParamsOverrider
      * Initialize dependencies
      *
      * @param ParamOverriderInterface[] $paramOverriders
-     * @since 2.0.0
      */
     public function __construct(
         array $paramOverriders = []
@@ -47,7 +44,6 @@ public function __construct(
      * @param array $inputData Incoming data from request
      * @param array $parameters Contains parameters to replace or default
      * @return array Data in same format as $inputData with appropriate parameters added or changed
-     * @since 2.0.0
      */
     public function override(array $inputData, array $parameters)
     {
@@ -72,7 +68,6 @@ public function override(array $inputData, array $parameters)
      * @param array &$nestedArray
      * @param string[] $arrayKeys
      * @return bool true if array value is set
-     * @since 2.0.0
      */
     protected function isNestedArrayValueSet(&$nestedArray, $arrayKeys)
     {
@@ -94,7 +89,6 @@ protected function isNestedArrayValueSet(&$nestedArray, $arrayKeys)
      * @param string[] $arrayKeys
      * @param string $valueToSet
      * @return void
-     * @since 2.0.0
      */
     protected function setNestedArrayValue(&$nestedArray, $arrayKeys, $valueToSet)
     {
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router.php b/app/code/Magento/Webapi/Controller/Rest/Router.php
index 6b1144dd900c7..4cd32b931c645 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Webapi\Controller\Rest\Router
  *
- * @since 2.0.0
  */
 class Router
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_routes = [];
 
     /**
      * @var \Magento\Webapi\Model\Rest\Config
-     * @since 2.0.0
      */
     protected $_apiConfig;
 
@@ -32,7 +29,6 @@ class Router
      * Initialize dependencies.
      *
      * @param \Magento\Webapi\Model\Rest\Config $apiConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Webapi\Model\Rest\Config $apiConfig)
     {
@@ -46,7 +42,6 @@ public function __construct(\Magento\Webapi\Model\Rest\Config $apiConfig)
      * @param Request $request
      * @return \Magento\Webapi\Controller\Rest\Router\Route
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     public function match(Request $request)
     {
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
index f173a39899d88..58d008084305a 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
@@ -13,55 +13,46 @@
 /**
  * Class \Magento\Webapi\Controller\Rest\Router\Route
  *
- * @since 2.0.0
  */
 class Route implements RouterInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $serviceClass;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $serviceMethod;
 
     /**
      * @var boolean
-     * @since 2.0.0
      */
     protected $secure;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $aclResources = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $parameters = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $variables = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $route;
 
     /**
      * @param string $route
-     * @since 2.0.0
      */
     public function __construct($route = '')
     {
@@ -72,7 +63,6 @@ public function __construct($route = '')
      * Split route by parts and variables
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getRouteParts()
     {
@@ -93,7 +83,6 @@ protected function getRouteParts()
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     protected function isVariable($value)
     {
@@ -109,7 +98,6 @@ protected function isVariable($value)
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     protected function getPathParts($path)
     {
@@ -121,7 +109,6 @@ protected function getPathParts($path)
      *
      * @param Request $request
      * @return array|bool
-     * @since 2.0.0
      */
     public function match(Request $request)
     {
@@ -154,7 +141,6 @@ public function match(Request $request)
      *
      * @param string $serviceClass
      * @return $this
-     * @since 2.0.0
      */
     public function setServiceClass($serviceClass)
     {
@@ -166,7 +152,6 @@ public function setServiceClass($serviceClass)
      * Get service class.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getServiceClass()
     {
@@ -178,7 +163,6 @@ public function getServiceClass()
      *
      * @param string $serviceMethod
      * @return $this
-     * @since 2.0.0
      */
     public function setServiceMethod($serviceMethod)
     {
@@ -190,7 +174,6 @@ public function setServiceMethod($serviceMethod)
      * Get service method name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getServiceMethod()
     {
@@ -202,7 +185,6 @@ public function getServiceMethod()
      *
      * @param boolean $secure
      * @return $this
-     * @since 2.0.0
      */
     public function setSecure($secure)
     {
@@ -214,7 +196,6 @@ public function setSecure($secure)
      * Returns true if the route is secure
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isSecure()
     {
@@ -226,7 +207,6 @@ public function isSecure()
      *
      * @param array $aclResources
      * @return $this
-     * @since 2.0.0
      */
     public function setAclResources($aclResources)
     {
@@ -238,7 +218,6 @@ public function setAclResources($aclResources)
      * Get ACL resources list.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAclResources()
     {
@@ -250,7 +229,6 @@ public function getAclResources()
      *
      * @param array $parameters
      * @return $this
-     * @since 2.0.0
      */
     public function setParameters($parameters)
     {
@@ -262,7 +240,6 @@ public function setParameters($parameters)
      * Get parameters list.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParameters()
     {
diff --git a/app/code/Magento/Webapi/Controller/Soap.php b/app/code/Magento/Webapi/Controller/Soap.php
index d3cd1c2d3f594..32e1cdb9c888d 100644
--- a/app/code/Magento/Webapi/Controller/Soap.php
+++ b/app/code/Magento/Webapi/Controller/Soap.php
@@ -16,7 +16,6 @@
  * SOAP Web API entry point.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Soap implements \Magento\Framework\App\FrontControllerInterface
 {
@@ -29,57 +28,46 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Webapi\Model\Soap\Server
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_soapServer;
 
     /**
      * @var \Magento\Webapi\Model\Soap\Wsdl\Generator
-     * @since 2.0.0
      */
     protected $_wsdlGenerator;
 
     /**
      * @var Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var Response
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var ErrorProcessor
-     * @since 2.0.0
      */
     protected $_errorProcessor;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var PathProcessor
-     * @since 2.0.0
      */
     protected $_pathProcessor;
 
     /**
      * @var \Magento\Framework\App\AreaList
-     * @since 2.0.0
      */
     protected $areaList;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Response\RendererFactory
-     * @since 2.0.0
      */
     protected $rendererFactory;
 
@@ -95,7 +83,6 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
      * @param \Magento\Framework\Webapi\Rest\Response\RendererFactory $rendererFactory
      * @param \Magento\Framework\App\AreaList $areaList
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Request $request,
@@ -126,7 +113,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
@@ -166,7 +152,6 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      * Check if current request is WSDL request. SOAP operation execution request is another type of requests.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isWsdlRequest()
     {
@@ -177,7 +162,6 @@ protected function _isWsdlRequest()
      * Check if current request is WSDL request. SOAP operation execution request is another type of requests.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isWsdlListRequest()
     {
@@ -189,7 +173,6 @@ protected function _isWsdlListRequest()
      *
      * @param \Exception $exception
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareErrorResponse($exception)
     {
@@ -218,7 +201,6 @@ protected function _prepareErrorResponse($exception)
      *
      * @param string $contentType
      * @return $this
-     * @since 2.0.0
      */
     protected function _setResponseContentType($contentType = 'text/xml')
     {
@@ -234,7 +216,6 @@ protected function _setResponseContentType($contentType = 'text/xml')
      *
      * @param string $responseBody
      * @return $this
-     * @since 2.0.0
      */
     protected function _setResponseBody($responseBody)
     {
@@ -253,7 +234,6 @@ protected function _setResponseBody($responseBody)
      *
      * @return void
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     protected function validateWsdlRequest()
     {
diff --git a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
index a83bff5e563b2..d22eaba5a4535 100644
--- a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
+++ b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
@@ -24,7 +24,6 @@
  * The main responsibility is to instantiate proper action controller (service) and execute requested method on it.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Handler
 {
@@ -32,19 +31,16 @@ class Handler
 
     /**
      * @var \Magento\Framework\Webapi\Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Webapi\Model\Soap\Config
-     * @since 2.0.0
      */
     protected $_apiConfig;
 
@@ -56,25 +52,21 @@ class Handler
 
     /**
      * @var \Magento\Framework\Api\SimpleDataObjectConverter
-     * @since 2.0.0
      */
     protected $_dataObjectConverter;
 
     /**
      * @var \Magento\Framework\Webapi\ServiceInputProcessor
-     * @since 2.0.0
      */
     protected $serviceInputProcessor;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $_dataObjectProcessor;
 
     /**
      * @var \Magento\Framework\Reflection\MethodsMap
-     * @since 2.0.0
      */
     protected $methodsMapProcessor;
 
@@ -89,7 +81,6 @@ class Handler
      * @param ServiceInputProcessor $serviceInputProcessor
      * @param DataObjectProcessor $dataObjectProcessor
      * @param MethodsMap $methodsMapProcessor
-     * @since 2.0.0
      */
     public function __construct(
         SoapRequest $request,
@@ -120,7 +111,6 @@ public function __construct(
      * @throws WebapiException
      * @throws \LogicException
      * @throws AuthorizationException
-     * @since 2.0.0
      */
     public function __call($operation, $arguments)
     {
@@ -155,7 +145,6 @@ public function __call($operation, $arguments)
      * @param string $serviceMethod
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareRequestData($serviceClass, $serviceMethod, $arguments)
     {
@@ -173,7 +162,6 @@ protected function _prepareRequestData($serviceClass, $serviceMethod, $arguments
      * @param string $serviceMethodName
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _prepareResponseData($data, $serviceClassName, $serviceMethodName)
     {
diff --git a/app/code/Magento/Webapi/Model/AbstractSchemaGenerator.php b/app/code/Magento/Webapi/Model/AbstractSchemaGenerator.php
index 09d863ef46bcb..e88dd06bc1813 100644
--- a/app/code/Magento/Webapi/Model/AbstractSchemaGenerator.php
+++ b/app/code/Magento/Webapi/Model/AbstractSchemaGenerator.php
@@ -13,32 +13,27 @@
 
 /**
  * Abstract API schema generator.
- * @since 2.0.0
  */
 abstract class AbstractSchemaGenerator
 {
     /**
      * @var Webapi
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $typeProcessor;
 
     /**
      * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface
-     * @since 2.0.0
      */
     protected $customAttributeTypeLocator;
 
-     /**
-      * @var ServiceMetadata
-      * @since 2.0.0
-      */
+    /**
+     * @var ServiceMetadata
+     */
     protected $serviceMetadata;
 
     /**
@@ -64,7 +59,6 @@ abstract class AbstractSchemaGenerator
      * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
      * @param Authorization $authorization
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Webapi $cache,
@@ -86,7 +80,6 @@ public function __construct(
      * Retrieve a list of all services.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getListOfServices()
     {
@@ -101,7 +94,6 @@ public function getListOfServices()
      * @param string $requestHost
      * @param string $endPointUrl
      * @return string
-     * @since 2.0.0
      */
     public function generate($requestedServices, $requestScheme, $requestHost, $endPointUrl)
     {
@@ -129,7 +121,6 @@ public function generate($requestedServices, $requestScheme, $requestHost, $endP
      * @param string $requestHost
      * @param string $requestUri
      * @return string
-     * @since 2.0.0
      */
     abstract protected function generateSchema($requestedServiceMetadata, $requestScheme, $requestHost, $requestUri);
 
@@ -138,7 +129,6 @@ abstract protected function generateSchema($requestedServiceMetadata, $requestSc
      *
      * @param string $serviceName
      * @return array
-     * @since 2.0.0
      */
     abstract protected function getServiceMetadata($serviceName);
 
@@ -147,7 +137,6 @@ abstract protected function getServiceMetadata($serviceName);
      *
      * @param string $messageName
      * @return string
-     * @since 2.0.0
      */
     public function getElementComplexTypeName($messageName)
     {
@@ -161,7 +150,6 @@ public function getElementComplexTypeName($messageName)
      *
      * @param array $requestedServiceMetadata
      * @return void
-     * @since 2.0.0
      */
     protected function collectCallInfo($requestedServiceMetadata)
     {
diff --git a/app/code/Magento/Webapi/Model/Authorization/GuestUserContext.php b/app/code/Magento/Webapi/Model/Authorization/GuestUserContext.php
index 16c58ca2f24ed..99df01e860d9c 100644
--- a/app/code/Magento/Webapi/Model/Authorization/GuestUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/GuestUserContext.php
@@ -10,13 +10,11 @@
 
 /**
  * Guest user context
- * @since 2.0.0
  */
 class GuestUserContext implements UserContextInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -25,7 +23,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
diff --git a/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php b/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
index ace516fab05bd..c97a0cb174f55 100644
--- a/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
@@ -14,37 +14,31 @@
 
 /**
  * A user context determined by OAuth headers in a HTTP request.
- * @since 2.0.0
  */
 class OauthUserContext implements UserContextInterface
 {
     /**
      * @var Request
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $integrationService;
 
     /**
      * @var OauthService
-     * @since 2.0.0
      */
     protected $oauthService;
 
     /**
      * @var  OauthRequestHelper
-     * @since 2.0.0
      */
     protected $oauthHelper;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $integrationId;
 
@@ -55,7 +49,6 @@ class OauthUserContext implements UserContextInterface
      * @param IntegrationServiceInterface $integrationService
      * @param OauthService $oauthService
      * @param OauthRequestHelper $oauthHelper
-     * @since 2.0.0
      */
     public function __construct(
         Request $request,
@@ -71,7 +64,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -94,7 +86,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
index c12c506056750..eaf39549b2c2a 100644
--- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -14,43 +14,36 @@
 
 /**
  * A user context determined by tokens in a HTTP request Authorization header.
- * @since 2.0.0
  */
 class TokenUserContext implements UserContextInterface
 {
     /**
      * @var Request
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var Token
-     * @since 2.0.0
      */
     protected $tokenFactory;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $userId;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $userType;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isRequestProcessed;
 
     /**
      * @var IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $integrationService;
 
@@ -60,7 +53,6 @@ class TokenUserContext implements UserContextInterface
      * @param Request $request
      * @param TokenFactory $tokenFactory
      * @param IntegrationServiceInterface $integrationService
-     * @since 2.0.0
      */
     public function __construct(
         Request $request,
@@ -74,7 +66,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserId()
     {
@@ -84,7 +75,6 @@ public function getUserId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUserType()
     {
@@ -96,7 +86,6 @@ public function getUserType()
      * Finds the bearer token and looks up the value.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processRequest()
     {
@@ -137,7 +126,6 @@ protected function processRequest()
     /**
      * @param Token $token
      * @return void
-     * @since 2.0.0
      */
     protected function setUserDataViaToken(Token $token)
     {
diff --git a/app/code/Magento/Webapi/Model/Config.php b/app/code/Magento/Webapi/Model/Config.php
index 1cfa71d04f23b..5116a13dab7bc 100644
--- a/app/code/Magento/Webapi/Model/Config.php
+++ b/app/code/Magento/Webapi/Model/Config.php
@@ -15,7 +15,6 @@
  * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi.xml files.
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -30,19 +29,16 @@ class Config
 
     /**
      * @var WebapiCache
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var Reader
-     * @since 2.0.0
      */
     protected $configReader;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $services;
 
@@ -58,7 +54,6 @@ class Config
      * @param WebapiCache $cache
      * @param Reader $configReader
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         WebapiCache $cache,
@@ -74,7 +69,6 @@ public function __construct(
      * Return services loaded from cache if enabled or from files merged previously
      *
      * @return array
-     * @since 2.0.0
      */
     public function getServices()
     {
diff --git a/app/code/Magento/Webapi/Model/Config/ClassReflector.php b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
index 035fc55be6022..7ce94c9bc6eeb 100644
--- a/app/code/Magento/Webapi/Model/Config/ClassReflector.php
+++ b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
@@ -9,13 +9,11 @@
 
 /**
  * Class reflector.
- * @since 2.0.0
  */
 class ClassReflector
 {
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $_typeProcessor;
 
@@ -23,7 +21,6 @@ class ClassReflector
      * Construct reflector.
      *
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Reflection\TypeProcessor $typeProcessor)
     {
@@ -63,7 +60,6 @@ public function __construct(\Magento\Framework\Reflection\TypeProcessor $typePro
      *     ),
      *     ...
      * )</pre>
-     * @since 2.0.0
      */
     public function reflectClassMethods($className, $methods)
     {
@@ -85,7 +81,6 @@ public function reflectClassMethods($className, $methods)
      * @param \Zend\Code\Reflection\MethodReflection $method
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function extractMethodData(\Zend\Code\Reflection\MethodReflection $method)
     {
@@ -123,7 +118,6 @@ public function extractMethodData(\Zend\Code\Reflection\MethodReflection $method
      *
      * @param \Zend\Code\Reflection\MethodReflection $method
      * @return string
-     * @since 2.0.0
      */
     protected function extractMethodDescription(\Zend\Code\Reflection\MethodReflection $method)
     {
@@ -147,7 +141,6 @@ protected function extractMethodDescription(\Zend\Code\Reflection\MethodReflecti
      *
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     public function extractClassDescription($className)
     {
diff --git a/app/code/Magento/Webapi/Model/Config/Converter.php b/app/code/Magento/Webapi/Model/Config/Converter.php
index da157a52bd53d..a85fcbb15329f 100644
--- a/app/code/Magento/Webapi/Model/Config/Converter.php
+++ b/app/code/Magento/Webapi/Model/Config/Converter.php
@@ -7,7 +7,6 @@
 
 /**
  * Converter of webapi.xml content into array format.
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -35,7 +34,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -118,7 +116,6 @@ public function convert($source)
      * @param \DOMNodeList $parameters
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function convertMethodParameters($parameters)
     {
@@ -154,7 +151,6 @@ protected function convertMethodParameters($parameters)
      *
      * @param string $url
      * @return string
-     * @since 2.0.0
      */
     protected function convertVersion($url)
     {
diff --git a/app/code/Magento/Webapi/Model/Config/Reader.php b/app/code/Magento/Webapi/Model/Config/Reader.php
index 7f7b9d6a01bc8..15eb1c0fb8e39 100644
--- a/app/code/Magento/Webapi/Model/Config/Reader.php
+++ b/app/code/Magento/Webapi/Model/Config/Reader.php
@@ -7,7 +7,6 @@
 
 /**
  * Service config data reader.
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -15,7 +14,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/routes/route' => ['url', 'method'],
@@ -32,7 +30,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/app/code/Magento/Webapi/Model/Config/SchemaLocator.php b/app/code/Magento/Webapi/Model/Config/SchemaLocator.php
index e8fcfd6258e19..21111f0e9df38 100644
--- a/app/code/Magento/Webapi/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Webapi/Model/Config/SchemaLocator.php
@@ -9,7 +9,6 @@
 
 /**
  * Web API config schema locator.
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -17,7 +16,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -25,13 +23,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -53,7 +48,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php b/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
index fd0f3c198a977..4eb8b131e0718 100644
--- a/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
+++ b/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
@@ -12,7 +12,6 @@
  * Plugin around \Magento\Framework\Authorization::isAllowed
  *
  * Plugin to allow guest users to access resources with anonymous permission
- * @since 2.0.0
  */
 class GuestAuthorization
 {
@@ -26,7 +25,6 @@ class GuestAuthorization
      * @return bool true If resource permission is anonymous,
      * to allow any user access without further checks in parent method
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundIsAllowed(
         \Magento\Framework\Authorization $subject,
diff --git a/app/code/Magento/Webapi/Model/Plugin/Manager.php b/app/code/Magento/Webapi/Model/Plugin/Manager.php
index 1acdc5ed90062..1e6bb809ca890 100644
--- a/app/code/Magento/Webapi/Model/Plugin/Manager.php
+++ b/app/code/Magento/Webapi/Model/Plugin/Manager.php
@@ -12,7 +12,6 @@
 /**
  * Plugin for @see \Magento\Integration\Model\ConfigBasedIntegrationManager model to manage resource permissions of
  * integration installed from config file
- * @since 2.0.0
  */
 class Manager
 {
@@ -20,13 +19,11 @@ class Manager
      * Integration service
      *
      * @var \Magento\Integration\Api\IntegrationServiceInterface
-     * @since 2.0.0
      */
     protected $_integrationService;
 
     /**
      * @var IntegrationAuthorizationInterface
-     * @since 2.0.0
      */
     protected $integrationAuthorizationService;
 
@@ -44,7 +41,6 @@ class Manager
      * @param IntegrationAuthorizationInterface $integrationAuthorizationService
      * @param \Magento\Integration\Api\IntegrationServiceInterface $integrationService
      * @param IntegrationConfig $integrationConfig
-     * @since 2.0.0
      */
     public function __construct(
         IntegrationAuthorizationInterface $integrationAuthorizationService,
@@ -65,7 +61,6 @@ public function __construct(
      * @return string[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function afterProcessIntegrationConfig(
         ConfigBasedIntegrationManager $subject,
diff --git a/app/code/Magento/Webapi/Model/Rest/Config.php b/app/code/Magento/Webapi/Model/Rest/Config.php
index e0d400422fe42..2e1148b8a6469 100644
--- a/app/code/Magento/Webapi/Model/Rest/Config.php
+++ b/app/code/Magento/Webapi/Model/Rest/Config.php
@@ -11,7 +11,6 @@
 
 /**
  * Webapi Config Model for Rest.
- * @since 2.0.0
  */
 class Config
 {
@@ -35,22 +34,17 @@ class Config
     const KEY_PARAMETERS = 'parameters';
     /*#@-*/
 
-    /**
-     * @var ModelConfig
-     * @since 2.0.0
-     */
+    /*#@-*/
     protected $_config;
 
     /**
      * @var \Magento\Framework\Controller\Router\Route\Factory
-     * @since 2.0.0
      */
     protected $_routeFactory;
 
     /**
      * @param ModelConfig $config
      * @param \Magento\Framework\Controller\Router\Route\Factory $routeFactory
-     * @since 2.0.0
      */
     public function __construct(ModelConfig $config, \Magento\Framework\Controller\Router\Route\Factory $routeFactory)
     {
@@ -69,7 +63,6 @@ public function __construct(ModelConfig $config, \Magento\Framework\Controller\R
      *      'secure' => true
      *  );</pre>
      * @return \Magento\Webapi\Controller\Rest\Router\Route
-     * @since 2.0.0
      */
     protected function _createRoute($routeData)
     {
@@ -92,7 +85,6 @@ protected function _createRoute($routeData)
      *
      * @param \Magento\Framework\Webapi\Rest\Request $request
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getServiceBaseUrl($request)
     {
@@ -108,7 +100,6 @@ protected function _getServiceBaseUrl($request)
      * @param \Magento\Framework\Webapi\Rest\Request $request
      * @return Route[] matched routes
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     public function getRestRoutes(\Magento\Framework\Webapi\Rest\Request $request)
     {
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger.php b/app/code/Magento/Webapi/Model/Rest/Swagger.php
index a18b8e1306db4..9363c992775ea 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger.php
@@ -15,7 +15,6 @@
  * @method Swagger setHost(string $host)
  * @method Swagger setDefinitions(array $definitions)
  * @method Swagger setSchemes(array $schemes)
- * @since 2.0.0
  */
 class Swagger extends \Magento\Framework\DataObject
 {
@@ -26,7 +25,6 @@ class Swagger extends \Magento\Framework\DataObject
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -47,7 +45,6 @@ public function __construct()
      * @param string $httpOperation
      * @param string[] $pathInfo
      * @return $this
-     * @since 2.0.0
      */
     public function addPath($path, $httpOperation, $pathInfo)
     {
@@ -60,7 +57,6 @@ public function addPath($path, $httpOperation, $pathInfo)
      *
      * @param string $tagInfo
      * @return $this
-     * @since 2.0.0
      */
     public function addTag($tagInfo)
     {
@@ -72,7 +68,6 @@ public function addTag($tagInfo)
      * Get JSON encoded REST schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function toSchema()
     {
@@ -84,7 +79,6 @@ public function toSchema()
      *
      * @param array $info
      * @return $this
-     * @since 2.0.0
      */
     public function setInfo($info)
     {
@@ -105,7 +99,6 @@ public function setInfo($info)
      *
      * @param string $basePath
      * @return $this
-     * @since 2.0.0
      */
     public function setBasePath($basePath)
     {
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index 37bcd3eaeeeb6..9f6acf7e8bebe 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -25,7 +25,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Generator extends AbstractSchemaGenerator
 {
@@ -46,7 +45,6 @@ class Generator extends AbstractSchemaGenerator
      * Swagger factory instance.
      *
      * @var SwaggerFactory
-     * @since 2.0.0
      */
     protected $swaggerFactory;
 
@@ -54,7 +52,6 @@ class Generator extends AbstractSchemaGenerator
      * Magento product metadata
      *
      * @var ProductMetadataInterface
-     * @since 2.0.0
      */
     protected $productMetadata;
 
@@ -69,7 +66,6 @@ class Generator extends AbstractSchemaGenerator
      * ]
      *
      * @var array
-     * @since 2.0.0
      */
     protected $tags = [];
 
@@ -84,7 +80,6 @@ class Generator extends AbstractSchemaGenerator
      * ]
      * Note: definitionName is converted from class name
      * @var array
-     * @since 2.0.0
      */
     protected $definitions = [];
 
@@ -93,7 +88,6 @@ class Generator extends AbstractSchemaGenerator
      * Contains  mapping to the internal swagger simple types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $simpleTypeList = [
         'bool'                              => 'boolean',
@@ -118,7 +112,6 @@ class Generator extends AbstractSchemaGenerator
      * @param Authorization $authorization
      * @param SwaggerFactory $swaggerFactory
      * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Webapi\Model\Cache\Type\Webapi $cache,
@@ -142,7 +135,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function generateSchema($requestedServiceMetadata, $requestScheme, $requestHost, $endpointUrl)
     {
@@ -186,7 +178,6 @@ protected function generateSchema($requestedServiceMetadata, $requestScheme, $re
      * Get the 'Info' section data
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function getGeneralInfo()
     {
@@ -209,7 +200,6 @@ protected function getGeneralInfo()
      * @param array $httpMethodData
      * @param string $tagName
      * @return array
-     * @since 2.0.0
      */
     protected function generatePathInfo($methodName, $httpMethodData, $tagName)
     {
@@ -235,7 +225,6 @@ protected function generatePathInfo($methodName, $httpMethodData, $tagName)
      *
      * @param array $methodData
      * @return array
-     * @since 2.0.0
      */
     protected function generateMethodResponses($methodData)
     {
@@ -279,7 +268,6 @@ protected function generateMethodResponses($methodData)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     private function generateMethodParameters($httpMethodData)
     {
@@ -363,7 +351,6 @@ private function generateMethodParameters($httpMethodData)
      * @param string $description
      * @param bool|null $required
      * @return array
-     * @since 2.0.0
      */
     private function createQueryParam($name, $type, $description, $required = null)
     {
@@ -386,7 +373,6 @@ private function createQueryParam($name, $type, $description, $required = null)
      * @param string $serviceName
      * @param array $serviceData
      * @return string[]
-     * @since 2.0.0
      */
     protected function generateTagInfo($serviceName, $serviceData)
     {
@@ -404,7 +390,6 @@ protected function generateTagInfo($serviceName, $serviceData)
      * @param string $typeName
      * @param string $description
      * @return array
-     * @since 2.0.0
      */
     protected function getObjectSchema($typeName, $description = '')
     {
@@ -443,7 +428,6 @@ protected function getObjectSchema($typeName, $description = '')
      *
      * @param string $typeName
      * @return array
-     * @since 2.0.0
      */
     protected function generateDefinition($typeName)
     {
@@ -479,7 +463,6 @@ protected function generateDefinition($typeName)
      *
      * @return array
      * Todo: create interface for error response
-     * @since 2.0.0
      */
     protected function getDefinitions()
     {
@@ -608,7 +591,6 @@ private function convertArrayToSnakeCase($properties)
      *
      * @param string $typeName
      * @return string
-     * @since 2.0.0
      */
     protected function getDefinitionReference($typeName)
     {
@@ -622,7 +604,6 @@ protected function getDefinitionReference($typeName)
      *
      * @param string $typeName
      * @return string
-     * @since 2.0.0
      */
     protected function toLowerCaseDashSeparated($typeName)
     {
@@ -634,7 +615,6 @@ protected function toLowerCaseDashSeparated($typeName)
      *
      * @param string $typeName
      * @return bool
-     * @since 2.0.0
      */
     protected function isDefinitionExists($typeName)
     {
@@ -645,7 +625,6 @@ protected function isDefinitionExists($typeName)
      * Create and add custom attribute types
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addCustomAttributeTypes()
     {
@@ -659,7 +638,6 @@ protected function addCustomAttributeTypes()
      *
      * @param string $serviceName
      * @return array
-     * @since 2.0.0
      */
     protected function getServiceMetadata($serviceName)
     {
@@ -671,7 +649,6 @@ protected function getServiceMetadata($serviceName)
      *
      * @param string $type
      * @return bool|string
-     * @since 2.0.0
      */
     protected function getSimpleType($type)
     {
@@ -693,7 +670,6 @@ protected function getSimpleType($type)
      * @param string $description
      * @param string $prefix
      * @return string[]
-     * @since 2.0.0
      */
     protected function getQueryParamNames($name, $type, $description, $prefix = '')
     {
@@ -724,7 +700,6 @@ protected function getQueryParamNames($name, $type, $description, $prefix = '')
      * @param string $prefix
      * @param bool $isArray
      * @return string[]
-     * @since 2.0.0
      */
     private function handleComplex($name, $type, $prefix, $isArray)
     {
@@ -755,7 +730,6 @@ private function handleComplex($name, $type, $prefix, $isArray)
      * @param string $name
      * @param string $prefix
      * @return string
-     * @since 2.0.0
      */
     private function handlePrimitive($name, $prefix)
     {
@@ -769,7 +743,6 @@ private function handlePrimitive($name, $prefix)
      *
      * @param string $uri
      * @return string
-     * @since 2.0.0
      */
     private function convertPathParams($uri)
     {
@@ -789,7 +762,6 @@ private function convertPathParams($uri)
      * @param array $parameterInfo
      * @param string $description
      * @return string[]
-     * @since 2.0.0
      */
     private function generateMethodPathParameter($parameterName, $parameterInfo, $description)
     {
@@ -814,7 +786,6 @@ private function generateMethodPathParameter($parameterName, $parameterInfo, $de
      * @param string $description
      * @param array $parameters
      * @return array
-     * @since 2.0.0
      */
     private function generateMethodQueryParameters($parameterName, $parameterInfo, $description, $parameters)
     {
@@ -852,7 +823,6 @@ private function generateMethodQueryParameters($parameterName, $parameterInfo, $
      * @param string $description
      * @param array $bodySchema
      * @return array
-     * @since 2.0.0
      */
     private function generateBodySchema($parameterName, $parameterInfo, $description, $bodySchema)
     {
@@ -878,7 +848,6 @@ private function generateBodySchema($parameterName, $parameterInfo, $description
      * @param array $parameters
      * @param array $responses
      * @return array
-     * @since 2.0.0
      */
     private function generateMethodSuccessResponse($parameters, $responses)
     {
@@ -905,7 +874,6 @@ private function generateMethodSuccessResponse($parameters, $responses)
      * @param array $exceptionClass
      * @param array $responses
      * @return array
-     * @since 2.0.0
      */
     private function generateMethodExceptionErrorResponses($exceptionClass, $responses)
     {
diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index 7b68dda025dd1..715719905a1f3 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -12,7 +12,6 @@
 
 /**
  * Service Metadata Model
- * @since 2.0.0
  */
 class ServiceMetadata
 {
@@ -45,43 +44,33 @@ class ServiceMetadata
 
     /**#@-*/
 
-    /**
-     * API services
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $services;
 
     /**
      * List of services with route data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $routes;
 
     /**
      * @var WebApiCache
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Webapi\Model\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Webapi\Model\Config\ClassReflector
-     * @since 2.0.0
      */
     protected $classReflector;
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $typeProcessor;
 
@@ -99,7 +88,6 @@ class ServiceMetadata
      * @param \Magento\Webapi\Model\Config\ClassReflector $classReflector
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Webapi\Model\Config $config,
@@ -119,7 +107,6 @@ public function __construct(
      * Collect the list of services metadata
      *
      * @return array
-     * @since 2.0.0
      */
     protected function initServicesMetadata()
     {
@@ -157,7 +144,6 @@ protected function initServicesMetadata()
      * Return services loaded from cache if enabled or from files merged previously
      *
      * @return array
-     * @since 2.0.0
      */
     public function getServicesConfig()
     {
@@ -188,7 +174,6 @@ public function getServicesConfig()
      * @param string $serviceName
      * @return array
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getServiceMetadata($serviceName)
     {
@@ -214,7 +199,6 @@ public function getServiceMetadata($serviceName)
      * @return string
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getServiceName($interfaceName, $version, $preserveVersion = true)
     {
@@ -266,7 +250,6 @@ public function getServiceName($interfaceName, $version, $preserveVersion = true
      * @param string $serviceName
      * @return array
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getRouteMetadata($serviceName)
     {
@@ -281,7 +264,6 @@ public function getRouteMetadata($serviceName)
      * Return routes loaded from cache if enabled or from files merged previously
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRoutesConfig()
     {
@@ -310,7 +292,6 @@ public function getRoutesConfig()
      * Collect the list of services with routes and request types for use in REST.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function initRoutesMetadata()
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Config.php b/app/code/Magento/Webapi/Model/Soap/Config.php
index a036de5eb1121..ea269d8703a47 100644
--- a/app/code/Magento/Webapi/Model/Soap/Config.php
+++ b/app/code/Magento/Webapi/Model/Soap/Config.php
@@ -11,13 +11,11 @@
  * Webapi Config Model for Soap.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,19 +23,16 @@ class Config
      * List of SOAP operations available in the system
      *
      * @var array
-     * @since 2.0.0
      */
     protected $soapOperations;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var \Magento\Webapi\Model\ServiceMetadata
-     * @since 2.0.0
      */
     protected $serviceMetadata;
 
@@ -47,7 +42,6 @@ class Config
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -72,7 +66,6 @@ public function __construct(
      *     ),
      *      ...
      * )</pre>
-     * @since 2.0.0
      */
     protected function getSoapOperations($requestedServices)
     {
@@ -102,7 +95,6 @@ protected function getSoapOperations($requestedServices)
      * @param array $requestedServices The list of requested services with their versions
      * @return array
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     public function getServiceMethodInfo($soapOperation, $requestedServices)
     {
@@ -127,7 +119,6 @@ public function getServiceMethodInfo($soapOperation, $requestedServices)
      *
      * @param array $requestedServices array('FooBarV1', 'OtherBazV2', ...)
      * @return array Filtered list of services
-     * @since 2.0.0
      */
     public function getRequestedSoapServices(array $requestedServices)
     {
@@ -148,7 +139,6 @@ public function getRequestedSoapServices(array $requestedServices)
      * @param string $methodName e.g. create
      * @param string $version
      * @return string e.g. catalogProductCreate
-     * @since 2.0.0
      */
     public function getSoapOperation($interfaceName, $methodName, $version)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
index 9b210e208b0d5..a3cc4632d8e9f 100644
--- a/app/code/Magento/Webapi/Model/Soap/Fault.php
+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Webapi\Model\Soap\Fault
  *
- * @since 2.0.0
  */
 class Fault
 {
@@ -44,17 +43,13 @@ class Fault
     const NODE_DETAIL_WRAPPER = 'GenericFault';
     /**#@-*/
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_soapFaultCode;
 
     /**
      * Parameters are extracted from exception and can be inserted into 'Detail' node as 'Parameters'.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameters = [];
 
@@ -62,7 +57,6 @@ class Fault
      * Wrapped errors are extracted from exception and can be inserted into 'Detail' node as 'WrappedErrors'.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_wrappedErrors = [];
 
@@ -70,7 +64,6 @@ class Fault
      * Fault name is used for details wrapper node name generation.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_faultName = '';
 
@@ -78,43 +71,36 @@ class Fault
      * Details that are used to generate 'Detail' node of SoapFault.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_details = [];
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var Server
-     * @since 2.0.0
      */
     protected $_soapServer;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $stackTrace;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $message;
 
@@ -124,7 +110,6 @@ class Fault
      * @param \Magento\Framework\Webapi\Exception $exception
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -148,7 +133,6 @@ public function __construct(
      * Render exception as XML.
      *
      * @return string
-     * @since 2.0.0
      */
     public function toXml()
     {
@@ -169,7 +153,6 @@ public function toXml()
      * Retrieve additional details about current fault.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParameters()
     {
@@ -180,7 +163,6 @@ public function getParameters()
      * Retrieve wrapped errors about current fault.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWrappedErrors()
     {
@@ -192,7 +174,6 @@ public function getWrappedErrors()
      *
      * @param array $details Associative array containing details about current fault
      * @return $this
-     * @since 2.0.0
      */
     public function addDetails($details)
     {
@@ -204,7 +185,6 @@ public function addDetails($details)
      * Retrieve additional details about current fault.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDetails()
     {
@@ -215,7 +195,6 @@ public function getDetails()
      * Retrieve SOAP fault code.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSoapCode()
     {
@@ -226,7 +205,6 @@ public function getSoapCode()
      * Retrieve SOAP fault language.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLanguage()
     {
@@ -235,7 +213,6 @@ public function getLanguage()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -249,7 +226,6 @@ public function getMessage()
      * @param string $code SOAP fault code
      * @param array|null $details Detailed reason message(s)
      * @return string
-     * @since 2.0.0
      */
     public function getSoapFaultMessage($reason, $code, $details = null)
     {
@@ -285,7 +261,6 @@ public function getSoapFaultMessage($reason, $code, $details = null)
      *
      * @param array $details
      * @return string
-     * @since 2.0.0
      */
     protected function _generateDetailXml($details)
     {
@@ -308,7 +283,6 @@ protected function _generateDetailXml($details)
      *
      * @param array $details
      * @return string
-     * @since 2.0.0
      */
     protected function _convertDetailsToXml($details)
     {
@@ -340,7 +314,6 @@ protected function _convertDetailsToXml($details)
      *
      * @param array $parameters
      * @return string
-     * @since 2.0.0
      */
     protected function _getParametersXml($parameters)
     {
@@ -376,7 +349,6 @@ protected function _getParametersXml($parameters)
      *
      * @param array $wrappedErrors
      * @return string
-     * @since 2.0.0
      */
     protected function _getWrappedErrorsXml($wrappedErrors)
     {
@@ -402,7 +374,6 @@ protected function _getWrappedErrorsXml($wrappedErrors)
      *
      * @param array $error
      * @return string
-     * @since 2.0.0
      */
     protected function _generateErrorNodeXML($error)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index 586f49ff6a6b4..c93df49cfa5fe 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -13,7 +13,6 @@
  * SOAP Server
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Server
 {
@@ -33,43 +32,36 @@ class Server
 
     /**
      * @var \Magento\Framework\App\AreaLIst
-     * @since 2.0.0
      */
     protected $_areaList;
 
     /**
      * @var \Magento\Framework\Config\ScopeInterface
-     * @since 2.0.0
      */
     protected $_configScope;
 
     /**
      * @var Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Webapi\Model\Soap\ServerFactory
-     * @since 2.0.0
      */
     protected $_soapServerFactory;
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $_typeProcessor;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -91,7 +83,6 @@ class Server
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Wsdl\Generator $wsdlGenerator
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\AreaList $areaList,
@@ -124,7 +115,6 @@ public function __construct(
      * Handle SOAP request. Response is sent by SOAP server.
      *
      * @return void
-     * @since 2.0.0
      */
     public function handle()
     {
@@ -158,7 +148,6 @@ private function getWsdlLocalUri()
      * Retrieve charset used in SOAP API.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getApiCharset()
     {
@@ -174,7 +163,6 @@ public function getApiCharset()
      *
      * @param bool $isWsdl
      * @return string
-     * @since 2.0.0
      */
     public function generateUri($isWsdl = false)
     {
@@ -190,7 +178,6 @@ public function generateUri($isWsdl = false)
      * Generate URI of SOAP endpoint.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEndpointUri()
     {
@@ -208,7 +195,6 @@ public function getEndpointUri()
      * @param string $soapRequest
      * @throws \Magento\Framework\Webapi\Exception With invalid SOAP extension
      * @return $this
-     * @since 2.0.0
      */
     protected function _checkRequest($soapRequest)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/ServerFactory.php b/app/code/Magento/Webapi/Model/Soap/ServerFactory.php
index 998b889b8b0ba..9b42f4f94e210 100644
--- a/app/code/Magento/Webapi/Model/Soap/ServerFactory.php
+++ b/app/code/Magento/Webapi/Model/Soap/ServerFactory.php
@@ -10,20 +10,17 @@
 /**
  * Class \Magento\Webapi\Model\Soap\ServerFactory
  *
- * @since 2.0.0
  */
 class ServerFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Webapi\Controller\Soap\Request\Handler
-     * @since 2.0.0
      */
     protected $_soapHandler;
 
@@ -32,7 +29,6 @@ class ServerFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Webapi\Controller\Soap\Request\Handler $soapHandler
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      * @param string $url URL of a WSDL file
      * @param array $options Options including encoding, soap_version etc
      * @return \SoapServer
-     * @since 2.0.0
      */
     public function create($url, $options)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl.php b/app/code/Magento/Webapi/Model/Soap/Wsdl.php
index 46c09d6ab3ec1..2d0b310995215 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl.php
@@ -10,7 +10,6 @@
 
 /**
  * Magento-specific WSDL builder.
- * @since 2.0.0
  */
 class Wsdl extends \Zend\Soap\Wsdl
 {
@@ -21,7 +20,6 @@ class Wsdl extends \Zend\Soap\Wsdl
      * @param string $name
      * @param string|\Zend\Uri\Uri $uri
      * @param ComplexTypeStrategy $strategy
-     * @since 2.0.0
      */
     public function __construct($name, $uri, ComplexTypeStrategy $strategy)
     {
@@ -37,7 +35,6 @@ public function __construct($name, $uri, ComplexTypeStrategy $strategy)
      * @param string|bool $output Output Message
      * @param string|bool|array $fault Message name OR array('message' => ..., 'name' => ...)
      * @return object The new operation's XML_Tree_Node
-     * @since 2.0.0
      */
     public function addPortOperation($portType, $name, $input = false, $output = false, $fault = false)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
index a63587668e8a9..401440684165c 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
@@ -10,7 +10,6 @@
 
 /**
  * Magento-specific Complex type strategy for WSDL auto discovery.
- * @since 2.0.0
  */
 class ComplexTypeStrategy extends AbstractComplexTypeStrategy
 {
@@ -26,7 +25,6 @@ class ComplexTypeStrategy extends AbstractComplexTypeStrategy
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $_typeProcessor;
 
@@ -34,7 +32,6 @@ class ComplexTypeStrategy extends AbstractComplexTypeStrategy
      * Resources configuration data.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
@@ -42,7 +39,6 @@ class ComplexTypeStrategy extends AbstractComplexTypeStrategy
      * Construct strategy with config helper.
      *
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Reflection\TypeProcessor $typeProcessor)
     {
@@ -53,7 +49,6 @@ public function __construct(\Magento\Framework\Reflection\TypeProcessor $typePro
      * Return DOM Document
      *
      * @return \DomDocument
-     * @since 2.0.0
      */
     protected function _getDom()
     {
@@ -67,7 +62,6 @@ protected function _getDom()
      * @param array $parentCallInfo array of callInfo from parent complex type
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addComplexType($type, $parentCallInfo = [])
     {
@@ -100,7 +94,6 @@ public function addComplexType($type, $parentCallInfo = [])
      * @param array $parameters
      * @param array $callInfo
      * @return \DOMElement
-     * @since 2.0.0
      */
     protected function _processParameters($parameters, $callInfo)
     {
@@ -142,7 +135,6 @@ protected function _processParameters($parameters, $callInfo)
      * @param string $parameterType
      * @param array $callInfo
      * @return void
-     * @since 2.0.0
      */
     protected function _processParameter(\DOMElement $element, $isRequired, $parameterData, $parameterType, $callInfo)
     {
@@ -164,7 +156,6 @@ protected function _processParameter(\DOMElement $element, $isRequired, $paramet
      * @param string $type
      * @param array $callInfo
      * @return void
-     * @since 2.0.0
      */
     protected function _processArrayParameter($type, $callInfo = [])
     {
@@ -195,7 +186,6 @@ protected function _processArrayParameter($type, $callInfo = [])
      * @param bool $isRequired
      * @param array &$callInfo
      * @return void
-     * @since 2.0.0
      */
     protected function _revertRequiredCallInfo($isRequired, &$callInfo)
     {
@@ -222,7 +212,6 @@ protected function _revertRequiredCallInfo($isRequired, &$callInfo)
      * @param string|null $default
      * @param array $callInfo
      * @return void
-     * @since 2.0.0
      */
     public function addAnnotation(\DOMElement $element, $documentation, $default = null, $callInfo = [])
     {
@@ -292,7 +281,6 @@ public function addAnnotation(\DOMElement $element, $documentation, $default = n
      * @param string $documentation
      * @param \DOMElement $appInfoNode
      * @return void
-     * @since 2.0.0
      */
     protected function _processElementType($elementType, $documentation, \DOMElement $appInfoNode)
     {
@@ -318,7 +306,6 @@ protected function _processElementType($elementType, $documentation, \DOMElement
      * @param string $default
      * @param \DOMElement $appInfoNode
      * @return void
-     * @since 2.0.0
      */
     protected function _processDefaultValueAnnotation($elementType, $default, \DOMElement $appInfoNode)
     {
@@ -338,7 +325,6 @@ protected function _processDefaultValueAnnotation($elementType, $default, \DOMEl
      * @param \DOMElement $element
      * @return string|null
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _getElementType(\DOMElement $element)
     {
@@ -356,7 +342,6 @@ protected function _getElementType(\DOMElement $element)
      * @param string $documentation
      * @param \DOMElement $appInfoNode
      * @return void
-     * @since 2.0.0
      */
     protected function _processRequiredAnnotation($annotation, $documentation, \DOMElement $appInfoNode)
     {
@@ -372,7 +357,6 @@ protected function _processRequiredAnnotation($annotation, $documentation, \DOME
      * @param \DOMElement $appInfoNode
      * @param array $callInfo
      * @return void
-     * @since 2.0.0
      */
     protected function _processCallInfo(\DOMElement $appInfoNode, $callInfo)
     {
@@ -406,7 +390,6 @@ protected function _processCallInfo(\DOMElement $appInfoNode, $callInfo)
      * @param \DOMElement $appInfoNode
      * @param string $tagValue
      * @return void
-     * @since 2.0.0
      */
     protected function _processDocInstructions(\DOMElement $appInfoNode, $tagValue)
     {
@@ -426,7 +409,6 @@ protected function _processDocInstructions(\DOMElement $appInfoNode, $tagValue)
      * @param \DOMElement $appInfoNode
      * @param string $tagValue
      * @return void
-     * @since 2.0.0
      */
     protected function _processSeeLink(\DOMElement $appInfoNode, $tagValue)
     {
@@ -450,7 +432,6 @@ protected function _processSeeLink(\DOMElement $appInfoNode, $tagValue)
      * @param array &$callInfo
      * @param string $callName
      * @return void
-     * @since 2.0.0
      */
     protected function _overrideCallInfoName(&$callInfo, $callName)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index 27d4cf11d6483..fb31461115e4f 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -16,7 +16,6 @@
 
 /**
  * WSDL generator.
- * @since 2.0.0
  */
 class Generator extends AbstractSchemaGenerator
 {
@@ -27,7 +26,6 @@ class Generator extends AbstractSchemaGenerator
      * WSDL factory instance.
      *
      * @var WsdlFactory
-     * @since 2.0.0
      */
     protected $_wsdlFactory;
 
@@ -40,7 +38,6 @@ class Generator extends AbstractSchemaGenerator
      * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
      * @param Authorization $authorization
      * @param WsdlFactory $wsdlFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Webapi\Model\Cache\Type\Webapi $cache,
@@ -62,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function generateSchema($requestedServiceMetadata, $requestScheme, $requestHost, $endPointUrl)
     {
@@ -121,7 +117,6 @@ protected function generateSchema($requestedServiceMetadata, $requestScheme, $re
      *
      * @param \Magento\Webapi\Model\Soap\Wsdl $wsdl
      * @return \Magento\Webapi\Model\Soap\Wsdl
-     * @since 2.0.0
      */
     protected function addCustomAttributeTypes($wsdl)
     {
@@ -139,7 +134,6 @@ protected function addCustomAttributeTypes($wsdl)
      * @param string $operationName
      * @param array $methodData
      * @return string input message name
-     * @since 2.0.0
      */
     protected function _createOperationInput(Wsdl $wsdl, $operationName, $methodData)
     {
@@ -183,7 +177,6 @@ protected function _createOperationInput(Wsdl $wsdl, $operationName, $methodData
      * @param string $operationName
      * @param array $methodData
      * @return string output message name
-     * @since 2.0.0
      */
     protected function _createOperationOutput(Wsdl $wsdl, $operationName, $methodData)
     {
@@ -220,7 +213,6 @@ protected function _createOperationOutput(Wsdl $wsdl, $operationName, $methodDat
      *
      * @param string $serviceName
      * @return string
-     * @since 2.0.0
      */
     public function getPortTypeName($serviceName)
     {
@@ -232,7 +224,6 @@ public function getPortTypeName($serviceName)
      *
      * @param string $serviceName
      * @return string
-     * @since 2.0.0
      */
     public function getBindingName($serviceName)
     {
@@ -244,7 +235,6 @@ public function getBindingName($serviceName)
      *
      * @param string $serviceName
      * @return string
-     * @since 2.0.0
      */
     public function getPortName($serviceName)
     {
@@ -256,7 +246,6 @@ public function getPortName($serviceName)
      *
      * @param string $serviceName
      * @return string
-     * @since 2.0.0
      */
     public function getServiceName($serviceName)
     {
@@ -268,7 +257,6 @@ public function getServiceName($serviceName)
      *
      * @param string $operationName
      * @return string
-     * @since 2.0.0
      */
     public function getInputMessageName($operationName)
     {
@@ -280,7 +268,6 @@ public function getInputMessageName($operationName)
      *
      * @param string $operationName
      * @return string
-     * @since 2.0.0
      */
     public function getOutputMessageName($operationName)
     {
@@ -292,7 +279,6 @@ public function getOutputMessageName($operationName)
      *
      * @param Wsdl $wsdl
      * @return string Default fault message name
-     * @since 2.0.0
      */
     protected function _addGenericFaultComplexTypeNodes($wsdl)
     {
@@ -374,7 +360,6 @@ protected function _addGenericFaultComplexTypeNodes($wsdl)
      *
      * @param string $serviceName
      * @return array
-     * @since 2.0.0
      */
     protected function getServiceMetadata($serviceName)
     {
diff --git a/app/code/Magento/Webapi/Model/Soap/WsdlFactory.php b/app/code/Magento/Webapi/Model/Soap/WsdlFactory.php
index b738d097ea9f0..0d30a411e7423 100644
--- a/app/code/Magento/Webapi/Model/Soap/WsdlFactory.php
+++ b/app/code/Magento/Webapi/Model/Soap/WsdlFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * Factory of WSDL builders.
- * @since 2.0.0
  */
 class WsdlFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $wsdlName
      * @param string $endpointUrl
      * @return \Magento\Webapi\Model\Soap\Wsdl
-     * @since 2.0.0
      */
     public function create($wsdlName, $endpointUrl)
     {
diff --git a/app/code/Magento/Webapi/Model/WebapiRoleLocator.php b/app/code/Magento/Webapi/Model/WebapiRoleLocator.php
index 5e100b2fb5f7b..0a721eb699ab6 100644
--- a/app/code/Magento/Webapi/Model/WebapiRoleLocator.php
+++ b/app/code/Magento/Webapi/Model/WebapiRoleLocator.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Webapi\Model\WebapiRoleLocator
  *
- * @since 2.0.0
  */
 class WebapiRoleLocator implements RoleLocatorInterface
 {
     /**
      * @var UserContextInterface
-     * @since 2.0.0
      */
     protected $userContext;
 
     /**
      * @var RoleCollectionFactory
-     * @since 2.0.0
      */
     protected $roleCollectionFactory;
 
@@ -35,7 +32,6 @@ class WebapiRoleLocator implements RoleLocatorInterface
      *
      * @param UserContextInterface $userContext
      * @param RoleCollectionFactory $roleCollectionFactory
-     * @since 2.0.0
      */
     public function __construct(
         UserContextInterface $userContext,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAclRoleId()
     {
diff --git a/app/code/Magento/WebapiSecurity/Model/Plugin/AnonymousResourceSecurity.php b/app/code/Magento/WebapiSecurity/Model/Plugin/AnonymousResourceSecurity.php
index f7fe28c538f93..4d0bb68f7a230 100644
--- a/app/code/Magento/WebapiSecurity/Model/Plugin/AnonymousResourceSecurity.php
+++ b/app/code/Magento/WebapiSecurity/Model/Plugin/AnonymousResourceSecurity.php
@@ -10,7 +10,7 @@
 /**
  * Class \Magento\WebapiSecurity\Model\Plugin\AnonymousResourceSecurity
  *
- * @since 2.1.0
+ * @since 2.0.3
  */
 class AnonymousResourceSecurity
 {
@@ -21,13 +21,13 @@ class AnonymousResourceSecurity
 
     /**
      * @var \Magento\Framework\App\Config\ReinitableConfigInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $config;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $resources;
 
@@ -36,7 +36,7 @@ class AnonymousResourceSecurity
      *
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param array $resources
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(\Magento\Framework\App\Config\ReinitableConfigInterface $config, $resources)
     {
@@ -51,7 +51,7 @@ public function __construct(\Magento\Framework\App\Config\ReinitableConfigInterf
      * @param array $nodes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function afterConvert(Converter $subject, $nodes)
     {
@@ -89,7 +89,7 @@ public function afterConvert(Converter $subject, $nodes)
      * @param string $requestType
      * @param array $source
      * @return array|null
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private function getNode($route, $requestType, $source)
     {
diff --git a/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php b/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
index c9d8eeecee498..757f6f79e4e02 100644
--- a/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
+++ b/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
@@ -8,13 +8,13 @@
 /**
  * Class \Magento\WebapiSecurity\Model\Plugin\CacheInvalidator
  *
- * @since 2.1.0
+ * @since 2.0.3
  */
 class CacheInvalidator
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.1.0
+     * @since 2.0.3
      */
     protected $cacheTypeList;
 
@@ -22,7 +22,7 @@ class CacheInvalidator
      * CacheInvalidator constructor.
      *
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function __construct(\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList)
     {
@@ -36,7 +36,7 @@ public function __construct(\Magento\Framework\App\Cache\TypeListInterface $cach
      * @param \Magento\Framework\App\Config\Value $result
      * @return \Magento\Framework\App\Config\Value
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function afterAfterSave(
         \Magento\Framework\App\Config\Value $subject,
diff --git a/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
index 08b2e57591355..b0029ed82d2e6 100644
--- a/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
@@ -15,13 +15,11 @@
  * Sales Order items price column renderer
  *
  * @api
- * @since 2.0.0
  */
 class Renderer extends \Magento\Tax\Block\Adminhtml\Items\Price\Renderer
 {
     /**
      * @var \Magento\Weee\Block\Item\Price\Renderer
-     * @since 2.0.0
      */
     protected $itemPriceRenderer;
 
@@ -31,7 +29,6 @@ class Renderer extends \Magento\Tax\Block\Adminhtml\Items\Price\Renderer
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +50,6 @@ public function __construct(
      * Whether to display weee details together with price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceWithWeeeDetails()
     {
@@ -64,7 +60,6 @@ public function displayPriceWithWeeeDetails()
      * Whether to display final price that include Weee amounts
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayFinalPrice()
     {
@@ -75,7 +70,6 @@ public function displayFinalPrice()
      * Return HTML for unit price excl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnitPriceExclTaxHtml()
     {
@@ -88,7 +82,6 @@ public function getUnitPriceExclTaxHtml()
      * Return HTML for row price excl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowPriceExclTaxHtml()
     {
@@ -101,7 +94,6 @@ public function getRowPriceExclTaxHtml()
      * Return HTML for unit price incl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUnitPriceInclTaxHtml()
     {
@@ -114,7 +106,6 @@ public function getUnitPriceInclTaxHtml()
      * Return HTML for row price incl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRowPriceInclTaxHtml()
     {
@@ -127,7 +118,6 @@ public function getRowPriceInclTaxHtml()
      * Return HTML for final unit price excl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFinalUnitPriceExclTaxHtml()
     {
@@ -140,7 +130,6 @@ public function getFinalUnitPriceExclTaxHtml()
      * Return HTML for final row price excl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFinalRowPriceExclTaxHtml()
     {
@@ -153,7 +142,6 @@ public function getFinalRowPriceExclTaxHtml()
      * Return HTML for final unit price incl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFinalUnitPriceInclTaxHtml()
     {
@@ -166,7 +154,6 @@ public function getFinalUnitPriceInclTaxHtml()
      * Return HTML for final row price incl tax
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFinalRowPriceInclTaxHtml()
     {
@@ -180,7 +167,6 @@ public function getFinalRowPriceInclTaxHtml()
      *
      * @param Item|QuoteItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -192,7 +178,6 @@ public function getTotalAmount($item)
      *
      * @param Item|QuoteItem|InvoiceItem|CreditmemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($item)
     {
diff --git a/app/code/Magento/Weee/Block/Element/Weee/Tax.php b/app/code/Magento/Weee/Block/Element/Weee/Tax.php
index a57086416e365..d69791e2474e2 100644
--- a/app/code/Magento/Weee/Block/Element/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Element/Weee/Tax.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\Weee\Block\Element\Weee\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @since 2.0.0
      */
     protected $localeCurrency;
 
@@ -35,7 +32,6 @@ class Tax extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -62,7 +57,6 @@ protected function _construct()
     /**
      * @param mixed $attribute
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected function getStore($attribute)
     {
@@ -77,7 +71,6 @@ protected function getStore($attribute)
      * @param null|int|string $index
      * @return null|string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/Magento/Weee/Block/Item/Price/Renderer.php b/app/code/Magento/Weee/Block/Item/Price/Renderer.php
index 65c8557a2716c..ae6bcb8698d80 100755
--- a/app/code/Magento/Weee/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Weee/Block/Item/Price/Renderer.php
@@ -16,13 +16,11 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Renderer extends \Magento\Tax\Block\Item\Price\Renderer
 {
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
@@ -32,7 +30,6 @@ class Renderer extends \Magento\Tax\Block\Item\Price\Renderer
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Weee\Helper\Data $weeeHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -50,7 +47,6 @@ public function __construct(
      * Whether to display weee details together with price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayPriceWithWeeeDetails()
     {
@@ -77,7 +73,6 @@ public function displayPriceWithWeeeDetails()
      * Return the flag whether to include weee in the price
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function getIncludeWeeeFlag()
     {
@@ -94,7 +89,6 @@ public function getIncludeWeeeFlag()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getUnitDisplayPriceInclTax()
     {
@@ -116,7 +110,6 @@ public function getUnitDisplayPriceInclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseUnitDisplayPriceInclTax()
     {
@@ -138,7 +131,6 @@ public function getBaseUnitDisplayPriceInclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowDisplayPriceInclTax()
     {
@@ -160,7 +152,6 @@ public function getRowDisplayPriceInclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseRowDisplayPriceInclTax()
     {
@@ -182,7 +173,6 @@ public function getBaseRowDisplayPriceInclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getUnitDisplayPriceExclTax()
     {
@@ -204,7 +194,6 @@ public function getUnitDisplayPriceExclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseUnitDisplayPriceExclTax()
     {
@@ -232,7 +221,6 @@ public function getBaseUnitDisplayPriceExclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRowDisplayPriceExclTax()
     {
@@ -254,7 +242,6 @@ public function getRowDisplayPriceExclTax()
      * depending on Weee display setting
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseRowDisplayPriceExclTax()
     {
@@ -275,7 +262,6 @@ public function getBaseRowDisplayPriceExclTax()
      * Get final unit display price including tax, this will add Weee amount to unit price include tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getFinalUnitDisplayPriceInclTax()
     {
@@ -292,7 +278,6 @@ public function getFinalUnitDisplayPriceInclTax()
      * Get base final unit display price including tax, this will add Weee amount to unit price include tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseFinalUnitDisplayPriceInclTax()
     {
@@ -309,7 +294,6 @@ public function getBaseFinalUnitDisplayPriceInclTax()
      * Get final row display price including tax, this will add weee amount to rowTotalInclTax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getFinalRowDisplayPriceInclTax()
     {
@@ -326,7 +310,6 @@ public function getFinalRowDisplayPriceInclTax()
      * Get base final row display price including tax, this will add weee amount to rowTotalInclTax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseFinalRowDisplayPriceInclTax()
     {
@@ -343,7 +326,6 @@ public function getBaseFinalRowDisplayPriceInclTax()
      * Get final unit display price excluding tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getFinalUnitDisplayPriceExclTax()
     {
@@ -360,7 +342,6 @@ public function getFinalUnitDisplayPriceExclTax()
      * Get base final unit display price excluding tax
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseFinalUnitDisplayPriceExclTax()
     {
@@ -383,7 +364,6 @@ public function getBaseFinalUnitDisplayPriceExclTax()
      * Get final row display price excluding tax, this will add Weee amount to rowTotal
      *
      * @return float
-     * @since 2.0.0
      */
     public function getFinalRowDisplayPriceExclTax()
     {
@@ -400,7 +380,6 @@ public function getFinalRowDisplayPriceExclTax()
      * Get base final row display price excluding tax, this will add Weee amount to rowTotal
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseFinalRowDisplayPriceExclTax()
     {
@@ -417,7 +396,6 @@ public function getBaseFinalRowDisplayPriceExclTax()
      * Whether to display final price that include Weee amounts
      *
      * @return bool
-     * @since 2.0.0
      */
     public function displayFinalPrice()
     {
@@ -442,7 +420,6 @@ public function displayFinalPrice()
      *
      * @param OrderItem|InvoiceItem|CreditMemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getTotalAmount($item)
     {
@@ -460,7 +437,6 @@ public function getTotalAmount($item)
      *
      * @param OrderItem|InvoiceItem|CreditMemoItem $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getBaseTotalAmount($item)
     {
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index ef82dcb112cf1..b079b034fd772 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -12,31 +12,26 @@
 
 /**
  * Adminhtml weee tax item renderer
- * @since 2.0.0
  */
 class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var AbstractElement|null
-     * @since 2.0.0
      */
     protected $_element = null;
 
     /**
      * @var array|null
-     * @since 2.0.0
      */
     protected $_countries = null;
 
     /**
      * @var array|null
-     * @since 2.0.0
      */
     protected $_websites = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'renderer/tax.phtml';
 
@@ -44,19 +39,16 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Directory\Model\Config\Source\Country
-     * @since 2.0.0
      */
     protected $_sourceCountry;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
@@ -66,7 +58,6 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -83,7 +74,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -93,7 +83,6 @@ public function getProduct()
     /**
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -103,7 +92,6 @@ public function render(AbstractElement $element)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -125,7 +113,6 @@ protected function _prepareLayout()
     /**
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     public function setElement(AbstractElement $element)
     {
@@ -135,7 +122,6 @@ public function setElement(AbstractElement $element)
 
     /**
      * @return AbstractElement|null
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -144,7 +130,6 @@ public function getElement()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getValues()
     {
@@ -162,7 +147,6 @@ public function getValues()
      * @param array $firstItem
      * @param array $secondItem
      * @return int
-     * @since 2.0.0
      */
     protected function _sortWeeeTaxes($firstItem, $secondItem)
     {
@@ -177,7 +161,6 @@ protected function _sortWeeeTaxes($firstItem, $secondItem)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getWebsiteCount()
     {
@@ -186,7 +169,6 @@ public function getWebsiteCount()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isMultiWebsites()
     {
@@ -195,7 +177,6 @@ public function isMultiWebsites()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getCountries()
     {
@@ -208,7 +189,6 @@ public function getCountries()
 
     /**
      * @return array|null
-     * @since 2.0.0
      */
     public function getWebsites()
     {
@@ -246,7 +226,6 @@ public function getWebsites()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAddButtonHtml()
     {
diff --git a/app/code/Magento/Weee/Block/Sales/Order/Totals.php b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
index dcf4f45a63fc1..ef132839f1aee 100644
--- a/app/code/Magento/Weee/Block/Sales/Order/Totals.php
+++ b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
@@ -7,13 +7,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Totals extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeData;
 
@@ -21,7 +19,6 @@ class Totals extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Weee\Helper\Data $weeeData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Get totals source object
      *
      * @return \Magento\Sales\Model\Order
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -47,7 +43,6 @@ public function getSource()
      * Create the weee ("FPT") totals summary
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initTotals()
     {
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index bca1737a5ed6d..e5150c8fb2ec8 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -41,17 +40,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_storeDisplayConfig = [];
 
     /**
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
@@ -59,31 +54,26 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData;
 
     /**
      * @var \Magento\Weee\Model\Tax
-     * @since 2.0.0
      */
     protected $_weeeTax;
 
     /**
      * @var \Magento\Weee\Model\Config
-     * @since 2.0.0
      */
     protected $_weeeConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $cacheProductWeeeAmount = '_cache_product_weee_amount';
 
@@ -104,7 +94,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -130,7 +119,6 @@ public function __construct(
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getPriceDisplayType($store = null)
     {
@@ -142,7 +130,6 @@ public function getPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getListPriceDisplayType($store = null)
     {
@@ -154,7 +141,6 @@ public function getListPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getSalesPriceDisplayType($store = null)
     {
@@ -166,7 +152,6 @@ public function getSalesPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getEmailPriceDisplayType($store = null)
     {
@@ -178,7 +163,6 @@ public function getEmailPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function isTaxable($store = null)
     {
@@ -190,7 +174,6 @@ public function isTaxable($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function includeInSubtotal($store = null)
     {
@@ -202,7 +185,6 @@ public function includeInSubtotal($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function isEnabled($store = null)
     {
@@ -214,7 +196,6 @@ public function isEnabled($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function displayTotalsInclTax($store = null)
     {
@@ -228,7 +209,6 @@ public function displayTotalsInclTax($store = null)
      * @param   \Magento\Catalog\Model\Product $product
      * @param   mixed $website
      * @return  float
-     * @since 2.0.0
      */
     public function getAmountExclTax($product, $website = null)
     {
@@ -258,7 +238,6 @@ public function getAmountExclTax($product, $website = null)
      * @param Store|int|string               $store
      * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function typeOfDisplay(
         $compareTo = null,
@@ -312,7 +291,6 @@ public function typeOfDisplay(
      * @param bool                                          $calculateTaxes
      * @param bool                                          $round
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getProductWeeeAttributes(
         $product,
@@ -337,7 +315,6 @@ public function getProductWeeeAttributes(
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedAmount($item)
     {
@@ -349,7 +326,6 @@ public function getWeeeTaxAppliedAmount($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeTaxAppliedRowAmount($item)
     {
@@ -362,7 +338,6 @@ public function getWeeeTaxAppliedRowAmount($item)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param string $functionName
      * @return float
-     * @since 2.0.0
      */
     protected function getRecursiveNumericAmount($item, $functionName)
     {
@@ -391,7 +366,6 @@ protected function getRecursiveNumericAmount($item, $functionName)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return array
-     * @since 2.0.0
      */
     public function getApplied($item)
     {
@@ -422,7 +396,6 @@ public function getApplied($item)
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param array $value
      * @return $this
-     * @since 2.0.0
      */
     public function setApplied($item, $value)
     {
@@ -435,7 +408,6 @@ public function setApplied($item, $value)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getProductWeeeAttributesForDisplay($product)
     {
@@ -458,7 +430,6 @@ public function getProductWeeeAttributesForDisplay($product)
      * @param null|Website $website
      * @param bool $calculateTaxes
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getProductWeeeAttributesForRenderer(
         $product,
@@ -491,7 +462,6 @@ public function getProductWeeeAttributesForRenderer(
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeTaxInclTax($item)
     {
@@ -508,7 +478,6 @@ public function getWeeeTaxInclTax($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxInclTax($item)
     {
@@ -525,7 +494,6 @@ public function getBaseWeeeTaxInclTax($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getRowWeeeTaxInclTax($item)
     {
@@ -542,7 +510,6 @@ public function getRowWeeeTaxInclTax($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getBaseRowWeeeTaxInclTax($item)
     {
@@ -559,7 +526,6 @@ public function getBaseRowWeeeTaxInclTax($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getTotalTaxAppliedForWeeeTax($item)
     {
@@ -580,7 +546,6 @@ public function getTotalTaxAppliedForWeeeTax($item)
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return float
-     * @since 2.0.0
      */
     public function getBaseTotalTaxAppliedForWeeeTax($item)
     {
@@ -599,7 +564,6 @@ public function getBaseTotalTaxAppliedForWeeeTax($item)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeAmountInvoiced($orderItem)
     {
@@ -617,7 +581,6 @@ public function getWeeeAmountInvoiced($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getBaseWeeeAmountInvoiced($orderItem)
     {
@@ -635,7 +598,6 @@ public function getBaseWeeeAmountInvoiced($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeTaxAmountInvoiced($orderItem)
     {
@@ -653,7 +615,6 @@ public function getWeeeTaxAmountInvoiced($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAmountInvoiced($orderItem)
     {
@@ -671,7 +632,6 @@ public function getBaseWeeeTaxAmountInvoiced($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeAmountRefunded($orderItem)
     {
@@ -689,7 +649,6 @@ public function getWeeeAmountRefunded($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getBaseWeeeAmountRefunded($orderItem)
     {
@@ -707,7 +666,6 @@ public function getBaseWeeeAmountRefunded($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeTaxAmountRefunded($orderItem)
     {
@@ -725,7 +683,6 @@ public function getWeeeTaxAmountRefunded($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @return float
-     * @since 2.0.0
      */
     public function getBaseWeeeTaxAmountRefunded($orderItem)
     {
@@ -746,7 +703,6 @@ public function getBaseWeeeTaxAmountRefunded($orderItem)
      * @param  \Magento\Quote\Model\Quote\Item\AbstractItem[] $items
      * @param  null|string|bool|int|Store $store
      * @return float
-     * @since 2.0.0
      */
     public function getTotalAmounts($items, $store = null)
     {
@@ -789,7 +745,6 @@ public function getBaseTotalAmounts($items, $store = null)
      *
      * @param  int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayIncl($storeId = null)
     {
@@ -805,7 +760,6 @@ public function isDisplayIncl($storeId = null)
      *
      * @param  int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayInclDesc($storeId = null)
     {
@@ -821,7 +775,6 @@ public function isDisplayInclDesc($storeId = null)
      *
      * @param  int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayExclDescIncl($storeId = null)
     {
@@ -837,7 +790,6 @@ public function isDisplayExclDescIncl($storeId = null)
      *
      * @param  int|null $storeId
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayExcl($storeId = null)
     {
@@ -853,7 +805,6 @@ public function isDisplayExcl($storeId = null)
      *
      * @param  null|string|bool|int|Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getTaxDisplayConfig($store = null)
     {
@@ -865,7 +816,6 @@ public function getTaxDisplayConfig($store = null)
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return array
-     * @since 2.0.0
      */
     public function getWeeeAttributesForBundle($product)
     {
diff --git a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
index d142aa7376761..36da9f8fbc29a 100644
--- a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
@@ -9,61 +9,51 @@
 /**
  * Class ContextPlugin
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ContextPlugin
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
     /**
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxHelper;
 
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $moduleManager;
 
     /**
      * @var \Magento\Weee\Model\Tax
-     * @since 2.0.0
      */
     protected $weeeTax;
 
     /**
      * @var \Magento\PageCache\Model\Config
-     * @since 2.0.0
      */
     protected $cacheConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -77,7 +67,6 @@ class ContextPlugin
      * @param \Magento\PageCache\Model\Config $cacheConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
@@ -173,7 +162,6 @@ public function beforeDispatch(
     /**
      * @param string $basedOn
      * @return array
-     * @since 2.0.0
      */
     protected function getWeeeTaxRegion($basedOn)
     {
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index b9754704250b9..609e66f2d5fc6 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Weee\Model\Attribute\Backend\Weee\Tax
  *
- * @since 2.0.0
  */
 class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
 {
     /**
      * @var \Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax
-     * @since 2.0.0
      */
     protected $_attributeTax;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Directory\Helper\Data
-     * @since 2.0.0
      */
     protected $_directoryHelper;
 
@@ -44,7 +40,6 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax $attributeTax
      * @param ScopeOverriddenValue|null $scopeOverriddenValue
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -71,7 +66,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public static function getBackendModelName()
     {
@@ -84,7 +78,6 @@ public static function getBackendModelName()
      * @param   \Magento\Catalog\Model\Product $object
      * @return  $this
      * @throws  \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate($object)
     {
@@ -115,7 +108,6 @@ public function validate($object)
      * @param   \Magento\Catalog\Model\Product $object
      * @return  $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function afterLoad($object)
     {
@@ -143,7 +135,6 @@ public function afterLoad($object)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function afterSave($object)
     {
@@ -182,7 +173,6 @@ public function afterSave($object)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function afterDelete($object)
     {
@@ -192,7 +182,6 @@ public function afterDelete($object)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTable()
     {
diff --git a/app/code/Magento/Weee/Model/Config.php b/app/code/Magento/Weee/Model/Config.php
index 6edc77e8d78e2..1d3e25eebdcf4 100644
--- a/app/code/Magento/Weee/Model/Config.php
+++ b/app/code/Magento/Weee/Model/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * WEEE config model
- * @since 2.0.0
  */
 class Config
 {
@@ -36,14 +35,12 @@ class Config
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -58,7 +55,6 @@ public function __construct(
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getPriceDisplayType($store = null)
     {
@@ -74,7 +70,6 @@ public function getPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getListPriceDisplayType($store = null)
     {
@@ -90,7 +85,6 @@ public function getListPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getSalesPriceDisplayType($store = null)
     {
@@ -106,7 +100,6 @@ public function getSalesPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  int
-     * @since 2.0.0
      */
     public function getEmailPriceDisplayType($store = null)
     {
@@ -122,7 +115,6 @@ public function getEmailPriceDisplayType($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function includeInSubtotal($store = null)
     {
@@ -138,7 +130,6 @@ public function includeInSubtotal($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function isTaxable($store = null)
     {
@@ -154,7 +145,6 @@ public function isTaxable($store = null)
      *
      * @param   null|string|bool|int|Store $store
      * @return  bool
-     * @since 2.0.0
      */
     public function isEnabled($store = null)
     {
diff --git a/app/code/Magento/Weee/Model/Config/Source/Display.php b/app/code/Magento/Weee/Model/Config/Source/Display.php
index c7a8425097633..8717f68aee5b8 100644
--- a/app/code/Magento/Weee/Model/Config/Source/Display.php
+++ b/app/code/Magento/Weee/Model/Config/Source/Display.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Weee\Model\Config\Source\Display
  *
- * @since 2.0.0
  */
 class Display implements \Magento\Framework\Option\ArrayInterface
 {
@@ -16,7 +15,6 @@ class Display implements \Magento\Framework\Option\ArrayInterface
      * Retrieve list of available options to display FPT
      *
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php
index aaccf119e1bb8..33a3ab5d15ab9 100644
--- a/app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php
@@ -9,13 +9,11 @@
  * Catalog product WEEE tax backend attribute model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -23,7 +21,6 @@ class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Defines main resource table and table identifier field
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -51,7 +47,6 @@ protected function _construct()
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return array
-     * @since 2.0.0
      */
     public function loadProductData($product, $attribute)
     {
@@ -85,7 +80,6 @@ public function loadProductData($product, $attribute)
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return $this
-     * @since 2.0.0
      */
     public function deleteProductData($product, $attribute)
     {
@@ -108,7 +102,6 @@ public function deleteProductData($product, $attribute)
      * @param \Magento\Catalog\Model\Product $product
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function insertProductData($product, $data)
     {
diff --git a/app/code/Magento/Weee/Model/ResourceModel/Tax.php b/app/code/Magento/Weee/Model/ResourceModel/Tax.php
index b09e1f82673b4..54052eae01a48 100644
--- a/app/code/Magento/Weee/Model/ResourceModel/Tax.php
+++ b/app/code/Magento/Weee/Model/ResourceModel/Tax.php
@@ -12,13 +12,11 @@
  * Wee tax resource model
  *
  * @api
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -26,7 +24,6 @@ class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -53,7 +49,6 @@ protected function _construct()
      *
      * @param \Magento\Framework\DB\Select|string $select
      * @return string
-     * @since 2.0.0
      */
     public function fetchOne($select)
     {
@@ -65,7 +60,6 @@ public function fetchOne($select)
      * @param int $regionId
      * @param int $websiteId
      * @return boolean
-     * @since 2.0.0
      */
     public function isWeeeInLocation($countryId, $regionId, $websiteId)
     {
@@ -102,7 +96,6 @@ public function isWeeeInLocation($countryId, $regionId, $websiteId)
      * @param int $storeId
      * @param int $entityId
      * @return array[]
-     * @since 2.0.0
      */
     public function fetchWeeeTaxCalculationsByEntity($countryId, $regionId, $websiteId, $storeId, $entityId)
     {
diff --git a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
index ff783d5f473f6..fa71e81281763 100644
--- a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
+++ b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
@@ -7,13 +7,11 @@
 
 /**
  * Sales order total for PDF, taking into account WEEE tax
- * @since 2.0.0
  */
 class Weee extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
 {
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $_weeeData;
 
@@ -23,7 +21,6 @@ class Weee extends \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $ordersFactory
      * @param \Magento\Weee\Helper\Data $_weeeData
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Tax\Helper\Data $taxHelper,
@@ -47,7 +44,6 @@ public function __construct(
      *  )
      * )
      * @return array
-     * @since 2.0.0
      */
     public function getTotalsForDisplay()
     {
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index 25757886adfd1..c5a969e8a9488 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -15,7 +15,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Tax extends \Magento\Framework\Model\AbstractModel
 {
@@ -41,7 +40,6 @@ class Tax extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var array|null
-     * @since 2.0.0
      */
     protected $_allAttributes = null;
 
@@ -49,31 +47,26 @@ class Tax extends \Magento\Framework\Model\AbstractModel
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $_taxData = null;
 
     /**
      * @var \Magento\Eav\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_attributeFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Tax\Model\CalculationFactory
-     * @since 2.0.0
      */
     protected $_calculationFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
@@ -81,19 +74,16 @@ class Tax extends \Magento\Framework\Model\AbstractModel
      * Weee config
      *
      * @var \Magento\Weee\Model\Config
-     * @since 2.0.0
      */
     protected $weeeConfig;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var AccountManagementInterface
-     * @since 2.0.0
      */
     protected $accountManagement;
 
@@ -112,7 +102,6 @@ class Tax extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -144,7 +133,6 @@ public function __construct(
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -158,7 +146,6 @@ protected function _construct()
      * @param Website $website
      * @param bool $calculateTax
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeAmount(
         $product,
@@ -187,7 +174,6 @@ public function getWeeeAmount(
      * @param null|false|\Magento\Framework\DataObject $billing
      * @param Website $website
      * @return float
-     * @since 2.0.0
      */
     public function getWeeeAmountExclTax(
         $product,
@@ -215,7 +201,6 @@ public function getWeeeAmountExclTax(
     /**
      * @param bool $forceEnabled
      * @return array
-     * @since 2.0.0
      */
     public function getWeeeAttributeCodes($forceEnabled = false)
     {
@@ -228,7 +213,6 @@ public function getWeeeAttributeCodes($forceEnabled = false)
      * @param  null|string|bool|int|Store $store
      * @param  bool $forceEnabled
      * @return array
-     * @since 2.0.0
      */
     public function getWeeeTaxAttributeCodes($store = null, $forceEnabled = false)
     {
@@ -253,7 +237,6 @@ public function getWeeeTaxAttributeCodes($store = null, $forceEnabled = false)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getProductWeeeAttributes(
         $product,
@@ -384,7 +367,6 @@ public function getProductWeeeAttributes(
      * @param int $regionId
      * @param int $websiteId
      * @return boolean
-     * @since 2.0.0
      */
     public function isWeeeInLocation($countryId, $regionId, $websiteId)
     {
diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
index 6dc48b6eb4f5a..cc6a0726aa134 100644
--- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Weee\Model\Total\Creditmemo\Weee
  *
- * @since 2.0.0
  */
 class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
 {
@@ -22,7 +21,6 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
      * Weee data
      *
      * @var WeeeHelper
-     * @since 2.0.0
      */
     protected $_weeeData = null;
 
@@ -43,7 +41,6 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
      * @param WeeeHelper $weeeData
      * @param array $data
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         WeeeHelper $weeeData,
@@ -64,7 +61,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function collect(Creditmemo $creditmemo)
     {
diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
index dbfb569d3a1be..837bb388dc0d1 100644
--- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Weee\Model\Total\Invoice\Weee
  *
- * @since 2.0.0
  */
 class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
 {
@@ -20,7 +19,6 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
      * Weee data
      *
      * @var WeeeHelper
-     * @since 2.0.0
      */
     protected $_weeeData = null;
 
@@ -41,7 +39,6 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
      * @param WeeeHelper $weeeData
      * @param array $data
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         WeeeHelper $weeeData,
@@ -61,7 +58,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index 9299b9e3edc2c..e662f8134dfcf 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Weee\Model\Total\Quote\Weee
  *
- * @since 2.0.0
  */
 class Weee extends AbstractTotal
 {
@@ -31,13 +30,11 @@ class Weee extends AbstractTotal
 
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeData;
 
     /**
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -45,7 +42,6 @@ class Weee extends AbstractTotal
      * Counter
      *
      * @var int
-     * @since 2.0.0
      */
     protected $counter = 0;
 
@@ -53,7 +49,6 @@ class Weee extends AbstractTotal
      * Array to keep track of weee taxable item code to quote item
      *
      * @var array
-     * @since 2.0.0
      */
     protected $weeeCodeToItemMap;
 
@@ -61,7 +56,6 @@ class Weee extends AbstractTotal
      * Accumulates totals for Weee excluding tax
      *
      * @var int
-     * @since 2.0.0
      */
     protected $weeeTotalExclTax;
 
@@ -69,20 +63,17 @@ class Weee extends AbstractTotal
      * Accumulates totals for Weee base excluding tax
      *
      * @var int
-     * @since 2.0.0
      */
     protected $weeeBaseTotalExclTax;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @param \Magento\Weee\Helper\Data $weeeData
      * @param PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Weee\Helper\Data $weeeData,
@@ -101,7 +92,6 @@ public function __construct(
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -152,7 +142,6 @@ public function collect(
      * @return  void|$this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function process(
         \Magento\Quote\Model\Quote\Address $address,
@@ -271,7 +260,6 @@ protected function process(
      * @param   float $rowValueInclTax
      * @param   float $baseRowValueInclTax
      * @return  $this
-     * @since 2.0.0
      */
     protected function processTotalAmount(
         $total,
@@ -301,7 +289,6 @@ protected function processTotalAmount(
      * id for an item.
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getNextIncrement()
     {
@@ -315,7 +302,6 @@ protected function getNextIncrement()
      * @return  void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function recalculateParent(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
     {
@@ -331,7 +317,6 @@ protected function recalculateParent(\Magento\Quote\Model\Quote\Item\AbstractIte
      *
      * @param   \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @return  void
-     * @since 2.0.0
      */
     protected function resetItemData($item)
     {
@@ -357,7 +342,6 @@ protected function resetItemData($item)
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
@@ -373,7 +357,6 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
      * @return  array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function processConfigArray($config, $store)
     {
@@ -385,7 +368,6 @@ public function processConfigArray($config, $store)
      *
      * TODO: fix
      * @return string
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
index f5818e2cc4847..7c0dcc1fdb719 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Weee\Model\Total\Quote\WeeeTax
  *
- * @since 2.0.0
  */
 class WeeeTax extends Weee
 {
@@ -25,7 +24,6 @@ class WeeeTax extends Weee
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
@@ -182,7 +180,6 @@ public function collect(
      *
      * @param array $weeeCodeToItemMap
      * @return array
-     * @since 2.0.0
      */
     protected function createItemToWeeeCodeMapping($weeeCodeToItemMap)
     {
@@ -209,7 +206,6 @@ protected function createItemToWeeeCodeMapping($weeeCodeToItemMap)
      * @param float $rowValueInclTax
      * @param float $baseRowValueInclTax
      * @return $this
-     * @since 2.0.0
      */
     protected function processTotalAmount(
         $total,
@@ -237,7 +233,6 @@ protected function processTotalAmount(
      * @param \Magento\Quote\Model\Quote $quote
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array
-     * @since 2.0.0
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Weee/Model/WeeeConfigProvider.php b/app/code/Magento/Weee/Model/WeeeConfigProvider.php
index 28e811c451027..e97c50abb1d61 100644
--- a/app/code/Magento/Weee/Model/WeeeConfigProvider.php
+++ b/app/code/Magento/Weee/Model/WeeeConfigProvider.php
@@ -13,25 +13,21 @@
 /**
  * Class \Magento\Weee\Model\WeeeConfigProvider
  *
- * @since 2.0.0
  */
 class WeeeConfigProvider implements ConfigProviderInterface
 {
     /**
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $weeeConfig;
 
@@ -39,7 +35,6 @@ class WeeeConfigProvider implements ConfigProviderInterface
      * @param WeeeHelper $weeeHelper
      * @param StoreManagerInterface $storeManager
      * @param Config $weeeConfig
-     * @since 2.0.0
      */
     public function __construct(
         WeeeHelper $weeeHelper,
@@ -53,7 +48,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -68,7 +62,6 @@ public function getConfig()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     private function getStoreId()
     {
@@ -79,7 +72,6 @@ private function getStoreId()
      * Whether to display weee details together with price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function iDisplayPriceWithWeeeDetails()
     {
@@ -102,7 +94,6 @@ public function iDisplayPriceWithWeeeDetails()
      * Whether to display final price that include Weee amounts
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayFinalPrice()
     {
@@ -123,7 +114,6 @@ public function isDisplayFinalPrice()
      * Check if fixed taxes are used in system
      *
      * @return  bool
-     * @since 2.0.0
      */
     public function isWeeeEnabled()
     {
@@ -134,7 +124,6 @@ public function isWeeeEnabled()
      * Return the flag whether to include weee in the price
      *
      * @return bool|int
-     * @since 2.0.0
      */
     public function getIncludeWeeeFlag()
     {
@@ -150,7 +139,6 @@ public function getIncludeWeeeFlag()
      * Display FPT row in subtotal or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInSubtotal()
     {
diff --git a/app/code/Magento/Weee/Observer/AddWeeeTaxAttributeTypeObserver.php b/app/code/Magento/Weee/Observer/AddWeeeTaxAttributeTypeObserver.php
index 1308d129e5f46..274f5921acf2d 100644
--- a/app/code/Magento/Weee/Observer/AddWeeeTaxAttributeTypeObserver.php
+++ b/app/code/Magento/Weee/Observer/AddWeeeTaxAttributeTypeObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Weee\Observer\AddWeeeTaxAttributeTypeObserver
  *
- * @since 2.0.0
  */
 class AddWeeeTaxAttributeTypeObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class AddWeeeTaxAttributeTypeObserver implements ObserverInterface
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/AfterAddressSave.php b/app/code/Magento/Weee/Observer/AfterAddressSave.php
index 682c486f62f9d..d52dfe05b40d4 100644
--- a/app/code/Magento/Weee/Observer/AfterAddressSave.php
+++ b/app/code/Magento/Weee/Observer/AfterAddressSave.php
@@ -16,19 +16,16 @@
 /**
  * Class \Magento\Weee\Observer\AfterAddressSave
  *
- * @since 2.0.0
  */
 class AfterAddressSave implements ObserverInterface
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
@@ -36,7 +33,6 @@ class AfterAddressSave implements ObserverInterface
      * Module manager
      *
      * @var Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -44,7 +40,6 @@ class AfterAddressSave implements ObserverInterface
      * Cache config
      *
      * @var Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
@@ -53,7 +48,6 @@ class AfterAddressSave implements ObserverInterface
      * @param Data $weeeHelper
      * @param Manager $moduleManager
      * @param Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
@@ -71,7 +65,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
index 21e2bab77e046..45e6b5005d0e2 100644
--- a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
+++ b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Weee\Observer\AssignBackendModelToAttributeObserver
  *
- * @since 2.0.0
  */
 class AssignBackendModelToAttributeObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $productType;
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $productTypeConfig;
 
     /**
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $productTypeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Type $productType,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
index 0e794796049e5..b000ded6f5ead 100644
--- a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
+++ b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Weee\Observer\CustomerLoggedIn
  *
- * @since 2.0.0
  */
 class CustomerLoggedIn implements ObserverInterface
 {
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
@@ -35,7 +32,6 @@ class CustomerLoggedIn implements ObserverInterface
      * Module manager
      *
      * @var Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -43,7 +39,6 @@ class CustomerLoggedIn implements ObserverInterface
      * Cache config
      *
      * @var Config
-     * @since 2.0.0
      */
     private $cacheConfig;
 
@@ -52,7 +47,6 @@ class CustomerLoggedIn implements ObserverInterface
      * @param Data $weeeHelper
      * @param Manager $moduleManager
      * @param Config $cacheConfig
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
@@ -70,7 +64,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php b/app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php
index 15dc2fb7810c9..181a39a42aa19 100644
--- a/app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php
+++ b/app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Weee\Observer\GetPriceConfigurationObserver
  *
- * @since 2.0.0
  */
 class GetPriceConfigurationObserver implements ObserverInterface
 {
@@ -18,7 +17,6 @@ class GetPriceConfigurationObserver implements ObserverInterface
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxData;
 
@@ -26,13 +24,11 @@ class GetPriceConfigurationObserver implements ObserverInterface
      * Weee data
      *
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeData;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -40,7 +36,6 @@ class GetPriceConfigurationObserver implements ObserverInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Weee\Helper\Data $weeeData
      * @param \Magento\Tax\Helper\Data $taxData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $registry,
@@ -58,7 +53,6 @@ public function __construct(
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -90,7 +84,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      * @param  string $calcPrice
      * @param  array $weeeAttributesForBundle
      * @return array
-     * @since 2.0.0
      */
     private function recurConfigAndInsertWeeePrice($input, $searchKey, $calcPrice, $weeeAttributesForBundle = null)
     {
@@ -127,7 +120,6 @@ private function recurConfigAndInsertWeeePrice($input, $searchKey, $calcPrice, $
      * @param  int|string $key
      * @param  array $weeeAttributesForBundle
      * @return array
-     * @since 2.0.0
      */
     private function insertWeeePrice($holder, $key, $weeeAttributesForBundle)
     {
@@ -156,7 +148,6 @@ private function insertWeeePrice($holder, $key, $weeeAttributesForBundle)
      * @param  int|null $storeId
      * @param  array|null $weeeAttributesForBundle
      * @return string
-     * @since 2.0.0
      */
     protected function getWhichCalcPriceToUse($storeId = null, $weeeAttributesForBundle = null)
     {
diff --git a/app/code/Magento/Weee/Observer/SetWeeeRendererInFormObserver.php b/app/code/Magento/Weee/Observer/SetWeeeRendererInFormObserver.php
index 8ce36e4eadccd..7d7cc76c9479f 100644
--- a/app/code/Magento/Weee/Observer/SetWeeeRendererInFormObserver.php
+++ b/app/code/Magento/Weee/Observer/SetWeeeRendererInFormObserver.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Weee\Observer\SetWeeeRendererInFormObserver
  *
- * @since 2.0.0
  */
 class SetWeeeRendererInFormObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Weee\Model\Tax
-     * @since 2.0.0
      */
     protected $weeeTax;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Weee\Model\Tax $weeeTax
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/UpdateElementTypesObserver.php b/app/code/Magento/Weee/Observer/UpdateElementTypesObserver.php
index d4ea685801ed2..8485717b67199 100644
--- a/app/code/Magento/Weee/Observer/UpdateElementTypesObserver.php
+++ b/app/code/Magento/Weee/Observer/UpdateElementTypesObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Weee\Observer\UpdateElementTypesObserver
  *
- * @since 2.0.0
  */
 class UpdateElementTypesObserver implements ObserverInterface
 {
@@ -19,7 +18,6 @@ class UpdateElementTypesObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/UpdateExcludedFieldListObserver.php b/app/code/Magento/Weee/Observer/UpdateExcludedFieldListObserver.php
index 56d343e0a0f96..273b5f8c8d9aa 100644
--- a/app/code/Magento/Weee/Observer/UpdateExcludedFieldListObserver.php
+++ b/app/code/Magento/Weee/Observer/UpdateExcludedFieldListObserver.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Weee\Observer\UpdateExcludedFieldListObserver
  *
- * @since 2.0.0
  */
 class UpdateExcludedFieldListObserver implements ObserverInterface
 {
     /**
      * @var \Magento\Weee\Model\Tax
-     * @since 2.0.0
      */
     protected $weeeTax;
 
     /**
      * @param \Magento\Weee\Model\Tax $weeeTax
-     * @since 2.0.0
      */
     public function __construct(\Magento\Weee\Model\Tax $weeeTax)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Weee\Model\Tax $weeeTax)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php b/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
index eb7b17c06cb39..0ed50155903ba 100644
--- a/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
+++ b/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Weee\Observer\UpdateProductOptionsObserver
  *
- * @since 2.0.0
  */
 class UpdateProductOptionsObserver implements ObserverInterface
 {
@@ -18,13 +17,11 @@ class UpdateProductOptionsObserver implements ObserverInterface
      * Weee data
      *
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeData = null;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -32,7 +29,6 @@ class UpdateProductOptionsObserver implements ObserverInterface
      * Tax data
      *
      * @var \Magento\Tax\Helper\Data
-     * @since 2.0.0
      */
     protected $taxData;
 
@@ -40,7 +36,6 @@ class UpdateProductOptionsObserver implements ObserverInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Weee\Helper\Data $weeeData
      * @param \Magento\Tax\Helper\Data $taxData
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Registry $registry,
@@ -58,7 +53,6 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -121,7 +115,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      *
      * @param  int|null $storeId
      * @return string
-     * @since 2.0.0
      */
     protected function getWhichCalcPriceToUse($storeId = null)
     {
diff --git a/app/code/Magento/Weee/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Weee/Plugin/Checkout/CustomerData/Cart.php
index b9125e3c1097a..69f32ad53747d 100644
--- a/app/code/Magento/Weee/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Weee/Plugin/Checkout/CustomerData/Cart.php
@@ -9,31 +9,26 @@
 /**
  * Class \Magento\Weee\Plugin\Checkout\CustomerData\Cart
  *
- * @since 2.0.0
  */
 class Cart extends \Magento\Tax\Plugin\Checkout\CustomerData\Cart
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Checkout\Helper\Data
-     * @since 2.0.0
      */
     protected $checkoutHelper;
 
     /**
      * @var \Magento\Tax\Block\Item\Price\Renderer
-     * @since 2.0.0
      */
     protected $itemPriceRenderer;
 
     /**
      * @var \Magento\Weee\Block\Item\Price\Renderer
-     * @since 2.0.0
      */
     protected $itemWeePriceRenderer;
 
@@ -42,7 +37,6 @@ class Cart extends \Magento\Tax\Plugin\Checkout\CustomerData\Cart
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Tax\Block\Item\Price\Renderer $itemPriceRenderer
      * @param \Magento\Weee\Block\Item\Price\Renderer $itemWeePriceRenderer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
diff --git a/app/code/Magento/Weee/Pricing/Adjustment.php b/app/code/Magento/Weee/Pricing/Adjustment.php
index 71537cd99195d..485fd61263cdc 100644
--- a/app/code/Magento/Weee/Pricing/Adjustment.php
+++ b/app/code/Magento/Weee/Pricing/Adjustment.php
@@ -14,7 +14,6 @@
 
 /**
  * Weee pricing adjustment
- * @since 2.0.0
  */
 class Adjustment implements AdjustmentInterface
 {
@@ -27,7 +26,6 @@ class Adjustment implements AdjustmentInterface
      * Weee helper
      *
      * @var WeeeHelper
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
@@ -35,13 +33,11 @@ class Adjustment implements AdjustmentInterface
      * Sort order
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $sortOrder;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -51,7 +47,6 @@ class Adjustment implements AdjustmentInterface
      * @param WeeeHelper $weeeHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param int $sortOrder
-     * @since 2.0.0
      */
     public function __construct(WeeeHelper $weeeHelper, PriceCurrencyInterface $priceCurrency, $sortOrder = null)
     {
@@ -64,7 +59,6 @@ public function __construct(WeeeHelper $weeeHelper, PriceCurrencyInterface $pric
      * Get adjustment code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode()
     {
@@ -76,7 +70,6 @@ public function getAdjustmentCode()
      * (FPT is excluded from base price)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInBasePrice()
     {
@@ -87,7 +80,6 @@ public function isIncludedInBasePrice()
      * Define if adjustment is included in display price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInDisplayPrice()
     {
@@ -108,7 +100,6 @@ public function isIncludedInDisplayPrice()
      * @param null|array $context
      * @return float
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function extractAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -122,7 +113,6 @@ public function extractAdjustment($amount, SaleableInterface $saleableItem, $con
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function applyAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -137,7 +127,6 @@ public function applyAdjustment($amount, SaleableInterface $saleableItem, $conte
      *
      * @param string $adjustmentCode
      * @return bool
-     * @since 2.0.0
      */
     public function isExcludedWith($adjustmentCode)
     {
@@ -150,7 +139,6 @@ public function isExcludedWith($adjustmentCode)
      *
      * @param SaleableInterface $saleableItem
      * @return float
-     * @since 2.0.0
      */
     protected function getAmount(SaleableInterface $saleableItem)
     {
@@ -163,7 +151,6 @@ protected function getAmount(SaleableInterface $saleableItem)
      * Return sort order position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Weee/Pricing/Render/Adjustment.php b/app/code/Magento/Weee/Pricing/Render/Adjustment.php
index 569749821681a..d6e0d15faae10 100644
--- a/app/code/Magento/Weee/Pricing/Render/Adjustment.php
+++ b/app/code/Magento/Weee/Pricing/Render/Adjustment.php
@@ -13,7 +13,6 @@
 
 /**
  * Weee Price Adjustment that handles Weee specific amount and its display
- * @since 2.0.0
  */
 class Adjustment extends AbstractAdjustment
 {
@@ -21,13 +20,11 @@ class Adjustment extends AbstractAdjustment
      * Weee helper
      *
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $finalAmount;
 
@@ -38,7 +35,6 @@ class Adjustment extends AbstractAdjustment
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Weee\Helper\Data $weeeHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * @return null
-     * @since 2.0.0
      */
     protected function apply()
     {
@@ -72,7 +67,6 @@ protected function apply()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getRawFinalAmount()
     {
@@ -83,7 +77,6 @@ public function getRawFinalAmount()
      * Obtain adjustment code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode()
     {
@@ -92,7 +85,6 @@ public function getAdjustmentCode()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getFinalAmount()
     {
@@ -103,7 +95,6 @@ public function getFinalAmount()
      * Get weee amount
      *
      * @return float
-     * @since 2.0.0
      */
     protected function getWeeeAmount()
     {
@@ -115,7 +106,6 @@ protected function getWeeeAmount()
      * Define if adjustment should be shown with including tax, description
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showInclDescr()
     {
@@ -126,7 +116,6 @@ public function showInclDescr()
      * Define if adjustment should be shown with including tax, excluding tax, description
      *
      * @return bool
-     * @since 2.0.0
      */
     public function showExclDescrIncl()
     {
@@ -137,7 +126,6 @@ public function showExclDescrIncl()
      * Obtain Weee tax attributes
      *
      * @return array|\Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getWeeeTaxAttributes()
     {
@@ -149,7 +137,6 @@ public function getWeeeTaxAttributes()
      *
      * @param \Magento\Framework\DataObject $attribute
      * @return string
-     * @since 2.0.0
      */
     public function renderWeeeTaxAttributeName(\Magento\Framework\DataObject $attribute)
     {
@@ -161,7 +148,6 @@ public function renderWeeeTaxAttributeName(\Magento\Framework\DataObject $attrib
      *
      * @param \Magento\Framework\DataObject $attribute
      * @return string
-     * @since 2.0.0
      */
     public function renderWeeeTaxAttribute(\Magento\Framework\DataObject $attribute)
     {
@@ -173,7 +159,6 @@ public function renderWeeeTaxAttribute(\Magento\Framework\DataObject $attribute)
      *
      * @param \Magento\Framework\DataObject $attribute
      * @return string
-     * @since 2.0.0
      */
     public function renderWeeeTaxAttributeWithTax(\Magento\Framework\DataObject $attribute)
     {
@@ -187,7 +172,6 @@ public function renderWeeeTaxAttributeWithTax(\Magento\Framework\DataObject $att
      *
      * @param \Magento\Framework\DataObject $attribute
      * @return string
-     * @since 2.0.0
      */
     public function renderWeeeTaxAttributeWithoutTax(\Magento\Framework\DataObject $attribute)
     {
@@ -201,7 +185,6 @@ public function renderWeeeTaxAttributeWithoutTax(\Magento\Framework\DataObject $
      * @param int|int[]|null $compareTo
      * @param \Magento\Store\Model\Store|null $store
      * @return bool|int
-     * @since 2.0.0
      */
     protected function typeOfDisplay($compareTo = null, $store = null)
     {
@@ -212,7 +195,6 @@ protected function typeOfDisplay($compareTo = null, $store = null)
      * Get Weee attributes for display
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected function getWeeeAttributesForDisplay()
     {
@@ -224,7 +206,6 @@ protected function getWeeeAttributesForDisplay()
      * Returns whether Weee should be displayed
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isWeeeShown()
     {
@@ -236,7 +217,6 @@ protected function isWeeeShown()
      * Returns whether tax should be shown (according to Price Display Settings)
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTaxDisplayConfig()
     {
@@ -248,7 +228,6 @@ public function getTaxDisplayConfig()
      * Returns whether price includes tax
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPriceIncludesTax()
     {
diff --git a/app/code/Magento/Weee/Pricing/Render/TaxAdjustment.php b/app/code/Magento/Weee/Pricing/Render/TaxAdjustment.php
index 23279566a266a..2411802cc51a1 100644
--- a/app/code/Magento/Weee/Pricing/Render/TaxAdjustment.php
+++ b/app/code/Magento/Weee/Pricing/Render/TaxAdjustment.php
@@ -12,7 +12,6 @@
 
 /**
  * Weee Price Adjustment that overrides part of the Tax module's Adjustment
- * @since 2.0.0
  */
 class TaxAdjustment extends \Magento\Tax\Pricing\Render\Adjustment
 {
@@ -20,7 +19,6 @@ class TaxAdjustment extends \Magento\Tax\Pricing\Render\Adjustment
      * Weee helper
      *
      * @var \Magento\Weee\Helper\Data
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
@@ -30,7 +28,6 @@ class TaxAdjustment extends \Magento\Tax\Pricing\Render\Adjustment
      * @param \Magento\Tax\Helper\Data $helper
      * @param \Magento\Weee\Helper\Data $weeeHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Returns the list of default exclusions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDefaultExclusions()
     {
@@ -68,7 +64,6 @@ public function getDefaultExclusions()
      * @param int|int[]|null $compareTo
      * @param \Magento\Store\Model\Store|null $store
      * @return bool|int
-     * @since 2.0.0
      */
     protected function typeOfDisplay($compareTo = null, $store = null)
     {
diff --git a/app/code/Magento/Weee/Pricing/TaxAdjustment.php b/app/code/Magento/Weee/Pricing/TaxAdjustment.php
index 09ca0ac9b8620..b913fdafcc00a 100644
--- a/app/code/Magento/Weee/Pricing/TaxAdjustment.php
+++ b/app/code/Magento/Weee/Pricing/TaxAdjustment.php
@@ -15,7 +15,6 @@
 
 /**
  * Weee tax pricing adjustment
- * @since 2.0.0
  */
 class TaxAdjustment implements AdjustmentInterface
 {
@@ -28,13 +27,11 @@ class TaxAdjustment implements AdjustmentInterface
      * Weee helper
      *
      * @var WeeeHelper
-     * @since 2.0.0
      */
     protected $weeeHelper;
 
     /**
      * @var TaxHelper
-     * @since 2.0.0
      */
     protected $taxHelper;
 
@@ -42,13 +39,11 @@ class TaxAdjustment implements AdjustmentInterface
      * Sort order
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $sortOrder;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -59,7 +54,6 @@ class TaxAdjustment implements AdjustmentInterface
      * @param TaxHelper $taxHelper
      * @param PriceCurrencyInterface $priceCurrency
      * @param int $sortOrder
-     * @since 2.0.0
      */
     public function __construct(
         WeeeHelper $weeeHelper,
@@ -77,7 +71,6 @@ public function __construct(
      * Get adjustment code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode()
     {
@@ -89,7 +82,6 @@ public function getAdjustmentCode()
      * (FPT is excluded from base price)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInBasePrice()
     {
@@ -100,7 +92,6 @@ public function isIncludedInBasePrice()
      * Define if adjustment is included in display price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInDisplayPrice()
     {
@@ -124,7 +115,6 @@ public function isIncludedInDisplayPrice()
      * @param null|array $context
      * @return float
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function extractAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -138,7 +128,6 @@ public function extractAdjustment($amount, SaleableInterface $saleableItem, $con
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function applyAdjustment($amount, SaleableInterface $saleableItem, $context = [])
     {
@@ -153,7 +142,6 @@ public function applyAdjustment($amount, SaleableInterface $saleableItem, $conte
      *
      * @param string $adjustmentCode
      * @return bool
-     * @since 2.0.0
      */
     public function isExcludedWith($adjustmentCode)
     {
@@ -166,7 +154,6 @@ public function isExcludedWith($adjustmentCode)
      *
      * @param SaleableInterface $saleableItem
      * @return float
-     * @since 2.0.0
      */
     protected function getAmount(SaleableInterface $saleableItem)
     {
@@ -185,7 +172,6 @@ protected function getAmount(SaleableInterface $saleableItem)
      * Return sort order position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Weee/Setup/InstallData.php b/app/code/Magento/Weee/Setup/InstallData.php
index 23d9c1d030068..dd4218cceb99a 100644
--- a/app/code/Magento/Weee/Setup/InstallData.php
+++ b/app/code/Magento/Weee/Setup/InstallData.php
@@ -16,7 +16,6 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
@@ -24,7 +23,6 @@ class InstallData implements InstallDataInterface
      * Sales setup factory
      *
      * @var SalesSetupFactory
-     * @since 2.0.0
      */
     private $salesSetupFactory;
 
@@ -32,7 +30,6 @@ class InstallData implements InstallDataInterface
      * Quote setup factory
      *
      * @var QuoteSetupFactory
-     * @since 2.0.0
      */
     private $quoteSetupFactory;
 
@@ -41,7 +38,6 @@ class InstallData implements InstallDataInterface
      *
      * @param SalesSetupFactory $salesSetupFactory
      * @param QuoteSetupFactory $quoteSetupFactory
-     * @since 2.0.0
      */
     public function __construct(
         SalesSetupFactory $salesSetupFactory,
@@ -53,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Weee/Setup/InstallSchema.php b/app/code/Magento/Weee/Setup/InstallSchema.php
index 02e89bff0068c..864117690994b 100644
--- a/app/code/Magento/Weee/Setup/InstallSchema.php
+++ b/app/code/Magento/Weee/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index da057770d94bc..115406f991066 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -11,13 +11,11 @@
  * WYSIWYG widget plugin main block
  *
  * @api
- * @since 2.0.0
  */
 class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
index cb5928e394a03..563019aef89bc 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Catalog/Category/Chooser.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Widget\Block\Adminhtml\Widget\Catalog\Category\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
 {
@@ -24,7 +23,6 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     protected function _getNodeJson($node, $level = 0)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
index d99c38c1dc936..636b80842d242 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Widget\Block\Adminhtml\Widget\Chooser
  *
- * @since 2.0.0
  */
 class Chooser extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Framework\Data\Form\Element\Factory
-     * @since 2.0.0
      */
     protected $_elementFactory;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $_jsonEncoder;
 
@@ -35,7 +32,6 @@ class Chooser extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,7 +48,6 @@ public function __construct(
      * Chooser source URL getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSourceUrl()
     {
@@ -63,7 +58,6 @@ public function getSourceUrl()
      * Chooser form element getter
      *
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -74,7 +68,6 @@ public function getElement()
      * Convert Array config to Object
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -110,7 +103,6 @@ public function getConfig()
      * Unique identifier for block that uses Chooser
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUniqId()
     {
@@ -121,7 +113,6 @@ public function getUniqId()
      * Form element fieldset id getter for working with form in chooser
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFieldsetId()
     {
@@ -133,7 +124,6 @@ public function getFieldsetId()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getHiddenEnabled()
     {
@@ -144,7 +134,6 @@ public function getHiddenEnabled()
      * Return chooser HTML and init scripts
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
index f3e6a0d9b2dbb..a5785b9791b2d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Widget\Block\Adminhtml\Widget\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Widget\Model\WidgetFactory
-     * @since 2.0.0
      */
     protected $_widgetFactory;
 
@@ -30,7 +28,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Widget\Model\WidgetFactory $widgetFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -47,7 +44,6 @@ public function __construct(
      * Form with widget to select
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -81,7 +77,6 @@ protected function _prepareForm()
      * Prepare options for widgets HTML select
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getWidgetSelectOptions()
     {
@@ -95,7 +90,6 @@ protected function _getWidgetSelectOptions()
      * Prepare widgets select after element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getWidgetSelectAfterHtml()
     {
@@ -113,7 +107,6 @@ protected function _getWidgetSelectAfterHtml()
      *
      * @param bool $withEmptyElement
      * @return array
-     * @since 2.0.0
      */
     protected function _getAvailableWidgets($withEmptyElement = false)
     {
@@ -140,7 +133,6 @@ protected function _getAvailableWidgets($withEmptyElement = false)
      * Return array of widgets disabled for selection
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getSkippedWidgets()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
index e03e031dc83a6..fb25b7b72f15d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Instance extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -21,7 +20,6 @@ class Instance extends \Magento\Backend\Block\Widget\Grid\Container
      * Block constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index 5513bce8ba32c..79612130f9381 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -21,7 +20,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -29,7 +27,6 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -58,7 +54,6 @@ protected function _construct()
      * Getter
      *
      * @return \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     public function getWidgetInstance()
     {
@@ -70,7 +65,6 @@ public function getWidgetInstance()
      * Adding save_and_continue button
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _preparelayout()
     {
@@ -98,7 +92,6 @@ protected function _preparelayout()
      * Return translated header text depending on creating/editing action
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeaderText()
     {
@@ -113,7 +106,6 @@ public function getHeaderText()
      * Return validation url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValidationUrl()
     {
@@ -124,7 +116,6 @@ public function getValidationUrl()
      * Return save url for edit form
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
index c0db8425f8492..068da79dc196c 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
@@ -12,7 +12,6 @@
  * @method getArea()
  * @method \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Chooser\Container setTheme($theme)
  * @method \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Chooser\Container setArea($area)
- * @since 2.0.0
  */
 class Container extends \Magento\Framework\View\Element\Html\Select
 {
@@ -25,15 +24,11 @@ class Container extends \Magento\Framework\View\Element\Html\Select
     const PAGE_LAYOUT_3COLUMNS = '3columns';
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\View\Layout\ProcessorFactory
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_layoutProcessorFactory;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory
-     * @since 2.0.0
      */
     protected $_themesFactory;
 
@@ -42,7 +37,6 @@ class Container extends \Magento\Framework\View\Element\Html\Select
      * @param \Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory
      * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $themesFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -59,7 +53,6 @@ public function __construct(
      * Assign attributes for the HTML select element
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -75,7 +68,6 @@ protected function _construct()
      * Add necessary options
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -117,7 +109,6 @@ protected function _beforeToHtml()
      *
      * @param int $themeId
      * @return \Magento\Theme\Model\Theme|null
-     * @since 2.0.0
      */
     protected function _getThemeInstance($themeId)
     {
@@ -130,7 +121,6 @@ protected function _getThemeInstance($themeId)
      * Retrieve page layouts
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getPageLayouts()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
index 9788b6cba9a5c..009f7b2e75dea 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
@@ -10,25 +10,21 @@
  *
  * @method getArea()
  * @method getTheme()
- * @since 2.0.0
  */
 class DesignAbstraction extends \Magento\Framework\View\Element\Html\Select
 {
     /**
      * @var \Magento\Framework\View\Layout\ProcessorFactory
-     * @since 2.0.0
      */
     protected $_layoutProcessorFactory;
 
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory
-     * @since 2.0.0
      */
     protected $_themesFactory;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -38,7 +34,6 @@ class DesignAbstraction extends \Magento\Framework\View\Element\Html\Select
      * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $themesFactory
      * @param \Magento\Framework\App\State $appState
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -57,7 +52,6 @@ public function __construct(
      * Add necessary options
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -78,7 +72,6 @@ protected function _beforeToHtml()
      *
      * @param int $themeId
      * @return \Magento\Theme\Model\Theme|null
-     * @since 2.0.0
      */
     protected function _getThemeInstance($themeId)
     {
@@ -92,7 +85,6 @@ protected function _getThemeInstance($themeId)
      *
      * @param array $arguments
      * @return \Magento\Framework\View\Layout\ProcessorInterface
-     * @since 2.0.0
      */
     protected function _getLayoutProcessor(array $arguments)
     {
@@ -104,7 +96,6 @@ protected function _getLayoutProcessor(array $arguments)
      *
      * @param array $designAbstractions
      * @return void
-     * @since 2.0.0
      */
     protected function _addDesignAbstractionOptions(array $designAbstractions)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
index e1312b5d18c9a..5aa68ae5c0758 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
@@ -10,13 +10,11 @@
  *
  * @method getArea()
  * @method getTheme()
- * @since 2.0.0
  */
 class Layout extends \Magento\Framework\View\Element\Html\Select
 {
     /**
      * @var \Magento\Framework\View\Layout\PageType\Config
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -24,7 +22,6 @@ class Layout extends \Magento\Framework\View\Element\Html\Select
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\View\Layout\PageType\Config $config
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -39,7 +36,6 @@ public function __construct(
      * Add necessary options
      *
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -56,7 +52,6 @@ protected function _beforeToHtml()
      *
      * @param array $pageTypes
      * @return void
-     * @since 2.0.0
      */
     protected function _addPageTypeOptions(array $pageTypes)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php
index d1ca0cfb6a31f..8bb2da81a5f95 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Chooser\Template
  *
- * @since 2.0.0
  */
 class Template extends \Magento\Backend\Block\Widget
 {
@@ -22,7 +21,6 @@ class Template extends \Magento\Backend\Block\Widget
      * Prepare html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php
index 528f97668019b..7b6d8f64e37a2 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Form
  *
- * @since 2.0.0
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -22,7 +21,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index b4bd317c299a6..d0ac04812de8d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -13,19 +13,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\Store\Model\System\Store
-     * @since 2.0.0
      */
     protected $_store;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\LabelFactory
-     * @since 2.0.0
      */
     protected $_themeLabelFactory;
 
@@ -36,7 +33,6 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
      * @param \Magento\Store\Model\System\Store $store
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $themeLabelFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -67,7 +62,6 @@ protected function _construct()
      * Prepare label for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -78,7 +72,6 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -89,7 +82,6 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -100,7 +92,6 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -111,7 +102,6 @@ public function isHidden()
      * Getter
      *
      * @return \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     public function getWidgetInstance()
     {
@@ -123,7 +113,6 @@ public function getWidgetInstance()
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -232,7 +221,6 @@ protected function _prepareForm()
      * Retrieve array (widget_type => widget_name) of available widgets
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypesOptionsArray()
     {
@@ -243,7 +231,6 @@ public function getTypesOptionsArray()
      * Initialize form fileds values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initFormValues()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index b595d51de9077..4bb8af34828e4 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -16,25 +16,21 @@
  * Widget Instance page groups (predefined layouts group) to display on
  *
  * @method \Magento\Widget\Model\Widget\Instance getWidgetInstance()
- * @since 2.0.0
  */
 class Layout extends Template implements RendererInterface
 {
     /**
      * @var AbstractElement|null
-     * @since 2.0.0
      */
     protected $_element = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'instance/edit/layout.phtml';
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
-     * @since 2.0.0
      */
     protected $_productType;
 
@@ -49,7 +45,6 @@ class Layout extends Template implements RendererInterface
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param array $data
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -67,7 +62,6 @@ public function __construct(
      *
      * @param AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(AbstractElement $element)
     {
@@ -80,7 +74,6 @@ public function render(AbstractElement $element)
      *
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     public function setElement(AbstractElement $element)
     {
@@ -92,7 +85,6 @@ public function setElement(AbstractElement $element)
      * Getter
      *
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function getElement()
     {
@@ -103,7 +95,6 @@ public function getElement()
      * Generate url to get categories chooser by ajax query
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCategoriesChooserUrl()
     {
@@ -114,7 +105,6 @@ public function getCategoriesChooserUrl()
      * Generate url to get products chooser by ajax query
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductsChooserUrl()
     {
@@ -125,7 +115,6 @@ public function getProductsChooserUrl()
      * Generate url to get reference block chooser by ajax query
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBlockChooserUrl()
     {
@@ -136,7 +125,6 @@ public function getBlockChooserUrl()
      * Generate url to get template chooser by ajax query
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateChooserUrl()
     {
@@ -147,7 +135,6 @@ public function getTemplateChooserUrl()
      * Create and return html of select box Display On
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayOnSelectHtml()
     {
@@ -174,7 +161,6 @@ public function getDisplayOnSelectHtml()
      * - Generic (predefined) pages (all pages and single layout update)
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDisplayOnOptions()
     {
@@ -214,7 +200,6 @@ protected function _getDisplayOnOptions()
      *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getDisplayOnContainers()
     {
@@ -264,7 +249,6 @@ public function getDisplayOnContainers()
      * Retrieve layout select chooser html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLayoutsChooser()
     {
@@ -291,7 +275,6 @@ public function getLayoutsChooser()
      * Retrieve layout select chooser html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageLayoutsPageChooser()
     {
@@ -318,7 +301,6 @@ public function getPageLayoutsPageChooser()
      * Retrieve add layout button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAddLayoutButtonHtml()
     {
@@ -338,7 +320,6 @@ public function getAddLayoutButtonHtml()
      * Retrieve remove layout button html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveLayoutButtonHtml()
     {
@@ -358,7 +339,6 @@ public function getRemoveLayoutButtonHtml()
      * Prepare and retrieve page groups data of widget instance
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPageGroups()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index a04d6d792ba81..9e47810df0843 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -14,7 +14,6 @@
 /**
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -23,7 +22,6 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
      * Widget config parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $hiddenParameters = [
         'template'
@@ -33,7 +31,6 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
      * Prepare label for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -44,7 +41,6 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -55,7 +51,6 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -66,7 +61,6 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -87,7 +81,6 @@ public function isHidden()
      * Getter
      *
      * @return \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     public function getWidgetInstance()
     {
@@ -99,7 +92,6 @@ public function getWidgetInstance()
      * Set widget type and widget parameters if available
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _preparelayout()
     {
@@ -116,7 +108,6 @@ protected function _preparelayout()
      *
      * @param \Magento\Framework\DataObject $parameter
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     protected function _addField($parameter)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index 331d533a61473..8133047104375 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
     \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -22,13 +21,11 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\LabelFactory
-     * @since 2.0.0
      */
     protected $_themeLabelFactory;
 
@@ -38,7 +35,6 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $themeLabelFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -53,7 +49,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -65,7 +60,6 @@ protected function _construct()
      * Prepare label for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -76,7 +70,6 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabTitle()
     {
@@ -87,7 +80,6 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -98,7 +90,6 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return true
-     * @since 2.0.0
      */
     public function isHidden()
     {
@@ -109,7 +100,6 @@ public function isHidden()
      * Getter
      *
      * @return \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     public function getWidgetInstance()
     {
@@ -120,7 +110,6 @@ public function getWidgetInstance()
      * Prepare form before rendering HTML
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -179,7 +168,6 @@ protected function _prepareForm()
      * Return url for continue button
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContinueUrl()
     {
@@ -198,7 +186,6 @@ public function getContinueUrl()
      * Retrieve array (widget_type => widget_name) of available widgets
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypesOptionsArray()
     {
@@ -213,7 +200,6 @@ public function getTypesOptionsArray()
      * @param array $a
      * @param array $b
      * @return boolean
-     * @since 2.0.0
      */
     protected function _sortWidgets($a, $b)
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
index ef5c347fc01e0..2f2f447a59d1c 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
 {
@@ -21,7 +20,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
      * Internal constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index efbda1d37a97e..49f30f6422668 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -9,26 +9,22 @@
  * WYSIWYG widget options form
  *
  * @api
- * @since 2.0.0
  */
 class Options extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * Element type used by default if configuration is omitted
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultElementType = 'text';
 
     /**
      * @var \Magento\Widget\Model\Widget
-     * @since 2.0.0
      */
     protected $_widget;
 
     /**
      * @var \Magento\Framework\Option\ArrayPool
-     * @since 2.0.0
      */
     protected $_sourceModelPool;
 
@@ -39,7 +35,6 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Option\ArrayPool $sourceModelPool
      * @param \Magento\Widget\Model\Widget $widget
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * widget_values may be set before to render element values
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareForm()
     {
@@ -74,7 +68,6 @@ protected function _prepareForm()
      * Form getter/instantiation
      *
      * @return \Magento\Framework\Data\Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -91,7 +84,6 @@ public function getForm()
      * Fieldset getter/instantiation
      *
      * @return \Magento\Framework\Data\Form\Element\Fieldset
-     * @since 2.0.0
      */
     public function getMainFieldset()
     {
@@ -118,7 +110,6 @@ public function getMainFieldset()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function addFields()
     {
@@ -144,7 +135,6 @@ public function addFields()
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _addField($parameter)
     {
@@ -246,7 +236,6 @@ protected function _addField($parameter)
      *
      * @param string $fieldType
      * @return bool
-     * @since 2.0.0
      */
     protected function _isClassName($fieldType)
     {
diff --git a/app/code/Magento/Widget/Block/BlockInterface.php b/app/code/Magento/Widget/Block/BlockInterface.php
index 0263ffc418af8..ddf810f433f3a 100644
--- a/app/code/Magento/Widget/Block/BlockInterface.php
+++ b/app/code/Magento/Widget/Block/BlockInterface.php
@@ -14,7 +14,6 @@
 /**
  * Interface \Magento\Widget\Block\BlockInterface
  *
- * @since 2.0.0
  */
 interface BlockInterface
 {
@@ -24,7 +23,6 @@ interface BlockInterface
      *
      * @param array $arr
      * @return $this
-     * @since 2.0.0
      */
     public function addData(array $arr);
 
@@ -38,7 +36,6 @@ public function addData(array $arr);
      * @param string|array $key
      * @param mixed $value
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setData($key, $value = null);
 }
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
index 0b5cf45bdf56b..aeec59e23b95e 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
@@ -9,20 +9,17 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\BuildWidget
  *
- * @since 2.0.0
  */
 class BuildWidget extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Widget\Model\Widget
-     * @since 2.0.0
      */
     protected $_widget;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Widget\Model\Widget $widget
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -36,7 +33,6 @@ public function __construct(
      * Format widget pseudo-code for inserting into wysiwyg editor
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
index dcd17ecd8c7cf..f0ea1600e8e2b 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Backend\App\Action
 {
@@ -17,13 +16,11 @@ class Index extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Widget\Model\Widget\Config
-     * @since 2.0.0
      */
     protected $_widgetConfig;
 
@@ -31,7 +28,6 @@ class Index extends \Magento\Backend\App\Action
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Widget\Model\Widget\Config $widgetConfig
      * @param \Magento\Framework\Registry $coreRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -47,7 +43,6 @@ public function __construct(
      * Wisywyg widget plugin main page
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index 103018df474ce..fa0d6978e77c9 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance
  *
- * @since 2.0.0
  */
 abstract class Instance extends \Magento\Backend\App\Action
 {
@@ -27,31 +26,26 @@ abstract class Instance extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Widget\Model\Widget\InstanceFactory
-     * @since 2.0.0
      */
     protected $_widgetFactory;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $_translateInline;
 
@@ -62,7 +56,6 @@ abstract class Instance extends \Magento\Backend\App\Action
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -84,7 +77,6 @@ public function __construct(
      * Load layout, set active menu and breadcrumbs
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initAction()
     {
@@ -105,7 +97,6 @@ protected function _initAction()
      * Init widget instance object and set it to registry
      *
      * @return \Magento\Widget\Model\Widget\Instance|boolean
-     * @since 2.0.0
      */
     protected function _initWidgetInstance()
     {
@@ -136,7 +127,6 @@ protected function _initWidgetInstance()
      *
      * @param string $body
      * @return void
-     * @since 2.0.0
      */
     protected function setBody($body)
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
index 1ced3c54e6a5e..d74912c1450d3 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Blocks
  *
- * @since 2.0.0
  */
 class Blocks extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Blocks extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Render page containers
      *
      * @return void
-     * @since 2.0.0
      */
     public function renderPageContainers()
     {
@@ -45,7 +43,6 @@ public function renderPageContainers()
      * Blocks Action (Ajax request)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php
index 0a7bc70f72dbd..2ffd6ad587026 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Categories
  *
- * @since 2.0.0
  */
 class Categories extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
     /**
      * @var \Magento\Framework\View\Layout
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -27,7 +25,6 @@ class Categories extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param \Magento\Framework\View\Layout $layout
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -46,7 +43,6 @@ public function __construct(
      * Categories chooser Action (Ajax request)
      *
      * @return \Magento\Framework\Controller\Result\Raw
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php
index a8413c8fecdeb..7ca8271e7bfc1 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Delete
  *
- * @since 2.0.0
  */
 class Delete extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Delete extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Delete Action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php
index f00a085d1a37c..ff23697360ab4 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Edit
  *
- * @since 2.0.0
  */
 class Edit extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Edit extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Edit widget instance action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
index 5619206af661f..c54232c218b38 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Widget Instances Grid
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php
index 979b12033b191..e86d503943e84 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\NewAction
  *
- * @since 2.0.0
  */
 class NewAction extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class NewAction extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * New widget instance action (forward to edit action)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
index b15a57e714c3c..4bc9de063b52a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Products
  *
- * @since 2.0.0
  */
 class Products extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Products extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Products chooser Action (Ajax request)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
index 21a141fefe83d..ed33c16764d00 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Save
  *
- * @since 2.0.0
  */
 class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Save action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
index eceb04a3cf343..9aa4f95436f0a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Template
  *
- * @since 2.0.0
  */
 class Template extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Template extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Templates Chooser Action (Ajax request)
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
index 27864b52bab1e..dcb71632e393e 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\Instance\Validate
  *
- * @since 2.0.0
  */
 class Validate extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
 {
@@ -17,7 +16,6 @@ class Validate extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      * Validate action
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
index ca8e992461833..9e706e7286251 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Widget\Controller\Adminhtml\Widget\LoadOptions
  *
- * @since 2.0.0
  */
 class LoadOptions extends \Magento\Backend\App\Action
 {
@@ -25,7 +24,6 @@ class LoadOptions extends \Magento\Backend\App\Action
      * Ajax responder for loading plugin options form
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Widget/Helper/Conditions.php b/app/code/Magento/Widget/Helper/Conditions.php
index 681b17e1294e4..288a6f6649968 100644
--- a/app/code/Magento/Widget/Helper/Conditions.php
+++ b/app/code/Magento/Widget/Helper/Conditions.php
@@ -11,7 +11,6 @@
 
 /**
  * Widget Conditions helper.
- * @since 2.0.0
  */
 class Conditions
 {
@@ -45,7 +44,6 @@ public function __construct(
      *
      * @param array $value
      * @return string
-     * @since 2.0.0
      */
     public function encode(array $value)
     {
@@ -57,7 +55,6 @@ public function encode(array $value)
      *
      * @param string $value
      * @return array
-     * @since 2.0.0
      */
     public function decode($value)
     {
diff --git a/app/code/Magento/Widget/Model/Config/Converter.php b/app/code/Magento/Widget/Model/Config/Converter.php
index 1f8206365e6e6..3a4d0220d0b20 100644
--- a/app/code/Magento/Widget/Model/Config/Converter.php
+++ b/app/code/Magento/Widget/Model/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Widget\Model\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -16,7 +15,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -96,7 +94,6 @@ public function convert($source)
      * @param \DOMNode $source
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _convertContainer($source)
     {
@@ -132,7 +129,6 @@ protected function _convertContainer($source)
      * @throws \LogicException
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _convertParameter($source)
     {
@@ -225,7 +221,6 @@ protected function _convertParameter($source)
      * @param \DOMNode $source
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _convertDepends($source)
     {
@@ -255,7 +250,6 @@ protected function _convertDepends($source)
      * @param \DOMNode $source
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _convertBlock($source)
     {
@@ -280,7 +274,6 @@ protected function _convertBlock($source)
      *
      * @param \DOMElement $source
      * @return array
-     * @since 2.0.0
      */
     protected function _convertData($source)
     {
@@ -306,7 +299,6 @@ protected function _convertData($source)
      * @param \DOMNode $source
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _convertOption($source)
     {
diff --git a/app/code/Magento/Widget/Model/Config/Data.php b/app/code/Magento/Widget/Model/Config/Data.php
index b7636c94440a0..b5026d1a4f2c4 100644
--- a/app/code/Magento/Widget/Model/Config/Data.php
+++ b/app/code/Magento/Widget/Model/Config/Data.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Widget\Model\Config\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data\Scoped
 {
@@ -16,7 +15,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * Scope priority loading scheme
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_scopePriorityScheme = ['global', 'design'];
 }
diff --git a/app/code/Magento/Widget/Model/Config/FileResolver.php b/app/code/Magento/Widget/Model/Config/FileResolver.php
index 59e1603092edc..3b2c9b40a9203 100644
--- a/app/code/Magento/Widget/Model/Config/FileResolver.php
+++ b/app/code/Magento/Widget/Model/Config/FileResolver.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Widget\Model\Config\FileResolver
  *
- * @since 2.0.0
  */
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
@@ -21,19 +20,16 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * Module configuration file reader
      *
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_moduleReader;
 
     /**
      * @var \Magento\Framework\Config\FileIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
     /**
      * @var DirSearch
-     * @since 2.0.0
      */
     private $componentDirSearch;
 
@@ -41,7 +37,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param \Magento\Framework\Config\FileIteratorFactory $iteratorFactory
      * @param DirSearch $componentDirSearch
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Module\Dir\Reader $moduleReader,
@@ -55,7 +50,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/app/code/Magento/Widget/Model/Config/Reader.php b/app/code/Magento/Widget/Model/Config/Reader.php
index 9fdbb42f457ce..896aef2e80c79 100644
--- a/app/code/Magento/Widget/Model/Config/Reader.php
+++ b/app/code/Magento/Widget/Model/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Widget\Model\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/widgets/widget' => 'id',
@@ -35,7 +33,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -64,7 +61,6 @@ public function __construct(
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     public function readFile($file)
     {
diff --git a/app/code/Magento/Widget/Model/Config/SchemaLocator.php b/app/code/Magento/Widget/Model/Config/SchemaLocator.php
index 7a36d56a70ce7..cf9f6acbcfd57 100644
--- a/app/code/Magento/Widget/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Widget/Model/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Widget\Model\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,7 +19,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -28,13 +26,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
     {
@@ -47,7 +43,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -58,7 +53,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/app/code/Magento/Widget/Model/Layout/Link.php b/app/code/Magento/Widget/Model/Layout/Link.php
index 88a4ed00fa5c2..e6cc2752cdbd0 100644
--- a/app/code/Magento/Widget/Model/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/Layout/Link.php
@@ -14,7 +14,6 @@
  * @method \Magento\Widget\Model\Layout\Link setStoreId($id)
  * @method \Magento\Widget\Model\Layout\Link setThemeId($id)
  * @method \Magento\Widget\Model\Layout\Link setLayoutUpdateId($id)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\AbstractModel
 {
@@ -22,7 +21,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
      * Layout Update model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Model/Layout/Update.php b/app/code/Magento/Widget/Model/Layout/Update.php
index 57c3b86c15828..c32e3f8e08df1 100644
--- a/app/code/Magento/Widget/Model/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/Layout/Update.php
@@ -19,7 +19,6 @@
  * @method \Magento\Widget\Model\Layout\Update setThemeId() setThemeId(int $themeId)
  * @method \Magento\Widget\Model\Layout\Update setUpdatedAt() setUpdatedAt(string $updateDateTime)
  * @method \Magento\Widget\Model\ResourceModel\Layout\Update\Collection getCollection()
- * @since 2.0.0
  */
 class Update extends \Magento\Framework\Model\AbstractModel
 {
@@ -29,7 +28,6 @@ class Update extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -45,7 +43,6 @@ public function __construct(
      * Layout Update model initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Model/NamespaceResolver.php b/app/code/Magento/Widget/Model/NamespaceResolver.php
index 3df7000f40192..9aa0b73b346ca 100644
--- a/app/code/Magento/Widget/Model/NamespaceResolver.php
+++ b/app/code/Magento/Widget/Model/NamespaceResolver.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Widget\Model\NamespaceResolver
  *
- * @since 2.0.0
  */
 class NamespaceResolver
 {
@@ -16,19 +15,16 @@ class NamespaceResolver
      * List of module namespaces
      *
      * @var array
-     * @since 2.0.0
      */
     protected $moduleNamespaces;
 
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     protected $moduleList;
 
     /**
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\ModuleListInterface $moduleList)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\Module\ModuleListInterface $modul
      * @param string $name
      * @param bool $asFullModuleName
      * @return string
-     * @since 2.0.0
      */
     public function determineOmittedNamespace($name, $asFullModuleName = false)
     {
@@ -75,7 +70,6 @@ public function determineOmittedNamespace($name, $asFullModuleName = false)
      * Prepare module namespaces
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareModuleNamespaces()
     {
@@ -93,7 +87,6 @@ protected function prepareModuleNamespaces()
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     protected function prepareName($name)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Link.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Link.php
index 5833444da640f..4ba457acf2096 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Link.php
@@ -7,7 +7,6 @@
 
 /**
  * Layout Link resource model
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Link/Collection.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Link/Collection.php
index 1c5dff4a86e5c..e699b4c9b004d 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Link/Collection.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Link/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * Layout update collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -25,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -44,7 +41,6 @@ public function __construct(
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -57,7 +53,6 @@ protected function _construct()
      *
      * @param int $themeId
      * @return $this
-     * @since 2.0.0
      */
     public function addThemeFilter($themeId)
     {
@@ -70,7 +65,6 @@ public function addThemeFilter($themeId)
      *
      * @param array $fields
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinWithUpdate($fields = [])
     {
@@ -92,7 +86,6 @@ protected function _joinWithUpdate($fields = [])
      *
      * @param bool $isTemporary
      * @return $this
-     * @since 2.0.0
      */
     public function addTemporaryFilter($isTemporary)
     {
@@ -105,7 +98,6 @@ public function addTemporaryFilter($isTemporary)
      *
      * @param string $days
      * @return $this
-     * @since 2.0.0
      */
     public function addUpdatedDaysBeforeFilter($days)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Plugin.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Plugin.php
index 138e6a19e14fa..5525520fa1da0 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Plugin.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Plugin.php
@@ -7,19 +7,16 @@
 
 /**
  * Class Plugin
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Widget\Model\ResourceModel\Layout\Update
-     * @since 2.0.0
      */
     private $update;
 
     /**
      * @param \Magento\Widget\Model\ResourceModel\Layout\Update $update
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Widget\Model\ResourceModel\Layout\Update $update
@@ -35,7 +32,6 @@ public function __construct(
      * @param string $handle
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function aroundGetDbUpdateString(
         \Magento\Framework\View\Model\Layout\Merge $subject,
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
index 1248f6f95348a..c7aef33bbf823 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
@@ -10,19 +10,17 @@
 
 /**
  * Layout update resource model
- * @since 2.0.0
  */
 class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     private $_cache;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.5
      */
     private $layoutUpdateCache;
 
@@ -30,7 +28,6 @@ class Update extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Cache\FrontendInterface $cache
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -45,7 +42,6 @@ public function __construct(
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -59,7 +55,6 @@ protected function _construct()
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param \Magento\Framework\App\ScopeInterface $store
      * @return string
-     * @since 2.0.0
      */
     public function fetchUpdatesByHandle(
         $handle,
@@ -85,7 +80,6 @@ public function fetchUpdatesByHandle(
      *
      * @param bool $loadAllUpdates
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
     {
@@ -120,7 +114,6 @@ protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
      *
      * @param \Magento\Widget\Model\Layout\Update|\Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
index 5bfa4a20794e4..2245af95320db 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * Layout update collection model
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -21,7 +19,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Name prefix of events that are dispatched by model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'layout_update_collection';
 
@@ -29,7 +26,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Name of event parameter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'layout_update_collection';
 
@@ -41,7 +37,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -60,7 +55,6 @@ public function __construct(
      * Define resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -76,7 +70,6 @@ protected function _construct()
      *
      * @param int $themeId
      * @return $this
-     * @since 2.0.0
      */
     public function addThemeFilter($themeId)
     {
@@ -91,7 +84,6 @@ public function addThemeFilter($themeId)
      *
      * @param int $storeId
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeId)
     {
@@ -105,7 +97,6 @@ public function addStoreFilter($storeId)
      * Join with layout link table
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinWithLink()
     {
@@ -128,7 +119,6 @@ protected function _joinWithLink()
      *
      * @param array $fields
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinLeftWithLink($fields = [])
     {
@@ -150,7 +140,6 @@ protected function _joinLeftWithLink($fields = [])
      *
      * @param string $days
      * @return $this
-     * @since 2.0.0
      */
     public function addUpdatedDaysBeforeFilter($days)
     {
@@ -174,7 +163,6 @@ public function addUpdatedDaysBeforeFilter($days)
      * Get layouts without links
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addNoLinksFilter()
     {
@@ -188,7 +176,6 @@ public function addNoLinksFilter()
      * Delete updates in collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function delete()
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget.php b/app/code/Magento/Widget/Model/ResourceModel/Widget.php
index 63ea16ddad535..8d9b6933faba2 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget.php
@@ -10,7 +10,6 @@
  * Resource model for widget.
  *
  * @deprecated 2.2.0 Data from this table was moved to xml(widget.xml).
- * @since 2.0.0
  */
 class Widget extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -18,7 +17,6 @@ class Widget extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -30,7 +28,6 @@ protected function _construct()
      *
      * @param int $widgetId
      * @return array|false
-     * @since 2.0.0
      */
     public function loadPreconfiguredWidget($widgetId)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance.php
index 3868caf26a038..c7e9731fb904a 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance.php
@@ -12,7 +12,6 @@
  * Widget Instance Resource Model
  *
  * @api
- * @since 2.0.0
  */
 class Instance extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -20,7 +19,6 @@ class Instance extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -32,7 +30,6 @@ protected function _construct()
      *
      * @param \Magento\Widget\Model\Widget\Instance $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad(AbstractModel $object)
     {
@@ -53,7 +50,6 @@ protected function _afterLoad(AbstractModel $object)
      *
      * @param \Magento\Widget\Model\Widget\Instance $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterSave(AbstractModel $object)
     {
@@ -112,7 +108,6 @@ protected function _afterSave(AbstractModel $object)
      * @param \Magento\Widget\Model\Widget\Instance $widgetInstance
      * @param array $pageGroupData
      * @return string[] of inserted layout updates ids
-     * @since 2.0.0
      */
     protected function _saveLayoutUpdates($widgetInstance, $pageGroupData)
     {
@@ -155,7 +150,6 @@ protected function _saveLayoutUpdates($widgetInstance, $pageGroupData)
      *
      * @param array $storeIds
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareStoreIds($storeIds)
     {
@@ -171,7 +165,6 @@ protected function _prepareStoreIds($storeIds)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeDelete(AbstractModel $object)
     {
@@ -198,7 +191,6 @@ protected function _beforeDelete(AbstractModel $object)
      *
      * @param \Magento\Widget\Model\Widget\Instance $object
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterDelete(AbstractModel $object)
     {
@@ -211,7 +203,6 @@ protected function _afterDelete(AbstractModel $object)
      *
      * @param array $pageIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteWidgetInstancePages($pageIds)
     {
@@ -228,7 +219,6 @@ protected function _deleteWidgetInstancePages($pageIds)
      *
      * @param array $layoutUpdateIds
      * @return $this
-     * @since 2.0.0
      */
     protected function _deleteLayoutUpdates($layoutUpdateIds)
     {
@@ -245,7 +235,6 @@ protected function _deleteLayoutUpdates($layoutUpdateIds)
      *
      * @param int $id
      * @return string[]
-     * @since 2.0.0
      */
     public function lookupStoreIds($id)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
index bd5303e5969d0..4e1631c96233f 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
@@ -10,7 +10,6 @@
  * Widget Instance Collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -18,7 +17,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Fields map for corellation names & real selected fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = ['fields' => ['type' => 'instance_type']];
 
@@ -26,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -43,7 +40,6 @@ protected function _construct()
      * @param array|int $storeIds
      * @param bool $withDefaultStore if TRUE also filter by store id '0'
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds = [], $withDefaultStore = true)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
index 634eff550d72d..1a6c2dfa5bf80 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
@@ -11,19 +11,16 @@
  *
  * @deprecated 2.2.0 created new class that correctly loads theme options and whose name follows naming convention
  * @see \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes
- * @since 2.0.0
  */
 class ThemeId implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
     /**
      * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionF
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php
index 7a3b8665e656d..0db3362753a65 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php
@@ -8,19 +8,16 @@
 
 /**
  * Widget Instance Types Options
- * @since 2.0.0
  */
 class Types implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @var \Magento\Widget\Model\Widget\Instance
-     * @since 2.0.0
      */
     protected $_model;
 
     /**
      * @param \Magento\Widget\Model\Widget\Instance $widgetInstanceModel
-     * @since 2.0.0
      */
     public function __construct(\Magento\Widget\Model\Widget\Instance $widgetInstanceModel)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Widget\Model\Widget\Instance $widgetInstanc
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 2ff50d4d9bc31..273a4aaf1fa37 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -8,19 +8,16 @@
 /**
  * Template Filter Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Filter extends \Magento\Cms\Model\Template\Filter
 {
     /**
      * @var \Magento\Widget\Model\ResourceModel\Widget
-     * @since 2.0.0
      */
     protected $_widgetResource;
 
     /**
      * @var \Magento\Widget\Model\Widget
-     * @since 2.0.0
      */
     protected $_widget;
 
@@ -41,7 +38,6 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
      * @param \Magento\Widget\Model\Widget $widget
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -84,7 +80,6 @@ public function __construct(
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function generateWidget($construction)
     {
@@ -127,7 +122,6 @@ public function generateWidget($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function widgetDirective($construction)
     {
@@ -139,7 +133,6 @@ public function widgetDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function mediaDirective($construction)
     {
diff --git a/app/code/Magento/Widget/Model/Template/FilterEmulate.php b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
index 9a15eb990216b..cbc78c1a2425c 100644
--- a/app/code/Magento/Widget/Model/Template/FilterEmulate.php
+++ b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Widget\Model\Template\FilterEmulate
  *
- * @since 2.0.0
  */
 class FilterEmulate extends Filter
 {
@@ -17,7 +16,6 @@ class FilterEmulate extends Filter
      *
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function widgetDirective($construction)
     {
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index e61664d561032..2f17852a5c59c 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -10,55 +10,46 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Widget
 {
     /**
      * @var \Magento\Widget\Model\Config\Data
-     * @since 2.0.0
      */
     protected $dataStorage;
 
     /**
      * @var \Magento\Framework\App\Cache\Type\Config
-     * @since 2.0.0
      */
     protected $configCacheType;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Magento\Framework\View\Asset\Source
-     * @since 2.0.0
      */
     protected $assetSource;
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $viewFileSystem;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $widgetsArray = [];
 
     /**
      * @var \Magento\Widget\Helper\Conditions
-     * @since 2.0.0
      */
     protected $conditionsHelper;
 
@@ -75,7 +66,6 @@ class Widget
      * @param \Magento\Framework\View\Asset\Source $assetSource
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Escaper $escaper,
@@ -113,7 +103,6 @@ private function getMathRandom()
      *
      * @param string $type Widget type
      * @return null|array
-     * @since 2.0.0
      */
     public function getWidgetByClassType($type)
     {
@@ -138,7 +127,6 @@ public function getWidgetByClassType($type)
      * @return null|\Magento\Framework\Simplexml\Element
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getConfigAsXml($type)
     {
@@ -150,7 +138,6 @@ public function getConfigAsXml($type)
      *
      * @param string $type Widget type
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getConfigAsObject($type)
     {
@@ -178,7 +165,6 @@ public function getConfigAsObject($type)
      *
      * @param \Magento\Framework\DataObject $object
      * @return array
-     * @since 2.0.0
      */
     protected function prepareWidgetParameters(\Magento\Framework\DataObject $object)
     {
@@ -208,7 +194,6 @@ protected function prepareWidgetParameters(\Magento\Framework\DataObject $object
      * @param string $key
      * @param int $sortOrder
      * @return array
-     * @since 2.0.0
      */
     protected function prepareDropDownValues(array $data, $key, $sortOrder)
     {
@@ -233,7 +218,6 @@ protected function prepareDropDownValues(array $data, $key, $sortOrder)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function prepareHelperBlock(array $data)
     {
@@ -256,7 +240,6 @@ protected function prepareHelperBlock(array $data)
      *
      * @param array $filters Key-value array of filters for widget node properties
      * @return array
-     * @since 2.0.0
      */
     public function getWidgets($filters = [])
     {
@@ -287,7 +270,6 @@ public function getWidgets($filters = [])
      *
      * @param array $filters Key-value array of filters for widget node properties
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetsArray($filters = [])
     {
@@ -314,7 +296,6 @@ public function getWidgetsArray($filters = [])
      * @param array $params Pre-configured Widget Params
      * @param bool $asIs Return result as widget directive(true) or as placeholder image(false)
      * @return string Widget directive ready to parse
-     * @since 2.0.0
      */
     public function getWidgetDeclaration($type, $params = [], $asIs = true)
     {
@@ -379,7 +360,6 @@ private function getWidgetPageVarName($params = [])
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function getPlaceholderImageUrl($type)
     {
@@ -404,7 +384,6 @@ public function getPlaceholderImageUrl($type)
      * Returns array(<type> => <url>)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPlaceholderImageUrls()
     {
@@ -427,7 +406,6 @@ public function getPlaceholderImageUrls()
      *
      * @param array $inputArray
      * @return array
-     * @since 2.0.0
      */
     protected function getAsCanonicalArray($inputArray)
     {
@@ -448,7 +426,6 @@ protected function getAsCanonicalArray($inputArray)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     protected function idEncode($string)
     {
@@ -461,7 +438,6 @@ protected function idEncode($string)
      * @param array $firstElement
      * @param array $secondElement
      * @return bool
-     * @since 2.0.0
      */
     protected function sortWidgets($firstElement, $secondElement)
     {
@@ -474,7 +450,6 @@ protected function sortWidgets($firstElement, $secondElement)
      * @param \Magento\Framework\DataObject $firstElement
      * @param \Magento\Framework\DataObject $secondElement
      * @return int
-     * @since 2.0.0
      */
     protected function sortParameters($firstElement, $secondElement)
     {
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 4bfcefec90f78..e4ddd9d48f2d2 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -7,43 +7,36 @@
 
 /**
  * Widgets Insertion Plugin Config for Editor HTML Element
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
     /**
      * @var \Magento\Widget\Model\Widget
-     * @since 2.0.0
      */
     protected $_widget;
 
     /**
      * @var \Magento\Backend\Model\UrlInterface
-     * @since 2.0.0
      */
     protected $_backendUrl;
 
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
     /**
      * @var \Magento\Widget\Model\WidgetFactory
-     * @since 2.0.0
      */
     protected $_widgetFactory;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -53,7 +46,6 @@ class Config
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Widget\Model\WidgetFactory $widgetFactory
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Backend\Model\UrlInterface $backendUrl,
@@ -74,7 +66,6 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $config
      * @return array
-     * @since 2.0.0
      */
     public function getPluginSettings($config)
     {
@@ -95,7 +86,6 @@ public function getPluginSettings($config)
      *
      * @param \Magento\Framework\DataObject $config Editor element config
      * @return string
-     * @since 2.0.0
      */
     public function getWidgetWindowUrl($config)
     {
@@ -123,7 +113,6 @@ public function getWidgetWindowUrl($config)
      *
      * @param string[]|string $widgets List of widgets
      * @return string Query param value
-     * @since 2.0.0
      */
     public function encodeWidgetsToQuery($widgets)
     {
@@ -137,7 +126,6 @@ public function encodeWidgetsToQuery($widgets)
      *
      * @param string $queryParam Query param value to decode
      * @return string[] Array of widget types
-     * @since 2.0.0
      */
     public function decodeWidgetsFromQuery($queryParam)
     {
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index f833aeb825237..373b82d805f23 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -23,7 +23,6 @@
  * @method int getThemeId()
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Instance extends \Magento\Framework\Model\AbstractModel
 {
@@ -47,19 +46,16 @@ class Instance extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_layoutHandles = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_specificEntitiesLayoutHandles = [];
 
     /**
      * @var \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     protected $_widgetConfigXml = null;
 
@@ -67,61 +63,51 @@ class Instance extends \Magento\Framework\Model\AbstractModel
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'widget_widget_instance';
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $_viewFileSystem;
 
     /**
      * @var \Magento\Widget\Model\Widget
-     * @since 2.0.0
      */
     protected $_widgetModel;
 
     /**
      * @var \Magento\Widget\Model\NamespaceResolver
-     * @since 2.0.0
      */
     protected $_namespaceResolver;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $_cacheTypeList;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_relatedCacheTypes;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var \Magento\Widget\Helper\Conditions
-     * @since 2.0.0
      */
     protected $conditionsHelper;
 
@@ -152,7 +138,6 @@ class Instance extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -192,7 +177,6 @@ public function __construct(
      * Internal Constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -222,7 +206,6 @@ protected function _construct()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -294,7 +277,6 @@ public function beforeSave()
      * Validate widget instance data
      *
      * @return \Magento\Framework\Phrase|bool
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -308,7 +290,6 @@ public function validate()
      * Check if widget instance has required data (other data depends on it)
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isCompleteToCreate()
     {
@@ -319,7 +300,6 @@ public function isCompleteToCreate()
      * Return widget instance code.  If not set, derive value from type (namespace\class).
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -338,7 +318,6 @@ public function getCode()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -352,7 +331,6 @@ public function setCode($code)
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -365,7 +343,6 @@ public function setType($type)
      * Prepare widget type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -377,7 +354,6 @@ public function getType()
      * If not set return default
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -393,7 +369,6 @@ public function getArea()
      * Explode to array if string setted
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoreIds()
     {
@@ -408,7 +383,6 @@ public function getStoreIds()
      * Unserialize if serialized string setted
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetParameters()
     {
@@ -425,7 +399,6 @@ public function getWidgetParameters()
      *
      * @param string $value
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetsOptionArray($value = 'code')
     {
@@ -444,7 +417,6 @@ public function getWidgetsOptionArray($value = 'code')
      * @param string $value
      * @param string $requestedParam
      * @return string|null
-     * @since 2.0.0
      */
     public function getWidgetReference($matchParam, $value, $requestedParam)
     {
@@ -464,7 +436,6 @@ public function getWidgetReference($matchParam, $value, $requestedParam)
      *
      * @return array|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getWidgetConfigAsArray()
     {
@@ -510,7 +481,6 @@ public function getWidgetConfigAsArray()
      * Retrieve widget available templates
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetTemplates()
     {
@@ -534,7 +504,6 @@ public function getWidgetTemplates()
      * Get list of containers that widget is limited to be in
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetSupportedContainers()
     {
@@ -556,7 +525,6 @@ public function getWidgetSupportedContainers()
      *
      * @param string $containerName
      * @return array
-     * @since 2.0.0
      */
     public function getWidgetSupportedTemplatesByContainer($containerName)
     {
@@ -594,7 +562,6 @@ public function getWidgetSupportedTemplatesByContainer($containerName)
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function generateLayoutUpdateXml($container, $templatePath = '')
     {
@@ -649,7 +616,6 @@ public function generateLayoutUpdateXml($container, $templatePath = '')
      * Invalidate related cache types
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _invalidateCache()
     {
@@ -663,7 +629,6 @@ protected function _invalidateCache()
      * Invalidate related cache if instance contain layout updates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -677,7 +642,6 @@ public function afterSave()
      * Invalidate related cache if instance contain layout updates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
diff --git a/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php b/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php
index 72b594e4ff532..96e39a298a246 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Widget\Model\Widget\Instance\OptionsFactory
  *
- * @since 2.0.0
  */
 class OptionsFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @param array $data
      * @return \Magento\Framework\Option\ArrayInterface
-     * @since 2.0.0
      */
     public function create($type, array $data = [])
     {
diff --git a/app/code/Magento/Widget/Setup/InstallData.php b/app/code/Magento/Widget/Setup/InstallData.php
index dc7360bced708..76c2154215290 100644
--- a/app/code/Magento/Widget/Setup/InstallData.php
+++ b/app/code/Magento/Widget/Setup/InstallData.php
@@ -12,13 +12,11 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallData implements InstallDataInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Widget/Setup/InstallSchema.php b/app/code/Magento/Widget/Setup/InstallSchema.php
index 007b7e4805093..4a3a1d8227c78 100644
--- a/app/code/Magento/Widget/Setup/InstallSchema.php
+++ b/app/code/Magento/Widget/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index 1b9fcb8280cf9..0a4f09227f888 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -8,7 +8,6 @@
 
 /**
  * Wishlist Product Items abstract Block
- * @since 2.0.0
  */
 abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProduct
 {
@@ -16,7 +15,6 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
      * Wishlist Product Items Collection
      *
      * @var \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected $_collection;
 
@@ -24,13 +22,11 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
      * Store wishlist Model
      *
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $_wishlist;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $httpContext;
 
@@ -38,7 +34,6 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
      * Retrieve Wishlist Data Helper
      *
      * @return \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected function _getHelper()
     {
@@ -67,7 +61,6 @@ protected function _getHelper()
      * Retrieve Wishlist model
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected function _getWishlist()
     {
@@ -80,7 +73,6 @@ protected function _getWishlist()
      * @param \Magento\Wishlist\Model\ResourceModel\Item\Collection $collection
      * @return \Magento\Wishlist\Block\Customer\Wishlist
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _prepareCollection($collection)
     {
@@ -91,7 +83,6 @@ protected function _prepareCollection($collection)
      * Create wishlist item collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected function _createWishlistItemCollection()
     {
@@ -102,7 +93,6 @@ protected function _createWishlistItemCollection()
      * Retrieve Wishlist Product Items collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     public function getWishlistItems()
     {
@@ -118,7 +108,6 @@ public function getWishlistItems()
      * Retrieve wishlist instance
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlistInstance()
     {
@@ -131,7 +120,6 @@ public function getWishlistInstance()
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemRemoveParams($item)
     {
@@ -143,7 +131,6 @@ public function getItemRemoveParams($item)
      *
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getItemAddToCartParams($item)
     {
@@ -155,7 +142,6 @@ public function getItemAddToCartParams($item)
      *
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getSharedItemAddToCartUrl($item)
     {
@@ -166,7 +152,6 @@ public function getSharedItemAddToCartUrl($item)
      * Retrieve URL for adding All items to shopping cart from shared wishlist
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSharedAddAllToCartUrl()
     {
@@ -178,7 +163,6 @@ public function getSharedAddAllToCartUrl()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getAddToWishlistParams($product)
     {
@@ -191,7 +175,6 @@ public function getAddToWishlistParams($product)
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $product
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemConfigureUrl($product)
     {
@@ -203,7 +186,6 @@ public function getItemConfigureUrl($product)
      *
      * @param \Magento\Catalog\Model\Product $item
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedDescription($item)
     {
@@ -218,7 +200,6 @@ public function getEscapedDescription($item)
      *
      * @param \Magento\Catalog\Model\Product $item
      * @return bool
-     * @since 2.0.0
      */
     public function hasDescription($item)
     {
@@ -230,7 +211,6 @@ public function hasDescription($item)
      *
      * @param string $date
      * @return string
-     * @since 2.0.0
      */
     public function getFormatedDate($date)
     {
@@ -241,7 +221,6 @@ public function getFormatedDate($date)
      * Check is the wishlist has a salable product(s)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSaleable()
     {
@@ -258,7 +237,6 @@ public function isSaleable()
      * Retrieve wishlist loaded items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWishlistItemsCount()
     {
@@ -270,7 +248,6 @@ public function getWishlistItemsCount()
      *
      * @param \Magento\Wishlist\Model\Item|\Magento\Catalog\Model\Product $item
      * @return float
-     * @since 2.0.0
      */
     public function getQty($item)
     {
@@ -285,7 +262,6 @@ public function getQty($item)
      * Check is the wishlist has items
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasWishlistItems()
     {
@@ -298,7 +274,6 @@ public function hasWishlistItems()
      * @param  \Magento\Wishlist\Model\Item|\Magento\Catalog\Model\Product $item
      * @param  array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($item, $additional = [])
     {
@@ -310,7 +285,6 @@ public function getProductUrl($item, $additional = [])
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getImageUrl($product)
     {
@@ -325,7 +299,6 @@ public function getImageUrl($product)
      * @param string $renderZone
      * @param array $arguments
      * @return string|null
-     * @since 2.0.0
      */
     public function getItemPriceHtml(
         \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item,
diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php b/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
index c3672a01a68bd..033cf2cc1a6de 100644
--- a/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text
  *
- * @since 2.0.0
  */
 class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
 {
@@ -16,7 +15,6 @@ class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
      * Override abstract method
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCondition()
     {
diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
index 6e7b86d14ee17..de47e5ca703aa 100644
--- a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
@@ -13,7 +13,6 @@
 
 /**
  * Class WishlistTab
- * @since 2.0.0
  */
 class WishlistTab extends TabWrapper implements TabInterface
 {
@@ -21,13 +20,11 @@ class WishlistTab extends TabWrapper implements TabInterface
      * Core registry
      *
      * @var Registry
-     * @since 2.0.0
      */
     protected $coreRegistry = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isAjaxLoaded = true;
 
@@ -37,7 +34,6 @@ class WishlistTab extends TabWrapper implements TabInterface
      * @param Context $context
      * @param Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Context $context, Registry $registry, array $data = [])
     {
@@ -47,7 +43,6 @@ public function __construct(Context $context, Registry $registry, array $data =
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function canShowTab()
     {
@@ -58,7 +53,6 @@ public function canShowTab()
      * Return Tab label
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTabLabel()
     {
@@ -69,7 +63,6 @@ public function getTabLabel()
      * Return URL link to Tab content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTabUrl()
     {
diff --git a/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php b/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
index 6788a2de8f6b1..1ec9a914e64dd 100644
--- a/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
+++ b/app/code/Magento/Wishlist/Block/Cart/Item/Renderer/Actions/MoveToWishlist.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class MoveToWishlist extends Generic
 {
     /**
      * @var Data
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
@@ -25,7 +23,6 @@ class MoveToWishlist extends Generic
      * @param Template\Context $context
      * @param Data $wishlistHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Check whether "add to wishlist" button is allowed in cart
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowInCart()
     {
@@ -51,7 +47,6 @@ public function isAllowInCart()
      * Get JSON POST params for moving from cart
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMoveFromCartParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Catalog/Product/ProductList/Item/AddTo/Wishlist.php b/app/code/Magento/Wishlist/Block/Catalog/Product/ProductList/Item/AddTo/Wishlist.php
index f1ebff054f52c..0858c330609fd 100644
--- a/app/code/Magento/Wishlist/Block/Catalog/Product/ProductList/Item/AddTo/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Catalog/Product/ProductList/Item/AddTo/Wishlist.php
@@ -9,13 +9,13 @@
  * Add product to wishlist
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Wishlist extends \Magento\Catalog\Block\Product\ProductList\Item\Block
 {
     /**
      * @return \Magento\Wishlist\Helper\Data
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getWishlistHelper()
     {
diff --git a/app/code/Magento/Wishlist/Block/Catalog/Product/View/AddTo/Wishlist.php b/app/code/Magento/Wishlist/Block/Catalog/Product/View/AddTo/Wishlist.php
index 11f6dbc151d8f..d61b7207b13c0 100644
--- a/app/code/Magento/Wishlist/Block/Catalog/Product/View/AddTo/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Catalog/Product/View/AddTo/Wishlist.php
@@ -10,7 +10,7 @@
  * Product view wishlist block
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.1
  */
 class Wishlist extends \Magento\Catalog\Block\Product\View
 {
@@ -18,7 +18,7 @@ class Wishlist extends \Magento\Catalog\Block\Product\View
      * Return wishlist widget options json
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getWishlistOptionsJson()
     {
@@ -29,7 +29,7 @@ public function getWishlistOptionsJson()
      * Return wishlist widget options
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getWishlistOptions()
     {
@@ -40,7 +40,7 @@ public function getWishlistOptions()
      * Return wishlist params
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function getWishlistParams()
     {
@@ -52,7 +52,7 @@ public function getWishlistParams()
      * Check whether the wishlist is allowed
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.1
      */
     public function isWishListAllowed()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
index e9e6e561d97ac..fa2696a68c186 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Sharing extends \Magento\Framework\View\Element\Template
 {
@@ -21,7 +20,6 @@ class Sharing extends \Magento\Framework\View\Element\Template
      * Entered Data cache
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_enteredData = null;
 
@@ -29,13 +27,11 @@ class Sharing extends \Magento\Framework\View\Element\Template
      * Wishlist configuration
      *
      * @var \Magento\Wishlist\Model\Config
-     * @since 2.0.0
      */
     protected $_wishlistConfig;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_wishlistSession;
 
@@ -44,7 +40,6 @@ class Sharing extends \Magento\Framework\View\Element\Template
      * @param \Magento\Wishlist\Model\Config $wishlistConfig
      * @param \Magento\Framework\Session\Generic $wishlistSession
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -61,7 +56,6 @@ public function __construct(
      * Prepare Global Layout
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -72,7 +66,6 @@ protected function _prepareLayout()
      * Retrieve Send Form Action URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSendUrl()
     {
@@ -84,7 +77,6 @@ public function getSendUrl()
      *
      * @param string $key
      * @return string|null
-     * @since 2.0.0
      */
     public function getEnteredData($key)
     {
@@ -103,7 +95,6 @@ public function getEnteredData($key)
      * Retrieve back button url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -114,7 +105,6 @@ public function getBackUrl()
      * Retrieve number of emails allowed for sharing
      *
      * @return int
-     * @since 2.0.0
      */
     public function getEmailSharingLimit()
     {
@@ -125,7 +115,6 @@ public function getEmailSharingLimit()
      * Retrieve maximum email length allowed for sharing
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTextSharingLimit()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index c7681d3395f9a..eff7e5afbb347 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Sidebar extends \Magento\Wishlist\Block\AbstractBlock
 {
@@ -22,7 +21,6 @@ class Sidebar extends \Magento\Wishlist\Block\AbstractBlock
      * Retrieve block title
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index 2fa239f6ff03d..c048fe953131e 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
 {
@@ -21,25 +20,21 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      * List of product options rendering configurations by product type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsCfg = [];
 
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
-     * @since 2.0.0
      */
     protected $_helperPool;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
-     * @since 2.0.0
      */
     protected $currentCustomer;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $postDataHelper;
 
@@ -50,7 +45,6 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -75,7 +69,6 @@ public function __construct(
      *
      * @param  \Magento\Wishlist\Model\ResourceModel\Item\Collection $collection
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareCollection($collection)
     {
@@ -87,7 +80,6 @@ protected function _prepareCollection($collection)
      * Preparing global layout
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -99,7 +91,6 @@ protected function _prepareLayout()
      * Retrieve Back URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackUrl()
     {
@@ -111,7 +102,6 @@ public function getBackUrl()
      *
      * @param null|array $optionCfg
      * @return $this
-     * @since 2.0.0
      */
     public function setOptionsRenderCfgs($optionCfg)
     {
@@ -123,7 +113,6 @@ public function setOptionsRenderCfgs($optionCfg)
      * Returns all options render configurations
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsRenderCfgs()
     {
@@ -137,7 +126,6 @@ public function getOptionsRenderCfgs()
      * @param string $helperName
      * @param null|string $template
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionsRenderCfg($productType, $helperName, $template = null)
     {
@@ -150,7 +138,6 @@ public function addOptionsRenderCfg($productType, $helperName, $template = null)
      *
      * @param string $productType
      * @return array|null
-     * @since 2.0.0
      */
     public function getOptionsRenderCfg($productType)
     {
@@ -168,7 +155,6 @@ public function getOptionsRenderCfg($productType)
      *
      * @param \Magento\Wishlist\Model\Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getDetailsHtml(\Magento\Wishlist\Model\Item $item)
     {
@@ -202,7 +188,6 @@ public function getDetailsHtml(\Magento\Wishlist\Model\Item $item)
      *
      * @param \Magento\Wishlist\Model\Item $item
      * @return float
-     * @since 2.0.0
      */
     public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
     {
@@ -213,7 +198,6 @@ public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
     /**
      * Get add all to cart params for POST request
      * @return string
-     * @since 2.0.0
      */
     public function getAddAllToCartParams()
     {
@@ -225,7 +209,6 @@ public function getAddAllToCartParams()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
index 5e549a2fd4d16..e905465e44bf6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Button extends \Magento\Framework\View\Element\Template
 {
@@ -21,7 +20,6 @@ class Button extends \Magento\Framework\View\Element\Template
      * Wishlist config
      *
      * @var \Magento\Wishlist\Model\Config
-     * @since 2.0.0
      */
     protected $_wishlistConfig;
 
@@ -29,7 +27,6 @@ class Button extends \Magento\Framework\View\Element\Template
      * Wishlist data
      *
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistData = null;
 
@@ -38,7 +35,6 @@ class Button extends \Magento\Framework\View\Element\Template
      * @param \Magento\Wishlist\Helper\Data $wishlistData
      * @param \Magento\Wishlist\Model\Config $wishlistConfig
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -55,7 +51,6 @@ public function __construct(
      * Retrieve current wishlist
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlist()
     {
@@ -66,7 +61,6 @@ public function getWishlist()
      * Retrieve wishlist config
      *
      * @return \Magento\Wishlist\Model\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column.php
index 3efc6baacf35c..7987285bda870 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @method \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface getItem()
- * @since 2.0.0
  */
 class Column extends \Magento\Wishlist\Block\AbstractBlock
 {
@@ -19,7 +18,6 @@ class Column extends \Magento\Wishlist\Block\AbstractBlock
      * Checks whether column should be shown in table
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -30,7 +28,6 @@ public function isEnabled()
      * Retrieve block html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -52,7 +49,6 @@ protected function _toHtml()
      * Retrieve column related javascript code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJs()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index 0c3725e1fa1c6..45550e37f4c18 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
index 194cae1bd7cc7..ff366df31d204 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
@@ -10,7 +10,6 @@
  * Wishlist block customer item cart column
  *
  * @api
- * @since 2.0.0
  */
 class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
@@ -19,7 +18,6 @@ class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
      *
      * @param \Magento\Wishlist\Model\Item $item
      * @return float
-     * @since 2.0.0
      */
     public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
     {
@@ -31,7 +29,6 @@ public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
      * Return product for current item
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProductItem()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 7c2da1d9fcd08..6ccb3923460de 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index f8e8f56896aba..884eb7922cdad 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
index b17582e1a0407..8df1ba362e594 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Image extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 34c10f87ca7ff..fe758ce8ee972 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 89589badaae29..8c1a69f7b072f 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
index 11d12dd43b176..1b076628ea269 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
@@ -11,13 +11,11 @@
  *
  * @api
  * @method \Magento\Wishlist\Model\Item getItem()
- * @since 2.0.0
  */
 class Options extends \Magento\Wishlist\Block\AbstractBlock
 {
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
-     * @since 2.0.0
      */
     protected $_helperPool;
 
@@ -25,7 +23,6 @@ class Options extends \Magento\Wishlist\Block\AbstractBlock
      * List of product options rendering configurations by product type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsCfg = [
         'default' => [
@@ -39,7 +36,6 @@ class Options extends \Magento\Wishlist\Block\AbstractBlock
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $helperPool
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -59,7 +55,6 @@ public function __construct(
      * Initialize block
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -74,7 +69,6 @@ protected function _construct()
      * @param string $helperName
      * @param null|string $template
      * @return $this
-     * @since 2.0.0
      */
     public function addOptionsRenderCfg($productType, $helperName, $template = null)
     {
@@ -87,7 +81,6 @@ public function addOptionsRenderCfg($productType, $helperName, $template = null)
      *
      * @param string $productType
      * @return array|null
-     * @since 2.0.0
      */
     public function getOptionsRenderCfg($productType)
     {
@@ -104,7 +97,6 @@ public function getOptionsRenderCfg($productType)
      * Retrieve product configured options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfiguredOptions()
     {
@@ -135,7 +127,6 @@ public function getConfiguredOptions()
      * Retrieve block template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplate()
     {
@@ -160,7 +151,6 @@ public function getTemplate()
      * Render block html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
index f79cb8f1fd7f1..882057d4a273d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
@@ -10,7 +10,6 @@
  * Wishlist block customer items
  *
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Framework\View\Element\Template
 {
@@ -18,7 +17,6 @@ class Items extends \Magento\Framework\View\Element\Template
      * Retrieve table column object list
      *
      * @return \Magento\Wishlist\Block\Customer\Wishlist\Item\Column[]
-     * @since 2.0.0
      */
     public function getColumns()
     {
diff --git a/app/code/Magento/Wishlist/Block/Item/Configure.php b/app/code/Magento/Wishlist/Block/Item/Configure.php
index a0fce46831ae0..1a47bdfc5d087 100644
--- a/app/code/Magento/Wishlist/Block/Item/Configure.php
+++ b/app/code/Magento/Wishlist/Block/Item/Configure.php
@@ -14,7 +14,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Configure extends \Magento\Framework\View\Element\Template
 {
@@ -22,7 +21,6 @@ class Configure extends \Magento\Framework\View\Element\Template
      * Wishlist data
      *
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistData = null;
 
@@ -30,7 +28,6 @@ class Configure extends \Magento\Framework\View\Element\Template
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry = null;
 
@@ -39,7 +36,6 @@ class Configure extends \Magento\Framework\View\Element\Template
      * @param \Magento\Wishlist\Helper\Data $wishlistData
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +52,6 @@ public function __construct(
      * Return wishlist widget options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getWishlistOptions()
     {
@@ -67,7 +62,6 @@ public function getWishlistOptions()
      * Returns product being edited
      *
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -78,7 +72,6 @@ public function getProduct()
      * Get update params for http post
      *
      * @return bool|string
-     * @since 2.0.0
      */
     public function getUpdateParams()
     {
@@ -89,7 +82,6 @@ public function getUpdateParams()
      * Returns wishlist item being configured
      *
      * @return \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item
-     * @since 2.0.0
      */
     protected function getWishlistItem()
     {
@@ -100,7 +92,6 @@ protected function getWishlistItem()
      * Configure product view blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Wishlist/Block/Link.php b/app/code/Magento/Wishlist/Block/Link.php
index 4de2396336064..4ebaeb7fb6c5b 100644
--- a/app/code/Magento/Wishlist/Block/Link.php
+++ b/app/code/Magento/Wishlist/Block/Link.php
@@ -16,7 +16,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Html\Link implements SortLinkInterface
 {
@@ -24,13 +23,11 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements SortLink
      * Template name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'Magento_Wishlist::link.phtml';
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistHelper;
 
@@ -38,7 +35,6 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements SortLink
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Wishlist\Helper\Data $wishlistHelper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -63,7 +58,6 @@ protected function _toHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -72,7 +66,6 @@ public function getHref()
 
     /**
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
index 56fdbeaefbff8..bcee2a0d4e242 100644
--- a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
+++ b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -14,19 +14,16 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @since 2.0.0
  */
 class EmailLink extends Link
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'rss/email.phtml';
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index aca14e831e925..4bb62d1ce8fff 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -11,25 +11,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
-     * @since 2.0.0
      */
     protected $rssUrlBuilder;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
@@ -39,7 +35,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Rss\UrlBuilderInterface $rssUrlBuilder
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getLink()
     {
@@ -67,7 +61,6 @@ public function getLink()
      * Check whether status notification is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllowed()
     {
@@ -79,7 +72,6 @@ public function isRssAllowed()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index 6c4184165e794..4612fbe2e48c1 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Items extends \Magento\Wishlist\Block\AbstractBlock
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_template = 'email/items.phtml';
 
@@ -29,7 +27,6 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($product, $additional = [])
     {
@@ -43,7 +40,6 @@ public function getProductUrl($product, $additional = [])
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($product, $additional = [])
     {
@@ -57,7 +53,6 @@ public function getAddToCartUrl($product, $additional = [])
      *
      * @param \Magento\Wishlist\Model\Item $item
      * @return bool
-     * @since 2.0.0
      */
     public function hasDescription($item)
     {
diff --git a/app/code/Magento/Wishlist/Block/Share/Wishlist.php b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
index 29e5291094bc2..a383e832c8611 100644
--- a/app/code/Magento/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
 {
@@ -21,13 +20,11 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      * Customer instance
      *
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $_customer = null;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $customerRepository;
 
@@ -36,7 +33,6 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -57,7 +53,6 @@ public function __construct(
      *
      * @return $this
      *
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -70,7 +65,6 @@ protected function _prepareLayout()
      * Retrieve Shared Wishlist Customer instance
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getWishlistCustomer()
     {
@@ -85,7 +79,6 @@ public function getWishlistCustomer()
      * Retrieve Page Header
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/Wishlist/Controller/AbstractIndex.php b/app/code/Magento/Wishlist/Controller/AbstractIndex.php
index 9722b402b5495..4242240277b5a 100644
--- a/app/code/Magento/Wishlist/Controller/AbstractIndex.php
+++ b/app/code/Magento/Wishlist/Controller/AbstractIndex.php
@@ -11,7 +11,6 @@
 /**
  * Class AbstractIndex
  * @package Magento\Wishlist\Controller\Index
- * @since 2.0.0
  */
 abstract class AbstractIndex extends Action\Action implements IndexInterface
 {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 2c59a442ba135..811f1087fc639 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -14,25 +14,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Add extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -48,7 +44,6 @@ class Add extends \Magento\Wishlist\Controller\AbstractIndex
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param ProductRepositoryInterface $productRepository
      * @param Validator $formKeyValidator
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -72,7 +67,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
index b29afed91602f..d5303c76f4f66 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
@@ -15,25 +15,21 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\Allcart
  *
- * @since 2.0.0
  */
 class Allcart extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Wishlist\Model\ItemCarrier
-     * @since 2.0.0
      */
     protected $itemCarrier;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $formKeyValidator;
 
@@ -42,7 +38,6 @@ class Allcart extends \Magento\Wishlist\Controller\AbstractIndex
      * @param WishlistProviderInterface $wishlistProvider
      * @param Validator $formKeyValidator
      * @param ItemCarrier $itemCarrier
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * Add all items from wishlist to shopping cart
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index 5191c973148c3..80f5d319d2fc4 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -11,61 +11,51 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Cart extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Wishlist\Model\LocaleQuantityProcessor
-     * @since 2.0.0
      */
     protected $quantityProcessor;
 
     /**
      * @var \Magento\Wishlist\Model\ItemFactory
-     * @since 2.0.0
      */
     protected $itemFactory;
 
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var \Magento\Wishlist\Model\Item\OptionFactory
-     * @since 2.0.0
      */
     private $optionFactory;
 
     /**
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $productHelper;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
@@ -88,7 +78,6 @@ class Cart extends \Magento\Wishlist\Controller\AbstractIndex
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -126,7 +115,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index b808926142287..7e6f4d3ed7939 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -11,7 +11,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Configure extends \Magento\Wishlist\Controller\AbstractIndex
 {
@@ -19,19 +18,16 @@ class Configure extends \Magento\Wishlist\Controller\AbstractIndex
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
-     * @since 2.0.0
      */
     protected $resultPageFactory;
 
@@ -40,7 +36,6 @@ class Configure extends \Magento\Wishlist\Controller\AbstractIndex
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
index 9224d113b0aa6..d3fe0a757fb55 100644
--- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\DownloadCustomOption
  *
- * @since 2.0.0
  */
 class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
-     * @since 2.0.0
      */
     protected $_fileResponseFactory;
 
@@ -36,7 +34,6 @@ class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
      * @param Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileResponseFactory
      * @param Json|null $json
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -54,7 +51,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\Result\Forward
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index cf07e88c274af..ead27e035abb2 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -19,37 +19,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Fromcart extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var WishlistHelper
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
     /**
      * @var CheckoutCart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @var CartHelper
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -67,7 +61,6 @@ class Fromcart extends \Magento\Wishlist\Controller\AbstractIndex
      * @param CartHelper $cartHelper
      * @param Escaper $escaper
      * @param Validator $formKeyValidator
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -93,7 +86,6 @@ public function __construct(
      * @return \Magento\Framework\Controller\Result\Redirect
      * @throws NotFoundException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Index.php b/app/code/Magento/Wishlist/Controller/Index/Index.php
index 8f074bde9fc34..461e36656e2f2 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Index.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Index.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      *
      * @return \Magento\Framework\View\Result\Page
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Plugin.php b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
index 0cd6f19ab91f4..96e8bb1a10f32 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Plugin.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\Plugin
  *
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Wishlist\Model\AuthenticationStateInterface
-     * @since 2.0.0
      */
     protected $authenticationState;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirector;
 
@@ -48,7 +43,6 @@ class Plugin
      * @param \Magento\Wishlist\Model\AuthenticationStateInterface $authenticationState
      * @param ScopeConfigInterface $config
      * @param RedirectInterface $redirector
-     * @since 2.0.0
      */
     public function __construct(
         CustomerSession $customerSession,
@@ -69,7 +63,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return void
      * @throws \Magento\Framework\Exception\NotFoundException
-     * @since 2.0.0
      */
     public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request)
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
index de6c1a7ba08b3..8b586f7a00de2 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Remove.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -13,13 +13,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Remove extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
@@ -33,7 +31,6 @@ class Remove extends \Magento\Wishlist\Controller\AbstractIndex
      * @param Action\Context $context
      * @param WishlistProviderInterface $wishlistProvider
      * @param Validator $formKeyValidator
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -50,7 +47,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\Result\Redirect
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index fe3b575bb9102..c2389af6a2282 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -16,67 +16,56 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Send extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerHelperView;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
     /**
      * @var \Magento\Framework\Mail\Template\TransportBuilder
-     * @since 2.0.0
      */
     protected $_transportBuilder;
 
     /**
      * @var \Magento\Wishlist\Model\Config
-     * @since 2.0.0
      */
     protected $_wishlistConfig;
 
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var WishlistSession
-     * @since 2.0.0
      */
     protected $wishlistSession;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var StoreManagerInterface
-     * @since 2.0.0
      */
     protected $storeManager;
 
@@ -93,7 +82,6 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -129,7 +117,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -263,7 +250,6 @@ public function execute()
      *
      * @param \Magento\Framework\View\Result\Layout $resultLayout
      * @return void
-     * @since 2.0.0
      */
     protected function addLayoutHandles(ResultLayout $resultLayout)
     {
@@ -279,7 +265,6 @@ protected function addLayoutHandles(ResultLayout $resultLayout)
      * @param int $wishlistId
      * @param \Magento\Framework\View\Result\Layout $resultLayout
      * @return mixed
-     * @since 2.0.0
      */
     protected function getRssLink($wishlistId, ResultLayout $resultLayout)
     {
@@ -296,7 +281,6 @@ protected function getRssLink($wishlistId, ResultLayout $resultLayout)
      *
      * @param \Magento\Framework\View\Result\Layout $resultLayout
      * @return string
-     * @since 2.0.0
      */
     protected function getWishlistItems(ResultLayout $resultLayout)
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Share.php b/app/code/Magento/Wishlist/Controller/Index/Share.php
index 1b764abdaac99..52c9efef17fae 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Share.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Share.php
@@ -11,20 +11,17 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\Share
  *
- * @since 2.0.0
  */
 class Share extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -38,7 +35,6 @@ public function __construct(
      * Prepare wishlist for share
      *
      * @return void|\Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 6528da8dbb657..ea8a5b34b89e7 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Wishlist\Controller\Index\Update
  *
- * @since 2.0.0
  */
 class Update extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
-     * @since 2.0.0
      */
     protected $_formKeyValidator;
 
     /**
      * @var \Magento\Wishlist\Model\LocaleQuantityProcessor
-     * @since 2.0.0
      */
     protected $quantityProcessor;
 
@@ -39,7 +35,6 @@ class Update extends \Magento\Wishlist\Controller\AbstractIndex
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -60,7 +55,6 @@ public function __construct(
      * @throws NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index 2c7a0630c4d15..98aa2d4518793 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -15,25 +15,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UpdateItemOptions extends \Magento\Wishlist\Controller\AbstractIndex
 {
     /**
      * @var WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -49,7 +45,6 @@ class UpdateItemOptions extends \Magento\Wishlist\Controller\AbstractIndex
      * @param WishlistProviderInterface $wishlistProvider
      * @param ProductRepositoryInterface $productRepository
      * @param Validator $formKeyValidator
-     * @since 2.0.0
      */
     public function __construct(
         Action\Context $context,
@@ -69,7 +64,6 @@ public function __construct(
      * Action to accept new configuration for a wishlist item
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/IndexInterface.php b/app/code/Magento/Wishlist/Controller/IndexInterface.php
index b79c022efb92b..8954996ab1173 100644
--- a/app/code/Magento/Wishlist/Controller/IndexInterface.php
+++ b/app/code/Magento/Wishlist/Controller/IndexInterface.php
@@ -11,7 +11,6 @@
 /**
  * Interface \Magento\Wishlist\Controller\IndexInterface
  *
- * @since 2.0.0
  */
 interface IndexInterface extends \Magento\Framework\App\ActionInterface, ViewInterface
 {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 4e7b963e4c3cd..8a8767e899b27 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Wishlist\Controller\Shared\Allcart
  *
- * @since 2.0.0
  */
 class Allcart extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var WishlistProvider
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Wishlist\Model\ItemCarrier
-     * @since 2.0.0
      */
     protected $itemCarrier;
 
@@ -32,7 +29,6 @@ class Allcart extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param WishlistProvider $wishlistProvider
      * @param ItemCarrier $itemCarrier
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * Add all items from wishlist to shopping cart
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 8951316bd4d03..b41b51057636f 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -19,37 +19,31 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Cart extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var CustomerCart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @var OptionFactory
-     * @since 2.0.0
      */
     protected $optionFactory;
 
     /**
      * @var ItemFactory
-     * @since 2.0.0
      */
     protected $itemFactory;
 
     /**
      * @var CartHelper
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
@@ -60,7 +54,6 @@ class Cart extends \Magento\Framework\App\Action\Action
      * @param ItemFactory $itemFactory
      * @param CartHelper $cartHelper
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         ActionContext $context,
@@ -85,7 +78,6 @@ public function __construct(
      * to product view page with message about needed defined required options
      *
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Index.php b/app/code/Magento/Wishlist/Controller/Shared/Index.php
index b455f7cd0ae7f..39ee0bd43975f 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Index.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Index.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Wishlist\Controller\Shared\Index
  *
- * @since 2.0.0
  */
 class Index extends Action
 {
@@ -20,19 +19,16 @@ class Index extends Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry = null;
 
     /**
      * @var WishlistProvider
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
@@ -41,7 +37,6 @@ class Index extends Action
      * @param WishlistProvider $wishlistProvider
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Customer\Model\Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -59,7 +54,6 @@ public function __construct(
      * Shared wishlist view page
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/WishlistProvider.php b/app/code/Magento/Wishlist/Controller/Shared/WishlistProvider.php
index 2ff0071daaebe..6cb489625dfb3 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/WishlistProvider.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/WishlistProvider.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Wishlist\Controller\Shared\WishlistProvider
  *
- * @since 2.0.0
  */
 class WishlistProvider implements WishlistProviderInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Wishlist\Model\WishlistFactory
-     * @since 2.0.0
      */
     protected $wishlistFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $wishlist;
 
@@ -43,7 +38,6 @@ class WishlistProvider implements WishlistProviderInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -59,7 +53,6 @@ public function __construct(
      * Retrieve current wishlist
      * @param string $wishlistId
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlist($wishlistId = null)
     {
diff --git a/app/code/Magento/Wishlist/Controller/WishlistProvider.php b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
index eebfbc181f7a5..193021eea68b4 100644
--- a/app/code/Magento/Wishlist/Controller/WishlistProvider.php
+++ b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
@@ -11,37 +11,31 @@
 /**
  * Class \Magento\Wishlist\Controller\WishlistProvider
  *
- * @since 2.0.0
  */
 class WishlistProvider implements WishlistProviderInterface
 {
     /**
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $wishlist;
 
     /**
      * @var \Magento\Wishlist\Model\WishlistFactory
-     * @since 2.0.0
      */
     protected $wishlistFactory;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -50,7 +44,6 @@ class WishlistProvider implements WishlistProviderInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
@@ -67,7 +60,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getWishlist($wishlistId = null)
     {
diff --git a/app/code/Magento/Wishlist/Controller/WishlistProviderInterface.php b/app/code/Magento/Wishlist/Controller/WishlistProviderInterface.php
index 3a24e3a0c735a..0b74c0a01a36d 100644
--- a/app/code/Magento/Wishlist/Controller/WishlistProviderInterface.php
+++ b/app/code/Magento/Wishlist/Controller/WishlistProviderInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Wishlist\Controller\WishlistProviderInterface
  *
- * @since 2.0.0
  */
 interface WishlistProviderInterface
 {
@@ -18,7 +17,6 @@ interface WishlistProviderInterface
      *
      * @param string $wishlistId
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlist($wishlistId = null);
 }
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index 8fe8a58adec6e..a81b3d6537dfd 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -9,7 +9,6 @@
 
 /**
  * Wishlist section
- * @since 2.0.0
  */
 class Wishlist implements SectionSourceInterface
 {
@@ -20,25 +19,21 @@ class Wishlist implements SectionSourceInterface
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
     /**
      * @var \Magento\Catalog\Helper\ImageFactory
-     * @since 2.0.0
      */
     protected $imageHelperFactory;
 
     /**
      * @var \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     protected $view;
 
     /**
      * @var \Magento\Wishlist\Block\Customer\Sidebar
-     * @since 2.0.0
      */
     protected $block;
 
@@ -47,7 +42,6 @@ class Wishlist implements SectionSourceInterface
      * @param \Magento\Wishlist\Block\Customer\Sidebar $block
      * @param \Magento\Catalog\Helper\ImageFactory $imageHelperFactory
      * @param \Magento\Framework\App\ViewInterface $view
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Wishlist\Helper\Data $wishlistHelper,
@@ -63,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSectionData()
     {
@@ -76,7 +69,6 @@ public function getSectionData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getCounter()
     {
@@ -88,7 +80,6 @@ protected function getCounter()
      *
      * @param int $count
      * @return \Magento\Framework\Phrase|null
-     * @since 2.0.0
      */
     protected function createCounter($count)
     {
@@ -104,7 +95,6 @@ protected function createCounter($count)
      * Get wishlist items
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getItems()
     {
@@ -126,7 +116,6 @@ protected function getItems()
      *
      * @param \Magento\Wishlist\Model\Item $wishlistItem
      * @return array
-     * @since 2.0.0
      */
     protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
     {
@@ -154,7 +143,6 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Block\Product\Image
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function getImageData($product)
     {
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 553bebbd06007..33fe12ee35709 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -15,7 +15,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -33,7 +32,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Currently logged in customer
      *
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $_currentCustomer;
 
@@ -41,7 +39,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Customer Wishlist instance
      *
      * @var \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected $_wishlist;
 
@@ -49,7 +46,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Wishlist Product Items Collection
      *
      * @var \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected $_productCollection;
 
@@ -57,7 +53,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Wishlist Items Collection
      *
      * @var \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected $_wishlistItemCollection;
 
@@ -65,49 +60,41 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_coreRegistry;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $_customerSession;
 
     /**
      * @var \Magento\Wishlist\Model\WishlistFactory
-     * @since 2.0.0
      */
     protected $_wishlistFactory;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Data\Helper\PostHelper
-     * @since 2.0.0
      */
     protected $_postDataHelper;
 
     /**
      * @var \Magento\Customer\Helper\View
-     * @since 2.0.0
      */
     protected $_customerViewHelper;
 
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
-     * @since 2.0.0
      */
     protected $wishlistProvider;
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -121,7 +108,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param WishlistProviderInterface $wishlistProvider
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -149,7 +135,6 @@ public function __construct(
      * Retrieve customer login status
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCustomerLogIn()
     {
@@ -160,7 +145,6 @@ protected function _isCustomerLogIn()
      * Retrieve logged in customer
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected function _getCurrentCustomer()
     {
@@ -172,7 +156,6 @@ protected function _getCurrentCustomer()
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return void
-     * @since 2.0.0
      */
     public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
@@ -183,7 +166,6 @@ public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $custom
      * Retrieve current customer
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -197,7 +179,6 @@ public function getCustomer()
      * Retrieve wishlist by logged in customer
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlist()
     {
@@ -216,7 +197,6 @@ public function getWishlist()
      * Used in top link menu only
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemCount()
     {
@@ -246,7 +226,6 @@ public function getItemCount()
      * Create wishlist item collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected function _createWishlistItemCollection()
     {
@@ -257,7 +236,6 @@ protected function _createWishlistItemCollection()
      * Retrieve wishlist items collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     public function getWishlistItemCollection()
     {
@@ -272,7 +250,6 @@ public function getWishlistItemCollection()
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected function _getUrlStore($item)
     {
@@ -301,7 +278,6 @@ protected function _getUrlStore($item)
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @param bool $addReferer
      * @return string
-     * @since 2.0.0
      */
     public function getRemoveParams($item, $addReferer = false)
     {
@@ -318,7 +294,6 @@ public function getRemoveParams($item, $addReferer = false)
      *
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return string
-     * @since 2.0.0
      */
     public function getConfigureUrl($item)
     {
@@ -337,7 +312,6 @@ public function getConfigureUrl($item)
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getAddParams($item, array $params = [])
     {
@@ -363,7 +337,6 @@ public function getAddParams($item, array $params = [])
      * @param int $itemId
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMoveFromCartParams($itemId)
     {
@@ -378,7 +351,6 @@ public function getMoveFromCartParams($itemId)
      * @param \Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      *
      * @return  string|false
-     * @since 2.0.0
      */
     public function getUpdateParams($item)
     {
@@ -406,7 +378,6 @@ public function getUpdateParams($item)
      *
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return  string
-     * @since 2.0.0
      */
     public function getAddToCartUrl($item)
     {
@@ -419,7 +390,6 @@ public function getAddToCartUrl($item)
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @param bool $addReferer
      * @return string
-     * @since 2.0.0
      */
     public function getAddToCartParams($item, $addReferer = false)
     {
@@ -438,7 +408,6 @@ public function getAddToCartParams($item, $addReferer = false)
      *
      * @param array $params
      * @return array
-     * @since 2.0.0
      */
     public function addRefererToParams(array $params)
     {
@@ -452,7 +421,6 @@ public function addRefererToParams(array $params)
      *
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return  string
-     * @since 2.0.0
      */
     public function getSharedAddToCartUrl($item)
     {
@@ -466,7 +434,6 @@ public function getSharedAddToCartUrl($item)
      * Retrieve URL for adding All items to shopping cart from shared wishlist
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSharedAddAllToCartUrl()
     {
@@ -478,7 +445,6 @@ public function getSharedAddAllToCartUrl()
     /**
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return array
-     * @since 2.0.0
      */
     protected function _getCartUrlParameters($item)
     {
@@ -496,7 +462,6 @@ protected function _getCartUrlParameters($item)
      *
      * @param int $wishlistId
      * @return string
-     * @since 2.0.0
      */
     public function getListUrl($wishlistId = null)
     {
@@ -511,7 +476,6 @@ public function getListUrl($wishlistId = null)
      * Check is allow wishlist module
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllow()
     {
@@ -529,7 +493,6 @@ public function isAllow()
      * Check is allow wishlist action in shopping cart
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowInCart()
     {
@@ -540,7 +503,6 @@ public function isAllowInCart()
      * Retrieve customer name
      *
      * @return string|void
-     * @since 2.0.0
      */
     public function getCustomerName()
     {
@@ -554,7 +516,6 @@ public function getCustomerName()
      *
      * @param int|string|null $wishlistId
      * @return string
-     * @since 2.0.0
      */
     public function getRssUrl($wishlistId = null)
     {
@@ -573,7 +534,6 @@ public function getRssUrl($wishlistId = null)
      * Retrieve default empty comment message
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function defaultCommentString()
     {
@@ -584,7 +544,6 @@ public function defaultCommentString()
      * Retrieve default empty comment message
      *
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function getDefaultWishlistName()
     {
@@ -597,7 +556,6 @@ public function getDefaultWishlistName()
      * Depends from configuration.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function calculate()
     {
@@ -635,7 +593,6 @@ public function calculate()
      * Should display item quantities in my wishlist link
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayQty()
     {
@@ -651,7 +608,6 @@ public function isDisplayQty()
      * @param  \Magento\Wishlist\Model\Item|\Magento\Catalog\Model\Product $item
      * @param  array $additional
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl($item, $additional = [])
     {
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index b5fe115d6f5f2..b3ff3a9b68a1e 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -10,25 +10,21 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Rss extends \Magento\Wishlist\Helper\Data
 {
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     protected $_customer;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
-     * @since 2.0.0
      */
     protected $_customerFactory;
 
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
-     * @since 2.0.0
      */
     protected $_customerRepository;
 
@@ -45,7 +41,6 @@ class Rss extends \Magento\Wishlist\Helper\Data
      * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -80,7 +75,6 @@ public function __construct(
      * Retrieve Wishlist model
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     public function getWishlist()
     {
@@ -103,7 +97,6 @@ public function getWishlist()
      * Retrieve Customer instance
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @since 2.0.0
      */
     public function getCustomer()
     {
@@ -125,7 +118,6 @@ public function getCustomer()
      * Is allow RSS
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRssAllow()
     {
diff --git a/app/code/Magento/Wishlist/Model/AuthenticationState.php b/app/code/Magento/Wishlist/Model/AuthenticationState.php
index 7123a658d5a83..e9c82736bb5e1 100644
--- a/app/code/Magento/Wishlist/Model/AuthenticationState.php
+++ b/app/code/Magento/Wishlist/Model/AuthenticationState.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Wishlist\Model\AuthenticationState
  *
- * @since 2.0.0
  */
 class AuthenticationState implements AuthenticationStateInterface
 {
@@ -17,7 +16,6 @@ class AuthenticationState implements AuthenticationStateInterface
      * Is authentication enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
diff --git a/app/code/Magento/Wishlist/Model/AuthenticationStateInterface.php b/app/code/Magento/Wishlist/Model/AuthenticationStateInterface.php
index e94c134f8f4c7..2c93097d1c3e1 100644
--- a/app/code/Magento/Wishlist/Model/AuthenticationStateInterface.php
+++ b/app/code/Magento/Wishlist/Model/AuthenticationStateInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Wishlist\Model\AuthenticationStateInterface
  *
- * @since 2.0.0
  */
 interface AuthenticationStateInterface
 {
@@ -17,7 +16,6 @@ interface AuthenticationStateInterface
      * Is authentication enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled();
 }
diff --git a/app/code/Magento/Wishlist/Model/Config.php b/app/code/Magento/Wishlist/Model/Config.php
index 918a07f864571..7efca17734082 100644
--- a/app/code/Magento/Wishlist/Model/Config.php
+++ b/app/code/Magento/Wishlist/Model/Config.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -21,13 +20,11 @@ class Config
 
     /**
      * @var \Magento\Catalog\Model\Config
-     * @since 2.0.0
      */
     private $_catalogConfig;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
-     * @since 2.0.0
      */
     private $_attributeConfig;
 
@@ -35,7 +32,6 @@ class Config
      * Number of emails allowed for sharing wishlist
      *
      * @var int
-     * @since 2.0.0
      */
     private $_sharingEmailLimit;
 
@@ -43,7 +39,6 @@ class Config
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Catalog\Model\Config $catalogConfig
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -68,7 +63,6 @@ public function __construct(
      * Get product attributes that need in wishlist
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductAttributes()
     {
@@ -81,7 +75,6 @@ public function getProductAttributes()
      * Retrieve number of emails allowed for sharing wishlist
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSharingEmailLimit()
     {
@@ -92,7 +85,6 @@ public function getSharingEmailLimit()
      * Retrieve maximum length of sharing email text
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSharingTextLimit()
     {
diff --git a/app/code/Magento/Wishlist/Model/Config/Source/Summary.php b/app/code/Magento/Wishlist/Model/Config/Source/Summary.php
index 7f2635c8a8c4e..698331a595e8c 100644
--- a/app/code/Magento/Wishlist/Model/Config/Source/Summary.php
+++ b/app/code/Magento/Wishlist/Model/Config/Source/Summary.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Wishlist\Model\Config\Source\Summary
  *
- * @since 2.0.0
  */
 class Summary implements \Magento\Framework\Option\ArrayInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index 552348bc72395..67689ab79b9fb 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -32,14 +32,12 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Item extends AbstractModel implements ItemInterface
 {
     /**
      * Custom path to download attached file
      * @var string
-     * @since 2.0.0
      */
     protected $_customOptionDownloadUrl = 'wishlist/index/downloadCustomOption';
 
@@ -47,7 +45,6 @@ class Item extends AbstractModel implements ItemInterface
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'wishlist_item';
 
@@ -57,7 +54,6 @@ class Item extends AbstractModel implements ItemInterface
      * In observe method you can use $observer->getEvent()->getItem() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'item';
 
@@ -65,7 +61,6 @@ class Item extends AbstractModel implements ItemInterface
      * Item options array
      *
      * @var Option[]
-     * @since 2.0.0
      */
     protected $_options = [];
 
@@ -73,7 +68,6 @@ class Item extends AbstractModel implements ItemInterface
      * Item options by code cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByCode = [];
 
@@ -81,7 +75,6 @@ class Item extends AbstractModel implements ItemInterface
      * Not Represent options
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_notRepresentOptions = ['info_buyRequest'];
 
@@ -89,49 +82,41 @@ class Item extends AbstractModel implements ItemInterface
      * Flag stating that options were successfully saved
      *
      * @var bool|null
-     * @since 2.0.0
      */
     protected $_flagOptionsSaved = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Url
-     * @since 2.0.0
      */
     protected $_catalogUrl;
 
     /**
      * @var OptionFactory
-     * @since 2.0.0
      */
     protected $_wishlistOptFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_wishlOptionCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
-     * @since 2.0.0
      */
     protected $productTypeConfig;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -158,7 +143,6 @@ class Item extends AbstractModel implements ItemInterface
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -191,7 +175,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -203,7 +186,6 @@ protected function _construct()
      *
      * @param int $qty
      * @return $this
-     * @since 2.0.0
      */
     public function setQty($qty)
     {
@@ -215,7 +197,6 @@ public function setQty($qty)
      * Retrieve resource instance wrapper
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -228,7 +209,6 @@ protected function _getResource()
      * @param array $options1
      * @param array $options2
      * @return bool
-     * @since 2.0.0
      */
     protected function _compareOptions($options1, $options2)
     {
@@ -250,7 +230,6 @@ protected function _compareOptions($options1, $options2)
      * @param   Option $option
      * @return  $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _addOptionCode($option)
     {
@@ -269,7 +248,6 @@ protected function _addOptionCode($option)
      * Call save item options if model isn't need to save in DB
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _hasModelChanged()
     {
@@ -284,7 +262,6 @@ protected function _hasModelChanged()
      * Save item options
      *
      * @return $this
-     * @since 2.0.0
      */
     public function saveItemOptions()
     {
@@ -309,7 +286,6 @@ public function saveItemOptions()
      *
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     public function setIsOptionsSaved($flag)
     {
@@ -320,7 +296,6 @@ public function setIsOptionsSaved($flag)
      * Were options saved?
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOptionsSaved()
     {
@@ -331,7 +306,6 @@ public function isOptionsSaved()
      * Save item options after item saved
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -344,7 +318,6 @@ public function afterSave()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validate()
     {
@@ -362,7 +335,6 @@ public function validate()
      * Check required data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -391,7 +363,6 @@ public function beforeSave()
      * @param int $productId
      * @param array $sharedStores
      * @return $this
-     * @since 2.0.0
      */
     public function loadByProductWishlist($wishlistId, $productId, $sharedStores)
     {
@@ -407,7 +378,6 @@ public function loadByProductWishlist($wishlistId, $productId, $sharedStores)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -442,7 +412,6 @@ public function getProduct()
      * @param bool $delete  delete the item after successful add to cart
      * @return bool
      * @throws \Magento\Catalog\Model\Product\Exception
-     * @since 2.0.0
      */
     public function addToCart(\Magento\Checkout\Model\Cart $cart, $delete = false)
     {
@@ -493,7 +462,6 @@ public function addToCart(\Magento\Checkout\Model\Cart $cart, $delete = false)
      * If product has required options add special key to URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProductUrl()
     {
@@ -512,7 +480,6 @@ public function getProductUrl()
      * product view page with keys and options for configured product
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getBuyRequest()
     {
@@ -533,7 +500,6 @@ public function getBuyRequest()
      *
      * @param array|\Magento\Framework\DataObject $buyRequest
      * @return $this
-     * @since 2.0.0
      */
     public function mergeBuyRequest($buyRequest)
     {
@@ -564,7 +530,6 @@ public function mergeBuyRequest($buyRequest)
      *
      * @param \Magento\Framework\DataObject $buyRequest
      * @return $this
-     * @since 2.0.0
      */
     public function setBuyRequest($buyRequest)
     {
@@ -581,7 +546,6 @@ public function setBuyRequest($buyRequest)
      * @param   \Magento\Catalog\Model\Product $product
      * @param   \Magento\Framework\DataObject $buyRequest
      * @return  bool
-     * @since 2.0.0
      */
     public function isRepresent($product, $buyRequest)
     {
@@ -618,7 +582,6 @@ public function isRepresent($product, $buyRequest)
      *
      * @param   \Magento\Catalog\Model\Product $product
      * @return  bool
-     * @since 2.0.0
      */
     public function representProduct($product)
     {
@@ -647,7 +610,6 @@ public function representProduct($product)
      * @param array $options1
      * @param array $options2
      * @return bool
-     * @since 2.0.0
      */
     public function compareOptions($options1, $options2)
     {
@@ -668,7 +630,6 @@ public function compareOptions($options1, $options2)
      *
      * @param   array $options
      * @return  $this
-     * @since 2.0.0
      */
     public function setOptions($options)
     {
@@ -682,7 +643,6 @@ public function setOptions($options)
      * Get all item options
      *
      * @return Option[]
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -693,7 +653,6 @@ public function getOptions()
      * Get all item options as array with codes in array key
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByCode()
     {
@@ -706,7 +665,6 @@ public function getOptionsByCode()
      * @param   Option|\Magento\Framework\DataObject|array $option
      * @return  $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function addOption($option)
     {
@@ -737,7 +695,6 @@ public function addOption($option)
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function removeOption($code)
     {
@@ -753,7 +710,6 @@ public function removeOption($code)
      *
      * @param   string $code
      * @return  Option|null
-     * @since 2.0.0
      */
     public function getOptionByCode($code)
     {
@@ -767,7 +723,6 @@ public function getOptionByCode($code)
      * Returns whether Qty field is valid for this item
      *
      * @return bool
-     * @since 2.0.0
      */
     public function canHaveQty()
     {
@@ -779,7 +734,6 @@ public function canHaveQty()
      * Get current custom option download url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomDownloadUrl()
     {
@@ -791,7 +745,6 @@ public function getCustomDownloadUrl()
      *
      * @param string $url
      * @return void
-     * @since 2.0.0
      */
     public function setCustomDownloadUrl($url)
     {
@@ -805,7 +758,6 @@ public function setCustomDownloadUrl($url)
      * We have to customize only controller url, so return it.
      *
      * @return null|\Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFileDownloadParams()
     {
@@ -823,7 +775,6 @@ public function getFileDownloadParams()
      * @param null|string|array $optionsFilter
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadWithOptions($id, $optionsFilter = null)
     {
diff --git a/app/code/Magento/Wishlist/Model/Item/Option.php b/app/code/Magento/Wishlist/Model/Item/Option.php
index efa314a477341..26c9a8bc3ba28 100644
--- a/app/code/Magento/Wishlist/Model/Item/Option.php
+++ b/app/code/Magento/Wishlist/Model/Item/Option.php
@@ -14,26 +14,22 @@
  * @method int getProductId()
  *
  * @api
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\AbstractModel implements
     \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
 {
     /**
      * @var Item
-     * @since 2.0.0
      */
     protected $_item;
 
     /**
      * @var Product|null
-     * @since 2.0.0
      */
     protected $_product;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -44,7 +40,6 @@ class Option extends \Magento\Framework\Model\AbstractModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -62,7 +57,6 @@ public function __construct(
      * Initialize resource model
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -73,7 +67,6 @@ protected function _construct()
      * Checks that item option model has data changes
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _hasModelChanged()
     {
@@ -89,7 +82,6 @@ protected function _hasModelChanged()
      *
      * @param   Item $item
      * @return  $this
-     * @since 2.0.0
      */
     public function setItem($item)
     {
@@ -102,7 +94,6 @@ public function setItem($item)
      * Get option item
      *
      * @return Item
-     * @since 2.0.0
      */
     public function getItem()
     {
@@ -114,7 +105,6 @@ public function getItem()
      *
      * @param   Product $product
      * @return  $this
-     * @since 2.0.0
      */
     public function setProduct($product)
     {
@@ -127,7 +117,6 @@ public function setProduct($product)
      * Get option product
      *
      * @return Product
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -142,7 +131,6 @@ public function getProduct()
      * Get option value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -153,7 +141,6 @@ public function getValue()
      * Initialize item identifier before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -167,7 +154,6 @@ public function beforeSave()
      * Clone option object
      *
      * @return $this
-     * @since 2.0.0
      */
     public function __clone()
     {
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index c0cfe6acbb939..6cf295084eca8 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -19,61 +19,51 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ItemCarrier
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var LocaleQuantityProcessor
-     * @since 2.0.0
      */
     protected $quantityProcessor;
 
     /**
      * @var \Magento\Checkout\Model\Cart
-     * @since 2.0.0
      */
     protected $cart;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Checkout\Helper\Cart
-     * @since 2.0.0
      */
     protected $cartHelper;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirector;
 
@@ -87,7 +77,6 @@ class ItemCarrier
      * @param UrlInterface $urlBuilder
      * @param MessageManager $messageManager
      * @param RedirectInterface $redirector
-     * @since 2.0.0
      */
     public function __construct(
         Session $customerSession,
@@ -120,7 +109,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function moveAllToCart(Wishlist $wishlist, $qtys)
     {
diff --git a/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php b/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php
index 6a9a7e84240fc..4f3066d704c15 100644
--- a/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php
+++ b/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php
@@ -8,26 +8,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class LocaleQuantityProcessor
 {
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\Filter\LocalizedToNormalized
-     * @since 2.0.0
      */
     protected $localFilter;
 
     /**
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Filter\LocalizedToNormalized $localFilter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
@@ -42,7 +38,6 @@ public function __construct(
      *
      * @param float $qty
      * @return array|string
-     * @since 2.0.0
      */
     public function process($qty)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
index 91c4aa63adb4d..72b6d6057f0d7 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Initialize connection and define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -36,7 +34,6 @@ protected function _construct()
      * @param int $productId
      * @param array $sharedStores
      * @return $this
-     * @since 2.0.0
      */
     public function loadByProductWishlist($object, $wishlistId, $productId, $sharedStores)
     {
@@ -59,7 +56,6 @@ public function loadByProductWishlist($object, $wishlistId, $productId, $sharedS
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index a22b671ec117b..c9ff6d8dc4c0b 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -14,7 +14,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -22,7 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product Visibility Filter to product collection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_productVisible = false;
 
@@ -30,7 +28,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product Salable Filter to product collection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_productSalable = false;
 
@@ -38,7 +35,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * If product out of stock, its item will be removed after load
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_productInStock = false;
 
@@ -46,7 +42,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product Ids array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_productIds = [];
 
@@ -54,7 +49,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Store Ids array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds = [];
 
@@ -62,7 +56,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Add days in wishlist filter of product collection
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_addDaysInWishlist = false;
 
@@ -70,7 +63,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Sum of items collection qty
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_itemsQty;
 
@@ -78,7 +70,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Whether product name attribute value table is joined in select
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_isProductNameJoined = false;
 
@@ -86,7 +77,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Adminhtml sales
      *
      * @var \Magento\Sales\Helper\Admin
-     * @since 2.0.0
      */
     protected $_adminhtmlSales = null;
 
@@ -94,67 +84,56 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Catalog inventory data
      *
      * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     * @since 2.0.0
      */
     protected $stockConfiguration = null;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var \Magento\Wishlist\Model\Config
-     * @since 2.0.0
      */
     protected $_wishlistConfig;
 
     /**
      * @var \Magento\Catalog\Model\Product\Visibility
-     * @since 2.0.0
      */
     protected $_productVisibility;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_coreResource;
 
     /**
      * @var \Magento\Wishlist\Model\ResourceModel\Item\Option\CollectionFactory
-     * @since 2.0.0
      */
     protected $_optionCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     * @since 2.0.0
      */
     protected $_productCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\ConfigFactory
-     * @since 2.0.0
      */
     protected $_catalogConfFactory;
 
     /**
      * @var \Magento\Catalog\Model\Entity\AttributeFactory
-     * @since 2.0.0
      */
     protected $_catalogAttrFactory;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -185,7 +164,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -226,7 +204,6 @@ public function __construct(
      * Initialize resource model for collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function _construct()
     {
@@ -253,7 +230,6 @@ protected function getMetadataPool()
      * After load processing
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -275,7 +251,6 @@ protected function _afterLoad()
      * Add options to items
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignOptions()
     {
@@ -298,7 +273,6 @@ protected function _assignOptions()
      * Add products to items and item options
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _assignProducts()
     {
@@ -359,7 +333,6 @@ protected function _assignProducts()
      *
      * @param \Magento\Wishlist\Model\Wishlist $wishlist
      * @return $this
-     * @since 2.0.0
      */
     public function addWishlistFilter(\Magento\Wishlist\Model\Wishlist $wishlist)
     {
@@ -372,7 +345,6 @@ public function addWishlistFilter(\Magento\Wishlist\Model\Wishlist $wishlist)
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomerIdFilter($customerId)
     {
@@ -392,7 +364,6 @@ public function addCustomerIdFilter($customerId)
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreFilter($storeIds = [])
     {
@@ -409,7 +380,6 @@ public function addStoreFilter($storeIds = [])
      * Add items store data to collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addStoreData()
     {
@@ -426,7 +396,6 @@ public function addStoreData()
      * Reset sort order
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetSortOrder()
     {
@@ -439,7 +408,6 @@ public function resetSortOrder()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setVisibilityFilter($flag = true)
     {
@@ -453,7 +421,6 @@ public function setVisibilityFilter($flag = true)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setSalableFilter($flag = true)
     {
@@ -467,7 +434,6 @@ public function setSalableFilter($flag = true)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setInStockFilter($flag = true)
     {
@@ -479,7 +445,6 @@ public function setInStockFilter($flag = true)
      * Set flag of adding days in wishlist
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addDaysInWishlist()
     {
@@ -494,7 +459,6 @@ public function addDaysInWishlist()
      *
      * @param array $constraints
      * @return $this
-     * @since 2.0.0
      */
     public function addDaysFilter($constraints)
     {
@@ -529,7 +493,6 @@ public function addDaysFilter($constraints)
      * Joins product name attribute value to use it in WHERE and ORDER clauses
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _joinProductNameTable()
     {
@@ -562,7 +525,6 @@ protected function _joinProductNameTable()
      *
      * @param string $productName
      * @return $this
-     * @since 2.0.0
      */
     public function addProductNameFilter($productName)
     {
@@ -577,7 +539,6 @@ public function addProductNameFilter($productName)
      *
      * @param string $dir
      * @return $this
-     * @since 2.0.0
      */
     public function setOrderByProductName($dir)
     {
@@ -590,7 +551,6 @@ public function setOrderByProductName($dir)
      * Get sum of items collection qty
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemsQty()
     {
@@ -607,7 +567,6 @@ public function getItemsQty()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadData()
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php
index 6446bb00b1c6a..36e70e9bdb1af 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php
@@ -13,13 +13,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Grid extends \Magento\Wishlist\Model\ResourceModel\Item\Collection
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registryManager;
 
@@ -45,7 +43,6 @@ class Grid extends \Magento\Wishlist\Model\ResourceModel\Item\Collection
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -95,7 +92,6 @@ public function __construct(
      * Initialize db select
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -112,7 +108,6 @@ protected function _initSelect()
      * @param   string $field
      * @param   string $direction
      * @return  \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -134,7 +129,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
      * @param null|string|array $condition
      * @see self::_getConditionSql for $condition
      * @return \Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
index f85f5f59f3bd3..3047c6a83a97c 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
@@ -13,13 +13,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
index 70018751d889b..d7263f5f59482 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -24,7 +23,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Array of option ids grouped by item id
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByItem = [];
 
@@ -32,7 +30,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Array of option ids grouped by product id
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_optionsByProduct = [];
 
@@ -40,7 +37,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Define resource model for collection
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -54,7 +50,6 @@ protected function _construct()
      * Fill array of options by item and product
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -84,7 +79,6 @@ protected function _afterLoad()
      *
      * @param  int|array|Item $item
      * @return $this
-     * @since 2.0.0
      */
     public function addItemFilter($item)
     {
@@ -106,7 +100,6 @@ public function addItemFilter($item)
      * Get array of all product ids
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProductIds()
     {
@@ -120,7 +113,6 @@ public function getProductIds()
      *
      * @param Item|int|string $item
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByItem($item)
     {
@@ -147,7 +139,6 @@ public function getOptionsByItem($item)
      *
      * @param  Product|int|string $product
      * @return array
-     * @since 2.0.0
      */
     public function getOptionsByProduct($product)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
index ca7c5af25588a..f1ac983b44fb8 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -21,7 +20,6 @@ class Wishlist extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store wishlist items count
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_itemsCount = null;
 
@@ -29,7 +27,6 @@ class Wishlist extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Store customer ID field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_customerIdFieldName = 'customer_id';
 
@@ -37,7 +34,6 @@ class Wishlist extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Set main entity table name and primary key field name
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -51,7 +47,6 @@ protected function _construct()
      * @param mixed $value
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -66,7 +61,6 @@ protected function _getLoadSelect($field, $value, $object)
      * Getter for customer ID field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomerIdFieldName()
     {
@@ -78,7 +72,6 @@ public function getCustomerIdFieldName()
      *
      * @param string $fieldName
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerIdFieldName($fieldName)
     {
@@ -88,7 +81,6 @@ public function setCustomerIdFieldName($fieldName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
index 8947af3e0b4ad..43f4d36324511 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -21,7 +20,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Initialize resource
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -33,7 +31,6 @@ protected function _construct()
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function filterByCustomerId($customerId)
     {
@@ -46,7 +43,6 @@ public function filterByCustomerId($customerId)
      *
      * @param array $customerIds
      * @return $this
-     * @since 2.0.0
      */
     public function filterByCustomerIds(array $customerIds)
     {
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 42d1edc414c90..75df3027ad9a9 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -11,7 +11,6 @@
 /**
  * Wishlist RSS model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Wishlist implements DataProviderInterface
 {
@@ -19,20 +18,17 @@ class Wishlist implements DataProviderInterface
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * System event manager
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
@@ -40,43 +36,36 @@ class Wishlist implements DataProviderInterface
      * Parent layout of the block
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $wishlistHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Output
-     * @since 2.0.0
      */
     protected $outputHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Image
-     * @since 2.0.0
      */
     protected $imageHelper;
 
     /**
      * @var \Magento\Wishlist\Block\Customer\Wishlist
-     * @since 2.0.0
      */
     protected $wishlistBlock;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @since 2.0.0
      */
     protected $customerFactory;
 
@@ -93,7 +82,6 @@ class Wishlist implements DataProviderInterface
      * @param \Magento\Framework\App\RequestInterface $request
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Wishlist\Helper\Rss $wishlistHelper,
@@ -123,7 +111,6 @@ public function __construct(
      * Check if RSS feed allowed
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -137,7 +124,6 @@ public function isAllowed()
      * Get RSS feed items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRssData()
     {
@@ -206,7 +192,6 @@ public function getRssData()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCacheKey()
     {
@@ -215,7 +200,6 @@ public function getCacheKey()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime()
     {
@@ -226,7 +210,6 @@ public function getCacheLifetime()
      * Get data for Header section of RSS feed
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeader()
     {
@@ -245,7 +228,6 @@ public function getHeader()
      * Retrieve Wishlist model
      *
      * @return \Magento\Wishlist\Model\Wishlist
-     * @since 2.0.0
      */
     protected function getWishlist()
     {
@@ -258,7 +240,6 @@ protected function getWishlist()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
-     * @since 2.0.0
      */
     public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
     {
@@ -284,7 +265,6 @@ public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds()
     {
@@ -293,7 +273,6 @@ public function getFeeds()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 7a6abf6bd2125..bb86b3d11edd1 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -28,7 +28,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
- * @since 2.0.0
  */
 class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
@@ -41,7 +40,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'wishlist';
 
@@ -49,7 +47,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Wishlist item collection
      *
      * @var \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     protected $_itemCollection;
 
@@ -57,7 +54,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Store filter for wishlist
      *
      * @var \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     protected $_store;
 
@@ -65,7 +61,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Shared store ids (website stores)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_storeIds;
 
@@ -73,7 +68,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Wishlist data
      *
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $_wishlistData;
 
@@ -81,61 +75,51 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
-     * @since 2.0.0
      */
     protected $_catalogProduct;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
     /**
      * @var ItemFactory
-     * @since 2.0.0
      */
     protected $_wishlistItemFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_wishlistCollectionFactory;
 
     /**
      * @var \Magento\Catalog\Model\ProductFactory
-     * @since 2.0.0
      */
     protected $_productFactory;
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_useCurrentWebsite;
 
     /**
      * @var ProductRepositoryInterface
-     * @since 2.0.0
      */
     protected $productRepository;
 
@@ -166,7 +150,6 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * @param array $data
      * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -208,7 +191,6 @@ public function __construct(
      * @param int $customerId
      * @param bool $create Create wishlist if don't exists
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCustomerId($customerId, $create = false)
     {
@@ -231,7 +213,6 @@ public function loadByCustomerId($customerId, $create = false)
      * Retrieve wishlist name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -246,7 +227,6 @@ public function getName()
      * Set random sharing code
      *
      * @return $this
-     * @since 2.0.0
      */
     public function generateSharingCode()
     {
@@ -259,7 +239,6 @@ public function generateSharingCode()
      *
      * @param string $code
      * @return $this
-     * @since 2.0.0
      */
     public function loadByCode($code)
     {
@@ -275,7 +254,6 @@ public function loadByCode($code)
      * Retrieve sharing code (random string)
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSharingRandomCode()
     {
@@ -286,7 +264,6 @@ protected function _getSharingRandomCode()
      * Set date of last update for wishlist
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -299,7 +276,6 @@ public function beforeSave()
      * Save related items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -319,7 +295,6 @@ public function afterSave()
      * @param   bool $forciblySetQty
      *
      * @return  Item
-     * @since 2.0.0
      */
     protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $qty = 1, $forciblySetQty = false)
     {
@@ -359,7 +334,6 @@ protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $
      * Retrieve wishlist item collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
-     * @since 2.0.0
      */
     public function getItemCollection()
     {
@@ -379,7 +353,6 @@ public function getItemCollection()
      *
      * @param int $itemId
      * @return false|Item
-     * @since 2.0.0
      */
     public function getItem($itemId)
     {
@@ -394,7 +367,6 @@ public function getItem($itemId)
      *
      * @param   Item $item
      * @return  $this
-     * @since 2.0.0
      */
     public function addItem(Item $item)
     {
@@ -417,7 +389,6 @@ public function addItem(Item $item)
      * @return Item|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addNewItem($product, $buyRequest = null, $forciblySetQty = false)
     {
@@ -514,7 +485,6 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
      *
      * @param int $customerId
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomerId($customerId)
     {
@@ -525,7 +495,6 @@ public function setCustomerId($customerId)
      * Retrieve customer id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCustomerId()
     {
@@ -536,7 +505,6 @@ public function getCustomerId()
      * Retrieve data for save
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDataForSave()
     {
@@ -551,7 +519,6 @@ public function getDataForSave()
      * Retrieve shared store ids for current website or all stores if $current is false
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSharedStoreIds()
     {
@@ -575,7 +542,6 @@ public function getSharedStoreIds()
      *
      * @param array $storeIds
      * @return $this
-     * @since 2.0.0
      */
     public function setSharedStoreIds($storeIds)
     {
@@ -587,7 +553,6 @@ public function setSharedStoreIds($storeIds)
      * Retrieve wishlist store object
      *
      * @return \Magento\Store\Model\Store
-     * @since 2.0.0
      */
     public function getStore()
     {
@@ -602,7 +567,6 @@ public function getStore()
      *
      * @param \Magento\Store\Model\Store $store
      * @return $this
-     * @since 2.0.0
      */
     public function setStore($store)
     {
@@ -614,7 +578,6 @@ public function setStore($store)
      * Retrieve wishlist items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getItemsCount()
     {
@@ -625,7 +588,6 @@ public function getItemsCount()
      * Retrieve wishlist has salable item(s)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSalable()
     {
@@ -642,7 +604,6 @@ public function isSalable()
      *
      * @param int $customerId
      * @return bool
-     * @since 2.0.0
      */
     public function isOwner($customerId)
     {
@@ -672,7 +633,6 @@ public function isOwner($customerId)
      * @see \Magento\Catalog\Helper\Product::addParamsToBuyRequest()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function updateItem($itemId, $buyRequest, $params = null)
     {
@@ -738,7 +698,6 @@ public function updateItem($itemId, $buyRequest, $params = null)
      * Return unique ID(s) for each object in system
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index a9a01ea9d7b5b..dd601afc161ae 100644
--- a/app/code/Magento/Wishlist/Observer/AddToCart.php
+++ b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -17,31 +17,26 @@
  * Class AddToCart
  * @deprecated 2.2.0
  * @package Magento\Wishlist\Observer
- * @since 2.0.0
  */
 class AddToCart implements ObserverInterface
 {
     /**
      * @var \Magento\Checkout\Model\Session
-     * @since 2.0.0
      */
     protected $checkoutSession;
 
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @var \Magento\Wishlist\Model\WishlistFactory
-     * @since 2.0.0
      */
     protected $wishlistFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
@@ -50,7 +45,6 @@ class AddToCart implements ObserverInterface
      * @param CustomerSession $customerSession
      * @param WishlistFactory $wishlistFactory
      * @param ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         CheckoutSession $checkoutSession,
@@ -68,7 +62,6 @@ public function __construct(
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Wishlist/Observer/CartUpdateBefore.php b/app/code/Magento/Wishlist/Observer/CartUpdateBefore.php
index cd874cac4ef42..c8c75e6b7707d 100644
--- a/app/code/Magento/Wishlist/Observer/CartUpdateBefore.php
+++ b/app/code/Magento/Wishlist/Observer/CartUpdateBefore.php
@@ -15,7 +15,6 @@
 /**
  * Class CartUpdateBefore
  * @package Magento\Wishlist\Observer
- * @since 2.0.0
  */
 class CartUpdateBefore implements ObserverInterface
 {
@@ -23,20 +22,17 @@ class CartUpdateBefore implements ObserverInterface
      * Wishlist data
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $wishlistData;
 
     /**
      * @var WishlistFactory
-     * @since 2.0.0
      */
     protected $wishlistFactory;
 
     /**
      * @param Data $wishlistData
      * @param WishlistFactory $wishlistFactory
-     * @since 2.0.0
      */
     public function __construct(
         Data $wishlistData,
@@ -51,7 +47,6 @@ public function __construct(
      *
      * @param   int $customerId
      * @return  Wishlist|false
-     * @since 2.0.0
      */
     protected function getWishlist($customerId)
     {
@@ -66,7 +61,6 @@ protected function getWishlist($customerId)
      *
      * @param   Observer $observer
      * @return  $this
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Wishlist/Observer/CustomerLogin.php b/app/code/Magento/Wishlist/Observer/CustomerLogin.php
index 67d1f73d5d559..631fe24a66d31 100644
--- a/app/code/Magento/Wishlist/Observer/CustomerLogin.php
+++ b/app/code/Magento/Wishlist/Observer/CustomerLogin.php
@@ -13,19 +13,16 @@
 /**
  * Class CustomerLogin
  * @package Magento\Wishlist\Observer
- * @since 2.0.0
  */
 class CustomerLogin implements ObserverInterface
 {
     /**
      * @var \Magento\Wishlist\Helper\Data
-     * @since 2.0.0
      */
     protected $wishlistData;
 
     /**
      * @param Data $wishlistData
-     * @since 2.0.0
      */
     public function __construct(Data $wishlistData)
     {
@@ -35,7 +32,6 @@ public function __construct(Data $wishlistData)
     /**
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Wishlist/Observer/CustomerLogout.php b/app/code/Magento/Wishlist/Observer/CustomerLogout.php
index 8f5ed32977c0e..3f89aa5dad7a5 100644
--- a/app/code/Magento/Wishlist/Observer/CustomerLogout.php
+++ b/app/code/Magento/Wishlist/Observer/CustomerLogout.php
@@ -13,19 +13,16 @@
 /**
  * Class CustomerLogout
  * @package Magento\Wishlist\Observer
- * @since 2.0.0
  */
 class CustomerLogout implements ObserverInterface
 {
     /**
      * @var \Magento\Customer\Model\Session
-     * @since 2.0.0
      */
     protected $customerSession;
 
     /**
      * @param Session $customerSession
-     * @since 2.0.0
      */
     public function __construct(Session $customerSession)
     {
@@ -37,7 +34,6 @@ public function __construct(Session $customerSession)
      *
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Wishlist/Setup/InstallSchema.php b/app/code/Magento/Wishlist/Setup/InstallSchema.php
index cec3586fc7b54..5175ad9a8fa03 100644
--- a/app/code/Magento/Wishlist/Setup/InstallSchema.php
+++ b/app/code/Magento/Wishlist/Setup/InstallSchema.php
@@ -12,14 +12,12 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/lib/internal/Magento/Framework/Acl.php b/lib/internal/Magento/Framework/Acl.php
index 15d5f6ec6f454..86b28f7e2ceb4 100644
--- a/lib/internal/Magento/Framework/Acl.php
+++ b/lib/internal/Magento/Framework/Acl.php
@@ -9,7 +9,6 @@
  * ACL. Can be queried for relations between roles and resources.
  *
  * @api
- * @since 2.0.0
  */
 class Acl extends \Zend_Acl
 {
@@ -30,7 +29,6 @@ class Acl extends \Zend_Acl
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -43,7 +41,6 @@ public function __construct()
      * @param \Zend_Acl_Role $role
      * @param \Zend_Acl_Role $parent
      * @return \Magento\Framework\Acl
-     * @since 2.0.0
      */
     public function addRoleParent($role, $parent)
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource.php b/lib/internal/Magento/Framework/Acl/AclResource.php
index 6c7663ad00890..585b4b5d8514b 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AclResource extends \Zend_Acl_Resource
 {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
index 6b464047f5ebe..df04cc1391116 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Acl\AclResource\Config\Converter\Dom
  *
- * @since 2.0.0
  */
 class Dom implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Dom implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -37,7 +35,6 @@ public function convert($source)
      * @return array
      * @throws \Exception
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _convertResourceNode(\DOMNode $resourceNode)
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/Reader/Filesystem.php
index b1dca09d7ba0b..db9390731d50a 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/Reader/Filesystem.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Acl\AclResource\Config\Reader\Filesystem
  *
- * @since 2.0.0
  */
 class Filesystem extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Filesystem extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/acl/resources(/resource)+' => 'id'];
 
@@ -29,7 +27,6 @@ class Filesystem extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
index 7fcff2ebc5235..105f27cb330fc 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
@@ -7,13 +7,11 @@
 
 /**
  * ACL resources configuration schema locator
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
@@ -21,7 +19,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Initialize dependencies.
      *
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -39,7 +35,6 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Provider.php b/lib/internal/Magento/Framework/Acl/AclResource/Provider.php
index a4b2c0e4f4401..ef94dc62fd713 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Provider.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Provider.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Acl\AclResource\Provider
  *
- * @since 2.0.0
  */
 class Provider implements ProviderInterface
 {
@@ -23,13 +22,11 @@ class Provider implements ProviderInterface
 
     /**
      * @var \Magento\Framework\Config\ReaderInterface
-     * @since 2.0.0
      */
     protected $_configReader;
 
     /**
      * @var TreeBuilder
-     * @since 2.0.0
      */
     protected $_resourceTreeBuilder;
 
@@ -57,7 +54,6 @@ class Provider implements ProviderInterface
      * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
      * @param Json $serializer
      * @param string $cacheKey
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\ReaderInterface $configReader,
@@ -77,7 +73,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAclResources()
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php b/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
index 8c94ab5282b7a..34f85f3641ccd 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
@@ -9,7 +9,6 @@
  * Acl resources provider interface
  *
  * @api
- * @since 2.0.0
  */
 interface ProviderInterface
 {
@@ -17,7 +16,6 @@ interface ProviderInterface
      * Retrieve ACL resources
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAclResources();
 }
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/TreeBuilder.php b/lib/internal/Magento/Framework/Acl/AclResource/TreeBuilder.php
index 71e6e4b5467c8..be0d0d234a839 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/TreeBuilder.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/TreeBuilder.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Acl\AclResource\TreeBuilder
  *
- * @since 2.0.0
  */
 class TreeBuilder
 {
@@ -17,7 +16,6 @@ class TreeBuilder
      *
      * @param array $resourceList
      * @return array
-     * @since 2.0.0
      */
     public function build(array $resourceList)
     {
@@ -40,7 +38,6 @@ public function build(array $resourceList)
      * @param array $nodeA
      * @param array $nodeB
      * @return int
-     * @since 2.0.0
      */
     protected function _sortTree(array $nodeA, array $nodeB)
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResourceFactory.php b/lib/internal/Magento/Framework/Acl/AclResourceFactory.php
index 018c30721cd12..bd6ffea8ad798 100644
--- a/lib/internal/Magento/Framework/Acl/AclResourceFactory.php
+++ b/lib/internal/Magento/Framework/Acl/AclResourceFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Acl\AclResourceFactory
  *
- * @since 2.0.0
  */
 class AclResourceFactory
 {
@@ -20,13 +19,11 @@ class AclResourceFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return AclResource
-     * @since 2.0.0
      */
     public function createResource(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Acl/Builder.php b/lib/internal/Magento/Framework/Acl/Builder.php
index 862d58b5ca33d..f2b60a1a47233 100644
--- a/lib/internal/Magento/Framework/Acl/Builder.php
+++ b/lib/internal/Magento/Framework/Acl/Builder.php
@@ -11,7 +11,6 @@
  * On consequent requests, ACL object is deserialized from cache.
  *
  * @api
- * @since 2.0.0
  */
 class Builder
 {
@@ -19,7 +18,6 @@ class Builder
      * Acl object
      *
      * @var \Magento\Framework\Acl
-     * @since 2.0.0
      */
     protected $_acl;
 
@@ -27,13 +25,11 @@ class Builder
      * Acl loader list
      *
      * @var \Magento\Framework\Acl\LoaderInterface[]
-     * @since 2.0.0
      */
     protected $_loaderPool;
 
     /**
      * @var \Magento\Framework\AclFactory
-     * @since 2.0.0
      */
     protected $_aclFactory;
 
@@ -42,7 +38,6 @@ class Builder
      * @param \Magento\Framework\Acl\LoaderInterface $roleLoader
      * @param \Magento\Framework\Acl\LoaderInterface $resourceLoader
      * @param \Magento\Framework\Acl\LoaderInterface $ruleLoader
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\AclFactory $aclFactory,
@@ -59,7 +54,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Acl
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getAcl()
     {
diff --git a/lib/internal/Magento/Framework/Acl/Loader/DefaultLoader.php b/lib/internal/Magento/Framework/Acl/Loader/DefaultLoader.php
index f6a07e7c185eb..c1066fd505780 100644
--- a/lib/internal/Magento/Framework/Acl/Loader/DefaultLoader.php
+++ b/lib/internal/Magento/Framework/Acl/Loader/DefaultLoader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Acl\Loader\DefaultLoader
  *
- * @since 2.0.0
  */
 class DefaultLoader implements \Magento\Framework\Acl\LoaderInterface
 {
@@ -19,7 +18,6 @@ class DefaultLoader implements \Magento\Framework\Acl\LoaderInterface
      *
      * @param \Magento\Framework\Acl $acl
      * @return void
-     * @since 2.0.0
      */
     public function populateAcl(\Magento\Framework\Acl $acl)
     {
diff --git a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
index a50a1762a0e63..e5833f6d0958a 100644
--- a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
+++ b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Framework\Acl\Loader\ResourceLoader
  *
- * @since 2.0.0
  */
 class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
 {
@@ -23,7 +22,6 @@ class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
      * Acl resource config
      *
      * @var ProviderInterface $resourceProvider
-     * @since 2.0.0
      */
     protected $_resourceProvider;
 
@@ -31,14 +29,12 @@ class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
      * Resource factory
      *
      * @var AclResourceFactory
-     * @since 2.0.0
      */
     protected $_resourceFactory;
 
     /**
      * @param ProviderInterface $resourceProvider
      * @param AclResourceFactory $resourceFactory
-     * @since 2.0.0
      */
     public function __construct(ProviderInterface $resourceProvider, AclResourceFactory $resourceFactory)
     {
@@ -51,7 +47,6 @@ public function __construct(ProviderInterface $resourceProvider, AclResourceFact
      *
      * @param Acl $acl
      * @return void
-     * @since 2.0.0
      */
     public function populateAcl(Acl $acl)
     {
@@ -66,7 +61,6 @@ public function populateAcl(Acl $acl)
      * @param AclResource $parent
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _addResourceTree(Acl $acl, array $resources, AclResource $parent = null)
     {
diff --git a/lib/internal/Magento/Framework/Acl/LoaderInterface.php b/lib/internal/Magento/Framework/Acl/LoaderInterface.php
index 91880ed5b92cf..920186fc2121a 100644
--- a/lib/internal/Magento/Framework/Acl/LoaderInterface.php
+++ b/lib/internal/Magento/Framework/Acl/LoaderInterface.php
@@ -12,7 +12,6 @@
  * with data (roles/rules/resources) persisted in external storage.
  *
  * @api
- * @since 2.0.0
  */
 interface LoaderInterface
 {
@@ -22,7 +21,6 @@ interface LoaderInterface
      * @param \Magento\Framework\Acl $acl
      * @return void
      * @abstract
-     * @since 2.0.0
      */
     public function populateAcl(\Magento\Framework\Acl $acl);
 }
diff --git a/lib/internal/Magento/Framework/Acl/Role/Registry.php b/lib/internal/Magento/Framework/Acl/Role/Registry.php
index 2a6201c70a670..7d24487e288a0 100644
--- a/lib/internal/Magento/Framework/Acl/Role/Registry.php
+++ b/lib/internal/Magento/Framework/Acl/Role/Registry.php
@@ -7,7 +7,6 @@
 
 /**
  * Acl role registry. Contains list of roles and their relations.
- * @since 2.0.0
  */
 class Registry extends \Zend_Acl_Role_Registry
 {
@@ -18,7 +17,6 @@ class Registry extends \Zend_Acl_Role_Registry
      * @param array|\Zend_Acl_Role_Interface|string $parents
      * @return $this
      * @throws \Zend_Acl_Role_Registry_Exception
-     * @since 2.0.0
      */
     public function addParent($role, $parents)
     {
diff --git a/lib/internal/Magento/Framework/Acl/RootResource.php b/lib/internal/Magento/Framework/Acl/RootResource.php
index 134da30fb13da..326416c346563 100644
--- a/lib/internal/Magento/Framework/Acl/RootResource.php
+++ b/lib/internal/Magento/Framework/Acl/RootResource.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RootResource
 {
@@ -17,13 +16,11 @@ class RootResource
      * Root resource id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_identifier;
 
     /**
      * @param string $identifier
-     * @since 2.0.0
      */
     public function __construct($identifier)
     {
@@ -34,7 +31,6 @@ public function __construct($identifier)
      * Retrieve root resource id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
diff --git a/lib/internal/Magento/Framework/AclFactory.php b/lib/internal/Magento/Framework/AclFactory.php
index 3dd9fc6218760..d05179843401e 100644
--- a/lib/internal/Magento/Framework/AclFactory.php
+++ b/lib/internal/Magento/Framework/AclFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\AclFactory
  *
- * @since 2.0.0
  */
 class AclFactory
 {
@@ -18,13 +17,11 @@ class AclFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Create new magento acl instance
      *
      * @return \Magento\Framework\Acl
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
index ef54161fdfe92..3ea43cbccd24f 100644
--- a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -13,7 +13,6 @@
  * TODO: This class can be split into Custom attribute and Extension attribute implementation classes
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractExtensibleObject extends AbstractSimpleObject implements CustomAttributesDataInterface
 {
@@ -24,19 +23,16 @@ abstract class AbstractExtensibleObject extends AbstractSimpleObject implements
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttributesFactory
-     * @since 2.0.0
      */
     protected $extensionFactory;
 
     /**
      * @var AttributeValueFactory
-     * @since 2.0.0
      */
     protected $attributeValueFactory;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $customAttributesCodes;
 
@@ -46,7 +42,6 @@ abstract class AbstractExtensibleObject extends AbstractSimpleObject implements
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param AttributeValueFactory $attributeValueFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
@@ -63,7 +58,6 @@ public function __construct(
      *
      * @param string $attributeCode
      * @return \Magento\Framework\Api\AttributeInterface|null null if the attribute has not been set
-     * @since 2.0.0
      */
     public function getCustomAttribute($attributeCode)
     {
@@ -77,7 +71,6 @@ public function getCustomAttribute($attributeCode)
      * Retrieve custom attributes values.
      *
      * @return \Magento\Framework\Api\AttributeInterface[]|null
-     * @since 2.0.0
      */
     public function getCustomAttributes()
     {
@@ -90,7 +83,6 @@ public function getCustomAttributes()
      * @param \Magento\Framework\Api\AttributeInterface[] $attributes
      * @return $this
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function setCustomAttributes(array $attributes)
     {
@@ -113,7 +105,6 @@ public function setCustomAttributes(array $attributes)
      * @param string $attributeCode
      * @param mixed $attributeValue
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomAttribute($attributeCode, $attributeValue)
     {
@@ -135,7 +126,6 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      * By default, entity can be extended only using extension attributes functionality.
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -149,7 +139,6 @@ protected function getCustomAttributesCodes()
      *
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
      * @return string[]
-     * @since 2.0.0
      */
     protected function getEavAttributesCodes(\Magento\Framework\Api\MetadataServiceInterface $metadataService)
     {
@@ -168,7 +157,6 @@ protected function getEavAttributesCodes(\Magento\Framework\Api\MetadataServiceI
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Framework\Api\ExtensionAttributesInterface
-     * @since 2.0.0
      */
     protected function _getExtensionAttributes()
     {
@@ -180,7 +168,6 @@ protected function _getExtensionAttributes()
      *
      * @param \Magento\Framework\Api\ExtensionAttributesInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     protected function _setExtensionAttributes(\Magento\Framework\Api\ExtensionAttributesInterface $extensionAttributes)
     {
diff --git a/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php b/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
index 6e6a65d2f2032..c5d72b59e12ac 100644
--- a/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
+++ b/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
@@ -11,7 +11,6 @@
 
 /**
  * Base for service collections
- * @since 2.0.0
  */
 abstract class AbstractServiceCollection extends \Magento\Framework\Data\Collection
 {
@@ -28,25 +27,21 @@ abstract class AbstractServiceCollection extends \Magento\Framework\Data\Collect
      * @see addFieldToFilter() for more information on conditions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $fieldFilters = [];
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var \Magento\Framework\Api\SortOrderBuilder
-     * @since 2.0.0
      */
     protected $sortOrderBuilder;
 
@@ -55,7 +50,6 @@ abstract class AbstractServiceCollection extends \Magento\Framework\Data\Collect
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactoryInterface $entityFactory,
@@ -112,7 +106,6 @@ public function __construct(
      * @param string|int|array $condition
      * @throws LocalizedException if some error in the input could be detected.
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition)
     {
@@ -136,7 +129,6 @@ public function addFieldToFilter($field, $condition)
      * @param string|array $field
      * @param string|int|array $condition
      * @return $this
-     * @since 2.0.0
      */
     private function processFilters($field, $condition)
     {
@@ -166,7 +158,6 @@ private function processFilters($field, $condition)
      * @param string|array $field
      * @param string|int|array $condition
      * @return $this
-     * @since 2.0.0
      */
     private function addFilterGroupsForSingleConditions($field, $condition)
     {
@@ -179,7 +170,6 @@ private function addFilterGroupsForSingleConditions($field, $condition)
      * @param string|array $field
      * @param array $condition
      * @return $this
-     * @since 2.0.0
      */
     private function addFilterGroupsForMultipleConditions($field, $condition)
     {
@@ -211,7 +201,6 @@ private function addFilterGroupsForMultipleConditions($field, $condition)
      * Creates a search criteria DTO based on the array of field filters.
      *
      * @return SearchCriteria
-     * @since 2.0.0
      */
     protected function getSearchCriteria()
     {
@@ -247,7 +236,6 @@ protected function getSearchCriteria()
      * @param string $field Field for new filter
      * @param string|array $condition Condition for new filter.
      * @return Filter
-     * @since 2.0.0
      */
     protected function createFilterData($field, $condition)
     {
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
index bb6427ad791e8..b907246139d42 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
@@ -8,13 +8,11 @@
 /**
  * Base Class for simple data Objects
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractSimpleObject
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
@@ -22,7 +20,6 @@ abstract class AbstractSimpleObject
      * Initialize internal storage
      *
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -34,7 +31,6 @@ public function __construct(array $data = [])
      *
      * @param string $key
      * @return mixed|null
-     * @since 2.0.0
      */
     protected function _get($key)
     {
@@ -47,7 +43,6 @@ protected function _get($key)
      * @param string $key
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setData($key, $value)
     {
@@ -59,7 +54,6 @@ public function setData($key, $value)
      * Return Data Object data in array format.
      *
      * @return array
-     * @since 2.0.0
      */
     public function __toArray()
     {
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
index 347a458b203cc..d9a972ac237f5 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
@@ -8,25 +8,21 @@
 /**
  * Base Builder Class for simple data Objects
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractSimpleObjectBuilder implements SimpleBuilderInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @param ObjectFactory $objectFactory
-     * @since 2.0.0
      */
     public function __construct(ObjectFactory $objectFactory)
     {
@@ -38,7 +34,6 @@ public function __construct(ObjectFactory $objectFactory)
      * Builds the Data Object
      *
      * @return AbstractSimpleObject
-     * @since 2.0.0
      */
     public function create()
     {
@@ -53,7 +48,6 @@ public function create()
      * @param mixed $value
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _set($key, $value)
     {
@@ -65,7 +59,6 @@ protected function _set($key, $value)
      * Return the Data type class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDataObjectType()
     {
@@ -79,7 +72,6 @@ protected function _getDataObjectType()
      * Return data Object data.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/lib/internal/Magento/Framework/Api/ArrayObjectSearch.php b/lib/internal/Magento/Framework/Api/ArrayObjectSearch.php
index 81733ea4baf03..43dcd30f4d0ad 100644
--- a/lib/internal/Magento/Framework/Api/ArrayObjectSearch.php
+++ b/lib/internal/Magento/Framework/Api/ArrayObjectSearch.php
@@ -8,7 +8,6 @@
 
 /**
  * Class to provide possibility to search for any object's property value by the name and value of another property
- * @since 2.0.0
  */
 class ArrayObjectSearch
 {
@@ -44,7 +43,6 @@ class ArrayObjectSearch
      * @param string $keyName Name of the key property to search for
      * @param string $valueName Name of the value property name
      * @return null|mixed
-     * @since 2.0.0
      */
     public static function getArrayElementByName($data, $keyValue, $keyName = 'name', $valueName = 'value')
     {
diff --git a/lib/internal/Magento/Framework/Api/AttributeInterface.php b/lib/internal/Magento/Framework/Api/AttributeInterface.php
index b0abfc1ae98ab..d208d861d4d2e 100644
--- a/lib/internal/Magento/Framework/Api/AttributeInterface.php
+++ b/lib/internal/Magento/Framework/Api/AttributeInterface.php
@@ -10,7 +10,6 @@
  * Interface for custom attribute value.
  *
  * @api
- * @since 2.0.0
  */
 interface AttributeInterface
 {
@@ -25,7 +24,6 @@ interface AttributeInterface
      * Get attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode();
 
@@ -34,7 +32,6 @@ public function getAttributeCode();
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode);
 
@@ -42,7 +39,6 @@ public function setAttributeCode($attributeCode);
      * Get attribute value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -51,7 +47,6 @@ public function getValue();
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 }
diff --git a/lib/internal/Magento/Framework/Api/AttributeMetadata.php b/lib/internal/Magento/Framework/Api/AttributeMetadata.php
index cff93157a19f7..38bd6b4176b17 100644
--- a/lib/internal/Magento/Framework/Api/AttributeMetadata.php
+++ b/lib/internal/Magento/Framework/Api/AttributeMetadata.php
@@ -8,7 +8,6 @@
 
 /**
  * Base data object for custom attribute metadata
- * @since 2.0.0
  */
 class AttributeMetadata extends AbstractSimpleObject implements MetadataObjectInterface
 {
@@ -18,7 +17,6 @@ class AttributeMetadata extends AbstractSimpleObject implements MetadataObjectIn
      * Retrieve code of the attribute.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -30,7 +28,6 @@ public function getAttributeCode()
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode)
     {
diff --git a/lib/internal/Magento/Framework/Api/AttributeTypeResolverInterface.php b/lib/internal/Magento/Framework/Api/AttributeTypeResolverInterface.php
index 3e20224fc3dcd..f78cf2798aa24 100644
--- a/lib/internal/Magento/Framework/Api/AttributeTypeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Api/AttributeTypeResolverInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Framework\Api\AttributeTypeResolverInterface
  *
- * @since 2.0.0
  */
 interface AttributeTypeResolverInterface
 {
@@ -20,7 +19,6 @@ interface AttributeTypeResolverInterface
      * @param object $value
      * @param string $context
      * @return string
-     * @since 2.0.0
      */
     public function resolveObjectType($attributeCode, $value, $context);
 }
diff --git a/lib/internal/Magento/Framework/Api/AttributeValue.php b/lib/internal/Magento/Framework/Api/AttributeValue.php
index a0517801bd860..2840e7acd7b99 100644
--- a/lib/internal/Magento/Framework/Api/AttributeValue.php
+++ b/lib/internal/Magento/Framework/Api/AttributeValue.php
@@ -8,7 +8,6 @@
 
 /**
  * Custom Attribute Data object
- * @since 2.0.0
  */
 class AttributeValue extends AbstractSimpleObject implements AttributeInterface
 {
@@ -16,7 +15,6 @@ class AttributeValue extends AbstractSimpleObject implements AttributeInterface
      * Get attribute code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -27,7 +25,6 @@ public function getAttributeCode()
      * Get attribute value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -39,7 +36,6 @@ public function getValue()
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode)
     {
@@ -52,7 +48,6 @@ public function setAttributeCode($attributeCode)
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
diff --git a/lib/internal/Magento/Framework/Api/AttributeValueFactory.php b/lib/internal/Magento/Framework/Api/AttributeValueFactory.php
index ee9bcacdd70b7..0ae52157b7ad8 100644
--- a/lib/internal/Magento/Framework/Api/AttributeValueFactory.php
+++ b/lib/internal/Magento/Framework/Api/AttributeValueFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Api\AttributeValueFactory
  *
- * @since 2.0.0
  */
 class AttributeValueFactory
 {
@@ -25,7 +24,6 @@ class AttributeValueFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -33,7 +31,6 @@ class AttributeValueFactory
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -44,7 +41,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * Create class instance with specified parameters
      *
      * @return AttributeValue
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
index 3f381d5a337da..add48c06103fc 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
@@ -12,7 +12,6 @@
 
 /**
  * Code generator for data object extensions.
- * @since 2.0.0
  */
 class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -22,7 +21,6 @@ class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\Ent
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\Config
-     * @since 2.0.0
      */
     protected $config;
 
@@ -34,7 +32,6 @@ class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\Ent
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $allCustomAttributes;
 
@@ -47,7 +44,6 @@ class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\Ent
      * @param Io $ioObject
      * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
      * @param DefinedClasses $definedClasses
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\Config $config,
@@ -87,7 +83,6 @@ private function getTypeProcessor()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -96,7 +91,6 @@ protected function _getDefaultConstructorDefinition()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -105,7 +99,6 @@ protected function _getClassProperties()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -149,7 +142,6 @@ protected function _getClassMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
@@ -159,7 +151,6 @@ protected function _validateData()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -172,7 +163,6 @@ protected function _generateCode()
      * Get class, which should be used as a parent for generated class.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getExtendedClass()
     {
@@ -183,7 +173,6 @@ protected function getExtendedClass()
      * Retrieve a list of attributes associated with current source class.
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getCustomAttributes()
     {
@@ -211,7 +200,6 @@ protected function getCustomAttributes()
      * Ensure that result class name corresponds to the source class name.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function validateResultClassName()
     {
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceGenerator.php
index 0cd119661ea80..126ce44bee218 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceGenerator.php
@@ -10,7 +10,6 @@
 
 /**
  * Code generator for data object extension interfaces.
- * @since 2.0.0
  */
 class ExtensionAttributesInterfaceGenerator extends \Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator
 {
@@ -27,7 +26,6 @@ class ExtensionAttributesInterfaceGenerator extends \Magento\Framework\Api\Code\
      * @param Io $ioObject
      * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
      * @param DefinedClasses $definedClasses
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\Config $config,
@@ -52,7 +50,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getExtendedClass()
     {
@@ -61,7 +58,6 @@ protected function getExtendedClass()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function validateResultClassName()
     {
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/Mapper.php b/lib/internal/Magento/Framework/Api/Code/Generator/Mapper.php
index 9a37352a0b814..b1aeb8972c7f3 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/Mapper.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/Mapper.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Repository
- * @since 2.0.0
  */
 class Mapper extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -20,7 +19,6 @@ class Mapper extends \Magento\Framework\Code\Generator\EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -55,7 +53,6 @@ protected function _getClassProperties()
      * Returns source factory property Name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourceBuilderPropertyName()
     {
@@ -66,7 +63,6 @@ protected function _getSourceBuilderPropertyName()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -97,7 +93,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -132,7 +127,6 @@ protected function _getClassMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/SearchResults.php b/lib/internal/Magento/Framework/Api/Code/Generator/SearchResults.php
index 375eef376afa4..74a3a22de1a7c 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/SearchResults.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/SearchResults.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Builder
- * @since 2.0.0
  */
 
 class SearchResults extends EntityAbstract
@@ -31,7 +30,6 @@ class SearchResults extends EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -42,7 +40,6 @@ protected function _getClassProperties()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -67,7 +64,6 @@ protected function _getClassMethods()
      * Returns default constructor definition
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -78,7 +74,6 @@ protected function _getDefaultConstructorDefinition()
      * Generate code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
diff --git a/lib/internal/Magento/Framework/Api/CriteriaInterface.php b/lib/internal/Magento/Framework/Api/CriteriaInterface.php
index 98ea9306cd512..ead0d31a5fbe0 100644
--- a/lib/internal/Magento/Framework/Api/CriteriaInterface.php
+++ b/lib/internal/Magento/Framework/Api/CriteriaInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface CriteriaInterface
- * @since 2.0.0
  */
 interface CriteriaInterface
 {
@@ -24,7 +23,6 @@ interface CriteriaInterface
      * Get associated Mapper Interface name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMapperInterfaceName();
 
@@ -34,7 +32,6 @@ public function getMapperInterfaceName();
      * @param string|array $field
      * @param string|null $alias
      * @return void
-     * @since 2.0.0
      */
     public function addField($field, $alias = null);
 
@@ -78,7 +75,6 @@ public function addField($field, $alias = null);
      * @param string $type
      * @throws \Magento\Framework\Exception\LocalizedException if some error in the input could be detected.
      * @return void
-     * @since 2.0.0
      */
     public function addFilter($name, $field, $condition = null, $type = 'and');
 
@@ -89,7 +85,6 @@ public function addFilter($name, $field, $condition = null, $type = 'and');
      * @param string $direction
      * @param bool $unShift
      * @return void
-     * @since 2.0.0
      */
     public function addOrder($field, $direction = self::SORT_ORDER_DESC, $unShift = false);
 
@@ -99,7 +94,6 @@ public function addOrder($field, $direction = self::SORT_ORDER_DESC, $unShift =
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function setLimit($offset, $size);
 
@@ -109,7 +103,6 @@ public function setLimit($offset, $size);
      * @param string|null $field
      * @param bool $isAlias Alias identifier
      * @return void
-     * @since 2.0.0
      */
     public function removeField($field, $isAlias = false);
 
@@ -117,7 +110,6 @@ public function removeField($field, $isAlias = false);
      * Removes all fields from select
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeAllFields();
 
@@ -126,7 +118,6 @@ public function removeAllFields();
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeFilter($name);
 
@@ -134,7 +125,6 @@ public function removeFilter($name);
      * Removes all filters
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeAllFilters();
 
@@ -142,7 +132,6 @@ public function removeAllFilters();
      * Get Criteria objects added to current Composite Criteria
      *
      * @return \Magento\Framework\Api\CriteriaInterface[]
-     * @since 2.0.0
      */
     public function getCriteriaList();
 
@@ -150,7 +139,6 @@ public function getCriteriaList();
      * Get list of filters
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getFilters();
 
@@ -158,7 +146,6 @@ public function getFilters();
      * Get ordering criteria
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getOrders();
 
@@ -167,7 +154,6 @@ public function getOrders();
      * (['offset', 'page'])
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getLimit();
 
@@ -177,7 +163,6 @@ public function getLimit();
      * @param string $name
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getPart($name, $default = null);
 
@@ -185,7 +170,6 @@ public function getPart($name, $default = null);
      * Return all criteria parts as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray();
 
@@ -193,7 +177,6 @@ public function toArray();
      * Reset criteria
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset();
 }
diff --git a/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php b/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
index 434cec64b01c0..3019f84abb15a 100644
--- a/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
@@ -10,7 +10,6 @@
  * Interface for entities which can be extended with custom attributes.
  *
  * @api
- * @since 2.0.0
  */
 interface CustomAttributesDataInterface extends ExtensibleDataInterface
 {
@@ -24,7 +23,6 @@ interface CustomAttributesDataInterface extends ExtensibleDataInterface
      *
      * @param string $attributeCode
      * @return \Magento\Framework\Api\AttributeInterface|null
-     * @since 2.0.0
      */
     public function getCustomAttribute($attributeCode);
 
@@ -34,7 +32,6 @@ public function getCustomAttribute($attributeCode);
      * @param string $attributeCode
      * @param mixed $attributeValue
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomAttribute($attributeCode, $attributeValue);
 
@@ -42,7 +39,6 @@ public function setCustomAttribute($attributeCode, $attributeValue);
      * Retrieve custom attributes values.
      *
      * @return \Magento\Framework\Api\AttributeInterface[]|null
-     * @since 2.0.0
      */
     public function getCustomAttributes();
 
@@ -52,7 +48,6 @@ public function getCustomAttributes();
      * @param \Magento\Framework\Api\AttributeInterface[] $attributes
      * @return $this
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function setCustomAttributes(array $attributes);
 }
diff --git a/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php b/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
index b98de25e3634b..abd770dd12f14 100644
--- a/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
+++ b/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
@@ -10,7 +10,6 @@
  * Image Content data interface
  *
  * @api
- * @since 2.0.0
  */
 interface ImageContentInterface
 {
@@ -22,7 +21,6 @@ interface ImageContentInterface
      * Retrieve media data (base64 encoded content)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBase64EncodedData();
 
@@ -31,7 +29,6 @@ public function getBase64EncodedData();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setBase64EncodedData($data);
 
@@ -39,7 +36,6 @@ public function setBase64EncodedData($data);
      * Retrieve MIME type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -48,7 +44,6 @@ public function getType();
      *
      * @param string $mimeType
      * @return $this
-     * @since 2.0.0
      */
     public function setType($mimeType);
 
@@ -56,7 +51,6 @@ public function setType($mimeType);
      * Retrieve image name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -65,7 +59,6 @@ public function getName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 }
diff --git a/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php b/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
index 24de0375dfd2a..7b1ea05cf939c 100644
--- a/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
+++ b/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
@@ -12,7 +12,6 @@
  * Video Content data interface
  *
  * @api
- * @since 2.0.0
  */
 interface VideoContentInterface extends ExtensibleDataInterface
 {
@@ -27,7 +26,6 @@ interface VideoContentInterface extends ExtensibleDataInterface
      * Retrieve MIME type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaType();
 
@@ -36,7 +34,6 @@ public function getMediaType();
      *
      * @param string $mimeType
      * @return $this
-     * @since 2.0.0
      */
     public function setMediaType($mimeType);
 
@@ -44,7 +41,6 @@ public function setMediaType($mimeType);
      * Get provider
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoProvider();
 
@@ -53,7 +49,6 @@ public function getVideoProvider();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoProvider($data);
 
@@ -61,7 +56,6 @@ public function setVideoProvider($data);
      * Get video URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoUrl();
 
@@ -70,7 +64,6 @@ public function getVideoUrl();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoUrl($data);
 
@@ -78,7 +71,6 @@ public function setVideoUrl($data);
      * Get Title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoTitle();
 
@@ -87,7 +79,6 @@ public function getVideoTitle();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoTitle($data);
 
@@ -95,7 +86,6 @@ public function setVideoTitle($data);
      * Get video Description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoDescription();
 
@@ -104,7 +94,6 @@ public function getVideoDescription();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoDescription($data);
 
@@ -112,7 +101,6 @@ public function setVideoDescription($data);
      * Get Metadata
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVideoMetadata();
 
@@ -121,7 +109,6 @@ public function getVideoMetadata();
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setVideoMetadata($data);
 }
diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
index 4e1007abe2076..1426b8c8ec721 100644
--- a/lib/internal/Magento/Framework/Api/DataObjectHelper.php
+++ b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -12,43 +12,36 @@
  * Data object helper.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DataObjectHelper
 {
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @since 2.0.0
      */
     protected $objectProcessor;
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $typeProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttributesFactory
-     * @since 2.0.0
      */
     protected $extensionFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     * @since 2.0.0
      */
     protected $joinProcessor;
 
     /**
      * @var MethodsMap
-     * @since 2.0.0
      */
     protected $methodsMapProcessor;
 
@@ -59,7 +52,6 @@ class DataObjectHelper
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param MethodsMap $methodsMapProcessor
-     * @since 2.0.0
      */
     public function __construct(
         ObjectFactory $objectFactory,
@@ -84,7 +76,6 @@ public function __construct(
      * @param array $data
      * @param string $interfaceName
      * @return $this
-     * @since 2.0.0
      */
     public function populateWithArray($dataObject, array $data, $interfaceName)
     {
@@ -103,7 +94,6 @@ public function populateWithArray($dataObject, array $data, $interfaceName)
      * @param string $interfaceName
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _setDataValues($dataObject, array $data, $interfaceName)
     {
@@ -154,7 +144,6 @@ protected function _setDataValues($dataObject, array $data, $interfaceName)
      * @param string $interfaceName
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function setComplexValue(
         $dataObject,
@@ -237,7 +226,6 @@ protected function setComplexValue(
      * @param mixed $secondDataObject
      * @return $this
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function mergeDataObjects(
         $interfaceName,
@@ -258,7 +246,6 @@ public function mergeDataObjects(
      * @param AttributeValue[] $attributeValues Array of custom attribute
      * @param string $type Data interface type
      * @return AttributeValue[]
-     * @since 2.0.0
      */
     public function getCustomAttributeValueByType(array $attributeValues, $type)
     {
diff --git a/lib/internal/Magento/Framework/Api/DefaultMetadataService.php b/lib/internal/Magento/Framework/Api/DefaultMetadataService.php
index c35658e9791d6..e7b110cc9598f 100644
--- a/lib/internal/Magento/Framework/Api/DefaultMetadataService.php
+++ b/lib/internal/Magento/Framework/Api/DefaultMetadataService.php
@@ -8,13 +8,11 @@
 
 /**
  * Default implementation of metadata service, which does not return any real attributes.
- * @since 2.0.0
  */
 class DefaultMetadataService implements MetadataServiceInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php b/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
index 0105066bb922d..affe86992f273 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
@@ -10,7 +10,6 @@
  * Interface for entities which can be extended with extension attributes.
  *
  * @api
- * @since 2.0.0
  */
 interface ExtensibleDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
index f9776fbd9ad49..538f4e646d060 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
@@ -11,19 +11,16 @@
 
 /**
  * Class to convert Extensible Data Object array to flat array
- * @since 2.0.0
  */
 class ExtensibleDataObjectConverter
 {
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @param DataObjectProcessor $dataObjectProcessor
-     * @since 2.0.0
      */
     public function __construct(DataObjectProcessor $dataObjectProcessor)
     {
@@ -37,7 +34,6 @@ public function __construct(DataObjectProcessor $dataObjectProcessor)
      * @param string[] $skipAttributes
      * @param string $dataObjectType
      * @return array
-     * @since 2.0.0
      */
     public function toNestedArray(
         ExtensibleDataInterface $dataObject,
@@ -80,7 +76,6 @@ public function toNestedArray(
      * @param string[] $skipCustomAttributes
      * @param string $dataObjectType
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray(
         ExtensibleDataInterface $dataObject,
@@ -96,7 +91,6 @@ public function toFlatArray(
      *
      * @param array $extensibleObjectData
      * @return array
-     * @since 2.0.0
      */
     public static function convertCustomAttributesToSequentialArray($extensibleObjectData)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
index 349879a156dd9..d928c77cc2e20 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
@@ -11,7 +11,6 @@
 
 /**
  * Extension attributes config
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data
 {
@@ -27,7 +26,6 @@ class Config extends \Magento\Framework\Config\Data
      * @param CacheInterface $cache
      * @param string $cacheId|null
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Reader $reader,
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Converter.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Converter.php
index b43cf7c06cb20..34080de939deb 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Api\ExtensionAttribute\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -29,7 +28,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -83,7 +81,6 @@ public function convert($source)
      * @param \DOMElement $joinElement
      * @param \DOMElement $attribute
      * @return array
-     * @since 2.0.0
      */
     private function processJoinElement($joinElement, $attribute)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Reader.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Reader.php
index 7c61c75d57343..0e26bcd1381bb 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Api\ExtensionAttribute\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/extension_attributes' => 'for',
@@ -32,7 +30,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/SchemaLocator.php
index 390d7326d21fe..0152e65143f51 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\Api\ExtensionAttribute\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinData.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinData.php
index c286cb3a56cff..10619ffa90d35 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinData.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinData.php
@@ -10,49 +10,41 @@
  * Data holder for extension attribute joins.
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class JoinData implements JoinDataInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $attributeCode;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $referenceTable;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $referenceTableAlias;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $referenceField;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $joinField;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $selectFields;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAttributeCode()
     {
@@ -61,7 +53,6 @@ public function getAttributeCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode)
     {
@@ -71,7 +62,6 @@ public function setAttributeCode($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getReferenceTable()
     {
@@ -80,7 +70,6 @@ public function getReferenceTable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setReferenceTable($referenceTable)
     {
@@ -90,7 +79,6 @@ public function setReferenceTable($referenceTable)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getReferenceTableAlias()
     {
@@ -99,7 +87,6 @@ public function getReferenceTableAlias()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setReferenceTableAlias($referenceTableAlias)
     {
@@ -109,7 +96,6 @@ public function setReferenceTableAlias($referenceTableAlias)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getReferenceField()
     {
@@ -118,7 +104,6 @@ public function getReferenceField()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setReferenceField($referenceField)
     {
@@ -128,7 +113,6 @@ public function setReferenceField($referenceField)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getJoinField()
     {
@@ -137,7 +121,6 @@ public function getJoinField()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setJoinField($joinField)
     {
@@ -147,7 +130,6 @@ public function setJoinField($joinField)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSelectFields()
     {
@@ -156,7 +138,6 @@ public function getSelectFields()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setSelectFields(array $selectFields)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
index 50cf1a8e0e5e6..a0a2f649900fb 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
@@ -10,7 +10,6 @@
  * Interface of data holder for extension attribute joins.
  *
  * @api
- * @since 2.0.0
  */
 interface JoinDataInterface
 {
@@ -23,7 +22,6 @@ interface JoinDataInterface
      * Get attribute code.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode();
 
@@ -32,7 +30,6 @@ public function getAttributeCode();
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode);
 
@@ -40,7 +37,6 @@ public function setAttributeCode($attributeCode);
      * Get reference table name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReferenceTable();
 
@@ -49,7 +45,6 @@ public function getReferenceTable();
      *
      * @param string $referenceTable
      * @return $this
-     * @since 2.0.0
      */
     public function setReferenceTable($referenceTable);
 
@@ -57,7 +52,6 @@ public function setReferenceTable($referenceTable);
      * Get reference table alias.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReferenceTableAlias();
 
@@ -66,7 +60,6 @@ public function getReferenceTableAlias();
      *
      * @param string $referenceTableAlias
      * @return $this
-     * @since 2.0.0
      */
     public function setReferenceTableAlias($referenceTableAlias);
 
@@ -74,7 +67,6 @@ public function setReferenceTableAlias($referenceTableAlias);
      * Get reference field.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getReferenceField();
 
@@ -83,7 +75,6 @@ public function getReferenceField();
      *
      * @param string $referenceField
      * @return $this
-     * @since 2.0.0
      */
     public function setReferenceField($referenceField);
 
@@ -91,7 +82,6 @@ public function setReferenceField($referenceField);
      * Get join field.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJoinField();
 
@@ -100,7 +90,6 @@ public function getJoinField();
      *
      * @param string $joinField
      * @return $this
-     * @since 2.0.0
      */
     public function setJoinField($joinField);
 
@@ -108,7 +97,6 @@ public function setJoinField($joinField);
      * Get select fields.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectFields();
 
@@ -117,7 +105,6 @@ public function getSelectFields();
      *
      * @param array $selectFields
      * @return $this
-     * @since 2.0.0
      */
     public function setSelectFields(array $selectFields);
 }
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterfaceFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterfaceFactory.php
index d669572958c31..277cefa99a104 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterfaceFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterfaceFactory.php
@@ -9,7 +9,6 @@
 /**
  * Factory class for @see
  * \Magento\Framework\Api\ExtensionAttribute\JoinDataInterface
- * @since 2.0.0
  */
 class JoinDataInterfaceFactory
 {
@@ -17,7 +16,6 @@ class JoinDataInterfaceFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -25,7 +23,6 @@ class JoinDataInterfaceFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -34,7 +31,6 @@ class JoinDataInterfaceFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Api\ExtensionAttribute\JoinData
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
index 89f2383c07172..28f053e1afa84 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
@@ -15,7 +15,6 @@
 
 /**
  * Join processor allows to join extension attributes during collections loading.
- * @since 2.0.0
  */
 class JoinProcessor implements \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
 {
@@ -23,25 +22,21 @@ class JoinProcessor implements \Magento\Framework\Api\ExtensionAttribute\JoinPro
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     private $typeProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttributesFactory
-     * @since 2.0.0
      */
     private $extensionAttributesFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorHelper
-     * @since 2.0.0
      */
     private $joinProcessorHelper;
 
@@ -52,7 +47,6 @@ class JoinProcessor implements \Magento\Framework\Api\ExtensionAttribute\JoinPro
      * @param TypeProcessor $typeProcessor
      * @param ExtensionAttributesFactory $extensionAttributesFactory
      * @param JoinProcessorHelper $joinProcessorHelper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -68,7 +62,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(DbCollection $collection, $extensibleEntityClass = null)
     {
@@ -95,7 +88,6 @@ public function process(DbCollection $collection, $extensibleEntityClass = null)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     private function getReferenceTableAlias($attributeCode)
     {
@@ -104,7 +96,6 @@ private function getReferenceTableAlias($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extractExtensionAttributes($extensibleEntityClass, array $data)
     {
@@ -140,7 +131,6 @@ public function extractExtensionAttributes($extensibleEntityClass, array $data)
      * @param array &$extensionData
      * @param string $extensibleEntityClass
      * @return void
-     * @since 2.0.0
      */
     private function populateAttributeCodeWithDirective(
         $attributeCode,
@@ -189,7 +179,6 @@ private function populateAttributeCodeWithDirective(
      *
      * @param string $extensibleEntityClass
      * @return array
-     * @since 2.0.0
      */
     private function getJoinDirectivesForType($extensibleEntityClass)
     {
@@ -218,7 +207,6 @@ private function getJoinDirectivesForType($extensibleEntityClass)
      *
      * @param string $typeName
      * @return bool
-     * @since 2.0.0
      */
     private function isExtensibleAttributesImplemented($typeName)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
index ba598d98e95ff..f49c1fd0b5154 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
@@ -12,19 +12,16 @@
 
 /**
  * Join processor helper class
- * @since 2.0.0
  */
 class JoinProcessorHelper
 {
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinDataInterfaceFactory
-     * @since 2.0.0
      */
     private $joinDataInterfaceFactory;
 
@@ -33,7 +30,6 @@ class JoinProcessorHelper
      *
      * @param Config $config
      * @param JoinDataInterfaceFactory $joinDataInterfaceFactory
-     * @since 2.0.0
      */
     public function __construct(
         Config $config,
@@ -49,7 +45,6 @@ public function __construct(
      * @param string $attributeCode
      * @param array $selectFields
      * @return array
-     * @since 2.0.0
      */
     public function getSelectFieldsMap($attributeCode, $selectFields)
     {
@@ -79,7 +74,6 @@ public function getSelectFieldsMap($attributeCode, $selectFields)
      *
      * @param string $attributeCode
      * @return string
-     * @since 2.0.0
      */
     public function getReferenceTableAlias($attributeCode)
     {
@@ -90,7 +84,6 @@ public function getReferenceTableAlias($attributeCode)
      * Returns config data values
      *
      * @return array|mixed|null
-     * @since 2.0.0
      */
     public function getConfigData()
     {
@@ -101,7 +94,6 @@ public function getConfigData()
      * JoinDataInterface getter
      *
      * @return JoinDataInterface
-     * @since 2.0.0
      */
     public function getJoinDataInterface()
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
index cc76e4a8a5b20..1eaeaef24f419 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
@@ -12,7 +12,6 @@
  * Join processor allows to join extension attributes during collections loading.
  *
  * @api
- * @since 2.0.0
  */
 interface JoinProcessorInterface
 {
@@ -23,7 +22,6 @@ interface JoinProcessorInterface
      * @param string|null $extensibleEntityClass
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function process(DbCollection $collection, $extensibleEntityClass = null);
 
@@ -37,7 +35,6 @@ public function process(DbCollection $collection, $extensibleEntityClass = null)
      * @param array $data
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function extractExtensionAttributes($extensibleEntityClass, array $data);
 }
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
index 25f16731f6184..d7a92460a7f4d 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory class for instantiation of extension attributes objects.
- * @since 2.0.0
  */
 class ExtensionAttributesFactory
 {
@@ -18,7 +17,6 @@ class ExtensionAttributesFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class ExtensionAttributesFactory
      * Map is used for performance optimization.
      *
      * @var array
-     * @since 2.0.0
      */
     private $classInterfaceMap = [];
 
@@ -34,7 +31,6 @@ class ExtensionAttributesFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -47,7 +43,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $extensibleClassName
      * @param array $data
      * @return object
-     * @since 2.0.0
      */
     public function create($extensibleClassName, $data = [])
     {
@@ -87,7 +82,6 @@ public function create($extensibleClassName, $data = [])
      *
      * @param string $extensibleClassName
      * @return string
-     * @since 2.0.0
      */
     public function getExtensibleInterfaceName($extensibleClassName)
     {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
index 88431b8cf5eff..5578ed0137a62 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
@@ -10,7 +10,6 @@
  * Marker interface for all extension attributes interfaces.
  *
  * @api
- * @since 2.0.0
  */
 interface ExtensionAttributesInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Filter.php b/lib/internal/Magento/Framework/Api/Filter.php
index d1e69cf347050..03af29a00ad67 100644
--- a/lib/internal/Magento/Framework/Api/Filter.php
+++ b/lib/internal/Magento/Framework/Api/Filter.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Filter extends AbstractSimpleObject
 {
@@ -28,7 +27,6 @@ class Filter extends AbstractSimpleObject
      * Get field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -40,7 +38,6 @@ public function getField()
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function setField($field)
     {
@@ -51,7 +48,6 @@ public function setField($field)
      * Get value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -63,7 +59,6 @@ public function getValue()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -74,7 +69,6 @@ public function setValue($value)
      * Get condition type
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getConditionType()
     {
@@ -86,7 +80,6 @@ public function getConditionType()
      *
      * @param string $conditionType
      * @return $this
-     * @since 2.0.0
      */
     public function setConditionType($conditionType)
     {
diff --git a/lib/internal/Magento/Framework/Api/FilterBuilder.php b/lib/internal/Magento/Framework/Api/FilterBuilder.php
index e8c8c61fa6c26..550595c3c7f8b 100644
--- a/lib/internal/Magento/Framework/Api/FilterBuilder.php
+++ b/lib/internal/Magento/Framework/Api/FilterBuilder.php
@@ -11,7 +11,6 @@
  *
  * @api
  * @method Filter create()
- * @since 2.0.0
  */
 class FilterBuilder extends AbstractSimpleObjectBuilder
 {
@@ -20,7 +19,6 @@ class FilterBuilder extends AbstractSimpleObjectBuilder
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function setField($field)
     {
@@ -33,7 +31,6 @@ public function setField($field)
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -46,7 +43,6 @@ public function setValue($value)
      *
      * @param string $conditionType
      * @return $this
-     * @since 2.0.0
      */
     public function setConditionType($conditionType)
     {
diff --git a/lib/internal/Magento/Framework/Api/ImageContent.php b/lib/internal/Magento/Framework/Api/ImageContent.php
index 1c6ff9937758e..176d2730d92aa 100644
--- a/lib/internal/Magento/Framework/Api/ImageContent.php
+++ b/lib/internal/Magento/Framework/Api/ImageContent.php
@@ -12,7 +12,6 @@
  * Image Content data object
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ImageContent extends AbstractSimpleObject implements ImageContentInterface
 {
@@ -20,7 +19,6 @@ class ImageContent extends AbstractSimpleObject implements ImageContentInterface
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBase64EncodedData()
     {
@@ -31,7 +29,6 @@ public function getBase64EncodedData()
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -42,7 +39,6 @@ public function getType()
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -54,7 +50,6 @@ public function getName()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setBase64EncodedData($data)
     {
@@ -66,7 +61,6 @@ public function setBase64EncodedData($data)
      *
      * @param string $mimeType
      * @return $this
-     * @since 2.0.0
      */
     public function setType($mimeType)
     {
@@ -78,7 +72,6 @@ public function setType($mimeType)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
diff --git a/lib/internal/Magento/Framework/Api/ImageContentValidator.php b/lib/internal/Magento/Framework/Api/ImageContentValidator.php
index e600346222f13..cc5e830f67231 100644
--- a/lib/internal/Magento/Framework/Api/ImageContentValidator.php
+++ b/lib/internal/Magento/Framework/Api/ImageContentValidator.php
@@ -13,13 +13,11 @@
 
 /**
  * Class for Image content validation
- * @since 2.0.0
  */
 class ImageContentValidator implements ImageContentValidatorInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $defaultMimeTypes = [
         'image/jpg',
@@ -30,13 +28,11 @@ class ImageContentValidator implements ImageContentValidatorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $allowedMimeTypes;
 
     /**
      * @param array $allowedMimeTypes
-     * @since 2.0.0
      */
     public function __construct(
         array $allowedMimeTypes = []
@@ -50,7 +46,6 @@ public function __construct(
      * @param ImageContentInterface $imageContent
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     public function isValid(ImageContentInterface $imageContent)
     {
@@ -77,7 +72,6 @@ public function isValid(ImageContentInterface $imageContent)
      *
      * @param string $mimeType
      * @return bool
-     * @since 2.0.0
      */
     protected function isMimeTypeValid($mimeType)
     {
@@ -89,7 +83,6 @@ protected function isMimeTypeValid($mimeType)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     protected function isNameValid($name)
     {
diff --git a/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php b/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
index e412202c957f1..686e47f7a933f 100644
--- a/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
@@ -13,7 +13,6 @@
  * Image content validation interface
  *
  * @api
- * @since 2.0.0
  */
 interface ImageContentValidatorInterface
 {
@@ -23,7 +22,6 @@ interface ImageContentValidatorInterface
      * @param ImageContentInterface $imageContent
      * @return bool
      * @throws InputException
-     * @since 2.0.0
      */
     public function isValid(ImageContentInterface $imageContent);
 }
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessor.php b/lib/internal/Magento/Framework/Api/ImageProcessor.php
index bb4ba25ab6bc7..281c84b3b580e 100644
--- a/lib/internal/Magento/Framework/Api/ImageProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ImageProcessor.php
@@ -15,7 +15,6 @@
 /**
  * Class ImageProcessor
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ImageProcessor implements ImageProcessorInterface
 {
@@ -23,7 +22,6 @@ class ImageProcessor implements ImageProcessorInterface
      * MIME type/extension map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mimeTypeExtensionMap = [
         'image/jpg' => 'jpg',
@@ -34,37 +32,31 @@ class ImageProcessor implements ImageProcessorInterface
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $contentValidator;
 
     /**
      * @var DataObjectHelper
-     * @since 2.0.0
      */
     private $dataObjectHelper;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Uploader
-     * @since 2.0.0
      */
     private $uploader;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     private $mediaDirectory;
 
@@ -74,7 +66,6 @@ class ImageProcessor implements ImageProcessorInterface
      * @param DataObjectHelper $dataObjectHelper
      * @param \Psr\Log\LoggerInterface $logger
      * @param Uploader $uploader
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $fileSystem,
@@ -93,7 +84,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save(
         CustomAttributesDataInterface $dataObjectWithCustomAttributes,
@@ -145,7 +135,6 @@ public function save(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function processImageContent($entityType, $imageContent)
     {
@@ -180,7 +169,6 @@ public function processImageContent($entityType, $imageContent)
     /**
      * @param string $mimeType
      * @return string
-     * @since 2.0.0
      */
     protected function getMimeTypeExtension($mimeType)
     {
@@ -191,7 +179,7 @@ protected function getMimeTypeExtension($mimeType)
      * @param ImageContentInterface $imageContent
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private function getFileName($imageContent)
     {
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php b/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
index dbdb32de2bd60..676e89974fe09 100644
--- a/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
@@ -13,7 +13,6 @@
  * Interface ImageProcessorInterface
  *
  * @api
- * @since 2.0.0
  */
 interface ImageProcessorInterface
 {
@@ -26,7 +25,6 @@ interface ImageProcessorInterface
      * @param string $entityType entity type
      * @param CustomAttributesDataInterface $previousCustomerData
      * @return CustomAttributesDataInterface
-     * @since 2.0.0
      */
     public function save(
         CustomAttributesDataInterface $dataObjectWithCustomAttributes,
@@ -41,7 +39,6 @@ public function save(
      * @param ImageContentInterface $imageContent
      * @return string Relative path of the file where image was saved
      * @throws InputException
-     * @since 2.0.0
      */
     public function processImageContent($entityType, $imageContent);
 }
diff --git a/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php b/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
index 4817676a5d6fa..64593d87f2a2d 100644
--- a/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
+++ b/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
@@ -10,7 +10,6 @@
  * Provides metadata about an attribute.
  *
  * @api
- * @since 2.0.0
  */
 interface MetadataObjectInterface
 {
@@ -18,7 +17,6 @@ interface MetadataObjectInterface
      * Retrieve code of the attribute.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAttributeCode();
 
@@ -27,7 +25,6 @@ public function getAttributeCode();
      *
      * @param string $attributeCode
      * @return $this
-     * @since 2.0.0
      */
     public function setAttributeCode($attributeCode);
 }
diff --git a/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php b/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
index 56348922489fd..c6c3492420922 100644
--- a/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
+++ b/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
@@ -10,7 +10,6 @@
  * MetadataService returns custom attribute metadata for a given class or interface it implements
  *
  * @api
- * @since 2.0.0
  */
 interface MetadataServiceInterface
 {
@@ -19,7 +18,6 @@ interface MetadataServiceInterface
      *
      * @param string|null $dataObjectClassName Data object class name
      * @return \Magento\Framework\Api\MetadataObjectInterface[]
-     * @since 2.0.0
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null);
 }
diff --git a/lib/internal/Magento/Framework/Api/ObjectFactory.php b/lib/internal/Magento/Framework/Api/ObjectFactory.php
index 310f4c5db7351..f904f49bc8ba8 100644
--- a/lib/internal/Magento/Framework/Api/ObjectFactory.php
+++ b/lib/internal/Magento/Framework/Api/ObjectFactory.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Framework\Api\ObjectFactory
  *
- * @since 2.0.0
  */
 class ObjectFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $arguments
      * @return object
-     * @since 2.0.0
      */
     public function create($className, array $arguments)
     {
@@ -46,7 +42,6 @@ public function create($className, array $arguments)
      *
      * @param string $className
      * @return object
-     * @since 2.0.0
      */
     public function get($className)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/AggregationInterface.php b/lib/internal/Magento/Framework/Api/Search/AggregationInterface.php
index 72c0f08231d52..5f02006b1f1a3 100644
--- a/lib/internal/Magento/Framework/Api/Search/AggregationInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/AggregationInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Faceted data
- * @since 2.0.0
  */
 interface AggregationInterface
 {
@@ -16,7 +15,6 @@ interface AggregationInterface
      *
      * @param string $bucketName
      * @return \Magento\Framework\Api\Search\BucketInterface
-     * @since 2.0.0
      */
     public function getBucket($bucketName);
 
@@ -24,7 +22,6 @@ public function getBucket($bucketName);
      * Get all Document fields
      *
      * @return \Magento\Framework\Api\Search\BucketInterface[]
-     * @since 2.0.0
      */
     public function getBuckets();
 
@@ -32,7 +29,6 @@ public function getBuckets();
      * Get Document field names
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getBucketNames();
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/AggregationValueInterface.php b/lib/internal/Magento/Framework/Api/Search/AggregationValueInterface.php
index f74e9d26188a8..0eb0b39af70ab 100644
--- a/lib/internal/Magento/Framework/Api/Search/AggregationValueInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/AggregationValueInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Api\Search\AggregationValueInterface
  *
- * @since 2.0.0
  */
 interface AggregationValueInterface
 {
@@ -16,7 +15,6 @@ interface AggregationValueInterface
      * Get aggregation
      *
      * @return string|array
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -24,7 +22,6 @@ public function getValue();
      * Get metrics
      *
      * @return mixed[]
-     * @since 2.0.0
      */
     public function getMetrics();
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/BucketInterface.php b/lib/internal/Magento/Framework/Api/Search/BucketInterface.php
index 7c8709b4a466c..034f72258442d 100644
--- a/lib/internal/Magento/Framework/Api/Search/BucketInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/BucketInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Facet Bucket
- * @since 2.0.0
  */
 interface BucketInterface
 {
@@ -15,7 +14,6 @@ interface BucketInterface
      * Get field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -23,7 +21,6 @@ public function getName();
      * Get field values
      *
      * @return \Magento\Framework\Api\Search\AggregationValueInterface[]
-     * @since 2.0.0
      */
     public function getValues();
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/Document.php b/lib/internal/Magento/Framework/Api/Search/Document.php
index 8757b35c52eb9..060f16dd1e343 100644
--- a/lib/internal/Magento/Framework/Api/Search/Document.php
+++ b/lib/internal/Magento/Framework/Api/Search/Document.php
@@ -9,13 +9,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Document extends AbstractSimpleObject implements DocumentInterface, \IteratorAggregate
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -24,7 +22,6 @@ public function getId()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -33,7 +30,6 @@ public function setId($id)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttribute($attributeCode)
     {
@@ -44,7 +40,6 @@ public function getCustomAttribute($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomAttribute($attributeCode, $attributeValue)
     {
@@ -56,7 +51,6 @@ public function setCustomAttribute($attributeCode, $attributeValue)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCustomAttributes()
     {
@@ -65,7 +59,6 @@ public function getCustomAttributes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomAttributes(array $attributes)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/DocumentFactory.php b/lib/internal/Magento/Framework/Api/Search/DocumentFactory.php
index a0b91e5cee74c..4fa49538e25c0 100644
--- a/lib/internal/Magento/Framework/Api/Search/DocumentFactory.php
+++ b/lib/internal/Magento/Framework/Api/Search/DocumentFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Api\Search\DocumentFactory
  *
- * @since 2.0.0
  */
 class DocumentFactory
 {
@@ -16,7 +15,6 @@ class DocumentFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -24,14 +22,12 @@ class DocumentFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param array $data
      * @return DocumentInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/DocumentInterface.php b/lib/internal/Magento/Framework/Api/Search/DocumentInterface.php
index bf992c3716bc5..e228de52aae36 100644
--- a/lib/internal/Magento/Framework/Api/Search/DocumentInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/DocumentInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Api\Search\DocumentInterface
  *
- * @since 2.0.0
  */
 interface DocumentInterface extends CustomAttributesDataInterface
 {
@@ -18,14 +17,12 @@ interface DocumentInterface extends CustomAttributesDataInterface
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
     /**
      * @param int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id);
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
index f207afe0ea2ae..f339214ca4dad 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
@@ -10,7 +10,6 @@
 
 /**
  * Groups two or more filters together using a logical OR
- * @since 2.0.0
  */
 class FilterGroup extends AbstractSimpleObject
 {
@@ -20,7 +19,6 @@ class FilterGroup extends AbstractSimpleObject
      * Returns a list of filters in this group
      *
      * @return \Magento\Framework\Api\Filter[]|null
-     * @since 2.0.0
      */
     public function getFilters()
     {
@@ -34,7 +32,6 @@ public function getFilters()
      * @param \Magento\Framework\Api\Filter[] $filters
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setFilters(array $filters = null)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
index 3af73c8fe4171..696a65fd710ca 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
@@ -12,20 +12,17 @@
 
 /**
  * Builder for FilterGroup Data.
- * @since 2.0.0
  */
 class FilterGroupBuilder extends AbstractSimpleObjectBuilder
 {
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $_filterBuilder;
 
     /**
      * @param ObjectFactory $objectFactory
      * @param FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         ObjectFactory $objectFactory,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Api\Filter $filter
      * @return $this
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
@@ -55,7 +51,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
      *
      * @param \Magento\Framework\Api\Filter[] $filters
      * @return $this
-     * @since 2.0.0
      */
     public function setFilters(array $filters)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/ReportingInterface.php b/lib/internal/Magento/Framework/Api/Search/ReportingInterface.php
index d5755bd37184b..46ee52f4fd697 100644
--- a/lib/internal/Magento/Framework/Api/Search/ReportingInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/ReportingInterface.php
@@ -7,14 +7,12 @@
 
 /**
  * Interface ReportingInterface
- * @since 2.0.0
  */
 interface ReportingInterface
 {
     /**
      * @param SearchCriteriaInterface $searchCriteria
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function search(SearchCriteriaInterface $searchCriteria);
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
index 5810a58f4c5da..964e506120167 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class SearchCriteria extends BaseSearchCriteria implements SearchCriteriaInterface
 {
@@ -18,7 +17,6 @@ class SearchCriteria extends BaseSearchCriteria implements SearchCriteriaInterfa
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRequestName()
     {
@@ -27,7 +25,6 @@ public function getRequestName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRequestName($requestName)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
index 907697f07cbb7..6d28525ced506 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
@@ -14,19 +14,16 @@
  * Builder for SearchCriteria Service Data Object
  *
  * @api
- * @since 2.0.0
  */
 class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
 {
     /**
      * @var SortOrderBuilder
-     * @since 2.0.0
      */
     protected $sortOrderBuilder;
 
     /**
      * @var FilterGroupBuilder
-     * @since 2.0.0
      */
     protected $filterGroupBuilder;
 
@@ -40,7 +37,6 @@ class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
      * @param ObjectFactory $objectFactory
      * @param FilterGroupBuilder $filterGroupBuilder
      * @param SortOrderBuilder $sortOrderBuilder
-     * @since 2.0.0
      */
     public function __construct(
         ObjectFactory $objectFactory,
@@ -56,7 +52,6 @@ public function __construct(
      * Builds the SearchCriteria Data Object
      *
      * @return SearchCriteria
-     * @since 2.0.0
      */
     public function create()
     {
@@ -74,7 +69,6 @@ public function create()
      *
      * @param \Magento\Framework\Api\Filter $filter
      * @return $this
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
@@ -86,7 +80,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
      * @param string $field
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function addSortOrder($field, $direction)
     {
@@ -100,7 +93,6 @@ public function addSortOrder($field, $direction)
      *
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($pageSize)
     {
@@ -112,7 +104,6 @@ public function setPageSize($pageSize)
      *
      * @param int $currentPage
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrentPage($currentPage)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaFactory.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaFactory.php
index f3a7dc76ead6b..da249cd97b0fa 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaFactory.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Api\Search\SearchCriteriaFactory
  *
- * @since 2.0.0
  */
 class SearchCriteriaFactory
 {
@@ -16,7 +15,6 @@ class SearchCriteriaFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -24,14 +22,12 @@ class SearchCriteriaFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param array $data
      * @return SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
index 96616584e3280..6dda50569ca03 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
@@ -12,20 +12,17 @@
  *
  * @api
  * @package Magento\Framework\Api\Search
- * @since 2.0.0
  */
 interface SearchCriteriaInterface extends BaseSearchCriteriaInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getRequestName();
 
     /**
      * @param string $requestName
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestName($requestName);
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
index 9ea8060d729c3..9793e005b70b5 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
@@ -9,7 +9,6 @@
  * Search API for all requests
  *
  * @api
- * @since 2.0.0
  */
 interface SearchInterface
 {
@@ -18,7 +17,6 @@ interface SearchInterface
      *
      * @param \Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Framework\Api\Search\SearchResultInterface
-     * @since 2.0.0
      */
     public function search(\Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria);
 }
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchResult.php b/lib/internal/Magento/Framework/Api/Search/SearchResult.php
index efd09e619b8a5..4aa049a61a806 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchResult.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchResult.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Framework\Api\Search\SearchResult
  *
- * @since 2.0.0
  */
 class SearchResult extends AbstractSimpleObject implements SearchResultInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAggregations()
     {
@@ -28,7 +26,6 @@ public function getAggregations()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setAggregations($aggregations)
     {
@@ -37,7 +34,6 @@ public function setAggregations($aggregations)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -46,7 +42,6 @@ public function getItems()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -57,7 +52,6 @@ public function setItems(array $items = null)
      * Get search criteria.
      *
      * @return SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -69,7 +63,6 @@ public function getSearchCriteria()
      *
      * @param BaseSearchCriteriaInterface $searchCriteria
      * @return $this
-     * @since 2.0.0
      */
     public function setSearchCriteria(BaseSearchCriteriaInterface $searchCriteria = null)
     {
@@ -80,7 +73,6 @@ public function setSearchCriteria(BaseSearchCriteriaInterface $searchCriteria =
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -92,7 +84,6 @@ public function getTotalCount()
      *
      * @param int $totalCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchResultFactory.php b/lib/internal/Magento/Framework/Api/Search/SearchResultFactory.php
index ff8fa7cdb05ed..00747748dc3c7 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchResultFactory.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchResultFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Api\Search\SearchResultFactory
  *
- * @since 2.0.0
  */
 class SearchResultFactory
 {
@@ -16,7 +15,6 @@ class SearchResultFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -24,14 +22,12 @@ class SearchResultFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param array $data
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
index e44f471255330..792401124b96e 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
@@ -11,7 +11,6 @@
  * Interface SearchResultInterface
  *
  * @api
- * @since 2.0.0
  */
 interface SearchResultInterface extends SearchResultsInterface
 {
@@ -26,7 +25,6 @@ interface SearchResultInterface extends SearchResultsInterface
 
     /**
      * @return \Magento\Framework\Api\Search\DocumentInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -35,20 +33,17 @@ public function getItems();
      *
      * @param \Magento\Framework\Api\Search\DocumentInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null);
 
     /**
      * @return \Magento\Framework\Api\Search\AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations();
 
     /**
      * @param \Magento\Framework\Api\Search\AggregationInterface $aggregations
      * @return $this
-     * @since 2.0.0
      */
     public function setAggregations($aggregations);
 
@@ -56,7 +51,6 @@ public function setAggregations($aggregations);
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\Search\SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria.php b/lib/internal/Magento/Framework/Api/SearchCriteria.php
index 35b709de4f16c..9d8f6bc5bb073 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria.php
@@ -9,7 +9,6 @@
 /**
  * Data Object for SearchCriteria
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class SearchCriteria extends AbstractSimpleObject implements SearchCriteriaInterface
 {
@@ -25,7 +24,6 @@ class SearchCriteria extends AbstractSimpleObject implements SearchCriteriaInter
      * Get a list of filter groups.
      *
      * @return \Magento\Framework\Api\Search\FilterGroup[]
-     * @since 2.0.0
      */
     public function getFilterGroups()
     {
@@ -37,7 +35,6 @@ public function getFilterGroups()
      * Get sort order.
      *
      * @return \Magento\Framework\Api\SortOrder[]|null
-     * @since 2.0.0
      */
     public function getSortOrders()
     {
@@ -48,7 +45,6 @@ public function getSortOrders()
      * Get page size.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -59,7 +55,6 @@ public function getPageSize()
      * Get current page.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -71,7 +66,6 @@ public function getCurrentPage()
      *
      * @param \Magento\Framework\Api\Search\FilterGroup[] $filterGroups
      * @return $this
-     * @since 2.0.0
      */
     public function setFilterGroups(array $filterGroups = null)
     {
@@ -83,7 +77,6 @@ public function setFilterGroups(array $filterGroups = null)
      *
      * @param \Magento\Framework\Api\SortOrder[] $sortOrders
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrders(array $sortOrders = null)
     {
@@ -95,7 +88,6 @@ public function setSortOrders(array $sortOrders = null)
      *
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($pageSize)
     {
@@ -107,7 +99,6 @@ public function setPageSize($pageSize)
      *
      * @param int $currentPage
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrentPage($currentPage)
     {
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Api/SearchCriteriaBuilder.php
index 05b8c85bfa409..4cf7a8fbef9ed 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteriaBuilder.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteriaBuilder.php
@@ -10,19 +10,16 @@
 
 /**
  * Builder for SearchCriteria Service Data Object
- * @since 2.0.0
  */
 class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
 {
     /**
      * @var FilterGroupBuilder
-     * @since 2.0.0
      */
     protected $_filterGroupBuilder;
 
     /**
      * @var \Magento\Framework\Api\FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
@@ -30,7 +27,6 @@ class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
      * @param ObjectFactory $objectFactory
      * @param FilterGroupBuilder $filterGroupBuilder
      * @param FilterBuilder $filterBuilder
-     * @since 2.0.0
      */
     public function __construct(
         ObjectFactory $objectFactory,
@@ -48,7 +44,6 @@ public function __construct(
      * Builds the SearchCriteria Data Object
      *
      * @return SearchCriteria
-     * @since 2.0.0
      */
     public function create()
     {
@@ -64,7 +59,6 @@ public function create()
      *
      * @param \Magento\Framework\Api\Filter[] $filter
      * @return $this
-     * @since 2.0.0
      */
     public function addFilters(array $filter)
     {
@@ -77,7 +71,6 @@ public function addFilters(array $filter)
      * @param mixed $value
      * @param string $conditionType
      * @return $this
-     * @since 2.0.0
      */
     public function addFilter($field, $value, $conditionType = 'eq')
     {
@@ -95,7 +88,6 @@ public function addFilter($field, $value, $conditionType = 'eq')
      *
      * @param \Magento\Framework\Api\Search\FilterGroup[] $filterGroups
      * @return $this
-     * @since 2.0.0
      */
     public function setFilterGroups(array $filterGroups)
     {
@@ -107,7 +99,6 @@ public function setFilterGroups(array $filterGroups)
      *
      * @param SortOrder $sortOrder
      * @return $this
-     * @since 2.0.0
      */
     public function addSortOrder($sortOrder)
     {
@@ -123,7 +114,6 @@ public function addSortOrder($sortOrder)
      *
      * @param SortOrder[] $sortOrders
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrders(array $sortOrders)
     {
@@ -135,7 +125,6 @@ public function setSortOrders(array $sortOrders)
      *
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($pageSize)
     {
@@ -147,7 +136,6 @@ public function setPageSize($pageSize)
      *
      * @param int $currentPage
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrentPage($currentPage)
     {
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
index e87bfb018f8b8..ae4057ae9c21e 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
@@ -10,7 +10,6 @@
  * Search criteria interface.
  *
  * @api
- * @since 2.0.0
  */
 interface SearchCriteriaInterface
 {
@@ -18,7 +17,6 @@ interface SearchCriteriaInterface
      * Get a list of filter groups.
      *
      * @return \Magento\Framework\Api\Search\FilterGroup[]
-     * @since 2.0.0
      */
     public function getFilterGroups();
 
@@ -27,7 +25,6 @@ public function getFilterGroups();
      *
      * @param \Magento\Framework\Api\Search\FilterGroup[] $filterGroups
      * @return $this
-     * @since 2.0.0
      */
     public function setFilterGroups(array $filterGroups = null);
 
@@ -35,7 +32,6 @@ public function setFilterGroups(array $filterGroups = null);
      * Get sort order.
      *
      * @return \Magento\Framework\Api\SortOrder[]|null
-     * @since 2.0.0
      */
     public function getSortOrders();
 
@@ -44,7 +40,6 @@ public function getSortOrders();
      *
      * @param \Magento\Framework\Api\SortOrder[] $sortOrders
      * @return $this
-     * @since 2.0.0
      */
     public function setSortOrders(array $sortOrders = null);
 
@@ -52,7 +47,6 @@ public function setSortOrders(array $sortOrders = null);
      * Get page size.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getPageSize();
 
@@ -61,7 +55,6 @@ public function getPageSize();
      *
      * @param int $pageSize
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($pageSize);
 
@@ -69,7 +62,6 @@ public function setPageSize($pageSize);
      * Get current page.
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getCurrentPage();
 
@@ -78,7 +70,6 @@ public function getCurrentPage();
      *
      * @param int $currentPage
      * @return $this
-     * @since 2.0.0
      */
     public function setCurrentPage($currentPage);
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchResults.php b/lib/internal/Magento/Framework/Api/SearchResults.php
index 979cf1f0b22b4..ad58d0a752653 100644
--- a/lib/internal/Magento/Framework/Api/SearchResults.php
+++ b/lib/internal/Magento/Framework/Api/SearchResults.php
@@ -8,7 +8,6 @@
 
 /**
  * SearchResults Service Data Object used for the search service requests
- * @since 2.0.0
  */
 class SearchResults extends AbstractSimpleObject implements SearchResultsInterface
 {
@@ -20,7 +19,6 @@ class SearchResults extends AbstractSimpleObject implements SearchResultsInterfa
      * Get items
      *
      * @return \Magento\Framework\Api\AbstractExtensibleObject[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -32,7 +30,6 @@ public function getItems()
      *
      * @param \Magento\Framework\Api\AbstractExtensibleObject[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items)
     {
@@ -43,7 +40,6 @@ public function setItems(array $items)
      * Get search criteria
      *
      * @return \Magento\Framework\Api\SearchCriteria
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -55,7 +51,6 @@ public function getSearchCriteria()
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @return $this
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -66,7 +61,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -78,7 +72,6 @@ public function getTotalCount()
      *
      * @param int $count
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($count)
     {
diff --git a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
index 89688b3619894..d2bc3053b8d6e 100644
--- a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
@@ -10,7 +10,6 @@
  * Search results interface.
  *
  * @api
- * @since 2.0.0
  */
 interface SearchResultsInterface
 {
@@ -18,7 +17,6 @@ interface SearchResultsInterface
      * Get items list.
      *
      * @return \Magento\Framework\Api\ExtensibleDataInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -27,7 +25,6 @@ public function getItems();
      *
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items);
 
@@ -35,7 +32,6 @@ public function setItems(array $items);
      * Get search criteria.
      *
      * @return \Magento\Framework\Api\SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 
@@ -44,7 +40,6 @@ public function getSearchCriteria();
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
@@ -52,7 +47,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
      * Get total count.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount();
 
@@ -61,7 +55,6 @@ public function getTotalCount();
      *
      * @param int $totalCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount);
 }
diff --git a/lib/internal/Magento/Framework/Api/SimpleBuilderInterface.php b/lib/internal/Magento/Framework/Api/SimpleBuilderInterface.php
index 712d4a2f03521..d7503f4223cbb 100644
--- a/lib/internal/Magento/Framework/Api/SimpleBuilderInterface.php
+++ b/lib/internal/Magento/Framework/Api/SimpleBuilderInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Base Builder interface for simple data Objects
- * @since 2.0.0
  */
 interface SimpleBuilderInterface
 {
@@ -16,7 +15,6 @@ interface SimpleBuilderInterface
      * Builds the Data Object
      *
      * @return AbstractSimpleObject
-     * @since 2.0.0
      */
     public function create();
 
@@ -24,7 +22,6 @@ public function create();
      * Return data Object data.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 }
diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
index c2dc3bdfdc99a..c42d19bf6190c 100644
--- a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Api\SimpleDataObjectConverter
  *
- * @since 2.0.0
  */
 class SimpleDataObjectConverter
 {
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @param DataObjectProcessor $dataObjectProcessor
-     * @since 2.0.0
      */
     public function __construct(DataObjectProcessor $dataObjectProcessor)
     {
@@ -36,7 +33,6 @@ public function __construct(DataObjectProcessor $dataObjectProcessor)
      * @param ExtensibleDataInterface $dataObject
      * @param string $dataObjectType
      * @return array
-     * @since 2.0.0
      */
     public function toFlatArray(ExtensibleDataInterface $dataObject, $dataObjectType = null)
     {
@@ -52,7 +48,6 @@ public function toFlatArray(ExtensibleDataInterface $dataObject, $dataObjectType
      *
      * @param array $dataArray
      * @return \stdClass
-     * @since 2.0.0
      */
     public function convertKeysToCamelCase(array $dataArray)
     {
@@ -75,7 +70,6 @@ public function convertKeysToCamelCase(array $dataArray)
      *
      * @param array $data
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSimpleSequentialArray(array $data)
     {
@@ -96,7 +90,6 @@ protected function _isSimpleSequentialArray(array $data)
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function convertStdObjectToArray($input, $removeItemNode = false)
     {
@@ -130,7 +123,6 @@ public function convertStdObjectToArray($input, $removeItemNode = false)
      *
      * @param mixed $data
      * @return array Unpacked associative array if array was passed as argument or original value otherwise
-     * @since 2.0.0
      */
     protected function _unpackAssociativeArray($data)
     {
@@ -154,7 +146,6 @@ protected function _unpackAssociativeArray($data)
      *
      * @param string $input
      * @return string
-     * @since 2.0.0
      */
     public static function snakeCaseToUpperCamelCase($input)
     {
@@ -166,7 +157,6 @@ public static function snakeCaseToUpperCamelCase($input)
      *
      * @param string $input
      * @return string
-     * @since 2.0.0
      */
     public static function snakeCaseToCamelCase($input)
     {
@@ -181,7 +171,6 @@ public static function snakeCaseToCamelCase($input)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public static function camelCaseToSnakeCase($name)
     {
diff --git a/lib/internal/Magento/Framework/Api/SortOrder.php b/lib/internal/Magento/Framework/Api/SortOrder.php
index 72a3f7b9f67ba..7d0bfec3950b1 100644
--- a/lib/internal/Magento/Framework/Api/SortOrder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrder.php
@@ -11,7 +11,6 @@
 
 /**
  * Data object for sort order.
- * @since 2.0.0
  */
 class SortOrder extends AbstractSimpleObject
 {
@@ -24,7 +23,6 @@ class SortOrder extends AbstractSimpleObject
      * Initialize object and validate sort direction
      *
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -38,7 +36,6 @@ public function __construct(array $data = [])
      * Get sorting field.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -50,7 +47,6 @@ public function getField()
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function setField($field)
     {
@@ -61,7 +57,6 @@ public function setField($field)
      * Get sorting direction.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDirection()
     {
@@ -73,7 +68,6 @@ public function getDirection()
      *
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setDirection($direction)
     {
@@ -87,7 +81,6 @@ public function setDirection($direction)
      * @param mixed $direction
      * @return null
      * @throws InputException
-     * @since 2.0.0
      */
     private function validateDirection($direction)
     {
@@ -99,7 +92,6 @@ private function validateDirection($direction)
      * @param string $direction
      * @throws InputException
      * @return null
-     * @since 2.0.0
      */
     private function validateDirectionIsString($direction)
     {
@@ -115,7 +107,6 @@ private function validateDirectionIsString($direction)
      * @param string $direction
      * @throws InputException
      * @return null
-     * @since 2.0.0
      */
     private function validateDirectionIsAscOrDesc($direction)
     {
@@ -131,7 +122,6 @@ private function validateDirectionIsAscOrDesc($direction)
     /**
      * @param string $direction
      * @return string
-     * @since 2.0.0
      */
     private function normalizeDirectionInput($direction)
     {
diff --git a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
index 0304ed86771bc..bb766aa6b951d 100644
--- a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
@@ -9,7 +9,6 @@
 /**
  * Builder for sort order data object.
  * @method SortOrder create()
- * @since 2.0.0
  */
 class SortOrderBuilder extends AbstractSimpleObjectBuilder
 {
@@ -18,7 +17,6 @@ class SortOrderBuilder extends AbstractSimpleObjectBuilder
      *
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function setField($field)
     {
@@ -31,7 +29,6 @@ public function setField($field)
      *
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setDirection($direction)
     {
@@ -41,7 +38,6 @@ public function setDirection($direction)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function setAscendingDirection()
     {
@@ -51,7 +47,6 @@ public function setAscendingDirection()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function setDescendingDirection()
     {
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
index 4efb84d13cfe1..d3ae11100b9dc 100644
--- a/lib/internal/Magento/Framework/Api/Uploader.php
+++ b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -8,13 +8,11 @@
 
 /**
  * Class Uploader specific to uploading images using services
- * @since 2.0.0
  */
 class Uploader extends \Magento\Framework\File\Uploader
 {
     /**
      * Avoid running the default constructor specific to FILE upload
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -26,7 +24,6 @@ public function __construct()
      * @param array $fileAttributes
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function processFileAttributes($fileAttributes)
     {
diff --git a/lib/internal/Magento/Framework/App/Action/AbstractAction.php b/lib/internal/Magento/Framework/App/Action/AbstractAction.php
index 96322a7865441..e07b21ec04fc8 100644
--- a/lib/internal/Magento/Framework/App/Action/AbstractAction.php
+++ b/lib/internal/Magento/Framework/App/Action/AbstractAction.php
@@ -13,37 +13,31 @@
 /**
  * Class \Magento\Framework\App\Action\AbstractAction
  *
- * @since 2.0.0
  */
 abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\Controller\Result\RedirectFactory
-     * @since 2.0.0
      */
     protected $resultRedirectFactory;
 
     /**
      * @var \Magento\Framework\Controller\ResultFactory
-     * @since 2.0.0
      */
     protected $resultFactory;
 
     /**
      * @param Context $context
-     * @since 2.0.0
      */
     public function __construct(
         Context $context
@@ -59,7 +53,6 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return ResponseInterface
-     * @since 2.0.0
      */
     abstract public function dispatch(RequestInterface $request);
 
@@ -67,7 +60,6 @@ abstract public function dispatch(RequestInterface $request);
      * Retrieve request object
      *
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -78,7 +70,6 @@ public function getRequest()
      * Retrieve response object
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function getResponse()
     {
diff --git a/lib/internal/Magento/Framework/App/Action/Action.php b/lib/internal/Magento/Framework/App/Action/Action.php
index 7a8323e74d091..b68e7e873be6a 100644
--- a/lib/internal/Magento/Framework/App/Action/Action.php
+++ b/lib/internal/Magento/Framework/App/Action/Action.php
@@ -20,13 +20,11 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Action extends AbstractAction
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -35,49 +33,41 @@ abstract class Action extends AbstractAction
      * Should be defined for proper working session.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sessionNamespace;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $_redirect;
 
     /**
      * @var \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     protected $_view;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @param Context $context
-     * @since 2.0.0
      */
     public function __construct(Context $context)
     {
@@ -97,7 +87,6 @@ public function __construct(Context $context)
      * @param RequestInterface $request
      * @return ResponseInterface
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -143,7 +132,6 @@ public function dispatch(RequestInterface $request)
      * @param string|null $module
      * @param array|null $params
      * @return void
-     * @since 2.0.0
      */
     protected function _forward($action, $controller = null, $module = null, array $params = null)
     {
@@ -174,7 +162,6 @@ protected function _forward($action, $controller = null, $module = null, array $
      * @param   string $path
      * @param   array $arguments
      * @return  ResponseInterface
-     * @since 2.0.0
      */
     protected function _redirect($path, $arguments = [])
     {
@@ -184,7 +171,6 @@ protected function _redirect($path, $arguments = [])
 
     /**
      * @return \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     public function getActionFlag()
     {
diff --git a/lib/internal/Magento/Framework/App/Action/Context.php b/lib/internal/Magento/Framework/App/Action/Context.php
index cae21af83944b..5f5f013f454f2 100644
--- a/lib/internal/Magento/Framework/App/Action/Context.php
+++ b/lib/internal/Magento/Framework/App/Action/Context.php
@@ -19,73 +19,61 @@
  * the classes they were introduced for.
  *
  * @api
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $_redirect;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     protected $_view;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var \Magento\Framework\Controller\Result\RedirectFactory
-     * @since 2.0.0
      */
     protected $resultRedirectFactory;
 
     /**
      * @var \Magento\Framework\Controller\ResultFactory
-     * @since 2.0.0
      */
     protected $resultFactory;
 
@@ -103,7 +91,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\Controller\ResultFactory $resultFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -133,7 +120,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\App\ActionFlag
-     * @since 2.0.0
      */
     public function getActionFlag()
     {
@@ -142,7 +128,6 @@ public function getActionFlag()
 
     /**
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -151,7 +136,6 @@ public function getEventManager()
 
     /**
      * @return \Magento\Framework\App\ViewInterface
-     * @since 2.0.0
      */
     public function getView()
     {
@@ -160,7 +144,6 @@ public function getView()
 
     /**
      * @return \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     public function getObjectManager()
     {
@@ -169,7 +152,6 @@ public function getObjectManager()
 
     /**
      * @return \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     public function getRedirect()
     {
@@ -178,7 +160,6 @@ public function getRedirect()
 
     /**
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -187,7 +168,6 @@ public function getRequest()
 
     /**
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function getResponse()
     {
@@ -196,7 +176,6 @@ public function getResponse()
 
     /**
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -205,7 +184,6 @@ public function getUrl()
 
     /**
      * @return \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     public function getMessageManager()
     {
@@ -214,7 +192,6 @@ public function getMessageManager()
 
     /**
      * @return \Magento\Framework\Controller\Result\RedirectFactory
-     * @since 2.0.0
      */
     public function getResultRedirectFactory()
     {
@@ -223,7 +200,6 @@ public function getResultRedirectFactory()
 
     /**
      * @return \Magento\Framework\Controller\ResultFactory
-     * @since 2.0.0
      */
     public function getResultFactory()
     {
diff --git a/lib/internal/Magento/Framework/App/Action/Forward.php b/lib/internal/Magento/Framework/App/Action/Forward.php
index 49ea1f64d4f25..c88fbddeab1a4 100644
--- a/lib/internal/Magento/Framework/App/Action/Forward.php
+++ b/lib/internal/Magento/Framework/App/Action/Forward.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\App\Action\Forward
  *
- * @since 2.0.0
  */
 class Forward extends AbstractAction
 {
@@ -21,7 +20,6 @@ class Forward extends AbstractAction
      * @param RequestInterface $request
      * @return ResponseInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -30,7 +28,6 @@ public function dispatch(RequestInterface $request)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
index 49748ee7f32c4..f58fe5c136db5 100644
--- a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
+++ b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Framework\App\Action\Plugin\Design
  *
- * @since 2.0.0
  */
 class Design
 {
     /**
      * @var \Magento\Framework\View\DesignLoader
-     * @since 2.0.0
      */
     protected $_designLoader;
 
@@ -29,7 +27,6 @@ class Design
     /**
      * @param \Magento\Framework\View\DesignLoader $designLoader
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\DesignLoader $designLoader,
diff --git a/lib/internal/Magento/Framework/App/Action/Redirect.php b/lib/internal/Magento/Framework/App/Action/Redirect.php
index daa71c178b488..c97b38cdcb257 100644
--- a/lib/internal/Magento/Framework/App/Action/Redirect.php
+++ b/lib/internal/Magento/Framework/App/Action/Redirect.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\App\Action\Redirect
  *
- * @since 2.0.0
  */
 class Redirect extends AbstractAction
 {
@@ -23,7 +22,6 @@ class Redirect extends AbstractAction
      * @param RequestInterface $request
      * @return ResponseInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
@@ -32,7 +30,6 @@ public function dispatch(RequestInterface $request)
 
     /**
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/lib/internal/Magento/Framework/App/ActionFactory.php b/lib/internal/Magento/Framework/App/ActionFactory.php
index c581d6f0507da..f929c38b75219 100644
--- a/lib/internal/Magento/Framework/App/ActionFactory.php
+++ b/lib/internal/Magento/Framework/App/ActionFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ActionFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $actionName
      * @return ActionInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($actionName)
     {
diff --git a/lib/internal/Magento/Framework/App/ActionFlag.php b/lib/internal/Magento/Framework/App/ActionFlag.php
index c4720d89f8a85..657c2ede9262d 100644
--- a/lib/internal/Magento/Framework/App/ActionFlag.php
+++ b/lib/internal/Magento/Framework/App/ActionFlag.php
@@ -13,25 +13,21 @@
  * Please use plugins to prevent action dispatching instead.
  *
  * @api
- * @since 2.0.0
  */
 class ActionFlag
 {
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_flags = [];
 
     /**
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\RequestInterface $request)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\App\RequestInterface $request)
      * @param   string $flag
      * @param   string $value
      * @return void
-     * @since 2.0.0
      */
     public function set($action, $flag, $value)
     {
@@ -63,7 +58,6 @@ public function set($action, $flag, $value)
      * @return  bool
      *
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function get($action, $flag = '')
     {
@@ -85,7 +79,6 @@ public function get($action, $flag = '')
      * Get controller key
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getControllerKey()
     {
diff --git a/lib/internal/Magento/Framework/App/ActionInterface.php b/lib/internal/Magento/Framework/App/ActionInterface.php
index ae4196249cd06..921e1a2e16b1e 100644
--- a/lib/internal/Magento/Framework/App/ActionInterface.php
+++ b/lib/internal/Magento/Framework/App/ActionInterface.php
@@ -9,7 +9,6 @@
  * Magento application action controller type. Every action controller in Application should implement this interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ActionInterface
 {
@@ -30,7 +29,6 @@ interface ActionInterface
      *
      * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
      * @throws \Magento\Framework\Exception\NotFoundException
-     * @since 2.0.0
      */
     public function execute();
 }
diff --git a/lib/internal/Magento/Framework/App/Area.php b/lib/internal/Magento/Framework/App/Area.php
index a57f0b5ff41cb..265a6554d2ddc 100644
--- a/lib/internal/Magento/Framework/App/Area.php
+++ b/lib/internal/Magento/Framework/App/Area.php
@@ -12,7 +12,6 @@
  * Application area model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Area implements \Magento\Framework\App\AreaInterface
 {
@@ -38,7 +37,6 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Array of area loaded parts
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_loadedParts;
 
@@ -46,7 +44,6 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Area code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_code;
 
@@ -54,7 +51,6 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Event Manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -62,7 +58,6 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Translator
      *
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $_translator;
 
@@ -70,19 +65,16 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var ConfigLoaderInterface
-     * @since 2.0.0
      */
     protected $_diConfigLoader;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -90,19 +82,16 @@ class Area implements \Magento\Framework\App\AreaInterface
      * Core design
      *
      * @var \Magento\Framework\App\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $_scopeResolver;
 
     /**
      * @var \Magento\Framework\View\DesignExceptions
-     * @since 2.0.0
      */
     protected $_designExceptions;
 
@@ -116,7 +105,6 @@ class Area implements \Magento\Framework\App\AreaInterface
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param \Magento\Framework\View\DesignExceptions $designExceptions
      * @param string $areaCode
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -145,7 +133,6 @@ public function __construct(
      *
      * @param   string|null $part
      * @return  $this
-     * @since 2.0.0
      */
     public function load($part = null)
     {
@@ -162,7 +149,6 @@ public function load($part = null)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return void
-     * @since 2.0.0
      */
     public function detectDesign($request = null)
     {
@@ -183,7 +169,6 @@ public function detectDesign($request = null)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     protected function _applyUserAgentDesignException($request)
     {
@@ -201,7 +186,6 @@ protected function _applyUserAgentDesignException($request)
 
     /**
      * @return \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected function _getDesign()
     {
@@ -213,7 +197,6 @@ protected function _getDesign()
      *
      * @param   string $part
      * @return  $this
-     * @since 2.0.0
      */
     protected function _loadPart($part)
     {
@@ -244,7 +227,6 @@ protected function _loadPart($part)
      * Load area configuration
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initConfig()
     {
@@ -256,7 +238,6 @@ protected function _initConfig()
      * Initialize translate object.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initTranslate()
     {
@@ -273,7 +254,6 @@ protected function _initTranslate()
      * Initialize design
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initDesign()
     {
diff --git a/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php b/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
index ca4559b304234..6a4f79dfefe82 100644
--- a/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
+++ b/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
@@ -12,19 +12,16 @@
  * Keeping it for backward compatibility
  *
  * @api
- * @since 2.0.0
  */
 class FrontNameResolverFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $className
      * @return FrontNameResolverInterface
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php b/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
index 3643526b27d7b..fcdee6276c63c 100644
--- a/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
@@ -17,7 +17,6 @@
  * for areas with dynamic front names.
  *
  * @api
- * @since 2.0.0
  */
 interface FrontNameResolverInterface
 {
@@ -26,7 +25,6 @@ interface FrontNameResolverInterface
      *
      * @param bool $checkHost if true, return front name only if it is valid for the current host
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFrontName($checkHost = false);
 }
diff --git a/lib/internal/Magento/Framework/App/AreaInterface.php b/lib/internal/Magento/Framework/App/AreaInterface.php
index d59e4516e89fc..b7e36b59a62d8 100644
--- a/lib/internal/Magento/Framework/App/AreaInterface.php
+++ b/lib/internal/Magento/Framework/App/AreaInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Interface AreaInterface
- * @since 2.0.0
  */
 interface AreaInterface
 {
@@ -21,7 +20,6 @@ interface AreaInterface
      *
      * @param string $partName
      * @return $this
-     * @since 2.0.0
      */
     public function load($partName = null);
 }
diff --git a/lib/internal/Magento/Framework/App/AreaList.php b/lib/internal/Magento/Framework/App/AreaList.php
index baa213974c902..67f3b0dafd601 100644
--- a/lib/internal/Magento/Framework/App/AreaList.php
+++ b/lib/internal/Magento/Framework/App/AreaList.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\AreaList
  *
- * @since 2.0.0
  */
 class AreaList
 {
@@ -18,31 +17,26 @@ class AreaList
      * Area configuration list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_areas = [];
 
     /**
      * @var \Magento\Framework\App\AreaInterface[]
-     * @since 2.0.0
      */
     protected $_areaInstances = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultAreaCode;
 
     /**
      * @var Area\FrontNameResolverFactory
-     * @since 2.0.0
      */
     protected $_resolverFactory;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -51,7 +45,6 @@ class AreaList
      * @param Area\FrontNameResolverFactory $resolverFactory
      * @param array $areas
      * @param string|null $default
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -75,7 +68,6 @@ public function __construct(
      * @param string $frontName
      * @return null|string
      * @api
-     * @since 2.0.0
      */
     public function getCodeByFrontName($frontName)
     {
@@ -97,7 +89,6 @@ public function getCodeByFrontName($frontName)
      * @param string $areaCode
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getFrontName($areaCode)
     {
@@ -109,7 +100,6 @@ public function getFrontName($areaCode)
      *
      * @return string[]
      * @api
-     * @since 2.0.0
      */
     public function getCodes()
     {
@@ -122,7 +112,6 @@ public function getCodes()
      * @param string $areaCode
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getDefaultRouter($areaCode)
     {
@@ -134,7 +123,6 @@ public function getDefaultRouter($areaCode)
      *
      * @param   string $code
      * @return  \Magento\Framework\App\Area
-     * @since 2.0.0
      */
     public function getArea($code)
     {
diff --git a/lib/internal/Magento/Framework/App/AreaList/Proxy.php b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
index 40f1b8e01a5db..bdd05019ff47d 100644
--- a/lib/internal/Magento/Framework/App/AreaList/Proxy.php
+++ b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\AreaList\Proxy
  *
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\App\AreaList implements
     \Magento\Framework\ObjectManager\NoninterceptableInterface
@@ -19,7 +18,6 @@ class Proxy extends \Magento\Framework\App\AreaList implements
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -27,7 +25,6 @@ class Proxy extends \Magento\Framework\App\AreaList implements
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -35,7 +32,6 @@ class Proxy extends \Magento\Framework\App\AreaList implements
      * Proxied instance
      *
      * @var \Magento\Framework\Locale\Resolver
-     * @since 2.0.0
      */
     protected $_subject = null;
 
@@ -43,7 +39,6 @@ class Proxy extends \Magento\Framework\App\AreaList implements
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isShared = null;
 
@@ -53,7 +48,6 @@ class Proxy extends \Magento\Framework\App\AreaList implements
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -67,7 +61,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -78,7 +71,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -89,7 +81,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -100,7 +91,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\Locale\Resolver
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -117,7 +107,6 @@ protected function _getSubject()
      *
      * @param string $frontName
      * @return null|string
-     * @since 2.0.0
      */
     public function getCodeByFrontName($frontName)
     {
@@ -129,7 +118,6 @@ public function getCodeByFrontName($frontName)
      *
      * @param string $areaCode
      * @return string
-     * @since 2.0.0
      */
     public function getFrontName($areaCode)
     {
@@ -140,7 +128,6 @@ public function getFrontName($areaCode)
      * Retrieve area codes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getCodes()
     {
@@ -152,7 +139,6 @@ public function getCodes()
      *
      * @param string $areaCode
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultRouter($areaCode)
     {
@@ -164,7 +150,6 @@ public function getDefaultRouter($areaCode)
      *
      * @param   string $code
      * @return  \Magento\Framework\App\Area
-     * @since 2.0.0
      */
     public function getArea($code)
     {
diff --git a/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php b/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php
index c96c6318e93eb..08a8d0440205f 100644
--- a/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php
+++ b/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php
@@ -10,19 +10,16 @@
 
 /**
  * Interpreter that returns value of an application argument, retrieving its name from a constant
- * @since 2.0.0
  */
 class ArgumentInterpreter implements InterpreterInterface
 {
     /**
      * @var Constant
-     * @since 2.0.0
      */
     private $constInterpreter;
 
     /**
      * @param Constant $constInterpreter
-     * @since 2.0.0
      */
     public function __construct(Constant $constInterpreter)
     {
@@ -32,7 +29,6 @@ public function __construct(Constant $constInterpreter)
     /**
      * {@inheritdoc}
      * @return mixed
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/App/Arguments/FileResolver/Primary.php b/lib/internal/Magento/Framework/App/Arguments/FileResolver/Primary.php
index 9176d335be817..0dc50a47ba244 100644
--- a/lib/internal/Magento/Framework/App/Arguments/FileResolver/Primary.php
+++ b/lib/internal/Magento/Framework/App/Arguments/FileResolver/Primary.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Framework\App\Arguments\FileResolver\Primary
  *
- * @since 2.0.0
  */
 class Primary implements \Magento\Framework\Config\FileResolverInterface
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $configDirectory;
 
     /**
      * @var \Magento\Framework\Config\FileIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Config\FileIteratorFactory $iteratorFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -44,7 +40,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/lib/internal/Magento/Framework/App/Arguments/ValidationState.php b/lib/internal/Magento/Framework/App/Arguments/ValidationState.php
index 147b209dfb208..165d0309194f8 100644
--- a/lib/internal/Magento/Framework/App/Arguments/ValidationState.php
+++ b/lib/internal/Magento/Framework/App/Arguments/ValidationState.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\Arguments\ValidationState
  *
- * @since 2.0.0
  */
 class ValidationState implements \Magento\Framework\Config\ValidationStateInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_appMode;
 
     /**
      * @param string $appMode
-     * @since 2.0.0
      */
     public function __construct($appMode)
     {
@@ -33,7 +30,6 @@ public function __construct($appMode)
      * Retrieve current validation state
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isValidationRequired()
     {
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 72042bfb0aff9..4468954d189da 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -21,7 +21,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Bootstrap
 {
@@ -69,7 +68,6 @@ class Bootstrap
      * The initialization parameters (normally come from the $_SERVER)
      *
      * @var array
-     * @since 2.0.0
      */
     private $server;
 
@@ -77,7 +75,6 @@ class Bootstrap
      * Root directory
      *
      * @var string
-     * @since 2.0.0
      */
     private $rootDir;
 
@@ -85,7 +82,6 @@ class Bootstrap
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -93,7 +89,6 @@ class Bootstrap
      * Maintenance mode manager
      *
      * @var \Magento\Framework\App\MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenance;
 
@@ -101,7 +96,6 @@ class Bootstrap
      * Bootstrap-specific error code that may have been set in runtime
      *
      * @var int
-     * @since 2.0.0
      */
     private $errorCode = 0;
 
@@ -109,7 +103,6 @@ class Bootstrap
      * Attribute for creating object manager
      *
      * @var ObjectManagerFactory
-     * @since 2.0.0
      */
     private $factory;
 
@@ -120,7 +113,6 @@ class Bootstrap
      * @param array $initParams
      * @param ObjectManagerFactory $factory
      * @return Bootstrap
-     * @since 2.0.0
      */
     public static function create($rootDir, array $initParams, ObjectManagerFactory $factory = null)
     {
@@ -137,7 +129,6 @@ public static function create($rootDir, array $initParams, ObjectManagerFactory
      * @param string $rootDir
      * @param array $initParams
      * @return void
-     * @since 2.0.0
      */
     public static function populateAutoloader($rootDir, $initParams)
     {
@@ -152,7 +143,6 @@ public static function populateAutoloader($rootDir, $initParams)
      * @param string $rootDir
      * @param array $initParams
      * @return ObjectManagerFactory
-     * @since 2.0.0
      */
     public static function createObjectManagerFactory($rootDir, array $initParams)
     {
@@ -168,7 +158,6 @@ public static function createObjectManagerFactory($rootDir, array $initParams)
      * @param string $rootDir
      * @param array $initParams
      * @return DirectoryList
-     * @since 2.0.0
      */
     public static function createFilesystemDirectoryList($rootDir, array $initParams)
     {
@@ -184,7 +173,6 @@ public static function createFilesystemDirectoryList($rootDir, array $initParams
      *
      * @param array $initParams
      * @return DriverPool
-     * @since 2.0.0
      */
     public static function createFilesystemDriverPool(array $initParams)
     {
@@ -199,7 +187,6 @@ public static function createFilesystemDriverPool(array $initParams)
      * Creates instance of configuration files pool
      *
      * @return DriverPool
-     * @since 2.0.0
      */
     public static function createConfigFilePool()
     {
@@ -212,7 +199,6 @@ public static function createConfigFilePool()
      * @param ObjectManagerFactory $factory
      * @param string $rootDir
      * @param array $initParams
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerFactory $factory, $rootDir, array $initParams)
     {
@@ -226,7 +212,6 @@ public function __construct(ObjectManagerFactory $factory, $rootDir, array $init
      * Gets the current parameters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParams()
     {
@@ -240,7 +225,6 @@ public function getParams()
      * @param array $arguments
      * @return \Magento\Framework\AppInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createApplication($type, $arguments = [])
     {
@@ -260,7 +244,6 @@ public function createApplication($type, $arguments = [])
      *
      * @param \Magento\Framework\AppInterface $application
      * @return void
-     * @since 2.0.0
      */
     public function run(AppInterface $application)
     {
@@ -289,7 +272,6 @@ public function run(AppInterface $application)
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function assertMaintenance()
     {
@@ -322,7 +304,6 @@ protected function assertMaintenance()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function assertInstalled()
     {
@@ -349,7 +330,6 @@ protected function assertInstalled()
      * @param string $key
      * @param bool $default
      * @return bool|null
-     * @since 2.0.0
      */
     private function getIsExpected($key, $default)
     {
@@ -366,7 +346,6 @@ private function getIsExpected($key, $default)
      * Determines whether application is installed
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isInstalled()
     {
@@ -379,7 +358,6 @@ private function isInstalled()
      * Gets the object manager instance
      *
      * @return \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     public function getObjectManager()
     {
@@ -390,7 +368,6 @@ public function getObjectManager()
      * Sets a custom error handler
      *
      * @return void
-     * @since 2.0.0
      */
     private function initErrorHandler()
     {
@@ -402,7 +379,6 @@ private function initErrorHandler()
      * Getter for error code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getErrorCode()
     {
@@ -413,7 +389,6 @@ public function getErrorCode()
      * Checks whether developer mode is set in the initialization parameters
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDeveloperMode()
     {
@@ -437,7 +412,6 @@ public function isDeveloperMode()
      * @param \Exception $e
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     protected function terminate(\Exception $e)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache.php b/lib/internal/Magento/Framework/App/Cache.php
index 8e6177d7b8ac4..a8d83c2afe45e 100644
--- a/lib/internal/Magento/Framework/App/Cache.php
+++ b/lib/internal/Magento/Framework/App/Cache.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Framework\App\Cache
  *
- * @since 2.0.0
  */
 class Cache implements CacheInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_frontendIdentifier = \Magento\Framework\App\Cache\Frontend\Pool::DEFAULT_FRONTEND_ID;
 
     /**
      * @var \Magento\Framework\App\Cache\Frontend\Pool
-     * @since 2.0.0
      */
     protected $_frontendPool;
 
@@ -33,13 +30,11 @@ class Cache implements CacheInterface
      * Cache frontend API
      *
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_frontend;
 
     /**
      * @param \Magento\Framework\App\Cache\Frontend\Pool $frontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Frontend\Pool $frontendPool)
     {
@@ -51,7 +46,6 @@ public function __construct(\Magento\Framework\App\Cache\Frontend\Pool $frontend
      * Get cache frontend API object
      *
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     public function getFrontend()
     {
@@ -63,7 +57,6 @@ public function getFrontend()
      *
      * @param  string $identifier
      * @return string
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -78,7 +71,6 @@ public function load($identifier)
      * @param array $tags
      * @param int $lifeTime
      * @return bool
-     * @since 2.0.0
      */
     public function save($data, $identifier, $tags = [], $lifeTime = null)
     {
@@ -90,7 +82,6 @@ public function save($data, $identifier, $tags = [], $lifeTime = null)
      *
      * @param string $identifier
      * @return bool
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -102,7 +93,6 @@ public function remove($identifier)
      *
      * @param array $tags
      * @return bool
-     * @since 2.0.0
      */
     public function clean($tags = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
index 5525dde7dd060..18547896115b5 100644
--- a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
+++ b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
@@ -8,31 +8,31 @@
 
 /**
  * Automatic cache cleaner plugin
- * @since 2.1.0
+ * @since 2.0.9
  */
 class FlushCacheByTags
 {
     /**
      * @var Type\FrontendPool
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $cachePool;
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $cacheList;
 
     /**
      * @var StateInterface
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private $cacheState;
 
     /**
      * @var Tag\Resolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $tagResolver;
 
@@ -43,7 +43,7 @@ class FlushCacheByTags
      * @param StateInterface $cacheState
      * @param array $cacheList
      * @param Tag\Resolver $tagResolver
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\FrontendPool $cachePool,
@@ -65,7 +65,7 @@ public function __construct(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\AbstractResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function aroundSave(
         \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
@@ -87,7 +87,7 @@ public function aroundSave(
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\AbstractResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function aroundDelete(
         \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
@@ -105,7 +105,7 @@ public function aroundDelete(
      *
      * @param  string[] $tags
      * @return void
-     * @since 2.1.0
+     * @since 2.0.9
      */
     private function cleanCacheByTags($tags)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
index eaa27e5bd8091..4c539da0960ea 100644
--- a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
+++ b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -16,7 +16,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Factory
 {
@@ -32,13 +31,11 @@ class Factory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $_filesystem;
 
@@ -46,7 +43,6 @@ class Factory
      * Cache options to be enforced for all instances being created
      *
      * @var array
-     * @since 2.0.0
      */
     private $_enforcedOptions = [];
 
@@ -58,7 +54,6 @@ class Factory
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     private $_decorators = [];
 
@@ -66,7 +61,6 @@ class Factory
      * Default cache backend type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultBackend = 'Cm_Cache_Backend_File';
 
@@ -74,7 +68,6 @@ class Factory
      * Options for default backend
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_backendOptions = [
         'hashed_directory_level' => 1,
@@ -86,7 +79,6 @@ class Factory
      * Resource
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -96,7 +88,6 @@ class Factory
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param array $enforcedOptions
      * @param array $decorators
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -117,7 +108,6 @@ public function __construct(
      *
      * @param array $options
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     public function create(array $options)
     {
@@ -181,7 +171,6 @@ public function create(array $options)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     private function _getExpandedOptions(array $options)
     {
@@ -195,7 +184,6 @@ private function _getExpandedOptions(array $options)
      * @return \Magento\Framework\Cache\FrontendInterface
      * @throws \LogicException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     private function _applyDecorators(\Magento\Framework\Cache\FrontendInterface $frontend)
     {
@@ -222,7 +210,6 @@ private function _applyDecorators(\Magento\Framework\Cache\FrontendInterface $fr
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getBackendOptions(array $cacheOptions)
     {
@@ -315,7 +302,6 @@ protected function _getBackendOptions(array $cacheOptions)
      * Get options for database backend type
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDbAdapterOptions()
     {
@@ -337,7 +323,6 @@ protected function _getDbAdapterOptions()
      * @param array $fastOptions fast level backend type and options
      * @param array $cacheOptions all cache options
      * @return array
-     * @since 2.0.0
      */
     protected function _getTwoLevelsBackendOptions($fastOptions, $cacheOptions)
     {
@@ -384,7 +369,6 @@ protected function _getTwoLevelsBackendOptions($fastOptions, $cacheOptions)
      * @param  array $cacheOptions
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getFrontendOptions(array $cacheOptions)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Pool.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Pool.php
index a3f09ad95ddea..30cb4a67b9edd 100644
--- a/lib/internal/Magento/Framework/App/Cache/Frontend/Pool.php
+++ b/lib/internal/Magento/Framework/App/Cache/Frontend/Pool.php
@@ -10,7 +10,6 @@
 
 /**
  * In-memory readonly pool of all cache front-end instances known to the system
- * @since 2.0.0
  */
 class Pool implements \Iterator
 {
@@ -21,25 +20,21 @@ class Pool implements \Iterator
 
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var Factory
-     * @since 2.0.0
      */
     private $_factory;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface[]
-     * @since 2.0.0
      */
     private $_instances;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_frontendSettings;
 
@@ -47,7 +42,6 @@ class Pool implements \Iterator
      * @param DeploymentConfig $deploymentConfig
      * @param Factory $frontendFactory
      * @param array $frontendSettings Format: array('<frontend_id>' => array(<cache_settings>), ...)
-     * @since 2.0.0
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -64,7 +58,6 @@ public function __construct(
      * Method is to be used for delayed initialization of the iterator.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initialize()
     {
@@ -80,7 +73,6 @@ protected function _initialize()
      * Retrieve settings for all cache front-ends known to the system
      *
      * @return array Format: array('<frontend_id>' => array(<cache_settings>), ...)
-     * @since 2.0.0
      */
     protected function _getCacheSettings()
     {
@@ -99,7 +91,6 @@ protected function _getCacheSettings()
      * {@inheritdoc}
      *
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     public function current()
     {
@@ -109,7 +100,6 @@ public function current()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function key()
     {
@@ -119,7 +109,6 @@ public function key()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function next()
     {
@@ -129,7 +118,6 @@ public function next()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -139,7 +127,6 @@ public function rewind()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -153,7 +140,6 @@ public function valid()
      * @param string $identifier Cache frontend identifier
      * @return \Magento\Framework\Cache\FrontendInterface Cache frontend instance
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function get($identifier)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/InstanceFactory.php b/lib/internal/Magento/Framework/App/Cache/InstanceFactory.php
index f9974fff5df15..9ada8a2d8411c 100644
--- a/lib/internal/Magento/Framework/App/Cache/InstanceFactory.php
+++ b/lib/internal/Magento/Framework/App/Cache/InstanceFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\App\Cache\InstanceFactory
  *
- * @since 2.0.0
  */
 class InstanceFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $instanceName
      * @return \Magento\Framework\Cache\FrontendInterface
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function get($instanceName)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index 86b36c273eac2..7ac53d5d6e070 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -12,7 +12,6 @@
  * Cache status manager
  *
  * @api
- * @since 2.0.0
  */
 class Manager
 {
@@ -20,7 +19,6 @@ class Manager
      * Cache types list
      *
      * @var TypeListInterface
-     * @since 2.0.0
      */
     private $cacheTypeList;
 
@@ -28,7 +26,6 @@ class Manager
      * Cache state service
      *
      * @var StateInterface
-     * @since 2.0.0
      */
     private $cacheState;
 
@@ -36,7 +33,6 @@ class Manager
      * Cache types pool
      *
      * @var Type\FrontendPool
-     * @since 2.0.0
      */
     private $pool;
 
@@ -46,7 +42,6 @@ class Manager
      * @param TypeListInterface $cacheTypeList
      * @param StateInterface $cacheState
      * @param Type\FrontendPool $pool
-     * @since 2.0.0
      */
     public function __construct(
         TypeListInterface $cacheTypeList,
@@ -64,7 +59,6 @@ public function __construct(
      * @param string[] $types
      * @param bool $isEnabled
      * @return array List of types with changed status
-     * @since 2.0.0
      */
     public function setEnabled(array $types, $isEnabled)
     {
@@ -89,7 +83,6 @@ public function setEnabled(array $types, $isEnabled)
      *
      * @param array $types
      * @return void
-     * @since 2.0.0
      */
     public function clean(array $types)
     {
@@ -103,7 +96,6 @@ public function clean(array $types)
      *
      * @param string[] $types
      * @return void
-     * @since 2.0.0
      */
     public function flush(array $types)
     {
@@ -122,7 +114,6 @@ public function flush(array $types)
      * Presents summary about cache status
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -135,7 +126,6 @@ public function getStatus()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableTypes()
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Proxy.php b/lib/internal/Magento/Framework/App/Cache/Proxy.php
index 10ae2009ba1ed..50c14e24203b0 100644
--- a/lib/internal/Magento/Framework/App/Cache/Proxy.php
+++ b/lib/internal/Magento/Framework/App/Cache/Proxy.php
@@ -10,7 +10,6 @@
 
 /**
  * System cache proxy model
- * @since 2.0.0
  */
 class Proxy implements
     CacheInterface,
@@ -18,19 +17,16 @@ class Proxy implements
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -41,7 +37,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Create cache model
      *
      * @return CacheInterface
-     * @since 2.0.0
      */
     protected function _getCache()
     {
@@ -55,7 +50,6 @@ protected function _getCache()
      * Get cache frontend API object
      *
      * @return \Zend_Cache_Core
-     * @since 2.0.0
      */
     public function getFrontend()
     {
@@ -67,7 +61,6 @@ public function getFrontend()
      *
      * @param  string $identifier
      * @return string
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -82,7 +75,6 @@ public function load($identifier)
      * @param array $tags
      * @param int $lifeTime
      * @return bool
-     * @since 2.0.0
      */
     public function save($data, $identifier, $tags = [], $lifeTime = null)
     {
@@ -94,7 +86,6 @@ public function save($data, $identifier, $tags = [], $lifeTime = null)
      *
      * @param string $identifier
      * @return bool
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -106,7 +97,6 @@ public function remove($identifier)
      *
      * @param array $tags
      * @return bool
-     * @since 2.0.0
      */
     public function clean($tags = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php
index 44ae33523e830..6caf5d9964e27 100644
--- a/lib/internal/Magento/Framework/App/Cache/State.php
+++ b/lib/internal/Magento/Framework/App/Cache/State.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\Cache\State
  *
- * @since 2.0.0
  */
 class State implements StateInterface
 {
@@ -32,7 +31,6 @@ class State implements StateInterface
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $config;
 
@@ -40,7 +38,6 @@ class State implements StateInterface
      * Deployment configuration storage writer
      *
      * @var Writer
-     * @since 2.0.0
      */
     private $writer;
 
@@ -48,7 +45,6 @@ class State implements StateInterface
      * Associative array of cache type codes and their statuses (enabled/disabled)
      *
      * @var array
-     * @since 2.0.0
      */
     private $statuses;
 
@@ -56,7 +52,6 @@ class State implements StateInterface
      * Whether all cache types are forced to be disabled
      *
      * @var bool
-     * @since 2.0.0
      */
     private $banAll;
 
@@ -66,7 +61,6 @@ class State implements StateInterface
      * @param DeploymentConfig $config
      * @param Writer $writer
      * @param bool $banAll
-     * @since 2.0.0
      */
     public function __construct(DeploymentConfig $config, Writer $writer, $banAll = false)
     {
@@ -80,7 +74,6 @@ public function __construct(DeploymentConfig $config, Writer $writer, $banAll =
      *
      * @param string $cacheType
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($cacheType)
     {
@@ -94,7 +87,6 @@ public function isEnabled($cacheType)
      * @param string $cacheType
      * @param bool $isEnabled
      * @return void
-     * @since 2.0.0
      */
     public function setEnabled($cacheType, $isEnabled)
     {
@@ -106,7 +98,6 @@ public function setEnabled($cacheType, $isEnabled)
      * Save the current statuses (enabled/disabled) of cache types to the persistent storage
      *
      * @return void
-     * @since 2.0.0
      */
     public function persist()
     {
@@ -118,7 +109,6 @@ public function persist()
      * Load statuses (enabled/disabled) of cache types
      *
      * @return void
-     * @since 2.0.0
      */
     private function load()
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/StateInterface.php b/lib/internal/Magento/Framework/App/Cache/StateInterface.php
index 4e0b4db528a1b..c9f6db3dd8899 100644
--- a/lib/internal/Magento/Framework/App/Cache/StateInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/StateInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface StateInterface
 {
@@ -16,7 +15,6 @@ interface StateInterface
      *
      * @param string $cacheType
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($cacheType);
 
@@ -26,7 +24,6 @@ public function isEnabled($cacheType);
      * @param string $cacheType
      * @param bool $isEnabled
      * @return void
-     * @since 2.0.0
      */
     public function setEnabled($cacheType, $isEnabled);
 
@@ -34,7 +31,6 @@ public function setEnabled($cacheType, $isEnabled);
      * Save the current statuses (enabled/disabled) of cache types to the persistent storage
      *
      * @return void
-     * @since 2.0.0
      */
     public function persist();
 }
diff --git a/lib/internal/Magento/Framework/App/Cache/Tag/Resolver.php b/lib/internal/Magento/Framework/App/Cache/Tag/Resolver.php
index fc34046e0d405..950c16f179733 100644
--- a/lib/internal/Magento/Framework/App/Cache/Tag/Resolver.php
+++ b/lib/internal/Magento/Framework/App/Cache/Tag/Resolver.php
@@ -7,7 +7,7 @@
 
 /**
  * Resolves invalidation tags for specified object using different strategies
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Resolver
 {
@@ -15,7 +15,7 @@ class Resolver
      * Tag strategies factory
      *
      * @var Strategy\Factory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $strategyFactory;
 
@@ -23,7 +23,7 @@ class Resolver
      * Resolver constructor.
      *
      * @param Strategy\Factory $factory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(\Magento\Framework\App\Cache\Tag\Strategy\Factory $factory)
     {
@@ -36,7 +36,7 @@ public function __construct(\Magento\Framework\App\Cache\Tag\Strategy\Factory $f
      * @param object $object
      * @throws \InvalidArgumentException
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTags($object)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Dummy.php b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Dummy.php
index 1b5326f620bc1..55c303338dead 100644
--- a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Dummy.php
+++ b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Dummy.php
@@ -9,13 +9,13 @@
 
 /**
  * Always return empty tags array
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Dummy implements StrategyInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTags($object)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Factory.php b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Factory.php
index 2be2315f0c37a..234f01634530a 100644
--- a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Factory.php
+++ b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Factory.php
@@ -9,7 +9,7 @@
 
 /**
  * Creates strategies using configuration
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Factory
 {
@@ -17,7 +17,7 @@ class Factory
      * Default strategy for objects which implement Identity interface
      *
      * @var StrategyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $identifierStrategy;
 
@@ -25,7 +25,7 @@ class Factory
      * Strategy for objects which don't implement Identity interface
      *
      * @var StrategyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $dummyStrategy;
 
@@ -33,7 +33,7 @@ class Factory
      * Strategies map
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $customStrategies = [];
 
@@ -43,7 +43,7 @@ class Factory
      * @param Identifier $identifierStrategy
      * @param Dummy $dummyStrategy
      * @param array $customStrategies
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\App\Cache\Tag\Strategy\Identifier $identifierStrategy,
@@ -61,7 +61,7 @@ public function __construct(
      * @param object $object
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\App\Cache\Tag\StrategyInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getStrategy($object)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Identifier.php b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Identifier.php
index a103598e5480e..25576edff0ea5 100644
--- a/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Identifier.php
+++ b/lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Identifier.php
@@ -9,13 +9,13 @@
 
 /**
  * Produce cache tags using IdentityInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Identifier implements StrategyInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTags($object)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Tag/StrategyInterface.php b/lib/internal/Magento/Framework/App/Cache/Tag/StrategyInterface.php
index 7be9f005122ee..151cdf2974534 100644
--- a/lib/internal/Magento/Framework/App/Cache/Tag/StrategyInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/Tag/StrategyInterface.php
@@ -9,7 +9,7 @@
  * Invalidation tags generator
  *
  * @api
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface StrategyInterface
 {
@@ -19,7 +19,7 @@ interface StrategyInterface
      * @param object $object
      * @throws \InvalidArgumentException
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getTags($object);
 }
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/AccessProxy.php b/lib/internal/Magento/Framework/App/Cache/Type/AccessProxy.php
index a720834fe6d85..2b641c2f3598d 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/AccessProxy.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/AccessProxy.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\Cache\Type\AccessProxy
  *
- * @since 2.0.0
  */
 class AccessProxy extends \Magento\Framework\Cache\Frontend\Decorator\Bare
 {
@@ -22,7 +21,6 @@ class AccessProxy extends \Magento\Framework\Cache\Frontend\Decorator\Bare
      * Cache types manager
      *
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     private $_cacheState;
 
@@ -30,7 +28,6 @@ class AccessProxy extends \Magento\Framework\Cache\Frontend\Decorator\Bare
      * Cache type identifier
      *
      * @var string
-     * @since 2.0.0
      */
     private $_identifier;
 
@@ -38,7 +35,6 @@ class AccessProxy extends \Magento\Framework\Cache\Frontend\Decorator\Bare
      * @param \Magento\Framework\Cache\FrontendInterface $frontend
      * @param \Magento\Framework\App\Cache\StateInterface $cacheState
      * @param string $identifier Cache type identifier
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Cache\FrontendInterface $frontend,
@@ -54,7 +50,6 @@ public function __construct(
      * Whether a cache type is enabled at the moment or not
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isEnabled()
     {
@@ -63,7 +58,6 @@ protected function _isEnabled()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function test($identifier)
     {
@@ -75,7 +69,6 @@ public function test($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -87,7 +80,6 @@ public function load($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
@@ -99,7 +91,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -111,7 +102,6 @@ public function remove($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Block.php b/lib/internal/Magento/Framework/App/Cache/Type/Block.php
index 98e4468b64f45..57f9477d9e360 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Block.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Block.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\Cache\Type\Block
  *
- * @since 2.0.0
  */
 class Block extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -30,7 +29,6 @@ class Block extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Collection.php b/lib/internal/Magento/Framework/App/Cache/Type/Collection.php
index 2b62be52855a5..7b1835287833c 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Collection.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * System / Cache Management / Cache type "Collections Data"
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -23,7 +22,6 @@ class Collection extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Config.php b/lib/internal/Magento/Framework/App/Cache/Type/Config.php
index 8bb28df21cc10..7c5547f936105 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Config.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Config.php
@@ -11,7 +11,6 @@
 
 /**
  * System / Cache Management / Cache type "Configuration"
- * @since 2.0.0
  */
 class Config extends TagScope implements CacheInterface
 {
@@ -27,13 +26,11 @@ class Config extends TagScope implements CacheInterface
 
     /**
      * @var \Magento\Framework\App\Cache\Type\FrontendPool
-     * @since 2.0.0
      */
     private $cacheFrontendPool;
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cach
      * Retrieve cache frontend instance being decorated
      *
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected function _getFrontend()
     {
@@ -60,7 +56,6 @@ protected function _getFrontend()
      * Retrieve cache tag name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTag()
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Dummy.php b/lib/internal/Magento/Framework/App/Cache/Type/Dummy.php
index 3e7eef2336ffa..7c1e66fcab74b 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Dummy.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Dummy.php
@@ -12,7 +12,7 @@
  *
  * for cases when need to disable interaction with cache
  * but no specific cache type is used
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Dummy implements CacheInterface
 {
@@ -20,7 +20,7 @@ class Dummy implements CacheInterface
      * Required by CacheInterface
      *
      * @return null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getFrontend()
     {
@@ -31,7 +31,7 @@ public function getFrontend()
      * Pretend to load data from cache by id
      *
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function load($identifier)
     {
@@ -42,7 +42,7 @@ public function load($identifier)
      * Pretend to save data
      *
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function save($data, $identifier, $tags = [], $lifeTime = null)
     {
@@ -53,7 +53,7 @@ public function save($data, $identifier, $tags = [], $lifeTime = null)
      * Pretend to remove cached data by identifier
      *
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function remove($identifier)
     {
@@ -64,7 +64,7 @@ public function remove($identifier)
      * Pretend to clean cached data by specific tag
      *
      * {@inheritdoc}
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean($tags = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
index af33c4cd811f5..596fd833ab1ed 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
@@ -12,7 +12,6 @@
  * In-memory readonly pool of cache front-ends with enforced access control, specific to cache types
  *
  * @api
- * @since 2.0.0
  */
 class FrontendPool
 {
@@ -33,31 +32,26 @@ class FrontendPool
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var \Magento\Framework\App\Cache\Frontend\Pool
-     * @since 2.0.0
      */
     private $_frontendPool;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_typeFrontendMap;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface[]
-     * @since 2.0.0
      */
     private $_instances = [];
 
@@ -66,7 +60,6 @@ class FrontendPool
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @param \Magento\Framework\App\Cache\Frontend\Pool $frontendPool
      * @param array $typeFrontendMap Format: array('<cache_type_id>' => '<cache_frontend_id>', ...)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -85,7 +78,6 @@ public function __construct(
      *
      * @param string $cacheType Cache type identifier
      * @return \Magento\Framework\Cache\FrontendInterface Cache frontend instance
-     * @since 2.0.0
      */
     public function get($cacheType)
     {
@@ -107,7 +99,6 @@ public function get($cacheType)
      *
      * @param string $cacheType
      * @return string
-     * @since 2.0.0
      */
     protected function _getCacheFrontendId($cacheType)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Layout.php b/lib/internal/Magento/Framework/App/Cache/Type/Layout.php
index c792fee5a1a72..2ea069a991829 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Layout.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Layout.php
@@ -7,7 +7,6 @@
 
 /**
  * System / Cache Management / Cache type "Layouts"
- * @since 2.0.0
  */
 class Layout extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -23,7 +22,6 @@ class Layout extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Reflection.php b/lib/internal/Magento/Framework/App/Cache/Type/Reflection.php
index 245e02da582ba..964c5e6ed9676 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Reflection.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Reflection.php
@@ -7,7 +7,6 @@
 
 /**
  * System / Cache Management / Cache type "Reflection Data"
- * @since 2.0.0
  */
 class Reflection extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -23,7 +22,6 @@ class Reflection extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/Translate.php b/lib/internal/Magento/Framework/App/Cache/Type/Translate.php
index b37b551cc1692..0ae73639c144c 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/Translate.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/Translate.php
@@ -7,7 +7,6 @@
 
 /**
  * System / Cache Management / Cache type "Translations"
- * @since 2.0.0
  */
 class Translate extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 {
@@ -23,7 +22,6 @@ class Translate extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
 
     /**
      * @param FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeList.php b/lib/internal/Magento/Framework/App/Cache/TypeList.php
index 8d7903430a3af..4346b069a531e 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeList.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeList.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\App\Cache\TypeList
  *
- * @since 2.0.0
  */
 class TypeList implements TypeListInterface
 {
@@ -19,25 +18,21 @@ class TypeList implements TypeListInterface
 
     /**
      * @var \Magento\Framework\Cache\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var InstanceFactory
-     * @since 2.0.0
      */
     protected $_factory;
 
     /**
      * @var StateInterface
-     * @since 2.0.0
      */
     protected $_cacheState;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -53,7 +48,6 @@ class TypeList implements TypeListInterface
      * @param InstanceFactory $factory
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param SerializerInterface $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Cache\ConfigInterface $config,
@@ -75,7 +69,6 @@ public function __construct(
      * @param string $type
      * @return \Magento\Framework\Cache\FrontendInterface
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function _getTypeInstance($type)
     {
@@ -90,7 +83,6 @@ protected function _getTypeInstance($type)
      * Get invalidate types codes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getInvalidatedTypes()
     {
@@ -108,7 +100,6 @@ protected function _getInvalidatedTypes()
      *
      * @param array $types
      * @return void
-     * @since 2.0.0
      */
     protected function _saveInvalidatedTypes($types)
     {
@@ -119,7 +110,6 @@ protected function _saveInvalidatedTypes($types)
      * Get information about all declared cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypes()
     {
@@ -148,7 +138,6 @@ public function getTypes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTypeLabels()
     {
@@ -165,7 +154,6 @@ public function getTypeLabels()
      * Get array of all invalidated cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInvalidated()
     {
@@ -187,7 +175,6 @@ public function getInvalidated()
      *
      * @param string|array $typeCode
      * @return void
-     * @since 2.0.0
      */
     public function invalidate($typeCode)
     {
@@ -206,7 +193,6 @@ public function invalidate($typeCode)
      *
      * @param string $typeCode
      * @return void
-     * @since 2.0.0
      */
     public function cleanType($typeCode)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
index 09403087b1d54..8f18f5b57d6cc 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface TypeListInterface
 {
@@ -15,7 +14,6 @@ interface TypeListInterface
      * Get information about all declared cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypes();
 
@@ -23,7 +21,6 @@ public function getTypes();
      * Get label information of available cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypeLabels();
 
@@ -31,7 +28,6 @@ public function getTypeLabels();
      * Get array of all invalidated cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInvalidated();
 
@@ -40,7 +36,6 @@ public function getInvalidated();
      *
      * @param string|array $typeCode
      * @return void
-     * @since 2.0.0
      */
     public function invalidate($typeCode);
 
@@ -49,7 +44,6 @@ public function invalidate($typeCode);
      *
      * @param string $typeCode
      * @return void
-     * @since 2.0.0
      */
     public function cleanType($typeCode);
 }
diff --git a/lib/internal/Magento/Framework/App/CacheInterface.php b/lib/internal/Magento/Framework/App/CacheInterface.php
index fdfea450892e0..374fb3cf68936 100644
--- a/lib/internal/Magento/Framework/App/CacheInterface.php
+++ b/lib/internal/Magento/Framework/App/CacheInterface.php
@@ -10,7 +10,6 @@
  * System cache model interface
  *
  * @api
- * @since 2.0.0
  */
 interface CacheInterface
 {
@@ -18,7 +17,6 @@ interface CacheInterface
      * Get cache frontend API object
      *
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     public function getFrontend();
 
@@ -27,7 +25,6 @@ public function getFrontend();
      *
      * @param  string $identifier
      * @return string
-     * @since 2.0.0
      */
     public function load($identifier);
 
@@ -39,7 +36,6 @@ public function load($identifier);
      * @param array $tags
      * @param int $lifeTime
      * @return bool
-     * @since 2.0.0
      */
     public function save($data, $identifier, $tags = [], $lifeTime = null);
 
@@ -48,7 +44,6 @@ public function save($data, $identifier, $tags = [], $lifeTime = null);
      *
      * @param string $identifier
      * @return bool
-     * @since 2.0.0
      */
     public function remove($identifier);
 
@@ -57,7 +52,6 @@ public function remove($identifier);
      *
      * @param array $tags
      * @return bool
-     * @since 2.0.0
      */
     public function clean($tags = []);
 }
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
index 4c697836383e0..7cb3bad01b2c2 100644
--- a/lib/internal/Magento/Framework/App/Config.php
+++ b/lib/internal/Magento/Framework/App/Config.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Config
- * @since 2.0.0
  */
 class Config implements ScopeConfigInterface
 {
@@ -24,13 +23,13 @@ class Config implements ScopeConfigInterface
 
     /**
      * @var ScopeCodeResolver
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeCodeResolver;
 
     /**
      * @var ConfigTypeInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $types;
 
@@ -39,7 +38,6 @@ class Config implements ScopeConfigInterface
      *
      * @param ScopeCodeResolver $scopeCodeResolver
      * @param array $types
-     * @since 2.0.0
      */
     public function __construct(
         ScopeCodeResolver $scopeCodeResolver,
@@ -56,7 +54,6 @@ public function __construct(
      * @param string $scope
      * @param null|string $scopeCode
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue(
         $path = null,
@@ -92,7 +89,6 @@ public function getValue(
      * @param string $scope
      * @param null|string $scopeCode
      * @return bool
-     * @since 2.0.0
      */
     public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {
@@ -104,7 +100,7 @@ public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAU
      * Clean scopeCodeResolver
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean()
     {
@@ -130,7 +126,7 @@ public function clean()
      * @param string|null $path
      * @param mixed|null $default
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($configType, $path = '', $default = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Base.php b/lib/internal/Magento/Framework/App/Config/Base.php
index 6506836ca205c..1c13435d032c4 100644
--- a/lib/internal/Magento/Framework/App/Config/Base.php
+++ b/lib/internal/Magento/Framework/App/Config/Base.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\App\Config\Base
  *
- * @since 2.0.0
  */
 class Base extends \Magento\Framework\Simplexml\Config
 {
@@ -19,13 +18,11 @@ class Base extends \Magento\Framework\Simplexml\Config
      * List of instances
      *
      * @var Base[]
-     * @since 2.0.0
      */
     public static $instances = [];
 
     /**
      * @param \Magento\Framework\Simplexml\Element|string $sourceData $sourceData
-     * @since 2.0.0
      */
     public function __construct($sourceData = null)
     {
@@ -38,7 +35,6 @@ public function __construct($sourceData = null)
      * Cleanup objects because of simplexml memory leak
      *
      * @return void
-     * @since 2.0.0
      */
     public static function destroy()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/BaseFactory.php b/lib/internal/Magento/Framework/App/Config/BaseFactory.php
index 8866ee7a75f04..fb87d59dceaad 100644
--- a/lib/internal/Magento/Framework/App/Config/BaseFactory.php
+++ b/lib/internal/Magento/Framework/App/Config/BaseFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\Config\BaseFactory
  *
- * @since 2.0.0
  */
 class BaseFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string|\Magento\Framework\Simplexml\Element $sourceData
      * @return \Magento\Framework\App\Config\Base
-     * @since 2.0.0
      */
     public function create($sourceData = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/CommentInterface.php b/lib/internal/Magento/Framework/App/Config/CommentInterface.php
index b785096534d95..ae74c9237b2cd 100644
--- a/lib/internal/Magento/Framework/App/Config/CommentInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/CommentInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * Interface CommentInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface CommentInterface
 {
@@ -17,7 +17,7 @@ interface CommentInterface
      * Retrieve comment for configuration data.
      *
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get();
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
index 7e3fd29e48274..60698e14d1fbe 100644
--- a/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Resource for storing store configuration values
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      * @param string $scope
      * @param int $scopeId
      * @return $this
-     * @since 2.0.0
      */
     public function saveConfig($path, $value, $scope, $scopeId);
 
@@ -30,7 +28,6 @@ public function saveConfig($path, $value, $scope, $scopeId);
      * @param string $scope
      * @param int $scopeId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteConfig($path, $scope, $scopeId);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigSourceAggregated.php b/lib/internal/Magento/Framework/App/Config/ConfigSourceAggregated.php
index f49e8c7766478..aedf9e1521dba 100644
--- a/lib/internal/Magento/Framework/App/Config/ConfigSourceAggregated.php
+++ b/lib/internal/Magento/Framework/App/Config/ConfigSourceAggregated.php
@@ -10,13 +10,13 @@
 /**
  * Class \Magento\Framework\App\Config\ConfigSourceAggregated
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ConfigSourceAggregated implements ConfigSourceInterface
 {
     /**
      * @var ConfigSourceInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $sources;
 
@@ -24,7 +24,7 @@ class ConfigSourceAggregated implements ConfigSourceInterface
      * ConfigSourceAggregated constructor.
      *
      * @param array $sources
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $sources = [])
     {
@@ -36,7 +36,7 @@ public function __construct(array $sources = [])
      *
      * @param string $path
      * @return string|array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
@@ -59,7 +59,7 @@ public function get($path = '')
      * Sort sources
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function sortSources()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigSourceInterface.php b/lib/internal/Magento/Framework/App/Config/ConfigSourceInterface.php
index 8144ecc3ebe37..7ccd1a22ad392 100644
--- a/lib/internal/Magento/Framework/App/Config/ConfigSourceInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ConfigSourceInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * Interface ConfigSourceInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface ConfigSourceInterface
 {
@@ -33,7 +33,7 @@ interface ConfigSourceInterface
      * ```
      * And string will be returned if you use full path to field (e.g. scope/scope_code/section_id/group_id/field_id)
      * E.g. 'value1'
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '');
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigTypeInterface.php b/lib/internal/Magento/Framework/App/Config/ConfigTypeInterface.php
index 03c668fd41504..ee960a3aa786c 100644
--- a/lib/internal/Magento/Framework/App/Config/ConfigTypeInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ConfigTypeInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * Interface ConfigTypeInterface
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface ConfigTypeInterface
 {
@@ -21,13 +21,13 @@ interface ConfigTypeInterface
      *
      * @param string $path
      * @return array|int|string|boolean
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '');
 
     /**
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function clean();
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Data.php b/lib/internal/Magento/Framework/App/Config/Data.php
index ab261a389c66f..f2ebce323f9b6 100644
--- a/lib/internal/Magento/Framework/App/Config/Data.php
+++ b/lib/internal/Magento/Framework/App/Config/Data.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Config\Data
  *
- * @since 2.0.0
  */
 class Data implements DataInterface
 {
@@ -18,7 +17,6 @@ class Data implements DataInterface
      * Config data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
@@ -26,14 +24,12 @@ class Data implements DataInterface
      * Config source data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_source = [];
 
     /**
      * @param MetadataProcessor $processor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(MetadataProcessor $processor, array $data)
     {
@@ -44,7 +40,6 @@ public function __construct(MetadataProcessor $processor, array $data)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getSource()
     {
@@ -53,7 +48,6 @@ public function getSource()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getValue($path = null)
     {
@@ -74,7 +68,6 @@ public function getValue($path = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setValue($path, $value)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Data/ProcessorFactory.php b/lib/internal/Magento/Framework/App/Config/Data/ProcessorFactory.php
index 47f6f53d981c9..909b6e876ca4c 100644
--- a/lib/internal/Magento/Framework/App/Config/Data/ProcessorFactory.php
+++ b/lib/internal/Magento/Framework/App/Config/Data/ProcessorFactory.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\Framework\App\Config\Data\ProcessorFactory
  *
- * @since 2.0.0
  */
 class ProcessorFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var ProcessorInterface[]
-     * @since 2.0.0
      */
     protected $_pool;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @return ProcessorInterface
      * @throws \InvalidArgumentException In case the given classname is not an instance of ProcessorInterface
      * @api
-     * @since 2.0.0
      */
     public function get($processorModel)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php b/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
index 7960bfea89f2c..83ff73ab387a9 100644
--- a/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
@@ -9,7 +9,6 @@
  * Processes data from admin store configuration fields
  *
  * @api
- * @since 2.0.0
  */
 interface ProcessorInterface
 {
@@ -18,7 +17,6 @@ interface ProcessorInterface
      *
      * @param string $value Raw value of the configuration field
      * @return string Processed value
-     * @since 2.0.0
      */
     public function processValue($value);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/DataFactory.php b/lib/internal/Magento/Framework/App/Config/DataFactory.php
index 969e001efb181..fe154fa661d23 100644
--- a/lib/internal/Magento/Framework/App/Config/DataFactory.php
+++ b/lib/internal/Magento/Framework/App/Config/DataFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Config\DataFactory
  *
- * @since 2.0.0
  */
 class DataFactory
 {
@@ -18,7 +17,6 @@ class DataFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -26,14 +24,12 @@ class DataFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return DataInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Config/DataInterface.php b/lib/internal/Magento/Framework/App/Config/DataInterface.php
index 8e482f0dbf2d3..6495bbf0bc4da 100644
--- a/lib/internal/Magento/Framework/App/Config/DataInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/DataInterface.php
@@ -9,7 +9,6 @@
  * Configuration data storage
  *
  * @api
- * @since 2.0.0
  */
 interface DataInterface
 {
@@ -18,7 +17,6 @@ interface DataInterface
      *
      * @param string|null $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($path);
 
@@ -28,7 +26,6 @@ public function getValue($path);
      * @param string $path
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setValue($path, $value);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Element.php b/lib/internal/Magento/Framework/App/Config/Element.php
index 1236a0de4fde6..e5b4a5c384513 100644
--- a/lib/internal/Magento/Framework/App/Config/Element.php
+++ b/lib/internal/Magento/Framework/App/Config/Element.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Element extends \Magento\Framework\Simplexml\Element
 {
@@ -22,7 +21,6 @@ class Element extends \Magento\Framework\Simplexml\Element
      * @param boolean $value
      * @return boolean
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function is($var, $value = true)
     {
@@ -44,7 +42,6 @@ public function is($var, $value = true)
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClassName()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/FileResolver.php b/lib/internal/Magento/Framework/App/Config/FileResolver.php
index 5a3e1d3fa6d21..c60592b445bd0 100644
--- a/lib/internal/Magento/Framework/App/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/FileResolver.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\Config\FileResolver
  *
- * @since 2.0.0
  */
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
@@ -20,7 +19,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * Module configuration file reader
      *
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_moduleReader;
 
@@ -28,7 +26,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * File iterator factory
      *
      * @var \Magento\Framework\Config\FileIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
@@ -36,7 +33,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * Filesystem
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -44,7 +40,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Config\FileIteratorFactory $iteratorFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Module\Dir\Reader $moduleReader,
@@ -58,7 +53,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
index 1646d07f9095a..225dbfc873de5 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\App\Config\Initial
  *
- * @since 2.0.0
  */
 class Initial
 {
@@ -26,7 +25,6 @@ class Initial
      * Config data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
@@ -34,7 +32,6 @@ class Initial
      * Config metadata
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_metadata = [];
 
@@ -50,7 +47,6 @@ class Initial
      * @param Initial\Reader $reader
      * @param \Magento\Framework\App\Cache\Type\Config $cache
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\Initial\Reader $reader,
@@ -75,7 +71,6 @@ public function __construct(
      *
      * @param string $scope Format is scope type and scope code separated by pipe: e.g. "type|code"
      * @return array
-     * @since 2.0.0
      */
     public function getData($scope)
     {
@@ -93,7 +88,6 @@ public function getData($scope)
      * Get configuration metadata
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMetadata()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Initial/Converter.php b/lib/internal/Magento/Framework/App/Config/Initial/Converter.php
index 9a5e93ef57347..3a20a3503ea7a 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial/Converter.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Config\Initial\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -18,19 +17,16 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * Node paths to process
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_nodeMap = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_metadata = [];
 
     /**
      * @param array $nodeMap
-     * @since 2.0.0
      */
     public function __construct(array $nodeMap = [])
     {
@@ -42,7 +38,6 @@ public function __construct(array $nodeMap = [])
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -65,7 +60,6 @@ public function convert($source)
      * @return array|string|null
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _convertNode(\DOMNode $node, $path = '')
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
index 81bf99b180620..9b6d7a31d463c 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Config\Initial\Reader
  *
- * @since 2.0.0
  */
 class Reader
 {
@@ -18,7 +17,6 @@ class Reader
      * File locator
      *
      * @var \Magento\Framework\Config\FileResolverInterface
-     * @since 2.0.0
      */
     protected $_fileResolver;
 
@@ -26,7 +24,6 @@ class Reader
      * Config converter
      *
      * @var  \Magento\Framework\Config\ConverterInterface
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -34,7 +31,6 @@ class Reader
      * Config file name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_fileName;
 
@@ -42,7 +38,6 @@ class Reader
      * Class of dom configuration document used for merge
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_domDocumentClass;
 
@@ -50,7 +45,6 @@ class Reader
      * Scope priority loading scheme
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_scopePriorityScheme = ['global'];
 
@@ -58,7 +52,6 @@ class Reader
      * Path to corresponding XSD file with validation rules for config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schemaFile;
 
@@ -69,7 +62,6 @@ class Reader
      * @param \Magento\Framework\Config\DomFactory $domFactory
      * @param string $fileName
      * @param string $domDocumentClass
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -91,7 +83,6 @@ public function __construct(
      * @return array
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function read()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Initial/SchemaLocator.php b/lib/internal/Magento/Framework/App/Config/Initial/SchemaLocator.php
index aecae7b3da33b..e9d30dceefa63 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\Config\Initial\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,14 +19,12 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param string $moduleName
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader, $moduleName)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader,
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -49,7 +45,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php b/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
index 76909da69e80b..98532cba32c25 100644
--- a/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
+++ b/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
@@ -10,26 +10,26 @@
 
 /**
  * Responsible for reading sources from files: config.dist.php, config.local.php, config.php
- * @since 2.2.0
+ * @since 2.1.3
  */
 class InitialConfigSource implements ConfigSourceInterface
 {
     /**
      * @var Reader
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $reader;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $configType;
 
     /**
      * @var string
      * @deprecated 2.2.0 Initial configs can not be separated since 2.2.0 version
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileKey;
 
@@ -39,7 +39,7 @@ class InitialConfigSource implements ConfigSourceInterface
      * @param Reader $reader
      * @param string $configType
      * @param string $fileKey
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(Reader $reader, $configType, $fileKey = null)
     {
@@ -50,7 +50,7 @@ public function __construct(Reader $reader, $configType, $fileKey = null)
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($path = '')
     {
diff --git a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
index 545e48518cdad..52307d30a3b1c 100644
--- a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
+++ b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
@@ -14,19 +14,19 @@
 /**
  * Class \Magento\Framework\App\Config\MetadataConfigTypeProcessor
  *
- * @since 2.2.0
+ * @since 2.1.3
  */
 class MetadataConfigTypeProcessor implements PostProcessorInterface
 {
     /**
      * @var ProcessorFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $_processorFactory;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected $_metadata = [];
 
@@ -51,7 +51,7 @@ class MetadataConfigTypeProcessor implements PostProcessorInterface
      * @param Initial $initialConfig
      * @param ConfigSourceInterface $configSource Source of configurations
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         ProcessorFactory $processorFactory,
@@ -73,7 +73,7 @@ public function __construct(
      * @param array $data
      * @param string $path
      * @return string|null
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _getValue(array $data, $path)
     {
@@ -95,7 +95,7 @@ protected function _getValue(array $data, $path)
      * @param string $path
      * @param string $value
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     protected function _setValue(array &$container, $path, $value)
     {
@@ -119,7 +119,7 @@ protected function _setValue(array &$container, $path, $value)
      * @param string $scope The configuration scope
      * @param string|null $scopeCode The configuration scope code
      * @return array An array of processed configuration
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function processScopeData(
         array $data,
@@ -145,7 +145,7 @@ private function processScopeData(
      *
      * @param array $rawData An array of configuration
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $rawData)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/MetadataProcessor.php b/lib/internal/Magento/Framework/App/Config/MetadataProcessor.php
index 4ae397be7f854..22dff147249f8 100644
--- a/lib/internal/Magento/Framework/App/Config/MetadataProcessor.php
+++ b/lib/internal/Magento/Framework/App/Config/MetadataProcessor.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\App\Config\MetadataProcessor
  *
- * @since 2.0.0
  */
 class MetadataProcessor
 {
     /**
      * @var \Magento\Framework\App\Config\Data\ProcessorFactory
-     * @since 2.0.0
      */
     protected $_processorFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_metadata = [];
 
     /**
      * @param \Magento\Framework\App\Config\Data\ProcessorFactory $processorFactory
      * @param Initial $initialConfig
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\Data\ProcessorFactory $processorFactory,
@@ -45,7 +41,6 @@ public function __construct(
      * @param array $data
      * @param string $path
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getValue(array $data, $path)
     {
@@ -67,7 +62,6 @@ protected function _getValue(array $data, $path)
      * @param string $path
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function _setValue(array &$container, $path, $value)
     {
@@ -87,7 +81,6 @@ protected function _setValue(array &$container, $path, $value)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function process(array $data)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
index dfc58bcf1d332..32d081b853f40 100644
--- a/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface MutableScopeConfigInterface extends \Magento\Framework\App\Config\ScopeConfigInterface
 {
@@ -22,7 +21,6 @@ interface MutableScopeConfigInterface extends \Magento\Framework\App\Config\Scop
      * @param string $scopeType
      * @param null|string $scopeCode
      * @return void
-     * @since 2.0.0
      */
     public function setValue(
         $path,
diff --git a/lib/internal/Magento/Framework/App/Config/PostProcessorComposite.php b/lib/internal/Magento/Framework/App/Config/PostProcessorComposite.php
index ab6d4b5844f50..7b8dfd4c8496a 100644
--- a/lib/internal/Magento/Framework/App/Config/PostProcessorComposite.php
+++ b/lib/internal/Magento/Framework/App/Config/PostProcessorComposite.php
@@ -10,19 +10,19 @@
 /**
  * @inheritdoc
  * @package Magento\Framework\App\Config
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PostProcessorComposite implements PostProcessorInterface
 {
     /**
      * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $processors;
 
     /**
      * @param array $processors
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $processors = [])
     {
@@ -32,7 +32,7 @@ public function __construct(array $processors = [])
     /**
      * @param array $config
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $config)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/PreProcessorComposite.php b/lib/internal/Magento/Framework/App/Config/PreProcessorComposite.php
index 8caf9bfbb9da5..86fc801980b75 100644
--- a/lib/internal/Magento/Framework/App/Config/PreProcessorComposite.php
+++ b/lib/internal/Magento/Framework/App/Config/PreProcessorComposite.php
@@ -9,19 +9,19 @@
 
 /**
  * Class PreProcessorComposite
- * @since 2.2.0
+ * @since 2.1.3
  */
 class PreProcessorComposite implements PreProcessorInterface
 {
     /**
      * @var PreProcessorInterface[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $processors = [];
 
     /**
      * @param PreProcessorInterface[] $processors
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $processors = [])
     {
@@ -30,7 +30,7 @@ public function __construct(array $processors = [])
 
     /**
      * @inheritdoc
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $config)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Reader/Source/SourceInterface.php b/lib/internal/Magento/Framework/App/Config/Reader/Source/SourceInterface.php
index 4692667f3938b..f763e1a152491 100644
--- a/lib/internal/Magento/Framework/App/Config/Reader/Source/SourceInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Reader/Source/SourceInterface.php
@@ -9,7 +9,7 @@
  * Provide access to data. Each Source can be responsible for each storage, where config data can be placed
  *
  * @package Magento\Framework\App\Config\Reader\Source
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface SourceInterface
 {
@@ -18,7 +18,7 @@ interface SourceInterface
      *
      * @param string|null $scopeCode
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function get($scopeCode = null);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
index 02703da837e04..7974f97ef1ffc 100644
--- a/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ReinitableConfigInterface extends \Magento\Framework\App\Config\MutableScopeConfigInterface
 {
@@ -18,7 +17,6 @@ interface ReinitableConfigInterface extends \Magento\Framework\App\Config\Mutabl
      * Reinitialize config object
      *
      * @return \Magento\Framework\App\Config\ReinitableConfigInterface
-     * @since 2.0.0
      */
     public function reinit();
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Scope/Converter.php b/lib/internal/Magento/Framework/App/Config/Scope/Converter.php
index 5ed5e0df08b99..4ed300c4e4eaf 100644
--- a/lib/internal/Magento/Framework/App/Config/Scope/Converter.php
+++ b/lib/internal/Magento/Framework/App/Config/Scope/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Config\Scope\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param array $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -37,7 +35,6 @@ public function convert($source)
      * @param string $path
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function _setArrayValue(array &$container, $path, $value)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Scope/ReaderInterface.php b/lib/internal/Magento/Framework/App/Config/Scope/ReaderInterface.php
index 3ea1535404f0a..fbc34e4a510bf 100644
--- a/lib/internal/Magento/Framework/App/Config/Scope/ReaderInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Scope/ReaderInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\Config\Scope\ReaderInterface
  *
- * @since 2.0.0
  */
 interface ReaderInterface
 {
@@ -20,7 +19,6 @@ interface ReaderInterface
      * @param string|null $scopeType
      * @throws \Exception May throw an exception if the given scope is invalid
      * @return array
-     * @since 2.0.0
      */
     public function read($scopeType = null);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
index 0bbe942df1f9d..747a0ca58a62e 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -9,25 +9,25 @@
 
 /**
  * Class for resolving scope code
- * @since 2.2.0
+ * @since 2.1.3
  */
 class ScopeCodeResolver
 {
     /**
      * @var ScopeResolverPool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $scopeResolverPool;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $resolvedScopeCodes = [];
 
     /**
      * @param ScopeResolverPool $scopeResolverPool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(ScopeResolverPool $scopeResolverPool)
     {
@@ -40,7 +40,7 @@ public function __construct(ScopeResolverPool $scopeResolverPool)
      * @param string $scopeType
      * @param string $scopeCode
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function resolve($scopeType, $scopeCode)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
index 659d347f2de50..48cabd7489588 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ScopeConfigInterface
 {
@@ -26,7 +25,6 @@ interface ScopeConfigInterface
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
      * @param null|string $scopeCode
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
 
@@ -37,7 +35,6 @@ public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
      * @param null|string $scopeCode
      * @return bool
-     * @since 2.0.0
      */
     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Spi/PostProcessorInterface.php b/lib/internal/Magento/Framework/App/Config/Spi/PostProcessorInterface.php
index 4f5dd11204559..ee766e3d1ea9e 100644
--- a/lib/internal/Magento/Framework/App/Config/Spi/PostProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Spi/PostProcessorInterface.php
@@ -14,7 +14,7 @@
  * @see SourceInterface
  * @see ConfigTypeInterface
  * @package Magento\Framework\App\Config\Spi
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PostProcessorInterface
 {
@@ -23,7 +23,7 @@ interface PostProcessorInterface
      *
      * @param array $config
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $config);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Spi/PreProcessorInterface.php b/lib/internal/Magento/Framework/App/Config/Spi/PreProcessorInterface.php
index a32b3a58ef24d..f782ac348e0d5 100644
--- a/lib/internal/Magento/Framework/App/Config/Spi/PreProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Spi/PreProcessorInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Allows to use custom callbacks and functions before applying fallback
- * @since 2.2.0
+ * @since 2.1.3
  */
 interface PreProcessorInterface
 {
@@ -16,7 +16,7 @@ interface PreProcessorInterface
      *
      * @param array $config
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function process(array $config);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Storage/Writer.php b/lib/internal/Magento/Framework/App/Config/Storage/Writer.php
index 25b394c737301..20e1e4e74a9fd 100644
--- a/lib/internal/Magento/Framework/App/Config/Storage/Writer.php
+++ b/lib/internal/Magento/Framework/App/Config/Storage/Writer.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\Config\Storage\Writer
  *
- * @since 2.0.0
  */
 class Writer implements \Magento\Framework\App\Config\Storage\WriterInterface
 {
@@ -20,13 +19,11 @@ class Writer implements \Magento\Framework\App\Config\Storage\WriterInterface
      * Resource model of config data
      *
      * @var \Magento\Framework\App\Config\ConfigResource\ConfigInterface
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @param \Magento\Framework\App\Config\ConfigResource\ConfigInterface $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ConfigResource\ConfigInterface $resource)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Framework\App\Config\ConfigResource\ConfigI
      * @param   string $scope
      * @param   int $scopeId
      * @return  void
-     * @since 2.0.0
      */
     public function delete($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
@@ -55,7 +51,6 @@ public function delete($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
      * @param string $scope
      * @param int $scopeId
      * @return void
-     * @since 2.0.0
      */
     public function save($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
index d48bbcc881119..308c7656d5e7c 100644
--- a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Framework\App\Config\Storage\WriterInterface
  *
- * @since 2.0.0
  */
 interface WriterInterface
 {
@@ -23,7 +22,6 @@ interface WriterInterface
      * @param   string $scope
      * @param   int $scopeId
      * @return void
-     * @since 2.0.0
      */
     public function delete($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0);
 
@@ -35,7 +33,6 @@ public function delete($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
      * @param string $scope
      * @param int $scopeId
      * @return void
-     * @since 2.0.0
      */
     public function save($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php
index 2f91cb47150bf..47cbec907d9c5 100644
--- a/lib/internal/Magento/Framework/App/Config/Value.php
+++ b/lib/internal/Magento/Framework/App/Config/Value.php
@@ -19,7 +19,6 @@
  * @method \Magento\Framework\App\Config\ValueInterface setValue(string $value)
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\App\Config\ValueInterface
 {
@@ -27,7 +26,6 @@ class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'config_data';
 
@@ -37,19 +35,16 @@ class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * In observe method you can use $observer->getEvent()->getObject() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'config_data';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
-     * @since 2.0.0
      */
     protected $cacheTypeList;
 
@@ -61,7 +56,6 @@ class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -81,7 +75,6 @@ public function __construct(
      * Check if config data value was changed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValueChanged()
     {
@@ -92,7 +85,6 @@ public function isValueChanged()
      * Get old value from existing config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOldValue()
     {
@@ -108,7 +100,6 @@ public function getOldValue()
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public function getFieldsetDataValue($key)
     {
@@ -122,7 +113,6 @@ public function getFieldsetDataValue($key)
      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
diff --git a/lib/internal/Magento/Framework/App/Config/ValueFactory.php b/lib/internal/Magento/Framework/App/Config/ValueFactory.php
index 3921dd02caa48..3216172017339 100644
--- a/lib/internal/Magento/Framework/App/Config/ValueFactory.php
+++ b/lib/internal/Magento/Framework/App/Config/ValueFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class
- * @since 2.0.0
  */
 class ValueFactory
 {
@@ -15,7 +14,6 @@ class ValueFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class ValueFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class ValueFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      * @param array $data
      * @return \Magento\Framework\App\Config\ValueInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Config/ValueInterface.php b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
index 2193bdd99a70c..1e0747acc36f2 100644
--- a/lib/internal/Magento/Framework/App/Config/ValueInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\Config\ValueInterface
  *
- * @since 2.0.0
  */
 interface ValueInterface
 {
@@ -23,7 +22,6 @@ interface ValueInterface
      * Check if config data value was changed
      * @todo this method should be make as protected
      * @return bool
-     * @since 2.0.0
      */
     public function isValueChanged();
 
@@ -31,7 +29,6 @@ public function isValueChanged();
      * Get old value from existing config
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOldValue();
 
@@ -40,7 +37,6 @@ public function getOldValue();
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     public function getFieldsetDataValue($key);
 }
diff --git a/lib/internal/Magento/Framework/App/Console/Request.php b/lib/internal/Magento/Framework/App/Console/Request.php
index 8738a8b606f22..5fc14b7937365 100644
--- a/lib/internal/Magento/Framework/App/Console/Request.php
+++ b/lib/internal/Magento/Framework/App/Console/Request.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\Console\Request
  *
- * @since 2.0.0
  */
 class Request implements \Magento\Framework\App\RequestInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $params;
 
     /**
      * @param array $parameters
-     * @since 2.0.0
      */
     public function __construct(array $parameters = [])
     {
@@ -39,7 +36,6 @@ public function __construct(array $parameters = [])
      * Retrieve module name
      *
      * @return void
-     * @since 2.0.0
      */
     public function getModuleName()
     {
@@ -52,7 +48,6 @@ public function getModuleName()
      * @param string $name
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setModuleName($name)
     {
@@ -62,7 +57,6 @@ public function setModuleName($name)
      * Retrieve action name
      *
      * @return void
-     * @since 2.0.0
      */
     public function getActionName()
     {
@@ -75,7 +69,6 @@ public function getActionName()
      * @param string $name
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setActionName($name)
     {
@@ -87,7 +80,6 @@ public function setActionName($name)
      * @param string $key
      * @param mixed $defaultValue
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($key, $defaultValue = null)
     {
@@ -101,7 +93,6 @@ public function getParam($key, $defaultValue = null)
      * Retrieve all params as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParams()
     {
@@ -113,7 +104,6 @@ public function getParams()
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function setParams(array $data)
     {
@@ -128,7 +118,6 @@ public function setParams(array $data)
      * @param null|string $default
      * @return null|string|void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getCookie($name, $default)
     {
@@ -138,7 +127,6 @@ public function getCookie($name, $default)
      * Stub to satisfy RequestInterface
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSecure()
     {
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 0af74f376f2c1..6255aaa3d87a6 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -7,7 +7,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.ExitExpression)
- * @since 2.0.0
  */
 class Response implements \Magento\Framework\App\ResponseInterface
 {
@@ -19,7 +18,6 @@ class Response implements \Magento\Framework\App\ResponseInterface
      *  -1 (error)
      *
      * @var int
-     * @since 2.0.0
      */
     protected $code = 0;
 
@@ -37,7 +35,6 @@ class Response implements \Magento\Framework\App\ResponseInterface
      * Text to output on send response
      *
      * @var string
-     * @since 2.0.0
      */
     private $body;
 
@@ -45,7 +42,6 @@ class Response implements \Magento\Framework\App\ResponseInterface
      * Set whether to terminate process on send or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $terminateOnSend = true;
 
@@ -53,7 +49,6 @@ class Response implements \Magento\Framework\App\ResponseInterface
      * Send response to client
      *
      * @return int
-     * @since 2.0.0
      */
     public function sendResponse()
     {
@@ -70,7 +65,6 @@ public function sendResponse()
      * Get body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBody()
     {
@@ -82,7 +76,6 @@ public function getBody()
      *
      * @param string $body
      * @return void
-     * @since 2.0.0
      */
     public function setBody($body)
     {
@@ -94,7 +87,6 @@ public function setBody($body)
      *
      * @param int $code
      * @return void
-     * @since 2.0.0
      */
     public function setCode($code)
     {
@@ -109,7 +101,6 @@ public function setCode($code)
      *
      * @param bool $terminate
      * @return void
-     * @since 2.0.0
      */
     public function terminateOnSend($terminate)
     {
diff --git a/lib/internal/Magento/Framework/App/Cron.php b/lib/internal/Magento/Framework/App/Cron.php
index 0382cb8c3d225..43d3041174977 100644
--- a/lib/internal/Magento/Framework/App/Cron.php
+++ b/lib/internal/Magento/Framework/App/Cron.php
@@ -12,25 +12,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Cron implements \Magento\Framework\AppInterface
 {
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $_state;
 
     /**
      * @var Console\Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var Console\Response
-     * @since 2.0.0
      */
     protected $_response;
 
@@ -57,7 +53,6 @@ class Cron implements \Magento\Framework\AppInterface
      * @param ObjectManagerInterface $objectManager
      * @param array $parameters
      * @param AreaList|null          $areaList
-     * @since 2.0.0
      */
     public function __construct(
         State $state,
@@ -79,7 +74,6 @@ public function __construct(
      * Run application
      *
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -98,7 +92,6 @@ public function launch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(App\Bootstrap $bootstrap, \Exception $exception)
     {
diff --git a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
index d81d47aeb749a..3a8ba0e31ae75 100644
--- a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
+++ b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\DefaultPath\DefaultPath
  *
- * @since 2.0.0
  */
 class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
 {
@@ -18,13 +17,11 @@ class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
      * Default path parts
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parts;
 
     /**
      * @param array $parts
-     * @since 2.0.0
      */
     public function __construct(array $parts)
     {
@@ -36,7 +33,6 @@ public function __construct(array $parts)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getPart($code)
     {
diff --git a/lib/internal/Magento/Framework/App/DefaultPathInterface.php b/lib/internal/Magento/Framework/App/DefaultPathInterface.php
index 37528f4175601..a0a517815e3e0 100644
--- a/lib/internal/Magento/Framework/App/DefaultPathInterface.php
+++ b/lib/internal/Magento/Framework/App/DefaultPathInterface.php
@@ -10,14 +10,12 @@
 /**
  * Interface \Magento\Framework\App\DefaultPathInterface
  *
- * @since 2.0.0
  */
 interface DefaultPathInterface
 {
     /**
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getPart($code);
 }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 427dd94159c15..1e493e7ad5828 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -12,7 +12,6 @@
  * Application deployment configuration
  *
  * @api
- * @since 2.0.0
  */
 class DeploymentConfig
 {
@@ -20,7 +19,6 @@ class DeploymentConfig
      * Configuration reader
      *
      * @var DeploymentConfig\Reader
-     * @since 2.0.0
      */
     private $reader;
 
@@ -28,7 +26,6 @@ class DeploymentConfig
      * Configuration data
      *
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
@@ -36,7 +33,6 @@ class DeploymentConfig
      * Flattened data
      *
      * @var array
-     * @since 2.0.0
      */
     private $flatData;
 
@@ -44,7 +40,6 @@ class DeploymentConfig
      * Injected configuration data
      *
      * @var array
-     * @since 2.0.0
      */
     private $overrideData;
 
@@ -55,7 +50,6 @@ class DeploymentConfig
      *
      * @param DeploymentConfig\Reader $reader
      * @param array $overrideData
-     * @since 2.0.0
      */
     public function __construct(DeploymentConfig\Reader $reader, $overrideData = [])
     {
@@ -69,7 +63,6 @@ public function __construct(DeploymentConfig\Reader $reader, $overrideData = [])
      * @param string $key
      * @param mixed $defaultValue
      * @return mixed|null
-     * @since 2.0.0
      */
     public function get($key = null, $defaultValue = null)
     {
@@ -84,7 +77,6 @@ public function get($key = null, $defaultValue = null)
      * Checks if data available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -98,7 +90,6 @@ public function isAvailable()
      *
      * @param string $key
      * @return null|mixed
-     * @since 2.0.0
      */
     public function getConfigData($key = null)
     {
@@ -119,7 +110,6 @@ public function getConfigData($key = null)
      * Resets config data
      *
      * @return void
-     * @since 2.0.0
      */
     public function resetData()
     {
@@ -130,7 +120,7 @@ public function resetData()
      * Check if data from deploy files is avaiable
      *
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function isDbAvailable()
     {
@@ -142,7 +132,6 @@ public function isDbAvailable()
      * Loads the configuration data
      *
      * @return void
-     * @since 2.0.0
      */
     private function load()
     {
@@ -164,7 +153,6 @@ private function load()
      * @param string $path
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     private function flattenParams(array $params, $path = null)
     {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
index 2b1b7de83b514..fd90e6818a133 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
@@ -16,25 +16,21 @@
  * Loads the merged configuration from config files.
  *
  * @see FileReader The reader for specific configuration file
- * @since 2.0.0
  */
 class Reader
 {
     /**
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $dirList;
 
     /**
      * @var ConfigFilePool
-     * @since 2.0.0
      */
     private $configFilePool;
 
     /**
      * @var DriverPool
-     * @since 2.0.0
      */
     private $driverPool;
 
@@ -42,7 +38,6 @@ class Reader
      * Configuration file names
      *
      * @var array
-     * @since 2.0.0
      */
     private $files;
 
@@ -54,7 +49,6 @@ class Reader
      * @param ConfigFilePool $configFilePool
      * @param null|string $file
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         DirectoryList $dirList,
@@ -79,7 +73,6 @@ public function __construct(
      * Gets the file name
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFiles()
     {
@@ -96,7 +89,6 @@ public function getFiles()
      * @throws FileSystemException If file can not be read
      * @throws \Exception If file key is not correct
      * @see FileReader
-     * @since 2.0.0
      */
     public function load($fileKey = null)
     {
@@ -137,7 +129,7 @@ public function load($fileKey = null)
      * @return array
      * @deprecated 2.2.0 Magento does not support custom config file pools since 2.2.0 version
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function loadConfigFile($fileKey, $pathConfig, $ignoreInitialConfigFiles = false)
     {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
index f6362435ed3ba..1fa6f1a7e5bc0 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
@@ -14,7 +14,6 @@
 
 /**
  * Deployment configuration writer to files: env.php, config.php.
- * @since 2.0.0
  */
 class Writer
 {
@@ -22,7 +21,6 @@ class Writer
      * Deployment config reader
      *
      * @var Reader
-     * @since 2.0.0
      */
     private $reader;
 
@@ -30,7 +28,6 @@ class Writer
      * Application filesystem
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -38,19 +35,16 @@ class Writer
      * Formatter
      *
      * @var Writer\FormatterInterface
-     * @since 2.0.0
      */
     private $formatter;
 
     /**
      * @var ConfigFilePool
-     * @since 2.0.0
      */
     private $configFilePool;
 
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -69,7 +63,6 @@ class Writer
      * @param DeploymentConfig $deploymentConfig
      * @param Writer\FormatterInterface $formatter
      * @param CommentParser $commentParser The parser of comments from configuration files
-     * @since 2.0.0
      */
     public function __construct(
         Reader $reader,
@@ -91,7 +84,6 @@ public function __construct(
      * Check if configuration file is writable
      *
      * @return bool
-     * @since 2.0.0
      */
     public function checkIfWritable()
     {
@@ -127,7 +119,6 @@ public function checkIfWritable()
      * @return void
      * @throws FileSystemException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function saveConfig(array $data, $override = false, $pool = null, array $comments = [])
     {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
index 3db0802900ef4..9425fd9a4a925 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Framework\App\DeploymentConfig\Writer\FormatterInterface
  *
- * @since 2.0.0
  */
 interface FormatterInterface
 {
@@ -19,7 +18,6 @@ interface FormatterInterface
      * @param array $data
      * @param array $comments
      * @return string
-     * @since 2.0.0
      */
     public function format($data, array $comments = []);
 }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
index 9e4a4b1d8ae46..4a40e19c818e7 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -8,7 +8,6 @@
 
 /**
  * A formatter for deployment configuration that presents it as a PHP-file that returns data
- * @since 2.0.0
  */
 class PhpFormatter implements FormatterInterface
 {
@@ -18,7 +17,6 @@ class PhpFormatter implements FormatterInterface
      * as comment to the corresponding section
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function format($data, array $comments = [])
     {
diff --git a/lib/internal/Magento/Framework/App/DesignInterface.php b/lib/internal/Magento/Framework/App/DesignInterface.php
index 0af1862f4c0e6..75ef7253a3dd7 100644
--- a/lib/internal/Magento/Framework/App/DesignInterface.php
+++ b/lib/internal/Magento/Framework/App/DesignInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Design Interface
- * @since 2.0.0
  */
 interface DesignInterface
 {
@@ -17,7 +16,6 @@ interface DesignInterface
      * @param string $storeId
      * @param string|null $date
      * @return $this
-     * @since 2.0.0
      */
     public function loadChange($storeId, $date = null);
 
@@ -26,7 +24,6 @@ public function loadChange($storeId, $date = null);
      *
      * @param \Magento\Framework\View\DesignInterface $packageInto
      * @return $this
-     * @since 2.0.0
      */
     public function changeDesign(\Magento\Framework\View\DesignInterface $packageInto);
 }
diff --git a/lib/internal/Magento/Framework/App/EnvironmentFactory.php b/lib/internal/Magento/Framework/App/EnvironmentFactory.php
index 08334524273de..5343bc4d57c97 100644
--- a/lib/internal/Magento/Framework/App/EnvironmentFactory.php
+++ b/lib/internal/Magento/Framework/App/EnvironmentFactory.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\Framework\App\EnvironmentFactory
  *
- * @since 2.0.0
  */
 class EnvironmentFactory
 {
     /**
      * @var RelationsInterface
-     * @since 2.0.0
      */
     private $relations;
 
     /**
      * @var DefinitionInterface
-     * @since 2.0.0
      */
     private $definitions;
 
     /**
      * @param RelationsInterface $relations
      * @param DefinitionInterface $definitions
-     * @since 2.0.0
      */
     public function __construct(
         RelationsInterface $relations,
@@ -47,7 +43,6 @@ public function __construct(
      * Create Environment object
      *
      * @return EnvironmentInterface
-     * @since 2.0.0
      */
     public function createEnvironment()
     {
@@ -64,7 +59,6 @@ public function createEnvironment()
      * Determinate running mode
      *
      * @return string
-     * @since 2.0.0
      */
     private function getMode()
     {
@@ -79,7 +73,6 @@ private function getMode()
      * Returns definitions
      *
      * @return DefinitionInterface
-     * @since 2.0.0
      */
     public function getDefinitions()
     {
@@ -90,7 +83,6 @@ public function getDefinitions()
      * Returns relations
      *
      * @return RelationsInterface
-     * @since 2.0.0
      */
     public function getRelations()
     {
diff --git a/lib/internal/Magento/Framework/App/EnvironmentInterface.php b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
index b1653697fe387..ef0394c49aed4 100644
--- a/lib/internal/Magento/Framework/App/EnvironmentInterface.php
+++ b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
@@ -12,7 +12,6 @@
 
 /**
  * Interface for ObjectManager Environment
- * @since 2.0.0
  */
 interface EnvironmentInterface
 {
@@ -20,7 +19,6 @@ interface EnvironmentInterface
      * Return name of running mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode();
 
@@ -28,7 +26,6 @@ public function getMode();
      * Return config object
      *
      * @return ConfigInterface
-     * @since 2.0.0
      */
     public function getDiConfig();
 
@@ -37,7 +34,6 @@ public function getDiConfig();
      *
      * @param array $arguments
      * @return FactoryInterface
-     * @since 2.0.0
      */
     public function getObjectManagerFactory($arguments);
 
@@ -45,7 +41,6 @@ public function getObjectManagerFactory($arguments);
      * Return ConfigLoader object
      *
      * @return ConfigLoaderInterface
-     * @since 2.0.0
      */
     public function getObjectManagerConfigLoader();
 
@@ -53,7 +48,6 @@ public function getObjectManagerConfigLoader();
      * @param ConfigInterface $diConfig
      * @param array &$sharedInstances
      * @return void
-     * @since 2.0.0
      */
     public function configureObjectManager(ConfigInterface $diConfig, &$sharedInstances);
 }
diff --git a/lib/internal/Magento/Framework/App/ErrorHandler.php b/lib/internal/Magento/Framework/App/ErrorHandler.php
index db1c37ae25a62..c3a26595dab72 100644
--- a/lib/internal/Magento/Framework/App/ErrorHandler.php
+++ b/lib/internal/Magento/Framework/App/ErrorHandler.php
@@ -8,7 +8,6 @@
 
 /**
  * An error handler that converts runtime errors into exceptions
- * @since 2.0.0
  */
 class ErrorHandler
 {
@@ -16,7 +15,6 @@ class ErrorHandler
      * Error messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $errorPhrases = [
         E_ERROR => 'Error',
@@ -45,7 +43,6 @@ class ErrorHandler
      * @param int $errorLine
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function handler($errorNo, $errorStr, $errorFile, $errorLine)
     {
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
index 3ff9443d9bc8e..4b10a503f423c 100644
--- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
@@ -9,7 +9,6 @@
 
 /**
  * A Magento application specific list of directories
- * @since 2.0.0
  */
 class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
 {
@@ -138,7 +137,6 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public static function getDefaultConfig()
     {
@@ -172,7 +170,6 @@ public static function getDefaultConfig()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function __construct($root, array $config = [])
     {
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
index 925841b0f0687..03adf01c327bc 100644
--- a/lib/internal/Magento/Framework/App/FrontController.php
+++ b/lib/internal/Magento/Framework/App/FrontController.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\App\FrontController
  *
- * @since 2.0.0
  */
 class FrontController implements FrontControllerInterface
 {
     /**
      * @var RouterListInterface
-     * @since 2.0.0
      */
     protected $_routerList;
 
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $response;
 
     /**
      * @param RouterListInterface $routerList
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @since 2.0.0
      */
     public function __construct(
         RouterListInterface $routerList,
@@ -45,7 +41,6 @@ public function __construct(
      * @param RequestInterface $request
      * @return ResponseInterface|\Magento\Framework\Controller\ResultInterface
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/lib/internal/Magento/Framework/App/FrontControllerInterface.php b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
index 64a22e8821170..a552d88e68f50 100644
--- a/lib/internal/Magento/Framework/App/FrontControllerInterface.php
+++ b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
@@ -11,7 +11,6 @@
  * Evary application area has own front controller
  *
  * @api
- * @since 2.0.0
  */
 interface FrontControllerInterface
 {
@@ -20,7 +19,6 @@ interface FrontControllerInterface
      *
      * @param RequestInterface $request
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function dispatch(RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
index 86d0065e30e3b..c28cf2f669922 100644
--- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
@@ -9,7 +9,6 @@
  * Abstract helper
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractHelper
 {
@@ -17,7 +16,6 @@ abstract class AbstractHelper
      * Helper module name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_moduleName;
 
@@ -25,31 +23,26 @@ abstract class AbstractHelper
      * Request object
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Framework\HTTP\Header
-     * @since 2.0.0
      */
     protected $_httpHeader;
 
@@ -57,31 +50,26 @@ abstract class AbstractHelper
      * Event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $_remoteAddress;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -93,7 +81,6 @@ abstract class AbstractHelper
 
     /**
      * @param Context $context
-     * @since 2.0.0
      */
     public function __construct(Context $context)
     {
@@ -114,7 +101,6 @@ public function __construct(Context $context)
      * Retrieve request object
      *
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected function _getRequest()
     {
@@ -125,7 +111,6 @@ protected function _getRequest()
      * Retrieve helper module name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getModuleName()
     {
@@ -142,7 +127,6 @@ protected function _getModuleName()
      * @param string $moduleName Full module name
      * @return boolean
      * use \Magento\Framework\Module\Manager::isOutputEnabled()
-     * @since 2.0.0
      */
     public function isModuleOutputEnabled($moduleName = null)
     {
@@ -158,7 +142,6 @@ public function isModuleOutputEnabled($moduleName = null)
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     protected function _getUrl($route, $params = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
index 329799c4d1358..dc8afd061cba1 100644
--- a/lib/internal/Magento/Framework/App/Helper/Context.php
+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
@@ -17,73 +17,61 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     protected $_moduleManager;
 
     /**
      * @var  \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_httpRequest;
 
     /**
      * @var \Magento\Framework\Cache\ConfigInterface
-     * @since 2.0.0
      */
     protected $_cacheConfig;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
     /**
      * @var \Magento\Framework\HTTP\Header
-     * @since 2.0.0
      */
     protected $_httpHeader;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $_remoteAddress;
 
     /**
      * @var \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     protected $urlEncoder;
 
     /**
      * @var \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     protected $urlDecoder;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -101,7 +89,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
@@ -131,7 +118,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     public function getModuleManager()
     {
@@ -140,7 +126,6 @@ public function getModuleManager()
 
     /**
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function getUrlBuilder()
     {
@@ -149,7 +134,6 @@ public function getUrlBuilder()
 
     /**
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -158,7 +142,6 @@ public function getRequest()
 
     /**
      * @return \Magento\Framework\Cache\ConfigInterface
-     * @since 2.0.0
      */
     public function getCacheConfig()
     {
@@ -167,7 +150,6 @@ public function getCacheConfig()
 
     /**
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -176,7 +158,6 @@ public function getEventManager()
 
     /**
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -185,7 +166,6 @@ public function getLogger()
 
     /**
      * @return \Magento\Framework\HTTP\Header
-     * @since 2.0.0
      */
     public function getHttpHeader()
     {
@@ -194,7 +174,6 @@ public function getHttpHeader()
 
     /**
      * @return \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     public function getRemoteAddress()
     {
@@ -203,7 +182,6 @@ public function getRemoteAddress()
 
     /**
      * @return \Magento\Framework\Url\EncoderInterface
-     * @since 2.0.0
      */
     public function getUrlEncoder()
     {
@@ -212,7 +190,6 @@ public function getUrlEncoder()
 
     /**
      * @return \Magento\Framework\Url\DecoderInterface
-     * @since 2.0.0
      */
     public function getUrlDecoder()
     {
@@ -221,7 +198,6 @@ public function getUrlDecoder()
 
     /**
      * @return \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     public function getScopeConfig()
     {
diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index a9388090d5677..24cf1767ebc4f 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -18,61 +18,51 @@
  * HTTP web application. Called from webroot index.php to serve web requests.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Http implements \Magento\Framework\AppInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Event\Manager
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var AreaList
-     * @since 2.0.0
      */
     protected $_areaList;
 
     /**
      * @var Request\Http
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var ConfigLoaderInterface
-     * @since 2.0.0
      */
     protected $_configLoader;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $_state;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var ResponseHttp
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
@@ -92,7 +82,6 @@ class Http implements \Magento\Framework\AppInterface
      * @param State $state
      * @param Filesystem $filesystem,
      * @param \Magento\Framework\Registry $registry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -137,7 +126,6 @@ private function getLogger()
      *
      * @throws \InvalidArgumentException
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -164,7 +152,6 @@ public function launch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -182,7 +169,6 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
      * @param Bootstrap $bootstrap
      * @param \Exception $exception
      * @return bool
-     * @since 2.0.0
      */
     private function handleDeveloperMode(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -245,7 +231,6 @@ private function buildContentFromException(\Exception $exception)
      * @param \Exception $exception
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     private function redirectToSetup(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -270,7 +255,6 @@ private function redirectToSetup(Bootstrap $bootstrap, \Exception $exception)
      * @param Bootstrap $bootstrap
      * @param \Exception &$exception
      * @return bool
-     * @since 2.0.0
      */
     private function handleBootstrapErrors(Bootstrap $bootstrap, \Exception &$exception)
     {
@@ -295,7 +279,6 @@ private function handleBootstrapErrors(Bootstrap $bootstrap, \Exception &$except
      *
      * @param \Exception $exception
      * @return bool
-     * @since 2.0.0
      */
     private function handleSessionException(\Exception $exception)
     {
@@ -312,7 +295,6 @@ private function handleSessionException(\Exception $exception)
      *
      * @param \Exception $exception
      * @return bool
-     * @since 2.0.0
      */
     private function handleInitException(\Exception $exception)
     {
@@ -330,7 +312,6 @@ private function handleInitException(\Exception $exception)
      * @param Bootstrap $bootstrap
      * @param \Exception $exception
      * @return bool
-     * @since 2.0.0
      */
     private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception)
     {
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
index 1e61c1fa33b58..16edaf25d9ed9 100644
--- a/lib/internal/Magento/Framework/App/Http/Context.php
+++ b/lib/internal/Magento/Framework/App/Http/Context.php
@@ -10,7 +10,6 @@
 
 /**
  * Context data for requests
- * @since 2.0.0
  */
 class Context
 {
@@ -23,13 +22,11 @@ class Context
      * Data storage
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $default = [];
 
@@ -59,7 +56,6 @@ public function __construct(array $data = [], array $default = [], Json $seriali
      * @param mixed $value
      * @param mixed $default
      * @return \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     public function setValue($name, $value, $default)
     {
@@ -75,7 +71,6 @@ public function setValue($name, $value, $default)
      *
      * @param string $name
      * @return null
-     * @since 2.0.0
      */
     public function unsValue($name)
     {
@@ -88,7 +83,6 @@ public function unsValue($name)
      *
      * @param string $name
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getValue($name)
     {
@@ -101,7 +95,6 @@ public function getValue($name)
      * Return all data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -118,7 +111,6 @@ public function getData()
      * Return vary string to be used as a part of page cache identifier
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getVaryString()
     {
diff --git a/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php b/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
index 1ee8a271cc344..aa7b601d5b0a2 100644
--- a/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
+++ b/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\Interception\Cache\CompiledConfig
  *
- * @since 2.0.0
  */
 class CompiledConfig extends TagScope implements CacheInterface
 {
@@ -28,7 +27,6 @@ class CompiledConfig extends TagScope implements CacheInterface
 
     /**
      * @param FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/App/Language/Config.php b/lib/internal/Magento/Framework/App/Language/Config.php
index d04cd5cd2496e..65967cc4da706 100644
--- a/lib/internal/Magento/Framework/App/Language/Config.php
+++ b/lib/internal/Magento/Framework/App/Language/Config.php
@@ -10,19 +10,16 @@
 
 /**
  * Language pack configuration file
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
      * @var \Magento\Framework\Config\DomFactory
-     * @since 2.0.0
      */
     protected $domFactory;
 
@@ -30,7 +27,6 @@ class Config
      * Data extracted from the configuration file
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
@@ -41,7 +37,6 @@ class Config
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      * @param \Magento\Framework\Config\DomFactory $domFactory
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         $source,
@@ -58,7 +53,6 @@ public function __construct(
      * Get absolute path to validation scheme for language.xml
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getSchemaFile()
     {
@@ -70,7 +64,6 @@ protected function getSchemaFile()
      *
      * @param \DOMDocument $dom
      * @return array
-     * @since 2.0.0
      */
     protected function _extractData(\DOMDocument $dom)
     {
@@ -105,7 +98,6 @@ protected function _extractData(\DOMDocument $dom)
      * Language code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode()
     {
@@ -116,7 +108,6 @@ public function getCode()
      * Language vendor
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVendor()
     {
@@ -127,7 +118,6 @@ public function getVendor()
      * Language package
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPackage()
     {
@@ -138,7 +128,6 @@ public function getPackage()
      * Sort order
      *
      * @return null|int
-     * @since 2.0.0
      */
     public function getSortOrder()
     {
@@ -149,7 +138,6 @@ public function getSortOrder()
      * Declaration of Inheritances
      *
      * @return string[][]
-     * @since 2.0.0
      */
     public function getUses()
     {
diff --git a/lib/internal/Magento/Framework/App/Language/ConfigFactory.php b/lib/internal/Magento/Framework/App/Language/ConfigFactory.php
index 885ac20d52d1d..f7bc0d3657f8f 100644
--- a/lib/internal/Magento/Framework/App/Language/ConfigFactory.php
+++ b/lib/internal/Magento/Framework/App/Language/ConfigFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class ConfigFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return Config
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
index d90783ecee59b..a8dc20d9465a3 100644
--- a/lib/internal/Magento/Framework/App/Language/Dictionary.php
+++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -13,7 +13,6 @@
  * A service for reading language package dictionaries
  *
  * @api
- * @since 2.0.0
  */
 class Dictionary
 {
@@ -21,7 +20,6 @@ class Dictionary
      * Paths of all language packages
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $paths;
 
@@ -29,7 +27,6 @@ class Dictionary
      * Creates directory read objects
      *
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $directoryReadFactory;
 
@@ -37,19 +34,16 @@ class Dictionary
      * Component Registrar
      *
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
     /**
      * @var ConfigFactory
-     * @since 2.0.0
      */
     private $configFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $packList = [];
 
@@ -57,7 +51,6 @@ class Dictionary
      * @param ReadFactory $directoryReadFactory
      * @param ComponentRegistrar $componentRegistrar
      * @param ConfigFactory $configFactory
-     * @since 2.0.0
      */
     public function __construct(
         ReadFactory $directoryReadFactory,
@@ -78,7 +71,6 @@ public function __construct(
      * @param string $languageCode
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDictionary($languageCode)
     {
@@ -134,7 +126,6 @@ public function getDictionary($languageCode)
      * @param int $level
      * @param array $visitedPacks
      * @return void
-     * @since 2.0.0
      */
     private function collectInheritedPacks($languageConfig, &$result, $level = 0, array &$visitedPacks = [])
     {
@@ -167,7 +158,6 @@ private function collectInheritedPacks($languageConfig, &$result, $level = 0, ar
      * @param array $next
      * @return int
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     * @since 2.0.0
      */
     private function sortInherited($current, $next)
     {
@@ -192,7 +182,6 @@ private function sortInherited($current, $next)
      * @param string $vendor
      * @param string $package
      * @return array
-     * @since 2.0.0
      */
     private function readPackCsv($vendor, $package)
     {
diff --git a/lib/internal/Magento/Framework/App/MaintenanceMode.php b/lib/internal/Magento/Framework/App/MaintenanceMode.php
index 47c0a1096e48d..4e4328cb72aef 100644
--- a/lib/internal/Magento/Framework/App/MaintenanceMode.php
+++ b/lib/internal/Magento/Framework/App/MaintenanceMode.php
@@ -10,7 +10,6 @@
 
 /**
  * Application Maintenance Mode
- * @since 2.0.0
  */
 class MaintenanceMode
 {
@@ -36,7 +35,6 @@ class MaintenanceMode
      * Path to store files
      *
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $flagDir;
 
@@ -44,7 +42,6 @@ class MaintenanceMode
      * Constructor
      *
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -58,7 +55,6 @@ public function __construct(Filesystem $filesystem)
      *
      * @param string $remoteAddr
      * @return bool
-     * @since 2.0.0
      */
     public function isOn($remoteAddr = '')
     {
@@ -74,7 +70,6 @@ public function isOn($remoteAddr = '')
      *
      * @param bool $isOn
      * @return bool
-     * @since 2.0.0
      */
     public function set($isOn)
     {
@@ -93,7 +88,6 @@ public function set($isOn)
      * @param string $addresses
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setAddresses($addresses)
     {
@@ -115,7 +109,6 @@ public function setAddresses($addresses)
      * Get list of IP addresses effective for maintenance mode
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAddressInfo()
     {
diff --git a/lib/internal/Magento/Framework/App/MutableScopeConfig.php b/lib/internal/Magento/Framework/App/MutableScopeConfig.php
index 2a1d778b9535c..711e0e85e99eb 100644
--- a/lib/internal/Magento/Framework/App/MutableScopeConfig.php
+++ b/lib/internal/Magento/Framework/App/MutableScopeConfig.php
@@ -13,7 +13,6 @@
 
 /**
  * @inheritdoc
- * @since 2.0.0
  */
 class MutableScopeConfig extends Config implements MutableScopeConfigInterface
 {
@@ -47,7 +46,6 @@ public function getValue(
      * @param string $scope
      * @param null|string $scopeCode
      * @return void
-     * @since 2.0.0
      */
     public function setValue(
         $path,
diff --git a/lib/internal/Magento/Framework/App/ObjectManager.php b/lib/internal/Magento/Framework/App/ObjectManager.php
index a9f5d98c9d977..1cc1745c3a57f 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager.php
@@ -15,13 +15,11 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ObjectManager extends \Magento\Framework\ObjectManager\ObjectManager
 {
     /**
      * @var ObjectManager
-     * @since 2.0.0
      */
     protected static $_instance;
 
@@ -30,7 +28,6 @@ class ObjectManager extends \Magento\Framework\ObjectManager\ObjectManager
      *
      * @return ObjectManager
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public static function getInstance()
     {
@@ -46,7 +43,6 @@ public static function getInstance()
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @throws \LogicException
      * @return void
-     * @since 2.0.0
      */
     public static function setInstance(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -57,7 +53,6 @@ public static function setInstance(\Magento\Framework\ObjectManagerInterface $ob
      * @param FactoryInterface $factory
      * @param \Magento\Framework\ObjectManager\ConfigInterface $config
      * @param array $sharedInstances
-     * @since 2.0.0
      */
     public function __construct(
         FactoryInterface $factory,
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
index 95d860a3adc36..4a1fcfd50dd4c 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Framework\App\ObjectManager\ConfigCache
  *
- * @since 2.0.0
  */
 class ConfigCache implements \Magento\Framework\ObjectManager\ConfigCacheInterface
 {
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_cacheFrontend;
 
@@ -27,7 +25,6 @@ class ConfigCache implements \Magento\Framework\ObjectManager\ConfigCacheInterfa
      * Cache prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_prefix = 'diConfig';
 
@@ -39,7 +36,6 @@ class ConfigCache implements \Magento\Framework\ObjectManager\ConfigCacheInterfa
 
     /**
      * @param \Magento\Framework\Cache\FrontendInterface $cacheFrontend
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Cache\FrontendInterface $cacheFrontend)
     {
@@ -51,7 +47,6 @@ public function __construct(\Magento\Framework\Cache\FrontendInterface $cacheFro
      *
      * @param string $key
      * @return array|false
-     * @since 2.0.0
      */
     public function get($key)
     {
@@ -68,7 +63,6 @@ public function get($key)
      * @param array $config
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function save(array $config, $key)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
index 20eaccc7e01ba..7c121b6236c54 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\ObjectManager\ConfigLoader
  *
- * @since 2.0.0
  */
 class ConfigLoader implements ConfigLoaderInterface
 {
@@ -22,7 +21,6 @@ class ConfigLoader implements ConfigLoaderInterface
      * Config reader
      *
      * @var \Magento\Framework\ObjectManager\Config\Reader\Dom
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -30,7 +28,6 @@ class ConfigLoader implements ConfigLoaderInterface
      * Config reader factory
      *
      * @var \Magento\Framework\ObjectManager\Config\Reader\DomFactory
-     * @since 2.0.0
      */
     protected $_readerFactory;
 
@@ -38,7 +35,6 @@ class ConfigLoader implements ConfigLoaderInterface
      * Cache
      *
      * @var \Magento\Framework\Config\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -51,7 +47,6 @@ class ConfigLoader implements ConfigLoaderInterface
     /**
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param \Magento\Framework\ObjectManager\Config\Reader\DomFactory $readerFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\CacheInterface $cache,
@@ -65,7 +60,6 @@ public function __construct(
      * Get reader instance
      *
      * @return \Magento\Framework\ObjectManager\Config\Reader\Dom
-     * @since 2.0.0
      */
     protected function _getReader()
     {
@@ -77,7 +71,6 @@ protected function _getReader()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function load($area)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
index 49b9684f83308..0f18f7fc92b7b 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled
  *
- * @since 2.0.0
  */
 class Compiled implements ConfigLoaderInterface
 {
@@ -22,13 +21,11 @@ class Compiled implements ConfigLoaderInterface
      * Global config
      *
      * @var array
-     * @since 2.0.0
      */
     private $configCache = [];
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function load($area)
     {
@@ -45,7 +42,6 @@ public function load($area)
      *
      * @param string $area
      * @return string
-     * @since 2.0.0
      */
     public static function getFilePath($area)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
index 25d2fe7d88584..a91e1b383c227 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
@@ -16,43 +16,36 @@
 /**
  * Class \Magento\Framework\App\ObjectManager\Environment\AbstractEnvironment
  *
- * @since 2.0.0
  */
 abstract class AbstractEnvironment implements EnvironmentInterface
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * Mode name
-     * @since 2.0.0
      */
     protected $mode = 'developer';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $configPreference = \Magento\Framework\ObjectManager\Factory\Dynamic\Developer::class;
 
     /**
      * @var FactoryInterface
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * @var EnvironmentFactory
-     * @since 2.0.0
      */
     protected $envFactory;
 
     /**
      * @param EnvironmentFactory $envFactory
-     * @since 2.0.0
      */
     public function __construct(EnvironmentFactory $envFactory)
     {
@@ -64,7 +57,6 @@ public function __construct(EnvironmentFactory $envFactory)
      *
      * @param array $arguments
      * @return FactoryInterface
-     * @since 2.0.0
      */
     public function getObjectManagerFactory($arguments)
     {
@@ -80,7 +72,6 @@ public function getObjectManagerFactory($arguments)
      * Return name of running mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -92,7 +83,6 @@ public function getMode()
      *
      * @param array $arguments
      * @return void
-     * @since 2.0.0
      */
     protected function decorate($arguments)
     {
@@ -111,7 +101,6 @@ protected function decorate($arguments)
      * @param string $factoryClass
      *
      * @return FactoryInterface
-     * @since 2.0.0
      */
     protected function createFactory($arguments, $factoryClass)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
index a3574caad9eb4..189773d7d6c59 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Compiled extends AbstractEnvironment implements EnvironmentInterface
 {
@@ -25,21 +24,16 @@ class Compiled extends AbstractEnvironment implements EnvironmentInterface
     const MODE = 'compiled';
     /**#@- */
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@- */
     protected $mode = self::MODE;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $configPreference = \Magento\Framework\ObjectManager\Factory\Compiled::class;
 
     /**
      * @var \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled
-     * @since 2.0.0
      */
     private $configLoader;
 
@@ -50,7 +44,6 @@ class Compiled extends AbstractEnvironment implements EnvironmentInterface
      * @param string $factoryClass
      *
      * @return FactoryInterface
-     * @since 2.0.0
      */
     protected function createFactory($arguments, $factoryClass)
     {
@@ -65,7 +58,6 @@ protected function createFactory($arguments, $factoryClass)
      * Returns initialized compiled config
      *
      * @return \Magento\Framework\Interception\ObjectManager\ConfigInterface
-     * @since 2.0.0
      */
     public function getDiConfig()
     {
@@ -82,7 +74,6 @@ public function getDiConfig()
      * Returns config data as array
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getConfigData()
     {
@@ -93,7 +84,6 @@ protected function getConfigData()
      * Returns new instance of compiled config loader
      *
      * @return \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled
-     * @since 2.0.0
      */
     public function getObjectManagerConfigLoader()
     {
@@ -107,7 +97,6 @@ public function getObjectManagerConfigLoader()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function configureObjectManager(ConfigInterface $diConfig, &$sharedInstances)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
index b22f94fa55427..5438683146f43 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\App\ObjectManager\Environment\Developer
  *
- * @since 2.0.0
  */
 class Developer extends AbstractEnvironment implements EnvironmentInterface
 {
@@ -24,21 +23,16 @@ class Developer extends AbstractEnvironment implements EnvironmentInterface
     const MODE = 'developer';
     /**#@- */
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@- */
     protected $mode = self::MODE;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $configPreference = \Magento\Framework\ObjectManager\Factory\Dynamic\Developer::class;
 
@@ -46,7 +40,6 @@ class Developer extends AbstractEnvironment implements EnvironmentInterface
      * Returns initialized di config entity
      *
      * @return ConfigInterface
-     * @since 2.0.0
      */
     public function getDiConfig()
     {
@@ -64,7 +57,6 @@ public function getDiConfig()
      * As developer environment does not have config loader, we return null
      *
      * @return null
-     * @since 2.0.0
      */
     public function getObjectManagerConfigLoader()
     {
@@ -73,7 +65,6 @@ public function getObjectManagerConfigLoader()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function configureObjectManager(ConfigInterface $diConfig, &$sharedInstances)
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index 67030025c03ac..db71782d1c25e 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -19,7 +19,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ObjectManagerFactory
 {
@@ -37,7 +36,6 @@ class ObjectManagerFactory
      * Locator class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_locatorClassName = \Magento\Framework\App\ObjectManager::class;
 
@@ -45,7 +43,6 @@ class ObjectManagerFactory
      * Config class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_configClassName = \Magento\Framework\Interception\ObjectManager\ConfigInterface::class;
 
@@ -53,7 +50,6 @@ class ObjectManagerFactory
      * Environment factory class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $envFactoryClassName = \Magento\Framework\App\EnvironmentFactory::class;
 
@@ -61,7 +57,6 @@ class ObjectManagerFactory
      * Filesystem directory list
      *
      * @var DirectoryList
-     * @since 2.0.0
      */
     protected $directoryList;
 
@@ -69,7 +64,6 @@ class ObjectManagerFactory
      * Filesystem driver pool
      *
      * @var DriverPool
-     * @since 2.0.0
      */
     protected $driverPool;
 
@@ -77,7 +71,6 @@ class ObjectManagerFactory
      * Configuration file pool
      *
      * @var ConfigFilePool
-     * @since 2.0.0
      */
     protected $configFilePool;
 
@@ -85,7 +78,6 @@ class ObjectManagerFactory
      * Factory
      *
      * @var \Magento\Framework\ObjectManager\FactoryInterface
-     * @since 2.0.0
      */
     protected $factory;
 
@@ -95,7 +87,6 @@ class ObjectManagerFactory
      * @param DirectoryList $directoryList
      * @param DriverPool $driverPool
      * @param ConfigFilePool $configFilePool
-     * @since 2.0.0
      */
     public function __construct(DirectoryList $directoryList, DriverPool $driverPool, ConfigFilePool $configFilePool)
     {
@@ -111,7 +102,6 @@ public function __construct(DirectoryList $directoryList, DriverPool $driverPool
      * @return \Magento\Framework\ObjectManagerInterface
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function create(array $arguments)
     {
@@ -206,7 +196,6 @@ public function create(array $arguments)
      * @param ConfigFilePool $configFilePool
      * @param array $arguments
      * @return DeploymentConfig
-     * @since 2.0.0
      */
     protected function createDeploymentConfig(
         DirectoryList $directoryList,
@@ -228,7 +217,6 @@ protected function createDeploymentConfig(
      *
      * @param \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
      * @return \Magento\Framework\Data\Argument\InterpreterInterface
-     * @since 2.0.0
      */
     protected function createArgumentInterpreter(
         \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
@@ -260,7 +248,6 @@ protected function createArgumentInterpreter(
      * @param string $appMode
      * @return array
      * @throws \Magento\Framework\Exception\State\InitException
-     * @since 2.0.0
      */
     protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool, $argumentMapper, $appMode)
     {
@@ -306,7 +293,6 @@ protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool,
      * @return \Magento\Framework\Interception\PluginList\PluginList
      * @deprecated 2.2.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _createPluginList(
         \Magento\Framework\ObjectManagerInterface $objectManager,
diff --git a/lib/internal/Magento/Framework/App/PageCache/Cache.php b/lib/internal/Magento/Framework/App/PageCache/Cache.php
index e7558b74d058e..739a22ffd6c42 100644
--- a/lib/internal/Magento/Framework/App/PageCache/Cache.php
+++ b/lib/internal/Magento/Framework/App/PageCache/Cache.php
@@ -9,7 +9,6 @@
  * Cache model for builtin cache
  *
  * @deprecated 2.1.0
- * @since 2.0.0
  */
 class Cache extends \Magento\Framework\App\Cache
 {
@@ -17,7 +16,6 @@ class Cache extends \Magento\Framework\App\Cache
      * @var string
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_frontendIdentifier = 'page_cache';
 }
diff --git a/lib/internal/Magento/Framework/App/PageCache/FormKey.php b/lib/internal/Magento/Framework/App/PageCache/FormKey.php
index e52de222ed26a..6ac3061d0bb57 100644
--- a/lib/internal/Magento/Framework/App/PageCache/FormKey.php
+++ b/lib/internal/Magento/Framework/App/PageCache/FormKey.php
@@ -13,7 +13,6 @@
 /**
  * Class Version
  *
- * @since 2.0.0
  */
 class FormKey
 {
@@ -26,19 +25,16 @@ class FormKey
      * CookieManager
      *
      * @var CookieManagerInterface
-     * @since 2.0.0
      */
     private $cookieManager;
 
     /**
      * @var CookieMetadataFactory
-     * @since 2.0.0
      */
     private $cookieMetadataFactory;
 
     /**
      * @var SessionManagerInterface
-     * @since 2.0.0
      */
     private $sessionManager;
 
@@ -46,7 +42,6 @@ class FormKey
      * @param CookieManagerInterface $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param SessionManagerInterface $sessionManager
-     * @since 2.0.0
      */
     public function __construct(
         CookieManagerInterface $cookieManager,
@@ -62,7 +57,6 @@ public function __construct(
      * Get form key cookie
      *
      * @return string
-     * @since 2.0.0
      */
     public function get()
     {
@@ -73,7 +67,6 @@ public function get()
      * @param string $value
      * @param PublicCookieMetadata $metadata
      * @return void
-     * @since 2.0.0
      */
     public function set($value, PublicCookieMetadata $metadata)
     {
@@ -86,7 +79,6 @@ public function set($value, PublicCookieMetadata $metadata)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function delete()
     {
diff --git a/lib/internal/Magento/Framework/App/PageCache/Identifier.php b/lib/internal/Magento/Framework/App/PageCache/Identifier.php
index f1f9bd596e2b5..7fc5f772a695f 100644
--- a/lib/internal/Magento/Framework/App/PageCache/Identifier.php
+++ b/lib/internal/Magento/Framework/App/PageCache/Identifier.php
@@ -10,19 +10,16 @@
 
 /**
  * Page unique identifier
- * @since 2.0.0
  */
 class Identifier
 {
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $context;
 
@@ -36,7 +33,6 @@ class Identifier
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\App\Http\Context $context
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -52,7 +48,6 @@ public function __construct(
      * Return unique page identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/lib/internal/Magento/Framework/App/PageCache/Kernel.php b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
index 986b01073ba87..bfe1c72953c4b 100644
--- a/lib/internal/Magento/Framework/App/PageCache/Kernel.php
+++ b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
@@ -7,7 +7,6 @@
 
 /**
  * Builtin cache processor
- * @since 2.0.0
  */
 class Kernel
 {
@@ -15,19 +14,16 @@ class Kernel
      * @var \Magento\PageCache\Model\Cache\Type
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var Identifier
-     * @since 2.0.0
      */
     protected $identifier;
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
@@ -69,7 +65,6 @@ class Kernel
      * @param \Magento\Framework\App\Http\ContextFactory|null $contextFactory
      * @param \Magento\Framework\App\Response\HttpFactory|null $httpFactory
      * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\PageCache\Cache $cache,
@@ -118,7 +113,6 @@ public function __construct(
      * Load response from cache
      *
      * @return \Magento\Framework\App\Response\Http|false
-     * @since 2.0.0
      */
     public function load()
     {
@@ -142,7 +136,6 @@ public function load()
      *
      * @param \Magento\Framework\App\Response\Http $response
      * @return void
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\Response\Http $response)
     {
diff --git a/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php b/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
index abd2fc7b15c74..f80914ec5cc1d 100644
--- a/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
+++ b/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\PageCache\NotCacheableInterface
  *
- * @since 2.0.0
  */
 interface NotCacheableInterface
 {
diff --git a/lib/internal/Magento/Framework/App/PageCache/Version.php b/lib/internal/Magento/Framework/App/PageCache/Version.php
index 05dd74e6c5143..71c4a913cea44 100644
--- a/lib/internal/Magento/Framework/App/PageCache/Version.php
+++ b/lib/internal/Magento/Framework/App/PageCache/Version.php
@@ -8,7 +8,6 @@
 /**
  * Class Version
  *
- * @since 2.0.0
  */
 class Version
 {
@@ -26,7 +25,6 @@ class Version
      * Cookie Manager
      *
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
@@ -34,13 +32,11 @@ class Version
      * Request
      *
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $cookieMetadataFactory;
 
@@ -48,7 +44,6 @@ class Version
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\App\Request\Http $request
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -64,7 +59,6 @@ public function __construct(
      * Generate unique version identifier
      *
      * @return string
-     * @since 2.0.0
      */
     protected function generateValue()
     {
@@ -78,7 +72,6 @@ protected function generateValue()
      * In all other cases do nothing.
      *
      * @return void
-     * @since 2.0.0
      */
     public function process()
     {
diff --git a/lib/internal/Magento/Framework/App/ProductMetadata.php b/lib/internal/Magento/Framework/App/ProductMetadata.php
index d4601ac46d1c3..d8975258dba9e 100644
--- a/lib/internal/Magento/Framework/App/ProductMetadata.php
+++ b/lib/internal/Magento/Framework/App/ProductMetadata.php
@@ -15,7 +15,6 @@
 /**
  * Class ProductMetadata
  * @package Magento\Framework\App
- * @since 2.0.0
  */
 class ProductMetadata implements ProductMetadataInterface
 {
@@ -63,7 +62,6 @@ public function __construct(ComposerJsonFinder $composerJsonFinder)
      * Get Product version
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersion()
     {
@@ -83,7 +81,6 @@ public function getVersion()
      * Get Product edition
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEdition()
     {
@@ -94,7 +91,6 @@ public function getEdition()
      * Get Product name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/lib/internal/Magento/Framework/App/ProductMetadataInterface.php b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
index 28067d738bdca..4d55092d45e03 100644
--- a/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
+++ b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
@@ -9,7 +9,6 @@
  * Magento application product metadata
  *
  * @api
- * @since 2.0.0
  */
 interface ProductMetadataInterface
 {
@@ -17,7 +16,6 @@ interface ProductMetadataInterface
      * Get Product version
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersion();
 
@@ -25,7 +23,6 @@ public function getVersion();
      * Get Product edition
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEdition();
 
@@ -33,7 +30,6 @@ public function getEdition();
      * Get Product name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 }
diff --git a/lib/internal/Magento/Framework/App/ReinitableConfig.php b/lib/internal/Magento/Framework/App/ReinitableConfig.php
index 81b0a21a02f46..e0c431044d604 100644
--- a/lib/internal/Magento/Framework/App/ReinitableConfig.php
+++ b/lib/internal/Magento/Framework/App/ReinitableConfig.php
@@ -10,13 +10,11 @@
 /**
  * @inheritdoc
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class ReinitableConfig extends MutableScopeConfig implements ReinitableConfigInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function reinit()
     {
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index a63715e59ddc2..24e3fc5b39e40 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -15,7 +15,6 @@
 
 /**
  * Http request
- * @since 2.0.0
  */
 class Http extends Request implements RequestContentInterface, RequestSafetyInterface
 {
@@ -31,7 +30,6 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $route;
 
@@ -39,7 +37,6 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      * PATH_INFO
      *
      * @var string
-     * @since 2.0.0
      */
     protected $pathInfo = '';
 
@@ -47,19 +44,16 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      * ORIGINAL_PATH_INFO
      *
      * @var string
-     * @since 2.0.0
      */
     protected $originalPathInfo = '';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $directFrontNames;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $controllerModule;
 
@@ -67,37 +61,31 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      * Request's original information before forward.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $beforeForwardInfo = [];
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $routeConfig;
 
     /**
      * @var PathInfoProcessorInterface
-     * @since 2.0.0
      */
     protected $pathInfoProcessor;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var bool|null
-     * @since 2.0.0
      */
     protected $isSafeMethod = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $safeRequestTypes = ['GET', 'HEAD', 'TRACE', 'OPTIONS'];
 
@@ -115,7 +103,6 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      * @param ObjectManagerInterface  $objectManager
      * @param \Zend\Uri\UriInterface|string|null $uri
      * @param array $directFrontNames
-     * @since 2.0.0
      */
     public function __construct(
         CookieReaderInterface $cookieReader,
@@ -139,7 +126,6 @@ public function __construct(
      * directly from $_SERVER due to cross-platform differences.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOriginalPathInfo()
     {
@@ -155,7 +141,6 @@ public function getOriginalPathInfo()
      *
      * @param string|null $pathInfo
      * @return $this
-     * @since 2.0.0
      */
     public function setPathInfo($pathInfo = null)
     {
@@ -192,7 +177,6 @@ public function setPathInfo($pathInfo = null)
      *
      * @param   string $code
      * @return  bool
-     * @since 2.0.0
      */
     public function isDirectAccessFrontendName($code)
     {
@@ -203,7 +187,6 @@ public function isDirectAccessFrontendName($code)
      * Get base path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBasePath()
     {
@@ -220,7 +203,6 @@ public function getBasePath()
      * Retrieve request front name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFrontName()
     {
@@ -233,7 +215,6 @@ public function getFrontName()
      *
      * @param string $route
      * @return $this
-     * @since 2.0.0
      */
     public function setRouteName($route)
     {
@@ -249,7 +230,6 @@ public function setRouteName($route)
      * Retrieve route name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRouteName()
     {
@@ -261,7 +241,6 @@ public function getRouteName()
      *
      * @param string $module
      * @return $this
-     * @since 2.0.0
      */
     public function setControllerModule($module)
     {
@@ -273,7 +252,6 @@ public function setControllerModule($module)
      * Get module name of currently used controller
      *
      * @return  string
-     * @since 2.0.0
      */
     public function getControllerModule()
     {
@@ -285,7 +263,6 @@ public function getControllerModule()
      * before _forward was called first time.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initForward()
     {
@@ -308,7 +285,6 @@ public function initForward()
      *
      * @param string $name
      * @return array|string|null
-     * @since 2.0.0
      */
     public function getBeforeForwardInfo($name = null)
     {
@@ -324,7 +300,6 @@ public function getBeforeForwardInfo($name = null)
      * Check is Request from AJAX
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isAjax()
     {
@@ -343,7 +318,6 @@ public function isAjax()
      * @return string
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getDistroBaseUrl()
     {
@@ -377,7 +351,6 @@ public function getDistroBaseUrl()
      *
      * @param array $server
      * @return string
-     * @since 2.0.0
      */
     public static function getDistroBaseUrlPath($server)
     {
@@ -399,7 +372,6 @@ public static function getDistroBaseUrlPath($server)
      *
      * @param  string $url
      * @return string
-     * @since 2.0.0
      */
     public static function getUrlNoScript($url)
     {
@@ -419,7 +391,6 @@ public static function getUrlNoScript($url)
      *
      * @param string $delimiter
      * @return string
-     * @since 2.0.0
      */
     public function getFullActionName($delimiter = '_')
     {
@@ -432,7 +403,6 @@ public function getFullActionName($delimiter = '_')
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -441,7 +411,6 @@ public function __sleep()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isSafeMethod()
     {
diff --git a/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php b/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
index e19457a2e88df..60d867cb4388f 100644
--- a/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface PathInfoProcessorInterface
 {
@@ -19,7 +18,6 @@ interface PathInfoProcessorInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $pathInfo
      * @return string
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo);
 }
diff --git a/lib/internal/Magento/Framework/App/RequestFactory.php b/lib/internal/Magento/Framework/App/RequestFactory.php
index 5149f6478b8f0..1c505c8c87e30 100644
--- a/lib/internal/Magento/Framework/App/RequestFactory.php
+++ b/lib/internal/Magento/Framework/App/RequestFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\RequestFactory
  *
- * @since 2.0.0
  */
 class RequestFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return RequestInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/App/RequestInterface.php b/lib/internal/Magento/Framework/App/RequestInterface.php
index 1592ecc9caacc..7abcc9208af5c 100644
--- a/lib/internal/Magento/Framework/App/RequestInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RequestInterface
 {
@@ -17,7 +16,6 @@ interface RequestInterface
      * Retrieve module name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModuleName();
 
@@ -26,7 +24,6 @@ public function getModuleName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setModuleName($name);
 
@@ -34,7 +31,6 @@ public function setModuleName($name);
      * Retrieve action name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionName();
 
@@ -43,7 +39,6 @@ public function getActionName();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setActionName($name);
 
@@ -53,7 +48,6 @@ public function setActionName($name);
      * @param string $key
      * @param mixed $defaultValue
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($key, $defaultValue = null);
 
@@ -62,7 +56,6 @@ public function getParam($key, $defaultValue = null);
      *
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function setParams(array $params);
 
@@ -70,7 +63,6 @@ public function setParams(array $params);
      * Retrieve all params as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParams();
 
@@ -80,7 +72,6 @@ public function getParams();
      * @param string|null $name
      * @param string|null $default
      * @return string|null
-     * @since 2.0.0
      */
     public function getCookie($name, $default);
 
@@ -88,7 +79,6 @@ public function getCookie($name, $default);
      * Returns whether request was delivered over HTTPS
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSecure();
 }
diff --git a/lib/internal/Magento/Framework/App/RequestSafetyInterface.php b/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
index b242b36f366d2..f56ff9aaf8ab5 100644
--- a/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
@@ -10,7 +10,6 @@
  * Request safety check. Can be used to identify if current application request is safe (does not modify state) or not.
  *
  * @api
- * @since 2.0.0
  */
 interface RequestSafetyInterface
 {
@@ -18,7 +17,6 @@ interface RequestSafetyInterface
      * Check that this is safe request
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSafeMethod();
 }
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index f056a8c0b75ff..5c8473bbdaa84 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -14,7 +14,6 @@
  * Application provides ability to configure multiple connections to persistent storage.
  * This class provides access to all these connections.
  * @api
- * @since 2.0.0
  */
 class ResourceConnection
 {
@@ -30,7 +29,6 @@ class ResourceConnection
      * Instances of actual connections
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface[]
-     * @since 2.0.0
      */
     protected $connections = [];
 
@@ -38,7 +36,6 @@ class ResourceConnection
      * Mapped tables cache array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mappedTableNames;
 
@@ -46,7 +43,6 @@ class ResourceConnection
      * Resource config
      *
      * @var ResourceConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -54,19 +50,16 @@ class ResourceConnection
      * Resource connection adapter factory
      *
      * @var ConnectionFactoryInterface
-     * @since 2.0.0
      */
     protected $connectionFactory;
 
     /**
      * @var DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $tablePrefix;
 
@@ -75,7 +68,6 @@ class ResourceConnection
      * @param ConnectionFactoryInterface $connectionFactory
      * @param DeploymentConfig $deploymentConfig
      * @param string $tablePrefix
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConfigInterface $resourceConfig,
@@ -96,7 +88,6 @@ public function __construct(
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \DomainException
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getConnection($resourceName = self::DEFAULT_CONNECTION)
     {
@@ -107,7 +98,7 @@ public function getConnection($resourceName = self::DEFAULT_CONNECTION)
     /**
      * @param string $resourceName
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
     {
@@ -123,7 +114,6 @@ public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
      * @param string $connectionName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function getConnectionByName($connectionName)
     {
@@ -149,7 +139,7 @@ public function getConnectionByName($connectionName)
     /**
      * @param string $connectionName
      * @return string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getProcessConnectionName($connectionName)
     {
@@ -163,7 +153,6 @@ private function getProcessConnectionName($connectionName)
      * @param string $connectionName
      * @return  string
      * @api
-     * @since 2.0.0
      */
     public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNECTION)
     {
@@ -210,7 +199,6 @@ public function getTablePlaceholder($tableName)
      * @param string $time  Either "before" or "after"
      * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
      * @return string
-     * @since 2.0.0
      */
     public function getTriggerName($tableName, $time, $event)
     {
@@ -224,7 +212,6 @@ public function getTriggerName($tableName, $time, $event)
      * @param string $mappedName
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setMappedTableName($tableName, $mappedName)
     {
@@ -237,7 +224,6 @@ public function setMappedTableName($tableName, $mappedName)
      *
      * @param string $tableName
      * @return bool|string
-     * @since 2.0.0
      */
     public function getMappedTableName($tableName)
     {
@@ -255,7 +241,6 @@ public function getMappedTableName($tableName)
      * @param string|string[] $fields
      * @param string $indexType
      * @return string
-     * @since 2.0.0
      */
     public function getIdxName(
         $tableName,
@@ -278,7 +263,6 @@ public function getIdxName(
      * @param string $refTableName  the reference table name
      * @param string $refColumnName the reference table column name
      * @return string
-     * @since 2.0.0
      */
     public function getFkName($priTableName, $priColumnName, $refTableName, $refColumnName)
     {
@@ -294,7 +278,6 @@ public function getFkName($priTableName, $priColumnName, $refTableName, $refColu
      * Get table prefix
      *
      * @return string
-     * @since 2.0.0
      */
     private function getTablePrefix()
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
index dd5c08467fab1..688a96517e9d6 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
@@ -10,7 +10,6 @@
 
 /**
  * Resource configuration, uses application configuration to retrieve resource connection information
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data\Scoped implements ConfigInterface
 {
@@ -18,19 +17,18 @@ class Config extends \Magento\Framework\Config\Data\Scoped implements ConfigInte
      * List of connection names per resource
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_connectionNames = [];
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $deploymentConfig;
 
     /**
      * @var bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $initialized = false;
 
@@ -44,7 +42,6 @@ class Config extends \Magento\Framework\Config\Data\Scoped implements ConfigInte
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         Config\Reader $reader,
@@ -63,7 +60,6 @@ public function __construct(
      *
      * @param string $resourceName
      * @return string
-     * @since 2.0.0
      */
     public function getConnectionName($resourceName)
     {
@@ -99,7 +95,7 @@ public function getConnectionName($resourceName)
      * Initialise connections
      *
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function initConnections()
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config/Converter.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config/Converter.php
index 573b7b336335c..202b6fee9e9a2 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/Config/Converter.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\ResourceConnection\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -20,7 +19,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config/Reader.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config/Reader.php
index 5ae5c80679d3e..563a16c5131bc 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/Config/Reader.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\ResourceConnection\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/resource' => 'name'];
 
@@ -31,7 +29,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -60,7 +57,6 @@ public function __construct(
      *
      * @param string $scope
      * @return array
-     * @since 2.0.0
      */
     public function read($scope = null)
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config/SchemaLocator.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config/SchemaLocator.php
index 068d6fbb211c1..29bc63d511dd6 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\App\ResourceConnection\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
@@ -43,7 +39,6 @@ public function getPerFileSchema()
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
index f3b4b1fc7ba55..250aa02b56334 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\ResourceConnection\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      *
      * @param string $resourceName
      * @return string
-     * @since 2.0.0
      */
     public function getConnectionName($resourceName);
 }
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
index 771f7f4c8d3fa..353f33a723abe 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
@@ -12,7 +12,6 @@
 /**
  * Connection adapter interface
  *
- * @since 2.0.0
  */
 interface ConnectionAdapterInterface
 {
@@ -23,7 +22,6 @@ interface ConnectionAdapterInterface
      * @param SelectFactory|null $selectFactory
      * @return AdapterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getConnection(LoggerInterface $logger = null, SelectFactory $selectFactory = null);
 }
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionFactory.php b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionFactory.php
index 1abc9575431dd..8efbbe719f823 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionFactory.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Connection adapter factory
- * @since 2.0.0
  */
 class ConnectionFactory extends ModelConnectionFactory
 {
@@ -19,7 +18,6 @@ class ConnectionFactory extends ModelConnectionFactory
      * @param array $connectionConfig
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $connectionConfig)
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/SourceFactory.php b/lib/internal/Magento/Framework/App/ResourceConnection/SourceFactory.php
index e135d0b86e24f..6c475564576c8 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/SourceFactory.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/SourceFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\App\ResourceConnection\SourceFactory
  *
- * @since 2.0.0
  */
 class SourceFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @throws \InvalidArgumentException
      * @return SourceProviderInterface
-     * @since 2.0.0
      */
     public function create($className)
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
index 4a090dd7d995b..f8ff407d4507e 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface SourceProviderInterface extends \Traversable
 {
@@ -16,7 +15,6 @@ interface SourceProviderInterface extends \Traversable
      * validated by db adapter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainTable();
 
@@ -25,7 +23,6 @@ public function getMainTable();
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName();
 
@@ -33,7 +30,6 @@ public function getIdFieldName();
      * @param string $fieldName
      * @param null|string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToSelect($fieldName, $alias = null);
 
@@ -41,7 +37,6 @@ public function addFieldToSelect($fieldName, $alias = null);
      * Get \Magento\Framework\DB\Select instance and applies fields to select if needed
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelect();
 
@@ -51,7 +46,6 @@ public function getSelect();
      * @param mixed $attribute
      * @param mixed $condition
      * @return $this|\Magento\Framework\Data\Collection\AbstractDb
-     * @since 2.0.0
      */
     public function addFieldToFilter($attribute, $condition = null);
 }
diff --git a/lib/internal/Magento/Framework/App/Response/FileInterface.php b/lib/internal/Magento/Framework/App/Response/FileInterface.php
index 92f4cd0915731..421749ca85e03 100644
--- a/lib/internal/Magento/Framework/App/Response/FileInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/FileInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\Response\FileInterface
  *
- * @since 2.0.0
  */
 interface FileInterface extends HttpInterface
 {
@@ -19,7 +18,6 @@ interface FileInterface extends HttpInterface
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     public function setFilePath($path);
 }
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index 1e5b09631eee8..59405a98bca14 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Framework\App\Response\Http
  *
- * @since 2.0.0
  */
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 {
@@ -32,31 +31,26 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 2.0.0
      */
     protected $context;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -66,7 +60,6 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param Context $context
      * @param DateTime $dateTime
-     * @since 2.0.0
      */
     public function __construct(
         HttpRequest $request,
@@ -87,7 +80,6 @@ public function __construct(
      *
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setXFrameOptions($value)
     {
@@ -98,7 +90,6 @@ public function setXFrameOptions($value)
      * Send Vary cookie
      *
      * @return void
-     * @since 2.0.0
      */
     public function sendVary()
     {
@@ -119,7 +110,6 @@ public function sendVary()
      * @param int $ttl
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setPublicHeaders($ttl)
     {
@@ -137,7 +127,6 @@ public function setPublicHeaders($ttl)
      * @param int $ttl
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setPrivateHeaders($ttl)
     {
@@ -154,7 +143,6 @@ public function setPrivateHeaders($ttl)
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setNoCacheHeaders()
     {
@@ -169,7 +157,6 @@ public function setNoCacheHeaders()
      * @param string $content String in JSON format
      * @return \Magento\Framework\App\Response\Http
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function representJson($content)
     {
@@ -180,7 +167,6 @@ public function representJson($content)
     /**
      * @return string[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -192,7 +178,6 @@ public function __sleep()
      *
      * @return void
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -210,7 +195,6 @@ public function __wakeup()
      * @param string $time
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     protected function getExpirationHeader($time)
     {
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 77b3b0996403a..350519a26be6f 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Framework\App\Response\Http\FileFactory
  *
- * @since 2.0.0
  */
 class FileFactory
 {
     /**
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
@@ -56,7 +52,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function create(
         $fileName,
@@ -118,7 +113,6 @@ public function create(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     protected function callExit()
     {
diff --git a/lib/internal/Magento/Framework/App/Response/HttpInterface.php b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
index 0eedabd7cb21b..0a9d4cfc14463 100644
--- a/lib/internal/Magento/Framework/App/Response/HttpInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
@@ -9,7 +9,6 @@
  * HTTP response interface
  *
  * @api
- * @since 2.0.0
  */
 interface HttpInterface extends \Magento\Framework\App\ResponseInterface
 {
@@ -18,7 +17,6 @@ interface HttpInterface extends \Magento\Framework\App\ResponseInterface
      *
      * @param int $code
      * @return void
-     * @since 2.0.0
      */
     public function setHttpResponseCode($code);
 
diff --git a/lib/internal/Magento/Framework/App/Response/RedirectInterface.php b/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
index 4adb525aa587f..74a05761b5cbd 100644
--- a/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\Response\RedirectInterface
  *
- * @since 2.0.0
  */
 interface RedirectInterface
 {
@@ -24,7 +23,6 @@ interface RedirectInterface
      * Identify referer url via all accepted methods (HTTP_REFERER, regular or base64-encoded request param)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRefererUrl();
 
@@ -33,7 +31,6 @@ public function getRefererUrl();
      *
      * @param   string $defaultUrl
      * @return  string
-     * @since 2.0.0
      */
     public function getRedirectUrl($defaultUrl = null);
 
@@ -42,7 +39,6 @@ public function getRedirectUrl($defaultUrl = null);
      *
      * @param string $defaultUrl
      * @return  string
-     * @since 2.0.0
      */
     public function error($defaultUrl);
 
@@ -51,7 +47,6 @@ public function error($defaultUrl);
      *
      * @param string $defaultUrl
      * @return string
-     * @since 2.0.0
      */
     public function success($defaultUrl);
 
@@ -60,7 +55,6 @@ public function success($defaultUrl);
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     public function updatePathParams(array $arguments);
 
@@ -71,7 +65,6 @@ public function updatePathParams(array $arguments);
      * @param string $path
      * @param array $arguments
      * @return void
-     * @since 2.0.0
      */
     public function redirect(\Magento\Framework\App\ResponseInterface $response, $path, $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/App/ResponseFactory.php b/lib/internal/Magento/Framework/App/ResponseFactory.php
index 2b4fb04a9d440..c426fddb4d894 100644
--- a/lib/internal/Magento/Framework/App/ResponseFactory.php
+++ b/lib/internal/Magento/Framework/App/ResponseFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\ResponseFactory
  *
- * @since 2.0.0
  */
 class ResponseFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/App/ResponseInterface.php b/lib/internal/Magento/Framework/App/ResponseInterface.php
index 85ac3aa1b904b..f55e2cbaa2c1c 100644
--- a/lib/internal/Magento/Framework/App/ResponseInterface.php
+++ b/lib/internal/Magento/Framework/App/ResponseInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ResponseInterface
 {
@@ -17,7 +16,6 @@ interface ResponseInterface
      * Send response to client
      *
      * @return int|void
-     * @since 2.0.0
      */
     public function sendResponse();
 }
diff --git a/lib/internal/Magento/Framework/App/Route/Config.php b/lib/internal/Magento/Framework/App/Route/Config.php
index d03d16d581139..60fc73f1d62f3 100644
--- a/lib/internal/Magento/Framework/App/Route/Config.php
+++ b/lib/internal/Magento/Framework/App/Route/Config.php
@@ -12,43 +12,36 @@
 /**
  * Class \Magento\Framework\App\Route\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\App\Route\Config\Reader
-     * @since 2.0.0
      */
     protected $_reader;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheId;
 
     /**
      * @var \Magento\Framework\Config\ScopeInterface
-     * @since 2.0.0
      */
     protected $_configScope;
 
     /**
      * @var \Magento\Framework\App\AreaList
-     * @since 2.0.0
      */
     protected $_areaList;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_routes;
 
@@ -64,7 +57,6 @@ class Config implements ConfigInterface
      * @param \Magento\Framework\Config\ScopeInterface $configScope
      * @param \Magento\Framework\App\AreaList $areaList
      * @param string $cacheId
-     * @since 2.0.0
      */
     public function __construct(
         Config\Reader $reader,
@@ -85,7 +77,6 @@ public function __construct(
      *
      * @param string $scope
      * @return array
-     * @since 2.0.0
      */
     protected function _getRoutes($scope = null)
     {
@@ -117,7 +108,6 @@ protected function _getRoutes($scope = null)
      * @param string $routeId
      * @param null $scope
      * @return string
-     * @since 2.0.0
      */
     public function getRouteFrontName($routeId, $scope = null)
     {
@@ -129,7 +119,6 @@ public function getRouteFrontName($routeId, $scope = null)
      * @param string $frontName
      * @param string $scope
      * @return bool|int|string
-     * @since 2.0.0
      */
     public function getRouteByFrontName($frontName, $scope = null)
     {
@@ -146,7 +135,6 @@ public function getRouteByFrontName($frontName, $scope = null)
      * @param string $frontName
      * @param string $scope
      * @return string[]
-     * @since 2.0.0
      */
     public function getModulesByFrontName($frontName, $scope = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Route/Config/Converter.php b/lib/internal/Magento/Framework/App/Route/Config/Converter.php
index 605a36a72375e..0c3f103831112 100644
--- a/lib/internal/Magento/Framework/App/Route/Config/Converter.php
+++ b/lib/internal/Magento/Framework/App/Route/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Route\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,7 +18,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -65,7 +63,6 @@ public function convert($source)
      *
      * @param array $modulesList
      * @return array
-     * @since 2.0.0
      */
     protected function _sortModulesList($modulesList)
     {
diff --git a/lib/internal/Magento/Framework/App/Route/Config/Reader.php b/lib/internal/Magento/Framework/App/Route/Config/Reader.php
index 74f78aa952fcc..1447263fdd862 100644
--- a/lib/internal/Magento/Framework/App/Route/Config/Reader.php
+++ b/lib/internal/Magento/Framework/App/Route/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Route\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of paths to identifiable nodes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/router' => 'id',
@@ -32,7 +30,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param SchemaLocator $schemaLocator
      * @param \Magento\Framework\Config\ValidationStateInterface $validationState
      * @param string $fileName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/App/Route/Config/SchemaLocator.php b/lib/internal/Magento/Framework/App/Route/Config/SchemaLocator.php
index a11bd78c701bf..8ae78e9977f1f 100644
--- a/lib/internal/Magento/Framework/App/Route/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/App/Route/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\App\Route\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
index d569fa968521c..88b1c42261fc7 100644
--- a/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Routes configuration interface
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      * @param string $routeId
      * @param string $scope
      * @return string
-     * @since 2.0.0
      */
     public function getRouteFrontName($routeId, $scope = null);
 
@@ -29,7 +27,6 @@ public function getRouteFrontName($routeId, $scope = null);
      * @param string $frontName
      * @param string $scope
      * @return string
-     * @since 2.0.0
      */
     public function getRouteByFrontName($frontName, $scope = null);
 
@@ -39,7 +36,6 @@ public function getRouteByFrontName($frontName, $scope = null);
      * @param string $frontName
      * @param string $scope
      * @return string[]
-     * @since 2.0.0
      */
     public function getModulesByFrontName($frontName, $scope = null);
 }
diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
index b879131afde31..fd37590bb7782 100644
--- a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
+++ b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
@@ -9,7 +9,6 @@
 
 /**
  * Proxy class for \Magento\Framework\App\ResourceConnection
- * @since 2.0.0
  */
 class Proxy implements
     \Magento\Framework\App\Route\ConfigInterface,
@@ -19,7 +18,6 @@ class Proxy implements
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -27,7 +25,6 @@ class Proxy implements
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -35,7 +32,6 @@ class Proxy implements
      * Proxied instance
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_subject = null;
 
@@ -43,7 +39,6 @@ class Proxy implements
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isShared = null;
 
@@ -53,7 +48,6 @@ class Proxy implements
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -67,7 +61,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -78,7 +71,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -89,7 +81,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -100,7 +91,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\App\Route\ConfigInterface
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -118,7 +108,6 @@ protected function _getSubject()
      * @param string $routeId
      * @param string $scope
      * @return string
-     * @since 2.0.0
      */
     public function getRouteFrontName($routeId, $scope = null)
     {
@@ -131,7 +120,6 @@ public function getRouteFrontName($routeId, $scope = null)
      * @param string $frontName
      * @param string $scope
      * @return string
-     * @since 2.0.0
      */
     public function getRouteByFrontName($frontName, $scope = null)
     {
@@ -144,7 +132,6 @@ public function getRouteByFrontName($frontName, $scope = null)
      * @param string $frontName
      * @param string $scope
      * @return array
-     * @since 2.0.0
      */
     public function getModulesByFrontName($frontName, $scope = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Router/ActionList.php b/lib/internal/Magento/Framework/App/Router/ActionList.php
index b780787673d8a..1a62b97614ee3 100644
--- a/lib/internal/Magento/Framework/App/Router/ActionList.php
+++ b/lib/internal/Magento/Framework/App/Router/ActionList.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\App\Router\ActionList
  *
- * @since 2.0.0
  */
 class ActionList
 {
@@ -26,13 +25,11 @@ class ActionList
      * List of application actions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $actions;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $reservedWords = [
         'abstract', 'and', 'array', 'as', 'break', 'callable', 'case', 'catch', 'class', 'clone', 'const',
@@ -65,7 +62,6 @@ class ActionList
      * @param string $cacheKey
      * @param array $reservedWords
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\CacheInterface $cache,
@@ -95,7 +91,6 @@ public function __construct(
      * @param string $namespace
      * @param string $action
      * @return null|string
-     * @since 2.0.0
      */
     public function get($module, $area, $namespace, $action)
     {
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
index 11c30abb20b2b..ed9def8e1cf55 100644
--- a/lib/internal/Magento/Framework/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -10,31 +10,26 @@
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Base implements \Magento\Framework\App\RouterInterface
 {
     /**
      * @var \Magento\Framework\App\ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $actionInterface = \Magento\Framework\App\ActionInterface::class;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_modules = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_dispatchData = [];
 
@@ -42,13 +37,11 @@ class Base implements \Magento\Framework\App\RouterInterface
      * List of required request parameters
      * Order sensitive
      * @var string[]
-     * @since 2.0.0
      */
     protected $_requiredParams = ['moduleFrontName', 'actionPath', 'actionName'];
 
     /**
      * @var \Magento\Framework\App\Route\ConfigInterface
-     * @since 2.0.0
      */
     protected $_routeConfig;
 
@@ -56,7 +49,6 @@ class Base implements \Magento\Framework\App\RouterInterface
      * Url security information.
      *
      * @var \Magento\Framework\Url\SecurityInfoInterface
-     * @since 2.0.0
      */
     protected $_urlSecurityInfo;
 
@@ -64,43 +56,36 @@ class Base implements \Magento\Framework\App\RouterInterface
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\App\ResponseFactory
-     * @since 2.0.0
      */
     protected $_responseFactory;
 
     /**
      * @var \Magento\Framework\App\DefaultPathInterface
-     * @since 2.0.0
      */
     protected $_defaultPath;
 
     /**
      * @var \Magento\Framework\Code\NameBuilder
-     * @since 2.0.0
      */
     protected $nameBuilder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $reservedNames = ['new', 'print', 'switch', 'return'];
 
@@ -108,25 +93,21 @@ class Base implements \Magento\Framework\App\RouterInterface
      * Allows to control if we need to enable no route functionality in current router
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $applyNoRoute = false;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pathPrefix = null;
 
     /**
      * @var \Magento\Framework\App\Router\ActionList
-     * @since 2.0.0
      */
     protected $actionList;
 
     /**
      * @var \Magento\Framework\App\Router\PathConfigInterface
-     * @since 2.0.0
      */
     protected $pathConfig;
 
@@ -143,7 +124,6 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Router\ActionList $actionList,
@@ -170,7 +150,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ActionInterface|null
-     * @since 2.0.0
      */
     public function match(\Magento\Framework\App\RequestInterface $request)
     {
@@ -184,7 +163,6 @@ public function match(\Magento\Framework\App\RequestInterface $request)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return array
-     * @since 2.0.0
      */
     protected function parseRequest(\Magento\Framework\App\RequestInterface $request)
     {
@@ -209,7 +187,6 @@ protected function parseRequest(\Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $param
      * @return string|null
-     * @since 2.0.0
      */
     protected function matchModuleFrontName(\Magento\Framework\App\RequestInterface $request, $param)
     {
@@ -234,7 +211,6 @@ protected function matchModuleFrontName(\Magento\Framework\App\RequestInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $param
      * @return string
-     * @since 2.0.0
      */
     protected function matchActionPath(\Magento\Framework\App\RequestInterface $request, $param)
     {
@@ -257,7 +233,6 @@ protected function matchActionPath(\Magento\Framework\App\RequestInterface $requ
      *
      * @param string $currentModuleName
      * @return \Magento\Framework\App\ActionInterface|null
-     * @since 2.0.0
      */
     protected function getNotFoundAction($currentModuleName)
     {
@@ -282,7 +257,6 @@ protected function getNotFoundAction($currentModuleName)
      * @return \Magento\Framework\App\ActionInterface|null
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function matchAction(\Magento\Framework\App\RequestInterface $request, array $params)
     {
@@ -350,7 +324,6 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
      * @param string $module
      * @param string $actionPath
      * @return string
-     * @since 2.0.0
      */
     public function getActionClassName($module, $actionPath)
     {
@@ -366,7 +339,6 @@ public function getActionClassName($module, $actionPath)
      * @param string $path
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface $request, $path = '')
     {
@@ -389,7 +361,6 @@ protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface
      * Check whether redirect url should be used for secure routes
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _shouldRedirectToSecure()
     {
diff --git a/lib/internal/Magento/Framework/App/Router/DefaultRouter.php b/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
index 82d671b9fe52f..c9b4f890f7d1a 100644
--- a/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
+++ b/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\Framework\App\Router\DefaultRouter
  *
- * @since 2.0.0
  */
 class DefaultRouter implements RouterInterface
 {
     /**
      * @var NoRouteHandlerList
-     * @since 2.0.0
      */
     protected $noRouteHandlerList;
 
     /**
      * @var ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
     /**
      * @param ActionFactory $actionFactory
      * @param NoRouteHandlerList $noRouteHandlerList
-     * @since 2.0.0
      */
     public function __construct(ActionFactory $actionFactory, NoRouteHandlerList $noRouteHandlerList)
     {
@@ -47,7 +43,6 @@ public function __construct(ActionFactory $actionFactory, NoRouteHandlerList $no
      *
      * @param RequestInterface $request
      * @return ActionInterface
-     * @since 2.0.0
      */
     public function match(RequestInterface $request)
     {
diff --git a/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php b/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
index 4c9f898464730..9f69b8329622e 100644
--- a/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
+++ b/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\App\Router\NoRouteHandler
  *
- * @since 2.0.0
  */
 class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
index 4681934aa1344..6c86319a4fc53 100644
--- a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
+++ b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\Router\NoRouteHandlerInterface
  *
- * @since 2.0.0
  */
 interface NoRouteHandlerInterface
 {
@@ -19,7 +18,6 @@ interface NoRouteHandlerInterface
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\App\RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerList.php b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerList.php
index ed31207e7b35e..70afb55a2919f 100644
--- a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerList.php
+++ b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerList.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\App\Router\NoRouteHandlerList
  *
- * @since 2.0.0
  */
 class NoRouteHandlerList
 {
@@ -18,26 +17,22 @@ class NoRouteHandlerList
      * No route handlers instances
      *
      * @var NoRouteHandlerInterface[]
-     * @since 2.0.0
      */
     protected $_handlers;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_handlerList;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $handlerClassesList
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $handlerClassesList)
     {
@@ -49,7 +44,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Get noRoute handlers
      *
      * @return NoRouteHandlerInterface[]
-     * @since 2.0.0
      */
     public function getHandlers()
     {
diff --git a/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
index 950e8db9f485c..a3c10d1c5492a 100644
--- a/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\App\Router\PathConfigInterface
  *
- * @since 2.0.0
  */
 interface PathConfigInterface
 {
@@ -17,7 +16,6 @@ interface PathConfigInterface
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request);
 
@@ -27,7 +25,6 @@ public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $req
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function shouldBeSecure($path);
 
@@ -35,7 +32,6 @@ public function shouldBeSecure($path);
      * Get router default request path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultPath();
 }
diff --git a/lib/internal/Magento/Framework/App/RouterInterface.php b/lib/internal/Magento/Framework/App/RouterInterface.php
index 4e31cc80c55b1..a029f1e3bc30c 100644
--- a/lib/internal/Magento/Framework/App/RouterInterface.php
+++ b/lib/internal/Magento/Framework/App/RouterInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\App\RouterInterface
  *
- * @since 2.0.0
  */
 interface RouterInterface
 {
@@ -19,7 +18,6 @@ interface RouterInterface
      *
      * @param RequestInterface $request
      * @return ActionInterface
-     * @since 2.0.0
      */
     public function match(RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php
index e6e84a0baee5b..cb4ee3d1be414 100644
--- a/lib/internal/Magento/Framework/App/RouterList.php
+++ b/lib/internal/Magento/Framework/App/RouterList.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Framework\App\RouterList
  *
- * @since 2.0.0
  */
 class RouterList implements RouterListInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,14 +23,12 @@ class RouterList implements RouterListInterface
      * List of routers
      *
      * @var RouterInterface[]
-     * @since 2.0.0
      */
     protected $routerList;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $routerList
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $routerList)
     {
@@ -51,7 +47,6 @@ function ($item) {
      *
      * @param string $routerId
      * @return RouterInterface
-     * @since 2.0.0
      */
     protected function getRouterInstance($routerId)
     {
@@ -68,7 +63,6 @@ protected function getRouterInstance($routerId)
      * Return the current element
      * @link http://php.net/manual/en/iterator.current.php
      * @return RouterInterface
-     * @since 2.0.0
      */
     public function current()
     {
@@ -80,7 +74,6 @@ public function current()
      * Move forward to next element
      * @link http://php.net/manual/en/iterator.next.php
      * @return void Any returned value is ignored.
-     * @since 2.0.0
      */
     public function next()
     {
@@ -92,7 +85,6 @@ public function next()
      * Return the key of the current element
      * @link http://php.net/manual/en/iterator.key.php
      * @return string|int|null
-     * @since 2.0.0
      */
     public function key()
     {
@@ -105,7 +97,6 @@ public function key()
      * @link http://php.net/manual/en/iterator.valid.php
      * @return boolean The return value will be casted to boolean and then evaluated.
      * Returns true on success or false on failure.
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -117,7 +108,6 @@ public function valid()
      * Rewind the Iterator to the first element
      * @link http://php.net/manual/en/iterator.rewind.php
      * @return void Any returned value is ignored.
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -130,7 +120,6 @@ public function rewind()
      * @param array $routerDataFirst
      * @param array $routerDataSecond
      * @return int
-     * @since 2.0.0
      */
     protected function compareRoutersSortOrder($routerDataFirst, $routerDataSecond)
     {
diff --git a/lib/internal/Magento/Framework/App/RouterListInterface.php b/lib/internal/Magento/Framework/App/RouterListInterface.php
index 1a7975c7483e3..e491381362586 100644
--- a/lib/internal/Magento/Framework/App/RouterListInterface.php
+++ b/lib/internal/Magento/Framework/App/RouterListInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Application router list
- * @since 2.0.0
  */
 interface RouterListInterface extends \Iterator
 {
diff --git a/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php b/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
index dbc4bdec8bcb7..2c61c855945f2 100644
--- a/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
@@ -15,7 +14,6 @@ interface DataProviderInterface
      * Check if RSS feed allowed
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function isAllowed();
 
@@ -23,19 +21,16 @@ public function isAllowed();
      * Get RSS feed items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRssData();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCacheKey();
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCacheLifetime();
 
@@ -43,13 +38,11 @@ public function getCacheLifetime();
      * Get information about all feeds this Data Provider is responsible for
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFeeds();
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isAuthRequired();
 }
diff --git a/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php b/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
index 868a271039ea6..4c7821c3aa583 100644
--- a/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface RssManagerInterface
  * @package Magento\Framework\App\Rss
- * @since 2.0.0
  */
 interface RssManagerInterface
 {
@@ -16,7 +15,6 @@ interface RssManagerInterface
      * Get Data Provider by type
      * @param string $type
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function getProvider($type);
 
@@ -24,7 +22,6 @@ public function getProvider($type);
      * Get all registered providers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProviders();
 }
diff --git a/lib/internal/Magento/Framework/App/Rss/UrlBuilder.php b/lib/internal/Magento/Framework/App/Rss/UrlBuilder.php
index bfdcb7066805b..5b012f3fe6079 100644
--- a/lib/internal/Magento/Framework/App/Rss/UrlBuilder.php
+++ b/lib/internal/Magento/Framework/App/Rss/UrlBuilder.php
@@ -7,14 +7,12 @@
 
 /**
  * Class UrlBuilder
- * @since 2.0.0
  */
 class UrlBuilder implements UrlBuilderInterface
 {
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getUrl(array $queryParams = [])
     {
diff --git a/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php b/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
index 0a6b082b45cc1..f7a2513f5fae9 100644
--- a/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
@@ -8,14 +8,12 @@
 /**
  * Interface UrlBuilderInterface
  * @package Magento\Framework\App\Rss
- * @since 2.0.0
  */
 interface UrlBuilderInterface
 {
     /**
      * @param array $queryParams
      * @return mixed
-     * @since 2.0.0
      */
     public function getUrl(array $queryParams = []);
 }
diff --git a/lib/internal/Magento/Framework/App/ScopeInterface.php b/lib/internal/Magento/Framework/App/ScopeInterface.php
index 490eea98ea682..e19a014e3c342 100644
--- a/lib/internal/Magento/Framework/App/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ScopeInterface
 {
@@ -20,7 +19,6 @@ interface ScopeInterface
      * Retrieve scope code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -28,7 +26,6 @@ public function getCode();
      * Get scope identifier
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
diff --git a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
index 4b3a6cfe83afb..bae89a6885d4f 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Scopes provider
- * @since 2.0.0
  */
 interface ScopeResolverInterface
 {
@@ -16,7 +15,6 @@ interface ScopeResolverInterface
      *
      * @param null|int $scopeId
      * @return \Magento\Framework\App\ScopeInterface
-     * @since 2.0.0
      */
     public function getScope($scopeId = null);
 
@@ -24,7 +22,6 @@ public function getScope($scopeId = null);
      * Retrieve scopes array
      *
      * @return \Magento\Framework\App\ScopeInterface[]
-     * @since 2.0.0
      */
     public function getScopes();
 }
diff --git a/lib/internal/Magento/Framework/App/ScopeResolverPool.php b/lib/internal/Magento/Framework/App/ScopeResolverPool.php
index 6764ca0f883a3..5cb0d787781d0 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolverPool.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolverPool.php
@@ -8,19 +8,16 @@
 
 /**
  * Provider of scope resolvers by type
- * @since 2.0.0
  */
 class ScopeResolverPool
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_scopeResolvers = [];
 
     /**
      * @param \Magento\Framework\App\ScopeResolverInterface[] $scopeResolvers
-     * @since 2.0.0
      */
     public function __construct(
         array $scopeResolvers = []
@@ -34,7 +31,6 @@ public function __construct(
      * @param string $scopeType
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     public function get($scopeType)
     {
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index 14568e1380ab6..bc148707b9a8f 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -10,7 +10,6 @@
 
 /**
  * A model for determining information about setup application
- * @since 2.0.0
  */
 class SetupInfo
 {
@@ -30,7 +29,6 @@ class SetupInfo
      * Environment variables
      *
      * @var array
-     * @since 2.0.0
      */
     private $server;
 
@@ -38,7 +36,6 @@ class SetupInfo
      * Current document root directory
      *
      * @var string
-     * @since 2.0.0
      */
     private $docRoot;
 
@@ -46,7 +43,6 @@ class SetupInfo
      * Project root directory
      *
      * @var string
-     * @since 2.0.0
      */
     private $projectRoot;
 
@@ -56,7 +52,6 @@ class SetupInfo
      * @param array $server
      * @param string $projectRoot
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct($server, $projectRoot = '')
     {
@@ -78,7 +73,6 @@ public function __construct($server, $projectRoot = '')
      *
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function detectProjectRoot()
     {
@@ -98,7 +92,6 @@ private function detectProjectRoot()
      * Gets setup application URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -112,7 +105,6 @@ public function getUrl()
      * Gets the "main" application URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProjectUrl()
     {
@@ -129,7 +121,6 @@ public function getProjectUrl()
      * Get the admin area path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getProjectAdminPath()
     {
@@ -141,7 +132,6 @@ public function getProjectAdminPath()
      *
      * @param string $projectRoot
      * @return string
-     * @since 2.0.0
      */
     public function getDir($projectRoot)
     {
@@ -152,7 +142,6 @@ public function getDir($projectRoot)
      * Checks if the setup application is available in current document root
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -173,7 +162,6 @@ public function isAvailable()
      * Gets relative path to setup application
      *
      * @return string
-     * @since 2.0.0
      */
     private function getPath()
     {
diff --git a/lib/internal/Magento/Framework/App/State.php b/lib/internal/Magento/Framework/App/State.php
index 4acd67c292203..61cb3e479a321 100644
--- a/lib/internal/Magento/Framework/App/State.php
+++ b/lib/internal/Magento/Framework/App/State.php
@@ -12,7 +12,6 @@
  * Note: Area code communication and emulation will be removed from this class.
  *
  * @api
- * @since 2.0.0
  */
 class State
 {
@@ -25,7 +24,6 @@ class State
      * Application mode
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_appMode;
 
@@ -33,7 +31,6 @@ class State
      * Is downloader flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDownloader = false;
 
@@ -41,7 +38,6 @@ class State
      * Update mode flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_updateMode = false;
 
@@ -49,7 +45,6 @@ class State
      * Config scope model
      *
      * @var \Magento\Framework\Config\ScopeInterface
-     * @since 2.0.0
      */
     protected $_configScope;
 
@@ -57,7 +52,6 @@ class State
      * Area code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_areaCode;
 
@@ -65,7 +59,6 @@ class State
      * Is area code being emulated
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isAreaCodeEmulated = false;
 
@@ -90,7 +83,6 @@ class State
      * @param \Magento\Framework\Config\ScopeInterface $configScope
      * @param string $mode
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\ScopeInterface $configScope,
@@ -112,7 +104,6 @@ public function __construct(
      * Return current app mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -124,7 +115,6 @@ public function getMode()
      *
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     public function setIsDownloader($flag = true)
     {
@@ -137,7 +127,6 @@ public function setIsDownloader($flag = true)
      * @param string $code
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setAreaCode($code)
     {
@@ -157,7 +146,6 @@ public function setAreaCode($code)
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getAreaCode()
     {
@@ -173,7 +161,6 @@ public function getAreaCode()
      * Checks whether area code is being emulated
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAreaCodeEmulated()
     {
@@ -188,7 +175,6 @@ public function isAreaCodeEmulated()
      * @param array $params
      * @return mixed
      * @throws \Exception
-     * @since 2.0.0
      */
     public function emulateAreaCode($areaCode, $callback, $params = [])
     {
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
index eb0b0797383dd..4202fd8883ec0 100644
--- a/lib/internal/Magento/Framework/App/State/CleanupFiles.php
+++ b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -12,7 +12,6 @@
 
 /**
  * A service for cleaning up application state
- * @since 2.0.0
  */
 class CleanupFiles
 {
@@ -20,7 +19,6 @@ class CleanupFiles
      * File system
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -28,7 +26,6 @@ class CleanupFiles
      * Constructor
      *
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -39,7 +36,6 @@ public function __construct(Filesystem $filesystem)
      * Clears all files that are subject of code generation
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function clearCodeGeneratedFiles()
     {
@@ -53,7 +49,6 @@ public function clearCodeGeneratedFiles()
      * Clears code-generated classes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function clearCodeGeneratedClasses()
     {
@@ -67,7 +62,6 @@ public function clearCodeGeneratedClasses()
      * Clears materialized static view files
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function clearMaterializedViewFiles()
     {
@@ -81,7 +75,6 @@ public function clearMaterializedViewFiles()
      * Clears all files
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function clearAllFiles()
     {
@@ -97,7 +90,6 @@ public function clearAllFiles()
      * @param string $code
      * @param string|null $subPath
      * @return string[]
-     * @since 2.0.0
      */
     private function emptyDir($code, $subPath = null)
     {
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index cec7e04243bd1..b8e8aeedf0e92 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -14,55 +14,46 @@
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class StaticResource implements \Magento\Framework\AppInterface
 {
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     private $state;
 
     /**
      * @var \Magento\Framework\App\Response\FileInterface
-     * @since 2.0.0
      */
     private $response;
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     private $request;
 
     /**
      * @var \Magento\Framework\App\View\Asset\Publisher
-     * @since 2.0.0
      */
     private $publisher;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
     /**
      * @var \Magento\Framework\Module\ModuleList
-     * @since 2.0.0
      */
     private $moduleList;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var \Magento\Framework\ObjectManager\ConfigLoaderInterface
-     * @since 2.0.0
      */
     private $configLoader;
 
@@ -87,7 +78,6 @@ class StaticResource implements \Magento\Framework\AppInterface
      * @param \Magento\Framework\Module\ModuleList $moduleList
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigLoaderInterface $configLoader
-     * @since 2.0.0
      */
     public function __construct(
         State $state,
@@ -114,7 +104,6 @@ public function __construct(
      *
      * @return \Magento\Framework\App\ResponseInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function launch()
     {
@@ -139,7 +128,6 @@ public function launch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -161,7 +149,6 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
      * @param string $path
      * @throws \InvalidArgumentException
      * @return array
-     * @since 2.0.0
      */
     protected function parsePath($path)
     {
diff --git a/lib/internal/Magento/Framework/App/TemplateTypesInterface.php b/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
index c64c7ba19575d..cd5134671b118 100644
--- a/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
+++ b/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
@@ -9,7 +9,6 @@
  * Template Types interface
  *
  * @deprecated 2.2.0 since 2.2.0 because of incorrect location
- * @since 2.0.0
  */
 interface TemplateTypesInterface
 {
@@ -24,7 +23,6 @@ interface TemplateTypesInterface
      * Return true if template type eq text
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isPlain();
 
@@ -32,7 +30,6 @@ public function isPlain();
      * Getter for template type
      *
      * @return int
-     * @since 2.0.0
      */
     public function getType();
 }
diff --git a/lib/internal/Magento/Framework/App/Utility/AggregateInvoker.php b/lib/internal/Magento/Framework/App/Utility/AggregateInvoker.php
index 1b859e29af587..acc3864a17b46 100644
--- a/lib/internal/Magento/Framework/App/Utility/AggregateInvoker.php
+++ b/lib/internal/Magento/Framework/App/Utility/AggregateInvoker.php
@@ -8,13 +8,11 @@
 /**
  * Runs given callback across given array of data and collects all PhpUnit assertion results.
  * Should be used in case data provider is huge to minimize overhead.
- * @since 2.0.0
  */
 class AggregateInvoker
 {
     /**
      * @var \PHPUnit_Framework_TestCase
-     * @since 2.0.0
      */
     protected $_testCase;
 
@@ -24,14 +22,12 @@ class AggregateInvoker
      * Only data sets for failed assertions are gathered otherwise.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = ['verbose' => false];
 
     /**
      * @param \PHPUnit_Framework_TestCase $testCase
      * @param array $options
-     * @since 2.0.0
      */
     public function __construct($testCase, array $options = [])
     {
@@ -46,7 +42,6 @@ public function __construct($testCase, array $options = [])
      * @param callable $callback
      * @param array[] $dataSource
      * @return void
-     * @since 2.0.0
      */
     public function __invoke(callable $callback, array $dataSource)
     {
@@ -80,7 +75,6 @@ public function __invoke(callable $callback, array $dataSource)
      * @param string $dataSetName
      * @param mixed $dataSet
      * @return string
-     * @since 2.0.0
      */
     protected function prepareMessage(\Exception $exception, $dataSetName, $dataSet)
     {
@@ -105,7 +99,6 @@ protected function prepareMessage(\Exception $exception, $dataSetName, $dataSet)
      * @param array $results
      * @param int $passed
      * @return void
-     * @since 2.0.0
      */
     protected function processResults(array $results, $passed)
     {
diff --git a/lib/internal/Magento/Framework/App/Utility/Classes.php b/lib/internal/Magento/Framework/App/Utility/Classes.php
index d42fa56b528c5..775c33ed349fd 100644
--- a/lib/internal/Magento/Framework/App/Utility/Classes.php
+++ b/lib/internal/Magento/Framework/App/Utility/Classes.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\Utility\Classes
  *
- * @since 2.0.0
  */
 class Classes
 {
@@ -20,7 +19,6 @@ class Classes
      * virtual class declarations collected from the whole system
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_virtualClasses = [];
 
@@ -31,7 +29,6 @@ class Classes
      * @param string $regex
      * @param array &$result
      * @return array
-     * @since 2.0.0
      */
     public static function getAllMatches($contents, $regex, &$result = [])
     {
@@ -58,7 +55,6 @@ function ($value) {
      * @param \SimpleXMLElement $xml
      * @param string $xPath
      * @return array
-     * @since 2.0.0
      */
     public static function getXmlNodeValues(\SimpleXMLElement $xml, $xPath)
     {
@@ -76,7 +72,6 @@ public static function getXmlNodeValues(\SimpleXMLElement $xml, $xPath)
      * @param \SimpleXMLElement $xml
      * @param string $xpath
      * @return array
-     * @since 2.0.0
      */
     public static function getXmlNodeNames(\SimpleXMLElement $xml, $xpath)
     {
@@ -95,7 +90,6 @@ public static function getXmlNodeNames(\SimpleXMLElement $xml, $xpath)
      * @param string $xPath
      * @param string $attributeName
      * @return array
-     * @since 2.0.0
      */
     public static function getXmlAttributeValues(\SimpleXMLElement $xml, $xPath, $attributeName)
     {
@@ -115,7 +109,6 @@ public static function getXmlAttributeValues(\SimpleXMLElement $xml, $xPath, $at
      *
      * @param string $callbackName
      * @return string
-     * @since 2.0.0
      */
     public static function getCallbackClass($callbackName)
     {
@@ -128,7 +121,6 @@ public static function getCallbackClass($callbackName)
      *
      * @param \SimpleXMLElement $xml
      * @return array
-     * @since 2.0.0
      */
     public static function collectClassesInConfig(\SimpleXMLElement $xml)
     {
@@ -168,7 +160,6 @@ function ($value) {
      *
      * @param \SimpleXMLElement $xml
      * @return array
-     * @since 2.0.0
      */
     public static function collectLayoutClasses(\SimpleXMLElement $xml)
     {
@@ -196,7 +187,6 @@ public static function collectLayoutClasses(\SimpleXMLElement $xml)
      *
      * @param string $subTypePattern
      * @return array
-     * @since 2.0.0
      */
     public static function collectModuleClasses($subTypePattern = '[A-Za-z]+')
     {
@@ -221,7 +211,6 @@ public static function collectModuleClasses($subTypePattern = '[A-Za-z]+')
      * Fetch virtual class declarations from DI configs
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getVirtualClasses()
     {
@@ -253,7 +242,6 @@ public static function getVirtualClasses()
      *
      * @param $className string
      * @return bool
-     * @since 2.0.0
      */
     public static function isVirtual($className)
     {
@@ -268,7 +256,6 @@ public static function isVirtual($className)
      *
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     public static function resolveVirtualType($className)
     {
@@ -285,7 +272,6 @@ public static function resolveVirtualType($className)
      *
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public static function isAutogenerated($className)
     {
@@ -308,7 +294,6 @@ public static function isAutogenerated($className)
      * @param string $contents
      * @param array &$classes
      * @return array
-     * @since 2.0.0
      */
     public static function collectPhpCodeClasses($contents, &$classes = [])
     {
@@ -377,7 +362,6 @@ public static function collectPhpCodeClasses($contents, &$classes = [])
      *
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     public static function getClassModuleName($class)
     {
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 24c7428e59c81..2bb3a4534ae9a 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -17,7 +17,6 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.NPathComplexity)
- * @since 2.0.0
  */
 class Files
 {
@@ -68,31 +67,26 @@ class Files
 
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     protected $componentRegistrar;
 
     /**
      * @var \Magento\Framework\App\Utility\Files
-     * @since 2.0.0
      */
     protected static $_instance = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_cache = [];
 
     /**
      * @var DirSearch
-     * @since 2.0.0
      */
     private $dirSearch;
 
     /**
      * @var ThemePackageList
-     * @since 2.0.0
      */
     private $themePackageList;
 
@@ -116,7 +110,6 @@ class Files
      * @param ThemePackageList $themePackageList
      * @param Json|null $serializer
      * @param RegexIteratorFactory|null $regexIteratorFactory
-     * @since 2.0.0
      */
     public function __construct(
         ComponentRegistrar $componentRegistrar,
@@ -141,7 +134,6 @@ public function __construct(
      *
      * @param Files|null $instance
      * @return void
-     * @since 2.0.0
      */
     public static function setInstance(Files $instance = null)
     {
@@ -153,7 +145,6 @@ public static function setInstance(Files $instance = null)
      *
      * @return \Magento\Framework\App\Utility\Files
      * @throws \Exception when there is no instance set
-     * @since 2.0.0
      */
     public static function init()
     {
@@ -168,7 +159,6 @@ public static function init()
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public static function composeDataSets(array $files)
     {
@@ -183,7 +173,6 @@ public static function composeDataSets(array $files)
      * Get list of regular expressions for matching test directories in modules
      *
      * @return array
-     * @since 2.0.0
      */
     private function getModuleTestDirsRegex()
     {
@@ -198,7 +187,6 @@ private function getModuleTestDirsRegex()
      * Get base path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPathToSource()
     {
@@ -210,7 +198,6 @@ public function getPathToSource()
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     public function getPhpFiles($flags = 0)
     {
@@ -246,7 +233,6 @@ public function getPhpFiles($flags = 0)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getTemplateFiles($flags)
     {
@@ -261,7 +247,6 @@ private function getTemplateFiles($flags)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getLibraryFiles($flags)
     {
@@ -288,7 +273,6 @@ private function getLibraryFiles($flags)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getPubFiles($flags)
     {
@@ -306,7 +290,6 @@ private function getPubFiles($flags)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getDevToolsFiles($flags)
     {
@@ -321,7 +304,6 @@ private function getDevToolsFiles($flags)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getAppCodeFiles($flags)
     {
@@ -350,7 +332,6 @@ private function getAppCodeFiles($flags)
      *
      * @param int $flags
      * @return array
-     * @since 2.0.0
      */
     private function getTestFiles($flags)
     {
@@ -378,7 +359,6 @@ private function getTestFiles($flags)
      * Returns list of xml files, used by Magento application
      *
      * @return array
-     * @since 2.0.0
      */
     public function getXmlFiles()
     {
@@ -398,7 +378,6 @@ public function getXmlFiles()
      *
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getMainConfigFiles($asDataSet = true)
     {
@@ -432,7 +411,6 @@ public function getMainConfigFiles($asDataSet = true)
      * @param bool $asDataSet
      * @return array
      * @codingStandardsIgnoreStart
-     * @since 2.0.0
      */
     public function getConfigFiles(
         $fileNamePattern = '*.xml',
@@ -465,7 +443,6 @@ function ($file) use ($excludedFileNames) {
      * @param array $excludedFileNames
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getXmlCatalogFiles(
         $fileNamePattern = '*.xsd',
@@ -520,7 +497,6 @@ function ($file) use ($excludedFileNames) {
      * @param string $fileNamePattern
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getLayoutConfigFiles($fileNamePattern = '*.xml', $asDataSet = true)
     {
@@ -554,7 +530,6 @@ public function getLayoutConfigFiles($fileNamePattern = '*.xml', $asDataSet = tr
      * @param array $incomingParams
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getLayoutFiles($incomingParams = [], $asDataSet = true)
     {
@@ -578,7 +553,6 @@ public function getLayoutFiles($incomingParams = [], $asDataSet = true)
      * @param array $incomingParams
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getPageLayoutFiles($incomingParams = [], $asDataSet = true)
     {
@@ -590,7 +564,6 @@ public function getPageLayoutFiles($incomingParams = [], $asDataSet = true)
      * @param array $incomingParams
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     protected function getLayoutXmlFiles($location, $incomingParams = [], $asDataSet = true)
     {
@@ -634,7 +607,6 @@ protected function getLayoutXmlFiles($location, $incomingParams = [], $asDataSet
      * @param array $params
      * @param string $location
      * @return array
-     * @since 2.0.0
      */
     private function collectModuleLayoutFiles(array $params, $location)
     {
@@ -679,7 +651,6 @@ private function collectModuleLayoutFiles(array $params, $location)
      * @param array $params
      * @param string $location
      * @return array
-     * @since 2.0.0
      */
     private function collectThemeLayoutFiles(array $params, $location)
     {
@@ -715,7 +686,6 @@ private function collectThemeLayoutFiles(array $params, $location)
      * @param string $currentThemePath
      * @param ThemePackage $theme
      * @return array
-     * @since 2.0.0
      */
     private function parseThemeFiles($themeFiles, $currentThemePath, $theme)
     {
@@ -753,7 +723,6 @@ private function parseThemeFiles($themeFiles, $currentThemePath, $theme)
      * @param array $incomingParams
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getPageTypeFiles($incomingParams = [], $asDataSet = true)
     {
@@ -785,7 +754,6 @@ public function getPageTypeFiles($incomingParams = [], $asDataSet = true)
      * @param string $module
      * @param string $area
      * @return array
-     * @since 2.0.0
      */
     private function getEtcAreaPaths($namespace, $module, $area)
     {
@@ -809,7 +777,6 @@ private function getEtcAreaPaths($namespace, $module, $area)
      * @param string $namespace
      * @param string $module
      * @return array
-     * @since 2.0.0
      */
     public function getJsFiles($area = '*', $themePath = '*/*', $namespace = '*', $module = '*')
     {
@@ -847,7 +814,6 @@ public function getJsFiles($area = '*', $themePath = '*/*', $namespace = '*', $m
      * @param string $module
      * @param string $subFolder
      * @return array
-     * @since 2.0.0
      */
     private function getThemePaths($area, $module, $subFolder)
     {
@@ -869,7 +835,6 @@ private function getThemePaths($area, $module, $subFolder)
      * @param string $namespace
      * @param string $module
      * @return array
-     * @since 2.0.0
      */
     public function getStaticHtmlFiles($area = '*', $themePath = '*/*', $namespace = '*', $module = '*')
     {
@@ -905,7 +870,6 @@ public function getStaticHtmlFiles($area = '*', $themePath = '*/*', $namespace =
      *
      * @param string $filePattern
      * @return array
-     * @since 2.0.0
      */
     public function getStaticPreProcessingFiles($filePattern = '*')
     {
@@ -938,7 +902,6 @@ public function getStaticPreProcessingFiles($filePattern = '*')
      * @param string $filePattern
      * @param array $result
      * @return void
-     * @since 2.0.0
      */
     private function accumulateThemeStaticFiles($area, $locale, $filePattern, &$result)
     {
@@ -989,7 +952,6 @@ private function accumulateThemeStaticFiles($area, $locale, $filePattern, &$resu
      * Get all files from static library directory
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStaticLibraryFiles()
     {
@@ -1004,7 +966,6 @@ public function getStaticLibraryFiles()
      * @param string $file
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _parseLibStatic($file, $path)
     {
@@ -1020,7 +981,6 @@ protected function _parseLibStatic($file, $path)
      * @param array $result
      * @param bool $subroutine
      * @return void
-     * @since 2.0.0
      */
     protected function _accumulateFilesByPatterns(array $patterns, $filePattern, array &$result, $subroutine = false)
     {
@@ -1040,7 +1000,6 @@ protected function _accumulateFilesByPatterns(array $patterns, $filePattern, arr
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     protected function _parseModuleStatic($file)
     {
@@ -1063,7 +1022,6 @@ protected function _parseModuleStatic($file)
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     protected function _parseModuleLocaleStatic($file)
     {
@@ -1082,7 +1040,6 @@ protected function _parseModuleLocaleStatic($file)
      *
      * @param string $area
      * @return array
-     * @since 2.0.0
      */
     public function getJsFilesForArea($area)
     {
@@ -1127,7 +1084,6 @@ public function getJsFilesForArea($area)
      * @param bool $withMetaInfo
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getPhtmlFiles($withMetaInfo = false, $asDataSet = true)
     {
@@ -1150,7 +1106,6 @@ public function getPhtmlFiles($withMetaInfo = false, $asDataSet = true)
      * @param bool $withMetaInfo
      * @param array $result
      * @return void
-     * @since 2.0.0
      */
     private function accumulateThemeTemplateFiles($withMetaInfo, array &$result)
     {
@@ -1190,7 +1145,6 @@ private function accumulateThemeTemplateFiles($withMetaInfo, array &$result)
      * @param bool $withMetaInfo
      * @param array $result
      * @return void
-     * @since 2.0.0
      */
     private function accumulateModuleTemplateFiles($withMetaInfo, array &$result)
     {
@@ -1227,7 +1181,6 @@ private function accumulateModuleTemplateFiles($withMetaInfo, array &$result)
      * Returns list of email template files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getEmailTemplates()
     {
@@ -1250,7 +1203,6 @@ public function getEmailTemplates()
      * (e.g. Git, IDE) or temp files (e.g. in "var/").
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllFiles()
     {
@@ -1289,7 +1241,6 @@ function ($file) {
      * @param string $fileNamePattern
      * @param bool $recursive
      * @return array
-     * @since 2.0.0
      */
     public static function getFiles(array $dirPatterns, $fileNamePattern, $recursive = true)
     {
@@ -1313,7 +1264,6 @@ public static function getFiles(array $dirPatterns, $fileNamePattern, $recursive
      *
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getDiConfigs($asDataSet = false)
     {
@@ -1342,7 +1292,6 @@ public function getDiConfigs($asDataSet = false)
      * Get module and library paths
      *
      * @return array
-     * @since 2.0.0
      */
     private function getPaths()
     {
@@ -1363,7 +1312,6 @@ private function getPaths()
      * @param string &$path
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function classFileExists($class, &$path = '')
     {
@@ -1430,7 +1378,6 @@ public function classFileExists($class, &$path = '')
      * @param string $namespace
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     private function classFileExistsCheckContent($fullPath, $namespace, $className)
     {
@@ -1459,7 +1406,6 @@ private function classFileExistsCheckContent($fullPath, $namespace, $className)
      * Return list of declared namespaces
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNamespaces()
     {
@@ -1484,7 +1430,6 @@ public function getNamespaces()
      * @param string $module
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getModuleFile($namespace, $module, $file)
     {
@@ -1498,7 +1443,6 @@ public function getModuleFile($namespace, $module, $file)
      * @param string $module
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getModulePhpFiles($module, $asDataSet = true)
     {
@@ -1524,7 +1468,6 @@ public function getModulePhpFiles($module, $asDataSet = true)
      * @param string $componentType
      * @param bool $asDataSet
      * @return array
-     * @since 2.0.0
      */
     public function getComposerFiles($componentType, $asDataSet = true)
     {
@@ -1555,7 +1498,6 @@ public function getComposerFiles($componentType, $asDataSet = true)
      * @param string $globPattern
      * @return array
      * @throws \Exception if any of the patterns don't return any result
-     * @since 2.0.0
      */
     public function readLists($globPattern)
     {
@@ -1605,7 +1547,6 @@ public function readLists($globPattern)
      * @param string $componentName
      * @param string $pathPattern
      * @return array
-     * @since 2.0.0
      */
     private function getPathByComponentPattern($componentType, $componentName, $pathPattern)
     {
@@ -1638,7 +1579,6 @@ private function getPathByComponentPattern($componentType, $componentName, $path
      *
      * @param string $moduleName
      * @return bool
-     * @since 2.0.0
      */
     public function isModuleExists($moduleName)
     {
@@ -1659,7 +1599,6 @@ public function isModuleExists($moduleName)
      * @param string $fileNamePattern Pattern for filename
      * @param string|array $excludes Subdirectories to exlude, represented as regex
      * @return array Files in $dirPatterns but not in $excludes
-     * @since 2.0.0
      */
     protected function getFilesSubset(array $dirPatterns, $fileNamePattern, $excludes)
     {
diff --git a/lib/internal/Magento/Framework/App/View.php b/lib/internal/Magento/Framework/App/View.php
index 7d2e0e5260a1d..2d5e6744e68b5 100644
--- a/lib/internal/Magento/Framework/App/View.php
+++ b/lib/internal/Magento/Framework/App/View.php
@@ -8,55 +8,46 @@
 /**
  * Class \Magento\Framework\App\View
  *
- * @since 2.0.0
  */
 class View implements ViewInterface
 {
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
     /**
      * @var \Magento\Framework\Config\ScopeInterface
-     * @since 2.0.0
      */
     protected $_configScope;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     protected $page;
 
     /**
      * @var ActionFlag
-     * @since 2.0.0
      */
     protected $_actionFlag;
 
     /**
      * @var ResponseInterface
-     * @since 2.0.0
      */
     protected $_response;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_isLayoutLoaded = false;
 
@@ -68,7 +59,6 @@ class View implements ViewInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\View\Result\PageFactory $pageFactory
      * @param ActionFlag $actionFlag
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
@@ -92,7 +82,6 @@ public function __construct(
      * Retrieve current page object
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function getPage()
     {
@@ -103,7 +92,6 @@ public function getPage()
      * Retrieve current layout object
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -112,7 +100,6 @@ public function getLayout()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadLayout($handles = null, $generateBlocks = true, $generateXml = true, $addActionHandles = true)
     {
@@ -148,7 +135,6 @@ public function loadLayout($handles = null, $generateBlocks = true, $generateXml
      * Retrieve the default layout handle name for the current action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultLayoutHandle()
     {
@@ -159,7 +145,6 @@ public function getDefaultLayoutHandle()
      * Add layout handle by full controller action name
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addActionLayoutHandles()
     {
@@ -173,7 +158,6 @@ public function addActionLayoutHandles()
      * @param array|null $parameters page parameters
      * @param string|null $defaultHandle
      * @return bool
-     * @since 2.0.0
      */
     public function addPageLayoutHandles(array $parameters = [], $defaultHandle = null)
     {
@@ -184,7 +168,6 @@ public function addPageLayoutHandles(array $parameters = [], $defaultHandle = nu
      * Load layout updates
      *
      * @return $this
-     * @since 2.0.0
      */
     public function loadLayoutUpdates()
     {
@@ -196,7 +179,6 @@ public function loadLayoutUpdates()
      * Generate layout xml
      *
      * @return $this
-     * @since 2.0.0
      */
     public function generateLayoutXml()
     {
@@ -208,7 +190,6 @@ public function generateLayoutXml()
      * Generate layout blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     public function generateLayoutBlocks()
     {
@@ -221,7 +202,6 @@ public function generateLayoutBlocks()
      *
      * @param   string $output
      * @return  $this
-     * @since 2.0.0
      */
     public function renderLayout($output = '')
     {
@@ -254,7 +234,6 @@ public function renderLayout($output = '')
      *
      * @param bool $value
      * @return void
-     * @since 2.0.0
      */
     public function setIsLayoutLoaded($value)
     {
@@ -265,7 +244,6 @@ public function setIsLayoutLoaded($value)
      * Returns is layout loaded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLayoutLoaded()
     {
diff --git a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Copy.php b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Copy.php
index f1e39ca850631..848c2df5f5b94 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Copy.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Copy.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\View\Asset\MaterializationStrategy\Copy
  *
- * @since 2.0.0
  */
 class Copy implements StrategyInterface
 {
@@ -24,7 +23,6 @@ class Copy implements StrategyInterface
      * @param string $sourcePath
      * @param string $destinationPath
      * @return bool
-     * @since 2.0.0
      */
     public function publishFile(
         WriteInterface $sourceDir,
@@ -42,7 +40,6 @@ public function publishFile(
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isSupported(Asset\LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Factory.php b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Factory.php
index e4252a3b15506..e9c155b9d3605 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Factory.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\App\View\Asset\MaterializationStrategy\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Strategies list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $strategiesList;
 
@@ -40,7 +37,6 @@ class Factory
     /**
      * @param ObjectManagerInterface $objectManager
      * @param StrategyInterface[] $strategiesList
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, $strategiesList = [])
     {
@@ -55,7 +51,6 @@ public function __construct(ObjectManagerInterface $objectManager, $strategiesLi
      * @return StrategyInterface
      *
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function create(Asset\LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
index 3f91a1b576218..5dc00130cfe68 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Framework\App\View\Asset\MaterializationStrategy\StrategyInterface
  *
- * @since 2.0.0
  */
 interface StrategyInterface
 {
@@ -24,7 +23,6 @@ interface StrategyInterface
      * @param string $sourcePath
      * @param string $destinationPath
      * @return bool
-     * @since 2.0.0
      */
     public function publishFile(
         WriteInterface $sourceDir,
@@ -38,7 +36,6 @@ public function publishFile(
      *
      * @param Asset\LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     public function isSupported(Asset\LocalInterface $asset);
 }
diff --git a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Symlink.php b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Symlink.php
index 7f6b0fcf9ea34..9e38c505e71c9 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Symlink.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Symlink.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\App\View\Asset\MaterializationStrategy\Symlink
  *
- * @since 2.0.0
  */
 class Symlink implements StrategyInterface
 {
@@ -25,7 +24,6 @@ class Symlink implements StrategyInterface
      * @param string $sourcePath
      * @param string $destinationPath
      * @return bool
-     * @since 2.0.0
      */
     public function publishFile(
         WriteInterface $sourceDir,
@@ -41,7 +39,6 @@ public function publishFile(
      *
      * @param Asset\LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     public function isSupported(Asset\LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
index 3c6b0fe9c1b53..2006fc6a5eb9f 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
@@ -14,19 +14,16 @@
  * A publishing service for view assets
  *
  * @api
- * @since 2.0.0
  */
 class Publisher
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var MaterializationStrategy\Factory
-     * @since 2.0.0
      */
     private $materializationStrategyFactory;
 
@@ -40,7 +37,6 @@ class Publisher
      * @param \Magento\Framework\Filesystem $filesystem
      * @param MaterializationStrategy\Factory $materializationStrategyFactory
      * @param WriteFactory $writeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -55,7 +51,6 @@ public function __construct(
     /**
      * @param Asset\LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     public function publish(Asset\LocalInterface $asset)
     {
@@ -72,7 +67,6 @@ public function publish(Asset\LocalInterface $asset)
      *
      * @param Asset\LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     private function publishAsset(Asset\LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version.php b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
index fec1cdca1eace..b4338b3f9d4cb 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
@@ -10,25 +10,21 @@
 
 /**
  * Deployment version of static files
- * @since 2.0.0
  */
 class Version
 {
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     private $appState;
 
     /**
      * @var \Magento\Framework\App\View\Deployment\Version\StorageInterface
-     * @since 2.0.0
      */
     private $versionStorage;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $cachedValue;
 
@@ -41,7 +37,6 @@ class Version
     /**
      * @param \Magento\Framework\App\State $appState
      * @param Version\StorageInterface $versionStorage
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\State $appState,
@@ -55,7 +50,6 @@ public function __construct(
      * Retrieve deployment version of static files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -70,7 +64,6 @@ public function getValue()
      *
      * @param string $appMode
      * @return string
-     * @since 2.0.0
      */
     protected function readValue($appMode)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php b/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
index a4f26f5bc60cb..8099b6864b3a1 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
@@ -8,19 +8,16 @@
 
 /**
  * Persistence of deployment version of static files in a local file
- * @since 2.0.0
  */
 class File implements \Magento\Framework\App\View\Deployment\Version\StorageInterface
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     private $directory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $fileName;
 
@@ -28,7 +25,6 @@ class File implements \Magento\Framework\App\View\Deployment\Version\StorageInte
      * @param \Magento\Framework\Filesystem $filesystem
      * @param string $directoryCode
      * @param string $fileName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load()
     {
@@ -53,7 +48,6 @@ public function load()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data)
     {
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php b/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
index 133cb4f1da6e8..a80cf1c0e701c 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Persistence of deployment version of static files
- * @since 2.0.0
  */
 interface StorageInterface
 {
@@ -17,7 +16,6 @@ interface StorageInterface
      *
      * @return string
      * @throws \UnexpectedValueException Exception is thrown when unable to retrieve data from a storage
-     * @since 2.0.0
      */
     public function load();
 
@@ -26,7 +24,6 @@ public function load();
      *
      * @param string $data
      * @return void
-     * @since 2.0.0
      */
     public function save($data);
 }
diff --git a/lib/internal/Magento/Framework/App/ViewInterface.php b/lib/internal/Magento/Framework/App/ViewInterface.php
index 6540a3a383875..597f99e41d453 100644
--- a/lib/internal/Magento/Framework/App/ViewInterface.php
+++ b/lib/internal/Magento/Framework/App/ViewInterface.php
@@ -12,7 +12,6 @@
  * @api
  * @deprecated 2.2.0 since 2.2.0
  * @see \Magento\Framework\View\Result\Layout
- * @since 2.0.0
  */
 interface ViewInterface
 {
@@ -20,7 +19,6 @@ interface ViewInterface
      * Load layout updates
      *
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function loadLayoutUpdates();
 
@@ -29,7 +27,6 @@ public function loadLayoutUpdates();
      *
      * @param   string $output
      * @return  ViewInterface
-     * @since 2.0.0
      */
     public function renderLayout($output = '');
 
@@ -37,7 +34,6 @@ public function renderLayout($output = '');
      * Retrieve the default layout handle name for the current action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultLayoutHandle();
 
@@ -50,7 +46,6 @@ public function getDefaultLayoutHandle();
      * @param   bool $addActionHandles
      * @return  ViewInterface
      * @throws  \RuntimeException
-     * @since 2.0.0
      */
     public function loadLayout($handles = null, $generateBlocks = true, $generateXml = true, $addActionHandles = true);
 
@@ -58,7 +53,6 @@ public function loadLayout($handles = null, $generateBlocks = true, $generateXml
      * Generate layout xml
      *
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function generateLayoutXml();
 
@@ -68,7 +62,6 @@ public function generateLayoutXml();
      * @param array $parameters page parameters
      * @param string $defaultHandle
      * @return bool
-     * @since 2.0.0
      */
     public function addPageLayoutHandles(array $parameters = [], $defaultHandle = null);
 
@@ -76,7 +69,6 @@ public function addPageLayoutHandles(array $parameters = [], $defaultHandle = nu
      * Generate layout blocks
      *
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function generateLayoutBlocks();
 
@@ -84,7 +76,6 @@ public function generateLayoutBlocks();
      * Retrieve current page object
      *
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function getPage();
 
@@ -92,7 +83,6 @@ public function getPage();
      * Retrieve current layout object
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout();
 
@@ -100,7 +90,6 @@ public function getLayout();
      * Add layout handle by full controller action name
      *
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function addActionLayoutHandles();
 
@@ -109,7 +98,6 @@ public function addActionLayoutHandles();
      *
      * @param bool $value
      * @return void
-     * @since 2.0.0
      */
     public function setIsLayoutLoaded($value);
 
@@ -117,7 +105,6 @@ public function setIsLayoutLoaded($value);
      * Returns is layout loaded
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLayoutLoaded();
 }
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
index 96c6bb0807546..25a0a9e785daa 100644
--- a/lib/internal/Magento/Framework/AppInterface.php
+++ b/lib/internal/Magento/Framework/AppInterface.php
@@ -14,7 +14,6 @@
  * Implementations of this interface should implement application type specific initialization.
  *
  * @api
- * @since 2.0.0
  */
 interface AppInterface
 {
@@ -27,7 +26,6 @@ interface AppInterface
      * Launch application
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     public function launch();
 
@@ -41,7 +39,6 @@ public function launch();
      * @param App\Bootstrap $bootstrap
      * @param \Exception $exception
      * @return bool
-     * @since 2.0.0
      */
     public function catchException(App\Bootstrap $bootstrap, \Exception $exception);
 }
diff --git a/lib/internal/Magento/Framework/Archive.php b/lib/internal/Magento/Framework/Archive.php
index b1f84ef21baf4..d43c976431b51 100644
--- a/lib/internal/Magento/Framework/Archive.php
+++ b/lib/internal/Magento/Framework/Archive.php
@@ -13,7 +13,6 @@
  * Class to work with archives
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Archive
 {
@@ -31,7 +30,6 @@ class Archive
      * Current archiver is used for compress.
      *
      * @var \Magento\Framework\Archive\Tar|\Magento\Framework\Archive\Gz|\Magento\Framework\Archive\Bz
-     * @since 2.0.0
      */
     protected $_archiver = null;
 
@@ -39,7 +37,6 @@ class Archive
      * Accessible formats for compress.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_formats = [
         'tar' => 'tar',
@@ -62,7 +59,6 @@ class Archive
      *
      * @param string $extension
      * @return Tar|Gz|Bz
-     * @since 2.0.0
      */
     protected function _getArchiver($extension)
     {
@@ -78,7 +74,6 @@ protected function _getArchiver($extension)
      *
      * @param string $source
      * @return string[]|string
-     * @since 2.0.0
      */
     protected function _getArchivers($source)
     {
@@ -96,7 +91,6 @@ protected function _getArchivers($source)
      * @param string $destination
      * @param boolean $skipRoot skip first level parent
      * @return string Path to file
-     * @since 2.0.0
      */
     public function pack($source, $destination = 'packed.tgz', $skipRoot = false)
     {
@@ -127,7 +121,6 @@ public function pack($source, $destination = 'packed.tgz', $skipRoot = false)
      * @param bool $tillTar
      * @param bool $clearInterm
      * @return string Path to file
-     * @since 2.0.0
      */
     public function unpack($source, $destination = '.', $tillTar = false, $clearInterm = true)
     {
@@ -164,7 +157,6 @@ public function unpack($source, $destination = '.', $tillTar = false, $clearInte
      * @param string $source
      * @param string $destination
      * @return string Path to file
-     * @since 2.0.0
      */
     public function extract($file, $source, $destination = '.')
     {
@@ -181,7 +173,6 @@ public function extract($file, $source, $destination = '.')
      *
      * @param string $file
      * @return boolean
-     * @since 2.0.0
      */
     public function isArchive($file)
     {
@@ -197,7 +188,6 @@ public function isArchive($file)
      *
      * @param string $file
      * @return boolean
-     * @since 2.0.0
      */
     public function isTar($file)
     {
diff --git a/lib/internal/Magento/Framework/Archive/AbstractArchive.php b/lib/internal/Magento/Framework/Archive/AbstractArchive.php
index fc8f16f97d4b1..45d3eb11b7e86 100644
--- a/lib/internal/Magento/Framework/Archive/AbstractArchive.php
+++ b/lib/internal/Magento/Framework/Archive/AbstractArchive.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Archive\AbstractArchive
  *
- * @since 2.0.0
  */
 class AbstractArchive
 {
@@ -25,7 +24,6 @@ class AbstractArchive
      * @param string $data
      * @return true
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _writeFile($destination, $data)
     {
@@ -42,7 +40,6 @@ protected function _writeFile($destination, $data)
      * @param string $source
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _readFile($source)
     {
@@ -64,7 +61,6 @@ protected function _readFile($source)
      * @param string $source
      * @param bool $withExtension
      * @return string
-     * @since 2.0.0
      */
     public function getFilename($source, $withExtension = false)
     {
diff --git a/lib/internal/Magento/Framework/Archive/ArchiveInterface.php b/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
index b740ca4397605..69a524107f1e0 100644
--- a/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
+++ b/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ArchiveInterface
 {
@@ -23,7 +22,6 @@ interface ArchiveInterface
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function pack($source, $destination);
 
@@ -33,7 +31,6 @@ public function pack($source, $destination);
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function unpack($source, $destination);
 }
diff --git a/lib/internal/Magento/Framework/Archive/Bz.php b/lib/internal/Magento/Framework/Archive/Bz.php
index dba2e7c53f025..2437f0aba9848 100644
--- a/lib/internal/Magento/Framework/Archive/Bz.php
+++ b/lib/internal/Magento/Framework/Archive/Bz.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Archive\Bz
  *
- * @since 2.0.0
  */
 class Bz extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
@@ -24,7 +23,6 @@ class Bz extends \Magento\Framework\Archive\AbstractArchive implements \Magento\
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function pack($source, $destination)
     {
@@ -50,7 +48,6 @@ public function pack($source, $destination)
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function unpack($source, $destination)
     {
diff --git a/lib/internal/Magento/Framework/Archive/Gz.php b/lib/internal/Magento/Framework/Archive/Gz.php
index 509d26fbad2a3..bcc2cf990f869 100644
--- a/lib/internal/Magento/Framework/Archive/Gz.php
+++ b/lib/internal/Magento/Framework/Archive/Gz.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Archive\Gz
  *
- * @since 2.0.0
  */
 class Gz extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
@@ -24,7 +23,6 @@ class Gz extends \Magento\Framework\Archive\AbstractArchive implements \Magento\
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function pack($source, $destination)
     {
@@ -50,7 +48,6 @@ public function pack($source, $destination)
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function unpack($source, $destination)
     {
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File.php b/lib/internal/Magento/Framework/Archive/Helper/File.php
index 3239901596f54..906ccb3b46d6f 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Archive\Helper\File
  *
- * @since 2.0.0
  */
 class File
 {
@@ -22,7 +21,6 @@ class File
      * Full path to directory where file located
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_fileLocation;
 
@@ -30,7 +28,6 @@ class File
      * File name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_fileName;
 
@@ -38,7 +35,6 @@ class File
      * Full path (directory + filename) to file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_filePath;
 
@@ -46,7 +42,6 @@ class File
      * File permissions that will be set if file opened in write mode
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_chmod;
 
@@ -54,7 +49,6 @@ class File
      * File handler
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_fileHandler;
 
@@ -62,7 +56,6 @@ class File
      * Whether file has been opened in write mode
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isInWriteMode;
 
@@ -70,7 +63,6 @@ class File
      * Set file path via constructor
      *
      * @param string $filePath
-     * @since 2.0.0
      */
     public function __construct($filePath)
     {
@@ -83,7 +75,6 @@ public function __construct($filePath)
 
     /**
      * Close file if it's not closed before object destruction
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -100,7 +91,6 @@ public function __destruct()
      * @return void
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function open($mode = 'w+', $chmod = null)
     {
@@ -150,7 +140,6 @@ public function open($mode = 'w+', $chmod = null)
      *
      * @param string $data
      * @return void
-     * @since 2.0.0
      */
     public function write($data)
     {
@@ -163,7 +152,6 @@ public function write($data)
      *
      * @param int $length
      * @return string|boolean
-     * @since 2.0.0
      */
     public function read($length = 4096)
     {
@@ -180,7 +168,6 @@ public function read($length = 4096)
      * Check whether end of file reached
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function eof()
     {
@@ -192,7 +179,6 @@ public function eof()
      * Close file
      *
      * @return void
-     * @since 2.0.0
      */
     public function close()
     {
@@ -211,7 +197,6 @@ public function close()
      * @param string $mode
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _open($mode)
     {
@@ -230,7 +215,6 @@ protected function _open($mode)
      * @param string $data
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _write($data)
     {
@@ -249,7 +233,6 @@ protected function _write($data)
      * @param int $length
      * @return string
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _read($length)
     {
@@ -268,7 +251,6 @@ protected function _read($length)
      * Implementation of EOF indicator
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _eof()
     {
@@ -279,7 +261,6 @@ protected function _eof()
      * Implementation of file closing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _close()
     {
@@ -291,7 +272,6 @@ protected function _close()
      *
      * @param string $mode
      * @return int
-     * @since 2.0.0
      */
     protected function _isWritableMode($mode)
     {
@@ -303,7 +283,6 @@ protected function _isWritableMode($mode)
      *
      * @param string $mode
      * @return bool
-     * @since 2.0.0
      */
     protected function _isReadableMode($mode)
     {
@@ -315,7 +294,6 @@ protected function _isReadableMode($mode)
      *
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _checkFileOpened()
     {
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
index d58a45674b7dc..488dd9b544076 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\Framework\Archive\Helper\File\Bz
  *
- * @since 2.0.0
  */
 class Bz extends \Magento\Framework\Archive\Helper\File
 {
     /**
      * {@inheritdoc}
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _open($mode)
     {
@@ -37,7 +35,6 @@ protected function _open($mode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _write($data)
     {
@@ -52,7 +49,6 @@ protected function _write($data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _read($length)
     {
@@ -69,7 +65,6 @@ protected function _read($length)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _close()
     {
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
index 0dede75180ccb..801403ce2893f 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
@@ -12,14 +12,12 @@
 /**
  * Class \Magento\Framework\Archive\Helper\File\Gz
  *
- * @since 2.0.0
  */
 class Gz extends \Magento\Framework\Archive\Helper\File
 {
     /**
      * {@inheritdoc}
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _open($mode)
     {
@@ -37,7 +35,6 @@ protected function _open($mode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _write($data)
     {
@@ -52,7 +49,6 @@ protected function _write($data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _read($length)
     {
@@ -61,7 +57,6 @@ protected function _read($length)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _eof()
     {
@@ -70,7 +65,6 @@ protected function _eof()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _close()
     {
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
index 54cc15814b836..bdb6643136cf0 100644
--- a/lib/internal/Magento/Framework/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Archive/Tar.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Framework\Archive\Tar
  *
- * @since 2.0.0
  */
 class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
@@ -32,7 +31,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Keep file or directory for packing.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentFile;
 
@@ -40,7 +38,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Keep path to file or directory for packing.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentPath;
 
@@ -49,7 +46,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      *   use test/fip.php instead test/test/fip.php;
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_skipRoot;
 
@@ -57,7 +53,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Tarball data writer
      *
      * @var File
-     * @since 2.0.0
      */
     protected $_writer;
 
@@ -65,7 +60,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Tarball data reader
      *
      * @var File
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -73,7 +67,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Path to file where tarball should be placed
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_destinationFilePath;
 
@@ -81,7 +74,6 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
      * Initialize tarball writer
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initWriter()
     {
@@ -95,7 +87,6 @@ protected function _initWriter()
      * Returns string that is used for tar's header parsing
      *
      * @return string
-     * @since 2.0.0
      */
     protected static function _getFormatParseHeader()
     {
@@ -107,7 +98,6 @@ protected static function _getFormatParseHeader()
      * Destroy tarball writer
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _destroyWriter()
     {
@@ -123,7 +113,6 @@ protected function _destroyWriter()
      * Get tarball writer
      *
      * @return File
-     * @since 2.0.0
      */
     protected function _getWriter()
     {
@@ -138,7 +127,6 @@ protected function _getWriter()
      * Initialize tarball reader
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initReader()
     {
@@ -152,7 +140,6 @@ protected function _initReader()
      * Destroy tarball reader
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _destroyReader()
     {
@@ -168,7 +155,6 @@ protected function _destroyReader()
      * Get tarball reader
      *
      * @return File
-     * @since 2.0.0
      */
     protected function _getReader()
     {
@@ -184,7 +170,6 @@ protected function _getReader()
      *
      * @param bool $skipRoot
      * @return $this
-     * @since 2.0.0
      */
     protected function _setSkipRoot($skipRoot)
     {
@@ -197,7 +182,6 @@ protected function _setSkipRoot($skipRoot)
      *
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCurrentFile($file)
     {
@@ -211,7 +195,6 @@ protected function _setCurrentFile($file)
      *
      * @param string $destinationFilePath
      * @return $this
-     * @since 2.0.0
      */
     protected function _setDestinationFilePath($destinationFilePath)
     {
@@ -223,7 +206,6 @@ protected function _setDestinationFilePath($destinationFilePath)
      * Retrieve file which is packing.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrentFile()
     {
@@ -235,7 +217,6 @@ protected function _getCurrentFile()
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCurrentPath($path)
     {
@@ -252,7 +233,6 @@ protected function _setCurrentPath($path)
      * Retrieve path to file which is packing.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCurrentPath()
     {
@@ -266,7 +246,6 @@ protected function _getCurrentPath()
      * @param bool $finalize
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _createTar($skipRoot = false, $finalize = false)
     {
@@ -304,7 +283,6 @@ protected function _createTar($skipRoot = false, $finalize = false)
      * Write current file to tarball
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _packAndWriteCurrentFile()
     {
@@ -342,7 +320,6 @@ protected function _packAndWriteCurrentFile()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _composeHeader($long = false)
     {
@@ -413,7 +390,6 @@ protected function _composeHeader($long = false)
      * @return string[] list of files
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _unpackCurrentTar($destination)
     {
@@ -466,7 +442,6 @@ protected function _unpackCurrentTar($destination)
      * Read and decode file header information from tarball
      *
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _extractFileHeader()
     {
@@ -525,7 +500,6 @@ protected function _extractFileHeader()
      * @param array $fileHeader
      * @param string $destination
      * @return void
-     * @since 2.0.0
      */
     protected function _extractAndWriteFile($fileHeader, $destination)
     {
@@ -556,7 +530,6 @@ protected function _extractAndWriteFile($fileHeader, $destination)
      * @param bool $skipRoot
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function pack($source, $destination, $skipRoot = false)
     {
@@ -577,7 +550,6 @@ public function pack($source, $destination, $skipRoot = false)
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function unpack($source, $destination)
     {
@@ -597,7 +569,6 @@ public function unpack($source, $destination)
      * @param string $source
      * @param string $destination
      * @return string
-     * @since 2.0.0
      */
     public function extract($file, $source, $destination)
     {
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index 032117bcf0b16..6f06fe8f420ca 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Framework\Archive\Zip
  *
- * @since 2.0.0
  */
 class Zip extends AbstractArchive implements ArchiveInterface
 {
     /**
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -39,7 +37,6 @@ public function __construct()
      * @param string $destination
      *
      * @return string
-     * @since 2.0.0
      */
     public function pack($source, $destination)
     {
@@ -57,7 +54,6 @@ public function pack($source, $destination)
      * @param string $destination
      *
      * @return string
-     * @since 2.0.0
      */
     public function unpack($source, $destination)
     {
diff --git a/lib/internal/Magento/Framework/Authorization.php b/lib/internal/Magento/Framework/Authorization.php
index 6f6b95304a209..c9b585ed65fd7 100644
--- a/lib/internal/Magento/Framework/Authorization.php
+++ b/lib/internal/Magento/Framework/Authorization.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Authorization
  *
- * @since 2.0.0
  */
 class Authorization implements \Magento\Framework\AuthorizationInterface
 {
@@ -18,7 +17,6 @@ class Authorization implements \Magento\Framework\AuthorizationInterface
      * ACL policy
      *
      * @var \Magento\Framework\Authorization\PolicyInterface
-     * @since 2.0.0
      */
     protected $_aclPolicy;
 
@@ -26,14 +24,12 @@ class Authorization implements \Magento\Framework\AuthorizationInterface
      * ACL role locator
      *
      * @var \Magento\Framework\Authorization\RoleLocatorInterface
-     * @since 2.0.0
      */
     protected $_aclRoleLocator;
 
     /**
      * @param \Magento\Framework\Authorization\PolicyInterface $aclPolicy
      * @param \Magento\Framework\Authorization\RoleLocatorInterface $roleLocator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Authorization\PolicyInterface $aclPolicy,
@@ -49,7 +45,6 @@ public function __construct(
      * @param   string $resource
      * @param   string $privilege
      * @return  boolean
-     * @since 2.0.0
      */
     public function isAllowed($resource, $privilege = null)
     {
diff --git a/lib/internal/Magento/Framework/Authorization/Factory.php b/lib/internal/Magento/Framework/Authorization/Factory.php
index 3f8e1371dee9a..81ad8cb292d82 100644
--- a/lib/internal/Magento/Framework/Authorization/Factory.php
+++ b/lib/internal/Magento/Framework/Authorization/Factory.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Authorization\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -26,7 +25,6 @@ class Factory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -34,7 +32,6 @@ class Factory
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -46,7 +43,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return Authorization
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Authorization/Policy/Acl.php b/lib/internal/Magento/Framework/Authorization/Policy/Acl.php
index 0bb4bd50313c4..c637052db79c1 100644
--- a/lib/internal/Magento/Framework/Authorization/Policy/Acl.php
+++ b/lib/internal/Magento/Framework/Authorization/Policy/Acl.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Framework\Authorization\Policy\Acl
  *
- * @since 2.0.0
  */
 class Acl implements PolicyInterface
 {
     /**
      * @var \Magento\Framework\Acl\Builder
-     * @since 2.0.0
      */
     protected $_aclBuilder;
 
     /**
      * @param Builder $aclBuilder
-     * @since 2.0.0
      */
     public function __construct(Builder $aclBuilder)
     {
@@ -40,7 +37,6 @@ public function __construct(Builder $aclBuilder)
      * @param string $resourceId
      * @param string $privilege
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed($roleId, $resourceId, $privilege = null)
     {
diff --git a/lib/internal/Magento/Framework/Authorization/Policy/DefaultPolicy.php b/lib/internal/Magento/Framework/Authorization/Policy/DefaultPolicy.php
index ec1c1e31a8336..e78a1b6666486 100644
--- a/lib/internal/Magento/Framework/Authorization/Policy/DefaultPolicy.php
+++ b/lib/internal/Magento/Framework/Authorization/Policy/DefaultPolicy.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Authorization\Policy\DefaultPolicy
  *
- * @since 2.0.0
  */
 class DefaultPolicy implements \Magento\Framework\Authorization\PolicyInterface
 {
@@ -23,7 +22,6 @@ class DefaultPolicy implements \Magento\Framework\Authorization\PolicyInterface
      * @param string $resourceId
      * @param string $privilege
      * @return true
-     * @since 2.0.0
      */
     public function isAllowed($roleId, $resourceId, $privilege = null)
     {
diff --git a/lib/internal/Magento/Framework/Authorization/PolicyInterface.php b/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
index 24ad71c4823bc..0d9a5d3af74c9 100644
--- a/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
+++ b/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
@@ -9,7 +9,6 @@
  * Responsible for internal authorization decision making based on provided role, resource and privilege
  *
  * @api
- * @since 2.0.0
  */
 interface PolicyInterface
 {
@@ -21,7 +20,6 @@ interface PolicyInterface
      * @param string $resourceId
      * @param string|null $privilege
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed($roleId, $resourceId, $privilege = null);
 }
diff --git a/lib/internal/Magento/Framework/Authorization/RoleLocator/DefaultRoleLocator.php b/lib/internal/Magento/Framework/Authorization/RoleLocator/DefaultRoleLocator.php
index 3288cdb6fec64..134a38bb09ce7 100644
--- a/lib/internal/Magento/Framework/Authorization/RoleLocator/DefaultRoleLocator.php
+++ b/lib/internal/Magento/Framework/Authorization/RoleLocator/DefaultRoleLocator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator
  *
- * @since 2.0.0
  */
 class DefaultRoleLocator implements \Magento\Framework\Authorization\RoleLocatorInterface
 {
@@ -16,7 +15,6 @@ class DefaultRoleLocator implements \Magento\Framework\Authorization\RoleLocator
      * Retrieve current role
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAclRoleId()
     {
diff --git a/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php b/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
index 6b240b707fea3..b273f2274df34 100644
--- a/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
@@ -11,7 +11,6 @@
  * Should be implemented by application developer that uses \Magento\Framework\Authorization component.
  *
  * @api
- * @since 2.0.0
  */
 interface RoleLocatorInterface
 {
@@ -19,7 +18,6 @@ interface RoleLocatorInterface
      * Retrieve current role
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAclRoleId();
 }
diff --git a/lib/internal/Magento/Framework/AuthorizationInterface.php b/lib/internal/Magento/Framework/AuthorizationInterface.php
index 1b0b8289aadd7..6077e2740b75c 100644
--- a/lib/internal/Magento/Framework/AuthorizationInterface.php
+++ b/lib/internal/Magento/Framework/AuthorizationInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface AuthorizationInterface
 {
@@ -19,7 +18,6 @@ interface AuthorizationInterface
      * @param   string $resource
      * @param   string $privilege
      * @return  boolean
-     * @since 2.0.0
      */
     public function isAllowed($resource, $privilege = null);
 }
diff --git a/lib/internal/Magento/Framework/Autoload/AutoloaderInterface.php b/lib/internal/Magento/Framework/Autoload/AutoloaderInterface.php
index cbe3e06e68ac9..24301063c8929 100644
--- a/lib/internal/Magento/Framework/Autoload/AutoloaderInterface.php
+++ b/lib/internal/Magento/Framework/Autoload/AutoloaderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for an autoloader class that allows the dynamic modification of PSR-0 and PSR-4 mappings
- * @since 2.0.0
  */
 interface AutoloaderInterface
 {
@@ -18,7 +17,6 @@ interface AutoloaderInterface
      * @param string|array $paths The path or paths to look in for the given prefix
      * @param bool $prepend Whether to append the given path or paths to the paths already associated with the prefix
      * @return void
-     * @since 2.0.0
      */
     public function addPsr4($nsPrefix, $paths, $prepend = false);
 
@@ -29,7 +27,6 @@ public function addPsr4($nsPrefix, $paths, $prepend = false);
      * @param string|array $paths The path or paths to look in for the given prefix
      * @param bool $prepend Whether to append the given path or paths to the paths already associated with the prefix
      * @return void
-     * @since 2.0.0
      */
     public function addPsr0($nsPrefix, $paths, $prepend = false);
 
@@ -39,7 +36,6 @@ public function addPsr0($nsPrefix, $paths, $prepend = false);
      * @param string $nsPrefix The namespace prefix of the PSR-0 mapping
      * @param string|array $paths The path or paths to look in for the given prefix
      * @return void
-     * @since 2.0.0
      */
     public function setPsr0($nsPrefix, $paths);
 
@@ -49,7 +45,6 @@ public function setPsr0($nsPrefix, $paths);
      * @param string $nsPrefix The namespace prefix of the PSR-0 mapping
      * @param string|array $paths The path or paths to look in for the given prefix
      * @return void
-     * @since 2.0.0
      */
     public function setPsr4($nsPrefix, $paths);
 
@@ -58,7 +53,6 @@ public function setPsr4($nsPrefix, $paths);
      *
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public function loadClass($className);
 
@@ -67,7 +61,6 @@ public function loadClass($className);
      *
      * @param string $className
      * @return string|bool
-     * @since 2.0.0
      */
     public function findFile($className);
 }
diff --git a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
index 523970b8bba77..f051d215808a3 100644
--- a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
+++ b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
@@ -9,13 +9,11 @@
 
 /**
  * Registry to store a static member autoloader
- * @since 2.0.0
  */
 class AutoloaderRegistry
 {
     /**
      * @var AutoloaderInterface
-     * @since 2.0.0
      */
     protected static $autoloader;
 
@@ -24,7 +22,6 @@ class AutoloaderRegistry
      *
      * @param AutoloaderInterface $newAutoloader
      * @return void
-     * @since 2.0.0
      */
     public static function registerAutoloader(AutoloaderInterface $newAutoloader)
     {
@@ -36,7 +33,6 @@ public static function registerAutoloader(AutoloaderInterface $newAutoloader)
      *
      * @throws \Exception
      * @return AutoloaderInterface
-     * @since 2.0.0
      */
     public static function getAutoloader()
     {
diff --git a/lib/internal/Magento/Framework/Autoload/ClassLoaderWrapper.php b/lib/internal/Magento/Framework/Autoload/ClassLoaderWrapper.php
index 63c470a049175..c87e0134641c6 100644
--- a/lib/internal/Magento/Framework/Autoload/ClassLoaderWrapper.php
+++ b/lib/internal/Magento/Framework/Autoload/ClassLoaderWrapper.php
@@ -9,7 +9,6 @@
 
 /**
  * Wrapper designed to insulate the autoloader class provided by Composer
- * @since 2.0.0
  */
 class ClassLoaderWrapper implements AutoloaderInterface
 {
@@ -17,13 +16,11 @@ class ClassLoaderWrapper implements AutoloaderInterface
      * Using the autoloader class provided by Composer
      *
      * @var ClassLoader
-     * @since 2.0.0
      */
     protected $autoloader;
 
     /**
      * @param ClassLoader $autoloader
-     * @since 2.0.0
      */
     public function __construct(ClassLoader $autoloader)
     {
@@ -32,7 +29,6 @@ public function __construct(ClassLoader $autoloader)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addPsr4($nsPrefix, $paths, $prepend = false)
     {
@@ -41,7 +37,6 @@ public function addPsr4($nsPrefix, $paths, $prepend = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addPsr0($nsPrefix, $paths, $prepend = false)
     {
@@ -50,7 +45,6 @@ public function addPsr0($nsPrefix, $paths, $prepend = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPsr0($nsPrefix, $paths)
     {
@@ -59,7 +53,6 @@ public function setPsr0($nsPrefix, $paths)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setPsr4($nsPrefix, $paths)
     {
@@ -69,7 +62,6 @@ public function setPsr4($nsPrefix, $paths)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function loadClass($className)
     {
@@ -79,7 +71,6 @@ public function loadClass($className)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function findFile($className)
     {
diff --git a/lib/internal/Magento/Framework/Autoload/ClassMap.php b/lib/internal/Magento/Framework/Autoload/ClassMap.php
index 60bc1cbd57b57..aafa03ef886bc 100644
--- a/lib/internal/Magento/Framework/Autoload/ClassMap.php
+++ b/lib/internal/Magento/Framework/Autoload/ClassMap.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Autoload\ClassMap
  *
- * @since 2.0.0
  */
 class ClassMap
 {
@@ -18,7 +17,6 @@ class ClassMap
      * Absolute path to base directory that will be prepended as prefix to the included files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_baseDir;
 
@@ -30,7 +28,6 @@ class ClassMap
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = [];
 
@@ -39,7 +36,6 @@ class ClassMap
      *
      * @param string $baseDir
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct($baseDir)
     {
@@ -54,7 +50,6 @@ public function __construct($baseDir)
      *
      * @param string $class
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($class)
     {
@@ -69,7 +64,6 @@ public function getFile($class)
      *
      * @param array $map
      * @return $this
-     * @since 2.0.0
      */
     public function addMap(array $map)
     {
@@ -82,7 +76,6 @@ public function addMap(array $map)
      *
      * @param string $class
      * @return void
-     * @since 2.0.0
      */
     public function load($class)
     {
diff --git a/lib/internal/Magento/Framework/Autoload/Populator.php b/lib/internal/Magento/Framework/Autoload/Populator.php
index 7b531bcc4786d..9fdac61012c7e 100644
--- a/lib/internal/Magento/Framework/Autoload/Populator.php
+++ b/lib/internal/Magento/Framework/Autoload/Populator.php
@@ -11,7 +11,6 @@
 /**
  * Utility class for populating an autoloader with application-specific information for PSR-0 and PSR-4 mappings
  * and include-path contents
- * @since 2.0.0
  */
 class Populator
 {
@@ -19,7 +18,6 @@ class Populator
      * @param AutoloaderInterface $autoloader
      * @param DirectoryList $dirList
      * @return void
-     * @since 2.0.0
      */
     public static function populateMappings(AutoloaderInterface $autoloader, DirectoryList $dirList)
     {
diff --git a/lib/internal/Magento/Framework/Backup/AbstractBackup.php b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
index 1a75f79dc7dee..7433d261d7ed6 100644
--- a/lib/internal/Magento/Framework/Backup/AbstractBackup.php
+++ b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
@@ -9,7 +9,6 @@
  * Class to work with archives
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractBackup implements BackupInterface
 {
@@ -17,7 +16,6 @@ abstract class AbstractBackup implements BackupInterface
      * Backup name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_name;
 
@@ -25,7 +23,6 @@ abstract class AbstractBackup implements BackupInterface
      * Backup creation date
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_time;
 
@@ -33,7 +30,6 @@ abstract class AbstractBackup implements BackupInterface
      * Backup file extension
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_backupExtension;
 
@@ -41,7 +37,6 @@ abstract class AbstractBackup implements BackupInterface
      * Resource model
      *
      * @var object
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
@@ -49,7 +44,6 @@ abstract class AbstractBackup implements BackupInterface
      * Magento's root directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_rootDir;
 
@@ -57,7 +51,6 @@ abstract class AbstractBackup implements BackupInterface
      * Path to directory where backups stored
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_backupsDir;
 
@@ -65,7 +58,6 @@ abstract class AbstractBackup implements BackupInterface
      * Is last operation completed successfully
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_lastOperationSucceed = false;
 
@@ -73,7 +65,6 @@ abstract class AbstractBackup implements BackupInterface
      * Last failed operation error message
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_lastErrorMessage;
 
@@ -82,7 +73,6 @@ abstract class AbstractBackup implements BackupInterface
      *
      * @param string $backupExtension
      * @return $this
-     * @since 2.0.0
      */
     public function setBackupExtension($backupExtension)
     {
@@ -94,7 +84,6 @@ public function setBackupExtension($backupExtension)
      * Get Backup Extension
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackupExtension()
     {
@@ -106,7 +95,6 @@ public function getBackupExtension()
      *
      * @param object $resourceModel
      * @return $this
-     * @since 2.0.0
      */
     public function setResourceModel($resourceModel)
     {
@@ -118,7 +106,6 @@ public function setResourceModel($resourceModel)
      * Get Resource Model
      *
      * @return object
-     * @since 2.0.0
      */
     public function getResourceModel()
     {
@@ -130,7 +117,6 @@ public function getResourceModel()
      *
      * @param int $time
      * @return $this
-     * @since 2.0.0
      */
     public function setTime($time)
     {
@@ -142,7 +128,6 @@ public function setTime($time)
      * Get Time
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTime()
     {
@@ -155,7 +140,6 @@ public function getTime()
      * @param string $rootDir
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function setRootDir($rootDir)
     {
@@ -172,7 +156,6 @@ public function setRootDir($rootDir)
     /**
      * Get Magento's root directory
      * @return string
-     * @since 2.0.0
      */
     public function getRootDir()
     {
@@ -184,7 +167,6 @@ public function getRootDir()
      *
      * @param string $backupsDir
      * @return $this
-     * @since 2.0.0
      */
     public function setBackupsDir($backupsDir)
     {
@@ -196,7 +178,6 @@ public function setBackupsDir($backupsDir)
      * Get path to directory where backups stored
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackupsDir()
     {
@@ -207,7 +188,6 @@ public function getBackupsDir()
      * Get path to backup
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackupPath()
     {
@@ -218,7 +198,6 @@ public function getBackupPath()
      * Get backup file name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBackupFilename()
     {
@@ -240,7 +219,6 @@ public function getBackupFilename()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSuccess()
     {
@@ -251,7 +229,6 @@ public function getIsSuccess()
      * Get last error message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getErrorMessage()
     {
@@ -263,7 +240,6 @@ public function getErrorMessage()
      *
      * @param string $errorMessage
      * @return void
-     * @since 2.0.0
      */
     public function setErrorMessage($errorMessage)
     {
@@ -276,7 +252,6 @@ public function setErrorMessage($errorMessage)
      * @param string $name
      * @param bool $applyFilter
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name, $applyFilter = true)
     {
@@ -291,7 +266,6 @@ public function setName($name, $applyFilter = true)
      * Get backup name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -302,7 +276,6 @@ public function getName()
      * Get backup display name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayName()
     {
@@ -314,7 +287,6 @@ public function getDisplayName()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _filterName($name)
     {
diff --git a/lib/internal/Magento/Framework/Backup/Archive/Tar.php b/lib/internal/Magento/Framework/Backup/Archive/Tar.php
index 5095b14a96511..45b4a0c735c77 100644
--- a/lib/internal/Magento/Framework/Backup/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Backup/Archive/Tar.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Backup\Archive\Tar
  *
- * @since 2.0.0
  */
 class Tar extends \Magento\Framework\Archive\Tar
 {
@@ -22,7 +21,6 @@ class Tar extends \Magento\Framework\Archive\Tar
      * Filenames or filename parts that are used for filtering files
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_skipFiles = [];
 
@@ -36,7 +34,6 @@ class Tar extends \Magento\Framework\Archive\Tar
      *
      * @see \Magento\Framework\Archive\Tar::_createTar()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _createTar($skipRoot = false, $finalize = false)
     {
@@ -67,7 +64,6 @@ protected function _createTar($skipRoot = false, $finalize = false)
      *
      * @param array $skipFiles
      * @return $this
-     * @since 2.0.0
      */
     public function setSkipFiles(array $skipFiles)
     {
diff --git a/lib/internal/Magento/Framework/Backup/BackupException.php b/lib/internal/Magento/Framework/Backup/BackupException.php
index 61b9ee28204ea..7694c084c10a7 100644
--- a/lib/internal/Magento/Framework/Backup/BackupException.php
+++ b/lib/internal/Magento/Framework/Backup/BackupException.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class BackupException extends \Magento\Framework\Exception\LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Backup/BackupInterface.php b/lib/internal/Magento/Framework/Backup/BackupInterface.php
index 56bc83223ef32..3d054bdbd1a9c 100644
--- a/lib/internal/Magento/Framework/Backup/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/BackupInterface.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface BackupInterface
 {
@@ -21,7 +20,6 @@ interface BackupInterface
      * Create Backup
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function create();
 
@@ -29,7 +27,6 @@ public function create();
      * Rollback Backup
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function rollback();
 
@@ -38,7 +35,6 @@ public function rollback();
      *
      * @param string $backupExtension
      * @return $this
-     * @since 2.0.0
      */
     public function setBackupExtension($backupExtension);
 
@@ -47,7 +43,6 @@ public function setBackupExtension($backupExtension);
      *
      * @param object $resourceModel
      * @return $this
-     * @since 2.0.0
      */
     public function setResourceModel($resourceModel);
 
@@ -56,7 +51,6 @@ public function setResourceModel($resourceModel);
      *
      * @param int $time
      * @return $this
-     * @since 2.0.0
      */
     public function setTime($time);
 
@@ -64,7 +58,6 @@ public function setTime($time);
      * Get Backup Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -73,7 +66,6 @@ public function getType();
      *
      * @param string $backupsDir
      * @return $this
-     * @since 2.0.0
      */
     public function setBackupsDir($backupsDir);
 }
diff --git a/lib/internal/Magento/Framework/Backup/Db.php b/lib/internal/Magento/Framework/Backup/Db.php
index b31ae9b3ca7d8..d9585f25365c8 100644
--- a/lib/internal/Magento/Framework/Backup/Db.php
+++ b/lib/internal/Magento/Framework/Backup/Db.php
@@ -10,19 +10,16 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Db extends AbstractBackup
 {
     /**
      * @var \Magento\Framework\Backup\Db\BackupFactory
-     * @since 2.0.0
      */
     protected $_backupFactory;
 
     /**
      * @param \Magento\Framework\Backup\Db\BackupFactory $backupFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Backup\Db\BackupFactory $backupFactory)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Backup\Db\BackupFactory $backupFa
      * Implements Rollback functionality for Db
      *
      * @return bool
-     * @since 2.0.0
      */
     public function rollback()
     {
@@ -61,7 +57,6 @@ public function rollback()
      *
      * @param string $line
      * @return bool
-     * @since 2.0.0
      */
     protected function _isLineLastInCommand($line)
     {
@@ -83,7 +78,6 @@ protected function _isLineLastInCommand($line)
      * Implements Create Backup functionality for Db
      *
      * @return bool
-     * @since 2.0.0
      */
     public function create()
     {
@@ -114,7 +108,6 @@ public function create()
      * Get database size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDBSize()
     {
@@ -126,7 +119,6 @@ public function getDBSize()
      * Get Backup Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
index b9fd1fbbc9c83..13e3c562bb527 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface BackupDbInterface
 {
@@ -16,7 +15,6 @@ interface BackupDbInterface
      *
      * @param BackupInterface $backup
      * @return void
-     * @since 2.0.0
      */
     public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backup);
 
@@ -24,7 +22,6 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
      * Get database backup size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDBBackupSize();
 }
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
index d01b75cc8ba29..e8d5fa4bd0b5f 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class BackupFactory
 {
@@ -16,19 +15,16 @@ class BackupFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $_backupInstanceName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $_backupDbInstanceName;
 
@@ -36,7 +32,6 @@ class BackupFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $backupInstanceName
      * @param string $backupDbInstanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -53,7 +48,6 @@ public function __construct(
      *
      * @param array $arguments
      * @return \Magento\Framework\Backup\Db\BackupInterface
-     * @since 2.0.0
      */
     public function createBackupModel(array $arguments = [])
     {
@@ -65,7 +59,6 @@ public function createBackupModel(array $arguments = [])
      *
      * @param array $arguments
      * @return \Magento\Framework\Backup\Db\BackupDbInterface
-     * @since 2.0.0
      */
     public function createBackupDbModel(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
index 29b62bbb18421..f7459f629cb4a 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface BackupInterface
 {
@@ -16,7 +15,6 @@ interface BackupInterface
      *
      * @param int $time
      * @return $this
-     * @since 2.0.0
      */
     public function setTime($time);
 
@@ -25,7 +23,6 @@ public function setTime($time);
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type);
 
@@ -34,7 +31,6 @@ public function setType($type);
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path);
 
@@ -43,7 +39,6 @@ public function setPath($path);
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -52,7 +47,6 @@ public function setName($name);
      *
      * @param bool $write
      * @return $this
-     * @since 2.0.0
      */
     public function open($write = false);
 
@@ -61,7 +55,6 @@ public function open($write = false);
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function write($data);
 
@@ -69,7 +62,6 @@ public function write($data);
      * Close open backup file
      *
      * @return $this
-     * @since 2.0.0
      */
     public function close();
 }
diff --git a/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php b/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
index ab9e537c4bfc1..45d1cc21b06da 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CantLoadSnapshot extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php b/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
index a2b4e0655e9d6..9b722da10a1bd 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FtpConnectionFailed extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php b/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
index 9ca0680c5138c..53af4bfd3061b 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FtpValidationFailed extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
index 2d0b7f905c3ec..b373134d2e9a6 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NotEnoughFreeSpace extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
index ae309d807cbda..ba7e80a503f4f 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NotEnoughPermissions extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Factory.php b/lib/internal/Magento/Framework/Backup/Factory.php
index a8befaf4bddb5..4a87c33927a5b 100644
--- a/lib/internal/Magento/Framework/Backup/Factory.php
+++ b/lib/internal/Magento/Framework/Backup/Factory.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Factory
 {
@@ -19,7 +18,6 @@ class Factory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
@@ -52,13 +50,11 @@ class Factory
      * List of supported a backup types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_allowedTypes;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -78,7 +74,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $type
      * @return BackupInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($type)
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem.php b/lib/internal/Magento/Framework/Backup/Filesystem.php
index 5c51d112ddba5..5c4eaa4c25d28 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem.php
@@ -12,7 +12,6 @@
  * Class to work with filesystem backups
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Filesystem extends AbstractBackup
 {
@@ -20,7 +19,6 @@ class Filesystem extends AbstractBackup
      * Paths that ignored when creating or rolling back snapshot
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ignorePaths = [];
 
@@ -28,7 +26,6 @@ class Filesystem extends AbstractBackup
      * Whether use ftp account for rollback procedure
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useFtp = false;
 
@@ -36,7 +33,6 @@ class Filesystem extends AbstractBackup
      * Ftp host
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ftpHost;
 
@@ -44,7 +40,6 @@ class Filesystem extends AbstractBackup
      * Ftp username
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ftpUser;
 
@@ -52,7 +47,6 @@ class Filesystem extends AbstractBackup
      * Password to ftp account
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ftpPass;
 
@@ -60,7 +54,6 @@ class Filesystem extends AbstractBackup
      * Ftp path to Magento installation
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_ftpPath;
 
@@ -81,7 +74,6 @@ class Filesystem extends AbstractBackup
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function rollback()
     {
@@ -102,7 +94,6 @@ public function rollback()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return boolean
-     * @since 2.0.0
      */
     public function create()
     {
@@ -164,7 +155,6 @@ public function create()
      * @param int $size
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function validateAvailableDiscSpace($backupDir, $size)
     {
@@ -188,7 +178,6 @@ public function validateAvailableDiscSpace($backupDir, $size)
      * @param string $password
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setUseFtp($host, $username, $password, $path)
     {
@@ -206,7 +195,6 @@ public function setUseFtp($host, $username, $password, $path)
      * @return string
      *
      * @see BackupInterface::getType()
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -218,7 +206,6 @@ public function getType()
      *
      * @param string|array $paths
      * @return $this
-     * @since 2.0.0
      */
     public function addIgnorePaths($paths)
     {
@@ -239,7 +226,6 @@ public function addIgnorePaths($paths)
      * Get paths that should be ignored while creating or rolling back backup procedure
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIgnorePaths()
     {
@@ -253,7 +239,6 @@ public function getIgnorePaths()
      * @return $this
      *
      * @see AbstractBackup::setBackupsDir()
-     * @since 2.0.0
      */
     public function setBackupsDir($backupsDir)
     {
@@ -266,7 +251,6 @@ public function setBackupsDir($backupsDir)
      * Getter for $_ftpPath variable
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFtpPath()
     {
@@ -277,7 +261,6 @@ public function getFtpPath()
      * Get ftp connection string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFtpConnectString()
     {
@@ -289,7 +272,6 @@ public function getFtpConnectString()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _checkBackupsDir()
     {
@@ -319,7 +301,6 @@ protected function _checkBackupsDir()
      * Generate tmp name for tarball
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTarTmpPath()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php b/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
index 7ed4d32593b16..36f02191bbc6d 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
@@ -9,7 +9,6 @@
  * Filesystem helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Helper
 {
@@ -54,7 +53,6 @@ class Helper
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function rm($path, $skipPaths = [], $removeRoot = false)
     {
@@ -83,7 +81,6 @@ public function rm($path, $skipPaths = [], $removeRoot = false)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getInfo($path, $infoOptions = self::INFO_ALL, $skipFiles = [])
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/File.php b/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/File.php
index 7cf248ab6c8d9..9602807a8aedb 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/File.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/File.php
@@ -9,7 +9,6 @@
  * File lines iterator
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class File extends \SplFileObject
 {
@@ -17,7 +16,6 @@ class File extends \SplFileObject
      * The statement that was last read during iteration
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentStatement = '';
 
@@ -25,7 +23,6 @@ class File extends \SplFileObject
      * Return current sql statement
      *
      * @return string
-     * @since 2.0.0
      */
     public function current()
     {
@@ -36,7 +33,6 @@ public function current()
      * Iterate to next sql statement in file
      *
      * @return void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -56,7 +52,6 @@ public function next()
      * Return to first statement
      *
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -69,7 +64,6 @@ public function rewind()
      *
      * @param string $line
      * @return bool
-     * @since 2.0.0
      */
     protected function _isComment($line)
     {
@@ -81,7 +75,6 @@ protected function _isComment($line)
      *
      * @param string $line
      * @return bool
-     * @since 2.0.0
      */
     protected function _isLineLastInCommand($line)
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php b/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php
index b422db765ab94..4564531f5fe6b 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Backup\Filesystem\Iterator\Filter
  *
- * @since 2.0.0
  */
 class Filter extends \FilterIterator
 {
@@ -22,7 +21,6 @@ class Filter extends \FilterIterator
      * Array that is used for filtering
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filters;
 
@@ -31,7 +29,6 @@ class Filter extends \FilterIterator
      *
      * @param \Iterator $iterator
      * @param array $filters list of files to skip
-     * @since 2.0.0
      */
     public function __construct(\Iterator $iterator, array $filters)
     {
@@ -43,7 +40,6 @@ public function __construct(\Iterator $iterator, array $filters)
      * Check whether the current element of the iterator is acceptable
      *
      * @return bool
-     * @since 2.0.0
      */
     public function accept()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
index f1c1561593585..efd1b335d3252 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
@@ -9,7 +9,6 @@
  * Filesystem rollback workers abstract class
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractRollback
 {
@@ -17,7 +16,6 @@ abstract class AbstractRollback
      * Snapshot object
      *
      * @var \Magento\Framework\Backup\Filesystem
-     * @since 2.0.0
      */
     protected $_snapshot;
 
@@ -25,7 +23,6 @@ abstract class AbstractRollback
      * Default worker constructor
      *
      * @param \Magento\Framework\Backup\Filesystem $snapshotObject
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Backup\Filesystem $snapshotObject)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\Backup\Filesystem $snapshotObject
      * Main worker's function that makes files rollback
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function run();
 }
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
index 7c84791a2966a..6a85864427393 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
@@ -11,7 +11,6 @@
  * Rollback worker for rolling back via local filesystem
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Fs extends AbstractRollback
 {
@@ -28,7 +27,6 @@ class Fs extends AbstractRollback
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @see AbstractRollback::run()
-     * @since 2.0.0
      */
     public function run()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
index ec4f5edf12f56..10322bb5ab23c 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
@@ -11,7 +11,6 @@
  * Rollback worker for rolling back via ftp
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Ftp extends AbstractRollback
 {
@@ -19,7 +18,6 @@ class Ftp extends AbstractRollback
      * Ftp client
      *
      * @var \Magento\Framework\System\Ftp
-     * @since 2.0.0
      */
     protected $_ftpClient;
 
@@ -30,7 +28,6 @@ class Ftp extends AbstractRollback
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @see AbstractRollback::run()
-     * @since 2.0.0
      */
     public function run()
     {
@@ -61,7 +58,6 @@ public function run()
      *
      * @return void
      * @throws \Magento\Framework\Backup\Exception\FtpConnectionFailed
-     * @since 2.0.0
      */
     protected function _initFtpClient()
     {
@@ -80,7 +76,6 @@ protected function _initFtpClient()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _validateFtp()
     {
@@ -114,7 +109,6 @@ protected function _validateFtp()
      *
      * @param string $tmpDir
      * @return void
-     * @since 2.0.0
      */
     protected function _unpackSnapshot($tmpDir)
     {
@@ -127,7 +121,6 @@ protected function _unpackSnapshot($tmpDir)
     /**
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _createTmpDir()
     {
@@ -148,7 +141,6 @@ protected function _createTmpDir()
      * Delete magento and all files from ftp
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _cleanupFtp()
     {
@@ -179,7 +171,6 @@ protected function _cleanupFtp()
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _uploadBackupToFtp($tmpDir)
     {
diff --git a/lib/internal/Magento/Framework/Backup/Media.php b/lib/internal/Magento/Framework/Backup/Media.php
index 629f5854e2fcf..d0f210c607454 100644
--- a/lib/internal/Magento/Framework/Backup/Media.php
+++ b/lib/internal/Magento/Framework/Backup/Media.php
@@ -9,7 +9,6 @@
  * Class to work media folder and database backups
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Media extends Snapshot
 {
@@ -18,7 +17,6 @@ class Media extends Snapshot
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function rollback()
     {
@@ -31,7 +29,6 @@ public function rollback()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return bool
-     * @since 2.0.0
      */
     public function create()
     {
@@ -44,7 +41,6 @@ public function create()
      *
      * @return string
      * @see BackupInterface::getType()
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -55,7 +51,6 @@ public function getType()
      * Add all folders and files except media and db backup to ignore list
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIgnoreList()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Nomedia.php b/lib/internal/Magento/Framework/Backup/Nomedia.php
index ae048c3c999bc..a1361331771de 100644
--- a/lib/internal/Magento/Framework/Backup/Nomedia.php
+++ b/lib/internal/Magento/Framework/Backup/Nomedia.php
@@ -9,7 +9,6 @@
  * Class to work system backup that excludes media folder
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Nomedia extends \Magento\Framework\Backup\Media
 {
@@ -18,7 +17,6 @@ class Nomedia extends \Magento\Framework\Backup\Media
      *
      * @return string
      * @see BackupInterface::getType()
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -29,7 +27,6 @@ public function getType()
      * Add media folder to ignore list
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareIgnoreList()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Snapshot.php b/lib/internal/Magento/Framework/Backup/Snapshot.php
index e0fd47bc24a85..cc796876511da 100644
--- a/lib/internal/Magento/Framework/Backup/Snapshot.php
+++ b/lib/internal/Magento/Framework/Backup/Snapshot.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Framework\Backup\Snapshot
  *
- * @since 2.0.0
  */
 class Snapshot extends Filesystem
 {
@@ -25,7 +24,6 @@ class Snapshot extends Filesystem
      * Database backup manager
      *
      * @var Db
-     * @since 2.0.0
      */
     protected $_dbBackupManager;
 
@@ -33,20 +31,17 @@ class Snapshot extends Filesystem
      * Filesystem facade
      *
      * @var AppFilesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var Factory
-     * @since 2.0.0
      */
     protected $_backupFactory;
 
     /**
      * @param AppFilesystem $filesystem
      * @param Factory $backupFactory
-     * @since 2.0.0
      */
     public function __construct(AppFilesystem $filesystem, Factory $backupFactory)
     {
@@ -59,7 +54,6 @@ public function __construct(AppFilesystem $filesystem, Factory $backupFactory)
      *
      * @throws \Exception
      * @return bool
-     * @since 2.0.0
      */
     public function rollback()
     {
@@ -85,7 +79,6 @@ public function rollback()
      *
      * @throws \Exception
      * @return bool
-     * @since 2.0.0
      */
     public function create()
     {
@@ -110,7 +103,6 @@ public function create()
      *
      * @return string
      * @see BackupInterface::getType()
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -121,7 +113,6 @@ public function getType()
      * Create Db Instance
      *
      * @return BackupInterface
-     * @since 2.0.0
      */
     protected function _createDbBackupInstance()
     {
@@ -136,7 +127,6 @@ protected function _createDbBackupInstance()
      * Get database backup manager
      *
      * @return Db
-     * @since 2.0.0
      */
     protected function _getDbBackupManager()
     {
@@ -152,7 +142,6 @@ protected function _getDbBackupManager()
      *
      * @param AbstractBackup $manager
      * @return $this
-     * @since 2.0.0
      */
     public function setDbBackupManager(AbstractBackup $manager)
     {
@@ -164,7 +153,6 @@ public function setDbBackupManager(AbstractBackup $manager)
      * Get Db Backup Filename
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDbBackupFilename()
     {
@@ -175,7 +163,6 @@ public function getDbBackupFilename()
      * Remove Db backup after added it to the snapshot
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _removeDbBackup()
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index 9090c8c857837..b5d4b182843ec 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -35,7 +35,6 @@
 /**
  * Class \Magento\Framework\Cache\Backend\Database
  *
- * @since 2.0.0
  */
 class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
@@ -43,7 +42,6 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
      * Available options
      *
      * @var array available options
-     * @since 2.0.0
      */
     protected $_options = [
         'adapter' => '',
@@ -58,7 +56,6 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_connection = null;
 
@@ -66,7 +63,6 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
      * Constructor
      *
      * @param array $options associative array of options
-     * @since 2.0.0
      */
     public function __construct($options = [])
     {
@@ -90,7 +86,6 @@ public function __construct($options = [])
      * Get DB adapter
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function _getConnection()
     {
@@ -115,7 +110,6 @@ protected function _getConnection()
      * Get table name where data is stored
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDataTable()
     {
@@ -132,7 +126,6 @@ protected function _getDataTable()
      * Get table name where tags are stored
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getTagsTable()
     {
@@ -153,7 +146,6 @@ protected function _getTagsTable()
      * @param  string  $id                     Cache id
      * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
      * @return string|false cached datas
-     * @since 2.0.0
      */
     public function load($id, $doNotTestCacheValidity = false)
     {
@@ -180,7 +172,6 @@ public function load($id, $doNotTestCacheValidity = false)
      *
      * @param  string $id cache id
      * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     * @since 2.0.0
      */
     public function test($id)
     {
@@ -214,7 +205,6 @@ public function test($id)
      * @param string[] $tags          Array of strings, the cache record will be tagged by each string entry
      * @param int|bool $specificLifetime  Integer to set a specific lifetime or null for infinite lifetime
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function save($data, $id, $tags = [], $specificLifetime = false)
     {
@@ -256,7 +246,6 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      *
      * @param  string $id Cache id
      * @return boolean True if no problem
-     * @since 2.0.0
      */
     public function remove($id)
     {
@@ -285,7 +274,6 @@ public function remove($id)
      * @param  string $mode Clean mode
      * @param  string[] $tags Array of tags
      * @return boolean true if no problem
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
@@ -318,7 +306,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
      * Return an array of stored cache ids
      *
      * @return string[] array of stored cache ids (string)
-     * @since 2.0.0
      */
     public function getIds()
     {
@@ -334,7 +321,6 @@ public function getIds()
      * Return an array of stored tags
      *
      * @return string[] array of stored tags (string)
-     * @since 2.0.0
      */
     public function getTags()
     {
@@ -349,7 +335,6 @@ public function getTags()
      *
      * @param string[] $tags array of tags
      * @return string[] array of matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingTags($tags = [])
     {
@@ -376,7 +361,6 @@ public function getIdsMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of not matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsNotMatchingTags($tags = [])
     {
@@ -390,7 +374,6 @@ public function getIdsNotMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of any matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingAnyTags($tags = [])
     {
@@ -410,7 +393,6 @@ public function getIdsMatchingAnyTags($tags = [])
      * Return the filling percentage of the backend storage
      *
      * @return int integer between 0 and 100
-     * @since 2.0.0
      */
     public function getFillingPercentage()
     {
@@ -427,7 +409,6 @@ public function getFillingPercentage()
      *
      * @param string $id cache id
      * @return array|false array of metadatas (false if the cache id is not found)
-     * @since 2.0.0
      */
     public function getMetadatas($id)
     {
@@ -449,7 +430,6 @@ public function getMetadatas($id)
      * @param string $id cache id
      * @param int $extraLifetime
      * @return boolean true if ok
-     * @since 2.0.0
      */
     public function touch($id, $extraLifetime)
     {
@@ -477,7 +457,6 @@ public function touch($id, $extraLifetime)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
      *
      * @return array associative of with capabilities
-     * @since 2.0.0
      */
     public function getCapabilities()
     {
@@ -497,7 +476,6 @@ public function getCapabilities()
      * @param string $id
      * @param string[] $tags
      * @return bool
-     * @since 2.0.0
      */
     protected function _saveTags($id, $tags)
     {
@@ -537,7 +515,6 @@ protected function _saveTags($id, $tags)
      * @param string[] $tags
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _cleanByTags($mode, $tags)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Decorator/AbstractDecorator.php b/lib/internal/Magento/Framework/Cache/Backend/Decorator/AbstractDecorator.php
index 6baca3b4961db..89068c10d498f 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Decorator/AbstractDecorator.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Decorator/AbstractDecorator.php
@@ -8,27 +8,23 @@
 
 /**
  * Abstract decorator class for \Zend_Cache_Backend class and its descendants
- * @since 2.0.0
  */
 abstract class AbstractDecorator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
     /**
      * Concrete Cache Backend class that is being decorated
      * @var \Zend_Cache_Backend
-     * @since 2.0.0
      */
     protected $_backend;
 
     /**
      * Array of specific options. Made in separate array to distinguish from parent options
      * @var array
-     * @since 2.0.0
      */
     protected $_decoratorOptions = [];
 
     /**
      * @param array $options
-     * @since 2.0.0
      */
     public function __construct(array $options = [])
     {
@@ -56,7 +52,6 @@ public function __construct(array $options = [])
      *
      * @param array $directives assoc of directives
      * @return void
-     * @since 2.0.0
      */
     public function setDirectives($directives)
     {
@@ -71,7 +66,6 @@ public function setDirectives($directives)
      * @param  string  $cacheId                     Cache id
      * @param  boolean $noTestCacheValidity If set to true, the cache validity won't be tested
      * @return string|false cached datas
-     * @since 2.0.0
      */
     public function load($cacheId, $noTestCacheValidity = false)
     {
@@ -83,7 +77,6 @@ public function load($cacheId, $noTestCacheValidity = false)
      *
      * @param  string $cacheId cache id
      * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     * @since 2.0.0
      */
     public function test($cacheId)
     {
@@ -104,7 +97,6 @@ public function test($cacheId)
      * @param  int $priority            integer between 0 (very low priority) and 10 (maximum priority) used by
      *                                  some particular backends
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function save($data, $cacheId, $tags = [], $specificLifetime = false, $priority = 8)
     {
@@ -116,7 +108,6 @@ public function save($data, $cacheId, $tags = [], $specificLifetime = false, $pr
      *
      * @param string $cacheId Cache id
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function remove($cacheId)
     {
@@ -139,7 +130,6 @@ public function remove($cacheId)
      * @param  string $mode Clean mode
      * @param  string[] $tags Array of tags
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
@@ -150,7 +140,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
      * Return an array of stored cache ids
      *
      * @return string[] array of stored cache ids (string)
-     * @since 2.0.0
      */
     public function getIds()
     {
@@ -161,7 +150,6 @@ public function getIds()
      * Return an array of stored tags
      *
      * @return string[] array of stored tags (string)
-     * @since 2.0.0
      */
     public function getTags()
     {
@@ -175,7 +163,6 @@ public function getTags()
      *
      * @param string[] $tags array of tags
      * @return string[] array of matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingTags($tags = [])
     {
@@ -189,7 +176,6 @@ public function getIdsMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of not matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsNotMatchingTags($tags = [])
     {
@@ -203,7 +189,6 @@ public function getIdsNotMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of any matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingAnyTags($tags = [])
     {
@@ -214,7 +199,6 @@ public function getIdsMatchingAnyTags($tags = [])
      * Return the filling percentage of the backend storage
      *
      * @return int integer between 0 and 100
-     * @since 2.0.0
      */
     public function getFillingPercentage()
     {
@@ -231,7 +215,6 @@ public function getFillingPercentage()
      *
      * @param string $cacheId cache id
      * @return array|bool array of metadatas (false if the cache id is not found)
-     * @since 2.0.0
      */
     public function getMetadatas($cacheId)
     {
@@ -244,7 +227,6 @@ public function getMetadatas($cacheId)
      * @param string $cacheId cache id
      * @param int $extraLifetime
      * @return boolean true if ok
-     * @since 2.0.0
      */
     public function touch($cacheId, $extraLifetime)
     {
@@ -264,7 +246,6 @@ public function touch($cacheId, $extraLifetime)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
      *
      * @return array associative of with capabilities
-     * @since 2.0.0
      */
     public function getCapabilities()
     {
@@ -278,7 +259,6 @@ public function getCapabilities()
      * @param  mixed  $value
      * @throws \Zend_Cache_Exception
      * @return void
-     * @since 2.0.0
      */
     public function setOption($name, $value)
     {
@@ -293,7 +273,6 @@ public function setOption($name, $value)
      *
      * @param  int $specificLifetime
      * @return int Cache life time
-     * @since 2.0.0
      */
     public function getLifetime($specificLifetime)
     {
@@ -307,7 +286,6 @@ public function getLifetime($specificLifetime)
      *
      * @return string
      * @throws \Zend_Cache_Exception if unable to determine directory
-     * @since 2.0.0
      */
     public function getTmpDir()
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Decorator/Compression.php b/lib/internal/Magento/Framework/Cache/Backend/Decorator/Compression.php
index d7b88f3a8d373..57f97e9cbac7f 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Decorator/Compression.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Decorator/Compression.php
@@ -10,7 +10,6 @@
  * Decorator class for compressing data before storing in cache
  *
  * @todo re-implement as a cache frontend decorator similarly to \Magento\Framework\Cache\Frontend\Decorator\*
- * @since 2.0.0
  */
 class Compression extends \Magento\Framework\Cache\Backend\Decorator\AbstractDecorator
 {
@@ -22,7 +21,6 @@ class Compression extends \Magento\Framework\Cache\Backend\Decorator\AbstractDec
     /**
      * Array of specific options. Made in separate array to distinguish from parent options
      * @var array
-     * @since 2.0.0
      */
     protected $_decoratorOptions = ['compression_threshold' => 512];
 
@@ -34,7 +32,6 @@ class Compression extends \Magento\Framework\Cache\Backend\Decorator\AbstractDec
      * @param  string  $cacheId                Cache id
      * @param  boolean $noTestCacheValidity    If set to true, the cache validity won't be tested
      * @return string|false cached datas
-     * @since 2.0.0
      */
     public function load($cacheId, $noTestCacheValidity = false)
     {
@@ -61,7 +58,6 @@ public function load($cacheId, $noTestCacheValidity = false)
      * @param int $priority             integer between 0 (very low priority) and 10 (maximum priority) used by
      *                                  some particular backends
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function save($data, $cacheId, $tags = [], $specificLifetime = false, $priority = 8)
     {
@@ -77,7 +73,6 @@ public function save($data, $cacheId, $tags = [], $specificLifetime = false, $pr
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     protected static function _compressData($data)
     {
@@ -89,7 +84,6 @@ protected static function _compressData($data)
      *
      * @param string $data
      * @return bool
-     * @since 2.0.0
      */
     protected function _isCompressionNeeded($data)
     {
@@ -101,7 +95,6 @@ protected function _isCompressionNeeded($data)
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     protected static function _decompressData($data)
     {
@@ -113,7 +106,6 @@ protected static function _decompressData($data)
      *
      * @param string $data
      * @return bool
-     * @since 2.0.0
      */
     protected function _isDecompressionNeeded($data)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
index e1f0812afc196..ee2d971f26c37 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\Cache\Backend\Eaccelerator
  *
- * @since 2.0.0
  */
 class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
@@ -27,7 +26,6 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
      *
      * @param  array $options associative array of options
      * @throws \Zend_Cache_Exception
-     * @since 2.0.0
      */
     public function __construct(array $options = [])
     {
@@ -46,7 +44,6 @@ public function __construct(array $options = [])
      * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
      * @return string cached datas (or false)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function load($id, $doNotTestCacheValidity = false)
     {
@@ -62,7 +59,6 @@ public function load($id, $doNotTestCacheValidity = false)
      *
      * @param  string $id cache id
      * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     * @since 2.0.0
      */
     public function test($id)
     {
@@ -84,7 +80,6 @@ public function test($id)
      * @param string[] $tags array of strings, the cache record will be tagged by each string entry
      * @param int|bool $specificLifetime Integer to set a specific lifetime or null for infinite lifetime
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function save($data, $id, $tags = [], $specificLifetime = false)
     {
@@ -101,7 +96,6 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      *
      * @param  string $id cache id
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function remove($id)
     {
@@ -123,7 +117,6 @@ public function remove($id)
      * @throws \Zend_Cache_Exception
      * @return bool|void true if no problem
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
@@ -153,7 +146,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
      *
      * @throws \Zend_Cache_Exception
      * @return int integer between 0 and 100
-     * @since 2.0.0
      */
     public function getFillingPercentage()
     {
@@ -174,7 +166,6 @@ public function getFillingPercentage()
      * Return an array of stored tags
      *
      * @return string[] array of stored tags (string)
-     * @since 2.0.0
      */
     public function getTags()
     {
@@ -190,7 +181,6 @@ public function getTags()
      * @param array $tags array of tags
      * @return string[] array of matching cache ids (string)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdsMatchingTags($tags = [])
     {
@@ -206,7 +196,6 @@ public function getIdsMatchingTags($tags = [])
      * @param string[] $tags array of tags
      * @return string[] array of not matching cache ids (string)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdsNotMatchingTags($tags = [])
     {
@@ -222,7 +211,6 @@ public function getIdsNotMatchingTags($tags = [])
      * @param string[] $tags array of tags
      * @return string[] array of any matching cache ids (string)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getIdsMatchingAnyTags($tags = [])
     {
@@ -235,7 +223,6 @@ public function getIdsMatchingAnyTags($tags = [])
      *
      * @return string[] array of stored cache ids (string)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getIds()
     {
@@ -258,7 +245,6 @@ public function getIds()
      * @param string $id cache id
      * @return array|false array of metadatas (false if the cache id is not found)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getMetadatas($id)
     {
@@ -283,7 +269,6 @@ public function getMetadatas($id)
      * @param string $id cache id
      * @param int $extraLifetime
      * @return bool true if ok
-     * @since 2.0.0
      */
     public function touch($id, $extraLifetime)
     {
@@ -320,7 +305,6 @@ public function touch($id, $extraLifetime)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
      *
      * @return array associative of with capabilities
-     * @since 2.0.0
      */
     public function getCapabilities()
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
index 41dc5da04d047..d0ceb20641a2e 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Cache\Backend\Memcached
  *
- * @since 2.0.0
  */
 class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Backend_ExtendedInterface
 {
@@ -27,7 +26,6 @@ class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Bac
      *
      * @param array $options @see \Zend_Cache_Backend_Memcached::__construct()
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(array $options = [])
     {
@@ -54,7 +52,6 @@ public function __construct(array $options = [])
      * @param string $id    Main data's ID
      * @param int    $index Particular chunk number to return ID for
      * @return string
-     * @since 2.0.0
      */
     protected function _getChunkId($id, $index)
     {
@@ -67,7 +64,6 @@ protected function _getChunkId($id, $index)
      * @param string $id     ID of data's info cell
      * @param int    $chunks Number of chunks to remove (basically, the number after '{splitted}|')
      * @return null
-     * @since 2.0.0
      */
     protected function _cleanTheMess($id, $chunks)
     {
@@ -86,7 +82,6 @@ protected function _cleanTheMess($id, $chunks)
      * @param string[] $tags           @see \Zend_Cache_Backend_Memcached::save()
      * @param bool $specificLifetime   @see \Zend_Cache_Backend_Memcached::save()
      * @return bool
-     * @since 2.0.0
      */
     public function save($data, $id, $tags = [], $specificLifetime = false)
     {
@@ -114,7 +109,6 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      * @param string $id                     @see \Zend_Cache_Backend_Memcached::load()
      * @param bool   $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
      * @return bool|false|string
-     * @since 2.0.0
      */
     public function load($id, $doNotTestCacheValidity = false)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php b/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
index 1ef6bda610e5a..f541b4debf90e 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Cache\Backend\MongoDb
  *
- * @since 2.0.0
  */
 class MongoDb extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
@@ -31,17 +30,13 @@ class MongoDb extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extende
     const COMPARISON_MODE_MATCHING_ANY_TAG = \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG;
     /**#@-*/
 
-    /**
-     * @var \MongoCollection|null
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_collection = null;
 
     /**
      * List of available options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = [
         'connection_string' => 'mongodb://localhost:27017', // MongoDB connection string
@@ -52,7 +47,6 @@ class MongoDb extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extende
 
     /**
      * @param array $options
-     * @since 2.0.0
      */
     public function __construct(array $options = [])
     {
@@ -71,7 +65,6 @@ public function __construct(array $options = [])
      * Get collection
      *
      * @return \MongoCollection
-     * @since 2.0.0
      */
     protected function _getCollection()
     {
@@ -87,7 +80,6 @@ protected function _getCollection()
      * Return an array of stored cache ids
      *
      * @return string[] array of stored cache ids (string)
-     * @since 2.0.0
      */
     public function getIds()
     {
@@ -98,7 +90,6 @@ public function getIds()
      * Return an array of stored tags
      *
      * @return string[] array of stored tags (string)
-     * @since 2.0.0
      */
     public function getTags()
     {
@@ -113,7 +104,6 @@ public function getTags()
      *
      * @param string[] $tags array of tags
      * @return string[] array of matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingTags($tags = [])
     {
@@ -132,7 +122,6 @@ public function getIdsMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of not matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsNotMatchingTags($tags = [])
     {
@@ -151,7 +140,6 @@ public function getIdsNotMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of any matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingAnyTags($tags = [])
     {
@@ -169,7 +157,6 @@ public function getIdsMatchingAnyTags($tags = [])
      * @param string[] $tags
      * @param string $comparisonMode
      * @return array
-     * @since 2.0.0
      */
     protected function _getQueryMatchingTags(array $tags, $comparisonMode)
     {
@@ -194,7 +181,6 @@ protected function _getQueryMatchingTags(array $tags, $comparisonMode)
      *
      * @return int integer between 0 and 100
      * TODO: implement basing on info from MongoDB server
-     * @since 2.0.0
      */
     public function getFillingPercentage()
     {
@@ -211,7 +197,6 @@ public function getFillingPercentage()
      *
      * @param string $cacheId cache id
      * @return array|false array of metadatas (false if the cache id is not found)
-     * @since 2.0.0
      */
     public function getMetadatas($cacheId)
     {
@@ -228,7 +213,6 @@ public function getMetadatas($cacheId)
      * @param string $cacheId cache id
      * @param int $extraLifetime
      * @return boolean true if ok
-     * @since 2.0.0
      */
     public function touch($cacheId, $extraLifetime)
     {
@@ -251,7 +235,6 @@ public function touch($cacheId, $extraLifetime)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
      *
      * @return array associative of with capabilities
-     * @since 2.0.0
      */
     public function getCapabilities()
     {
@@ -273,7 +256,6 @@ public function getCapabilities()
      * @param  string  $cacheId                     Cache id
      * @param  boolean $notTestCacheValidity If set to true, the cache validity won't be tested
      * @return string|bool cached data. Return false if nothing found
-     * @since 2.0.0
      */
     public function load($cacheId, $notTestCacheValidity = false)
     {
@@ -293,7 +275,6 @@ public function load($cacheId, $notTestCacheValidity = false)
      *
      * @param  string $cacheId cache id
      * @return int|bool "last modified" timestamp of the available cache record or false if cache is not available
-     * @since 2.0.0
      */
     public function test($cacheId)
     {
@@ -321,7 +302,6 @@ public function test($cacheId)
      * @param  string[] $tags             Array of strings, the cache record will be tagged by each string entry
      * @param  int|bool $specificLifetime If != false, set a specific lifetime (null => infinite lifetime)
      * @return boolean true if no problem
-     * @since 2.0.0
      */
     public function save($data, $cacheId, $tags = [], $specificLifetime = false)
     {
@@ -344,7 +324,6 @@ public function save($data, $cacheId, $tags = [], $specificLifetime = false)
      *
      * @param  string $cacheId Cache id
      * @return boolean True if no problem
-     * @since 2.0.0
      */
     public function remove($cacheId)
     {
@@ -367,7 +346,6 @@ public function remove($cacheId)
      * @param  string $mode Clean mode
      * @param  string[] $tags Array of tags
      * @return bool true if no problem
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
@@ -400,7 +378,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _quoteString($value)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Config.php b/lib/internal/Magento/Framework/Cache/Config.php
index 0a807fedf91d8..57020f8990c1d 100644
--- a/lib/internal/Magento/Framework/Cache/Config.php
+++ b/lib/internal/Magento/Framework/Cache/Config.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Cache\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\Cache\Config\Data
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
     /**
      * @param \Magento\Framework\Cache\Config\Data $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Cache\Config\Data $dataStorage)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Cache\Config\Data $dataStorage)
      * {inheritdoc}
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypes()
     {
@@ -45,7 +41,6 @@ public function getTypes()
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getType($type)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Config/Converter.php b/lib/internal/Magento/Framework/Cache/Config/Converter.php
index 50270951a667b..5831cc12a4715 100644
--- a/lib/internal/Magento/Framework/Cache/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Cache/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Cache\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Config/Data.php b/lib/internal/Magento/Framework/Cache/Config/Data.php
index 62965b474d8bf..0fc6f98c2320b 100644
--- a/lib/internal/Magento/Framework/Cache/Config/Data.php
+++ b/lib/internal/Magento/Framework/Cache/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides cached configuration data based on current config scope
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data\Scoped
 {
@@ -17,7 +16,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * Scope priority loading scheme
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_scopePriorityScheme = ['global'];
 
@@ -29,7 +27,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Cache\Config\Reader $reader,
diff --git a/lib/internal/Magento/Framework/Cache/Config/Reader.php b/lib/internal/Magento/Framework/Cache/Config/Reader.php
index cfb1b75a14ba1..8b5c8349cef55 100644
--- a/lib/internal/Magento/Framework/Cache/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Cache/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Cache\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/type' => 'name'];
 
@@ -29,7 +27,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
index abd417501e9b0..96a41b7941c2b 100644
--- a/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\Cache\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Cache/ConfigInterface.php b/lib/internal/Magento/Framework/Cache/ConfigInterface.php
index 80dad9f1d7a5c..4f35ab3bf4298 100644
--- a/lib/internal/Magento/Framework/Cache/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Cache/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Cache\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -18,7 +17,6 @@ interface ConfigInterface
      * Get configuration of all cache types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypes();
 
@@ -27,7 +25,6 @@ public function getTypes();
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getType($type);
 }
diff --git a/lib/internal/Magento/Framework/Cache/Core.php b/lib/internal/Magento/Framework/Cache/Core.php
index 8b36be044d70a..580db05b1615a 100644
--- a/lib/internal/Magento/Framework/Cache/Core.php
+++ b/lib/internal/Magento/Framework/Cache/Core.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Cache\Core
  *
- * @since 2.0.0
  */
 class Core extends \Zend_Cache_Core
 {
@@ -20,7 +19,6 @@ class Core extends \Zend_Cache_Core
      * -- 'class' - concrete decorator, descendant of \Magento\Framework\Cache\Backend\Decorator\AbstractDecorator
      * -- 'options' - optional array of specific decorator options
      * @var array
-     * @since 2.0.0
      */
     protected $_specificOptions = ['backend_decorators' => [], 'disable_save' => false];
 
@@ -31,7 +29,6 @@ class Core extends \Zend_Cache_Core
      *
      * @param  string $cacheId Cache id
      * @return string Cache id (with or without prefix)
-     * @since 2.0.0
      */
     protected function _id($cacheId)
     {
@@ -50,7 +47,6 @@ protected function _id($cacheId)
      *
      * @param string[] $tags
      * @return string[]
-     * @since 2.0.0
      */
     protected function _tags($tags)
     {
@@ -72,7 +68,6 @@ protected function _tags($tags)
      * @param  int $priority                integer between 0 (very low priority) and 10 (maximum priority) used by
      *                                      some particular backends
      * @return bool                         True if no problem
-     * @since 2.0.0
      */
     public function save($data, $cacheId = null, $tags = [], $specificLifetime = false, $priority = 8)
     {
@@ -100,7 +95,6 @@ public function save($data, $cacheId = null, $tags = [], $specificLifetime = fal
      * @param string[] $tags
      * @throws \Zend_Cache_Exception
      * @return bool True if ok
-     * @since 2.0.0
      */
     public function clean($mode = 'all', $tags = [])
     {
@@ -115,7 +109,6 @@ public function clean($mode = 'all', $tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsMatchingTags($tags = [])
     {
@@ -130,7 +123,6 @@ public function getIdsMatchingTags($tags = [])
      *
      * @param string[] $tags array of tags
      * @return string[] array of not matching cache ids (string)
-     * @since 2.0.0
      */
     public function getIdsNotMatchingTags($tags = [])
     {
@@ -143,7 +135,6 @@ public function getIdsNotMatchingTags($tags = [])
      *
      * @param  \Zend_Cache_Backend $backendObject
      * @return void
-     * @since 2.0.0
      */
     public function setBackend(\Zend_Cache_Backend $backendObject)
     {
@@ -156,7 +147,6 @@ public function setBackend(\Zend_Cache_Backend $backendObject)
      *
      * @param \Zend_Cache_Backend $backendObject
      * @return \Zend_Cache_Backend
-     * @since 2.0.0
      */
     protected function _decorateBackend(\Zend_Cache_Backend $backendObject)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php b/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
index f64e732dee0c2..c8917a099689b 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
@@ -7,19 +7,16 @@
 
 /**
  * Adapter for Magento -> Zend cache frontend interfaces
- * @since 2.0.0
  */
 class Zend implements \Magento\Framework\Cache\FrontendInterface
 {
     /**
      * @var \Zend_Cache_Core
-     * @since 2.0.0
      */
     protected $_frontend;
 
     /**
      * @param \Zend_Cache_Core $frontend
-     * @since 2.0.0
      */
     public function __construct(\Zend_Cache_Core $frontend)
     {
@@ -28,7 +25,6 @@ public function __construct(\Zend_Cache_Core $frontend)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function test($identifier)
     {
@@ -37,7 +33,6 @@ public function test($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -46,7 +41,6 @@ public function load($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
@@ -55,7 +49,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -66,7 +59,6 @@ public function remove($identifier)
      * {@inheritdoc}
      *
      * @throws \InvalidArgumentException Exception is thrown when non-supported cleaning mode is specified
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
@@ -89,7 +81,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBackend()
     {
@@ -98,7 +89,6 @@ public function getBackend()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLowLevelFrontend()
     {
@@ -110,7 +100,6 @@ public function getLowLevelFrontend()
      *
      * @param string $identifier
      * @return string
-     * @since 2.0.0
      */
     protected function _unifyId($identifier)
     {
@@ -122,7 +111,6 @@ protected function _unifyId($identifier)
      *
      * @param array $ids
      * @return array
-     * @since 2.0.0
      */
     protected function _unifyIds(array $ids)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Bare.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Bare.php
index 1eadebaafe531..0efe9405e46a5 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Bare.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Bare.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Cache\Frontend\Decorator\Bare
  *
- * @since 2.0.0
  */
 class Bare implements \Magento\Framework\Cache\FrontendInterface
 {
@@ -21,13 +20,11 @@ class Bare implements \Magento\Framework\Cache\FrontendInterface
      * Cache frontend instance to delegate actual cache operations to
      *
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     private $_frontend;
 
     /**
      * @param \Magento\Framework\Cache\FrontendInterface $frontend
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend
      *
      * @param \Magento\Framework\Cache\FrontendInterface $frontend
      * @return $this
-     * @since 2.0.0
      */
     protected function setFrontend(\Magento\Framework\Cache\FrontendInterface $frontend)
     {
@@ -51,7 +47,6 @@ protected function setFrontend(\Magento\Framework\Cache\FrontendInterface $front
      * Retrieve cache frontend instance being decorated
      *
      * @return \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected function _getFrontend()
     {
@@ -60,7 +55,6 @@ protected function _getFrontend()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function test($identifier)
     {
@@ -69,7 +63,6 @@ public function test($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -80,7 +73,6 @@ public function load($identifier)
      * Enforce marking with a tag
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
@@ -89,7 +81,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -98,7 +89,6 @@ public function remove($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
@@ -107,7 +97,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBackend()
     {
@@ -116,7 +105,6 @@ public function getBackend()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLowLevelFrontend()
     {
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
index a5b1e60104678..d57946a07f1f4 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Logger.php
@@ -11,20 +11,17 @@
 
 /**
  * Cache frontend decorator that logs cache invalidation actions
- * @since 2.0.0
  */
 class Logger extends Bare
 {
     /**
      * @var LoggerHandler
-     * @since 2.0.0
      */
     private $logger;
 
     /**
      * @param FrontendInterface $frontend
      * @param LoggerHandler $logger
-     * @since 2.0.0
      */
     public function __construct(FrontendInterface $frontend, LoggerHandler $logger)
     {
@@ -34,7 +31,6 @@ public function __construct(FrontendInterface $frontend, LoggerHandler $logger)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -45,7 +41,6 @@ public function remove($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
@@ -57,7 +52,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     /**
      * @param mixed $args
      * @return void
-     * @since 2.0.0
      */
     public function log($args)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Profiler.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Profiler.php
index 2e525908a0c0c..2bb1bc0d2dc20 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Profiler.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/Profiler.php
@@ -8,7 +8,6 @@
 
 /**
  * Cache frontend decorator that performs profiling of cache operations
- * @since 2.0.0
  */
 class Profiler extends \Magento\Framework\Cache\Frontend\Decorator\Bare
 {
@@ -16,14 +15,12 @@ class Profiler extends \Magento\Framework\Cache\Frontend\Decorator\Bare
      * Backend class prefixes to be striped from profiler tags
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $_backendPrefixes = [];
 
     /**
      * @param \Magento\Framework\Cache\FrontendInterface $frontend
      * @param string[] $backendPrefixes Backend class prefixes to be striped for profiling informativeness
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend, $backendPrefixes = [])
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend
      *
      * @param string $operation
      * @return array
-     * @since 2.0.0
      */
     protected function _getProfilerTags($operation)
     {
@@ -52,7 +48,6 @@ protected function _getProfilerTags($operation)
      * Get short cache backend type name by striping known backend class prefixes
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getBackendType()
     {
@@ -68,7 +63,6 @@ protected function _getBackendType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function test($identifier)
     {
@@ -80,7 +74,6 @@ public function test($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($identifier)
     {
@@ -94,7 +87,6 @@ public function load($identifier)
      * Enforce marking with a tag
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
@@ -106,7 +98,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -118,7 +109,6 @@ public function remove($identifier)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
index cc5a673d8582c..c837544a75f0f 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
@@ -10,7 +10,6 @@
  * Cache frontend decorator that limits the cleaning scope within a tag
  *
  * @api
- * @since 2.0.0
  */
 class TagScope extends \Magento\Framework\Cache\Frontend\Decorator\Bare
 {
@@ -18,14 +17,12 @@ class TagScope extends \Magento\Framework\Cache\Frontend\Decorator\Bare
      * Tag to associate cache entries with
      *
      * @var string
-     * @since 2.0.0
      */
     private $_tag;
 
     /**
      * @param \Magento\Framework\Cache\FrontendInterface $frontend
      * @param string $tag Cache tag name
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend, $tag)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\Cache\FrontendInterface $frontend
      * Retrieve cache tag name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTag()
     {
@@ -48,7 +44,6 @@ public function getTag()
      * Enforce marking with a tag
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
@@ -60,7 +55,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
      * Limit the cleaning scope within a tag
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
diff --git a/lib/internal/Magento/Framework/Cache/FrontendInterface.php b/lib/internal/Magento/Framework/Cache/FrontendInterface.php
index 2bca358413413..d81d7fbe1c7cc 100644
--- a/lib/internal/Magento/Framework/Cache/FrontendInterface.php
+++ b/lib/internal/Magento/Framework/Cache/FrontendInterface.php
@@ -9,7 +9,6 @@
  * Interface of a cache frontend - an ultimate publicly available interface to an actual cache storage
  *
  * @api
- * @since 2.0.0
  */
 interface FrontendInterface
 {
@@ -18,7 +17,6 @@ interface FrontendInterface
      *
      * @param string $identifier Cache id
      * @return int|bool Last modified time of cache entry if it is available, false otherwise
-     * @since 2.0.0
      */
     public function test($identifier);
 
@@ -28,7 +26,6 @@ public function test($identifier);
      * @param string $identifier
      * @return string|bool
      * @api
-     * @since 2.0.0
      */
     public function load($identifier);
 
@@ -41,7 +38,6 @@ public function load($identifier);
      * @param int|bool|null $lifeTime
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null);
 
@@ -51,7 +47,6 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null);
      * @param string $identifier
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function remove($identifier);
 
@@ -62,7 +57,6 @@ public function remove($identifier);
      * @param array $tags
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = []);
 
@@ -70,7 +64,6 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = []);
      * Retrieve backend instance
      *
      * @return \Zend_Cache_Backend_Interface
-     * @since 2.0.0
      */
     public function getBackend();
 
@@ -78,7 +71,6 @@ public function getBackend();
      * Retrieve frontend instance compatible with Zend Locale Data setCache() to be used as a workaround
      *
      * @return \Zend_Cache_Core
-     * @since 2.0.0
      */
     public function getLowLevelFrontend();
 }
diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
index 9f9e32586328b..0ac1ab9d38c2f 100644
--- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
+++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Framework\Cache\InvalidateLogger
  *
- * @since 2.0.0
  */
 class InvalidateLogger
 {
     /**
      * @var HttpRequest
-     * @since 2.0.0
      */
     private $request;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     private $logger;
 
     /**
      * @param HttpRequest $request
      * @param Logger $logger
-     * @since 2.0.0
      */
     public function __construct(HttpRequest $request, Logger $logger)
     {
@@ -44,7 +40,6 @@ public function __construct(HttpRequest $request, Logger $logger)
      * Logger invalidate cache
      * @param mixed $invalidateInfo
      * @return void
-     * @since 2.0.0
      */
     public function execute($invalidateInfo)
     {
@@ -55,7 +50,6 @@ public function execute($invalidateInfo)
      * Make extra data to logger message
      * @param mixed $invalidateInfo
      * @return array
-     * @since 2.0.0
      */
     private function makeParams($invalidateInfo)
     {
@@ -70,7 +64,6 @@ private function makeParams($invalidateInfo)
      * @param string $message
      * @param mixed $params
      * @return void
-     * @since 2.0.0
      */
     public function critical($message, $params)
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index d4fb2f080c120..fbf08a20fa86e 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Code\Generator
  *
- * @since 2.0.0
  */
 class Generator
 {
@@ -23,25 +22,21 @@ class Generator
 
     /**
      * @var \Magento\Framework\Code\Generator\Io
-     * @since 2.0.0
      */
     protected $_ioObject;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_generatedEntities;
 
     /**
      * @var DefinedClasses
-     * @since 2.0.0
      */
     protected $definedClasses;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -49,7 +44,6 @@ class Generator
      * @param Generator\Io   $ioObject
      * @param array          $generatedEntities
      * @param DefinedClasses $definedClasses
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Code\Generator\Io $ioObject = null,
@@ -68,7 +62,6 @@ public function __construct(
      * Get generated entities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getGeneratedEntities()
     {
@@ -95,7 +88,6 @@ public function setGeneratedEntities($generatedEntities)
      * @return string | void
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function generateClass($className)
     {
@@ -141,7 +133,6 @@ public function generateClass($className)
      * @param string $entityName
      * @param string $className
      * @return \Magento\Framework\Code\Generator\EntityAbstract
-     * @since 2.0.0
      */
     protected function createGeneratorInstance($generatorClass, $entityName, $className)
     {
@@ -156,7 +147,6 @@ protected function createGeneratorInstance($generatorClass, $entityName, $classN
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @return $this
-     * @since 2.0.0
      */
     public function setObjectManager(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -168,7 +158,6 @@ public function setObjectManager(\Magento\Framework\ObjectManagerInterface $obje
      * Get object manager instance.
      *
      * @return \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     public function getObjectManager()
     {
@@ -188,7 +177,6 @@ public function getObjectManager()
      * @param \Magento\Framework\Code\Generator\EntityAbstract $generator
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function tryToLoadSourceClass($className, $generator)
     {
@@ -211,7 +199,6 @@ protected function tryToLoadSourceClass($className, $generator)
      * @param string $sourceClassName
      * @param string $resultClass
      * @return string|bool
-     * @since 2.0.0
      */
     protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $resultClass)
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
index 9327b22880cb9..ef46830ac93b5 100644
--- a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
+++ b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Code\Generator\Autoloader
  *
- * @since 2.0.0
  */
 class Autoloader
 {
     /**
      * @var \Magento\Framework\Code\Generator
-     * @since 2.0.0
      */
     protected $_generator;
 
     /**
      * @param \Magento\Framework\Code\Generator $generator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Code\Generator $generator
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param string $className
      * @return bool True if class was loaded
-     * @since 2.0.0
      */
     public function load($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
index 688fad3082eee..fff066d819130 100644
--- a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
+++ b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Code\Generator\ClassGenerator
  *
- * @since 2.0.0
  */
 class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
     \Magento\Framework\Code\Generator\CodeGeneratorInterface
@@ -20,7 +19,6 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
      * Possible doc block options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_docBlockOptions = [
         'shortDescription' => 'setShortDescription',
@@ -32,7 +30,6 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
      * Possible class property options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_propertyOptions = [
         'name' => 'setName',
@@ -46,7 +43,6 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
      * Possible class method options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_methodOptions = [
         'name' => 'setName',
@@ -61,7 +57,6 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
      * Possible method parameter options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_parameterOptions = [
         'name' => 'setName',
@@ -75,7 +70,6 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
      * @param array $data
      * @param array $map
      * @return void
-     * @since 2.0.0
      */
     protected function _setDataToObject($object, array $data, array $map)
     {
@@ -91,7 +85,6 @@ protected function _setDataToObject($object, array $data, array $map)
      *
      * @param array $docBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setClassDocBlock(array $docBlock)
     {
@@ -107,7 +100,6 @@ public function setClassDocBlock(array $docBlock)
      *
      * @param array $methods
      * @return $this
-     * @since 2.0.0
      */
     public function addMethods(array $methods)
     {
@@ -156,7 +148,6 @@ public function addMethods(array $methods)
      * @param  MethodGenerator $method
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addMethodFromGenerator(MethodGenerator $method)
     {
@@ -173,7 +164,6 @@ public function addMethodFromGenerator(MethodGenerator $method)
      * @param array $properties
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addProperties(array $properties)
     {
@@ -203,7 +193,6 @@ public function addProperties(array $properties)
      * @param  PropertyGenerator $property
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addPropertyFromGenerator(PropertyGenerator $property)
     {
@@ -218,7 +207,6 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
      * Instantiate method generator object.
      *
      * @return MethodGenerator
-     * @since 2.0.0
      */
     protected function createMethodGenerator()
     {
@@ -227,7 +215,6 @@ protected function createMethodGenerator()
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getNamespaceName()
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/CodeGeneratorInterface.php b/lib/internal/Magento/Framework/Code/Generator/CodeGeneratorInterface.php
index 3d13b62dbfca6..81ada6a1ee369 100644
--- a/lib/internal/Magento/Framework/Code/Generator/CodeGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/Code/Generator/CodeGeneratorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Code\Generator\CodeGeneratorInterface
  *
- * @since 2.0.0
  */
 interface CodeGeneratorInterface extends \Zend\Code\Generator\GeneratorInterface
 {
@@ -17,7 +16,6 @@ interface CodeGeneratorInterface extends \Zend\Code\Generator\GeneratorInterface
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -26,7 +24,6 @@ public function setName($name);
      *
      * @param array $docBlock
      * @return $this
-     * @since 2.0.0
      */
     public function setClassDocBlock(array $docBlock);
 
@@ -35,7 +32,6 @@ public function setClassDocBlock(array $docBlock);
      *
      * @param array $properties
      * @return $this
-     * @since 2.0.0
      */
     public function addProperties(array $properties);
 
@@ -44,7 +40,6 @@ public function addProperties(array $properties);
      *
      * @param array $methods
      * @return $this
-     * @since 2.0.0
      */
     public function addMethods(array $methods);
 
@@ -53,7 +48,6 @@ public function addMethods(array $methods);
      *
      * @param string $extendedClass
      * @return $this
-     * @since 2.0.0
      */
     public function setExtendedClass($extendedClass);
 
@@ -62,7 +56,6 @@ public function setExtendedClass($extendedClass);
      *
      * @param array $interfaces
      * @return $this
-     * @since 2.0.0
      */
     public function setImplementedInterfaces(array $interfaces);
 
@@ -71,7 +64,6 @@ public function setImplementedInterfaces(array $interfaces);
      *
      * @param string $trait
      * @return $this
-     * @since 2.0.0
      */
     public function addTrait($trait);
 }
diff --git a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
index e0fba4b01d95c..91d6e001a4edd 100644
--- a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
+++ b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
@@ -10,7 +10,6 @@
 
 /**
  * DefinedClasses class detects if a class has been defined
- * @since 2.0.0
  */
 class DefinedClasses
 {
@@ -19,7 +18,6 @@ class DefinedClasses
      *
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public function isClassLoadable($className)
     {
@@ -31,7 +29,6 @@ public function isClassLoadable($className)
      *
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public function isClassLoadableFromMemory($className)
     {
@@ -43,7 +40,6 @@ public function isClassLoadableFromMemory($className)
      *
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public function isClassLoadableFromDisc($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index dd302f41a639d..0b324bc03879d 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Code\Generator\EntityAbstract
  *
- * @since 2.0.0
  */
 abstract class EntityAbstract
 {
@@ -19,7 +18,6 @@ abstract class EntityAbstract
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $_errors = [];
 
@@ -27,7 +25,6 @@ abstract class EntityAbstract
      * Source model class name
      *
      * @var string
-     * @since 2.0.0
      */
     private $_sourceClassName;
 
@@ -35,13 +32,11 @@ abstract class EntityAbstract
      * Result model class name
      *
      * @var string
-     * @since 2.0.0
      */
     private $_resultClassName;
 
     /**
      * @var Io
-     * @since 2.0.0
      */
     private $_ioObject;
 
@@ -49,13 +44,11 @@ abstract class EntityAbstract
      * Class generator object
      *
      * @var \Magento\Framework\Code\Generator\CodeGeneratorInterface
-     * @since 2.0.0
      */
     protected $_classGenerator;
 
     /**
      * @var DefinedClasses
-     * @since 2.0.0
      */
     private $definedClasses;
 
@@ -65,7 +58,6 @@ abstract class EntityAbstract
      * @param Io $ioObject
      * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
      * @param DefinedClasses $definedClasses
-     * @since 2.0.0
      */
     public function __construct(
         $sourceClassName = null,
@@ -102,7 +94,6 @@ public function __construct(
      * Generation template method
      *
      * @return bool
-     * @since 2.0.0
      */
     public function generate()
     {
@@ -127,7 +118,6 @@ public function generate()
      * List of occurred generation errors
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -138,7 +128,6 @@ public function getErrors()
      * Get full source class name, with namespace
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSourceClassName()
     {
@@ -149,7 +138,6 @@ public function getSourceClassName()
      * Get source class without namespace.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSourceClassNameWithoutNamespace()
     {
@@ -162,7 +150,6 @@ public function getSourceClassNameWithoutNamespace()
      *
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     protected function _getFullyQualifiedClassName($className)
     {
@@ -174,7 +161,6 @@ protected function _getFullyQualifiedClassName($className)
      * Get result class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getResultClassName()
     {
@@ -186,7 +172,6 @@ protected function _getResultClassName()
      *
      * @param string $modelClassName
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultResultClassName($modelClassName)
     {
@@ -197,7 +182,6 @@ protected function _getDefaultResultClassName($modelClassName)
      * Returns list of properties for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -218,7 +202,6 @@ protected function _getClassProperties()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _getDefaultConstructorDefinition();
 
@@ -226,7 +209,6 @@ abstract protected function _getDefaultConstructorDefinition();
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _getClassMethods();
 
@@ -234,7 +216,6 @@ abstract protected function _getClassMethods();
      * Generate code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -251,7 +232,6 @@ protected function _generateCode()
      *
      * @param string $message
      * @return $this
-     * @since 2.0.0
      */
     protected function _addError($message)
     {
@@ -261,7 +241,6 @@ protected function _addError($message)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateData()
     {
@@ -287,7 +266,6 @@ protected function _validateData()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassDocBlock()
     {
@@ -297,7 +275,6 @@ protected function _getClassDocBlock()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _getGeneratedCode()
     {
@@ -308,7 +285,6 @@ protected function _getGeneratedCode()
     /**
      * @param string $sourceCode
      * @return string
-     * @since 2.0.0
      */
     protected function _fixCodeStyle($sourceCode)
     {
@@ -322,7 +298,6 @@ protected function _fixCodeStyle($sourceCode)
      * Get value generator for null default value
      *
      * @return \Zend\Code\Generator\ValueGenerator
-     * @since 2.0.0
      */
     protected function _getNullDefaultValue()
     {
@@ -336,7 +311,6 @@ protected function _getNullDefaultValue()
      *
      * @param \ReflectionParameter $parameter
      * @return array
-     * @since 2.0.0
      */
     protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
     {
@@ -374,7 +348,6 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
      * @param string $sourceClassName
      * @param string $resultClassName
      * @return void
-     * @since 2.0.0
      */
     public function init($sourceClassName, $resultClassName)
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/InterfaceGenerator.php b/lib/internal/Magento/Framework/Code/Generator/InterfaceGenerator.php
index 6a08189de67eb..ad7da45036040 100644
--- a/lib/internal/Magento/Framework/Code/Generator/InterfaceGenerator.php
+++ b/lib/internal/Magento/Framework/Code/Generator/InterfaceGenerator.php
@@ -7,13 +7,11 @@
 
 /**
  * Interface generator.
- * @since 2.0.0
  */
 class InterfaceGenerator extends \Magento\Framework\Code\Generator\ClassGenerator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generate()
     {
@@ -48,7 +46,6 @@ public function generate()
      * Instantiate interface method generator object.
      *
      * @return \Magento\Framework\Code\Generator\InterfaceMethodGenerator
-     * @since 2.0.0
      */
     protected function createMethodGenerator()
     {
@@ -59,7 +56,6 @@ protected function createMethodGenerator()
      * Generate methods.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function generateMethods()
     {
@@ -77,7 +73,6 @@ protected function generateMethods()
      * Generate directives.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function generateDirectives()
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/InterfaceMethodGenerator.php b/lib/internal/Magento/Framework/Code/Generator/InterfaceMethodGenerator.php
index 8ed64e98f01d4..d73c94eb89e00 100644
--- a/lib/internal/Magento/Framework/Code/Generator/InterfaceMethodGenerator.php
+++ b/lib/internal/Magento/Framework/Code/Generator/InterfaceMethodGenerator.php
@@ -7,13 +7,11 @@
 
 /**
  * Interface method generator.
- * @since 2.0.0
  */
 class InterfaceMethodGenerator extends \Zend\Code\Generator\MethodGenerator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generate()
     {
@@ -54,7 +52,6 @@ public function generate()
      *
      * @throws \LogicException
      * @return void
-     * @since 2.0.0
      */
     protected function validateMethodModifiers()
     {
diff --git a/lib/internal/Magento/Framework/Code/Generator/Io.php b/lib/internal/Magento/Framework/Code/Generator/Io.php
index 7a25815c6cf27..02d8f68574737 100644
--- a/lib/internal/Magento/Framework/Code/Generator/Io.php
+++ b/lib/internal/Magento/Framework/Code/Generator/Io.php
@@ -9,7 +9,6 @@
 
 /**
  * Manages generated code.
- * @since 2.0.0
  */
 class Io
 {
@@ -23,20 +22,17 @@ class Io
      * Path to directory where new file must be created
      *
      * @var string
-     * @since 2.0.0
      */
     private $_generationDirectory;
 
     /**
      * @var \Magento\Framework\Filesystem\Driver\File
-     * @since 2.0.0
      */
     private $filesystemDriver;
 
     /**
      * @param \Magento\Framework\Filesystem\Driver\File $filesystemDriver
      * @param null|string $generationDirectory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem\Driver\File $filesystemDriver,
@@ -51,7 +47,6 @@ public function __construct(
      *
      * @param null|string $directory
      * @return string
-     * @since 2.0.0
      */
     protected function initGeneratorDirectory($directory = null)
     {
@@ -65,7 +60,6 @@ protected function initGeneratorDirectory($directory = null)
     /**
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     public function getResultFileDirectory($className)
     {
@@ -79,7 +73,6 @@ public function getResultFileDirectory($className)
     /**
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     public function generateResultFileName($className)
     {
@@ -91,7 +84,6 @@ public function generateResultFileName($className)
      * @param string $content
      * @throws FileSystemException
      * @return bool
-     * @since 2.0.0
      */
     public function writeResultFile($fileName, $content)
     {
@@ -124,7 +116,6 @@ public function writeResultFile($fileName, $content)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function makeGenerationDirectory()
     {
@@ -134,7 +125,6 @@ public function makeGenerationDirectory()
     /**
      * @param string $className
      * @return bool
-     * @since 2.0.0
      */
     public function makeResultFileDirectory($className)
     {
@@ -143,7 +133,6 @@ public function makeResultFileDirectory($className)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getGenerationDirectory()
     {
@@ -153,7 +142,6 @@ public function getGenerationDirectory()
     /**
      * @param string $fileName
      * @return bool
-     * @since 2.0.0
      */
     public function fileExists($fileName)
     {
@@ -166,7 +154,6 @@ public function fileExists($fileName)
      * @param string $fileName
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function includeFile($fileName)
     {
@@ -176,7 +163,6 @@ public function includeFile($fileName)
     /**
      * @param string $directory
      * @return bool
-     * @since 2.0.0
      */
     private function _makeDirectory($directory)
     {
diff --git a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
index fac4116942336..2f121e4ecb7ea 100644
--- a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
+++ b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
@@ -10,7 +10,6 @@
 
 /**
  * Adapter for CSSmin library
- * @since 2.0.0
  */
 class CSSmin implements AdapterInterface
 {
@@ -21,14 +20,12 @@ class CSSmin implements AdapterInterface
 
     /**
      * @var CssMinLibrary
-     * @since 2.0.0
      */
     protected $cssMinifier;
 
     /**
      * @param CssMinLibrary $cssMinifier
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(CssMinLibrary $cssMinifier)
     {
@@ -54,7 +51,6 @@ private function getCssMin()
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     public function minify($content)
     {
diff --git a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Js/JShrink.php b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Js/JShrink.php
index e7d7153397485..456fcd7d35a7e 100644
--- a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Js/JShrink.php
+++ b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Js/JShrink.php
@@ -11,7 +11,6 @@
 
 /**
  * Adapter for JShrink library
- * @since 2.0.0
  */
 class JShrink implements AdapterInterface
 {
@@ -22,7 +21,6 @@ class JShrink implements AdapterInterface
      * @param string $content The raw javascript to be minified
      * @throws \Exception
      * @return bool|string
-     * @since 2.0.0
      */
     public function minify($content)
     {
diff --git a/lib/internal/Magento/Framework/Code/Minifier/AdapterInterface.php b/lib/internal/Magento/Framework/Code/Minifier/AdapterInterface.php
index a884a8d3c2881..a9ad4a95a9d72 100644
--- a/lib/internal/Magento/Framework/Code/Minifier/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Code/Minifier/AdapterInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Framework\Code\Minifier\AdapterInterface
  *
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -21,7 +20,6 @@ interface AdapterInterface
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     public function minify($content);
 }
diff --git a/lib/internal/Magento/Framework/Code/NameBuilder.php b/lib/internal/Magento/Framework/Code/NameBuilder.php
index 1d68cd9738913..6a0709032b18c 100644
--- a/lib/internal/Magento/Framework/Code/NameBuilder.php
+++ b/lib/internal/Magento/Framework/Code/NameBuilder.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Code\NameBuilder
  *
- * @since 2.0.0
  */
 class NameBuilder
 {
@@ -22,7 +21,6 @@ class NameBuilder
      *
      * @param string[] $parts
      * @return string
-     * @since 2.0.0
      */
     public function buildClassName($parts)
     {
diff --git a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
index a1da049e592ce..c439c580bc31c 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Code\Reader\ArgumentsReader
  *
- * @since 2.0.0
  */
 class ArgumentsReader
 {
@@ -48,7 +47,6 @@ public function __construct(
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getConstructorArguments(\ReflectionClass $class, $groupByPosition = false, $inherited = false)
     {
@@ -134,7 +132,6 @@ private function processType(\ReflectionClass $class, \Zend\Code\Reflection\Para
      * @param \ReflectionClass $class
      * @param array $classArguments
      * @return array|null
-     * @since 2.0.0
      */
     public function getParentCall(\ReflectionClass $class, array $classArguments)
     {
@@ -194,7 +191,6 @@ public function getParentCall(\ReflectionClass $class, array $classArguments)
      * @param string $requiredType
      * @param string $actualType
      * @return bool
-     * @since 2.0.0
      */
     public function isCompatibleType($requiredType, $actualType)
     {
@@ -228,7 +224,6 @@ public function isCompatibleType($requiredType, $actualType)
      *
      * @param mixed $var
      * @return mixed|string
-     * @since 2.0.0
      */
     protected function _varExportMin($var)
     {
@@ -249,7 +244,6 @@ protected function _varExportMin($var)
      *
      * @param \ReflectionClass $class
      * @return array
-     * @since 2.0.0
      */
     public function getAnnotations(\ReflectionClass $class)
     {
diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
index df039fe9951ab..18f4592be4c27 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Code\Reader\ClassReader
  *
- * @since 2.0.0
  */
 class ClassReader implements ClassReaderInterface
 {
@@ -18,7 +17,6 @@ class ClassReader implements ClassReaderInterface
      * @param string $className
      * @return array|null
      * @throws \ReflectionException
-     * @since 2.0.0
      */
     public function getConstructor($className)
     {
@@ -59,7 +57,6 @@ public function getConstructor($className)
      *
      * @param string $className
      * @return string[]
-     * @since 2.0.0
      */
     public function getParents($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReaderInterface.php b/lib/internal/Magento/Framework/Code/Reader/ClassReaderInterface.php
index 91c8da523c00e..b7a26ba114fe4 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReaderInterface.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReaderInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Code\Reader\ClassReaderInterface
  *
- * @since 2.0.0
  */
 interface ClassReaderInterface
 {
@@ -20,7 +19,6 @@ interface ClassReaderInterface
      * @param string $className
      * @return array|null
      * @throws \ReflectionException
-     * @since 2.0.0
      */
     public function getConstructor($className);
 
@@ -35,7 +33,6 @@ public function getConstructor($className);
      *
      * @param string $className
      * @return string[]
-     * @since 2.0.0
      */
     public function getParents($className);
 }
diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
index dae5055a5ce0e..13aecd7784b6e 100644
--- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Code\Reader\SourceArgumentsReader
  *
- * @since 2.0.0
  */
 class SourceArgumentsReader
 {
@@ -43,7 +42,6 @@ public function __construct(NamespaceResolver $namespaceResolver = null)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false)
     {
@@ -107,7 +105,6 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
      * @return string
      * @deprecated 2.2.0
      * @see \Magento\Framework\Code\Reader\NamespaceResolver::resolveNamespace
-     * @since 2.0.0
      */
     protected function resolveNamespaces($argument, $availableNamespaces)
     {
@@ -120,7 +117,6 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * @param string $argument
      * @param string $token
      * @return string
-     * @since 2.0.0
      */
     protected function removeToken($argument, $token)
     {
@@ -138,7 +134,6 @@ protected function removeToken($argument, $token)
      * @return array
      * @deprecated 2.2.0
      * @see \Magento\Framework\Code\Reader\NamespaceResolver::getImportedNamespaces
-     * @since 2.0.0
      */
     protected function getImportedNamespaces(array $file)
     {
diff --git a/lib/internal/Magento/Framework/Code/Validator.php b/lib/internal/Magento/Framework/Code/Validator.php
index 869d07d76190e..529ba6ccd46cd 100644
--- a/lib/internal/Magento/Framework/Code/Validator.php
+++ b/lib/internal/Magento/Framework/Code/Validator.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Code\Validator
  *
- * @since 2.0.0
  */
 class Validator implements ValidatorInterface
 {
     /**
      * @var ValidatorInterface[]
-     * @since 2.0.0
      */
     protected $_validators = [];
 
@@ -23,7 +21,6 @@ class Validator implements ValidatorInterface
      *
      * @param ValidatorInterface $validator
      * @return void
-     * @since 2.0.0
      */
     public function add(ValidatorInterface $validator)
     {
@@ -36,7 +33,6 @@ public function add(ValidatorInterface $validator)
      * @param string $className
      * @return bool
      * @throws \Magento\Framework\Exception\ValidatorException
-     * @since 2.0.0
      */
     public function validate($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php b/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
index fa900d1927e19..b817a793114d9 100644
--- a/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
+++ b/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Code\Validator\ArgumentSequence
  *
- * @since 2.0.0
  */
 class ArgumentSequence implements ValidatorInterface
 {
@@ -22,19 +21,16 @@ class ArgumentSequence implements ValidatorInterface
 
     /**
      * @var \Magento\Framework\Code\Reader\ArgumentsReader
-     * @since 2.0.0
      */
     protected $_argumentsReader;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @param \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argu
      * @return bool
      * @throws \Magento\Framework\Exception\ValidatorException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validate($className)
     {
@@ -111,7 +106,6 @@ public function validate($className)
      * @param array $actualSequence
      * @param array $requiredSequence
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkArgumentSequence(array $actualSequence, array $requiredSequence)
     {
@@ -146,7 +140,6 @@ protected function _checkArgumentSequence(array $actualSequence, array $required
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _buildsSequence(array $classArguments, array $parentArguments = [])
     {
@@ -204,7 +197,6 @@ protected function _buildsSequence(array $classArguments, array $parentArguments
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     protected function _sortArguments($arguments)
     {
@@ -227,7 +219,6 @@ protected function _sortArguments($arguments)
      *
      * @param array $arguments
      * @return bool
-     * @since 2.0.0
      */
     protected function _isContextOnly(array $arguments)
     {
@@ -243,7 +234,6 @@ protected function _isContextOnly(array $arguments)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     protected function _isContextType($type)
     {
diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php
index 95b8be0359f84..3ced0590611e8 100644
--- a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php
+++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\Code\Validator\ConstructorArgumentTypes
  *
- * @since 2.0.0
  */
 class ConstructorArgumentTypes implements ValidatorInterface
 {
     /**
      * @var \Magento\Framework\Code\Reader\ArgumentsReader
-     * @since 2.0.0
      */
     protected $argumentsReader;
 
     /**
      * @var \Magento\Framework\Code\Reader\SourceArgumentsReader
-     * @since 2.0.0
      */
     protected $sourceArgumentsReader;
 
     /**
      * @param \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader
      * @param \Magento\Framework\Code\Reader\SourceArgumentsReader $sourceArgumentsReader
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null,
@@ -46,7 +42,6 @@ public function __construct(
      * @param string $className
      * @return bool
      * @throws \Magento\Framework\Exception\ValidatorException
-     * @since 2.0.0
      */
     public function validate($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
index b8102f64d987a..8a21f6c9eeea9 100644
--- a/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
+++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Framework\Code\Validator\ConstructorIntegrity
  *
- * @since 2.0.0
  */
 class ConstructorIntegrity implements ValidatorInterface
 {
     /**
      * @var \Magento\Framework\Code\Reader\ArgumentsReader
-     * @since 2.0.0
      */
     protected $_argumentsReader;
 
     /**
      * @param \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argu
      * @throws \Magento\Framework\Exception\ValidatorException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function validate($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/Validator/TypeDuplication.php b/lib/internal/Magento/Framework/Code/Validator/TypeDuplication.php
index ea6db0c447be3..39feefe295685 100644
--- a/lib/internal/Magento/Framework/Code/Validator/TypeDuplication.php
+++ b/lib/internal/Magento/Framework/Code/Validator/TypeDuplication.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Code\Validator\TypeDuplication
  *
- * @since 2.0.0
  */
 class TypeDuplication implements ValidatorInterface
 {
@@ -25,7 +24,6 @@ class TypeDuplication implements ValidatorInterface
 
     /**
      * @var \Magento\Framework\Code\Reader\ArgumentsReader
-     * @since 2.0.0
      */
     protected $_argumentsReader;
 
@@ -38,7 +36,6 @@ class TypeDuplication implements ValidatorInterface
     /**
      * @param \Magento\Framework\Code\Reader\ArgumentsReader|null $argumentsReader
      * @param \Magento\Framework\Code\Reader\ScalarTypesProvider|null $scalarTypesProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null,
@@ -54,7 +51,6 @@ public function __construct(
      * @param string $className
      * @return bool
      * @throws \Magento\Framework\Exception\ValidatorException
-     * @since 2.0.0
      */
     public function validate($className)
     {
@@ -100,7 +96,6 @@ public function validate($className)
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     protected function _getObjectArguments(array $arguments)
     {
@@ -123,7 +118,6 @@ protected function _getObjectArguments(array $arguments)
      *
      * @param \ReflectionClass $class
      * @return bool
-     * @since 2.0.0
      */
     protected function _ignoreWarning(\ReflectionClass $class)
     {
diff --git a/lib/internal/Magento/Framework/Code/ValidatorInterface.php b/lib/internal/Magento/Framework/Code/ValidatorInterface.php
index 31c80654e791c..cb8a625decbf3 100644
--- a/lib/internal/Magento/Framework/Code/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Code/ValidatorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Code\ValidatorInterface
  *
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -18,7 +17,6 @@ interface ValidatorInterface
      * @param string $className
      * @return bool
      * @throws \Magento\Framework\Exception\ValidatorException
-     * @since 2.0.0
      */
     public function validate($className);
 }
diff --git a/lib/internal/Magento/Framework/Component/ComponentFile.php b/lib/internal/Magento/Framework/Component/ComponentFile.php
index aaff3601ecbc4..7bdc3fc25c402 100644
--- a/lib/internal/Magento/Framework/Component/ComponentFile.php
+++ b/lib/internal/Magento/Framework/Component/ComponentFile.php
@@ -7,7 +7,6 @@
 
 /**
  * Value-object for files found in components
- * @since 2.0.0
  */
 class ComponentFile
 {
@@ -15,7 +14,6 @@ class ComponentFile
      * Component type
      *
      * @var string
-     * @since 2.0.0
      */
     private $componentType;
 
@@ -23,7 +21,6 @@ class ComponentFile
      * Component name
      *
      * @var string
-     * @since 2.0.0
      */
     private $componentName;
 
@@ -31,7 +28,6 @@ class ComponentFile
      * Full path
      *
      * @var string
-     * @since 2.0.0
      */
     private $path;
 
@@ -41,7 +37,6 @@ class ComponentFile
      * @param string $componentType
      * @param string $componentName
      * @param string $fullPath
-     * @since 2.0.0
      */
     public function __construct($componentType, $componentName, $fullPath)
     {
@@ -54,7 +49,6 @@ public function __construct($componentType, $componentName, $fullPath)
      * Get component type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentType()
     {
@@ -65,7 +59,6 @@ public function getComponentType()
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName()
     {
@@ -76,7 +69,6 @@ public function getComponentName()
      * Get full path to the component
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullPath()
     {
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index 6ed8f3bf07dfc..9c746177d6f7d 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -11,7 +11,6 @@
  * @author Josh Di Fabio <joshdifabio@gmail.com>
  *
  * @api
- * @since 2.0.0
  */
 class ComponentRegistrar implements ComponentRegistrarInterface
 {
@@ -24,12 +23,7 @@ class ComponentRegistrar implements ComponentRegistrarInterface
     const LANGUAGE = 'language';
     /**#@- */
 
-    /**
-     * All paths
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@- */
     private static $paths = [
         self::MODULE => [],
         self::LIBRARY => [],
@@ -45,7 +39,6 @@ class ComponentRegistrar implements ComponentRegistrarInterface
      * @param string $path Absolute file path to the component
      * @throws \LogicException
      * @return void
-     * @since 2.0.0
      */
     public static function register($type, $componentName, $path)
     {
@@ -62,7 +55,6 @@ public static function register($type, $componentName, $path)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPaths($type)
     {
@@ -72,7 +64,6 @@ public function getPaths($type)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPath($type, $componentName)
     {
@@ -86,7 +77,6 @@ public function getPath($type, $componentName)
      * @param string $type
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     private static function validateType($type)
     {
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php b/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
index 87d77d37287ec..04d7676eff3c0 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @author Josh Di Fabio <joshdifabio@gmail.com>
- * @since 2.0.0
  */
 interface ComponentRegistrarInterface
 {
@@ -18,7 +17,6 @@ interface ComponentRegistrarInterface
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getPaths($type);
 
@@ -28,7 +26,6 @@ public function getPaths($type);
      * @param string $type
      * @param string $componentName
      * @return null|string
-     * @since 2.0.0
      */
     public function getPath($type, $componentName);
 }
diff --git a/lib/internal/Magento/Framework/Component/DirSearch.php b/lib/internal/Magento/Framework/Component/DirSearch.php
index 34b126ea13eb7..c656730fc2a18 100644
--- a/lib/internal/Magento/Framework/Component/DirSearch.php
+++ b/lib/internal/Magento/Framework/Component/DirSearch.php
@@ -9,7 +9,6 @@
 
 /**
  * Class for searching files across all locations of certain component type
- * @since 2.0.0
  */
 class DirSearch
 {
@@ -17,7 +16,6 @@ class DirSearch
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $registrar;
 
@@ -25,7 +23,6 @@ class DirSearch
      * Read dir factory
      *
      * @var Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     private $readFactory;
 
@@ -34,7 +31,6 @@ class DirSearch
      *
      * @param ComponentRegistrarInterface $registrar
      * @param Filesystem\Directory\ReadFactory $readFactory
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrarInterface $registrar, Filesystem\Directory\ReadFactory $readFactory)
     {
@@ -48,7 +44,6 @@ public function __construct(ComponentRegistrarInterface $registrar, Filesystem\D
      * @param string $componentType
      * @param string $pattern
      * @return array
-     * @since 2.0.0
      */
     public function collectFiles($componentType, $pattern)
     {
@@ -61,7 +56,6 @@ public function collectFiles($componentType, $pattern)
      * @param string $componentType
      * @param string $pattern
      * @return ComponentFile[]
-     * @since 2.0.0
      */
     public function collectFilesWithContext($componentType, $pattern)
     {
@@ -76,7 +70,6 @@ public function collectFilesWithContext($componentType, $pattern)
      * @param string $pattern
      * @param bool|false $withContext
      * @return array
-     * @since 2.0.0
      */
     private function collect($componentType, $pattern, $withContext)
     {
diff --git a/lib/internal/Magento/Framework/Composer/BufferIoFactory.php b/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
index d476f9497e954..db8fff2c218e9 100644
--- a/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
+++ b/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
@@ -10,7 +10,6 @@
 
 /**
  * Class creates BufferIO instance
- * @since 2.0.0
  */
 class BufferIoFactory
 {
@@ -18,7 +17,6 @@ class BufferIoFactory
      * Creates BufferIO instance
      *
      * @return BufferIO
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/Composer/ComposerInformation.php b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
index 4d1a2a4bbbacb..1169d68bfb4aa 100755
--- a/lib/internal/Magento/Framework/Composer/ComposerInformation.php
+++ b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
@@ -11,7 +11,6 @@
 
 /**
  * Class ComposerInformation uses Composer to determine dependency information.
- * @since 2.0.0
  */
 class ComposerInformation
 {
@@ -64,21 +63,16 @@ class ComposerInformation
     const PARAM_AVAILABLE = '--available';
     /**#@-*/
 
-    /**
-     * @var \Composer\Composer
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $composer;
 
     /**
      * @var \Composer\Package\Locker
-     * @since 2.0.0
      */
     private $locker;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private static $packageTypes = [
         self::THEME_PACKAGE_TYPE,
@@ -99,7 +93,6 @@ class ComposerInformation
      * @param ComposerFactory $composerFactory
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(ComposerFactory $composerFactory)
     {
@@ -111,7 +104,6 @@ public function __construct(ComposerFactory $composerFactory)
      *
      * @return string
      * @throws \Exception If attributes are missing in composer.lock file.
-     * @since 2.0.0
      */
     public function getRequiredPhpVersion()
     {
@@ -147,7 +139,6 @@ public function getRequiredPhpVersion()
      *
      * @return array
      * @throws \Exception If attributes are missing in composer.lock file.
-     * @since 2.0.0
      */
     public function getRequiredExtensions()
     {
@@ -176,7 +167,6 @@ public function getRequiredExtensions()
      * Collect suggests from composer.lock file and modules composer.json files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSuggestedPackages()
     {
@@ -193,7 +183,6 @@ public function getSuggestedPackages()
      * Collect required packages from root composer.lock file
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRootRequiredPackages()
     {
@@ -209,7 +198,6 @@ public function getRootRequiredPackages()
      * Collect required packages and types from root composer.lock file
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRootRequiredPackageTypesByName()
     {
@@ -225,7 +213,6 @@ public function getRootRequiredPackageTypesByName()
      * Collect all installed Magento packages from composer.lock
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInstalledMagentoPackages()
     {
@@ -271,7 +258,6 @@ public function getSystemPackages()
      *
      * @param string $packageName
      * @return bool
-     * @since 2.0.0
      */
     public function isSystemPackage($packageName = '')
     {
@@ -285,7 +271,6 @@ public function isSystemPackage($packageName = '')
      * Determines if Magento is the root package or it is included as a requirement.
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isMagentoRoot()
     {
@@ -310,7 +295,6 @@ public function getRootPackage()
      *
      * @param string $packageName
      * @return bool
-     * @since 2.0.0
      */
     public function isPackageInComposerJson($packageName)
     {
@@ -321,7 +305,6 @@ public function isPackageInComposerJson($packageName)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getPackagesTypes()
     {
@@ -332,7 +315,6 @@ public function getPackagesTypes()
      * @param string $name
      * @param string $version
      * @return array
-     * @since 2.0.0
      */
     public function getPackageRequirements($name, $version)
     {
diff --git a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
index 5a54779db9607..259fcd323b38b 100644
--- a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
+++ b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
@@ -9,13 +9,11 @@
 
 /**
  * A class to find path to root Composer json file
- * @since 2.0.0
  */
 class ComposerJsonFinder
 {
     /**
      * @var DirectoryList $directoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -23,7 +21,6 @@ class ComposerJsonFinder
      * Constructor
      *
      * @param DirectoryList $directoryList
-     * @since 2.0.0
      */
     public function __construct(DirectoryList $directoryList)
     {
@@ -35,7 +32,6 @@ public function __construct(DirectoryList $directoryList)
      *
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function findComposerJson()
     {
diff --git a/lib/internal/Magento/Framework/Composer/DependencyChecker.php b/lib/internal/Magento/Framework/Composer/DependencyChecker.php
index 6379b962c8dde..6084b574235e2 100644
--- a/lib/internal/Magento/Framework/Composer/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Composer/DependencyChecker.php
@@ -12,19 +12,16 @@
 
 /**
  * A class to check if there are any dependency to package(s) that exists in the codebase, regardless of package type
- * @since 2.0.0
  */
 class DependencyChecker
 {
     /**
      * @var Application
-     * @since 2.0.0
      */
     private $composerApp;
 
     /**
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -33,7 +30,6 @@ class DependencyChecker
      *
      * @param Application $composerApp
      * @param DirectoryList $directoryList
-     * @since 2.0.0
      */
     public function __construct(Application $composerApp, DirectoryList $directoryList)
     {
@@ -50,7 +46,6 @@ public function __construct(Application $composerApp, DirectoryList $directoryLi
      * @param string[] $packages
      * @param bool $excludeSelf
      * @return string[]
-     * @since 2.0.0
      */
     public function checkDependencies(array $packages, $excludeSelf = false)
     {
@@ -79,7 +74,6 @@ public function checkDependencies(array $packages, $excludeSelf = false)
      *
      * @param string $output
      * @return string[]
-     * @since 2.0.0
      */
     private function parseComposerOutput($output)
     {
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
index 70c32bfafbcf9..1d0a50ff9468a 100755
--- a/lib/internal/Magento/Framework/Composer/MagentoComponent.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Composer\MagentoComponent
  *
- * @since 2.0.0
  */
 class MagentoComponent
 {
@@ -19,7 +18,6 @@ class MagentoComponent
      * @return string[] ['type' => '<type>', 'area' => '<area>', 'name' => '<name>']
      *             Ex.: ['type' => 'module', 'name' => 'catalog']
      *                  ['type' => 'theme', 'area' => 'frontend', 'name' => 'blank']
-     * @since 2.0.0
      */
     public static function matchMagentoComponent($key)
     {
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComposerApplicationFactory.php b/lib/internal/Magento/Framework/Composer/MagentoComposerApplicationFactory.php
index c7e86bb157ff7..2f3ff89a31d1e 100644
--- a/lib/internal/Magento/Framework/Composer/MagentoComposerApplicationFactory.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComposerApplicationFactory.php
@@ -14,20 +14,17 @@
 /**
  * Class \Magento\Framework\Composer\MagentoComposerApplicationFactory
  *
- * @since 2.0.0
  */
 class MagentoComposerApplicationFactory
 {
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $pathToComposerHome;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $pathToComposerJson;
 
@@ -36,7 +33,6 @@ class MagentoComposerApplicationFactory
      *
      * @param ComposerJsonFinder $composerJsonFinder
      * @param DirectoryList $directoryList
-     * @since 2.0.0
      */
     public function __construct(ComposerJsonFinder $composerJsonFinder, DirectoryList $directoryList)
     {
@@ -48,7 +44,6 @@ public function __construct(ComposerJsonFinder $composerJsonFinder, DirectoryLis
      * Creates MagentoComposerApplication instance
      *
      * @return MagentoComposerApplication
-     * @since 2.0.0
      */
     public function create()
     {
@@ -59,7 +54,6 @@ public function create()
      * Creates InfoCommand instance
      *
      * @return InfoCommand
-     * @since 2.0.0
      */
     public function createInfoCommand()
     {
@@ -70,7 +64,6 @@ public function createInfoCommand()
      * Creates RequireUpdateDryRunCommand instance
      *
      * @return RequireUpdateDryRunCommand
-     * @since 2.0.0
      */
     public function createRequireUpdateDryRunCommand()
     {
diff --git a/lib/internal/Magento/Framework/Composer/Remove.php b/lib/internal/Magento/Framework/Composer/Remove.php
index 3f2c0ca6cba38..b7a9a20333d86 100644
--- a/lib/internal/Magento/Framework/Composer/Remove.php
+++ b/lib/internal/Magento/Framework/Composer/Remove.php
@@ -9,7 +9,6 @@
 
 /**
  * Class to run composer remove command
- * @since 2.0.0
  */
 class Remove
 {
@@ -17,7 +16,6 @@ class Remove
      * Composer application factory
      *
      * @var MagentoComposerApplicationFactory
-     * @since 2.0.0
      */
     private $composerApplicationFactory;
 
@@ -25,7 +23,6 @@ class Remove
      * Constructor
      *
      * @param MagentoComposerApplicationFactory $composerApplicationFactory
-     * @since 2.0.0
      */
     public function __construct(
         MagentoComposerApplicationFactory $composerApplicationFactory
@@ -40,7 +37,6 @@ public function __construct(
      * @throws \Exception
      *
      * @return string
-     * @since 2.0.0
      */
     public function remove(array $packages)
     {
diff --git a/lib/internal/Magento/Framework/Config/AbstractXml.php b/lib/internal/Magento/Framework/Config/AbstractXml.php
index 78eecc1a640af..a8d0eff6bce74 100644
--- a/lib/internal/Magento/Framework/Config/AbstractXml.php
+++ b/lib/internal/Magento/Framework/Config/AbstractXml.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractXml
 {
@@ -19,20 +18,17 @@ abstract class AbstractXml
      * Data extracted from the merged configuration files
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
     /**
      * Dom configuration model
      * @var \Magento\Framework\Config\Dom
-     * @since 2.0.0
      */
     protected $_domConfig = null;
 
     /**
      * @var \Magento\Framework\Config\DomFactory
-     * @since 2.0.0
      */
     protected $domFactory;
 
@@ -42,7 +38,6 @@ abstract class AbstractXml
      * @param array $configFiles
      * @param \Magento\Framework\Config\DomFactory $domFactory
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         $configFiles,
@@ -59,7 +54,6 @@ public function __construct(
      * Get absolute path to the XML-schema file
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function getSchemaFile();
 
@@ -67,7 +61,6 @@ abstract public function getSchemaFile();
      * Get absolute path to per-file XML-schema file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPerFileSchemaFile()
     {
@@ -79,7 +72,6 @@ public function getPerFileSchemaFile()
      *
      * @param \DOMDocument $dom
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _extractData(\DOMDocument $dom);
 
@@ -89,7 +81,6 @@ abstract protected function _extractData(\DOMDocument $dom);
      * @param array $configFiles
      * @return \DOMDocument
      * @throws \Magento\Framework\Exception\LocalizedException If a non-existing or invalid XML-file passed
-     * @since 2.0.0
      */
     protected function _merge($configFiles)
     {
@@ -112,7 +103,6 @@ protected function _merge($configFiles)
      * @param string $file
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException If invalid XML-file passed
-     * @since 2.0.0
      */
     protected function _performValidate($file = null)
     {
@@ -133,7 +123,6 @@ protected function _performValidate($file = null)
      *
      * @return \Magento\Framework\Config\Dom
      * @throws \Magento\Framework\Config\Dom\ValidationException
-     * @since 2.0.0
      */
     protected function _getDomConfigModel()
     {
@@ -153,7 +142,6 @@ protected function _getDomConfigModel()
      * Get XML-contents, initial for merging
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function _getInitialXml();
 
@@ -161,7 +149,6 @@ abstract protected function _getInitialXml();
      * Get list of paths to identifiable nodes
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _getIdAttributes();
 }
diff --git a/lib/internal/Magento/Framework/Config/CacheInterface.php b/lib/internal/Magento/Framework/Config/CacheInterface.php
index 80b2d7fbb0949..7064dcfca0547 100644
--- a/lib/internal/Magento/Framework/Config/CacheInterface.php
+++ b/lib/internal/Magento/Framework/Config/CacheInterface.php
@@ -11,7 +11,6 @@
  * Config cache interface.
  *
  * @api
- * @since 2.0.0
  */
 interface CacheInterface extends \Magento\Framework\Cache\FrontendInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Composer/Package.php b/lib/internal/Magento/Framework/Config/Composer/Package.php
index 1007e74a9e2de..a8ff6ac724c3f 100644
--- a/lib/internal/Magento/Framework/Config/Composer/Package.php
+++ b/lib/internal/Magento/Framework/Config/Composer/Package.php
@@ -9,7 +9,6 @@
 /**
  * A model that represents composer package
  * @api
- * @since 2.0.0
  */
 class Package
 {
@@ -17,7 +16,6 @@ class Package
      * Contents of composer.json
      *
      * @var \StdClass
-     * @since 2.0.0
      */
     protected $json;
 
@@ -25,7 +23,6 @@ class Package
      * Constructor
      *
      * @param \StdClass $json
-     * @since 2.0.0
      */
     public function __construct(\stdClass $json)
     {
@@ -38,7 +35,6 @@ public function __construct(\stdClass $json)
      * @param bool $formatted
      * @param string|null $format
      * @return string|\StdClass
-     * @since 2.0.0
      */
     public function getJson($formatted = true, $format = null)
     {
@@ -65,7 +61,6 @@ public function getJson($formatted = true, $format = null)
      * @param string $filter pattern to filter out the properties
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function get($propertyPath, $filter = null)
     {
@@ -87,7 +82,6 @@ public function get($propertyPath, $filter = null)
      * @param array $chain
      * @param int $index
      * @return mixed
-     * @since 2.0.0
      */
     private function traverseGet(\StdClass $json, array $chain, $index = 0)
     {
diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index c4c83d30e9888..3fdb57dd6282c 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -9,7 +9,6 @@
 /**
  * Deployment configuration options constant storage
  * @api
- * @since 2.0.0
  */
 class ConfigOptionsListConstants
 {
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 011ccc2eba1d9..0401471f27ea5 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -11,19 +11,16 @@
  * Class Converter convert xml to appropriate array
  *
  * @package Magento\Framework\Config
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var \Magento\Framework\View\Xsd\Media\TypeDataExtractorPool
-     * @since 2.0.0
      */
     protected $extractorPool;
 
     /**
      * @param TypeDataExtractorPool $extractorPool
-     * @since 2.0.0
      */
     public function __construct(TypeDataExtractorPool $extractorPool)
     {
@@ -36,7 +33,6 @@ public function __construct(TypeDataExtractorPool $extractorPool)
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -59,7 +55,6 @@ public function convert($source)
      *
      * @param \DOMElement $childNode
      * @return array
-     * @since 2.0.0
      */
     protected function parseNodes($childNode)
     {
@@ -97,7 +92,6 @@ protected function parseNodes($childNode)
      *
      * @param \DOMElement $node
      * @return string|boolean|number|null|[]
-     * @since 2.0.0
      */
     protected function parseVarElement(\DOMElement $node)
     {
diff --git a/lib/internal/Magento/Framework/Config/Converter/Dom.php b/lib/internal/Magento/Framework/Config/Converter/Dom.php
index cb90dc1dd8b61..dcb40d1e93c9e 100644
--- a/lib/internal/Magento/Framework/Config/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Converter/Dom.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Config\Converter\Dom
  *
- * @since 2.0.0
  */
 class Dom implements \Magento\Framework\Config\ConverterInterface
 {
@@ -21,7 +20,6 @@ class Dom implements \Magento\Framework\Config\ConverterInterface
      *
      * @param mixed $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php b/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
index d5705663ca1c1..67b8937442310 100644
--- a/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
+++ b/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
@@ -11,13 +11,11 @@
  * Universal converter of any XML data to an array representation with no data loss
  *
  * @api
- * @since 2.0.0
  */
 class Flat
 {
     /**
      * @var ArrayNodeConfig
-     * @since 2.0.0
      */
     protected $arrayNodeConfig;
 
@@ -25,7 +23,6 @@ class Flat
      * Constructor
      *
      * @param ArrayNodeConfig $arrayNodeConfig
-     * @since 2.0.0
      */
     public function __construct(ArrayNodeConfig $arrayNodeConfig)
     {
@@ -54,7 +51,6 @@ public function __construct(ArrayNodeConfig $arrayNodeConfig)
      * @return string|array
      * @throws \UnexpectedValueException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function convert(\DOMNode $source, $basePath = '')
     {
@@ -119,7 +115,6 @@ public function convert(\DOMNode $source, $basePath = '')
      *
      * @param \DOMNode $node
      * @return array
-     * @since 2.0.0
      */
     protected function getNodeAttributes(\DOMNode $node)
     {
diff --git a/lib/internal/Magento/Framework/Config/ConverterInterface.php b/lib/internal/Magento/Framework/Config/ConverterInterface.php
index 9ff3ba268d16f..4e299e31fb206 100644
--- a/lib/internal/Magento/Framework/Config/ConverterInterface.php
+++ b/lib/internal/Magento/Framework/Config/ConverterInterface.php
@@ -9,7 +9,6 @@
  * Config DOM-to-array converter interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ConverterInterface
 {
@@ -18,7 +17,6 @@ interface ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source);
 }
diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php
index 1fa2f7fd611be..876d7c70f51f8 100644
--- a/lib/internal/Magento/Framework/Config/Data.php
+++ b/lib/internal/Magento/Framework/Config/Data.php
@@ -13,7 +13,6 @@
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
- * @since 2.0.0
  */
 class Data implements \Magento\Framework\Config\DataInterface
 {
@@ -21,7 +20,6 @@ class Data implements \Magento\Framework\Config\DataInterface
      * Configuration reader
      *
      * @var ReaderInterface
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -29,7 +27,6 @@ class Data implements \Magento\Framework\Config\DataInterface
      * Configuration cache
      *
      * @var CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -37,7 +34,6 @@ class Data implements \Magento\Framework\Config\DataInterface
      * Cache tag
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheId;
 
@@ -45,7 +41,6 @@ class Data implements \Magento\Framework\Config\DataInterface
      * Cache tags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $cacheTags = [];
 
@@ -53,25 +48,21 @@ class Data implements \Magento\Framework\Config\DataInterface
      * Config data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
     /**
      * @var ReaderInterface
-     * @since 2.0.0
      */
     private $reader;
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     private $cache;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $cacheId;
 
@@ -88,7 +79,6 @@ class Data implements \Magento\Framework\Config\DataInterface
      * @param CacheInterface $cache
      * @param string $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         ReaderInterface $reader,
@@ -107,7 +97,6 @@ public function __construct(
      * Initialise data for configuration
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initData()
     {
@@ -127,7 +116,6 @@ protected function initData()
      *
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
@@ -140,7 +128,6 @@ public function merge(array $config)
      * @param string $path
      * @param mixed $default
      * @return array|mixed|null
-     * @since 2.0.0
      */
     public function get($path = null, $default = null)
     {
@@ -163,7 +150,6 @@ public function get($path = null, $default = null)
      * Clear cache data
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
diff --git a/lib/internal/Magento/Framework/Config/Data/ConfigData.php b/lib/internal/Magento/Framework/Config/Data/ConfigData.php
index fd27f9cdbb3f9..504b9566ca912 100644
--- a/lib/internal/Magento/Framework/Config/Data/ConfigData.php
+++ b/lib/internal/Magento/Framework/Config/Data/ConfigData.php
@@ -9,7 +9,6 @@
 /**
  * Data transfer object to store config data for config options
  * @api
- * @since 2.0.0
  */
 class ConfigData
 {
@@ -17,7 +16,6 @@ class ConfigData
      * File key
      *
      * @var string
-     * @since 2.0.0
      */
     private $fileKey;
 
@@ -25,7 +23,6 @@ class ConfigData
      * Data
      *
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
@@ -33,7 +30,7 @@ class ConfigData
      * Override previous config options when save
      *
      * @var bool
-     * @since 2.1.0
+     * @since 2.0.3
      */
     private $overrideWhenSave = false;
 
@@ -41,7 +38,6 @@ class ConfigData
      * Constructor
      *
      * @param string $fileKey
-     * @since 2.0.0
      */
     public function __construct($fileKey)
     {
@@ -52,7 +48,6 @@ public function __construct($fileKey)
      * Gets File Key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileKey()
     {
@@ -63,7 +58,6 @@ public function getFileKey()
      * Gets Data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -75,7 +69,7 @@ public function getData()
      *
      * @param bool $overrideWhenSave
      * @return void
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function setOverrideWhenSave($overrideWhenSave)
     {
@@ -86,7 +80,7 @@ public function setOverrideWhenSave($overrideWhenSave)
      * Gets override when save flag
      *
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.3
      */
     public function isOverrideWhenSave()
     {
@@ -99,7 +93,6 @@ public function isOverrideWhenSave()
      * @param string $path
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function set($path, $value)
     {
@@ -128,7 +121,6 @@ public function set($path, $value)
      * @param string $path
      * @return string[]
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function expand($path)
     {
diff --git a/lib/internal/Magento/Framework/Config/Data/Scoped.php b/lib/internal/Magento/Framework/Config/Data/Scoped.php
index 8f6a1f4ea11e2..adf5fab17f798 100644
--- a/lib/internal/Magento/Framework/Config/Data/Scoped.php
+++ b/lib/internal/Magento/Framework/Config/Data/Scoped.php
@@ -11,7 +11,6 @@
 /**
  * Provides scoped configuration
  * @api
- * @since 2.0.0
  */
 class Scoped extends \Magento\Framework\Config\Data
 {
@@ -19,7 +18,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Configuration scope resolver
      *
      * @var \Magento\Framework\Config\ScopeInterface
-     * @since 2.0.0
      */
     protected $_configScope;
 
@@ -27,7 +25,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Configuration reader
      *
      * @var \Magento\Framework\Config\ReaderInterface
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -35,7 +32,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Configuration cache
      *
      * @var \Magento\Framework\Config\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -43,7 +39,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Cache tag
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheId;
 
@@ -51,7 +46,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Scope priority loading scheme
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_scopePriorityScheme = [];
 
@@ -59,7 +53,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * Loaded scopes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_loadedScopes = [];
 
@@ -77,7 +70,6 @@ class Scoped extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\ReaderInterface $reader,
@@ -99,7 +91,6 @@ public function __construct(
      * @param string $path
      * @param mixed $default
      * @return array|mixed|null
-     * @since 2.0.0
      */
     public function get($path = null, $default = null)
     {
@@ -111,7 +102,6 @@ public function get($path = null, $default = null)
      * Load data for current scope
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadScopedData()
     {
diff --git a/lib/internal/Magento/Framework/Config/DataInterface.php b/lib/internal/Magento/Framework/Config/DataInterface.php
index 63c50844a2c11..f0fbedae5a500 100644
--- a/lib/internal/Magento/Framework/Config/DataInterface.php
+++ b/lib/internal/Magento/Framework/Config/DataInterface.php
@@ -9,7 +9,6 @@
  * Config data interface.
  *
  * @api
- * @since 2.0.0
  */
 interface DataInterface
 {
@@ -18,7 +17,6 @@ interface DataInterface
      *
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $config);
 
@@ -28,7 +26,6 @@ public function merge(array $config);
      * @param string $key
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function get($key, $default = null);
 }
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index beed4c16dbf6c..2fbd814139a64 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -18,7 +18,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Dom
 {
@@ -34,7 +33,6 @@ class Dom
 
     /**
      * @var \Magento\Framework\Config\ValidationStateInterface
-     * @since 2.0.0
      */
     private $validationState;
 
@@ -42,13 +40,11 @@ class Dom
      * Dom document
      *
      * @var \DOMDocument
-     * @since 2.0.0
      */
     protected $dom;
 
     /**
      * @var Dom\NodeMergingConfig
-     * @since 2.0.0
      */
     protected $nodeMergingConfig;
 
@@ -56,7 +52,6 @@ class Dom
      * Name of attribute that specifies type of argument node
      *
      * @var string|null
-     * @since 2.0.0
      */
     protected $typeAttributeName;
 
@@ -64,7 +59,6 @@ class Dom
      * Schema validation file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $schema;
 
@@ -72,7 +66,6 @@ class Dom
      * Format of error messages
      *
      * @var string
-     * @since 2.0.0
      */
     protected $errorFormat;
 
@@ -80,13 +73,11 @@ class Dom
      * Default namespace for xml elements
      *
      * @var string
-     * @since 2.0.0
      */
     protected $rootNamespace;
 
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     private static $urnResolver;
 
@@ -108,7 +99,6 @@ class Dom
      * @param string $typeAttributeName
      * @param string $schemaFile
      * @param string $errorFormat
-     * @since 2.0.0
      */
     public function __construct(
         $xml,
@@ -153,7 +143,6 @@ private static function getXmlErrors($errorFormat)
      *
      * @param string $xml
      * @return void
-     * @since 2.0.0
      */
     public function merge($xml)
     {
@@ -173,7 +162,6 @@ public function merge($xml)
      * @param string $parentPath path to parent node
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mergeNode(\DOMElement $node, $parentPath)
     {
@@ -226,7 +214,6 @@ protected function _mergeNode(\DOMElement $node, $parentPath)
      *
      * @param \DOMElement $node
      * @return bool
-     * @since 2.0.0
      */
     protected function _isTextNode($node)
     {
@@ -239,7 +226,6 @@ protected function _isTextNode($node)
      * @param \DOMElement $baseNode
      * @param \DOMNode $mergeNode
      * @return void
-     * @since 2.0.0
      */
     protected function _mergeAttributes($baseNode, $mergeNode)
     {
@@ -254,7 +240,6 @@ protected function _mergeAttributes($baseNode, $mergeNode)
      * @param \DOMElement $node
      * @param string $parentPath
      * @return string
-     * @since 2.0.0
      */
     protected function _getNodePathByParent(\DOMElement $node, $parentPath)
     {
@@ -281,7 +266,6 @@ protected function _getNodePathByParent(\DOMElement $node, $parentPath)
      * @throws \Magento\Framework\Exception\LocalizedException An exception is possible if original document contains
      *     multiple nodes for identifier
      * @return \DOMElement|null
-     * @since 2.0.0
      */
     protected function _getMatchedNode($nodePath)
     {
@@ -309,7 +293,6 @@ protected function _getMatchedNode($nodePath)
      * @param string $errorFormat
      * @return array of errors
      * @throws \Exception
-     * @since 2.0.0
      */
     public static function validateDomDocument(
         \DOMDocument $dom,
@@ -354,7 +337,6 @@ public static function validateDomDocument(
      * @param string $format
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private static function _renderErrorMessage(\LibXMLError $errorInfo, $format)
     {
@@ -386,7 +368,6 @@ private static function _renderErrorMessage(\LibXMLError $errorInfo, $format)
      * DOM document getter
      *
      * @return \DOMDocument
-     * @since 2.0.0
      */
     public function getDom()
     {
@@ -399,7 +380,6 @@ public function getDom()
      * @param string $xml
      * @return \DOMDocument
      * @throws \Magento\Framework\Config\Dom\ValidationException
-     * @since 2.0.0
      */
     protected function _initDom($xml)
     {
@@ -427,7 +407,6 @@ protected function _initDom($xml)
      * @param string $schemaFileName absolute path to schema file
      * @param array &$errors
      * @return bool
-     * @since 2.0.0
      */
     public function validate($schemaFileName, &$errors = [])
     {
@@ -443,7 +422,6 @@ public function validate($schemaFileName, &$errors = [])
      *
      * @param string $schemaFile
      * @return $this
-     * @since 2.0.0
      */
     public function setSchemaFile($schemaFile)
     {
@@ -456,7 +434,6 @@ public function setSchemaFile($schemaFile)
      *
      * @param \DOMAttr $attribute
      * @return string
-     * @since 2.0.0
      */
     private function _getAttributeName($attribute)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/ArrayNodeConfig.php b/lib/internal/Magento/Framework/Config/Dom/ArrayNodeConfig.php
index 2e5b1454c1451..84918b9643e8d 100644
--- a/lib/internal/Magento/Framework/Config/Dom/ArrayNodeConfig.php
+++ b/lib/internal/Magento/Framework/Config/Dom/ArrayNodeConfig.php
@@ -7,13 +7,11 @@
 
 /**
  * Configuration of nodes that represent numeric or associative arrays
- * @since 2.0.0
  */
 class ArrayNodeConfig
 {
     /**
      * @var NodePathMatcher
-     * @since 2.0.0
      */
     private $nodePathMatcher;
 
@@ -21,7 +19,6 @@ class ArrayNodeConfig
      * Format: array('/associative/array/path' => '<array_key_attribute>', ...)
      *
      * @var array
-     * @since 2.0.0
      */
     private $assocArrays = [];
 
@@ -29,7 +26,6 @@ class ArrayNodeConfig
      * Format: array('/numeric/array/path', ...)
      *
      * @var array
-     * @since 2.0.0
      */
     private $numericArrays = [];
 
@@ -37,7 +33,6 @@ class ArrayNodeConfig
      * @param NodePathMatcher $nodePathMatcher
      * @param array $assocArrayAttributes
      * @param array $numericArrays
-     * @since 2.0.0
      */
     public function __construct(
         NodePathMatcher $nodePathMatcher,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param string $nodeXpath
      * @return bool
-     * @since 2.0.0
      */
     public function isNumericArray($nodeXpath)
     {
@@ -71,7 +65,6 @@ public function isNumericArray($nodeXpath)
      *
      * @param string $nodeXpath
      * @return string|null
-     * @since 2.0.0
      */
     public function getAssocArrayKeyAttribute($nodeXpath)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/NodeMergingConfig.php b/lib/internal/Magento/Framework/Config/Dom/NodeMergingConfig.php
index 6e1059a88df39..d7c8e9d425e6d 100644
--- a/lib/internal/Magento/Framework/Config/Dom/NodeMergingConfig.php
+++ b/lib/internal/Magento/Framework/Config/Dom/NodeMergingConfig.php
@@ -7,13 +7,11 @@
 
 /**
  * Configuration of identifier attributes to be taken into account during merging
- * @since 2.0.0
  */
 class NodeMergingConfig
 {
     /**
      * @var NodePathMatcher
-     * @since 2.0.0
      */
     private $nodePathMatcher;
 
@@ -21,14 +19,12 @@ class NodeMergingConfig
      * Format: array('/node/path' => '<node_id_attribute>', ...)
      *
      * @var array
-     * @since 2.0.0
      */
     private $idAttributes = [];
 
     /**
      * @param NodePathMatcher $nodePathMatcher
      * @param array $idAttributes
-     * @since 2.0.0
      */
     public function __construct(NodePathMatcher $nodePathMatcher, array $idAttributes)
     {
@@ -41,7 +37,6 @@ public function __construct(NodePathMatcher $nodePathMatcher, array $idAttribute
      *
      * @param string $nodeXpath
      * @return string|null
-     * @since 2.0.0
      */
     public function getIdAttribute($nodeXpath)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/NodePathMatcher.php b/lib/internal/Magento/Framework/Config/Dom/NodePathMatcher.php
index 821ee1490f37d..9c1686c882c54 100644
--- a/lib/internal/Magento/Framework/Config/Dom/NodePathMatcher.php
+++ b/lib/internal/Magento/Framework/Config/Dom/NodePathMatcher.php
@@ -7,7 +7,6 @@
 
 /**
  * Matching of XPath expressions to path patterns
- * @since 2.0.0
  */
 class NodePathMatcher
 {
@@ -17,7 +16,6 @@ class NodePathMatcher
      * @param string $pathPattern Example: '/some/static/path' or '/some/regexp/path(/item)+'
      * @param string $xpathSubject Example: '/some[@attr="value"]/static/ns:path'
      * @return bool
-     * @since 2.0.0
      */
     public function match($pathPattern, $xpathSubject)
     {
@@ -31,7 +29,6 @@ public function match($pathPattern, $xpathSubject)
      *
      * @param string $xpath
      * @return string
-     * @since 2.0.0
      */
     protected function simplifyXpath($xpath)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
index 564caa3daed9f..44d663041e156 100644
--- a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
+++ b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UrnResolver
 {
@@ -26,7 +25,6 @@ class UrnResolver
      * @param string $schema
      * @return string
      * @throws NotFoundException
-     * @since 2.0.0
      */
     public function getRealPath($schema)
     {
@@ -68,7 +66,6 @@ public function getRealPath($schema)
      * @return resource
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function registerEntityLoader($public, $system, $context)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/ValidationException.php b/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
index e33e48b7d95bd..3c74a80bdfab1 100644
--- a/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
+++ b/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ValidationException extends \InvalidArgumentException
 {
diff --git a/lib/internal/Magento/Framework/Config/DomFactory.php b/lib/internal/Magento/Framework/Config/DomFactory.php
index 0e627e38bd5b6..542ebd642c71d 100644
--- a/lib/internal/Magento/Framework/Config/DomFactory.php
+++ b/lib/internal/Magento/Framework/Config/DomFactory.php
@@ -8,7 +8,6 @@
 /**
  * Magento configuration DOM factory
  * @api
- * @since 2.0.0
  */
 class DomFactory
 {
@@ -18,7 +17,6 @@ class DomFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -26,7 +24,6 @@ class DomFactory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManger
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManger
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param array $arguments
      * @return \Magento\Framework\Config\Dom
-     * @since 2.0.0
      */
     public function createDom(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php b/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
index ed5ed1acf0c8d..abe16ec5c2964 100644
--- a/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
+++ b/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
@@ -9,7 +9,6 @@
 /**
  * Stores file key to file name config
  * @api
- * @since 2.0.0
  */
 class ConfigFilePool
 {
@@ -30,7 +29,6 @@ class ConfigFilePool
      * Default files for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $applicationConfigFiles = [
         self::APP_CONFIG => 'config.php',
@@ -42,7 +40,7 @@ class ConfigFilePool
      *
      * @var array
      * @deprecated 2.2.0 Magento does not support custom config file pools since 2.2.0 version
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $initialConfigFiles = [
         self::DIST => [
@@ -59,7 +57,6 @@ class ConfigFilePool
      * Constructor
      *
      * @param array $additionalConfigFiles
-     * @since 2.0.0
      */
     public function __construct($additionalConfigFiles = [])
     {
@@ -70,7 +67,6 @@ public function __construct($additionalConfigFiles = [])
      * Returns application config files.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPaths()
     {
@@ -83,7 +79,6 @@ public function getPaths()
      * @param string $fileKey
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getPath($fileKey)
     {
@@ -98,7 +93,7 @@ public function getPath($fileKey)
      *
      * @return array
      * @deprecated 2.2.0 Magento does not support custom config file pools since 2.2.0 version
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getInitialFilePools()
     {
@@ -111,7 +106,7 @@ public function getInitialFilePools()
      * @param string $pool
      * @return array
      * @deprecated 2.2.0 Magento does not support custom config file pools since 2.2.0 version
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function getPathsByPool($pool)
     {
diff --git a/lib/internal/Magento/Framework/Config/FileIterator.php b/lib/internal/Magento/Framework/Config/FileIterator.php
index 681fce036bef8..f8cbe5d46dd8d 100644
--- a/lib/internal/Magento/Framework/Config/FileIterator.php
+++ b/lib/internal/Magento/Framework/Config/FileIterator.php
@@ -12,7 +12,6 @@
 /**
  * Class FileIterator
  * @api
- * @since 2.0.0
  */
 class FileIterator implements \Iterator, \Countable
 {
@@ -20,7 +19,6 @@ class FileIterator implements \Iterator, \Countable
      * Paths
      *
      * @var array
-     * @since 2.0.0
      */
     protected $paths = [];
 
@@ -28,7 +26,6 @@ class FileIterator implements \Iterator, \Countable
      * Position
      *
      * @var int
-     * @since 2.0.0
      */
     protected $position;
 
@@ -36,7 +33,6 @@ class FileIterator implements \Iterator, \Countable
      * File read factory
      *
      * @var ReadFactory
-     * @since 2.0.0
      */
     protected $fileReadFactory;
 
@@ -45,7 +41,6 @@ class FileIterator implements \Iterator, \Countable
      *
      * @param ReadFactory $readFactory
      * @param array $paths
-     * @since 2.0.0
      */
     public function __construct(ReadFactory $readFactory, array $paths)
     {
@@ -58,7 +53,6 @@ public function __construct(ReadFactory $readFactory, array $paths)
      * Rewind
      *
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -69,7 +63,6 @@ public function rewind()
      * Current
      *
      * @return string
-     * @since 2.0.0
      */
     public function current()
     {
@@ -82,7 +75,6 @@ public function current()
      * Key
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function key()
     {
@@ -93,7 +85,6 @@ public function key()
      * Next
      *
      * @return void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -104,7 +95,6 @@ public function next()
      * Valid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -115,7 +105,6 @@ public function valid()
      * Convert to an array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -130,7 +119,6 @@ public function toArray()
      * Count
      *
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
diff --git a/lib/internal/Magento/Framework/Config/FileIteratorFactory.php b/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
index 865457cca0e3f..15d0edd57ded8 100644
--- a/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
+++ b/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
@@ -8,13 +8,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FileIteratorFactory
 {
     /**
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     private $fileReadFactory;
 
@@ -22,7 +20,6 @@ class FileIteratorFactory
      * Constructor
      *
      * @param \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\Filesystem\File\ReadFactory $file
      *
      * @param array $paths List of absolute paths
      * @return FileIterator
-     * @since 2.0.0
      */
     public function create($paths)
     {
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index bcb5d27ba2968..619c8caba6227 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -18,7 +18,6 @@
 /**
  * Class FileResolver
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface, DesignResolverInterface
 {
@@ -26,37 +25,31 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface, D
      * Module configuration file reader
      *
      * @var DirReader
-     * @since 2.0.0
      */
     protected $moduleReader;
 
     /**
      * @var \Magento\Framework\Config\FileIteratorFactory
-     * @since 2.0.0
      */
     protected $iteratorFactory;
 
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $currentTheme;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $area;
 
     /**
      * @var Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $rootDirectory;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface
-     * @since 2.0.0
      */
     protected $resolver;
 
@@ -67,7 +60,6 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface, D
      * @param DirectoryList $directoryList
      * @param Filesystem $filesystem
      * @param ResolverInterface $resolver
-     * @since 2.0.0
      */
     public function __construct(
         DirReader $moduleReader,
@@ -88,7 +80,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($filename, $scope)
     {
diff --git a/lib/internal/Magento/Framework/Config/FileResolverInterface.php b/lib/internal/Magento/Framework/Config/FileResolverInterface.php
index 0a827fa39fc61..a83f1da03e123 100644
--- a/lib/internal/Magento/Framework/Config/FileResolverInterface.php
+++ b/lib/internal/Magento/Framework/Config/FileResolverInterface.php
@@ -9,7 +9,6 @@
  * File resolver interface.
  *
  * @api
- * @since 2.0.0
  */
 interface FileResolverInterface
 {
@@ -19,7 +18,6 @@ interface FileResolverInterface
      * @param string $filename
      * @param string $scope
      * @return array
-     * @since 2.0.0
      */
     public function get($filename, $scope);
 }
diff --git a/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php b/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
index cf14bc761169b..df0a55bf20b57 100644
--- a/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
+++ b/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
@@ -11,31 +11,26 @@
 
 /**
  * Class GenericSchemaLocator
- * @since 2.0.0
  */
 class GenericSchemaLocator implements SchemaLocatorInterface
 {
     /**
      * @var ModuleDirReader
-     * @since 2.0.0
      */
     private $moduleDirReader;
     
     /**
      * @var string
-     * @since 2.0.0
      */
     private $moduleName;
     
     /**
      * @var string
-     * @since 2.0.0
      */
     private $perFileSchema;
     
     /**
      * @var string|null
-     * @since 2.0.0
      */
     private $schema;
 
@@ -44,7 +39,6 @@ class GenericSchemaLocator implements SchemaLocatorInterface
      * @param string $moduleName
      * @param string $schema
      * @param string|null $perFileSchema
-     * @since 2.0.0
      */
     public function __construct(ModuleDirReader $reader, $moduleName, $schema, $perFileSchema = null)
     {
@@ -58,7 +52,6 @@ public function __construct(ModuleDirReader $reader, $moduleName, $schema, $perF
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -69,7 +62,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Config/Reader.php b/lib/internal/Magento/Framework/Config/Reader.php
index 7e28352796ee5..a158de88eb79f 100644
--- a/lib/internal/Magento/Framework/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Config/Reader.php
@@ -11,19 +11,19 @@
  * Read config from different sources and aggregate them
  *
  * @package Magento\Framework\Config
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Reader implements \Magento\Framework\App\Config\Scope\ReaderInterface
 {
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $sources;
 
     /**
      * @param array $sources
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(array $sources)
     {
@@ -36,7 +36,7 @@ public function __construct(array $sources)
      * @param null|string $scope
      * @throws LocalizedException Exception is thrown when scope other than default is given
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function read($scope = null)
     {
@@ -55,7 +55,7 @@ public function read($scope = null)
      *
      * @param array $array
      * @return array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function prepareSources(array $array)
     {
diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
index b9c85740f6e6e..b1a4a80f34d82 100644
--- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
@@ -11,7 +11,6 @@
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
- * @since 2.0.0
  */
 class Filesystem implements \Magento\Framework\Config\ReaderInterface
 {
@@ -19,7 +18,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * File locator
      *
      * @var \Magento\Framework\Config\FileResolverInterface
-     * @since 2.0.0
      */
     protected $_fileResolver;
 
@@ -27,7 +25,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * Config converter
      *
      * @var \Magento\Framework\Config\ConverterInterface
-     * @since 2.0.0
      */
     protected $_converter;
 
@@ -35,7 +32,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * The name of file that stores configuration
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_fileName;
 
@@ -43,7 +39,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
@@ -51,7 +46,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema;
 
@@ -59,7 +53,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [];
 
@@ -67,25 +60,23 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * Class of dom configuration document used for merge
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_domDocumentClass;
 
     /**
      * @var \Magento\Framework\Config\ValidationStateInterface
-     * @since 2.0.0
      */
     protected $validationState;
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $_defaultScope;
 
     /**
      * @var string
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $_schemaFile;
 
@@ -100,7 +91,6 @@ class Filesystem implements \Magento\Framework\Config\ReaderInterface
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -129,7 +119,6 @@ public function __construct(
      *
      * @param string|null $scope
      * @return array
-     * @since 2.0.0
      */
     public function read($scope = null)
     {
@@ -149,7 +138,6 @@ public function read($scope = null)
      * @param array $fileList
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _readFiles($fileList)
     {
@@ -192,7 +180,6 @@ protected function _readFiles($fileList)
      * @param string $initialContents
      * @return \Magento\Framework\Config\Dom
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function _createConfigMerger($mergerClass, $initialContents)
     {
diff --git a/lib/internal/Magento/Framework/Config/ReaderInterface.php b/lib/internal/Magento/Framework/Config/ReaderInterface.php
index 190f02f6c0495..d85ed2030a262 100644
--- a/lib/internal/Magento/Framework/Config/ReaderInterface.php
+++ b/lib/internal/Magento/Framework/Config/ReaderInterface.php
@@ -11,7 +11,6 @@
  * Config reader interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ReaderInterface
 {
@@ -20,7 +19,6 @@ interface ReaderInterface
      *
      * @param string|null $scope
      * @return array
-     * @since 2.0.0
      */
     public function read($scope = null);
 }
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Config/SchemaLocator.php
index 9137b239e49aa..fbfe06bb8c5c4 100644
--- a/lib/internal/Magento/Framework/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Config/SchemaLocator.php
@@ -13,7 +13,6 @@
  * Class SchemaLocator provides the information about xsd schema to be used for a configuration validation
  * Current class can be configured through di.xml
  * The default value of realPath variable contains information about view.xsd to keep the backward compatibility.
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -21,7 +20,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $schema = null;
 
@@ -30,7 +28,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      *
      * @param UrnResolver $urnResolver
      * @param string $realPath
-     * @since 2.0.0
      */
     public function __construct(
         UrnResolver $urnResolver,
@@ -43,7 +40,6 @@ public function __construct(
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -54,7 +50,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php b/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
index d860b2f6dfd8f..242f3d62a5f2a 100644
--- a/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
@@ -11,7 +11,6 @@
  * Config schema locator interface.
  *
  * @api
- * @since 2.0.0
  */
 interface SchemaLocatorInterface
 {
@@ -19,7 +18,6 @@ interface SchemaLocatorInterface
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema();
 
@@ -27,7 +25,6 @@ public function getSchema();
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema();
 }
diff --git a/lib/internal/Magento/Framework/Config/Scope.php b/lib/internal/Magento/Framework/Config/Scope.php
index bc5cda4a357b5..2e6a7d7ac9ac9 100644
--- a/lib/internal/Magento/Framework/Config/Scope.php
+++ b/lib/internal/Magento/Framework/Config/Scope.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Config\Scope
  *
- * @since 2.0.0
  */
 class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framework\Config\ScopeListInterface
 {
@@ -16,7 +15,6 @@ class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framew
      * Default application scope
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultScope;
 
@@ -24,7 +22,6 @@ class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framew
      * Current config scope
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentScope;
 
@@ -32,7 +29,6 @@ class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framew
      * List of all available areas
      *
      * @var \Magento\Framework\App\AreaList
-     * @since 2.0.0
      */
     protected $_areaList;
 
@@ -41,7 +37,6 @@ class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framew
      *
      * @param \Magento\Framework\App\AreaList $areaList
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\AreaList $areaList, $defaultScope = 'primary')
     {
@@ -53,7 +48,6 @@ public function __construct(\Magento\Framework\App\AreaList $areaList, $defaultS
      * Get current configuration scope identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentScope()
     {
@@ -65,7 +59,6 @@ public function getCurrentScope()
      *
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setCurrentScope($scope)
     {
@@ -76,7 +69,6 @@ public function setCurrentScope($scope)
      * Retrieve list of available config scopes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllScopes()
     {
diff --git a/lib/internal/Magento/Framework/Config/ScopeInterface.php b/lib/internal/Magento/Framework/Config/ScopeInterface.php
index c7a5f878db30c..052d97eebc166 100644
--- a/lib/internal/Magento/Framework/Config/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/Config/ScopeInterface.php
@@ -9,7 +9,6 @@
  * Config scope interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ScopeInterface
 {
@@ -17,7 +16,6 @@ interface ScopeInterface
      * Get current configuration scope identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentScope();
 
@@ -26,7 +24,6 @@ public function getCurrentScope();
      *
      * @param string $scope
      * @return void
-     * @since 2.0.0
      */
     public function setCurrentScope($scope);
 }
diff --git a/lib/internal/Magento/Framework/Config/ScopeListInterface.php b/lib/internal/Magento/Framework/Config/ScopeListInterface.php
index bb9ece4e0657a..c45938db93d41 100644
--- a/lib/internal/Magento/Framework/Config/ScopeListInterface.php
+++ b/lib/internal/Magento/Framework/Config/ScopeListInterface.php
@@ -9,7 +9,6 @@
  * Config scope list interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ScopeListInterface
 {
@@ -17,7 +16,6 @@ interface ScopeListInterface
      * Retrieve list of all scopes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllScopes();
 }
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
index 66c7d1f06c0fc..812e61483b77b 100644
--- a/lib/internal/Magento/Framework/Config/Theme.php
+++ b/lib/internal/Magento/Framework/Config/Theme.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Theme
 {
@@ -24,13 +23,11 @@ class Theme
      * Data extracted from the configuration file
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data;
 
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
@@ -39,7 +36,6 @@ class Theme
      *
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      * @param string $configContent
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\Dom\UrnResolver $urnResolver,
@@ -53,7 +49,6 @@ public function __construct(
      * Get absolute path to theme.xsd
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchemaFile()
     {
@@ -66,7 +61,6 @@ public function getSchemaFile()
      * @param string $configContent
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _extractData($configContent)
     {
@@ -99,7 +93,6 @@ protected function _extractData($configContent)
      * Get title for specified theme and package code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThemeTitle()
     {
@@ -110,7 +103,6 @@ public function getThemeTitle()
      * Get theme media data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMedia()
     {
@@ -121,7 +113,6 @@ public function getMedia()
      * Retrieve a parent theme code
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getParentTheme()
     {
diff --git a/lib/internal/Magento/Framework/Config/ValidationStateInterface.php b/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
index a75539ec4ea58..20869d20b9dc1 100644
--- a/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
+++ b/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
@@ -9,7 +9,6 @@
  * Config validation state interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ValidationStateInterface
 {
@@ -17,7 +16,6 @@ interface ValidationStateInterface
      * Retrieve current validation state
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isValidationRequired();
 }
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index f2289887fe42d..50ccd57ccde67 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -9,13 +9,11 @@
  * View configuration files handler
  *
  * @api
- * @since 2.0.0
  */
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $xpath;
 
@@ -23,7 +21,6 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      * View config data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
@@ -37,7 +34,6 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      * @param string $domDocumentClass
      * @param string $defaultScope
      * @param array $xpath
-     * @since 2.0.0
      */
     public function __construct(
         FileResolverInterface $fileResolver,
@@ -71,7 +67,6 @@ public function __construct(
      *
      * @param string $module
      * @return array
-     * @since 2.0.0
      */
     public function getVars($module)
     {
@@ -85,7 +80,6 @@ public function getVars($module)
      * @param string $module
      * @param string $var
      * @return string|false|array
-     * @since 2.0.0
      */
     public function getVarValue($module, $var)
     {
@@ -112,7 +106,6 @@ public function getVarValue($module, $var)
      * @param string $module
      * @param string $mediaType
      * @return array
-     * @since 2.0.0
      */
     public function getMediaEntities($module, $mediaType)
     {
@@ -127,7 +120,6 @@ public function getMediaEntities($module, $mediaType)
      * @param string $mediaType
      * @param string $mediaId
      * @return array
-     * @since 2.0.0
      */
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
@@ -141,7 +133,6 @@ public function getMediaAttributes($module, $mediaType, $mediaId)
      * Variables are identified by module and name
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getIdAttributes()
     {
@@ -168,7 +159,6 @@ protected function getIdAttributes()
      * Get excluded file list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExcludedFiles()
     {
@@ -180,7 +170,6 @@ public function getExcludedFiles()
      * Get excluded directory list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getExcludedDir()
     {
@@ -192,7 +181,6 @@ public function getExcludedDir()
      * Get a list of excludes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getItems()
     {
@@ -204,7 +192,6 @@ protected function getItems()
      * Initialize data array
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initData()
     {
diff --git a/lib/internal/Magento/Framework/Config/ViewFactory.php b/lib/internal/Magento/Framework/Config/ViewFactory.php
index 35190ebcfd679..74b396311ecfa 100644
--- a/lib/internal/Magento/Framework/Config/ViewFactory.php
+++ b/lib/internal/Magento/Framework/Config/ViewFactory.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Framework\Config\ViewFactory
  *
- * @since 2.0.0
  */
 class ViewFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -25,7 +23,6 @@ class ViewFactory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param array $arguments
      * @return \Magento\Framework\Config\View
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index 9cd56afbc842d..dbec1786c1562 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -27,7 +27,6 @@
  *
  * {@inheritdoc}
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Cli extends Console\Application
 {
@@ -43,19 +42,13 @@ class Cli extends Console\Application
     const RETURN_FAILURE = 1;
     /**#@-*/
 
-    /**
-     * Service Manager.
-     *
-     * @var ServiceManager
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $serviceManager;
 
     /**
      * Initialization exception.
      *
      * @var \Exception
-     * @since 2.0.0
      */
     private $initException;
 
@@ -71,7 +64,6 @@ class Cli extends Console\Application
      * @param string $name the application name
      * @param string $version the application version
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
@@ -107,7 +99,6 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
      * {@inheritdoc}
      *
      * @throws \Exception The exception in case of unexpected error
-     * @since 2.0.0
      */
     public function doRun(Console\Input\InputInterface $input, Console\Output\OutputInterface $output)
     {
@@ -122,7 +113,6 @@ public function doRun(Console\Input\InputInterface $input, Console\Output\Output
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function getDefaultCommands()
     {
@@ -133,7 +123,6 @@ protected function getDefaultCommands()
      * Gets application commands.
      *
      * @return array a list of available application commands
-     * @since 2.0.0
      */
     protected function getApplicationCommands()
     {
@@ -237,7 +226,6 @@ private function assertCompilerPreparation()
      * @param ObjectManagerInterface $objectManager the object manager
      *
      * @return array an array with external commands
-     * @since 2.0.0
      */
     protected function getVendorCommands($objectManager)
     {
diff --git a/lib/internal/Magento/Framework/Console/CommandList.php b/lib/internal/Magento/Framework/Console/CommandList.php
index af51144505a46..eddfd4e084536 100644
--- a/lib/internal/Magento/Framework/Console/CommandList.php
+++ b/lib/internal/Magento/Framework/Console/CommandList.php
@@ -8,13 +8,11 @@
 
 /**
  * Class CommandList has a list of commands, which can be extended via DI configuration.
- * @since 2.0.0
  */
 class CommandList implements CommandListInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $commands;
 
@@ -22,7 +20,6 @@ class CommandList implements CommandListInterface
      * Constructor
      *
      * @param array $commands
-     * @since 2.0.0
      */
     public function __construct(array $commands = [])
     {
@@ -31,7 +28,6 @@ public function __construct(array $commands = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getCommands()
     {
diff --git a/lib/internal/Magento/Framework/Console/CommandListInterface.php b/lib/internal/Magento/Framework/Console/CommandListInterface.php
index d3f806be2e618..1547b5b671bfd 100644
--- a/lib/internal/Magento/Framework/Console/CommandListInterface.php
+++ b/lib/internal/Magento/Framework/Console/CommandListInterface.php
@@ -8,7 +8,6 @@
 /**
  * Contains a list of Console commands
  * @api
- * @since 2.0.0
  */
 interface CommandListInterface
 {
@@ -16,7 +15,6 @@ interface CommandListInterface
      * Gets list of command instances
      *
      * @return \Symfony\Component\Console\Command\Command[]
-     * @since 2.0.0
      */
     public function getCommands();
 }
diff --git a/lib/internal/Magento/Framework/Console/CommandLocator.php b/lib/internal/Magento/Framework/Console/CommandLocator.php
index d1171cd7f633c..65653a5744925 100644
--- a/lib/internal/Magento/Framework/Console/CommandLocator.php
+++ b/lib/internal/Magento/Framework/Console/CommandLocator.php
@@ -7,20 +7,17 @@
 
 /**
  * Locator for Console commands
- * @since 2.0.0
  */
 class CommandLocator
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private static $commands = [];
 
     /**
      * @param string $commandListClass
      * @return void
-     * @since 2.0.0
      */
     public static function register($commandListClass)
     {
@@ -29,7 +26,6 @@ public static function register($commandListClass)
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public static function getCommands()
     {
diff --git a/lib/internal/Magento/Framework/Controller/AbstractResult.php b/lib/internal/Magento/Framework/Controller/AbstractResult.php
index 72792fd6c0536..455ebbfd94c95 100644
--- a/lib/internal/Magento/Framework/Controller/AbstractResult.php
+++ b/lib/internal/Magento/Framework/Controller/AbstractResult.php
@@ -12,37 +12,31 @@
 /**
  * Class \Magento\Framework\Controller\AbstractResult
  *
- * @since 2.0.0
  */
 abstract class AbstractResult implements ResultInterface
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $httpResponseCode;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $headers = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $statusHeaderCode;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $statusHeaderVersion;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $statusHeaderPhrase;
 
@@ -51,7 +45,6 @@ abstract class AbstractResult implements ResultInterface
      *
      * @param int $httpCode
      * @return $this
-     * @since 2.0.0
      */
     public function setHttpResponseCode($httpCode)
     {
@@ -69,7 +62,6 @@ public function setHttpResponseCode($httpCode)
      * @param string $value
      * @param boolean $replace
      * @return $this
-     * @since 2.0.0
      */
     public function setHeader($name, $value, $replace = false)
     {
@@ -86,7 +78,6 @@ public function setHeader($name, $value, $replace = false)
      * @param null|int|string $version
      * @param null|string $phrase
      * @return $this
-     * @since 2.0.0
      */
     public function setStatusHeader($httpCode, $version = null, $phrase = null)
     {
@@ -99,7 +90,6 @@ public function setStatusHeader($httpCode, $version = null, $phrase = null)
     /**
      * @param HttpResponseInterface $response
      * @return $this
-     * @since 2.0.0
      */
     protected function applyHttpHeaders(HttpResponseInterface $response)
     {
@@ -124,7 +114,6 @@ protected function applyHttpHeaders(HttpResponseInterface $response)
     /**
      * @param HttpResponseInterface $response
      * @return $this
-     * @since 2.0.0
      */
     abstract protected function render(HttpResponseInterface $response);
 
@@ -133,7 +122,6 @@ abstract protected function render(HttpResponseInterface $response);
      *
      * @param HttpResponseInterface|ResponseInterface $response
      * @return $this
-     * @since 2.0.0
      */
     public function renderResult(ResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Controller/Index/Index.php b/lib/internal/Magento/Framework/Controller/Index/Index.php
index d62abbc655754..2530efb81faa2 100644
--- a/lib/internal/Magento/Framework/Controller/Index/Index.php
+++ b/lib/internal/Magento/Framework/Controller/Index/Index.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Controller\Index\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/lib/internal/Magento/Framework/Controller/Noroute/Index.php b/lib/internal/Magento/Framework/Controller/Noroute/Index.php
index ee163caeddbd8..f802f8c0a262d 100644
--- a/lib/internal/Magento/Framework/Controller/Noroute/Index.php
+++ b/lib/internal/Magento/Framework/Controller/Noroute/Index.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\Controller\Noroute\Index
  *
- * @since 2.0.0
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
@@ -17,7 +16,6 @@ class Index extends \Magento\Framework\App\Action\Action
      * Noroute application handler
      *
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Forward.php b/lib/internal/Magento/Framework/Controller/Result/Forward.php
index 19b35e26f9936..c783cdb959324 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Forward.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Forward.php
@@ -13,37 +13,31 @@
 /**
  * Class \Magento\Framework\Controller\Result\Forward
  *
- * @since 2.0.0
  */
 class Forward extends AbstractResult
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $module;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $controller;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $params = [];
 
     /**
      * @param RequestInterface $request
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request)
     {
@@ -53,7 +47,6 @@ public function __construct(RequestInterface $request)
     /**
      * @param string $module
      * @return $this
-     * @since 2.0.0
      */
     public function setModule($module)
     {
@@ -64,7 +57,6 @@ public function setModule($module)
     /**
      * @param string $controller
      * @return $this
-     * @since 2.0.0
      */
     public function setController($controller)
     {
@@ -75,7 +67,6 @@ public function setController($controller)
     /**
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function setParams(array $params)
     {
@@ -86,7 +77,6 @@ public function setParams(array $params)
     /**
      * @param string $action
      * @return $this
-     * @since 2.0.0
      */
     public function forward($action)
     {
@@ -112,7 +102,6 @@ public function forward($action)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Json.php b/lib/internal/Magento/Framework/Controller/Result/Json.php
index 563685d1ec726..3349d4507577b 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Json.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Json.php
@@ -15,25 +15,21 @@
  * Actual for controller actions that serve ajax requests
  *
  * @api
- * @since 2.0.0
  */
 class Json extends AbstractResult
 {
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $translateInline;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $json;
 
     /**
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
-     * @since 2.0.0
      */
     public function __construct(InlineInterface $translateInline)
     {
@@ -47,7 +43,6 @@ public function __construct(InlineInterface $translateInline)
      * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
      * @param array $options Additional options used during encoding
      * @return $this
-     * @since 2.0.0
      */
     public function setData($data, $cycleCheck = false, $options = [])
     {
@@ -58,7 +53,6 @@ public function setData($data, $cycleCheck = false, $options = [])
     /**
      * @param string $jsonData
      * @return $this
-     * @since 2.0.0
      */
     public function setJsonData($jsonData)
     {
@@ -68,7 +62,6 @@ public function setJsonData($jsonData)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Raw.php b/lib/internal/Magento/Framework/Controller/Result/Raw.php
index 4f659ef18943b..6355029af4da5 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Raw.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Raw.php
@@ -12,20 +12,17 @@
 /**
  * A result that contains raw response - may be good for passing through files,
  * returning result of downloads or some other binary contents
- * @since 2.0.0
  */
 class Raw extends AbstractResult
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $contents;
 
     /**
      * @param string $contents
      * @return $this
-     * @since 2.0.0
      */
     public function setContents($contents)
     {
@@ -35,7 +32,6 @@ public function setContents($contents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Redirect.php b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
index d8e6e4dea7266..d68caeb3e4409 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Redirect.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
@@ -15,25 +15,21 @@
  * so this is a result object that implements all necessary properties of a HTTP redirect
  *
  * @api
- * @since 2.0.0
  */
 class Redirect extends AbstractResult
 {
     /**
      * @var \Magento\Framework\App\Response\RedirectInterface
-     * @since 2.0.0
      */
     protected $redirect;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $url;
 
@@ -42,7 +38,6 @@ class Redirect extends AbstractResult
      *
      * @param App\Response\RedirectInterface $redirect
      * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @since 2.0.0
      */
     public function __construct(
         App\Response\RedirectInterface $redirect,
@@ -56,7 +51,6 @@ public function __construct(
      * Set url from referer
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRefererUrl()
     {
@@ -68,7 +62,6 @@ public function setRefererUrl()
      * Set referer url or base if referer is not exist
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setRefererOrBaseUrl()
     {
@@ -79,7 +72,6 @@ public function setRefererOrBaseUrl()
     /**
      * @param string $url
      * @return $this
-     * @since 2.0.0
      */
     public function setUrl($url)
     {
@@ -93,7 +85,6 @@ public function setUrl($url)
      * @param string $path
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path, array $params = [])
     {
@@ -103,7 +94,6 @@ public function setPath($path, array $params = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php b/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
index 48e228fd30cc5..0e622b1cc5e1a 100644
--- a/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
+++ b/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RedirectFactory
 {
@@ -17,7 +16,6 @@ class RedirectFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,14 +23,12 @@ class RedirectFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Controller\Result\Redirect
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Controller/ResultFactory.php b/lib/internal/Magento/Framework/Controller/ResultFactory.php
index 26c07760f73e7..bb7ab1c8b6c85 100644
--- a/lib/internal/Magento/Framework/Controller/ResultFactory.php
+++ b/lib/internal/Magento/Framework/Controller/ResultFactory.php
@@ -12,7 +12,6 @@
  * Result Factory
  *
  * @api
- * @since 2.0.0
  */
 class ResultFactory
 {
@@ -27,12 +26,7 @@ class ResultFactory
     const TYPE_PAGE     = 'page';
     /**#@-*/
 
-    /**
-     * Map of types which are references to classes
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $typeMap = [
         self::TYPE_JSON     => Result\Json::class,
         self::TYPE_RAW      => Result\Raw::class,
@@ -44,7 +38,6 @@ class ResultFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -53,7 +46,6 @@ class ResultFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $typeMap
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -68,7 +60,6 @@ public function __construct(
      *
      * @param array $typeMap
      * @return void
-     * @since 2.0.0
      */
     protected function mergeTypes(array $typeMap)
     {
@@ -86,7 +77,6 @@ protected function mergeTypes(array $typeMap)
      * @param array $arguments
      * @throws \InvalidArgumentException
      * @return ResultInterface
-     * @since 2.0.0
      */
     public function create($type, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Controller/ResultInterface.php b/lib/internal/Magento/Framework/Controller/ResultInterface.php
index 9de4629f0cd36..f20f32078a9b5 100644
--- a/lib/internal/Magento/Framework/Controller/ResultInterface.php
+++ b/lib/internal/Magento/Framework/Controller/ResultInterface.php
@@ -14,14 +14,12 @@
  * and be able to set it to the HTTP response
  *
  * @api
- * @since 2.0.0
  */
 interface ResultInterface
 {
     /**
      * @param int $httpCode
      * @return $this
-     * @since 2.0.0
      */
     public function setHttpResponseCode($httpCode);
 
@@ -35,7 +33,6 @@ public function setHttpResponseCode($httpCode);
      * @param string $value
      * @param boolean $replace
      * @return $this
-     * @since 2.0.0
      */
     public function setHeader($name, $value, $replace = false);
 
@@ -44,7 +41,6 @@ public function setHeader($name, $value, $replace = false);
      *
      * @param ResponseInterface $response
      * @return $this
-     * @since 2.0.0
      */
     public function renderResult(ResponseInterface $response);
 }
diff --git a/lib/internal/Magento/Framework/Controller/Router/Route/Factory.php b/lib/internal/Magento/Framework/Controller/Router/Route/Factory.php
index 59af50e045ae8..9379a7799857a 100644
--- a/lib/internal/Magento/Framework/Controller/Router/Route/Factory.php
+++ b/lib/internal/Magento/Framework/Controller/Router/Route/Factory.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Controller\Router\Route\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var ObjectManager
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManager $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManager $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManager $objectManager)
      * @param string $route Map used to match with later submitted URL path
      * @return RouterInterface
      * @throws \LogicException If specified route class does not implement proper interface.
-     * @since 2.0.0
      */
     public function createRoute($routeClass, $route)
     {
diff --git a/lib/internal/Magento/Framework/Convert/ConvertArray.php b/lib/internal/Magento/Framework/Convert/ConvertArray.php
index be39fb51d43fb..089c25a0da771 100644
--- a/lib/internal/Magento/Framework/Convert/ConvertArray.php
+++ b/lib/internal/Magento/Framework/Convert/ConvertArray.php
@@ -9,7 +9,6 @@
 
 /**
  * Convert the array data to SimpleXMLElement object
- * @since 2.0.0
  */
 class ConvertArray
 {
@@ -21,7 +20,6 @@ class ConvertArray
      * @param string $rootName
      * @return \SimpleXMLElement
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function assocToXml(array $array, $rootName = '_')
     {
@@ -47,7 +45,6 @@ public function assocToXml(array $array, $rootName = '_')
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public static function toFlatArray($data)
     {
@@ -69,7 +66,6 @@ public static function toFlatArray($data)
      * @param \SimpleXMLElement $xml
      * @return \SimpleXMLElement
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function _assocToXml(array $array, $rootName, \SimpleXMLElement $xml)
     {
diff --git a/lib/internal/Magento/Framework/Convert/DataObject.php b/lib/internal/Magento/Framework/Convert/DataObject.php
index cf53dd7dde20c..b49803caad464 100644
--- a/lib/internal/Magento/Framework/Convert/DataObject.php
+++ b/lib/internal/Magento/Framework/Convert/DataObject.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Convert\DataObject
  *
- * @since 2.0.0
  */
 class DataObject
 {
@@ -27,7 +26,6 @@ class DataObject
      *
      * @param array $data input data
      * @return array Data converted to an array
-     * @since 2.0.0
      */
     public function convertDataToArray($data)
     {
@@ -48,7 +46,6 @@ public function convertDataToArray($data)
      * @param mixed $obj array or object to convert
      * @param array $objects array of object hashes used for cycle detection
      * @return array|string Converted object or CYCLE_DETECTED_MARK
-     * @since 2.0.0
      */
     protected function _convertObjectToArray($obj, &$objects = [])
     {
@@ -92,7 +89,6 @@ protected function _convertObjectToArray($obj, &$objects = [])
      * @param string|callable $idField
      * @param string|callable $valueField
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray(array $items, $idField, $valueField)
     {
@@ -117,7 +113,6 @@ public function toOptionArray(array $items, $idField, $valueField)
      * @param string|callable $idField
      * @param string|callable $valueField
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash(array $items, $idField, $valueField)
     {
@@ -138,7 +133,6 @@ public function toOptionHash(array $items, $idField, $valueField)
      * @param mixed $item
      * @param string|callable $field
      * @return mixed
-     * @since 2.0.0
      */
     protected function _invokeGetter($item, $field)
     {
diff --git a/lib/internal/Magento/Framework/Convert/Excel.php b/lib/internal/Magento/Framework/Convert/Excel.php
index 3b110aba70d53..f2a629407c1cf 100644
--- a/lib/internal/Magento/Framework/Convert/Excel.php
+++ b/lib/internal/Magento/Framework/Convert/Excel.php
@@ -9,7 +9,6 @@
 
 /**
  * Convert the data to XML Excel
- * @since 2.0.0
  */
 class Excel
 {
@@ -17,7 +16,6 @@ class Excel
      * \ArrayIterator Object
      *
      * @var \Iterator|null
-     * @since 2.0.0
      */
     protected $_iterator = null;
 
@@ -25,7 +23,6 @@ class Excel
      * Method Callback Array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_rowCallback = [];
 
@@ -33,7 +30,6 @@ class Excel
      * Grid Header Array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dataHeader = [];
 
@@ -41,7 +37,6 @@ class Excel
      * Grid Footer Array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dataFooter = [];
 
@@ -50,7 +45,6 @@ class Excel
      *
      * @param \Iterator $iterator
      * @param array $rowCallback
-     * @since 2.0.0
      */
     public function __construct(\Iterator $iterator, $rowCallback = [])
     {
@@ -64,7 +58,6 @@ public function __construct(\Iterator $iterator, $rowCallback = [])
      *
      * @param string $sheetName
      * @return string
-     * @since 2.0.0
      */
     protected function _getXmlHeader($sheetName = '')
     {
@@ -108,7 +101,6 @@ protected function _getXmlHeader($sheetName = '')
      * Append data footer if it is available
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getXmlFooter()
     {
@@ -131,7 +123,6 @@ protected function _getXmlFooter()
      * @return string
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getXmlRow($row, $useCallback)
     {
@@ -174,7 +165,6 @@ protected function _getXmlRow($row, $useCallback)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setDataHeader($data)
     {
@@ -186,7 +176,6 @@ public function setDataHeader($data)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setDataFooter($data)
     {
@@ -198,7 +187,6 @@ public function setDataFooter($data)
      *
      * @param string $sheetName
      * @return string
-     * @since 2.0.0
      */
     public function convert($sheetName = '')
     {
@@ -218,7 +206,6 @@ public function convert($sheetName = '')
      * @param WriteInterface $stream
      * @param string $sheetName
      * @return void
-     * @since 2.0.0
      */
     public function write(WriteInterface $stream, $sheetName = '')
     {
diff --git a/lib/internal/Magento/Framework/Convert/ExcelFactory.php b/lib/internal/Magento/Framework/Convert/ExcelFactory.php
index 8da897387be9b..656adbc59a6ed 100644
--- a/lib/internal/Magento/Framework/Convert/ExcelFactory.php
+++ b/lib/internal/Magento/Framework/Convert/ExcelFactory.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\Convert\ExcelFactory
  *
- * @since 2.0.0
  */
 class ExcelFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Convert\Excel
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Convert/Xml.php b/lib/internal/Magento/Framework/Convert/Xml.php
index 1955a83b2c357..ba9d3f0ffff92 100644
--- a/lib/internal/Magento/Framework/Convert/Xml.php
+++ b/lib/internal/Magento/Framework/Convert/Xml.php
@@ -7,7 +7,6 @@
 
 /**
  * Convert xml data (SimpleXMLElement object) to array
- * @since 2.0.0
  */
 class Xml
 {
@@ -17,7 +16,6 @@ class Xml
      *
      * @param \SimpleXMLElement $xml
      * @return array
-     * @since 2.0.0
      */
     public function xmlToAssoc(\SimpleXMLElement $xml)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php
index 09d439a6e1077..517c2f5c55b90 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php
@@ -16,31 +16,26 @@
 
 /**
  * Class Processor
- * @since 2.0.0
  */
 class Processor implements ContentProcessorInterface
 {
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     private $logger;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     private $appState;
 
     /**
      * @var Source
-     * @since 2.0.0
      */
     private $assetSource;
 
     /**
      * @var Temporary
-     * @since 2.0.0
      */
     private $temporaryFile;
 
@@ -51,7 +46,6 @@ class Processor implements ContentProcessorInterface
      * @param State $appState
      * @param Source $assetSource
      * @param Temporary $temporaryFile
-     * @since 2.0.0
      */
     public function __construct(
         LoggerInterface $logger,
@@ -68,7 +62,6 @@ public function __construct(
     /**
      * @inheritdoc
      * @throws ContentProcessorException
-     * @since 2.0.0
      */
     public function processContent(File $asset)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Config.php b/lib/internal/Magento/Framework/Css/PreProcessor/Config.php
index be5bbb898f3bf..1d82d0f7f6fde 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Config.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Config.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Css\PreProcessor\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -23,7 +22,6 @@ class Config
      * Returns relative path to materialization directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMaterializationRelativePath()
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandler.php b/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandler.php
index b1bcfa7e1c808..97f27191cf052 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandler.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandler.php
@@ -7,19 +7,16 @@
 
 /**
  * Default Error Handler for CSS files pre-processing
- * @since 2.0.0
  */
 class ErrorHandler implements ErrorHandlerInterface
 {
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(\Psr\Log\LoggerInterface $logger)
     {
@@ -28,7 +25,6 @@ public function __construct(\Psr\Log\LoggerInterface $logger)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function processException(\Exception $e)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandlerInterface.php b/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandlerInterface.php
index ad1eb284a4cb1..282e8d6c80f89 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandlerInterface.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/ErrorHandlerInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Error handler interface
- * @since 2.0.0
  */
 interface ErrorHandlerInterface
 {
@@ -16,7 +15,6 @@ interface ErrorHandlerInterface
      *
      * @param \Exception $e
      * @return void
-     * @since 2.0.0
      */
     public function processException(\Exception $e);
 }
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Aggregated.php b/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Aggregated.php
index 3d8a7d7be1464..2163ab9a1c5d4 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Aggregated.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Aggregated.php
@@ -13,37 +13,31 @@
 
 /**
  * Source of layout files aggregated from a theme and its parents according to merging and overriding conventions
- * @since 2.0.0
  */
 class Aggregated implements CollectorInterface
 {
     /**
      * @var Factory
-     * @since 2.0.0
      */
     protected $fileListFactory;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $libraryFiles;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $baseFiles;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $overriddenBaseFiles;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -53,7 +47,6 @@ class Aggregated implements CollectorInterface
      * @param CollectorInterface $baseFiles
      * @param CollectorInterface $overriddenBaseFiles
      * @param LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         Factory $fileListFactory,
@@ -78,7 +71,6 @@ public function __construct(
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Library.php b/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Library.php
index c38c6eb26386b..4b9ebb97fa503 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Library.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/File/Collector/Library.php
@@ -15,31 +15,26 @@
 
 /**
  * Source of base layout files introduced by modules
- * @since 2.0.0
  */
 class Library implements CollectorInterface
 {
     /**
      * @var \Magento\Framework\View\File\Factory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
     /**
      * @var ReadInterface
-     * @since 2.0.0
      */
     protected $libraryDirectory;
 
     /**
      * @var \Magento\Framework\View\File\FileList\Factory
-     * @since 2.0.0
      */
     protected $fileListFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     private $readFactory;
 
@@ -47,7 +42,6 @@ class Library implements CollectorInterface
      * Component registry
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -57,7 +51,6 @@ class Library implements CollectorInterface
      * @param \Magento\Framework\View\File\Factory $fileFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\File\FileList\Factory $fileListFactory,
@@ -81,7 +74,6 @@ public function __construct(
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
@@ -110,7 +102,6 @@ public function getFiles(ThemeInterface $theme, $filePath)
      * @param ThemeInterface $theme
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     protected function createFiles(ReadInterface $reader, ThemeInterface $theme, $files)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/File/FileList/Collator.php b/lib/internal/Magento/Framework/Css/PreProcessor/File/FileList/Collator.php
index 83a4f8671a369..5936c23a29a0c 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/File/FileList/Collator.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/File/FileList/Collator.php
@@ -9,7 +9,6 @@
 
 /**
  * File list collator
- * @since 2.0.0
  */
 class Collator implements CollateInterface
 {
@@ -19,7 +18,6 @@ class Collator implements CollateInterface
      * @param \Magento\Framework\View\File[] $files
      * @param \Magento\Framework\View\File[] $filesOrigin
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function collate($files, $filesOrigin)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php b/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
index cb7a031cef01d..89763f42f466a 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Framework\Css\PreProcessor\File\Temporary
  *
- * @since 2.0.0
  */
 class Temporary
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     private $tmpDirectory;
 
     /**
      * @param Filesystem $filesystem
      * @param Config $config
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -47,7 +43,6 @@ public function __construct(
      * @param string $relativePath
      * @param string $contents
      * @return string
-     * @since 2.0.0
      */
     public function createFile($relativePath, $contents)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php b/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
index d797c282e8aef..ed1f16c2e427b 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
@@ -12,26 +12,22 @@
 
 /**
  * Class RelatedGenerator
- * @since 2.0.0
  */
 class RelatedGenerator
 {
     /**
      * @var Repository
-     * @since 2.0.0
      */
     private $assetRepository;
 
     /**
      * @var Temporary
-     * @since 2.0.0
      */
     private $temporaryFile;
 
     /**
      * @param Repository $assetRepository
      * @param Temporary $temporaryFile
-     * @since 2.0.0
      */
     public function __construct(
         Repository $assetRepository,
@@ -47,7 +43,6 @@ public function __construct(
      * @param Import $importGenerator
      *
      * @return void
-     * @since 2.0.0
      */
     public function generate(Import $importGenerator)
     {
@@ -68,7 +63,6 @@ public function generate(Import $importGenerator)
      * @param string $relatedFileId
      * @param LocalInterface $asset
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     protected function generateRelatedFile($relatedFileId, LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
index dcd2492f70b00..788cbee21b318 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
@@ -14,7 +14,6 @@
 
 /**
  * 'import' instruction preprocessor
- * @since 2.0.0
  */
 class Import implements PreProcessorInterface
 {
@@ -29,19 +28,16 @@ class Import implements PreProcessorInterface
 
     /**
      * @var \Magento\Framework\View\Asset\NotationResolver\Module
-     * @since 2.0.0
      */
     private $notationResolver;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $relatedFiles = [];
 
     /**
      * @var RelatedGenerator
-     * @since 2.0.0
      */
     private $relatedFileGenerator;
 
@@ -50,7 +46,6 @@ class Import implements PreProcessorInterface
      *
      * @param NotationResolver\Module $notationResolver
      * @param RelatedGenerator $relatedFileGenerator
-     * @since 2.0.0
      */
     public function __construct(
         NotationResolver\Module $notationResolver,
@@ -62,7 +57,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
@@ -85,7 +79,6 @@ public function process(Chain $chain)
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     private function removeComments($content)
     {
@@ -101,7 +94,6 @@ private function removeComments($content)
      * because it uses a 3rd-party library, which requires the files to physically reside in the base same directory.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRelatedFiles()
     {
@@ -112,7 +104,6 @@ public function getRelatedFiles()
      * Clear the record of related files, processed so far
      *
      * @return void
-     * @since 2.0.0
      */
     public function resetRelatedFiles()
     {
@@ -125,7 +116,6 @@ public function resetRelatedFiles()
      * @param string $matchedFileId
      * @param LocalInterface $asset
      * @return void
-     * @since 2.0.0
      */
     protected function recordRelatedFile($matchedFileId, LocalInterface $asset)
     {
@@ -139,7 +129,6 @@ protected function recordRelatedFile($matchedFileId, LocalInterface $asset)
      * @param LocalInterface $asset
      * @param string $contentType
      * @return string
-     * @since 2.0.0
      */
     protected function replace(array $matchedContent, LocalInterface $asset, $contentType)
     {
@@ -163,7 +152,6 @@ protected function replace(array $matchedContent, LocalInterface $asset, $conten
      * @param string $contentType
      * @return string
      * @link http://lesscss.org/features/#import-directives-feature-file-extensions
-     * @since 2.0.0
      */
     protected function fixFileExtension($fileId, $contentType)
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
index 5bf44e03f63ad..faf6618da3001 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
@@ -17,7 +17,6 @@
 /**
  * @magento_import instruction preprocessor
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) Must be deleted after moving themeProvider to construct
- * @since 2.0.0
  */
 class MagentoImport implements PreProcessorInterface
 {
@@ -29,38 +28,33 @@ class MagentoImport implements PreProcessorInterface
 
     /**
      * @var DesignInterface
-     * @since 2.0.0
      */
     protected $design;
 
     /**
      * @var CollectorInterface
-     * @since 2.0.0
      */
     protected $fileSource;
 
     /**
      * @var ErrorHandlerInterface
-     * @since 2.0.0
      */
     protected $errorHandler;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     protected $themeList;
 
     /**
      * @var ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $themeProvider;
 
@@ -70,7 +64,6 @@ class MagentoImport implements PreProcessorInterface
      * @param ErrorHandlerInterface $errorHandler
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\Design\Theme\ListInterface $themeList
-     * @since 2.0.0
      */
     public function __construct(
         DesignInterface $design,
@@ -88,7 +81,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(\Magento\Framework\View\Asset\PreProcessor\Chain $chain)
     {
@@ -105,7 +97,6 @@ public function process(\Magento\Framework\View\Asset\PreProcessor\Chain $chain)
      * @param array $matchedContent
      * @param LocalInterface $asset
      * @return string
-     * @since 2.0.0
      */
     protected function replace(array $matchedContent, LocalInterface $asset)
     {
@@ -134,7 +125,6 @@ protected function replace(array $matchedContent, LocalInterface $asset)
      *
      * @param LocalInterface $asset
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected function getTheme(LocalInterface $asset)
     {
@@ -149,8 +139,8 @@ protected function getTheme(LocalInterface $asset)
 
     /**
      * @return ThemeProviderInterface
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getThemeProvider()
     {
diff --git a/lib/internal/Magento/Framework/Currency.php b/lib/internal/Magento/Framework/Currency.php
index 1f4ec4f2300fc..1a36e20e934ff 100644
--- a/lib/internal/Magento/Framework/Currency.php
+++ b/lib/internal/Magento/Framework/Currency.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Currency
  *
- * @since 2.0.0
  */
 class Currency extends \Zend_Currency implements CurrencyInterface
 {
diff --git a/lib/internal/Magento/Framework/CurrencyFactory.php b/lib/internal/Magento/Framework/CurrencyFactory.php
index 44b19d9850a0d..a9bc8d4b9863a 100644
--- a/lib/internal/Magento/Framework/CurrencyFactory.php
+++ b/lib/internal/Magento/Framework/CurrencyFactory.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Framework\CurrencyFactory
  *
- * @since 2.0.0
  */
 class CurrencyFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param array $data
      * @return CurrencyInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/CurrencyInterface.php b/lib/internal/Magento/Framework/CurrencyInterface.php
index d11c2097e9db5..7242a724e05a7 100644
--- a/lib/internal/Magento/Framework/CurrencyInterface.php
+++ b/lib/internal/Magento/Framework/CurrencyInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface CurrencyInterface
 {
@@ -18,7 +17,6 @@ interface CurrencyInterface
      * @param  array         $options OPTIONAL options to set temporary
      * @throws \Zend_Currency_Exception When the value is not a number
      * @return string
-     * @since 2.0.0
      */
     public function toCurrency($value = null, array $options = []);
 
@@ -29,7 +27,6 @@ public function toCurrency($value = null, array $options = []);
      *
      * @param  array $options (Optional) Options to set
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function setFormat(array $options = []);
 
@@ -40,7 +37,6 @@ public function setFormat(array $options = []);
      * @param  string             $currency (Optional) Currency name
      * @param  string $locale   (Optional) Locale to display informations
      * @return string
-     * @since 2.0.0
      */
     public function getSymbol($currency = null, $locale = null);
 
@@ -50,7 +46,6 @@ public function getSymbol($currency = null, $locale = null);
      * @param  string             $currency OPTIONAL Currency's name
      * @param  string $locale   OPTIONAL The locale
      * @return string
-     * @since 2.0.0
      */
     public function getShortName($currency = null, $locale = null);
 
@@ -60,7 +55,6 @@ public function getShortName($currency = null, $locale = null);
      * @param  string             $currency (Optional) Currency's short name
      * @param  string $locale   (Optional) The locale
      * @return string
-     * @since 2.0.0
      */
     public function getName($currency = null, $locale = null);
 
@@ -70,7 +64,6 @@ public function getName($currency = null, $locale = null);
      * @param  string $currency OPTIONAL Currency's short name
      * @throws \Zend_Currency_Exception When no currency was defined
      * @return array List of regions
-     * @since 2.0.0
      */
     public function getRegionList($currency = null);
 
@@ -81,7 +74,6 @@ public function getRegionList($currency = null);
      *
      * @param  string $region OPTIONAL Region to return the currencies for
      * @return array List of currencies
-     * @since 2.0.0
      */
     public function getCurrencyList($region = null);
 
@@ -89,7 +81,6 @@ public function getCurrencyList($region = null);
      * Returns the actual currency name
      *
      * @return string
-     * @since 2.0.0
      */
     public function toString();
 
@@ -97,7 +88,6 @@ public function toString();
      * Returns the set cache
      *
      * @return \Zend_Cache_Core The set cache
-     * @since 2.0.0
      */
     public static function getCache();
 
@@ -106,7 +96,6 @@ public static function getCache();
      *
      * @param  \Zend_Cache_Core $cache Cache to set
      * @return void
-     * @since 2.0.0
      */
     public static function setCache(\Zend_Cache_Core $cache);
 
@@ -114,7 +103,6 @@ public static function setCache(\Zend_Cache_Core $cache);
      * Returns true when a cache is set
      *
      * @return boolean
-     * @since 2.0.0
      */
     public static function hasCache();
 
@@ -122,7 +110,6 @@ public static function hasCache();
      * Removes any set cache
      *
      * @return void
-     * @since 2.0.0
      */
     public static function removeCache();
 
@@ -131,7 +118,6 @@ public static function removeCache();
      *
      * @param string $tag Tag to clear when the default tag name is not used
      * @return void
-     * @since 2.0.0
      */
     public static function clearCache($tag = null);
 
@@ -143,7 +129,6 @@ public static function clearCache($tag = null);
      * @param  string $locale (Optional) Locale for parsing input
      * @throws \Zend_Currency_Exception When the given locale does not exist
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale = null);
 
@@ -151,7 +136,6 @@ public function setLocale($locale = null);
      * Returns the actual set locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale();
 
@@ -159,7 +143,6 @@ public function getLocale();
      * Returns the value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -169,7 +152,6 @@ public function getValue();
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Add this value to currency
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to add
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function setValue($value, $currency = null);
 
@@ -179,7 +161,6 @@ public function setValue($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Add this value to currency
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to add
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function add($value, $currency = null);
 
@@ -189,7 +170,6 @@ public function add($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Substracts this value from currency
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to substract
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function sub($value, $currency = null);
 
@@ -199,7 +179,6 @@ public function sub($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Divides this value from currency
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to divide
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function div($value, $currency = null);
 
@@ -209,7 +188,6 @@ public function div($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Multiplies this value from currency
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to multiply
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function mul($value, $currency = null);
 
@@ -219,7 +197,6 @@ public function mul($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Calculate modulo from this value
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to calculate the modulo
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function mod($value, $currency = null);
 
@@ -229,7 +206,6 @@ public function mod($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Compares the currency with this value
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to compare this value from
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function compare($value, $currency = null);
 
@@ -239,7 +215,6 @@ public function compare($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Compares the currency with this value
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to compare this value from
      * @return boolean
-     * @since 2.0.0
      */
     public function equals($value, $currency = null);
 
@@ -249,7 +224,6 @@ public function equals($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Compares the currency with this value
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to compare this value from
      * @return boolean
-     * @since 2.0.0
      */
     public function isMore($value, $currency = null);
 
@@ -259,7 +233,6 @@ public function isMore($value, $currency = null);
      * @param float|integer|\Magento\Framework\CurrencyInterface $value    Compares the currency with this value
      * @param string|\Magento\Framework\CurrencyInterface        $currency The currency to compare this value from
      * @return boolean
-     * @since 2.0.0
      */
     public function isLess($value, $currency = null);
 
@@ -267,7 +240,6 @@ public function isLess($value, $currency = null);
      * Returns the set service class
      *
      * @return \Zend_Service
-     * @since 2.0.0
      */
     public function getService();
 
@@ -276,7 +248,6 @@ public function getService();
      *
      * @param string|\Magento\Framework\Locale\CurrencyInterface $service Service class
      * @return \Magento\Framework\CurrencyInterface
-     * @since 2.0.0
      */
     public function setService($service);
 }
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index 51a5807c59f65..b9c44bbaed6f8 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -16,7 +16,6 @@
  * Class AbstractMapper
  * @package Magento\Framework\DB
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractMapper implements MapperInterface
 {
@@ -24,7 +23,6 @@ abstract class AbstractMapper implements MapperInterface
      * Resource model name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $resourceModel;
 
@@ -32,7 +30,6 @@ abstract class AbstractMapper implements MapperInterface
      * Resource instance
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -40,7 +37,6 @@ abstract class AbstractMapper implements MapperInterface
      * Store joined tables here
      *
      * @var array
-     * @since 2.0.0
      */
     protected $joinedTables = [];
 
@@ -48,7 +44,6 @@ abstract class AbstractMapper implements MapperInterface
      * DB connection
      *
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -56,31 +51,26 @@ abstract class AbstractMapper implements MapperInterface
      * Select object
      *
      * @var Select
-     * @since 2.0.0
      */
     protected $select;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var FetchStrategyInterface
-     * @since 2.0.0
      */
     protected $fetchStrategy;
 
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var MapperFactory
-     * @since 2.0.0
      */
     protected $mapperFactory;
 
@@ -88,7 +78,6 @@ abstract class AbstractMapper implements MapperInterface
      * Fields and filters map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $map = [];
 
@@ -98,7 +87,6 @@ abstract class AbstractMapper implements MapperInterface
      * @param ObjectFactory $objectFactory
      * @param MapperFactory $mapperFactory
      * @param Select $select
-     * @since 2.0.0
      */
     public function __construct(
         Logger $logger,
@@ -119,7 +107,6 @@ public function __construct(
      * Set initial conditions
      *
      * @return void
-     * @since 2.0.0
      */
     abstract protected function init();
 
@@ -128,7 +115,6 @@ abstract protected function init();
      *
      * @param CriteriaInterface $criteria
      * @return Select
-     * @since 2.0.0
      */
     public function map(CriteriaInterface $criteria)
     {
@@ -156,7 +142,6 @@ public function map(CriteriaInterface $criteria)
      * @param string $expression
      * @param array|string $fields
      * @return void
-     * @since 2.0.0
      */
     public function addExpressionFieldToSelect($alias, $expression, $fields)
     {
@@ -173,7 +158,6 @@ public function addExpressionFieldToSelect($alias, $expression, $fields)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -192,7 +176,6 @@ public function addFieldToFilter($field, $condition = null)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -204,7 +187,6 @@ public function reset()
      *
      * @param string $model
      * @return void
-     * @since 2.0.0
      */
     protected function setResourceModelName($model)
     {
@@ -215,7 +197,6 @@ protected function setResourceModelName($model)
      *  Retrieve resource model name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getResourceModelName()
     {
@@ -226,7 +207,6 @@ protected function getResourceModelName()
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -243,7 +223,6 @@ public function getResource()
      *
      * @param string $resourceInterface
      * @return void
-     * @since 2.0.0
      */
     protected function initResource($resourceInterface)
     {
@@ -259,7 +238,6 @@ protected function initResource($resourceInterface)
      * Init collection select
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initSelect()
     {
@@ -273,7 +251,6 @@ protected function initSelect()
      * @param string $condition
      * @param string $cols
      * @return void
-     * @since 2.0.0
      */
     protected function join($table, $condition, $cols = '*')
     {
@@ -296,7 +273,6 @@ protected function join($table, $condition, $cols = '*')
      * Retrieve connection object
      *
      * @return AdapterInterface
-     * @since 2.0.0
      */
     protected function getConnection()
     {
@@ -309,7 +285,6 @@ protected function getConnection()
      * @param AdapterInterface $connection
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function setConnection($connection)
     {
@@ -329,7 +304,6 @@ protected function setConnection($connection)
      * @param   string|array $field
      * @param   null|string|array $condition
      * @return  string
-     * @since 2.0.0
      */
     protected function translateCondition($field, $condition)
     {
@@ -342,7 +316,6 @@ protected function translateCondition($field, $condition)
      *
      * @param   string $field
      * @return  string
-     * @since 2.0.0
      */
     protected function getMappedField($field)
     {
@@ -361,7 +334,6 @@ protected function getMappedField($field)
      * Retrieve mapper data
      *
      * @return array|bool|null
-     * @since 2.0.0
      */
     protected function getMapper()
     {
@@ -402,7 +374,6 @@ protected function getMapper()
      * @param string $fieldName
      * @param integer|string|array $condition
      * @return string
-     * @since 2.0.0
      */
     protected function getConditionSql($fieldName, $condition)
     {
@@ -414,7 +385,6 @@ protected function getConditionSql($fieldName, $condition)
      *
      * @param string $fieldName
      * @return string
-     * @since 2.0.0
      */
     protected function getConditionFieldName($fieldName)
     {
@@ -424,7 +394,6 @@ protected function getConditionFieldName($fieldName)
     /**
      * Hook for operations before rendering filters
      * @return void
-     * @since 2.0.0
      */
     protected function renderFiltersBefore()
     {
@@ -435,7 +404,6 @@ protected function renderFiltersBefore()
      *
      * @param string $table
      * @return string
-     * @since 2.0.0
      */
     protected function getTable($table)
     {
@@ -446,7 +414,6 @@ protected function getTable($table)
      * Get \Magento\Framework\DB\Select object instance
      *
      * @return Select
-     * @since 2.0.0
      */
     protected function getSelect()
     {
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index db41d19dbcfad..d393e1e28f898 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -11,7 +11,6 @@
  * Magento Database Adapter Interface
  *
  * @api
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -80,7 +79,6 @@ interface AdapterInterface
      * Begin new DB transaction for connection
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function beginTransaction();
 
@@ -88,7 +86,6 @@ public function beginTransaction();
      * Commit DB transaction
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function commit();
 
@@ -96,7 +93,6 @@ public function commit();
      * Roll-back DB transaction
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function rollBack();
 
@@ -106,7 +102,6 @@ public function rollBack();
      * @param string $tableName the table name
      * @param string $schemaName the database or schema name
      * @return Table
-     * @since 2.0.0
      */
     public function newTable($tableName = null, $schemaName = null);
 
@@ -116,7 +111,6 @@ public function newTable($tableName = null, $schemaName = null);
      * @param Table $table
      * @throws \Zend_Db_Exception
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function createTable(Table $table);
 
@@ -126,7 +120,6 @@ public function createTable(Table $table);
      * @param string $tableName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function dropTable($tableName, $schemaName = null);
 
@@ -136,7 +129,6 @@ public function dropTable($tableName, $schemaName = null);
      * @param Table $table
      * @throws \Zend_Db_Exception
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function createTemporaryTable(Table $table);
 
@@ -147,7 +139,6 @@ public function createTemporaryTable(Table $table);
      * @param string $originTableName
      * @param bool $ifNotExists
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function createTemporaryTableLike($temporaryTableName, $originTableName, $ifNotExists = false);
 
@@ -157,7 +148,6 @@ public function createTemporaryTableLike($temporaryTableName, $originTableName,
      * @param string $tableName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function dropTemporaryTable($tableName, $schemaName = null);
 
@@ -168,7 +158,6 @@ public function dropTemporaryTable($tableName, $schemaName = null);
      *
      * @return boolean
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function renameTablesBatch(array $tablePairs);
 
@@ -178,7 +167,6 @@ public function renameTablesBatch(array $tablePairs);
      * @param string $tableName
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function truncateTable($tableName, $schemaName = null);
 
@@ -188,7 +176,6 @@ public function truncateTable($tableName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function isTableExists($tableName, $schemaName = null);
 
@@ -198,7 +185,6 @@ public function isTableExists($tableName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName
      * @return array|false
-     * @since 2.0.0
      */
     public function showTableStatus($tableName, $schemaName = null);
 
@@ -229,7 +215,6 @@ public function showTableStatus($tableName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName OPTIONAL
      * @return array
-     * @since 2.0.0
      */
     public function describeTable($tableName, $schemaName = null);
 
@@ -239,7 +224,6 @@ public function describeTable($tableName, $schemaName = null);
      * @param string $tableName
      * @param string $newTableName
      * @return Table
-     * @since 2.0.0
      */
     public function createTableByDdl($tableName, $newTableName);
 
@@ -252,7 +236,6 @@ public function createTableByDdl($tableName, $newTableName);
      * @param boolean $flushData
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function modifyColumnByDdl($tableName, $columnName, $definition, $flushData = false, $schemaName = null);
 
@@ -263,7 +246,6 @@ public function modifyColumnByDdl($tableName, $columnName, $definition, $flushDa
      * @param string $newTableName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function renameTable($oldTableName, $newTableName, $schemaName = null);
 
@@ -278,7 +260,6 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null);
      * @param array|string $definition  string specific or universal array DB Server definition
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function addColumn($tableName, $columnName, $definition, $schemaName = null);
 
@@ -294,7 +275,6 @@ public function addColumn($tableName, $columnName, $definition, $schemaName = nu
      * @param boolean $flushData        flush table statistic
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function changeColumn(
         $tableName,
@@ -314,7 +294,6 @@ public function changeColumn(
      * @param boolean $flushData
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function modifyColumn($tableName, $columnName, $definition, $flushData = false, $schemaName = null);
 
@@ -325,7 +304,6 @@ public function modifyColumn($tableName, $columnName, $definition, $flushData =
      * @param string $columnName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function dropColumn($tableName, $columnName, $schemaName = null);
 
@@ -336,7 +314,6 @@ public function dropColumn($tableName, $columnName, $schemaName = null);
      * @param string $columnName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function tableColumnExists($tableName, $columnName, $schemaName = null);
 
@@ -349,7 +326,6 @@ public function tableColumnExists($tableName, $columnName, $schemaName = null);
      * @param string $indexType     the index type
      * @param string $schemaName
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function addIndex($tableName, $indexName, $fields, $indexType = self::INDEX_TYPE_INDEX, $schemaName = null);
 
@@ -360,7 +336,6 @@ public function addIndex($tableName, $indexName, $fields, $indexType = self::IND
      * @param string $keyName
      * @param string $schemaName
      * @return bool|\Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function dropIndex($tableName, $keyName, $schemaName = null);
 
@@ -385,7 +360,6 @@ public function dropIndex($tableName, $keyName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName
      * @return array
-     * @since 2.0.0
      */
     public function getIndexList($tableName, $schemaName = null);
 
@@ -406,7 +380,6 @@ public function getIndexList($tableName, $schemaName = null);
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function addForeignKey(
         $fkName,
@@ -427,7 +400,6 @@ public function addForeignKey(
      * @param string $fkName
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function dropForeignKey($tableName, $fkName, $schemaName = null);
 
@@ -453,7 +425,6 @@ public function dropForeignKey($tableName, $fkName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName
      * @return array
-     * @since 2.0.0
      */
     public function getForeignKeys($tableName, $schemaName = null);
 
@@ -461,7 +432,6 @@ public function getForeignKeys($tableName, $schemaName = null);
      * Creates and returns a new \Magento\Framework\DB\Select object for this adapter.
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function select();
 
@@ -472,7 +442,6 @@ public function select();
      * @param array $data Column-value pairs or array of column-value pairs.
      * @param array $fields update fields pairs or values
      * @return int The number of affected rows.
-     * @since 2.0.0
      */
     public function insertOnDuplicate($table, array $data, array $fields = []);
 
@@ -482,7 +451,6 @@ public function insertOnDuplicate($table, array $data, array $fields = []);
      * @param mixed $table The table to insert data into.
      * @param array $data Column-value pairs or array of Column-value pairs.
      * @return int The number of affected rows.
-     * @since 2.0.0
      */
     public function insertMultiple($table, array $data);
 
@@ -502,7 +470,6 @@ public function insertMultiple($table, array $data);
      * @param   string[] $columns  the data array column map
      * @param   array $data
      * @return  int
-     * @since 2.0.0
      */
     public function insertArray($table, array $columns, array $data);
 
@@ -512,7 +479,6 @@ public function insertArray($table, array $columns, array $data);
      * @param mixed $table The table to insert data into.
      * @param array $bind Column-value pairs.
      * @return int The number of affected rows.
-     * @since 2.0.0
      */
     public function insert($table, array $bind);
 
@@ -523,7 +489,6 @@ public function insert($table, array $bind);
      * @param string $table
      * @param array $bind
      * @return int The number of affected rows.
-     * @since 2.0.0
      */
     public function insertForce($table, array $bind);
 
@@ -534,7 +499,6 @@ public function insertForce($table, array $bind);
      * @param  array        $bind  Column-value pairs.
      * @param  mixed        $where UPDATE WHERE clause(s).
      * @return int          The number of affected rows.
-     * @since 2.0.0
      */
     public function update($table, array $bind, $where = '');
 
@@ -544,7 +508,6 @@ public function update($table, array $bind, $where = '');
      * @param  mixed        $table The table to update.
      * @param  mixed        $where DELETE WHERE clause(s).
      * @return int          The number of affected rows.
-     * @since 2.0.0
      */
     public function delete($table, $where = '');
 
@@ -555,7 +518,6 @@ public function delete($table, $where = '');
      *                      May be a string or \Magento\Framework\DB\Select.
      * @param  mixed  $bind An array of data or data itself to bind to the placeholders.
      * @return \Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function query($sql, $bind = []);
 
@@ -567,7 +529,6 @@ public function query($sql, $bind = []);
      * @param mixed                 $bind Data to bind into SELECT placeholders.
      * @param mixed                 $fetchMode Override current fetch mode.
      * @return array
-     * @since 2.0.0
      */
     public function fetchAll($sql, $bind = [], $fetchMode = null);
 
@@ -579,7 +540,6 @@ public function fetchAll($sql, $bind = [], $fetchMode = null);
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @param mixed                 $fetchMode Override current fetch mode.
      * @return array
-     * @since 2.0.0
      */
     public function fetchRow($sql, $bind = [], $fetchMode = null);
 
@@ -595,7 +555,6 @@ public function fetchRow($sql, $bind = [], $fetchMode = null);
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @return array
-     * @since 2.0.0
      */
     public function fetchAssoc($sql, $bind = []);
 
@@ -607,7 +566,6 @@ public function fetchAssoc($sql, $bind = []);
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @return array
-     * @since 2.0.0
      */
     public function fetchCol($sql, $bind = []);
 
@@ -620,7 +578,6 @@ public function fetchCol($sql, $bind = []);
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @return array
-     * @since 2.0.0
      */
     public function fetchPairs($sql, $bind = []);
 
@@ -630,7 +587,6 @@ public function fetchPairs($sql, $bind = []);
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @return string
-     * @since 2.0.0
      */
     public function fetchOne($sql, $bind = []);
 
@@ -643,7 +599,6 @@ public function fetchOne($sql, $bind = []);
      * @param mixed $value The value to quote.
      * @param mixed $type  OPTIONAL the SQL datatype name, or constant, or null.
      * @return mixed An SQL-safe quoted value (or string of separated values).
-     * @since 2.0.0
      */
     public function quote($value, $type = null);
 
@@ -665,7 +620,6 @@ public function quote($value, $type = null);
      * @param string  $type  OPTIONAL SQL datatype
      * @param integer $count OPTIONAL count of placeholders to replace
      * @return string An SQL-safe quoted value placed into the original text.
-     * @since 2.0.0
      */
     public function quoteInto($text, $value, $type = null, $count = null);
 
@@ -690,7 +644,6 @@ public function quoteInto($text, $value, $type = null, $count = null);
      * @param string|array|\Zend_Db_Expr $ident The identifier.
      * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
      * @return string The quoted identifier.
-     * @since 2.0.0
      */
     public function quoteIdentifier($ident, $auto = false);
 
@@ -701,7 +654,6 @@ public function quoteIdentifier($ident, $auto = false);
      * @param string $alias An alias for the column.
      * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
      * @return string The quoted identifier and alias.
-     * @since 2.0.0
      */
     public function quoteColumnAs($ident, $alias, $auto = false);
 
@@ -712,7 +664,6 @@ public function quoteColumnAs($ident, $alias, $auto = false);
      * @param string $alias An alias for the table.
      * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
      * @return string The quoted identifier and alias.
-     * @since 2.0.0
      */
     public function quoteTableAs($ident, $alias = null, $auto = false);
 
@@ -722,7 +673,6 @@ public function quoteTableAs($ident, $alias = null, $auto = false);
      * @param int|string|\DateTimeInterface $date
      * @param boolean $includeTime
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function formatDate($date, $includeTime = true);
 
@@ -730,7 +680,6 @@ public function formatDate($date, $includeTime = true);
      * Run additional environment before setup
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function startSetup();
 
@@ -738,7 +687,6 @@ public function startSetup();
      * Run additional environment after setup
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function endSetup();
 
@@ -747,7 +695,6 @@ public function endSetup();
      *
      * @param \Magento\Framework\Cache\FrontendInterface $cacheAdapter
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function setCacheAdapter(\Magento\Framework\Cache\FrontendInterface $cacheAdapter);
 
@@ -755,7 +702,6 @@ public function setCacheAdapter(\Magento\Framework\Cache\FrontendInterface $cach
      * Allow DDL caching
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function allowDdlCache();
 
@@ -763,7 +709,6 @@ public function allowDdlCache();
      * Disallow DDL caching
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function disallowDdlCache();
 
@@ -774,7 +719,6 @@ public function disallowDdlCache();
      * @param string $tableName
      * @param string $schemaName OPTIONAL
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function resetDdlCache($tableName = null, $schemaName = null);
 
@@ -785,7 +729,6 @@ public function resetDdlCache($tableName = null, $schemaName = null);
      * @param int $ddlType
      * @param mixed $data
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function saveDdlCache($tableCacheKey, $ddlType, $data);
 
@@ -796,7 +739,6 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data);
      * @param string $tableCacheKey the table cache key
      * @param int $ddlType          the DDL constant
      * @return string|array|int|false
-     * @since 2.0.0
      */
     public function loadDdlCache($tableCacheKey, $ddlType);
 
@@ -830,7 +772,6 @@ public function loadDdlCache($tableCacheKey, $ddlType);
      * @param string $fieldName
      * @param integer|string|array $condition
      * @return string
-     * @since 2.0.0
      */
     public function prepareSqlCondition($fieldName, $condition);
 
@@ -841,7 +782,6 @@ public function prepareSqlCondition($fieldName, $condition);
      * @param array $column     the column describe array
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function prepareColumnValue(array $column, $value);
 
@@ -852,7 +792,6 @@ public function prepareColumnValue(array $column, $value);
      * @param string $true          true value
      * @param string $false         false value
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getCheckSql($condition, $true, $false);
 
@@ -862,7 +801,6 @@ public function getCheckSql($condition, $true, $false);
      * @param string $expression
      * @param string|int $value OPTIONAL. Applies when $expression is NULL
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getIfNullSql($expression, $value = 0);
 
@@ -873,7 +811,6 @@ public function getIfNullSql($expression, $value = 0);
      * @param array $data
      * @param string $separator concatenate with separator
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getConcatSql(array $data, $separator = null);
 
@@ -883,7 +820,6 @@ public function getConcatSql(array $data, $separator = null);
      *
      * @param string $string
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getLengthSql($string);
 
@@ -894,7 +830,6 @@ public function getLengthSql($string);
      *
      * @param array $data
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getLeastSql(array $data);
 
@@ -905,7 +840,6 @@ public function getLeastSql(array $data);
      *
      * @param array $data
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getGreatestSql(array $data);
 
@@ -918,7 +852,6 @@ public function getGreatestSql(array $data);
      * @param int $interval
      * @param string $unit
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateAddSql($date, $interval, $unit);
 
@@ -931,7 +864,6 @@ public function getDateAddSql($date, $interval, $unit);
      * @param int|string $interval
      * @param string $unit
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateSubSql($date, $interval, $unit);
 
@@ -950,7 +882,6 @@ public function getDateSubSql($date, $interval, $unit);
      * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
      * @param string $format
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateFormatSql($date, $format);
 
@@ -959,7 +890,6 @@ public function getDateFormatSql($date, $format);
      *
      * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDatePartSql($date);
 
@@ -970,7 +900,6 @@ public function getDatePartSql($date);
      * @param int|string|\Zend_Db_Expr $pos
      * @param int|string|\Zend_Db_Expr|null $len
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getSubstringSql($stringExpression, $pos, $len = null);
 
@@ -979,7 +908,6 @@ public function getSubstringSql($stringExpression, $pos, $len = null);
      *
      * @param \Zend_Db_Expr|string $expressionField   quoted field name or SQL statement
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getStandardDeviationSql($expressionField);
 
@@ -991,7 +919,6 @@ public function getStandardDeviationSql($expressionField);
      * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
      * @param string $unit
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateExtractSql($date, $unit);
 
@@ -1001,7 +928,6 @@ public function getDateExtractSql($date, $unit);
      *
      * @param string $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTableName($tableName);
 
@@ -1012,7 +938,6 @@ public function getTableName($tableName);
      * @param string $time  Either "before" or "after"
      * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
      * @return string
-     * @since 2.0.0
      */
     public function getTriggerName($tableName, $time, $event);
 
@@ -1024,7 +949,6 @@ public function getTriggerName($tableName, $time, $event);
      * @param string|array $fields  the columns list
      * @param string $indexType
      * @return string
-     * @since 2.0.0
      */
     public function getIndexName($tableName, $fields, $indexType = '');
 
@@ -1037,7 +961,6 @@ public function getIndexName($tableName, $fields, $indexType = '');
      * @param string $refTableName
      * @param string $refColumnName
      * @return string
-     * @since 2.0.0
      */
     public function getForeignKeyName($priTableName, $priColumnName, $refTableName, $refColumnName);
 
@@ -1047,7 +970,6 @@ public function getForeignKeyName($priTableName, $priColumnName, $refTableName,
      * @param string $tableName
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function disableTableKeys($tableName, $schemaName = null);
 
@@ -1057,7 +979,6 @@ public function disableTableKeys($tableName, $schemaName = null);
      * @param string $tableName
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function enableTableKeys($tableName, $schemaName = null);
 
@@ -1069,7 +990,6 @@ public function enableTableKeys($tableName, $schemaName = null);
      * @param array $fields
      * @param int|bool $mode
      * @return string
-     * @since 2.0.0
      */
     public function insertFromSelect(\Magento\Framework\DB\Select $select, $table, array $fields = [], $mode = false);
 
@@ -1081,7 +1001,6 @@ public function insertFromSelect(\Magento\Framework\DB\Select $select, $table, a
      * @param int $stepCount
      * @return \Magento\Framework\DB\Select[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function selectsByRange($rangeField, \Magento\Framework\DB\Select $select, $stepCount = 100);
 
@@ -1091,7 +1010,6 @@ public function selectsByRange($rangeField, \Magento\Framework\DB\Select $select
      * @param \Magento\Framework\DB\Select $select
      * @param string|array $table
      * @return string
-     * @since 2.0.0
      */
     public function updateFromSelect(\Magento\Framework\DB\Select $select, $table);
 
@@ -1101,7 +1019,6 @@ public function updateFromSelect(\Magento\Framework\DB\Select $select, $table);
      * @param \Magento\Framework\DB\Select $select
      * @param string $table the table name or alias used in select
      * @return string|int
-     * @since 2.0.0
      */
     public function deleteFromSelect(\Magento\Framework\DB\Select $select, $table);
 
@@ -1111,7 +1028,6 @@ public function deleteFromSelect(\Magento\Framework\DB\Select $select, $table);
      * @param array|string $tableNames
      * @param string $schemaName
      * @return array
-     * @since 2.0.0
      */
     public function getTablesChecksum($tableNames, $schemaName = null);
 
@@ -1119,7 +1035,6 @@ public function getTablesChecksum($tableNames, $schemaName = null);
      * Check if the database support STRAIGHT JOIN
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function supportStraightJoin();
 
@@ -1130,7 +1045,6 @@ public function supportStraightJoin();
      * @param \Magento\Framework\DB\Select $select
      * @param string $field
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function orderRand(\Magento\Framework\DB\Select $select, $field = null);
 
@@ -1139,7 +1053,6 @@ public function orderRand(\Magento\Framework\DB\Select $select, $field = null);
      *
      * @param string $sql
      * @return string
-     * @since 2.0.0
      */
     public function forUpdate($sql);
 
@@ -1149,7 +1062,6 @@ public function forUpdate($sql);
      * @param string $tableName Table name
      * @param string $schemaName OPTIONAL
      * @return string Primary Key name
-     * @since 2.0.0
      */
     public function getPrimaryKeyName($tableName, $schemaName = null);
 
@@ -1159,7 +1071,6 @@ public function getPrimaryKeyName($tableName, $schemaName = null);
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function decodeVarbinary($value);
 
@@ -1167,7 +1078,6 @@ public function decodeVarbinary($value);
      * Get adapter transaction level state. Return 0 if all transactions are complete
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTransactionLevel();
 
@@ -1176,7 +1086,6 @@ public function getTransactionLevel();
      *
      * @param \Magento\Framework\DB\Ddl\Trigger $trigger
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger);
 
@@ -1186,7 +1095,6 @@ public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger);
      * @param string $triggerName
      * @param string|null $schemaName
      * @return bool
-     * @since 2.0.0
      */
     public function dropTrigger($triggerName, $schemaName = null);
 
@@ -1195,7 +1103,6 @@ public function dropTrigger($triggerName, $schemaName = null);
      *
      * @param null|string $likeCondition
      * @return array
-     * @since 2.0.0
      */
     public function getTables($likeCondition = null);
 
@@ -1207,7 +1114,6 @@ public function getTables($likeCondition = null);
      * @param array $casesResults Cases and results
      * @param string $defaultValue value to use if value doesn't confirm to any cases
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getCaseSql($valueName, $casesResults, $defaultValue = null);
 
diff --git a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
index 33f8343e343ea..0a51354f77462 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
@@ -11,7 +11,6 @@
 
 /**
  * Cache segment for DDL operations in database adapter
- * @since 2.0.0
  */
 class DdlCache extends TagScope
 {
@@ -29,7 +28,6 @@ class DdlCache extends TagScope
      * Constructor
      *
      * @param FrontendPool $cacheFrontendPool
-     * @since 2.0.0
      */
     public function __construct(FrontendPool $cacheFrontendPool)
     {
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 5a394d3a8bf4f..6b246d75e76a8 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -36,7 +36,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
 {
@@ -71,7 +70,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Default class name for a DB statement.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultStmtClass = \Magento\Framework\DB\Statement\Pdo\Mysql::class;
 
@@ -79,7 +77,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Current Transaction Level
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_transactionLevel    = 0;
 
@@ -87,7 +84,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Whether transaction was rolled back or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isRolledBack = false;
 
@@ -95,7 +91,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Set attribute to connection flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_connectionFlagsSet  = false;
 
@@ -103,7 +98,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Tables DDL cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ddlCache            = [];
 
@@ -111,7 +105,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * SQL bind params. Used temporarily by regexp callback.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_bindParams          = [];
 
@@ -119,7 +112,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Autoincrement for bind value. Used by regexp callback.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_bindIncrement       = 0;
 
@@ -127,14 +119,12 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Cache frontend adapter instance
      *
      * @var FrontendInterface
-     * @since 2.0.0
      */
     protected $_cacheAdapter;
 
     /**
      * DDL cache allowing flag
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDdlCacheAllowed = true;
 
@@ -142,7 +132,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * MySQL column - Table DDL type pairs
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_ddlColumnTypes      = [
         Table::TYPE_BOOLEAN       => 'bool',
@@ -165,7 +154,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * First 3 symbols for each statement
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_ddlRoutines = ['alt', 'cre', 'ren', 'dro', 'tru'];
 
@@ -173,7 +161,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Allowed interval units array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_intervalUnits = [
         self::INTERVAL_YEAR     => 'YEAR',
@@ -188,19 +175,16 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * Hook callback to modify queries. Mysql specific property, designed only for backwards compatibility.
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_queryHook = null;
 
     /**
      * @var String
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var DateTime
-     * @since 2.0.0
      */
     protected $dateTime;
 
@@ -212,7 +196,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -226,7 +209,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
 
     /**
      * @var QueryGenerator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $queryGenerator;
 
@@ -245,7 +228,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      * @param SelectFactory $selectFactory
      * @param array $config
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         StringUtils $string,
@@ -284,7 +266,6 @@ public function __construct(
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function beginTransaction()
     {
@@ -305,7 +286,6 @@ public function beginTransaction()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function commit()
     {
@@ -327,7 +307,6 @@ public function commit()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function rollBack()
     {
@@ -349,7 +328,6 @@ public function rollBack()
      * Get adapter transaction level state. Return 0 if all transactions are complete
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTransactionLevel()
     {
@@ -361,7 +339,6 @@ public function getTransactionLevel()
      *
      * @param int|string|\DateTimeInterface $date
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function convertDate($date)
     {
@@ -373,7 +350,6 @@ public function convertDate($date)
      *
      * @param   int|string|\DateTimeInterface $datetime
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function convertDateTime($datetime)
     {
@@ -389,7 +365,6 @@ public function convertDateTime($datetime)
      * @return void
      * @throws \Zend_Db_Adapter_Exception
      * @throws \Zend_Db_Statement_Exception
-     * @since 2.0.0
      */
     protected function _connect()
     {
@@ -456,7 +431,6 @@ protected function _connect()
      * @param string $sql
      * @return \Zend_Db_Statement_Interface
      * @throws \PDOException
-     * @since 2.0.0
      */
     public function rawQuery($sql)
     {
@@ -480,7 +454,6 @@ public function rawQuery($sql)
      * @param string $sql
      * @param string|int $field
      * @return mixed|null
-     * @since 2.0.0
      */
     public function rawFetchRow($sql, $field = null)
     {
@@ -507,7 +480,6 @@ public function rawFetchRow($sql, $field = null)
      * @param string|\Magento\Framework\DB\Select $sql
      * @return void
      * @throws \Zend_Db_Adapter_Exception
-     * @since 2.0.0
      */
     protected function _checkDdlTransaction($sql)
     {
@@ -531,7 +503,6 @@ protected function _checkDdlTransaction($sql)
      * @throws \Zend_Db_Adapter_Exception To re-throw \PDOException.
      * @throws \Zend_Db_Statement_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _query($sql, $bind = [])
     {
@@ -603,7 +574,6 @@ protected function _query($sql, $bind = [])
      * @throws \Zend_Db_Adapter_Exception To re-throw \PDOException.
      * @throws LocalizedException In case multiple queries are attempted at once, to protect from SQL injection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function query($sql, $bind = [])
     {
@@ -627,7 +597,6 @@ public function query($sql, $bind = [])
      * @throws LocalizedException In case multiple queries are attempted at once, to protect from SQL injection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function multiQuery($sql, $bind = [])
     {
@@ -642,7 +611,6 @@ public function multiQuery($sql, $bind = [])
      * @param \Magento\Framework\DB\Select|string $sql
      * @param mixed $bind
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareQuery(&$sql, &$bind = [])
     {
@@ -683,7 +651,6 @@ protected function _prepareQuery(&$sql, &$bind = [])
      *
      * @param string[] $matches
      * @return string
-     * @since 2.0.0
      */
     public function proccessBindCallback($matches)
     {
@@ -704,7 +671,6 @@ public function proccessBindCallback($matches)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     protected function _unQuote($string)
     {
@@ -727,7 +693,6 @@ protected function _unQuote($string)
      * @param string $sql
      * @param array $bind
      * @return $this
-     * @since 2.0.0
      */
     protected function _convertMixedBind(&$sql, &$bind)
     {
@@ -783,7 +748,6 @@ protected function _convertMixedBind(&$sql, &$bind)
      *
      * @param array $hook
      * @return array|null
-     * @since 2.0.0
      */
     public function setQueryHook($hook)
     {
@@ -799,8 +763,7 @@ public function setQueryHook($hook)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.2
      */
     protected function _splitMultiQuery($sql)
     {
@@ -864,7 +827,6 @@ protected function _splitMultiQuery($sql)
      * @param string $fkName
      * @param string $schemaName
      * @return $this
-     * @since 2.0.0
      */
     public function dropForeignKey($tableName, $fkName, $schemaName = null)
     {
@@ -896,7 +858,6 @@ public function dropForeignKey($tableName, $fkName, $schemaName = null)
      * @param string $refColumnName
      * @param string $onDelete
      * @return $this
-     * @since 2.0.0
      */
     public function purgeOrphanRecords(
         $tableName,
@@ -941,7 +902,6 @@ public function purgeOrphanRecords(
      * @param string $columnName
      * @param string $schemaName
      * @return bool
-     * @since 2.0.0
      */
     public function tableColumnExists($tableName, $columnName, $schemaName = null)
     {
@@ -967,7 +927,6 @@ public function tableColumnExists($tableName, $columnName, $schemaName = null)
      * @param   string $schemaName
      * @return  true|\Zend_Db_Statement_Pdo
      * @throws  \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function addColumn($tableName, $columnName, $definition, $schemaName = null)
     {
@@ -1009,7 +968,6 @@ public function addColumn($tableName, $columnName, $definition, $schemaName = nu
      * @param string $columnName
      * @param string $schemaName
      * @return true|\Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function dropColumn($tableName, $columnName, $schemaName = null)
     {
@@ -1058,7 +1016,6 @@ public function dropColumn($tableName, $columnName, $schemaName = null)
      * @param array $columns
      * @param string|null $schemaName
      * @return array|null
-     * @since 2.0.0
      */
     protected function _getIndexByColumns($tableName, array $columns, $schemaName)
     {
@@ -1083,7 +1040,6 @@ protected function _getIndexByColumns($tableName, array $columns, $schemaName)
      * @param string $schemaName
      * @return \Zend_Db_Statement_Pdo
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function changeColumn(
         $tableName,
@@ -1135,7 +1091,6 @@ public function changeColumn(
      * @param string $schemaName
      * @return $this
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function modifyColumn($tableName, $columnName, $definition, $flushData = false, $schemaName = null)
     {
@@ -1168,7 +1123,6 @@ public function modifyColumn($tableName, $columnName, $definition, $flushData =
      * @param string $tableName
      * @param string $schemaName
      * @return mixed
-     * @since 2.0.0
      */
     public function showTableStatus($tableName, $schemaName = null)
     {
@@ -1187,7 +1141,6 @@ public function showTableStatus($tableName, $schemaName = null)
      * @param string $tableName
      * @param string $schemaName
      * @return string
-     * @since 2.0.0
      */
     public function getCreateTable($tableName, $schemaName = null)
     {
@@ -1223,7 +1176,6 @@ public function getCreateTable($tableName, $schemaName = null)
      * @param string $tableName
      * @param string $schemaName
      * @return array
-     * @since 2.0.0
      */
     public function getForeignKeys($tableName, $schemaName = null)
     {
@@ -1263,7 +1215,6 @@ public function getForeignKeys($tableName, $schemaName = null)
      * Retrieve the foreign keys tree for all tables
      *
      * @return array
-     * @since 2.0.0
      */
     public function getForeignKeysTree()
     {
@@ -1293,7 +1244,6 @@ public function getForeignKeysTree()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function modifyTables($tables)
     {
@@ -1369,7 +1319,6 @@ public function modifyTables($tables)
      * @param string $tableName
      * @param string $schemaName
      * @return array|string|int
-     * @since 2.0.0
      */
     public function getIndexList($tableName, $schemaName = null)
     {
@@ -1428,7 +1377,6 @@ public function getIndexList($tableName, $schemaName = null)
      * @param array $fields
      * @param string[] $ids
      * @return $this
-     * @since 2.0.0
      */
     protected function _removeDuplicateEntry($table, $fields, $ids)
     {
@@ -1462,7 +1410,6 @@ protected function _removeDuplicateEntry($table, $fields, $ids)
      * Creates and returns a new \Magento\Framework\DB\Select object for this adapter.
      *
      * @return Select
-     * @since 2.0.0
      */
     public function select()
     {
@@ -1479,7 +1426,6 @@ public function select()
      * @param string  $type  OPTIONAL SQL datatype
      * @param integer $count OPTIONAL count of placeholders to replace
      * @return string An SQL-safe quoted value placed into the orignal text.
-     * @since 2.0.0
      */
     public function quoteInto($text, $value, $type = null, $count = null)
     {
@@ -1500,7 +1446,6 @@ public function quoteInto($text, $value, $type = null, $count = null)
      * @param string $tableName
      * @param string $schemaName
      * @return string
-     * @since 2.0.0
      */
     protected function _getTableName($tableName, $schemaName = null)
     {
@@ -1513,7 +1458,6 @@ protected function _getTableName($tableName, $schemaName = null)
      * @param string $tableKey
      * @param int $ddlType
      * @return string
-     * @since 2.0.0
      */
     protected function _getCacheId($tableKey, $ddlType)
     {
@@ -1527,7 +1471,6 @@ protected function _getCacheId($tableKey, $ddlType)
      * @param string $tableCacheKey the table cache key
      * @param int $ddlType          the DDL constant
      * @return string|array|int|false
-     * @since 2.0.0
      */
     public function loadDdlCache($tableCacheKey, $ddlType)
     {
@@ -1558,7 +1501,6 @@ public function loadDdlCache($tableCacheKey, $ddlType)
      * @param int $ddlType
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function saveDdlCache($tableCacheKey, $ddlType, $data)
     {
@@ -1583,7 +1525,6 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data)
      * @param string $tableName
      * @param string $schemaName OPTIONAL
      * @return $this
-     * @since 2.0.0
      */
     public function resetDdlCache($tableName = null, $schemaName = null)
     {
@@ -1617,7 +1558,6 @@ public function resetDdlCache($tableName = null, $schemaName = null)
     /**
      * Disallow DDL caching
      * @return $this
-     * @since 2.0.0
      */
     public function disallowDdlCache()
     {
@@ -1628,7 +1568,6 @@ public function disallowDdlCache()
     /**
      * Allow DDL caching
      * @return $this
-     * @since 2.0.0
      */
     public function allowDdlCache()
     {
@@ -1663,7 +1602,6 @@ public function allowDdlCache()
      * @param string $tableName
      * @param string $schemaName OPTIONAL
      * @return array
-     * @since 2.0.0
      */
     public function describeTable($tableName, $schemaName = null)
     {
@@ -1695,7 +1633,6 @@ public function describeTable($tableName, $schemaName = null)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getColumnCreateByDescribe($columnData)
     {
@@ -1745,7 +1682,6 @@ public function getColumnCreateByDescribe($columnData)
      * @param string $tableName
      * @param string $newTableName
      * @return Table
-     * @since 2.0.0
      */
     public function createTableByDdl($tableName, $newTableName)
     {
@@ -1817,7 +1753,6 @@ public function createTableByDdl($tableName, $newTableName)
      * @param boolean $flushData
      * @param string $schemaName
      * @return $this
-     * @since 2.0.0
      */
     public function modifyColumnByDdl($tableName, $columnName, $definition, $flushData = false, $schemaName = null)
     {
@@ -1836,7 +1771,6 @@ public function modifyColumnByDdl($tableName, $columnName, $definition, $flushDa
      * @param array $column
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getColumnTypeByDdl($column)
     {
@@ -1883,7 +1817,6 @@ protected function _getColumnTypeByDdl($column)
      * @param string $engine
      * @param string $schemaName
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function changeTableEngine($tableName, $engine, $schemaName = null)
     {
@@ -1900,7 +1833,6 @@ public function changeTableEngine($tableName, $engine, $schemaName = null)
      * @param string $comment
      * @param string $schemaName
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function changeTableComment($tableName, $comment, $schemaName = null)
     {
@@ -1917,7 +1849,6 @@ public function changeTableComment($tableName, $comment, $schemaName = null)
      * @param string $table
      * @param array $bind
      * @return int The number of affected rows.
-     * @since 2.0.0
      */
     public function insertForce($table, array $bind)
     {
@@ -1938,7 +1869,6 @@ public function insertForce($table, array $bind)
      * @throws \Zend_Db_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function insertOnDuplicate($table, array $data, array $fields = [])
     {
@@ -2008,7 +1938,6 @@ public function insertOnDuplicate($table, array $data, array $fields = [])
      * @param array $data Column-value pairs or array of Column-value pairs.
      * @return int The number of affected rows.
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function insertMultiple($table, array $data)
     {
@@ -2054,7 +1983,6 @@ public function insertMultiple($table, array $data)
      * @param   int $strategy
      * @return int
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function insertArray($table, array $columns, array $data, $strategy = 0)
     {
@@ -2088,7 +2016,6 @@ public function insertArray($table, array $columns, array $data, $strategy = 0)
      *
      * @param FrontendInterface $cacheAdapter
      * @return $this
-     * @since 2.0.0
      */
     public function setCacheAdapter(FrontendInterface $cacheAdapter)
     {
@@ -2102,7 +2029,6 @@ public function setCacheAdapter(FrontendInterface $cacheAdapter)
      * @param string $tableName the table name
      * @param string $schemaName the database/schema name
      * @return Table
-     * @since 2.0.0
      */
     public function newTable($tableName = null, $schemaName = null)
     {
@@ -2126,7 +2052,6 @@ public function newTable($tableName = null, $schemaName = null)
      * @param Table $table
      * @throws \Zend_Db_Exception
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function createTable(Table $table)
     {
@@ -2162,7 +2087,6 @@ public function createTable(Table $table)
      * @throws \Zend_Db_Exception
      * @return \Zend_Db_Pdo_Statement
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
     {
@@ -2190,7 +2114,6 @@ public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
      * @param string $originTableName
      * @param bool $ifNotExists
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function createTemporaryTableLike($temporaryTableName, $originTableName, $ifNotExists = false)
     {
@@ -2209,7 +2132,6 @@ public function createTemporaryTableLike($temporaryTableName, $originTableName,
      *
      * @return boolean
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function renameTablesBatch(array $tablePairs)
     {
@@ -2244,7 +2166,6 @@ public function renameTablesBatch(array $tablePairs)
      * @param Table $table
      * @return string[]
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     protected function _getColumnsDefinition(Table $table)
     {
@@ -2283,7 +2204,6 @@ protected function _getColumnsDefinition(Table $table)
      *
      * @param Table $table
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getIndexesDefinition(Table $table)
     {
@@ -2333,7 +2253,6 @@ protected function _getIndexesDefinition(Table $table)
      *
      * @param Table $table
      * @return bool
-     * @since 2.0.0
      */
     protected function isNdb(Table $table)
     {
@@ -2346,7 +2265,6 @@ protected function isNdb(Table $table)
      *
      * @param Table $table
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getForeignKeysDefinition(Table $table)
     {
@@ -2376,7 +2294,6 @@ protected function _getForeignKeysDefinition(Table $table)
      * @param Table $table
      * @return string[]
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     protected function _getOptionsDefinition(Table $table)
     {
@@ -2415,7 +2332,6 @@ protected function _getOptionsDefinition(Table $table)
      * @param  array $options
      * @param  null|string $ddlType
      * @return string
-     * @since 2.0.0
      */
     public function getColumnDefinitionFromDescribe($options, $ddlType = null)
     {
@@ -2438,7 +2354,6 @@ public function getColumnDefinitionFromDescribe($options, $ddlType = null)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     protected function _getColumnDefinition($options, $ddlType = null)
     {
@@ -2578,7 +2493,6 @@ protected function _getColumnDefinition($options, $ddlType = null)
      * @param string $tableName
      * @param string $schemaName
      * @return true
-     * @since 2.0.0
      */
     public function dropTable($tableName, $schemaName = null)
     {
@@ -2595,7 +2509,6 @@ public function dropTable($tableName, $schemaName = null)
      * @param string $tableName
      * @param string $schemaName
      * @return boolean
-     * @since 2.0.0
      */
     public function dropTemporaryTable($tableName, $schemaName = null)
     {
@@ -2613,7 +2526,6 @@ public function dropTemporaryTable($tableName, $schemaName = null)
      * @param string $schemaName
      * @return $this
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function truncateTable($tableName, $schemaName = null)
     {
@@ -2634,7 +2546,6 @@ public function truncateTable($tableName, $schemaName = null)
      * @param string $tableName
      * @param string $schemaName
      * @return bool
-     * @since 2.0.0
      */
     public function isTableExists($tableName, $schemaName = null)
     {
@@ -2649,7 +2560,6 @@ public function isTableExists($tableName, $schemaName = null)
      * @param string $schemaName
      * @return true
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function renameTable($oldTableName, $newTableName, $schemaName = null)
     {
@@ -2684,7 +2594,6 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function addIndex(
         $tableName,
@@ -2770,7 +2679,6 @@ public function addIndex(
      * @param string $keyName
      * @param string $schemaName
      * @return true|\Zend_Db_Statement_Interface
-     * @since 2.0.0
      */
     public function dropIndex($tableName, $keyName, $schemaName = null)
     {
@@ -2811,7 +2719,6 @@ public function dropIndex($tableName, $keyName, $schemaName = null)
      * @param string $refSchemaName
      * @return \Zend_Db_Statement_Interface
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function addForeignKey(
         $fkName,
@@ -2854,7 +2761,6 @@ public function addForeignKey(
      * @param int|string|\DateTimeInterface $date
      * @param bool $includeTime
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function formatDate($date, $includeTime = true)
     {
@@ -2871,7 +2777,6 @@ public function formatDate($date, $includeTime = true)
      * Run additional environment before setup
      *
      * @return $this
-     * @since 2.0.0
      */
     public function startSetup()
     {
@@ -2886,7 +2791,6 @@ public function startSetup()
      * Run additional environment after setup
      *
      * @return $this
-     * @since 2.0.0
      */
     public function endSetup()
     {
@@ -2926,7 +2830,6 @@ public function endSetup()
      * @param integer|string|array $condition
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function prepareSqlCondition($fieldName, $condition)
     {
@@ -2999,7 +2902,6 @@ public function prepareSqlCondition($fieldName, $condition)
      * @param  mixed $value
      * @param  string $fieldName
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareQuotedSqlCondition($text, $value, $fieldName)
     {
@@ -3016,7 +2918,6 @@ protected function _prepareQuotedSqlCondition($text, $value, $fieldName)
      * @param string $conditionKey
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     protected function _transformStringSqlCondition($conditionKey, $value)
     {
@@ -3038,7 +2939,6 @@ protected function _transformStringSqlCondition($conditionKey, $value)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function prepareColumnValue(array $column, $value)
     {
@@ -3123,7 +3023,6 @@ public function prepareColumnValue(array $column, $value)
      * @param string $true  true value
      * @param string $false false value
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getCheckSql($expression, $true, $false)
     {
@@ -3142,7 +3041,6 @@ public function getCheckSql($expression, $true, $false)
      * @param \Zend_Db_Expr|\Magento\Framework\DB\Select|string $expression
      * @param string|int $value OPTIONAL. Applies when $expression is NULL
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getIfNullSql($expression, $value = 0)
     {
@@ -3163,7 +3061,6 @@ public function getIfNullSql($expression, $value = 0)
      * @param array $casesResults Cases and results
      * @param string $defaultValue value to use if value doesn't confirm to any cases
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getCaseSql($valueName, $casesResults, $defaultValue = null)
     {
@@ -3186,7 +3083,6 @@ public function getCaseSql($valueName, $casesResults, $defaultValue = null)
      * @param string[] $data
      * @param string $separator concatenate with separator
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getConcatSql(array $data, $separator = null)
     {
@@ -3200,7 +3096,6 @@ public function getConcatSql(array $data, $separator = null)
      *
      * @param string $string
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getLengthSql($string)
     {
@@ -3214,7 +3109,6 @@ public function getLengthSql($string)
      *
      * @param string[] $data
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getLeastSql(array $data)
     {
@@ -3228,7 +3122,6 @@ public function getLeastSql(array $data)
      *
      * @param string[] $data
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getGreatestSql(array $data)
     {
@@ -3242,7 +3135,6 @@ public function getGreatestSql(array $data)
      * @param string $unit
      * @return string
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     protected function _getIntervalUnitSql($interval, $unit)
     {
@@ -3262,7 +3154,6 @@ protected function _getIntervalUnitSql($interval, $unit)
      * @param int $interval
      * @param string $unit
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateAddSql($date, $interval, $unit)
     {
@@ -3279,7 +3170,6 @@ public function getDateAddSql($date, $interval, $unit)
      * @param int|string $interval
      * @param string $unit
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateSubSql($date, $interval, $unit)
     {
@@ -3302,7 +3192,6 @@ public function getDateSubSql($date, $interval, $unit)
      * @param string $date  quoted date value or non quoted SQL statement(field)
      * @param string $format
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateFormatSql($date, $format)
     {
@@ -3315,7 +3204,6 @@ public function getDateFormatSql($date, $format)
      *
      * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDatePartSql($date)
     {
@@ -3329,7 +3217,6 @@ public function getDatePartSql($date)
      * @param int|string|\Zend_Db_Expr $pos
      * @param int|string|\Zend_Db_Expr|null $len
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getSubstringSql($stringExpression, $pos, $len = null)
     {
@@ -3344,7 +3231,6 @@ public function getSubstringSql($stringExpression, $pos, $len = null)
      *
      * @param \Zend_Db_Expr|string $expressionField   quoted field name or SQL statement
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getStandardDeviationSql($expressionField)
     {
@@ -3360,7 +3246,6 @@ public function getStandardDeviationSql($expressionField)
      * @param string $unit
      * @return \Zend_Db_Expr
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function getDateExtractSql($date, $unit)
     {
@@ -3378,7 +3263,6 @@ public function getDateExtractSql($date, $unit)
      * @param string $tableName
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTableName($tableName)
     {
@@ -3393,7 +3277,6 @@ public function getTableName($tableName)
      * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTriggerName($tableName, $time, $event)
     {
@@ -3409,7 +3292,6 @@ public function getTriggerName($tableName, $time, $event)
      * @param string|string[] $fields  the columns list
      * @param string $indexType
      * @return string
-     * @since 2.0.0
      */
     public function getIndexName($tableName, $fields, $indexType = '')
     {
@@ -3441,7 +3323,6 @@ public function getIndexName($tableName, $fields, $indexType = '')
      * @param string $refColumnName
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getForeignKeyName($priTableName, $priColumnName, $refTableName, $refColumnName)
     {
@@ -3455,7 +3336,6 @@ public function getForeignKeyName($priTableName, $priColumnName, $refTableName,
      * @param string $tableName
      * @param string $schemaName
      * @return $this
-     * @since 2.0.0
      */
     public function disableTableKeys($tableName, $schemaName = null)
     {
@@ -3472,7 +3352,6 @@ public function disableTableKeys($tableName, $schemaName = null)
      * @param string $tableName
      * @param string $schemaName
      * @return $this
-     * @since 2.0.0
      */
     public function enableTableKeys($tableName, $schemaName = null)
     {
@@ -3491,7 +3370,6 @@ public function enableTableKeys($tableName, $schemaName = null)
      * @param array $fields
      * @param int|false $mode
      * @return string
-     * @since 2.0.0
      */
     public function insertFromSelect(Select $select, $table, array $fields = [], $mode = false)
     {
@@ -3549,8 +3427,7 @@ private function renderOnDuplicate($table, array $fields)
      * @param int $stepCount
      * @return \Magento\Framework\DB\Select[]
      * @throws LocalizedException
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.3
      */
     public function selectsByRange($rangeField, \Magento\Framework\DB\Select $select, $stepCount = 100)
     {
@@ -3566,8 +3443,8 @@ public function selectsByRange($rangeField, \Magento\Framework\DB\Select $select
      * Get query generator
      *
      * @return QueryGenerator
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.3
+     * @since 2.1.3
      */
     private function getQueryGenerator()
     {
@@ -3586,7 +3463,6 @@ private function getQueryGenerator()
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function updateFromSelect(Select $select, $table)
     {
@@ -3664,7 +3540,6 @@ public function updateFromSelect(Select $select, $table)
      * @param Select $select
      * @param string $table the table name or alias used in select
      * @return string
-     * @since 2.0.0
      */
     public function deleteFromSelect(Select $select, $table)
     {
@@ -3683,7 +3558,6 @@ public function deleteFromSelect(Select $select, $table)
      * @param array|string $tableNames array of tables names | table name
      * @param string $schemaName schema name
      * @return array
-     * @since 2.0.0
      */
     public function getTablesChecksum($tableNames, $schemaName = null)
     {
@@ -3703,7 +3577,6 @@ public function getTablesChecksum($tableNames, $schemaName = null)
      * Check if the database support STRAIGHT JOIN
      *
      * @return true
-     * @since 2.0.0
      */
     public function supportStraightJoin()
     {
@@ -3717,7 +3590,6 @@ public function supportStraightJoin()
      * @param Select $select
      * @param string $field
      * @return $this
-     * @since 2.0.0
      */
     public function orderRand(Select $select, $field = null)
     {
@@ -3738,7 +3610,6 @@ public function orderRand(Select $select, $field = null)
      *
      * @param string $sql
      * @return string
-     * @since 2.0.0
      */
     public function forUpdate($sql)
     {
@@ -3751,7 +3622,6 @@ public function forUpdate($sql)
      * @param mixed $row
      * @param array $bind
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareInsertData($row, &$bind)
     {
@@ -3777,7 +3647,6 @@ protected function _prepareInsertData($row, &$bind)
      * @param array $columns
      * @param array $values
      * @return string
-     * @since 2.0.0
      */
     protected function _getInsertSqlQuery($tableName, array $columns, array $values)
     {
@@ -3817,7 +3686,6 @@ protected function _getReplaceSqlQuery($tableName, array $columns, array $values
      *
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     protected function _getDdlType($options)
     {
@@ -3836,7 +3704,6 @@ protected function _getDdlType($options)
      *
      * @param string $action
      * @return string
-     * @since 2.0.0
      */
     protected function _getDdlAction($action)
     {
@@ -3858,7 +3725,6 @@ protected function _getDdlAction($action)
      * @param array $condition
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareSqlDateCondition($condition, $key)
     {
@@ -3881,7 +3747,6 @@ protected function _prepareSqlDateCondition($condition, $key)
      * @param string $tableName Table name
      * @param string $schemaName OPTIONAL
      * @return string Primary Key name
-     * @since 2.0.0
      */
     public function getPrimaryKeyName($tableName, $schemaName = null)
     {
@@ -3899,7 +3764,6 @@ public function getPrimaryKeyName($tableName, $schemaName = null)
      *
      * @param string|int $size
      * @return int
-     * @since 2.0.0
      */
     protected function _parseTextSize($size)
     {
@@ -3934,7 +3798,6 @@ protected function _parseTextSize($size)
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function decodeVarbinary($value)
     {
@@ -3947,7 +3810,6 @@ public function decodeVarbinary($value)
      * @param \Magento\Framework\DB\Ddl\Trigger $trigger
      * @throws \Zend_Db_Exception
      * @return \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
     {
@@ -3981,7 +3843,6 @@ public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
      * @param string|null $schemaName
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function dropTrigger($triggerName, $schemaName = null)
     {
@@ -4001,7 +3862,6 @@ public function dropTrigger($triggerName, $schemaName = null)
      * Check if all transactions have been committed
      *
      * @return void
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -4015,7 +3875,6 @@ public function __destruct()
      *
      * @param null|string $likeCondition
      * @return array
-     * @since 2.0.0
      */
     public function getTables($likeCondition = null)
     {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Sequence.php b/lib/internal/Magento/Framework/DB/Ddl/Sequence.php
index ecfc79f58de50..278c8ab4773c2 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Sequence.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Sequence.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Sequence represents DDL for manage sequences
- * @since 2.0.0
  */
 class Sequence
 {
@@ -19,7 +18,6 @@ class Sequence
      * @param string $columnType Type of sequence_value column
      * @param bool|true $unsigned Flag to set sequence_value as UNSIGNED field
      * @return string
-     * @since 2.0.0
      */
     public function getCreateSequenceDdl(
         $name,
@@ -40,7 +38,6 @@ public function getCreateSequenceDdl(
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function dropSequence($name)
     {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Table.php b/lib/internal/Magento/Framework/DB/Ddl/Table.php
index 6970c09b5f3aa..44ce0f5d76c62 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Table.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Table.php
@@ -11,7 +11,6 @@
  * Data Definition for table
  *
  * @api
- * @since 2.0.0
  */
 class Table
 {
@@ -83,7 +82,6 @@ class Table
      * Name of table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_tableName;
 
@@ -91,7 +89,6 @@ class Table
      * Schema name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schemaName;
 
@@ -99,7 +96,6 @@ class Table
      * Comment for Table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_tableComment;
 
@@ -125,7 +121,6 @@ class Table
      * COMMENT          => string; column description
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columns = [];
 
@@ -149,7 +144,6 @@ class Table
      * POSITION         => int; Position in index
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_indexes = [];
 
@@ -171,7 +165,6 @@ class Table
      * CASCADE | SET NULL | NONE | RESTRICT | SET DEFAULT
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_foreignKeys = [];
 
@@ -179,7 +172,6 @@ class Table
      * Additional table options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = ['type' => 'INNODB', 'charset' => 'utf8', 'collate' => 'utf8_general_ci'];
 
@@ -188,7 +180,6 @@ class Table
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -204,7 +195,6 @@ public function setName($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setSchema($name)
     {
@@ -217,7 +207,6 @@ public function setSchema($name)
      *
      * @param string $comment
      * @return $this
-     * @since 2.0.0
      */
     public function setComment($comment)
     {
@@ -230,7 +219,6 @@ public function setComment($comment)
      *
      * @return string
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -244,7 +232,6 @@ public function getName()
      * Get schema name
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -255,7 +242,6 @@ public function getSchema()
      * Return comment for table
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComment()
     {
@@ -285,7 +271,6 @@ public function getComment()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function addColumn($name, $type, $size = null, $options = [], $comment = null)
     {
@@ -421,7 +406,6 @@ public function addColumn($name, $type, $size = null, $options = [], $comment =
      * @return $this
      * @throws \Zend_Db_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addForeignKey($fkName, $column, $refTable, $refColumn, $onDelete = null)
     {
@@ -462,7 +446,6 @@ public function addForeignKey($fkName, $column, $refTable, $refColumn, $onDelete
      * @return $this
      * @throws \Zend_Db_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addIndex($indexName, $fields, $options = [])
     {
@@ -530,7 +513,6 @@ public function addIndex($indexName, $fields, $options = [])
      * @param bool $normalized
      * @see $this->_columns
      * @return array
-     * @since 2.0.0
      */
     public function getColumns($normalized = true)
     {
@@ -546,7 +528,6 @@ public function getColumns($normalized = true)
      * @param array $column
      * @see $this->_columns
      * @return $this
-     * @since 2.0.0
      */
     public function setColumn($column)
     {
@@ -560,7 +541,6 @@ public function setColumn($column)
      *
      * @see $this->_indexes
      * @return array
-     * @since 2.0.0
      */
     public function getIndexes()
     {
@@ -572,7 +552,6 @@ public function getIndexes()
      *
      * @see $this->_foreignKeys
      * @return array
-     * @since 2.0.0
      */
     public function getForeignKeys()
     {
@@ -585,7 +564,6 @@ public function getForeignKeys()
      * @param string $key
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setOption($key, $value)
     {
@@ -599,7 +577,6 @@ public function setOption($key, $value)
      *
      * @param string $key
      * @return null|string
-     * @since 2.0.0
      */
     public function getOption($key)
     {
@@ -613,7 +590,6 @@ public function getOption($key)
      * Retrieve array of table options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -626,7 +602,6 @@ public function getOptions()
      * @param array $a
      * @param array $b
      * @return int
-     * @since 2.0.0
      */
     protected function _sortIndexColumnPosition($a, $b)
     {
@@ -639,7 +614,6 @@ protected function _sortIndexColumnPosition($a, $b)
      * @param array $a
      * @param array $b
      * @return int
-     * @since 2.0.0
      */
     protected function _sortColumnPosition($a, $b)
     {
@@ -651,7 +625,6 @@ protected function _sortColumnPosition($a, $b)
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     protected function _normalizeIndexColumnPosition($columns)
     {
@@ -669,7 +642,6 @@ protected function _normalizeIndexColumnPosition($columns)
      *
      * @param array $columns
      * @return array
-     * @since 2.0.0
      */
     protected function _normalizeColumnPosition($columns)
     {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
index 1b84b1cfedb66..94427c3d9c39d 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Trigger
 {
@@ -31,19 +30,13 @@ class Trigger
 
     /**#@-*/
 
-    /**
-     * List of times available for trigger
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected static $listOfTimes = [self::TIME_BEFORE, self::TIME_AFTER];
 
     /**
      * List of events available for trigger
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $listOfEvents = [self::EVENT_INSERT, self::EVENT_UPDATE, self::EVENT_DELETE];
 
@@ -51,7 +44,6 @@ class Trigger
      * Name of trigger
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -59,7 +51,6 @@ class Trigger
      * Time of trigger
      *
      * @var string
-     * @since 2.0.0
      */
     protected $time;
 
@@ -67,7 +58,6 @@ class Trigger
      * Time of trigger
      *
      * @var string
-     * @since 2.0.0
      */
     protected $event;
 
@@ -75,7 +65,6 @@ class Trigger
      * Table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $tableName;
 
@@ -83,7 +72,6 @@ class Trigger
      * List of statements for trigger body
      *
      * @var array
-     * @since 2.0.0
      */
     protected $statements = [];
 
@@ -93,7 +81,6 @@ class Trigger
      * @param string $name
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -112,7 +99,6 @@ public function setName($name)
      *
      * @throws \Zend_Db_Exception
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -128,7 +114,6 @@ public function getName()
      * @param string $time
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function setTime($time)
     {
@@ -145,7 +130,6 @@ public function setTime($time)
      *
      * @throws \Zend_Db_Exception
      * @return string
-     * @since 2.0.0
      */
     public function getTime()
     {
@@ -161,7 +145,6 @@ public function getTime()
      * @param string $event
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function setEvent($event)
     {
@@ -180,7 +163,6 @@ public function setEvent($event)
      *
      * @throws \Zend_Db_Exception
      * @return string
-     * @since 2.0.0
      */
     public function getEvent()
     {
@@ -196,7 +178,6 @@ public function getEvent()
      * @param string $name
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function setTable($name)
     {
@@ -214,7 +195,6 @@ public function setTable($name)
      *
      * @throws \Zend_Db_Exception
      * @return string
-     * @since 2.0.0
      */
     public function getTable()
     {
@@ -230,7 +210,6 @@ public function getTable()
      * @param string $statement
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function addStatement($statement)
     {
@@ -252,7 +231,6 @@ public function addStatement($statement)
      * Retrieve list of statements of trigger
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStatements()
     {
@@ -263,7 +241,6 @@ public function getStatements()
      * Retrieve list of times available for trigger
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getListOfTimes()
     {
@@ -274,7 +251,6 @@ public static function getListOfTimes()
      * Retrieve list of events available for trigger
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getListOfEvents()
     {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/TriggerFactory.php b/lib/internal/Magento/Framework/DB/Ddl/TriggerFactory.php
index 3f6cd9ace5a74..32c5dba37c01f 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/TriggerFactory.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/TriggerFactory.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\DB\Ddl\TriggerFactory
  *
- * @since 2.0.0
  */
 class TriggerFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class TriggerFactory
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Framework\DB\Ddl\Trigger
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/ExpressionConverter.php b/lib/internal/Magento/Framework/DB/ExpressionConverter.php
index d71193d4fce88..2c8e16c913353 100644
--- a/lib/internal/Magento/Framework/DB/ExpressionConverter.php
+++ b/lib/internal/Magento/Framework/DB/ExpressionConverter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\DB\ExpressionConverter
  *
- * @since 2.0.0
  */
 class ExpressionConverter
 {
@@ -23,7 +22,6 @@ class ExpressionConverter
      * Dictionary maps common words in identifiers to abbreviations
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_translateMap = [
         'address'       => 'addr',
@@ -77,7 +75,6 @@ class ExpressionConverter
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public static function shortName($name)
     {
@@ -90,7 +87,6 @@ public static function shortName($name)
      * @param string $from
      * @param string $to
      * @return void
-     * @since 2.0.0
      */
     public static function addTranslate($from, $to)
     {
@@ -104,7 +100,6 @@ public static function addTranslate($from, $to)
      * @param string $entityName
      * @param string $prefix
      * @return string
-     * @since 2.0.0
      */
     public static function shortenEntityName($entityName, $prefix)
     {
@@ -131,7 +126,6 @@ public static function shortenEntityName($entityName, $prefix)
      * @param  string $prefix
      * @param  int $maxCharacters
      * @return string
-     * @since 2.0.0
      */
     private static function trimHash($hash, $prefix, $maxCharacters)
     {
diff --git a/lib/internal/Magento/Framework/DB/GenericMapper.php b/lib/internal/Magento/Framework/DB/GenericMapper.php
index f8dc8676d8457..d18e92523c98d 100644
--- a/lib/internal/Magento/Framework/DB/GenericMapper.php
+++ b/lib/internal/Magento/Framework/DB/GenericMapper.php
@@ -9,7 +9,6 @@
 
 /**
  * Class GenericMapper
- * @since 2.0.0
  */
 class GenericMapper extends AbstractMapper
 {
@@ -17,7 +16,6 @@ class GenericMapper extends AbstractMapper
      * Set initial conditions
      *
      * @return void
-     * @since 2.0.0
      */
     protected function init()
     {
@@ -29,7 +27,6 @@ protected function init()
      *
      * @param \Magento\Framework\Api\CriteriaInterface[] $criteriaList
      * @return void
-     * @since 2.0.0
      */
     public function mapCriteriaList(array $criteriaList)
     {
@@ -46,7 +43,6 @@ public function mapCriteriaList(array $criteriaList)
      *
      * @param array $filters
      * @return void
-     * @since 2.0.0
      */
     public function mapFilters(array $filters)
     {
@@ -77,7 +73,6 @@ public function mapFilters(array $filters)
      *
      * @param array $orders
      * @return void
-     * @since 2.0.0
      */
     public function mapOrders(array $orders)
     {
@@ -93,7 +88,6 @@ public function mapOrders(array $orders)
      * @throws \Zend_Db_Select_Exception
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function mapFields(array $fields)
     {
@@ -127,7 +121,6 @@ public function mapFields(array $fields)
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function mapLimit($offset, $size)
     {
@@ -139,7 +132,6 @@ public function mapLimit($offset, $size)
      *
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     public function mapDistinct($flag)
     {
diff --git a/lib/internal/Magento/Framework/DB/Helper.php b/lib/internal/Magento/Framework/DB/Helper.php
index e6b8bae6a6bd1..2c33f8c8f0bd2 100644
--- a/lib/internal/Magento/Framework/DB/Helper.php
+++ b/lib/internal/Magento/Framework/DB/Helper.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\DB\Helper
  *
- * @since 2.0.0
  */
 class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
 {
@@ -21,7 +20,6 @@ class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
      * @param \Magento\Framework\DB\Select $select
      * @param bool $autoReset
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareOrder(\Magento\Framework\DB\Select $select, $autoReset = false)
     {
@@ -60,7 +58,6 @@ protected function _prepareOrder(\Magento\Framework\DB\Select $select, $autoRese
      * @param string $field
      * @param bool   $reverse OPTIONAL
      * @return string
-     * @since 2.0.0
      */
     protected function _truncateAliasName($field, $reverse = false)
     {
@@ -83,7 +80,6 @@ protected function _truncateAliasName($field, $reverse = false)
      * @param \Magento\Framework\DB\Select $select
      * @param bool $autoReset
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareGroup(\Magento\Framework\DB\Select $select, $autoReset = false)
     {
@@ -111,7 +107,6 @@ protected function _prepareGroup(\Magento\Framework\DB\Select $select, $autoRese
      * @param bool $autoReset
      * @return array
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     protected function _prepareHaving(\Magento\Framework\DB\Select $select, $autoReset = false)
     {
@@ -158,7 +153,6 @@ protected function _prepareHaving(\Magento\Framework\DB\Select $select, $autoRes
      * @param int $limitOffset
      * @param array $columnList
      * @return string
-     * @since 2.0.0
      */
     protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList = [])
     {
@@ -194,7 +188,6 @@ protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList
      * @throws \Zend_Db_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareColumnsList(\Magento\Framework\DB\Select $select, $groupByCondition = null)
     {
@@ -248,7 +241,6 @@ public function prepareColumnsList(\Magento\Framework\DB\Select $select, $groupB
      * @param string $fieldsDelimiter
      * @param string $additionalWhere
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function addGroupConcatColumn(
         $select,
@@ -280,7 +272,6 @@ public function addGroupConcatColumn(
      * @param  string|\Zend_Db_Expr $startDate
      * @param  string|\Zend_Db_Expr $endDate
      * @return \Zend_Db_Expr
-     * @since 2.0.0
      */
     public function getDateDiff($startDate, $endDate)
     {
@@ -298,7 +289,6 @@ public function getDateDiff($startDate, $endDate)
      * @return \Zend_Db_Expr
      *
      * @see escapeLikeValue()
-     * @since 2.0.0
      */
     public function addLikeEscape($value, $options = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
index 1e4efc4fd3f58..56aba7ce95449 100644
--- a/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\DB\Helper\AbstractHelper
  *
- * @since 2.0.0
  */
 abstract class AbstractHelper
 {
@@ -18,13 +17,11 @@ abstract class AbstractHelper
      * Resource helper module prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_modulePrefix;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -33,7 +30,6 @@ abstract class AbstractHelper
      *
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
      * Retrieves connection to the resource
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected function getConnection()
     {
@@ -69,7 +64,6 @@ protected function getConnection()
      * @param string $value
      * @param array $options
      * @return string
-     * @since 2.0.0
      */
     public function escapeLikeValue($value, $options = [])
     {
@@ -117,7 +111,6 @@ public function escapeLikeValue($value, $options = [])
      * @return \Zend_Db_Expr
      *
      * @see escapeLikeValue()
-     * @since 2.0.0
      */
     abstract public function addLikeEscape($value, $options = []);
 
@@ -131,7 +124,6 @@ abstract public function addLikeEscape($value, $options = []);
      * @return \Zend_Db_Expr
      *
      * @see escapeLikeValue()
-     * @since 2.0.0
      */
     public function getCILike($field, $value, $options = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php b/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
index e64391f1e66ee..c4eb5e6d2e5f4 100644
--- a/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
+++ b/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\DB\Helper\Mysql\Fulltext
  *
- * @since 2.0.0
  */
 class Fulltext
 {
@@ -46,13 +45,11 @@ class Fulltext
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
     /**
      * @param ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(ResourceConnection $resource)
     {
@@ -66,7 +63,6 @@ public function __construct(ResourceConnection $resource)
      * @param string $expression Expression which add to AGAINST ()
      * @param string $mode
      * @return string
-     * @since 2.0.0
      */
     public function getMatchQuery($columns, $expression, $mode = self::FULLTEXT_MODE_NATURAL)
     {
@@ -90,7 +86,6 @@ public function getMatchQuery($columns, $expression, $mode = self::FULLTEXT_MODE
      * @param bool $isCondition true=AND, false=OR
      * @param string $mode
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function match($select, $columns, $expression, $isCondition = true, $mode = self::FULLTEXT_MODE_NATURAL)
     {
diff --git a/lib/internal/Magento/Framework/DB/Logger/File.php b/lib/internal/Magento/Framework/DB/Logger/File.php
index 42030b6961944..8112f6a100361 100644
--- a/lib/internal/Magento/Framework/DB/Logger/File.php
+++ b/lib/internal/Magento/Framework/DB/Logger/File.php
@@ -11,13 +11,11 @@
 
 /**
  * Logging to file
- * @since 2.0.0
  */
 class File extends LoggerAbstract
 {
     /**
      * @var WriteInterface
-     * @since 2.0.0
      */
     private $dir;
 
@@ -25,7 +23,6 @@ class File extends LoggerAbstract
      * Path to SQL debug data log
      *
      * @var string
-     * @since 2.0.0
      */
     protected $debugFile;
 
@@ -35,7 +32,6 @@ class File extends LoggerAbstract
      * @param bool $logAllQueries
      * @param float $logQueryTime
      * @param bool $logCallStack
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -51,7 +47,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function log($str)
     {
@@ -66,7 +61,6 @@ public function log($str)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logStats($type, $sql, $bind = [], $result = null)
     {
@@ -78,7 +72,6 @@ public function logStats($type, $sql, $bind = [], $result = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function critical(\Exception $e)
     {
diff --git a/lib/internal/Magento/Framework/DB/Logger/LoggerAbstract.php b/lib/internal/Magento/Framework/DB/Logger/LoggerAbstract.php
index 007945ca2a114..eaafcaa633944 100644
--- a/lib/internal/Magento/Framework/DB/Logger/LoggerAbstract.php
+++ b/lib/internal/Magento/Framework/DB/Logger/LoggerAbstract.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Framework\DB\Logger\LoggerAbstract
  *
- * @since 2.0.0
  */
 abstract class LoggerAbstract implements LoggerInterface
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     private $timer;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $logAllQueries;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     private $logQueryTime;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $logCallStack;
 
@@ -43,7 +38,6 @@ abstract class LoggerAbstract implements LoggerInterface
      * @param bool $logAllQueries
      * @param float $logQueryTime
      * @param bool $logCallStack
-     * @since 2.0.0
      */
     public function __construct($logAllQueries = false, $logQueryTime = 0.05, $logCallStack = false)
     {
@@ -54,7 +48,6 @@ public function __construct($logAllQueries = false, $logQueryTime = 0.05, $logCa
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function startTimer()
     {
@@ -70,7 +63,6 @@ public function startTimer()
      * @param \Zend_Db_Statement_Pdo|null $result
      * @return string
      * @throws \Zend_Db_Statement_Exception
-     * @since 2.0.0
      */
     public function getStats($type, $sql, $bind = [], $result = null)
     {
diff --git a/lib/internal/Magento/Framework/DB/Logger/Quiet.php b/lib/internal/Magento/Framework/DB/Logger/Quiet.php
index 792232b5f20fd..ed7367a8b13f0 100644
--- a/lib/internal/Magento/Framework/DB/Logger/Quiet.php
+++ b/lib/internal/Magento/Framework/DB/Logger/Quiet.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\DB\Logger\Quiet
  *
- * @since 2.0.0
  */
 class Quiet implements \Magento\Framework\DB\LoggerInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function log($str)
     {
@@ -22,7 +20,6 @@ public function log($str)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logStats($type, $sql, $bind = [], $result = null)
     {
@@ -30,7 +27,6 @@ public function logStats($type, $sql, $bind = [], $result = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function critical(\Exception $e)
     {
@@ -38,7 +34,6 @@ public function critical(\Exception $e)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function startTimer()
     {
diff --git a/lib/internal/Magento/Framework/DB/LoggerInterface.php b/lib/internal/Magento/Framework/DB/LoggerInterface.php
index f077c8fc5de84..f072254c0f76e 100644
--- a/lib/internal/Magento/Framework/DB/LoggerInterface.php
+++ b/lib/internal/Magento/Framework/DB/LoggerInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * DB logger interface
- * @since 2.0.0
  */
 interface LoggerInterface
 {
@@ -24,13 +23,11 @@ interface LoggerInterface
      *
      * @param string $str
      * @return void
-     * @since 2.0.0
      */
     public function log($str);
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function startTimer();
 
@@ -40,14 +37,12 @@ public function startTimer();
      * @param array $bind
      * @param \Zend_Db_Statement_Pdo|null $result
      * @return void
-     * @since 2.0.0
      */
     public function logStats($type, $sql, $bind = [], $result = null);
 
     /**
      * @param \Exception $e
      * @return void
-     * @since 2.0.0
      */
     public function critical(\Exception $e);
 }
diff --git a/lib/internal/Magento/Framework/DB/MapperFactory.php b/lib/internal/Magento/Framework/DB/MapperFactory.php
index e091302d55aa5..b5edbee14503a 100644
--- a/lib/internal/Magento/Framework/DB/MapperFactory.php
+++ b/lib/internal/Magento/Framework/DB/MapperFactory.php
@@ -9,19 +9,16 @@
 /**
  * Class MapperFactory
  * @package Magento\Framework\DB
- * @since 2.0.0
  */
 class MapperFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return MapperInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/MapperInterface.php b/lib/internal/Magento/Framework/DB/MapperInterface.php
index 456dcc35df4cd..cfe2c53a155fd 100644
--- a/lib/internal/Magento/Framework/DB/MapperInterface.php
+++ b/lib/internal/Magento/Framework/DB/MapperInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface MapperInterface
- * @since 2.0.0
  */
 interface MapperInterface
 {
@@ -20,7 +19,6 @@ interface MapperInterface
      *
      * @param \Magento\Framework\Api\CriteriaInterface $criteria
      * @return Select
-     * @since 2.0.0
      */
     public function map(\Magento\Framework\Api\CriteriaInterface $criteria);
 
@@ -28,7 +26,6 @@ public function map(\Magento\Framework\Api\CriteriaInterface $criteria);
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource();
 
@@ -42,7 +39,6 @@ public function getResource();
      * @param string $expression
      * @param array|string $fields
      * @return $this
-     * @since 2.0.0
      */
     public function addExpressionFieldToSelect($alias, $expression, $fields);
 
@@ -83,7 +79,6 @@ public function addExpressionFieldToSelect($alias, $expression, $fields);
      * @param string|int|array $condition
      * @throws \Magento\Framework\Exception\LocalizedException if some error in the input could be detected.
      * @return void
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null);
 
@@ -91,7 +86,6 @@ public function addFieldToFilter($field, $condition = null);
      * Reset Select object state
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset();
 }
diff --git a/lib/internal/Magento/Framework/DB/Profiler.php b/lib/internal/Magento/Framework/DB/Profiler.php
index b9930ae89970a..241260e4786c4 100644
--- a/lib/internal/Magento/Framework/DB/Profiler.php
+++ b/lib/internal/Magento/Framework/DB/Profiler.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\DB\Profiler
  *
- * @since 2.0.0
  */
 class Profiler extends \Zend_Db_Profiler
 {
@@ -18,7 +17,6 @@ class Profiler extends \Zend_Db_Profiler
      * Host IP whereto a request is sent
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_host = '';
 
@@ -26,7 +24,6 @@ class Profiler extends \Zend_Db_Profiler
      * Database connection type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_type = '';
 
@@ -34,7 +31,6 @@ class Profiler extends \Zend_Db_Profiler
      * Last query Id
      *
      * @var string|null
-     * @since 2.0.0
      */
     private $_lastQueryId = null;
 
@@ -43,7 +39,6 @@ class Profiler extends \Zend_Db_Profiler
      *
      * @param string $host
      * @return \Magento\Framework\DB\Profiler
-     * @since 2.0.0
      */
     public function setHost($host)
     {
@@ -56,7 +51,6 @@ public function setHost($host)
      *
      * @param string $type
      * @return \Magento\Framework\DB\Profiler
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -70,7 +64,6 @@ public function setType($type)
      * @param string $queryText SQL statement
      * @param integer|null $queryType OPTIONAL Type of query, one of the \Zend_Db_Profiler::* constants
      * @return integer|null
-     * @since 2.0.0
      */
     public function queryStart($queryText, $queryType = null)
     {
@@ -83,7 +76,6 @@ public function queryStart($queryText, $queryType = null)
      *
      * @param int $queryId
      * @return string|void
-     * @since 2.0.0
      */
     public function queryEnd($queryId)
     {
@@ -95,7 +87,6 @@ public function queryEnd($queryId)
      * Ends the last query if exists. Used for finalize broken queries.
      *
      * @return string|void
-     * @since 2.0.0
      */
     public function queryEndLast()
     {
diff --git a/lib/internal/Magento/Framework/DB/Query.php b/lib/internal/Magento/Framework/DB/Query.php
index f1e3bb3361a2e..04ac2006b5e1f 100644
--- a/lib/internal/Magento/Framework/DB/Query.php
+++ b/lib/internal/Magento/Framework/DB/Query.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Query
- * @since 2.0.0
  */
 class Query implements QueryInterface
 {
@@ -17,13 +16,11 @@ class Query implements QueryInterface
      * Select object
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $select;
 
     /**
      * @var \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     protected $criteria;
 
@@ -31,7 +28,6 @@ class Query implements QueryInterface
      * Resource instance
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -39,37 +35,31 @@ class Query implements QueryInterface
      * Database's statement for fetch item one by one
      *
      * @var \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     protected $fetchStmt = null;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface
-     * @since 2.0.0
      */
     private $fetchStrategy;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $bindParams = [];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $totalRecords;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     protected $data;
 
@@ -77,7 +67,6 @@ class Query implements QueryInterface
      * Query Select Parts to be skipped when prepare query for count
      *
      * @var array
-     * @since 2.0.0
      */
     protected $countSqlSkipParts = [
         \Magento\Framework\DB\Select::ORDER => true,
@@ -91,7 +80,6 @@ class Query implements QueryInterface
      * @param \Magento\Framework\Api\CriteriaInterface $criteria
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DB\Select $select,
@@ -109,7 +97,6 @@ public function __construct(
      * Retrieve source Criteria object
      *
      * @return \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     public function getCriteria()
     {
@@ -120,7 +107,6 @@ public function getCriteria()
      * Retrieve all ids for query
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
@@ -139,7 +125,6 @@ public function getAllIds()
      * @param string $name
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function addBindParam($name, $value)
     {
@@ -150,7 +135,6 @@ public function addBindParam($name, $value)
      * Get collection size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -166,7 +150,6 @@ public function getSize()
      *
      * @param bool $stringMode
      * @return string || Select
-     * @since 2.0.0
      */
     public function getSelectSql($stringMode = false)
     {
@@ -180,7 +163,6 @@ public function getSelectSql($stringMode = false)
      * Reset Statement object
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -192,7 +174,6 @@ public function reset()
      * Fetch all statement
      *
      * @return array
-     * @since 2.0.0
      */
     public function fetchAll()
     {
@@ -207,7 +188,6 @@ public function fetchAll()
      * Fetch statement
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function fetchItem()
     {
@@ -225,7 +205,6 @@ public function fetchItem()
      * Get Identity Field Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -236,7 +215,6 @@ public function getIdFieldName()
      * Retrieve connection object
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -247,7 +225,6 @@ public function getConnection()
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -260,7 +237,6 @@ public function getResource()
      * @param string $name
      * @param bool $toSkip
      * @return void
-     * @since 2.0.0
      */
     public function addCountSqlSkipPart($name, $toSkip = true)
     {
@@ -271,7 +247,6 @@ public function addCountSqlSkipPart($name, $toSkip = true)
      * Get SQL for get record count
      *
      * @return Select
-     * @since 2.0.0
      */
     protected function getSelectCountSql()
     {
@@ -290,7 +265,6 @@ protected function getSelectCountSql()
      * Returned count SQL skip parts
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getCountSqlSkipParts()
     {
@@ -301,7 +275,6 @@ protected function getCountSqlSkipParts()
      * Get \Magento\Framework\DB\Select object instance
      *
      * @return Select
-     * @since 2.0.0
      */
     protected function getSelect()
     {
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
index 3a34ac173be25..1efbf5e77a172 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
@@ -10,67 +10,67 @@
 
 /**
  * Query batch iterator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class BatchIterator implements BatchIteratorInterface
 {
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $batchSize;
 
     /**
      * @var Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $select;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $minValue = 0;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $correlationName;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $rangeField;
 
     /**
      * @var Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $currentSelect;
 
     /**
      * @var AdapterInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $connection;
 
     /**
      * @var int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $iteration = 0;
 
     /**
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $rangeFieldAlias;
 
     /**
      * @var bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $isValid = true;
 
@@ -82,7 +82,7 @@ class BatchIterator implements BatchIteratorInterface
      * @param string $correlationName
      * @param string $rangeField
      * @param string $rangeFieldAlias
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         Select $select,
@@ -101,7 +101,7 @@ public function __construct(
 
     /**
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function current()
     {
@@ -115,7 +115,7 @@ public function current()
 
     /**
      * @return Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function next()
     {
@@ -136,7 +136,7 @@ public function next()
 
     /**
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function key()
     {
@@ -145,7 +145,7 @@ public function key()
 
     /**
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function valid()
     {
@@ -154,7 +154,7 @@ public function valid()
 
     /**
      * @return void
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function rewind()
     {
@@ -169,7 +169,7 @@ public function rewind()
      *
      * @param Select $select
      * @return int
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function calculateBatchSize(Select $select)
     {
@@ -190,7 +190,7 @@ private function calculateBatchSize(Select $select)
      * Initialize select object.
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function initSelectObject()
     {
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php b/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
index 35743b0638360..2f53edfc746dc 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
@@ -7,7 +7,7 @@
 
 /**
  * Factory class for @see \Magento\Framework\DB\Query\BatchIterator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class BatchIteratorFactory
 {
@@ -15,7 +15,7 @@ class BatchIteratorFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $objectManager = null;
 
@@ -23,7 +23,7 @@ class BatchIteratorFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $instanceName = null;
 
@@ -32,7 +32,7 @@ class BatchIteratorFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +47,7 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\DB\Query\BatchIteratorInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/Query/Generator.php b/lib/internal/Magento/Framework/DB/Query/Generator.php
index c0f8806859b42..c77fbbb8187f6 100644
--- a/lib/internal/Magento/Framework/DB/Query/Generator.php
+++ b/lib/internal/Magento/Framework/DB/Query/Generator.php
@@ -9,13 +9,13 @@
 
 /**
  * Query generator
- * @since 2.2.0
+ * @since 2.1.3
  */
 class Generator
 {
     /**
      * @var \Magento\Framework\DB\Query\BatchIteratorFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $iteratorFactory;
 
@@ -30,7 +30,7 @@ class Generator
      *
      * @param BatchIteratorFactory $iteratorFactory
      * @param BatchRangeIteratorFactory $rangeIteratorFactory
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function __construct(
         BatchIteratorFactory $iteratorFactory,
@@ -65,7 +65,7 @@ public function __construct(
      * @param string $batchStrategy It determines which strategy is chosen
      * @return BatchIteratorInterface
      * @throws LocalizedException Throws if incorrect "FROM" part in \Select exists
-     * @since 2.2.0
+     * @since 2.1.3
      */
     public function generate(
         $rangeField,
diff --git a/lib/internal/Magento/Framework/DB/QueryBuilder.php b/lib/internal/Magento/Framework/DB/QueryBuilder.php
index 2099e0df1ece9..4840cf63be2c1 100644
--- a/lib/internal/Magento/Framework/DB/QueryBuilder.php
+++ b/lib/internal/Magento/Framework/DB/QueryBuilder.php
@@ -7,7 +7,6 @@
 
 /**
  * Class QueryBuilder
- * @since 2.0.0
  */
 class QueryBuilder
 {
@@ -15,13 +14,11 @@ class QueryBuilder
      * Select object
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $select;
 
     /**
      * @var \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     protected $criteria;
 
@@ -29,26 +26,22 @@ class QueryBuilder
      * Resource instance
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\DB\MapperFactory
-     * @since 2.0.0
      */
     protected $mapperFactory;
 
     /**
      * @var \Magento\Framework\DB\QueryFactory
-     * @since 2.0.0
      */
     protected $queryFactory;
 
     /**
      * @param \Magento\Framework\DB\MapperFactory $mapperFactory
      * @param \Magento\Framework\DB\QueryFactory $queryFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DB\MapperFactory $mapperFactory,
@@ -63,7 +56,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Api\CriteriaInterface $criteria
      * @return void
-     * @since 2.0.0
      */
     public function setCriteria(\Magento\Framework\Api\CriteriaInterface $criteria)
     {
@@ -75,7 +67,6 @@ public function setCriteria(\Magento\Framework\Api\CriteriaInterface $criteria)
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      * @return void
-     * @since 2.0.0
      */
     public function setResource(\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource)
     {
@@ -85,7 +76,6 @@ public function setResource(\Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @return \Magento\Framework\DB\QueryInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/DB/QueryFactory.php b/lib/internal/Magento/Framework/DB/QueryFactory.php
index 5505fb2a1e4a2..f1a1a391f47a5 100644
--- a/lib/internal/Magento/Framework/DB/QueryFactory.php
+++ b/lib/internal/Magento/Framework/DB/QueryFactory.php
@@ -8,19 +8,16 @@
 
 /**
  * Class QueryFactory
- * @since 2.0.0
  */
 class QueryFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return QueryInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/QueryInterface.php b/lib/internal/Magento/Framework/DB/QueryInterface.php
index 56efb70873ec2..2afd21c0f5c26 100644
--- a/lib/internal/Magento/Framework/DB/QueryInterface.php
+++ b/lib/internal/Magento/Framework/DB/QueryInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Class QueryInterface
- * @since 2.0.0
  */
 interface QueryInterface
 {
@@ -15,7 +14,6 @@ interface QueryInterface
      * Retrieve source Criteria object
      *
      * @return \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     public function getCriteria();
 
@@ -23,7 +21,6 @@ public function getCriteria();
      * Retrieve all ids for query
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds();
 
@@ -33,7 +30,6 @@ public function getAllIds();
      * @param string $name
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function addBindParam($name, $value);
 
@@ -41,7 +37,6 @@ public function addBindParam($name, $value);
      * Get collection size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSize();
 
@@ -50,7 +45,6 @@ public function getSize();
      *
      * @param bool $stringMode
      * @return string || Select
-     * @since 2.0.0
      */
     public function getSelectSql($stringMode = false);
 
@@ -58,7 +52,6 @@ public function getSelectSql($stringMode = false);
      * Reset Statement object
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset();
 
@@ -66,7 +59,6 @@ public function reset();
      * Fetch all statement
      *
      * @return array
-     * @since 2.0.0
      */
     public function fetchAll();
 
@@ -74,7 +66,6 @@ public function fetchAll();
      * Fetch statement
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function fetchItem();
 
@@ -82,7 +73,6 @@ public function fetchItem();
      * Get Identity Field Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName();
 
@@ -90,7 +80,6 @@ public function getIdFieldName();
      * Retrieve connection object
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection();
 
@@ -98,7 +87,6 @@ public function getConnection();
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource();
 
@@ -108,7 +96,6 @@ public function getResource();
      * @param string $name
      * @param bool $toSkip
      * @return void
-     * @since 2.0.0
      */
     public function addCountSqlSkipPart($name, $toSkip = true);
 }
diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index aec0d25302847..2ac0e5adeab23 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -28,7 +28,6 @@
  * @method \Magento\Framework\DB\Select distinct($flag = true)
  * @method \Magento\Framework\DB\Select reset($part = null)
  * @method \Magento\Framework\DB\Select columns($cols = '*', $correlationName = null)
- * @since 2.0.0
  */
 class Select extends \Zend_Db_Select
 {
@@ -49,7 +48,7 @@ class Select extends \Zend_Db_Select
 
     /**
      * @var Select\SelectRenderer
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $selectRenderer;
 
@@ -60,7 +59,6 @@ class Select extends \Zend_Db_Select
      * @param Adapter\Pdo\Mysql $adapter
      * @param Select\SelectRenderer $selectRenderer
      * @param array $parts
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DB\Adapter\Pdo\Mysql $adapter,
@@ -107,7 +105,6 @@ public function __construct(
      * @param string $value OPTIONAL A single value to quote into the condition.
      * @param string|int|null $type OPTIONAL The type of the given value
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function where($cond, $value = null, $type = null)
     {
@@ -129,7 +126,6 @@ public function where($cond, $value = null, $type = null)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function resetJoinLeft()
     {
@@ -208,7 +204,6 @@ public function resetJoinLeft()
      * Validate LEFT joins, and remove it if not exists
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _resetJoinLeft()
     {
@@ -242,7 +237,6 @@ protected function _resetJoinLeft()
      * @param string $table
      * @param string $cond
      * @return bool
-     * @since 2.0.0
      */
     protected function _findTableInCond($table, $cond)
     {
@@ -295,7 +289,6 @@ protected function _findTableInCond($table, $cond)
      * @param  string $schema The database name to specify, if any.
      * @return \Magento\Framework\DB\Select This \Magento\Framework\DB\Select object
      * @throws \Zend_Db_Select_Exception
-     * @since 2.0.0
      */
     protected function _join($type, $name, $cond, $cols, $schema = null)
     {
@@ -311,7 +304,6 @@ protected function _join($type, $name, $cond, $cols, $schema = null)
      * @param int $count OPTIONAL The number of rows to return.
      * @param int $offset OPTIONAL Start returning after this many rows.
      * @return $this
-     * @since 2.0.0
      */
     public function limit($count = null, $offset = null)
     {
@@ -333,7 +325,6 @@ public function limit($count = null, $offset = null)
      *
      * @param string|array $table
      * @return string
-     * @since 2.0.0
      */
     public function crossUpdateFromSelect($table)
     {
@@ -347,7 +338,6 @@ public function crossUpdateFromSelect($table)
      * @param array $fields
      * @param bool $onDuplicate
      * @return string
-     * @since 2.0.0
      */
     public function insertFromSelect($tableName, $fields = [], $onDuplicate = true)
     {
@@ -361,7 +351,6 @@ public function insertFromSelect($tableName, $fields = [], $onDuplicate = true)
      * @param string $tableName
      * @param array $fields
      * @return string
-     * @since 2.0.0
      */
     public function insertIgnoreFromSelect($tableName, $fields = [])
     {
@@ -373,7 +362,6 @@ public function insertIgnoreFromSelect($tableName, $fields = [])
      *
      * @param string $table The table name or alias
      * @return string
-     * @since 2.0.0
      */
     public function deleteFromSelect($table)
     {
@@ -387,7 +375,6 @@ public function deleteFromSelect($table)
      * @param mixed $value
      * @return $this
      * @throws \Zend_Db_Select_Exception
-     * @since 2.0.0
      */
     public function setPart($part, $value)
     {
@@ -404,7 +391,6 @@ public function setPart($part, $value)
      *
      * @param bool $flag Whether or not the SELECT use STRAIGHT_JOIN (default true).
      * @return $this
-     * @since 2.0.0
      */
     public function useStraightJoin($flag = true)
     {
@@ -417,7 +403,6 @@ public function useStraightJoin($flag = true)
      *
      * @param string   $sql SQL query
      * @return string
-     * @since 2.0.0
      */
     protected function _renderStraightjoin($sql)
     {
@@ -437,7 +422,6 @@ protected function _renderStraightjoin($sql)
      * @param  bool|string $afterCorrelationName True if it should be prepended,
      *     a correlation name if it should be inserted
      * @return void
-     * @since 2.0.0
      */
     protected function _tableCols($correlationName, $cols, $afterCorrelationName = null)
     {
@@ -459,7 +443,6 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n
      *
      * @param string $field     integer field name
      * @return $this
-     * @since 2.0.0
      */
     public function orderRand($field = null)
     {
@@ -472,7 +455,6 @@ public function orderRand($field = null)
      *
      * @param string   $sql SQL query
      * @return string
-     * @since 2.0.0
      */
     protected function _renderForupdate($sql)
     {
@@ -490,7 +472,6 @@ protected function _renderForupdate($sql)
      * @param  string           $joinCondition
      * @param   bool            $isExists
      * @return $this
-     * @since 2.0.0
      */
     public function exists($select, $joinCondition, $isExists = true)
     {
@@ -511,7 +492,6 @@ public function exists($select, $joinCondition, $isExists = true)
      * Get adapter
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -531,7 +511,7 @@ public function assemble()
 
     /**
      * @return string[]
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -550,7 +530,7 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/DB/Sequence/SequenceInterface.php b/lib/internal/Magento/Framework/DB/Sequence/SequenceInterface.php
index c86f4af08acb9..58d83c9524a74 100644
--- a/lib/internal/Magento/Framework/DB/Sequence/SequenceInterface.php
+++ b/lib/internal/Magento/Framework/DB/Sequence/SequenceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface represents sequence
- * @since 2.0.0
  */
 interface SequenceInterface
 {
@@ -15,7 +14,6 @@ interface SequenceInterface
      * Retrieve current value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentValue();
 
@@ -23,7 +21,6 @@ public function getCurrentValue();
      * Retrieve next value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNextValue();
 }
diff --git a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
index 5b0a4ffee972e..a0c3a803ca019 100644
--- a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
@@ -10,25 +10,21 @@
 
 /**
  * Class Concat
- * @since 2.0.0
  */
 class ConcatExpression extends Expression
 {
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $adapter;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $columns;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $separator;
 
@@ -36,7 +32,6 @@ class ConcatExpression extends Expression
      * @param ResourceConnection $resource
      * @param array $columns
      * @param string $separator
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -53,7 +48,6 @@ public function __construct(
      *   TRIM(CONCAT_WS(separator, IF(str1 <> '', str1, NULL), IF(str2 <> '', str2, NULL) ...))
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
diff --git a/lib/internal/Magento/Framework/DB/Sql/LookupExpression.php b/lib/internal/Magento/Framework/DB/Sql/LookupExpression.php
index 0fe67102a39da..9a43b3f8bf758 100644
--- a/lib/internal/Magento/Framework/DB/Sql/LookupExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/LookupExpression.php
@@ -11,43 +11,36 @@
 
 /**
  * Class LookupExpression
- * @since 2.0.0
  */
 class LookupExpression extends Expression
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $adapter;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $targetColumn;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $targetTable;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $referenceColumns;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $sortOrder;
 
@@ -57,7 +50,6 @@ class LookupExpression extends Expression
      * @param string $targetTable
      * @param array $referenceColumns
      * @param array $sortOrder
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -79,7 +71,6 @@ public function __construct(
      *
      * @param Select $select
      * @return void
-     * @since 2.0.0
      */
     protected function processWhereCondition(Select $select)
     {
@@ -107,7 +98,6 @@ protected function processWhereCondition(Select $select)
      *
      * @param Select $select
      * @return void
-     * @since 2.0.0
      */
     protected function processSortOrder(Select $select)
     {
@@ -130,7 +120,6 @@ protected function processSortOrder(Select $select)
      * Returns lookup SQL
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
diff --git a/lib/internal/Magento/Framework/DB/Statement/Parameter.php b/lib/internal/Magento/Framework/DB/Statement/Parameter.php
index aa09da8e38f37..fb7dd5e47c57e 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Parameter.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Parameter.php
@@ -14,7 +14,6 @@
  * transmitted using 'addtional' property (\Magento\Framework\DataObject) as a container.
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Parameter
 {
@@ -22,7 +21,6 @@ class Parameter
      * Actual parameter value
      *
      * @var mixed
-     * @since 2.0.0
      */
     protected $_value = null;
 
@@ -33,35 +31,30 @@ class Parameter
      * BLOB data to query placeholders. If FALSE, then specific settings from $_dataType, $_length,
      * $_driverOptions will be used.
      * @var bool
-     * @since 2.0.0
      */
     protected $_isBlob = false;
 
     /**
      * Data type to set to DB driver during parameter bind
      * @var mixed
-     * @since 2.0.0
      */
     protected $_dataType = null;
 
     /**
      * Length to set to DB driver during parameter bind
      * @var mixed
-     * @since 2.0.0
      */
     protected $_length = null;
 
     /**
      * Specific driver options to set to DB driver during parameter bind
      * @var mixed
-     * @since 2.0.0
      */
     protected $_driverOptions = null;
 
     /**
      * Additional information to be used by DB adapter internally
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_additional = null;
 
@@ -69,7 +62,6 @@ class Parameter
      * Inits instance
      *
      * @param mixed $value
-     * @since 2.0.0
      */
     public function __construct($value)
     {
@@ -83,7 +75,6 @@ public function __construct($value)
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -95,7 +86,6 @@ public function setValue($value)
      * Gets parameter value.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -111,7 +101,6 @@ public function getValue()
      *
      * @param bool $isBlob
      * @return $this
-     * @since 2.0.0
      */
     public function setIsBlob($isBlob)
     {
@@ -127,7 +116,6 @@ public function setIsBlob($isBlob)
      *
      * @see setIsBlob
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsBlob()
     {
@@ -139,7 +127,6 @@ public function getIsBlob()
      *
      * @param mixed $dataType
      * @return $this
-     * @since 2.0.0
      */
     public function setDataType($dataType)
     {
@@ -151,7 +138,6 @@ public function setDataType($dataType)
      * Gets data type option to be used during binding parameter value.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getDataType()
     {
@@ -163,7 +149,6 @@ public function getDataType()
      *
      * @param mixed $length
      * @return $this
-     * @since 2.0.0
      */
     public function setLength($length)
     {
@@ -175,7 +160,6 @@ public function setLength($length)
      * Gets length option to be used during binding parameter value.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getLength()
     {
@@ -187,7 +171,6 @@ public function getLength()
      *
      * @param mixed $driverOptions
      * @return $this
-     * @since 2.0.0
      */
     public function setDriverOptions($driverOptions)
     {
@@ -199,7 +182,6 @@ public function setDriverOptions($driverOptions)
      * Gets driver options to be used during binding parameter value.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getDriverOptions()
     {
@@ -212,7 +194,6 @@ public function getDriverOptions()
      *
      * @param \Magento\Framework\DataObject $additional
      * @return $this
-     * @since 2.0.0
      */
     public function setAdditional($additional)
     {
@@ -224,7 +205,6 @@ public function setAdditional($additional)
      * Gets additional information for concrete DB adapter.
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getAdditional()
     {
@@ -235,7 +215,6 @@ public function getAdditional()
      * Returns representation of a object to be used in string contexts
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -246,7 +225,6 @@ public function __toString()
      * Returns representation of a object to be used in string contexts
      *
      * @return string
-     * @since 2.0.0
      */
     public function toString()
     {
diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
index 7b139740de98e..c1c6a285b1a3d 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\DB\Statement\Pdo\Mysql
  *
- * @since 2.0.0
  */
 class Mysql extends \Zend_Db_Statement_Pdo
 {
@@ -28,7 +27,6 @@ class Mysql extends \Zend_Db_Statement_Pdo
      * @return bool
      * @throws \Zend_Db_Statement_Exception
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function _executeWithBinding(array $params)
     {
@@ -80,7 +78,6 @@ public function _executeWithBinding(array $params)
      * @param array $params OPTIONAL Values to bind to parameter placeholders.
      * @return bool
      * @throws \Zend_Db_Statement_Exception
-     * @since 2.0.0
      */
     public function _execute(array $params = null)
     {
diff --git a/lib/internal/Magento/Framework/DB/SubSelect.php b/lib/internal/Magento/Framework/DB/SubSelect.php
index 3c4668c0f51d4..16ac8b6c421f2 100644
--- a/lib/internal/Magento/Framework/DB/SubSelect.php
+++ b/lib/internal/Magento/Framework/DB/SubSelect.php
@@ -10,49 +10,41 @@
 
 /**
  * Class Concat
- * @since 2.0.0
  */
 class SubSelect extends \Zend_Db_Expr
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $table;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $columns;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $originColumn;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $targetColumn;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $connectionName;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -63,7 +55,6 @@ class SubSelect extends \Zend_Db_Expr
      * @param string[] $columns
      * @param string $originColumn
      * @param string $targetColumn
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -83,7 +74,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -104,7 +94,6 @@ public function __toString()
      * Returns connection
      *
      * @return AdapterInterface
-     * @since 2.0.0
      */
     protected function getConnection()
     {
diff --git a/lib/internal/Magento/Framework/DB/Transaction.php b/lib/internal/Magento/Framework/DB/Transaction.php
index f695b793a7852..e5c4741dd0d58 100644
--- a/lib/internal/Magento/Framework/DB/Transaction.php
+++ b/lib/internal/Magento/Framework/DB/Transaction.php
@@ -9,7 +9,6 @@
 
 /**
  * @todo need collect connection by name
- * @since 2.0.0
  */
 class Transaction
 {
@@ -17,7 +16,6 @@ class Transaction
      * Objects which will be involved to transaction
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_objects = [];
 
@@ -25,7 +23,6 @@ class Transaction
      * Transaction objects array with alias key
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_objectsByAlias = [];
 
@@ -33,7 +30,6 @@ class Transaction
      * Callbacks array.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_beforeCommitCallbacks = [];
 
@@ -41,7 +37,6 @@ class Transaction
      * Begin transaction for all involved object resources
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _startTransaction()
     {
@@ -55,7 +50,6 @@ protected function _startTransaction()
      * Commit transaction for all resources
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _commitTransaction()
     {
@@ -69,7 +63,6 @@ protected function _commitTransaction()
      * Rollback transaction
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _rollbackTransaction()
     {
@@ -83,7 +76,6 @@ protected function _rollbackTransaction()
      * Run all configured object callbacks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _runCallbacks()
     {
@@ -99,7 +91,6 @@ protected function _runCallbacks()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function addObject(\Magento\Framework\Model\AbstractModel $object, $alias = '')
     {
@@ -115,7 +106,6 @@ public function addObject(\Magento\Framework\Model\AbstractModel $object, $alias
      *
      * @param callback $callback
      * @return $this
-     * @since 2.0.0
      */
     public function addCommitCallback($callback)
     {
@@ -128,7 +118,6 @@ public function addCommitCallback($callback)
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function save()
     {
@@ -166,7 +155,6 @@ public function save()
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function delete()
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index f9a79717239c0..e96b5e123f8dd 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -14,43 +14,36 @@
  * Magento Library
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Tree
 {
     /**
      * @var string|int
-     * @since 2.0.0
      */
     private $_id;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_left;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_right;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_level;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_pid;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_nodesInfo = [];
 
@@ -65,19 +58,16 @@ class Tree
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     private $_extTables = [];
 
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private $_db;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $_table;
 
@@ -86,7 +76,6 @@ class Tree
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct($config = [])
     {
@@ -157,7 +146,6 @@ public function __construct($config = [])
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setIdField($name)
     {
@@ -170,7 +158,6 @@ public function setIdField($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setLeftField($name)
     {
@@ -183,7 +170,6 @@ public function setLeftField($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setRightField($name)
     {
@@ -196,7 +182,6 @@ public function setRightField($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setLevelField($name)
     {
@@ -209,7 +194,6 @@ public function setLevelField($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setPidField($name)
     {
@@ -222,7 +206,6 @@ public function setPidField($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setTable($name)
     {
@@ -232,7 +215,6 @@ public function setTable($name)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getKeys()
     {
@@ -250,7 +232,6 @@ public function getKeys()
      *
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     public function clear($data = [])
     {
@@ -276,7 +257,6 @@ public function clear($data = [])
      *
      * @param string|int $nodeId
      * @return array
-     * @since 2.0.0
      */
     public function getNodeInfo($nodeId)
     {
@@ -296,7 +276,6 @@ public function getNodeInfo($nodeId)
      * @param array $data
      * @return false|string
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function appendChild($nodeId, $data)
     {
@@ -363,7 +342,6 @@ public function appendChild($nodeId, $data)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function checkNodes()
     {
@@ -394,7 +372,6 @@ public function checkNodes()
     /**
      * @param string|int $nodeId
      * @return bool|Node|void
-     * @since 2.0.0
      */
     public function removeNode($nodeId)
     {
@@ -470,7 +447,6 @@ public function removeNode($nodeId)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function moveNode($eId, $pId, $aId = 0)
     {
@@ -806,7 +782,6 @@ public function moveNode($eId, $pId, $aId = 0)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function moveNodes($eId, $pId, $aId = 0)
     {
@@ -1005,7 +980,6 @@ public function moveNodes($eId, $pId, $aId = 0)
      * @param string $joinCondition
      * @param string $fields
      * @return void
-     * @since 2.0.0
      */
     public function addTable($tableName, $joinCondition, $fields = '*')
     {
@@ -1015,7 +989,6 @@ public function addTable($tableName, $joinCondition, $fields = '*')
     /**
      * @param Select $select
      * @return void
-     * @since 2.0.0
      */
     protected function _addExtTablesToSelect(Select &$select)
     {
@@ -1030,7 +1003,6 @@ protected function _addExtTablesToSelect(Select &$select)
      * @param int $endLevel
      * @return NodeSet
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
     {
@@ -1076,7 +1048,6 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
     /**
      * @param string|int $nodeId
      * @return Node
-     * @since 2.0.0
      */
     public function getNode($nodeId)
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/Node.php b/lib/internal/Magento/Framework/DB/Tree/Node.php
index b08fcab4fdfd0..a11faecb851eb 100644
--- a/lib/internal/Magento/Framework/DB/Tree/Node.php
+++ b/lib/internal/Magento/Framework/DB/Tree/Node.php
@@ -9,61 +9,51 @@
 
 /**
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
- * @since 2.0.0
  */
 class Node
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     private $left;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $right;
 
     /**
      * @var string|int
-     * @since 2.0.0
      */
     private $id;
 
     /**
      * @var string|int
-     * @since 2.0.0
      */
     private $pid;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $level;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $title;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     public $hasChild = false;
 
     /**
      * @var float|int
-     * @since 2.0.0
      */
     public $numChild = 0;
 
@@ -71,7 +61,6 @@ class Node
      * @param array $nodeData
      * @param array $keys
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function __construct($nodeData, $keys)
     {
@@ -100,7 +89,6 @@ public function __construct($nodeData, $keys)
     /**
      * @param string $name
      * @return null|array
-     * @since 2.0.0
      */
     public function getData($name)
     {
@@ -113,7 +101,6 @@ public function getData($name)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLevel()
     {
@@ -122,7 +109,6 @@ public function getLevel()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLeft()
     {
@@ -131,7 +117,6 @@ public function getLeft()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getRight()
     {
@@ -140,7 +125,6 @@ public function getRight()
 
     /**
      * @return string|int
-     * @since 2.0.0
      */
     public function getPid()
     {
@@ -149,7 +133,6 @@ public function getPid()
 
     /**
      * @return string|int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -160,7 +143,6 @@ public function getId()
      * Return true if node has child
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isParent()
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
index d36524e2d0ced..525651577f289 100644
--- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
@@ -8,31 +8,26 @@
 /**
  * TODO implements iterators
  *
- * @since 2.0.0
  */
 class NodeSet implements \Iterator
 {
     /**
      * @var Node[]
-     * @since 2.0.0
      */
     private $_nodes = [];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_currentNode = 0;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $_current = 0;
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -45,7 +40,6 @@ public function __construct()
     /**
      * @param Node $node
      * @return int
-     * @since 2.0.0
      */
     public function addNode(Node $node)
     {
@@ -56,7 +50,6 @@ public function addNode(Node $node)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -65,7 +58,6 @@ public function count()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -74,7 +66,6 @@ public function valid()
 
     /**
      * @return false|int
-     * @since 2.0.0
      */
     public function next()
     {
@@ -87,7 +78,6 @@ public function next()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function key()
     {
@@ -96,7 +86,6 @@ public function key()
 
     /**
      * @return Node
-     * @since 2.0.0
      */
     public function current()
     {
@@ -105,7 +94,6 @@ public function current()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index 9a579ee3db1c0..c90ed2b03bf3d 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -9,13 +9,11 @@
 
 /**
  * Class AbstractCriteria
- * @since 2.0.0
  */
 abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data = [
         self::PART_FIELDS => ['list' => []],
@@ -26,7 +24,6 @@ abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterf
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $mapperInterfaceName;
 
@@ -35,7 +32,6 @@ abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterf
      *
      * @throws \Exception
      * @return string
-     * @since 2.0.0
      */
     public function getMapperInterfaceName()
     {
@@ -56,7 +52,6 @@ public function getMapperInterfaceName()
      * @param string|array $field
      * @param string|null $alias
      * @return void
-     * @since 2.0.0
      */
     public function addField($field, $alias = null)
     {
@@ -117,7 +112,6 @@ public function addField($field, $alias = null)
      * @param string $type
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     public function addFilter($name, $field, $condition = null, $type = 'and')
     {
@@ -145,7 +139,6 @@ public function addFilter($name, $field, $condition = null, $type = 'and')
      * @param string $direction
      * @param bool $unShift
      * @return void
-     * @since 2.0.0
      */
     public function addOrder($field, $direction = self::SORT_ORDER_DESC, $unShift = false)
     {
@@ -169,7 +162,6 @@ public function addOrder($field, $direction = self::SORT_ORDER_DESC, $unShift =
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function setLimit($offset, $size)
     {
@@ -182,7 +174,6 @@ public function setLimit($offset, $size)
      * @param string|null $field
      * @param bool $isAlias Alias identifier
      * @return void
-     * @since 2.0.0
      */
     public function removeField($field, $isAlias = false)
     {
@@ -204,7 +195,6 @@ public function removeField($field, $isAlias = false)
      * Removes all fields from select
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeAllFields()
     {
@@ -216,7 +206,6 @@ public function removeAllFields()
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeFilter($name)
     {
@@ -229,7 +218,6 @@ public function removeFilter($name)
      * Removes all filters
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeAllFilters()
     {
@@ -240,7 +228,6 @@ public function removeAllFilters()
      * Get Criteria objects added to current Composite Criteria
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCriteriaList()
     {
@@ -251,7 +238,6 @@ public function getCriteriaList()
      * Get list of filters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFilters()
     {
@@ -262,7 +248,6 @@ public function getFilters()
      * Get ordering criteria
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOrders()
     {
@@ -274,7 +259,6 @@ public function getOrders()
      * (['offset', 'page'])
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLimit()
     {
@@ -287,7 +271,6 @@ public function getLimit()
      * @param string $name
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getPart($name, $default = null)
     {
@@ -298,7 +281,6 @@ public function getPart($name, $default = null)
      * Return all criteria parts as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -309,7 +291,6 @@ public function toArray()
      * Reset criteria
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractDataObject.php b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
index 61c0dd00976f7..5916100ffbbfa 100644
--- a/lib/internal/Magento/Framework/Data/AbstractDataObject.php
+++ b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
@@ -8,13 +8,11 @@
 /**
  * Base Class for simple data Objects
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractDataObject
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
@@ -22,7 +20,6 @@ abstract class AbstractDataObject
      * Return Data Object data in array format.
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -50,7 +47,6 @@ public function toArray()
      *
      * @param string $key
      * @return mixed|null
-     * @since 2.0.0
      */
     protected function get($key)
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
index 676af2d778c98..a3bf4d52a13bd 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
@@ -10,26 +10,22 @@
 /**
  * Class AbstractSearchCriteriaBuilder
  * @package Magento\Framework\Data
- * @since 2.0.0
  */
 abstract class AbstractSearchCriteriaBuilder
 {
     /**
      * @var ObjectFactory
-     * @since 2.0.0
      */
     protected $objectFactory;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $resultObjectInterface;
 
     /**
      * @param Logger $logger
      * @param ObjectFactory $objectFactory,
-     * @since 2.0.0
      */
     public function __construct(
         Logger $logger,
@@ -42,13 +38,11 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     abstract protected function init();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getResultObjectInterface()
     {
@@ -57,7 +51,6 @@ protected function getResultObjectInterface()
 
     /**
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function make()
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
index e76672a6cbd34..ba3337c2650f9 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
@@ -7,7 +7,6 @@
 
 /**
  * Class AbstractSearchResult
- * @since 2.0.0
  */
 abstract class AbstractSearchResult extends AbstractDataObject implements SearchResultInterface
 {
@@ -15,7 +14,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Data Interface name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $dataInterface = \Magento\Framework\DataObject::class;
 
@@ -23,7 +21,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Name prefix of events that are dispatched by model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $eventPrefix = '';
 
@@ -31,7 +28,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Name of event parameter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $eventObject = '';
 
@@ -39,7 +35,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager = null;
 
@@ -47,7 +42,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Total items number
      *
      * @var int
-     * @since 2.0.0
      */
     protected $totalRecords;
 
@@ -55,13 +49,11 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * Loading state flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isLoaded;
 
     /**
      * @var \Magento\Framework\Data\Collection\EntityFactoryInterface
-     * @since 2.0.0
      */
     protected $entityFactory;
 
@@ -74,13 +66,11 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
     /**
      * @var \Magento\Framework\DB\Select
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $select;
 
     /**
      * @var \Magento\Framework\Data\SearchResultIteratorFactory
-     * @since 2.0.0
      */
     protected $resultIteratorFactory;
 
@@ -89,7 +79,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Data\SearchResultIteratorFactory $resultIteratorFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\DB\QueryInterface $query,
@@ -108,13 +97,11 @@ public function __construct(
      * Standard query builder initialization
      *
      * @return void
-     * @since 2.0.0
      */
     abstract protected function init();
 
     /**
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -125,7 +112,6 @@ public function getItems()
     /**
      * @param \Magento\Framework\DataObject[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
@@ -135,7 +121,6 @@ public function setItems(array $items = null)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -148,7 +133,6 @@ public function getTotalCount()
     /**
      * @param int $totalCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -158,7 +142,6 @@ public function setTotalCount($totalCount)
 
     /**
      * @return \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -172,7 +155,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
     {
@@ -181,7 +163,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
 
     /**
      * @return \Magento\Framework\Data\SearchResultIterator
-     * @since 2.0.0
      */
     public function createIterator()
     {
@@ -196,7 +177,6 @@ public function createIterator()
     /**
      * @param array $arguments
      * @return \Magento\Framework\DataObject|mixed
-     * @since 2.0.0
      */
     public function createDataObject(array $arguments = [])
     {
@@ -205,7 +185,6 @@ public function createDataObject(array $arguments = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -214,7 +193,6 @@ public function getIdFieldName()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -226,7 +204,6 @@ public function getSize()
      *
      * @param \Magento\Framework\DataObject $item
      * @return mixed
-     * @since 2.0.0
      */
     public function getItemId(\Magento\Framework\DataObject $item)
     {
@@ -239,7 +216,6 @@ public function getItemId(\Magento\Framework\DataObject $item)
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     protected function isLoaded()
     {
@@ -250,7 +226,6 @@ protected function isLoaded()
      * Load data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function load()
     {
@@ -274,7 +249,6 @@ protected function load()
      *
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     protected function setIsLoaded($flag = true)
     {
@@ -287,7 +261,6 @@ protected function setIsLoaded($flag = true)
      * @param \Magento\Framework\DataObject $item
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function addItem(\Magento\Framework\DataObject $item)
     {
@@ -308,7 +281,6 @@ protected function addItem(\Magento\Framework\DataObject $item)
      * Dispatch "before" load method events
      *
      * @return void
-     * @since 2.0.0
      */
     protected function beforeLoad()
     {
@@ -322,7 +294,6 @@ protected function beforeLoad()
      * Dispatch "after" load method events
      *
      * @return void
-     * @since 2.0.0
      */
     protected function afterLoad()
     {
@@ -337,7 +308,6 @@ protected function afterLoad()
      *
      * @param string $dataInterface
      * @return void
-     * @since 2.0.0
      */
     protected function setDataInterfaceName($dataInterface)
     {
@@ -350,7 +320,6 @@ protected function setDataInterfaceName($dataInterface)
      * Get Data Interface name for collection items
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDataInterfaceName()
     {
@@ -359,7 +328,6 @@ protected function getDataInterfaceName()
 
     /**
      * @return \Magento\Framework\DB\QueryInterface
-     * @since 2.0.0
      */
     protected function getQuery()
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
index a80143a1eae8f..669b51328d6a8 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter of array data type that supports arrays of unlimited depth
- * @since 2.0.0
  */
 class ArrayType implements InterpreterInterface
 {
@@ -17,13 +16,11 @@ class ArrayType implements InterpreterInterface
      * Interpreter of individual array item
      *
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     private $itemInterpreter;
 
     /**
      * @param InterpreterInterface $itemInterpreter
-     * @since 2.0.0
      */
     public function __construct(InterpreterInterface $itemInterpreter)
     {
@@ -34,7 +31,6 @@ public function __construct(InterpreterInterface $itemInterpreter)
      * {@inheritdoc}
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Boolean.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Boolean.php
index 725910631a893..8068501820b25 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Boolean.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Boolean.php
@@ -10,19 +10,16 @@
 
 /**
  * Interpreter of boolean data type, such as boolean itself or boolean string
- * @since 2.0.0
  */
 class Boolean implements InterpreterInterface
 {
     /**
      * @var BooleanUtils
-     * @since 2.0.0
      */
     private $booleanUtils;
 
     /**
      * @param BooleanUtils $booleanUtils
-     * @since 2.0.0
      */
     public function __construct(BooleanUtils $booleanUtils)
     {
@@ -33,7 +30,6 @@ public function __construct(BooleanUtils $booleanUtils)
      * {@inheritdoc}
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php
index ade0ff332fc3a..5e969cc04af55 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter that aggregates named interpreters and delegates every evaluation to one of them
- * @since 2.0.0
  */
 class Composite implements InterpreterInterface
 {
@@ -17,7 +16,6 @@ class Composite implements InterpreterInterface
      * Format: array('<name>' => <instance>, ...)
      *
      * @var InterpreterInterface[]
-     * @since 2.0.0
      */
     private $interpreters;
 
@@ -25,7 +23,6 @@ class Composite implements InterpreterInterface
      * Data key that holds name of an interpreter to be used for that data
      *
      * @var string
-     * @since 2.0.0
      */
     private $discriminator;
 
@@ -33,7 +30,6 @@ class Composite implements InterpreterInterface
      * @param InterpreterInterface[] $interpreters
      * @param string $discriminator
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $interpreters, $discriminator)
     {
@@ -51,7 +47,6 @@ public function __construct(array $interpreters, $discriminator)
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
@@ -73,7 +68,6 @@ public function evaluate(array $data)
      * @param InterpreterInterface $instance
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addInterpreter($name, InterpreterInterface $instance)
     {
@@ -89,7 +83,6 @@ public function addInterpreter($name, InterpreterInterface $instance)
      * @param string $name
      * @return InterpreterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getInterpreter($name)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php
index f64557688b322..5c680788c8143 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter that returns value of a constant by its name
- * @since 2.0.0
  */
 class Constant implements InterpreterInterface
 {
@@ -17,7 +16,6 @@ class Constant implements InterpreterInterface
      * {@inheritdoc}
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/DataObject.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/DataObject.php
index 47ba6db2b0510..bf2e87a379070 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/DataObject.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/DataObject.php
@@ -12,19 +12,16 @@
 /**
  * Class \Magento\Framework\Data\Argument\Interpreter\DataObject
  *
- * @since 2.0.0
  */
 class DataObject implements InterpreterInterface
 {
     /**
      * @var \Magento\Framework\Stdlib\BooleanUtils
-     * @since 2.0.0
      */
     protected $booleanUtils;
 
     /**
      * @param BooleanUtils $booleanUtils
-     * @since 2.0.0
      */
     public function __construct(BooleanUtils $booleanUtils)
     {
@@ -38,7 +35,6 @@ public function __construct(BooleanUtils $booleanUtils)
      * @return mixed
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/NullType.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/NullType.php
index 36a3dca8ea623..b275d84006a86 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/NullType.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/NullType.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter of NULL data type
- * @since 2.0.0
  */
 class NullType implements InterpreterInterface
 {
@@ -17,7 +16,6 @@ class NullType implements InterpreterInterface
      * {@inheritdoc}
      * @return null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Number.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Number.php
index 7d157fae4edcd..4b060b3fd6f4a 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Number.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Number.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter of numeric data, such as integer, float, or numeric string
- * @since 2.0.0
  */
 class Number implements InterpreterInterface
 {
@@ -17,7 +16,6 @@ class Number implements InterpreterInterface
      * {@inheritdoc}
      * @return string|int|float
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/StringUtils.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/StringUtils.php
index e89f04eca8161..e579b2af83f6d 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/StringUtils.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/StringUtils.php
@@ -11,7 +11,6 @@
 
 /**
  * Interpreter of string data type that may optionally perform text translation.
- * @since 2.0.0
  */
 class StringUtils implements InterpreterInterface
 {
@@ -23,7 +22,6 @@ class StringUtils implements InterpreterInterface
 
     /**
      * @var BooleanUtils
-     * @since 2.0.0
      */
     private $booleanUtils;
 
@@ -32,7 +30,6 @@ class StringUtils implements InterpreterInterface
      *
      * @param BooleanUtils $booleanUtils
      * @param BaseStringUtils $baseStringUtils
-     * @since 2.0.0
      */
     public function __construct(
         BooleanUtils $booleanUtils,
@@ -46,7 +43,6 @@ public function __construct(
      * {@inheritdoc}
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php b/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
index c5378a5e815db..2deabdf9829ae 100644
--- a/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
+++ b/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
@@ -9,7 +9,6 @@
  * Interface that encapsulates complexity of expression computation
  *
  * @api
- * @since 2.0.0
  */
 interface InterpreterInterface
 {
@@ -20,7 +19,6 @@ interface InterpreterInterface
      * @return mixed
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function evaluate(array $data);
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index 211cf57b80fd9..666942625b5fb 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -14,7 +14,6 @@
  * TODO: Refactor use of \Magento\Framework\Option\ArrayInterface in library.
  *
  * @api
- * @since 2.0.0
  */
 class Collection implements \IteratorAggregate, \Countable, ArrayInterface, CollectionDataSourceInterface
 {
@@ -26,7 +25,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Collection items
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_items = [];
 
@@ -34,7 +32,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Item object class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_itemObjectClass = \Magento\Framework\DataObject::class;
 
@@ -42,7 +39,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Order configuration
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_orders = [];
 
@@ -50,7 +46,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Filters configuration
      *
      * @var \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     protected $_filters = [];
 
@@ -58,7 +53,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Filter rendered flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isFiltersRendered = false;
 
@@ -66,7 +60,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Current page number for items pager
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_curPage = 1;
 
@@ -76,7 +69,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * if page size is false, then we works with all items
      *
      * @var int|false
-     * @since 2.0.0
      */
     protected $_pageSize = false;
 
@@ -84,7 +76,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Total items number
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_totalRecords;
 
@@ -92,7 +83,6 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Loading state flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isCollectionLoaded;
 
@@ -100,19 +90,16 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
      * Additional collection flags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_flags = [];
 
     /**
      * @var EntityFactoryInterface
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @param EntityFactoryInterface $entityFactory
-     * @since 2.0.0
      */
     public function __construct(EntityFactoryInterface $entityFactory)
     {
@@ -126,7 +113,6 @@ public function __construct(EntityFactoryInterface $entityFactory)
      * @param string $value
      * @param string $type and|or|string
      * @return $this
-     * @since 2.0.0
      */
     public function addFilter($field, $value, $type = 'and')
     {
@@ -179,7 +165,6 @@ public function addFilter($field, $value, $type = 'and')
      * @throws \Magento\Framework\Exception\LocalizedException if some error in the input could be detected.
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition)
     {
@@ -197,7 +182,6 @@ public function addFieldToFilter($field, $condition)
      *
      * @param string|string[] $field
      * @return \Magento\Framework\DataObject|\Magento\Framework\DataObject[]|void
-     * @since 2.0.0
      */
     public function getFilter($field)
     {
@@ -228,7 +212,6 @@ public function getFilter($field)
      * Retrieve collection loading status
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLoaded()
     {
@@ -240,7 +223,6 @@ public function isLoaded()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     protected function _setIsLoaded($flag = true)
     {
@@ -253,7 +235,6 @@ protected function _setIsLoaded($flag = true)
      *
      * @param  int $displacement
      * @return int
-     * @since 2.0.0
      */
     public function getCurPage($displacement = 0)
     {
@@ -270,7 +251,6 @@ public function getCurPage($displacement = 0)
      * Retrieve collection last page number
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLastPageNumber()
     {
@@ -288,7 +268,6 @@ public function getLastPageNumber()
      * Retrieve collection page size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -299,7 +278,6 @@ public function getPageSize()
      * Retrieve collection all items count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -314,7 +292,6 @@ public function getSize()
      * Retrieve collection first item
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFirstItem()
     {
@@ -332,7 +309,6 @@ public function getFirstItem()
      * Retrieve collection last item
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getLastItem()
     {
@@ -349,7 +325,6 @@ public function getLastItem()
      * Retrieve collection items
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -362,7 +337,6 @@ public function getItems()
      *
      * @param   string $colName
      * @return  array
-     * @since 2.0.0
      */
     public function getColumnValues($colName)
     {
@@ -381,7 +355,6 @@ public function getColumnValues($colName)
      * @param   string $column
      * @param   mixed $value
      * @return  array
-     * @since 2.0.0
      */
     public function getItemsByColumnValue($column, $value)
     {
@@ -402,7 +375,6 @@ public function getItemsByColumnValue($column, $value)
      * @param   string $column
      * @param   mixed $value
      * @return  \Magento\Framework\DataObject || null
-     * @since 2.0.0
      */
     public function getItemByColumnValue($column, $value)
     {
@@ -422,7 +394,6 @@ public function getItemByColumnValue($column, $value)
      * @param   \Magento\Framework\DataObject $item
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function addItem(\Magento\Framework\DataObject $item)
     {
@@ -446,7 +417,6 @@ public function addItem(\Magento\Framework\DataObject $item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return $this
-     * @since 2.0.0
      */
     protected function _addItem($item)
     {
@@ -459,7 +429,6 @@ protected function _addItem($item)
      *
      * @param \Magento\Framework\DataObject $item
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getItemId(\Magento\Framework\DataObject $item)
     {
@@ -470,7 +439,6 @@ protected function _getItemId(\Magento\Framework\DataObject $item)
      * Retrieve ids of all items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
@@ -486,7 +454,6 @@ public function getAllIds()
      *
      * @param   mixed $key
      * @return $this
-     * @since 2.0.0
      */
     public function removeItemByKey($key)
     {
@@ -500,7 +467,6 @@ public function removeItemByKey($key)
      * Remove all items from collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllItems()
     {
@@ -512,7 +478,6 @@ public function removeAllItems()
      * Clear collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -530,7 +495,6 @@ public function clear()
      * @param string $callback
      * @param array $args
      * @return array
-     * @since 2.0.0
      */
     public function walk($callback, array $args = [])
     {
@@ -555,7 +519,6 @@ public function walk($callback, array $args = [])
      * @param string|array|\Closure $objMethod
      * @param array $args
      * @return void
-     * @since 2.0.0
      */
     public function each($objMethod, $args = [])
     {
@@ -580,7 +543,6 @@ public function each($objMethod, $args = [])
      * @param   mixed $key
      * @param   mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setDataToAll($key, $value = null)
     {
@@ -601,7 +563,6 @@ public function setDataToAll($key, $value = null)
      *
      * @param   int $page
      * @return $this
-     * @since 2.0.0
      */
     public function setCurPage($page)
     {
@@ -614,7 +575,6 @@ public function setCurPage($page)
      *
      * @param   int $size
      * @return $this
-     * @since 2.0.0
      */
     public function setPageSize($size)
     {
@@ -628,7 +588,6 @@ public function setPageSize($size)
      * @param   string $field
      * @param   string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -642,7 +601,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
      * @param  string $className
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setItemObjectClass($className)
     {
@@ -657,7 +615,6 @@ public function setItemObjectClass($className)
      * Retrieve collection empty item
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getNewEmptyItem()
     {
@@ -668,7 +625,6 @@ public function getNewEmptyItem()
      * Render sql select conditions
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderFilters()
     {
@@ -679,7 +635,6 @@ protected function _renderFilters()
      * Render sql select orders
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderOrders()
     {
@@ -690,7 +645,6 @@ protected function _renderOrders()
      * Render sql select limit
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderLimit()
     {
@@ -703,7 +657,6 @@ protected function _renderLimit()
      * @param bool $flag
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function distinct($flag)
     {
@@ -717,7 +670,6 @@ public function distinct($flag)
      * @param bool $logQuery
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -730,7 +682,6 @@ public function loadData($printQuery = false, $logQuery = false)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -743,7 +694,6 @@ public function load($printQuery = false, $logQuery = false)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function loadWithFilter($printQuery = false, $logQuery = false)
     {
@@ -754,7 +704,6 @@ public function loadWithFilter($printQuery = false, $logQuery = false)
      * Convert collection to XML
      *
      * @return string
-     * @since 2.0.0
      */
     public function toXml()
     {
@@ -778,7 +727,6 @@ public function toXml()
      *
      * @param array $arrRequiredFields
      * @return array
-     * @since 2.0.0
      */
     public function toArray($arrRequiredFields = [])
     {
@@ -807,7 +755,6 @@ public function toArray($arrRequiredFields = [])
      * @param string $labelField
      * @param array $additional
      * @return array
-     * @since 2.0.0
      */
     protected function _toOptionArray($valueField = 'id', $labelField = 'name', $additional = [])
     {
@@ -826,7 +773,6 @@ protected function _toOptionArray($valueField = 'id', $labelField = 'name', $add
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray()
     {
@@ -835,7 +781,6 @@ public function toOptionArray()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash()
     {
@@ -851,7 +796,6 @@ public function toOptionHash()
      * @param   string $valueField
      * @param   string $labelField
      * @return  array
-     * @since 2.0.0
      */
     protected function _toOptionHash($valueField = 'id', $labelField = 'name')
     {
@@ -867,7 +811,6 @@ protected function _toOptionHash($valueField = 'id', $labelField = 'name')
      *
      * @param   mixed $idValue
      * @return  \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getItemById($idValue)
     {
@@ -882,7 +825,6 @@ public function getItemById($idValue)
      * Implementation of \IteratorAggregate::getIterator()
      *
      * @return \ArrayIterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -894,7 +836,6 @@ public function getIterator()
      * Retrieve count of collection loaded items
      *
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -907,7 +848,6 @@ public function count()
      *
      * @param string $flag
      * @return bool|null
-     * @since 2.0.0
      */
     public function getFlag($flag)
     {
@@ -920,7 +860,6 @@ public function getFlag($flag)
      * @param string $flag
      * @param bool|null $value
      * @return $this
-     * @since 2.0.0
      */
     public function setFlag($flag, $value = null)
     {
@@ -933,7 +872,6 @@ public function setFlag($flag, $value = null)
      *
      * @param string $flag
      * @return bool
-     * @since 2.0.0
      */
     public function hasFlag($flag)
     {
@@ -942,7 +880,7 @@ public function hasFlag($flag)
 
     /**
      * @return string[]
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -960,7 +898,7 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index dc4ff00d870f8..2c53293e0f71d 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -18,7 +18,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 abstract class AbstractDb extends \Magento\Framework\Data\Collection
 {
@@ -26,7 +25,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * DB connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_conn;
 
@@ -34,7 +32,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Select object
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_select;
 
@@ -44,7 +41,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Can be used by collections with items without defined
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName;
 
@@ -52,7 +48,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * List of bound variables for select
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_bindParams = [];
 
@@ -61,7 +56,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Used for getData method
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = null;
 
@@ -69,7 +63,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Fields map for correlation names & real selected fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_map = null;
 
@@ -77,7 +70,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Database's statement for fetch item one by one
      *
      * @var \Zend_Db_Statement_Pdo
-     * @since 2.0.0
      */
     protected $_fetchStmt = null;
 
@@ -85,19 +77,16 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Whether orders are rendered
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isOrdersRendered = false;
 
     /**
      * @var Logger
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var FetchStrategyInterface
-     * @since 2.0.0
      */
     private $_fetchStrategy;
 
@@ -105,7 +94,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * Join processor is set only if extension attributes were joined before the collection was loaded.
      *
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface|null
-     * @since 2.0.0
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -114,7 +102,6 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
      * @param Logger $logger
      * @param FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactoryInterface $entityFactory,
@@ -134,7 +121,6 @@ public function __construct(
      * Get resource instance.
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     abstract public function getResource();
 
@@ -144,7 +130,6 @@ abstract public function getResource();
      * @param string $name
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function addBindParam($name, $value)
     {
@@ -157,7 +142,6 @@ public function addBindParam($name, $value)
      *
      * @param string $fieldName
      * @return $this
-     * @since 2.0.0
      */
     protected function _setIdFieldName($fieldName)
     {
@@ -169,7 +153,6 @@ protected function _setIdFieldName($fieldName)
      * Id field name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -181,7 +164,6 @@ public function getIdFieldName()
      *
      * @param \Magento\Framework\DataObject $item
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getItemId(\Magento\Framework\DataObject $item)
     {
@@ -197,7 +179,6 @@ protected function _getItemId(\Magento\Framework\DataObject $item)
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $conn
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setConnection(\Magento\Framework\DB\Adapter\AdapterInterface $conn)
     {
@@ -211,7 +192,6 @@ public function setConnection(\Magento\Framework\DB\Adapter\AdapterInterface $co
      * Get \Magento\Framework\DB\Select instance
      *
      * @return Select
-     * @since 2.0.0
      */
     public function getSelect()
     {
@@ -222,7 +202,6 @@ public function getSelect()
      * Retrieve connection object
      *
      * @return AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -233,7 +212,6 @@ public function getConnection()
      * Get collection size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSize()
     {
@@ -248,7 +226,6 @@ public function getSize()
      * Get SQL for get record count
      *
      * @return Select
-     * @since 2.0.0
      */
     public function getSelectCountSql()
     {
@@ -276,7 +253,6 @@ public function getSelectCountSql()
      *
      * @param   bool $stringMode
      * @return  string|\Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelectSql($stringMode = false)
     {
@@ -292,7 +268,6 @@ public function getSelectSql($stringMode = false)
      * @param   string $field
      * @param   string $direction
      * @return  $this
-     * @since 2.0.0
      */
     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -305,7 +280,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
      * @param string $field
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function addOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -318,7 +292,6 @@ public function addOrder($field, $direction = self::SORT_ORDER_DESC)
      * @param string $field
      * @param string $direction
      * @return $this
-     * @since 2.0.0
      */
     public function unshiftOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -332,7 +305,6 @@ public function unshiftOrder($field, $direction = self::SORT_ORDER_DESC)
      * @param string $direction
      * @param bool $unshift
      * @return $this
-     * @since 2.0.0
      */
     private function _setOrder($field, $direction, $unshift = false)
     {
@@ -358,7 +330,6 @@ private function _setOrder($field, $direction, $unshift = false)
      * Render sql select conditions
      *
      * @return  $this
-     * @since 2.0.0
      */
     protected function _renderFilters()
     {
@@ -394,7 +365,6 @@ protected function _renderFilters()
     /**
      * Hook for operations before rendering filters
      * @return void
-     * @since 2.0.0
      */
     protected function _renderFiltersBefore()
     {
@@ -408,7 +378,6 @@ protected function _renderFiltersBefore()
      * @param string|array $field
      * @param null|string|array $condition
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -434,7 +403,6 @@ public function addFieldToFilter($field, $condition = null)
      * @param   string|array $field
      * @param   null|string|array $condition
      * @return  string
-     * @since 2.0.0
      */
     protected function _translateCondition($field, $condition)
     {
@@ -447,7 +415,6 @@ protected function _translateCondition($field, $condition)
      *
      * @param   string $field
      * @return  string
-     * @since 2.0.0
      */
     protected function _getMappedField($field)
     {
@@ -466,7 +433,6 @@ protected function _getMappedField($field)
      * Retrieve mapper data
      *
      * @return array|bool|null
-     * @since 2.0.0
      */
     protected function _getMapper()
     {
@@ -507,7 +473,6 @@ protected function _getMapper()
      * @param string $fieldName
      * @param integer|string|array $condition
      * @return string
-     * @since 2.0.0
      */
     protected function _getConditionSql($fieldName, $condition)
     {
@@ -519,7 +484,6 @@ protected function _getConditionSql($fieldName, $condition)
      *
      * @param string $fieldName
      * @return string
-     * @since 2.0.0
      */
     protected function _getConditionFieldName($fieldName)
     {
@@ -530,7 +494,6 @@ protected function _getConditionFieldName($fieldName)
      * Render sql select orders
      *
      * @return  $this
-     * @since 2.0.0
      */
     protected function _renderOrders()
     {
@@ -548,7 +511,6 @@ protected function _renderOrders()
      * Render sql select limit
      *
      * @return  $this
-     * @since 2.0.0
      */
     protected function _renderLimit()
     {
@@ -564,7 +526,6 @@ protected function _renderLimit()
      *
      * @param   bool $flag
      * @return  $this
-     * @since 2.0.0
      */
     public function distinct($flag)
     {
@@ -576,7 +537,6 @@ public function distinct($flag)
      * Before load action
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -589,7 +549,6 @@ protected function _beforeLoad()
      * @param   bool $printQuery
      * @param   bool $logQuery
      * @return  $this
-     * @since 2.0.0
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -606,7 +565,6 @@ public function load($printQuery = false, $logQuery = false)
      * @param   bool $printQuery
      * @param   bool $logQuery
      * @return  $this
-     * @since 2.0.0
      */
     public function loadWithFilter($printQuery = false, $logQuery = false)
     {
@@ -636,7 +594,6 @@ public function loadWithFilter($printQuery = false, $logQuery = false)
      *
      * @param \Magento\Framework\DataObject $item
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
     {
@@ -648,7 +605,6 @@ protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
      * and moves the internal data pointer ahead
      *
      * @return  \Magento\Framework\Model\AbstractModel|bool
-     * @since 2.0.0
      */
     public function fetchItem()
     {
@@ -677,7 +633,6 @@ public function fetchItem()
      * @param string $labelField
      * @param array $additional
      * @return array
-     * @since 2.0.0
      */
     protected function _toOptionArray($valueField = null, $labelField = 'name', $additional = [])
     {
@@ -693,7 +648,6 @@ protected function _toOptionArray($valueField = null, $labelField = 'name', $add
      * @param   string $valueField
      * @param   string $labelField
      * @return  array
-     * @since 2.0.0
      */
     protected function _toOptionHash($valueField = null, $labelField = 'name')
     {
@@ -707,7 +661,6 @@ protected function _toOptionHash($valueField = null, $labelField = 'name')
      * Get all data array for collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -724,7 +677,6 @@ public function getData()
      * Process loaded collection data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoadData()
     {
@@ -735,7 +687,6 @@ protected function _afterLoadData()
      * Reset loaded for collection data array
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetData()
     {
@@ -747,7 +698,6 @@ public function resetData()
      * Process loaded collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -760,7 +710,6 @@ protected function _afterLoad()
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -774,7 +723,6 @@ public function loadData($printQuery = false, $logQuery = false)
      * @param   bool $logQuery
      * @param   string $sql
      * @return  $this
-     * @since 2.0.0
      */
     public function printLogQuery($printQuery = false, $logQuery = false, $sql = null)
     {
@@ -793,7 +741,6 @@ public function printLogQuery($printQuery = false, $logQuery = false, $sql = nul
      *
      * @param string $sql
      * @return void
-     * @since 2.0.0
      */
     protected function _logQuery($sql)
     {
@@ -804,7 +751,6 @@ protected function _logQuery($sql)
      * Reset collection
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _reset()
     {
@@ -822,7 +768,6 @@ protected function _reset()
      *
      * @param Select $select
      * @return array
-     * @since 2.0.0
      */
     protected function _fetchAll(Select $select)
     {
@@ -845,7 +790,6 @@ protected function _fetchAll(Select $select)
      * @param string $alias
      * @param string $group default 'fields'
      * @return $this
-     * @since 2.0.0
      */
     public function addFilterToMap($filter, $alias, $group = 'fields')
     {
@@ -863,7 +807,6 @@ public function addFilterToMap($filter, $alias, $group = 'fields')
      * Clone $this->_select during cloning collection, otherwise both collections will share the same $this->_select
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -876,7 +819,6 @@ public function __clone()
      * Init select
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -889,7 +831,6 @@ protected function _initSelect()
      * @param JoinDataInterface $join
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @return $this
-     * @since 2.0.0
      */
     public function joinExtensionAttribute(
         JoinDataInterface $join,
@@ -921,7 +862,6 @@ public function joinExtensionAttribute(
      * Get collection item object class name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getItemObjectClass()
     {
@@ -933,7 +873,6 @@ public function getItemObjectClass()
      *
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function getMainTableAlias()
     {
@@ -947,7 +886,7 @@ private function getMainTableAlias()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -959,7 +898,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Cache.php b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Cache.php
index 74bf87f02088f..22f9b9df95025 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Cache.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Cache.php
@@ -11,37 +11,31 @@
 
 /**
  * Retrieve collection data from cache, fail over to another fetch strategy, if cache does not exist yet
- * @since 2.0.0
  */
 class Cache implements \Magento\Framework\Data\Collection\Db\FetchStrategyInterface
 {
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     private $_cache;
 
     /**
      * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface
-     * @since 2.0.0
      */
     private $_fetchStrategy;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheIdPrefix = '';
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_cacheTags = [];
 
     /**
      * @var int|bool|null
-     * @since 2.0.0
      */
     protected $_cacheLifetime = null;
 
@@ -60,7 +54,6 @@ class Cache implements \Magento\Framework\Data\Collection\Db\FetchStrategyInterf
      * @param array $cacheTags
      * @param int|bool|null $cacheLifetime
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Cache\FrontendInterface $cache,
@@ -80,7 +73,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function fetchAll(Select $select, array $bindParams = [])
     {
@@ -105,7 +97,6 @@ public function fetchAll(Select $select, array $bindParams = [])
      *
      * @param \Magento\Framework\DB\Select|string $select
      * @return string
-     * @since 2.0.0
      */
     protected function _getSelectCacheId($select)
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Query.php b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Query.php
index e470d425650f1..9d4589575125c 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Query.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Query.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Framework\Data\Collection\Db\FetchStrategy\Query
  *
- * @since 2.0.0
  */
 class Query implements \Magento\Framework\Data\Collection\Db\FetchStrategyInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function fetchAll(Select $select, array $bindParams = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategyInterface.php b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategyInterface.php
index 7f4d6dd813d52..d4ddf8b530be9 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategyInterface.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategyInterface.php
@@ -14,7 +14,6 @@
 /**
  * Interface \Magento\Framework\Data\Collection\Db\FetchStrategyInterface
  *
- * @since 2.0.0
  */
 interface FetchStrategyInterface
 {
@@ -24,7 +23,6 @@ interface FetchStrategyInterface
      * @param Select $select
      * @param array $bindParams
      * @return array
-     * @since 2.0.0
      */
     public function fetchAll(Select $select, array $bindParams = []);
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php b/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
index 9afb71bc5c04f..9791c4a33d42b 100644
--- a/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
+++ b/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Data\Collection\EntityFactory
  *
- * @since 2.0.0
  */
 class EntityFactory implements EntityFactoryInterface
 {
@@ -16,7 +15,6 @@ class EntityFactory implements EntityFactoryInterface
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class EntityFactory implements EntityFactoryInterface
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @throws \LogicException
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/EntityFactoryInterface.php b/lib/internal/Magento/Framework/Data/Collection/EntityFactoryInterface.php
index aa2afe8a5f8d8..7f8bbeafc9f12 100644
--- a/lib/internal/Magento/Framework/Data/Collection/EntityFactoryInterface.php
+++ b/lib/internal/Magento/Framework/Data/Collection/EntityFactoryInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Data\Collection\EntityFactoryInterface
  *
- * @since 2.0.0
  */
 interface EntityFactoryInterface
 {
@@ -18,7 +17,6 @@ interface EntityFactoryInterface
      * @param string $type
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function create($type, array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index e12ead4c46939..67d2a020864dd 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -23,7 +23,6 @@
  * At least one target directory must be set
  *
  * @api
- * @since 2.0.0
  */
 class Filesystem extends \Magento\Framework\Data\Collection
 {
@@ -31,7 +30,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Target directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_targetDirs = [];
 
@@ -39,7 +37,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Whether to collect files
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_collectFiles = true;
 
@@ -47,7 +44,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Whether to collect directories before files
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_dirsFirst = true;
 
@@ -55,7 +51,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Whether to collect recursively
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_collectRecursively = true;
 
@@ -63,7 +58,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Whether to collect dirs
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_collectDirs = false;
 
@@ -71,7 +65,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * \Directory names regex pre-filter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_allowedDirsMask = '/^[a-z0-9\.\-\_]+$/i';
 
@@ -79,7 +72,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Filenames regex pre-filter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_allowedFilesMask = '/^[a-z0-9\.\-\_]+\.[a-z0-9]+$/i';
 
@@ -87,7 +79,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Disallowed filenames regex pre-filter match for better versatility
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_disallowedFilesMask = '';
 
@@ -97,7 +88,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * @var int
      * @see Collection::$_filter
      * @see Collection::$_isFiltersRendered
-     * @since 2.0.0
      */
     private $_filterIncrement = 0;
 
@@ -107,7 +97,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * @var array
      * @see Collection::$_filter
      * @see Collection::$_isFiltersRendered
-     * @since 2.0.0
      */
     private $_filterBrackets = [];
 
@@ -117,7 +106,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * @var string
      * @see Collection::$_filter
      * @see Collection::$_isFiltersRendered
-     * @since 2.0.0
      */
     private $_filterEvalRendered = '';
 
@@ -125,7 +113,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Collecting items helper variable
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_collectedDirs = [];
 
@@ -133,7 +120,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      * Collecting items helper variable
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_collectedFiles = [];
 
@@ -143,7 +129,6 @@ class Filesystem extends \Magento\Framework\Data\Collection
      *
      * @param string $regex
      * @return $this
-     * @since 2.0.0
      */
     public function setDirsFilter($regex)
     {
@@ -157,7 +142,6 @@ public function setDirsFilter($regex)
      *
      * @param string $regex
      * @return $this
-     * @since 2.0.0
      */
     public function setFilesFilter($regex)
     {
@@ -171,7 +155,6 @@ public function setFilesFilter($regex)
      *
      * @param string $regex
      * @return $this
-     * @since 2.0.0
      */
     public function setDisallowedFilesFilter($regex)
     {
@@ -184,7 +167,6 @@ public function setDisallowedFilesFilter($regex)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCollectDirs($value)
     {
@@ -197,7 +179,6 @@ public function setCollectDirs($value)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCollectFiles($value)
     {
@@ -210,7 +191,6 @@ public function setCollectFiles($value)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setCollectRecursively($value)
     {
@@ -224,7 +204,6 @@ public function setCollectRecursively($value)
      * @param string $value
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function addTargetDir($value)
     {
@@ -242,7 +221,6 @@ public function addTargetDir($value)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setDirsFirst($value)
     {
@@ -257,7 +235,6 @@ public function setDirsFirst($value)
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _collectRecursive($dir)
     {
@@ -311,7 +288,6 @@ protected function _collectRecursive($dir)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @throws \Exception
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -364,7 +340,6 @@ public function loadData($printQuery = false, $logQuery = false)
      *
      * @param string $attributeName '_collectedFiles' | '_collectedDirs'
      * @return void
-     * @since 2.0.0
      */
     private function _generateAndFilterAndSort($attributeName)
     {
@@ -395,7 +370,6 @@ private function _generateAndFilterAndSort($attributeName)
      * @param array $a
      * @param array $b
      * @return int|void
-     * @since 2.0.0
      */
     protected function _usort($a, $b)
     {
@@ -413,7 +387,6 @@ protected function _usort($a, $b)
      * @param   string $field
      * @param   string $direction
      * @return  Collection
-     * @since 2.0.0
      */
     public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     {
@@ -426,7 +399,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
      *
      * @param string $filename
      * @return array
-     * @since 2.0.0
      */
     protected function _generateRow($filename)
     {
@@ -446,7 +418,6 @@ protected function _generateRow($filename)
      * @param callback $callback
      * @param bool $isInverted
      * @return $this
-     * @since 2.0.0
      */
     public function addCallbackFilter($field, $value, $type, $callback, $isInverted = false)
     {
@@ -469,7 +440,6 @@ public function addCallbackFilter($field, $value, $type, $callback, $isInverted
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.EvalExpression)
-     * @since 2.0.0
      */
     protected function _filterRow($row)
     {
@@ -512,7 +482,6 @@ protected function _filterRow($row)
      * @param array $callbackParams
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _invokeFilter($callback, $callbackParams)
     {
@@ -534,7 +503,6 @@ protected function _invokeFilter($callback, $callbackParams)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $cond, $type = 'and')
     {
@@ -663,7 +631,6 @@ public function addFieldToFilter($field, $cond, $type = 'and')
      * @param string $bracket
      * @param bool $isAnd
      * @return $this
-     * @since 2.0.0
      */
     protected function _addFilterBracket($bracket = '(', $isAnd = true)
     {
@@ -681,7 +648,6 @@ protected function _addFilterBracket($bracket = '(', $isAnd = true)
      * @param int $increment
      * @param bool $isAnd
      * @return string
-     * @since 2.0.0
      */
     protected function _renderConditionBeforeFilterElement($increment, $isAnd)
     {
@@ -706,7 +672,6 @@ protected function _renderConditionBeforeFilterElement($increment, $isAnd)
      * @param string $type
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addFilter($field, $value, $type = 'and')
     {
@@ -717,7 +682,6 @@ public function addFilter($field, $value, $type = 'and')
      * Get all ids of collected items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
@@ -733,7 +697,6 @@ public function getAllIds()
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
-     * @since 2.0.0
      */
     public function filterCallbackLike($field, $filterValue, $row)
     {
@@ -753,7 +716,6 @@ public function filterCallbackLike($field, $filterValue, $row)
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
-     * @since 2.0.0
      */
     public function filterCallbackEq($field, $filterValue, $row)
     {
@@ -769,7 +731,6 @@ public function filterCallbackEq($field, $filterValue, $row)
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
-     * @since 2.0.0
      */
     public function filterCallbackInArray($field, $filterValue, $row)
     {
@@ -786,7 +747,6 @@ public function filterCallbackInArray($field, $filterValue, $row)
      * @see addFieldToFilter()
      * @see addCallbackFilter()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function filterCallbackIsNull($field, $filterValue, $row)
     {
@@ -802,7 +762,6 @@ public function filterCallbackIsNull($field, $filterValue, $row)
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
-     * @since 2.0.0
      */
     public function filterCallbackIsMoreThan($field, $filterValue, $row)
     {
@@ -818,7 +777,6 @@ public function filterCallbackIsMoreThan($field, $filterValue, $row)
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
-     * @since 2.0.0
      */
     public function filterCallbackIsLessThan($field, $filterValue, $row)
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php b/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
index 891047391e146..25f3bbc3735f1 100644
--- a/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
+++ b/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * Model object factory
- * @since 2.0.0
  */
 class ModelFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function create($model, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/CollectionDataSourceInterface.php b/lib/internal/Magento/Framework/Data/CollectionDataSourceInterface.php
index 3be5026d49e24..41c044db400fe 100644
--- a/lib/internal/Magento/Framework/Data/CollectionDataSourceInterface.php
+++ b/lib/internal/Magento/Framework/Data/CollectionDataSourceInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CollectionDataSourceInterface
- * @since 2.0.0
  */
 interface CollectionDataSourceInterface extends ArgumentInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/DataArray.php b/lib/internal/Magento/Framework/Data/DataArray.php
index 2f5614a67cf3f..0a0aeff826ee5 100644
--- a/lib/internal/Magento/Framework/Data/DataArray.php
+++ b/lib/internal/Magento/Framework/Data/DataArray.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Data\DataArray
  *
- * @since 2.0.0
  */
 class DataArray extends \Magento\Framework\DataObject
 {
diff --git a/lib/internal/Magento/Framework/Data/Form.php b/lib/internal/Magento/Framework/Data/Form.php
index cdad354381755..fbec614dc3c96 100644
--- a/lib/internal/Magento/Framework/Data/Form.php
+++ b/lib/internal/Magento/Framework/Data/Form.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Form extends \Magento\Framework\Data\Form\AbstractForm
 {
@@ -23,7 +22,6 @@ class Form extends \Magento\Framework\Data\Form\AbstractForm
      * All form elements collection
      *
      * @var ElementCollection
-     * @since 2.0.0
      */
     protected $_allElements;
 
@@ -31,31 +29,26 @@ class Form extends \Magento\Framework\Data\Form\AbstractForm
      * form elements index
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_elementsIndex;
 
     /**
      * @var FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
     /**
      * @var RendererInterface
-     * @since 2.0.0
      */
     protected static $_defaultElementRenderer;
 
     /**
      * @var RendererInterface
-     * @since 2.0.0
      */
     protected static $_defaultFieldsetRenderer;
 
     /**
      * @var RendererInterface
-     * @since 2.0.0
      */
     protected static $_defaultFieldsetElementRenderer;
 
@@ -64,7 +57,6 @@ class Form extends \Magento\Framework\Data\Form\AbstractForm
      * @param ElementCollectionFactory $factoryCollection
      * @param FormKey $formKey
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -80,7 +72,6 @@ public function __construct(
     /**
      * @param RendererInterface $renderer
      * @return void
-     * @since 2.0.0
      */
     public static function setElementRenderer(RendererInterface $renderer = null)
     {
@@ -90,7 +81,6 @@ public static function setElementRenderer(RendererInterface $renderer = null)
     /**
      * @param RendererInterface $renderer
      * @return void
-     * @since 2.0.0
      */
     public static function setFieldsetRenderer(RendererInterface $renderer = null)
     {
@@ -100,7 +90,6 @@ public static function setFieldsetRenderer(RendererInterface $renderer = null)
     /**
      * @param RendererInterface $renderer
      * @return void
-     * @since 2.0.0
      */
     public static function setFieldsetElementRenderer(RendererInterface $renderer = null)
     {
@@ -109,7 +98,6 @@ public static function setFieldsetElementRenderer(RendererInterface $renderer =
 
     /**
      * @return RendererInterface
-     * @since 2.0.0
      */
     public static function getElementRenderer()
     {
@@ -118,7 +106,6 @@ public static function getElementRenderer()
 
     /**
      * @return RendererInterface
-     * @since 2.0.0
      */
     public static function getFieldsetRenderer()
     {
@@ -127,7 +114,6 @@ public static function getFieldsetRenderer()
 
     /**
      * @return RendererInterface
-     * @since 2.0.0
      */
     public static function getFieldsetElementRenderer()
     {
@@ -138,7 +124,6 @@ public static function getFieldsetElementRenderer()
      * Return allowed HTML form attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -151,7 +136,6 @@ public function getHtmlAttributes()
      * @param AbstractElement $element
      * @param bool $after
      * @return $this
-     * @since 2.0.0
      */
     public function addElement(AbstractElement $element, $after = false)
     {
@@ -166,7 +150,6 @@ public function addElement(AbstractElement $element, $after = false)
      *
      * @param   string $elementId
      * @return  bool
-     * @since 2.0.0
      */
     protected function _elementIdExists($elementId)
     {
@@ -176,7 +159,6 @@ protected function _elementIdExists($elementId)
     /**
      * @param AbstractElement $element
      * @return $this
-     * @since 2.0.0
      */
     public function addElementToCollection($element)
     {
@@ -189,7 +171,6 @@ public function addElementToCollection($element)
      * @param string $elementId
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function checkElementId($elementId)
     {
@@ -201,7 +182,6 @@ public function checkElementId($elementId)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -213,7 +193,6 @@ public function getForm()
      *
      * @param string $elementId
      * @return null|AbstractElement
-     * @since 2.0.0
      */
     public function getElement($elementId)
     {
@@ -226,7 +205,6 @@ public function getElement($elementId)
     /**
      * @param array $values
      * @return $this
-     * @since 2.0.0
      */
     public function setValues($values)
     {
@@ -243,7 +221,6 @@ public function setValues($values)
     /**
      * @param array $values
      * @return $this
-     * @since 2.0.0
      */
     public function addValues($values)
     {
@@ -264,7 +241,6 @@ public function addValues($values)
      *
      * @param string $suffix
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldNameSuffix($suffix)
     {
@@ -281,7 +257,6 @@ public function addFieldNameSuffix($suffix)
      * @param string $name
      * @param string $suffix
      * @return string
-     * @since 2.0.0
      */
     public function addSuffixToName($name, $suffix)
     {
@@ -302,7 +277,6 @@ public function addSuffixToName($name, $suffix)
     /**
      * @param string $elementId
      * @return $this
-     * @since 2.0.0
      */
     public function removeField($elementId)
     {
@@ -315,7 +289,6 @@ public function removeField($elementId)
     /**
      * @param string $prefix
      * @return $this
-     * @since 2.0.0
      */
     public function setFieldContainerIdPrefix($prefix)
     {
@@ -325,7 +298,6 @@ public function setFieldContainerIdPrefix($prefix)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFieldContainerIdPrefix()
     {
@@ -334,7 +306,6 @@ public function getFieldContainerIdPrefix()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -363,7 +334,6 @@ public function toHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/AbstractForm.php b/lib/internal/Magento/Framework/Data/Form/AbstractForm.php
index c8584b802ac78..f3b26dc7a9bfa 100644
--- a/lib/internal/Magento/Framework/Data/Form/AbstractForm.php
+++ b/lib/internal/Magento/Framework/Data/Form/AbstractForm.php
@@ -16,7 +16,6 @@
  * Abstract class for form, column and fieldset
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class AbstractForm extends \Magento\Framework\DataObject
 {
@@ -24,7 +23,6 @@ class AbstractForm extends \Magento\Framework\DataObject
      * Form level elements collection
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_elements;
 
@@ -32,25 +30,21 @@ class AbstractForm extends \Magento\Framework\DataObject
      * Element type classes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_types = [];
 
     /**
      * @var Factory
-     * @since 2.0.0
      */
     protected $_factoryElement;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $_factoryCollection;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $customAttributes = [];
 
@@ -58,7 +52,6 @@ class AbstractForm extends \Magento\Framework\DataObject
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Factory $factoryElement, CollectionFactory $factoryCollection, $data = [])
     {
@@ -74,7 +67,6 @@ public function __construct(Factory $factoryElement, CollectionFactory $factoryC
      * Please override this one instead of overriding real __construct constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -86,7 +78,6 @@ protected function _construct()
      * @param string $type
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function addType($type, $className)
     {
@@ -98,7 +89,6 @@ public function addType($type, $className)
      * Get elements collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getElements()
     {
@@ -114,7 +104,6 @@ public function getElements()
      * @param boolean $readonly
      * @param boolean $useDisabled
      * @return $this
-     * @since 2.0.0
      */
     public function setReadonly($readonly, $useDisabled = false)
     {
@@ -137,7 +126,6 @@ public function setReadonly($readonly, $useDisabled = false)
      * @param AbstractElement $element
      * @param bool|string|null $after
      * @return $this
-     * @since 2.0.0
      */
     public function addElement(AbstractElement $element, $after = null)
     {
@@ -158,7 +146,6 @@ public function addElement(AbstractElement $element, $after = null)
      * @param   array  $config
      * @param   bool|string|null  $after
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function addField($elementId, $type, $config, $after = false)
     {
@@ -176,7 +163,6 @@ public function addField($elementId, $type, $config, $after = false)
      *
      * @param string $elementId
      * @return $this
-     * @since 2.0.0
      */
     public function removeField($elementId)
     {
@@ -192,7 +178,6 @@ public function removeField($elementId)
      * @param bool|string|null $after
      * @param bool $isAdvanced
      * @return Fieldset
-     * @since 2.0.0
      */
     public function addFieldset($elementId, $config, $after = false, $isAdvanced = false)
     {
@@ -209,7 +194,6 @@ public function addFieldset($elementId, $config, $after = false, $isAdvanced = f
      * @param string $elementId
      * @param array $config
      * @return Column
-     * @since 2.0.0
      */
     public function addColumn($elementId, $config)
     {
@@ -225,7 +209,6 @@ public function addColumn($elementId, $config)
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function convertToArray(array $arrAttributes = [])
     {
@@ -244,7 +227,6 @@ public function convertToArray(array $arrAttributes = [])
      * @param string $key
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function addCustomAttribute($key, $value)
     {
@@ -260,7 +242,6 @@ public function addCustomAttribute($key, $value)
      * @param string $fieldSeparator
      * @param string $quote
      * @return string
-     * @since 2.0.0
      */
     public function serialize($keys = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 8b92d7867a4e9..8db84c27980ad 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -16,37 +16,31 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractElement extends AbstractForm
 {
     /**
      * @var string|int
-     * @since 2.0.0
      */
     protected $_id;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_type;
 
     /**
      * @var Form
-     * @since 2.0.0
      */
     protected $_form;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_elements;
 
     /**
      * @var RendererInterface
-     * @since 2.0.0
      */
     protected $_renderer;
 
@@ -54,13 +48,11 @@ abstract class AbstractElement extends AbstractForm
      * Shows whether current element belongs to Basic or Advanced form layout
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_advanced = false;
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -68,7 +60,6 @@ abstract class AbstractElement extends AbstractForm
      * Lock html attribute
      *
      * @var string
-     * @since 2.0.0
      */
     private $lockHtmlAttribute = 'data-locked';
 
@@ -77,7 +68,6 @@ abstract class AbstractElement extends AbstractForm
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -96,7 +86,6 @@ public function __construct(
      * @param AbstractElement $element
      * @param bool $after
      * @return Form
-     * @since 2.0.0
      */
     public function addElement(AbstractElement $element, $after = false)
     {
@@ -113,7 +102,6 @@ public function addElement(AbstractElement $element, $after = false)
      * Shows whether current element belongs to Basic or Advanced form layout
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAdvanced()
     {
@@ -125,7 +113,6 @@ public function isAdvanced()
      *
      * @param bool $advanced
      * @return $this
-     * @since 2.0.0
      */
     public function setAdvanced($advanced)
     {
@@ -137,7 +124,6 @@ public function setAdvanced($advanced)
      * Get id.
      *
      * @return string|int
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -148,7 +134,6 @@ public function getId()
      * Get type.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -159,7 +144,6 @@ public function getType()
      * Get form
      *
      * @return Form
-     * @since 2.0.0
      */
     public function getForm()
     {
@@ -171,7 +155,6 @@ public function getForm()
      *
      * @param string|int $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -184,7 +167,6 @@ public function setId($id)
      * Get the Html Id.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlId()
     {
@@ -195,7 +177,6 @@ public function getHtmlId()
      * Get the name.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -211,7 +192,6 @@ public function getName()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setType($type)
     {
@@ -223,7 +203,6 @@ public function setType($type)
     /**
      * @param AbstractForm $form
      * @return $this
-     * @since 2.0.0
      */
     public function setForm($form)
     {
@@ -236,7 +215,6 @@ public function setForm($form)
      *
      * @param string $elementId
      * @return AbstractForm
-     * @since 2.0.0
      */
     public function removeField($elementId)
     {
@@ -248,7 +226,6 @@ public function removeField($elementId)
      * Return the attributes for Html.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -275,7 +252,6 @@ public function getHtmlAttributes()
      *
      * @param string $class
      * @return $this
-     * @since 2.0.0
      */
     public function addClass($class)
     {
@@ -289,7 +265,6 @@ public function addClass($class)
      *
      * @param string $class
      * @return $this
-     * @since 2.0.0
      */
     public function removeClass($class)
     {
@@ -306,7 +281,6 @@ public function removeClass($class)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     protected function _escape($string)
     {
@@ -318,7 +292,6 @@ protected function _escape($string)
      *
      * @param null|int|string $index
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
@@ -335,7 +308,6 @@ public function getEscapedValue($index = null)
      *
      * @param RendererInterface $renderer
      * @return $this
-     * @since 2.0.0
      */
     public function setRenderer(RendererInterface $renderer)
     {
@@ -347,7 +319,6 @@ public function setRenderer(RendererInterface $renderer)
      * Get the renderer.
      *
      * @return RendererInterface
-     * @since 2.0.0
      */
     public function getRenderer()
     {
@@ -357,7 +328,6 @@ public function getRenderer()
     /**
      * @param null|string $suffix
      * @return string
-     * @since 2.0.0
      */
     protected function _getUiId($suffix = null)
     {
@@ -372,7 +342,6 @@ protected function _getUiId($suffix = null)
      * Get the Html for the element.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -404,7 +373,6 @@ public function getElementHtml()
      * Get the before element html.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBeforeElementHtml()
     {
@@ -415,7 +383,6 @@ public function getBeforeElementHtml()
      * Get the after element html.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getAfterElementHtml()
     {
@@ -426,7 +393,6 @@ public function getAfterElementHtml()
      * Get the after element Javascript.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getAfterElementJs()
     {
@@ -439,7 +405,6 @@ public function getAfterElementJs()
      * @param string $idSuffix
      * @param string $scopeLabel
      * @return string
-     * @since 2.0.0
      */
     public function getLabelHtml($idSuffix = '', $scopeLabel = '')
     {
@@ -462,7 +427,6 @@ public function getLabelHtml($idSuffix = '', $scopeLabel = '')
      * Get the default html.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultHtml()
     {
@@ -480,7 +444,6 @@ public function getDefaultHtml()
      * Get the html.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -499,7 +462,6 @@ public function getHtml()
      * Get the html.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -514,7 +476,6 @@ public function toHtml()
      * @param string $fieldSeparator
      * @param string $quote
      * @return string
-     * @since 2.0.0
      */
     public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
     {
@@ -538,7 +499,6 @@ public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparat
      * Indicates the elements readonly status.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getReadonly()
     {
@@ -553,7 +513,6 @@ public function getReadonly()
      * Get the container Id.
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtmlContainerId()
     {
@@ -572,7 +531,6 @@ public function getHtmlContainerId()
      * @param bool $overwrite
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function addElementValues($values, $overwrite = false)
     {
@@ -601,7 +559,6 @@ public function addElementValues($values, $overwrite = false)
      * Lock element
      *
      * @return void
-     * @since 2.0.0
      */
     public function lock()
     {
@@ -612,7 +569,6 @@ public function lock()
      * Is element locked
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLocked()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Button.php b/lib/internal/Magento/Framework/Data/Form/Element/Button.php
index 63e3b71ad794f..fa7d5ce4a600e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Button.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Button.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Button
  *
- * @since 2.0.0
  */
 class Button extends AbstractElement
 {
@@ -24,7 +23,6 @@ class Button extends AbstractElement
      * Additional html attributes
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_htmlAttributes = ['data-mage-init'];
 
@@ -33,7 +31,6 @@ class Button extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -50,7 +47,6 @@ public function __construct(
      * Html attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
index d025c7a0a6ccc..8be40b41fd737 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
@@ -11,7 +11,6 @@
  * Form checkbox element
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Checkbox extends AbstractElement
 {
@@ -20,7 +19,6 @@ class Checkbox extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -35,7 +33,6 @@ public function __construct(
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -58,7 +55,6 @@ public function getHtmlAttributes()
     /**
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -75,7 +71,6 @@ public function getElementHtml()
      *
      * @param bool $value
      * @return Checkbox
-     * @since 2.0.0
      */
     public function setIsChecked($value = false)
     {
@@ -88,7 +83,6 @@ public function setIsChecked($value = false)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsChecked()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index 691208f59137b..76bc4fce5f95c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -11,7 +11,6 @@
  * Form select element
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Checkboxes extends AbstractElement
 {
@@ -20,7 +19,6 @@ class Checkboxes extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -37,7 +35,6 @@ public function __construct(
      * Retrieve allow attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -59,7 +56,6 @@ public function getHtmlAttributes()
      * Prepare value list
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareValues()
     {
@@ -95,7 +91,6 @@ protected function _prepareValues()
      * Retrieve HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -117,7 +112,6 @@ public function getElementHtml()
     /**
      * @param mixed $value
      * @return string|void
-     * @since 2.0.0
      */
     public function getChecked($value)
     {
@@ -142,7 +136,6 @@ public function getChecked($value)
     /**
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     public function getDisabled($value)
     {
@@ -164,7 +157,6 @@ public function getDisabled($value)
     /**
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function getOnclick($value)
     {
@@ -177,7 +169,6 @@ public function getOnclick($value)
     /**
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function getOnchange($value)
     {
@@ -198,7 +189,6 @@ public function getOnchange($value)
     /**
      * @param array $option
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
index 003f481349b25..7a544501861bd 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
@@ -12,7 +12,6 @@
  * Form element collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Collection implements \ArrayAccess, \IteratorAggregate
 {
@@ -20,7 +19,6 @@ class Collection implements \ArrayAccess, \IteratorAggregate
      * Elements storage
      *
      * @var array
-     * @since 2.0.0
      */
     private $_elements;
 
@@ -28,7 +26,6 @@ class Collection implements \ArrayAccess, \IteratorAggregate
      * Elements container
      *
      * @var AbstractForm
-     * @since 2.0.0
      */
     private $_container;
 
@@ -36,7 +33,6 @@ class Collection implements \ArrayAccess, \IteratorAggregate
      * Class constructor
      *
      * @param AbstractForm $container
-     * @since 2.0.0
      */
     public function __construct(AbstractForm $container)
     {
@@ -48,7 +44,6 @@ public function __construct(AbstractForm $container)
      * Implementation of \IteratorAggregate::getIterator()
      *
      * @return \ArrayIterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -61,7 +56,6 @@ public function getIterator()
      * @param mixed $key
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function offsetSet($key, $value)
     {
@@ -73,7 +67,6 @@ public function offsetSet($key, $value)
      *
      * @param mixed $key
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function offsetGet($key)
     {
@@ -85,7 +78,6 @@ public function offsetGet($key)
      *
      * @param mixed $key
      * @return void
-     * @since 2.0.0
      */
     public function offsetUnset($key)
     {
@@ -97,7 +89,6 @@ public function offsetUnset($key)
      *
      * @param mixed $key
      * @return boolean
-     * @since 2.0.0
      */
     public function offsetExists($key)
     {
@@ -111,7 +102,6 @@ public function offsetExists($key)
      * @param AbstractElement $element
      * @param bool|string $after
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function add(AbstractElement $element, $after = false)
     {
@@ -147,7 +137,6 @@ public function add(AbstractElement $element, $after = false)
      *
      * @param mixed $callback
      * @return $this
-     * @since 2.0.0
      */
     public function usort($callback)
     {
@@ -160,7 +149,6 @@ public function usort($callback)
      *
      * @param mixed $elementId
      * @return $this
-     * @since 2.0.0
      */
     public function remove($elementId)
     {
@@ -178,7 +166,6 @@ public function remove($elementId)
      * Count elements in collection
      *
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -190,7 +177,6 @@ public function count()
      *
      * @param mixed $elementId
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function searchById($elementId)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/CollectionFactory.php b/lib/internal/Magento/Framework/Data/Form/Element/CollectionFactory.php
index c7fe2119b91ee..072d5b599e1b6 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/CollectionFactory.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/CollectionFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\CollectionFactory
  *
- * @since 2.0.0
  */
 class CollectionFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return Collection
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Column.php b/lib/internal/Magento/Framework/Data/Form/Element/Column.php
index 9d6412702c6fa..332b6def3d133 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Column.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Column.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Column
  *
- * @since 2.0.0
  */
 class Column extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Column extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 9410de839b67c..2f8d5417aa680 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -18,19 +18,16 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Date
  *
- * @since 2.0.0
  */
 class Date extends AbstractElement
 {
     /**
      * @var \DateTime
-     * @since 2.0.0
      */
     protected $_value;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $localeDate;
 
@@ -40,7 +37,6 @@ class Date extends AbstractElement
      * @param Escaper $escaper
      * @param TimezoneInterface $localeDate
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -64,7 +60,6 @@ public function __construct(
      *
      * @param int $value
      * @return int
-     * @since 2.0.0
      */
     protected function _toTimestamp($value)
     {
@@ -81,7 +76,6 @@ protected function _toTimestamp($value)
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value)
     {
@@ -112,7 +106,6 @@ public function setValue($value)
      *
      * @param string $format (compatible with \DateTime)
      * @return string
-     * @since 2.0.0
      */
     public function getValue($format = null)
     {
@@ -138,7 +131,6 @@ public function getValue($format = null)
      * Get value instance, if any
      *
      * @return \DateTime
-     * @since 2.0.0
      */
     public function getValueInstance()
     {
@@ -156,7 +148,6 @@ public function getValueInstance()
      *
      * @throws \Exception
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index 0dd346032b506..a8f342bf433ab 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Editablemultiselect
  *
- * @since 2.0.0
  */
 class Editablemultiselect extends \Magento\Framework\Data\Form\Element\Multiselect
 {
@@ -62,7 +61,6 @@ public function __construct(
      *
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -124,7 +122,6 @@ function check( tries, delay ){
      * @param array $option
      * @param string[] $selected
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option, $selected)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index b30bdee5c1d5e..24110bb30cdc6 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -12,7 +12,6 @@
  * Form editor element
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Editor extends Textarea
 {
@@ -30,7 +29,6 @@ class Editor extends Textarea
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -54,7 +52,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function getButtonTranslations()
     {
@@ -86,7 +83,6 @@ private function getJsonConfig()
     /**
      * @return string
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -225,7 +221,6 @@ public function getElementHtml()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getTheme()
     {
@@ -240,7 +235,6 @@ public function getTheme()
      * Return Editor top Buttons HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getButtonsHtml()
     {
@@ -261,7 +255,6 @@ protected function _getButtonsHtml()
      *
      * @param bool $visible
      * @return string
-     * @since 2.0.0
      */
     protected function _getToggleButtonHtml($visible = true)
     {
@@ -283,7 +276,6 @@ protected function _getToggleButtonHtml($visible = true)
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getPluginButtonsHtml($visible = true)
     {
@@ -344,7 +336,6 @@ protected function _getPluginButtonsHtml($visible = true)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareButtonOptions($options)
     {
@@ -362,7 +353,6 @@ protected function _prepareButtonOptions($options)
      *
      * @param array $pluginOptions
      * @return boolean
-     * @since 2.0.0
      */
     protected function _checkPluginButtonOptions($pluginOptions)
     {
@@ -378,7 +368,6 @@ protected function _checkPluginButtonOptions($pluginOptions)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareOptions($options)
     {
@@ -403,7 +392,6 @@ protected function _prepareOptions($options)
      * @param array $data Button params
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _getButtonHtml($data)
     {
@@ -425,7 +413,6 @@ protected function _getButtonHtml($data)
      *
      * @param string $html HTML code to wrap
      * @return string
-     * @since 2.0.0
      */
     protected function _wrapIntoContainer($html)
     {
@@ -447,7 +434,6 @@ protected function _wrapIntoContainer($html)
      *
      * @param string $key Config var key
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfig($key = null)
     {
@@ -466,7 +452,6 @@ public function getConfig($key = null)
      *
      * @param string $string String to be translated
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     public function translate($string)
     {
@@ -477,7 +462,6 @@ public function translate($string)
      * Check whether Wysiwyg is enabled or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -492,7 +476,6 @@ public function isEnabled()
      * Check whether Wysiwyg is loaded on demand or not
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHidden()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
index 1dc984db29389..cec75eff71b5a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,7 +26,6 @@ class Factory
      * Standard library element types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_standardTypes = [
         'button',
@@ -63,7 +60,6 @@ class Factory
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -77,7 +73,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param array $config
      * @return AbstractElement
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($elementType, array $config = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
index b5ed26f706230..66b1299b98696 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Fieldset extends AbstractElement
 {
@@ -22,7 +21,6 @@ class Fieldset extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -42,7 +40,6 @@ public function __construct(
      * Get elements html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -62,7 +59,6 @@ public function getElementHtml()
      * Get Children element's array
      *
      * @return AbstractElement[]
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -79,7 +75,6 @@ public function getChildren()
      * Get Children element's html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getChildrenHtml()
     {
@@ -90,7 +85,6 @@ public function getChildrenHtml()
      * Get Basic elements' array
      *
      * @return AbstractElement[]
-     * @since 2.0.0
      */
     public function getBasicChildren()
     {
@@ -107,7 +101,6 @@ public function getBasicChildren()
      * Get Basic elements' html in sorted order
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBasicChildrenHtml()
     {
@@ -118,7 +111,6 @@ public function getBasicChildrenHtml()
      * Get Number of Basic Children
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCountBasicChildren()
     {
@@ -129,7 +121,6 @@ public function getCountBasicChildren()
      * Get Advanced elements'
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAdvancedChildren()
     {
@@ -146,7 +137,6 @@ public function getAdvancedChildren()
      * Get Advanced elements' html in sorted order
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdvancedChildrenHtml()
     {
@@ -157,7 +147,6 @@ public function getAdvancedChildrenHtml()
      * Whether fieldset contains advance section
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdvanced()
     {
@@ -173,7 +162,6 @@ public function hasAdvanced()
      * Get SubFieldset
      *
      * @return AbstractElement[]
-     * @since 2.0.0
      */
     public function getSubFieldset()
     {
@@ -190,7 +178,6 @@ public function getSubFieldset()
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubFieldsetHtml()
     {
@@ -201,7 +188,6 @@ public function getSubFieldsetHtml()
      * Enter description here...
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultHtml()
     {
@@ -220,7 +206,6 @@ public function getDefaultHtml()
      * @param bool $after
      * @param bool $isAdvanced
      * @return AbstractElement
-     * @since 2.0.0
      */
     public function addField($elementId, $type, $config, $after = false, $isAdvanced = false)
     {
@@ -237,7 +222,6 @@ public function addField($elementId, $type, $config, $after = false, $isAdvanced
      *
      * @param AbstractElement[] $elements
      * @return string
-     * @since 2.0.0
      */
     protected function _elementsToHtml($elements)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/File.php b/lib/internal/Magento/Framework/Data/Form/Element/File.php
index 579ece4004cfe..3c899953cb8ab 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/File.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/File.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\File
  *
- * @since 2.0.0
  */
 class File extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index d285091655727..ef96a6969687a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Gallery
  *
- * @since 2.0.0
  */
 class Gallery extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Gallery extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -41,7 +39,6 @@ public function __construct(
      * @return string
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -234,7 +231,6 @@ function addNewImg(){
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -243,7 +239,6 @@ public function getName()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getParentName()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
index 3c76223c86a53..246d00688f022 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Hidden
  *
- * @since 2.0.0
  */
 class Hidden extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Hidden extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -40,7 +38,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
index 2d714a686734b..25700a9536f01 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Image.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Image
  *
- * @since 2.0.0
  */
 class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
@@ -32,7 +30,6 @@ class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Escaper $escaper
      * @param UrlInterface $urlBuilder
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -50,7 +47,6 @@ public function __construct(
      * Return element html code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -98,7 +94,6 @@ public function getElementHtml()
      * Return html code of delete checkbox element
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDeleteCheckbox()
     {
@@ -133,7 +128,6 @@ protected function _getDeleteCheckbox()
      * Return html code of hidden element
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getHiddenInput()
     {
@@ -144,7 +138,6 @@ protected function _getHiddenInput()
      * Get image preview url
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getUrl()
     {
@@ -155,7 +148,6 @@ protected function _getUrl()
      * Return name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php b/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
index 8acb73e054a86..418bc29a1b39e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Imagefile
  *
- * @since 2.0.0
  */
 class Imagefile extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Imagefile extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index f0690062b8097..1b9052a52aa6d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Label
  *
- * @since 2.0.0
  */
 class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
      * Retrieve Element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Link.php b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
index 057034e93424b..b752b0743a95d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Link.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Link
  *
- * @since 2.0.0
  */
 class Link extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Link extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -41,7 +39,6 @@ public function __construct(
      * Generates element html
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -55,7 +52,6 @@ public function getElementHtml()
      * Prepare array of anchor attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
index 5a9833ef86d15..e7133313da940 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Multiline
  *
- * @since 2.0.0
  */
 class Multiline extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Multiline extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -40,7 +38,6 @@ public function __construct(
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -63,7 +60,6 @@ public function getHtmlAttributes()
      * @param int $suffix
      * @param string $scopeLabel
      * @return string
-     * @since 2.0.0
      */
     public function getLabelHtml($suffix = 0, $scopeLabel = '')
     {
@@ -74,7 +70,6 @@ public function getLabelHtml($suffix = 0, $scopeLabel = '')
      * Get element HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -114,7 +109,6 @@ public function getElementHtml()
     /**
      * @return mixed
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getDefaultHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index 740b492ed245e..2c4a857167adf 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Multiselect
  *
- * @since 2.0.0
  */
 class Multiselect extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Multiselect extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -43,7 +41,6 @@ public function __construct(
      * Get the name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -58,7 +55,6 @@ public function getName()
      * Get the element as HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -101,7 +97,6 @@ public function getElementHtml()
      * Get the HTML attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -124,7 +119,6 @@ public function getHtmlAttributes()
      * Get the default HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultHtml()
     {
@@ -173,7 +167,6 @@ public function getDefaultHtml()
      * Get the  name of the JS object
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsObjectName()
     {
@@ -184,7 +177,6 @@ public function getJsObjectName()
      * @param array $option
      * @param array $selected
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option, $selected)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Note.php b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
index d96e06c061b1f..0b1f0d7625a0f 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Note.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Note
  *
- * @since 2.0.0
  */
 class Note extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Note extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php b/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
index 3d2f1b50a4439..570dc67852292 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Obscure
  *
- * @since 2.0.0
  */
 class Obscure extends \Magento\Framework\Data\Form\Element\Password
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_obscuredValue = '******';
 
@@ -29,7 +27,6 @@ class Obscure extends \Magento\Framework\Data\Form\Element\Password
      *
      * @param string $index
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue($index = null)
     {
@@ -44,7 +41,6 @@ public function getEscapedValue($index = null)
      * Returns list of html attributes possible to output in HTML
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Password.php b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
index e3585f21cbc6e..d333fb981c5d2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Password.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Password
  *
- * @since 2.0.0
  */
 class Password extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Password extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -40,7 +38,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radio.php b/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
index d4af49478fc45..da13a4c09bf36 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Radio
  *
- * @since 2.0.0
  */
 class Radio extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Radio extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
index 5dc87662c4249..77248a8946d58 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Radios
  *
- * @since 2.0.0
  */
 class Radios extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Radios extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -58,7 +55,6 @@ public function getElementHtml()
      * @param array $option
      * @param array $selected
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option, $selected)
     {
@@ -99,7 +95,6 @@ protected function _optionToHtml($option, $selected)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -109,7 +104,6 @@ public function getHtmlAttributes()
     /**
      * @param array $option
      * @return string
-     * @since 2.0.0
      */
     protected function getRadioButtonAttributes($option)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php b/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
index 02c2357dceb35..6cd22e0f50d5e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -22,7 +21,6 @@ interface RendererInterface
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @since 2.0.0
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element);
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Reset.php b/lib/internal/Magento/Framework/Data/Form/Element/Reset.php
index 486a02c6cf6e7..e0c84e51da419 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Reset.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Reset.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Reset
  *
- * @since 2.0.0
  */
 class Reset extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -23,7 +22,6 @@ class Reset extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index 40211f71a2602..d6d95ef9da63b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -12,7 +12,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Select extends AbstractElement
 {
@@ -21,7 +20,6 @@ class Select extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
      * Get the element Html.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
@@ -97,7 +94,6 @@ public function getElementHtml()
      * @param array $option
      * @param array $selected
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option, $selected)
     {
@@ -123,7 +119,6 @@ protected function _optionToHtml($option, $selected)
      * Prepare options.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareOptions()
     {
@@ -146,7 +141,6 @@ protected function _prepareOptions()
      * Get the Html attributes.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Submit.php b/lib/internal/Magento/Framework/Data/Form/Element/Submit.php
index 0995d4fdc16d8..544ad0748b98d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Submit.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Submit.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Submit
  *
- * @since 2.0.0
  */
 class Submit extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Submit extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -40,7 +38,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Text.php b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
index 4a6bde8d953c4..d2b5afe69be7e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Text.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Text
  *
- * @since 2.0.0
  */
 class Text extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Text extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -42,7 +40,6 @@ public function __construct(
      * Get the HTML
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -54,7 +51,6 @@ public function getHtml()
      * Get the attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
index ae1a4c3563b0d..094e982fd1031 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Textarea
  *
- * @since 2.0.0
  */
 class Textarea extends AbstractElement
 {
@@ -35,7 +34,6 @@ class Textarea extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -58,7 +56,6 @@ public function __construct(
      * Return the HTML attributes
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getHtmlAttributes()
     {
@@ -84,7 +81,6 @@ public function getHtmlAttributes()
      * Return the element as HTML
      *
      * @return string
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index 7f9dda54e970b..d29e24c1708aa 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Element\Time
  *
- * @since 2.0.0
  */
 class Time extends AbstractElement
 {
@@ -25,7 +24,6 @@ class Time extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Factory $factoryElement,
@@ -39,7 +37,6 @@ public function __construct(
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -54,7 +51,6 @@ public function getName()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/ElementFactory.php b/lib/internal/Magento/Framework/Data/Form/ElementFactory.php
index 8943d49839800..865aced3e2b29 100644
--- a/lib/internal/Magento/Framework/Data/Form/ElementFactory.php
+++ b/lib/internal/Magento/Framework/Data/Form/ElementFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Data\Form\ElementFactory
  *
- * @since 2.0.0
  */
 class ElementFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $elementClass
      * @param array $data
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
-     * @since 2.0.0
      */
     public function create($elementClass, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Date.php b/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
index 68f995fabb67e..3fe10e2fa83a4 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Filter\Date
  *
- * @since 2.0.0
  */
 class Date implements \Magento\Framework\Data\Form\Filter\FilterInterface
 {
@@ -24,7 +23,6 @@ class Date implements \Magento\Framework\Data\Form\Filter\FilterInterface
      * Date format
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_dateFormat;
 
@@ -32,7 +30,6 @@ class Date implements \Magento\Framework\Data\Form\Filter\FilterInterface
      * Local
      *
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -41,7 +38,6 @@ class Date implements \Magento\Framework\Data\Form\Filter\FilterInterface
      *
      * @param string $format \DateTime input/output format
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @since 2.0.0
      */
     public function __construct(
         $format = null,
@@ -59,7 +55,6 @@ public function __construct(
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function inputFilter($value)
     {
@@ -80,7 +75,6 @@ public function inputFilter($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function outputFilter($value)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
index 03987edd4464a..b218e17b98675 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Filter\Escapehtml
  *
- * @since 2.0.0
  */
 class Escapehtml implements \Magento\Framework\Data\Form\Filter\FilterInterface
 {
@@ -23,7 +22,6 @@ class Escapehtml implements \Magento\Framework\Data\Form\Filter\FilterInterface
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function inputFilter($value)
     {
@@ -35,7 +33,6 @@ public function inputFilter($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function outputFilter($value)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php b/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
index 32128b1055b79..f7205fd6946a2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface FilterInterface
 {
@@ -22,7 +21,6 @@ interface FilterInterface
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function inputFilter($value);
 
@@ -31,7 +29,6 @@ public function inputFilter($value);
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function outputFilter($value);
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Striptags.php b/lib/internal/Magento/Framework/Data/Form/Filter/Striptags.php
index 987624f03ec8e..efe09c203d550 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/Striptags.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Striptags.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Data\Form\Filter\Striptags
  *
- * @since 2.0.0
  */
 class Striptags implements \Magento\Framework\Data\Form\Filter\FilterInterface
 {
@@ -23,7 +22,6 @@ class Striptags implements \Magento\Framework\Data\Form\Filter\FilterInterface
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function inputFilter($value)
     {
@@ -35,7 +33,6 @@ public function inputFilter($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function outputFilter($value)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey.php b/lib/internal/Magento/Framework/Data/Form/FormKey.php
index 6445f768ccf10..dc4e89cd160c7 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FormKey
 {
@@ -18,19 +17,17 @@ class FormKey
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $mathRandom;
 
     /**
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.1.0
+     * @since 2.0.1
      */
     protected $escaper;
 
@@ -38,7 +35,6 @@ class FormKey
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Framework\Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Math\Random $mathRandom,
@@ -54,7 +50,6 @@ public function __construct(
      * Retrieve Session Form Key
      *
      * @return string A 16 bit unique key for forms
-     * @since 2.0.0
      */
     public function getFormKey()
     {
@@ -66,7 +61,6 @@ public function getFormKey()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isPresent()
     {
@@ -76,7 +70,6 @@ public function isPresent()
     /**
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function set($value)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index 54427432d94d0..0dbc9c879462e 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Validator
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $_formKey;
 
     /**
      * @param \Magento\Framework\Data\Form\FormKey $formKey
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Data\Form\FormKey $formKey)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\Data\Form\FormKey $formKey)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/lib/internal/Magento/Framework/Data/FormFactory.php b/lib/internal/Magento/Framework/Data/FormFactory.php
index 1a9f58caea730..ce8d39aa1f23a 100644
--- a/lib/internal/Magento/Framework/Data/FormFactory.php
+++ b/lib/internal/Magento/Framework/Data/FormFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Form factory class
- * @since 2.0.0
  */
 class FormFactory
 {
@@ -16,7 +15,6 @@ class FormFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -24,7 +22,6 @@ class FormFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName;
 
@@ -33,7 +30,6 @@ class FormFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -49,7 +45,6 @@ public function __construct(
      * @param array $data
      * @return \Magento\Framework\Data\Form
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/Graph.php b/lib/internal/Magento/Framework/Data/Graph.php
index 35c8a3482e258..fb680bb6870d0 100644
--- a/lib/internal/Magento/Framework/Data/Graph.php
+++ b/lib/internal/Magento/Framework/Data/Graph.php
@@ -7,7 +7,6 @@
 
 /**
  * Graph data structure
- * @since 2.0.0
  */
 class Graph
 {
@@ -22,19 +21,13 @@ class Graph
 
     /**#@-*/
 
-    /**
-     * Registry of nodes
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_nodes = [];
 
     /**
      * Declared relations directed "from" "to"
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_from = [];
 
@@ -42,7 +35,6 @@ class Graph
      * Inverse relations "to" "from"
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_to = [];
 
@@ -51,7 +43,6 @@ class Graph
      *
      * @param array $nodes plain array with node identifiers
      * @param array $relations array of 2-item plain arrays, which represent relations of nodes "from" "to"
-     * @since 2.0.0
      */
     public function __construct(array $nodes, array $relations)
     {
@@ -72,7 +63,6 @@ public function __construct(array $nodes, array $relations)
      * @param string|int $toNode
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addRelation($fromNode, $toNode)
     {
@@ -92,7 +82,6 @@ public function addRelation($fromNode, $toNode)
      * @param int $mode
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getRelations($mode = self::DIRECTIONAL)
     {
@@ -123,7 +112,6 @@ public function getRelations($mode = self::DIRECTIONAL)
      * @param string|int $node
      * @param boolean $firstOnly found only first cycle
      * @return array
-     * @since 2.0.0
      */
     public function findCycle($node = null, $firstOnly = true)
     {
@@ -151,7 +139,6 @@ public function findCycle($node = null, $firstOnly = true)
      * @param string|int $rootNode
      * @param int $mode
      * @return array
-     * @since 2.0.0
      */
     public function findPathsToReachableNodes($rootNode, $mode = self::DIRECTIONAL)
     {
@@ -186,7 +173,6 @@ public function findPathsToReachableNodes($rootNode, $mode = self::DIRECTIONAL)
      * @param string|int $toNode
      * @param int $mode
      * @return array
-     * @since 2.0.0
      */
     public function dfs($fromNode, $toNode, $mode = self::DIRECTIONAL)
     {
@@ -205,7 +191,6 @@ public function dfs($fromNode, $toNode, $mode = self::DIRECTIONAL)
      * @param array $stack
      * @return array
      * @link http://en.wikipedia.org/wiki/Depth-first_search
-     * @since 2.0.0
      */
     protected function _dfs($fromNode, $toNode, $graph, &$visited = [], $stack = [])
     {
@@ -235,7 +220,6 @@ protected function _dfs($fromNode, $toNode, $graph, &$visited = [], $stack = [])
      * @param bool $mustExist
      * @return void
      * @throws \InvalidArgumentException according to assertion rules
-     * @since 2.0.0
      */
     protected function _assertNode($node, $mustExist)
     {
diff --git a/lib/internal/Magento/Framework/Data/Helper/PostHelper.php b/lib/internal/Magento/Framework/Data/Helper/PostHelper.php
index 479eb73049995..53c5d2171232c 100644
--- a/lib/internal/Magento/Framework/Data/Helper/PostHelper.php
+++ b/lib/internal/Magento/Framework/Data/Helper/PostHelper.php
@@ -15,20 +15,17 @@
 /**
  * Class \Magento\Framework\Data\Helper\PostHelper
  *
- * @since 2.0.0
  */
 class PostHelper extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var UrlHelper
-     * @since 2.0.0
      */
     private $urlHelper;
 
     /**
      * @param Context $context
      * @param UrlHelper $urlHelper
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -44,7 +41,6 @@ public function __construct(
      * @param string $url
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     public function getPostData($url, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/ObjectFactory.php b/lib/internal/Magento/Framework/Data/ObjectFactory.php
index 9385e620e161d..ed3e97bfd7b0d 100644
--- a/lib/internal/Magento/Framework/Data/ObjectFactory.php
+++ b/lib/internal/Magento/Framework/Data/ObjectFactory.php
@@ -9,19 +9,16 @@
 /**
  * Class ObjectFactory
  * @package Magento\Framework\Data
- * @since 2.0.0
  */
 class ObjectFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $arguments
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function create($className, array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/Data/OptionSourceInterface.php b/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
index f4fd991dec249..aac9a266c7957 100644
--- a/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
+++ b/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
@@ -9,7 +9,6 @@
  * Source of option values in a form of value-label pairs
  *
  * @api
- * @since 2.0.0
  */
 interface OptionSourceInterface
 {
@@ -17,7 +16,6 @@ interface OptionSourceInterface
      * Return array of options as value-label pairs
      *
      * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
-     * @since 2.0.0
      */
     public function toOptionArray();
 }
diff --git a/lib/internal/Magento/Framework/Data/Schema.php b/lib/internal/Magento/Framework/Data/Schema.php
index 83f5a3ed10e3a..2baa3dc1c0201 100644
--- a/lib/internal/Magento/Framework/Data/Schema.php
+++ b/lib/internal/Magento/Framework/Data/Schema.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Framework\Data\Schema
  *
- * @since 2.0.0
  */
 class Schema extends \Magento\Framework\DataObject
 {
     /**
      * @param mixed $schema
      * @return void
-     * @since 2.0.0
      */
     public function load($schema)
     {
@@ -32,7 +30,6 @@ public function load($schema)
     /**
      * @param mixed $rawData
      * @return DataArray
-     * @since 2.0.0
      */
     public function extract($rawData)
     {
diff --git a/lib/internal/Magento/Framework/Data/SearchResultInterface.php b/lib/internal/Magento/Framework/Data/SearchResultInterface.php
index 34ddf8eb9dcd7..736fa209970f5 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultInterface.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Class SearchResultInterface
- * @since 2.0.0
  */
 interface SearchResultInterface
 {
@@ -15,7 +14,6 @@ interface SearchResultInterface
      * Retrieve collection items
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -23,13 +21,11 @@ public function getItems();
      * Retrieve count of currently loaded items
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount();
 
     /**
      * @return \Magento\Framework\Api\CriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 }
diff --git a/lib/internal/Magento/Framework/Data/SearchResultIterator.php b/lib/internal/Magento/Framework/Data/SearchResultIterator.php
index 4d4369395ff40..62d5b88f0d5c7 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultIterator.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultIterator.php
@@ -9,38 +9,32 @@
 
 /**
  * Class SearchResultIterator
- * @since 2.0.0
  */
 class SearchResultIterator implements \Iterator
 {
     /**
      * @var SearchResultInterface
-     * @since 2.0.0
      */
     protected $searchResult;
 
     /**
      * @var QueryInterface
-     * @since 2.0.0
      */
     protected $query;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $current;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $key = 0;
 
     /**
      * @param AbstractSearchResult $searchResult
      * @param QueryInterface $query
-     * @since 2.0.0
      */
     public function __construct(AbstractSearchResult $searchResult, QueryInterface $query)
     {
@@ -50,7 +44,6 @@ public function __construct(AbstractSearchResult $searchResult, QueryInterface $
 
     /**
      * @return array|mixed
-     * @since 2.0.0
      */
     public function current()
     {
@@ -59,7 +52,6 @@ public function current()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -69,7 +61,6 @@ public function next()
 
     /**
      * @return int|mixed
-     * @since 2.0.0
      */
     public function key()
     {
@@ -78,7 +69,6 @@ public function key()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -87,7 +77,6 @@ public function valid()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function rewind()
     {
diff --git a/lib/internal/Magento/Framework/Data/SearchResultIteratorFactory.php b/lib/internal/Magento/Framework/Data/SearchResultIteratorFactory.php
index 475ddc0226ce5..b5b0d66b1b15f 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultIteratorFactory.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultIteratorFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * Class SearchResultIteratorFactory
- * @since 2.0.0
  */
 class SearchResultIteratorFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return SearchResultIterator
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
index f543e4312d885..9cbee9c0e67c1 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
@@ -7,7 +7,6 @@
 
 /**
  * Class SearchResultProcessor
- * @since 2.0.0
  */
 class SearchResultProcessor extends AbstractDataObject implements SearchResultProcessorInterface
 {
@@ -15,19 +14,16 @@ class SearchResultProcessor extends AbstractDataObject implements SearchResultPr
      * Data Interface name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $dataInterface = \Magento\Framework\DataObject::class;
 
     /**
      * @var AbstractSearchResult
-     * @since 2.0.0
      */
     protected $searchResult;
 
     /**
      * @param AbstractSearchResult $searchResult
-     * @since 2.0.0
      */
     public function __construct(AbstractSearchResult $searchResult)
     {
@@ -36,7 +32,6 @@ public function __construct(AbstractSearchResult $searchResult)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage()
     {
@@ -45,7 +40,6 @@ public function getCurrentPage()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize()
     {
@@ -54,7 +48,6 @@ public function getPageSize()
 
     /**
      * @return \Magento\Framework\DataObject|mixed
-     * @since 2.0.0
      */
     public function getFirstItem()
     {
@@ -63,7 +56,6 @@ public function getFirstItem()
 
     /**
      * @return \Magento\Framework\DataObject|mixed
-     * @since 2.0.0
      */
     public function getLastItem()
     {
@@ -73,7 +65,6 @@ public function getLastItem()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
@@ -87,7 +78,6 @@ public function getAllIds()
     /**
      * @param int $id
      * @return \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function getItemById($id)
     {
@@ -101,7 +91,6 @@ public function getItemById($id)
     /**
      * @param string $colName
      * @return array
-     * @since 2.0.0
      */
     public function getColumnValues($colName)
     {
@@ -116,7 +105,6 @@ public function getColumnValues($colName)
      * @param string $column
      * @param mixed $value
      * @return array
-     * @since 2.0.0
      */
     public function getItemsByColumnValue($column, $value)
     {
@@ -133,7 +121,6 @@ public function getItemsByColumnValue($column, $value)
      * @param string $column
      * @param mixed $value
      * @return \Magento\Framework\DataObject|null
-     * @since 2.0.0
      */
     public function getItemByColumnValue($column, $value)
     {
@@ -149,7 +136,6 @@ public function getItemByColumnValue($column, $value)
      * @param string $callback
      * @param array $args
      * @return array
-     * @since 2.0.0
      */
     public function walk($callback, array $args = [])
     {
@@ -169,7 +155,6 @@ public function walk($callback, array $args = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function toXml()
     {
@@ -190,7 +175,6 @@ public function toXml()
     /**
      * @param array $arrRequiredFields
      * @return array
-     * @since 2.0.0
      */
     public function toArray($arrRequiredFields = [])
     {
@@ -208,7 +192,6 @@ public function toArray($arrRequiredFields = [])
      * @param null $labelField
      * @param array $additional
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($valueField = null, $labelField = null, $additional = [])
     {
@@ -235,7 +218,6 @@ public function toOptionArray($valueField = null, $labelField = null, $additiona
      * @param string $valueField
      * @param string $labelField
      * @return array
-     * @since 2.0.0
      */
     public function toOptionHash($valueField, $labelField)
     {
@@ -248,7 +230,6 @@ public function toOptionHash($valueField, $labelField)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getDataInterfaceName()
     {
diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessorFactory.php b/lib/internal/Magento/Framework/Data/SearchResultProcessorFactory.php
index 1480189ad8f39..85d002a96a021 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultProcessorFactory.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultProcessorFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class SearchResultProcessorFactory
- * @since 2.0.0
  */
 class SearchResultProcessorFactory
 {
@@ -17,7 +16,6 @@ class SearchResultProcessorFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class SearchResultProcessorFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager
@@ -38,7 +35,6 @@ public function __construct(
      *
      * @param AbstractSearchResult $collection
      * @return SearchResultProcessor
-     * @since 2.0.0
      */
     public function create(AbstractSearchResult $collection)
     {
diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessorInterface.php b/lib/internal/Magento/Framework/Data/SearchResultProcessorInterface.php
index 6ded0291ae6ae..ed5fc060799fc 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultProcessorInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface SearchResultProcessorInterface
- * @since 2.0.0
  */
 interface SearchResultProcessorInterface
 {
@@ -15,7 +14,6 @@ interface SearchResultProcessorInterface
      * Retrieve all ids for collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds();
 
@@ -23,7 +21,6 @@ public function getAllIds();
      * Get current collection page
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrentPage();
 
@@ -31,7 +28,6 @@ public function getCurrentPage();
      * Retrieve collection page size
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPageSize();
 
@@ -39,7 +35,6 @@ public function getPageSize();
      * Retrieve collection first item
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getFirstItem();
 
@@ -47,7 +42,6 @@ public function getFirstItem();
      * Retrieve collection last item
      *
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getLastItem();
 
@@ -56,7 +50,6 @@ public function getLastItem();
      *
      * @param   string $colName
      * @return  array
-     * @since 2.0.0
      */
     public function getColumnValues($colName);
 
@@ -66,7 +59,6 @@ public function getColumnValues($colName);
      * @param   string $column
      * @param   mixed $value
      * @return  array
-     * @since 2.0.0
      */
     public function getItemsByColumnValue($column, $value);
 
@@ -76,7 +68,6 @@ public function getItemsByColumnValue($column, $value);
      * @param   string $column
      * @param   mixed $value
      * @return  \Magento\Framework\DataObject || null
-     * @since 2.0.0
      */
     public function getItemByColumnValue($column, $value);
 
@@ -85,7 +76,6 @@ public function getItemByColumnValue($column, $value);
      *
      * @param   mixed $idValue
      * @return  \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function getItemById($idValue);
 
@@ -98,7 +88,6 @@ public function getItemById($idValue);
      * @param string $callback
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     public function walk($callback, array $arguments = []);
 
@@ -106,7 +95,6 @@ public function walk($callback, array $arguments = []);
      * Convert collection to XML
      *
      * @return string
-     * @since 2.0.0
      */
     public function toXml();
 
@@ -115,7 +103,6 @@ public function toXml();
      *
      * @param array $arrRequiredFields
      * @return array
-     * @since 2.0.0
      */
     public function toArray($arrRequiredFields = []);
 
@@ -134,7 +121,6 @@ public function toArray($arrRequiredFields = []);
      * @param string $labelField
      * @param array $additional
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($valueField = null, $labelField = null, $additional = []);
 
@@ -147,7 +133,6 @@ public function toOptionArray($valueField = null, $labelField = null, $additiona
      * @param   string $valueField
      * @param   string $labelField
      * @return  array
-     * @since 2.0.0
      */
     public function toOptionHash($valueField, $labelField);
 }
diff --git a/lib/internal/Magento/Framework/Data/Structure.php b/lib/internal/Magento/Framework/Data/Structure.php
index 51b3ef2966ea9..9d540e8a49f08 100644
--- a/lib/internal/Magento/Framework/Data/Structure.php
+++ b/lib/internal/Magento/Framework/Data/Structure.php
@@ -9,7 +9,6 @@
 
 /**
  * An associative data structure, that features "nested set" parent-child relations
- * @since 2.0.0
  */
 class Structure
 {
@@ -24,7 +23,6 @@ class Structure
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_elements = [];
 
@@ -32,7 +30,6 @@ class Structure
      * Set elements in constructor
      *
      * @param array $elements
-     * @since 2.0.0
      */
     public function __construct(array $elements = null)
     {
@@ -47,7 +44,6 @@ public function __construct(array $elements = null)
      * @param array $elements
      * @return void
      * @throws LocalizedException if any format issues identified
-     * @since 2.0.0
      */
     public function importElements(array $elements)
     {
@@ -86,7 +82,6 @@ public function importElements(array $elements)
      * @param string $elementId
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _assertParentRelation($elementId)
     {
@@ -136,7 +131,6 @@ protected function _assertParentRelation($elementId)
      * Dump all elements
      *
      * @return array
-     * @since 2.0.0
      */
     public function exportElements()
     {
@@ -150,7 +144,6 @@ public function exportElements()
      * @param array $data
      * @return void
      * @throws LocalizedException if an element with this id already exists
-     * @since 2.0.0
      */
     public function createElement($elementId, array $data)
     {
@@ -170,7 +163,6 @@ public function createElement($elementId, array $data)
      *
      * @param string $elementId
      * @return array|bool
-     * @since 2.0.0
      */
     public function getElement($elementId)
     {
@@ -182,7 +174,6 @@ public function getElement($elementId)
      *
      * @param string $elementId
      * @return bool
-     * @since 2.0.0
      */
     public function hasElement($elementId)
     {
@@ -198,7 +189,6 @@ public function hasElement($elementId)
      * @param string $elementId
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function unsetElement($elementId, $recursive = true)
     {
@@ -226,7 +216,6 @@ public function unsetElement($elementId, $recursive = true)
      * @param mixed $value
      * @throws \InvalidArgumentException
      * @return $this
-     * @since 2.0.0
      */
     public function setAttribute($elementId, $attribute, $value)
     {
@@ -249,7 +238,6 @@ public function setAttribute($elementId, $attribute, $value)
      * @param string $elementId
      * @param string $attribute
      * @return mixed
-     * @since 2.0.0
      */
     public function getAttribute($elementId, $attribute)
     {
@@ -267,7 +255,6 @@ public function getAttribute($elementId, $attribute)
      * @param string $newId
      * @return $this
      * @throws LocalizedException if trying to overwrite another element
-     * @since 2.0.0
      */
     public function renameElement($oldId, $newId)
     {
@@ -311,7 +298,6 @@ public function renameElement($oldId, $newId)
      * @see _insertChild() for position explanation
      * @return void
      * @throws LocalizedException if attempting to set parent as child to its child (recursively)
-     * @since 2.0.0
      */
     public function setAsChild($elementId, $parentId, $alias = '', $position = null)
     {
@@ -344,7 +330,6 @@ public function setAsChild($elementId, $parentId, $alias = '', $position = null)
      * @param string $elementId ID of an element or its parent element
      * @param string|null $alias
      * @return $this
-     * @since 2.0.0
      */
     public function unsetChild($elementId, $alias = null)
     {
@@ -374,7 +359,6 @@ public function unsetChild($elementId, $alias = null)
      * @param int|null $position
      * @return int
      * @see _insertChild() for position explanation
-     * @since 2.0.0
      */
     public function reorderChild($parentId, $childId, $position)
     {
@@ -413,7 +397,6 @@ public function reorderChild($parentId, $childId, $position)
      * @param string $siblingId
      * @param int $offset
      * @return int
-     * @since 2.0.0
      */
     public function reorderToSibling($parentId, $childId, $siblingId, $offset)
     {
@@ -435,7 +418,6 @@ public function reorderToSibling($parentId, $childId, $siblingId, $offset)
      * @param string $siblingId
      * @param int $delta
      * @return int
-     * @since 2.0.0
      */
     private function _getRelativeOffset($parentId, $siblingId, $delta)
     {
@@ -455,7 +437,6 @@ private function _getRelativeOffset($parentId, $siblingId, $delta)
      * @param string $parentId
      * @param string $alias
      * @return string|bool
-     * @since 2.0.0
      */
     public function getChildId($parentId, $alias)
     {
@@ -472,7 +453,6 @@ public function getChildId($parentId, $alias)
      *
      * @param string $parentId
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($parentId)
     {
@@ -486,7 +466,6 @@ public function getChildren($parentId)
      *
      * @param string $childId
      * @return string|bool
-     * @since 2.0.0
      */
     public function getParentId($childId)
     {
@@ -499,7 +478,6 @@ public function getParentId($childId)
      * @param string $parentId
      * @param string $childId
      * @return string|bool
-     * @since 2.0.0
      */
     public function getChildAlias($parentId, $childId)
     {
@@ -515,7 +493,6 @@ public function getChildAlias($parentId, $childId)
      * @param string $childId
      * @param string $groupName
      * @return bool
-     * @since 2.0.0
      */
     public function addToParentGroup($childId, $groupName)
     {
@@ -538,7 +515,6 @@ public function addToParentGroup($childId, $groupName)
      * @param string $parentId Name of an element containing group
      * @param string $groupName
      * @return array
-     * @since 2.0.0
      */
     public function getGroupChildNames($parentId, $groupName)
     {
@@ -560,7 +536,6 @@ public function getGroupChildNames($parentId, $groupName)
      * @param string $childId
      * @return int
      * @throws LocalizedException if specified elements have no parent-child relation
-     * @since 2.0.0
      */
     protected function _getChildOffset($parentId, $childId)
     {
@@ -579,7 +554,6 @@ protected function _getChildOffset($parentId, $childId)
      * @param string $childId
      * @param string $potentialParentId
      * @return bool
-     * @since 2.0.0
      */
     private function _isParentRecursively($childId, $potentialParentId)
     {
@@ -611,7 +585,6 @@ private function _isParentRecursively($childId, $potentialParentId)
      * @param string $alias
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _insertChild($targetParentId, $elementId, $offset, $alias)
     {
@@ -661,7 +634,6 @@ protected function _insertChild($targetParentId, $elementId, $offset, $alias)
      * @param string $elementId
      * @return void
      * @throws LocalizedException if doesn't exist
-     * @since 2.0.0
      */
     private function _assertElementExists($elementId)
     {
@@ -676,7 +648,6 @@ private function _assertElementExists($elementId)
      * @param array $value
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     private function _assertArray($value)
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree.php b/lib/internal/Magento/Framework/Data/Tree.php
index 31c3300019078..b458338184885 100644
--- a/lib/internal/Magento/Framework/Data/Tree.php
+++ b/lib/internal/Magento/Framework/Data/Tree.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Tree
 {
@@ -21,14 +20,12 @@ class Tree
      * Nodes collection
      *
      * @var NodeCollection
-     * @since 2.0.0
      */
     protected $_nodes;
 
     /**
      * Enter description here...
      *
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -39,7 +36,6 @@ public function __construct()
      * Enter description here...
      *
      * @return \Magento\Framework\Data\Tree
-     * @since 2.0.0
      */
     public function getTree()
     {
@@ -52,7 +48,6 @@ public function getTree()
      * @param Node $parentNode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function load($parentNode = null)
     {
@@ -64,7 +59,6 @@ public function load($parentNode = null)
      * @param int|string $nodeId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadNode($nodeId)
     {
@@ -78,7 +72,6 @@ public function loadNode($nodeId)
      * @param Node $prevNode
      * @return Node
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function appendChild($data, $parentNode, $prevNode = null)
     {
@@ -96,7 +89,6 @@ public function appendChild($data, $parentNode, $prevNode = null)
      * @param Node $node
      * @param Node $parent
      * @return Node
-     * @since 2.0.0
      */
     public function addNode($node, $parent = null)
     {
@@ -116,7 +108,6 @@ public function addNode($node, $parent = null)
      * @param Node $prevNode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function moveNodeTo($node, $parentNode, $prevNode = null)
     {
@@ -130,7 +121,6 @@ public function moveNodeTo($node, $parentNode, $prevNode = null)
      * @param Node $prevNode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function copyNodeTo($node, $parentNode, $prevNode = null)
     {
@@ -141,7 +131,6 @@ public function copyNodeTo($node, $parentNode, $prevNode = null)
      *
      * @param Node $node
      * @return $this
-     * @since 2.0.0
      */
     public function removeNode($node)
     {
@@ -160,7 +149,6 @@ public function removeNode($node)
      * @param Node $prevNode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function createNode($parentNode, $prevNode = null)
     {
@@ -172,7 +160,6 @@ public function createNode($parentNode, $prevNode = null)
      * @param Node $node
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChild($node)
     {
@@ -184,7 +171,6 @@ public function getChild($node)
      * @param Node $node
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getChildren($node)
     {
@@ -194,7 +180,6 @@ public function getChildren($node)
      * Enter description here...
      *
      * @return NodeCollection
-     * @since 2.0.0
      */
     public function getNodes()
     {
@@ -206,7 +191,6 @@ public function getNodes()
      *
      * @param Node $nodeId
      * @return Node
-     * @since 2.0.0
      */
     public function getNodeById($nodeId)
     {
@@ -218,7 +202,6 @@ public function getNodeById($nodeId)
      *
      * @param Node $node
      * @return array
-     * @since 2.0.0
      */
     public function getPath($node)
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Db.php b/lib/internal/Magento/Framework/Data/Tree/Db.php
index 5793a653b1c91..f114fd3508eb6 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Db.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Db.php
@@ -12,7 +12,6 @@
  * id  |  pid  |  level | order
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Db extends \Magento\Framework\Data\Tree
 {
@@ -28,7 +27,6 @@ class Db extends \Magento\Framework\Data\Tree
      * DB connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_conn;
 
@@ -36,7 +34,6 @@ class Db extends \Magento\Framework\Data\Tree
      * Data table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_table;
 
@@ -44,7 +41,6 @@ class Db extends \Magento\Framework\Data\Tree
      * SQL select object
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_select;
 
@@ -52,7 +48,6 @@ class Db extends \Magento\Framework\Data\Tree
      * Tree structure field name: _idField
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idField;
 
@@ -60,7 +55,6 @@ class Db extends \Magento\Framework\Data\Tree
      * Tree structure field name: _parentField
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_parentField;
 
@@ -68,7 +62,6 @@ class Db extends \Magento\Framework\Data\Tree
      * Tree structure field name: _levelField
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_levelField;
 
@@ -76,7 +69,6 @@ class Db extends \Magento\Framework\Data\Tree
      * Tree structure field name: _orderField
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField;
 
@@ -94,7 +86,6 @@ class Db extends \Magento\Framework\Data\Tree
      * @param string $table
      * @param array $fields
      * @throws \Exception
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $table, $fields)
     {
@@ -131,7 +122,6 @@ public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $conn
 
     /**
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getDbSelect()
     {
@@ -141,7 +131,6 @@ public function getDbSelect()
     /**
      * @param \Magento\Framework\DB\Select $select
      * @return void
-     * @since 2.0.0
      */
     public function setDbSelect($select)
     {
@@ -155,7 +144,6 @@ public function setDbSelect($select)
      * @param   int $recursionLevel recursion level
      * @return  $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function load($parentNode = null, $recursionLevel = 100)
     {
@@ -190,7 +178,6 @@ public function load($parentNode = null, $recursionLevel = 100)
     /**
      * @param mixed $nodeId
      * @return Node
-     * @since 2.0.0
      */
     public function loadNode($nodeId)
     {
@@ -207,7 +194,6 @@ public function loadNode($nodeId)
      * @param Node $parentNode
      * @param Node $prevNode
      * @return Node
-     * @since 2.0.0
      */
     public function appendChild($data, $parentNode, $prevNode = null)
     {
@@ -238,7 +224,6 @@ public function appendChild($data, $parentNode, $prevNode = null)
      * @param Node $prevNode
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function moveNodeTo($node, $parentNode, $prevNode = null)
     {
@@ -297,7 +282,6 @@ public function moveNodeTo($node, $parentNode, $prevNode = null)
      * @param mixed $parentId
      * @param int $parentLevel
      * @return $this
-     * @since 2.0.0
      */
     protected function _updateChildLevels($parentId, $parentLevel)
     {
@@ -325,7 +309,6 @@ protected function _updateChildLevels($parentId, $parentLevel)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadFullTree()
     {
@@ -347,7 +330,6 @@ protected function _loadFullTree()
      * @param Node $node
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function removeNode($node)
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Dbp.php b/lib/internal/Magento/Framework/Data/Tree/Dbp.php
index 6a44fd58add9f..814aafcec49c6 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Dbp.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Dbp.php
@@ -14,7 +14,6 @@
  * id  |  path  |  order
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Dbp extends \Magento\Framework\Data\Tree
 {
@@ -30,7 +29,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * DB connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_conn;
 
@@ -38,7 +36,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Data table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_table;
 
@@ -46,7 +43,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Indicates if loaded
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_loaded = false;
 
@@ -54,7 +50,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * SQL select object
      *
      * @var \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     protected $_select;
 
@@ -62,7 +57,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Tree structure field: id
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idField;
 
@@ -70,7 +64,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Tree structure field: path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_pathField;
 
@@ -78,7 +71,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Tree structure field: order
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_orderField;
 
@@ -86,7 +78,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * Tree structure field: level
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_levelField;
 
@@ -104,7 +95,6 @@ class Dbp extends \Magento\Framework\Data\Tree
      * @param string $table
      * @param array $fields
      * @throws \Exception
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $table, $fields)
     {
@@ -143,7 +133,6 @@ public function __construct(\Magento\Framework\DB\Adapter\AdapterInterface $conn
      * Retrieve current select object
      *
      * @return Select
-     * @since 2.0.0
      */
     public function getDbSelect()
     {
@@ -155,7 +144,6 @@ public function getDbSelect()
      *
      * @param Select $select
      * @return void
-     * @since 2.0.0
      */
     public function setDbSelect($select)
     {
@@ -168,7 +156,6 @@ public function setDbSelect($select)
      * @param   int|Node|string $parentNode
      * @param   int $recursionLevel
      * @return  $this
-     * @since 2.0.0
      */
     public function load($parentNode = null, $recursionLevel = 0)
     {
@@ -233,7 +220,6 @@ public function load($parentNode = null, $recursionLevel = 0)
      * @param Node $parentNode
      * @param int $level
      * @return void
-     * @since 2.0.0
      */
     public function addChildNodes($children, $path, $parentNode, $level = 0)
     {
@@ -269,7 +255,6 @@ public function addChildNodes($children, $path, $parentNode, $level = 0)
      *
      * @param int|string $nodeId
      * @return Node
-     * @since 2.0.0
      */
     public function loadNode($nodeId)
     {
@@ -294,7 +279,6 @@ public function loadNode($nodeId)
      * @param bool $recursive
      * @param array $result
      * @return array
-     * @since 2.0.0
      */
     public function getChildren($node, $recursive = true, $result = [])
     {
@@ -325,7 +309,6 @@ public function getChildren($node, $recursive = true, $result = [])
      * @return void
      * @throws \Exception
      * @todo Use adapter for generate conditions
-     * @since 2.0.0
      */
     public function move($node, $newParent, $prevNode = null)
     {
@@ -390,7 +373,6 @@ public function move($node, $newParent, $prevNode = null)
      * @param object $category
      * @param Node $rootNode
      * @return void
-     * @since 2.0.0
      */
     public function loadEnsuredNodes($category, $rootNode)
     {
@@ -435,7 +417,6 @@ public function loadEnsuredNodes($category, $rootNode)
      * @param bool $withChildren
      * @param int $level
      * @return void
-     * @since 2.0.0
      */
     protected function _addChildNodes($children, $path, $parentNode, $withChildren = false, $level = 0)
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node.php b/lib/internal/Magento/Framework/Data/Tree/Node.php
index 3ca0ceb6609db..f1901b71f21e6 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node.php
@@ -13,7 +13,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Node extends \Magento\Framework\DataObject
 {
@@ -21,7 +20,6 @@ class Node extends \Magento\Framework\DataObject
      * Parent node
      *
      * @var Node
-     * @since 2.0.0
      */
     protected $_parent;
 
@@ -29,7 +27,6 @@ class Node extends \Magento\Framework\DataObject
      * Main tree object
      *
      * @var Tree
-     * @since 2.0.0
      */
     protected $_tree;
 
@@ -37,7 +34,6 @@ class Node extends \Magento\Framework\DataObject
      * Child nodes
      *
      * @var Collection
-     * @since 2.0.0
      */
     protected $_childNodes;
 
@@ -45,7 +41,6 @@ class Node extends \Magento\Framework\DataObject
      * Node ID field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idField;
 
@@ -56,7 +51,6 @@ class Node extends \Magento\Framework\DataObject
      * @param string $idField
      * @param Tree $tree
      * @param Node $parent
-     * @since 2.0.0
      */
     public function __construct($data, $idField, $tree, $parent = null)
     {
@@ -71,7 +65,6 @@ public function __construct($data, $idField, $tree, $parent = null)
      * Retrieve node id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -83,7 +76,6 @@ public function getId()
      *
      * @param   string $idField
      * @return  $this
-     * @since 2.0.0
      */
     public function setIdField($idField)
     {
@@ -95,7 +87,6 @@ public function setIdField($idField)
      * Retrieve node id field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdField()
     {
@@ -107,7 +98,6 @@ public function getIdField()
      *
      * @param   Tree $tree
      * @return  $this
-     * @since 2.0.0
      */
     public function setTree(Tree $tree)
     {
@@ -119,7 +109,6 @@ public function setTree(Tree $tree)
      * Retrieve node tree object
      *
      * @return Tree
-     * @since 2.0.0
      */
     public function getTree()
     {
@@ -131,7 +120,6 @@ public function getTree()
      *
      * @param   Node $parent
      * @return  $this
-     * @since 2.0.0
      */
     public function setParent($parent)
     {
@@ -143,7 +131,6 @@ public function setParent($parent)
      * Retrieve node parent
      *
      * @return Tree
-     * @since 2.0.0
      */
     public function getParent()
     {
@@ -154,7 +141,6 @@ public function getParent()
      * Check node children
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -164,7 +150,6 @@ public function hasChildren()
     /**
      * @param mixed $level
      * @return $this
-     * @since 2.0.0
      */
     public function setLevel($level)
     {
@@ -175,7 +160,6 @@ public function setLevel($level)
     /**
      * @param mixed $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPathId($path)
     {
@@ -187,7 +171,6 @@ public function setPathId($path)
      * @param Node $node
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isChildOf($node)
     {
@@ -198,7 +181,6 @@ public function isChildOf($node)
      *
      * @param   int  $recursionLevel
      * @return  \Magento\Framework\Data\Tree\Node
-     * @since 2.0.0
      */
     public function loadChildren($recursionLevel = 0)
     {
@@ -210,7 +192,6 @@ public function loadChildren($recursionLevel = 0)
      * Retrieve node children collection
      *
      * @return Collection
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -220,7 +201,6 @@ public function getChildren()
     /**
      * @param array $nodes
      * @return array
-     * @since 2.0.0
      */
     public function getAllChildNodes(&$nodes = [])
     {
@@ -233,7 +213,6 @@ public function getAllChildNodes(&$nodes = [])
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getLastChild()
     {
@@ -245,7 +224,6 @@ public function getLastChild()
      *
      * @param   Node $node
      * @return  Node
-     * @since 2.0.0
      */
     public function addChild($node)
     {
@@ -256,7 +234,6 @@ public function addChild($node)
     /**
      * @param Node $prevNode
      * @return $this
-     * @since 2.0.0
      */
     public function appendChild($prevNode = null)
     {
@@ -268,7 +245,6 @@ public function appendChild($prevNode = null)
      * @param Node $parentNode
      * @param Node $prevNode
      * @return $this
-     * @since 2.0.0
      */
     public function moveTo($parentNode, $prevNode = null)
     {
@@ -280,7 +256,6 @@ public function moveTo($parentNode, $prevNode = null)
      * @param Node $parentNode
      * @param Node $prevNode
      * @return $this
-     * @since 2.0.0
      */
     public function copyTo($parentNode, $prevNode = null)
     {
@@ -291,7 +266,6 @@ public function copyTo($parentNode, $prevNode = null)
     /**
      * @param Node $childNode
      * @return $this
-     * @since 2.0.0
      */
     public function removeChild($childNode)
     {
@@ -302,7 +276,6 @@ public function removeChild($childNode)
     /**
      * @param array $prevNodes
      * @return array
-     * @since 2.0.0
      */
     public function getPath(&$prevNodes = [])
     {
@@ -315,7 +288,6 @@ public function getPath(&$prevNodes = [])
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getIsActive()
     {
@@ -324,7 +296,6 @@ public function getIsActive()
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
index 6bcd5b1937394..832fd18b48606 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
@@ -16,25 +16,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection implements \ArrayAccess, \IteratorAggregate
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $_nodes;
 
     /**
      * @var Node
-     * @since 2.0.0
      */
     private $_container;
 
     /**
      * @param Node $container
-     * @since 2.0.0
      */
     public function __construct($container)
     {
@@ -46,7 +42,6 @@ public function __construct($container)
      * Get the nodes
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNodes()
     {
@@ -57,7 +52,6 @@ public function getNodes()
      * Implementation of \IteratorAggregate::getIterator()
      *
      * @return \ArrayIterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -70,7 +64,6 @@ public function getIterator()
      * @param string $key
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function offsetSet($key, $value)
     {
@@ -81,7 +74,6 @@ public function offsetSet($key, $value)
      * Implementation of \ArrayAccess:offsetGet()
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function offsetGet($key)
     {
@@ -92,7 +84,6 @@ public function offsetGet($key)
      * Implementation of \ArrayAccess:offsetUnset()
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function offsetUnset($key)
     {
@@ -103,7 +94,6 @@ public function offsetUnset($key)
      * Implementation of \ArrayAccess:offsetExists()
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     public function offsetExists($key)
     {
@@ -114,7 +104,6 @@ public function offsetExists($key)
      * Adds a node to this node
      * @param Node $node
      * @return Node
-     * @since 2.0.0
      */
     public function add(Node $node)
     {
@@ -135,7 +124,6 @@ public function add(Node $node)
      *
      * @param Node $node
      * @return $this
-     * @since 2.0.0
      */
     public function delete($node)
     {
@@ -149,7 +137,6 @@ public function delete($node)
      * Return count
      *
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -160,7 +147,6 @@ public function count()
      * Return the last node
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function lastNode()
     {
@@ -179,7 +165,6 @@ public function lastNode()
      *
      * @param string $nodeId
      * @return null
-     * @since 2.0.0
      */
     public function searchById($nodeId)
     {
diff --git a/lib/internal/Magento/Framework/Data/Tree/NodeFactory.php b/lib/internal/Magento/Framework/Data/Tree/NodeFactory.php
index ad329d59c0243..1cda1ab0fa31f 100644
--- a/lib/internal/Magento/Framework/Data/Tree/NodeFactory.php
+++ b/lib/internal/Magento/Framework/Data/Tree/NodeFactory.php
@@ -10,7 +10,6 @@
 
 /**
  * Factory class for @see \Magento\Framework\Data\Tree\Node
- * @since 2.0.0
  */
 class NodeFactory
 {
@@ -18,7 +17,6 @@ class NodeFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class NodeFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -35,7 +32,6 @@ class NodeFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Data\Tree\Node
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Data/TreeFactory.php b/lib/internal/Magento/Framework/Data/TreeFactory.php
index dcb37d0ebd9e0..b72d100aa481b 100644
--- a/lib/internal/Magento/Framework/Data/TreeFactory.php
+++ b/lib/internal/Magento/Framework/Data/TreeFactory.php
@@ -10,7 +10,6 @@
 
 /**
  * Factory class for @see \Magento\Framework\Data\Tree
- * @since 2.0.0
  */
 class TreeFactory
 {
@@ -18,7 +17,6 @@ class TreeFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -26,7 +24,6 @@ class TreeFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -35,7 +32,6 @@ class TreeFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Data\Tree
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
index a4c03c66f0a0c..547a23ed979d1 100644
--- a/lib/internal/Magento/Framework/DataObject.php
+++ b/lib/internal/Magento/Framework/DataObject.php
@@ -10,7 +10,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 class DataObject implements \ArrayAccess
 {
@@ -18,7 +17,6 @@ class DataObject implements \ArrayAccess
      * Object attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_data = [];
 
@@ -26,7 +24,6 @@ class DataObject implements \ArrayAccess
      * Setter/Getter underscore transformation cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_underscoreCache = [];
 
@@ -37,7 +34,6 @@ class DataObject implements \ArrayAccess
      * This behavior may change in child classes
      *
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -51,7 +47,6 @@ public function __construct(array $data = [])
      *
      * @param array $arr
      * @return $this
-     * @since 2.0.0
      */
     public function addData(array $arr)
     {
@@ -72,7 +67,6 @@ public function addData(array $arr)
      * @param string|array  $key
      * @param mixed         $value
      * @return $this
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -89,7 +83,6 @@ public function setData($key, $value = null)
      *
      * @param null|string|array $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsetData($key = null)
     {
@@ -121,7 +114,6 @@ public function unsetData($key = null)
      * @param string     $key
      * @param string|int $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -158,7 +150,6 @@ public function getData($key = '', $index = null)
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getDataByPath($path)
     {
@@ -182,7 +173,6 @@ public function getDataByPath($path)
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getDataByKey($key)
     {
@@ -194,7 +184,6 @@ public function getDataByKey($key)
      *
      * @param   string $key
      * @return  mixed
-     * @since 2.0.0
      */
     protected function _getData($key)
     {
@@ -210,7 +199,6 @@ protected function _getData($key)
      * @param string $key
      * @param mixed $args
      * @return $this
-     * @since 2.0.0
      */
     public function setDataUsingMethod($key, $args = [])
     {
@@ -225,7 +213,6 @@ public function setDataUsingMethod($key, $args = [])
      * @param string $key
      * @param mixed $args
      * @return mixed
-     * @since 2.0.0
      */
     public function getDataUsingMethod($key, $args = null)
     {
@@ -239,7 +226,6 @@ public function getDataUsingMethod($key, $args = null)
      *
      * @param string $key
      * @return bool
-     * @since 2.0.0
      */
     public function hasData($key = '')
     {
@@ -254,7 +240,6 @@ public function hasData($key = '')
      *
      * @param array $keys array of required keys
      * @return array
-     * @since 2.0.0
      */
     public function toArray(array $keys = [])
     {
@@ -278,7 +263,6 @@ public function toArray(array $keys = [])
      *
      * @param  array $keys
      * @return array
-     * @since 2.0.0
      */
     public function convertToArray(array $keys = [])
     {
@@ -293,7 +277,6 @@ public function convertToArray(array $keys = [])
      * @param bool $addOpenTag flag that allow to add initial xml node
      * @param bool $addCdata flag that require wrap all values in CDATA
      * @return string
-     * @since 2.0.0
      */
     public function toXml(array $keys = [], $rootName = 'item', $addOpenTag = false, $addCdata = true)
     {
@@ -328,7 +311,6 @@ public function toXml(array $keys = [], $rootName = 'item', $addOpenTag = false,
      * @param bool $addOpenTag flag that allow to add initial xml node
      * @param bool $addCdata flag that require wrap all values in CDATA
      * @return string
-     * @since 2.0.0
      */
     public function convertToXml(
         array $arrAttributes = [],
@@ -344,7 +326,6 @@ public function convertToXml(
      *
      * @param array $keys array of required keys
      * @return string
-     * @since 2.0.0
      */
     public function toJson(array $keys = [])
     {
@@ -357,7 +338,6 @@ public function toJson(array $keys = [])
      *
      * @param  array $keys
      * @return string
-     * @since 2.0.0
      */
     public function convertToJson(array $keys = [])
     {
@@ -371,7 +351,6 @@ public function convertToJson(array $keys = [])
      *
      * @param string $format
      * @return string
-     * @since 2.0.0
      */
     public function toString($format = '')
     {
@@ -394,7 +373,6 @@ public function toString($format = '')
      * @param   array $args
      * @return  mixed
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
@@ -423,7 +401,6 @@ public function __call($method, $args)
      * Checks whether the object is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEmpty()
     {
@@ -441,7 +418,6 @@ public function isEmpty()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _underscore($name)
     {
@@ -463,7 +439,6 @@ protected function _underscore($name)
      * @param   string $fieldSeparator separator between key/value pairs
      * @param   string $quote quoting sign
      * @return  string
-     * @since 2.0.0
      */
     public function serialize($keys = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
     {
@@ -487,7 +462,6 @@ public function serialize($keys = [], $valueSeparator = '=', $fieldSeparator = '
      * @param mixed $data
      * @param array &$objects
      * @return array
-     * @since 2.0.0
      */
     public function debug($data = null, &$objects = [])
     {
@@ -519,7 +493,6 @@ public function debug($data = null, &$objects = [])
      * @param mixed $value
      * @return void
      * @link http://www.php.net/manual/en/arrayaccess.offsetset.php
-     * @since 2.0.0
      */
     public function offsetSet($offset, $value)
     {
@@ -532,7 +505,6 @@ public function offsetSet($offset, $value)
      * @param string $offset
      * @return bool
      * @link http://www.php.net/manual/en/arrayaccess.offsetexists.php
-     * @since 2.0.0
      */
     public function offsetExists($offset)
     {
@@ -545,7 +517,6 @@ public function offsetExists($offset)
      * @param string $offset
      * @return void
      * @link http://www.php.net/manual/en/arrayaccess.offsetunset.php
-     * @since 2.0.0
      */
     public function offsetUnset($offset)
     {
@@ -558,7 +529,6 @@ public function offsetUnset($offset)
      * @param string $offset
      * @return mixed
      * @link http://www.php.net/manual/en/arrayaccess.offsetget.php
-     * @since 2.0.0
      */
     public function offsetGet($offset)
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Cache.php b/lib/internal/Magento/Framework/DataObject/Cache.php
index fd49a3f456466..06f6cd0bb0ff6 100644
--- a/lib/internal/Magento/Framework/DataObject/Cache.php
+++ b/lib/internal/Magento/Framework/DataObject/Cache.php
@@ -11,7 +11,6 @@
  * Stores objects for reuse, cleanup and to avoid circular references
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Cache
 {
@@ -19,7 +18,6 @@ class Cache
      * Singleton instance
      *
      * @var \Magento\Framework\DataObject\Cache
-     * @since 2.0.0
      */
     protected static $_instance;
 
@@ -27,7 +25,6 @@ class Cache
      * Running object index for anonymous objects
      *
      * @var integer
-     * @since 2.0.0
      */
     protected $_idx = 0;
 
@@ -35,7 +32,6 @@ class Cache
      * Array of objects
      *
      * @var array of objects
-     * @since 2.0.0
      */
     protected $_objects = [];
 
@@ -43,7 +39,6 @@ class Cache
      * SPL object hashes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_hashes = [];
 
@@ -51,7 +46,6 @@ class Cache
      * SPL hashes by object
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_objectHashes = [];
 
@@ -59,7 +53,6 @@ class Cache
      * Objects by tags for cleanup
      *
      * @var array 2D
-     * @since 2.0.0
      */
     protected $_tags = [];
 
@@ -67,7 +60,6 @@ class Cache
      * Tags by objects
      *
      * @var array 2D
-     * @since 2.0.0
      */
     protected $_objectTags = [];
 
@@ -75,7 +67,6 @@ class Cache
      * References to objects
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_references = [];
 
@@ -83,7 +74,6 @@ class Cache
      * References by object
      *
      * @var array 2D
-     * @since 2.0.0
      */
     protected $_objectReferences = [];
 
@@ -91,7 +81,6 @@ class Cache
      * Debug data such as backtrace per class
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_debug = [];
 
@@ -99,7 +88,6 @@ class Cache
      * Singleton factory
      *
      * @return \Magento\Framework\DataObject\Cache
-     * @since 2.0.0
      */
     public static function singleton()
     {
@@ -115,7 +103,6 @@ public static function singleton()
      * @param string|object $idx
      * @param object $default
      * @return object
-     * @since 2.0.0
      */
     public function load($idx, $default = null)
     {
@@ -138,7 +125,6 @@ public function load($idx, $default = null)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save($object, $idx = null, $tags = null)
     {
@@ -198,7 +184,6 @@ public function save($object, $idx = null, $tags = null)
      * @param string $idx
      * @return bool|void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function reference($refName, $idx)
     {
@@ -228,7 +213,6 @@ public function reference($refName, $idx)
      *
      * @param string|object $idx
      * @return boolean
-     * @since 2.0.0
      */
     public function delete($idx)
     {
@@ -274,7 +258,6 @@ public function delete($idx)
      *
      * @param string $class
      * @return void
-     * @since 2.0.0
      */
     public function deleteByClass($class)
     {
@@ -291,7 +274,6 @@ public function deleteByClass($class)
      * @param array|string $tags
      * @return true
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function deleteByTags($tags)
     {
@@ -311,7 +293,6 @@ public function deleteByTags($tags)
      *
      * @param string $idx
      * @return boolean
-     * @since 2.0.0
      */
     public function has($idx)
     {
@@ -323,7 +304,6 @@ public function has($idx)
      *
      * @param object $object
      * @return string|boolean
-     * @since 2.0.0
      */
     public function find($object)
     {
@@ -340,7 +320,6 @@ public function find($object)
      *
      * @param string[] $ids
      * @return array
-     * @since 2.0.0
      */
     public function findByIds($ids)
     {
@@ -358,7 +337,6 @@ public function findByIds($ids)
      *
      * @param string $hash
      * @return object
-     * @since 2.0.0
      */
     public function findByHash($hash)
     {
@@ -371,7 +349,6 @@ public function findByHash($hash)
      * @param array|string $tags
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function findByTags($tags)
     {
@@ -395,7 +372,6 @@ public function findByTags($tags)
      *
      * @param string $class
      * @return array
-     * @since 2.0.0
      */
     public function findByClass($class)
     {
@@ -415,7 +391,6 @@ public function findByClass($class)
      * @param object|null $object
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function debug($idx, $object = null)
     {
@@ -436,7 +411,6 @@ public function debug($idx, $object = null)
      *
      * @param array|string $ids
      * @return array
-     * @since 2.0.0
      */
     public function debugByIds($ids)
     {
@@ -454,7 +428,6 @@ public function debugByIds($ids)
      * Get all objects
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllObjects()
     {
@@ -465,7 +438,6 @@ public function getAllObjects()
      * Get all tags
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTags()
     {
@@ -476,7 +448,6 @@ public function getAllTags()
      * Get all tags by object
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllTagsByObject()
     {
@@ -487,7 +458,6 @@ public function getAllTagsByObject()
      * Get all references
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllReferences()
     {
@@ -498,7 +468,6 @@ public function getAllReferences()
      * Get all references by object
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllReferencesByObject()
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy.php b/lib/internal/Magento/Framework/DataObject/Copy.php
index 6cf24e9c4addb..19aa57cd7e71a 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Framework\DataObject\Copy
  *
- * @since 2.0.0
  */
 class Copy
 {
     /**
      * @var \Magento\Framework\DataObject\Copy\Config
-     * @since 2.0.0
      */
     protected $fieldsetConfig;
 
@@ -26,13 +24,11 @@ class Copy
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager = null;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttributesFactory
-     * @since 2.0.0
      */
     protected $extensionAttributesFactory;
 
@@ -40,7 +36,6 @@ class Copy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\DataObject\Copy\Config $fieldsetConfig
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionAttributesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -67,7 +62,6 @@ public function __construct(
      * @throws \InvalidArgumentException
      *
      * @api
-     * @since 2.0.0
      */
     public function copyFieldsetToTarget($fieldset, $aspect, $source, $target, $root = 'global')
     {
@@ -108,7 +102,6 @@ public function copyFieldsetToTarget($fieldset, $aspect, $source, $target, $root
      * @param string $root
      * @param bool $targetIsArray
      * @return \Magento\Framework\DataObject|mixed
-     * @since 2.0.0
      */
     protected function dispatchCopyFieldSetEvent($fieldset, $aspect, $source, $target, $root, $targetIsArray)
     {
@@ -137,7 +130,6 @@ protected function dispatchCopyFieldSetEvent($fieldset, $aspect, $source, $targe
      * @return array $data
      *
      * @api
-     * @since 2.0.0
      */
     public function getDataFromFieldset($fieldset, $aspect, $source, $root = 'global')
     {
@@ -171,7 +163,6 @@ public function getDataFromFieldset($fieldset, $aspect, $source, $root = 'global
      * @param array|\Magento\Framework\DataObject $source
      * @param array|\Magento\Framework\DataObject $target
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFieldsetInputValid($source, $target)
     {
@@ -191,7 +182,6 @@ protected function _isFieldsetInputValid($source, $target)
      *
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getFieldsetFieldValue($source, $code)
     {
@@ -221,7 +211,6 @@ protected function _getFieldsetFieldValue($source, $code)
      *
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _setFieldsetFieldValue($target, $targetCode, $value)
     {
@@ -252,7 +241,6 @@ protected function _setFieldsetFieldValue($target, $targetCode, $value)
      *
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getAttributeValueFromExtensibleDataObject($source, $code)
     {
@@ -287,7 +275,6 @@ protected function getAttributeValueFromExtensibleDataObject($source, $code)
      *
      * @return null
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function setAttributeValueFromExtensibleDataObject($target, $code, $value)
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config.php b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
index d65157e836880..6717c60f061f4 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\DataObject\Copy\Config
  *
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @var \Magento\Framework\DataObject\Copy\Config\Data
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
     /**
      * @param \Magento\Framework\DataObject\Copy\Config\Data $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\DataObject\Copy\Config\Data $dataStorage)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\DataObject\Copy\Config\Data $data
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     public function getFieldsets($path)
     {
@@ -45,7 +41,6 @@ public function getFieldsets($path)
      * @param string $name fieldset name
      * @param string $root fieldset area, could be 'admin'
      * @return null|array
-     * @since 2.0.0
      */
     public function getFieldset($name, $root = 'global')
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Converter.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Converter.php
index a8b9ca9448d28..1504803f1e5bf 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Converter.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\DataObject\Copy\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -17,7 +16,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -36,7 +34,6 @@ public function convert($source)
      *
      * @param \DOMNode $scope
      * @return array
-     * @since 2.0.0
      */
     protected function _convertScope($scope)
     {
@@ -56,7 +53,6 @@ protected function _convertScope($scope)
      *
      * @param \DOMNode $fieldset
      * @return array
-     * @since 2.0.0
      */
     protected function _convertFieldset($fieldset)
     {
@@ -76,7 +72,6 @@ protected function _convertFieldset($fieldset)
      *
      * @param \DOMNode $field
      * @return array
-     * @since 2.0.0
      */
     protected function _convertField($field)
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data.php
index b034931f569bc..625017d34d977 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data.php
@@ -7,7 +7,6 @@
 
 /**
  * Provides DataObject copier configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
index 083a2258f97b2..880da5db771eb 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
@@ -7,7 +7,6 @@
 
 /**
  * Proxy class for @see \Magento\Framework\DataObject\Copy\Config\Data
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
     \Magento\Framework\ObjectManager\NoninterceptableInterface
@@ -16,7 +15,6 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
      * Proxied instance
      *
      * @var \Magento\Framework\DataObject\Copy\Config\Data
-     * @since 2.0.0
      */
     protected $_subject = null;
 
@@ -40,7 +36,6 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isShared = null;
 
@@ -50,7 +45,6 @@ class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -64,7 +58,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -75,7 +68,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -86,7 +78,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -97,7 +88,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\DataObject\Copy\Config\Data
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -111,7 +101,6 @@ protected function _getSubject()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
@@ -120,7 +109,6 @@ public function merge(array $config)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($path = null, $default = null)
     {
@@ -129,7 +117,6 @@ public function get($path = null, $default = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function reset()
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Reader.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Reader.php
index c17ab3b9ec8ac..7752e8a4d520f 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Reader.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\DataObject\Copy\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/scope' => 'id',
@@ -36,7 +34,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/SchemaLocator.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/SchemaLocator.php
index 0aa7d8d2015eb..88e4413743aaa 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/SchemaLocator.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\DataObject\Copy\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -20,7 +19,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema;
 
@@ -28,7 +26,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema;
 
@@ -36,7 +33,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * @param UrnResolver $urnResolver
      * @param string $schema
      * @param string $perFileSchema
-     * @since 2.0.0
      */
     public function __construct(UrnResolver $urnResolver, $schema, $perFileSchema)
     {
@@ -48,7 +44,6 @@ public function __construct(UrnResolver $urnResolver, $schema, $perFileSchema)
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -59,7 +54,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/DataObject/Factory.php b/lib/internal/Magento/Framework/DataObject/Factory.php
index 88fef974c655c..1eb632cc60d55 100644
--- a/lib/internal/Magento/Framework/DataObject/Factory.php
+++ b/lib/internal/Magento/Framework/DataObject/Factory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\DataObject\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -17,7 +16,6 @@ class Factory
      *
      * @param array $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/DataObject/IdentityInterface.php b/lib/internal/Magento/Framework/DataObject/IdentityInterface.php
index 9c5aad86c4c81..42bc9c570b128 100644
--- a/lib/internal/Magento/Framework/DataObject/IdentityInterface.php
+++ b/lib/internal/Magento/Framework/DataObject/IdentityInterface.php
@@ -9,7 +9,6 @@
  * Interface for
  * 1. models which require cache refresh when it is created/updated/deleted
  * 2. blocks which render this information to front-end
- * @since 2.0.0
  */
 interface IdentityInterface
 {
@@ -17,7 +16,6 @@ interface IdentityInterface
      * Return unique ID(s) for each object in system
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getIdentities();
 }
diff --git a/lib/internal/Magento/Framework/DataObject/KeyValueObjectInterface.php b/lib/internal/Magento/Framework/DataObject/KeyValueObjectInterface.php
index 16f051e593c31..52e012c639a47 100644
--- a/lib/internal/Magento/Framework/DataObject/KeyValueObjectInterface.php
+++ b/lib/internal/Magento/Framework/DataObject/KeyValueObjectInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Framework\DataObject\KeyValueObjectInterface
  *
- * @since 2.0.0
  */
 interface KeyValueObjectInterface
 {
@@ -20,7 +19,6 @@ interface KeyValueObjectInterface
      * Get object key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getKey();
 
@@ -29,7 +27,6 @@ public function getKey();
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function setKey($key);
 
@@ -37,7 +34,6 @@ public function setKey($key);
      * Get object value
      *
      * @return string
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -46,7 +42,6 @@ public function getValue();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setValue($value);
 }
diff --git a/lib/internal/Magento/Framework/DataObject/Mapper.php b/lib/internal/Magento/Framework/DataObject/Mapper.php
index dbd4cb48496f7..0b00564a454a0 100644
--- a/lib/internal/Magento/Framework/DataObject/Mapper.php
+++ b/lib/internal/Magento/Framework/DataObject/Mapper.php
@@ -12,7 +12,6 @@
 /**
  * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  * @SuppressWarnings(PHPMD.NPathComplexity)
- * @since 2.0.0
  */
 class Mapper
 {
@@ -42,7 +41,6 @@ class Mapper
      * @param array $map
      * @param array $defaults
      * @return array|object
-     * @since 2.0.0
      */
     public static function &accumulateByMap($from, $to, array $map, array $defaults = [])
     {
diff --git a/lib/internal/Magento/Framework/Debug.php b/lib/internal/Magento/Framework/Debug.php
index 664dc93c3b2dc..6e5222a19884c 100644
--- a/lib/internal/Magento/Framework/Debug.php
+++ b/lib/internal/Magento/Framework/Debug.php
@@ -7,13 +7,11 @@
 
 /**
  * Magento Debug methods
- * @since 2.0.0
  */
 class Debug
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     public static $argLength = 16;
 
@@ -21,7 +19,6 @@ class Debug
      * Magento Root path
      *
      * @var string
-     * @since 2.0.0
      */
     protected static $_filePath;
 
@@ -29,7 +26,6 @@ class Debug
      * Retrieve real root path with last directory separator
      *
      * @return string
-     * @since 2.0.0
      */
     public static function getRootPath()
     {
@@ -50,7 +46,6 @@ public static function getRootPath()
      * @param bool $html        output in HTML format
      * @param bool $withArgs    add short arguments of methods
      * @return string|bool
-     * @since 2.0.0
      */
     public static function backtrace($return = false, $html = true, $withArgs = true)
     {
@@ -68,7 +63,6 @@ public static function backtrace($return = false, $html = true, $withArgs = true
      * @return string|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public static function trace(array $trace, $return = false, $html = true, $withArgs = true)
     {
@@ -150,7 +144,6 @@ public static function trace(array $trace, $return = false, $html = true, $withA
      * @param mixed $arg
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected static function _formatCalledArgument($arg)
     {
diff --git a/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php b/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
index d72206e4aa979..677e4d654e52c 100644
--- a/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
+++ b/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * DOM document factory
- * @since 2.0.0
  */
 class DomDocumentFactory
 {
@@ -15,7 +14,6 @@ class DomDocumentFactory
      * Create empty DOM document instance.
      *
      * @return \DOMDocument
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index 6345afa9c11f4..c304cdb23f85e 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -10,25 +10,21 @@
  * Class encapsulates cryptographic algorithm
  *
  * @api
- * @since 2.0.0
  */
 class Crypt
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_cipher;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_mode;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_initVector;
 
@@ -36,7 +32,6 @@ class Crypt
      * Encryption algorithm module handle
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_handle;
 
@@ -51,7 +46,6 @@ class Crypt
      *                                 TRUE generates a random initial vector.
      *                                 FALSE fills initial vector with zero bytes to not use it.
      * @throws \Exception
-     * @since 2.0.0
      */
     public function __construct(
         $key,
@@ -108,7 +102,6 @@ public function __construct(
 
     /**
      * Destructor frees allocated resources
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -124,7 +117,6 @@ public function __destruct()
      * Retrieve a name of currently used cryptographic algorithm
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCipher()
     {
@@ -135,7 +127,6 @@ public function getCipher()
      * Mode in which cryptographic algorithm is running
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode()
     {
@@ -146,7 +137,6 @@ public function getMode()
      * Retrieve an actual value of initial vector that has been used to initialize a cipher
      *
      * @return string
-     * @since 2.0.0
      */
     public function getInitVector()
     {
@@ -158,7 +148,6 @@ public function getInitVector()
      *
      * @param  string $data String to encrypt
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data)
     {
@@ -175,7 +164,6 @@ public function encrypt($data)
      *
      * @param  string $data String to decrypt
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data)
     {
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index 330d39174dd24..c79233b62fb61 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Encryptor provides basic logic for hashing strings and encrypting/decrypting misc data
- * @since 2.0.0
  */
 class Encryptor implements EncryptorInterface
 {
@@ -67,7 +66,6 @@ class Encryptor implements EncryptorInterface
 
     /**
      * @var array map of hash versions
-     * @since 2.0.0
      */
     private $hashVersionMap = [
         self::HASH_VERSION_MD5 => 'md5',
@@ -76,7 +74,6 @@ class Encryptor implements EncryptorInterface
 
     /**
      * @var array map of password hash
-     * @since 2.0.0
      */
     private $passwordHashMap = [
         self::PASSWORD_HASH => '',
@@ -88,7 +85,6 @@ class Encryptor implements EncryptorInterface
      * Indicate cipher
      *
      * @var int
-     * @since 2.0.0
      */
     protected $cipher = self::CIPHER_LATEST;
 
@@ -96,7 +92,6 @@ class Encryptor implements EncryptorInterface
      * Version of encryption key
      *
      * @var int
-     * @since 2.0.0
      */
     protected $keyVersion;
 
@@ -104,14 +99,12 @@ class Encryptor implements EncryptorInterface
      * Array of encryption keys
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $keys = [];
 
     /**
      * @param Random $random
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(
         Random $random,
@@ -132,7 +125,6 @@ public function __construct(
      * @param int $version
      * @return int
      * @throws \Exception
-     * @since 2.0.0
      */
     public function validateCipher($version)
     {
@@ -147,7 +139,6 @@ public function validateCipher($version)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getHash($password, $salt = false, $version = self::HASH_VERSION_LATEST)
     {
@@ -173,7 +164,6 @@ public function getHash($password, $salt = false, $version = self::HASH_VERSION_
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function hash($data, $version = self::HASH_VERSION_LATEST)
     {
@@ -182,7 +172,6 @@ public function hash($data, $version = self::HASH_VERSION_LATEST)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function validateHash($password, $hash)
     {
@@ -191,7 +180,6 @@ public function validateHash($password, $hash)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isValidHash($password, $hash)
     {
@@ -209,7 +197,6 @@ public function isValidHash($password, $hash)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function validateHashVersion($hash, $validateCount = false)
     {
@@ -224,7 +211,6 @@ public function validateHashVersion($hash, $validateCount = false)
     /**
      * @param string $hash
      * @return array
-     * @since 2.0.0
      */
     private function explodePasswordHash($hash)
     {
@@ -239,7 +225,6 @@ private function explodePasswordHash($hash)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     private function getPasswordHash()
     {
@@ -248,7 +233,6 @@ private function getPasswordHash()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     private function getPasswordSalt()
     {
@@ -257,7 +241,6 @@ private function getPasswordSalt()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     private function getPasswordVersion()
     {
@@ -269,7 +252,6 @@ private function getPasswordVersion()
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data)
     {
@@ -292,7 +274,6 @@ public function encrypt($data)
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data)
     {
@@ -344,7 +325,6 @@ public function decrypt($data)
      * @param string|null $key NULL value means usage of the default key specified on constructor
      * @return \Magento\Framework\Encryption\Crypt
      * @throws \Exception
-     * @since 2.0.0
      */
     public function validateKey($key)
     {
@@ -359,7 +339,6 @@ public function validateKey($key)
      *
      * @param string $key
      * @return $this
-     * @since 2.0.0
      */
     public function setNewKey($key)
     {
@@ -373,7 +352,6 @@ public function setNewKey($key)
      * Export current keys as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function exportKeys()
     {
@@ -389,7 +367,6 @@ public function exportKeys()
      * @param int $cipherVersion
      * @param bool $initVector
      * @return Crypt|null
-     * @since 2.0.0
      */
     protected function getCrypt($key = null, $cipherVersion = null, $initVector = true)
     {
diff --git a/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php b/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
index 665fe8196f708..f7bc424a7a0d6 100644
--- a/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
+++ b/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
@@ -9,7 +9,6 @@
  * Encryptor interface
  *
  * @api
- * @since 2.0.0
  */
 interface EncryptorInterface
 {
@@ -25,7 +24,6 @@ interface EncryptorInterface
      * @param string $password
      * @param bool|int|string $salt
      * @return string
-     * @since 2.0.0
      */
     public function getHash($password, $salt = false);
 
@@ -34,7 +32,6 @@ public function getHash($password, $salt = false);
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function hash($data);
 
@@ -45,7 +42,6 @@ public function hash($data);
      * @param string $hash
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function validateHash($password, $hash);
 
@@ -56,7 +52,6 @@ public function validateHash($password, $hash);
      * @param string $hash
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function isValidHash($password, $hash);
 
@@ -66,7 +61,6 @@ public function isValidHash($password, $hash);
      * @param string $hash
      * @param bool $validateCount
      * @return bool
-     * @since 2.0.0
      */
     public function validateHashVersion($hash, $validateCount = false);
 
@@ -75,7 +69,6 @@ public function validateHashVersion($hash, $validateCount = false);
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($data);
 
@@ -84,7 +77,6 @@ public function encrypt($data);
      *
      * @param string $data
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($data);
 
@@ -93,7 +85,6 @@ public function decrypt($data);
      *
      * @param string $key
      * @return \Magento\Framework\Encryption\Crypt
-     * @since 2.0.0
      */
     public function validateKey($key);
 }
diff --git a/lib/internal/Magento/Framework/Encryption/Helper/Security.php b/lib/internal/Magento/Framework/Encryption/Helper/Security.php
index 8f739d3262cd8..63884b5c7fb3e 100644
--- a/lib/internal/Magento/Framework/Encryption/Helper/Security.php
+++ b/lib/internal/Magento/Framework/Encryption/Helper/Security.php
@@ -12,7 +12,6 @@
  * Class implements compareString from Zend\Crypt
  *
  * @api
- * @since 2.0.0
  */
 class Security
 {
@@ -22,7 +21,6 @@ class Security
      * @param  string $expected
      * @param  string $actual
      * @return bool
-     * @since 2.0.0
      */
     public static function compareStrings($expected, $actual)
     {
diff --git a/lib/internal/Magento/Framework/Encryption/UrlCoder.php b/lib/internal/Magento/Framework/Encryption/UrlCoder.php
index 0c15cd06c9a7e..12e3bb27b6724 100644
--- a/lib/internal/Magento/Framework/Encryption/UrlCoder.php
+++ b/lib/internal/Magento/Framework/Encryption/UrlCoder.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UrlCoder
 {
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_url;
 
     /**
      * @param \Magento\Framework\UrlInterface $url
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\UrlInterface $url)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\UrlInterface $url)
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function encode($url)
     {
@@ -44,7 +40,6 @@ public function encode($url)
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function decode($url)
     {
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index 42589101fa6bd..dd3906841ff52 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -9,7 +9,6 @@
  * Magento escape methods
  *
  * @api
- * @since 2.0.0
  */
 class Escaper
 {
@@ -50,7 +49,6 @@ class Escaper
      * @param string|array $data
      * @param array|null $allowedTags
      * @return string|array
-     * @since 2.0.0
      */
     public function escapeHtml($data, $allowedTags = null)
     {
@@ -217,7 +215,6 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function escapeUrl($string)
     {
@@ -282,7 +279,6 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -304,7 +300,6 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeXssInUrl($data)
     {
@@ -323,7 +318,6 @@ public function escapeXssInUrl($data)
      * @param bool $addSlashes
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeQuote($data, $addSlashes = false)
     {
diff --git a/lib/internal/Magento/Framework/Event.php b/lib/internal/Magento/Framework/Event.php
index 21ef665e8e18a..4c116d0a33629 100644
--- a/lib/internal/Magento/Framework/Event.php
+++ b/lib/internal/Magento/Framework/Event.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Event extends \Magento\Framework\DataObject
 {
@@ -21,7 +20,6 @@ class Event extends \Magento\Framework\DataObject
      * Observers collection
      *
      * @var \Magento\Framework\Event\Observer\Collection
-     * @since 2.0.0
      */
     protected $_observers;
 
@@ -31,7 +29,6 @@ class Event extends \Magento\Framework\DataObject
      * Initializes observers collection
      *
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -43,7 +40,6 @@ public function __construct(array $data = [])
      * Returns all the registered observers for the event
      *
      * @return \Magento\Framework\Event\Observer\Collection
-     * @since 2.0.0
      */
     public function getObservers()
     {
@@ -55,7 +51,6 @@ public function getObservers()
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function addObserver(\Magento\Framework\Event\Observer $observer)
     {
@@ -68,7 +63,6 @@ public function addObserver(\Magento\Framework\Event\Observer $observer)
      *
      * @param string $observerName
      * @return $this
-     * @since 2.0.0
      */
     public function removeObserverByName($observerName)
     {
@@ -80,7 +74,6 @@ public function removeObserverByName($observerName)
      * Dispatches the event to registered observers
      *
      * @return $this
-     * @since 2.0.0
      */
     public function dispatch()
     {
@@ -92,7 +85,6 @@ public function dispatch()
      * Retrieve event name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -102,7 +94,6 @@ public function getName()
     /**
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     public function setName($data)
     {
@@ -112,7 +103,6 @@ public function setName($data)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getBlock()
     {
diff --git a/lib/internal/Magento/Framework/Event/Collection.php b/lib/internal/Magento/Framework/Event/Collection.php
index 4f70a0aecbded..8e2c25c2056ce 100644
--- a/lib/internal/Magento/Framework/Event/Collection.php
+++ b/lib/internal/Magento/Framework/Event/Collection.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Event\Collection
  *
- * @since 2.0.0
  */
 class Collection
 {
@@ -24,7 +23,6 @@ class Collection
      * Array of events in the collection
      *
      * @var array
-     * @since 2.0.0
      */
     protected $events;
 
@@ -34,7 +32,6 @@ class Collection
      * For example regex observers will watch all events that
      *
      * @var Observer\Collection
-     * @since 2.0.0
      */
     protected $globalObservers;
 
@@ -43,7 +40,6 @@ class Collection
      *
      * @param array $events
      * @param Observer\Collection $observerCollection
-     * @since 2.0.0
      */
     public function __construct(array $events = [], Observer\Collection $observerCollection = null)
     {
@@ -55,7 +51,6 @@ public function __construct(array $events = [], Observer\Collection $observerCol
      * Returns all registered events in collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllEvents()
     {
@@ -66,7 +61,6 @@ public function getAllEvents()
      * Returns all registered global observers for the collection of events
      *
      * @return Observer\Collection
-     * @since 2.0.0
      */
     public function getGlobalObservers()
     {
@@ -80,7 +74,6 @@ public function getGlobalObservers()
      *
      * @param string $eventName
      * @return Event
-     * @since 2.0.0
      */
     public function getEventByName($eventName)
     {
@@ -95,7 +88,6 @@ public function getEventByName($eventName)
      *
      * @param Event $event
      * @return $this
-     * @since 2.0.0
      */
     public function addEvent(Event $event)
     {
@@ -111,7 +103,6 @@ public function addEvent(Event $event)
      *
      * @param Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function addObserver(Observer $observer)
     {
@@ -132,7 +123,6 @@ public function addObserver(Observer $observer)
      * @param string $eventName
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function dispatch($eventName, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Event/Config.php b/lib/internal/Magento/Framework/Event/Config.php
index e7dbb58d4f1bc..9ba8c7d105d05 100644
--- a/lib/internal/Magento/Framework/Event/Config.php
+++ b/lib/internal/Magento/Framework/Event/Config.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Event\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
@@ -20,13 +19,11 @@ class Config implements ConfigInterface
      * Modules configuration model
      *
      * @var Data
-     * @since 2.0.0
      */
     protected $_dataContainer;
 
     /**
      * @param Data $dataContainer
-     * @since 2.0.0
      */
     public function __construct(Data $dataContainer)
     {
@@ -38,7 +35,6 @@ public function __construct(Data $dataContainer)
      *
      * @param string $eventName
      * @return null|array|mixed
-     * @since 2.0.0
      */
     public function getObservers($eventName)
     {
diff --git a/lib/internal/Magento/Framework/Event/Config/Converter.php b/lib/internal/Magento/Framework/Event/Config/Converter.php
index ce44004282bac..206eebb7ef92d 100644
--- a/lib/internal/Magento/Framework/Event/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Event/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Event\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -20,7 +19,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -54,7 +52,6 @@ public function convert($source)
      *
      * @param \DOMNode $observerConfig
      * @return array
-     * @since 2.0.0
      */
     public function _convertObserverConfig($observerConfig)
     {
diff --git a/lib/internal/Magento/Framework/Event/Config/Data.php b/lib/internal/Magento/Framework/Event/Config/Data.php
index 390320836d6c4..09478f9f7d0ed 100644
--- a/lib/internal/Magento/Framework/Event/Config/Data.php
+++ b/lib/internal/Magento/Framework/Event/Config/Data.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides event configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data\Scoped
 {
@@ -17,7 +16,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * Scope priority loading scheme
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_scopePriorityScheme = ['global'];
 
@@ -29,7 +27,6 @@ class Data extends \Magento\Framework\Config\Data\Scoped
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\Config\Reader $reader,
diff --git a/lib/internal/Magento/Framework/Event/Config/Reader.php b/lib/internal/Magento/Framework/Event/Config/Reader.php
index b97dfea5505a7..1f2971f620b06 100644
--- a/lib/internal/Magento/Framework/Event/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Event/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Event\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/event' => 'name', '/config/event/observer' => 'name'];
 
@@ -31,7 +29,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Event/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Event/Config/SchemaLocator.php
index 2a5ded8f66c21..1f8867aa21141 100644
--- a/lib/internal/Magento/Framework/Event/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Event/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\Event\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Event/ConfigInterface.php b/lib/internal/Magento/Framework/Event/ConfigInterface.php
index 60e72ef539d72..40c46c0eea438 100644
--- a/lib/internal/Magento/Framework/Event/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Event/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Event\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -26,7 +25,6 @@ interface ConfigInterface
      *
      * @param string $eventName
      * @return array
-     * @since 2.0.0
      */
     public function getObservers($eventName);
 }
diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
index 05ce8f7ec469f..0353fc7b42a28 100644
--- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Event\Invoker\InvokerDefault
  *
- * @since 2.0.0
  */
 class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
 {
@@ -21,7 +20,6 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
      * Observer model factory
      *
      * @var \Magento\Framework\Event\ObserverFactory
-     * @since 2.0.0
      */
     protected $_observerFactory;
 
@@ -29,14 +27,12 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
      * Application state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @param \Magento\Framework\Event\ObserverFactory $observerFactory
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ObserverFactory $observerFactory,
@@ -52,7 +48,6 @@ public function __construct(
      * @param array $configuration
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function dispatch(array $configuration, Observer $observer)
     {
@@ -74,7 +69,6 @@ public function dispatch(array $configuration, Observer $observer)
      * @param Observer $observer
      * @return $this
      * @throws \LogicException
-     * @since 2.0.0
      */
     protected function _callObserverMethod($object, $observer)
     {
diff --git a/lib/internal/Magento/Framework/Event/InvokerInterface.php b/lib/internal/Magento/Framework/Event/InvokerInterface.php
index f69e0951b9b00..d5e8c17ea0870 100644
--- a/lib/internal/Magento/Framework/Event/InvokerInterface.php
+++ b/lib/internal/Magento/Framework/Event/InvokerInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Event\InvokerInterface
  *
- * @since 2.0.0
  */
 interface InvokerInterface
 {
@@ -20,7 +19,6 @@ interface InvokerInterface
      * @param array $configuration
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function dispatch(array $configuration, \Magento\Framework\Event\Observer $observer);
 }
diff --git a/lib/internal/Magento/Framework/Event/Manager.php b/lib/internal/Magento/Framework/Event/Manager.php
index 8bd39192d2924..fa070f4ba54a2 100644
--- a/lib/internal/Magento/Framework/Event/Manager.php
+++ b/lib/internal/Magento/Framework/Event/Manager.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Event\Manager
  *
- * @since 2.0.0
  */
 class Manager implements ManagerInterface
 {
@@ -19,7 +18,6 @@ class Manager implements ManagerInterface
      * Events cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_events = [];
 
@@ -27,7 +25,6 @@ class Manager implements ManagerInterface
      * Event invoker
      *
      * @var InvokerInterface
-     * @since 2.0.0
      */
     protected $_invoker;
 
@@ -35,14 +32,12 @@ class Manager implements ManagerInterface
      * Event config
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $_eventConfig;
 
     /**
      * @param InvokerInterface $invoker
      * @param ConfigInterface $eventConfig
-     * @since 2.0.0
      */
     public function __construct(InvokerInterface $invoker, ConfigInterface $eventConfig)
     {
@@ -59,7 +54,6 @@ public function __construct(InvokerInterface $invoker, ConfigInterface $eventCon
      * @param string $eventName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function dispatch($eventName, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Event/ManagerInterface.php b/lib/internal/Magento/Framework/Event/ManagerInterface.php
index 1a27ee27da02e..20d01c6a0f099 100644
--- a/lib/internal/Magento/Framework/Event/ManagerInterface.php
+++ b/lib/internal/Magento/Framework/Event/ManagerInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Event\ManagerInterface
  *
- * @since 2.0.0
  */
 interface ManagerInterface
 {
@@ -21,7 +20,6 @@ interface ManagerInterface
      * @param string $eventName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function dispatch($eventName, array $data = []);
 }
diff --git a/lib/internal/Magento/Framework/Event/Observer.php b/lib/internal/Magento/Framework/Event/Observer.php
index 30b420ee2eff8..4b5dc47795e6c 100644
--- a/lib/internal/Magento/Framework/Event/Observer.php
+++ b/lib/internal/Magento/Framework/Event/Observer.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Observer extends \Magento\Framework\DataObject
 {
@@ -18,7 +17,6 @@ class Observer extends \Magento\Framework\DataObject
      *
      * @param Event $event
      * @return boolean
-     * @since 2.0.0
      */
     public function isValidFor(Event $event)
     {
@@ -30,7 +28,6 @@ public function isValidFor(Event $event)
      *
      * @param Event $event
      * @return $this
-     * @since 2.0.0
      */
     public function dispatch(Event $event)
     {
@@ -58,7 +55,6 @@ public function dispatch(Event $event)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -68,7 +64,6 @@ public function getName()
     /**
      * @param string $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setName($data)
     {
@@ -77,7 +72,6 @@ public function setName($data)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getEventName()
     {
@@ -87,7 +81,6 @@ public function getEventName()
     /**
      * @param string $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setEventName($data)
     {
@@ -96,7 +89,6 @@ public function setEventName($data)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getCallback()
     {
@@ -106,7 +98,6 @@ public function getCallback()
     /**
      * @param string $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setCallback($data)
     {
@@ -117,7 +108,6 @@ public function setCallback($data)
      * Get observer event object
      *
      * @return Event
-     * @since 2.0.0
      */
     public function getEvent()
     {
@@ -127,7 +117,6 @@ public function getEvent()
     /**
      * @param mixed $data
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function setEvent($data)
     {
diff --git a/lib/internal/Magento/Framework/Event/Observer/Collection.php b/lib/internal/Magento/Framework/Event/Observer/Collection.php
index ae138ffd9da8b..c108d422cc9ca 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Collection.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Collection.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Collection
 {
@@ -21,13 +20,11 @@ class Collection
      * Array of observers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_observers;
 
     /**
      * Initializes observers
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -38,7 +35,6 @@ public function __construct()
      * Returns all observers in the collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllObservers()
     {
@@ -50,7 +46,6 @@ public function getAllObservers()
      *
      * @param string $observerName
      * @return \Magento\Framework\Event\Observer
-     * @since 2.0.0
      */
     public function getObserverByName($observerName)
     {
@@ -62,7 +57,6 @@ public function getObserverByName($observerName)
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
-     * @since 2.0.0
      */
     public function addObserver(\Magento\Framework\Event\Observer $observer)
     {
@@ -75,7 +69,6 @@ public function addObserver(\Magento\Framework\Event\Observer $observer)
      *
      * @param string $observerName
      * @return $this
-     * @since 2.0.0
      */
     public function removeObserverByName($observerName)
     {
@@ -88,7 +81,6 @@ public function removeObserverByName($observerName)
      *
      * @param \Magento\Framework\Event $event
      * @return $this
-     * @since 2.0.0
      */
     public function dispatch(\Magento\Framework\Event $event)
     {
diff --git a/lib/internal/Magento/Framework/Event/Observer/Cron.php b/lib/internal/Magento/Framework/Event/Observer/Cron.php
index 1e3f5b2364de5..ca8d511f2645f 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Cron.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Cron.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Event\Observer\Cron
  *
- * @since 2.0.0
  */
 class Cron extends \Magento\Framework\Event\Observer
 {
@@ -26,7 +25,6 @@ class Cron extends \Magento\Framework\Event\Observer
      * @param \Magento\Framework\Event $event
      * @return boolean
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isValidFor(\Magento\Framework\Event $event)
     {
@@ -57,7 +55,6 @@ public function isValidFor(\Magento\Framework\Event $event)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getNow()
     {
@@ -73,7 +70,6 @@ public function getNow()
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function matchCronExpression($expr, $num)
     {
@@ -128,7 +124,6 @@ public function matchCronExpression($expr, $num)
     /**
      * @param int|string $value
      * @return bool|string
-     * @since 2.0.0
      */
     public function getNumeric($value)
     {
diff --git a/lib/internal/Magento/Framework/Event/Observer/Regex.php b/lib/internal/Magento/Framework/Event/Observer/Regex.php
index 7c96e8f3fa205..92541ec19ead7 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Regex.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Regex.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Event\Observer\Regex
  *
- * @since 2.0.0
  */
 class Regex extends \Magento\Framework\Event\Observer
 {
@@ -23,7 +22,6 @@ class Regex extends \Magento\Framework\Event\Observer
      *
      * @param \Magento\Framework\Event $event
      * @return boolean
-     * @since 2.0.0
      */
     public function isValidFor(\Magento\Framework\Event $event)
     {
diff --git a/lib/internal/Magento/Framework/Event/ObserverFactory.php b/lib/internal/Magento/Framework/Event/ObserverFactory.php
index 66b52bfb8c649..855b23535f56d 100644
--- a/lib/internal/Magento/Framework/Event/ObserverFactory.php
+++ b/lib/internal/Magento/Framework/Event/ObserverFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Event\ObserverFactory
  *
- * @since 2.0.0
  */
 class ObserverFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $className
      * @return mixed
-     * @since 2.0.0
      */
     public function get($className)
     {
@@ -47,7 +43,6 @@ public function get($className)
      * @param string $className
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Event/ObserverInterface.php b/lib/internal/Magento/Framework/Event/ObserverInterface.php
index d2aff706b1c95..09358e0966216 100644
--- a/lib/internal/Magento/Framework/Event/ObserverInterface.php
+++ b/lib/internal/Magento/Framework/Event/ObserverInterface.php
@@ -10,14 +10,12 @@
 /**
  * Interface \Magento\Framework\Event\ObserverInterface
  *
- * @since 2.0.0
  */
 interface ObserverInterface
 {
     /**
      * @param Observer $observer
      * @return void
-     * @since 2.0.0
      */
     public function execute(Observer $observer);
 }
diff --git a/lib/internal/Magento/Framework/Event/WrapperFactory.php b/lib/internal/Magento/Framework/Event/WrapperFactory.php
index 1fe3f1698179c..96a0e76b806cb 100644
--- a/lib/internal/Magento/Framework/Event/WrapperFactory.php
+++ b/lib/internal/Magento/Framework/Event/WrapperFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Event\WrapperFactory
  *
- * @since 2.0.0
  */
 class WrapperFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $arguments
      * @return \Magento\Framework\Event\Observer
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/EventFactory.php b/lib/internal/Magento/Framework/EventFactory.php
index 301b5a7b17d68..539871c04e535 100644
--- a/lib/internal/Magento/Framework/EventFactory.php
+++ b/lib/internal/Magento/Framework/EventFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\EventFactory
  *
- * @since 2.0.0
  */
 class EventFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -30,7 +27,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
     /**
      * @param array $arguments
      * @return Event
-     * @since 2.0.0
      */
     public function create($arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index e3dc7cc8eed49..56c3bd285bc1e 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 abstract class AbstractAggregateException extends LocalizedException
 {
@@ -18,7 +17,6 @@ abstract class AbstractAggregateException extends LocalizedException
      * The array of errors that have been added via the addError() method
      *
      * @var \Magento\Framework\Exception\LocalizedException[]
-     * @since 2.0.0
      */
     protected $errors = [];
 
@@ -26,7 +24,6 @@ abstract class AbstractAggregateException extends LocalizedException
      * The original phrase
      *
      * @var \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected $originalPhrase;
 
@@ -34,7 +31,6 @@ abstract class AbstractAggregateException extends LocalizedException
      * An internal variable indicating how many time addError has been called
      *
      * @var int
-     * @since 2.0.0
      */
     private $addErrorCalls = 0;
 
@@ -44,7 +40,6 @@ abstract class AbstractAggregateException extends LocalizedException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
@@ -57,7 +52,6 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
      *
      * @param \Magento\Framework\Phrase $phrase
      * @return $this
-     * @since 2.0.0
      */
     public function addError(Phrase $phrase)
     {
@@ -88,7 +82,6 @@ public function addError(Phrase $phrase)
      * Should return true if someone has added different errors to this exception after construction
      *
      * @return bool
-     * @since 2.0.0
      */
     public function wasErrorAdded()
     {
@@ -99,7 +92,6 @@ public function wasErrorAdded()
      * Get the array of LocalizedException objects. Get an empty array if no errors were added.
      *
      * @return \Magento\Framework\Exception\LocalizedException[]
-     * @since 2.0.0
      */
     public function getErrors()
     {
diff --git a/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php b/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
index 725150b4d3dff..714e7a06ee7f7 100644
--- a/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
+++ b/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AlreadyExistsException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/AuthenticationException.php b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
index 39e353e5ab01a..fc097dc5562bd 100644
--- a/lib/internal/Magento/Framework/Exception/AuthenticationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AuthenticationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/AuthorizationException.php b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
index 344b925fe37e5..79bf95b22bccf 100644
--- a/lib/internal/Magento/Framework/Exception/AuthorizationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AuthorizationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
index 7d7e2ea61d51f..af8e4c3c0ec57 100644
--- a/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
+++ b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CouldNotDeleteException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php b/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
index 8c20b54fca481..ea265864afd24 100644
--- a/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
+++ b/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CouldNotSaveException extends AbstractAggregateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/CronException.php b/lib/internal/Magento/Framework/Exception/CronException.php
index ca322e3349408..22d23526a6558 100644
--- a/lib/internal/Magento/Framework/Exception/CronException.php
+++ b/lib/internal/Magento/Framework/Exception/CronException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class CronException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php b/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
index f47b78b9980d1..330f34fb565ce 100644
--- a/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
+++ b/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class EmailNotConfirmedException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/FileSystemException.php b/lib/internal/Magento/Framework/Exception/FileSystemException.php
index b9193fb5bc146..6c85314b6f2a6 100644
--- a/lib/internal/Magento/Framework/Exception/FileSystemException.php
+++ b/lib/internal/Magento/Framework/Exception/FileSystemException.php
@@ -9,7 +9,6 @@
  * Magento filesystem exception
  *
  * @api
- * @since 2.0.0
  */
 class FileSystemException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
index 25b96f6cc5593..b332c88d42f71 100644
--- a/lib/internal/Magento/Framework/Exception/InputException.php
+++ b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -11,7 +11,6 @@
  * Exception to be thrown when there is an issue with the Input to a function call.
  *
  * @api
- * @since 2.0.0
  */
 class InputException extends AbstractAggregateException
 {
@@ -51,7 +50,6 @@ class InputException extends AbstractAggregateException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
@@ -68,7 +66,6 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
      * @param string $fieldValue The invalid value that was provided for the field.
      * @param \Exception $cause   Cause of the InputException
      * @return \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public static function invalidFieldValue($fieldName, $fieldValue, \Exception $cause = null)
     {
@@ -86,7 +83,6 @@ public static function invalidFieldValue($fieldName, $fieldValue, \Exception $ca
      *
      * @param string $fieldName Name of the missing required field.
      * @return \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public static function requiredField($fieldName)
     {
diff --git a/lib/internal/Magento/Framework/Exception/IntegrationException.php b/lib/internal/Magento/Framework/Exception/IntegrationException.php
index 05ee14552367f..9adf9c740f0e2 100644
--- a/lib/internal/Magento/Framework/Exception/IntegrationException.php
+++ b/lib/internal/Magento/Framework/Exception/IntegrationException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IntegrationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php b/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
index 18cb41f6de8bf..ba5b7d94f5328 100644
--- a/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
+++ b/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class InvalidEmailOrPasswordException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
index 3c8c159638edf..0b1d5f1998bfb 100644
--- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
@@ -12,19 +12,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class LocalizedException extends \Exception
 {
     /**
      * @var \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected $phrase;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $logMessage;
 
@@ -32,7 +29,6 @@ class LocalizedException extends \Exception
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
@@ -44,7 +40,6 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
      * Get the un-processed message, without the parameters filled in
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRawMessage()
     {
@@ -55,7 +50,6 @@ public function getRawMessage()
      * Get parameters, corresponding to placeholders in raw exception message
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParameters()
     {
@@ -66,7 +60,6 @@ public function getParameters()
      * Get the un-localized message, but with the parameters filled in
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLogMessage()
     {
diff --git a/lib/internal/Magento/Framework/Exception/MailException.php b/lib/internal/Magento/Framework/Exception/MailException.php
index efded62cb4de9..1475ba04257c9 100644
--- a/lib/internal/Magento/Framework/Exception/MailException.php
+++ b/lib/internal/Magento/Framework/Exception/MailException.php
@@ -9,7 +9,6 @@
  * Magento mail exception
  *
  * @api
- * @since 2.0.0
  */
 class MailException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php b/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
index ca3a005f38a51..42b30d45e4c72 100644
--- a/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
+++ b/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NoSuchEntityException extends LocalizedException
 {
@@ -29,7 +28,6 @@ class NoSuchEntityException extends LocalizedException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
@@ -45,7 +43,6 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
      * @param string $fieldName
      * @param string|int $fieldValue
      * @return \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public static function singleField($fieldName, $fieldValue)
     {
@@ -68,7 +65,6 @@ public static function singleField($fieldName, $fieldValue)
      * @param string $secondFieldName
      * @param string|int $secondFieldValue
      * @return \Magento\Framework\Exception\NoSuchEntityException
-     * @since 2.0.0
      */
     public static function doubleField($fieldName, $fieldValue, $secondFieldName, $secondFieldValue)
     {
diff --git a/lib/internal/Magento/Framework/Exception/NotFoundException.php b/lib/internal/Magento/Framework/Exception/NotFoundException.php
index 4178b06ce0191..40e02e70fa37c 100644
--- a/lib/internal/Magento/Framework/Exception/NotFoundException.php
+++ b/lib/internal/Magento/Framework/Exception/NotFoundException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class NotFoundException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/PaymentException.php b/lib/internal/Magento/Framework/Exception/PaymentException.php
index d94a3bb57073d..83b189d020ee3 100644
--- a/lib/internal/Magento/Framework/Exception/PaymentException.php
+++ b/lib/internal/Magento/Framework/Exception/PaymentException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class PaymentException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php b/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
index 91d347cad0769..2a5564181d43f 100644
--- a/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
+++ b/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class AuthenticationException extends \Magento\Framework\Exception\AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php b/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
index 62d815b7170a8..a9af31b003333 100644
--- a/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
+++ b/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RemoteServiceUnavailableException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/SerializationException.php b/lib/internal/Magento/Framework/Exception/SerializationException.php
index 57ce355e79cdb..27d0bc0c4371a 100644
--- a/lib/internal/Magento/Framework/Exception/SerializationException.php
+++ b/lib/internal/Magento/Framework/Exception/SerializationException.php
@@ -11,7 +11,6 @@
  * Serialization Exception
  *
  * @api
- * @since 2.0.0
  */
 class SerializationException extends LocalizedException
 {
@@ -29,7 +28,6 @@ class SerializationException extends LocalizedException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
diff --git a/lib/internal/Magento/Framework/Exception/SessionException.php b/lib/internal/Magento/Framework/Exception/SessionException.php
index 391ae8baac283..b3af3ea5b5bb0 100644
--- a/lib/internal/Magento/Framework/Exception/SessionException.php
+++ b/lib/internal/Magento/Framework/Exception/SessionException.php
@@ -9,7 +9,6 @@
  * Session exception
  *
  * @api
- * @since 2.0.0
  */
 class SessionException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/ExpiredException.php b/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
index 719e00c4d8500..29748b52c8351 100644
--- a/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
+++ b/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ExpiredException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InitException.php b/lib/internal/Magento/Framework/Exception/State/InitException.php
index de421b058d44a..9ca7de26c58d7 100644
--- a/lib/internal/Magento/Framework/Exception/State/InitException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InitException.php
@@ -11,7 +11,6 @@
  * An exception that indicates application initialization error
  *
  * @api
- * @since 2.0.0
  */
 class InitException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php b/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
index bb4e4e54af46a..752ebcf4804b1 100644
--- a/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class InputMismatchException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php b/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
index 2b4fe898551c9..2667d1745767e 100644
--- a/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class InvalidTransitionException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/UserLockedException.php b/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
index d39dd81b043d7..fa39556f6eecc 100644
--- a/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
+++ b/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class UserLockedException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/StateException.php b/lib/internal/Magento/Framework/Exception/StateException.php
index b0f88161ebb2c..580ef6fabe2fa 100644
--- a/lib/internal/Magento/Framework/Exception/StateException.php
+++ b/lib/internal/Magento/Framework/Exception/StateException.php
@@ -9,7 +9,6 @@
  * State Exception
  *
  * @api
- * @since 2.0.0
  */
 class StateException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/ValidatorException.php b/lib/internal/Magento/Framework/Exception/ValidatorException.php
index 5edf2508d651c..1066fe268df44 100644
--- a/lib/internal/Magento/Framework/Exception/ValidatorException.php
+++ b/lib/internal/Magento/Framework/Exception/ValidatorException.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ValidatorException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php
index 6449131ef0da4..3d177f89e2968 100644
--- a/lib/internal/Magento/Framework/File/Csv.php
+++ b/lib/internal/Magento/Framework/File/Csv.php
@@ -12,31 +12,26 @@
  * Csv parse
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Csv
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_lineLength = 0;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_delimiter = ',';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_enclosure = '"';
 
     /**
      * @var File
-     * @since 2.0.0
      */
     protected $file;
 
@@ -44,7 +39,6 @@ class Csv
      * Constructor
      *
      * @param File $file File Driver used for writing CSV
-     * @since 2.0.0
      */
     public function __construct(File $file)
     {
@@ -56,7 +50,6 @@ public function __construct(File $file)
      *
      * @param   int $length
      * @return  \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     public function setLineLength($length)
     {
@@ -69,7 +62,6 @@ public function setLineLength($length)
      *
      * @param   string $delimiter
      * @return  \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     public function setDelimiter($delimiter)
     {
@@ -82,7 +74,6 @@ public function setDelimiter($delimiter)
      *
      * @param   string $enclosure
      * @return  \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     public function setEnclosure($enclosure)
     {
@@ -96,7 +87,6 @@ public function setEnclosure($enclosure)
      * @param   string $file
      * @return  array
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getData($file)
     {
@@ -120,7 +110,6 @@ public function getData($file)
      * @param   int $keyIndex
      * @param   int $valueIndex
      * @return  array
-     * @since 2.0.0
      */
     public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1)
     {
@@ -140,7 +129,6 @@ public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1)
      * @param   string $file
      * @param   array $data
      * @return  $this
-     * @since 2.0.0
      */
     public function saveData($file, $data)
     {
diff --git a/lib/internal/Magento/Framework/File/CsvMulty.php b/lib/internal/Magento/Framework/File/CsvMulty.php
index 4ab3ed795873e..3184ddb0737bc 100644
--- a/lib/internal/Magento/Framework/File/CsvMulty.php
+++ b/lib/internal/Magento/Framework/File/CsvMulty.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\File\CsvMulty
  *
- * @since 2.0.0
  */
 class CsvMulty extends \Magento\Framework\File\Csv
 {
@@ -25,7 +24,6 @@ class CsvMulty extends \Magento\Framework\File\Csv
      * @param   int $keyIndex
      * @param   int $valueIndex
      * @return  array
-     * @since 2.0.0
      */
     public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1)
     {
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index 5509fd0a173b9..d01b5f4bc482b 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\File\Mime
  *
- * @since 2.0.0
  */
 class Mime
 {
@@ -17,7 +16,6 @@ class Mime
      * Mime types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mimeTypes = [
         'txt'  => 'text/plain',
@@ -70,7 +68,6 @@ class Mime
      * @param string $file
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getMimeType($file)
     {
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
index 5d12ae9f77be5..e0d5681dd0bf0 100644
--- a/lib/internal/Magento/Framework/File/Size.php
+++ b/lib/internal/Magento/Framework/File/Size.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Size
 {
@@ -28,7 +27,6 @@ class Size
      *
      * @link http://www.php.net/manual/en/features.file-upload.post-method.php
      * @var integer
-     * @since 2.0.0
      */
     protected static $_maxFileSize = -1;
 
@@ -36,7 +34,6 @@ class Size
      * Get post max size
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPostMaxSize()
     {
@@ -47,7 +44,6 @@ public function getPostMaxSize()
      * Get upload max size
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUploadMaxSize()
     {
@@ -60,7 +56,6 @@ public function getUploadMaxSize()
      * @param int $precision
      * @param int $mode
      * @return float
-     * @since 2.0.0
      */
     public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
     {
@@ -74,7 +69,6 @@ public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
      * @param int $precision
      * @param int $mode
      * @return float
-     * @since 2.0.0
      */
     public function getFileSizeInMb($fileSize, $precision = 0, $mode = PHP_ROUND_HALF_DOWN)
     {
@@ -85,7 +79,6 @@ public function getFileSizeInMb($fileSize, $precision = 0, $mode = PHP_ROUND_HAL
      * Get the maximum file size of the a form in bytes
      *
      * @return integer
-     * @since 2.0.0
      */
     public function getMaxFileSize()
     {
@@ -115,7 +108,6 @@ public function getMaxFileSize()
      *
      * @param string $size
      * @return integer
-     * @since 2.0.0
      */
     public function convertSizeToInteger($size)
     {
@@ -128,7 +120,6 @@ public function convertSizeToInteger($size)
      * @link http://php.net/manual/en/function.ini-get.php
      * @param string $param The configuration option name
      * @return string
-     * @since 2.0.0
      */
     protected function _iniGet($param)
     {
diff --git a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
index 36e956a2c46d2..77a4e3154b7de 100644
--- a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
+++ b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Framework\File\Transfer\Adapter\Http
  *
- * @since 2.0.0
  */
 class Http
 {
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\Response
-     * @since 2.0.0
      */
     private $response;
 
     /**
      * @var \Magento\Framework\File\Mime
-     * @since 2.0.0
      */
     private $mime;
 
     /**
      * @param \Magento\Framework\App\Response\Http $response
      * @param \Magento\Framework\File\Mime $mime
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\HTTP\PhpEnvironment\Response $response,
@@ -45,7 +41,6 @@ public function __construct(
      * @throws \UnexpectedValueException
      * @throws \InvalidArgumentException
      * @return void
-     * @since 2.0.0
      */
     public function send($options = null)
     {
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 2b0e5f0012776..9e9d827f26f18 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -14,7 +14,6 @@
  * validation by protected file extension list to extended class
  *
  * @api
- * @since 2.0.0
  */
 class Uploader
 {
@@ -23,7 +22,6 @@ class Uploader
      *
      * @var array
      * @access protected
-     * @since 2.0.0
      */
     protected $_file;
 
@@ -32,7 +30,6 @@ class Uploader
      *
      * @var string
      * @access protected
-     * @since 2.0.0
      */
     protected $_fileMimeType;
 
@@ -41,7 +38,6 @@ class Uploader
      *
      * @var \Magento\Framework\File\Uploader::SINGLE_STYLE|\Magento\Framework\File\Uploader::MULTIPLE_STYLE
      * @access protected
-     * @since 2.0.0
      */
     protected $_uploadType;
 
@@ -51,7 +47,6 @@ class Uploader
      *
      * @var string
      * @access protected
-     * @since 2.0.0
      */
     protected $_uploadedFileName;
 
@@ -60,7 +55,6 @@ class Uploader
      *
      * @var string
      * @access protected
-     * @since 2.0.0
      */
     protected $_uploadedFileDir;
 
@@ -70,7 +64,6 @@ class Uploader
      *
      * @var bool
      * @access protected
-     * @since 2.0.0
      */
     protected $_allowCreateFolders = true;
 
@@ -80,7 +73,6 @@ class Uploader
      *
      * @var bool
      * @access protected
-     * @since 2.0.0
      */
     protected $_allowRenameFiles = false;
 
@@ -89,7 +81,6 @@ class Uploader
      *
      * @var bool
      * @access protected
-     * @since 2.0.0
      */
     protected $_enableFilesDispersion = false;
 
@@ -100,26 +91,22 @@ class Uploader
      *
      * @var bool
      * @access protected
-     * @since 2.0.0
      */
     protected $_caseInsensitiveFilenames = true;
 
     /**
      * @var string
      * @access protected
-     * @since 2.0.0
      */
     protected $_dispretionPath = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_fileExists = false;
 
     /**
      * @var null|string[]
-     * @since 2.0.0
      */
     protected $_allowedExtensions = null;
 
@@ -128,7 +115,6 @@ class Uploader
      *
      * @var array
      * @access protected
-     * @since 2.0.0
      */
     protected $_validateCallbacks = [];
 
@@ -161,7 +147,6 @@ class Uploader
      *
      * @var array|bool      Array with file info keys: path, file. Result is
      *                      FALSE when file not uploaded
-     * @since 2.0.0
      */
     protected $_result;
 
@@ -170,7 +155,6 @@ class Uploader
      *
      * @param string|array $fileId
      * @throws \Exception
-     * @since 2.0.0
      */
     public function __construct($fileId)
     {
@@ -189,7 +173,6 @@ public function __construct($fileId)
      * @param  array $result
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _afterSave($result)
     {
@@ -205,7 +188,6 @@ protected function _afterSave($result)
      * @return array
      * @throws \Exception
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function save($destinationFolder, $newFileName = null)
     {
@@ -280,8 +262,7 @@ private function validateDestination($destinationFolder)
      * @param string $file
      * @return void
      *
-     * @deprecated 2.1.0
-     * @since 2.0.0
+     * @deprecated 2.0.6
      */
     protected function chmod($file)
     {
@@ -294,7 +275,6 @@ protected function chmod($file)
      * @param string $tmpPath
      * @param string $destPath
      * @return bool|void
-     * @since 2.0.0
      */
     protected function _moveFile($tmpPath, $destPath)
     {
@@ -310,7 +290,6 @@ protected function _moveFile($tmpPath, $destPath)
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _validateFile()
     {
@@ -337,7 +316,6 @@ protected function _validateFile()
      * Returns extension of the uploaded file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileExtension()
     {
@@ -352,7 +330,6 @@ public function getFileExtension()
      * @param string $callbackMethod    Method name of $callbackObject. It must
      *                                  have interface (string $tmpFilePath)
      * @return \Magento\Framework\File\Uploader
-     * @since 2.0.0
      */
     public function addValidateCallback($callbackName, $callbackObject, $callbackMethod)
     {
@@ -366,7 +343,6 @@ public function addValidateCallback($callbackName, $callbackObject, $callbackMet
      * @param string $callbackName
      * @access public
      * @return \Magento\Framework\File\Uploader
-     * @since 2.0.0
      */
     public function removeValidateCallback($callbackName)
     {
@@ -381,7 +357,6 @@ public function removeValidateCallback($callbackName)
      *
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     public static function getCorrectFileName($fileName)
     {
@@ -399,7 +374,6 @@ public static function getCorrectFileName($fileName)
      *
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     public function correctFileNameCase($fileName)
     {
@@ -414,7 +388,6 @@ public function correctFileNameCase($fileName)
      *
      * @param string $dir
      * @return string
-     * @since 2.0.0
      */
     protected static function _addDirSeparator($dir)
     {
@@ -430,7 +403,6 @@ protected static function _addDirSeparator($dir)
      * @param string[] $validTypes
      * @access public
      * @return bool
-     * @since 2.0.0
      */
     public function checkMimeType($validTypes = [])
     {
@@ -447,7 +419,6 @@ public function checkMimeType($validTypes = [])
      *
      * @access public
      * @return string
-     * @since 2.0.0
      */
     public function getUploadedFileName()
     {
@@ -460,7 +431,6 @@ public function getUploadedFileName()
      * @param bool $flag
      * @access public
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowCreateFolders($flag)
     {
@@ -474,7 +444,6 @@ public function setAllowCreateFolders($flag)
      * @param bool $flag
      * @access public
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowRenameFiles($flag)
     {
@@ -488,7 +457,6 @@ public function setAllowRenameFiles($flag)
      * @param bool $flag
      * @access public
      * @return $this
-     * @since 2.0.0
      */
     public function setFilesDispersion($flag)
     {
@@ -501,7 +469,6 @@ public function setFilesDispersion($flag)
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setFilenamesCaseSensitivity($flag)
     {
@@ -514,7 +481,6 @@ public function setFilenamesCaseSensitivity($flag)
      *
      * @param string[] $extensions
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowedExtensions($extensions = [])
     {
@@ -529,7 +495,6 @@ public function setAllowedExtensions($extensions = [])
      *
      * @param string $extension
      * @return boolean
-     * @since 2.0.0
      */
     public function checkAllowedExtension($extension)
     {
@@ -544,7 +509,6 @@ public function checkAllowedExtension($extension)
      * Return file mime type
      *
      * @return string
-     * @since 2.0.0
      */
     private function _getMimeType()
     {
@@ -558,7 +522,6 @@ private function _getMimeType()
      * @return void
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function _setUploadFileId($fileId)
     {
@@ -600,7 +563,6 @@ private function _setUploadFileId($fileId)
      * @param string $destinationFolder
      * @return \Magento\Framework\File\Uploader
      * @throws \Exception
-     * @since 2.0.0
      */
     private function _createDestinationFolder($destinationFolder)
     {
@@ -625,7 +587,6 @@ private function _createDestinationFolder($destinationFolder)
      *
      * @param string $destinationFile
      * @return string
-     * @since 2.0.0
      */
     public static function getNewFileName($destinationFile)
     {
@@ -650,7 +611,6 @@ public static function getNewFileName($destinationFile)
      *
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     public static function getDispretionPath($fileName)
     {
diff --git a/lib/internal/Magento/Framework/File/UploaderFactory.php b/lib/internal/Magento/Framework/File/UploaderFactory.php
index 4d33342a0083f..5de7183f9d6f3 100644
--- a/lib/internal/Magento/Framework/File/UploaderFactory.php
+++ b/lib/internal/Magento/Framework/File/UploaderFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\File\UploaderFactory
  *
- * @since 2.0.0
  */
 class UploaderFactory
 {
@@ -16,13 +15,11 @@ class UploaderFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return Uploader
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index 71e2ba75d7393..78a3771568adc 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -11,37 +11,31 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Filesystem
 {
     /**
      * @var \Magento\Framework\Filesystem\DirectoryList
-     * @since 2.0.0
      */
     protected $directoryList;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteFactory
-     * @since 2.0.0
      */
     protected $writeFactory;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface[]
-     * @since 2.0.0
      */
     protected $readInstances = [];
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface[]
-     * @since 2.0.0
      */
     protected $writeInstances = [];
 
@@ -49,7 +43,6 @@ class Filesystem
      * @param Filesystem\DirectoryList $directoryList
      * @param Filesystem\Directory\ReadFactory $readFactory
      * @param Filesystem\Directory\WriteFactory $writeFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem\DirectoryList $directoryList,
@@ -67,7 +60,6 @@ public function __construct(
      * @param string $directoryCode
      * @param string $driverCode
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
     {
@@ -85,7 +77,6 @@ public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
      * @param string $driverCode
      * @return \Magento\Framework\Filesystem\Directory\WriteInterface
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function getDirectoryWrite($directoryCode, $driverCode = DriverPool::FILE)
     {
@@ -101,7 +92,6 @@ public function getDirectoryWrite($directoryCode, $driverCode = DriverPool::FILE
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     protected function getDirPath($code)
     {
@@ -113,7 +103,6 @@ protected function getDirPath($code)
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getUri($code)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index f1595c82e1436..18c93f2f4e1c8 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Read implements ReadInterface
 {
@@ -17,7 +16,6 @@ class Read implements ReadInterface
      * Directory path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $path;
 
@@ -25,7 +23,6 @@ class Read implements ReadInterface
      * File factory
      *
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -33,7 +30,6 @@ class Read implements ReadInterface
      * Filesystem driver
      *
      * @var \Magento\Framework\Filesystem\DriverInterface
-     * @since 2.0.0
      */
     protected $driver;
 
@@ -43,7 +39,6 @@ class Read implements ReadInterface
      * @param \Magento\Framework\Filesystem\File\ReadFactory $fileFactory
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\ReadFactory $fileFactory,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     protected function setPath($path)
     {
@@ -76,7 +70,6 @@ protected function setPath($path)
      * @param string $path
      * @param string $scheme
      * @return string
-     * @since 2.0.0
      */
     public function getAbsolutePath($path = null, $scheme = null)
     {
@@ -88,7 +81,6 @@ public function getAbsolutePath($path = null, $scheme = null)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getRelativePath($path = null)
     {
@@ -100,7 +92,6 @@ public function getRelativePath($path = null)
      *
      * @param string|null $path
      * @return string[]
-     * @since 2.0.0
      */
     public function read($path = null)
     {
@@ -117,7 +108,6 @@ public function read($path = null)
      *
      * @param null $path
      * @return string[]
-     * @since 2.0.0
      */
     public function readRecursively($path = null)
     {
@@ -137,7 +127,6 @@ public function readRecursively($path = null)
      * @param string $pattern
      * @param string $path [optional]
      * @return string[]
-     * @since 2.0.0
      */
     public function search($pattern, $path = null)
     {
@@ -161,7 +150,6 @@ public function search($pattern, $path = null)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function isExist($path = null)
     {
@@ -174,7 +162,6 @@ public function isExist($path = null)
      * @param string $path
      * @return array
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function stat($path)
     {
@@ -187,7 +174,6 @@ public function stat($path)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function isReadable($path = null)
     {
@@ -200,7 +186,6 @@ public function isReadable($path = null)
      * @param string $path
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
-     * @since 2.0.0
      */
     public function openFile($path)
     {
@@ -218,7 +203,6 @@ public function openFile($path)
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function readFile($path, $flag = null, $context = null)
     {
@@ -231,7 +215,6 @@ public function readFile($path, $flag = null, $context = null)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function isFile($path)
     {
@@ -243,7 +226,6 @@ public function isFile($path)
      *
      * @param string $path [optional]
      * @return bool
-     * @since 2.0.0
      */
     public function isDirectory($path = null)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
index bd8a17ee1bd42..2b81183ff2690 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Filesystem\Directory\ReadFactory
  *
- * @since 2.0.0
  */
 class ReadFactory
 {
@@ -18,7 +17,6 @@ class ReadFactory
      * Pool of filesystem drivers
      *
      * @var DriverPool
-     * @since 2.0.0
      */
     private $driverPool;
 
@@ -26,7 +24,6 @@ class ReadFactory
      * Constructor
      *
      * @param DriverPool $driverPool
-     * @since 2.0.0
      */
     public function __construct(DriverPool $driverPool)
     {
@@ -39,7 +36,6 @@ public function __construct(DriverPool $driverPool)
      * @param string $path
      * @param string $driverCode
      * @return ReadInterface
-     * @since 2.0.0
      */
     public function create($path, $driverCode = DriverPool::FILE)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
index 28dc5c5cb4e65..5519245ec24b4 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Filesystem\Directory\ReadInterface
  *
- * @since 2.0.0
  */
 interface ReadInterface
 {
@@ -17,7 +16,6 @@ interface ReadInterface
      *
      * @param string $path [optional]
      * @return string
-     * @since 2.0.0
      */
     public function getAbsolutePath($path = null);
 
@@ -26,7 +24,6 @@ public function getAbsolutePath($path = null);
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getRelativePath($path = null);
 
@@ -35,7 +32,6 @@ public function getRelativePath($path = null);
      *
      * @param string $path [optional]
      * @return array
-     * @since 2.0.0
      */
     public function read($path = null);
 
@@ -45,7 +41,6 @@ public function read($path = null);
      * @param string $pattern
      * @param string $path [optional]
      * @return array
-     * @since 2.0.0
      */
     public function search($pattern, $path = null);
 
@@ -54,7 +49,6 @@ public function search($pattern, $path = null);
      *
      * @param string $path [optional]
      * @return bool
-     * @since 2.0.0
      */
     public function isExist($path = null);
 
@@ -63,7 +57,6 @@ public function isExist($path = null);
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     public function stat($path);
 
@@ -72,7 +65,6 @@ public function stat($path);
      *
      * @param string $path [optional]
      * @return bool
-     * @since 2.0.0
      */
     public function isReadable($path = null);
 
@@ -81,7 +73,6 @@ public function isReadable($path = null);
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function isFile($path);
 
@@ -90,7 +81,6 @@ public function isFile($path);
      *
      * @param string $path [optional]
      * @return bool
-     * @since 2.0.0
      */
     public function isDirectory($path = null);
 
@@ -99,7 +89,6 @@ public function isDirectory($path = null);
      *
      * @param string $path
      * @return \Magento\Framework\Filesystem\File\ReadInterface
-     * @since 2.0.0
      */
     public function openFile($path);
 
@@ -111,7 +100,6 @@ public function openFile($path);
      * @param resource|null $context
      * @return string
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function readFile($path, $flag = null, $context = null);
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index e9019cce63c39..1698cbf6dd2b7 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Filesystem\Directory\Write
  *
- * @since 2.0.0
  */
 class Write extends Read implements WriteInterface
 {
@@ -18,7 +17,6 @@ class Write extends Read implements WriteInterface
      * Permissions for new sub-directories
      *
      * @var int
-     * @since 2.0.0
      */
     protected $permissions = 0777;
 
@@ -29,7 +27,6 @@ class Write extends Read implements WriteInterface
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
      * @param int $createPermissions
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\WriteFactory $fileFactory,
@@ -51,7 +48,6 @@ public function __construct(
      * @param string $path
      * @return void
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     protected function assertWritable($path)
     {
@@ -69,7 +65,6 @@ protected function assertWritable($path)
      * @param string $path
      * @return void
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     protected function assertIsFile($path)
     {
@@ -88,7 +83,6 @@ protected function assertIsFile($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function create($path = null)
     {
@@ -107,7 +101,6 @@ public function create($path = null)
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function renameFile($path, $newPath, WriteInterface $targetDirectory = null)
     {
@@ -129,7 +122,6 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function copyFile($path, $destination, WriteInterface $targetDirectory = null)
     {
@@ -153,7 +145,6 @@ public function copyFile($path, $destination, WriteInterface $targetDirectory =
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function createSymlink($path, $destination, WriteInterface $targetDirectory = null)
     {
@@ -174,7 +165,6 @@ public function createSymlink($path, $destination, WriteInterface $targetDirecto
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function delete($path = null)
     {
@@ -197,7 +187,6 @@ public function delete($path = null)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissions($path, $permissions)
     {
@@ -213,7 +202,6 @@ public function changePermissions($path, $permissions)
      * @param int $filePermissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions)
     {
@@ -228,7 +216,6 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int|null $modificationTime
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function touch($path, $modificationTime = null)
     {
@@ -244,7 +231,6 @@ public function touch($path, $modificationTime = null)
      * @param null $path
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function isWritable($path = null)
     {
@@ -258,7 +244,6 @@ public function isWritable($path = null)
      * @param string $mode
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function openFile($path, $mode = 'w')
     {
@@ -277,7 +262,6 @@ public function openFile($path, $mode = 'w')
      * @param string|null $mode
      * @return int The number of bytes that were written.
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function writeFile($path, $content, $mode = 'w+')
     {
@@ -288,7 +272,6 @@ public function writeFile($path, $content, $mode = 'w+')
      * Get driver
      *
      * @return \Magento\Framework\Filesystem\DriverInterface
-     * @since 2.0.0
      */
     public function getDriver()
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
index 806d1934d6dc8..c5c30357d3f57 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Filesystem\Directory\WriteFactory
  *
- * @since 2.0.0
  */
 class WriteFactory
 {
@@ -18,7 +17,6 @@ class WriteFactory
      * Pool of filesystem drivers
      *
      * @var DriverPool
-     * @since 2.0.0
      */
     private $driverPool;
 
@@ -26,7 +24,6 @@ class WriteFactory
      * Constructor
      *
      * @param DriverPool $driverPool
-     * @since 2.0.0
      */
     public function __construct(DriverPool $driverPool)
     {
@@ -40,7 +37,6 @@ public function __construct(DriverPool $driverPool)
      * @param string $driverCode
      * @param int $createPermissions
      * @return \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     public function create($path, $driverCode = DriverPool::FILE, $createPermissions = null)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
index d038248b70545..c72651a78dad3 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Filesystem\Directory\WriteInterface
  *
- * @since 2.0.0
  */
 interface WriteInterface extends ReadInterface
 {
@@ -18,7 +17,6 @@ interface WriteInterface extends ReadInterface
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function create($path = null);
 
@@ -28,7 +26,6 @@ public function create($path = null);
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function delete($path = null);
 
@@ -40,7 +37,6 @@ public function delete($path = null);
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function renameFile($path, $newPath, WriteInterface $targetDirectory = null);
 
@@ -52,7 +48,6 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function copyFile($path, $destination, WriteInterface $targetDirectory = null);
 
@@ -64,7 +59,6 @@ public function copyFile($path, $destination, WriteInterface $targetDirectory =
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function createSymlink($path, $destination, WriteInterface $targetDirectory = null);
 
@@ -75,7 +69,6 @@ public function createSymlink($path, $destination, WriteInterface $targetDirecto
      * @param int $permissions
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function changePermissions($path, $permissions);
 
@@ -87,7 +80,6 @@ public function changePermissions($path, $permissions);
      * @param int $filePermissions
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions);
 
@@ -98,7 +90,6 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int $modificationTime [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function touch($path, $modificationTime = null);
 
@@ -107,7 +98,6 @@ public function touch($path, $modificationTime = null);
      *
      * @param string $path [optional]
      * @return bool
-     * @since 2.0.0
      */
     public function isWritable($path = null);
 
@@ -117,7 +107,6 @@ public function isWritable($path = null);
      * @param string $path
      * @param string $mode
      * @return \Magento\Framework\Filesystem\File\WriteInterface
-     * @since 2.0.0
      */
     public function openFile($path, $mode = 'w');
 
@@ -129,7 +118,6 @@ public function openFile($path, $mode = 'w');
      * @param string $mode [optional]
      * @return int The number of bytes that were written.
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function writeFile($path, $content, $mode = null);
 
@@ -137,7 +125,6 @@ public function writeFile($path, $content, $mode = null);
      * Get driver
      *
      * @return \Magento\Framework\Filesystem\DriverInterface
-     * @since 2.0.0
      */
     public function getDriver();
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
index 0663a39092b3c..9d05b94fbfe79 100644
--- a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
@@ -20,7 +20,6 @@
  * This object is intended to be immutable (a "value object").
  * The defaults are pre-defined and can be modified only by inheritors of this class.
  * Through the constructor, it is possible to inject custom paths or URL paths, but impossible to inject new types.
- * @since 2.0.0
  */
 class DirectoryList
 {
@@ -40,7 +39,6 @@ class DirectoryList
      * Root path
      *
      * @var string
-     * @since 2.0.0
      */
     private $root;
 
@@ -48,7 +46,6 @@ class DirectoryList
      * Directories configurations
      *
      * @var array
-     * @since 2.0.0
      */
     private $directories;
 
@@ -56,7 +53,6 @@ class DirectoryList
      * Predefined types/paths
      *
      * @return array
-     * @since 2.0.0
      */
     public static function getDefaultConfig()
     {
@@ -69,7 +65,6 @@ public static function getDefaultConfig()
      * @param array $config
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public static function validate($config)
     {
@@ -95,7 +90,6 @@ public static function validate($config)
      *
      * @param string $root
      * @param array $config
-     * @since 2.0.0
      */
     public function __construct($root, array $config = [])
     {
@@ -148,7 +142,6 @@ private function normalizePath($path)
      * @param string $urlPath
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function assertUrlPath($urlPath)
     {
@@ -164,7 +157,6 @@ private function assertUrlPath($urlPath)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function prependRoot($path)
     {
@@ -177,7 +169,6 @@ protected function prependRoot($path)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     protected function isAbsolute($path)
     {
@@ -201,7 +192,6 @@ protected function isAbsolute($path)
      * Gets a filesystem path of the root directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRoot()
     {
@@ -213,7 +203,6 @@ public function getRoot()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function getPath($code)
     {
@@ -226,7 +215,6 @@ public function getPath($code)
      *
      * @param string $code
      * @return string|bool
-     * @since 2.0.0
      */
     public function getUrlPath($code)
     {
@@ -243,7 +231,6 @@ public function getUrlPath($code)
      * @param string $code
      * @throws \Magento\Framework\Exception\FileSystemException
      * @return void
-     * @since 2.0.0
      */
     private function assertCode($code)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 3d7ac008f284f..21085d42b2a82 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -15,13 +15,11 @@
  * Class File
  * @package Magento\Framework\Filesystem\Driver
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class File implements DriverInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $scheme = '';
 
@@ -29,7 +27,6 @@ class File implements DriverInterface
      * Returns last warning message string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getWarningMessage()
     {
@@ -46,7 +43,6 @@ protected function getWarningMessage()
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isExists($path)
     {
@@ -66,7 +62,6 @@ public function isExists($path)
      * @param string $path
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function stat($path)
     {
@@ -86,7 +81,6 @@ public function stat($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isReadable($path)
     {
@@ -106,7 +100,6 @@ public function isReadable($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isFile($path)
     {
@@ -126,7 +119,6 @@ public function isFile($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isDirectory($path)
     {
@@ -148,7 +140,6 @@ public function isDirectory($path)
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileGetContents($path, $flag = null, $context = null)
     {
@@ -171,7 +162,6 @@ public function fileGetContents($path, $flag = null, $context = null)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isWritable($path)
     {
@@ -190,7 +180,6 @@ public function isWritable($path)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getParentDirectory($path)
     {
@@ -204,7 +193,6 @@ public function getParentDirectory($path)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function createDirectory($path, $permissions = 0777)
     {
@@ -218,7 +206,7 @@ public function createDirectory($path, $permissions = 0777)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function mkdirRecursive($path, $permissions = 0777)
     {
@@ -252,7 +240,6 @@ private function mkdirRecursive($path, $permissions = 0777)
      * @param string $path
      * @return string[]
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function readDirectory($path)
     {
@@ -278,7 +265,6 @@ public function readDirectory($path)
      * @param string $path
      * @return string[]
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function search($pattern, $path)
     {
@@ -296,7 +282,6 @@ public function search($pattern, $path)
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function rename($oldPath, $newPath, DriverInterface $targetDriver = null)
     {
@@ -329,7 +314,6 @@ public function rename($oldPath, $newPath, DriverInterface $targetDriver = null)
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function copy($source, $destination, DriverInterface $targetDriver = null)
     {
@@ -363,7 +347,6 @@ public function copy($source, $destination, DriverInterface $targetDriver = null
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function symlink($source, $destination, DriverInterface $targetDriver = null)
     {
@@ -392,7 +375,6 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function deleteFile($path)
     {
@@ -411,7 +393,6 @@ public function deleteFile($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function deleteDirectory($path)
     {
@@ -444,7 +425,6 @@ public function deleteDirectory($path)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissions($path, $permissions)
     {
@@ -468,7 +448,6 @@ public function changePermissions($path, $permissions)
      * @param int $filePermissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions)
     {
@@ -519,7 +498,6 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int|null $modificationTime
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function touch($path, $modificationTime = null)
     {
@@ -547,7 +525,6 @@ public function touch($path, $modificationTime = null)
      * @param string|null $mode
      * @return int The number of bytes that were written.
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function filePutContents($path, $content, $mode = null)
     {
@@ -570,7 +547,6 @@ public function filePutContents($path, $content, $mode = null)
      * @param string $mode
      * @return resource file
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileOpen($path, $mode)
     {
@@ -591,7 +567,6 @@ public function fileOpen($path, $mode)
      * @param string $ending [optional]
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileReadLine($resource, $length, $ending = null)
     {
@@ -611,7 +586,6 @@ public function fileReadLine($resource, $length, $ending = null)
      * @param int $length
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileRead($resource, $length)
     {
@@ -634,7 +608,6 @@ public function fileRead($resource, $length)
      * @param string $escape [optional]
      * @return array|bool|null
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileGetCsv($resource, $length = 0, $delimiter = ',', $enclosure = '"', $escape = '\\')
     {
@@ -653,7 +626,6 @@ public function fileGetCsv($resource, $length = 0, $delimiter = ',', $enclosure
      * @param resource $resource
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileTell($resource)
     {
@@ -674,7 +646,6 @@ public function fileTell($resource)
      * @param int $whence
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileSeek($resource, $offset, $whence = SEEK_SET)
     {
@@ -695,7 +666,6 @@ public function fileSeek($resource, $offset, $whence = SEEK_SET)
      *
      * @param resource $resource
      * @return boolean
-     * @since 2.0.0
      */
     public function endOfFile($resource)
     {
@@ -708,7 +678,6 @@ public function endOfFile($resource)
      * @param resource $resource
      * @return boolean
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileClose($resource)
     {
@@ -731,7 +700,6 @@ public function fileClose($resource)
      * @param string $data
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileWrite($resource, $data)
     {
@@ -775,7 +743,6 @@ private function fileSystemException($message, $arguments = [])
      * @param string $enclosure
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure = '"')
     {
@@ -812,7 +779,6 @@ public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure
      * @param resource $resource
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileFlush($resource)
     {
@@ -835,7 +801,6 @@ public function fileFlush($resource)
      * @param int $lockMode
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileLock($resource, $lockMode = LOCK_EX)
     {
@@ -857,7 +822,6 @@ public function fileLock($resource, $lockMode = LOCK_EX)
      * @param resource $resource
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileUnlock($resource)
     {
@@ -878,7 +842,6 @@ public function fileUnlock($resource)
      * @param string $path
      * @param string|null $scheme
      * @return string
-     * @since 2.0.0
      */
     public function getAbsolutePath($basePath, $path, $scheme = null)
     {
@@ -898,7 +861,6 @@ public function getAbsolutePath($basePath, $path, $scheme = null)
      * @param string $basePath
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getRelativePath($basePath, $path = null)
     {
@@ -917,7 +879,6 @@ public function getRelativePath($basePath, $path = null)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function fixSeparator($path)
     {
@@ -929,7 +890,6 @@ protected function fixSeparator($path)
      *
      * @param null|string $scheme
      * @return string
-     * @since 2.0.0
      */
     protected function getScheme($scheme = null)
     {
@@ -942,7 +902,6 @@ protected function getScheme($scheme = null)
      * @param string $path
      * @return string[]
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function readDirectoryRecursively($path = null)
     {
@@ -969,7 +928,6 @@ public function readDirectoryRecursively($path = null)
      * @param string $path
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getRealPath($path)
     {
@@ -981,7 +939,6 @@ public function getRealPath($path)
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getRealPathSafety($path)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 3de994e9f7c0b..09d5372291a0a 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -12,7 +12,6 @@
 /**
  * Class Http
  *
- * @since 2.0.0
  */
 class Http extends File
 {
@@ -20,7 +19,6 @@ class Http extends File
      * Scheme distinguisher
      *
      * @var string
-     * @since 2.0.0
      */
     protected $scheme = 'http';
 
@@ -30,7 +28,6 @@ class Http extends File
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isExists($path)
     {
@@ -53,7 +50,6 @@ public function isExists($path)
      * @param string $path
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function stat($path)
     {
@@ -87,7 +83,6 @@ public function stat($path)
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileGetContents($path, $flags = null, $context = null)
     {
@@ -113,7 +108,6 @@ public function fileGetContents($path, $flags = null, $context = null)
      * @param resource|null $context
      * @return int The number of bytes that were written
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function filePutContents($path, $content, $mode = null, $context = null)
     {
@@ -137,7 +131,6 @@ public function filePutContents($path, $content, $mode = null, $context = null)
      * @return resource file
      * @throws FileSystemException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function fileOpen($path, $mode)
     {
@@ -201,7 +194,6 @@ public function fileOpen($path, $mode)
      * @param string $ending [optional]
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileReadLine($resource, $length, $ending = null)
     {
@@ -218,7 +210,6 @@ public function fileReadLine($resource, $length, $ending = null)
      * @param string|null $scheme
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAbsolutePath($basePath, $path, $scheme = null)
     {
@@ -237,7 +228,6 @@ public function getAbsolutePath($basePath, $path, $scheme = null)
      *
      * @param null|string $scheme
      * @return string
-     * @since 2.0.0
      */
     protected function getScheme($scheme = null)
     {
@@ -252,7 +242,6 @@ protected function getScheme($scheme = null)
      * @param int $port
      * @throws \Magento\Framework\Exception\FileSystemException
      * @return array
-     * @since 2.0.0
      */
     protected function open($hostname, $port)
     {
@@ -273,7 +262,6 @@ protected function open($hostname, $port)
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     protected function parseUrl($path)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Https.php b/lib/internal/Magento/Framework/Filesystem/Driver/Https.php
index 840ab905ab4a6..cc7551d477917 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Https.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Https.php
@@ -10,7 +10,6 @@
 /**
  * Class Https
  *
- * @since 2.0.0
  */
 class Https extends Http
 {
@@ -18,7 +17,6 @@ class Https extends Http
      * Scheme distinguisher
      *
      * @var string
-     * @since 2.0.0
      */
     protected $scheme = 'https';
 
@@ -27,7 +25,6 @@ class Https extends Http
      *
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     protected function parseUrl($path)
     {
@@ -46,7 +43,6 @@ protected function parseUrl($path)
      * @param string $hostname
      * @param int $port
      * @return array
-     * @since 2.0.0
      */
     protected function open($hostname, $port)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Zlib.php b/lib/internal/Magento/Framework/Filesystem/Driver/Zlib.php
index 1272ee603293a..8cc5f30e8dc48 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Zlib.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Zlib.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Framework\Filesystem\Driver\Zlib
  *
- * @since 2.0.0
  */
 class Zlib extends File
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $scheme = 'compress.zlib';
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/DriverInterface.php b/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
index 8fc25c0df02d8..39be808875141 100644
--- a/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
@@ -13,7 +13,6 @@
  * Class Driver
  *
  * @api
- * @since 2.0.0
  */
 interface DriverInterface
 {
@@ -36,7 +35,6 @@ interface DriverInterface
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isExists($path);
 
@@ -46,7 +44,6 @@ public function isExists($path);
      * @param string $path
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function stat($path);
 
@@ -56,7 +53,6 @@ public function stat($path);
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isReadable($path);
 
@@ -66,7 +62,6 @@ public function isReadable($path);
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isFile($path);
 
@@ -76,7 +71,6 @@ public function isFile($path);
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isDirectory($path);
 
@@ -88,7 +82,6 @@ public function isDirectory($path);
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileGetContents($path, $flag = null, $context = null);
 
@@ -98,7 +91,6 @@ public function fileGetContents($path, $flag = null, $context = null);
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function isWritable($path);
 
@@ -107,7 +99,6 @@ public function isWritable($path);
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getParentDirectory($path);
 
@@ -118,7 +109,6 @@ public function getParentDirectory($path);
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function createDirectory($path, $permissions = 0777);
 
@@ -128,7 +118,6 @@ public function createDirectory($path, $permissions = 0777);
      * @param string $path
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function readDirectory($path);
 
@@ -138,7 +127,6 @@ public function readDirectory($path);
      * @param string|null $path
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function readDirectoryRecursively($path = null);
 
@@ -149,7 +137,6 @@ public function readDirectoryRecursively($path = null);
      * @param string $path
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function search($pattern, $path);
 
@@ -161,7 +148,6 @@ public function search($pattern, $path);
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function rename($oldPath, $newPath, DriverInterface $targetDriver = null);
 
@@ -173,7 +159,6 @@ public function rename($oldPath, $newPath, DriverInterface $targetDriver = null)
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function copy($source, $destination, DriverInterface $targetDriver = null);
 
@@ -185,7 +170,6 @@ public function copy($source, $destination, DriverInterface $targetDriver = null
      * @param DriverInterface|null $targetDriver
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function symlink($source, $destination, DriverInterface $targetDriver = null);
 
@@ -195,7 +179,6 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function deleteFile($path);
 
@@ -205,7 +188,6 @@ public function deleteFile($path);
      * @param string $path
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function deleteDirectory($path);
 
@@ -216,7 +198,6 @@ public function deleteDirectory($path);
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissions($path, $permissions);
 
@@ -228,7 +209,6 @@ public function changePermissions($path, $permissions);
      * @param int $filePermissions
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions);
 
@@ -239,7 +219,6 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int|null $modificationTime
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function touch($path, $modificationTime = null);
 
@@ -251,7 +230,6 @@ public function touch($path, $modificationTime = null);
      * @param string|null $mode
      * @return int The number of bytes that were written.
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function filePutContents($path, $content, $mode = null);
 
@@ -262,7 +240,6 @@ public function filePutContents($path, $content, $mode = null);
      * @param string $mode
      * @return resource
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileOpen($path, $mode);
 
@@ -274,7 +251,6 @@ public function fileOpen($path, $mode);
      * @param string $ending [optional]
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileReadLine($resource, $length, $ending = null);
 
@@ -285,7 +261,6 @@ public function fileReadLine($resource, $length, $ending = null);
      * @param int $length
      * @return string
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileRead($resource, $length);
 
@@ -299,7 +274,6 @@ public function fileRead($resource, $length);
      * @param string $escape [optional]
      * @return array|bool|null
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileGetCsv($resource, $length = 0, $delimiter = ',', $enclosure = '"', $escape = '\\');
 
@@ -309,7 +283,6 @@ public function fileGetCsv($resource, $length = 0, $delimiter = ',', $enclosure
      * @param resource $resource
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileTell($resource);
 
@@ -321,7 +294,6 @@ public function fileTell($resource);
      * @param int $whence
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileSeek($resource, $offset, $whence = SEEK_SET);
 
@@ -330,7 +302,6 @@ public function fileSeek($resource, $offset, $whence = SEEK_SET);
      *
      * @param resource $resource
      * @return boolean
-     * @since 2.0.0
      */
     public function endOfFile($resource);
 
@@ -340,7 +311,6 @@ public function endOfFile($resource);
      * @param resource $resource
      * @return boolean
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileClose($resource);
 
@@ -351,7 +321,6 @@ public function fileClose($resource);
      * @param string $data
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileWrite($resource, $data);
 
@@ -364,7 +333,6 @@ public function fileWrite($resource, $data);
      * @param string $enclosure
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure = '"');
 
@@ -374,7 +342,6 @@ public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure
      * @param resource $resource
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileFlush($resource);
 
@@ -385,7 +352,6 @@ public function fileFlush($resource);
      * @param int $lockMode
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileLock($resource, $lockMode = LOCK_EX);
 
@@ -395,7 +361,6 @@ public function fileLock($resource, $lockMode = LOCK_EX);
      * @param resource $resource
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function fileUnlock($resource);
 
@@ -404,14 +369,12 @@ public function fileUnlock($resource);
      * @param string $path
      * @param string|null $scheme
      * @return mixed
-     * @since 2.0.0
      */
     public function getAbsolutePath($basePath, $path, $scheme = null);
 
     /**
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getRealPath($path);
 
@@ -420,7 +383,6 @@ public function getRealPath($path);
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getRealPathSafety($path);
 
@@ -428,7 +390,6 @@ public function getRealPathSafety($path);
      * @param string $basePath
      * @param null $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getRelativePath($basePath, $path = null);
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/DriverPool.php b/lib/internal/Magento/Framework/Filesystem/DriverPool.php
index 9e678a5cd9a74..435e51c26b012 100644
--- a/lib/internal/Magento/Framework/Filesystem/DriverPool.php
+++ b/lib/internal/Magento/Framework/Filesystem/DriverPool.php
@@ -8,7 +8,6 @@
 
 /**
  * A pool of stream wrappers
- * @since 2.0.0
  */
 class DriverPool
 {
@@ -21,12 +20,7 @@ class DriverPool
     const ZLIB = 'compress.zlib';
     /**#@- */
 
-    /**
-     * Supported types
-     *
-     * @var string[]
-     * @since 2.0.0
-     */
+    /**#@- */
     protected $types = [
         self::FILE => \Magento\Framework\Filesystem\Driver\File::class,
         self::HTTP => \Magento\Framework\Filesystem\Driver\Http::class,
@@ -38,7 +32,6 @@ class DriverPool
      * The pool
      *
      * @var DriverInterface[]
-     * @since 2.0.0
      */
     private $pool = [];
 
@@ -47,7 +40,6 @@ class DriverPool
      *
      * @param array $extraTypes
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct($extraTypes = [])
     {
@@ -74,7 +66,6 @@ public function __construct($extraTypes = [])
      *
      * @param string $code
      * @return DriverInterface
-     * @since 2.0.0
      */
     public function getDriver($code)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Read.php b/lib/internal/Magento/Framework/Filesystem/File/Read.php
index aa9fdc05fe29b..4384b7ab3c835 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Read.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Filesystem\File\Read
  *
- * @since 2.0.0
  */
 class Read implements ReadInterface
 {
@@ -19,7 +18,6 @@ class Read implements ReadInterface
      * Full path to file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $path;
 
@@ -27,7 +25,6 @@ class Read implements ReadInterface
      * Mode to open the file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $mode = 'r';
 
@@ -35,13 +32,11 @@ class Read implements ReadInterface
      * Opened file resource
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var \Magento\Framework\Filesystem\DriverInterface
-     * @since 2.0.0
      */
     protected $driver;
 
@@ -50,7 +45,6 @@ class Read implements ReadInterface
      *
      * @param string $path
      * @param DriverInterface $driver
-     * @since 2.0.0
      */
     public function __construct($path, DriverInterface $driver)
     {
@@ -65,7 +59,6 @@ public function __construct($path, DriverInterface $driver)
      * Open file
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function open()
     {
@@ -79,7 +72,6 @@ protected function open()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     protected function assertValid()
     {
@@ -94,7 +86,6 @@ protected function assertValid()
      *
      * @param int $length The number of bytes to read
      * @return string
-     * @since 2.0.0
      */
     public function read($length)
     {
@@ -107,7 +98,6 @@ public function read($length)
      * @param string|null $flag
      * @param resource|null $context
      * @return string
-     * @since 2.0.0
      */
     public function readAll($flag = null, $context = null)
     {
@@ -120,7 +110,6 @@ public function readAll($flag = null, $context = null)
      * @param int $length The number of bytes to read
      * @param string $ending [optional]
      * @return string
-     * @since 2.0.0
      */
     public function readLine($length, $ending = null)
     {
@@ -135,7 +124,6 @@ public function readLine($length, $ending = null)
      * @param string $enclosure [optional]
      * @param string $escape [optional]
      * @return array|bool|null
-     * @since 2.0.0
      */
     public function readCsv($length = 0, $delimiter = ',', $enclosure = '"', $escape = '\\')
     {
@@ -146,7 +134,6 @@ public function readCsv($length = 0, $delimiter = ',', $enclosure = '"', $escape
      * Returns the current cursor position
      *
      * @return int
-     * @since 2.0.0
      */
     public function tell()
     {
@@ -159,7 +146,6 @@ public function tell()
      * @param int $offset
      * @param int $whence
      * @return int
-     * @since 2.0.0
      */
     public function seek($offset, $whence = SEEK_SET)
     {
@@ -170,7 +156,6 @@ public function seek($offset, $whence = SEEK_SET)
      * Checks if the current position is the end-of-file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function eof()
     {
@@ -181,7 +166,6 @@ public function eof()
      * Closes the file.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close()
     {
@@ -192,7 +176,6 @@ public function close()
      * {@inheritDoc}
      *
      * @return array
-     * @since 2.0.0
      */
     public function stat()
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index ab0702203693e..95ee46723f4fe 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Filesystem\File\ReadFactory
  *
- * @since 2.0.0
  */
 class ReadFactory
 {
@@ -19,7 +18,6 @@ class ReadFactory
      * Pool of filesystem drivers
      *
      * @var DriverPool
-     * @since 2.0.0
      */
     private $driverPool;
 
@@ -27,7 +25,6 @@ class ReadFactory
      * Constructor
      *
      * @param DriverPool $driverPool
-     * @since 2.0.0
      */
     public function __construct(DriverPool $driverPool)
     {
@@ -40,7 +37,6 @@ public function __construct(DriverPool $driverPool)
      * @param string $path
      * @param DriverInterface|string $driver Driver or driver code
      * @return \Magento\Framework\Filesystem\File\ReadInterface
-     * @since 2.0.0
      */
     public function create($path, $driver)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
index c74e70dbd58ff..d4f547cc5c88a 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Filesystem\File\ReadInterface
  *
- * @since 2.0.0
  */
 interface ReadInterface
 {
@@ -17,7 +16,6 @@ interface ReadInterface
      *
      * @param int $length The number of bytes to read
      * @return string
-     * @since 2.0.0
      */
     public function read($length);
 
@@ -27,7 +25,6 @@ public function read($length);
      * @param int $length The number of bytes to read
      * @param string $ending [optional]
      * @return string
-     * @since 2.0.0
      */
     public function readLine($length, $ending = null);
 
@@ -39,7 +36,6 @@ public function readLine($length, $ending = null);
      * @param string $enclosure [optional]
      * @param string $escape [optional]
      * @return array|bool false on end of file
-     * @since 2.0.0
      */
     public function readCsv($length = 0, $delimiter = ',', $enclosure = '"', $escape = '\\');
 
@@ -47,7 +43,6 @@ public function readCsv($length = 0, $delimiter = ',', $enclosure = '"', $escape
      * Returns the current position
      *
      * @return int
-     * @since 2.0.0
      */
     public function tell();
 
@@ -57,7 +52,6 @@ public function tell();
      * @param int $length
      * @param int $whence
      * @return int
-     * @since 2.0.0
      */
     public function seek($length, $whence = SEEK_SET);
 
@@ -65,7 +59,6 @@ public function seek($length, $whence = SEEK_SET);
      * Checks if the current position is the end-of-file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function eof();
 
@@ -73,7 +66,6 @@ public function eof();
      * Closes the file.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close();
 
@@ -81,7 +73,6 @@ public function close();
      * Get file properties.
      *
      * @return array
-     * @since 2.0.0
      */
     public function stat();
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Write.php b/lib/internal/Magento/Framework/Filesystem/File/Write.php
index 305bfdeb8edcd..900cd1e0c6df1 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Write.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Filesystem\File\Write
  *
- * @since 2.0.0
  */
 class Write extends Read implements WriteInterface
 {
@@ -21,7 +20,6 @@ class Write extends Read implements WriteInterface
      * @param string $path
      * @param DriverInterface $driver
      * @param string $mode
-     * @since 2.0.0
      */
     public function __construct($path, DriverInterface $driver, $mode)
     {
@@ -34,7 +32,6 @@ public function __construct($path, DriverInterface $driver, $mode)
      *
      * @return void
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     protected function assertValid()
     {
@@ -52,7 +49,6 @@ protected function assertValid()
      * @param string $data
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function write($data)
     {
@@ -73,7 +69,6 @@ public function write($data)
      * @param string $enclosure
      * @return int
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function writeCsv(array $data, $delimiter = ',', $enclosure = '"')
     {
@@ -91,7 +86,6 @@ public function writeCsv(array $data, $delimiter = ',', $enclosure = '"')
      *
      * @return bool
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function flush()
     {
@@ -109,7 +103,6 @@ public function flush()
      *
      * @param int $lockMode
      * @return bool
-     * @since 2.0.0
      */
     public function lock($lockMode = LOCK_EX)
     {
@@ -120,7 +113,6 @@ public function lock($lockMode = LOCK_EX)
      * File unlocking
      *
      * @return bool
-     * @since 2.0.0
      */
     public function unlock()
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index e77f5f34ba3af..33225121600f4 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Filesystem\File\WriteFactory
  *
- * @since 2.0.0
  */
 class WriteFactory
 {
@@ -19,7 +18,6 @@ class WriteFactory
      * Pool of filesystem drivers
      *
      * @var DriverPool
-     * @since 2.0.0
      */
     private $driverPool;
 
@@ -27,7 +25,6 @@ class WriteFactory
      * Constructor
      *
      * @param DriverPool $driverPool
-     * @since 2.0.0
      */
     public function __construct(DriverPool $driverPool)
     {
@@ -41,7 +38,6 @@ public function __construct(DriverPool $driverPool)
      * @param DriverInterface|string $driver Driver or driver code
      * @param string $mode [optional]
      * @return Write
-     * @since 2.0.0
      */
     public function create($path, $driver, $mode = 'r')
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
index 5428bfe3774de..3592c34dae7f6 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface WriteInterface extends ReadInterface
 {
@@ -17,7 +16,6 @@ interface WriteInterface extends ReadInterface
      * @param string $data
      * @return int
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function write($data);
 
@@ -29,7 +27,6 @@ public function write($data);
      * @param string $enclosure
      * @return int
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function writeCsv(array $data, $delimiter = ',', $enclosure = '"');
 
@@ -38,7 +35,6 @@ public function writeCsv(array $data, $delimiter = ',', $enclosure = '"');
      *
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @since 2.0.0
      */
     public function flush();
 
@@ -47,7 +43,6 @@ public function flush();
      *
      * @param int $lockMode
      * @return bool
-     * @since 2.0.0
      */
     public function lock($lockMode = LOCK_EX);
 
@@ -55,7 +50,6 @@ public function lock($lockMode = LOCK_EX);
      * File unlocking
      *
      * @return bool
-     * @since 2.0.0
      */
     public function unlock();
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/FileResolver.php b/lib/internal/Magento/Framework/Filesystem/FileResolver.php
index 84e1f32db19df..d4f8330b799ca 100644
--- a/lib/internal/Magento/Framework/Filesystem/FileResolver.php
+++ b/lib/internal/Magento/Framework/Filesystem/FileResolver.php
@@ -7,7 +7,6 @@
 
 /**
  * Contains logic for finding class filepaths based on include_path configuration.
- * @since 2.0.0
  */
 class FileResolver
 {
@@ -16,7 +15,6 @@ class FileResolver
      *
      * @param string $class
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($class)
     {
@@ -29,7 +27,6 @@ public function getFile($class)
      *
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     public function getFilePath($class)
     {
@@ -42,7 +39,6 @@ public function getFilePath($class)
      * @param string|array $path
      * @param bool         $prepend Whether to prepend paths or to append them
      * @return void
-     * @since 2.0.0
      */
     public static function addIncludePath($path, $prepend = true)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Filter/ExcludeFilter.php b/lib/internal/Magento/Framework/Filesystem/Filter/ExcludeFilter.php
index 03454552eb587..9bf384d87d8d1 100644
--- a/lib/internal/Magento/Framework/Filesystem/Filter/ExcludeFilter.php
+++ b/lib/internal/Magento/Framework/Filesystem/Filter/ExcludeFilter.php
@@ -8,7 +8,7 @@
 
 /**
  * Filters Iterator to exclude specified files
- * @since 2.1.0
+ * @since 2.0.11
  */
 class ExcludeFilter extends \FilterIterator
 {
@@ -16,7 +16,7 @@ class ExcludeFilter extends \FilterIterator
      * Array that is used for filtering
      *
      * @var array
-     * @since 2.1.0
+     * @since 2.0.11
      */
     protected $_filters;
 
@@ -25,7 +25,7 @@ class ExcludeFilter extends \FilterIterator
      *
      * @param \Iterator $iterator
      * @param array $filters list of files to skip
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function __construct(\Iterator $iterator, array $filters)
     {
@@ -37,7 +37,7 @@ public function __construct(\Iterator $iterator, array $filters)
      * Check whether the current element of the iterator is acceptable
      *
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function accept()
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Glob.php b/lib/internal/Magento/Framework/Filesystem/Glob.php
index 6a828a0b33fa4..eed1352999243 100644
--- a/lib/internal/Magento/Framework/Filesystem/Glob.php
+++ b/lib/internal/Magento/Framework/Filesystem/Glob.php
@@ -10,7 +10,7 @@
 
 /**
  * Wrapper for Zend\Stdlib\Glob
- * @since 2.1.0
+ * @since 2.0.8
  */
 class Glob extends ZendGlob
 {
@@ -21,7 +21,7 @@ class Glob extends ZendGlob
      * @param  int $flags
      * @param  bool $forceFallback
      * @return array
-     * @since 2.1.0
+     * @since 2.0.8
      */
     public static function glob($pattern, $flags = 0, $forceFallback = false)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/AbstractIo.php b/lib/internal/Magento/Framework/Filesystem/Io/AbstractIo.php
index 0daa53fe75da0..e30499523f3a3 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/AbstractIo.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/AbstractIo.php
@@ -8,7 +8,6 @@
 
 /**
  * Install and upgrade client abstract class
- * @since 2.0.0
  */
 abstract class AbstractIo implements IoInterface
 {
@@ -17,7 +16,6 @@ abstract class AbstractIo implements IoInterface
      * create non-existant directories
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_allowCreateFolders = false;
 
@@ -26,7 +24,6 @@ abstract class AbstractIo implements IoInterface
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowCreateFolders($flag)
     {
@@ -39,7 +36,6 @@ public function setAllowCreateFolders($flag)
      *
      * @param array $args
      * @return false
-     * @since 2.0.0
      */
     public function open(array $args = [])
     {
@@ -48,7 +44,6 @@ public function open(array $args = [])
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function dirsep()
     {
@@ -59,7 +54,6 @@ public function dirsep()
      * @param string $path
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getCleanPath($path)
     {
@@ -106,7 +100,6 @@ public function getCleanPath($path)
      * @param string $haystackPath
      * @param string $needlePath
      * @return bool
-     * @since 2.0.0
      */
     public function allowedPath($haystackPath, $needlePath)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php
index 9942c641b74d8..565aaf8664328 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/File.php
@@ -11,7 +11,6 @@
 /**
  * Filesystem client
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class File extends AbstractIo
 {
@@ -19,7 +18,6 @@ class File extends AbstractIo
      * Save initial working directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_iwd;
 
@@ -27,7 +25,6 @@ class File extends AbstractIo
      * Use virtual current working directory for application integrity
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cwd;
 
@@ -51,7 +48,6 @@ class File extends AbstractIo
      *
      * @var bool
      * @access protected
-     * @since 2.0.0
      */
     protected $_allowCreateFolders = false;
 
@@ -59,7 +55,6 @@ class File extends AbstractIo
      * Stream open file pointer
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_streamHandler;
 
@@ -67,7 +62,6 @@ class File extends AbstractIo
      * Stream mode filename
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_streamFileName;
 
@@ -75,7 +69,6 @@ class File extends AbstractIo
      * Stream mode chmod
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_streamChmod;
 
@@ -83,7 +76,6 @@ class File extends AbstractIo
      * Lock file
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_streamLocked = false;
 
@@ -91,7 +83,6 @@ class File extends AbstractIo
      * Destruct
      *
      * @return void
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -105,7 +96,6 @@ public function __destruct()
      *
      * @param bool $exclusive
      * @return bool
-     * @since 2.0.0
      */
     public function streamLock($exclusive = true)
     {
@@ -121,7 +111,6 @@ public function streamLock($exclusive = true)
      * Unlock file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function streamUnlock()
     {
@@ -137,7 +126,6 @@ public function streamUnlock()
      *
      * @param int $length
      * @return string|false
-     * @since 2.0.0
      */
     public function streamRead($length = 1024)
     {
@@ -156,7 +144,6 @@ public function streamRead($length = 1024)
      * @param string $delimiter
      * @param string $enclosure
      * @return string|false
-     * @since 2.0.0
      */
     public function streamReadCsv($delimiter = ',', $enclosure = '"')
     {
@@ -171,7 +158,6 @@ public function streamReadCsv($delimiter = ',', $enclosure = '"')
      *
      * @param string $str
      * @return int|false
-     * @since 2.0.0
      */
     public function streamWrite($str)
     {
@@ -188,7 +174,6 @@ public function streamWrite($str)
      * @param string $delimiter
      * @param string $enclosure
      * @return int|false The length of the written string or false
-     * @since 2.0.0
      */
     public function streamWriteCsv(array $row, $delimiter = ',', $enclosure = '"')
     {
@@ -217,7 +202,6 @@ public function streamWriteCsv(array $row, $delimiter = ',', $enclosure = '"')
      * Set chmod on a file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function streamClose()
     {
@@ -239,7 +223,6 @@ public function streamClose()
      * @param string $part the part of statistic
      * @param mixed $default default value for part
      * @return array|bool
-     * @since 2.0.0
      */
     public function streamStat($part = null, $default = null)
     {
@@ -257,7 +240,6 @@ public function streamStat($part = null, $default = null)
      * Retrieve stream methods exception
      *
      * @return \Exception
-     * @since 2.0.0
      */
     public function getStreamException()
     {
@@ -272,7 +254,6 @@ public function getStreamException()
      *
      * @param array $args
      * @return true
-     * @since 2.0.0
      */
     public function open(array $args = [])
     {
@@ -295,7 +276,6 @@ public function open(array $args = [])
      * @param bool $flag
      * @access public
      * @return $this
-     * @since 2.0.0
      */
     public function setAllowCreateFolders($flag)
     {
@@ -307,7 +287,6 @@ public function setAllowCreateFolders($flag)
      * Close a connection
      *
      * @return true
-     * @since 2.0.0
      */
     public function close()
     {
@@ -321,7 +300,6 @@ public function close()
      * @param int $mode
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function mkdir($dir, $mode = 0777, $recursive = true)
     {
@@ -337,7 +315,6 @@ public function mkdir($dir, $mode = 0777, $recursive = true)
      * @param string $dir
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function rmdir($dir, $recursive = false)
     {
@@ -352,7 +329,6 @@ public function rmdir($dir, $recursive = false)
      * @param string $dir
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public static function rmdirRecursive($dir, $recursive = true)
     {
@@ -378,7 +354,6 @@ public static function rmdirRecursive($dir, $recursive = true)
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected static function _recursiveCallback($dir, array $fileCallback, array $dirCallback = [])
     {
@@ -417,7 +392,6 @@ protected static function _recursiveCallback($dir, array $fileCallback, array $d
      * Get current working directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function pwd()
     {
@@ -431,7 +405,6 @@ public function pwd()
      * @return true
      * @throws \Exception
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function cd($dir)
     {
@@ -453,7 +426,6 @@ public function cd($dir)
      * @param string $filename
      * @param string|resource $dest
      * @return bool|string
-     * @since 2.0.0
      */
     public function read($filename, $dest = null)
     {
@@ -476,7 +448,6 @@ public function read($filename, $dest = null)
      * @param int $mode
      * @return int|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function write($filename, $src, $mode = null)
     {
@@ -519,7 +490,6 @@ public function write($filename, $src, $mode = null)
      * @param string $file
      * @param bool $onlyFile
      * @return bool
-     * @since 2.0.0
      */
     public function fileExists($file, $onlyFile = true)
     {
@@ -537,7 +507,6 @@ public function fileExists($file, $onlyFile = true)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function isWriteable($path)
     {
@@ -552,7 +521,6 @@ public function isWriteable($path)
      *
      * @param string $filePath
      * @return bool|string
-     * @since 2.0.0
      */
     public function getDestinationFolder($filePath)
     {
@@ -568,7 +536,6 @@ public function getDestinationFolder($filePath)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function createDestinationDir($path)
     {
@@ -585,7 +552,6 @@ public function createDestinationDir($path)
      * @param int $mode
      * @return true
      * @throws \Exception
-     * @since 2.0.0
      */
     public function checkAndCreateFolder($folder, $mode = 0777)
     {
@@ -606,7 +572,6 @@ public function checkAndCreateFolder($folder, $mode = 0777)
      *
      * @param string $destinationFolder
      * @return bool
-     * @since 2.0.0
      */
     private function _createDestinationFolder($destinationFolder)
     {
@@ -619,7 +584,6 @@ private function _createDestinationFolder($destinationFolder)
      * @param string $filename
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function rm($filename)
     {
@@ -636,7 +600,6 @@ public function rm($filename)
      * @param string $destination
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function mv($src, $destination)
     {
@@ -653,7 +616,6 @@ public function mv($src, $destination)
      * @param string $destination
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function cp($src, $destination)
     {
@@ -670,7 +632,6 @@ public function cp($src, $destination)
      * @param int $mode
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function chmod($filename, $mode, $recursive = false)
     {
@@ -691,7 +652,6 @@ public function chmod($filename, $mode, $recursive = false)
      * @param string $dir
      * @param int $mode
      * @return bool
-     * @since 2.0.0
      */
     public static function chmodRecursive($dir, $mode)
     {
@@ -713,7 +673,6 @@ public static function chmodRecursive($dir, $mode)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function ls($grep = null)
     {
@@ -791,7 +750,6 @@ public function ls($grep = null)
      * Change directory to current working directory
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _cwd()
     {
@@ -804,7 +762,6 @@ protected function _cwd()
      * Change directory to initial directory
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _iwd()
     {
@@ -821,7 +778,6 @@ protected function _iwd()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _parsePermissions($mode)
     {
@@ -877,7 +833,6 @@ protected function _parsePermissions($mode)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     protected function _getFileOwner($filename)
     {
@@ -895,7 +850,6 @@ protected function _getFileOwner($filename)
      * Get directory separator
      *
      * @return string
-     * @since 2.0.0
      */
     public function dirsep()
     {
@@ -907,7 +861,6 @@ public function dirsep()
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function dirname($file)
     {
@@ -920,7 +873,6 @@ public function dirname($file)
      * @param string $path
      * @param int $flag
      * @return array
-     * @since 2.0.0
      */
     public function getDirectoriesList($path, $flag = GLOB_ONLYDIR)
     {
@@ -932,7 +884,6 @@ public function getDirectoriesList($path, $flag = GLOB_ONLYDIR)
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getPathInfo($path)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
index f95e6f70f42c1..2a1938df4d687 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
@@ -11,7 +11,6 @@
 
 /**
  * FTP client
- * @since 2.0.0
  */
 class Ftp extends AbstractIo
 {
@@ -33,7 +32,6 @@ class Ftp extends AbstractIo
      * Connection config
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -41,7 +39,6 @@ class Ftp extends AbstractIo
      * An FTP connection
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_conn;
 
@@ -49,13 +46,11 @@ class Ftp extends AbstractIo
      * Error code
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_error;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_tmpFilename;
 
@@ -78,7 +73,6 @@ class Ftp extends AbstractIo
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function open(array $args = [])
     {
@@ -149,7 +143,6 @@ public function open(array $args = [])
      * Close a connection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close()
     {
@@ -165,7 +158,6 @@ public function close()
      * @param bool $recursive
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function mkdir($dir, $mode = 0777, $recursive = true)
     {
@@ -179,7 +171,6 @@ public function mkdir($dir, $mode = 0777, $recursive = true)
      * @param bool $recursive
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function rmdir($dir, $recursive = false)
     {
@@ -190,7 +181,6 @@ public function rmdir($dir, $recursive = false)
      * Get current working directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function pwd()
     {
@@ -203,7 +193,6 @@ public function pwd()
      * @param string $dir
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function cd($dir)
     {
@@ -216,7 +205,6 @@ public function cd($dir)
      * @param string $filename
      * @param string|resource|null $dest destination file name, stream, or if null will return file contents
      * @return false|string
-     * @since 2.0.0
      */
     public function read($filename, $dest = null)
     {
@@ -253,7 +241,6 @@ public function read($filename, $dest = null)
      * @param null $mode
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function write($filename, $src, $mode = null)
     {
@@ -285,7 +272,6 @@ public function write($filename, $src, $mode = null)
      * @param string $filename
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function rm($filename)
     {
@@ -299,7 +285,6 @@ public function rm($filename)
      * @param string $dest
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function mv($src, $dest)
     {
@@ -312,7 +297,6 @@ public function mv($src, $dest)
      * @param string $filename
      * @param int $mode
      * @return bool
-     * @since 2.0.0
      */
     public function chmod($filename, $mode)
     {
@@ -324,7 +308,6 @@ public function chmod($filename, $mode)
      * @return array
      * @SuppressWarnings(PHPMD.ShortMethodName)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function ls($grep = null)
     {
@@ -341,7 +324,6 @@ public function ls($grep = null)
     /**
      * @param bool $new
      * @return string
-     * @since 2.0.0
      */
     protected function _tmpFilename($new = false)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
index fcf206cd11657..c31d3ff9e52ba 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Input/output client interface
- * @since 2.0.0
  */
 interface IoInterface
 {
@@ -18,7 +17,6 @@ interface IoInterface
      *
      * @param array $args
      * @return bool
-     * @since 2.0.0
      */
     public function open(array $args = []);
 
@@ -26,7 +24,6 @@ public function open(array $args = []);
      * Close a connection
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close();
 
@@ -37,7 +34,6 @@ public function close();
      * @param int $mode
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function mkdir($dir, $mode = 0777, $recursive = true);
 
@@ -47,7 +43,6 @@ public function mkdir($dir, $mode = 0777, $recursive = true);
      * @param string $dir
      * @param bool $recursive
      * @return bool
-     * @since 2.0.0
      */
     public function rmdir($dir, $recursive = false);
 
@@ -55,7 +50,6 @@ public function rmdir($dir, $recursive = false);
      * Get current working directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function pwd();
 
@@ -65,7 +59,6 @@ public function pwd();
      * @param string $dir
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function cd($dir);
 
@@ -75,7 +68,6 @@ public function cd($dir);
      * @param string $filename
      * @param string|resource|null $dest
      * @return string|bool
-     * @since 2.0.0
      */
     public function read($filename, $dest = null);
 
@@ -86,7 +78,6 @@ public function read($filename, $dest = null);
      * @param string|resource $src
      * @param int|null $mode
      * @return int|bool
-     * @since 2.0.0
      */
     public function write($filename, $src, $mode = null);
 
@@ -96,7 +87,6 @@ public function write($filename, $src, $mode = null);
      * @param string $filename
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function rm($filename);
 
@@ -107,7 +97,6 @@ public function rm($filename);
      * @param string $dest
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function mv($src, $dest);
 
@@ -117,7 +106,6 @@ public function mv($src, $dest);
      * @param string $filename
      * @param int $mode
      * @return bool
-     * @since 2.0.0
      */
     public function chmod($filename, $mode);
 
@@ -127,7 +115,6 @@ public function chmod($filename, $mode);
      * @param string|null $grep
      * @return array
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function ls($grep = null);
 
@@ -135,7 +122,6 @@ public function ls($grep = null);
      * Retrieve directory separator in context of io resource
      *
      * @return string
-     * @since 2.0.0
      */
     public function dirsep();
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
index c141b649b9bef..a04e4fcbb12d0 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
@@ -10,7 +10,6 @@
  * Sftp client interface
  *
  * @link        http://www.php.net/manual/en/function.ssh2-connect.php
- * @since 2.0.0
  */
 class Sftp extends AbstractIo
 {
@@ -19,7 +18,6 @@ class Sftp extends AbstractIo
 
     /**
      * @var \phpseclib\Net\SFTP $_connection
-     * @since 2.0.0
      */
     protected $_connection = null;
 
@@ -33,7 +31,6 @@ class Sftp extends AbstractIo
      *        int $args[timeout] Connection timeout [=10]
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function open(array $args = [])
     {
@@ -58,7 +55,6 @@ public function open(array $args = [])
      * Close a connection
      *
      * @return void
-     * @since 2.0.0
      */
     public function close()
     {
@@ -78,7 +74,6 @@ public function close()
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function mkdir($dir, $mode = 0777, $recursive = true)
     {
@@ -105,7 +100,6 @@ public function mkdir($dir, $mode = 0777, $recursive = true)
      * @return bool
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function rmdir($dir, $recursive = false)
     {
@@ -146,7 +140,6 @@ public function rmdir($dir, $recursive = false)
      * Get current working directory
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function pwd()
     {
@@ -159,7 +152,6 @@ public function pwd()
      * @param string $dir
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function cd($dir)
     {
@@ -172,7 +164,6 @@ public function cd($dir)
      * @param string $filename remote file name
      * @param string|null $destination local file name (optional)
      * @return mixed
-     * @since 2.0.0
      */
     public function read($filename, $destination = null)
     {
@@ -189,7 +180,6 @@ public function read($filename, $destination = null)
      * @param string $source string data or local file name
      * @param int $mode ignored parameter
      * @return bool
-     * @since 2.0.0
      */
     public function write($filename, $source, $mode = null)
     {
@@ -203,7 +193,6 @@ public function write($filename, $source, $mode = null)
      * @param string $filename
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function rm($filename)
     {
@@ -217,7 +206,6 @@ public function rm($filename)
      * @param string $destination
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function mv($source, $destination)
     {
@@ -230,7 +218,6 @@ public function mv($source, $destination)
      * @param string $filename
      * @param int $mode
      * @return mixed
-     * @since 2.0.0
      */
     public function chmod($filename, $mode)
     {
@@ -244,7 +231,6 @@ public function chmod($filename, $mode)
      * @return array
      * @SuppressWarnings(PHPMD.ShortMethodName)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function ls($grep = null)
     {
@@ -261,7 +247,6 @@ public function ls($grep = null)
      * Returns a list of files in the current directory
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function rawls()
     {
diff --git a/lib/internal/Magento/Framework/Filter/AbstractFactory.php b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
index 28ab81924ea54..2a0ae0ba15e42 100644
--- a/lib/internal/Magento/Framework/Filter/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Magento filter factory abstract
- * @since 2.0.0
  */
 abstract class AbstractFactory implements FactoryInterface
 {
@@ -15,7 +14,6 @@ abstract class AbstractFactory implements FactoryInterface
      * Set of filters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $invokableClasses = [];
 
@@ -23,7 +21,6 @@ abstract class AbstractFactory implements FactoryInterface
      * Whether or not to share by default; default to false
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $shareByDefault = true;
 
@@ -31,25 +28,21 @@ abstract class AbstractFactory implements FactoryInterface
      * Shared instances, by default is shared
      *
      * @var array
-     * @since 2.0.0
      */
     protected $shared = [];
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Zend_Filter_Interface[]
-     * @since 2.0.0
      */
     protected $sharedInstances = [];
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManger
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManger)
     {
@@ -61,7 +54,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $alias
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateFilter($alias)
     {
@@ -73,7 +65,6 @@ public function canCreateFilter($alias)
      *
      * @param string $class
      * @return bool
-     * @since 2.0.0
      */
     public function isShared($class)
     {
@@ -86,7 +77,6 @@ public function isShared($class)
      * @param string $alias
      * @param array $arguments
      * @return \Zend_Filter_Interface
-     * @since 2.0.0
      */
     public function createFilter($alias, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Filter/ArrayFilter.php b/lib/internal/Magento/Framework/Filter/ArrayFilter.php
index f96fe542d10ef..73f9f112621cf 100644
--- a/lib/internal/Magento/Framework/Filter/ArrayFilter.php
+++ b/lib/internal/Magento/Framework/Filter/ArrayFilter.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Filter\ArrayFilter
  *
- * @since 2.0.0
  */
 class ArrayFilter extends \Zend_Filter
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_columnFilters = [];
 
@@ -24,7 +22,6 @@ class ArrayFilter extends \Zend_Filter
      * @param \Zend_Filter_Interface $filter
      * @param string $column
      * @return null|\Zend_Filter
-     * @since 2.0.0
      */
     public function addFilter(\Zend_Filter_Interface $filter, $column = '')
     {
@@ -43,7 +40,6 @@ public function addFilter(\Zend_Filter_Interface $filter, $column = '')
      *
      * @param array $array
      * @return array
-     * @since 2.0.0
      */
     public function filter($array)
     {
diff --git a/lib/internal/Magento/Framework/Filter/DataObject.php b/lib/internal/Magento/Framework/Filter/DataObject.php
index 1e4fa8fbb19bc..f8b9c25a08724 100644
--- a/lib/internal/Magento/Framework/Filter/DataObject.php
+++ b/lib/internal/Magento/Framework/Filter/DataObject.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Framework\Filter\DataObject
  *
- * @since 2.0.0
  */
 class DataObject extends \Zend_Filter
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_columnFilters = [];
 
     /**
      * @var \Magento\Framework\Data\Collection\EntityFactoryInterface
-     * @since 2.0.0
      */
     protected $_entityFactory;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory)
     {
@@ -37,7 +33,6 @@ public function __construct(\Magento\Framework\Data\Collection\EntityFactoryInte
      * @param \Zend_Filter_Interface $filter
      * @param string $column
      * @return null|\Zend_Filter
-     * @since 2.0.0
      */
     public function addFilter(\Zend_Filter_Interface $filter, $column = '')
     {
@@ -55,7 +50,6 @@ public function addFilter(\Zend_Filter_Interface $filter, $column = '')
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Framework\DataObject
      * @throws \Exception
-     * @since 2.0.0
      */
     public function filter($object)
     {
diff --git a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
index ccb9c4723ebb9..b471c1b03a088 100644
--- a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
+++ b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Framework\Filter\DataObject\Grid
  *
- * @since 2.0.0
  */
 class Grid extends \Magento\Framework\Filter\DataObject
 {
     /**
      * @param Object[] $grid
      * @return Object[]
-     * @since 2.0.0
      */
     public function filter($grid)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Decrypt.php b/lib/internal/Magento/Framework/Filter/Decrypt.php
index 1de163af61df1..6684fd9e115cf 100644
--- a/lib/internal/Magento/Framework/Filter/Decrypt.php
+++ b/lib/internal/Magento/Framework/Filter/Decrypt.php
@@ -7,13 +7,11 @@
 
 /**
  * Decrypt filter
- * @since 2.0.0
  */
 class Decrypt extends \Zend_Filter_Decrypt
 {
     /**
      * @param \Magento\Framework\Filter\Encrypt\AdapterInterface $adapter
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Filter\Encrypt\AdapterInterface $adapter)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Email.php b/lib/internal/Magento/Framework/Filter/Email.php
index 627bad5af3d77..7d0d9498b58d4 100644
--- a/lib/internal/Magento/Framework/Filter/Email.php
+++ b/lib/internal/Magento/Framework/Filter/Email.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Framework\Filter\Email
  *
- * @since 2.0.0
  */
 class Email implements \Zend_Filter_Interface
 {
     /**
      * @param  mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Encrypt.php b/lib/internal/Magento/Framework/Filter/Encrypt.php
index c756ffcb5efe4..ced540a4ce460 100644
--- a/lib/internal/Magento/Framework/Filter/Encrypt.php
+++ b/lib/internal/Magento/Framework/Filter/Encrypt.php
@@ -7,13 +7,11 @@
 
 /**
  * Encrypt filter
- * @since 2.0.0
  */
 class Encrypt extends \Zend_Filter_Encrypt
 {
     /**
      * @param \Magento\Framework\Filter\Encrypt\AdapterInterface $adapter
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Filter\Encrypt\AdapterInterface $adapter)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Encrypt/AdapterInterface.php b/lib/internal/Magento/Framework/Filter/Encrypt/AdapterInterface.php
index 667959bc37d83..16b6a52d10d37 100644
--- a/lib/internal/Magento/Framework/Filter/Encrypt/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Filter/Encrypt/AdapterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Encrypt adapter interface
- * @since 2.0.0
  */
 interface AdapterInterface extends \Zend_Filter_Encrypt_Interface
 {
diff --git a/lib/internal/Magento/Framework/Filter/Encrypt/Basic.php b/lib/internal/Magento/Framework/Filter/Encrypt/Basic.php
index f96b9ce579123..819de04ba9891 100644
--- a/lib/internal/Magento/Framework/Filter/Encrypt/Basic.php
+++ b/lib/internal/Magento/Framework/Filter/Encrypt/Basic.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Filter\Encrypt\Basic
  *
- * @since 2.0.0
  */
 class Basic implements \Zend_Filter_Encrypt_Interface
 {
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $encryptor;
 
     /**
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Encryption\EncryptorInterface $encryptor)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Encryption\EncryptorInterface $en
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function encrypt($value)
     {
@@ -44,7 +40,6 @@ public function encrypt($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function decrypt($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Factory.php b/lib/internal/Magento/Framework/Filter/Factory.php
index 39b69dabba2ed..a5e5978a83f06 100644
--- a/lib/internal/Magento/Framework/Filter/Factory.php
+++ b/lib/internal/Magento/Framework/Filter/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  * Magento filter factory
- * @since 2.0.0
  */
 class Factory extends AbstractFactory
 {
@@ -15,7 +14,6 @@ class Factory extends AbstractFactory
      * Set of filters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $invokableClasses = [
         'email' => \Magento\Framework\Filter\Email::class,
@@ -40,7 +38,6 @@ class Factory extends AbstractFactory
      * Shared instances, by default is shared
      *
      * @var array
-     * @since 2.0.0
      */
     protected $shared = [
         \Magento\Framework\Filter\Sprintf::class => false,
diff --git a/lib/internal/Magento/Framework/Filter/FactoryInterface.php b/lib/internal/Magento/Framework/Filter/FactoryInterface.php
index 3b81a971d161b..c0d49158b05ee 100644
--- a/lib/internal/Magento/Framework/Filter/FactoryInterface.php
+++ b/lib/internal/Magento/Framework/Filter/FactoryInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Magento filter factory interface
- * @since 2.0.0
  */
 interface FactoryInterface
 {
@@ -16,7 +15,6 @@ interface FactoryInterface
      *
      * @param string $alias
      * @return bool
-     * @since 2.0.0
      */
     public function canCreateFilter($alias);
 
@@ -25,7 +23,6 @@ public function canCreateFilter($alias);
      *
      * @param string $class
      * @return bool
-     * @since 2.0.0
      */
     public function isShared($class);
 
@@ -35,7 +32,6 @@ public function isShared($class);
      * @param string $alias
      * @param array $arguments
      * @return \Zend_Filter_Interface
-     * @since 2.0.0
      */
     public function createFilter($alias, array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager.php b/lib/internal/Magento/Framework/Filter/FilterManager.php
index a46c9f1b40025..52c9d017ad11c 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager.php
@@ -25,32 +25,27 @@
  * @method string decrypt(string $value, $params = array())
  * @method string translit(string $value)
  * @method string translitUrl(string $value)
- * @since 2.0.0
  */
 class FilterManager
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var FilterManager\Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var FactoryInterface[]
-     * @since 2.0.0
      */
     protected $factoryInstances;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManger
      * @param FilterManager\Config $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManger, FilterManager\Config $config)
     {
@@ -65,7 +60,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return \Zend_Filter_Interface
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function get($filterAlias, array $arguments = [])
     {
@@ -85,7 +79,6 @@ public function get($filterAlias, array $arguments = [])
      * @param array $arguments
      * @return \Zend_Filter_Interface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function createFilterInstance($filterAlias, $arguments)
     {
@@ -103,7 +96,6 @@ protected function createFilterInstance($filterAlias, $arguments)
      *
      * @return FactoryInterface[]
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function getFilterFactories()
     {
@@ -129,7 +121,6 @@ protected function getFilterFactories()
      * @param string $filterAlias
      * @param array $arguments
      * @return \Zend_Filter_Interface
-     * @since 2.0.0
      */
     public function __call($filterAlias, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager/Config.php b/lib/internal/Magento/Framework/Filter/FilterManager/Config.php
index 2b31a936be936..1f102cd41e2fc 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager/Config.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager/Config.php
@@ -7,19 +7,16 @@
 
 /**
  * Filter plugin manager config
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $factories = [\Magento\Framework\Filter\Factory::class, \Magento\Framework\Filter\ZendFactory::class];
 
     /**
      * @param string[] $factories
-     * @since 2.0.0
      */
     public function __construct(array $factories = [])
     {
@@ -32,7 +29,6 @@ public function __construct(array $factories = [])
      * Get list of factories
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getFactories()
     {
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager/ConfigInterface.php b/lib/internal/Magento/Framework/Filter/FilterManager/ConfigInterface.php
index d3e1d6216dd1c..95218bd7b5bc2 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Filter manager config interface
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -15,7 +14,6 @@ interface ConfigInterface
      * Get list of factories
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getFactories();
 }
diff --git a/lib/internal/Magento/Framework/Filter/Input.php b/lib/internal/Magento/Framework/Filter/Input.php
index 12c2e2c8354f6..d11b4f52772ab 100644
--- a/lib/internal/Magento/Framework/Filter/Input.php
+++ b/lib/internal/Magento/Framework/Filter/Input.php
@@ -82,19 +82,16 @@
 /**
  * Class \Magento\Framework\Filter\Input
  *
- * @since 2.0.0
  */
 class Input implements \Zend_Filter_Interface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -105,7 +102,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Filters data collectors
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_filters = [];
 
@@ -116,7 +112,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array|\Zend_Filter_Interface $filter
      * @param string $placement
      * @return $this
-     * @since 2.0.0
      */
     public function addFilter($name, $filter, $placement = \Zend_Filter::CHAIN_APPEND)
     {
@@ -133,7 +128,6 @@ public function addFilter($name, $filter, $placement = \Zend_Filter::CHAIN_APPEN
      *
      * @param  array|\Zend_Filter_Interface $filter
      * @return $this
-     * @since 2.0.0
      */
     public function appendFilter(\Zend_Filter_Interface $filter)
     {
@@ -145,7 +139,6 @@ public function appendFilter(\Zend_Filter_Interface $filter)
      *
      * @param  array|\Zend_Filter_Interface $filter
      * @return $this
-     * @since 2.0.0
      */
     public function prependFilter($filter)
     {
@@ -164,7 +157,6 @@ public function prependFilter($filter)
      *
      * @param array $filters
      * @return $this
-     * @since 2.0.0
      */
     public function addFilters(array $filters)
     {
@@ -177,7 +169,6 @@ public function addFilters(array $filters)
      *
      * @param array $filters
      * @return $this
-     * @since 2.0.0
      */
     public function setFilters(array $filters)
     {
@@ -190,7 +181,6 @@ public function setFilters(array $filters)
      *
      * @param string|null $name Get filter for selected name
      * @return array|\Zend_Filter_Interface
-     * @since 2.0.0
      */
     public function getFilters($name = null)
     {
@@ -206,7 +196,6 @@ public function getFilters($name = null)
      *
      * @param array $data
      * @return array Return filtered data
-     * @since 2.0.0
      */
     public function filter($data)
     {
@@ -222,7 +211,6 @@ public function filter($data)
      * @return array
      * @throws \Exception when filter is not found or not instance of defined instances
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _filter(array $data, &$filters = null, $isFilterListSimple = false)
     {
@@ -263,7 +251,6 @@ protected function _filter(array $data, &$filters = null, $isFilterListSimple =
      * @param array $filterData
      * @return mixed
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _applyFiltrationWithHelper(
         $value,
@@ -288,7 +275,6 @@ protected function _applyFiltrationWithHelper(
      * @param \Zend_Filter_Interface|array $filterData
      * @return false|\Magento\Framework\App\Helper\AbstractHelper
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _getFiltrationHelper($filterData)
     {
@@ -309,7 +295,6 @@ protected function _getFiltrationHelper($filterData)
      *
      * @param \Zend_Filter_Interface|array $filterData
      * @return false|\Zend_Filter_Interface
-     * @since 2.0.0
      */
     protected function _getZendFilter($filterData)
     {
@@ -331,7 +316,6 @@ protected function _getZendFilter($filterData)
      * @param array $filterData
      * @return \Zend_Filter_Interface
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _createCustomZendFilter($filterData)
     {
@@ -357,7 +341,6 @@ protected function _createCustomZendFilter($filterData)
      * @param array $filterData
      * @return \Zend_Filter_Interface
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _createNativeZendFilter($filterData)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
index 961fef1c54064..04fb2e1a6509a 100644
--- a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
+++ b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Filter\Input\MaliciousCode
  *
- * @since 2.0.0
  */
 class MaliciousCode implements \Zend_Filter_Interface
 {
@@ -19,7 +18,6 @@ class MaliciousCode implements \Zend_Filter_Interface
      * Regular expressions for cutting malicious code
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_expressions = [
         //comments, must be first
@@ -46,7 +44,6 @@ class MaliciousCode implements \Zend_Filter_Interface
      *
      * @param string|array $value
      * @return string|array Filtered value
-     * @since 2.0.0
      */
     public function filter($value)
     {
@@ -62,7 +59,6 @@ public function filter($value)
      *
      * @param string $expression
      * @return $this
-     * @since 2.0.0
      */
     public function addExpression($expression)
     {
@@ -77,7 +73,6 @@ public function addExpression($expression)
      *
      * @param array $expressions
      * @return $this
-     * @since 2.0.0
      */
     public function setExpressions(array $expressions)
     {
diff --git a/lib/internal/Magento/Framework/Filter/LocalizedToNormalized.php b/lib/internal/Magento/Framework/Filter/LocalizedToNormalized.php
index 66f045dc5f10b..20761622c811a 100644
--- a/lib/internal/Magento/Framework/Filter/LocalizedToNormalized.php
+++ b/lib/internal/Magento/Framework/Filter/LocalizedToNormalized.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Filter\LocalizedToNormalized
  *
- * @since 2.0.0
  */
 class LocalizedToNormalized extends \Zend_Filter_LocalizedToNormalized
 {
diff --git a/lib/internal/Magento/Framework/Filter/Money.php b/lib/internal/Magento/Framework/Filter/Money.php
index 9cbd8422a9374..23f8a1dd48f8b 100644
--- a/lib/internal/Magento/Framework/Filter/Money.php
+++ b/lib/internal/Magento/Framework/Filter/Money.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Filter\Money
  *
- * @since 2.0.0
  */
 class Money implements \Zend_Filter_Interface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_format;
 
     /**
      * @param string $format
-     * @since 2.0.0
      */
     public function __construct($format)
     {
@@ -30,7 +27,6 @@ public function __construct($format)
     /**
      * @param float $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/RemoveAccents.php b/lib/internal/Magento/Framework/Filter/RemoveAccents.php
index 830840f280f05..7ec6f9f5920c0 100644
--- a/lib/internal/Magento/Framework/Filter/RemoveAccents.php
+++ b/lib/internal/Magento/Framework/Filter/RemoveAccents.php
@@ -7,19 +7,16 @@
 
 /**
  * Remove accents from string
- * @since 2.0.0
  */
 class RemoveAccents implements \Zend_Filter_Interface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $german;
 
     /**
      * @param bool $german
-     * @since 2.0.0
      */
     public function __construct($german = false)
     {
@@ -30,7 +27,6 @@ public function __construct($german = false)
      * @param string $string
      * @return string
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function filter($string)
     {
diff --git a/lib/internal/Magento/Framework/Filter/RemoveTags.php b/lib/internal/Magento/Framework/Filter/RemoveTags.php
index d2e580d4bb6bb..63528dd4234c3 100644
--- a/lib/internal/Magento/Framework/Filter/RemoveTags.php
+++ b/lib/internal/Magento/Framework/Filter/RemoveTags.php
@@ -7,7 +7,6 @@
 
 /**
  * Remove tags from string
- * @since 2.0.0
  */
 class RemoveTags implements \Zend_Filter_Interface
 {
@@ -16,7 +15,6 @@ class RemoveTags implements \Zend_Filter_Interface
      *
      * @param string[] $matches
      * @return string
-     * @since 2.0.0
      */
     protected function _convertEntities($matches)
     {
@@ -28,7 +26,6 @@ protected function _convertEntities($matches)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/SplitWords.php b/lib/internal/Magento/Framework/Filter/SplitWords.php
index ecf430f6ea466..b217cd058f060 100644
--- a/lib/internal/Magento/Framework/Filter/SplitWords.php
+++ b/lib/internal/Magento/Framework/Filter/SplitWords.php
@@ -7,25 +7,21 @@
 
 /**
  * Split words
- * @since 2.0.0
  */
 class SplitWords implements \Zend_Filter_Interface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $uniqueOnly;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $wordsQty;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $wordSeparatorRegexp;
 
@@ -33,7 +29,6 @@ class SplitWords implements \Zend_Filter_Interface
      * @param bool $uniqueOnly Unique words only
      * @param int $wordsQty Limit words qty in result
      * @param string $wordSeparatorRegexp
-     * @since 2.0.0
      */
     public function __construct($uniqueOnly = true, $wordsQty = 0, $wordSeparatorRegexp = '\s')
     {
@@ -47,7 +42,6 @@ public function __construct($uniqueOnly = true, $wordsQty = 0, $wordSeparatorReg
      *
      * @param string $str The source string
      * @return array
-     * @since 2.0.0
      */
     public function filter($str)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Sprintf.php b/lib/internal/Magento/Framework/Filter/Sprintf.php
index 0fa17dd28a060..7fcfb879a85c5 100644
--- a/lib/internal/Magento/Framework/Filter/Sprintf.php
+++ b/lib/internal/Magento/Framework/Filter/Sprintf.php
@@ -8,31 +8,26 @@
 /**
  * Class \Magento\Framework\Filter\Sprintf
  *
- * @since 2.0.0
  */
 class Sprintf implements \Zend_Filter_Interface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $format;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $decimals;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $decPoint;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $thousandsSep;
 
@@ -41,7 +36,6 @@ class Sprintf implements \Zend_Filter_Interface
      * @param null|int $decimals
      * @param string $decPoint
      * @param string $thousandsSep
-     * @since 2.0.0
      */
     public function __construct($format, $decimals = null, $decPoint = '.', $thousandsSep = ',')
     {
@@ -54,7 +48,6 @@ public function __construct($format, $decimals = null, $decPoint = '.', $thousan
     /**
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/StripTags.php b/lib/internal/Magento/Framework/Filter/StripTags.php
index 5615073d0329b..bfb7714cfe00a 100644
--- a/lib/internal/Magento/Framework/Filter/StripTags.php
+++ b/lib/internal/Magento/Framework/Filter/StripTags.php
@@ -7,25 +7,21 @@
 
 /**
  * Filter for standard strip_tags() function with extra functionality for html entities
- * @since 2.0.0
  */
 class StripTags implements \Zend_Filter_Interface
 {
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $allowableTags;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $escape;
 
@@ -33,7 +29,6 @@ class StripTags implements \Zend_Filter_Interface
      * @param \Magento\Framework\Escaper $escaper
      * @param null $allowableTags
      * @param bool $escape
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Escaper $escaper, $allowableTags = null, $escape = false)
     {
@@ -47,7 +42,6 @@ public function __construct(\Magento\Framework\Escaper $escaper, $allowableTags
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 969e83a3777aa..465b907348751 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Template implements \Zend_Filter_Interface
 {
@@ -31,19 +30,13 @@ class Template implements \Zend_Filter_Interface
 
     /**#@-*/
 
-    /**
-     * Callbacks that will be applied after filtering
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $afterFilterCallbacks = [];
 
     /**
      * Assigned template variables
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateVars = [];
 
@@ -51,20 +44,17 @@ class Template implements \Zend_Filter_Interface
      * Template processor
      *
      * @var callable|null
-     * @since 2.0.0
      */
     protected $templateProcessor = null;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param array $variables
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\StringUtils $string, $variables = [])
     {
@@ -77,7 +67,6 @@ public function __construct(\Magento\Framework\Stdlib\StringUtils $string, $vari
      *
      * @param array $variables
      * @return \Magento\Framework\Filter\Template
-     * @since 2.0.0
      */
     public function setVariables(array $variables)
     {
@@ -92,7 +81,6 @@ public function setVariables(array $variables)
      *
      * @param callable $callback it must return string
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateProcessor(callable $callback)
     {
@@ -104,7 +92,6 @@ public function setTemplateProcessor(callable $callback)
      * Sets the processor for template directive.
      *
      * @return callable|null
-     * @since 2.0.0
      */
     public function getTemplateProcessor()
     {
@@ -118,7 +105,6 @@ public function getTemplateProcessor()
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function filter($value)
     {
@@ -168,7 +154,6 @@ public function filter($value)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function afterFilter($value)
     {
@@ -187,7 +172,6 @@ protected function afterFilter($value)
      *
      * @param callable $afterFilterCallback
      * @return $this
-     * @since 2.0.0
      */
     public function addAfterFilterCallback(callable $afterFilterCallback)
     {
@@ -204,7 +188,6 @@ public function addAfterFilterCallback(callable $afterFilterCallback)
      * Resets the after filter callbacks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function resetAfterFilterCallbacks()
     {
@@ -215,7 +198,6 @@ protected function resetAfterFilterCallbacks()
     /**
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function varDirective($construction)
     {
@@ -240,7 +222,6 @@ public function varDirective($construction)
      *
      * @param string[] $construction
      * @return mixed
-     * @since 2.0.0
      */
     public function templateDirective($construction)
     {
@@ -262,7 +243,6 @@ public function templateDirective($construction)
     /**
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function dependDirective($construction)
     {
@@ -281,7 +261,6 @@ public function dependDirective($construction)
     /**
      * @param string[] $construction
      * @return string
-     * @since 2.0.0
      */
     public function ifDirective($construction)
     {
@@ -304,7 +283,6 @@ public function ifDirective($construction)
      *
      * @param string $value raw parameters
      * @return array
-     * @since 2.0.0
      */
     protected function getParameters($value)
     {
@@ -326,7 +304,6 @@ protected function getParameters($value)
      * @param string $default default value
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function getVariable($value, $default = '{no_value_defined}')
     {
@@ -381,7 +358,6 @@ protected function getVariable($value, $default = '{no_value_defined}')
      *
      * @param array $stack
      * @return array
-     * @since 2.0.0
      */
     protected function getStackArgs($stack)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Template/Simple.php b/lib/internal/Magento/Framework/Filter/Template/Simple.php
index 8c8c82af09402..c92ae4b0390b3 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Simple.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Simple.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Filter\Template\Simple
  *
- * @since 2.0.0
  */
 class Simple extends \Magento\Framework\DataObject implements \Zend_Filter_Interface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_startTag = '{{';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_endTag = '}}';
 
@@ -30,7 +27,6 @@ class Simple extends \Magento\Framework\DataObject implements \Zend_Filter_Inter
      * @param string $start
      * @param string $end
      * @return $this
-     * @since 2.0.0
      */
     public function setTags($start, $end)
     {
@@ -44,7 +40,6 @@ public function setTags($start, $end)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
index b80c9bddebdf1..20fd7c2669c95 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php
@@ -7,7 +7,6 @@
 
 /**
  * Template constructions tokenizer
- * @since 2.0.0
  */
 abstract class AbstractTokenizer
 {
@@ -15,7 +14,6 @@ abstract class AbstractTokenizer
      * Current index in string
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_currentIndex;
 
@@ -23,7 +21,6 @@ abstract class AbstractTokenizer
      * String for tokenize
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_string;
 
@@ -33,7 +30,6 @@ abstract class AbstractTokenizer
      * If index out of bounds returns false
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function next()
     {
@@ -51,7 +47,6 @@ public function next()
      * If index out of bounds returns false
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function prev()
     {
@@ -70,7 +65,6 @@ public function prev()
      *
      * @param int $distance number of characters to backtrack
      * @return bool
-     * @since 2.0.0
      */
     public function back($distance)
     {
@@ -86,7 +80,6 @@ public function back($distance)
      * Return current char
      *
      * @return string
-     * @since 2.0.0
      */
     public function char()
     {
@@ -98,7 +91,6 @@ public function char()
      *
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setString($value)
     {
@@ -110,7 +102,6 @@ public function setString($value)
      * Move char index to begin of string
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -121,7 +112,6 @@ public function reset()
      * Return true if current char is white-space
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isWhiteSpace()
     {
@@ -132,7 +122,6 @@ public function isWhiteSpace()
      * Tokenize string
      *
      * @return array
-     * @since 2.0.0
      */
     abstract public function tokenize();
 }
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
index 5886a249b88bf..624d6107bb6b8 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
@@ -7,7 +7,6 @@
 
 /**
  * Template constructions parameters tokenizer
- * @since 2.0.0
  */
 class Parameter extends \Magento\Framework\Filter\Template\Tokenizer\AbstractTokenizer
 {
@@ -15,7 +14,6 @@ class Parameter extends \Magento\Framework\Filter\Template\Tokenizer\AbstractTok
      * Tokenize string and return getted parameters
      *
      * @return array
-     * @since 2.0.0
      */
     public function tokenize()
     {
@@ -39,7 +37,6 @@ public function tokenize()
      *
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
index a41e03831f8da..67c2d17abe208 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
@@ -7,7 +7,6 @@
 
 /**
  * Template constructions variables tokenizer
- * @since 2.0.0
  */
 class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractTokenizer
 {
@@ -15,7 +14,6 @@ class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractToke
      * Internal counter used to keep track of how deep in array parsing we are
      *
      * @var int
-     * @since 2.0.0
      */
     protected $arrayDepth = 0;
 
@@ -24,7 +22,6 @@ class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractToke
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function tokenize()
     {
@@ -70,7 +67,6 @@ public function tokenize()
      * Get string value for method args
      *
      * @return string
-     * @since 2.0.0
      */
     public function getString()
     {
@@ -107,7 +103,6 @@ public function getString()
      * Get array member key or return false if none present
      *
      * @return bool|string
-     * @since 2.0.0
      */
     public function getMemberKey()
     {
@@ -162,7 +157,6 @@ public function getMemberKey()
      * ]]
      *
      * @return array
-     * @since 2.0.0
      */
     public function getArray()
     {
@@ -205,7 +199,6 @@ public function getArray()
      * Return the internal array depth counter
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getArrayDepth()
     {
@@ -216,7 +209,6 @@ protected function getArrayDepth()
      * Increment the internal array depth counter
      *
      * @return void
-     * @since 2.0.0
      */
     protected function incArrayDepth()
     {
@@ -229,7 +221,6 @@ protected function incArrayDepth()
      * If depth is already 0 do nothing
      *
      * @return void
-     * @since 2.0.0
      */
     protected function decArrayDepth()
     {
@@ -243,7 +234,6 @@ protected function decArrayDepth()
      * Return true if current char is a number
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isNumeric()
     {
@@ -254,7 +244,6 @@ public function isNumeric()
      * Return true if current char is quote or apostrophe
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isQuote()
     {
@@ -265,7 +254,6 @@ public function isQuote()
      * Retrun true if current char is opening boundary for an array
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isArray()
     {
@@ -276,7 +264,6 @@ public function isArray()
      * Return true if current char is closing boundary for string
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStringBreak()
     {
@@ -292,7 +279,6 @@ public function isStringBreak()
      * Return array of arguments for method
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMethodArgs()
     {
@@ -316,7 +302,6 @@ public function getMethodArgs()
      * Return number value for method args
      *
      * @return float
-     * @since 2.0.0
      */
     public function getNumber()
     {
diff --git a/lib/internal/Magento/Framework/Filter/Translit.php b/lib/internal/Magento/Framework/Filter/Translit.php
index 263a0a37d2a64..7a84a6e33af18 100644
--- a/lib/internal/Magento/Framework/Filter/Translit.php
+++ b/lib/internal/Magento/Framework/Filter/Translit.php
@@ -9,7 +9,6 @@
  * Translit filter
  *
  * Process string based on convertation table
- * @since 2.0.0
  */
 class Translit implements \Zend_Filter_Interface
 {
@@ -17,7 +16,6 @@ class Translit implements \Zend_Filter_Interface
      * Symbol convert table
      *
      * @var array
-     * @since 2.0.0
      */
     protected $convertTable = [
         '&amp;' => 'and',
@@ -405,7 +403,6 @@ class Translit implements \Zend_Filter_Interface
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
     {
@@ -421,7 +418,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * Get chars convertation table
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getConvertTable()
     {
@@ -433,7 +429,6 @@ protected function getConvertTable()
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function filter($string)
     {
diff --git a/lib/internal/Magento/Framework/Filter/TranslitUrl.php b/lib/internal/Magento/Framework/Filter/TranslitUrl.php
index 6595866e9e6c4..a24ccab4c5b22 100644
--- a/lib/internal/Magento/Framework/Filter/TranslitUrl.php
+++ b/lib/internal/Magento/Framework/Filter/TranslitUrl.php
@@ -9,7 +9,6 @@
  * Url compatible translit filter
  *
  * Process string based on convertation table
- * @since 2.0.0
  */
 class TranslitUrl extends Translit
 {
@@ -18,7 +17,6 @@ class TranslitUrl extends Translit
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function filter($string)
     {
diff --git a/lib/internal/Magento/Framework/Filter/Truncate.php b/lib/internal/Magento/Framework/Filter/Truncate.php
index a7366ea16992b..fd4fbe9910427 100644
--- a/lib/internal/Magento/Framework/Filter/Truncate.php
+++ b/lib/internal/Magento/Framework/Filter/Truncate.php
@@ -10,37 +10,31 @@
  *
  * Truncate a string to a certain length if necessary, appending the $etc string.
  * $remainder will contain the string that has been replaced with $etc.
- * @since 2.0.0
  */
 class Truncate implements \Zend_Filter_Interface
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $length;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $etc;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $remainder;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $breakWords;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
@@ -50,7 +44,6 @@ class Truncate implements \Zend_Filter_Interface
      * @param string $etc
      * @param string &$remainder
      * @param bool $breakWords
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
@@ -71,7 +64,6 @@ public function __construct(
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function filter($string)
     {
diff --git a/lib/internal/Magento/Framework/Filter/ZendFactory.php b/lib/internal/Magento/Framework/Filter/ZendFactory.php
index 791ae5ff32e27..3adfa5e2a6f35 100644
--- a/lib/internal/Magento/Framework/Filter/ZendFactory.php
+++ b/lib/internal/Magento/Framework/Filter/ZendFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Zend filter factory
- * @since 2.0.0
  */
 class ZendFactory extends AbstractFactory
 {
@@ -15,7 +14,6 @@ class ZendFactory extends AbstractFactory
      * Set of filters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $invokableClasses = [
         'stripTags' => 'Zend_Filter_StripTags',
@@ -65,7 +63,6 @@ class ZendFactory extends AbstractFactory
      * Whether or not to share by default; default to false
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $shareByDefault = false;
 
@@ -73,7 +70,6 @@ class ZendFactory extends AbstractFactory
      * Shared instances, by default is shared
      *
      * @var array
-     * @since 2.0.0
      */
     protected $shared = [
         'Zend_Filter_StripNewlines' => true,
diff --git a/lib/internal/Magento/Framework/Flag.php b/lib/internal/Magento/Framework/Flag.php
index 3452b9cab038c..0143b48f321f4 100644
--- a/lib/internal/Magento/Framework/Flag.php
+++ b/lib/internal/Magento/Framework/Flag.php
@@ -16,7 +16,6 @@
  * @method \Magento\Framework\Flag setState(int $value)
  * @method string getLastUpdate()
  * @method \Magento\Framework\Flag setLastUpdate(string $value)
- * @since 2.0.0
  */
 class Flag extends Model\AbstractModel
 {
@@ -24,7 +23,6 @@ class Flag extends Model\AbstractModel
      * Flag code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_flagCode = null;
 
@@ -81,7 +79,6 @@ public function __construct(
      * Set flag_code if it is specified in arguments
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -96,7 +93,6 @@ protected function _construct()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -116,7 +112,6 @@ public function beforeSave()
      * Retrieve flag data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getFlagData()
     {
@@ -136,7 +131,6 @@ public function getFlagData()
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setFlagData($value)
     {
@@ -148,7 +142,6 @@ public function setFlagData($value)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function loadSelf()
     {
diff --git a/lib/internal/Magento/Framework/Flag/FlagResource.php b/lib/internal/Magento/Framework/Flag/FlagResource.php
index 1e0354feb5def..b6c37cb368e3d 100644
--- a/lib/internal/Magento/Framework/Flag/FlagResource.php
+++ b/lib/internal/Magento/Framework/Flag/FlagResource.php
@@ -7,7 +7,6 @@
 
 /**
  * Flag Resource model
- * @since 2.0.0
  */
 class FlagResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -15,7 +14,6 @@ class FlagResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
diff --git a/lib/internal/Magento/Framework/FlagFactory.php b/lib/internal/Magento/Framework/FlagFactory.php
index 5e512b9a201f5..6a35fe98e0bbe 100644
--- a/lib/internal/Magento/Framework/FlagFactory.php
+++ b/lib/internal/Magento/Framework/FlagFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Framework\Flag
- * @since 2.0.0
  */
 class FlagFactory
 {
@@ -15,7 +14,6 @@ class FlagFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class FlagFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class FlagFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Flag
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index 41923bc6be419..e7f4706154a2c 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\HTTP\Adapter\Curl
  *
- * @since 2.0.0
  */
 class Curl implements \Zend_Http_Client_Adapter_Interface
 {
@@ -22,7 +21,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * Parameters array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_config = [
         'protocols' => (CURLPROTO_HTTP
@@ -38,7 +36,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * Curl handle
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -46,7 +43,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * Allow parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedParams = [
         'timeout'      => CURLOPT_TIMEOUT,
@@ -66,7 +62,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * Array of CURL options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = [];
 
@@ -74,7 +69,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * Apply current configuration array to transport resource
      *
      * @return \Magento\Framework\HTTP\Adapter\Curl
-     * @since 2.0.0
      */
     protected function _applyConfig()
     {
@@ -95,7 +89,7 @@ protected function _applyConfig()
      * Get default options
      *
      * @return array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private function getDefaultConfig()
     {
@@ -113,7 +107,6 @@ private function getDefaultConfig()
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options = [])
     {
@@ -127,7 +120,6 @@ public function setOptions(array $options = [])
      * @param  int $option      the CURLOPT_* constants
      * @param  mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function addOption($option, $value)
     {
@@ -140,7 +132,6 @@ public function addOption($option, $value)
      *
      * @param array $config
      * @return $this
-     * @since 2.0.0
      */
     public function setConfig($config = [])
     {
@@ -158,7 +149,6 @@ public function setConfig($config = [])
      * @param boolean $secure
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function connect($host, $port = 80, $secure = false)
     {
@@ -175,7 +165,6 @@ public function connect($host, $port = 80, $secure = false)
      * @param string $body
      * @return string Request as text
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '')
     {
@@ -216,7 +205,6 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
      * Read response from server
      *
      * @return string
-     * @since 2.0.0
      */
     public function read()
     {
@@ -240,7 +228,6 @@ public function read()
      * Close the connection to the server
      *
      * @return $this
-     * @since 2.0.0
      */
     public function close()
     {
@@ -253,7 +240,6 @@ public function close()
      * Returns a cURL handle on success
      *
      * @return resource
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -267,7 +253,6 @@ protected function _getResource()
      * Get last error number
      *
      * @return int
-     * @since 2.0.0
      */
     public function getErrno()
     {
@@ -278,7 +263,6 @@ public function getErrno()
      * Get string with last error for the current session
      *
      * @return string
-     * @since 2.0.0
      */
     public function getError()
     {
@@ -290,7 +274,6 @@ public function getError()
      *
      * @param int $opt CURLINFO option
      * @return mixed
-     * @since 2.0.0
      */
     public function getInfo($opt = 0)
     {
@@ -303,7 +286,6 @@ public function getInfo($opt = 0)
      * @param array $urls
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     public function multiRequest($urls, $options = [])
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/FileTransferFactory.php b/lib/internal/Magento/Framework/HTTP/Adapter/FileTransferFactory.php
index efc72b86b183f..f8b90d75e99e3 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/FileTransferFactory.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/FileTransferFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\HTTP\Adapter\FileTransferFactory
  *
- * @since 2.0.0
  */
 class FileTransferFactory
 {
@@ -17,7 +16,6 @@ class FileTransferFactory
      *
      * @param array $options
      * @return \Zend_File_Transfer_Adapter_Http
-     * @since 2.0.0
      */
     public function create(array $options = [])
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Authentication.php b/lib/internal/Magento/Framework/HTTP/Authentication.php
index fcf01686f76f1..24a21dd1e05b2 100644
--- a/lib/internal/Magento/Framework/HTTP/Authentication.php
+++ b/lib/internal/Magento/Framework/HTTP/Authentication.php
@@ -7,7 +7,6 @@
 
 /**
  * Library for working with HTTP authentication
- * @since 2.0.0
  */
 class Authentication
 {
@@ -15,7 +14,6 @@ class Authentication
      * Request object
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -23,14 +21,12 @@ class Authentication
      * Response object
      *
      * @var \Magento\Framework\App\ResponseInterface
-     * @since 2.0.0
      */
     protected $response;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $httpRequest
      * @param \Magento\Framework\App\ResponseInterface $httpResponse
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $httpRequest,
@@ -46,7 +42,6 @@ public function __construct(
      * Returns plain array with 2 items: login and password respectively
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCredentials()
     {
@@ -86,7 +81,6 @@ public function getCredentials()
      *
      * @param string $realm
      * @return void
-     * @since 2.0.0
      */
     public function setAuthenticationFailed($realm)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
index 7c7c08fe433a4..465b3b57f36f9 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Curl implements \Magento\Framework\HTTP\ClientInterface
 {
@@ -24,84 +23,72 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
     /**
      * Hostname
      * @var string
-     * @since 2.0.0
      */
     protected $_host = 'localhost';
 
     /**
      * Port
      * @var int
-     * @since 2.0.0
      */
     protected $_port = 80;
 
     /**
      * Stream resource
      * @var object
-     * @since 2.0.0
      */
     protected $_sock = null;
 
     /**
      * Request headers
      * @var array
-     * @since 2.0.0
      */
     protected $_headers = [];
 
     /**
      * Fields for POST method - hash
      * @var array
-     * @since 2.0.0
      */
     protected $_postFields = [];
 
     /**
      * Request cookies
      * @var array
-     * @since 2.0.0
      */
     protected $_cookies = [];
 
     /**
      * Response headers
      * @var array
-     * @since 2.0.0
      */
     protected $_responseHeaders = [];
 
     /**
      * Response body
      * @var string
-     * @since 2.0.0
      */
     protected $_responseBody = '';
 
     /**
      * Response status
      * @var int
-     * @since 2.0.0
      */
     protected $_responseStatus = 0;
 
     /**
      * Request timeout
      * @var int type
-     * @since 2.0.0
      */
     protected $_timeout = 300;
 
     /**
      * TODO
      * @var int
-     * @since 2.0.0
      */
     protected $_redirectCount = 0;
 
     /**
      * Curl
      * @var resource
-     * @since 2.0.0
      */
     protected $_ch;
 
@@ -110,7 +97,6 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
      * Are applied before curl_exec
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_curlUserOptions = [];
 
@@ -118,7 +104,6 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
      * Header count, used while parsing headers
      * in CURL callback function
      * @var int
-     * @since 2.0.0
      */
     protected $_headerCount = 0;
 
@@ -127,7 +112,6 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
      *
      * @param int $value
      * @return void
-     * @since 2.0.0
      */
     public function setTimeout($value)
     {
@@ -136,7 +120,6 @@ public function setTimeout($value)
 
     /**
      * @param int|null $sslVersion
-     * @since 2.0.0
      */
     public function __construct($sslVersion = null)
     {
@@ -148,7 +131,6 @@ public function __construct($sslVersion = null)
      *
      * @param array $headers
      * @return void
-     * @since 2.0.0
      */
     public function setHeaders($headers)
     {
@@ -161,7 +143,6 @@ public function setHeaders($headers)
      * @param string $name name, ex. "Location"
      * @param string $value value ex. "http://google.com"
      * @return void
-     * @since 2.0.0
      */
     public function addHeader($name, $value)
     {
@@ -173,7 +154,6 @@ public function addHeader($name, $value)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeHeader($name)
     {
@@ -187,7 +167,6 @@ public function removeHeader($name)
      * @param string $login username
      * @param string $pass password
      * @return void
-     * @since 2.0.0
      */
     public function setCredentials($login, $pass)
     {
@@ -201,7 +180,6 @@ public function setCredentials($login, $pass)
      * @param string $name
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function addCookie($name, $value)
     {
@@ -213,7 +191,6 @@ public function addCookie($name, $value)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeCookie($name)
     {
@@ -225,7 +202,6 @@ public function removeCookie($name)
      *
      * @param array $cookies
      * @return void
-     * @since 2.0.0
      */
     public function setCookies($cookies)
     {
@@ -235,7 +211,6 @@ public function setCookies($cookies)
     /**
      * Clear cookies
      * @return void
-     * @since 2.0.0
      */
     public function removeCookies()
     {
@@ -247,7 +222,6 @@ public function removeCookies()
      *
      * @param string $uri uri relative to host, ex. "/index.php"
      * @return void
-     * @since 2.0.0
      */
     public function get($uri)
     {
@@ -265,7 +239,6 @@ public function get($uri)
      * @return void
      *
      * @see \Magento\Framework\HTTP\Client#post($uri, $params)
-     * @since 2.0.0
      */
     public function post($uri, $params)
     {
@@ -276,7 +249,6 @@ public function post($uri, $params)
      * Get response headers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders()
     {
@@ -287,7 +259,6 @@ public function getHeaders()
      * Get response body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBody()
     {
@@ -298,7 +269,6 @@ public function getBody()
      * Get cookies response hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCookies()
     {
@@ -325,7 +295,6 @@ public function getCookies()
      * Get cookies array with details
      * (domain, expire time etc)
      * @return array
-     * @since 2.0.0
      */
     public function getCookiesFull()
     {
@@ -362,7 +331,6 @@ public function getCookiesFull()
      * @see lib\Magento\Framework\HTTP\Client#getStatus()
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -381,7 +349,6 @@ public function getStatus()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function makeRequest($method, $uri, $params = [])
     {
@@ -447,7 +414,6 @@ protected function makeRequest($method, $uri, $params = [])
      * @param string $string
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function doError($string)
     {
@@ -462,7 +428,6 @@ public function doError($string)
      * @return int
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function parseHeaders($ch, $data)
     {
@@ -502,7 +467,6 @@ protected function parseHeaders($ch, $data)
      * @param string $name
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     protected function curlOption($name, $value)
     {
@@ -513,7 +477,6 @@ protected function curlOption($name, $value)
      * Set curl options array directly
      * @param array $arr
      * @return void
-     * @since 2.0.0
      */
     protected function curlOptions($arr)
     {
@@ -524,7 +487,6 @@ protected function curlOptions($arr)
      * Set CURL options overrides array
      * @param array $arr
      * @return void
-     * @since 2.0.0
      */
     public function setOptions($arr)
     {
@@ -537,7 +499,6 @@ public function setOptions($arr)
      * @param string $name
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setOption($name, $value)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Socket.php b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
index 11fcfe3fb5b57..8157081139788 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Socket.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
@@ -16,84 +16,72 @@
  */
 /**
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
- * @since 2.0.0
  */
 class Socket implements \Magento\Framework\HTTP\ClientInterface
 {
     /**
      * Hostname
      * @var string
-     * @since 2.0.0
      */
     private $_host = 'localhost';
 
     /**
      * Port
      * @var int
-     * @since 2.0.0
      */
     private $_port = 80;
 
     /**
      * Stream resource
      * @var object
-     * @since 2.0.0
      */
     private $_sock = null;
 
     /**
      * Request headers
      * @var array
-     * @since 2.0.0
      */
     private $_headers = [];
 
     /**
      * Fields for POST method - hash
      * @var array
-     * @since 2.0.0
      */
     private $_postFields = [];
 
     /**
      * Request cookies
      * @var array
-     * @since 2.0.0
      */
     private $_cookies = [];
 
     /**
      * Response headers
      * @var array
-     * @since 2.0.0
      */
     private $_responseHeaders = [];
 
     /**
      * Response body
      * @var string
-     * @since 2.0.0
      */
     private $_responseBody = '';
 
     /**
      * Response status
      * @var int
-     * @since 2.0.0
      */
     private $_responseStatus = 0;
 
     /**
      * Request timeout
      * @var int
-     * @since 2.0.0
      */
     private $_timeout = 300;
 
     /**
      * TODO
      * @var int
-     * @since 2.0.0
      */
     private $_redirectCount = 0;
 
@@ -102,7 +90,6 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
      *
      * @param int $value
      * @return void
-     * @since 2.0.0
      */
     public function setTimeout($value)
     {
@@ -114,7 +101,6 @@ public function setTimeout($value)
      *
      * @param string $host
      * @param int $port
-     * @since 2.0.0
      */
     public function __construct($host = null, $port = 80)
     {
@@ -129,7 +115,6 @@ public function __construct($host = null, $port = 80)
      * @param string $host
      * @param int $port
      * @return void
-     * @since 2.0.0
      */
     public function connect($host, $port = 80)
     {
@@ -141,7 +126,6 @@ public function connect($host, $port = 80)
      * Disconnect
      *
      * @return void
-     * @since 2.0.0
      */
     public function disconnect()
     {
@@ -152,7 +136,6 @@ public function disconnect()
      * Set headers from hash
      * @param array $headers
      * @return void
-     * @since 2.0.0
      */
     public function setHeaders($headers)
     {
@@ -165,7 +148,6 @@ public function setHeaders($headers)
      * @param string $name name, ex. "Location"
      * @param string $value value ex. "http://google.com"
      * @return void
-     * @since 2.0.0
      */
     public function addHeader($name, $value)
     {
@@ -177,7 +159,6 @@ public function addHeader($name, $value)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeHeader($name)
     {
@@ -191,7 +172,6 @@ public function removeHeader($name)
      * @param string $login username
      * @param string $pass password
      * @return void
-     * @since 2.0.0
      */
     public function setCredentials($login, $pass)
     {
@@ -205,7 +185,6 @@ public function setCredentials($login, $pass)
      * @param string $name
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function addCookie($name, $value)
     {
@@ -217,7 +196,6 @@ public function addCookie($name, $value)
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     public function removeCookie($name)
     {
@@ -229,7 +207,6 @@ public function removeCookie($name)
      *
      * @param array $cookies
      * @return void
-     * @since 2.0.0
      */
     public function setCookies($cookies)
     {
@@ -240,7 +217,6 @@ public function setCookies($cookies)
      * Clear cookies
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeCookies()
     {
@@ -252,7 +228,6 @@ public function removeCookies()
      *
      * @param string $uri full uri path
      * @return void
-     * @since 2.0.0
      */
     public function get($uri)
     {
@@ -266,7 +241,6 @@ public function get($uri)
      * @param string $uri ex. http://google.com/index.php?a=b
      * @return string ex. /index.php?a=b
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function parseUrl($uri)
     {
@@ -301,7 +275,6 @@ protected function parseUrl($uri)
      * @param string $uri
      * @param array $params
      * @return void
-     * @since 2.0.0
      */
     public function post($uri, $params)
     {
@@ -312,7 +285,6 @@ public function post($uri, $params)
      * Get response headers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders()
     {
@@ -323,7 +295,6 @@ public function getHeaders()
      * Get response body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBody()
     {
@@ -334,7 +305,6 @@ public function getBody()
      * Get cookies response hash
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCookies()
     {
@@ -361,7 +331,6 @@ public function getCookies()
      * Get cookies array with details
      * (domain, expire time etc)
      * @return array
-     * @since 2.0.0
      */
     public function getCookiesFull()
     {
@@ -397,7 +366,6 @@ public function getCookiesFull()
      * Process response headers
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processResponseHeaders()
     {
@@ -431,7 +399,6 @@ protected function processResponseHeaders()
      * Process response body
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processResponseBody()
     {
@@ -447,7 +414,6 @@ protected function processResponseBody()
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function processResponse()
     {
@@ -470,7 +436,6 @@ protected function processResponse()
      * Process redirect
      *
      * @return void
-     * @since 2.0.0
      */
     protected function processRedirect()
     {
@@ -482,7 +447,6 @@ protected function processRedirect()
      * @see \Magento\Framework\HTTP\Client#getStatus()
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStatus()
     {
@@ -495,7 +459,6 @@ public function getStatus()
      * @param string $uri
      * @param array $params
      * @return void
-     * @since 2.0.0
      */
     protected function makeRequest($method, $uri, $params = [])
     {
@@ -532,7 +495,6 @@ protected function makeRequest($method, $uri, $params = [])
      * @param string $string
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function doError($string)
     {
@@ -543,7 +505,6 @@ public function doError($string)
      * Convert headers hash to string
      * @param array $append
      * @return string
-     * @since 2.0.0
      */
     protected function headersToString($append = [])
     {
@@ -564,7 +525,6 @@ protected function headersToString($append = [])
      * @param array $arr
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setOptions($arr)
     {
@@ -578,7 +538,6 @@ public function setOptions($arr)
      * @param string $value
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setOption($name, $value)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/ClientFactory.php b/lib/internal/Magento/Framework/HTTP/ClientFactory.php
index d7e5f331557f9..06139b75c39d5 100644
--- a/lib/internal/Magento/Framework/HTTP/ClientFactory.php
+++ b/lib/internal/Magento/Framework/HTTP/ClientFactory.php
@@ -10,7 +10,6 @@
  * Factory for HTTP client classes
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class ClientFactory
 {
@@ -18,7 +17,6 @@ class ClientFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -26,7 +24,6 @@ class ClientFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -35,7 +32,6 @@ class ClientFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param array $data
      * @return ClientInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/HTTP/ClientInterface.php b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
index 117228ca65d69..643f298ef4c45 100644
--- a/lib/internal/Magento/Framework/HTTP/ClientInterface.php
+++ b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
@@ -10,7 +10,6 @@
  * Interface for HTTP clients
  *
  * @api
- * @since 2.0.0
  */
 interface ClientInterface
 {
@@ -19,7 +18,6 @@ interface ClientInterface
      *
      * @param int $value value in seconds
      * @return void
-     * @since 2.0.0
      */
     public function setTimeout($value);
 
@@ -28,7 +26,6 @@ public function setTimeout($value);
      *
      * @param array $headers an array of header names as keys and header values as values
      * @return void
-     * @since 2.0.0
      */
     public function setHeaders($headers);
 
@@ -38,7 +35,6 @@ public function setHeaders($headers);
      * @param string $name name of the HTTP header
      * @param string $value value of the HTTP header
      * @return void
-     * @since 2.0.0
      */
     public function addHeader($name, $value);
 
@@ -47,7 +43,6 @@ public function addHeader($name, $value);
      *
      * @param string $name name of the HTTP header
      * @return void
-     * @since 2.0.0
      */
     public function removeHeader($name);
 
@@ -57,7 +52,6 @@ public function removeHeader($name);
      * @param string $login user identity/name
      * @param string $pass user password
      * @return void
-     * @since 2.0.0
      */
     public function setCredentials($login, $pass);
 
@@ -67,7 +61,6 @@ public function setCredentials($login, $pass);
      * @param string $name name of the cookie
      * @param string $value value of the cookie
      * @return void
-     * @since 2.0.0
      */
     public function addCookie($name, $value);
 
@@ -76,7 +69,6 @@ public function addCookie($name, $value);
      *
      * @param string $name name of the cookie
      * @return void
-     * @since 2.0.0
      */
     public function removeCookie($name);
 
@@ -85,7 +77,6 @@ public function removeCookie($name);
      *
      * @param array $cookies an array of cookies with cookie names as keys and cookie values as value
      * @return void
-     * @since 2.0.0
      */
     public function setCookies($cookies);
 
@@ -93,7 +84,6 @@ public function setCookies($cookies);
      * Remove cookies from request
      *
      * @return void
-     * @since 2.0.0
      */
     public function removeCookies();
 
@@ -102,7 +92,6 @@ public function removeCookies();
      *
      * @param string $uri full uri
      * @return array
-     * @since 2.0.0
      */
     public function get($uri);
 
@@ -112,7 +101,6 @@ public function get($uri);
      * @param string $uri full uri
      * @param array $params POST fields array
      * @return void
-     * @since 2.0.0
      */
     public function post($uri, $params);
 
@@ -120,7 +108,6 @@ public function post($uri, $params);
      * Get response headers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders();
 
@@ -128,7 +115,6 @@ public function getHeaders();
      * Get response body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBody();
 
@@ -136,7 +122,6 @@ public function getBody();
      * Get response status code
      *
      * @return int
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -144,7 +129,6 @@ public function getStatus();
      * Get response cookies (k=>v)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCookies();
 
@@ -154,7 +138,6 @@ public function getCookies();
      * @param string $key
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setOption($key, $value);
 
@@ -163,7 +146,6 @@ public function setOption($key, $value);
      *
      * @param array $arr
      * @return void
-     * @since 2.0.0
      */
     public function setOptions($arr);
 }
diff --git a/lib/internal/Magento/Framework/HTTP/Header.php b/lib/internal/Magento/Framework/HTTP/Header.php
index 287a7c81bbb68..1dbeb8ccc183b 100644
--- a/lib/internal/Magento/Framework/HTTP/Header.php
+++ b/lib/internal/Magento/Framework/HTTP/Header.php
@@ -8,7 +8,6 @@
 
 /**
  * Library for working with HTTP headers
- * @since 2.0.0
  */
 class Header
 {
@@ -16,20 +15,17 @@ class Header
      * Request object
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_converter;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $httpRequest
      * @param \Magento\Framework\Stdlib\StringUtils $converter
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $httpRequest,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getHttpHost($clean = true)
     {
@@ -56,7 +51,6 @@ public function getHttpHost($clean = true)
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getHttpUserAgent($clean = true)
     {
@@ -68,7 +62,6 @@ public function getHttpUserAgent($clean = true)
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getHttpAcceptLanguage($clean = true)
     {
@@ -80,7 +73,6 @@ public function getHttpAcceptLanguage($clean = true)
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getHttpAcceptCharset($clean = true)
     {
@@ -92,7 +84,6 @@ public function getHttpAcceptCharset($clean = true)
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getHttpReferer($clean = true)
     {
@@ -105,7 +96,6 @@ public function getHttpReferer($clean = true)
      *
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     public function getRequestUri($clean = false)
     {
@@ -122,7 +112,6 @@ public function getRequestUri($clean = false)
      * @param string $var
      * @param boolean $clean clean non UTF-8 characters
      * @return string
-     * @since 2.0.0
      */
     protected function _getHttpCleanValue($var, $clean = true)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
index a2a34bb6edce9..3b2f79eecb370 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -7,7 +7,6 @@
 
 /**
  * Library for working with client ip address
- * @since 2.0.0
  */
 class RemoteAddress
 {
@@ -15,7 +14,6 @@ class RemoteAddress
      * Request object
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -23,20 +21,17 @@ class RemoteAddress
      * Remote address cache
      *
      * @var string
-     * @since 2.0.0
      */
     protected $remoteAddress;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $alternativeHeaders;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $httpRequest
      * @param array $alternativeHeaders
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\RequestInterface $httpRequest, array $alternativeHeaders = [])
     {
@@ -49,7 +44,6 @@ public function __construct(\Magento\Framework\App\RequestInterface $httpRequest
      *
      * @param bool $ipToLong converting IP to long format
      * @return string IPv4|long
-     * @since 2.0.0
      */
     public function getRemoteAddress($ipToLong = false)
     {
@@ -82,7 +76,6 @@ public function getRemoteAddress($ipToLong = false)
      * Returns internet host name corresponding to remote server
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getRemoteHost()
     {
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
index e7404fcca3c52..928def1146f84 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Request extends \Zend\Http\PhpEnvironment\Request
 {
@@ -31,19 +30,16 @@ class Request extends \Zend\Http\PhpEnvironment\Request
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $module;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $controller;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $action;
 
@@ -51,13 +47,11 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      * PATH_INFO
      *
      * @var string
-     * @since 2.0.0
      */
     protected $pathInfo = '';
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $requestString = '';
 
@@ -65,13 +59,11 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      * Request parameters
      *
      * @var array
-     * @since 2.0.0
      */
     protected $params = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $aliases = [];
 
@@ -79,7 +71,6 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      * Has the action been dispatched?
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $dispatched = false;
 
@@ -87,19 +78,16 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      * Flag for whether the request is forwarded or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $forwarded;
 
     /**
      * @var CookieReaderInterface
-     * @since 2.0.0
      */
     protected $cookieReader;
 
     /**
      * @var StringUtils
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -121,7 +109,6 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      * @param CookieReaderInterface $cookieReader
      * @param StringUtils $converter
      * @param UriInterface|string|null $uri
-     * @since 2.0.0
      */
     public function __construct(
         CookieReaderInterface $cookieReader,
@@ -152,7 +139,6 @@ public function __construct(
      * Retrieve the module name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModuleName()
     {
@@ -164,7 +150,6 @@ public function getModuleName()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setModuleName($value)
     {
@@ -176,7 +161,6 @@ public function setModuleName($value)
      * Retrieve the controller name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getControllerName()
     {
@@ -188,7 +172,6 @@ public function getControllerName()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setControllerName($value)
     {
@@ -200,7 +183,6 @@ public function setControllerName($value)
      * Retrieve the action name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionName()
     {
@@ -212,7 +194,6 @@ public function getActionName()
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setActionName($value)
     {
@@ -226,7 +207,6 @@ public function setActionName($value)
      * directly from $_SERVER due to cross-platform differences.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPathInfo()
     {
@@ -241,7 +221,6 @@ public function getPathInfo()
      *
      * @param string|null $pathInfo
      * @return $this
-     * @since 2.0.0
      */
     public function setPathInfo($pathInfo = null)
     {
@@ -274,7 +253,6 @@ public function setPathInfo($pathInfo = null)
      * Get request string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestString()
     {
@@ -288,7 +266,6 @@ public function getRequestString()
      *
      * @param string $name
      * @return string|null Returns null when no alias exists
-     * @since 2.0.0
      */
     public function getAlias($name)
     {
@@ -307,7 +284,6 @@ public function getAlias($name)
      * @param string $name
      * @param string $target
      * @return $this
-     * @since 2.0.0
      */
     public function setAlias($name, $target)
     {
@@ -321,7 +297,6 @@ public function setAlias($name, $target)
      * @param string $key
      * @param mixed $default Default value to use if key not found
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($key, $default = null)
     {
@@ -345,7 +320,6 @@ public function getParam($key, $default = null)
      * @param string $key
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setParam($key, $value)
     {
@@ -363,7 +337,6 @@ public function setParam($key, $value)
      * Get all action parameters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParams()
     {
@@ -384,7 +357,6 @@ public function getParams()
      *
      * @param array $array
      * @return $this
-     * @since 2.0.0
      */
     public function setParams(array $array)
     {
@@ -398,7 +370,6 @@ public function setParams(array $array)
      * Unset all user parameters
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearParams()
     {
@@ -410,7 +381,6 @@ public function clearParams()
      * Get the request URI scheme
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScheme()
     {
@@ -422,7 +392,6 @@ public function getScheme()
      *
      * @param boolean $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setDispatched($flag = true)
     {
@@ -434,7 +403,6 @@ public function setDispatched($flag = true)
      * Determine if the request has been dispatched
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isDispatched()
     {
@@ -445,7 +413,6 @@ public function isDispatched()
      * Is https secure request
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSecure()
     {
@@ -533,7 +500,6 @@ protected function initialRequestSecure($offLoaderHeader)
      * @param string|null $name
      * @param string|null $default The default value to return if no value could be found for the given $name.
      * @return string|null
-     * @since 2.0.0
      */
     public function getCookie($name = null, $default = null)
     {
@@ -546,7 +512,6 @@ public function getCookie($name = null, $default = null)
      * @param string $name
      * @param mixed $default
      * @return mixed|ParametersInterface
-     * @since 2.0.0
      */
     public function getServerValue($name = null, $default = null)
     {
@@ -563,7 +528,6 @@ public function getServerValue($name = null, $default = null)
      * @param string $name
      * @param mixed $default
      * @return mixed|ParametersInterface
-     * @since 2.0.0
      */
     public function getQueryValue($name = null, $default = null)
     {
@@ -580,7 +544,6 @@ public function getQueryValue($name = null, $default = null)
      * @param string $name
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setQueryValue($name, $value = null)
     {
@@ -600,7 +563,6 @@ public function setQueryValue($name, $value = null)
      * @param string $name
      * @param mixed $default
      * @return mixed|ParametersInterface
-     * @since 2.0.0
      */
     public function getPostValue($name = null, $default = null)
     {
@@ -617,7 +579,6 @@ public function getPostValue($name = null, $default = null)
      * @param string|array $name
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setPostValue($name, $value = null)
     {
@@ -636,7 +597,6 @@ public function setPostValue($name, $value = null)
      * @see http://msdn.microsoft.com/en-us/library/system.web.httprequest.item.aspx
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function __get($key)
     {
@@ -675,7 +635,6 @@ public function __get($key)
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function get($key)
     {
@@ -687,7 +646,6 @@ public function get($key)
      *
      * @param string $key
      * @return boolean
-     * @since 2.0.0
      */
     public function __isset($key)
     {
@@ -720,7 +678,6 @@ public function __isset($key)
      *
      * @param string $key
      * @return boolean
-     * @since 2.0.0
      */
     public function has($key)
     {
@@ -733,7 +690,6 @@ public function has($key)
      * @param string $name Header name to retrieve.
      * @param mixed|null $default Default value to use when the requested header is missing.
      * @return bool|HeaderInterface
-     * @since 2.0.0
      */
     public function getHeader($name, $default = false)
     {
@@ -751,7 +707,6 @@ public function getHeader($name, $default = false)
      * @return string
      *
      * @todo getHttpHost should return only string (currently method return boolean value too)
-     * @since 2.0.0
      */
     public function getHttpHost($trimPort = true)
     {
@@ -772,7 +727,6 @@ public function getHttpHost($trimPort = true)
      *
      * @param  boolean $checkProxy
      * @return string
-     * @since 2.0.0
      */
     public function getClientIp($checkProxy = true)
     {
@@ -790,7 +744,6 @@ public function getClientIp($checkProxy = true)
      * Retrieve only user params
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUserParams()
     {
@@ -803,7 +756,6 @@ public function getUserParams()
      * @param string $key
      * @param string $default Default value to use if key not found
      * @return mixed
-     * @since 2.0.0
      */
     public function getUserParam($key, $default = null)
     {
@@ -818,7 +770,6 @@ public function getUserParam($key, $default = null)
      *
      * @param string $requestUri
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestUri($requestUri = null)
     {
@@ -841,7 +792,6 @@ public function setRequestUri($requestUri = null)
      * Get base url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -853,7 +803,6 @@ public function getBaseUrl()
     /**
      * @return bool
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function isForwarded()
     {
@@ -864,7 +813,6 @@ public function isForwarded()
      * @param bool $forwarded
      * @return $this
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function setForwarded($forwarded)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index 116ef32cabd2d..6a01d4022fecd 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -10,20 +10,17 @@
 /**
  * Class \Magento\Framework\HTTP\PhpEnvironment\Response
  *
- * @since 2.0.0
  */
 class Response extends \Zend\Http\PhpEnvironment\Response implements \Magento\Framework\App\Response\HttpInterface
 {
     /**
      * Flag; is this response a redirect?
      * @var boolean
-     * @since 2.0.0
      */
     protected $isRedirect = false;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHeader($name)
     {
@@ -40,7 +37,6 @@ public function getHeader($name)
      * requested.
      *
      * @return void
-     * @since 2.0.0
      */
     public function sendResponse()
     {
@@ -49,7 +45,6 @@ public function sendResponse()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function appendBody($value)
     {
@@ -60,7 +55,6 @@ public function appendBody($value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBody($value)
     {
@@ -71,7 +65,6 @@ public function setBody($value)
     /**
      * Clear body
      * @return $this
-     * @since 2.0.0
      */
     public function clearBody()
     {
@@ -81,7 +74,6 @@ public function clearBody()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setHeader($name, $value, $replace = false)
     {
@@ -97,7 +89,6 @@ public function setHeader($name, $value, $replace = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function clearHeader($name)
     {
@@ -114,7 +105,6 @@ public function clearHeader($name)
      * Remove all headers
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearHeaders()
     {
@@ -126,7 +116,6 @@ public function clearHeaders()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRedirect($url, $code = 302)
     {
@@ -138,7 +127,6 @@ public function setRedirect($url, $code = 302)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setHttpResponseCode($code)
     {
@@ -154,7 +142,6 @@ public function setHttpResponseCode($code)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setStatusHeader($httpCode, $version = null, $phrase = null)
     {
@@ -170,7 +157,6 @@ public function setStatusHeader($httpCode, $version = null, $phrase = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getHttpResponseCode()
     {
@@ -181,7 +167,6 @@ public function getHttpResponseCode()
      * Is this a redirect?
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isRedirect()
     {
@@ -190,7 +175,6 @@ public function isRedirect()
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function __sleep()
     {
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/ServerAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/ServerAddress.php
index 8d00b69b4e129..f432a20ded3f4 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/ServerAddress.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/ServerAddress.php
@@ -9,7 +9,6 @@
 
 /**
  * Library for working with server ip address
- * @since 2.0.0
  */
 class ServerAddress
 {
@@ -17,13 +16,11 @@ class ServerAddress
      * Request object
      *
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param RequestInterface $httpRequest
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $httpRequest)
     {
@@ -35,7 +32,6 @@ public function __construct(RequestInterface $httpRequest)
      *
      * @param bool $ipToLong converting IP to long format
      * @return string IPv4|long
-     * @since 2.0.0
      */
     public function getServerAddress($ipToLong = false)
     {
diff --git a/lib/internal/Magento/Framework/HTTP/ZendClient.php b/lib/internal/Magento/Framework/HTTP/ZendClient.php
index eda706d192f47..fe13391024c77 100644
--- a/lib/internal/Magento/Framework/HTTP/ZendClient.php
+++ b/lib/internal/Magento/Framework/HTTP/ZendClient.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\HTTP\ZendClient
  *
- * @since 2.0.0
  */
 class ZendClient extends \Zend_Http_Client
 {
@@ -22,14 +21,12 @@ class ZendClient extends \Zend_Http_Client
      * Internal flag to allow decoding of request body
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_urlEncodeBody = true;
 
     /**
      * @param null|\Zend_Uri_Http|string $uri
      * @param null|array $config
-     * @since 2.0.0
      */
     public function __construct($uri = null, $config = null)
     {
@@ -40,7 +37,6 @@ public function __construct($uri = null, $config = null)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function _trySetCurlAdapter()
     {
@@ -53,7 +49,6 @@ protected function _trySetCurlAdapter()
     /**
      * @param null|string $method
      * @return \Zend_Http_Response
-     * @since 2.0.0
      */
     public function request($method = null)
     {
@@ -66,7 +61,6 @@ public function request($method = null)
      *
      * @param bool $flag
      * @return \Magento\Framework\HTTP\ZendClient
-     * @since 2.0.0
      */
     public function setUrlEncodeBody($flag)
     {
@@ -79,7 +73,6 @@ public function setUrlEncodeBody($flag)
      * standard prepare functionality
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareBody()
     {
diff --git a/lib/internal/Magento/Framework/Image.php b/lib/internal/Magento/Framework/Image.php
index 2717599dd08a2..fa5a8268e3756 100644
--- a/lib/internal/Magento/Framework/Image.php
+++ b/lib/internal/Magento/Framework/Image.php
@@ -9,19 +9,16 @@
  * Image handler library
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @since 2.0.0
  */
 class Image
 {
     /**
      * @var Image\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $_adapter;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $_fileName;
 
@@ -30,7 +27,6 @@ class Image
      *
      * @param Image\Adapter\AdapterInterface $adapter
      * @param string|null $fileName
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Image\Adapter\AdapterInterface $adapter, $fileName = null)
     {
@@ -47,7 +43,6 @@ public function __construct(\Magento\Framework\Image\Adapter\AdapterInterface $a
      * @access public
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function open()
     {
@@ -65,7 +60,6 @@ public function open()
      *
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function display()
     {
@@ -79,7 +73,6 @@ public function display()
      * @param null|string $newFileName Default value is NULL
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function save($destination = null, $newFileName = null)
     {
@@ -92,7 +85,6 @@ public function save($destination = null, $newFileName = null)
      * @param int $angle
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function rotate($angle)
     {
@@ -108,7 +100,6 @@ public function rotate($angle)
      * @param int $bottom Default value is 0
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
     {
@@ -122,7 +113,6 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
      * @param int $height
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function resize($width, $height = null)
     {
@@ -134,7 +124,6 @@ public function resize($width, $height = null)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function keepAspectRatio($value)
     {
@@ -146,7 +135,6 @@ public function keepAspectRatio($value)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function keepFrame($value)
     {
@@ -158,7 +146,6 @@ public function keepFrame($value)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function keepTransparency($value)
     {
@@ -170,7 +157,6 @@ public function keepTransparency($value)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function constrainOnly($value)
     {
@@ -182,7 +168,6 @@ public function constrainOnly($value)
      *
      * @param null|array $value
      * @return array|null
-     * @since 2.0.0
      */
     public function backgroundColor($value)
     {
@@ -194,7 +179,6 @@ public function backgroundColor($value)
      *
      * @param int $value
      * @return int
-     * @since 2.0.0
      */
     public function quality($value)
     {
@@ -212,7 +196,6 @@ public function quality($value)
      * @access public
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     public function watermark(
         $watermarkImage,
@@ -232,7 +215,6 @@ public function watermark(
      *
      * @access public
      * @return string
-     * @since 2.0.0
      */
     public function getMimeType()
     {
@@ -244,7 +226,6 @@ public function getMimeType()
      *
      * @access public
      * @return int
-     * @since 2.0.0
      */
     public function getImageType()
     {
@@ -256,7 +237,6 @@ public function getImageType()
      *
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function process()
     {
@@ -267,7 +247,6 @@ public function process()
      *
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function instruction()
     {
@@ -279,7 +258,6 @@ public function instruction()
      * @param int $color
      * @access public
      * @return void
-     * @since 2.0.0
      */
     public function setImageBackgroundColor($color)
     {
@@ -291,7 +269,6 @@ public function setImageBackgroundColor($color)
      *
      * @param string $position
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkPosition($position)
     {
@@ -304,7 +281,6 @@ public function setWatermarkPosition($position)
      *
      * @param int $imageOpacity
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
@@ -317,7 +293,6 @@ public function setWatermarkImageOpacity($imageOpacity)
      *
      * @param int $width
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkWidth($width)
     {
@@ -330,7 +305,6 @@ public function setWatermarkWidth($width)
      *
      * @param int $height
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkHeight($height)
     {
@@ -342,7 +316,6 @@ public function setWatermarkHeight($height)
      * Retrieve original image width
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalWidth()
     {
@@ -353,7 +326,6 @@ public function getOriginalWidth()
      * Retrieve original image height
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalHeight()
     {
@@ -366,7 +338,6 @@ public function getOriginalHeight()
      * @param string $text
      * @param string $font Path to font file
      * @return $this
-     * @since 2.0.0
      */
     public function createPngFromString($text, $font = '')
     {
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index 61eb49334b0aa..a32561704d178 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -11,14 +11,12 @@
  * @file        Abstract.php
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
     /**
      * Background color
      * @var int|string
-     * @since 2.0.0
      */
     public $imageBackgroundColor = 0;
 
@@ -46,121 +44,101 @@ abstract class AbstractAdapter implements AdapterInterface
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_fileType;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_fileName;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_fileMimeType;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_fileSrcName;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_fileSrcPath;
 
     /**
      * @var resource
-     * @since 2.0.0
      */
     protected $_imageHandler;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_imageSrcWidth;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_imageSrcHeight;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_requiredExtensions;
 
     /**
      * @var  string
-     * @since 2.0.0
      */
     protected $_watermarkPosition;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_watermarkWidth;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_watermarkHeight;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_watermarkImageOpacity;
 
     /**
      * @var  int
-     * @since 2.0.0
      */
     protected $_quality;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_fontSize = self::DEFAULT_FONT_SIZE;
 
     /**
      * @var  bool
-     * @since 2.0.0
      */
     protected $_keepAspectRatio;
 
     /**
      * @var  bool
-     * @since 2.0.0
      */
     protected $_keepFrame;
 
     /**
      * @var  bool
-     * @since 2.0.0
      */
     protected $_keepTransparency;
 
     /**
      * @var  array
-     * @since 2.0.0
      */
     protected $_backgroundColor;
 
     /**
      * @var  bool
-     * @since 2.0.0
      */
     protected $_constrainOnly;
 
@@ -168,19 +146,16 @@ abstract class AbstractAdapter implements AdapterInterface
      * Filesystem instance
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $directoryWrite;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -189,7 +164,6 @@ abstract class AbstractAdapter implements AdapterInterface
      *
      * @param string $fileName
      * @return void
-     * @since 2.0.0
      */
     abstract public function open($fileName);
 
@@ -201,7 +175,6 @@ abstract public function open($fileName);
      * @param null|string $newName
      * @return void
      * @throws \Exception  If destination path is not writable
-     * @since 2.0.0
      */
     abstract public function save($destination = null, $newName = null);
 
@@ -209,7 +182,6 @@ abstract public function save($destination = null, $newName = null);
      * Render image and return its binary contents
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function getImage();
 
@@ -219,7 +191,6 @@ abstract public function getImage();
      * @param null|int $width
      * @param null|int $height
      * @return void
-     * @since 2.0.0
      */
     abstract public function resize($width = null, $height = null);
 
@@ -228,7 +199,6 @@ abstract public function resize($width = null, $height = null);
      *
      * @param int $angle
      * @return void
-     * @since 2.0.0
      */
     abstract public function rotate($angle);
 
@@ -240,7 +210,6 @@ abstract public function rotate($angle);
      * @param int $right
      * @param int $bottom
      * @return bool
-     * @since 2.0.0
      */
     abstract public function crop($top = 0, $left = 0, $right = 0, $bottom = 0);
 
@@ -253,7 +222,6 @@ abstract public function crop($top = 0, $left = 0, $right = 0, $bottom = 0);
      * @param int $opacity
      * @param bool $tile
      * @return void
-     * @since 2.0.0
      */
     abstract public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false);
 
@@ -262,7 +230,6 @@ abstract public function watermark($imagePath, $positionX = 0, $positionY = 0, $
      *
      * @return void
      * @throws \Exception If some of dependencies are missing
-     * @since 2.0.0
      */
     abstract public function checkDependencies();
 
@@ -272,7 +239,6 @@ abstract public function checkDependencies();
      * @param string $text
      * @param string $font Path to font file
      * @return AbstractAdapter
-     * @since 2.0.0
      */
     abstract public function createPngFromString($text, $font = '');
 
@@ -280,7 +246,6 @@ abstract public function createPngFromString($text, $font = '');
      * Reassign image dimensions
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function refreshImageDimensions();
 
@@ -290,7 +255,6 @@ abstract public function refreshImageDimensions();
      * @param int $x
      * @param int $y
      * @return array
-     * @since 2.0.0
      */
     abstract public function getColorAt($x, $y);
 
@@ -301,7 +265,6 @@ abstract public function getColorAt($x, $y);
      * @param \Psr\Log\LoggerInterface $logger
      * @param array $data
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -317,7 +280,6 @@ public function __construct(
      * Assign image width, height, fileMimeType to object properties
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getMimeType()
     {
@@ -333,7 +295,6 @@ public function getMimeType()
      * Assign image width, height, fileType to object properties using getimagesize function
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getImageType()
     {
@@ -349,7 +310,6 @@ public function getImageType()
      * Retrieve Original Image Width
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalWidth()
     {
@@ -361,7 +321,6 @@ public function getOriginalWidth()
      * Retrieve Original Image Height
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getOriginalHeight()
     {
@@ -374,7 +333,6 @@ public function getOriginalHeight()
      *
      * @param string $position
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkPosition($position)
     {
@@ -386,7 +344,6 @@ public function setWatermarkPosition($position)
      * Get watermark position
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWatermarkPosition()
     {
@@ -398,7 +355,6 @@ public function getWatermarkPosition()
      *
      * @param int $imageOpacity
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
@@ -410,7 +366,6 @@ public function setWatermarkImageOpacity($imageOpacity)
      * Get watermark opacity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWatermarkImageOpacity()
     {
@@ -422,7 +377,6 @@ public function getWatermarkImageOpacity()
      *
      * @param int $width
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkWidth($width)
     {
@@ -434,7 +388,6 @@ public function setWatermarkWidth($width)
      * Get watermark width
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWatermarkWidth()
     {
@@ -446,7 +399,6 @@ public function getWatermarkWidth()
      *
      * @param int $height
      * @return $this
-     * @since 2.0.0
      */
     public function setWatermarkHeight($height)
     {
@@ -458,7 +410,6 @@ public function setWatermarkHeight($height)
      * Return watermark height
      *
      * @return int
-     * @since 2.0.0
      */
     public function getWatermarkHeight()
     {
@@ -470,7 +421,6 @@ public function getWatermarkHeight()
      *
      * @param bool $value
      * @return bool|\Magento\Framework\Image\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     public function keepAspectRatio($value = null)
     {
@@ -485,7 +435,6 @@ public function keepAspectRatio($value = null)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function keepFrame($value = null)
     {
@@ -500,7 +449,6 @@ public function keepFrame($value = null)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function keepTransparency($value = null)
     {
@@ -515,7 +463,6 @@ public function keepTransparency($value = null)
      *
      * @param bool $value
      * @return bool
-     * @since 2.0.0
      */
     public function constrainOnly($value = null)
     {
@@ -530,7 +477,6 @@ public function constrainOnly($value = null)
      *
      * @param int $value
      * @return int
-     * @since 2.0.0
      */
     public function quality($value = null)
     {
@@ -545,7 +491,6 @@ public function quality($value = null)
      *
      * @param null|array $value
      * @return array|void
-     * @since 2.0.0
      */
     public function backgroundColor($value = null)
     {
@@ -567,7 +512,6 @@ public function backgroundColor($value = null)
      * Assign file dirname and basename to object properties
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _getFileAttributes()
     {
@@ -584,7 +528,6 @@ protected function _getFileAttributes()
      * @param int $frameHeight
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _adaptResizeValues($frameWidth, $frameHeight)
     {
@@ -637,7 +580,6 @@ protected function _adaptResizeValues($frameWidth, $frameHeight)
      * @param int $frameWidth
      * @param int $frameHeight
      * @return int[]
-     * @since 2.0.0
      */
     protected function _checkAspectRatio($frameWidth, $frameHeight)
     {
@@ -668,7 +610,6 @@ protected function _checkAspectRatio($frameWidth, $frameHeight)
      * @param int $frameHeight
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _checkDimensions($frameWidth, $frameHeight)
     {
@@ -684,7 +625,6 @@ protected function _checkDimensions($frameWidth, $frameHeight)
      * Return false if source width or height is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _checkSrcDimensions()
     {
@@ -696,7 +636,6 @@ protected function _checkSrcDimensions()
      *
      * @param string $filePath
      * @return array
-     * @since 2.0.0
      */
     protected function _getImageOptions($filePath)
     {
@@ -707,7 +646,6 @@ protected function _getImageOptions($filePath)
      * Return supported image formats
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedFormats()
     {
@@ -721,7 +659,6 @@ public function getSupportedFormats()
      * @param string $newName
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _prepareDestination($destination = null, $newName = null)
     {
@@ -758,7 +695,6 @@ protected function _prepareDestination($destination = null, $newName = null)
      * Checks is adapter can work with image
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _canProcess()
     {
@@ -771,7 +707,6 @@ protected function _canProcess()
      * @param string $filePath
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validateUploadFile($filePath)
     {
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/Image/Adapter/AdapterInterface.php
index 79e58b905d328..b31ed5c773495 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AdapterInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Image\Adapter\AdapterInterface
  *
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -25,14 +24,12 @@ interface AdapterInterface
      * @param int $x
      * @param int $y
      * @return array
-     * @since 2.0.0
      */
     public function getColorAt($x, $y);
 
     /**
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
-     * @since 2.0.0
      */
     public function getImage();
 
@@ -45,7 +42,6 @@ public function getImage();
      * @param int $opacity
      * @param bool $tile
      * @return void
-     * @since 2.0.0
      */
     public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false);
 
@@ -53,7 +49,6 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
      * Reassign image dimensions
      *
      * @return void
-     * @since 2.0.0
      */
     public function refreshImageDimensions();
 
@@ -62,7 +57,6 @@ public function refreshImageDimensions();
      *
      * @return void
      * @throws \Exception If some of dependencies are missing
-     * @since 2.0.0
      */
     public function checkDependencies();
 
@@ -72,7 +66,6 @@ public function checkDependencies();
      * @param string $text
      * @param string $font
      * @return \Magento\Framework\Image\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     public function createPngFromString($text, $font = '');
 
@@ -81,7 +74,6 @@ public function createPngFromString($text, $font = '');
      *
      * @param string $filename
      * @return void
-     * @since 2.0.0
      */
     public function open($filename);
 
@@ -91,7 +83,6 @@ public function open($filename);
      * @param null|int $frameWidth
      * @param null|int $frameHeight
      * @return void
-     * @since 2.0.0
      */
     public function resize($frameWidth = null, $frameHeight = null);
 
@@ -103,7 +94,6 @@ public function resize($frameWidth = null, $frameHeight = null);
      * @param int $right
      * @param int $bottom
      * @return bool
-     * @since 2.0.0
      */
     public function crop($top = 0, $left = 0, $right = 0, $bottom = 0);
 
@@ -115,7 +105,6 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0);
      * @param null|string $newName
      * @return void
      * @throws \Exception  If destination path is not writable
-     * @since 2.0.0
      */
     public function save($destination = null, $newName = null);
 
@@ -124,7 +113,6 @@ public function save($destination = null, $newName = null);
      *
      * @param int $angle
      * @return void
-     * @since 2.0.0
      */
     public function rotate($angle);
 }
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php
index 2ae3b697dc08c..8b891f325737f 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Config.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Image\Adapter\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Image\Adapter\ConfigInterface
 {
@@ -18,13 +17,11 @@ class Config implements \Magento\Framework\Image\Adapter\ConfigInterface
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      * {@inherit}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdapterAlias()
     {
@@ -46,7 +42,6 @@ public function getAdapterAlias()
      * {@inherit}
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getAdapters()
     {
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php b/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php
index d8bac3bb09a9a..dab642b14ac6c 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php
@@ -8,19 +8,16 @@
 /**
  * Interface \Magento\Framework\Image\Adapter\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAdapterAlias();
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAdapters();
 }
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 9de54e8a5b8db..175dec8e05be8 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Image\Adapter\Gd2
  *
- * @since 2.0.0
  */
 class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
 {
@@ -16,7 +15,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
      * Required extensions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_requiredExtensions = ["gd"];
 
@@ -24,7 +22,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
      * Image output callbacks by type
      *
      * @var array
-     * @since 2.0.0
      */
     private static $_callbacks = [
         IMAGETYPE_GIF => ['output' => 'imagegif', 'create' => 'imagecreatefromgif'],
@@ -38,7 +35,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
      * Whether image was resized or not
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_resized = false;
 
@@ -46,7 +42,6 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
      * For properties reset, e.g. mimeType caching.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _reset()
     {
@@ -60,7 +55,6 @@ protected function _reset()
      * @param string $filename
      * @return void
      * @throws \OverflowException
-     * @since 2.0.0
      */
     public function open($filename)
     {
@@ -79,7 +73,6 @@ public function open($filename)
      * Checks whether memory limit is reached.
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isMemoryLimitReached()
     {
@@ -97,7 +90,6 @@ protected function _isMemoryLimitReached()
      *
      * @param string $file
      * @return float|int
-     * @since 2.0.0
      */
     protected function _getImageNeedMemorySize($file)
     {
@@ -125,7 +117,6 @@ protected function _getImageNeedMemorySize($file)
      *
      * @param string $memoryValue
      * @return int
-     * @since 2.0.0
      */
     protected function _convertToByte($memoryValue)
     {
@@ -148,7 +139,6 @@ protected function _convertToByte($memoryValue)
      * @param null|string $newName
      * @return void
      * @throws \Exception  If destination path is not writable
-     * @since 2.0.0
      */
     public function save($destination = null, $newName = null)
     {
@@ -201,7 +191,6 @@ public function save($destination = null, $newName = null)
     /**
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
-     * @since 2.0.0
      */
     public function getImage()
     {
@@ -218,7 +207,6 @@ public function getImage()
      * @param string $unsupportedText
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     private function _getCallback($callbackType, $fileType = null, $unsupportedText = 'Unsupported image format.')
     {
@@ -242,7 +230,6 @@ private function _getCallback($callbackType, $fileType = null, $unsupportedText
      * @return int
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function _fillBackgroundColor(&$imageResourceTo)
     {
@@ -302,7 +289,6 @@ private function _fillBackgroundColor(&$imageResourceTo)
      *
      * @param string $fileName
      * @return boolean
-     * @since 2.0.0
      */
     public function checkAlpha($fileName)
     {
@@ -318,7 +304,6 @@ public function checkAlpha($fileName)
      * @param bool &$isTrueColor
      * @return boolean
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     private function _getTransparency($imageResource, $fileType, &$isAlpha = false, &$isTrueColor = false)
     {
@@ -350,7 +335,6 @@ private function _getTransparency($imageResource, $fileType, &$isAlpha = false,
      * @param null|int $frameWidth
      * @param null|int $frameHeight
      * @return void
-     * @since 2.0.0
      */
     public function resize($frameWidth = null, $frameHeight = null)
     {
@@ -399,7 +383,6 @@ public function resize($frameWidth = null, $frameHeight = null)
      *
      * @param int $angle
      * @return void
-     * @since 2.0.0
      */
     public function rotate($angle)
     {
@@ -422,7 +405,6 @@ public function rotate($angle)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
     {
@@ -599,7 +581,6 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
      * @param int $right
      * @param int $bottom
      * @return bool
-     * @since 2.0.0
      */
     public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
     {
@@ -639,7 +620,6 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
      *
      * @return void
      * @throws \Exception If some of dependencies are missing
-     * @since 2.0.0
      */
     public function checkDependencies()
     {
@@ -654,7 +634,6 @@ public function checkDependencies()
      * Reassign image dimensions
      *
      * @return void
-     * @since 2.0.0
      */
     public function refreshImageDimensions()
     {
@@ -664,7 +643,6 @@ public function refreshImageDimensions()
 
     /**
      * Standard destructor. Destroy stored information about image
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -689,7 +667,6 @@ private function imageDestroy()
      *
      * @param resource $imageHandler
      * @return void
-     * @since 2.0.0
      */
     private function _saveAlpha($imageHandler)
     {
@@ -705,7 +682,6 @@ private function _saveAlpha($imageHandler)
      * @param int $x
      * @param int $y
      * @return array
-     * @since 2.0.0
      */
     public function getColorAt($x, $y)
     {
@@ -719,7 +695,6 @@ public function getColorAt($x, $y)
      * @param string $text
      * @param string $font
      * @return \Magento\Framework\Image\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     public function createPngFromString($text, $font = '')
     {
@@ -743,7 +718,6 @@ public function createPngFromString($text, $font = '')
      *
      * @param string $text
      * @return void
-     * @since 2.0.0
      */
     protected function _createImageFromText($text)
     {
@@ -764,7 +738,6 @@ protected function _createImageFromText($text)
      * @param string $font
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _createImageFromTtfText($text, $font)
     {
@@ -796,7 +769,6 @@ protected function _createImageFromTtfText($text, $font)
      * @param int $width
      * @param int $height
      * @return void
-     * @since 2.0.0
      */
     protected function _createEmptyImage($width, $height)
     {
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index 7586804f52ce2..dbcad2845a2a6 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Image\Adapter\ImageMagick
  *
- * @since 2.0.0
  */
 class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
 {
@@ -28,7 +27,6 @@ class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
      * Options Container
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = [
         'resolution' => ['x' => 72, 'y' => 72],
@@ -41,7 +39,6 @@ class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
      *
      * @param int|string|array $color
      * @return int
-     * @since 2.0.0
      */
     public function backgroundColor($color = null)
     {
@@ -74,7 +71,6 @@ public function backgroundColor($color = null)
      * @param string $filename
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function open($filename)
     {
@@ -100,7 +96,6 @@ public function open($filename)
      * @param null|string $newName
      * @return void
      * @throws \Exception  If destination path is not writable
-     * @since 2.0.0
      */
     public function save($destination = null, $newName = null)
     {
@@ -115,7 +110,6 @@ public function save($destination = null, $newName = null)
      * Apply options to image. Will be usable later when create an option container
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _applyOptions()
     {
@@ -136,7 +130,6 @@ protected function _applyOptions()
     /**
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
-     * @since 2.0.0
      */
     public function getImage()
     {
@@ -150,7 +143,6 @@ public function getImage()
      * @param null|int $frameWidth
      * @param null|int $frameHeight
      * @return void
-     * @since 2.0.0
      */
     public function resize($frameWidth = null, $frameHeight = null)
     {
@@ -207,7 +199,6 @@ public function resize($frameWidth = null, $frameHeight = null)
      *
      * @param int $angle
      * @return void
-     * @since 2.0.0
      */
     public function rotate($angle)
     {
@@ -229,7 +220,6 @@ public function rotate($angle)
      * @param int $right
      * @param int $bottom
      * @return bool
-     * @since 2.0.0
      */
     public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
     {
@@ -258,7 +248,6 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
     {
@@ -348,7 +337,6 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
      *
      * @return void
      * @throws \Exception If some of dependencies are missing
-     * @since 2.0.0
      */
     public function checkDependencies()
     {
@@ -361,7 +349,6 @@ public function checkDependencies()
      * Reassign image dimensions
      *
      * @return void
-     * @since 2.0.0
      */
     public function refreshImageDimensions()
     {
@@ -372,7 +359,6 @@ public function refreshImageDimensions()
 
     /**
      * Standard destructor. Destroy stored information about image
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -383,7 +369,6 @@ public function __destruct()
      * Destroy stored information about image
      *
      * @return $this
-     * @since 2.0.0
      */
     public function destroy()
     {
@@ -401,7 +386,6 @@ public function destroy()
      * @param int $x
      * @param int $y
      * @return array
-     * @since 2.0.0
      */
     public function getColorAt($x, $y)
     {
@@ -422,7 +406,6 @@ public function getColorAt($x, $y)
      *
      * @throws \LogicException
      * @return true
-     * @since 2.0.0
      */
     protected function _checkCanProcess()
     {
@@ -438,7 +421,6 @@ protected function _checkCanProcess()
      * @param string $text
      * @param string $font
      * @return \Magento\Framework\Image\Adapter\AbstractAdapter
-     * @since 2.0.0
      */
     public function createPngFromString($text, $font = '')
     {
@@ -480,7 +462,6 @@ public function createPngFromString($text, $font = '')
      *
      * @param mixed $files
      * @return \Imagick
-     * @since 2.0.0
      */
     protected function _getImagickObject($files = null)
     {
@@ -491,7 +472,6 @@ protected function _getImagickObject($files = null)
      * Get ImagickDraw object
      *
      * @return \ImagickDraw
-     * @since 2.0.0
      */
     protected function _getImagickDrawObject()
     {
@@ -503,7 +483,6 @@ protected function _getImagickDrawObject()
      *
      * @param string|null $color
      * @return \ImagickPixel
-     * @since 2.0.0
      */
     protected function _getImagickPixelObject($color = null)
     {
diff --git a/lib/internal/Magento/Framework/Image/AdapterFactory.php b/lib/internal/Magento/Framework/Image/AdapterFactory.php
index 45dbb26c4479b..bc73f7a8f1d17 100644
--- a/lib/internal/Magento/Framework/Image/AdapterFactory.php
+++ b/lib/internal/Magento/Framework/Image/AdapterFactory.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Framework\Image\AdapterFactory
  *
- * @since 2.0.0
  */
 class AdapterFactory
 {
     /**
      * @var Adapter\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $adapterMap;
 
@@ -34,7 +30,6 @@ class AdapterFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param Adapter\ConfigInterface $config
      * @param array $adapterMap
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -52,7 +47,6 @@ public function __construct(
      * @param string $adapterAlias
      * @return \Magento\Framework\Image\Adapter\AdapterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($adapterAlias = null)
     {
diff --git a/lib/internal/Magento/Framework/Image/Factory.php b/lib/internal/Magento/Framework/Image/Factory.php
index 05e62f8611573..c5ce769e6166b 100644
--- a/lib/internal/Magento/Framework/Image/Factory.php
+++ b/lib/internal/Magento/Framework/Image/Factory.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Framework\Image\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var AdapterFactory
-     * @since 2.0.0
      */
     protected $adapterFactory;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param AdapterFactory $adapterFactory
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -46,7 +42,6 @@ public function __construct(
      * @param string|null $fileName
      * @param string|null $adapterName
      * @return \Magento\Framework\Image
-     * @since 2.0.0
      */
     public function create($fileName = null, $adapterName = null)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/AbstractProcessor.php b/lib/internal/Magento/Framework/Indexer/AbstractProcessor.php
index 52a45839cb739..adebbacfba2c0 100644
--- a/lib/internal/Magento/Framework/Indexer/AbstractProcessor.php
+++ b/lib/internal/Magento/Framework/Indexer/AbstractProcessor.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Indexer\AbstractProcessor
  *
- * @since 2.0.0
  */
 abstract class AbstractProcessor
 {
@@ -22,13 +21,11 @@ abstract class AbstractProcessor
 
     /**
      * @var \Magento\Framework\Indexer\IndexerRegistry
-     * @since 2.0.0
      */
     protected $indexerRegistry;
 
     /**
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
@@ -40,7 +37,6 @@ public function __construct(
      * Get indexer
      *
      * @return \Magento\Framework\Indexer\IndexerInterface
-     * @since 2.0.0
      */
     public function getIndexer()
     {
@@ -53,7 +49,6 @@ public function getIndexer()
      * @param int $id
      * @param bool $forceReindex
      * @return void
-     * @since 2.0.0
      */
     public function reindexRow($id, $forceReindex = false)
     {
@@ -69,7 +64,6 @@ public function reindexRow($id, $forceReindex = false)
      * @param int[] $ids
      * @param bool $forceReindex
      * @return void
-     * @since 2.0.0
      */
     public function reindexList($ids, $forceReindex = false)
     {
@@ -83,7 +77,6 @@ public function reindexList($ids, $forceReindex = false)
      * Run Full reindex
      *
      * @return void
-     * @since 2.0.0
      */
     public function reindexAll()
     {
@@ -94,7 +87,6 @@ public function reindexAll()
      * Mark Product price indexer as invalid
      *
      * @return void
-     * @since 2.0.0
      */
     public function markIndexerAsInvalid()
     {
@@ -105,7 +97,6 @@ public function markIndexerAsInvalid()
      * Get processor indexer ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIndexerId()
     {
@@ -116,7 +107,6 @@ public function getIndexerId()
      * Check if indexer is on scheduled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIndexerScheduled()
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
index 3ec631c9a7b6b..f232ca269ce50 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Base.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Base.php
@@ -22,7 +22,6 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Base implements ActionInterface
 {
@@ -33,47 +32,40 @@ class Base implements ActionInterface
 
     /**
      * @var FieldsetPool
-     * @since 2.0.0
      */
     protected $fieldsetPool;
 
     /**
      * @var AdapterInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var SourceProviderInterface[]
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $sources;
 
     /**
      * @var SourceProviderInterface
-     * @since 2.0.0
      */
     protected $primarySource;
 
     /**
      * @var HandlerInterface[]
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $handlers;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $columnTypesMap = [
         'varchar'    => ['type' => Table::TYPE_TEXT, 'size' => 255],
@@ -84,71 +76,60 @@ class Base implements ActionInterface
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $filterColumns;
 
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $searchColumns;
 
     /**
      * @var SourceFactory
-     * @since 2.0.0
      */
     protected $sourceFactory;
 
     /**
      * @var HandlerPool
-     * @since 2.0.0
      */
     protected $handlerPool;
 
     /**
      * @var SaveHandlerFactory
-     * @since 2.0.0
      */
     protected $saveHandlerFactory;
 
     /**
      * @var String
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var IndexStructureInterface
-     * @since 2.0.0
      */
     protected $indexStructure;
 
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $filterable = [];
 
     /**
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $searchable = [];
 
     /**
      * @var IndexerInterface
-     * @since 2.0.0
      */
     protected $saveHandler;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $tableAlias = 'main_table';
 
@@ -161,7 +142,6 @@ class Base implements ActionInterface
      * @param StdString $string
      * @param IndexStructureInterface $indexStructure
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         AppResource $resource,
@@ -188,7 +168,6 @@ public function __construct(
      *
      * @param null|int|array $ids
      * @return void
-     * @since 2.0.0
      */
     protected function execute(array $ids = [])
     {
@@ -204,7 +183,6 @@ protected function execute(array $ids = [])
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -216,7 +194,6 @@ public function executeFull()
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -228,7 +205,6 @@ public function executeList(array $ids)
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -240,7 +216,6 @@ public function executeRow($id)
      *
      * @param array|int|null $ids
      * @return SourceProviderInterface
-     * @since 2.0.0
      */
     protected function prepareDataSource(array $ids = [])
     {
@@ -253,7 +228,6 @@ protected function prepareDataSource(array $ids = [])
      * Return index table name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getTableName()
     {
@@ -264,7 +238,6 @@ protected function getTableName()
      * Return save handler
      *
      * @return IndexerInterface
-     * @since 2.0.0
      */
     protected function getSaveHandler()
     {
@@ -284,7 +257,6 @@ protected function getSaveHandler()
      * Return primary source provider
      *
      * @return SourceProviderInterface
-     * @since 2.0.0
      */
     protected function getPrimaryResource()
     {
@@ -295,7 +267,6 @@ protected function getPrimaryResource()
      * Return primary fieldset
      *
      * @return []
-     * @since 2.0.0
      */
     protected function getPrimaryFieldset()
     {
@@ -306,7 +277,6 @@ protected function getPrimaryFieldset()
      * Create select from indexer configuration
      *
      * @return SourceProviderInterface
-     * @since 2.0.0
      */
     protected function createResultCollection()
     {
@@ -349,7 +319,6 @@ protected function createResultCollection()
      * Prepare configuration data
      *
      * @return void
-     * @since 2.0.0
      */
     protected function prepareFields()
     {
@@ -385,7 +354,6 @@ protected function prepareFields()
      * @return void
      *
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function saveFieldByType($field)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Dummy.php b/lib/internal/Magento/Framework/Indexer/Action/Dummy.php
index 748b8052d0c69..58f19b9143742 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Dummy.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Dummy.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Indexer\Action\Dummy
  *
- * @since 2.0.0
  */
 class Dummy implements ActionInterface, MviewActionInterface
 {
@@ -19,7 +18,6 @@ class Dummy implements ActionInterface, MviewActionInterface
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull()
     {
@@ -31,7 +29,6 @@ public function executeFull()
      * @param int[] $ids
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function executeList(array $ids)
     {
@@ -43,7 +40,6 @@ public function executeList(array $ids)
      * @param int $id
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function executeRow($id)
     {
@@ -55,7 +51,6 @@ public function executeRow($id)
      * @param int[] $ids
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function execute($ids)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Entity.php b/lib/internal/Magento/Framework/Indexer/Action/Entity.php
index 31b18c181a64c..12b3767f98f27 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Entity.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Entity.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Framework\Indexer\Action\Entity
  *
- * @since 2.0.0
  */
 class Entity extends Base
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $tableAlias = 'e';
 
@@ -25,7 +23,6 @@ class Entity extends Base
      *
      * @param array|int|null $ids
      * @return SourceProviderInterface
-     * @since 2.0.0
      */
     protected function prepareDataSource(array $ids = [])
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ActionFactory.php b/lib/internal/Magento/Framework/Indexer/ActionFactory.php
index 1dfcae712dc30..bd2cacd8c0330 100644
--- a/lib/internal/Magento/Framework/Indexer/ActionFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/ActionFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Indexer\ActionFactory
  *
- * @since 2.0.0
  */
 class ActionFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param [] $arguments
      * @throws \InvalidArgumentException
      * @return ActionInterface
-     * @since 2.0.0
      */
     public function create($className, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ActionInterface.php b/lib/internal/Magento/Framework/Indexer/ActionInterface.php
index 0b1f68c483bf0..68a10e23e1d60 100644
--- a/lib/internal/Magento/Framework/Indexer/ActionInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/ActionInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api Implement custom Action Interface
- * @since 2.0.0
  */
 interface ActionInterface
 {
@@ -15,7 +14,6 @@ interface ActionInterface
      * Execute full indexation
      *
      * @return void
-     * @since 2.0.0
      */
     public function executeFull();
 
@@ -24,7 +22,6 @@ public function executeFull();
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function executeList(array $ids);
 
@@ -33,7 +30,6 @@ public function executeList(array $ids);
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function executeRow($id);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/CacheContext.php b/lib/internal/Magento/Framework/Indexer/CacheContext.php
index 561b359626d8f..754cc755d5ff9 100644
--- a/lib/internal/Magento/Framework/Indexer/CacheContext.php
+++ b/lib/internal/Magento/Framework/Indexer/CacheContext.php
@@ -7,19 +7,17 @@
 
 /**
  * Class Context
- * @since 2.0.0
  */
 class CacheContext implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $entities = [];
 
     /**
      * @var array
-     * @since 2.1.0
+     * @since 2.0.11
      */
     private $tags = [];
 
@@ -29,7 +27,6 @@ class CacheContext implements \Magento\Framework\DataObject\IdentityInterface
      * @param string $cacheTag
      * @param array $ids
      * @return $this
-     * @since 2.0.0
      */
     public function registerEntities($cacheTag, $ids)
     {
@@ -43,7 +40,7 @@ public function registerEntities($cacheTag, $ids)
      *
      * @param string $cacheTag
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function registerTags($cacheTags)
     {
@@ -56,7 +53,6 @@ public function registerTags($cacheTags)
      *
      * @param string $cacheTag
      * @return array
-     * @since 2.0.0
      */
     public function getRegisteredEntity($cacheTag)
     {
@@ -71,7 +67,6 @@ public function getRegisteredEntity($cacheTag)
      * Returns identities
      *
      * @return array
-     * @since 2.0.0
      */
     public function getIdentities()
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Config/Converter.php b/lib/internal/Magento/Framework/Indexer/Config/Converter.php
index ff247d78a8500..c5f2bc9b070c5 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/Converter.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Indexer\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements ConverterInterface
 {
@@ -20,7 +19,6 @@ class Converter implements ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -59,7 +57,6 @@ public function convert($source)
      * @param string $attributeName
      * @param mixed $default
      * @return null|string
-     * @since 2.0.0
      */
     protected function getAttributeValue(\DOMNode $input, $attributeName, $default = null)
     {
@@ -73,7 +70,6 @@ protected function getAttributeValue(\DOMNode $input, $attributeName, $default =
      * @param \DOMElement $childNode
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function convertChild(\DOMElement $childNode, $data)
     {
@@ -105,7 +101,6 @@ protected function convertChild(\DOMElement $childNode, $data)
      * @param array $data
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function convertFieldset(\DOMElement $node, $data)
     {
@@ -171,7 +166,6 @@ protected function convertFieldset(\DOMElement $node, $data)
      * @param string $field
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function addVirtualField($fieldset, $field, $data)
     {
@@ -189,7 +183,6 @@ protected function addVirtualField($fieldset, $field, $data)
      * @param \DOMElement $node
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function convertField(\DOMElement $node, $data)
     {
@@ -219,7 +212,6 @@ protected function convertField(\DOMElement $node, $data)
      * @param \DOMNode $node
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected function getTranslatedNodeValue(\DOMNode $node)
     {
@@ -235,7 +227,6 @@ protected function getTranslatedNodeValue(\DOMNode $node)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function sorting($data)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Config/Reader.php b/lib/internal/Magento/Framework/Indexer/Config/Reader.php
index 6d4833ac1c138..164f7568220ef 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Indexer\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/indexer'                => 'id',
@@ -37,7 +35,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param string $defaultScope
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Indexer/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Indexer/Config/SchemaLocator.php
index 861c0176661fa..838b269579a21 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\Indexer\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ConfigInterface.php b/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
index f06bc5754a0d3..1769676e8ab42 100644
--- a/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Indexer(s) configuration
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Get indexers list
      *
      * @return array[]
-     * @since 2.0.0
      */
     public function getIndexers();
 
@@ -26,7 +24,6 @@ public function getIndexers();
      *
      * @param string $indexerId
      * @return array
-     * @since 2.0.0
      */
     public function getIndexer($indexerId);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php b/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
index 855606ade3446..0ce1e8763ac96 100644
--- a/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api Implement custom Fieldset
- * @since 2.0.0
  */
 interface FieldsetInterface
 {
@@ -16,7 +15,6 @@ interface FieldsetInterface
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     public function addDynamicData(array $data);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/FieldsetPool.php b/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
index 49306449db880..747db5d2cc00f 100644
--- a/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
+++ b/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
@@ -9,19 +9,16 @@
 
 /**
  * @api Retrieve Fieldset when implementing custom Indexer\Action
- * @since 2.0.0
  */
 class FieldsetPool
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $fieldsetClass
      * @throws \InvalidArgumentException
      * @return FieldsetInterface
-     * @since 2.0.0
      */
     public function get($fieldsetClass)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/GridStructure.php b/lib/internal/Magento/Framework/Indexer/GridStructure.php
index 8936bd2c870c0..f6fd64a987274 100644
--- a/lib/internal/Magento/Framework/Indexer/GridStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/GridStructure.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Framework\Indexer\GridStructure
  *
- * @since 2.0.0
  */
 class GridStructure implements IndexStructureInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var FlatScopeResolver
-     * @since 2.0.0
      */
     private $flatScopeResolver;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $columnTypesMap = [
         'varchar'    => ['type' => Table::TYPE_TEXT, 'size' => 255],
@@ -48,7 +44,6 @@ class GridStructure implements IndexStructureInterface
      * @param ResourceConnection $resource
      * @param FlatScopeResolver $flatScopeResolver
      * @param array $columnTypesMap
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -64,7 +59,6 @@ public function __construct(
      * @param string $index
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function delete($index, array $dimensions = [])
     {
@@ -80,7 +74,6 @@ public function delete($index, array $dimensions = [])
      * @param array $fields
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function create($index, array $fields, array $dimensions = [])
     {
@@ -92,7 +85,6 @@ public function create($index, array $fields, array $dimensions = [])
      * @param array $fields
      * @throws \Zend_Db_Exception
      * @return void
-     * @since 2.0.0
      */
     protected function createFlatTable($tableName, array $fields)
     {
@@ -139,7 +131,6 @@ protected function createFlatTable($tableName, array $fields)
 
     /**
      * @return false|AdapterInterface
-     * @since 2.0.0
      */
     private function getAdapter()
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
index f56d387cc663a..b64419e9e0325 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Indexer\Handler\AttributeHandler
  *
- * @since 2.0.0
  */
 class AttributeHandler implements HandlerInterface
 {
@@ -24,7 +23,6 @@ class AttributeHandler implements HandlerInterface
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
index 4c49ccb31d8bd..c0a4ca303ec53 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Indexer\Handler\ConcatHandler
  *
- * @since 2.0.0
  */
 class ConcatHandler implements HandlerInterface
 {
     /**
      * @var \Magento\Framework\DB\ConcatExpression
-     * @since 2.0.0
      */
     protected $concatExpression;
 
     /**
      * @param \Zend_Db_Expr $concatExpression
-     * @since 2.0.0
      */
     public function __construct(
         \Zend_Db_Expr $concatExpression
@@ -38,7 +35,6 @@ public function __construct(
      * @param string $alias
      * @param array $fieldInfo
      * @return void
-     * @since 2.0.0
      */
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/DefaultHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/DefaultHandler.php
index e2ff4cee96c00..7454e9f97cdde 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/DefaultHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/DefaultHandler.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Indexer\Handler\DefaultHandler
  *
- * @since 2.0.0
  */
 class DefaultHandler implements HandlerInterface
 {
@@ -20,7 +19,6 @@ class DefaultHandler implements HandlerInterface
      * @param string $alias
      * @param array $fieldInfo
      * @return void
-     * @since 2.0.0
      */
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/HandlerInterface.php b/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
index 8f037d29a04aa..5c1e9ea5a2569 100644
--- a/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api Implement custom Handler
- * @since 2.0.0
  */
 interface HandlerInterface
 {
@@ -20,7 +19,6 @@ interface HandlerInterface
      * @param string $alias
      * @param array $fieldInfo
      * @return void
-     * @since 2.0.0
      */
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/HandlerPool.php b/lib/internal/Magento/Framework/Indexer/HandlerPool.php
index e00b9fed18613..ed7abf19bad47 100644
--- a/lib/internal/Magento/Framework/Indexer/HandlerPool.php
+++ b/lib/internal/Magento/Framework/Indexer/HandlerPool.php
@@ -10,26 +10,22 @@
 
 /**
  * @api Instantiate save handler when implementing custom Indexer\Action
- * @since 2.0.0
  */
 class HandlerPool
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var HandlerInterface
-     * @since 2.0.0
      */
     protected $defaultHandler;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param DefaultHandler $defaultHandler
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -45,7 +41,6 @@ public function __construct(
      * @param string $handlerClass
      * @throws \InvalidArgumentException
      * @return HandlerInterface
-     * @since 2.0.0
      */
     public function get($handlerClass = null)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructure.php b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
index 42744a3c71a92..794691bf680fb 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
@@ -16,31 +16,26 @@
 /**
  * Class \Magento\Framework\Indexer\IndexStructure
  *
- * @since 2.0.0
  */
 class IndexStructure implements IndexStructureInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver
-     * @since 2.0.0
      */
     private $indexScopeResolver;
 
     /**
      * @var FlatScopeResolver
-     * @since 2.0.0
      */
     private $flatScopeResolver;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $columnTypesMap = [
         'varchar'    => ['type' => Table::TYPE_TEXT, 'size' => 255],
@@ -53,7 +48,6 @@ class IndexStructure implements IndexStructureInterface
      * @param IndexScopeResolver $indexScopeResolver
      * @param \Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver $flatScopeResolver
      * @param array $columnTypesMap
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -71,7 +65,6 @@ public function __construct(
      * @param string $index
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function delete($index, array $dimensions = [])
     {
@@ -84,7 +77,6 @@ public function delete($index, array $dimensions = [])
      * @param array $fields
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function create($index, array $fields, array $dimensions = [])
     {
@@ -98,7 +90,6 @@ public function create($index, array $fields, array $dimensions = [])
      * @param string $tableName
      * @throws \Zend_Db_Exception
      * @return void
-     * @since 2.0.0
      */
     protected function createFulltextIndex($tableName)
     {
@@ -109,7 +100,6 @@ protected function createFulltextIndex($tableName)
     /**
      * @param Table $table
      * @return Table
-     * @since 2.0.0
      */
     protected function configureFulltextTable(Table $table)
     {
@@ -147,7 +137,6 @@ protected function configureFulltextTable(Table $table)
      * @param array $fields
      * @throws \Zend_Db_Exception
      * @return void
-     * @since 2.0.0
      */
     protected function createFlatIndex($tableName, array $fields)
     {
@@ -178,7 +167,6 @@ protected function createFlatIndex($tableName, array $fields)
      * @param AdapterInterface $connection
      * @param string $tableName
      * @return void
-     * @since 2.0.0
      */
     private function dropTable(AdapterInterface $connection, $tableName)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php b/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
index a0a2608b7dc84..f4c518bdfea7a 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
@@ -11,7 +11,6 @@
  * Indexer structure (schema) handler
  *
  * @api
- * @since 2.0.0
  */
 interface IndexStructureInterface
 {
@@ -19,7 +18,6 @@ interface IndexStructureInterface
      * @param string $index
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function delete($index, array $dimensions = []);
 
@@ -28,7 +26,6 @@ public function delete($index, array $dimensions = []);
      * @param array $fields
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     public function create($index, array $fields, array $dimensions = []);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
index ea8acafb9d008..c0e6416b8261a 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
@@ -9,7 +9,6 @@
  * Indexer
  *
  * @api
- * @since 2.0.0
  */
 interface IndexerInterface
 {
@@ -17,7 +16,6 @@ interface IndexerInterface
      * Return indexer ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId();
 
@@ -25,7 +23,6 @@ public function getId();
      * Return indexer's view ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getViewId();
 
@@ -33,7 +30,6 @@ public function getViewId();
      * Return indexer action class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionClass();
 
@@ -41,7 +37,6 @@ public function getActionClass();
      * Return indexer title
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle();
 
@@ -49,7 +44,6 @@ public function getTitle();
      * Return indexer description
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDescription();
 
@@ -57,7 +51,6 @@ public function getDescription();
      * Return indexer fields
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFields();
 
@@ -65,7 +58,6 @@ public function getFields();
      * Return indexer sources
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSources();
 
@@ -73,7 +65,6 @@ public function getSources();
      * Return indexer handlers
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHandlers();
 
@@ -83,7 +74,6 @@ public function getHandlers();
      * @param string $indexerId
      * @return IndexerInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function load($indexerId);
 
@@ -91,7 +81,6 @@ public function load($indexerId);
      * Return related view object
      *
      * @return \Magento\Framework\Mview\ViewInterface
-     * @since 2.0.0
      */
     public function getView();
 
@@ -99,7 +88,6 @@ public function getView();
      * Return related state object
      *
      * @return StateInterface
-     * @since 2.0.0
      */
     public function getState();
 
@@ -108,7 +96,6 @@ public function getState();
      *
      * @param StateInterface $state
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function setState(StateInterface $state);
 
@@ -116,7 +103,6 @@ public function setState(StateInterface $state);
      * Check whether indexer is run by schedule
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScheduled();
 
@@ -125,7 +111,6 @@ public function isScheduled();
      *
      * @param bool $scheduled
      * @return void
-     * @since 2.0.0
      */
     public function setScheduled($scheduled);
 
@@ -133,7 +118,6 @@ public function setScheduled($scheduled);
      * Check whether indexer is valid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValid();
 
@@ -141,7 +125,6 @@ public function isValid();
      * Check whether indexer is invalid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInvalid();
 
@@ -149,7 +132,6 @@ public function isInvalid();
      * Check whether indexer is working
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWorking();
 
@@ -157,7 +139,6 @@ public function isWorking();
      * Set indexer invalid
      *
      * @return void
-     * @since 2.0.0
      */
     public function invalidate();
 
@@ -165,7 +146,6 @@ public function invalidate();
      * Return indexer status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -173,7 +153,6 @@ public function getStatus();
      * Return indexer or mview latest updated time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLatestUpdated();
 
@@ -182,7 +161,6 @@ public function getLatestUpdated();
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function reindexAll();
 
@@ -191,7 +169,6 @@ public function reindexAll();
      *
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function reindexRow($id);
 
@@ -200,7 +177,6 @@ public function reindexRow($id);
      *
      * @param int[] $ids
      * @return void
-     * @since 2.0.0
      */
     public function reindexList($ids);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php b/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
index 50e554474f14d..5867565e0ccd5 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
@@ -7,25 +7,21 @@
 
 /**
  * @api Retrieve indexer by id, for example when indexer need to be invalidated
- * @since 2.0.0
  */
 class IndexerRegistry
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var IndexerInterface[]
-     * @since 2.0.0
      */
     protected $indexers = [];
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $indexerId
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function get($indexerId)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/Batch.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/Batch.php
index d0094b6391df2..09be3c4aa32f8 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/Batch.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/Batch.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Indexer\SaveHandler\Batch
  *
- * @since 2.0.0
  */
 class Batch
 {
@@ -16,7 +15,6 @@ class Batch
      * @param \Traversable $documents
      * @param int $size
      * @return \Generator
-     * @since 2.0.0
      */
     public function getItems(\Traversable $documents, $size)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
index 020162edca5ac..f5c6c4ed4725b 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Indexer\SaveHandler\Grid
  *
- * @since 2.0.0
  */
 class Grid extends IndexerHandler
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $dataTypes = ['searchable', 'filterable', 'virtual'];
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function saveIndex($dimensions, \Traversable $documents)
     {
@@ -35,7 +32,6 @@ public function saveIndex($dimensions, \Traversable $documents)
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     protected function insertDocumentsForFilterable(array $documents, array $dimensions)
     {
@@ -56,7 +52,6 @@ protected function insertDocumentsForFilterable(array $documents, array $dimensi
     /**
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     protected function prepareFilterableFields(array $documents)
     {
@@ -75,7 +70,6 @@ protected function prepareFilterableFields(array $documents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteIndex($dimensions, \Traversable $ids)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
index 40eb4711b0fe2..60305087a24f6 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
@@ -17,62 +17,52 @@
 /**
  * Class \Magento\Framework\Indexer\SaveHandler\IndexerHandler
  *
- * @since 2.0.0
  */
 class IndexerHandler implements IndexerInterface
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $dataTypes = ['searchable', 'filterable'];
 
     /**
      * @var IndexStructureInterface
-     * @since 2.0.0
      */
     protected $indexStructure;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $fields;
 
     /**
      * @var Resource|Resource
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @var Batch
-     * @since 2.0.0
      */
     protected $batch;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $batchSize;
 
     /**
      * @var IndexScopeResolverInterface[]
-     * @since 2.0.0
      */
     protected $scopeResolvers;
 
     /**
      * @param IndexStructureInterface $indexStructure
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -84,7 +74,6 @@ class IndexerHandler implements IndexerInterface
      * @param \Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver $flatScopeResolver
      * @param array $data
      * @param int $batchSize
-     * @since 2.0.0
      */
     public function __construct(
         IndexStructureInterface $indexStructure,
@@ -110,7 +99,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function saveIndex($dimensions, \Traversable $documents)
     {
@@ -122,7 +110,6 @@ public function saveIndex($dimensions, \Traversable $documents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function deleteIndex($dimensions, \Traversable $documents)
     {
@@ -136,7 +123,6 @@ public function deleteIndex($dimensions, \Traversable $documents)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function cleanIndex($dimensions)
     {
@@ -146,7 +132,6 @@ public function cleanIndex($dimensions)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isAvailable()
     {
@@ -157,7 +142,6 @@ public function isAvailable()
      * @param string $dataType
      * @param Dimension[] $dimensions
      * @return string
-     * @since 2.0.0
      */
     protected function getTableName($dataType, $dimensions)
     {
@@ -166,7 +150,6 @@ protected function getTableName($dataType, $dimensions)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getIndexName()
     {
@@ -177,7 +160,6 @@ protected function getIndexName()
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     private function insertDocumentsForSearchable(array $documents, array $dimensions)
     {
@@ -192,7 +174,6 @@ private function insertDocumentsForSearchable(array $documents, array $dimension
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
-     * @since 2.0.0
      */
     protected function insertDocumentsForFilterable(array $documents, array $dimensions)
     {
@@ -213,7 +194,6 @@ protected function insertDocumentsForFilterable(array $documents, array $dimensi
     /**
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     protected function prepareFilterableFields(array $documents)
     {
@@ -233,7 +213,6 @@ protected function prepareFilterableFields(array $documents)
     /**
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     private function prepareSearchableFields(array $documents)
     {
@@ -255,7 +234,6 @@ private function prepareSearchableFields(array $documents)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     private function prepareFields()
     {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
index c05a3cd787d5c..047539d28be3f 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
@@ -15,7 +15,6 @@
  * Indexer persistence handler
  *
  * @api
- * @since 2.0.0
  */
 interface IndexerInterface
 {
@@ -25,7 +24,6 @@ interface IndexerInterface
      * @param Dimension[] $dimensions
      * @param \Traversable $documents
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function saveIndex($dimensions, \Traversable $documents);
 
@@ -35,7 +33,6 @@ public function saveIndex($dimensions, \Traversable $documents);
      * @param Dimension[] $dimensions
      * @param \Traversable $documents
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function deleteIndex($dimensions, \Traversable $documents);
 
@@ -44,7 +41,6 @@ public function deleteIndex($dimensions, \Traversable $documents);
      *
      * @param Dimension[] $dimensions
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function cleanIndex($dimensions);
 
@@ -52,7 +48,6 @@ public function cleanIndex($dimensions);
      * Define if engine is available
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAvailable();
 }
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
index b454f3759f09d..82e8a26553b89 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api Instantiate save handler when implementing custom Indexer\Action
- * @since 2.0.0
  */
 class SaveHandlerFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param array $arguments
      * @throws \InvalidArgumentException
      * @return IndexerInterface
-     * @since 2.0.0
      */
     public function create($saveHandlerClass, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
index d099f27a6db0c..ef51206727f99 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver
  *
- * @since 2.0.0
  */
 class FlatScopeResolver implements IndexScopeResolverInterface
 {
@@ -20,13 +19,11 @@ class FlatScopeResolver implements IndexScopeResolverInterface
 
     /**
      * @var IndexScopeResolver
-     * @since 2.0.0
      */
     private $indexScopeResolver;
 
     /**
      * @param IndexScopeResolver $indexScopeResolver
-     * @since 2.0.0
      */
     public function __construct(IndexScopeResolver $indexScopeResolver)
     {
@@ -38,7 +35,6 @@ public function __construct(IndexScopeResolver $indexScopeResolver)
      * @param Dimension[] $dimensions
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function resolve($index, array $dimensions)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
index bb6f1fce8b90a..ab1f7d44e4317 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver
  *
- * @since 2.0.0
  */
 class IndexScopeResolver implements IndexScopeResolverInterface
 {
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.0.0
      */
     private $scopeResolver;
 
     /**
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -47,7 +43,6 @@ public function __construct(
      * @param string $index
      * @param Dimension[] $dimensions
      * @return string
-     * @since 2.0.0
      */
     public function resolve($index, array $dimensions)
     {
@@ -70,7 +65,6 @@ public function resolve($index, array $dimensions)
      *
      * @param Dimension $dimension
      * @return int
-     * @since 2.0.0
      */
     private function getScopeId($dimension)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/StateInterface.php b/lib/internal/Magento/Framework/Indexer/StateInterface.php
index ea1979255309b..124b8ab50b4b8 100644
--- a/lib/internal/Magento/Framework/Indexer/StateInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/StateInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api Retrieve status of the Indexer
- * @since 2.0.0
  */
 interface StateInterface
 {
@@ -22,7 +21,6 @@ interface StateInterface
      * Return indexer id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIndexerId();
 
@@ -31,7 +29,6 @@ public function getIndexerId();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setIndexerId($value);
 
@@ -39,7 +36,6 @@ public function setIndexerId($value);
      * Return status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -47,7 +43,6 @@ public function getStatus();
      * Return updated
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated();
 
@@ -56,7 +51,6 @@ public function getUpdated();
      *
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setUpdated($value);
 
@@ -65,7 +59,6 @@ public function setUpdated($value);
      *
      * @param string $indexerId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByIndexer($indexerId);
 
@@ -74,7 +67,6 @@ public function loadByIndexer($indexerId);
      *
      * @param string $status
      * @return $this
-     * @since 2.0.0
      */
     public function setStatus($status);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/StructureFactory.php b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
index a37ed45c7b8f9..c811af7ebe357 100644
--- a/lib/internal/Magento/Framework/Indexer/StructureFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Indexer\StructureFactory
  *
- * @since 2.0.0
  */
 class StructureFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param [] $arguments
      * @throws \InvalidArgumentException
      * @return IndexStructureInterface
-     * @since 2.0.0
      */
     public function create($className, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Table/Strategy.php b/lib/internal/Magento/Framework/Indexer/Table/Strategy.php
index 2293607348100..d54aed05514ef 100644
--- a/lib/internal/Magento/Framework/Indexer/Table/Strategy.php
+++ b/lib/internal/Magento/Framework/Indexer/Table/Strategy.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Indexer\Table\Strategy
  *
- * @since 2.0.0
  */
 class Strategy implements StrategyInterface
 {
@@ -16,7 +15,6 @@ class Strategy implements StrategyInterface
      * Application resource
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -24,7 +22,6 @@ class Strategy implements StrategyInterface
      * Constructor
      *
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource
@@ -36,13 +33,11 @@ public function __construct(
      * Use index table directly
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $useIdxTable = false;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUseIdxTable()
     {
@@ -51,7 +46,6 @@ public function getUseIdxTable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setUseIdxTable($value = false)
     {
@@ -61,7 +55,6 @@ public function setUseIdxTable($value = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTableName($tablePrefix)
     {
@@ -74,7 +67,6 @@ public function getTableName($tablePrefix)
      * @param string $tablePrefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function prepareTableName($tablePrefix)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/Table/StrategyInterface.php b/lib/internal/Magento/Framework/Indexer/Table/StrategyInterface.php
index f24d048b22baa..84882aa747ad3 100644
--- a/lib/internal/Magento/Framework/Indexer/Table/StrategyInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/Table/StrategyInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Framework\Indexer\Table\StrategyInterface
  *
- * @since 2.0.0
  */
 interface StrategyInterface
 {
@@ -22,7 +21,6 @@ interface StrategyInterface
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseIdxTable();
 
@@ -32,7 +30,6 @@ public function getUseIdxTable();
      * @param bool $value
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setUseIdxTable($value = false);
 
@@ -42,7 +39,6 @@ public function setUseIdxTable($value = false);
      * @param string $tablePrefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function prepareTableName($tablePrefix);
 
@@ -52,7 +48,6 @@ public function prepareTableName($tablePrefix);
      * @param string $tablePrefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTableName($tablePrefix);
 }
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 1144953bdff28..159e6ced8f0ef 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\Interception\Code\Generator\Interceptor
  *
- * @since 2.0.0
  */
 class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -21,7 +20,6 @@ class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
     /**
      * @param string $modelClassName
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultResultClassName($modelClassName)
     {
@@ -32,7 +30,6 @@ protected function _getDefaultResultClassName($modelClassName)
      * Returns list of properties for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -43,7 +40,6 @@ protected function _getClassProperties()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -70,7 +66,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns list of methods for class generator
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -91,7 +86,6 @@ protected function _getClassMethods()
      *
      * @param \ReflectionMethod $method
      * @return bool
-     * @since 2.0.0
      */
     protected function isInterceptedMethod(\ReflectionMethod $method)
     {
@@ -104,7 +98,6 @@ protected function isInterceptedMethod(\ReflectionMethod $method)
      *
      * @param \ReflectionMethod $method
      * @return array
-     * @since 2.0.0
      */
     protected function _getMethodInfo(\ReflectionMethod $method)
     {
@@ -134,7 +127,6 @@ protected function _getMethodInfo(\ReflectionMethod $method)
     /**
      * @param array $parameters
      * @return string
-     * @since 2.0.0
      */
     protected function _getParameterList(array $parameters)
     {
@@ -153,7 +145,6 @@ function ($item) {
      * Generate resulting class source code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -174,7 +165,6 @@ protected function _generateCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php b/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
index a8211f3dc4729..342035f2f1abf 100644
--- a/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
+++ b/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Interception\Code\InterfaceValidator
  *
- * @since 2.0.0
  */
 class InterfaceValidator
 {
@@ -25,13 +24,11 @@ class InterfaceValidator
      * Arguments reader model
      *
      * @var \Magento\Framework\Code\Reader\ArgumentsReader
-     * @since 2.0.0
      */
     protected $_argumentsReader;
 
     /**
      * @param \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null)
     {
@@ -48,7 +45,6 @@ public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argu
      * @throws ValidatorException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function validate($pluginClass, $interceptedType)
     {
@@ -145,7 +141,6 @@ public function validate($pluginClass, $interceptedType)
      *
      * @return void
      * @throws ValidatorException
-     * @since 2.0.0
      */
     protected function validateMethodsParameters(array $pluginParameters, array $originParameters, $class, $method)
     {
@@ -175,7 +170,6 @@ protected function validateMethodsParameters(array $pluginParameters, array $ori
      * @param \ReflectionParameter $parameter
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getParametersType(\ReflectionParameter $parameter)
     {
@@ -190,7 +184,6 @@ protected function getParametersType(\ReflectionParameter $parameter)
      * @param string $pluginMethodName
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function getOriginMethodName($pluginMethodName)
     {
@@ -213,7 +206,6 @@ protected function getOriginMethodName($pluginMethodName)
      * @param string $pluginMethodName
      *
      * @return null|string
-     * @since 2.0.0
      */
     protected function getMethodType($pluginMethodName)
     {
@@ -234,7 +226,6 @@ protected function getMethodType($pluginMethodName)
      * @param \ReflectionMethod $method
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getMethodParameters(\ReflectionMethod $method)
     {
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 86cdd84dccd5f..2f9941d8dd7d0 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Interception\Config\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Interception\ConfigInterface
 {
@@ -21,7 +20,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Type configuration
      *
      * @var \Magento\Framework\Interception\ObjectManager\ConfigInterface
-     * @since 2.0.0
      */
     protected $_omConfig;
 
@@ -29,7 +27,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Class relations info
      *
      * @var \Magento\Framework\ObjectManager\RelationsInterface
-     * @since 2.0.0
      */
     protected $_relations;
 
@@ -37,7 +34,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * List of interceptable classes
      *
      * @var \Magento\Framework\ObjectManager\DefinitionInterface
-     * @since 2.0.0
      */
     protected $_classDefinitions;
 
@@ -45,7 +41,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Cache
      *
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -53,7 +48,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Cache identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheId;
 
@@ -61,7 +55,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Configuration reader
      *
      * @var \Magento\Framework\Config\ReaderInterface
-     * @since 2.0.0
      */
     protected $_reader;
 
@@ -69,7 +62,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * Inherited list of intercepted types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_intercepted = [];
 
@@ -77,13 +69,11 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * List of class types that can not be pluginized
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serviceClassTypes = ['Interceptor'];
 
     /**
      * @var \Magento\Framework\Config\ScopeListInterface
-     * @since 2.0.0
      */
     protected $_scopeList;
 
@@ -104,7 +94,6 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions
      * @param string $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\ReaderInterface $reader,
@@ -138,7 +127,6 @@ public function __construct(
      *
      * @param array $classDefinitions
      * @return void
-     * @since 2.0.0
      */
     public function initialize($classDefinitions = [])
     {
@@ -167,7 +155,6 @@ public function initialize($classDefinitions = [])
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     protected function _inheritInterception($type)
     {
@@ -198,7 +185,6 @@ protected function _inheritInterception($type)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function hasPlugins($type)
     {
diff --git a/lib/internal/Magento/Framework/Interception/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ConfigInterface.php
index 4ff9bbfecbccf..00d45c7551731 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Interception\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function hasPlugins($type);
 
@@ -28,7 +26,6 @@ public function hasPlugins($type);
      *
      * @param array $classDefinitions
      * @return void
-     * @since 2.0.0
      */
     public function initialize($classDefinitions = []);
 }
diff --git a/lib/internal/Magento/Framework/Interception/Definition/Runtime.php b/lib/internal/Magento/Framework/Interception/Definition/Runtime.php
index 1ef067a42ef9e..c74a13c1daadc 100644
--- a/lib/internal/Magento/Framework/Interception/Definition/Runtime.php
+++ b/lib/internal/Magento/Framework/Interception/Definition/Runtime.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Framework\Interception\Definition\Runtime
  *
- * @since 2.0.0
  */
 class Runtime implements DefinitionInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_typesByPrefixes = [
         'befor' => self::LISTENER_BEFORE,
@@ -31,7 +29,6 @@ class Runtime implements DefinitionInterface
      * Plugin method service prefix lengths
      *
      * @var array
-     * @since 2.0.0
      */
     protected $prefixLengths = [
         self::LISTENER_BEFORE => 6,
@@ -44,7 +41,6 @@ class Runtime implements DefinitionInterface
      *
      * @param string $type
      * @return string[]
-     * @since 2.0.0
      */
     public function getMethodList($type)
     {
diff --git a/lib/internal/Magento/Framework/Interception/DefinitionInterface.php b/lib/internal/Magento/Framework/Interception/DefinitionInterface.php
index 93f4d76bf5a55..9d7c2d31966d0 100644
--- a/lib/internal/Magento/Framework/Interception/DefinitionInterface.php
+++ b/lib/internal/Magento/Framework/Interception/DefinitionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Interception\DefinitionInterface
  *
- * @since 2.0.0
  */
 interface DefinitionInterface
 {
@@ -25,7 +24,6 @@ interface DefinitionInterface
      *
      * @param string $type
      * @return string[]
-     * @since 2.0.0
      */
     public function getMethodList($type);
 }
diff --git a/lib/internal/Magento/Framework/Interception/Interceptor.php b/lib/internal/Magento/Framework/Interception/Interceptor.php
index 7e7ac7004b633..07600c5168181 100644
--- a/lib/internal/Magento/Framework/Interception/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Interceptor.php
@@ -15,7 +15,6 @@
  * Any class using this trait is required to implement \Magento\Framework\Interception\InterceptorInterface
  *
  * @see \Magento\Framework\Interception\InterceptorInterface
- * @since 2.0.0
  */
 trait Interceptor
 {
@@ -23,7 +22,6 @@ trait Interceptor
      * List of plugins
      *
      * @var PluginListInterface
-     * @since 2.0.0
      */
     private $pluginList;
 
@@ -31,7 +29,6 @@ trait Interceptor
      * Subject type name
      *
      * @var string
-     * @since 2.0.0
      */
     private $subjectType;
 
@@ -39,7 +36,6 @@ trait Interceptor
      * Initialize the Interceptor
      *
      * @return void
-     * @since 2.0.0
      */
     public function ___init()
     {
@@ -56,7 +52,6 @@ public function ___init()
      * @param string $method
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function ___callParent($method, array $arguments)
     {
@@ -67,7 +62,6 @@ public function ___callParent($method, array $arguments)
      * Calls parent class sleep if defined, otherwise provides own implementation
      *
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -84,7 +78,6 @@ public function __sleep()
      * Causes Interceptor to be initialized
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -101,7 +94,6 @@ public function __wakeup()
      * @param array $arguments
      * @param array $pluginInfo
      * @return mixed|null
-     * @since 2.0.0
      */
     protected function ___callPlugins($method, array $arguments, array $pluginInfo)
     {
diff --git a/lib/internal/Magento/Framework/Interception/InterceptorInterface.php b/lib/internal/Magento/Framework/Interception/InterceptorInterface.php
index 7c3aad4fd5d2e..451d8b5c599b7 100644
--- a/lib/internal/Magento/Framework/Interception/InterceptorInterface.php
+++ b/lib/internal/Magento/Framework/Interception/InterceptorInterface.php
@@ -10,7 +10,6 @@
  *
  * This interface exposes the parent method of the interception class, which allows the caller to bypass
  * the interception logic.
- * @since 2.0.0
  */
 interface InterceptorInterface
 {
@@ -20,7 +19,6 @@ interface InterceptorInterface
      * @param string $method
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function ___callParent($method, array $arguments);
 }
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
index 858ce5b5d436d..3d66f5259e5b1 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Framework\Interception\ObjectManager\Config\Compiled
  *
- * @since 2.0.0
  */
 class Compiled extends \Magento\Framework\ObjectManager\Config\Compiled implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\Interception\ConfigInterface
-     * @since 2.0.0
      */
     protected $interceptionConfig;
 
@@ -27,7 +25,6 @@ class Compiled extends \Magento\Framework\ObjectManager\Config\Compiled implemen
      *
      * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
      * @return void
-     * @since 2.0.0
      */
     public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig)
     {
@@ -39,7 +36,6 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
      *
      * @param string $instanceName
      * @return string
-     * @since 2.0.0
      */
     public function getOriginalInstanceType($instanceName)
     {
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
index 9147dcf10f287..615f656ebdd6a 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -15,13 +15,12 @@
 /**
  * Class \Magento\Framework\Interception\ObjectManager\Config\Developer
  *
- * @since 2.0.0
  */
 class Developer extends \Magento\Framework\ObjectManager\Config\Config implements ConfigInterface
 {
     /**
      * @var InterceptableValidator
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $interceptableValidator;
 
@@ -29,7 +28,7 @@ class Developer extends \Magento\Framework\ObjectManager\Config\Config implement
      * @param RelationsInterface $relations
      * @param DefinitionInterface $definitions
      * @param InterceptableValidator $interceptableValidator
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(
         RelationsInterface $relations = null,
@@ -42,7 +41,6 @@ public function __construct(
 
     /**
      * @var \Magento\Framework\Interception\ConfigInterface
-     * @since 2.0.0
      */
     protected $interceptionConfig;
 
@@ -51,7 +49,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
      * @return void
-     * @since 2.0.0
      */
     public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig)
     {
@@ -63,7 +60,6 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
      *
      * @param string $instanceName
      * @return string
-     * @since 2.0.0
      */
     public function getInstanceType($instanceName)
     {
@@ -81,7 +77,6 @@ public function getInstanceType($instanceName)
      *
      * @param string $instanceName
      * @return string
-     * @since 2.0.0
      */
     public function getOriginalInstanceType($instanceName)
     {
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
index f6756f9668918..441d96d0b1fa4 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Interception\ObjectManager\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface extends \Magento\Framework\ObjectManager\ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface extends \Magento\Framework\ObjectManager\ConfigInterfa
      *
      * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
      * @return void
-     * @since 2.0.0
      */
     public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig);
 
@@ -26,7 +24,6 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
      *
      * @param string $instanceName
      * @return string
-     * @since 2.0.0
      */
     public function getOriginalInstanceType($instanceName);
 }
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index a0e8e36034895..ff969b3280fae 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -22,7 +22,6 @@
  * Plugin config, provides list of plugins for a type
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PluginList extends Scoped implements InterceptionPluginList
 {
@@ -30,7 +29,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * Inherited plugin data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_inherited;
 
@@ -38,7 +36,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * Inherited plugin data, preprocessed for read
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_processed;
 
@@ -46,7 +43,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * Type config
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $_omConfig;
 
@@ -54,7 +50,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * Class relations information provider
      *
      * @var RelationsInterface
-     * @since 2.0.0
      */
     protected $_relations;
 
@@ -62,7 +57,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * List of interception methods per plugin
      *
      * @var DefinitionInterface
-     * @since 2.0.0
      */
     protected $_definitions;
 
@@ -70,19 +64,16 @@ class PluginList extends Scoped implements InterceptionPluginList
      * List of interceptable application classes
      *
      * @var ClassDefinitions
-     * @since 2.0.0
      */
     protected $_classDefinitions;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_pluginInstances = [];
 
@@ -113,7 +104,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         ReaderInterface $reader,
@@ -146,7 +136,6 @@ public function __construct(
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _inheritPlugins($type)
     {
@@ -220,7 +209,6 @@ protected function _inheritPlugins($type)
      *
      * @param array $plugins
      * @return void
-     * @since 2.0.0
      */
     private function trimInstanceStartingBackslash(&$plugins)
     {
@@ -235,7 +223,6 @@ private function trimInstanceStartingBackslash(&$plugins)
      * @param array $itemA
      * @param array $itemB
      * @return int
-     * @since 2.0.0
      */
     protected function _sort($itemA, $itemB)
     {
@@ -257,7 +244,6 @@ protected function _sort($itemA, $itemB)
      * @param string $type
      * @param string $code
      * @return mixed
-     * @since 2.0.0
      */
     public function getPlugin($type, $code)
     {
@@ -276,7 +262,6 @@ public function getPlugin($type, $code)
      * @param string $method
      * @param string $code
      * @return array
-     * @since 2.0.0
      */
     public function getNext($type, $method, $code = '__self')
     {
@@ -293,7 +278,6 @@ public function getNext($type, $method, $code = '__self')
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _loadScopedData()
     {
@@ -351,7 +335,6 @@ protected function _loadScopedData()
      *
      * @param string $scopeCode
      * @return bool
-     * @since 2.0.0
      */
     protected function isCurrentScope($scopeCode)
     {
@@ -362,7 +345,6 @@ protected function isCurrentScope($scopeCode)
      * Returns class definitions
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getClassDefinitions()
     {
@@ -374,7 +356,6 @@ protected function getClassDefinitions()
      *
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
diff --git a/lib/internal/Magento/Framework/Interception/PluginListInterface.php b/lib/internal/Magento/Framework/Interception/PluginListInterface.php
index ef09d6a925c92..00ee03cae5b75 100644
--- a/lib/internal/Magento/Framework/Interception/PluginListInterface.php
+++ b/lib/internal/Magento/Framework/Interception/PluginListInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Interception\PluginListInterface
  *
- * @since 2.0.0
  */
 interface PluginListInterface
 {
@@ -21,7 +20,6 @@ interface PluginListInterface
      * @param string $method
      * @param string $code
      * @return array
-     * @since 2.0.0
      */
     public function getNext($type, $method, $code = null);
 
@@ -31,7 +29,6 @@ public function getNext($type, $method, $code = null);
      * @param string $type
      * @param string $code
      * @return mixed
-     * @since 2.0.0
      */
     public function getPlugin($type, $code);
 }
diff --git a/lib/internal/Magento/Framework/Intl/DateTimeFactory.php b/lib/internal/Magento/Framework/Intl/DateTimeFactory.php
index a6838f995c1fb..f08bd91cb0746 100644
--- a/lib/internal/Magento/Framework/Intl/DateTimeFactory.php
+++ b/lib/internal/Magento/Framework/Intl/DateTimeFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class DateTimeFactory
  * @package Magento\Framework
- * @since 2.0.0
  */
 class DateTimeFactory
 {
@@ -18,7 +17,6 @@ class DateTimeFactory
      * @param string $time
      * @param \DateTimeZone $timezone
      * @return \DateTime
-     * @since 2.0.0
      */
     public function create($time = 'now', \DateTimeZone $timezone = null)
     {
diff --git a/lib/internal/Magento/Framework/Json/Decoder.php b/lib/internal/Magento/Framework/Json/Decoder.php
index 33b689732ab1e..bb0114a04bd4a 100644
--- a/lib/internal/Magento/Framework/Json/Decoder.php
+++ b/lib/internal/Magento/Framework/Json/Decoder.php
@@ -7,7 +7,6 @@
 
 /**
  * @deprecated 2.2.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
- * @since 2.0.0
  */
 class Decoder implements DecoderInterface
 {
@@ -16,7 +15,6 @@ class Decoder implements DecoderInterface
      *
      * @param string $data
      * @return mixed
-     * @since 2.0.0
      */
     public function decode($data)
     {
diff --git a/lib/internal/Magento/Framework/Json/DecoderInterface.php b/lib/internal/Magento/Framework/Json/DecoderInterface.php
index 83a30b62f39a8..2b475b92cbdc2 100644
--- a/lib/internal/Magento/Framework/Json/DecoderInterface.php
+++ b/lib/internal/Magento/Framework/Json/DecoderInterface.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @deprecated 2.2.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
- * @since 2.0.0
  */
 interface DecoderInterface
 {
@@ -20,7 +19,6 @@ interface DecoderInterface
      *
      * @param string $data
      * @return mixed
-     * @since 2.0.0
      */
     public function decode($data);
 }
diff --git a/lib/internal/Magento/Framework/Json/Encoder.php b/lib/internal/Magento/Framework/Json/Encoder.php
index df52b7b953ffe..192c85a693304 100644
--- a/lib/internal/Magento/Framework/Json/Encoder.php
+++ b/lib/internal/Magento/Framework/Json/Encoder.php
@@ -7,7 +7,6 @@
 
 /**
  * @deprecated 2.2.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
- * @since 2.0.0
  */
 class Encoder implements EncoderInterface
 {
@@ -15,13 +14,11 @@ class Encoder implements EncoderInterface
      * Translator
      *
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $translateInline;
 
     /**
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Translate\InlineInterface $translateInline)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\Translate\InlineInterface $transl
      *
      * @param mixed $data
      * @return string
-     * @since 2.0.0
      */
     public function encode($data)
     {
diff --git a/lib/internal/Magento/Framework/Json/EncoderInterface.php b/lib/internal/Magento/Framework/Json/EncoderInterface.php
index c02391c3c6118..cee9fb9b043a9 100644
--- a/lib/internal/Magento/Framework/Json/EncoderInterface.php
+++ b/lib/internal/Magento/Framework/Json/EncoderInterface.php
@@ -11,7 +11,6 @@
  * @api
  *
  * @deprecated 2.2.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
- * @since 2.0.0
  */
 interface EncoderInterface
 {
@@ -20,7 +19,6 @@ interface EncoderInterface
      *
      * @param mixed $data
      * @return string
-     * @since 2.0.0
      */
     public function encode($data);
 }
diff --git a/lib/internal/Magento/Framework/Json/Helper/Data.php b/lib/internal/Magento/Framework/Json/Helper/Data.php
index 91d923bad4436..f222352b15a26 100644
--- a/lib/internal/Magento/Framework/Json/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Json/Helper/Data.php
@@ -9,19 +9,16 @@
  * Json data helper
  *
  * @deprecated 2.2.0 @see \Magento\Framework\Serialize\Serializer\Json
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\Json\DecoderInterface
-     * @since 2.0.0
      */
     protected $jsonDecoder;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $jsonEncoder;
 
@@ -29,7 +26,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Json\DecoderInterface $jsonDecoder
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -46,7 +42,6 @@ public function __construct(
      *
      * @param mixed $valueToEncode
      * @return string
-     * @since 2.0.0
      */
     public function jsonEncode($valueToEncode)
     {
@@ -59,7 +54,6 @@ public function jsonEncode($valueToEncode)
      *
      * @param string $encodedValue
      * @return mixed
-     * @since 2.0.0
      */
     public function jsonDecode($encodedValue)
     {
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php
index c062c72faba42..bf9393f3b8a65 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Locale\Bundle\CurrencyBundle
  *
- * @since 2.0.0
  */
 class CurrencyBundle extends DataBundle
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'ICUDATA-curr';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
index 9eee83f966509..caa56a2a61ce2 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Locale\Bundle\DataBundle
  *
- * @since 2.0.0
  */
 class DataBundle
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'ICUDATA';
 
     /**
      * @var \ResourceBundle[][]
-     * @since 2.0.0
      */
     protected static $bundles = [];
 
@@ -29,7 +26,6 @@ class DataBundle
      *
      * @param string $locale
      * @return \ResourceBundle
-     * @since 2.0.0
      */
     public function get($locale)
     {
@@ -49,7 +45,6 @@ public function get($locale)
      * @param string $locale
      * @param string $path
      * @return null|\ResourceBundle
-     * @since 2.0.0
      */
     protected function createResourceBundle($locale, $path)
     {
@@ -67,7 +62,6 @@ protected function createResourceBundle($locale, $path)
      *
      * @param string $locale
      * @return string
-     * @since 2.0.0
      */
     protected function cleanLocale($locale)
     {
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php
index ec9e5dac8a972..eee2b4daa09b8 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Locale\Bundle\LanguageBundle
  *
- * @since 2.0.0
  */
 class LanguageBundle extends DataBundle
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'ICUDATA-lang';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php
index 8dcffb9debc8c..af0176546ac9b 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Locale\Bundle\RegionBundle
  *
- * @since 2.0.0
  */
 class RegionBundle extends DataBundle
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'ICUDATA-region';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php
index 52a222a558552..a545dd95e2a13 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Locale\Bundle\TimezoneBundle
  *
- * @since 2.0.0
  */
 class TimezoneBundle extends DataBundle
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $path = 'ICUDATA-zone';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
index 934e153ff9bed..314f964e14502 100644
--- a/lib/internal/Magento/Framework/Locale/Config.php
+++ b/lib/internal/Magento/Framework/Locale/Config.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Locale\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Locale\ConfigInterface
 {
@@ -16,7 +15,6 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
      * List of allowed locales
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedLocales = [
         'af_ZA', /*Afrikaans (South Africa)*/
@@ -113,7 +111,6 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
      * List of allowed currencies
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedCurrencies = [
         'AFN', /*Afghani*/
@@ -290,7 +287,6 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
 
     /**
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -305,7 +301,6 @@ public function __construct(array $data = [])
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getAllowedLocales()
     {
@@ -314,7 +309,6 @@ public function getAllowedLocales()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getAllowedCurrencies()
     {
diff --git a/lib/internal/Magento/Framework/Locale/ConfigInterface.php b/lib/internal/Magento/Framework/Locale/ConfigInterface.php
index 052247a2da6cf..e5f8bc00e5466 100644
--- a/lib/internal/Magento/Framework/Locale/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Provides access to locale-related config information
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Get list pre-configured allowed locales
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllowedLocales();
 
@@ -25,7 +23,6 @@ public function getAllowedLocales();
      * Get list pre-configured allowed currencies
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAllowedCurrencies();
 }
diff --git a/lib/internal/Magento/Framework/Locale/Currency.php b/lib/internal/Magento/Framework/Locale/Currency.php
index 4da28a190aebd..a7e3a5f2bafd3 100644
--- a/lib/internal/Magento/Framework/Locale/Currency.php
+++ b/lib/internal/Magento/Framework/Locale/Currency.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Locale\Currency
  *
- * @since 2.0.0
  */
 class Currency implements \Magento\Framework\Locale\CurrencyInterface
 {
@@ -30,7 +29,6 @@ class Currency implements \Magento\Framework\Locale\CurrencyInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected static $_currencyCache = [];
 
@@ -38,19 +36,16 @@ class Currency implements \Magento\Framework\Locale\CurrencyInterface
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Framework\CurrencyFactory
-     * @since 2.0.0
      */
     protected $_currencyFactory;
 
@@ -58,7 +53,6 @@ class Currency implements \Magento\Framework\Locale\CurrencyInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param ResolverInterface $localeResolver
      * @param \Magento\Framework\CurrencyFactory $currencyFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -72,7 +66,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getDefaultCurrency()
     {
@@ -81,7 +74,6 @@ public function getDefaultCurrency()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getCurrency($currency)
     {
diff --git a/lib/internal/Magento/Framework/Locale/CurrencyInterface.php b/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
index 34ce6ad4eeaf2..e52ac551f54ec 100644
--- a/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
@@ -9,7 +9,6 @@
  * Provides access to currency config information
  *
  * @api
- * @since 2.0.0
  */
 interface CurrencyInterface
 {
@@ -17,7 +16,6 @@ interface CurrencyInterface
      * Retrieve default currency code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultCurrency();
 
@@ -26,7 +24,6 @@ public function getDefaultCurrency();
      *
      * @param   string $currency
      * @return  \Magento\Framework\Currency
-     * @since 2.0.0
      */
     public function getCurrency($currency);
 }
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index 3b2e744005772..7fd4b3f25286b 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Framework\Locale\Format
  *
- * @since 2.0.0
  */
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $_scopeResolver;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
-     * @since 2.0.0
      */
     protected $currencyFactory;
 
@@ -34,7 +30,6 @@ class Format implements \Magento\Framework\Locale\FormatInterface
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param ResolverInterface $localeResolver
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
@@ -62,7 +57,6 @@ public function __construct(
      *
      * @param string|float|int $value
      * @return float|null
-     * @since 2.0.0
      */
     public function getNumber($value)
     {
@@ -99,7 +93,6 @@ public function getNumber($value)
      * @param string $localeCode Locale code.
      * @param string $currencyCode Currency code.
      * @return array
-     * @since 2.0.0
      */
     public function getPriceFormat($localeCode = null, $currencyCode = null)
     {
diff --git a/lib/internal/Magento/Framework/Locale/FormatInterface.php b/lib/internal/Magento/Framework/Locale/FormatInterface.php
index c5b057df4fcd8..1312c8841c23b 100644
--- a/lib/internal/Magento/Framework/Locale/FormatInterface.php
+++ b/lib/internal/Magento/Framework/Locale/FormatInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface FormatInterface
 {
@@ -27,7 +26,6 @@ interface FormatInterface
      *
      * @param string|float|int $value
      * @return float|null
-     * @since 2.0.0
      */
     public function getNumber($value);
 
@@ -36,7 +34,6 @@ public function getNumber($value);
      * formatCurrency in js/varien/js.js
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPriceFormat();
 }
diff --git a/lib/internal/Magento/Framework/Locale/ListsInterface.php b/lib/internal/Magento/Framework/Locale/ListsInterface.php
index 2cd8718e99ab4..22e9bf00ebce7 100644
--- a/lib/internal/Magento/Framework/Locale/ListsInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ListsInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ListsInterface extends OptionInterface
 {
@@ -15,7 +14,6 @@ interface ListsInterface extends OptionInterface
      * Retrieve timezone option list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionTimezones();
 
@@ -26,7 +24,6 @@ public function getOptionTimezones();
      * @param bool $ucFirstCode
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false);
 
@@ -34,7 +31,6 @@ public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false);
      * Retrieve country option list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionCountries();
 
@@ -42,7 +38,6 @@ public function getOptionCountries();
      * Retrieve currency option list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionCurrencies();
 
@@ -50,7 +45,6 @@ public function getOptionCurrencies();
      * Retrieve all currency option list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptionAllCurrencies();
 
@@ -60,7 +54,6 @@ public function getOptionAllCurrencies();
      * @param  string $value  Name to get detailed information about
      * @param  string $locale Optional locale string
      * @return string
-     * @since 2.0.0
      */
     public function getCountryTranslation($value, $locale = null);
 }
diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index 0c64abd6481c6..0aa7dd2fb73fd 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Locale\Resolver
  *
- * @since 2.0.0
  */
 class Resolver implements ResolverInterface
 {
@@ -23,7 +22,6 @@ class Resolver implements ResolverInterface
      * Default locale code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $defaultLocale;
 
@@ -31,7 +29,6 @@ class Resolver implements ResolverInterface
      * Scope type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $scopeType;
 
@@ -39,13 +36,11 @@ class Resolver implements ResolverInterface
      * Locale code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $locale;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -53,7 +48,6 @@ class Resolver implements ResolverInterface
      * Emulated locales stack
      *
      * @var array
-     * @since 2.0.0
      */
     protected $emulatedLocales = [];
 
@@ -62,7 +56,6 @@ class Resolver implements ResolverInterface
      * @param string $defaultLocalePath
      * @param string $scopeType
      * @param mixed $locale
-     * @since 2.0.0
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -78,7 +71,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultLocalePath()
     {
@@ -87,7 +79,6 @@ public function getDefaultLocalePath()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDefaultLocale($locale)
     {
@@ -97,7 +88,6 @@ public function setDefaultLocale($locale)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultLocale()
     {
@@ -113,7 +103,6 @@ public function getDefaultLocale()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setLocale($locale = null)
     {
@@ -127,7 +116,6 @@ public function setLocale($locale = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -139,7 +127,6 @@ public function getLocale()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function emulate($scopeId)
     {
@@ -160,7 +147,6 @@ public function emulate($scopeId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function revert()
     {
diff --git a/lib/internal/Magento/Framework/Locale/ResolverInterface.php b/lib/internal/Magento/Framework/Locale/ResolverInterface.php
index a2b1c783c6e25..22ec8fb70304c 100644
--- a/lib/internal/Magento/Framework/Locale/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ResolverInterface.php
@@ -9,7 +9,6 @@
  * Manages locale config information
  *
  * @api
- * @since 2.0.0
  */
 interface ResolverInterface
 {
@@ -17,7 +16,6 @@ interface ResolverInterface
      * Return path to default locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultLocalePath();
 
@@ -26,7 +24,6 @@ public function getDefaultLocalePath();
      *
      * @param   string $locale
      * @return  self
-     * @since 2.0.0
      */
     public function setDefaultLocale($locale);
 
@@ -34,7 +31,6 @@ public function setDefaultLocale($locale);
      * Retrieve default locale code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultLocale();
 
@@ -43,7 +39,6 @@ public function getDefaultLocale();
      *
      * @param   string $locale
      * @return  self
-     * @since 2.0.0
      */
     public function setLocale($locale = null);
 
@@ -51,7 +46,6 @@ public function setLocale($locale = null);
      * Retrieve locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale();
 
@@ -60,7 +54,6 @@ public function getLocale();
      *
      * @param int $scopeId
      * @return string|null
-     * @since 2.0.0
      */
     public function emulate($scopeId);
 
@@ -68,7 +61,6 @@ public function emulate($scopeId);
      * Get last locale, used before last emulation
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function revert();
 }
diff --git a/lib/internal/Magento/Framework/Locale/TranslatedLists.php b/lib/internal/Magento/Framework/Locale/TranslatedLists.php
index 998f5a2b246ab..de46523979720 100644
--- a/lib/internal/Magento/Framework/Locale/TranslatedLists.php
+++ b/lib/internal/Magento/Framework/Locale/TranslatedLists.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Framework\Locale\TranslatedLists
  *
- * @since 2.0.0
  */
 class TranslatedLists implements ListsInterface
 {
     /**
      * @var \Magento\Framework\Locale\ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
@@ -34,7 +31,6 @@ class TranslatedLists implements ListsInterface
      * @param \Magento\Framework\Locale\ConfigInterface $config
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param string $locale
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Locale\ConfigInterface $config,
@@ -50,7 +46,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionLocales()
     {
@@ -59,7 +54,6 @@ public function getOptionLocales()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getTranslatedOptionLocales()
     {
@@ -72,7 +66,6 @@ public function getTranslatedOptionLocales()
      * @param   bool $translatedName translation flag
      * @return  array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getOptionLocales($translatedName = false)
     {
@@ -108,7 +101,6 @@ protected function _getOptionLocales($translatedName = false)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionTimezones()
     {
@@ -127,7 +119,6 @@ public function getOptionTimezones()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
     {
@@ -144,7 +135,6 @@ public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionCountries()
     {
@@ -158,7 +148,6 @@ public function getOptionCountries()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionCurrencies()
     {
@@ -176,7 +165,6 @@ public function getOptionCurrencies()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getOptionAllCurrencies()
     {
@@ -194,7 +182,6 @@ public function getOptionAllCurrencies()
     /**
      * @param array $option
      * @return array
-     * @since 2.0.0
      */
     protected function _sortOptionArray($option)
     {
@@ -212,7 +199,6 @@ protected function _sortOptionArray($option)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getCountryTranslation($value, $locale = null)
     {
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Base.php b/lib/internal/Magento/Framework/Logger/Handler/Base.php
index c5acfad5e5630..3e16e7c6748fb 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/Base.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/Base.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Framework\Logger\Handler\Base
  *
- * @since 2.0.0
  */
 class Base extends StreamHandler
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileName;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $loggerType = Logger::DEBUG;
 
     /**
      * @var DriverInterface
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -40,7 +36,6 @@ class Base extends StreamHandler
      * @param DriverInterface $filesystem
      * @param string $filePath
      * @param string $fileName
-     * @since 2.0.0
      */
     public function __construct(
         DriverInterface $filesystem,
@@ -86,7 +81,6 @@ private function sanitizeFileName($fileName)
      * @param $record array
      *
      * @return void
-     * @since 2.0.0
      */
     public function write(array $record)
     {
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Debug.php b/lib/internal/Magento/Framework/Logger/Handler/Debug.php
index e87218e1efad2..a3a3ba2fe8ec7 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/Debug.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/Debug.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Logger\Handler\Debug
  *
- * @since 2.0.0
  */
 class Debug extends Base
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileName = '/var/log/debug.log';
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $loggerType = Logger::DEBUG;
 }
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Exception.php b/lib/internal/Magento/Framework/Logger/Handler/Exception.php
index b62911fb95bc3..8f926a0a77051 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/Exception.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/Exception.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Logger\Handler\Exception
  *
- * @since 2.0.0
  */
 class Exception extends Base
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileName = '/var/log/exception.log';
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $loggerType = Logger::INFO;
 }
diff --git a/lib/internal/Magento/Framework/Logger/Handler/System.php b/lib/internal/Magento/Framework/Logger/Handler/System.php
index 6ef8bd44f2e23..4e7c5ffbabdb1 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/System.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/System.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Framework\Logger\Handler\System
  *
- * @since 2.0.0
  */
 class System extends Base
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileName = '/var/log/system.log';
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $loggerType = Logger::INFO;
 
     /**
      * @var Exception
-     * @since 2.0.0
      */
     protected $exceptionHandler;
 
@@ -38,7 +34,6 @@ class System extends Base
      * @param DriverInterface $filesystem
      * @param Exception $exceptionHandler
      * @param string $filePath
-     * @since 2.0.0
      */
     public function __construct(
         DriverInterface $filesystem,
@@ -54,7 +49,6 @@ public function __construct(
      *
      * @param $record array The record metadata
      * @return void
-     * @since 2.0.0
      */
     public function write(array $record)
     {
diff --git a/lib/internal/Magento/Framework/Logger/Monolog.php b/lib/internal/Magento/Framework/Logger/Monolog.php
index 8931db46241e4..e696b4479dae6 100644
--- a/lib/internal/Magento/Framework/Logger/Monolog.php
+++ b/lib/internal/Magento/Framework/Logger/Monolog.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Logger\Monolog
  *
- * @since 2.0.0
  */
 class Monolog extends Logger
 {
@@ -36,7 +35,6 @@ public function __construct($name, array $handlers = [], array $processors = [])
      * @param string $message The log message
      * @param array $context The log context
      * @return Boolean Whether the record has been processed
-     * @since 2.0.0
      */
     public function addRecord($level, $message, array $context = [])
     {
diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 099c1e4c041d0..242dd42d6d6ba 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Framework\Mail\Message
  *
- * @since 2.0.0
  */
 class Message extends \Zend_Mail implements MessageInterface
 {
     /**
      * @param string $charset
-     * @since 2.0.0
      */
     public function __construct($charset = 'utf-8')
     {
@@ -27,7 +25,6 @@ public function __construct($charset = 'utf-8')
      * Message type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $messageType = self::TYPE_TEXT;
 
@@ -36,7 +33,6 @@ public function __construct($charset = 'utf-8')
      *
      * @param string $body
      * @return $this
-     * @since 2.0.0
      */
     public function setBody($body)
     {
@@ -47,7 +43,6 @@ public function setBody($body)
      * Set message body
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBody()
     {
@@ -59,7 +54,6 @@ public function getBody()
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setMessageType($type)
     {
diff --git a/lib/internal/Magento/Framework/Mail/MessageInterface.php b/lib/internal/Magento/Framework/Mail/MessageInterface.php
index 9995d6327e550..868f2a4c9cfa9 100644
--- a/lib/internal/Magento/Framework/Mail/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Mail/MessageInterface.php
@@ -9,7 +9,6 @@
  * Mail Message interface
  *
  * @api
- * @since 2.0.0
  */
 interface MessageInterface
 {
@@ -25,7 +24,6 @@ interface MessageInterface
      *
      * @param string $subject
      * @return $this
-     * @since 2.0.0
      */
     public function setSubject($subject);
 
@@ -33,7 +31,6 @@ public function setSubject($subject);
      * Get message subject
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubject();
 
@@ -42,7 +39,6 @@ public function getSubject();
      *
      * @param mixed $body
      * @return $this
-     * @since 2.0.0
      */
     public function setBody($body);
 
@@ -50,7 +46,6 @@ public function setBody($body);
      * Get message body
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getBody();
 
@@ -59,7 +54,6 @@ public function getBody();
      *
      * @param string|array $fromAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setFrom($fromAddress);
 
@@ -68,7 +62,6 @@ public function setFrom($fromAddress);
      *
      * @param string|array $toAddress
      * @return $this
-     * @since 2.0.0
      */
     public function addTo($toAddress);
 
@@ -77,7 +70,6 @@ public function addTo($toAddress);
      *
      * @param string|array $ccAddress
      * @return $this
-     * @since 2.0.0
      */
     public function addCc($ccAddress);
 
@@ -86,7 +78,6 @@ public function addCc($ccAddress);
      *
      * @param string|array $bccAddress
      * @return $this
-     * @since 2.0.0
      */
     public function addBcc($bccAddress);
 
@@ -95,7 +86,6 @@ public function addBcc($bccAddress);
      *
      * @param string|array $replyToAddress
      * @return $this
-     * @since 2.0.0
      */
     public function setReplyTo($replyToAddress);
 
@@ -104,7 +94,6 @@ public function setReplyTo($replyToAddress);
      *
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function setMessageType($type);
 }
diff --git a/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php b/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
index 814eecacd98ef..b4e6cb46045fe 100644
--- a/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
@@ -9,7 +9,6 @@
  * High-level interface for mail templates data that hides format from the client code
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Retrieve unique identifiers of all available email templates
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAvailableTemplates();
 
@@ -26,7 +24,6 @@ public function getAvailableTemplates();
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateLabel($templateId);
 
@@ -35,7 +32,6 @@ public function getTemplateLabel($templateId);
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateType($templateId);
 
@@ -44,7 +40,6 @@ public function getTemplateType($templateId);
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateModule($templateId);
 
@@ -53,7 +48,6 @@ public function getTemplateModule($templateId);
      *
      * @param string $templateId
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateArea($templateId);
 
@@ -63,7 +57,6 @@ public function getTemplateArea($templateId);
      * @param string $templateId
      * @param array|null $designParams
      * @return string
-     * @since 2.0.0
      */
     public function getTemplateFilename($templateId, $designParams = []);
 }
diff --git a/lib/internal/Magento/Framework/Mail/Template/Factory.php b/lib/internal/Magento/Framework/Mail/Template/Factory.php
index 907398bca6075..1d2384c019041 100644
--- a/lib/internal/Magento/Framework/Mail/Template/Factory.php
+++ b/lib/internal/Magento/Framework/Mail/Template/Factory.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\Mail\Template\Factory
  *
- * @since 2.0.0
  */
 class Factory implements \Magento\Framework\Mail\Template\FactoryInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($identifier, $namespace = null)
     {
diff --git a/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php b/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
index cb8d462271688..4e88a9897e4a2 100644
--- a/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
@@ -9,7 +9,6 @@
  * Mail Template Factory interface
  *
  * @api
- * @since 2.0.0
  */
 interface FactoryInterface
 {
@@ -19,7 +18,6 @@ interface FactoryInterface
      * @param string $identifier
      * @param null|string $namespace
      * @return \Magento\Framework\Mail\TemplateInterface
-     * @since 2.0.0
      */
     public function get($identifier, $namespace = null);
 }
diff --git a/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php b/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
index 69d0d2c4659f9..89fcb7478bdf5 100644
--- a/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
@@ -9,7 +9,6 @@
  * Mail Sender Resolver interface
  *
  * @api
- * @since 2.0.0
  */
 interface SenderResolverInterface
 {
@@ -21,7 +20,6 @@ interface SenderResolverInterface
      * @param string|array $sender
      * @param int|null $scopeId
      * @return array an array with 'name' and 'email' key/value pairs
-     * @since 2.0.0
      */
     public function resolve($sender, $scopeId = null);
 }
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index b86a62124b7dd..18b241d77a426 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class TransportBuilder
 {
@@ -23,7 +22,6 @@ class TransportBuilder
      * Template Identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $templateIdentifier;
 
@@ -31,7 +29,6 @@ class TransportBuilder
      * Template Model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $templateModel;
 
@@ -39,7 +36,6 @@ class TransportBuilder
      * Template Variables
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateVars;
 
@@ -47,7 +43,6 @@ class TransportBuilder
      * Template Options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $templateOptions;
 
@@ -55,7 +50,6 @@ class TransportBuilder
      * Mail Transport
      *
      * @var \Magento\Framework\Mail\TransportInterface
-     * @since 2.0.0
      */
     protected $transport;
 
@@ -63,7 +57,6 @@ class TransportBuilder
      * Template Factory
      *
      * @var FactoryInterface
-     * @since 2.0.0
      */
     protected $templateFactory;
 
@@ -71,7 +64,6 @@ class TransportBuilder
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -79,7 +71,6 @@ class TransportBuilder
      * Message
      *
      * @var \Magento\Framework\Mail\Message
-     * @since 2.0.0
      */
     protected $message;
 
@@ -87,13 +78,11 @@ class TransportBuilder
      * Sender resolver
      *
      * @var \Magento\Framework\Mail\Template\SenderResolverInterface
-     * @since 2.0.0
      */
     protected $_senderResolver;
 
     /**
      * @var \Magento\Framework\Mail\TransportInterfaceFactory
-     * @since 2.0.0
      */
     protected $mailTransportFactory;
 
@@ -103,7 +92,6 @@ class TransportBuilder
      * @param SenderResolverInterface $senderResolver
      * @param ObjectManagerInterface $objectManager
      * @param TransportInterfaceFactory $mailTransportFactory
-     * @since 2.0.0
      */
     public function __construct(
         FactoryInterface $templateFactory,
@@ -125,7 +113,6 @@ public function __construct(
      * @param array|string $address
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function addCc($address, $name = '')
     {
@@ -139,7 +126,6 @@ public function addCc($address, $name = '')
      * @param array|string $address
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function addTo($address, $name = '')
     {
@@ -152,7 +138,6 @@ public function addTo($address, $name = '')
      *
      * @param array|string $address
      * @return $this
-     * @since 2.0.0
      */
     public function addBcc($address)
     {
@@ -166,7 +151,6 @@ public function addBcc($address)
      * @param string $email
      * @param string|null $name
      * @return $this
-     * @since 2.0.0
      */
     public function setReplyTo($email, $name = null)
     {
@@ -179,7 +163,6 @@ public function setReplyTo($email, $name = null)
      *
      * @param string|array $from
      * @return $this
-     * @since 2.0.0
      */
     public function setFrom($from)
     {
@@ -193,7 +176,6 @@ public function setFrom($from)
      *
      * @param string $templateIdentifier
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateIdentifier($templateIdentifier)
     {
@@ -206,7 +188,6 @@ public function setTemplateIdentifier($templateIdentifier)
      *
      * @param string $templateModel
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateModel($templateModel)
     {
@@ -219,7 +200,6 @@ public function setTemplateModel($templateModel)
      *
      * @param array $templateVars
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateVars($templateVars)
     {
@@ -232,7 +212,6 @@ public function setTemplateVars($templateVars)
      *
      * @param array $templateOptions
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplateOptions($templateOptions)
     {
@@ -244,7 +223,6 @@ public function setTemplateOptions($templateOptions)
      * Get mail transport
      *
      * @return \Magento\Framework\Mail\TransportInterface
-     * @since 2.0.0
      */
     public function getTransport()
     {
@@ -259,7 +237,6 @@ public function getTransport()
      * Reset object state
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function reset()
     {
@@ -274,7 +251,6 @@ protected function reset()
      * Get template
      *
      * @return \Magento\Framework\Mail\TemplateInterface
-     * @since 2.0.0
      */
     protected function getTemplate()
     {
@@ -287,7 +263,6 @@ protected function getTemplate()
      * Prepare message
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function prepareMessage()
     {
diff --git a/lib/internal/Magento/Framework/Mail/TemplateInterface.php b/lib/internal/Magento/Framework/Mail/TemplateInterface.php
index 32aa27aaf97ae..ad13772876ea1 100644
--- a/lib/internal/Magento/Framework/Mail/TemplateInterface.php
+++ b/lib/internal/Magento/Framework/Mail/TemplateInterface.php
@@ -9,7 +9,6 @@
  * Mail Template interface
  *
  * @api
- * @since 2.0.0
  */
 interface TemplateInterface extends \Magento\Framework\App\TemplateTypesInterface
 {
@@ -17,7 +16,6 @@ interface TemplateInterface extends \Magento\Framework\App\TemplateTypesInterfac
      * Get processed template
      *
      * @return string
-     * @since 2.0.0
      */
     public function processTemplate();
 
@@ -25,7 +23,6 @@ public function processTemplate();
      * Get processed subject
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSubject();
 
@@ -34,7 +31,6 @@ public function getSubject();
      *
      * @param array $vars
      * @return $this
-     * @since 2.0.0
      */
     public function setVars(array $vars);
 
@@ -43,7 +39,6 @@ public function setVars(array $vars);
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions(array $options);
 }
diff --git a/lib/internal/Magento/Framework/Mail/Transport.php b/lib/internal/Magento/Framework/Mail/Transport.php
index 6c50635255be9..3fe3bcdd82ad1 100644
--- a/lib/internal/Magento/Framework/Mail/Transport.php
+++ b/lib/internal/Magento/Framework/Mail/Transport.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Mail\Transport
  *
- * @since 2.0.0
  */
 class Transport extends \Zend_Mail_Transport_Sendmail implements \Magento\Framework\Mail\TransportInterface
 {
     /**
      * @var \Magento\Framework\Mail\MessageInterface
-     * @since 2.0.0
      */
     protected $_message;
 
@@ -23,7 +21,6 @@ class Transport extends \Zend_Mail_Transport_Sendmail implements \Magento\Framew
      * @param MessageInterface $message
      * @param null $parameters
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Mail\MessageInterface $message, $parameters = null)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\Mail\MessageInterface $message, $
      *
      * @return void
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function sendMessage()
     {
diff --git a/lib/internal/Magento/Framework/Mail/TransportInterface.php b/lib/internal/Magento/Framework/Mail/TransportInterface.php
index b807753f93a42..bac50afb9ac34 100644
--- a/lib/internal/Magento/Framework/Mail/TransportInterface.php
+++ b/lib/internal/Magento/Framework/Mail/TransportInterface.php
@@ -9,7 +9,6 @@
  * Mail Transport interface
  *
  * @api
- * @since 2.0.0
  */
 interface TransportInterface
 {
@@ -18,7 +17,6 @@ interface TransportInterface
      *
      * @return void
      * @throws \Magento\Framework\Exception\MailException
-     * @since 2.0.0
      */
     public function sendMessage();
 
diff --git a/lib/internal/Magento/Framework/Mail/TransportInterfaceFactory.php b/lib/internal/Magento/Framework/Mail/TransportInterfaceFactory.php
index c3765b56abfb6..db86275954cbd 100644
--- a/lib/internal/Magento/Framework/Mail/TransportInterfaceFactory.php
+++ b/lib/internal/Magento/Framework/Mail/TransportInterfaceFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory class for \Magento\Framework\Mail\TransportInterface
- * @since 2.0.0
  */
 class TransportInterfaceFactory
 {
@@ -16,7 +15,6 @@ class TransportInterfaceFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class TransportInterfaceFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -33,7 +30,6 @@ class TransportInterfaceFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Mail\TransportInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Math/Calculator.php b/lib/internal/Magento/Framework/Math/Calculator.php
index a7db88abab92c..c09f90d4be4da 100644
--- a/lib/internal/Magento/Framework/Math/Calculator.php
+++ b/lib/internal/Magento/Framework/Math/Calculator.php
@@ -9,7 +9,6 @@
  * Calculations Library
  *
  * @api
- * @since 2.0.0
  */
 class Calculator
 {
@@ -17,19 +16,16 @@ class Calculator
      * Delta collected during rounding steps
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_delta = 0.0;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface|null
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency)
     {
@@ -42,7 +38,6 @@ public function __construct(\Magento\Framework\Pricing\PriceCurrencyInterface $p
      * @param float $price
      * @param bool $negative Indicates if we perform addition (true) or subtraction (false) of rounded value
      * @return float
-     * @since 2.0.0
      */
     public function deltaRound($price, $negative = false)
     {
diff --git a/lib/internal/Magento/Framework/Math/Division.php b/lib/internal/Magento/Framework/Math/Division.php
index ce52e5a4fe302..820a11b80dea9 100644
--- a/lib/internal/Magento/Framework/Math/Division.php
+++ b/lib/internal/Magento/Framework/Math/Division.php
@@ -9,7 +9,6 @@
  * Division library
  *
  * @api
- * @since 2.0.0
  */
 class Division
 {
@@ -24,7 +23,6 @@ class Division
      * @param float|int $dividend
      * @param float|int $divisor
      * @return float|int
-     * @since 2.0.0
      */
     public function getExactDivision($dividend, $divisor)
     {
diff --git a/lib/internal/Magento/Framework/Math/Random.php b/lib/internal/Magento/Framework/Math/Random.php
index f79693030b2b0..7cb70c9a822cc 100644
--- a/lib/internal/Magento/Framework/Math/Random.php
+++ b/lib/internal/Magento/Framework/Math/Random.php
@@ -9,7 +9,6 @@
  * Random data generator
  *
  * @api
- * @since 2.0.0
  */
 class Random
 {
@@ -31,7 +30,6 @@ class Random
      * @param null|string $chars
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getRandomString($length, $chars = null)
     {
@@ -73,7 +71,6 @@ public function getRandomString($length, $chars = null)
      * @param $max [optional]
      * @return int A random integer value between min (or 0) and max
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public static function getRandomNumber($min = 0, $max = null)
     {
@@ -108,7 +105,6 @@ public static function getRandomNumber($min = 0, $max = null)
      *
      * @param string $prefix
      * @return string
-     * @since 2.0.0
      */
     public function getUniqueHash($prefix = '')
     {
diff --git a/lib/internal/Magento/Framework/Message/AbstractMessage.php b/lib/internal/Magento/Framework/Message/AbstractMessage.php
index f2ccee860f633..85789bca9047c 100644
--- a/lib/internal/Magento/Framework/Message/AbstractMessage.php
+++ b/lib/internal/Magento/Framework/Message/AbstractMessage.php
@@ -9,37 +9,31 @@
  * Abstract message model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractMessage implements MessageInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $text;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $identifier;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isSticky = false;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
     /**
      * @param string $text
-     * @since 2.0.0
      */
     public function __construct(
         $text = null
@@ -51,7 +45,6 @@ public function __construct(
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function getType();
 
@@ -59,7 +52,6 @@ abstract public function getType();
      * Getter for text of message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -71,7 +63,6 @@ public function getText()
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function setText($text)
     {
@@ -84,7 +75,6 @@ public function setText($text)
      *
      * @param string $identifier
      * @return $this
-     * @since 2.0.0
      */
     public function setIdentifier($identifier)
     {
@@ -96,7 +86,6 @@ public function setIdentifier($identifier)
      * Getter message identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier()
     {
@@ -108,7 +97,6 @@ public function getIdentifier()
      *
      * @param bool $isSticky
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSticky($isSticky = true)
     {
@@ -121,7 +109,6 @@ public function setIsSticky($isSticky = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSticky()
     {
@@ -132,7 +119,6 @@ public function getIsSticky()
      * Retrieve message as a string
      *
      * @return string
-     * @since 2.0.0
      */
     public function toString()
     {
@@ -146,7 +132,6 @@ public function toString()
      * @param array $data
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setData(array $data = [])
     {
@@ -167,7 +152,6 @@ function ($element) {
      * Returns message data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
diff --git a/lib/internal/Magento/Framework/Message/Collection.php b/lib/internal/Magento/Framework/Message/Collection.php
index a9ab9eda0169d..8805d433f4ffb 100644
--- a/lib/internal/Magento/Framework/Message/Collection.php
+++ b/lib/internal/Magento/Framework/Message/Collection.php
@@ -9,7 +9,6 @@
  * Messages collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection
 {
@@ -17,13 +16,11 @@ class Collection
      * All messages by type array
      *
      * @var MessageInterface[]
-     * @since 2.0.0
      */
     protected $messages = [];
 
     /**
      * @var MessageInterface
-     * @since 2.0.0
      */
     protected $lastAddedMessage;
 
@@ -32,7 +29,6 @@ class Collection
      *
      * @param MessageInterface $message
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage(MessageInterface $message)
     {
@@ -48,7 +44,6 @@ public function addMessage(MessageInterface $message)
      * Clear all messages except sticky
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -73,7 +68,6 @@ public function clear()
      * Get last added message if any
      *
      * @return MessageInterface|null
-     * @since 2.0.0
      */
     public function getLastAddedMessage()
     {
@@ -85,7 +79,6 @@ public function getLastAddedMessage()
      *
      * @param string $identifier
      * @return MessageInterface|void
-     * @since 2.0.0
      */
     public function getMessageByIdentifier($identifier)
     {
@@ -104,7 +97,6 @@ public function getMessageByIdentifier($identifier)
      *
      * @param string $identifier
      * @return void
-     * @since 2.0.0
      */
     public function deleteMessageByIdentifier($identifier)
     {
@@ -125,7 +117,6 @@ public function deleteMessageByIdentifier($identifier)
      * Retrieve messages collection items
      *
      * @return MessageInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -142,7 +133,6 @@ public function getItems()
      *
      * @param string $type
      * @return MessageInterface[]
-     * @since 2.0.0
      */
     public function getItemsByType($type)
     {
@@ -153,7 +143,6 @@ public function getItemsByType($type)
      * Retrieve all error messages
      *
      * @return MessageInterface[]
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -165,7 +154,6 @@ public function getErrors()
      *
      * @param string $type
      * @return int
-     * @since 2.0.0
      */
     public function getCountByType($type)
     {
@@ -180,7 +168,6 @@ public function getCountByType($type)
      * Retrieve messages count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/lib/internal/Magento/Framework/Message/CollectionFactory.php b/lib/internal/Magento/Framework/Message/CollectionFactory.php
index c1e44c3fbadf8..530a3627034aa 100644
--- a/lib/internal/Magento/Framework/Message/CollectionFactory.php
+++ b/lib/internal/Magento/Framework/Message/CollectionFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Message collection factory
- * @since 2.0.0
  */
 class CollectionFactory
 {
@@ -17,13 +16,11 @@ class CollectionFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return Collection
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Message/Error.php b/lib/internal/Magento/Framework/Message/Error.php
index 6f60d38752ab0..eccd41b7a9c80 100644
--- a/lib/internal/Magento/Framework/Message/Error.php
+++ b/lib/internal/Magento/Framework/Message/Error.php
@@ -7,7 +7,6 @@
 
 /**
  * Error message model
- * @since 2.0.0
  */
 class Error extends AbstractMessage
 {
@@ -15,7 +14,6 @@ class Error extends AbstractMessage
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Message/Factory.php b/lib/internal/Magento/Framework/Message/Factory.php
index 92582e1c98c12..0d42fe6cd5594 100644
--- a/lib/internal/Magento/Framework/Message/Factory.php
+++ b/lib/internal/Magento/Framework/Message/Factory.php
@@ -10,7 +10,6 @@
 
 /**
  * Message model factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -18,7 +17,6 @@ class Factory
      * Allowed message types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $types = [
         MessageInterface::TYPE_ERROR,
@@ -31,7 +29,6 @@ class Factory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -39,7 +36,6 @@ class Factory
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -54,7 +50,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $text The text to inject into the message
      * @throws \InvalidArgumentException Exception gets thrown if type does not correspond to a valid Magento message
      * @return MessageInterface
-     * @since 2.0.0
      */
     public function create($type, $text = null)
     {
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index 94b0674dd4e5a..e9abc706ce1f2 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -12,7 +12,6 @@
 /**
  * Message manager model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Manager implements ManagerInterface
 {
@@ -23,43 +22,36 @@ class Manager implements ManagerInterface
 
     /**
      * @var Session
-     * @since 2.0.0
      */
     protected $session;
 
     /**
      * @var Factory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $messagesFactory;
 
     /**
      * @var Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $defaultGroup;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $hasMessages = false;
 
@@ -77,7 +69,6 @@ class Manager implements ManagerInterface
      * @param LoggerInterface $logger
      * @param string $defaultGroup
      * @param ExceptionMessageFactoryInterface|null exceptionMessageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Session $session,
@@ -100,7 +91,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultGroup()
     {
@@ -112,7 +102,6 @@ public function getDefaultGroup()
      *
      * @param string|null $group
      * @return string
-     * @since 2.0.0
      */
     protected function prepareGroup($group)
     {
@@ -125,7 +114,6 @@ protected function prepareGroup($group)
      * @param string|null $group
      * @param bool $clear
      * @return Collection
-     * @since 2.0.0
      */
     public function getMessages($clear = false, $group = null)
     {
@@ -149,7 +137,6 @@ public function getMessages($clear = false, $group = null)
      * @param MessageInterface $message
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage(MessageInterface $message, $group = null)
     {
@@ -165,7 +152,6 @@ public function addMessage(MessageInterface $message, $group = null)
      * @param MessageInterface[] $messages
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addMessages(array $messages, $group = null)
     {
@@ -183,7 +169,6 @@ public function addMessages(array $messages, $group = null)
      * @param string $message
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addError($message, $group = null)
     {
@@ -197,7 +182,6 @@ public function addError($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addWarning($message, $group = null)
     {
@@ -211,7 +195,6 @@ public function addWarning($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addNotice($message, $group = null)
     {
@@ -225,7 +208,6 @@ public function addNotice($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addSuccess($message, $group = null)
     {
@@ -239,7 +221,6 @@ public function addSuccess($message, $group = null)
      * @param MessageInterface[] $messages
      * @param string|null $group
      * @return $this
-     * @since 2.0.0
      */
     public function addUniqueMessages(array $messages, $group = null)
     {
@@ -261,7 +242,6 @@ public function addUniqueMessages(array $messages, $group = null)
      * @param string $alternativeText
      * @param string $group
      * @return $this
-     * @since 2.0.0
      */
     public function addException(\Exception $exception, $alternativeText = null, $group = null)
     {
@@ -287,7 +267,6 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
      * Returns false if there are any messages for customer, true - in other case
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasMessages()
     {
@@ -301,7 +280,6 @@ public function hasMessages()
      * @param string $alternativeText
      * @param string $group
      * @return $this
-     * @since 2.0.0
      */
     public function addExceptionMessage(\Exception $exception, $alternativeText = null, $group = null)
     {
@@ -329,7 +307,6 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addErrorMessage($message, $group = null)
     {
@@ -347,7 +324,6 @@ public function addErrorMessage($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addWarningMessage($message, $group = null)
     {
@@ -365,7 +341,6 @@ public function addWarningMessage($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addNoticeMessage($message, $group = null)
     {
@@ -383,7 +358,6 @@ public function addNoticeMessage($message, $group = null)
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addSuccessMessage($message, $group = null)
     {
@@ -403,7 +377,6 @@ public function addSuccessMessage($message, $group = null)
      * @param string|null $group
      * @return ManagerInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addComplexErrorMessage($identifier, array $data = [], $group = null)
     {
@@ -425,7 +398,6 @@ public function addComplexErrorMessage($identifier, array $data = [], $group = n
      * @param string|null $group
      * @return ManagerInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addComplexWarningMessage($identifier, array $data = [], $group = null)
     {
@@ -447,7 +419,6 @@ public function addComplexWarningMessage($identifier, array $data = [], $group =
      * @param string|null $group
      * @return ManagerInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addComplexNoticeMessage($identifier, array $data = [], $group = null)
     {
@@ -469,7 +440,6 @@ public function addComplexNoticeMessage($identifier, array $data = [], $group =
      * @param string|null $group
      * @return ManagerInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addComplexSuccessMessage($identifier, array $data = [], $group = null)
     {
@@ -490,7 +460,6 @@ public function addComplexSuccessMessage($identifier, array $data = [], $group =
      * @param string|null $identifier
      * @return MessageInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createMessage($type, $identifier = null)
     {
@@ -508,7 +477,6 @@ public function createMessage($type, $identifier = null)
      * @param mixed $identifier
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function assertNotEmptyIdentifier($identifier)
     {
diff --git a/lib/internal/Magento/Framework/Message/ManagerInterface.php b/lib/internal/Magento/Framework/Message/ManagerInterface.php
index 11c04ca27c143..9ae9601d0e6cf 100644
--- a/lib/internal/Magento/Framework/Message/ManagerInterface.php
+++ b/lib/internal/Magento/Framework/Message/ManagerInterface.php
@@ -9,7 +9,6 @@
  * Adds different types of messages to the session, and allows access to existing messages.
  *
  * @api
- * @since 2.0.0
  */
 interface ManagerInterface
 {
@@ -19,7 +18,6 @@ interface ManagerInterface
      * @param bool $clear
      * @param string|null $group
      * @return Collection
-     * @since 2.0.0
      */
     public function getMessages($clear = false, $group = null);
 
@@ -27,7 +25,6 @@ public function getMessages($clear = false, $group = null);
      * Retrieve default message group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultGroup();
 
@@ -37,7 +34,6 @@ public function getDefaultGroup();
      * @param MessageInterface $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addMessage(MessageInterface $message, $group = null);
 
@@ -47,7 +43,6 @@ public function addMessage(MessageInterface $message, $group = null);
      * @param MessageInterface[] $messages
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addMessages(array $messages, $group = null);
 
@@ -59,7 +54,6 @@ public function addMessages(array $messages, $group = null);
      * @return ManagerInterface
      * @deprecated 2.1.0
      * @see \Magento\Framework\Message\ManagerInterface::addErrorMessage
-     * @since 2.0.0
      */
     public function addError($message, $group = null);
 
@@ -71,7 +65,6 @@ public function addError($message, $group = null);
      * @return ManagerInterface
      * @deprecated 2.1.0
      * @see \Magento\Framework\Message\ManagerInterface::addWarningMessage
-     * @since 2.0.0
      */
     public function addWarning($message, $group = null);
 
@@ -83,7 +76,6 @@ public function addWarning($message, $group = null);
      * @return ManagerInterface
      * @deprecated 2.1.0
      * @see \Magento\Framework\Message\ManagerInterface::addNoticeMessage
-     * @since 2.0.0
      */
     public function addNotice($message, $group = null);
 
@@ -95,7 +87,6 @@ public function addNotice($message, $group = null);
      * @return ManagerInterface
      * @deprecated 2.1.0
      * @see \Magento\Framework\Message\ManagerInterface::addSuccessMessage
-     * @since 2.0.0
      */
     public function addSuccess($message, $group = null);
 
@@ -105,7 +96,6 @@ public function addSuccess($message, $group = null);
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addErrorMessage($message, $group = null);
 
@@ -115,7 +105,6 @@ public function addErrorMessage($message, $group = null);
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addWarningMessage($message, $group = null);
 
@@ -125,7 +114,6 @@ public function addWarningMessage($message, $group = null);
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addNoticeMessage($message, $group = null);
 
@@ -135,7 +123,6 @@ public function addNoticeMessage($message, $group = null);
      * @param string $message
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addSuccessMessage($message, $group = null);
 
@@ -146,7 +133,6 @@ public function addSuccessMessage($message, $group = null);
      * @param array $data
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addComplexErrorMessage($identifier, array $data = [], $group = null);
 
@@ -157,7 +143,6 @@ public function addComplexErrorMessage($identifier, array $data = [], $group = n
      * @param array $data
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addComplexWarningMessage($identifier, array $data = [], $group = null);
 
@@ -168,7 +153,6 @@ public function addComplexWarningMessage($identifier, array $data = [], $group =
      * @param array $data
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addComplexNoticeMessage($identifier, array $data = [], $group = null);
 
@@ -179,7 +163,6 @@ public function addComplexNoticeMessage($identifier, array $data = [], $group =
      * @param array $data
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addComplexSuccessMessage($identifier, array $data = [], $group = null);
 
@@ -189,7 +172,6 @@ public function addComplexSuccessMessage($identifier, array $data = [], $group =
      * @param MessageInterface[] $messages
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addUniqueMessages(array $messages, $group = null);
 
@@ -202,7 +184,6 @@ public function addUniqueMessages(array $messages, $group = null);
      * @return ManagerInterface
      * @deprecated 2.1.0
      * @see \Magento\Framework\Message\ManagerInterface::addExceptionMessage
-     * @since 2.0.0
      */
     public function addException(\Exception $exception, $alternativeText = null, $group = null);
 
@@ -213,7 +194,6 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
      * @param string|null $alternativeText
      * @param string|null $group
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function addExceptionMessage(\Exception $exception, $alternativeText = null, $group = null);
 
@@ -224,7 +204,6 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
      * @param string|null $identifier
      * @return MessageInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createMessage($type, $identifier = null);
 }
diff --git a/lib/internal/Magento/Framework/Message/MessageInterface.php b/lib/internal/Magento/Framework/Message/MessageInterface.php
index 3c2de2349f88e..2dad284152990 100644
--- a/lib/internal/Magento/Framework/Message/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Message/MessageInterface.php
@@ -9,7 +9,6 @@
  * Represent a message with a type, content text, and an isSticky attribute to prevent message from being cleared.
  *
  * @api
- * @since 2.0.0
  */
 interface MessageInterface
 {
@@ -42,7 +41,6 @@ interface MessageInterface
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -50,7 +48,6 @@ public function getType();
      * Getter for text of message
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText();
 
@@ -59,7 +56,6 @@ public function getText();
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function setText($text);
 
@@ -68,7 +64,6 @@ public function setText($text);
      *
      * @param string $identifier
      * @return $this
-     * @since 2.0.0
      */
     public function setIdentifier($identifier);
 
@@ -76,7 +71,6 @@ public function setIdentifier($identifier);
      * Getter message identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentifier();
 
@@ -85,7 +79,6 @@ public function getIdentifier();
      *
      * @param bool $isSticky
      * @return $this
-     * @since 2.0.0
      */
     public function setIsSticky($isSticky);
 
@@ -94,7 +87,6 @@ public function setIsSticky($isSticky);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getIsSticky();
 
@@ -102,7 +94,6 @@ public function getIsSticky();
      * Retrieve message as a string
      *
      * @return string
-     * @since 2.0.0
      */
     public function toString();
 
@@ -112,7 +103,6 @@ public function toString();
      * @param array $data
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function setData(array $data = []);
 
@@ -120,7 +110,6 @@ public function setData(array $data = []);
      * Returns message data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 }
diff --git a/lib/internal/Magento/Framework/Message/Notice.php b/lib/internal/Magento/Framework/Message/Notice.php
index 0d506e65c4534..0c08d263cb683 100644
--- a/lib/internal/Magento/Framework/Message/Notice.php
+++ b/lib/internal/Magento/Framework/Message/Notice.php
@@ -7,7 +7,6 @@
 
 /**
  * Notice message model
- * @since 2.0.0
  */
 class Notice extends AbstractMessage
 {
@@ -15,7 +14,6 @@ class Notice extends AbstractMessage
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Message/Session.php b/lib/internal/Magento/Framework/Message/Session.php
index 0a102f38603aa..a4a6c2551ed41 100644
--- a/lib/internal/Magento/Framework/Message/Session.php
+++ b/lib/internal/Magento/Framework/Message/Session.php
@@ -7,7 +7,6 @@
 
 /**
  * Message session model
- * @since 2.0.0
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
diff --git a/lib/internal/Magento/Framework/Message/Success.php b/lib/internal/Magento/Framework/Message/Success.php
index fb16da5f43af2..0035fdf7f5b64 100644
--- a/lib/internal/Magento/Framework/Message/Success.php
+++ b/lib/internal/Magento/Framework/Message/Success.php
@@ -7,7 +7,6 @@
 
 /**
  * Success message model
- * @since 2.0.0
  */
 class Success extends AbstractMessage
 {
@@ -15,7 +14,6 @@ class Success extends AbstractMessage
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Message/Warning.php b/lib/internal/Magento/Framework/Message/Warning.php
index 82bf0f78291f5..50c6666548e66 100644
--- a/lib/internal/Magento/Framework/Message/Warning.php
+++ b/lib/internal/Magento/Framework/Message/Warning.php
@@ -7,7 +7,6 @@
 
 /**
  * Warning message model
- * @since 2.0.0
  */
 class Warning extends AbstractMessage
 {
@@ -15,7 +14,6 @@ class Warning extends AbstractMessage
      * Getter message type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index bfbfd5e755ad3..dc026800b5cf3 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -15,38 +15,32 @@
  * This class defines basic data structure of how custom attributes are stored in an ExtensibleModel.
  * Implementations may choose to process custom attributes as their persistence requires them to.
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractExtensibleModel extends AbstractModel implements
     \Magento\Framework\Api\CustomAttributesDataInterface
 {
     /**
      * @var ExtensionAttributesFactory
-     * @since 2.0.0
      */
     protected $extensionAttributesFactory;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttributesInterface
-     * @since 2.0.0
      */
     protected $extensionAttributes;
 
     /**
      * @var AttributeValueFactory
-     * @since 2.0.0
      */
     protected $customAttributeFactory;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $customAttributesCodes = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $customAttributesChanged = false;
 
@@ -58,7 +52,6 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -83,7 +76,6 @@ public function __construct(
      *
      * @param array $data
      * @return array processed data
-     * @since 2.0.0
      */
     protected function filterCustomAttributes($data)
     {
@@ -109,7 +101,6 @@ protected function filterCustomAttributes($data)
      * Initialize customAttributes based on existing data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function initializeCustomAttributes()
     {
@@ -138,7 +129,6 @@ protected function initializeCustomAttributes()
      * Retrieve custom attributes values.
      *
      * @return \Magento\Framework\Api\AttributeInterface[]|null
-     * @since 2.0.0
      */
     public function getCustomAttributes()
     {
@@ -152,7 +142,6 @@ public function getCustomAttributes()
      *
      * @param string $attributeCode
      * @return \Magento\Framework\Api\AttributeInterface|null null if the attribute has not been set
-     * @since 2.0.0
      */
     public function getCustomAttribute($attributeCode)
     {
@@ -164,7 +153,6 @@ public function getCustomAttribute($attributeCode)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomAttributes(array $attributes)
     {
@@ -173,7 +161,6 @@ public function setCustomAttributes(array $attributes)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setCustomAttribute($attributeCode, $attributeValue)
     {
@@ -192,7 +179,6 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      * {@inheritdoc}
      *
      * Added custom attributes support.
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -211,7 +197,6 @@ public function setData($key, $value = null)
      * {@inheritdoc}
      *
      * Unset customAttributesChanged flag
-     * @since 2.0.0
      */
     public function unsetData($key = null)
     {
@@ -226,7 +211,6 @@ public function unsetData($key = null)
      *
      * @param array $customAttributes
      * @return void
-     * @since 2.0.0
      */
     protected function convertCustomAttributeValues(array &$customAttributes)
     {
@@ -253,7 +237,6 @@ protected function convertCustomAttributeValues(array &$customAttributes)
      * @param string $key
      * @param string|int $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null)
     {
@@ -292,7 +275,6 @@ public function getData($key = '', $index = null)
      * By default, entity can be extended only using extension attributes functionality.
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function getCustomAttributesCodes()
     {
@@ -306,7 +288,6 @@ protected function getCustomAttributesCodes()
      *
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
      * @return string[]
-     * @since 2.0.0
      */
     protected function getEavAttributesCodes(\Magento\Framework\Api\MetadataServiceInterface $metadataService)
     {
@@ -326,7 +307,6 @@ protected function getEavAttributesCodes(\Magento\Framework\Api\MetadataServiceI
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setId($value)
     {
@@ -339,7 +319,6 @@ public function setId($value)
      *
      * @param \Magento\Framework\Api\ExtensionAttributesInterface $extensionAttributes
      * @return $this
-     * @since 2.0.0
      */
     protected function _setExtensionAttributes(\Magento\Framework\Api\ExtensionAttributesInterface $extensionAttributes)
     {
@@ -351,7 +330,6 @@ protected function _setExtensionAttributes(\Magento\Framework\Api\ExtensionAttri
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Framework\Api\ExtensionAttributesInterface
-     * @since 2.0.0
      */
     protected function _getExtensionAttributes()
     {
@@ -360,7 +338,7 @@ protected function _getExtensionAttributes()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -369,7 +347,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 1043a561db2a3..ad36e2db16b19 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -14,7 +14,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 abstract class AbstractModel extends \Magento\Framework\DataObject
 {
@@ -22,7 +21,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Prefix of model events names
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = 'core_abstract';
 
@@ -32,7 +30,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * In observe method you can use $observer->getEvent()->getObject() in this case
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = 'object';
 
@@ -40,14 +37,12 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Name of object id field
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'id';
 
     /**
      * Data changes flag (true after setData|unsetData call)
      * @var $_hasDataChange bool
-     * @since 2.0.0
      */
     protected $_hasDataChanges = false;
 
@@ -55,7 +50,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Original data that was loaded
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_origData;
 
@@ -63,7 +57,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Object delete flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isDeleted = false;
 
@@ -71,7 +64,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Resource model instance
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -79,7 +71,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Resource collection
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     protected $_resourceCollection;
 
@@ -87,7 +78,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Name of the resource model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceName;
 
@@ -95,7 +85,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Name of the resource collection model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_collectionName;
 
@@ -105,7 +94,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * When you use true - all cache will be clean
      *
      * @var string|array|bool
-     * @since 2.0.0
      */
     protected $_cacheTag = false;
 
@@ -115,7 +103,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * not valid - we can set this flag to false value and save process will be stopped
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_dataSaveAllowed = true;
 
@@ -123,7 +110,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Flag which allow detect object state: is it new object (without id) or existing one (with id)
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isObjectNew = null;
 
@@ -131,7 +117,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Validator for checking the model state before saving it
      *
      * @var \Zend_Validate_Interface|bool|null
-     * @since 2.0.0
      */
     protected $_validatorBeforeSave = null;
 
@@ -139,7 +124,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Application Event Dispatcher
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -147,31 +131,26 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Application Cache Manager
      *
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cacheManager;
 
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $_registry;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Framework\Model\ActionValidator\RemoveAction
-     * @since 2.0.0
      */
     protected $_actionValidator;
 
@@ -179,7 +158,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * Array to store object's original data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $storedData = [];
 
@@ -189,7 +167,6 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -221,7 +198,6 @@ public function __construct(
      * Model construct that should be used for object initialization
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -232,7 +208,6 @@ protected function _construct()
      *
      * @param string $resourceModel
      * @return void
-     * @since 2.0.0
      */
     protected function _init($resourceModel)
     {
@@ -242,7 +217,6 @@ protected function _init($resourceModel)
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -267,7 +241,6 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -289,7 +262,6 @@ public function __wakeup()
      *
      * @param  string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setIdFieldName($name)
     {
@@ -301,7 +273,6 @@ public function setIdFieldName($name)
      * Id field name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -312,7 +283,6 @@ public function getIdFieldName()
      * Identifier getter
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -324,7 +294,6 @@ public function getId()
      *
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setId($value)
     {
@@ -337,7 +306,6 @@ public function setId($value)
      *
      * @param boolean $isDeleted
      * @return bool
-     * @since 2.0.0
      */
     public function isDeleted($isDeleted = null)
     {
@@ -355,7 +323,6 @@ public function isDeleted($isDeleted = null)
      * Flag value should be set up to true after any external data changes
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasDataChanges()
     {
@@ -373,7 +340,6 @@ public function hasDataChanges()
      * @param string|array  $key
      * @param mixed         $value
      * @return $this
-     * @since 2.0.0
      */
     public function setData($key, $value = null)
     {
@@ -396,7 +362,6 @@ public function setData($key, $value = null)
      *
      * @param null|string|array $key
      * @return $this
-     * @since 2.0.0
      */
     public function unsetData($key = null)
     {
@@ -420,7 +385,6 @@ public function unsetData($key = null)
      *
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     public function setDataChanges($value)
     {
@@ -433,7 +397,6 @@ public function setDataChanges($value)
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getOrigData($key = null)
     {
@@ -454,7 +417,6 @@ public function getOrigData($key = null)
      * @param string $key
      * @param mixed $data
      * @return $this
-     * @since 2.0.0
      */
     public function setOrigData($key = null, $data = null)
     {
@@ -471,7 +433,6 @@ public function setOrigData($key = null, $data = null)
      *
      * @param string $field
      * @return bool
-     * @since 2.0.0
      */
     public function dataHasChangedFor($field)
     {
@@ -488,7 +449,6 @@ public function dataHasChangedFor($field)
      * @param string $resourceName
      * @param string|null $collectionName
      * @return void
-     * @since 2.0.0
      */
     protected function _setResourceModel($resourceName, $collectionName = null)
     {
@@ -504,7 +464,6 @@ protected function _setResourceModel($resourceName, $collectionName = null)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected function _getResource()
     {
@@ -521,7 +480,6 @@ protected function _getResource()
      * Retrieve model resource name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResourceName()
     {
@@ -534,7 +492,6 @@ public function getResourceName()
      * @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getResourceCollection()
     {
@@ -555,7 +512,6 @@ public function getResourceCollection()
      *
      * @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -571,7 +527,6 @@ public function getCollection()
      * @deprecated 2.1.0 because entities must not be responsible for their own loading.
      * Service contracts should persist entities. Use resource model "load" or collections to implement
      * service contract model loading operations.
-     * @since 2.0.0
      */
     public function load($modelId, $field = null)
     {
@@ -583,7 +538,6 @@ public function load($modelId, $field = null)
      * Get array of objects transferred to default events processing
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getEventData()
     {
@@ -599,7 +553,6 @@ protected function _getEventData()
      * @param int $modelId
      * @param null|string $field
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad($modelId, $field = null)
     {
@@ -614,7 +567,6 @@ protected function _beforeLoad($modelId, $field = null)
      * Processing object after load data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -640,7 +592,6 @@ public function beforeLoad($identifier, $field = null)
      * Object after load processing. Implemented as public interface for supporting objects after load in collections
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterLoad()
     {
@@ -655,7 +606,6 @@ public function afterLoad()
      * e.g. using resourceModel->hasDataChanged() or any other technique
      *
      * @return boolean
-     * @since 2.0.0
      */
     protected function _hasModelChanged()
     {
@@ -664,7 +614,6 @@ protected function _hasModelChanged()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isSaveAllowed()
     {
@@ -674,7 +623,6 @@ public function isSaveAllowed()
     /**
      * @param bool $flag
      * @return void
-     * @since 2.0.0
      */
     public function setHasDataChanges($flag)
     {
@@ -690,7 +638,6 @@ public function setHasDataChanges($flag)
      * @deprecated 2.1.0 because entities must not be responsible for their own persistence.
      * Service contracts should persist entities. Use resource model "save" to implement
      * service contract persistence operations.
-     * @since 2.0.0
      */
     public function save()
     {
@@ -702,7 +649,6 @@ public function save()
      * Callback function which called after transaction commit in resource model
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterCommitCallback()
     {
@@ -719,7 +665,6 @@ public function afterCommitCallback()
      *
      * @param bool|null $flag
      * @return bool
-     * @since 2.0.0
      */
     public function isObjectNew($flag = null)
     {
@@ -736,7 +681,6 @@ public function isObjectNew($flag = null)
      * Processing object before save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function beforeSave()
     {
@@ -753,7 +697,6 @@ public function beforeSave()
      *
      * @return $this
      * @throws \Magento\Framework\Validator\Exception
-     * @since 2.0.0
      */
     public function validateBeforeSave()
     {
@@ -776,7 +719,6 @@ public function validateBeforeSave()
      * Returns FALSE, if no validation rules exist.
      *
      * @return \Zend_Validate_Interface|false
-     * @since 2.0.0
      */
     protected function _getValidatorBeforeSave()
     {
@@ -791,7 +733,6 @@ protected function _getValidatorBeforeSave()
      * Returns FALSE, if no validation rules exist.
      *
      * @return \Zend_Validate_Interface|bool
-     * @since 2.0.0
      */
     protected function _createValidatorBeforeSave()
     {
@@ -818,7 +759,6 @@ protected function _createValidatorBeforeSave()
      * Template method to return validate rules for the entity
      *
      * @return \Zend_Validate_Interface|null
-     * @since 2.0.0
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -830,7 +770,6 @@ protected function _getValidationRulesBeforeSave()
      * Return false if cache tags are not supported by model
      *
      * @return array|false
-     * @since 2.0.0
      */
     public function getCacheTags()
     {
@@ -853,7 +792,6 @@ public function getCacheTags()
      * Remove model object related cache
      *
      * @return $this
-     * @since 2.0.0
      */
     public function cleanModelCache()
     {
@@ -868,7 +806,6 @@ public function cleanModelCache()
      * Processing object after save data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterSave()
     {
@@ -888,7 +825,6 @@ public function afterSave()
      * @deprecated 2.1.0 because entities must not be responsible for their own deletion.
      * Service contracts should delete entities. Use resource model "delete" method to implement
      * service contract persistence operations.
-     * @since 2.0.0
      */
     public function delete()
     {
@@ -901,7 +837,6 @@ public function delete()
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function beforeDelete()
     {
@@ -921,7 +856,6 @@ public function beforeDelete()
      * Processing object after delete data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDelete()
     {
@@ -936,7 +870,6 @@ public function afterDelete()
      * Processing manipulation after main transaction commit
      *
      * @return $this
-     * @since 2.0.0
      */
     public function afterDeleteCommit()
     {
@@ -949,7 +882,6 @@ public function afterDeleteCommit()
      * Retrieve model resource
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -960,7 +892,6 @@ public function getResource()
      * Retrieve entity id
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getEntityId()
     {
@@ -972,7 +903,6 @@ public function getEntityId()
      *
      * @param int $entityId
      * @return $this
-     * @since 2.0.0
      */
     public function setEntityId($entityId)
     {
@@ -983,7 +913,6 @@ public function setEntityId($entityId)
      * Clearing object for correct deleting by garbage collector
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearInstance()
     {
@@ -997,7 +926,6 @@ public function clearInstance()
      * Clearing cyclic references
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearReferences()
     {
@@ -1008,7 +936,6 @@ protected function _clearReferences()
      * Clearing object's data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _clearData()
     {
@@ -1019,7 +946,6 @@ protected function _clearData()
      * Synchronize object's stored data with the actual data
      *
      * @return $this
-     * @since 2.0.0
      */
     private function updateStoredData()
     {
@@ -1035,7 +961,6 @@ private function updateStoredData()
      * Model StoredData getter
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStoredData()
     {
@@ -1046,7 +971,6 @@ public function getStoredData()
      * Returns _eventPrefix
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEventPrefix()
     {
diff --git a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
index e907321e94d78..430bb6f65f295 100644
--- a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
+++ b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
@@ -12,26 +12,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RemoveAction
 {
     /**
      * @var \Magento\Framework\Registry
-     * @since 2.0.0
      */
     protected $registry;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $protectedModels;
 
     /**
      * @param \Magento\Framework\Registry $registry
      * @param array $protectedModels
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Registry $registry, array $protectedModels = [])
     {
@@ -44,7 +40,6 @@ public function __construct(\Magento\Framework\Registry $registry, array $protec
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed(AbstractModel $model)
     {
@@ -63,7 +58,6 @@ public function isAllowed(AbstractModel $model)
      * Get clean model name without Interceptor and Proxy part and slashes
      * @param object $object
      * @return mixed
-     * @since 2.0.0
      */
     protected function getBaseClassName($object)
     {
diff --git a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction/Allowed.php b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction/Allowed.php
index 27dcacac0cd61..6d72fe58eebe9 100644
--- a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction/Allowed.php
+++ b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction/Allowed.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Model\ActionValidator\RemoveAction\Allowed
  *
- * @since 2.0.0
  */
 class Allowed extends \Magento\Framework\Model\ActionValidator\RemoveAction
 {
@@ -21,7 +20,6 @@ class Allowed extends \Magento\Framework\Model\ActionValidator\RemoveAction
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isAllowed(\Magento\Framework\Model\AbstractModel $model)
     {
diff --git a/lib/internal/Magento/Framework/Model/Context.php b/lib/internal/Magento/Framework/Model/Context.php
index 6e4c668809d9f..910a0d48a5e9c 100644
--- a/lib/internal/Magento/Framework/Model/Context.php
+++ b/lib/internal/Magento/Framework/Model/Context.php
@@ -19,37 +19,31 @@
  * the classes they were introduced for.
  *
  * @api
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventDispatcher;
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cacheManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Framework\Model\ActionValidator\RemoveAction
-     * @since 2.0.0
      */
     protected $_actionValidator;
 
@@ -59,7 +53,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\App\CacheInterface $cacheManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Model\ActionValidator\RemoveAction $actionValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -77,7 +70,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     public function getCacheManager()
     {
@@ -86,7 +78,6 @@ public function getCacheManager()
 
     /**
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventDispatcher()
     {
@@ -95,7 +86,6 @@ public function getEventDispatcher()
 
     /**
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -104,7 +94,6 @@ public function getLogger()
 
     /**
      * @return \Magento\Framework\App\State
-     * @since 2.0.0
      */
     public function getAppState()
     {
@@ -113,7 +102,6 @@ public function getAppState()
 
     /**
      * @return \Magento\Framework\Model\ActionValidator\RemoveAction
-     * @since 2.0.0
      */
     public function getActionValidator()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
index 9dfc7160f408e..6bef63fb66b74 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -14,7 +14,6 @@
  * Abstract resource model
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractResource
 {
@@ -26,7 +25,6 @@ abstract class AbstractResource
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -40,7 +38,6 @@ public function __construct()
      * Resource initialization
      *
      * @return void
-     * @since 2.0.0
      */
     abstract protected function _construct();
 
@@ -48,7 +45,6 @@ abstract protected function _construct();
      * Get connection
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     abstract public function getConnection();
 
@@ -57,7 +53,6 @@ abstract public function getConnection();
      *
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function beginTransaction()
     {
@@ -71,7 +66,6 @@ public function beginTransaction()
      * @param callable|array $callback
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function addCommitCallback($callback)
     {
@@ -84,7 +78,6 @@ public function addCommitCallback($callback)
      *
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function commit()
     {
@@ -110,7 +103,6 @@ public function commit()
      *
      * @return $this
      * @api
-     * @since 2.0.0
      */
     public function rollBack()
     {
@@ -127,7 +119,6 @@ public function rollBack()
      * @param mixed $defaultValue
      * @param bool $unsetEmpty
      * @return $this
-     * @since 2.0.0
      */
     protected function _serializeField(DataObject $object, $field, $defaultValue = null, $unsetEmpty = false)
     {
@@ -148,7 +139,6 @@ protected function _serializeField(DataObject $object, $field, $defaultValue = n
      * @param string $field
      * @param mixed $defaultValue
      * @return void
-     * @since 2.0.0
      */
     protected function _unserializeField(DataObject $object, $field, $defaultValue = null)
     {
@@ -171,7 +161,6 @@ protected function _unserializeField(DataObject $object, $field, $defaultValue =
      * @param DataObject $object
      * @param string $table
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareDataForTable(DataObject $object, $table)
     {
@@ -201,7 +190,6 @@ protected function _prepareDataForTable(DataObject $object, $table)
      * @param mixed $value
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareTableValueForSave($value, $type)
     {
@@ -220,7 +208,6 @@ protected function _prepareTableValueForSave($value, $type)
      * Template method to return validate rules to be executed before entity is saved
      *
      * @return null
-     * @since 2.0.0
      */
     public function getValidationRulesBeforeSave()
     {
@@ -233,7 +220,6 @@ public function getValidationRulesBeforeSave()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @param string $tableName
      * @return array|string
-     * @since 2.0.0
      */
     protected function _getColumnsForEntityLoad(\Magento\Framework\Model\AbstractModel $object, $tableName)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
index 61c12139f175f..e136ba8e97bc8 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
@@ -19,7 +19,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @api
- * @since 2.0.0
  */
 abstract class AbstractDb extends AbstractResource
 {
@@ -27,7 +26,6 @@ abstract class AbstractDb extends AbstractResource
      * Cached resources singleton
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resources;
 
@@ -35,7 +33,6 @@ abstract class AbstractDb extends AbstractResource
      * Prefix for resources that will be used in this resource model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $connectionName = \Magento\Framework\App\ResourceConnection::DEFAULT_CONNECTION;
 
@@ -43,7 +40,6 @@ abstract class AbstractDb extends AbstractResource
      * Connections cache for this resource model
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_connections = [];
 
@@ -51,7 +47,6 @@ abstract class AbstractDb extends AbstractResource
      * Resource model name that contains entities (names of tables)
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
@@ -59,7 +54,6 @@ abstract class AbstractDb extends AbstractResource
      * Tables used in this resource model
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_tables = [];
 
@@ -67,7 +61,6 @@ abstract class AbstractDb extends AbstractResource
      * Main table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_mainTable;
 
@@ -75,7 +68,6 @@ abstract class AbstractDb extends AbstractResource
      * Main table primary key field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName;
 
@@ -83,7 +75,6 @@ abstract class AbstractDb extends AbstractResource
      * Primary key auto increment flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isPkAutoIncrement = true;
 
@@ -91,7 +82,6 @@ abstract class AbstractDb extends AbstractResource
      * Use is object new method for save of object
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useIsObjectNew = false;
 
@@ -99,7 +89,6 @@ abstract class AbstractDb extends AbstractResource
      * Fields of main table
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_mainTableFields;
 
@@ -117,7 +106,6 @@ abstract class AbstractDb extends AbstractResource
      *      array( array( 'field' => 'my_field_name', 'title' => 'my_field_name' ) )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_uniqueFields = null;
 
@@ -132,19 +120,16 @@ abstract class AbstractDb extends AbstractResource
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_serializableFields = [];
 
     /**
      * @var TransactionManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var ObjectRelationProcessor
-     * @since 2.0.0
      */
     protected $objectRelationProcessor;
 
@@ -153,7 +138,6 @@ abstract class AbstractDb extends AbstractResource
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -172,7 +156,6 @@ public function __construct(
      * Provide variables to serialize
      *
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -185,7 +168,6 @@ public function __sleep()
      * Restore global dependencies
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -199,7 +181,6 @@ public function __wakeup()
      * @param string $mainTable
      * @param string $idFieldName
      * @return void
-     * @since 2.0.0
      */
     protected function _init($mainTable, $idFieldName)
     {
@@ -214,7 +195,6 @@ protected function _init($mainTable, $idFieldName)
      * @param string|array $connections
      * @param string|array|null $tables
      * @return $this
-     * @since 2.0.0
      */
     protected function _setResource($connections, $tables = null)
     {
@@ -245,7 +225,6 @@ protected function _setResource($connections, $tables = null)
      * @param string $mainTable
      * @param string|null $idFieldName
      * @return $this
-     * @since 2.0.0
      */
     protected function _setMainTable($mainTable, $idFieldName = null)
     {
@@ -264,7 +243,6 @@ protected function _setMainTable($mainTable, $idFieldName = null)
      * @throws LocalizedException
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -281,7 +259,6 @@ public function getIdFieldName()
      * @throws LocalizedException
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getMainTable()
     {
@@ -297,7 +274,6 @@ public function getMainTable()
      * @param string $tableName
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getTable($tableName)
     {
@@ -325,7 +301,6 @@ public function getTable($tableName)
      *
      * @param string $resourceName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface|false
-     * @since 2.0.0
      */
     protected function _getConnection($resourceName)
     {
@@ -345,7 +320,6 @@ protected function _getConnection($resourceName)
      * Get connection
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface|false
-     * @since 2.0.0
      */
     public function getConnection()
     {
@@ -360,7 +334,6 @@ public function getConnection()
      * @param mixed $value
      * @param string $field field to load by (defaults to model id)
      * @return $this
-     * @since 2.0.0
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null)
     {
@@ -396,7 +369,6 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -414,7 +386,6 @@ protected function _getLoadSelect($field, $value, $object)
      * @throws \Exception
      * @throws AlreadyExistsException
      * @api
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -466,7 +437,6 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -498,7 +468,6 @@ public function delete(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param array|string $field
      * @return $this
-     * @since 2.0.0
      */
     public function addUniqueField($field)
     {
@@ -515,7 +484,6 @@ public function addUniqueField($field)
      * Reset unique fields restrictions
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetUniqueField()
     {
@@ -529,7 +497,6 @@ public function resetUniqueField()
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function unserializeFields(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -543,7 +510,6 @@ public function unserializeFields(\Magento\Framework\Model\AbstractModel $object
      * Initialize unique fields
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initUniqueFields()
     {
@@ -555,7 +521,6 @@ protected function _initUniqueFields()
      * Get configuration of all unique fields
      *
      * @return array
-     * @since 2.0.0
      */
     public function getUniqueFields()
     {
@@ -570,7 +535,6 @@ public function getUniqueFields()
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -583,7 +547,6 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     public function hasDataChanged($object)
     {
@@ -607,7 +570,6 @@ public function hasDataChanged($object)
      * @param mixed $value
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     protected function _prepareValueForSave($value, $type)
     {
@@ -622,7 +584,6 @@ protected function _prepareValueForSave($value, $type)
      * @throws AlreadyExistsException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -675,7 +636,6 @@ protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -688,7 +648,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -701,7 +660,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -714,7 +672,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -727,7 +684,6 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -740,7 +696,6 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function _serializeFields(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -755,7 +710,6 @@ protected function _serializeFields(\Magento\Framework\Model\AbstractModel $obje
      *
      * @param string|array $table
      * @return int|array|false
-     * @since 2.0.0
      */
     public function getChecksum($table)
     {
@@ -774,7 +728,6 @@ public function getChecksum($table)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return array
-     * @since 2.0.0
      */
     protected function prepareDataForUpdate($object)
     {
@@ -798,7 +751,6 @@ protected function prepareDataForUpdate($object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     protected function isObjectNotNew(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -811,7 +763,6 @@ protected function isObjectNotNew(\Magento\Framework\Model\AbstractModel $object
      * @param \Magento\Framework\Model\AbstractModel $object
      * @throws LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function saveNewObject(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -836,7 +787,6 @@ protected function saveNewObject(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @throws LocalizedException
      * @return void
-     * @since 2.0.0
      */
     protected function updateObject(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -875,7 +825,6 @@ protected function updateObject(\Magento\Framework\Model\AbstractModel $object)
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     protected function processAfterSaves(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -888,7 +837,6 @@ protected function processAfterSaves(\Magento\Framework\Model\AbstractModel $obj
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
-     * @since 2.0.0
      */
     protected function isModified(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -901,7 +849,6 @@ protected function isModified(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function processNotModifiedSave(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -913,7 +860,6 @@ protected function processNotModifiedSave(\Magento\Framework\Model\AbstractModel
      *
      * @param \Magento\Framework\DataObject $object
      * @return void
-     * @since 2.0.0
      */
     public function afterLoad(\Magento\Framework\DataObject $object)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
index c8434d897c93c..d879f348401a6 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -14,7 +14,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface
 {
@@ -22,7 +21,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Model name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_model;
 
@@ -30,7 +28,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Resource model name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
@@ -38,7 +35,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Resource instance
      *
      * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     protected $_resource;
 
@@ -46,7 +42,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Fields to select in query
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_fieldsToSelect = null;
 
@@ -54,7 +49,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Fields initial fields to select like id_field
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_initialFieldsToSelect = null;
 
@@ -62,7 +56,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Fields to select changed flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_fieldsToSelectChanged = false;
 
@@ -70,7 +63,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Store joined tables here
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_joinedTables = [];
 
@@ -78,7 +70,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Collection main table
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_mainTable = null;
 
@@ -86,7 +77,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Reset items data changed flag
      *
      * @var boolean
-     * @since 2.0.0
      */
     protected $_resetItemsDataChanged = false;
 
@@ -94,7 +84,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Name prefix of events that are dispatched by model
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventPrefix = '';
 
@@ -102,7 +91,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Name of event parameter
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_eventObject = '';
 
@@ -110,7 +98,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * Event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager = null;
 
@@ -121,7 +108,6 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -143,7 +129,6 @@ public function __construct(
      * Initialization here
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -153,7 +138,6 @@ protected function _construct()
      * Retrieve main table
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMainTable()
     {
@@ -169,7 +153,6 @@ public function getMainTable()
      *
      * @param string $table
      * @return $this
-     * @since 2.0.0
      */
     public function setMainTable($table)
     {
@@ -188,7 +171,6 @@ public function setMainTable($table)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _initSelect()
     {
@@ -200,7 +182,6 @@ protected function _initSelect()
      * Get \Magento\Framework\DB\Select instance and applies fields to select if needed
      *
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function getSelect()
     {
@@ -217,7 +198,6 @@ public function getSelect()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _initSelectFields()
     {
@@ -279,7 +259,6 @@ protected function _initSelectFields()
      * Retrieve initial fields to select like id field
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getInitialFieldsToSelect()
     {
@@ -295,7 +274,6 @@ protected function _getInitialFieldsToSelect()
      * Initialize initial fields to select like id field
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initInitialFieldsToSelect()
     {
@@ -312,7 +290,6 @@ protected function _initInitialFieldsToSelect()
      * @param string|array $field
      * @param string|null $alias
      * @return $this
-     * @since 2.0.0
      */
     public function addFieldToSelect($field, $alias = null)
     {
@@ -356,7 +333,6 @@ public function addFieldToSelect($field, $alias = null)
      * @param string $expression
      * @param array|string $fields
      * @return $this
-     * @since 2.0.0
      */
     public function addExpressionFieldToSelect($alias, $expression, $fields)
     {
@@ -381,7 +357,6 @@ public function addExpressionFieldToSelect($alias, $expression, $fields)
      * @param string|null $field
      * @param bool $isAlias Alias identifier
      * @return $this
-     * @since 2.0.0
      */
     public function removeFieldFromSelect($field, $isAlias = false)
     {
@@ -407,7 +382,6 @@ public function removeFieldFromSelect($field, $isAlias = false)
      * Removes all fields from select
      *
      * @return $this
-     * @since 2.0.0
      */
     public function removeAllFieldsFromSelect()
     {
@@ -422,7 +396,6 @@ public function removeAllFieldsFromSelect()
      * @param string $model
      * @param string $resourceModel
      * @return $this
-     * @since 2.0.0
      */
     protected function _init($model, $resourceModel)
     {
@@ -436,7 +409,6 @@ protected function _init($model, $resourceModel)
      *
      * @param string $model
      * @return $this
-     * @since 2.0.0
      */
     public function setModel($model)
     {
@@ -451,7 +423,6 @@ public function setModel($model)
      * Get model instance
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModelName()
     {
@@ -463,7 +434,6 @@ public function getModelName()
      *
      * @param string $model
      * @return void
-     * @since 2.0.0
      */
     public function setResourceModel($model)
     {
@@ -474,7 +444,6 @@ public function setResourceModel($model)
      *  Retrieve resource model name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getResourceModelName()
     {
@@ -485,7 +454,6 @@ public function getResourceModelName()
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -502,7 +470,6 @@ public function getResource()
      *
      * @param string $table
      * @return string
-     * @since 2.0.0
      */
     public function getTable($table)
     {
@@ -513,7 +480,6 @@ public function getTable($table)
      * Retrieve all ids for collection
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllIds()
     {
@@ -534,7 +500,6 @@ public function getAllIds()
      * @param string $cond
      * @param string $cols
      * @return $this
-     * @since 2.0.0
      */
     public function join($table, $cond, $cols = '*')
     {
@@ -559,7 +524,6 @@ public function join($table, $cond, $cols = '*')
      * Redeclare before load method for adding event
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeLoad()
     {
@@ -576,7 +540,6 @@ protected function _beforeLoad()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setResetItemsDataChanged($flag)
     {
@@ -588,7 +551,6 @@ public function setResetItemsDataChanged($flag)
      * Set flag data has changed to all collection items
      *
      * @return $this
-     * @since 2.0.0
      */
     public function resetItemsDataChanged()
     {
@@ -603,7 +565,6 @@ public function resetItemsDataChanged()
      * Redeclare after load method for specifying collection items original data
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _afterLoad()
     {
@@ -625,7 +586,6 @@ protected function _afterLoad()
      * Save all the entities in the collection
      *
      * @return $this
-     * @since 2.0.0
      */
     public function save()
     {
@@ -637,7 +597,7 @@ public function save()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __sleep()
     {
@@ -649,7 +609,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     * @since 2.1.0
+     * @since 2.0.9
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Context.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Context.php
index e1284c56107c9..73cf9c203bb54 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Context.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Context.php
@@ -17,25 +17,21 @@
  * the classes they were introduced for.
  *
  * @codeCoverageIgnore
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resources;
 
     /**
      * @var TransactionManagerInterface
-     * @since 2.0.0
      */
     protected $transactionManager;
 
     /**
      * @var ObjectRelationProcessor
-     * @since 2.0.0
      */
     protected $objectRelationProcessor;
 
@@ -43,7 +39,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param TransactionManagerInterface $transactionManager
      * @param ObjectRelationProcessor $objectRelationProcessor
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -57,7 +52,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     public function getResources()
     {
@@ -66,7 +60,6 @@ public function getResources()
 
     /**
      * @return TransactionManagerInterface
-     * @since 2.0.0
      */
     public function getTransactionManager()
     {
@@ -75,7 +68,6 @@ public function getTransactionManager()
 
     /**
      * @return ObjectRelationProcessor
-     * @since 2.0.0
      */
     public function getObjectRelationProcessor()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
index f0e8784c3ea3e..e899cc56f4548 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ObjectRelationProcessor
 {
@@ -25,7 +24,6 @@ class ObjectRelationProcessor
      * @return void
      * @throws \LogicException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function delete(
         TransactionManagerInterface $transactionManager,
@@ -44,7 +42,6 @@ public function delete(
      * @param array $involvedData
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function validateDataIntegrity($table, array $involvedData)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Profiler.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Profiler.php
index fb8ec1a6ba74f..3cd5ecf5845ce 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Profiler.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Profiler.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Db\Profiler
  *
- * @since 2.0.0
  */
 class Profiler extends \Magento\Framework\DB\Profiler
 {
@@ -26,7 +25,6 @@ class Profiler extends \Magento\Framework\DB\Profiler
 
     /**
      * @var array Allowed query types
-     * @since 2.0.0
      */
     protected $_queryTypes = ['select', 'insert', 'update', 'delete'];
 
@@ -35,7 +33,6 @@ class Profiler extends \Magento\Framework\DB\Profiler
      *
      * @param string $operation
      * @return string
-     * @since 2.0.0
      */
     protected function _getTimerName($operation)
     {
@@ -63,7 +60,6 @@ protected function _getTimerName($operation)
      *
      * @param string $queryText
      * @return string
-     * @since 2.0.0
      */
     protected function _parseQueryType($queryText)
     {
@@ -82,7 +78,6 @@ protected function _parseQueryType($queryText)
      * @param string $queryText SQL statement
      * @param integer $queryType OPTIONAL Type of query, one of the \Zend_Db_Profiler::* constants
      * @return integer|null
-     * @since 2.0.0
      */
     public function queryStart($queryText, $queryType = null)
     {
@@ -120,7 +115,6 @@ public function queryStart($queryText, $queryType = null)
      *
      * @param int $queryId
      * @return string|void
-     * @since 2.0.0
      */
     public function queryEnd($queryId)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManager.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManager.php
index 2da6b6c6cc406..f1ff18d31a23a 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManager.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManager.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Db\TransactionManager
  *
- * @since 2.0.0
  */
 class TransactionManager implements TransactionManagerInterface
 {
     /**
      * @var Connection[]
-     * @since 2.0.0
      */
     protected $participants;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function start(Connection $connection)
     {
@@ -34,7 +31,6 @@ public function start(Connection $connection)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function commit()
     {
@@ -46,7 +42,6 @@ public function commit()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function rollBack()
     {
@@ -61,7 +56,6 @@ public function rollBack()
      *
      * @param Connection $connection
      * @return string
-     * @since 2.0.0
      */
     protected function getConnectionKey(Connection $connection)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
index d8037ec6cfa97..166789196cfa6 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface TransactionManagerInterface
 {
@@ -18,7 +17,6 @@ interface TransactionManagerInterface
      *
      * @param Connection $connection
      * @return Connection
-     * @since 2.0.0
      */
     public function start(Connection $connection);
 
@@ -26,7 +24,6 @@ public function start(Connection $connection);
      * Commit transaction
      *
      * @return void
-     * @since 2.0.0
      */
     public function commit();
 
@@ -34,7 +31,6 @@ public function commit();
      * Rollback transaction
      *
      * @return void
-     * @since 2.0.0
      */
     public function rollBack();
 }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/AbstractDb.php
index caa6056d16b36..b8df7871be55d 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/AbstractDb.php
@@ -7,19 +7,16 @@
 
 /**
  * Class AbstractDb with snapshot saving and relation save processing
- * @since 2.0.0
  */
 abstract class AbstractDb extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var Snapshot
-     * @since 2.0.0
      */
     protected $entitySnapshot;
 
     /**
      * @var RelationComposite
-     * @since 2.0.0
      */
     protected $entityRelationComposite;
 
@@ -28,7 +25,6 @@ abstract class AbstractDb extends \Magento\Framework\Model\ResourceModel\Db\Abst
      * @param RelationComposite $entityRelationComposite
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -53,7 +48,6 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function processAfterSaves(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -65,7 +59,6 @@ protected function processAfterSaves(\Magento\Framework\Model\AbstractModel $obj
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function isModified(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -74,7 +67,6 @@ protected function isModified(\Magento\Framework\Model\AbstractModel $object)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function processNotModifiedSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Collection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Collection.php
index a8d1d0dd966e3..ed0c98648b618 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Collection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Collection.php
@@ -7,13 +7,11 @@
 
 /**
  * Class Collection
- * @since 2.0.0
  */
 abstract class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
      * @var Snapshot
-     * @since 2.0.0
      */
     protected $entitySnapshot;
 
@@ -25,7 +23,6 @@ abstract class Collection extends \Magento\Framework\Model\ResourceModel\Db\Coll
      * @param Snapshot $entitySnapshot
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -49,7 +46,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function fetchItem()
     {
@@ -62,7 +58,6 @@ public function fetchItem()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Metadata.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Metadata.php
index 52c652533f8ea..64d89f56d6827 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Metadata.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Metadata.php
@@ -7,13 +7,11 @@
 
 /**
  * Class Metadata represents a list of entity fields that are applicable for persistence operations
- * @since 2.0.0
  */
 class Metadata
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $metadataInfo = [];
 
@@ -23,7 +21,6 @@ class Metadata
      * @param \Magento\Framework\DataObject $entity
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getFields(\Magento\Framework\DataObject $entity)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
index d36204841f4bd..af6c6a6575c70 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
@@ -10,26 +10,22 @@
 
 /**
  * Class RelationComposite
- * @since 2.0.0
  */
 class RelationComposite
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $relationProcessors;
 
     /**
      * @var EventManager
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @param EventManager $eventManager
      * @param array $relationProcessors
-     * @since 2.0.0
      */
     public function __construct(
         EventManager $eventManager,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function processRelations(AbstractModel $object)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationInterface.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationInterface.php
index 8ffc9fdaeb679..3e5aabdd75d40 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationInterface.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface RelationInterface
- * @since 2.0.0
  */
 interface RelationInterface
 {
@@ -16,7 +15,6 @@ interface RelationInterface
      *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return void
-     * @since 2.0.0
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object);
 }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
index fe4eb0a6e5370..095b5accda7c3 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Snapshot register snapshot of entity data, for tracking changes
- * @since 2.0.0
  */
 class Snapshot
 {
@@ -15,13 +14,11 @@ class Snapshot
      * Array of snapshots of entities data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $snapshotData = [];
 
     /**
      * @var Metadata
-     * @since 2.0.0
      */
     protected $metadata;
 
@@ -29,7 +26,6 @@ class Snapshot
      * Initialization
      *
      * @param Metadata $metadata
-     * @since 2.0.0
      */
     public function __construct(
         Metadata $metadata
@@ -43,7 +39,6 @@ public function __construct(
      * @param \Magento\Framework\DataObject $entity
      * @return void
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function registerSnapshot(\Magento\Framework\DataObject $entity)
     {
@@ -58,7 +53,6 @@ public function registerSnapshot(\Magento\Framework\DataObject $entity)
      *
      * @param \Magento\Framework\DataObject $entity
      * @return bool
-     * @since 2.0.0
      */
     public function isModified(\Magento\Framework\DataObject $entity)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Entity/AbstractEntity.php b/lib/internal/Magento/Framework/Model/ResourceModel/Entity/AbstractEntity.php
index 157c2da9057e8..8a86b636b4964 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Entity/AbstractEntity.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Entity/AbstractEntity.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Entity\AbstractEntity
  *
- * @since 2.0.0
  */
 abstract class AbstractEntity
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_name = null;
 
@@ -22,7 +20,6 @@ abstract class AbstractEntity
      * Configuration object
      *
      * @var \Magento\Framework\Simplexml\Config
-     * @since 2.0.0
      */
     protected $_config = [];
 
@@ -30,7 +27,6 @@ abstract class AbstractEntity
      * Set config
      *
      * @param \Magento\Framework\Simplexml\Config $config
-     * @since 2.0.0
      */
     public function __construct($config)
     {
@@ -42,7 +38,6 @@ public function __construct($config)
      *
      * @param string $key
      * @return \Magento\Framework\Simplexml\Config|string|false
-     * @since 2.0.0
      */
     public function getConfig($key = '')
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Entity/Table.php b/lib/internal/Magento/Framework/Model/ResourceModel/Entity/Table.php
index d722553786363..39833c80d1d7d 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Entity/Table.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Entity/Table.php
@@ -8,7 +8,6 @@
 /**
  * Class describing db table resource entity
  *
- * @since 2.0.0
  */
 class Table extends \Magento\Framework\Model\ResourceModel\Entity\AbstractEntity
 {
@@ -16,7 +15,6 @@ class Table extends \Magento\Framework\Model\ResourceModel\Entity\AbstractEntity
      * Get table
      *
      * @return String
-     * @since 2.0.0
      */
     public function getTable()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php b/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
index 24cb618e6921a..37eebc1eb1673 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Iterator
  *
- * @since 2.0.0
  */
 class Iterator extends \Magento\Framework\DataObject
 {
@@ -28,7 +27,6 @@ class Iterator extends \Magento\Framework\DataObject
      * @param array $args
      * @param AdapterInterface $connection
      * @return \Magento\Framework\Model\ResourceModel\Iterator
-     * @since 2.0.0
      */
     public function walk($query, array $callbacks, array $args = [], $connection = null)
     {
@@ -55,7 +53,6 @@ public function walk($query, array $callbacks, array $args = [], $connection = n
      * @param AdapterInterface $connection
      * @return \Zend_Db_Statement_Interface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function _getStatement($query, AdapterInterface $connection = null)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Type/AbstractType.php b/lib/internal/Magento/Framework/Model/ResourceModel/Type/AbstractType.php
index 01f8f089db2b9..71e24b26426a0 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Type/AbstractType.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Type/AbstractType.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Type\AbstractType
  *
- * @since 2.0.0
  */
 abstract class AbstractType
 {
@@ -16,7 +15,6 @@ abstract class AbstractType
      * Name
      *
      * @var String
-     * @since 2.0.0
      */
     protected $_name = '';
 
@@ -24,7 +22,6 @@ abstract class AbstractType
      * Entity class
      *
      * @var String
-     * @since 2.0.0
      */
     protected $_entityClass = \Magento\Framework\Model\ResourceModel\Entity\AbstractEntity::class;
 
@@ -32,7 +29,6 @@ abstract class AbstractType
      * Retrieve entity type
      *
      * @return String
-     * @since 2.0.0
      */
     public function getEntityClass()
     {
@@ -44,7 +40,6 @@ public function getEntityClass()
      *
      * @param String $name
      * @return void
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -55,7 +50,6 @@ public function setName($name)
      * Retrieve name
      *
      * @return String
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db.php b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db.php
index 099425f10606d..84de47db53cac 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Type\Db
  *
- * @since 2.0.0
  */
 abstract class Db extends \Magento\Framework\Model\ResourceModel\Type\AbstractType
 {
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactory.php b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactory.php
index fe8f6b03fa4ec..8fa057d890a13 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactory.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactory.php
@@ -9,13 +9,11 @@
 
 /**
  * Connection adapter factory
- * @since 2.0.0
  */
 class ConnectionFactory implements ConnectionFactoryInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class ConnectionFactory implements ConnectionFactoryInterface
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(ObjectManagerInterface $objectManager)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create(array $connectionConfig)
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactoryInterface.php b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactoryInterface.php
index 3d255abb52c39..aff1684059b65 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactoryInterface.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/ConnectionFactoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface
  *
- * @since 2.0.0
  */
 interface ConnectionFactoryInterface
 {
@@ -20,7 +19,6 @@ interface ConnectionFactoryInterface
      * @param array $connectionConfig
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $connectionConfig);
 }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/Pdo/Mysql.php b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/Pdo/Mysql.php
index 67a6b64a81835..3488f06a7a381 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/Pdo/Mysql.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql
  *
- * @since 2.0.0
  */
 class Mysql extends \Magento\Framework\Model\ResourceModel\Type\Db implements
     ConnectionAdapterInterface
@@ -24,7 +23,6 @@ class Mysql extends \Magento\Framework\Model\ResourceModel\Type\Db implements
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $connectionConfig;
 
@@ -39,7 +37,6 @@ class Mysql extends \Magento\Framework\Model\ResourceModel\Type\Db implements
      *
      * @param array $config
      * @param MysqlFactory|null $mysqlFactory
-     * @since 2.0.0
      */
     public function __construct(
         array $config,
@@ -52,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConnection(DB\LoggerInterface $logger = null, SelectFactory $selectFactory = null)
     {
@@ -73,7 +69,6 @@ public function getConnection(DB\LoggerInterface $logger = null, SelectFactory $
      * @param DB\LoggerInterface|null $logger
      * @param SelectFactory|null $selectFactory
      * @return \Magento\Framework\DB\Adapter\Pdo\Mysql
-     * @since 2.0.0
      */
     protected function getDbConnectionInstance(DB\LoggerInterface $logger = null, SelectFactory $selectFactory = null)
     {
@@ -89,7 +84,6 @@ protected function getDbConnectionInstance(DB\LoggerInterface $logger = null, Se
      * Retrieve DB connection class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDbConnectionClassName()
     {
@@ -101,7 +95,6 @@ protected function getDbConnectionClassName()
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     private function getValidConfig(array $config)
     {
diff --git a/lib/internal/Magento/Framework/Module/ConflictChecker.php b/lib/internal/Magento/Framework/Module/ConflictChecker.php
index 0992b0185f5cd..64b1c7e5cfce3 100644
--- a/lib/internal/Magento/Framework/Module/ConflictChecker.php
+++ b/lib/internal/Magento/Framework/Module/ConflictChecker.php
@@ -9,7 +9,6 @@
 
 /**
  * Checks for conflicts between modules
- * @since 2.0.0
  */
 class ConflictChecker
 {
@@ -17,7 +16,6 @@ class ConflictChecker
      * Enabled module list
      *
      * @var ModuleList
-     * @since 2.0.0
      */
     private $list;
 
@@ -25,7 +23,6 @@ class ConflictChecker
      * Composer package info
      *
      * @var PackageInfo
-     * @since 2.0.0
      */
     private $packageInfo;
 
@@ -34,7 +31,6 @@ class ConflictChecker
      *
      * @param ModuleList $list
      * @param PackageInfoFactory $packageInfoFactory
-     * @since 2.0.0
      */
     public function __construct(ModuleList $list, PackageInfoFactory $packageInfoFactory)
     {
@@ -49,7 +45,6 @@ public function __construct(ModuleList $list, PackageInfoFactory $packageInfoFac
      * @param string[] $currentlyEnabledModules
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkConflictsWhenEnableModules($moduleNames, $currentlyEnabledModules = null)
     {
@@ -76,7 +71,6 @@ public function checkConflictsWhenEnableModules($moduleNames, $currentlyEnabledM
      * @param string $moduleA
      * @param string $moduleB
      * @return string[]
-     * @since 2.0.0
      */
     private function getConflictMessages($moduleA, $moduleB)
     {
diff --git a/lib/internal/Magento/Framework/Module/DbVersionInfo.php b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
index f3ebbe70f6982..993f2853d2ce3 100644
--- a/lib/internal/Magento/Framework/Module/DbVersionInfo.php
+++ b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
@@ -10,7 +10,6 @@
 /**
  * Class DbVersionInfo
  *
- * @since 2.0.0
  */
 class DbVersionInfo
 {
@@ -23,22 +22,17 @@ class DbVersionInfo
     const KEY_REQUIRED = 'required';
     /**#@-*/
 
-    /**
-     * @var ModuleListInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $moduleList;
 
     /**
      * @var ResourceInterface
-     * @since 2.0.0
      */
     private $moduleResource;
 
     /**
      * @param ModuleListInterface $moduleList
      * @param ResourceInterface $moduleResource
-     * @since 2.0.0
      */
     public function __construct(
         ModuleListInterface $moduleList,
@@ -53,7 +47,6 @@ public function __construct(
      *
      * @param string $moduleName
      * @return bool
-     * @since 2.0.0
      */
     public function isSchemaUpToDate($moduleName)
     {
@@ -64,7 +57,6 @@ public function isSchemaUpToDate($moduleName)
     /**
      * @param string $moduleName
      * @return bool
-     * @since 2.0.0
      */
     public function isDataUpToDate($moduleName)
     {
@@ -77,7 +69,6 @@ public function isDataUpToDate($moduleName)
      *
      * @return string[] Array of errors, each error contains module name, current version, required version,
      *                  and type (schema or data).  The array will be empty if all schema and data are current.
-     * @since 2.0.0
      */
     public function getDbVersionErrors()
     {
@@ -99,7 +90,6 @@ public function getDbVersionErrors()
      *
      * @param string $moduleName
      * @return string[] Contains current and needed version strings
-     * @since 2.0.0
      */
     private function getSchemaInfo($moduleName)
     {
@@ -120,7 +110,6 @@ private function getSchemaInfo($moduleName)
      *
      * @param string $moduleName
      * @return string[]
-     * @since 2.0.0
      */
     private function getDataInfo($moduleName)
     {
@@ -143,7 +132,6 @@ private function getDataInfo($moduleName)
      * @param string|bool $version
      * @return bool
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     private function isModuleVersionEqual($moduleName, $version)
     {
diff --git a/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php b/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
index 45f1046fd53e0..30630dd364638 100644
--- a/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
@@ -10,14 +10,12 @@
 /**
  * Class \Magento\Framework\Module\Declaration\Converter\Dom
  *
- * @since 2.0.0
  */
 class Dom implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * {@inheritdoc}
      * @throws \Exception
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -59,7 +57,6 @@ public function convert($source)
      * @param \DOMNode $node
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _readModules(\DOMNode $node)
     {
diff --git a/lib/internal/Magento/Framework/Module/DependencyChecker.php b/lib/internal/Magento/Framework/Module/DependencyChecker.php
index 39396b22398a7..5855c5cf4143e 100644
--- a/lib/internal/Magento/Framework/Module/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Module/DependencyChecker.php
@@ -9,7 +9,6 @@
 
 /**
  * Checks for dependencies between modules
- * @since 2.0.0
  */
 class DependencyChecker
 {
@@ -17,7 +16,6 @@ class DependencyChecker
      * Enabled module list from configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $enabledModuleList;
 
@@ -25,7 +23,6 @@ class DependencyChecker
      * The full module list information from filesystem
      *
      * @var array
-     * @since 2.0.0
      */
     private $fullModuleList;
 
@@ -33,13 +30,11 @@ class DependencyChecker
      * Graph
      *
      * @var Graph
-     * @since 2.0.0
      */
     private $graph;
 
     /**
      * @var PackageInfo
-     * @since 2.0.0
      */
     protected $packageInfo;
 
@@ -49,7 +44,6 @@ class DependencyChecker
      * @param ModuleList $list
      * @param ModuleList\Loader $loader
      * @param PackageInfoFactory $packageInfoFactory
-     * @since 2.0.0
      */
     public function __construct(ModuleList $list, ModuleList\Loader $loader, PackageInfoFactory $packageInfoFactory)
     {
@@ -64,7 +58,6 @@ public function __construct(ModuleList $list, ModuleList\Loader $loader, Package
      * @param string[] $toBeDisabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
-     * @since 2.0.0
      */
     public function checkDependenciesWhenDisableModules($toBeDisabledModules, $currentlyEnabledModules = null)
     {
@@ -80,7 +73,6 @@ public function checkDependenciesWhenDisableModules($toBeDisabledModules, $curre
      * @param string[] $toBeEnabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
-     * @since 2.0.0
      */
     public function checkDependenciesWhenEnableModules($toBeEnabledModules, $currentlyEnabledModules = null)
     {
@@ -97,7 +89,6 @@ public function checkDependenciesWhenEnableModules($toBeEnabledModules, $current
      * @param string[] $moduleNames list of modules to be enabled/disabled
      * @param string[] $enabledModules list of enabled modules assuming enable/disable succeeds
      * @return array
-     * @since 2.0.0
      */
     private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
     {
@@ -129,7 +120,6 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
      * Create the dependency graph
      *
      * @return Graph
-     * @since 2.0.0
      */
     private function createGraph()
     {
diff --git a/lib/internal/Magento/Framework/Module/Dir.php b/lib/internal/Magento/Framework/Module/Dir.php
index 2d94d33a1eac8..2000dfa05ba79 100644
--- a/lib/internal/Magento/Framework/Module/Dir.php
+++ b/lib/internal/Magento/Framework/Module/Dir.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Module\Dir
  *
- * @since 2.0.0
  */
 class Dir
 {
@@ -27,17 +26,11 @@ class Dir
     const MODULE_CONTROLLER_DIR = 'Controller';
     /**#@-*/
 
-    /**
-     * Module registry
-     *
-     * @var ComponentRegistrarInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $componentRegistrar;
 
     /**
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrarInterface $componentRegistrar)
     {
@@ -51,7 +44,6 @@ public function __construct(ComponentRegistrarInterface $componentRegistrar)
      * @param string $type Type of module's directory to retrieve
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getDir($moduleName, $type = '')
     {
diff --git a/lib/internal/Magento/Framework/Module/Dir/Reader.php b/lib/internal/Magento/Framework/Module/Dir/Reader.php
index 49cae006106c7..033778f3cb329 100644
--- a/lib/internal/Magento/Framework/Module/Dir/Reader.php
+++ b/lib/internal/Magento/Framework/Module/Dir/Reader.php
@@ -15,7 +15,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Reader
 {
@@ -23,7 +22,6 @@ class Reader
      * Module directories that were set explicitly
      *
      * @var array
-     * @since 2.0.0
      */
     protected $customModuleDirs = [];
 
@@ -31,7 +29,6 @@ class Reader
      * Directory registry
      *
      * @var Dir
-     * @since 2.0.0
      */
     protected $moduleDirs;
 
@@ -39,19 +36,16 @@ class Reader
      * Modules configuration provider
      *
      * @var ModuleListInterface
-     * @since 2.0.0
      */
     protected $modulesList;
 
     /**
      * @var FileIteratorFactory
-     * @since 2.0.0
      */
     protected $fileIteratorFactory;
 
     /**
      * @var Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     protected $readFactory;
 
@@ -59,7 +53,7 @@ class Reader
      * Found configuration files grouped by configuration types (filename).
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private $fileIterators = [];
 
@@ -68,7 +62,6 @@ class Reader
      * @param ModuleListInterface $moduleList
      * @param FileIteratorFactory $fileIteratorFactory
      * @param Filesystem\Directory\ReadFactory $readFactory
-     * @since 2.0.0
      */
     public function __construct(
         Dir $moduleDirs,
@@ -87,7 +80,6 @@ public function __construct(
      *
      * @param string $filename
      * @return FileIterator
-     * @since 2.0.0
      */
     public function getConfigurationFiles($filename)
     {
@@ -98,7 +90,6 @@ public function getConfigurationFiles($filename)
      * Go through all modules and find composer.json files of active modules.
      *
      * @return FileIterator
-     * @since 2.0.0
      */
     public function getComposerJsonFiles()
     {
@@ -112,7 +103,7 @@ public function getComposerJsonFiles()
      * @param string $subDir
      *
      * @return FileIterator
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getFilesIterator($filename, $subDir = '')
     {
@@ -130,7 +121,6 @@ private function getFilesIterator($filename, $subDir = '')
      * @param string $filename
      * @param string $subDir
      * @return array
-     * @since 2.0.0
      */
     private function getFiles($filename, $subDir = '')
     {
@@ -151,7 +141,6 @@ private function getFiles($filename, $subDir = '')
      * Retrieve list of module action files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getActionFiles()
     {
@@ -180,7 +169,6 @@ public function getActionFiles()
      * @param string $type
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     public function getModuleDir($type, $moduleName)
     {
@@ -197,7 +185,6 @@ public function getModuleDir($type, $moduleName)
      * @param string $type directory type (etc, controllers, locale etc)
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     public function setModuleDir($moduleName, $type, $path)
     {
diff --git a/lib/internal/Magento/Framework/Module/Dir/ReverseResolver.php b/lib/internal/Magento/Framework/Module/Dir/ReverseResolver.php
index 5c692e983d02b..7c5d1b9f9f841 100644
--- a/lib/internal/Magento/Framework/Module/Dir/ReverseResolver.php
+++ b/lib/internal/Magento/Framework/Module/Dir/ReverseResolver.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Framework\Module\Dir\ReverseResolver
  *
- * @since 2.0.0
  */
 class ReverseResolver
 {
     /**
      * @var ModuleListInterface
-     * @since 2.0.0
      */
     protected $_moduleList;
 
     /**
      * @var Dir
-     * @since 2.0.0
      */
     protected $_moduleDirs;
 
     /**
      * @param ModuleListInterface $moduleList
      * @param Dir $moduleDirs
-     * @since 2.0.0
      */
     public function __construct(ModuleListInterface $moduleList, Dir $moduleDirs)
     {
@@ -45,7 +41,6 @@ public function __construct(ModuleListInterface $moduleList, Dir $moduleDirs)
      *
      * @param string $path Full path to file or directory
      * @return string|null
-     * @since 2.0.0
      */
     public function getModuleName($path)
     {
diff --git a/lib/internal/Magento/Framework/Module/FullModuleList.php b/lib/internal/Magento/Framework/Module/FullModuleList.php
index a8e0e975b0213..5ad5b05a413ef 100644
--- a/lib/internal/Magento/Framework/Module/FullModuleList.php
+++ b/lib/internal/Magento/Framework/Module/FullModuleList.php
@@ -9,7 +9,6 @@
  * A list of modules in the Magento application
  *
  * Represents all modules, regardless of enabled or not
- * @since 2.0.0
  */
 class FullModuleList implements ModuleListInterface
 {
@@ -17,7 +16,6 @@ class FullModuleList implements ModuleListInterface
      * Loader of module information from source code
      *
      * @var ModuleList\Loader
-     * @since 2.0.0
      */
     private $loader;
 
@@ -25,7 +23,6 @@ class FullModuleList implements ModuleListInterface
      * Enumeration of the module names
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $data;
 
@@ -33,7 +30,6 @@ class FullModuleList implements ModuleListInterface
      * Constructor
      *
      * @param ModuleList\Loader $loader
-     * @since 2.0.0
      */
     public function __construct(ModuleList\Loader $loader)
     {
@@ -43,7 +39,6 @@ public function __construct(ModuleList\Loader $loader)
     /**
      * {@inheritdoc}
      * @see getNames()
-     * @since 2.0.0
      */
     public function getAll()
     {
@@ -56,7 +51,6 @@ public function getAll()
     /**
      * {@inheritdoc}
      * @see has()
-     * @since 2.0.0
      */
     public function getOne($name)
     {
@@ -66,7 +60,6 @@ public function getOne($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNames()
     {
@@ -76,7 +69,6 @@ public function getNames()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function has($name)
     {
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 02b03a8e5801c..3515f281cc26e 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -12,7 +12,6 @@
  * ```php
  *  $manager->isEnabled('Vendor_Module');
  * ```
- * @since 2.0.0
  */
 class Manager
 {
@@ -50,7 +49,6 @@ class Manager
      * @param Output\ConfigInterface $outputConfig the checker of output modules
      * @param ModuleListInterface $moduleList the list of all modules
      * @param array $outputConfigPaths the list of config paths to ignore
-     * @since 2.0.0
      */
     public function __construct(
         Output\ConfigInterface $outputConfig,
@@ -68,7 +66,6 @@ public function __construct(
      * @param string $moduleName the fully-qualified module name
      *
      * @return boolean true if module is enabled, false otherwise
-     * @since 2.0.0
      */
     public function isEnabled($moduleName)
     {
@@ -82,7 +79,6 @@ public function isEnabled($moduleName)
      *
      * @return boolean
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     public function isOutputEnabled($moduleName)
     {
@@ -98,7 +94,6 @@ public function isOutputEnabled($moduleName)
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version.
      * The method can be removed in a future major release
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function _isCustomOutputConfigEnabled($moduleName)
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
index 52cd1af75614f..406aa9efd31a0 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -13,7 +13,6 @@
  *
  * Encapsulates information about whether modules are enabled or not.
  * Represents only enabled modules through its interface
- * @since 2.0.0
  */
 class ModuleList implements ModuleListInterface
 {
@@ -21,7 +20,6 @@ class ModuleList implements ModuleListInterface
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $config;
 
@@ -29,7 +27,6 @@ class ModuleList implements ModuleListInterface
      * Loader of module information from source code
      *
      * @var ModuleList\Loader
-     * @since 2.0.0
      */
     private $loader;
 
@@ -39,7 +36,6 @@ class ModuleList implements ModuleListInterface
      * The possible values are 1 (enabled) or 0 (disabled)
      *
      * @var int[]
-     * @since 2.0.0
      */
     private $configData;
 
@@ -47,7 +43,6 @@ class ModuleList implements ModuleListInterface
      * Enumeration of the enabled module names
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $enabled;
 
@@ -56,7 +51,6 @@ class ModuleList implements ModuleListInterface
      *
      * @param DeploymentConfig $config
      * @param ModuleList\Loader $loader
-     * @since 2.0.0
      */
     public function __construct(DeploymentConfig $config, ModuleList\Loader $loader)
     {
@@ -71,7 +65,6 @@ public function __construct(DeploymentConfig $config, ModuleList\Loader $loader)
      * Use this method only when you actually need modules' declared meta-information.
      *
      * @see getNames()
-     * @since 2.0.0
      */
     public function getAll()
     {
@@ -93,7 +86,6 @@ public function getAll()
     /**
      * {@inheritdoc}
      * @see has()
-     * @since 2.0.0
      */
     public function getOne($name)
     {
@@ -103,7 +95,6 @@ public function getOne($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNames()
     {
@@ -117,7 +108,6 @@ public function getNames()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function has($name)
     {
@@ -132,7 +122,6 @@ public function has($name)
      * Checks if module list information is available.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isModuleInfoAvailable()
     {
@@ -147,7 +136,6 @@ public function isModuleInfoAvailable()
      * Loads configuration data only
      *
      * @return void
-     * @since 2.0.0
      */
     private function loadConfigData()
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index af70e688f0197..bdfb77762b41c 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -16,7 +16,6 @@
  * Loader of module list information from the filesystem
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Loader
 {
@@ -24,7 +23,6 @@ class Loader
      * Converter of XML-files to associative arrays (specific to module.xml file format)
      *
      * @var Dom
-     * @since 2.0.0
      */
     private $converter;
 
@@ -32,7 +30,6 @@ class Loader
      * Parser
      *
      * @var \Magento\Framework\Xml\Parser
-     * @since 2.0.0
      */
     private $parser;
 
@@ -40,7 +37,6 @@ class Loader
      * Module registry
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $moduleRegistry;
 
@@ -48,7 +44,6 @@ class Loader
      * Filesystem driver to allow reading of module.xml files which live outside of app/code
      *
      * @var DriverInterface
-     * @since 2.0.0
      */
     private $filesystemDriver;
 
@@ -59,7 +54,6 @@ class Loader
      * @param Parser $parser
      * @param ComponentRegistrarInterface $moduleRegistry
      * @param DriverInterface $filesystemDriver
-     * @since 2.0.0
      */
     public function __construct(
         Dom $converter,
@@ -80,7 +74,6 @@ public function __construct(
      * @param array $exclude
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
-     * @since 2.0.0
      */
     public function load(array $exclude = [])
     {
@@ -118,7 +111,6 @@ public function load(array $exclude = [])
      * @return \Traversable
      *
      * @author Josh Di Fabio <joshdifabio@gmail.com>
-     * @since 2.0.0
      */
     private function getModuleConfigs()
     {
@@ -135,7 +127,6 @@ private function getModuleConfigs()
      * @param array $origList
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     private function sortBySequence($origList)
     {
@@ -176,7 +167,6 @@ private function sortBySequence($origList)
      * @param array $accumulated
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     private function expandSequence($list, $name, $accumulated = [])
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleListInterface.php b/lib/internal/Magento/Framework/Module/ModuleListInterface.php
index 036cfc958d35a..1df097d1963ae 100644
--- a/lib/internal/Magento/Framework/Module/ModuleListInterface.php
+++ b/lib/internal/Magento/Framework/Module/ModuleListInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Module\ModuleListInterface
  *
- * @since 2.0.0
  */
 interface ModuleListInterface
 {
@@ -20,7 +19,6 @@ interface ModuleListInterface
      * Returns an array where key is module name and value is an array with module meta-information
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAll();
 
@@ -31,7 +29,6 @@ public function getAll();
      *
      * @param string $name
      * @return array|null
-     * @since 2.0.0
      */
     public function getOne($name);
 
@@ -39,7 +36,6 @@ public function getOne($name);
      * Enumerates the list of names of modules
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getNames();
 
@@ -48,7 +44,6 @@ public function getNames();
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function has($name);
 }
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index 70a716e7ebad9..ed740d459060e 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -10,7 +10,6 @@
 
 /**
  * Resource Model
- * @since 2.0.0
  */
 class ModuleResource extends AbstractDb implements ResourceInterface
 {
@@ -18,7 +17,6 @@ class ModuleResource extends AbstractDb implements ResourceInterface
      * Database versions
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $schemaVersions = null;
 
@@ -26,7 +24,6 @@ class ModuleResource extends AbstractDb implements ResourceInterface
      * Resource data versions cache array
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $dataVersions = null;
 
@@ -34,7 +31,6 @@ class ModuleResource extends AbstractDb implements ResourceInterface
      * Define main table
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -50,7 +46,6 @@ protected function _construct()
      *
      * @param string $needType Can be 'db' or 'data'
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadVersion($needType)
     {
@@ -82,7 +77,6 @@ protected function _loadVersion($needType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDbVersion($moduleName)
     {
@@ -95,7 +89,6 @@ public function getDbVersion($moduleName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDbVersion($moduleName, $version)
     {
@@ -116,7 +109,6 @@ public function setDbVersion($moduleName, $version)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataVersion($moduleName)
     {
@@ -129,7 +121,6 @@ public function getDataVersion($moduleName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDataVersion($moduleName, $version)
     {
diff --git a/lib/internal/Magento/Framework/Module/Output/Config.php b/lib/internal/Magento/Framework/Module/Output/Config.php
index 1afb39229702a..85765eb1001df 100644
--- a/lib/internal/Magento/Framework/Module/Output/Config.php
+++ b/lib/internal/Magento/Framework/Module/Output/Config.php
@@ -11,7 +11,6 @@
  * Checks whether the module is enabled in the configuration.
  *
  * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\Module\Output\ConfigInterface
 {
@@ -24,21 +23,18 @@ class Config implements \Magento\Framework\Module\Output\ConfigInterface
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var string
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @since 2.0.0
      */
     protected $_storeType;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $scopeType
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -54,7 +50,6 @@ public function __construct(
      * @param string $moduleName Fully-qualified module name
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return boolean
-     * @since 2.0.0
      */
     public function isEnabled($moduleName)
     {
@@ -67,7 +62,6 @@ public function isEnabled($moduleName)
      * @param string $path Fully-qualified config path
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return boolean
-     * @since 2.0.0
      */
     public function isSetFlag($path)
     {
diff --git a/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php b/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
index 72a32f1391aa7..7ba185372fb21 100644
--- a/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Checks whether the module is enabled in the configuration.
  *
  * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      * @param string $moduleName Fully-qualified module name
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return boolean
-     * @since 2.0.0
      */
     public function isEnabled($moduleName);
 
@@ -29,7 +27,6 @@ public function isEnabled($moduleName);
      * @param string $path Fully-qualified config path
      * @deprecated 2.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      * @return boolean
-     * @since 2.0.0
      */
     public function isSetFlag($path);
 }
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
index 5384d29b29798..a6cf6b811184d 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfo.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -10,7 +10,6 @@
 /**
  * Provide information of dependencies and conflicts in composer.json files, mapping of package name to module name,
  * and mapping of module name to package version
- * @since 2.0.0
  */
 class PackageInfo
 {
@@ -18,7 +17,6 @@ class PackageInfo
      * Package name to module name map
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $packageModuleMap;
 
@@ -26,7 +24,6 @@ class PackageInfo
      * Map of module name to package version
      *
      * @var string[]
-     * @since 2.0.0
      */
     private $modulePackageVersionMap;
 
@@ -34,7 +31,6 @@ class PackageInfo
      * "require" field of each module, contains depending modules' name
      *
      * @var array[]
-     * @since 2.0.0
      */
     private $requireMap;
 
@@ -42,7 +38,6 @@ class PackageInfo
      * "conflict" field of each module, contains conflicting modules' name and version constraint
      *
      * @var array[]
-     * @since 2.0.0
      */
     private $conflictMap;
 
@@ -50,19 +45,16 @@ class PackageInfo
      * Reader of composer.json files
      *
      * @var Dir\Reader
-     * @since 2.0.0
      */
     private $reader;
 
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $nonExistingDependencies = [];
 
@@ -71,7 +63,6 @@ class PackageInfo
      *
      * @param Dir\Reader $reader
      * @param ComponentRegistrar $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(Dir\Reader $reader, ComponentRegistrar $componentRegistrar)
     {
@@ -85,7 +76,6 @@ public function __construct(Dir\Reader $reader, ComponentRegistrar $componentReg
      * @return void
      * @throws \Zend_Json_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function load()
     {
@@ -128,7 +118,6 @@ private function load()
      *
      * @param string $packageName
      * @return string
-     * @since 2.0.0
      */
     public function getModuleName($packageName)
     {
@@ -150,7 +139,6 @@ public function getModuleName($packageName)
      *
      * @param string $dependency
      * @return void
-     * @since 2.0.0
      */
     protected function addNonExistingDependency($dependency)
     {
@@ -163,7 +151,6 @@ protected function addNonExistingDependency($dependency)
      * Return list of non existing dependencies
      *
      * @return array
-     * @since 2.0.0
      */
     public function getNonExistingDependencies()
     {
@@ -175,7 +162,6 @@ public function getNonExistingDependencies()
      *
      * @param string $packageName
      * @return string|null
-     * @since 2.0.0
      */
     protected function convertPackageNameToModuleName($packageName)
     {
@@ -191,7 +177,6 @@ protected function convertPackageNameToModuleName($packageName)
      *
      * @param string $packageName
      * @return bool
-     * @since 2.0.0
      */
     protected function isMagentoPackage($packageName)
     {
@@ -203,7 +188,6 @@ protected function isMagentoPackage($packageName)
      *
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     public function getPackageName($moduleName)
     {
@@ -216,7 +200,6 @@ public function getPackageName($moduleName)
      *
      * @param string[] $packageNames
      * @return string[]
-     * @since 2.0.0
      */
     private function convertToModuleNames($packageNames)
     {
@@ -232,7 +215,6 @@ private function convertToModuleNames($packageNames)
      *
      * @param string $moduleName
      * @return array
-     * @since 2.0.0
      */
     public function getRequire($moduleName)
     {
@@ -269,7 +251,6 @@ public function getRequiredBy($requiredModuleName)
      *
      * @param string $moduleName
      * @return array
-     * @since 2.0.0
      */
     public function getConflict($moduleName)
     {
@@ -289,7 +270,6 @@ public function getConflict($moduleName)
      *
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     public function getVersion($moduleName)
     {
diff --git a/lib/internal/Magento/Framework/Module/PackageInfoFactory.php b/lib/internal/Magento/Framework/Module/PackageInfoFactory.php
index 3703870c03e8a..fffef8c6ffeb1 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfoFactory.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfoFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory to create PackageInfo class
- * @since 2.0.0
  */
 class PackageInfoFactory
 {
@@ -15,7 +14,6 @@ class PackageInfoFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -23,7 +21,6 @@ class PackageInfoFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Create class instance with specified parameters
      *
      * @return \Magento\Framework\Module\PackageInfo
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 69d5851d85373..aa7e0394658ed 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -14,26 +14,22 @@
 
 /**
  * Validation of DB up to date state
- * @since 2.0.0
  */
 class DbStatusValidator
 {
     /**
      * @var FrontendCacheInterface
-     * @since 2.0.0
      */
     private $cache;
 
     /**
      * @var DbVersionInfo
-     * @since 2.0.0
      */
     private $dbVersionInfo;
 
     /**
      * @param FrontendCacheInterface $cache
      * @param DbVersionInfo $dbVersionInfo
-     * @since 2.0.0
      */
     public function __construct(FrontendCacheInterface $cache, DbVersionInfo $dbVersionInfo)
     {
@@ -74,7 +70,6 @@ public function beforeDispatch(FrontController $subject, RequestInterface $reque
      *
      * @param array $errorsData array of error data from getOutOfDateDbErrors
      * @return array Messages that can be used to log the error
-     * @since 2.0.0
      */
     private function formatErrors($errorsData)
     {
diff --git a/lib/internal/Magento/Framework/Module/ResourceInterface.php b/lib/internal/Magento/Framework/Module/ResourceInterface.php
index 83037089bec6a..f2d49de5b428c 100644
--- a/lib/internal/Magento/Framework/Module/ResourceInterface.php
+++ b/lib/internal/Magento/Framework/Module/ResourceInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Resource Model Interface
- * @since 2.0.0
  */
 interface ResourceInterface
 {
@@ -16,7 +15,6 @@ interface ResourceInterface
      *
      * @param string $moduleName
      * @return false|string
-     * @since 2.0.0
      */
     public function getDbVersion($moduleName);
 
@@ -25,7 +23,6 @@ public function getDbVersion($moduleName);
      *
      * @param string $moduleName
      * @return string|false
-     * @since 2.0.0
      */
     public function getDataVersion($moduleName);
 
@@ -35,7 +32,6 @@ public function getDataVersion($moduleName);
      * @param string $moduleName
      * @param string $version
      * @return int
-     * @since 2.0.0
      */
     public function setDbVersion($moduleName, $version);
 
@@ -45,7 +41,6 @@ public function setDbVersion($moduleName, $version);
      * @param string $moduleName
      * @param string $version
      * @return void
-     * @since 2.0.0
      */
     public function setDataVersion($moduleName, $version);
 }
diff --git a/lib/internal/Magento/Framework/Module/Setup.php b/lib/internal/Magento/Framework/Module/Setup.php
index b3dbc4015652b..c1b40c3a1d412 100644
--- a/lib/internal/Magento/Framework/Module/Setup.php
+++ b/lib/internal/Magento/Framework/Module/Setup.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Module\Setup
  *
- * @since 2.0.0
  */
 class Setup implements SetupInterface
 {
@@ -22,7 +21,6 @@ class Setup implements SetupInterface
      * Setup Connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private $connection = null;
 
@@ -30,7 +28,6 @@ class Setup implements SetupInterface
      * Tables cache array
      *
      * @var array
-     * @since 2.0.0
      */
     private $tables = [];
 
@@ -38,7 +35,6 @@ class Setup implements SetupInterface
      * Modules configuration
      *
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     private $resourceModel;
 
@@ -46,7 +42,6 @@ class Setup implements SetupInterface
      * Connection instance name
      *
      * @var string
-     * @since 2.0.0
      */
     private $connectionName;
 
@@ -55,7 +50,6 @@ class Setup implements SetupInterface
      *
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -70,7 +64,6 @@ public function __construct(
      *
      * @param string|null $connectionName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection($connectionName = null)
     {
@@ -88,7 +81,7 @@ public function getConnection($connectionName = null)
      * Returns default setup connection instance
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getDefaultConnection()
     {
@@ -104,7 +97,6 @@ private function getDefaultConnection()
      * @param string $tableName
      * @param string $realTableName
      * @return $this
-     * @since 2.0.0
      */
     public function setTable($tableName, $realTableName)
     {
@@ -130,7 +122,6 @@ public function getTablePlaceholder($tableName)
      * @param string|array $tableName
      * @param string $connectionName
      * @return string
-     * @since 2.0.0
      */
     public function getTable($tableName, $connectionName = ResourceConnection::DEFAULT_CONNECTION)
     {
@@ -146,7 +137,6 @@ public function getTable($tableName, $connectionName = ResourceConnection::DEFAU
      *
      * @param string|array $tableName
      * @return string
-     * @since 2.0.0
      */
     private function _getTableCacheName($tableName)
     {
@@ -162,7 +152,6 @@ private function _getTableCacheName($tableName)
      * @param string $table
      * @param string $connectionName
      * @return bool
-     * @since 2.0.0
      */
     public function tableExists($table, $connectionName = ResourceConnection::DEFAULT_CONNECTION)
     {
@@ -175,7 +164,6 @@ public function tableExists($table, $connectionName = ResourceConnection::DEFAUL
      *
      * @param string $sql
      * @return $this
-     * @since 2.0.0
      */
     public function run($sql)
     {
@@ -187,7 +175,6 @@ public function run($sql)
      * Prepare database before install/upgrade
      *
      * @return $this
-     * @since 2.0.0
      */
     public function startSetup()
     {
@@ -199,7 +186,6 @@ public function startSetup()
      * Prepare database after install/upgrade
      *
      * @return $this
-     * @since 2.0.0
      */
     public function endSetup()
     {
diff --git a/lib/internal/Magento/Framework/Module/Setup/Context.php b/lib/internal/Magento/Framework/Module/Setup/Context.php
index fd62e61f55053..81b93ac447cc0 100644
--- a/lib/internal/Magento/Framework/Module/Setup/Context.php
+++ b/lib/internal/Magento/Framework/Module/Setup/Context.php
@@ -15,61 +15,51 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $_resourceModel;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_modulesReader;
 
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     protected $_moduleList;
 
     /**
      * @var \Magento\Framework\Module\ResourceInterface
-     * @since 2.0.0
      */
     protected $_resource;
 
     /**
      * @var \Magento\Framework\Module\Setup\MigrationFactory
-     * @since 2.0.0
      */
     protected $_migrationFactory;
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     protected $_encryptor;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -85,7 +75,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\Module\Setup\MigrationFactory $migrationFactory
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -111,7 +100,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -120,7 +108,6 @@ public function getEventManager()
 
     /**
      * @return \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -129,7 +116,6 @@ public function getLogger()
 
     /**
      * @return \Magento\Framework\Module\ModuleListInterface
-     * @since 2.0.0
      */
     public function getModuleList()
     {
@@ -138,7 +124,6 @@ public function getModuleList()
 
     /**
      * @return \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     public function getModulesReader()
     {
@@ -147,7 +132,6 @@ public function getModulesReader()
 
     /**
      * @return \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     public function getResourceModel()
     {
@@ -156,7 +140,6 @@ public function getResourceModel()
 
     /**
      * @return \Magento\Framework\Module\Setup\MigrationFactory
-     * @since 2.0.0
      */
     public function getMigrationFactory()
     {
@@ -165,7 +148,6 @@ public function getMigrationFactory()
 
     /**
      * @return \Magento\Framework\Module\ResourceInterface
-     * @since 2.0.0
      */
     public function getResource()
     {
@@ -174,7 +156,6 @@ public function getResource()
 
     /**
      * @return \Magento\Framework\Encryption\EncryptorInterface
-     * @since 2.0.0
      */
     public function getEncryptor()
     {
@@ -183,7 +164,6 @@ public function getEncryptor()
 
     /**
      * @return \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     public function getFilesystem()
     {
diff --git a/lib/internal/Magento/Framework/Module/Setup/Migration.php b/lib/internal/Magento/Framework/Module/Setup/Migration.php
index 6bb951c99e7e0..9d0c05a6b0986 100644
--- a/lib/internal/Magento/Framework/Module/Setup/Migration.php
+++ b/lib/internal/Magento/Framework/Module/Setup/Migration.php
@@ -15,7 +15,6 @@
  * @api
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Migration
 {
@@ -50,19 +49,13 @@ class Migration
 
     /**#@-*/
 
-    /**
-     * Config key for path to aliases map file
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_confPathToMapFile;
 
     /**
      * List of possible entity types sorted by possibility of usage
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_entityTypes = [self::ENTITY_TYPE_MODEL, self::ENTITY_TYPE_BLOCK, self::ENTITY_TYPE_RESOURCE];
 
@@ -70,7 +63,6 @@ class Migration
      * Rows per page. To split processing data from tables
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_rowsPerPage = 100;
 
@@ -86,7 +78,6 @@ class Migration
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_replaceRules = [];
 
@@ -98,7 +89,6 @@ class Migration
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_aliasesMap;
 
@@ -106,7 +96,6 @@ class Migration
      * Replacement regexps for specified content types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_replacePatterns = [];
 
@@ -114,7 +103,6 @@ class Migration
      * Path to map file from config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_pathToMapFile;
 
@@ -122,25 +110,21 @@ class Migration
      * List of composite module names
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_compositeModules;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Read
-     * @since 2.0.0
      */
     protected $_directory;
 
     /**
      * @var MigrationData
-     * @since 2.0.0
      */
     protected $_migrationData;
 
     /**
      * @var ModuleDataSetupInterface
-     * @since 2.0.0
      */
     private $setup;
 
@@ -150,7 +134,6 @@ class Migration
      * @param MigrationData $migrationData
      * @param string $confPathToMapFile
      * @param array $compositeModules
-     * @since 2.0.0
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
@@ -180,7 +163,6 @@ public function __construct(
      * @param array $primaryKeyFields row pk field(s) to update by
      * @param string $additionalWhere additional where condition
      * @return void
-     * @since 2.0.0
      */
     public function appendClassAliasReplace(
         $tableName,
@@ -208,7 +190,6 @@ public function appendClassAliasReplace(
      * Start process of replacing aliases with class names using rules
      *
      * @return void
-     * @since 2.0.0
      */
     public function doUpdateClassAliases()
     {
@@ -223,7 +204,6 @@ public function doUpdateClassAliases()
      * @param string $tableName name of table to replace aliases in
      * @param array $tableRules replacing rules for table
      * @return void
-     * @since 2.0.0
      */
     protected function _updateClassAliasesInTable($tableName, array $tableRules)
     {
@@ -245,7 +225,6 @@ protected function _updateClassAliasesInTable($tableName, array $tableRules)
      * @param string $fieldName name of table column to replace aliases in
      * @param string $additionalWhere additional where condition
      * @return int
-     * @since 2.0.0
      */
     protected function _getRowsCount($tableName, $fieldName, $additionalWhere = '')
     {
@@ -273,7 +252,6 @@ protected function _getRowsCount($tableName, $fieldName, $additionalWhere = '')
      * @param array $fieldRule
      * @param int $currentPage
      * @return void
-     * @since 2.0.0
      */
     protected function _applyFieldRule($tableName, $fieldName, array $fieldRule, $currentPage = 0)
     {
@@ -320,7 +298,6 @@ protected function _applyFieldRule($tableName, $fieldName, array $fieldRule, $cu
      * @param string $fieldName
      * @param array $fieldReplacements
      * @return void
-     * @since 2.0.0
      */
     protected function _updateRowsData($tableName, $fieldName, array $fieldReplacements)
     {
@@ -350,7 +327,6 @@ protected function _updateRowsData($tableName, $fieldName, array $fieldReplaceme
      * @param string $additionalWhere additional where condition
      * @param int $currPage
      * @return array
-     * @since 2.0.0
      */
     protected function _getTableData(
         $tableName,
@@ -386,7 +362,6 @@ protected function _getTableData(
      * @param string $contentType type of data (field content)
      * @param string $entityType entity type of alias
      * @return string
-     * @since 2.0.0
      */
     protected function _getReplacement($data, $contentType, $entityType = '')
     {
@@ -414,7 +389,6 @@ protected function _getReplacement($data, $contentType, $entityType = '')
      * @param string $alias
      * @param string $entityType entity type of alias
      * @return string
-     * @since 2.0.0
      */
     protected function _getCorrespondingClassName($alias, $entityType = '')
     {
@@ -455,7 +429,6 @@ protected function _getCorrespondingClassName($alias, $entityType = '')
      * @param string $data
      * @param string $entityType
      * @return string
-     * @since 2.0.0
      */
     protected function _getModelReplacement($data, $entityType = '')
     {
@@ -482,7 +455,6 @@ protected function _getModelReplacement($data, $entityType = '')
      * @param string $contentType
      * @param string $entityType
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getPatternReplacement($data, $contentType, $entityType = '')
     {
@@ -517,7 +489,6 @@ protected function _getPatternReplacement($data, $contentType, $entityType = '')
      * @param string $type
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _getClassName($module, $type, $name = null)
     {
@@ -535,7 +506,6 @@ protected function _getClassName($module, $type, $name = null)
      *
      * @param string $factoryName
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFactoryName($factoryName)
     {
@@ -547,7 +517,6 @@ protected function _isFactoryName($factoryName)
      *
      * @param string $factoryName
      * @return array
-     * @since 2.0.0
      */
     protected function _getModuleName($factoryName)
     {
@@ -571,7 +540,6 @@ protected function _getModuleName($factoryName)
      *
      * @param string $moduleAlias
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getCompositeModuleName($moduleAlias)
     {
@@ -587,7 +555,6 @@ protected function _getCompositeModuleName($moduleAlias)
      * @param string $alias
      * @param string $entityType
      * @return string
-     * @since 2.0.0
      */
     protected function _getAliasFromMap($alias, $entityType = '')
     {
@@ -619,7 +586,6 @@ protected function _getAliasFromMap($alias, $entityType = '')
      * @param string $alias
      * @param string $className
      * @return void
-     * @since 2.0.0
      */
     protected function _pushToMap($entityType, $alias, $className)
     {
@@ -639,7 +605,6 @@ protected function _pushToMap($entityType, $alias, $className)
      * Retrieve aliases to classes map if exit
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getAliasesMap()
     {
@@ -661,7 +626,6 @@ protected function _getAliasesMap()
      *
      * @param string $pathToMapFile
      * @return string
-     * @since 2.0.0
      */
     protected function _loadMap($pathToMapFile)
     {
@@ -676,7 +640,6 @@ protected function _loadMap($pathToMapFile)
      * @param string $data
      * @param string $entityType
      * @return string
-     * @since 2.0.0
      */
     protected function _getAliasInSerializedStringReplacement($data, $entityType = '')
     {
@@ -700,7 +663,6 @@ protected function _getAliasInSerializedStringReplacement($data, $entityType = '
      *
      * @param string $string
      * @return array
-     * @since 2.0.0
      */
     protected function _parseSerializedString($string)
     {
@@ -716,7 +678,6 @@ protected function _parseSerializedString($string)
      * List of correspondence between composite module aliases and module names
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCompositeModules()
     {
@@ -730,7 +691,6 @@ public function getCompositeModules()
      * @param string $encodedValue
      * @param int $objectDecodeType
      * @return mixed
-     * @since 2.0.0
      */
     protected function _jsonDecode($encodedValue, $objectDecodeType = \Zend_Json::TYPE_ARRAY)
     {
diff --git a/lib/internal/Magento/Framework/Module/Setup/MigrationData.php b/lib/internal/Magento/Framework/Module/Setup/MigrationData.php
index 058e60fc021b1..8c109b5e31349 100644
--- a/lib/internal/Magento/Framework/Module/Setup/MigrationData.php
+++ b/lib/internal/Magento/Framework/Module/Setup/MigrationData.php
@@ -9,7 +9,6 @@
  * Replace patterns needed for migration process between Magento versions
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class MigrationData
 {
@@ -17,7 +16,6 @@ class MigrationData
      * List of required params
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_requiredParams = ['plain', 'wiki', 'xml', 'serialized'];
 
@@ -25,14 +23,12 @@ class MigrationData
      * List of replace patterns
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $_patterns = [];
 
     /**
      * @param array $data
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         array $data
@@ -49,7 +45,6 @@ public function __construct(
      * Get replace pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPlainFindPattern()
     {
@@ -60,7 +55,6 @@ public function getPlainFindPattern()
      * Get replace pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getWikiFindPattern()
     {
@@ -71,7 +65,6 @@ public function getWikiFindPattern()
      * Get replace pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getXmlFindPattern()
     {
@@ -82,7 +75,6 @@ public function getXmlFindPattern()
      * Get replace pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSerializedFindPattern()
     {
diff --git a/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php b/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
index 5f2cf2829bfef..fbd837ed696f7 100644
--- a/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
+++ b/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory class for \Magento\Framework\Module\Setup\Migration
- * @since 2.0.0
  */
 class MigrationFactory
 {
@@ -16,7 +15,6 @@ class MigrationFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class MigrationFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -33,7 +30,6 @@ class MigrationFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -49,7 +45,6 @@ public function __construct(
      * @param array $data
      * @return \Magento\Framework\Module\Setup\Migration
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Module/Status.php b/lib/internal/Magento/Framework/Module/Status.php
index 96fe203889c04..ba457396596eb 100644
--- a/lib/internal/Magento/Framework/Module/Status.php
+++ b/lib/internal/Magento/Framework/Module/Status.php
@@ -13,7 +13,6 @@
  * A service for controlling module status
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Status
 {
@@ -21,7 +20,6 @@ class Status
      * Module list loader
      *
      * @var ModuleList\Loader
-     * @since 2.0.0
      */
     private $loader;
 
@@ -29,7 +27,6 @@ class Status
      * Module list
      *
      * @var ModuleList
-     * @since 2.0.0
      */
     private $list;
 
@@ -37,7 +34,6 @@ class Status
      * Deployment config writer
      *
      * @var Writer
-     * @since 2.0.0
      */
     private $writer;
 
@@ -45,7 +41,6 @@ class Status
      * Dependency Checker
      *
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $dependencyChecker;
 
@@ -53,7 +48,6 @@ class Status
      * Conflict checker
      *
      * @var ConflictChecker
-     * @since 2.0.0
      */
     private $conflictChecker;
 
@@ -65,7 +59,6 @@ class Status
      * @param Writer $writer
      * @param ConflictChecker $conflictChecker
      * @param DependencyChecker $dependencyChecker
-     * @since 2.0.0
      */
     public function __construct(
         ModuleList\Loader $loader,
@@ -90,7 +83,6 @@ public function __construct(
      * @param bool $prettyMessage
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function checkConstraints(
         $isEnabled,
@@ -147,7 +139,6 @@ public function checkConstraints(
      * @param bool $isEnabled
      * @param string[] $modules
      * @return void
-     * @since 2.0.0
      */
     public function setIsEnabled($isEnabled, $modules)
     {
@@ -169,7 +160,6 @@ public function setIsEnabled($isEnabled, $modules)
      * @param bool $isEnabled
      * @param string[] $modules
      * @return string[]
-     * @since 2.0.0
      */
     public function getModulesToChange($isEnabled, $modules)
     {
@@ -191,7 +181,6 @@ public function getModulesToChange($isEnabled, $modules)
      * @param string[] $modules
      * @return string[]
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function getAllModules($modules)
     {
@@ -214,7 +203,6 @@ private function getAllModules($modules)
      * @param bool $isEnabled
      * @param string $moduleName
      * @return string
-     * @since 2.0.0
      */
     private function createShortErrorMessage($isEnabled, $moduleName)
     {
@@ -234,7 +222,6 @@ private function createShortErrorMessage($isEnabled, $moduleName)
      * @param string $moduleName
      * @param array $missingDependencies
      * @return string[]
-     * @since 2.0.0
      */
     private function createVerboseErrorMessage($isEnabled, $moduleName, $missingDependencies)
     {
diff --git a/lib/internal/Magento/Framework/Mview/ActionFactory.php b/lib/internal/Magento/Framework/Mview/ActionFactory.php
index 98b3f090c6560..f81da974a8171 100644
--- a/lib/internal/Magento/Framework/Mview/ActionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/ActionFactory.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Mview\ActionFactory
  *
- * @since 2.0.0
  */
 class ActionFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @throws \InvalidArgumentException
      * @return ActionInterface
-     * @since 2.0.0
      */
     public function get($className)
     {
diff --git a/lib/internal/Magento/Framework/Mview/ActionInterface.php b/lib/internal/Magento/Framework/Mview/ActionInterface.php
index ac2374e1ce085..4c2ac766448d3 100644
--- a/lib/internal/Magento/Framework/Mview/ActionInterface.php
+++ b/lib/internal/Magento/Framework/Mview/ActionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\ActionInterface
  *
- * @since 2.0.0
  */
 interface ActionInterface
 {
@@ -18,7 +17,6 @@ interface ActionInterface
      * @param int[] $ids
      * @return void
      * @api
-     * @since 2.0.0
      */
     public function execute($ids);
 }
diff --git a/lib/internal/Magento/Framework/Mview/Config.php b/lib/internal/Magento/Framework/Mview/Config.php
index 436c8c9dabe7d..af51a097c8062 100644
--- a/lib/internal/Magento/Framework/Mview/Config.php
+++ b/lib/internal/Magento/Framework/Mview/Config.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Mview\Config
  *
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
     /**
      * @var Config\Data
-     * @since 2.0.0
      */
     protected $configData;
 
     /**
      * @param Config\Data $configData
-     * @since 2.0.0
      */
     public function __construct(Config\Data $configData)
     {
@@ -31,7 +28,6 @@ public function __construct(Config\Data $configData)
      * Get views list
      *
      * @return array[]
-     * @since 2.0.0
      */
     public function getViews()
     {
@@ -43,7 +39,6 @@ public function getViews()
      *
      * @param string $viewId
      * @return array
-     * @since 2.0.0
      */
     public function getView($viewId)
     {
diff --git a/lib/internal/Magento/Framework/Mview/Config/Converter.php b/lib/internal/Magento/Framework/Mview/Config/Converter.php
index 0c8a24b0815f5..666cf023fea40 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Converter.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Mview\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -21,7 +20,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -57,7 +55,6 @@ public function convert($source)
      * @param string $attributeName
      * @param mixed $default
      * @return null|string
-     * @since 2.0.0
      */
     protected function getAttributeValue(\DOMNode $input, $attributeName, $default = null)
     {
@@ -71,7 +68,6 @@ protected function getAttributeValue(\DOMNode $input, $attributeName, $default =
      * @param \DOMNode $childNode
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function convertChild(\DOMNode $childNode, $data)
     {
diff --git a/lib/internal/Magento/Framework/Mview/Config/Data.php b/lib/internal/Magento/Framework/Mview/Config/Data.php
index 04ce83ea7f6a7..561e63cd592a1 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Data.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Data.php
@@ -9,13 +9,11 @@
 
 /**
  * Provides materialized view configuration
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\Config\Data
 {
     /**
      * @var \Magento\Framework\Mview\View\State\CollectionInterface
-     * @since 2.0.0
      */
     protected $stateCollection;
 
@@ -27,7 +25,6 @@ class Data extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Mview\View\State\CollectionInterface $stateCollection
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Mview\Config\Reader $reader,
@@ -51,7 +48,6 @@ public function __construct(
      * Delete all states that are not in configuration
      *
      * @return void
-     * @since 2.0.0
      */
     protected function deleteNonexistentStates()
     {
diff --git a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
index 2508dc9ce8614..a83e9507bda04 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
@@ -7,7 +7,6 @@
 
 /**
  * Proxy class for \Magento\Framework\Mview\Config\Data
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\Mview\Config\Data implements
     \Magento\Framework\ObjectManager\NoninterceptableInterface
@@ -16,7 +15,6 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -24,7 +22,6 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
      * Proxied instance
      *
      * @var \Magento\Framework\Mview\Config\Data
-     * @since 2.0.0
      */
     protected $subject;
 
@@ -40,7 +36,6 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isShared = null;
 
@@ -48,7 +43,6 @@ class Proxy extends \Magento\Framework\Mview\Config\Data implements
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -73,7 +66,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -84,7 +76,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -95,7 +86,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\Mview\Config\Data
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -111,7 +101,6 @@ protected function _getSubject()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function merge(array $config)
     {
@@ -120,7 +109,6 @@ public function merge(array $config)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($path = null, $default = null)
     {
diff --git a/lib/internal/Magento/Framework/Mview/Config/Reader.php b/lib/internal/Magento/Framework/Mview/Config/Reader.php
index a19271fe7c91b..c8feb8a0b9bb3 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Reader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Mview\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of id attributes for merge
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/config/view' => 'id', '/config/view/subscriptions/table' => 'name'];
 
@@ -29,7 +27,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
index b56e9041dea00..d54e7c89484e5 100644
--- a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Mview\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,7 +17,6 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for merged config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_schema = null;
 
@@ -26,13 +24,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for separate config files
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_perFileSchema = null;
 
     /**
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -44,7 +40,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -55,7 +50,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Mview/ConfigInterface.php b/lib/internal/Magento/Framework/Mview/ConfigInterface.php
index efac19c379f86..e55aad302f3cf 100644
--- a/lib/internal/Magento/Framework/Mview/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Mview/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -16,7 +15,6 @@ interface ConfigInterface
      * Get views list
      *
      * @return array[]
-     * @since 2.0.0
      */
     public function getViews();
 
@@ -25,7 +23,6 @@ public function getViews();
      *
      * @param string $viewId
      * @return array
-     * @since 2.0.0
      */
     public function getView($viewId);
 }
diff --git a/lib/internal/Magento/Framework/Mview/Processor.php b/lib/internal/Magento/Framework/Mview/Processor.php
index 49a35e73aa4d8..3cc87bc7877f7 100644
--- a/lib/internal/Magento/Framework/Mview/Processor.php
+++ b/lib/internal/Magento/Framework/Mview/Processor.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Mview\Processor
  *
- * @since 2.0.0
  */
 class Processor implements ProcessorInterface
 {
     /**
      * @var View\CollectionFactory
-     * @since 2.0.0
      */
     protected $viewsFactory;
 
     /**
      * @param View\CollectionFactory $viewsFactory
-     * @since 2.0.0
      */
     public function __construct(View\CollectionFactory $viewsFactory)
     {
@@ -32,7 +29,6 @@ public function __construct(View\CollectionFactory $viewsFactory)
      *
      * @param string $group
      * @return ViewInterface[]
-     * @since 2.0.0
      */
     protected function getViewsByGroup($group = '')
     {
@@ -45,7 +41,6 @@ protected function getViewsByGroup($group = '')
      *
      * @param string $group
      * @return void
-     * @since 2.0.0
      */
     public function update($group = '')
     {
@@ -59,7 +54,6 @@ public function update($group = '')
      *
      * @param string $group
      * @return void
-     * @since 2.0.0
      */
     public function clearChangelog($group = '')
     {
diff --git a/lib/internal/Magento/Framework/Mview/ProcessorInterface.php b/lib/internal/Magento/Framework/Mview/ProcessorInterface.php
index 5284b2febc36f..68996ffe62137 100644
--- a/lib/internal/Magento/Framework/Mview/ProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Mview/ProcessorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\ProcessorInterface
  *
- * @since 2.0.0
  */
 interface ProcessorInterface
 {
@@ -17,7 +16,6 @@ interface ProcessorInterface
      *
      * @param string $group
      * @return void
-     * @since 2.0.0
      */
     public function update($group = '');
 
@@ -26,7 +24,6 @@ public function update($group = '');
      *
      * @param string $group
      * @return void
-     * @since 2.0.0
      */
     public function clearChangelog($group = '');
 }
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
index b3a4b2ee41dc2..dba9cfb5a101a 100644
--- a/lib/internal/Magento/Framework/Mview/View.php
+++ b/lib/internal/Magento/Framework/Mview/View.php
@@ -13,7 +13,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class View extends \Magento\Framework\DataObject implements ViewInterface
 {
@@ -24,37 +23,31 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_idFieldName = 'view_id';
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var ActionFactory
-     * @since 2.0.0
      */
     protected $actionFactory;
 
     /**
      * @var View\ChangelogInterface
-     * @since 2.0.0
      */
     protected $changelog;
 
     /**
      * @var View\SubscriptionFactory
-     * @since 2.0.0
      */
     protected $subscriptionFactory;
 
     /**
      * @var \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     protected $state;
 
@@ -72,7 +65,6 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
      * @param SubscriptionFactory $subscriptionFactory
      * @param array $data
      * @param array $changelogBatchSize
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $config,
@@ -96,7 +88,6 @@ public function __construct(
      * Return ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -108,7 +99,6 @@ public function getId()
      *
      * @param string $id
      * @return $this
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -121,7 +111,6 @@ public function setId($id)
      *
      * @param  string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setIdFieldName($name)
     {
@@ -133,7 +122,6 @@ public function setIdFieldName($name)
      * Id field name getter
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdFieldName()
     {
@@ -144,7 +132,6 @@ public function getIdFieldName()
      * Return view action class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionClass()
     {
@@ -155,7 +142,6 @@ public function getActionClass()
      * Return view group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroup()
     {
@@ -166,7 +152,6 @@ public function getGroup()
      * Return view subscriptions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSubscriptions()
     {
@@ -179,7 +164,6 @@ public function getSubscriptions()
      * @param string $viewId
      * @return ViewInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function load($viewId)
     {
@@ -199,7 +183,6 @@ public function load($viewId)
      *
      * @throws \Exception
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function subscribe()
     {
@@ -239,7 +222,6 @@ public function subscribe()
      *
      * @throws \Exception
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function unsubscribe()
     {
@@ -276,7 +258,6 @@ public function unsubscribe()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function update()
     {
@@ -324,7 +305,6 @@ public function update()
      * Suspend view updates and set version ID to changelog's end
      *
      * @return void
-     * @since 2.0.0
      */
     public function suspend()
     {
@@ -340,7 +320,6 @@ public function suspend()
      * Resume view updates
      *
      * @return void
-     * @since 2.0.0
      */
     public function resume()
     {
@@ -355,7 +334,6 @@ public function resume()
      * Clear precessed changelog entries
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearChangelog()
     {
@@ -368,7 +346,6 @@ public function clearChangelog()
      * Return related state object
      *
      * @return View\StateInterface
-     * @since 2.0.0
      */
     public function getState()
     {
@@ -383,7 +360,6 @@ public function getState()
      *
      * @param View\StateInterface $state
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function setState(View\StateInterface $state)
     {
@@ -395,7 +371,6 @@ public function setState(View\StateInterface $state)
      * Check whether view is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -406,7 +381,6 @@ public function isEnabled()
      * Check whether view is idle
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIdle()
     {
@@ -417,7 +391,6 @@ public function isIdle()
      * Check whether view is working
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWorking()
     {
@@ -428,7 +401,6 @@ public function isWorking()
      * Check whether view is suspended
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSuspended()
     {
@@ -439,7 +411,6 @@ public function isSuspended()
      * Return view updated datetime
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated()
     {
@@ -450,7 +421,6 @@ public function getUpdated()
      * Retrieve linked changelog
      *
      * @return View\ChangelogInterface
-     * @since 2.0.0
      */
     public function getChangelog()
     {
diff --git a/lib/internal/Magento/Framework/Mview/View/AbstractFactory.php b/lib/internal/Magento/Framework/Mview/View/AbstractFactory.php
index 1469eae0903a0..0fda5000317e5 100644
--- a/lib/internal/Magento/Framework/Mview/View/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/Mview/View/AbstractFactory.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Mview\View\AbstractFactory
  *
- * @since 2.0.0
  */
 abstract class AbstractFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ abstract class AbstractFactory
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return CollectionInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php
index f3e532008758f..5f531b866137f 100644
--- a/lib/internal/Magento/Framework/Mview/View/Changelog.php
+++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Mview\View\Changelog
  *
- * @since 2.0.0
  */
 class Changelog implements ChangelogInterface
 {
@@ -29,7 +28,6 @@ class Changelog implements ChangelogInterface
      * Database connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -37,19 +35,16 @@ class Changelog implements ChangelogInterface
      * View Id identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $viewId;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     protected $resource;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     {
@@ -63,7 +58,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function checkConnection()
     {
@@ -77,7 +71,6 @@ protected function checkConnection()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function create()
     {
@@ -107,7 +100,6 @@ public function create()
      *
      * @return void
      * @throws ChangelogTableNotExistsException
-     * @since 2.0.0
      */
     public function drop()
     {
@@ -125,7 +117,6 @@ public function drop()
      * @param int $versionId
      * @return boolean
      * @throws ChangelogTableNotExistsException
-     * @since 2.0.0
      */
     public function clear($versionId)
     {
@@ -146,7 +137,6 @@ public function clear($versionId)
      * @param int $toVersionId
      * @return int[]
      * @throws ChangelogTableNotExistsException
-     * @since 2.0.0
      */
     public function getList($fromVersionId, $toVersionId)
     {
@@ -176,7 +166,6 @@ public function getList($fromVersionId, $toVersionId)
      * @return int
      * @throws ChangelogTableNotExistsException
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getVersion()
     {
@@ -199,7 +188,6 @@ public function getVersion()
      *
      * @throws \Exception
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -213,7 +201,6 @@ public function getName()
      * Get changlog entity column name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getColumnName()
     {
@@ -225,7 +212,6 @@ public function getColumnName()
      *
      * @param string $viewId
      * @return Changelog
-     * @since 2.0.0
      */
     public function setViewId($viewId)
     {
@@ -235,7 +221,6 @@ public function setViewId($viewId)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getViewId()
     {
diff --git a/lib/internal/Magento/Framework/Mview/View/ChangelogInterface.php b/lib/internal/Magento/Framework/Mview/View/ChangelogInterface.php
index 3c567920e3730..b00c1ca3a2e33 100644
--- a/lib/internal/Magento/Framework/Mview/View/ChangelogInterface.php
+++ b/lib/internal/Magento/Framework/Mview/View/ChangelogInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\View\ChangelogInterface
  *
- * @since 2.0.0
  */
 interface ChangelogInterface
 {
@@ -16,7 +15,6 @@ interface ChangelogInterface
      * Create changelog table
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function create();
 
@@ -24,7 +22,6 @@ public function create();
      * Drop changelog table
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function drop();
 
@@ -33,7 +30,6 @@ public function drop();
      *
      * @param int $versionId
      * @return bool
-     * @since 2.0.0
      */
     public function clear($versionId);
 
@@ -43,7 +39,6 @@ public function clear($versionId);
      * @param integer $fromVersionId
      * @param integer $toVersionId
      * @return int[]
-     * @since 2.0.0
      */
     public function getList($fromVersionId, $toVersionId);
 
@@ -51,7 +46,6 @@ public function getList($fromVersionId, $toVersionId);
      * Get maximum version_id from changelog
      *
      * @return int
-     * @since 2.0.0
      */
     public function getVersion();
 
@@ -59,7 +53,6 @@ public function getVersion();
      * Get changlog name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -67,7 +60,6 @@ public function getName();
      * Get changlog entity column name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getColumnName();
 
@@ -76,7 +68,6 @@ public function getColumnName();
      *
      * @param string $viewId
      * @return ChangelogInterface
-     * @since 2.0.0
      */
     public function setViewId($viewId);
 
@@ -84,7 +75,6 @@ public function setViewId($viewId);
      * Get view's identifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function getViewId();
 }
diff --git a/lib/internal/Magento/Framework/Mview/View/Collection.php b/lib/internal/Magento/Framework/Mview/View/Collection.php
index 91ea4917e2902..e03d9576f9f96 100644
--- a/lib/internal/Magento/Framework/Mview/View/Collection.php
+++ b/lib/internal/Magento/Framework/Mview/View/Collection.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Mview\View\Collection
  *
- * @since 2.0.0
  */
 class Collection extends \Magento\Framework\Data\Collection implements CollectionInterface
 {
@@ -16,19 +15,16 @@ class Collection extends \Magento\Framework\Data\Collection implements Collectio
      * Item object class name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_itemObjectClass = \Magento\Framework\Mview\ViewInterface::class;
 
     /**
      * @var \Magento\Framework\Mview\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\Mview\View\State\CollectionFactory
-     * @since 2.0.0
      */
     protected $statesFactory;
 
@@ -36,7 +32,6 @@ class Collection extends \Magento\Framework\Data\Collection implements Collectio
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
      * @param \Magento\Framework\Mview\ConfigInterface $config
      * @param State\CollectionFactory $statesFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -56,7 +51,6 @@ public function __construct(
      * @return \Magento\Framework\Mview\View\CollectionInterface
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function loadData($printQuery = false, $logQuery = false)
     {
@@ -85,7 +79,6 @@ public function loadData($printQuery = false, $logQuery = false)
      *
      * @param string $mode
      * @return \Magento\Framework\Mview\ViewInterface[]
-     * @since 2.0.0
      */
     public function getViewsByStateMode($mode)
     {
diff --git a/lib/internal/Magento/Framework/Mview/View/CollectionFactory.php b/lib/internal/Magento/Framework/Mview/View/CollectionFactory.php
index e98155cf92a4d..82e75a265f8b1 100644
--- a/lib/internal/Magento/Framework/Mview/View/CollectionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/View/CollectionFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Mview\View\CollectionFactory
  *
- * @since 2.0.0
  */
 class CollectionFactory extends AbstractFactory
 {
diff --git a/lib/internal/Magento/Framework/Mview/View/CollectionInterface.php b/lib/internal/Magento/Framework/Mview/View/CollectionInterface.php
index 1e328c029656c..e6b28ab46f99f 100644
--- a/lib/internal/Magento/Framework/Mview/View/CollectionInterface.php
+++ b/lib/internal/Magento/Framework/Mview/View/CollectionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\View\CollectionInterface
  *
- * @since 2.0.0
  */
 interface CollectionInterface
 {
@@ -17,7 +16,6 @@ interface CollectionInterface
      *
      * @param string $mode
      * @return \Magento\Framework\Mview\ViewInterface[]
-     * @since 2.0.0
      */
     public function getViewsByStateMode($mode);
 
@@ -27,7 +25,6 @@ public function getViewsByStateMode($mode);
      * @param   string $column
      * @param   mixed $value
      * @return  \Magento\Framework\Mview\ViewInterface[]
-     * @since 2.0.0
      */
     public function getItemsByColumnValue($column, $value);
 
@@ -35,7 +32,6 @@ public function getItemsByColumnValue($column, $value);
      * Retrieve collection views
      *
      * @return \Magento\Framework\Mview\ViewInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/lib/internal/Magento/Framework/Mview/View/State/CollectionFactory.php b/lib/internal/Magento/Framework/Mview/View/State/CollectionFactory.php
index 0f7a4224f715c..a75cf4864323d 100644
--- a/lib/internal/Magento/Framework/Mview/View/State/CollectionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/View/State/CollectionFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Mview\View\State\CollectionFactory
  *
- * @since 2.0.0
  */
 class CollectionFactory extends \Magento\Framework\Mview\View\AbstractFactory
 {
diff --git a/lib/internal/Magento/Framework/Mview/View/State/CollectionInterface.php b/lib/internal/Magento/Framework/Mview/View/State/CollectionInterface.php
index 45aefec75ec74..36b3c5c3343f2 100644
--- a/lib/internal/Magento/Framework/Mview/View/State/CollectionInterface.php
+++ b/lib/internal/Magento/Framework/Mview/View/State/CollectionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\View\State\CollectionInterface
  *
- * @since 2.0.0
  */
 interface CollectionInterface
 {
@@ -16,7 +15,6 @@ interface CollectionInterface
      * Retrieve loaded states
      *
      * @return array
-     * @since 2.0.0
      */
     public function getItems();
 }
diff --git a/lib/internal/Magento/Framework/Mview/View/StateInterface.php b/lib/internal/Magento/Framework/Mview/View/StateInterface.php
index e4c4cd962b6da..ab6360b1a7939 100644
--- a/lib/internal/Magento/Framework/Mview/View/StateInterface.php
+++ b/lib/internal/Magento/Framework/Mview/View/StateInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\View\StateInterface
  *
- * @since 2.0.0
  */
 interface StateInterface
 {
@@ -37,7 +36,6 @@ interface StateInterface
      *
      * @param string $viewId
      * @return $this
-     * @since 2.0.0
      */
     public function loadByView($viewId);
 
@@ -46,7 +44,6 @@ public function loadByView($viewId);
      *
      * @return \Magento\Framework\Mview\View\StateInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function save();
 
@@ -55,7 +52,6 @@ public function save();
      *
      * @return \Magento\Framework\Mview\View\StateInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     public function delete();
 
@@ -63,7 +59,6 @@ public function delete();
      * Get state view ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getViewId();
 
@@ -71,7 +66,6 @@ public function getViewId();
      * Get state mode
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMode();
 
@@ -80,7 +74,6 @@ public function getMode();
      *
      * @param string $mode
      * @return \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     public function setMode($mode);
 
@@ -88,7 +81,6 @@ public function setMode($mode);
      * Get state status
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatus();
 
@@ -97,7 +89,6 @@ public function getStatus();
      *
      * @param string $status
      * @return \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     public function setStatus($status);
 
@@ -105,7 +96,6 @@ public function setStatus($status);
      * Get state version ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersionId();
 
@@ -114,7 +104,6 @@ public function getVersionId();
      *
      * @param int $versionId
      * @return \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     public function setVersionId($versionId);
 
@@ -122,7 +111,6 @@ public function setVersionId($versionId);
      * Get state updated time
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated();
 
@@ -131,7 +119,6 @@ public function getUpdated();
      *
      * @param string|int|\DateTimeInterface $updated
      * @return \Magento\Framework\Mview\View\StateInterface
-     * @since 2.0.0
      */
     public function setUpdated($updated);
 }
diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index dd6ef9f75025a..96d062fe6e0f9 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Mview\View\Subscription
  *
- * @since 2.0.0
  */
 class Subscription implements SubscriptionInterface
 {
@@ -22,37 +21,31 @@ class Subscription implements SubscriptionInterface
      * Database connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
     /**
      * @var \Magento\Framework\DB\Ddl\TriggerFactory
-     * @since 2.0.0
      */
     protected $triggerFactory;
 
     /**
      * @var \Magento\Framework\Mview\View\CollectionInterface
-     * @since 2.0.0
      */
     protected $viewCollection;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $view;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $tableName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $columnName;
 
@@ -60,13 +53,11 @@ class Subscription implements SubscriptionInterface
      * List of views linked to the same entity as the current view
      *
      * @var array
-     * @since 2.0.0
      */
     protected $linkedViews = [];
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     protected $resource;
 
@@ -77,7 +68,6 @@ class Subscription implements SubscriptionInterface
      * @param \Magento\Framework\Mview\ViewInterface $view
      * @param string $tableName
      * @param string $columnName
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -100,7 +90,6 @@ public function __construct(
      * Create subsciption
      *
      * @return \Magento\Framework\Mview\View\SubscriptionInterface
-     * @since 2.0.0
      */
     public function create()
     {
@@ -132,7 +121,6 @@ public function create()
      * Remove subscription
      *
      * @return \Magento\Framework\Mview\View\SubscriptionInterface
-     * @since 2.0.0
      */
     public function remove()
     {
@@ -166,7 +154,6 @@ public function remove()
      * Retrieve list of linked views
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getLinkedViews()
     {
@@ -197,7 +184,6 @@ protected function getLinkedViews()
      * @param string $event
      * @param \Magento\Framework\Mview\View\ChangelogInterface $changelog
      * @return string
-     * @since 2.0.0
      */
     protected function buildStatement($event, $changelog)
     {
@@ -230,7 +216,6 @@ protected function buildStatement($event, $changelog)
      * @param string $event The DB level event, like "update" or "insert"
      *
      * @return string
-     * @since 2.0.0
      */
     private function getAfterEventTriggerName($event)
     {
@@ -246,7 +231,6 @@ private function getAfterEventTriggerName($event)
      *
      * @return \Magento\Framework\Mview\ViewInterface
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getView()
     {
@@ -258,7 +242,6 @@ public function getView()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTableName()
     {
@@ -270,7 +253,6 @@ public function getTableName()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getColumnName()
     {
diff --git a/lib/internal/Magento/Framework/Mview/View/SubscriptionFactory.php b/lib/internal/Magento/Framework/Mview/View/SubscriptionFactory.php
index 9fe9e028acf07..c3e6d566d7758 100644
--- a/lib/internal/Magento/Framework/Mview/View/SubscriptionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/View/SubscriptionFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Mview\View\SubscriptionFactory
  *
- * @since 2.0.0
  */
 class SubscriptionFactory extends AbstractFactory
 {
diff --git a/lib/internal/Magento/Framework/Mview/View/SubscriptionInterface.php b/lib/internal/Magento/Framework/Mview/View/SubscriptionInterface.php
index 9609d5ba39de7..943cf3b9d3a6f 100644
--- a/lib/internal/Magento/Framework/Mview/View/SubscriptionInterface.php
+++ b/lib/internal/Magento/Framework/Mview/View/SubscriptionInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\View\SubscriptionInterface
  *
- * @since 2.0.0
  */
 interface SubscriptionInterface
 {
@@ -16,7 +15,6 @@ interface SubscriptionInterface
      * Create subsciption
      *
      * @return \Magento\Framework\Mview\View\SubscriptionInterface
-     * @since 2.0.0
      */
     public function create();
 
@@ -24,7 +22,6 @@ public function create();
      * Remove subscription
      *
      * @return \Magento\Framework\Mview\View\SubscriptionInterface
-     * @since 2.0.0
      */
     public function remove();
 
@@ -32,7 +29,6 @@ public function remove();
      * Retrieve View related to subscription
      *
      * @return \Magento\Framework\Mview\ViewInterface
-     * @since 2.0.0
      */
     public function getView();
 
@@ -40,7 +36,6 @@ public function getView();
      * Retrieve table name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTableName();
 
@@ -48,7 +43,6 @@ public function getTableName();
      * Retrieve table column name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getColumnName();
 }
diff --git a/lib/internal/Magento/Framework/Mview/ViewInterface.php b/lib/internal/Magento/Framework/Mview/ViewInterface.php
index 010b3a2f17eae..a0f8a81900ebe 100644
--- a/lib/internal/Magento/Framework/Mview/ViewInterface.php
+++ b/lib/internal/Magento/Framework/Mview/ViewInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Mview\ViewInterface
  *
- * @since 2.0.0
  */
 interface ViewInterface
 {
@@ -16,7 +15,6 @@ interface ViewInterface
      * Return view ID
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId();
 
@@ -24,7 +22,6 @@ public function getId();
      * Return view action class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionClass();
 
@@ -32,7 +29,6 @@ public function getActionClass();
      * Return view group
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroup();
 
@@ -40,7 +36,6 @@ public function getGroup();
      * Return view subscriptions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSubscriptions();
 
@@ -50,7 +45,6 @@ public function getSubscriptions();
      * @param string $viewId
      * @return ViewInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function load($viewId);
 
@@ -59,7 +53,6 @@ public function load($viewId);
      *
      * @throws \Exception
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function subscribe();
 
@@ -68,7 +61,6 @@ public function subscribe();
      *
      * @throws \Exception
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function unsubscribe();
 
@@ -77,7 +69,6 @@ public function unsubscribe();
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function update();
 
@@ -85,7 +76,6 @@ public function update();
      * Pause view updates and set version ID to changelog's end
      *
      * @return void
-     * @since 2.0.0
      */
     public function suspend();
 
@@ -93,7 +83,6 @@ public function suspend();
      * Resume view updates
      *
      * @return void
-     * @since 2.0.0
      */
     public function resume();
 
@@ -101,7 +90,6 @@ public function resume();
      * Clear precessed changelog entries
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearChangelog();
 
@@ -109,7 +97,6 @@ public function clearChangelog();
      * Return related state object
      *
      * @return View\StateInterface
-     * @since 2.0.0
      */
     public function getState();
 
@@ -118,7 +105,6 @@ public function getState();
      *
      * @param View\StateInterface $state
      * @return ViewInterface
-     * @since 2.0.0
      */
     public function setState(View\StateInterface $state);
 
@@ -126,7 +112,6 @@ public function setState(View\StateInterface $state);
      * Check whether view is enabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled();
 
@@ -134,7 +119,6 @@ public function isEnabled();
      * Check whether view is idle
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIdle();
 
@@ -142,7 +126,6 @@ public function isIdle();
      * Check whether view is working
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWorking();
 
@@ -150,7 +133,6 @@ public function isWorking();
      * Check whether view is paused
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSuspended();
 
@@ -158,7 +140,6 @@ public function isSuspended();
      * Return view updated datetime
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUpdated();
 
@@ -166,7 +147,6 @@ public function getUpdated();
      * Retrieve linked changelog
      *
      * @return View\ChangelogInterface
-     * @since 2.0.0
      */
     public function getChangelog();
 }
diff --git a/lib/internal/Magento/Framework/Notification/MessageInterface.php b/lib/internal/Magento/Framework/Notification/MessageInterface.php
index c1721b9df87b4..a1694b042d9db 100644
--- a/lib/internal/Magento/Framework/Notification/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Notification/MessageInterface.php
@@ -14,7 +14,6 @@
  * Interface MessageInterface
  *
  * @api
- * @since 2.0.0
  */
 interface MessageInterface
 {
@@ -30,7 +29,6 @@ interface MessageInterface
      * Retrieve unique message identity
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIdentity();
 
@@ -38,7 +36,6 @@ public function getIdentity();
      * Check whether
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDisplayed();
 
@@ -46,7 +43,6 @@ public function isDisplayed();
      * Retrieve message text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText();
 
@@ -54,7 +50,6 @@ public function getText();
      * Retrieve message severity
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSeverity();
 }
diff --git a/lib/internal/Magento/Framework/Notification/MessageList.php b/lib/internal/Magento/Framework/Notification/MessageList.php
index e1007d72d7691..8fb91890b2ff0 100644
--- a/lib/internal/Magento/Framework/Notification/MessageList.php
+++ b/lib/internal/Magento/Framework/Notification/MessageList.php
@@ -11,7 +11,6 @@
  *
  * Class MessageList
  * @api
- * @since 2.0.0
  */
 class MessageList
 {
@@ -19,7 +18,6 @@ class MessageList
      * List of configured message classes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageClasses;
 
@@ -27,14 +25,12 @@ class MessageList
      * List of messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $messages
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $messages = [])
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @return void
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function _loadMessages()
     {
@@ -73,7 +68,6 @@ protected function _loadMessages()
      *
      * @param string $identity
      * @return null|\Magento\Framework\Notification\MessageInterface
-     * @since 2.0.0
      */
     public function getMessageByIdentity($identity)
     {
@@ -85,7 +79,6 @@ public function getMessageByIdentity($identity)
      * Retrieve list of all messages
      *
      * @return \Magento\Framework\Notification\MessageInterface[]
-     * @since 2.0.0
      */
     public function asArray()
     {
diff --git a/lib/internal/Magento/Framework/Notification/NotifierInterface.php b/lib/internal/Magento/Framework/Notification/NotifierInterface.php
index 2cf5609b6d592..0e34e69a94541 100644
--- a/lib/internal/Magento/Framework/Notification/NotifierInterface.php
+++ b/lib/internal/Magento/Framework/Notification/NotifierInterface.php
@@ -12,7 +12,6 @@
  * Interface NotifierInterface
  *
  * @api
- * @since 2.0.0
  */
 interface NotifierInterface
 {
@@ -26,7 +25,6 @@ interface NotifierInterface
      * @param bool $isInternal
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function add($severity, $title, $description, $url = '', $isInternal = true);
 
@@ -38,7 +36,6 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addCritical($title, $description, $url = '', $isInternal = true);
 
@@ -50,7 +47,6 @@ public function addCritical($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMajor($title, $description, $url = '', $isInternal = true);
 
@@ -62,7 +58,6 @@ public function addMajor($title, $description, $url = '', $isInternal = true);
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMinor($title, $description, $url = '', $isInternal = true);
 
@@ -74,7 +69,6 @@ public function addMinor($title, $description, $url = '', $isInternal = true);
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addNotice($title, $description, $url = '', $isInternal = true);
 }
diff --git a/lib/internal/Magento/Framework/Notification/NotifierList.php b/lib/internal/Magento/Framework/Notification/NotifierList.php
index 36d7a5905d4cd..e436e21cae5fc 100644
--- a/lib/internal/Magento/Framework/Notification/NotifierList.php
+++ b/lib/internal/Magento/Framework/Notification/NotifierList.php
@@ -10,7 +10,6 @@
  * List of registered system notifiers
  * @api
  *
- * @since 2.0.0
  */
 class NotifierList
 {
@@ -18,7 +17,6 @@ class NotifierList
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class NotifierList
      * List of notifiers
      *
      * @var NotifierInterface[]|string[]
-     * @since 2.0.0
      */
     protected $notifiers;
 
@@ -34,14 +31,12 @@ class NotifierList
      * Whether the list of notifiers is verified (all notifiers should implement NotifierInterface  interface)
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isNotifiersVerified;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param NotifierInterface[]|string[] $notifiers
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $notifiers = [])
     {
@@ -55,7 +50,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @return NotifierInterface[]
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function asArray()
     {
diff --git a/lib/internal/Magento/Framework/Notification/NotifierPool.php b/lib/internal/Magento/Framework/Notification/NotifierPool.php
index 3c817d1633599..5d8d86c918dfa 100644
--- a/lib/internal/Magento/Framework/Notification/NotifierPool.php
+++ b/lib/internal/Magento/Framework/Notification/NotifierPool.php
@@ -10,19 +10,16 @@
  * Default notifiers. Iterates through all registered notifiers to process message
  *
  * Class NotifierPool
- * @since 2.0.0
  */
 class NotifierPool implements NotifierInterface
 {
     /**
      * @var NotifierList
-     * @since 2.0.0
      */
     protected $notifierList;
 
     /**
      * @param NotifierList $notifierList
-     * @since 2.0.0
      */
     public function __construct(NotifierList $notifierList)
     {
@@ -39,7 +36,6 @@ public function __construct(NotifierList $notifierList)
      * @param bool $isInternal
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function add($severity, $title, $description, $url = '', $isInternal = true)
     {
@@ -57,7 +53,6 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addCritical($title, $description, $url = '', $isInternal = true)
     {
@@ -75,7 +70,6 @@ public function addCritical($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMajor($title, $description, $url = '', $isInternal = true)
     {
@@ -93,7 +87,6 @@ public function addMajor($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addMinor($title, $description, $url = '', $isInternal = true)
     {
@@ -111,7 +104,6 @@ public function addMinor($title, $description, $url = '', $isInternal = true)
      * @param string $url
      * @param bool $isInternal
      * @return $this
-     * @since 2.0.0
      */
     public function addNotice($title, $description, $url = '', $isInternal = true)
     {
diff --git a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
index ddd186292f336..ae416b01eae94 100644
--- a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
@@ -9,7 +9,6 @@
  * Oauth consumer interface.
  *
  * @api
- * @since 2.0.0
  */
 interface ConsumerInterface
 {
@@ -18,7 +17,6 @@ interface ConsumerInterface
      *
      * @return bool True if the consumer data is valid.
      * @throws \Exception
-     * @since 2.0.0
      */
     public function validate();
 
@@ -26,7 +24,6 @@ public function validate();
      * Get the consumer Id.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -34,7 +31,6 @@ public function getId();
      * Get consumer key.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getKey();
 
@@ -42,7 +38,6 @@ public function getKey();
      * Get consumer secret.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSecret();
 
@@ -50,7 +45,6 @@ public function getSecret();
      * Get consumer callback Url.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCallbackUrl();
 
@@ -58,7 +52,6 @@ public function getCallbackUrl();
      * Get when the consumer was created.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCreatedAt();
 
@@ -66,7 +59,6 @@ public function getCreatedAt();
      * Check if the consumer key has not expired for Oauth token exchange usage
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForTokenExchange();
 }
diff --git a/lib/internal/Magento/Framework/Oauth/Exception.php b/lib/internal/Magento/Framework/Oauth/Exception.php
index d4369b09520a0..6e6753654fdd2 100644
--- a/lib/internal/Magento/Framework/Oauth/Exception.php
+++ b/lib/internal/Magento/Framework/Oauth/Exception.php
@@ -11,7 +11,6 @@
  * OAuth Exception
  *
  * @api
- * @since 2.0.0
  */
 class Exception extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Oauth.php b/lib/internal/Magento/Framework/Oauth/Helper/Oauth.php
index 948be2a2dd970..f2772bf026eb9 100644
--- a/lib/internal/Magento/Framework/Oauth/Helper/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Helper/Oauth.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Oauth\Helper\Oauth
  *
- * @since 2.0.0
  */
 class Oauth
 {
@@ -48,13 +47,11 @@ class Oauth
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $_mathRandom;
 
     /**
      * @param \Magento\Framework\Math\Random $mathRandom
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Math\Random $mathRandom)
     {
@@ -66,7 +63,6 @@ public function __construct(\Magento\Framework\Math\Random $mathRandom)
      *
      * @param int $length String length
      * @return string
-     * @since 2.0.0
      */
     public function generateRandomString($length)
     {
@@ -80,7 +76,6 @@ public function generateRandomString($length)
      * Generate random string for token
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateToken()
     {
@@ -91,7 +86,6 @@ public function generateToken()
      * Generate random string for token secret
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateTokenSecret()
     {
@@ -102,7 +96,6 @@ public function generateTokenSecret()
      * Generate random string for verifier
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateVerifier()
     {
@@ -113,7 +106,6 @@ public function generateVerifier()
      * Generate random string for consumer key
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateConsumerKey()
     {
@@ -124,7 +116,6 @@ public function generateConsumerKey()
      * Generate random string for consumer secret
      *
      * @return string
-     * @since 2.0.0
      */
     public function generateConsumerSecret()
     {
diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Request.php b/lib/internal/Magento/Framework/Oauth/Helper/Request.php
index 7139fe827f5fb..0c095916859a3 100644
--- a/lib/internal/Magento/Framework/Oauth/Helper/Request.php
+++ b/lib/internal/Magento/Framework/Oauth/Helper/Request.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Oauth\Helper\Request
  *
- * @since 2.0.0
  */
 class Request
 {
@@ -34,7 +33,6 @@ class Request
      *
      * @param RequestInterface $httpRequest
      * @return array
-     * @since 2.0.0
      */
     public function prepareRequest($httpRequest)
     {
@@ -52,7 +50,6 @@ public function prepareRequest($httpRequest)
      *
      * @param RequestInterface $httpRequest
      * @return string
-     * @since 2.0.0
      */
     public function getRequestUrl($httpRequest)
     {
@@ -78,7 +75,6 @@ public function getRequestUrl($httpRequest)
      *         'oauth_signature' => 'VNg4mhFlXk7%2FvsxMqqUd5DWIj9s%3D'
      * )
      * </pre>
-     * @since 2.0.0
      */
     protected function _processRequest($authHeaderValue, $contentTypeHeader, $requestBodyString, $requestUrl)
     {
@@ -120,7 +116,6 @@ protected function _processRequest($authHeaderValue, $contentTypeHeader, $reques
      * @param array &$protocolParams
      * @param array $queryString
      * @return void
-     * @since 2.0.0
      */
     protected function _fetchProtocolParamsFromQuery(&$protocolParams, $queryString)
     {
@@ -138,7 +133,6 @@ protected function _fetchProtocolParamsFromQuery(&$protocolParams, $queryString)
      *
      * @param string $attrName
      * @return bool
-     * @since 2.0.0
      */
     protected function _isProtocolParameter($attrName)
     {
@@ -151,7 +145,6 @@ protected function _isProtocolParameter($attrName)
      * @param string $authHeaderValue
      * @param array &$protocolParams
      * @return bool true if parameters from oauth headers are processed correctly
-     * @since 2.0.0
      */
     protected function _processHeader($authHeaderValue, &$protocolParams)
     {
@@ -180,7 +173,6 @@ protected function _processHeader($authHeaderValue, &$protocolParams)
      * @param array &$protocolParams
      * @param string $queryString
      * @return void
-     * @since 2.0.0
      */
     protected function _extractQueryStringParams(&$protocolParams, $queryString)
     {
@@ -201,7 +193,6 @@ protected function _extractQueryStringParams(&$protocolParams, $queryString)
      * @param \Exception $exception
      * @param \Magento\Framework\HTTP\PhpEnvironment\Response $response OPTIONAL If NULL - will use internal getter
      * @return array
-     * @since 2.0.0
      */
     public function prepareErrorResponse(
         \Exception $exception,
diff --git a/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php b/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
index d7fd2cabf9e68..ca364aa95abeb 100644
--- a/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
@@ -11,7 +11,6 @@
  * A method for generating a current timestamp is also provided by this interface.
  *
  * @api
- * @since 2.0.0
  */
 interface NonceGeneratorInterface
 {
@@ -20,7 +19,6 @@ interface NonceGeneratorInterface
      *
      * @param ConsumerInterface $consumer
      * @return string The generated nonce value.
-     * @since 2.0.0
      */
     public function generateNonce(ConsumerInterface $consumer = null);
 
@@ -28,7 +26,6 @@ public function generateNonce(ConsumerInterface $consumer = null);
      * Generate a current timestamp.
      *
      * @return int The time as an int
-     * @since 2.0.0
      */
     public function generateTimestamp();
 
@@ -42,7 +39,6 @@ public function generateTimestamp();
      * @param int $timestamp The 'oauth_timestamp' value.
      * @return void
      * @throws \Magento\Framework\Oauth\Exception Exceptions are thrown for validation errors.
-     * @since 2.0.0
      */
     public function validateNonce(ConsumerInterface $consumer, $nonce, $timestamp);
 }
diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
index 4637984924ec7..d05963e41cb0a 100644
--- a/lib/internal/Magento/Framework/Oauth/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Framework\Oauth\Oauth
  *
- * @since 2.0.0
  */
 class Oauth implements OauthInterface
 {
     /**
      * @var  \Magento\Framework\Oauth\Helper\Oauth
-     * @since 2.0.0
      */
     protected $_oauthHelper;
 
     /**
      * @var  \Zend_Oauth_Http_Utility
-     * @since 2.0.0
      */
     protected $_httpUtility;
 
     /**
      * @var \Magento\Framework\Oauth\NonceGeneratorInterface
-     * @since 2.0.0
      */
     protected $_nonceGenerator;
 
     /**
      * @var \Magento\Framework\Oauth\TokenProviderInterface
-     * @since 2.0.0
      */
     protected $_tokenProvider;
 
@@ -44,7 +39,6 @@ class Oauth implements OauthInterface
      * @param NonceGeneratorInterface $nonceGenerator
      * @param TokenProviderInterface $tokenProvider
      * @param \Zend_Oauth_Http_Utility $httpUtility
-     * @since 2.0.0
      */
     public function __construct(
         Helper\Oauth $oauthHelper,
@@ -63,7 +57,6 @@ public function __construct(
      * Retrieve array of supported signature methods.
      *
      * @return string[] - Supported HMAC-SHA1 and HMAC-SHA256 signature methods.
-     * @since 2.0.0
      */
     public static function getSupportedSignatureMethods()
     {
@@ -72,7 +65,6 @@ public static function getSupportedSignatureMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -86,7 +78,6 @@ public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -115,7 +106,6 @@ public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -139,7 +129,6 @@ public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = '
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validateAccessToken($accessToken)
     {
@@ -148,7 +137,6 @@ public function validateAccessToken($accessToken)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function buildAuthorizationHeader(
         $params,
@@ -189,7 +177,6 @@ public function buildAuthorizationHeader(
      * @param string $tokenSecret
      * @return void
      * @throws Exception|OauthInputException
-     * @since 2.0.0
      */
     protected function _validateSignature($params, $consumerSecret, $httpMethod, $requestUrl, $tokenSecret = null)
     {
@@ -225,7 +212,6 @@ protected function _validateSignature($params, $consumerSecret, $httpMethod, $re
      * @param string $version
      * @return void
      * @throws OauthInputException
-     * @since 2.0.0
      */
     protected function _validateVersionParam($version)
     {
@@ -242,7 +228,6 @@ protected function _validateVersionParam($version)
      * @param array $requiredParams
      * @return void
      * @throws OauthInputException
-     * @since 2.0.0
      */
     protected function _validateProtocolParams($protocolParams, $requiredParams = [])
     {
@@ -297,7 +282,6 @@ protected function _validateProtocolParams($protocolParams, $requiredParams = []
      * @param array $requiredParams
      * @return void
      * @throws OauthInputException
-     * @since 2.0.0
      */
     protected function _checkRequiredParams($protocolParams, $requiredParams)
     {
diff --git a/lib/internal/Magento/Framework/Oauth/OauthInputException.php b/lib/internal/Magento/Framework/Oauth/OauthInputException.php
index 35b3248fc20f0..1c526dd220f25 100644
--- a/lib/internal/Magento/Framework/Oauth/OauthInputException.php
+++ b/lib/internal/Magento/Framework/Oauth/OauthInputException.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class OauthInputException extends InputException
 {
@@ -18,7 +17,6 @@ class OauthInputException extends InputException
      * Get error messages as a single comma separated string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAggregatedErrorMessage()
     {
diff --git a/lib/internal/Magento/Framework/Oauth/OauthInterface.php b/lib/internal/Magento/Framework/Oauth/OauthInterface.php
index b9a2beed2d8fd..4f68eabaf69dc 100644
--- a/lib/internal/Magento/Framework/Oauth/OauthInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/OauthInterface.php
@@ -11,7 +11,6 @@
  * token requests. A method is also included for generating an OAuth header that can be used in an HTTP request.
  *
  * @api
- * @since 2.0.0
  */
 interface OauthInterface
 {
@@ -89,7 +88,6 @@ interface OauthInterface
      * )
      * </pre>
      * @throws \Magento\Framework\Oauth\Exception - Validation errors.
-     * @since 2.0.0
      */
     public function getRequestToken($params, $requestUrl, $httpMethod = 'POST');
 
@@ -119,7 +117,6 @@ public function getRequestToken($params, $requestUrl, $httpMethod = 'POST');
      * )
      * </pre>
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function getAccessToken($params, $requestUrl, $httpMethod = 'POST');
 
@@ -142,7 +139,6 @@ public function getAccessToken($params, $requestUrl, $httpMethod = 'POST');
      * @param string $httpMethod - (default: 'POST')
      * @return int Consumer ID.
      * @throws \Magento\Framework\Oauth\Exception - Validation errors.
-     * @since 2.0.0
      */
     public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = 'POST');
 
@@ -152,7 +148,6 @@ public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = '
      * @param string $accessToken - The access token.
      * @return int - Consumer ID if the access token is valid.
      * @throws \Magento\Framework\Oauth\Exception - Validation errors.
-     * @since 2.0.0
      */
     public function validateAccessToken($accessToken);
 
@@ -180,7 +175,6 @@ public function validateAccessToken($accessToken);
      * oauth_token="7c0709f789e1f38a17aa4b9a28e1b06c", oauth_signature="agVxK0epXOOeQK4%2Bc7UAqUXoAok%3D"
      * <pre>
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function buildAuthorizationHeader(
         $params,
diff --git a/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php b/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
index 5ee0203b88497..7f4bc6a320173 100644
--- a/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
@@ -11,7 +11,6 @@
  * provided to help clients manipulating tokens validate and acquire the associated token consumer.
  *
  * @api
- * @since 2.0.0
  */
 interface TokenProviderInterface
 {
@@ -21,7 +20,6 @@ interface TokenProviderInterface
      * @param ConsumerInterface $consumer The consumer.
      * @return bool True if the consumer is valid.
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function validateConsumer($consumer);
 
@@ -38,7 +36,6 @@ public function validateConsumer($consumer);
      * @param ConsumerInterface $consumer
      * @return array The request token and secret.
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function createRequestToken($consumer);
 
@@ -50,7 +47,6 @@ public function createRequestToken($consumer);
      * @param string $oauthVerifier The 'oauth_verifier' value.
      * @return string The request token secret (i.e. 'oauth_token_secret').
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function validateRequestToken($requestToken, $consumer, $oauthVerifier);
 
@@ -67,7 +63,6 @@ public function validateRequestToken($requestToken, $consumer, $oauthVerifier);
      * @param ConsumerInterface $consumer The consumer given the 'oauth_consumer_key'.
      * @return array The access token and secret.
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function getAccessToken($consumer);
 
@@ -78,7 +73,6 @@ public function getAccessToken($consumer);
      * @param ConsumerInterface $consumer The consumer given the 'oauth_consumer_key'.
      * @return string The access token secret.
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function validateAccessTokenRequest($accessToken, $consumer);
 
@@ -88,7 +82,6 @@ public function validateAccessTokenRequest($accessToken, $consumer);
      * @param string $accessToken The 'oauth_token' access token string.
      * @return int Consumer ID if the access token is valid.
      * @throws \Magento\Framework\Oauth\Exception Validation errors.
-     * @since 2.0.0
      */
     public function validateAccessToken($accessToken);
 
@@ -97,7 +90,6 @@ public function validateAccessToken($accessToken);
      *
      * @param string $oauthToken The token string.
      * @return bool True if the Oauth token passes basic validation.
-     * @since 2.0.0
      */
     public function validateOauthToken($oauthToken);
 
@@ -107,7 +99,6 @@ public function validateOauthToken($oauthToken);
      * @param string $consumerKey The 'oauth_consumer_key' value.
      * @return ConsumerInterface
      * @throws \Magento\Framework\Oauth\Exception
-     * @since 2.0.0
      */
     public function getConsumerByKey($consumerKey);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Converter.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Converter.php
index d7eccc6e1ddde..f3c9e445f9bdc 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Converter.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Converter.php
@@ -8,7 +8,6 @@
 /**
  * Class Converter
  * @package Magento\Framework\ObjectManager\Code\Generator
- * @since 2.0.0
  */
 class Converter extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -21,7 +20,6 @@ class Converter extends \Magento\Framework\Code\Generator\EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -46,7 +44,6 @@ protected function _getClassProperties()
      * Returns factory name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFactoryPropertyName()
     {
@@ -57,7 +54,6 @@ protected function _getFactoryPropertyName()
      * Returns factory class
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFactoryClass()
     {
@@ -68,7 +64,6 @@ protected function _getFactoryClass()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -100,7 +95,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -136,7 +130,6 @@ protected function _getClassMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Factory.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Factory.php
index 5da584962f14b..f2ae5d386285f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Factory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Factory.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Code\Generator\Factory
  *
- * @since 2.0.0
  */
 class Factory extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -21,7 +20,6 @@ class Factory extends \Magento\Framework\Code\Generator\EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -43,7 +41,6 @@ protected function _getClassProperties()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -71,7 +68,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -99,7 +95,6 @@ protected function _getClassMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
index 1de8e5bf2199d..ef5d14e57352b 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
@@ -8,7 +8,6 @@
 
 /**
  * Class Persistor
- * @since 2.0.0
  */
 class Persistor extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -21,7 +20,6 @@ class Persistor extends \Magento\Framework\Code\Generator\EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -114,7 +112,6 @@ protected function _getClassProperties()
      * Returns source factory property name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourceFactoryPropertyName()
     {
@@ -124,7 +121,6 @@ protected function _getSourceFactoryPropertyName()
     /**
      * Returns source collection factory property name
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourceResourcePropertyName() // InvoiceResource
     {
@@ -135,7 +131,6 @@ protected function _getSourceResourcePropertyName() // InvoiceResource
      * Returns collection factory class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourceResourceClassName() // Invoice\Resource
     {
@@ -150,7 +145,6 @@ protected function _getSourceResourceClassName() // Invoice\Resource
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -170,7 +164,6 @@ protected function _getClassMethods()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -222,7 +215,6 @@ protected function _getDefaultConstructorDefinition()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getGetConnectionMethod()
     {
@@ -252,7 +244,6 @@ protected function _getGetConnectionMethod()
      * Returns register() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getLoadEntityMethod()
     {
@@ -286,7 +277,6 @@ protected function _getLoadEntityMethod()
      * Returns registerDelete() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getRegisterDeletedMethod()
     {
@@ -319,7 +309,6 @@ protected function _getRegisterDeletedMethod()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     protected function _getDoPersistMethod()
     {
@@ -378,7 +367,6 @@ protected function _getDoPersistMethod()
      * Returns registerDelete() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDoPersistEntityMethod()
     {
@@ -419,7 +407,6 @@ protected function _getDoPersistEntityMethod()
      * Returns registerDelete() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getRegisterFromArrayMethod()
     {
@@ -455,7 +442,6 @@ protected function _getRegisterFromArrayMethod()
      * Returns registerDelete() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getRegisterNewMethod()
     {
@@ -490,7 +476,6 @@ protected function _getRegisterNewMethod()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
index 4a9c7b44c4628..9df64b86f5310 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Code\Generator\Proxy
  *
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -27,7 +26,6 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
     /**
      * @param string $modelClassName
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultResultClassName($modelClassName)
     {
@@ -38,7 +36,6 @@ protected function _getDefaultResultClassName($modelClassName)
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -79,7 +76,6 @@ protected function _getClassProperties()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -137,7 +133,6 @@ protected function _getClassMethods()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -158,7 +153,6 @@ protected function _generateCode()
      *
      * @param \ReflectionMethod $method
      * @return array
-     * @since 2.0.0
      */
     protected function _getMethodInfo(\ReflectionMethod $method)
     {
@@ -183,7 +177,6 @@ protected function _getMethodInfo(\ReflectionMethod $method)
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -224,7 +217,6 @@ protected function _getDefaultConstructorDefinition()
      * @param string $name
      * @param array $parameters
      * @return string
-     * @since 2.0.0
      */
     protected function _getMethodBody($name, array $parameters = [])
     {
@@ -238,7 +230,6 @@ protected function _getMethodBody($name, array $parameters = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index 605a383ff39d8..2128e34936658 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -16,7 +16,6 @@
 
 /**
  * Class Repository
- * @since 2.0.0
  */
 class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -44,7 +43,6 @@ class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
      * Retrieve class properties
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -123,7 +121,6 @@ protected function _getClassProperties()
      * Returns source factory property name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourcePersistorPropertyName()
     {
@@ -133,7 +130,6 @@ protected function _getSourcePersistorPropertyName()
     /**
      * Returns source collection factory property name
      * @return string
-     * @since 2.0.0
      */
     protected function _getSourceCollectionFactoryPropertyName()
     {
@@ -144,7 +140,6 @@ protected function _getSourceCollectionFactoryPropertyName()
      * Returns collection factory class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCollectionFactoryClassName()
     {
@@ -156,7 +151,6 @@ protected function _getCollectionFactoryClassName()
      * Returns source persistor class name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getPersistorClassName()
     {
@@ -171,7 +165,6 @@ protected function _getPersistorClassName()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -224,7 +217,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns get() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getGetMethod()
     {
@@ -282,7 +274,6 @@ protected function _getGetMethod()
      * Returns register() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCreateFromArrayMethod()
     {
@@ -316,7 +307,6 @@ protected function _getCreateFromArrayMethod()
      * Returns register() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getCreateMethod()
     {
@@ -350,7 +340,6 @@ protected function _getCreateMethod()
      * Returns register() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getFlushMethod()
     {
@@ -373,7 +362,6 @@ protected function _getFlushMethod()
      * Returns persist() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getSaveMethod()
     {
@@ -410,7 +398,6 @@ protected function _getSaveMethod()
      * Return remove() method
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDeleteMethod()
     {
@@ -447,7 +434,6 @@ protected function _getDeleteMethod()
      * Return remove() method
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDeleteByIdMethod()
     {
@@ -485,7 +471,6 @@ protected function _getDeleteByIdMethod()
      * Return remove() method
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getRemoveMethod()
     {
@@ -515,7 +500,6 @@ protected function _getRemoveMethod()
      * Returns getList() method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getGetListMethod()
     {
@@ -586,7 +570,6 @@ private function _getGetCollectionProcessorMethod()
      * Returns list of methods for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -607,7 +590,6 @@ protected function _getClassMethods()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
@@ -631,7 +613,6 @@ protected function _validateData()
      * Generate code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -647,7 +628,6 @@ protected function _generateCode()
      * Get source class name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSourceClassName()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 40ca563620812..7bf974a6e09e0 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -11,31 +11,26 @@
 
 /**
  * Provides object manager configuration when in compiled mode
- * @since 2.0.0
  */
 class Compiled implements ConfigInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $arguments;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $virtualTypes;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $preferences;
 
     /**
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct($data)
     {
@@ -55,7 +50,6 @@ public function __construct($data)
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setRelations(RelationsInterface $relations)
     {
@@ -69,7 +63,6 @@ public function setRelations(RelationsInterface $relations)
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setCache(ConfigCacheInterface $cache)
     {
@@ -80,7 +73,6 @@ public function setCache(ConfigCacheInterface $cache)
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getArguments($type)
     {
@@ -100,7 +92,6 @@ public function getArguments($type)
      * @param string $type
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function isShared($type)
     {
@@ -112,7 +103,6 @@ public function isShared($type)
      *
      * @param string $instanceName
      * @return mixed
-     * @since 2.0.0
      */
     public function getInstanceType($instanceName)
     {
@@ -128,7 +118,6 @@ public function getInstanceType($instanceName)
      * @param string $type
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getPreference($type)
     {
@@ -144,7 +133,6 @@ public function getPreference($type)
      *
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     public function extend(array $configuration)
     {
@@ -163,7 +151,6 @@ public function extend(array $configuration)
      * Retrieve all virtual types
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVirtualTypes()
     {
@@ -174,7 +161,6 @@ public function getVirtualTypes()
      * Returns list on preferences
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPreferences()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index 31cfcd9d8cb00..24565501aaead 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Config\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\ObjectManager\ConfigInterface
 {
@@ -21,7 +20,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Config cache
      *
      * @var ConfigCacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -29,7 +27,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Class definitions
      *
      * @var \Magento\Framework\ObjectManager\DefinitionInterface
-     * @since 2.0.0
      */
     protected $_definitions;
 
@@ -37,7 +34,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Current cache key
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_currentCacheKey;
 
@@ -45,7 +41,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Interface preferences
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_preferences = [];
 
@@ -53,7 +48,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Virtual types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_virtualTypes = [];
 
@@ -61,7 +55,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Instance arguments
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_arguments = [];
 
@@ -69,7 +62,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * Type shareability
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_nonShared = [];
 
@@ -77,7 +69,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * List of relations
      *
      * @var RelationsInterface
-     * @since 2.0.0
      */
     protected $_relations;
 
@@ -85,7 +76,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
      * List of merged arguments
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_mergedArguments;
 
@@ -98,7 +88,6 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
     /**
      * @param RelationsInterface $relations
      * @param DefinitionInterface $definitions
-     * @since 2.0.0
      */
     public function __construct(RelationsInterface $relations = null, DefinitionInterface $definitions = null)
     {
@@ -111,7 +100,6 @@ public function __construct(RelationsInterface $relations = null, DefinitionInte
      *
      * @param RelationsInterface $relations
      * @return void
-     * @since 2.0.0
      */
     public function setRelations(RelationsInterface $relations)
     {
@@ -123,7 +111,6 @@ public function setRelations(RelationsInterface $relations)
      *
      * @param ConfigCacheInterface $cache
      * @return void
-     * @since 2.0.0
      */
     public function setCache(ConfigCacheInterface $cache)
     {
@@ -135,7 +122,6 @@ public function setCache(ConfigCacheInterface $cache)
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getArguments($type)
     {
@@ -150,7 +136,6 @@ public function getArguments($type)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isShared($type)
     {
@@ -162,7 +147,6 @@ public function isShared($type)
      *
      * @param string $instanceName
      * @return mixed
-     * @since 2.0.0
      */
     public function getInstanceType($instanceName)
     {
@@ -178,7 +162,6 @@ public function getInstanceType($instanceName)
      * @param string $type
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getPreference($type)
     {
@@ -206,7 +189,6 @@ public function getPreference($type)
      * @param string $type
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _collectConfiguration($type)
     {
@@ -247,7 +229,6 @@ protected function _collectConfiguration($type)
      * @param array $configuration
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _mergeConfiguration(array $configuration)
     {
@@ -291,7 +272,6 @@ protected function _mergeConfiguration(array $configuration)
      *
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     public function extend(array $configuration)
     {
@@ -341,7 +321,6 @@ public function extend(array $configuration)
      * Returns list of virtual types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVirtualTypes()
     {
@@ -352,7 +331,6 @@ public function getVirtualTypes()
      * Returns list on preferences
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPreferences()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/ArgumentParser.php b/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/ArgumentParser.php
index 34cdd5c83993e..6f47950e197a7 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/ArgumentParser.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/ArgumentParser.php
@@ -11,13 +11,11 @@
 
 /**
  * Parser of a DI argument node that returns its array representation with no data loss
- * @since 2.0.0
  */
 class ArgumentParser
 {
     /**
      * @var FlatConverter
-     * @since 2.0.0
      */
     private $converter;
 
@@ -26,7 +24,6 @@ class ArgumentParser
      *
      * @param \DOMNode $argumentNode
      * @return array|string
-     * @since 2.0.0
      */
     public function parse(\DOMNode $argumentNode)
     {
@@ -38,7 +35,6 @@ public function parse(\DOMNode $argumentNode)
      * Retrieve instance of XML converter, suitable for DI argument nodes
      *
      * @return FlatConverter
-     * @since 2.0.0
      */
     protected function getConverter()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/Dom.php b/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/Dom.php
index 6033e63dbb9d0..0704f8e85f924 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/Dom.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Mapper/Dom.php
@@ -11,25 +11,21 @@
 /**
  * Class \Magento\Framework\ObjectManager\Config\Mapper\Dom
  *
- * @since 2.0.0
  */
 class Dom implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * @var BooleanUtils
-     * @since 2.0.0
      */
     private $booleanUtils;
 
     /**
      * @var ArgumentParser
-     * @since 2.0.0
      */
     private $argumentParser;
 
     /**
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     private $argumentInterpreter;
 
@@ -37,7 +33,6 @@ class Dom implements \Magento\Framework\Config\ConverterInterface
      * @param BooleanUtils $booleanUtils
      * @param ArgumentParser $argumentParser
      * @param InterpreterInterface $argumentInterpreter
-     * @since 2.0.0
      */
     public function __construct(
         InterpreterInterface $argumentInterpreter,
@@ -59,7 +54,6 @@ public function __construct(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function convert($config)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Reader/Dom.php b/lib/internal/Magento/Framework/ObjectManager/Config/Reader/Dom.php
index 50347bb52f689..307be958e43c6 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Reader/Dom.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Reader/Dom.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Config\Reader\Dom
  *
- * @since 2.0.0
  */
 class Dom extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -19,7 +18,6 @@ class Dom extends \Magento\Framework\Config\Reader\Filesystem
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/config/preference' => 'for',
@@ -38,7 +36,6 @@ class Dom extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
@@ -66,7 +63,6 @@ public function __construct(
      * Create and return a config merger instance that takes into account types of arguments
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _createConfigMerger($mergerClass, $initialContents)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Reader/DomFactory.php b/lib/internal/Magento/Framework/ObjectManager/Config/Reader/DomFactory.php
index 803e35f96aad6..da81283a6fd43 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Reader/DomFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Reader/DomFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Factory class for \Magento\Framework\ObjectManager\Config\Reader\Dom
- * @since 2.0.0
  */
 class DomFactory
 {
@@ -17,7 +16,6 @@ class DomFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -25,7 +23,6 @@ class DomFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -34,7 +31,6 @@ class DomFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\ObjectManager\Config\Reader\Dom
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/SchemaLocator.php b/lib/internal/Magento/Framework/ObjectManager/Config/SchemaLocator.php
index dbf11b6153aeb..f922a0ba882bc 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/SchemaLocator.php
@@ -10,18 +10,15 @@
 /**
  * Class \Magento\Framework\ObjectManager\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -32,7 +29,6 @@ public function __construct()
      * Get path to merged config schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -43,7 +39,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
index 5c43045f94534..8552dece04d77 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\ConfigCacheInterface
  *
- * @since 2.0.0
  */
 interface ConfigCacheInterface
 {
@@ -17,7 +16,6 @@ interface ConfigCacheInterface
      *
      * @param string $key
      * @return array
-     * @since 2.0.0
      */
     public function get($key);
 
@@ -27,7 +25,6 @@ public function get($key);
      * @param array $config
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function save(array $config, $key);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
index af31e877de66e..0aebc15f9e403 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -18,7 +17,6 @@ interface ConfigInterface
      * @param RelationsInterface $relations
      *
      * @return void
-     * @since 2.0.0
      */
     public function setRelations(RelationsInterface $relations);
 
@@ -28,7 +26,6 @@ public function setRelations(RelationsInterface $relations);
      * @param ConfigCacheInterface $cache
      *
      * @return void
-     * @since 2.0.0
      */
     public function setCache(ConfigCacheInterface $cache);
 
@@ -37,7 +34,6 @@ public function setCache(ConfigCacheInterface $cache);
      *
      * @param string $type
      * @return array|null
-     * @since 2.0.0
      */
     public function getArguments($type);
 
@@ -46,7 +42,6 @@ public function getArguments($type);
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isShared($type);
 
@@ -55,7 +50,6 @@ public function isShared($type);
      *
      * @param string $instanceName
      * @return mixed
-     * @since 2.0.0
      */
     public function getInstanceType($instanceName);
 
@@ -65,7 +59,6 @@ public function getInstanceType($instanceName);
      * @param string $type
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getPreference($type);
 
@@ -73,7 +66,6 @@ public function getPreference($type);
      * Returns list of virtual types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getVirtualTypes();
 
@@ -82,7 +74,6 @@ public function getVirtualTypes();
      *
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     public function extend(array $configuration);
 
@@ -90,7 +81,6 @@ public function extend(array $configuration);
      * Returns list on preferences
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPreferences();
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigLoaderInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigLoaderInterface.php
index 73a69bcf56330..3555df5db60f2 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigLoaderInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigLoaderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\ConfigLoaderInterface
  *
- * @since 2.0.0
  */
 interface ConfigLoaderInterface
 {
@@ -17,7 +16,6 @@ interface ConfigLoaderInterface
      *
      * @param string $area
      * @return array
-     * @since 2.0.0
      */
     public function load($area);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php b/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
index 0c46b7507408b..323f092e7cf52 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
@@ -17,7 +17,6 @@
  * the classes they were introduced for.
  *
  * @api
- * @since 2.0.0
  */
 interface ContextInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
index a9c67d219b18f..48fc2664dde39 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\ObjectManager\Definition\Runtime
  *
- * @since 2.0.0
  */
 class Runtime implements \Magento\Framework\ObjectManager\DefinitionInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_definitions = [];
 
     /**
      * @param \Magento\Framework\Code\Reader\ClassReaderInterface $reader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface $reader = null)
     {
@@ -44,7 +41,6 @@ public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface
      *
      * @param string $className
      * @return array|null
-     * @since 2.0.0
      */
     public function getParameters($className)
     {
@@ -58,7 +54,6 @@ public function getParameters($className)
      * Retrieve list of all classes covered with definitions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getClasses()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
index 8e5ea776e70c0..e4e82fc1ac7b3 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DefinitionFactory
 {
@@ -22,7 +21,6 @@ class DefinitionFactory
      * Class generation dir
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_generationDir;
 
@@ -30,20 +28,17 @@ class DefinitionFactory
      * Filesystem Driver
      *
      * @var DriverInterface
-     * @since 2.0.0
      */
     protected $_filesystemDriver;
 
     /**
      * @var \Magento\Framework\Code\Generator
-     * @since 2.0.0
      */
     protected $codeGenerator;
 
     /**
      * @param DriverInterface $filesystemDriver
      * @param string $generationDir
-     * @since 2.0.0
      */
     public function __construct(
         DriverInterface $filesystemDriver,
@@ -57,7 +52,6 @@ public function __construct(
      * Create class definitions
      *
      * @return DefinitionInterface
-     * @since 2.0.0
      */
     public function createClassDefinition()
     {
@@ -70,7 +64,6 @@ public function createClassDefinition()
      * Create plugin definitions
      *
      * @return \Magento\Framework\Interception\DefinitionInterface
-     * @since 2.0.0
      */
     public function createPluginDefinition()
     {
@@ -81,7 +74,6 @@ public function createPluginDefinition()
      * Create relations
      *
      * @return RelationsInterface
-     * @since 2.0.0
      */
     public function createRelations()
     {
@@ -92,7 +84,6 @@ public function createRelations()
      * Get existing code generator. Instantiate a new one if it does not exist yet.
      *
      * @return \Magento\Framework\Code\Generator
-     * @since 2.0.0
      */
     public function getCodeGenerator()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionInterface.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionInterface.php
index c87fa262b5863..972378d480bf6 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DefinitionInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\DefinitionInterface
  *
- * @since 2.0.0
  */
 interface DefinitionInterface
 {
@@ -29,7 +28,6 @@ interface DefinitionInterface
      *
      * @param string $className
      * @return array|null
-     * @since 2.0.0
      */
     public function getParameters($className);
 
@@ -37,7 +35,6 @@ public function getParameters($className);
      * Retrieve list of all classes covered with definitions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getClasses();
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/DynamicConfigInterface.php b/lib/internal/Magento/Framework/ObjectManager/DynamicConfigInterface.php
index 227c0e4f32a7d..6cb6bf99ded63 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DynamicConfigInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DynamicConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\DynamicConfigInterface
  *
- * @since 2.0.0
  */
 interface DynamicConfigInterface
 {
@@ -16,7 +15,6 @@ interface DynamicConfigInterface
      * Map application initialization params to Object Manager configuration format
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfiguration();
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 008e29647a06b..f9178072fc7bd 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Factory\AbstractFactory
  *
- * @since 2.0.0
  */
 abstract class AbstractFactory implements \Magento\Framework\ObjectManager\FactoryInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
      * Object manager config
      *
      * @var \Magento\Framework\ObjectManager\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -34,7 +31,6 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
      * Definition list
      *
      * @var \Magento\Framework\ObjectManager\DefinitionInterface
-     * @since 2.0.0
      */
     protected $definitions;
 
@@ -42,7 +38,6 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
      * Global arguments
      *
      * @var array
-     * @since 2.0.0
      */
     protected $globalArguments;
 
@@ -59,7 +54,6 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
      * @param ObjectManagerInterface $objectManager
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $definitions
      * @param array $globalArguments
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManager\ConfigInterface $config,
@@ -79,7 +73,6 @@ public function __construct(
      * @param ObjectManagerInterface $objectManager
      *
      * @return void
-     * @since 2.0.0
      */
     public function setObjectManager(ObjectManagerInterface $objectManager)
     {
@@ -92,7 +85,6 @@ public function setObjectManager(ObjectManagerInterface $objectManager)
      * @param array $arguments
      *
      * @return void
-     * @since 2.0.0
      */
     public function setArguments($arguments)
     {
@@ -119,7 +111,6 @@ public function getDefinitions()
      *
      * @return object
      *
-     * @since 2.0.0
      */
     protected function createObject($type, $args)
     {
@@ -138,7 +129,6 @@ protected function createObject($type, $args)
      * @return void
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)
     {
@@ -180,7 +170,6 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
      * @param array $array
      *
      * @return void
-     * @since 2.0.0
      */
     protected function parseArray(&$array)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
index 846c29599987c..9d7503feb03f4 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Factory\Compiled
  *
- * @since 2.0.0
  */
 class Compiled extends AbstractFactory
 {
@@ -16,7 +15,6 @@ class Compiled extends AbstractFactory
      * Object manager config
      *
      * @var \Magento\Framework\ObjectManager\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -24,13 +22,11 @@ class Compiled extends AbstractFactory
      * Global arguments
      *
      * @var array
-     * @since 2.0.0
      */
     protected $globalArguments;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $sharedInstances;
 
@@ -38,7 +34,6 @@ class Compiled extends AbstractFactory
      * @param \Magento\Framework\ObjectManager\ConfigInterface $config
      * @param array $sharedInstances
      * @param array $globalArguments
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManager\ConfigInterface $config,
@@ -58,7 +53,6 @@ public function __construct(
      * @return object
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function create($requestedType, array $arguments = [])
     {
@@ -126,7 +120,6 @@ public function create($requestedType, array $arguments = [])
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function parseArray(&$array)
     {
@@ -154,7 +147,6 @@ protected function parseArray(&$array)
      *
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     protected function get($type)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Developer.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Developer.php
index 52cfa61758857..5e1170cff8a89 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Developer.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Developer.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Factory\Dynamic\Developer
  *
- * @since 2.0.0
  */
 class Developer extends \Magento\Framework\ObjectManager\Factory\AbstractFactory
 {
@@ -23,7 +22,6 @@ class Developer extends \Magento\Framework\ObjectManager\Factory\AbstractFactory
      *
      * @throws \UnexpectedValueException
      * @throws \BadMethodCallException
-     * @since 2.0.0
      */
     protected function _resolveArguments($requestedType, array $parameters, array $arguments = [])
     {
@@ -47,7 +45,6 @@ protected function _resolveArguments($requestedType, array $parameters, array $a
      * @param array $arguments
      * @return object
      * @throws \Exception
-     * @since 2.0.0
      */
     public function create($requestedType, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
index 73b406f9fd23d..6f42b8faaa007 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Factory\Dynamic\Production
  *
- * @since 2.0.0
  */
 class Production extends \Magento\Framework\ObjectManager\Factory\AbstractFactory
 {
@@ -23,7 +22,6 @@ class Production extends \Magento\Framework\ObjectManager\Factory\AbstractFactor
      *
      * @throws \UnexpectedValueException
      * @throws \BadMethodCallException
-     * @since 2.0.0
      */
     protected function _resolveArguments($requestedType, array $parameters, array $arguments = [])
     {
@@ -58,7 +56,6 @@ protected function _resolveArguments($requestedType, array $parameters, array $a
      * @return object
      *
      * @throws \Exception
-     * @since 2.0.0
      */
     public function create($requestedType, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/FactoryInterface.php b/lib/internal/Magento/Framework/ObjectManager/FactoryInterface.php
index 70210415323d5..824ac98a936d5 100644
--- a/lib/internal/Magento/Framework/ObjectManager/FactoryInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/FactoryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\FactoryInterface
  *
- * @since 2.0.0
  */
 interface FactoryInterface
 {
@@ -22,7 +21,6 @@ interface FactoryInterface
      * @return object
      * @throws \LogicException
      * @throws \BadMethodCallException
-     * @since 2.0.0
      */
     public function create($requestedType, array $arguments = []);
 
@@ -32,7 +30,6 @@ public function create($requestedType, array $arguments = []);
      * @param ObjectManagerInterface $objectManager
      *
      * @return void
-     * @since 2.0.0
      */
     public function setObjectManager(ObjectManagerInterface $objectManager);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
index 429b37ce1defa..c99170b4112c8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
@@ -8,7 +8,6 @@
 
 /**
  * Helper for classes which implement Composite pattern.
- * @since 2.0.0
  */
 class Composite
 {
@@ -22,7 +21,6 @@ class Composite
      * ]
      * </pre>
      * @return array Array of components declarations. Items are sorted and misconfigured ones are removed.
-     * @since 2.0.0
      */
     public function filterAndSortDeclaredComponents($declaredComponents)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php b/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php
index 455f46bd41d30..bf10ff355e696 100644
--- a/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php
+++ b/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php
@@ -8,14 +8,14 @@
 /**
  * Class \Magento\Framework\ObjectManager\InterceptableValidator
  *
- * @since 2.1.0
+ * @since 2.0.1
  */
 class InterceptableValidator
 {
     /**
      * @param string $className
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function validate($className)
     {
@@ -28,7 +28,7 @@ public function validate($className)
      *
      * @param string $instanceName
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function isInterceptor($instanceName)
     {
@@ -41,7 +41,7 @@ private function isInterceptor($instanceName)
      *
      * @param string $instanceName
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function isInterceptable($instanceName)
     {
@@ -57,7 +57,7 @@ private function isInterceptable($instanceName)
      * @param string $haystack
      * @param string $needle
      * @return bool
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private function endsWith($haystack, $needle)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php b/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php
index cf71d44713139..39869ca34e1ee 100644
--- a/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Marker interface, used to identify proxies for which we don't need to generate interceptors
- * @since 2.1.0
+ * @since 2.0.1
  */
 interface NoninterceptableInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/ObjectManager.php b/lib/internal/Magento/Framework/ObjectManager/ObjectManager.php
index 86ab87b16d4a8..faca8366dcda8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ObjectManager.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ObjectManager.php
@@ -15,13 +15,11 @@
 /**
  * Class \Magento\Framework\ObjectManager\ObjectManager
  *
- * @since 2.0.0
  */
 class ObjectManager implements \Magento\Framework\ObjectManagerInterface
 {
     /**
      * @var \Magento\Framework\ObjectManager\FactoryInterface
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -29,13 +27,11 @@ class ObjectManager implements \Magento\Framework\ObjectManagerInterface
      * List of shared instances
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_sharedInstances = [];
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -43,7 +39,6 @@ class ObjectManager implements \Magento\Framework\ObjectManagerInterface
      * @param FactoryInterface $factory
      * @param ConfigInterface $config
      * @param array &$sharedInstances
-     * @since 2.0.0
      */
     public function __construct(FactoryInterface $factory, ConfigInterface $config, &$sharedInstances = [])
     {
@@ -59,7 +54,6 @@ public function __construct(FactoryInterface $factory, ConfigInterface $config,
      * @param string $type
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function create($type, array $arguments = [])
     {
@@ -71,7 +65,6 @@ public function create($type, array $arguments = [])
      *
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     public function get($type)
     {
@@ -89,7 +82,6 @@ public function get($type)
      *
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     public function configure(array $configuration)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Code/Generator/Logger.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Code/Generator/Logger.php
index 614c108506383..cf43d178d0be5 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Code/Generator/Logger.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Code/Generator/Logger.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Profiler\Code\Generator\Logger
  *
- * @since 2.0.0
  */
 class Logger extends \Magento\Framework\Code\Generator\EntityAbstract
 {
@@ -21,7 +20,6 @@ class Logger extends \Magento\Framework\Code\Generator\EntityAbstract
     /**
      * @param string $modelClassName
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultResultClassName($modelClassName)
     {
@@ -32,7 +30,6 @@ protected function _getDefaultResultClassName($modelClassName)
      * Returns list of properties for class generator
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getClassProperties()
     {
@@ -64,7 +61,6 @@ protected function _getClassProperties()
      * Get default constructor definition for generated class
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getDefaultConstructorDefinition()
     {
@@ -83,7 +79,6 @@ protected function _getDefaultConstructorDefinition()
      * Returns list of methods for class generator
      *
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getClassMethods()
     {
@@ -142,7 +137,6 @@ protected function _getClassMethods()
      * Retrieve body of the _invoke method
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInvokeMethodBody()
     {
@@ -159,7 +153,6 @@ protected function _getInvokeMethodBody()
      *
      * @param \ReflectionMethod $method
      * @return array
-     * @since 2.0.0
      */
     protected function _getMethodInfo(\ReflectionMethod $method)
     {
@@ -191,7 +184,6 @@ protected function _getMethodInfo(\ReflectionMethod $method)
      * Generate resulting class source code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _generateCode()
     {
@@ -208,7 +200,6 @@ protected function _generateCode()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _validateData()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/FactoryDecorator.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/FactoryDecorator.php
index 0b4710da616cb..c32995c904ea6 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/FactoryDecorator.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/FactoryDecorator.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\ObjectManager\Profiler\FactoryDecorator
  *
- * @since 2.0.0
  */
 class FactoryDecorator implements \Magento\Framework\ObjectManager\FactoryInterface
 {
@@ -20,20 +19,17 @@ class FactoryDecorator implements \Magento\Framework\ObjectManager\FactoryInterf
 
     /**
      * @var \Magento\Framework\ObjectManager\FactoryInterface
-     * @since 2.0.0
      */
     protected $subject;
 
     /**
      * @var Log
-     * @since 2.0.0
      */
     protected $log;
 
     /**
      * @param \Magento\Framework\ObjectManager\FactoryInterface $subject
      * @param Log $log
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManager\FactoryInterface $subject, Log $log)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\ObjectManager\FactoryInterface $s
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      *
      * @return void
-     * @since 2.0.0
      */
     public function setObjectManager(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -54,7 +49,6 @@ public function setObjectManager(\Magento\Framework\ObjectManagerInterface $obje
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create($requestedType, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
index ef9fc0934e364..2d2501ab6f9c2 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
@@ -11,49 +11,41 @@
 /**
  * Class \Magento\Framework\ObjectManager\Profiler\Log
  *
- * @since 2.0.0
  */
 class Log
 {
     /**
      * @var $this
-     * @since 2.0.0
      */
     protected static $instance;
 
     /**
      * @var Item
-     * @since 2.0.0
      */
     protected $currentItem = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $roots = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $used = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $stats = ['total' => 0, 'used' => 0, 'unused' => 0];
 
     /**
      * Constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -64,7 +56,6 @@ public function __construct()
      * Retrieve instance
      *
      * @return Log
-     * @since 2.0.0
      */
     public static function getInstance()
     {
@@ -79,7 +70,6 @@ public static function getInstance()
      *
      * @param string $class
      * @return void
-     * @since 2.0.0
      */
     public function startCreating($class)
     {
@@ -99,7 +89,6 @@ public function startCreating($class)
      *
      * @param mixed $object
      * @return void
-     * @since 2.0.0
      */
     public function stopCreating($object)
     {
@@ -112,7 +101,6 @@ public function stopCreating($object)
      *
      * @param mixed $object
      * @return void
-     * @since 2.0.0
      */
     public function add($object)
     {
@@ -132,7 +120,6 @@ public function add($object)
      *
      * @param mixed $object
      * @return void
-     * @since 2.0.0
      */
     public function invoked($object)
     {
@@ -143,7 +130,6 @@ public function invoked($object)
      * Display results
      *
      * @return void
-     * @since 2.0.0
      */
     public function display()
     {
@@ -168,7 +154,6 @@ public function display()
      * @param Item $item
      * @param int $level
      * @return void
-     * @since 2.0.0
      */
     protected function displayItem(Item $item, $level = 0)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Tree/Item.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Tree/Item.php
index 500a620afd6ba..2af8071b3e71e 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Tree/Item.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Tree/Item.php
@@ -9,38 +9,32 @@
 /**
  * Class \Magento\Framework\ObjectManager\Profiler\Tree\Item
  *
- * @since 2.0.0
  */
 class Item
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $class;
 
     /**
      * @var Item|null
-     * @since 2.0.0
      */
     protected $parent = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $hash = null;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $children = [];
 
     /**
      * @param string $class
      * @param Item $parent
-     * @since 2.0.0
      */
     public function __construct($class, Item $parent = null)
     {
@@ -56,7 +50,6 @@ public function __construct($class, Item $parent = null)
      * Retrieve class
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -68,7 +61,6 @@ public function getClass()
      *
      * @param Item $item
      * @return void
-     * @since 2.0.0
      */
     public function addChild(Item $item)
     {
@@ -79,7 +71,6 @@ public function addChild(Item $item)
      * Retrieve list of children
      *
      * @return array[Item]
-     * @since 2.0.0
      */
     public function getChildren()
     {
@@ -90,7 +81,6 @@ public function getChildren()
      * Retrieve parent
      *
      * @return Item|null
-     * @since 2.0.0
      */
     public function getParent()
     {
@@ -102,7 +92,6 @@ public function getParent()
      *
      * @param string $hash
      * @return void
-     * @since 2.0.0
      */
     public function setHash($hash)
     {
@@ -113,7 +102,6 @@ public function setHash($hash)
      * Retrieve hash
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHash()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Relations/Runtime.php b/lib/internal/Magento/Framework/ObjectManager/Relations/Runtime.php
index 0bf94c504b3d7..7528f8b638df9 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Relations/Runtime.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Relations/Runtime.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\ObjectManager\Relations\Runtime
  *
- * @since 2.0.0
  */
 class Runtime implements \Magento\Framework\ObjectManager\RelationsInterface
 {
     /**
      * @var \Magento\Framework\Code\Reader\ClassReaderInterface
-     * @since 2.0.0
      */
     protected $_classReader;
 
@@ -22,13 +20,11 @@ class Runtime implements \Magento\Framework\ObjectManager\RelationsInterface
      * Default behavior
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_default = [];
 
     /**
      * @param \Magento\Framework\Code\Reader\ClassReaderInterface $classReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface $classReader = null)
     {
@@ -40,7 +36,6 @@ public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function has($type)
     {
@@ -52,7 +47,6 @@ public function has($type)
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getParents($type)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php b/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
index f1d35b2b23eb5..21deeca418dad 100644
--- a/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\ObjectManager\RelationsInterface
  *
- * @since 2.0.0
  */
 interface RelationsInterface
 {
@@ -17,7 +16,6 @@ interface RelationsInterface
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function has($type);
 
@@ -26,7 +24,6 @@ public function has($type);
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getParents($type);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/TMap.php b/lib/internal/Magento/Framework/ObjectManager/TMap.php
index 7b07fba000d6b..ecc2128f7f340 100644
--- a/lib/internal/Magento/Framework/ObjectManager/TMap.php
+++ b/lib/internal/Magento/Framework/ObjectManager/TMap.php
@@ -10,43 +10,36 @@
 /**
  * Class TMap
  * @internal
- * @since 2.0.0
  */
 class TMap implements \IteratorAggregate, \Countable, \ArrayAccess
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $type;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $array = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $objectsArray = [];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $counter = 0;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $configInterface;
 
@@ -62,7 +55,6 @@ class TMap implements \IteratorAggregate, \Countable, \ArrayAccess
      * @param ConfigInterface $configInterface
      * @param array $array
      * @param \Closure $objectCreationStrategy
-     * @since 2.0.0
      */
     public function __construct(
         $type,
@@ -99,7 +91,6 @@ function ($item, $index) {
      * @param string|int|null $index
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function assertValidTypeLazy($instanceName, $index = null)
     {
@@ -123,7 +114,6 @@ private function assertValidTypeLazy($instanceName, $index = null)
      * @param string $index
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function throwTypeException($inputType, $index)
     {
@@ -139,7 +129,6 @@ private function throwTypeException($inputType, $index)
      *
      * @param string|int $index
      * @return object
-     * @since 2.0.0
      */
     private function initObject($index)
     {
@@ -155,7 +144,6 @@ private function initObject($index)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -170,7 +158,6 @@ public function getIterator()
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function offsetExists($offset)
     {
@@ -179,7 +166,6 @@ public function offsetExists($offset)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function offsetGet($offset)
     {
@@ -188,7 +174,6 @@ public function offsetGet($offset)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function offsetSet($offset, $value)
     {
@@ -204,7 +189,6 @@ public function offsetSet($offset, $value)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function offsetUnset($offset)
     {
@@ -220,7 +204,6 @@ public function offsetUnset($offset)
 
     /**
      * {inheritdoc}
-     * @since 2.0.0
      */
     public function count()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManagerInterface.php b/lib/internal/Magento/Framework/ObjectManagerInterface.php
index d9a9ae6ab30d0..68e7056bc413b 100644
--- a/lib/internal/Magento/Framework/ObjectManagerInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManagerInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ObjectManagerInterface
 {
@@ -17,7 +16,6 @@ interface ObjectManagerInterface
      * @param string $type
      * @param array $arguments
      * @return mixed
-     * @since 2.0.0
      */
     public function create($type, array $arguments = []);
 
@@ -26,7 +24,6 @@ public function create($type, array $arguments = []);
      *
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     public function get($type);
 
@@ -35,7 +32,6 @@ public function get($type);
      *
      * @param array $configuration
      * @return void
-     * @since 2.0.0
      */
     public function configure(array $configuration);
 }
diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
index 693dd6a7bd3bb..ecfa71227f9f2 100644
--- a/lib/internal/Magento/Framework/Option/ArrayInterface.php
+++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @todo Remove in favor of the ancestor interface
- * @since 2.0.0
  */
 interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index 2ed03b9b31fd1..5ac349d99b82e 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -7,19 +7,16 @@
 
 /**
  * Array optioned object factory
- * @since 2.0.0
  */
 class ArrayPool
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $model
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\Option\ArrayInterface
-     * @since 2.0.0
      */
     public function get($model)
     {
diff --git a/lib/internal/Magento/Framework/OsInfo.php b/lib/internal/Magento/Framework/OsInfo.php
index 1e52f91775973..90ba20891c88c 100644
--- a/lib/internal/Magento/Framework/OsInfo.php
+++ b/lib/internal/Magento/Framework/OsInfo.php
@@ -7,7 +7,6 @@
 
 /**
  * Wrapper on PHP_OS constant
- * @since 2.0.0
  */
 class OsInfo
 {
@@ -15,13 +14,11 @@ class OsInfo
      * Operation system
      *
      * @var string
-     * @since 2.0.0
      */
     protected $os;
 
     /**
      * Initialize os
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -32,7 +29,6 @@ public function __construct()
      * Check id system is Windows
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWindows()
     {
diff --git a/lib/internal/Magento/Framework/Parse/Zip.php b/lib/internal/Magento/Framework/Parse/Zip.php
index 1b2cf7e1633c3..cc6e93b7f8cfc 100644
--- a/lib/internal/Magento/Framework/Parse/Zip.php
+++ b/lib/internal/Magento/Framework/Parse/Zip.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Parse\Zip
  *
- * @since 2.0.0
  */
 class Zip
 {
@@ -23,7 +22,6 @@ class Zip
      * @param string $state
      * @param string $zip
      * @return string[]
-     * @since 2.0.0
      */
     public static function parseRegions($state, $zip)
     {
@@ -35,7 +33,6 @@ public static function parseRegions($state, $zip)
      *
      * @param string $zip
      * @return string[]
-     * @since 2.0.0
      */
     public static function parseZip($zip)
     {
@@ -55,7 +52,6 @@ public static function parseZip($zip)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public static function zipRangeToZipPattern($zipRange)
     {
diff --git a/lib/internal/Magento/Framework/Phrase.php b/lib/internal/Magento/Framework/Phrase.php
index 8fd2286ba3f95..e61c780174f73 100644
--- a/lib/internal/Magento/Framework/Phrase.php
+++ b/lib/internal/Magento/Framework/Phrase.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Phrase implements JsonSerializable
 {
@@ -21,7 +20,6 @@ class Phrase implements JsonSerializable
      * Default phrase renderer. Allows stacking renderers that "don't know about each other"
      *
      * @var RendererInterface
-     * @since 2.0.0
      */
     private static $renderer;
 
@@ -29,7 +27,6 @@ class Phrase implements JsonSerializable
      * String for rendering
      *
      * @var string
-     * @since 2.0.0
      */
     private $text;
 
@@ -37,7 +34,6 @@ class Phrase implements JsonSerializable
      * Arguments for placeholder values
      *
      * @var array
-     * @since 2.0.0
      */
     private $arguments;
 
@@ -46,7 +42,6 @@ class Phrase implements JsonSerializable
      *
      * @param RendererInterface $renderer
      * @return void
-     * @since 2.0.0
      */
     public static function setRenderer(RendererInterface $renderer)
     {
@@ -57,7 +52,6 @@ public static function setRenderer(RendererInterface $renderer)
      * Get default Phrase renderer
      *
      * @return RendererInterface
-     * @since 2.0.0
      */
     public static function getRenderer()
     {
@@ -72,7 +66,6 @@ public static function getRenderer()
      *
      * @param string $text
      * @param array $arguments
-     * @since 2.0.0
      */
     public function __construct($text, array $arguments = [])
     {
@@ -84,7 +77,6 @@ public function __construct($text, array $arguments = [])
      * Get phrase base text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -95,7 +87,6 @@ public function getText()
      * Get phrase message arguments
      *
      * @return array
-     * @since 2.0.0
      */
     public function getArguments()
     {
@@ -106,7 +97,6 @@ public function getArguments()
      * Render phrase
      *
      * @return string
-     * @since 2.0.0
      */
     public function render()
     {
@@ -121,7 +111,6 @@ public function render()
      * Defers rendering to the last possible moment (when converted to string)
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -132,7 +121,6 @@ public function __toString()
      * Specify data which should be serialized to JSON
      *
      * @return string
-     * @since 2.0.0
      */
     public function jsonSerialize()
     {
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Composite.php b/lib/internal/Magento/Framework/Phrase/Renderer/Composite.php
index f87dd8ab75dc4..e06a44031d18b 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Composite.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Composite.php
@@ -12,20 +12,17 @@
 /**
  * Class \Magento\Framework\Phrase\Renderer\Composite
  *
- * @since 2.0.0
  */
 class Composite implements RendererInterface
 {
     /**
      * @var RendererInterface[]
-     * @since 2.0.0
      */
     protected $_renderers;
 
     /**
      * @param \Magento\Framework\Phrase\RendererInterface[] $renderers
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $renderers)
     {
@@ -45,7 +42,6 @@ public function __construct(array $renderers)
      * @param [] $source
      * @param [] $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render(array $source, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php b/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
index 6d37410745091..93907e7a35ec9 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
@@ -15,25 +15,21 @@
 /**
  * Class \Magento\Framework\Phrase\Renderer\Inline
  *
- * @since 2.0.0
  */
 class Inline implements RendererInterface
 {
     /**
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $translator;
 
     /**
      * @var \Magento\Framework\Translate\Inline\ProviderInterface
-     * @since 2.0.0
      */
     protected $inlineProvider;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -41,7 +37,6 @@ class Inline implements RendererInterface
      * @param \Magento\Framework\TranslateInterface $translator
      * @param \Magento\Framework\Translate\Inline\ProviderInterface $inlineProvider
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         TranslateInterface $translator,
@@ -61,7 +56,6 @@ public function __construct(
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function render(array $source, array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
index da92ee4f9a510..16caa341adea0 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Phrase\Renderer\Placeholder
  *
- * @since 2.0.0
  */
 class Placeholder implements RendererInterface
 {
@@ -22,7 +21,6 @@ class Placeholder implements RendererInterface
      * @param [] $source
      * @param [] $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render(array $source, array $arguments)
     {
@@ -43,7 +41,6 @@ public function render(array $source, array $arguments)
      * @param string|int $key
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     * @since 2.0.0
      */
     private function keyToPlaceholder($key)
     {
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Translate.php b/lib/internal/Magento/Framework/Phrase/Renderer/Translate.php
index 94ceb88910753..ab953c0562550 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Translate.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Translate.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Framework\Phrase\Renderer\Translate
  *
- * @since 2.0.0
  */
 class Translate implements RendererInterface
 {
     /**
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $translator;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -35,7 +32,6 @@ class Translate implements RendererInterface
      *
      * @param \Magento\Framework\TranslateInterface $translator
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         TranslateInterface $translator,
@@ -53,7 +49,6 @@ public function __construct(
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function render(array $source, array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/Phrase/RendererInterface.php b/lib/internal/Magento/Framework/Phrase/RendererInterface.php
index 01fa23ea1c6bd..e3e314696f3d1 100644
--- a/lib/internal/Magento/Framework/Phrase/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Phrase/RendererInterface.php
@@ -11,7 +11,6 @@
  * Translated phrase renderer
  *
  * @api
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -21,7 +20,6 @@ interface RendererInterface
      * @param [] $source
      * @param [] $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render(array $source, array $arguments);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php b/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
index 9a4bd29eae164..9dff304ea3407 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
@@ -12,7 +12,6 @@
  * Interface AdjustmentInterface
  *
  * @api
- * @since 2.0.0
  */
 interface AdjustmentInterface
 {
@@ -21,7 +20,6 @@ interface AdjustmentInterface
      * (as declared in DI configuration)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode();
 
@@ -29,7 +27,6 @@ public function getAdjustmentCode();
      * Define if adjustment is included in base price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInBasePrice();
 
@@ -37,7 +34,6 @@ public function isIncludedInBasePrice();
      * Define if adjustment is included in display price
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIncludedInDisplayPrice();
 
@@ -48,7 +44,6 @@ public function isIncludedInDisplayPrice();
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function extractAdjustment($amount, SaleableInterface $saleableItem, $context = []);
 
@@ -59,7 +54,6 @@ public function extractAdjustment($amount, SaleableInterface $saleableItem, $con
      * @param SaleableInterface $saleableItem
      * @param null|array $context
      * @return float
-     * @since 2.0.0
      */
     public function applyAdjustment($amount, SaleableInterface $saleableItem, $context = []);
 
@@ -68,7 +62,6 @@ public function applyAdjustment($amount, SaleableInterface $saleableItem, $conte
      *
      * @param string $adjustmentCode
      * @return bool
-     * @since 2.0.0
      */
     public function isExcludedWith($adjustmentCode);
 
@@ -76,7 +69,6 @@ public function isExcludedWith($adjustmentCode);
      * Return sort order position
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSortOrder();
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Calculator.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Calculator.php
index c6e404ad8b88a..94e43f6a7cf81 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Calculator.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Calculator.php
@@ -11,19 +11,16 @@
 
 /**
  * Class Calculator
- * @since 2.0.0
  */
 class Calculator implements CalculatorInterface
 {
     /**
      * @var AmountFactory
-     * @since 2.0.0
      */
     protected $amountFactory;
 
     /**
      * @param AmountFactory $amountFactory
-     * @since 2.0.0
      */
     public function __construct(AmountFactory $amountFactory)
     {
@@ -40,7 +37,6 @@ public function __construct(AmountFactory $amountFactory)
      * @param null|array $context
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getAmount($amount, SaleableInterface $saleableItem, $exclude = null, $context = [])
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php b/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
index 158281ed2b205..ea622c2a1cba6 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
@@ -12,7 +12,6 @@
  * Calculator interface
  *
  * @api
- * @since 2.0.0
  */
 interface CalculatorInterface
 {
@@ -22,7 +21,6 @@ interface CalculatorInterface
      * @param null|bool|string|array $exclude
      * @param null|array $context
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
-     * @since 2.0.0
      */
     public function getAmount($amount, SaleableInterface $saleableItem, $exclude = null, $context = []);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
index 32ea3c7b8f87f..c7ab4b6e796c2 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
@@ -10,32 +10,27 @@
  * Adjustment collection model
  *
  * @api
- * @since 2.0.0
  */
 class Collection
 {
     /**
      * @var Pool
-     * @since 2.0.0
      */
     protected $adjustmentPool;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $adjustments;
 
     /**
      * @var AdjustmentInterface[]
-     * @since 2.0.0
      */
     protected $adjustmentInstances;
 
     /**
      * @param Pool $adjustmentPool
      * @param string[] $adjustments
-     * @since 2.0.0
      */
     public function __construct(
         Pool $adjustmentPool,
@@ -47,7 +42,6 @@ public function __construct(
 
     /**
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     public function getItems()
     {
@@ -63,7 +57,6 @@ public function getItems()
      * @param string $adjustmentCode
      * @throws \InvalidArgumentException
      * @return AdjustmentInterface
-     * @since 2.0.0
      */
     public function getItemByCode($adjustmentCode)
     {
@@ -80,7 +73,6 @@ public function getItemByCode($adjustmentCode)
     /**
      * @param string[] $adjustments
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     protected function fetchAdjustments($adjustments)
     {
@@ -100,7 +92,6 @@ protected function fetchAdjustments($adjustments)
      * @param AdjustmentInterface $firstAdjustment
      * @param AdjustmentInterface $secondAdjustment
      * @return int
-     * @since 2.0.0
      */
     protected function sortAdjustments(AdjustmentInterface $firstAdjustment, AdjustmentInterface $secondAdjustment)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Factory.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Factory.php
index a3ffb5cb39645..2140cc06db049 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Factory.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Factory.php
@@ -8,7 +8,6 @@
 
 /**
  * Adjustment factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -16,7 +15,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -24,7 +22,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @return \Magento\Framework\Pricing\Adjustment\AdjustmentInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
index 579d9e046a3cb..d064e05b0b671 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
@@ -12,7 +12,6 @@
  * Global adjustment pool model
  *
  * @api
- * @since 2.0.0
  */
 class Pool
 {
@@ -23,26 +22,22 @@ class Pool
 
     /**
      * @var AdjustmentFactory
-     * @since 2.0.0
      */
     protected $adjustmentFactory;
 
     /**
      * @var array[]
-     * @since 2.0.0
      */
     protected $adjustments;
 
     /**
      * @var AdjustmentInterface[]
-     * @since 2.0.0
      */
     protected $adjustmentInstances;
 
     /**
      * @param AdjustmentFactory $adjustmentFactory
      * @param array[] $adjustments
-     * @since 2.0.0
      */
     public function __construct(AdjustmentFactory $adjustmentFactory, $adjustments = [])
     {
@@ -52,7 +47,6 @@ public function __construct(AdjustmentFactory $adjustmentFactory, $adjustments =
 
     /**
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     public function getAdjustments()
     {
@@ -66,7 +60,6 @@ public function getAdjustments()
      * @param string $adjustmentCode
      * @return AdjustmentInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getAdjustmentByCode($adjustmentCode)
     {
@@ -84,7 +77,6 @@ public function getAdjustmentByCode($adjustmentCode)
      *
      * @param string[] $adjustments
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     protected function createAdjustments($adjustments)
     {
@@ -102,7 +94,6 @@ protected function createAdjustments($adjustments)
      *
      * @param string $adjustmentCode
      * @return AdjustmentInterface
-     * @since 2.0.0
      */
     protected function createAdjustment($adjustmentCode)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php b/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
index f0c5640b71d06..a8340ee097f58 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
@@ -10,7 +10,6 @@
  * Class AmountFactory
  *
  * @api
- * @since 2.0.0
  */
 class AmountFactory
 {
@@ -21,7 +20,6 @@ class AmountFactory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -29,7 +27,6 @@ class AmountFactory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $adjustmentAmounts
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($amount, array $adjustmentAmounts = [])
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php b/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
index 77bf3c48b155c..a625e340395cc 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
@@ -10,7 +10,6 @@
  * Amount interface, the amount values are in display currency
  *
  * @api
- * @since 2.0.0
  */
 interface AmountInterface
 {
@@ -19,7 +18,6 @@ interface AmountInterface
      *
      * @param null|string|array $exclude
      * @return float
-     * @since 2.0.0
      */
     public function getValue($exclude = null);
 
@@ -27,7 +25,6 @@ public function getValue($exclude = null);
      * Return full amount value in string format
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString();
 
@@ -35,7 +32,6 @@ public function __toString();
      * Return base amount part value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getBaseAmount();
 
@@ -44,7 +40,6 @@ public function getBaseAmount();
      *
      * @param string $adjustmentCode
      * @return float
-     * @since 2.0.0
      */
     public function getAdjustmentAmount($adjustmentCode);
 
@@ -52,7 +47,6 @@ public function getAdjustmentAmount($adjustmentCode);
      * Return sum amount of all applied adjustments
      *
      * @return float
-     * @since 2.0.0
      */
     public function getTotalAdjustmentAmount();
 
@@ -60,7 +54,6 @@ public function getTotalAdjustmentAmount();
      * Return all applied adjustments as array
      *
      * @return float[]
-     * @since 2.0.0
      */
     public function getAdjustmentAmounts();
 
@@ -69,7 +62,6 @@ public function getAdjustmentAmounts();
      *
      * @param string $adjustmentCode
      * @return boolean
-     * @since 2.0.0
      */
     public function hasAdjustment($adjustmentCode);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/Base.php b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
index a8e7de4542b64..2664ccc54944c 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/Base.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
@@ -10,44 +10,37 @@
 
 /**
  * Amount base model
- * @since 2.0.0
  */
 class Base implements AmountInterface
 {
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $amount;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $baseAmount;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $totalAdjustmentAmount;
 
     /**
      * @var float[]
-     * @since 2.0.0
      */
     protected $adjustmentAmounts = [];
 
     /**
      * @var AdjustmentInterface[]
-     * @since 2.0.0
      */
     protected $adjustments = [];
 
     /**
      * @param float $amount
      * @param array $adjustmentAmounts
-     * @since 2.0.0
      */
     public function __construct(
         $amount,
@@ -62,7 +55,6 @@ public function __construct(
      *
      * @param null|string|array $exclude
      * @return float
-     * @since 2.0.0
      */
     public function getValue($exclude = null)
     {
@@ -86,7 +78,6 @@ public function getValue($exclude = null)
      * Return full amount value in string format
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -97,7 +88,6 @@ public function __toString()
      * Return base amount part value
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getBaseAmount()
     {
@@ -112,7 +102,6 @@ public function getBaseAmount()
      *
      * @param string $adjustmentCode
      * @return bool|float
-     * @since 2.0.0
      */
     public function getAdjustmentAmount($adjustmentCode)
     {
@@ -125,7 +114,6 @@ public function getAdjustmentAmount($adjustmentCode)
      * Return sum amount of all applied adjustments
      *
      * @return float|null
-     * @since 2.0.0
      */
     public function getTotalAdjustmentAmount()
     {
@@ -139,7 +127,6 @@ public function getTotalAdjustmentAmount()
      * Return all applied adjustments as array
      *
      * @return float[]
-     * @since 2.0.0
      */
     public function getAdjustmentAmounts()
     {
@@ -151,7 +138,6 @@ public function getAdjustmentAmounts()
      *
      * @param string $adjustmentCode
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdjustment($adjustmentCode)
     {
@@ -162,7 +148,6 @@ public function hasAdjustment($adjustmentCode)
      * Calculate base amount
      *
      * @return void
-     * @since 2.0.0
      */
     protected function calculateAmounts()
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Helper/Data.php b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
index 83fbe3614e38d..bc56bddea8ece 100644
--- a/lib/internal/Magento/Framework/Pricing/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
@@ -11,20 +11,17 @@
  * Pricing data helper
  *
  * @api
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
      * @param   bool $format
      * @param   bool $includeContainer
      * @return  float|string
-     * @since 2.0.0
      */
     public function currency($value, $format = true, $includeContainer = true)
     {
@@ -58,7 +54,6 @@ public function currency($value, $format = true, $includeContainer = true)
      * @param   bool $format
      * @param   bool $includeContainer
      * @return  float|string
-     * @since 2.0.0
      */
     public function currencyByStore($value, $store = null, $format = true, $includeContainer = true)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
index 04658399487a0..fe8fcbb6f430f 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
@@ -16,7 +16,6 @@
  * Should be the base for creating any Price type class
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractPrice implements PriceInterface
 {
@@ -27,49 +26,41 @@ abstract class AbstractPrice implements PriceInterface
 
     /**
      * @var AmountInterface[]
-     * @since 2.0.0
      */
     protected $amount;
 
     /**
      * @var \Magento\Framework\Pricing\Adjustment\Calculator
-     * @since 2.0.0
      */
     protected $calculator;
 
     /**
      * @var SaleableInterface
-     * @since 2.0.0
      */
     protected $product;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $priceType;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $quantity;
 
     /**
      * @var PriceInfoInterface
-     * @since 2.0.0
      */
     protected $priceInfo;
 
     /**
      * @var bool|float
-     * @since 2.0.0
      */
     protected $value;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
@@ -78,7 +69,6 @@ abstract class AbstractPrice implements PriceInterface
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @since 2.0.0
      */
     public function __construct(
         SaleableInterface $saleableItem,
@@ -97,7 +87,6 @@ public function __construct(
      * Get price value in display currency
      *
      * @return float|bool
-     * @since 2.0.0
      */
     abstract public function getValue();
 
@@ -105,7 +94,6 @@ abstract public function getValue();
      * Get Price Amount object
      *
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -120,7 +108,6 @@ public function getAmount()
      * @param null|bool|string|array $exclude
      * @param null|array $context
      * @return AmountInterface|bool|float
-     * @since 2.0.0
      */
     public function getCustomAmount($amount = null, $exclude = null, $context = [])
     {
@@ -136,7 +123,6 @@ public function getCustomAmount($amount = null, $exclude = null, $context = [])
      * Get price type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPriceCode()
     {
@@ -145,7 +131,6 @@ public function getPriceCode()
 
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getProduct()
     {
@@ -154,7 +139,6 @@ public function getProduct()
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getQuantity()
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php b/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
index 8234d2300f2a2..eb5c6d9064e21 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
@@ -10,7 +10,6 @@
  * Interface BasePriceProviderInterface
  *
  * @api
- * @since 2.0.0
  */
 interface BasePriceProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Collection.php b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
index ec6a4d8c22d9d..200c3a50aff89 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
@@ -12,43 +12,36 @@
  * Class Collection
  *
  * @api
- * @since 2.0.0
  */
 class Collection implements \Iterator
 {
     /**
      * @var Pool
-     * @since 2.0.0
      */
     protected $pool;
 
     /**
      * @var \Magento\Framework\Pricing\SaleableInterface
-     * @since 2.0.0
      */
     protected $saleableItem;
 
     /**
      * @var \Magento\Framework\Pricing\Price\Factory
-     * @since 2.0.0
      */
     protected $priceFactory;
 
     /**
      * @var float
-     * @since 2.0.0
      */
     protected $quantity;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $contains;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $excludes;
 
@@ -56,7 +49,6 @@ class Collection implements \Iterator
      * Cached price models
      *
      * @var array
-     * @since 2.0.0
      */
     protected $priceModels;
 
@@ -67,7 +59,6 @@ class Collection implements \Iterator
      * @param Factory $priceFactory
      * @param Pool $pool
      * @param float $quantity
-     * @since 2.0.0
      */
     public function __construct(
         SaleableInterface $saleableItem,
@@ -86,7 +77,6 @@ public function __construct(
      * Reset the Collection to the first element
      *
      * @return mixed|void
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -97,7 +87,6 @@ public function rewind()
      * Return the current element
      *
      * @return \Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     public function current()
     {
@@ -108,7 +97,6 @@ public function current()
      * Return the key of the current element
      *
      * @return string
-     * @since 2.0.0
      */
     public function key()
     {
@@ -119,7 +107,6 @@ public function key()
      * Move forward to next element
      *
      * @return mixed|void
-     * @since 2.0.0
      */
     public function next()
     {
@@ -130,7 +117,6 @@ public function next()
      * Checks if current position is valid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -142,7 +128,6 @@ public function valid()
      *
      * @param string $code
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function get($code)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Factory.php b/lib/internal/Magento/Framework/Pricing/Price/Factory.php
index 76e740b467a62..7608a455d7bea 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Factory.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Factory.php
@@ -10,7 +10,6 @@
 
 /**
  * Price factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -18,7 +17,6 @@ class Factory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class Factory
      * Construct
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $arguments
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     public function create(SaleableInterface $saleableItem, $className, $quantity, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Pool.php b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
index d25a84e34b6ee..b460113fc32c8 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
@@ -10,20 +10,17 @@
  * Class Pool
  *
  * @api
- * @since 2.0.0
  */
 class Pool implements \Iterator, \ArrayAccess
 {
     /**
      * @var \Magento\Framework\Pricing\Price\PriceInterface[]
-     * @since 2.0.0
      */
     protected $prices;
 
     /**
      * @param array $prices
      * @param \Iterator $target
-     * @since 2.0.0
      */
     public function __construct(
         array $prices,
@@ -41,7 +38,6 @@ public function __construct(
      * Reset the Collection to the first element
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -52,7 +48,6 @@ public function rewind()
      * Return the current element
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function current()
     {
@@ -63,7 +58,6 @@ public function current()
      * Return the key of the current element
      *
      * @return string
-     * @since 2.0.0
      */
     public function key()
     {
@@ -74,7 +68,6 @@ public function key()
      * Move forward to next element
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function next()
     {
@@ -85,7 +78,6 @@ public function next()
      * Checks if current position is valid
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -97,7 +89,6 @@ public function valid()
      *
      * @param string $code
      * @return string
-     * @since 2.0.0
      */
     public function get($code)
     {
@@ -110,7 +101,6 @@ public function get($code)
      * @param string $offset
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function offsetSet($offset, $value)
     {
@@ -126,7 +116,6 @@ public function offsetSet($offset, $value)
      *
      * @param string $offset
      * @return bool
-     * @since 2.0.0
      */
     public function offsetExists($offset)
     {
@@ -138,7 +127,6 @@ public function offsetExists($offset)
      *
      * @param string $offset
      * @return void
-     * @since 2.0.0
      */
     public function offsetUnset($offset)
     {
@@ -150,7 +138,6 @@ public function offsetUnset($offset)
      *
      * @param string $offset
      * @return string
-     * @since 2.0.0
      */
     public function offsetGet($offset)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php b/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
index 1efb0c4677851..7953940287eb2 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
@@ -12,7 +12,6 @@
  * Catalog price interface
  *
  * @api
- * @since 2.0.0
  */
 interface PriceInterface
 {
@@ -20,7 +19,6 @@ interface PriceInterface
      * Get price type code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPriceCode();
 
@@ -28,7 +26,6 @@ public function getPriceCode();
      * Get price value
      *
      * @return float
-     * @since 2.0.0
      */
     public function getValue();
 
@@ -36,7 +33,6 @@ public function getValue();
      * Get Price Amount object
      *
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getAmount();
 
@@ -48,7 +44,6 @@ public function getAmount();
      * @param null|bool|string|array $exclude
      * @param null|array $context
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getCustomAmount($amount = null, $exclude = null, $context = []);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/PriceComposite.php b/lib/internal/Magento/Framework/Pricing/PriceComposite.php
index 8b8d6b38db614..620480a89c2b8 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceComposite.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceComposite.php
@@ -11,26 +11,22 @@
 
 /**
  * Composite price model
- * @since 2.0.0
  */
 class PriceComposite
 {
     /**
      * @var PriceFactory
-     * @since 2.0.0
      */
     protected $priceFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $metadata;
 
     /**
      * @param PriceFactory $priceFactory
      * @param array $metadata
-     * @since 2.0.0
      */
     public function __construct(PriceFactory $priceFactory, array $metadata = [])
     {
@@ -40,7 +36,6 @@ public function __construct(PriceFactory $priceFactory, array $metadata = [])
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getPriceCodes()
     {
@@ -51,7 +46,6 @@ public function getPriceCodes()
      * Returns metadata for prices
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMetadata()
     {
@@ -64,7 +58,6 @@ public function getMetadata()
      * @param float $quantity
      * @return PriceInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createPriceObject(SaleableInterface $salableItem, $priceCode, $quantity)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
index 34e4a20f48e2a..31f00d8b1345a 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
@@ -10,7 +10,6 @@
  * Interface PriceCurrencyInterface
  *
  * @api
- * @since 2.0.0
  */
 interface PriceCurrencyInterface
 {
@@ -26,7 +25,6 @@ interface PriceCurrencyInterface
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return float
-     * @since 2.0.0
      */
     public function convert($amount, $scope = null, $currency = null);
 
@@ -38,7 +36,6 @@ public function convert($amount, $scope = null, $currency = null);
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @param int $precision
      * @return float
-     * @since 2.0.0
      */
     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION);
 
@@ -51,7 +48,6 @@ public function convertAndRound($amount, $scope = null, $currency = null, $preci
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return float
-     * @since 2.0.0
      */
     public function format(
         $amount,
@@ -70,7 +66,6 @@ public function format(
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return string
-     * @since 2.0.0
      */
     public function convertAndFormat(
         $amount,
@@ -85,7 +80,6 @@ public function convertAndFormat(
      *
      * @param float $price
      * @return float
-     * @since 2.0.0
      */
     public function round($price);
 
@@ -95,7 +89,6 @@ public function round($price);
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return \Magento\Framework\Model\AbstractModel
-     * @since 2.0.0
      */
     public function getCurrency($scope = null, $currency = null);
 
@@ -103,7 +96,6 @@ public function getCurrency($scope = null, $currency = null);
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return string
-     * @since 2.0.0
      */
     public function getCurrencySymbol($scope = null, $currency = null);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php b/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
index 69f94bfead6c9..ac8c301e24a5c 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
@@ -17,26 +17,22 @@
  * Price info base model
  *
  * @api
- * @since 2.0.0
  */
 class Base implements PriceInfoInterface
 {
     /**
      * @var PriceCollection
-     * @since 2.0.0
      */
     protected $priceCollection;
 
     /**
      * @var Collection
-     * @since 2.0.0
      */
     protected $adjustmentCollection;
 
     /**
      * @param PriceCollection $prices
      * @param Collection $adjustmentCollection
-     * @since 2.0.0
      */
     public function __construct(
         PriceCollection $prices,
@@ -50,7 +46,6 @@ public function __construct(
      * Returns array of prices
      *
      * @return PriceCollection
-     * @since 2.0.0
      */
     public function getPrices()
     {
@@ -62,7 +57,6 @@ public function getPrices()
      *
      * @param string $priceCode
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice($priceCode)
     {
@@ -73,7 +67,6 @@ public function getPrice($priceCode)
      * Get all registered adjustments
      *
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     public function getAdjustments()
     {
@@ -86,7 +79,6 @@ public function getAdjustments()
      * @param string $adjustmentCode
      * @throws \InvalidArgumentException
      * @return AdjustmentInterface
-     * @since 2.0.0
      */
     public function getAdjustment($adjustmentCode)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php b/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
index 1cf891add1dff..e3e4af56f6095 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
@@ -16,7 +16,6 @@
  * Price info model factory
  *
  * @api
- * @since 2.0.0
  */
 class Factory
 {
@@ -24,7 +23,6 @@ class Factory
      * List of Price Info classes by product types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $types = [];
 
@@ -32,7 +30,6 @@ class Factory
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -41,7 +38,6 @@ class Factory
      *
      * @param array $types
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(
         array $types,
@@ -58,7 +54,6 @@ public function __construct(
      * @param array $arguments
      * @return \Magento\Framework\Pricing\PriceInfoInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(SaleableInterface $saleableItem, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php b/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
index ca5533e691860..259a8a4d8c2d1 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
@@ -13,7 +13,6 @@
  * Price info model interface
  *
  * @api
- * @since 2.0.0
  */
 interface PriceInfoInterface
 {
@@ -26,7 +25,6 @@ interface PriceInfoInterface
      * Returns array of prices
      *
      * @return PriceInterface[]
-     * @since 2.0.0
      */
     public function getPrices();
 
@@ -35,7 +33,6 @@ public function getPrices();
      *
      * @param string $priceCode
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice($priceCode);
 
@@ -43,7 +40,6 @@ public function getPrice($priceCode);
      * Get all registered adjustments
      *
      * @return AdjustmentInterface[]
-     * @since 2.0.0
      */
     public function getAdjustments();
 
@@ -52,7 +48,6 @@ public function getAdjustments();
      *
      * @param string $adjustmentCode
      * @return AdjustmentInterface
-     * @since 2.0.0
      */
     public function getAdjustment($adjustmentCode);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Render.php b/lib/internal/Magento/Framework/Pricing/Render.php
index 0a966242b6900..2159fcaeaa121 100644
--- a/lib/internal/Magento/Framework/Pricing/Render.php
+++ b/lib/internal/Magento/Framework/Pricing/Render.php
@@ -19,7 +19,6 @@
  * @method string getPriceRenderHandle()
  *
  * @api
- * @since 2.0.0
  */
 class Render extends AbstractBlock
 {
@@ -35,19 +34,13 @@ class Render extends AbstractBlock
     const ZONE_DEFAULT   = null;
     /**#@-*/
 
-    /**
-     * Default type renderer
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $defaultTypeRender = 'default';
 
     /**
      * Price layout
      *
      * @var Layout
-     * @since 2.0.0
      */
     protected $priceLayout;
 
@@ -57,7 +50,6 @@ class Render extends AbstractBlock
      * @param Template\Context $context
      * @param Layout $priceLayout
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -72,7 +64,6 @@ public function __construct(
      * Prepare layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -90,7 +81,6 @@ protected function _prepareLayout()
      * @return string
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function render($priceCode, SaleableInterface $saleableItem, array $arguments = [])
     {
@@ -116,7 +106,6 @@ public function render($priceCode, SaleableInterface $saleableItem, array $argum
      * @param array $arguments
      * @return string
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function renderAmount(
         AmountInterface $amount,
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php b/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
index 875ca878c4ff3..d6c969b06d661 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
@@ -15,19 +15,16 @@
  * Adjustment render abstract
  *
  * @method string getZone()
- * @since 2.0.0
  */
 abstract class AbstractAdjustment extends Template implements AdjustmentRenderInterface
 {
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var AmountRenderInterface
-     * @since 2.0.0
      */
     protected $amountRender;
 
@@ -35,7 +32,6 @@ abstract class AbstractAdjustment extends Template implements AdjustmentRenderIn
      * @param Template\Context $context
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -50,7 +46,6 @@ public function __construct(
      * @param AmountRenderInterface $amountRender
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render(AmountRenderInterface $amountRender, array $arguments = [])
     {
@@ -68,7 +63,6 @@ public function render(AmountRenderInterface $amountRender, array $arguments = [
 
     /**
      * @return AmountRenderInterface
-     * @since 2.0.0
      */
     public function getAmountRender()
     {
@@ -78,7 +72,6 @@ public function getAmountRender()
     /**
      * @param string $priceCode
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPriceType($priceCode)
     {
@@ -87,7 +80,6 @@ public function getPriceType($priceCode)
 
     /**
      * @return \Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -96,7 +88,6 @@ public function getPrice()
 
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem()
     {
@@ -110,7 +101,6 @@ public function getSaleableItem()
      * @param bool $includeContainer
      * @param int $precision
      * @return string
-     * @since 2.0.0
      */
     public function formatCurrency(
         $amount,
@@ -127,7 +117,6 @@ public function formatCurrency(
      * @param bool $includeContainer
      * @param int $precision
      * @return string
-     * @since 2.0.0
      */
     public function convertAndFormatCurrency(
         $amount,
@@ -139,7 +128,6 @@ public function convertAndFormatCurrency(
 
     /**
      * @return \Magento\Framework\Pricing\Adjustment\AdjustmentInterface
-     * @since 2.0.0
      */
     public function getAdjustment()
     {
@@ -148,7 +136,6 @@ public function getAdjustment()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     abstract protected function apply();
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
index 16ed6a77f8418..3be51eb83b911 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
@@ -13,7 +13,6 @@
  * Adjustment render interface
  *
  * @api
- * @since 2.0.0
  */
 interface AdjustmentRenderInterface
 {
@@ -21,19 +20,16 @@ interface AdjustmentRenderInterface
      * @param AmountRenderInterface $amountRender
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render(AmountRenderInterface $amountRender, array $arguments = []);
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentCode();
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 
@@ -41,7 +37,6 @@ public function getData();
      * (to use in templates only)
      *
      * @return AmountRenderInterface
-     * @since 2.0.0
      */
     public function getAmountRender();
 
@@ -49,7 +44,6 @@ public function getAmountRender();
      * (to use in templates only)
      *
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -57,7 +51,6 @@ public function getPrice();
      * (to use in templates only)
      *
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem();
 
@@ -65,7 +58,6 @@ public function getSaleableItem();
      * (to use in templates only)
      *
      * @return \Magento\Framework\Pricing\Adjustment\AdjustmentInterface
-     * @since 2.0.0
      */
     public function getAdjustment();
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Render/Amount.php b/lib/internal/Magento/Framework/Pricing/Render/Amount.php
index 49903adde1ac3..f78107c184266 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/Amount.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/Amount.php
@@ -20,55 +20,46 @@
  * @method string getPriceId()
  * @method bool getIncludeContainer()
  * @method bool getSkipAdjustments()
- * @since 2.0.0
  */
 class Amount extends Template implements AmountRenderInterface
 {
     /**
      * @var SaleableInterface
-     * @since 2.0.0
      */
     protected $saleableItem;
 
     /**
      * @var PriceInterface
-     * @since 2.0.0
      */
     protected $price;
 
     /**
      * @var AdjustmentRenderInterface[]
-     * @since 2.0.0
      */
     protected $adjustmentRenders;
 
     /**
      * @var PriceCurrencyInterface
-     * @since 2.0.0
      */
     protected $priceCurrency;
 
     /**
      * @var RendererPool
-     * @since 2.0.0
      */
     protected $rendererPool;
 
     /**
      * @var AmountInterface
-     * @since 2.0.0
      */
     protected $amount;
 
     /**
      * @var null|float
-     * @since 2.0.0
      */
     protected $displayValue;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $adjustmentsHtml = [];
 
@@ -80,7 +71,6 @@ class Amount extends Template implements AmountRenderInterface
      * @param SaleableInterface $saleableItem
      * @param \Magento\Framework\Pricing\Price\PriceInterface $price
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -102,7 +92,6 @@ public function __construct(
     /**
      * @param float $value
      * @return void
-     * @since 2.0.0
      */
     public function setDisplayValue($value)
     {
@@ -111,7 +100,6 @@ public function setDisplayValue($value)
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getDisplayValue()
     {
@@ -124,7 +112,6 @@ public function getDisplayValue()
 
     /**
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getAmount()
     {
@@ -133,7 +120,6 @@ public function getAmount()
 
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem()
     {
@@ -142,7 +128,6 @@ public function getSaleableItem()
 
     /**
      * @return \Magento\Framework\Pricing\Price\PriceInterface
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -151,7 +136,6 @@ public function getPrice()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayCurrencyCode()
     {
@@ -160,7 +144,6 @@ public function getDisplayCurrencyCode()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayCurrencySymbol()
     {
@@ -169,7 +152,6 @@ public function getDisplayCurrencySymbol()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function hasAdjustmentsHtml()
     {
@@ -178,7 +160,6 @@ public function hasAdjustmentsHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentsHtml()
     {
@@ -187,7 +168,6 @@ public function getAdjustmentsHtml()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -205,7 +185,6 @@ protected function _toHtml()
 
     /**
      * @return AdjustmentRenderInterface[]
-     * @since 2.0.0
      */
     protected function getAdjustmentRenders()
     {
@@ -215,7 +194,6 @@ protected function getAdjustmentRenders()
     /**
      * @param AdjustmentRenderInterface[] $adjustmentRenders
      * @return array
-     * @since 2.0.0
      */
     protected function getAdjustments($adjustmentRenders)
     {
@@ -240,7 +218,6 @@ protected function getAdjustments($adjustmentRenders)
      * @param bool $includeContainer
      * @param int $precision
      * @return float
-     * @since 2.0.0
      */
     public function formatCurrency(
         $amount,
@@ -253,7 +230,6 @@ public function formatCurrency(
     /**
      * @param AdjustmentRenderInterface[] $adjustmentRenders
      * @return array
-     * @since 2.0.0
      */
     protected function setAdjustmentCssClasses($adjustmentRenders)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
index 3331304bddf70..724593e269944 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
@@ -14,7 +14,6 @@
  * Price amount renderer interface
  *
  * @api
- * @since 2.0.0
  */
 interface AmountRenderInterface
 {
@@ -23,13 +22,11 @@ interface AmountRenderInterface
      *
      * @param float $value
      * @return void
-     * @since 2.0.0
      */
     public function setDisplayValue($value);
 
     /**
      * @return float
-     * @since 2.0.0
      */
     public function getDisplayValue();
 
@@ -37,37 +34,31 @@ public function getDisplayValue();
      * Retrieve amount object
      *
      * @return AmountInterface
-     * @since 2.0.0
      */
     public function getAmount();
 
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem();
 
     /**
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayCurrencyCode();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDisplayCurrencySymbol();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getAdjustmentsHtml();
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Render/Layout.php b/lib/internal/Magento/Framework/Pricing/Render/Layout.php
index 84c3aba984188..73c9799e9cf01 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/Layout.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/Layout.php
@@ -11,7 +11,6 @@
 
 /**
  * Pricing render's layout model
- * @since 2.0.0
  */
 class Layout
 {
@@ -19,7 +18,6 @@ class Layout
      * Layout Interface
      *
      * @var LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -28,7 +26,6 @@ class Layout
      *
      * @param LayoutFactory $layoutFactory
      * @param LayoutInterface $generalLayout
-     * @since 2.0.0
      */
     public function __construct(
         LayoutFactory $layoutFactory,
@@ -42,7 +39,6 @@ public function __construct(
      *
      * @param string|string[] $handle
      * @return void
-     * @since 2.0.0
      */
     public function addHandle($handle)
     {
@@ -53,7 +49,6 @@ public function addHandle($handle)
      * Load layout
      *
      * @return void
-     * @since 2.0.0
      */
     public function loadLayout()
     {
@@ -67,7 +62,6 @@ public function loadLayout()
      *
      * @param string $name
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getBlock($name)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
index bbdc3af4917f4..e79ab57a2efc9 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
@@ -17,7 +17,6 @@
  *
  * @method bool hasListClass()
  * @method string getListClass()
- * @since 2.0.0
  */
 class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInterface
 {
@@ -26,19 +25,16 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
 
     /**
      * @var SaleableInterface
-     * @since 2.0.0
      */
     protected $saleableItem;
 
     /**
      * @var PriceInterface
-     * @since 2.0.0
      */
     protected $price;
 
     /**
      * @var RendererPool
-     * @since 2.0.0
      */
     protected $rendererPool;
 
@@ -48,7 +44,6 @@ class PriceBox extends Template implements PriceBoxRenderInterface, IdentityInte
      * @param PriceInterface    $price
      * @param RendererPool      $rendererPool
      * @param array             $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -65,7 +60,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -99,7 +93,6 @@ protected function getCacheLifetime()
     
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem()
     {
@@ -108,7 +101,6 @@ public function getSaleableItem()
 
     /**
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice()
     {
@@ -121,7 +113,6 @@ public function getPrice()
      * @param null|string $defaultPrefix
      * @param null|string $defaultSuffix
      * @return string
-     * @since 2.0.0
      */
     public function getPriceId($defaultPrefix = null, $defaultSuffix = null)
     {
@@ -140,7 +131,6 @@ public function getPriceId($defaultPrefix = null, $defaultSuffix = null)
      *
      * @param string $priceCode
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPriceType($priceCode)
     {
@@ -151,7 +141,6 @@ public function getPriceType($priceCode)
      * @param AmountInterface $amount
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function renderAmount(AmountInterface $amount, array $arguments = [])
     {
@@ -165,7 +154,6 @@ public function renderAmount(AmountInterface $amount, array $arguments = [])
      * @param AmountInterface $amount
      * @param array $arguments
      * @return AmountRenderInterface
-     * @since 2.0.0
      */
     protected function getAmountRender(AmountInterface $amount, array $arguments = [])
     {
@@ -179,7 +167,6 @@ protected function getAmountRender(AmountInterface $amount, array $arguments = [
 
     /**
      * @return RendererPool
-     * @since 2.0.0
      */
     public function getRendererPool()
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
index b2aa0a0b3f240..9c23c594a89fb 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
@@ -14,13 +14,11 @@
  * Price box render interface
  *
  * @api
- * @since 2.0.0
  */
 interface PriceBoxRenderInterface
 {
     /**
      * @return SaleableInterface
-     * @since 2.0.0
      */
     public function getSaleableItem();
 
@@ -29,7 +27,6 @@ public function getSaleableItem();
      * (to use in templates only)
      *
      * @return PriceInterface
-     * @since 2.0.0
      */
     public function getPrice();
 
@@ -40,7 +37,6 @@ public function getPrice();
      * @param AmountInterface $price
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function renderAmount(AmountInterface $price, array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
index a71df26100320..73efef2e477be 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RendererPool extends AbstractBlock
 {
@@ -40,7 +39,6 @@ class RendererPool extends AbstractBlock
      * @param array $data
      * @throws \InvalidArgumentException
      * @return PriceBoxRenderInterface
-     * @since 2.0.0
      */
     public function createPriceRender(
         $priceCode,
@@ -96,7 +94,6 @@ public function createPriceRender(
      * @param array $data
      * @return AmountRenderInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createAmountRender(
         AmountInterface $amount,
@@ -156,7 +153,6 @@ public function createAmountRender(
      * @param SaleableInterface $saleableItem
      * @param PriceInterface $price
      * @return array
-     * @since 2.0.0
      */
     public function getAdjustmentRenders(SaleableInterface $saleableItem = null, PriceInterface $price = null)
     {
@@ -187,7 +183,6 @@ public function getAdjustmentRenders(SaleableInterface $saleableItem = null, Pri
      * @param string $priceCode
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getAmountRenderBlockTemplate($type, $priceCode)
     {
@@ -211,7 +206,6 @@ protected function getAmountRenderBlockTemplate($type, $priceCode)
      * @param string $priceCode
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function getRenderBlockTemplate($type, $priceCode)
     {
@@ -233,7 +227,6 @@ protected function getRenderBlockTemplate($type, $priceCode)
     /**
      * @param array $pattern
      * @return null|string
-     * @since 2.0.0
      */
     protected function findDataByPattern(array $pattern)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/SaleableInterface.php b/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
index e5a72162c1a70..240012c0b18e1 100644
--- a/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
@@ -10,7 +10,6 @@
  * Interface SaleableInterface
  *
  * @api
- * @since 2.0.0
  */
 interface SaleableInterface
 {
@@ -18,7 +17,6 @@ interface SaleableInterface
      * Returns PriceInfo container of saleable item
      *
      * @return \Magento\Framework\Pricing\PriceInfoInterface
-     * @since 2.0.0
      */
     public function getPriceInfo();
 
@@ -26,7 +24,6 @@ public function getPriceInfo();
      * Returns type identifier of saleable item
      *
      * @return array|string
-     * @since 2.0.0
      */
     public function getTypeId();
 
@@ -34,7 +31,6 @@ public function getTypeId();
      * Returns identifier of saleable item
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 
@@ -42,7 +38,6 @@ public function getId();
      * Returns quantity of saleable item
      *
      * @return float
-     * @since 2.0.0
      */
     public function getQty();
 }
diff --git a/lib/internal/Magento/Framework/Profiler.php b/lib/internal/Magento/Framework/Profiler.php
index 7ec232aa26975..eaf0a732f98c0 100644
--- a/lib/internal/Magento/Framework/Profiler.php
+++ b/lib/internal/Magento/Framework/Profiler.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Profiler
 {
@@ -25,7 +24,6 @@ class Profiler
      * Whether profiling is active or not
      *
      * @var bool
-     * @since 2.0.0
      */
     private static $_enabled = false;
 
@@ -33,7 +31,6 @@ class Profiler
      * Nesting path that represents namespace to resolve timer names
      *
      * @var string[]
-     * @since 2.0.0
      */
     private static $_currentPath = [];
 
@@ -41,7 +38,6 @@ class Profiler
      * Count of elements in $_currentPath
      *
      * @var int
-     * @since 2.0.0
      */
     private static $_pathCount = 0;
 
@@ -49,7 +45,6 @@ class Profiler
      * Index for counting of $_pathCount for timer names
      *
      * @var array
-     * @since 2.0.0
      */
     private static $_pathIndex = [];
 
@@ -57,7 +52,6 @@ class Profiler
      * Collection for profiler drivers.
      *
      * @var DriverInterface[]
-     * @since 2.0.0
      */
     private static $_drivers = [];
 
@@ -65,7 +59,6 @@ class Profiler
      * List of default tags.
      *
      * @var array
-     * @since 2.0.0
      */
     private static $_defaultTags = [];
 
@@ -73,7 +66,6 @@ class Profiler
      * Collection of tag filters.
      *
      * @var array
-     * @since 2.0.0
      */
     private static $_tagFilters = [];
 
@@ -81,7 +73,6 @@ class Profiler
      * Has tag filters flag for faster checks of filters availability.
      *
      * @var bool
-     * @since 2.0.0
      */
     private static $_hasTagFilters = false;
 
@@ -90,7 +81,6 @@ class Profiler
      *
      * @param array $tags
      * @return void
-     * @since 2.0.0
      */
     public static function setDefaultTags(array $tags)
     {
@@ -103,7 +93,6 @@ public static function setDefaultTags(array $tags)
      * @param string $tagName
      * @param string $tagValue
      * @return void
-     * @since 2.0.0
      */
     public static function addTagFilter($tagName, $tagValue)
     {
@@ -119,7 +108,6 @@ public static function addTagFilter($tagName, $tagValue)
      *
      * @param array|null $tags
      * @return bool
-     * @since 2.0.0
      */
     private static function _checkTags(array $tags = null)
     {
@@ -144,7 +132,6 @@ private static function _checkTags(array $tags = null)
      *
      * @param DriverInterface $driver
      * @return void
-     * @since 2.0.0
      */
     public static function add(DriverInterface $driver)
     {
@@ -157,7 +144,6 @@ public static function add(DriverInterface $driver)
      *
      * @param string|null $timerName Timer name
      * @return string
-     * @since 2.0.0
      */
     private static function _getTimerId($timerName = null)
     {
@@ -175,7 +161,6 @@ private static function _getTimerId($timerName = null)
      *
      * @param array|null $tags
      * @return array|null
-     * @since 2.0.0
      */
     private static function _getTags(array $tags = null)
     {
@@ -192,7 +177,6 @@ private static function _getTags(array $tags = null)
      * Any call to profiler does nothing until profiler is enabled.
      *
      * @return void
-     * @since 2.0.0
      */
     public static function enable()
     {
@@ -205,7 +189,6 @@ public static function enable()
      * Any call to profiler is silently ignored while profiler is disabled.
      *
      * @return void
-     * @since 2.0.0
      */
     public static function disable()
     {
@@ -216,7 +199,6 @@ public static function disable()
      * Get profiler enable status.
      *
      * @return bool
-     * @since 2.0.0
      */
     public static function isEnabled()
     {
@@ -229,7 +211,6 @@ public static function isEnabled()
      * @param string|null $timerName
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public static function clear($timerName = null)
     {
@@ -247,7 +228,6 @@ public static function clear($timerName = null)
      * Reset profiler to initial state
      *
      * @return void
-     * @since 2.0.0
      */
     public static function reset()
     {
@@ -269,7 +249,6 @@ public static function reset()
      * @param array|null $tags
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public static function start($timerName, array $tags = null)
     {
@@ -306,7 +285,6 @@ public static function start($timerName, array $tags = null)
      * @param string|null $timerName
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public static function stop($timerName = null)
     {
@@ -349,7 +327,6 @@ public static function stop($timerName = null)
      * @param string $baseDir
      * @param bool $isAjax
      * @return void
-     * @since 2.0.0
      */
     public static function applyConfig($config, $baseDir, $isAjax = false)
     {
@@ -373,7 +350,6 @@ public static function applyConfig($config, $baseDir, $isAjax = false)
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected static function _parseConfig($profilerConfig, $baseDir, $isAjax)
     {
@@ -406,7 +382,6 @@ protected static function _parseConfig($profilerConfig, $baseDir, $isAjax)
      * @param array $driverConfigs
      * @param string $baseDir
      * @return array
-     * @since 2.0.0
      */
     protected static function _parseDriverConfigs(array $driverConfigs, $baseDir)
     {
@@ -432,7 +407,6 @@ protected static function _parseDriverConfigs(array $driverConfigs, $baseDir)
      *
      * @param mixed $driverConfig
      * @return array|false
-     * @since 2.0.0
      */
     protected static function _parseDriverConfig($driverConfig)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Factory.php b/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
index e058782daf9f5..621472228abd6 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Default driver type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultDriverType;
 
@@ -28,7 +26,6 @@ class Factory
      * Default driver class prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultDriverPrefix;
 
@@ -37,7 +34,6 @@ class Factory
      *
      * @param string $defaultDriverPrefix
      * @param string $defaultDriverType
-     * @since 2.0.0
      */
     public function __construct(
         $defaultDriverPrefix = 'Magento\Framework\Profiler\Driver\\',
@@ -53,7 +49,6 @@ public function __construct(
      * @param array $config|null
      * @return DriverInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $config = null)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard.php
index 74f3923731866..c1044dd412fd1 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard
  *
- * @since 2.0.0
  */
 class Standard implements DriverInterface
 {
@@ -23,7 +22,6 @@ class Standard implements DriverInterface
      * Storage for timers statistics
      *
      * @var Stat
-     * @since 2.0.0
      */
     protected $_stat;
 
@@ -31,7 +29,6 @@ class Standard implements DriverInterface
      * List of profiler driver outputs
      *
      * @var OutputInterface[]
-     * @since 2.0.0
      */
     protected $_outputs = [];
 
@@ -39,7 +36,6 @@ class Standard implements DriverInterface
      * Constructor
      *
      * @param array|null $config
-     * @since 2.0.0
      */
     public function __construct(array $config = null)
     {
@@ -53,7 +49,6 @@ public function __construct(array $config = null)
      *
      * @param array|null $config
      * @return void
-     * @since 2.0.0
      */
     protected function _initOutputs(array $config = null)
     {
@@ -82,7 +77,6 @@ protected function _initOutputs(array $config = null)
      *
      * @param mixed $outputConfig
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _parseOutputConfig($outputConfig)
     {
@@ -104,7 +98,6 @@ protected function _parseOutputConfig($outputConfig)
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     protected function _getOutputConfigs(array $config = null)
     {
@@ -122,7 +115,6 @@ protected function _getOutputConfigs(array $config = null)
      *
      * @param array|null $config
      * @return OutputFactory
-     * @since 2.0.0
      */
     protected function _getOutputFactory(array $config = null)
     {
@@ -139,7 +131,6 @@ protected function _getOutputFactory(array $config = null)
      *
      * @param array $config|null
      * @return void
-     * @since 2.0.0
      */
     protected function _initStat(array $config = null)
     {
@@ -155,7 +146,6 @@ protected function _initStat(array $config = null)
      *
      * @param string|null $timerId
      * @return void
-     * @since 2.0.0
      */
     public function clear($timerId = null)
     {
@@ -169,7 +159,6 @@ public function clear($timerId = null)
      * @param array|null $tags
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function start($timerId, array $tags = null)
     {
@@ -181,7 +170,6 @@ public function start($timerId, array $tags = null)
      *
      * @param string $timerId
      * @return void
-     * @since 2.0.0
      */
     public function stop($timerId)
     {
@@ -193,7 +181,6 @@ public function stop($timerId)
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     public function registerOutput(OutputInterface $output)
     {
@@ -204,7 +191,6 @@ public function registerOutput(OutputInterface $output)
      * Display collected statistics with registered outputs
      *
      * @return void
-     * @since 2.0.0
      */
     public function display()
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/AbstractOutput.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/AbstractOutput.php
index 83e5613fddb95..c1cba88b2d171 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/AbstractOutput.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/AbstractOutput.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard\AbstractOutput
  *
- * @since 2.0.0
  */
 abstract class AbstractOutput implements OutputInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractOutput implements OutputInterface
      * PCRE Regular Expression for filter timer by id
      *
      * @var null|string
-     * @since 2.0.0
      */
     protected $_filterPattern;
 
@@ -26,7 +24,6 @@ abstract class AbstractOutput implements OutputInterface
      * List of threshold (minimal allowed) values for profiler data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_thresholds = [Stat::TIME => 0.001, Stat::COUNT => 10, Stat::EMALLOC => 10000];
 
@@ -34,7 +31,6 @@ abstract class AbstractOutput implements OutputInterface
      * List of columns to output
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_columns = [
         'Timer Id' => Stat::ID,
@@ -49,7 +45,6 @@ abstract class AbstractOutput implements OutputInterface
      * Constructor
      *
      * @param array|null $config
-     * @since 2.0.0
      */
     public function __construct(array $config = null)
     {
@@ -68,7 +63,6 @@ public function __construct(array $config = null)
      *
      * @param string $filterPattern PCRE pattern to filter timers by their identifiers
      * @return void
-     * @since 2.0.0
      */
     public function setFilterPattern($filterPattern)
     {
@@ -79,7 +73,6 @@ public function setFilterPattern($filterPattern)
      * Get profiler output timer identifiers filter.
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFilterPattern()
     {
@@ -94,7 +87,6 @@ public function getFilterPattern()
      * @param string $fetchKey
      * @param int|float|null $minAllowedValue
      * @return void
-     * @since 2.0.0
      */
     public function setThreshold($fetchKey, $minAllowedValue)
     {
@@ -109,7 +101,6 @@ public function setThreshold($fetchKey, $minAllowedValue)
      * Get list of thresholds.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getThresholds()
     {
@@ -122,7 +113,6 @@ public function getThresholds()
      * @param string|float $value
      * @param string $columnKey
      * @return string
-     * @since 2.0.0
      */
     protected function _renderColumnValue($value, $columnKey)
     {
@@ -145,7 +135,6 @@ protected function _renderColumnValue($value, $columnKey)
      *
      * @param string $timerId
      * @return string
-     * @since 2.0.0
      */
     protected function _renderTimerId($timerId)
     {
@@ -156,7 +145,6 @@ protected function _renderTimerId($timerId)
      * Render a caption for the profiling results
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _renderCaption()
     {
@@ -174,7 +162,6 @@ protected function _renderCaption()
      *
      * @param Stat $stat
      * @return string[]
-     * @since 2.0.0
      */
     protected function _getTimerIds(Stat $stat)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Csvfile.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Csvfile.php
index 6cf976aadf40b..8adaddd38f58d 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Csvfile.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Csvfile.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard\Output\Csvfile
  *
- * @since 2.0.0
  */
 class Csvfile extends AbstractOutput
 {
@@ -22,19 +21,16 @@ class Csvfile extends AbstractOutput
     /**
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_filePath;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_delimiter;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_enclosure;
 
@@ -42,7 +38,6 @@ class Csvfile extends AbstractOutput
      * Constructor
      *
      * @param array|null $config
-     * @since 2.0.0
      */
     public function __construct(array $config = null)
     {
@@ -57,7 +52,6 @@ public function __construct(array $config = null)
      *
      * @param array|null $config
      * @return string
-     * @since 2.0.0
      */
     protected function _parseFilePath(array $config = null)
     {
@@ -74,7 +68,6 @@ protected function _parseFilePath(array $config = null)
      * @param Stat $stat
      * @return void
      * @throws \RuntimeException if output file cannot be opened
-     * @since 2.0.0
      */
     public function display(Stat $stat)
     {
@@ -101,7 +94,6 @@ public function display(Stat $stat)
      * @param resource $fileHandle
      * @param Stat $stat
      * @return void
-     * @since 2.0.0
      */
     protected function _writeFileContent($fileHandle, Stat $stat)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Factory.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Factory.php
index 804fd5e98c5f2..ab4ada5e65a24 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Factory.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Factory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard\Output\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
      * Default output type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultOutputType;
 
@@ -28,7 +26,6 @@ class Factory
      * Default output class prefix
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultOutputPrefix;
 
@@ -37,7 +34,6 @@ class Factory
      *
      * @param string $defaultOutputPrefix
      * @param string $defaultOutputType
-     * @since 2.0.0
      */
     public function __construct(
         $defaultOutputPrefix = 'Magento\Framework\Profiler\Driver\Standard\Output\\',
@@ -53,7 +49,6 @@ public function __construct(
      * @param array $config
      * @return OutputInterface
      * @throws \InvalidArgumentException If driver cannot be created
-     * @since 2.0.0
      */
     public function create(array $config)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Html.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Html.php
index 5387a0f95c5e6..93a3dfe6e6448 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Html.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Output/Html.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard\Output\Html
  *
- * @since 2.0.0
  */
 class Html extends AbstractOutput
 {
@@ -23,7 +22,6 @@ class Html extends AbstractOutput
      *
      * @param Stat $stat
      * @return void
-     * @since 2.0.0
      */
     public function display(Stat $stat)
     {
@@ -56,7 +54,6 @@ public function display(Stat $stat)
      *
      * @param string $timerId
      * @return string
-     * @since 2.0.0
      */
     protected function _renderTimerId($timerId)
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/OutputInterface.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/OutputInterface.php
index 3a51a4b94af2e..6e5c30ca7b867 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/OutputInterface.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/OutputInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Profiler\Driver\Standard\OutputInterface
  *
- * @since 2.0.0
  */
 interface OutputInterface
 {
@@ -19,7 +18,6 @@ interface OutputInterface
      *
      * @param Stat $stat
      * @return void
-     * @since 2.0.0
      */
     public function display(Stat $stat);
 }
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php
index 21da38d3d1c6a..c1710fda32ac0 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Profiler\Driver\Standard\Stat
  *
- * @since 2.0.0
  */
 class Stat
 {
@@ -30,12 +29,7 @@ class Stat
     const EMALLOC_START = 'emalloc_start';
     /**#@-*/
 
-    /**
-     * Array of timers statistics data
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_timers = [];
 
     /**
@@ -46,7 +40,6 @@ class Stat
      * @param int $realMemory Real size of memory allocated from system
      * @param int $emallocMemory Memory used by emalloc()
      * @return void
-     * @since 2.0.0
      */
     public function start($timerId, $time, $realMemory, $emallocMemory)
     {
@@ -75,7 +68,6 @@ public function start($timerId, $time, $realMemory, $emallocMemory)
      * @param int $emallocMemory Memory used by emalloc()
      * @return void
      * @throws \InvalidArgumentException if timer doesn't exist
-     * @since 2.0.0
      */
     public function stop($timerId, $time, $realMemory, $emallocMemory)
     {
@@ -97,7 +89,6 @@ public function stop($timerId, $time, $realMemory, $emallocMemory)
      * @param string $timerId
      * @return array
      * @throws \InvalidArgumentException if timer doesn't exist
-     * @since 2.0.0
      */
     public function get($timerId)
     {
@@ -114,7 +105,6 @@ public function get($timerId)
      * @param string $key Information to return
      * @return string|bool|int|float
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function fetch($timerId, $key)
     {
@@ -150,7 +140,6 @@ public function fetch($timerId, $key)
      *
      * @param string|null $timerId
      * @return void
-     * @since 2.0.0
      */
     public function clear($timerId = null)
     {
@@ -167,7 +156,6 @@ public function clear($timerId = null)
      * @param array|null $thresholds
      * @param string|null $filterPattern
      * @return array
-     * @since 2.0.0
      */
     public function getFilteredTimerIds(array $thresholds = null, $filterPattern = null)
     {
@@ -201,7 +189,6 @@ public function getFilteredTimerIds(array $thresholds = null, $filterPattern = n
      * Get ordered list of timer ids
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getOrderedTimerIds()
     {
diff --git a/lib/internal/Magento/Framework/Profiler/DriverInterface.php b/lib/internal/Magento/Framework/Profiler/DriverInterface.php
index 702b8de2ddc47..fe6393b3a43e3 100644
--- a/lib/internal/Magento/Framework/Profiler/DriverInterface.php
+++ b/lib/internal/Magento/Framework/Profiler/DriverInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DriverInterface
 {
@@ -21,7 +20,6 @@ interface DriverInterface
      * @param string $timerId
      * @param array|null $tags
      * @return void
-     * @since 2.0.0
      */
     public function start($timerId, array $tags = null);
 
@@ -30,7 +28,6 @@ public function start($timerId, array $tags = null);
      *
      * @param string $timerId
      * @return void
-     * @since 2.0.0
      */
     public function stop($timerId);
 
@@ -39,7 +36,6 @@ public function stop($timerId);
      *
      * @param string|null $timerId
      * @return void
-     * @since 2.0.0
      */
     public function clear($timerId = null);
 }
diff --git a/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php b/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
index 8884edd81d538..596dfcd255ff5 100644
--- a/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
+++ b/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Framework\Reflection\AttributeTypeResolver
  *
- * @since 2.0.0
  */
 class AttributeTypeResolver implements AttributeTypeResolverInterface
 {
     /**
      * @var Config
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var TypeProcessor
-     * @since 2.0.0
      */
     protected $typeProcessor;
 
     /**
      * @param TypeProcessor $typeProcessor
      * @param Config $config
-     * @since 2.0.0
      */
     public function __construct(TypeProcessor $typeProcessor, Config $config)
     {
@@ -41,7 +37,6 @@ public function __construct(TypeProcessor $typeProcessor, Config $config)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolveObjectType($attributeCode, $value, $context)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
index 52ff800606815..4fd3a17fb6c6a 100644
--- a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
@@ -16,26 +16,22 @@
 
 /**
  * Processes custom attributes and produces an array for the data.
- * @since 2.0.0
  */
 class CustomAttributesProcessor
 {
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     private $dataObjectProcessor;
 
     /**
      * @var AttributeTypeResolverInterface
-     * @since 2.0.0
      */
     private $attributeTypeResolver;
 
     /**
      * @param DataObjectProcessor $dataObjectProcessor
      * @param AttributeTypeResolverInterface $typeResolver
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectProcessor $dataObjectProcessor,
@@ -51,7 +47,6 @@ public function __construct(
      * @param CustomAttributesDataInterface $objectWithCustomAttributes
      * @param string $dataObjectType
      * @return array
-     * @since 2.0.0
      */
     public function buildOutputDataArray(CustomAttributesDataInterface $objectWithCustomAttributes, $dataObjectType)
     {
@@ -69,7 +64,6 @@ public function buildOutputDataArray(CustomAttributesDataInterface $objectWithCu
      * @param AttributeInterface $customAttribute
      * @param string $dataObjectType
      * @return array
-     * @since 2.0.0
      */
     private function convertCustomAttribute(AttributeInterface $customAttribute, $dataObjectType)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 69dcff7655871..6311003bd2ad5 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -12,37 +12,31 @@
  * Data object processor for array serialization using class reflection
  *
  * @api
- * @since 2.0.0
  */
 class DataObjectProcessor
 {
     /**
      * @var MethodsMap
-     * @since 2.0.0
      */
     private $methodsMapProcessor;
 
     /**
      * @var TypeCaster
-     * @since 2.0.0
      */
     private $typeCaster;
 
     /**
      * @var FieldNamer
-     * @since 2.0.0
      */
     private $fieldNamer;
 
     /**
      * @var ExtensionAttributesProcessor
-     * @since 2.0.0
      */
     private $extensionAttributesProcessor;
 
     /**
      * @var CustomAttributesProcessor
-     * @since 2.0.0
      */
     private $customAttributesProcessor;
 
@@ -52,7 +46,6 @@ class DataObjectProcessor
      * @param FieldNamer $fieldNamer
      * @param CustomAttributesProcessor $customAttributesProcessor
      * @param ExtensionAttributesProcessor $extensionAttributesProcessor
-     * @since 2.0.0
      */
     public function __construct(
         MethodsMap $methodsMapProcessor,
@@ -75,7 +68,6 @@ public function __construct(
      * @param string $dataObjectType
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function buildOutputDataArray($dataObject, $dataObjectType)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
index fbb027636b720..3e9eef4fd7b15 100644
--- a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
@@ -18,49 +18,41 @@
  * Processes extension attributes and produces an array for the data.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ExtensionAttributesProcessor
 {
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     private $dataObjectProcessor;
 
     /**
      * @var MethodsMap
-     * @since 2.0.0
      */
     private $methodsMapProcessor;
 
     /**
      * @var AuthorizationInterface
-     * @since 2.0.0
      */
     private $authorization;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $isPermissionChecked;
 
     /**
      * @var FieldNamer
-     * @since 2.0.0
      */
     private $fieldNamer;
 
     /**
      * @var TypeCaster
-     * @since 2.0.0
      */
     private $typeCaster;
 
@@ -72,7 +64,6 @@ class ExtensionAttributesProcessor
      * @param AuthorizationInterface $authorization
      * @param Config $config
      * @param bool $isPermissionChecked
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectProcessor $dataObjectProcessor,
@@ -99,7 +90,6 @@ public function __construct(
      * @param string $dataObjectType
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function buildOutputDataArray(ExtensionAttributesInterface $dataObject, $dataObjectType)
     {
@@ -154,7 +144,6 @@ public function buildOutputDataArray(ExtensionAttributesInterface $dataObject, $
      * @param string $dataObjectType
      * @param string $attributeCode
      * @return bool
-     * @since 2.0.0
      */
     private function isAttributePermissionValid($dataObjectType, $attributeCode)
     {
@@ -172,7 +161,6 @@ private function isAttributePermissionValid($dataObjectType, $attributeCode)
     /**
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     private function getRegularTypeForExtensionAttributesType($name)
     {
@@ -183,7 +171,6 @@ private function getRegularTypeForExtensionAttributesType($name)
      * @param string $typeName
      * @param string $attributeCode
      * @return string[] A list of permissions
-     * @since 2.0.0
      */
     private function getPermissionsForTypeAndMethod($typeName, $attributeCode)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/FieldNamer.php b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
index 7366565a88034..8e4d077c52e08 100644
--- a/lib/internal/Magento/Framework/Reflection/FieldNamer.php
+++ b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
@@ -15,7 +15,6 @@
 
 /**
  * Determines the name to use for fields in a data output array given method metadata.
- * @since 2.0.0
  */
 class FieldNamer
 {
@@ -28,7 +27,6 @@ class FieldNamer
      *
      * @param string $methodName
      * @return string|null
-     * @since 2.0.0
      */
     public function getFieldNameForMethodName($methodName)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/MethodsMap.php b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
index 1becb4781c1a5..d81dfd7a981f8 100644
--- a/lib/internal/Magento/Framework/Reflection/MethodsMap.php
+++ b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
@@ -14,7 +14,6 @@
 
 /**
  * Gathers method metadata information.
- * @since 2.0.0
  */
 class MethodsMap
 {
@@ -29,25 +28,21 @@ class MethodsMap
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     private $cache;
 
     /**
      * @var TypeProcessor
-     * @since 2.0.0
      */
     private $typeProcessor;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $serviceInterfaceMethodsMap = [];
 
     /**
      * @var FieldNamer
-     * @since 2.0.0
      */
     private $fieldNamer;
 
@@ -62,7 +57,6 @@ class MethodsMap
      * @param TypeProcessor $typeProcessor
      * @param \Magento\Framework\Api\AttributeTypeResolverInterface $typeResolver
      * @param FieldNamer $fieldNamer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Cache\FrontendInterface $cache,
@@ -82,7 +76,6 @@ public function __construct(
      * @param string $typeName
      * @param string $methodName
      * @return string
-     * @since 2.0.0
      */
     public function getMethodReturnType($typeName, $methodName)
     {
@@ -102,7 +95,6 @@ public function getMethodReturnType($typeName, $methodName)
      *  'validatePassword' => 'boolean'
      * ]
      * </pre>
-     * @since 2.0.0
      */
     public function getMethodsMap($interfaceName)
     {
@@ -126,7 +118,6 @@ public function getMethodsMap($interfaceName)
      * @param string $serviceClassName
      * @param string $serviceMethodName
      * @return array
-     * @since 2.0.0
      */
     public function getMethodParams($serviceClassName, $serviceMethodName)
     {
@@ -158,7 +149,6 @@ public function getMethodParams($serviceClassName, $serviceMethodName)
      *
      * @param string $interfaceName
      * @return array
-     * @since 2.0.0
      */
     private function getMethodMapViaReflection($interfaceName)
     {
@@ -188,7 +178,6 @@ private function getMethodMapViaReflection($interfaceName)
      *
      * @param \ReflectionMethod $method
      * @return bool
-     * @since 2.0.0
      */
     private function isSuitableMethod($method)
     {
@@ -205,7 +194,6 @@ private function isSuitableMethod($method)
      * @param string $type
      * @param string $methodName
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodValidForDataField($type, $methodName)
     {
@@ -230,7 +218,6 @@ public function isMethodValidForDataField($type, $methodName)
      * @param string $type
      * @param string $methodName
      * @return bool
-     * @since 2.0.0
      */
     public function isMethodReturnValueRequired($type, $methodName)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/TypeCaster.php b/lib/internal/Magento/Framework/Reflection/TypeCaster.php
index 3840c3589354f..e974d30da919a 100644
--- a/lib/internal/Magento/Framework/Reflection/TypeCaster.php
+++ b/lib/internal/Magento/Framework/Reflection/TypeCaster.php
@@ -9,7 +9,6 @@
 
 /**
  * Casts values to the type given.
- * @since 2.0.0
  */
 class TypeCaster
 {
@@ -36,7 +35,6 @@ public function __construct(Json $serializer)
      * @return mixed
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function castValueToType($value, $type)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
index 4d16fa86944ff..a56be14b8828b 100644
--- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
@@ -16,7 +16,6 @@
  * Type processor of config reader properties
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class TypeProcessor
 {
@@ -40,27 +39,7 @@ class TypeProcessor
     const NORMALIZED_ANY_TYPE = 'anyType';
     /**#@-*/
 
-    /**
-     * Array of types data.
-     * <pre>array(
-     *     $complexTypeName => array(
-     *         'documentation' => $typeDocumentation
-     *         'parameters' => array(
-     *             $firstParameter => array(
-     *                 'type' => $type,
-     *                 'required' => $isRequired,
-     *                 'default' => $defaultValue,
-     *                 'documentation' => $parameterDocumentation
-     *             ),
-     *             ...
-     *         )
-     *     ),
-     *     ...
-     * )</pre>
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_types = [];
 
     /**
@@ -90,7 +69,6 @@ private function getNameFinder()
      * Retrieve processed types data.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTypesData()
     {
@@ -104,7 +82,6 @@ public function getTypesData()
      *
      * @param array $typesData
      * @return $this
-     * @since 2.0.0
      */
     public function setTypesData($typesData)
     {
@@ -118,7 +95,6 @@ public function setTypesData($typesData)
      * @param string $typeName
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getTypeData($typeName)
     {
@@ -134,7 +110,6 @@ public function getTypeData($typeName)
      * @param string $typeName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setTypeData($typeName, $data)
     {
@@ -151,7 +126,6 @@ public function setTypeData($typeName, $data)
      * @param string $type
      * @return string Complex type name
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function register($type)
     {
@@ -183,7 +157,6 @@ public function register($type)
      * @return array
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _processComplexType($class)
     {
@@ -218,7 +191,6 @@ protected function _processComplexType($class)
      * @param MethodReflection $methodReflection
      * @param string $typeName
      * @return void
-     * @since 2.0.0
      */
     protected function _processMethod(MethodReflection $methodReflection, $typeName)
     {
@@ -249,7 +221,6 @@ protected function _processMethod(MethodReflection $methodReflection, $typeName)
      *
      * @param DocBlockReflection $doc
      * @return string
-     * @since 2.0.0
      */
     public function getDescription(DocBlockReflection $doc)
     {
@@ -273,7 +244,6 @@ public function getDescription(DocBlockReflection $doc)
      * @return string
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function dataObjectGetterNameToFieldName($getterName)
     {
@@ -287,7 +257,6 @@ public function dataObjectGetterNameToFieldName($getterName)
      * @return string
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function dataObjectGetterDescriptionToFieldDescription($shortDescription)
     {
@@ -305,7 +274,6 @@ protected function dataObjectGetterDescriptionToFieldDescription($shortDescripti
      *     'parameterCount' => $numberOfRequiredParameters
      * )</pre>
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getGetterReturnType($methodReflection)
     {
@@ -342,7 +310,6 @@ public function getGetterReturnType($methodReflection)
      *
      * @param MethodReflection $methodReflection
      * @return array
-     * @since 2.0.0
      */
     public function getExceptions($methodReflection)
     {
@@ -366,7 +333,6 @@ public function getExceptions($methodReflection)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function normalizeType($type)
     {
@@ -388,7 +354,6 @@ public function normalizeType($type)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isTypeSimple($type)
     {
@@ -409,7 +374,6 @@ public function isTypeSimple($type)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isTypeAny($type)
     {
@@ -426,7 +390,6 @@ public function isTypeAny($type)
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isArrayType($type)
     {
@@ -451,7 +414,6 @@ public function isValidTypeDeclaration($type)
      *
      * @param string $arrayType
      * @return string
-     * @since 2.0.0
      */
     public function getArrayItemType($arrayType)
     {
@@ -469,7 +431,6 @@ public function getArrayItemType($arrayType)
      * @param string $class
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function translateTypeName($class)
     {
@@ -494,7 +455,6 @@ public function translateTypeName($class)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     public function translateArrayTypeName($type)
     {
@@ -510,7 +470,6 @@ public function translateArrayTypeName($type)
      * @throws SerializationException
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function processSimpleAndAnyType($value, $type)
     {
@@ -555,7 +514,6 @@ public function processSimpleAndAnyType($value, $type)
      * @param ParameterReflection $param
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function getParamType(ParameterReflection $param)
     {
@@ -587,7 +545,6 @@ public function getParamType(ParameterReflection $param)
      *
      * @param ParameterReflection $param
      * @return string|null
-     * @since 2.0.0
      */
     public function getParamDescription(ParameterReflection $param)
     {
@@ -612,7 +569,6 @@ public function getParamDescription(ParameterReflection $param)
      * @throws \Exception If $camelCaseProperty has no corresponding getter method
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function findGetterMethodName(ClassReflection $class, $camelCaseProperty)
     {
@@ -625,7 +581,6 @@ public function findGetterMethodName(ClassReflection $class, $camelCaseProperty)
      * @param mixed $value
      * @param string $type
      * @return true on successful type cast
-     * @since 2.0.0
      */
     protected function setType(&$value, $type)
     {
@@ -652,7 +607,6 @@ protected function setType(&$value, $type)
      * @throws \Exception If $camelCaseProperty has no corresponding setter method
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function findSetterMethodName(ClassReflection $class, $camelCaseProperty)
     {
@@ -670,7 +624,6 @@ public function findSetterMethodName(ClassReflection $class, $camelCaseProperty)
      * @throws \Exception If $camelCaseProperty has no corresponding setter method
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function findAccessorMethodName(
         ClassReflection $class,
@@ -692,7 +645,6 @@ protected function findAccessorMethodName(
      * @return bool
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected function classHasMethod(ClassReflection $class, $methodName)
     {
@@ -707,7 +659,6 @@ protected function classHasMethod(ClassReflection $class, $methodName)
      * @param string $methodName
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function processInterfaceCallInfo($interface, $serviceName, $methodName)
     {
@@ -740,7 +691,6 @@ public function processInterfaceCallInfo($interface, $serviceName, $methodName)
      * @param string $serviceName API service name
      * @param string $methodName
      * @return string
-     * @since 2.0.0
      */
     public function getOperationName($serviceName, $methodName)
     {
diff --git a/lib/internal/Magento/Framework/Registry.php b/lib/internal/Magento/Framework/Registry.php
index 3226fe0306c04..825d550fc1507 100644
--- a/lib/internal/Magento/Framework/Registry.php
+++ b/lib/internal/Magento/Framework/Registry.php
@@ -9,7 +9,6 @@
  * Registry model. Used to manage values in registry
  *
  * @api
- * @since 2.0.0
  */
 class Registry
 {
@@ -17,7 +16,6 @@ class Registry
      * Registry collection
      *
      * @var array
-     * @since 2.0.0
      */
     private $_registry = [];
 
@@ -26,7 +24,6 @@ class Registry
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function registry($key)
     {
@@ -44,7 +41,6 @@ public function registry($key)
      * @param bool $graceful
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function register($key, $value, $graceful = false)
     {
@@ -62,7 +58,6 @@ public function register($key, $value, $graceful = false)
      *
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function unregister($key)
     {
@@ -79,7 +74,6 @@ public function unregister($key)
 
     /**
      * Destruct registry items
-     * @since 2.0.0
      */
     public function __destruct()
     {
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index b8612c577026b..1df2badf38e77 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -12,7 +12,6 @@
 
 /**
  * Provider of RequireJs config information
- * @since 2.0.0
  */
 class Config
 {
@@ -87,37 +86,31 @@ class Config
 
     /**
      * @var \Magento\Framework\RequireJs\Config\File\Collector\Aggregated
-     * @since 2.0.0
      */
     private $fileSource;
 
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     private $design;
 
     /**
      * @var \Magento\Framework\Filesystem\File\ReadFactory
-     * @since 2.0.0
      */
     private $readFactory;
 
     /**
      * @var \Magento\Framework\View\Asset\ContextInterface
-     * @since 2.0.0
      */
     private $staticContext;
 
     /**
      * @var \Magento\Framework\Code\Minifier\AdapterInterface
-     * @since 2.0.0
      */
     private $minifyAdapter;
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     private $minification;
 
@@ -135,7 +128,6 @@ class Config
      * @param \Magento\Framework\Code\Minifier\AdapterInterface $minifyAdapter
      * @param Minification $minification
      * @param RepositoryMap $repositoryMap
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\RequireJs\Config\File\Collector\Aggregated $fileSource,
@@ -159,7 +151,6 @@ public function __construct(
      * Get aggregated distributed configuration
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -193,7 +184,6 @@ public function getConfig()
      * Get path to config file relative to directory, where all config files with different context are located
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigFileRelativePath()
     {
@@ -204,7 +194,6 @@ public function getConfigFileRelativePath()
      * Get path to config file relative to directory, where all config files with different context are located
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMixinsFileRelativePath()
     {
@@ -225,7 +214,6 @@ public function getMixinsFileRelativePath()
      * Get path to config file relative to directory, where all config files with different context are located
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequireJsFileRelativePath()
     {
@@ -236,7 +224,6 @@ public function getRequireJsFileRelativePath()
      * Get base RequireJs configuration necessary for working with Magento application
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseConfig()
     {
@@ -252,7 +239,6 @@ public function getBaseConfig()
      * Get path to '.min' files resolver relative to config files directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMinResolverRelativePath()
     {
@@ -296,7 +282,6 @@ public function getMapFileRelativePath()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getConfigFileName()
     {
@@ -305,7 +290,6 @@ protected function getConfigFileName()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getMinResolverCode()
     {
diff --git a/lib/internal/Magento/Framework/RequireJs/Config/File/Collector/Aggregated.php b/lib/internal/Magento/Framework/RequireJs/Config/File/Collector/Aggregated.php
index 94b0ab879c050..a4b38668c8ebd 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config/File/Collector/Aggregated.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config/File/Collector/Aggregated.php
@@ -12,7 +12,6 @@
 
 /**
  * Source of RequireJs config files basing on list of directories they may be located in
- * @since 2.0.0
  */
 class Aggregated implements CollectorInterface
 {
@@ -20,7 +19,6 @@ class Aggregated implements CollectorInterface
      * Base files
      *
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $baseFiles;
 
@@ -28,7 +26,6 @@ class Aggregated implements CollectorInterface
      * Theme files
      *
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $themeFiles;
 
@@ -36,19 +33,16 @@ class Aggregated implements CollectorInterface
      * Theme modular files
      *
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $themeModularFiles;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $libDirectory;
 
     /**
      * @var \Magento\Framework\View\File\Factory
-     * @since 2.0.0
      */
     protected $fileFactory;
 
@@ -58,7 +52,6 @@ class Aggregated implements CollectorInterface
      * @param CollectorInterface $baseFiles
      * @param CollectorInterface $themeFiles
      * @param CollectorInterface $themeModularFiles
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -81,7 +74,6 @@ public function __construct(
      * @param string $filePath
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/Search/AbstractKeyValuePair.php b/lib/internal/Magento/Framework/Search/AbstractKeyValuePair.php
index 0138b035879b6..c12cd0d2ad566 100644
--- a/lib/internal/Magento/Framework/Search/AbstractKeyValuePair.php
+++ b/lib/internal/Magento/Framework/Search/AbstractKeyValuePair.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Search\AbstractKeyValuePair
  *
- * @since 2.0.0
  */
 class AbstractKeyValuePair
 {
@@ -16,7 +15,6 @@ class AbstractKeyValuePair
      * Field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -24,7 +22,6 @@ class AbstractKeyValuePair
      * Field values
      *
      * @var mixed
-     * @since 2.0.0
      */
     protected $value;
 
@@ -32,7 +29,6 @@ class AbstractKeyValuePair
      * @param string $name
      * @param mixed $value
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $value)
     {
@@ -45,7 +41,6 @@ public function __construct($name, $value)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -57,7 +52,6 @@ public function getName()
      *
      * @return mixed Return data in raw-formt. Must be escaped for using in sql
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index 5d8536af29a3b..098782b4e814e 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -16,7 +16,6 @@
  * MySQL Search Adapter
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Adapter implements AdapterInterface
 {
@@ -24,7 +23,6 @@ class Adapter implements AdapterInterface
      * Mapper instance
      *
      * @var Mapper
-     * @since 2.0.0
      */
     protected $mapper;
 
@@ -32,25 +30,21 @@ class Adapter implements AdapterInterface
      * Response Factory
      *
      * @var ResponseFactory
-     * @since 2.0.0
      */
     protected $responseFactory;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var AggregationBuilder
-     * @since 2.0.0
      */
     private $aggregationBuilder;
 
     /**
      * @var TemporaryStorageFactory
-     * @since 2.0.0
      */
     private $temporaryStorageFactory;
 
@@ -60,7 +54,6 @@ class Adapter implements AdapterInterface
      * @param ResourceConnection $resource
      * @param AggregationBuilder $aggregationBuilder
      * @param TemporaryStorageFactory $temporaryStorageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Mapper $mapper,
@@ -79,7 +72,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function query(RequestInterface $request)
     {
@@ -103,7 +95,6 @@ public function query(RequestInterface $request)
      * @param Table $table
      * @return array
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     private function getDocuments(Table $table)
     {
@@ -115,7 +106,6 @@ private function getDocuments(Table $table)
 
     /**
      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private function getConnection()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
index ab6273a1d2a3d..a305d3350af64 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
@@ -16,31 +16,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var DataProviderContainer
-     * @since 2.0.0
      */
     private $dataProviderContainer;
 
     /**
      * @var Builder\Container
-     * @since 2.0.0
      */
     private $aggregationContainer;
 
     /**
      * @var EntityMetadata
-     * @since 2.0.0
      */
     private $entityMetadata;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
@@ -56,7 +51,6 @@ class Builder
      * @param AggregationContainer $aggregationContainer
      * @param EntityMetadata $entityMetadata
      * @param AggregationResolverInterface $aggregationResolver
-     * @since 2.0.0
      */
     public function __construct(
         ResourceConnection $resource,
@@ -77,7 +71,6 @@ public function __construct(
      * @param Table $documentsTable
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     public function build(RequestInterface $request, Table $documentsTable, array $documents = [])
     {
@@ -89,7 +82,6 @@ public function build(RequestInterface $request, Table $documentsTable, array $d
      * @param Table $documentsTable
      * @param array $documents
      * @return array
-     * @since 2.0.0
      */
     private function processAggregations(RequestInterface $request, Table $documentsTable, $documents)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
index 3d304f9650aea..90220676e0068 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
@@ -13,7 +13,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\BucketInterface
  *
- * @since 2.0.0
  */
 interface BucketInterface
 {
@@ -23,7 +22,6 @@ interface BucketInterface
      * @param RequestBucketInterface $bucket
      * @param Table $entityIdsTable
      * @return array
-     * @since 2.0.0
      */
     public function build(
         DataProviderInterface $dataProvider,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
index 2db804d043d6e..8b1d6f1740c64 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container
  *
- * @since 2.0.0
  */
 class Container
 {
     /**
      * @var BucketInterface[]
-     * @since 2.0.0
      */
     private $buckets;
 
     /**
      * @param BucketInterface[] $buckets
-     * @since 2.0.0
      */
     public function __construct(array $buckets)
     {
@@ -30,7 +27,6 @@ public function __construct(array $buckets)
     /**
      * @param string $bucketType
      * @return BucketInterface
-     * @since 2.0.0
      */
     public function get($bucketType)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
index 9fbca338e32a9..e98254f8f26b6 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
@@ -15,26 +15,22 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Dynamic
  *
- * @since 2.0.0
  */
 class Dynamic implements BucketInterface
 {
     /**
      * @var Repository
-     * @since 2.0.0
      */
     private $algorithmRepository;
 
     /**
      * @var EntityStorageFactory
-     * @since 2.0.0
      */
     private $entityStorageFactory;
 
     /**
      * @param Repository $algorithmRepository
      * @param EntityStorageFactory $entityStorageFactory
-     * @since 2.0.0
      */
     public function __construct(
         Repository $algorithmRepository,
@@ -46,7 +42,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(
         DataProviderInterface $dataProvider,
@@ -68,7 +63,6 @@ public function build(
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     private function prepareData($data)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
index 5d46638112b9f..577455cda5e2b 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Metrics
  *
- * @since 2.0.0
  */
 class Metrics
 {
@@ -27,7 +26,6 @@ class Metrics
      *
      * @param RequestBucketInterface $bucket
      * @return string[]
-     * @since 2.0.0
      */
     public function build(RequestBucketInterface $bucket)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
index a615a1a3f5360..629c578831df7 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Range
  *
- * @since 2.0.0
  */
 class Range implements BucketInterface
 {
@@ -26,26 +25,22 @@ class Range implements BucketInterface
 
     /**
      * @var Metrics
-     * @since 2.0.0
      */
     private $metricsBuilder;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
     /**
      * @param Metrics $metricsBuilder
      * @param ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(Metrics $metricsBuilder, ResourceConnection $resource)
     {
@@ -56,7 +51,6 @@ public function __construct(Metrics $metricsBuilder, ResourceConnection $resourc
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(
         DataProviderInterface $dataProvider,
@@ -83,7 +77,6 @@ public function build(
      * @param Select $select
      * @param AggregationRange[] $ranges
      * @return Select
-     * @since 2.0.0
      */
     private function generateCase(Select $select, array $ranges)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
index 4b03263819c58..c28de6e77f513 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Term
  *
- * @since 2.0.0
  */
 class Term implements BucketInterface
 {
     /**
      * @var Metrics
-     * @since 2.0.0
      */
     private $metricsBuilder;
 
     /**
      * @param Metrics $metricsBuilder
-     * @since 2.0.0
      */
     public function __construct(Metrics $metricsBuilder)
     {
@@ -34,7 +31,6 @@ public function __construct(Metrics $metricsBuilder)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(
         DataProviderInterface $dataProvider,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
index 7ace4dfb9c812..6a817bcbddf82 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
@@ -7,19 +7,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DataProviderContainer
 {
     /**
      * @var DataProviderInterface[]
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @param DataProviderInterface[] $dataProviders
-     * @since 2.0.0
      */
     public function __construct(array $dataProviders)
     {
@@ -29,7 +26,6 @@ public function __construct(array $dataProviders)
     /**
      * @param string $indexName
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function get($indexName)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
index aec1151b3311c..b18269335bc6f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
@@ -13,7 +13,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface
  *
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
@@ -22,7 +21,6 @@ interface DataProviderInterface
      * @param Dimension[] $dimensions
      * @param Table $entityIdsTable
      * @return Select
-     * @since 2.0.0
      */
     public function getDataSet(
         BucketInterface $bucket,
@@ -35,7 +33,6 @@ public function getDataSet(
      *
      * @param Select $select
      * @return array
-     * @since 2.0.0
      */
     public function execute(Select $select);
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
index 84bd369836cb3..518ffe016640c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Aggregation\Interval
  *
- * @since 2.0.0
  */
 class Interval implements IntervalInterface
 {
@@ -22,13 +21,11 @@ class Interval implements IntervalInterface
 
     /**
      * @var Select
-     * @since 2.0.0
      */
     private $select;
 
     /**
      * @param Select $select
-     * @since 2.0.0
      */
     public function __construct(Select $select)
     {
@@ -39,7 +36,6 @@ public function __construct(Select $select)
      * Get value field
      *
      * @return string
-     * @since 2.0.0
      */
     private function getValueFiled()
     {
@@ -51,7 +47,6 @@ private function getValueFiled()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function load($limit, $offset = null, $lower = null, $upper = null)
     {
@@ -75,7 +70,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function loadPrevious($data, $index, $lower = null)
     {
@@ -98,7 +92,6 @@ public function loadPrevious($data, $index, $lower = null)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function loadNext($data, $rightIndex, $upper = null)
     {
@@ -137,7 +130,6 @@ public function loadNext($data, $rightIndex, $upper = null)
     /**
      * @param array $prices
      * @return array
-     * @since 2.0.0
      */
     private function arrayValuesToFloat($prices)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
index e5769bdb8fe30..4d255705bf7df 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Aggregation Factory
- * @since 2.0.0
  */
 class AggregationFactory
 {
@@ -15,13 +14,11 @@ class AggregationFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $rawAggregation
      * @return \Magento\Framework\Search\Response\Aggregation
-     * @since 2.0.0
      */
     public function create(array $rawAggregation)
     {
@@ -59,7 +55,6 @@ public function create(array $rawAggregation)
      *
      * @param array $values
      * @return \Magento\Framework\Search\Response\Aggregation\Value[]
-     * @since 2.0.0
      */
     private function prepareValues(array $values)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
index bdb50aba8dbf9..41d6b14b6a477 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ConditionManager
 {
@@ -19,13 +18,11 @@ class ConditionManager
 
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     private $connection;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(ResourceConnection $resource)
     {
@@ -35,7 +32,6 @@ public function __construct(ResourceConnection $resource)
     /**
      * @param string $query
      * @return string
-     * @since 2.0.0
      */
     public function wrapBrackets($query)
     {
@@ -48,7 +44,6 @@ public function wrapBrackets($query)
      * @param string[] $queries
      * @param string $unionOperator
      * @return string
-     * @since 2.0.0
      */
     public function combineQueries(array $queries, $unionOperator)
     {
@@ -63,7 +58,6 @@ public function combineQueries(array $queries, $unionOperator)
      * @param string $operator
      * @param mixed $value
      * @return string
-     * @since 2.0.0
      */
     public function generateCondition($field, $operator, $value)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
index c3b0f3195a7bc..57b1073d6afab 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
@@ -14,7 +14,6 @@
 /**
  * Document Factory
  * @api
- * @since 2.0.0
  */
 class DocumentFactory
 {
@@ -23,13 +22,11 @@ class DocumentFactory
      *
      * @var \Magento\Framework\ObjectManagerInterface
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\Search\EntityMetadata
-     * @since 2.0.0
      */
     private $entityMetadata;
 
@@ -37,7 +34,6 @@ class DocumentFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Search\EntityMetadata $entityMetadata
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -51,7 +47,6 @@ public function __construct(
      *
      * @param mixed $rawDocument
      * @return \Magento\Framework\Api\Search\Document
-     * @since 2.0.0
      */
     public function create($rawDocument)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
index 6d5c689665c1b..d0d7d5ca274a3 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
@@ -9,25 +9,21 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Field\Field
  *
- * @since 2.0.0
  */
 class Field implements FieldInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $column;
 
     /**
      * @var int|null
-     * @since 2.0.0
      */
     private $attributeId;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     private $type;
 
@@ -35,7 +31,6 @@ class Field implements FieldInterface
      * @param string $column
      * @param int|null $attributeId
      * @param int $type
-     * @since 2.0.0
      */
     public function __construct($column, $attributeId = null, $type = self::TYPE_FULLTEXT)
     {
@@ -46,7 +41,6 @@ public function __construct($column, $attributeId = null, $type = self::TYPE_FUL
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getColumn()
     {
@@ -55,7 +49,6 @@ public function getColumn()
 
     /**
      * @return int|null
-     * @since 2.0.0
      */
     public function getAttributeId()
     {
@@ -64,7 +57,6 @@ public function getAttributeId()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
index 2a593e33a94d6..9a3c55965740e 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FieldFactory
 {
@@ -16,7 +15,6 @@ class FieldFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class FieldFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -33,7 +30,6 @@ class FieldFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
index 8f8ad97835361..5f4e0027a8508 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface
  *
- * @since 2.0.0
  */
 interface FieldInterface
 {
@@ -19,21 +18,18 @@ interface FieldInterface
     /**
      * Get type of index
      * @return int
-     * @since 2.0.0
      */
     public function getType();
 
     /**
      * Get ID of attribute
      * @return int
-     * @since 2.0.0
      */
     public function getAttributeId();
 
     /**
      * Get field name
      * @return string
-     * @since 2.0.0
      */
     public function getColumn();
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
index b30630f0d0e4c..96a06d95acf4d 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Field\Resolver
  *
- * @since 2.0.0
  */
 class Resolver implements ResolverInterface
 {
     /**
      * @var FieldFactory
-     * @since 2.0.0
      */
     private $fieldFactory;
 
     /**
      * @param FieldFactory $fieldFactory
-     * @since 2.0.0
      */
     public function __construct(FieldFactory $fieldFactory)
     {
@@ -29,7 +26,6 @@ public function __construct(FieldFactory $fieldFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolve(array $fields)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
index 10245966ba0ab..f275c4f1b1c14 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface
  *
- * @since 2.0.0
  */
 interface ResolverInterface
 {
@@ -17,7 +16,6 @@ interface ResolverInterface
      *
      * @param array $fields
      * @return FieldInterface[]
-     * @since 2.0.0
      */
     public function resolve(array $fields);
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
index 38b2987ad4841..80074ffc5e2b9 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
@@ -16,25 +16,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Builder implements BuilderInterface
 {
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @var FilterInterface[]
-     * @since 2.0.0
      */
     private $filters;
 
     /**
      * @var PreprocessorInterface
-     * @since 2.0.0
      */
     private $preprocessor;
 
@@ -44,7 +40,6 @@ class Builder implements BuilderInterface
      * @param Wildcard $wildcard
      * @param ConditionManager $conditionManager
      * @param PreprocessorInterface $preprocessor
-     * @since 2.0.0
      */
     public function __construct(
         Range $range,
@@ -64,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(RequestFilterInterface $filter, $conditionType)
     {
@@ -75,7 +69,6 @@ public function build(RequestFilterInterface $filter, $conditionType)
      * @param RequestFilterInterface $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function processFilter(RequestFilterInterface $filter, $isNegation)
     {
@@ -97,7 +90,6 @@ private function processFilter(RequestFilterInterface $filter, $isNegation)
      * @param RequestFilterInterface|\Magento\Framework\Search\Request\Filter\Bool $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function processBoolFilter(RequestFilterInterface $filter, $isNegation)
     {
@@ -123,7 +115,6 @@ private function processBoolFilter(RequestFilterInterface $filter, $isNegation)
      * @param string $unionOperator
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function buildFilters(array $filters, $unionOperator, $isNegation)
     {
@@ -138,7 +129,6 @@ private function buildFilters(array $filters, $unionOperator, $isNegation)
     /**
      * @param string $conditionType
      * @return bool
-     * @since 2.0.0
      */
     private function isNegation($conditionType)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
index 0ec45280b2662..787866a2bca38 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\FilterInterface
  *
- * @since 2.0.0
  */
 interface FilterInterface
 {
@@ -18,7 +17,6 @@ interface FilterInterface
      * @param RequestFilterInterface $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     public function buildFilter(
         RequestFilterInterface $filter,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
index 4e1abdec66f80..42c9a550ccbfe 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\Range
  *
- * @since 2.0.0
  */
 class Range implements FilterInterface
 {
@@ -23,13 +22,11 @@ class Range implements FilterInterface
 
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @param ConditionManager $conditionManager
-     * @since 2.0.0
      */
     public function __construct(
         ConditionManager $conditionManager
@@ -39,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function buildFilter(
         RequestFilterInterface $filter,
@@ -59,7 +55,6 @@ public function buildFilter(
      * @param RequestFilterInterface|RangeFilterRequest $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function getLeftConditionPart(RequestFilterInterface $filter, $isNegation)
     {
@@ -74,7 +69,6 @@ private function getLeftConditionPart(RequestFilterInterface $filter, $isNegatio
      * @param RequestFilterInterface|RangeFilterRequest $filter
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function getRightConditionPart(RequestFilterInterface $filter, $isNegation)
     {
@@ -90,7 +84,6 @@ private function getRightConditionPart(RequestFilterInterface $filter, $isNegati
      * @param string $operator
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     private function getPart($field, $operator, $value)
     {
@@ -102,7 +95,6 @@ private function getPart($field, $operator, $value)
     /**
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function getConditionUnionOperator($isNegation)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
index e8c32b729b7eb..25304b6a438c7 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\Term
  *
- * @since 2.0.0
  */
 class Term implements FilterInterface
 {
@@ -22,13 +21,11 @@ class Term implements FilterInterface
 
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @param ConditionManager $conditionManager
-     * @since 2.0.0
      */
     public function __construct(
         ConditionManager $conditionManager
@@ -38,7 +35,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function buildFilter(
         RequestFilterInterface $filter,
@@ -57,7 +53,6 @@ public function buildFilter(
      * @param string|array $value
      * @param bool $isNegation
      * @return string
-     * @since 2.0.0
      */
     private function getConditionOperator($value, $isNegation)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
index 294560bd31be5..3fb89a0bad1b7 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\Wildcard
  *
- * @since 2.0.0
  */
 class Wildcard implements FilterInterface
 {
@@ -19,13 +18,11 @@ class Wildcard implements FilterInterface
 
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @param ConditionManager $conditionManager
-     * @since 2.0.0
      */
     public function __construct(
         ConditionManager $conditionManager
@@ -35,7 +32,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function buildFilter(
         \Magento\Framework\Search\Request\FilterInterface $filter,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
index e2b854a1e0e6c..ec3b88ad24507 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\BuilderInterface
  *
- * @since 2.0.0
  */
 interface BuilderInterface
 {
@@ -18,7 +17,6 @@ interface BuilderInterface
      * @param RequestFilterInterface $filter
      * @param string $conditionType
      * @return string
-     * @since 2.0.0
      */
     public function build(RequestFilterInterface $filter, $conditionType);
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
index 228772282b035..16fd7447782cf 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Filter\Preprocessor
  *
- * @since 2.0.0
  */
 class Preprocessor implements PreprocessorInterface
 {
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @param ConditionManager $conditionManager
-     * @since 2.0.0
      */
     public function __construct(ConditionManager $conditionManager)
     {
@@ -32,7 +29,6 @@ public function __construct(ConditionManager $conditionManager)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(FilterInterface $filter, $isNegation, $query)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
index 334302269d5e9..430b775337b7f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface
  *
- * @since 2.0.0
  */
 interface PreprocessorInterface
 {
@@ -19,7 +18,6 @@ interface PreprocessorInterface
      * @param bool $isNegation
      * @param string $query
      * @return string
-     * @since 2.0.0
      */
     public function process(FilterInterface $filter, $isNegation, $query);
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
index b9347dd46172a..73c20406f35df 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Build base Query for Index
- * @since 2.0.0
  */
 interface IndexBuilderInterface
 {
@@ -19,7 +18,6 @@ interface IndexBuilderInterface
      *
      * @param RequestInterface $request
      * @return Select
-     * @since 2.0.0
      */
     public function build(RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
index 0f95bb2a66f6d..7d780114bf9e5 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
@@ -24,61 +24,51 @@
  * Mapper class. Maps library request to specific adapter dependent query
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Mapper
 {
     /**
      * @var ScoreBuilder
-     * @since 2.0.0
      */
     private $scoreBuilderFactory;
 
     /**
      * @var Filter\Builder
-     * @since 2.0.0
      */
     private $filterBuilder;
 
     /**
      * @var ConditionManager
-     * @since 2.0.0
      */
     private $conditionManager;
 
     /**
      * @var IndexBuilderInterface[]
-     * @since 2.0.0
      */
     private $indexProviders;
 
     /**
      * @var Resource
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @var EntityMetadata
-     * @since 2.0.0
      */
     private $entityMetadata;
 
     /**
      * @var QueryContainerFactory
-     * @since 2.0.0
      */
     private $queryContainerFactory;
 
     /**
      * @var Query\Builder\Match
-     * @since 2.0.0
      */
     private $matchBuilder;
 
     /**
      * @var TemporaryStorage
-     * @since 2.0.0
      */
     private $temporaryStorage;
 
@@ -107,7 +97,6 @@ class Mapper
      * @param string $relevanceCalculationMethod
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         ScoreBuilderFactory $scoreBuilderFactory,
@@ -145,7 +134,6 @@ public function __construct(
      * @throws \LogicException
      * @throws \Zend_Db_Exception
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function buildQuery(RequestInterface $request)
     {
@@ -193,7 +181,6 @@ public function buildQuery(RequestInterface $request)
      * @param Select $select
      * @param ScoreBuilder $scoreBuilder
      * @return Select
-     * @since 2.0.0
      */
     private function createAroundSelect(Select $select, ScoreBuilder $scoreBuilder)
     {
@@ -218,7 +205,6 @@ private function createAroundSelect(Select $select, ScoreBuilder $scoreBuilder)
      * @param QueryContainer $queryContainer
      * @return Select
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function processQuery(
         ScoreBuilder $scoreBuilder,
@@ -258,7 +244,6 @@ protected function processQuery(
      * @param Select $select
      * @param QueryContainer $queryContainer
      * @return Select
-     * @since 2.0.0
      */
     private function processBoolQuery(
         ScoreBuilder $scoreBuilder,
@@ -306,7 +291,6 @@ private function processBoolQuery(
      * @param string $conditionType
      * @param QueryContainer $queryContainer
      * @return Select
-     * @since 2.0.0
      */
     private function processBoolQueryCondition(
         ScoreBuilder $scoreBuilder,
@@ -330,7 +314,6 @@ private function processBoolQueryCondition(
      * @param string $conditionType
      * @param QueryContainer $queryContainer
      * @return Select
-     * @since 2.0.0
      */
     private function processFilterQuery(
         ScoreBuilder $scoreBuilder,
@@ -370,7 +353,6 @@ private function processFilterQuery(
      * @param IndexBuilderInterface $indexBuilder
      * @return Select
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     private function addDerivedQueries(
         RequestInterface $request,
@@ -401,7 +383,6 @@ private function addDerivedQueries(
 
     /**
      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     private function getConnection()
     {
@@ -414,7 +395,6 @@ private function getConnection()
      * @param IndexBuilderInterface $indexBuilder
      * @param MatchContainer[] $matchQueries
      * @return Select
-     * @since 2.0.0
      */
     private function addMatchQueries(
         RequestInterface $request,
@@ -451,7 +431,6 @@ private function addMatchQueries(
      * @param ScoreBuilder $scoreBuilder
      * @return Select
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     private function joinPreviousResultToSelect(Select $query, Table $previousResultTable, ScoreBuilder $scoreBuilder)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index d7e9bfc7f876a..94479c0553221 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -16,7 +16,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Match implements QueryInterface
 {
@@ -26,25 +25,21 @@ class Match implements QueryInterface
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $replaceSymbols = [];
 
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     private $resolver;
 
     /**
      * @var Fulltext
-     * @since 2.0.0
      */
     private $fulltextHelper;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $fulltextSearchMode;
 
@@ -59,7 +54,6 @@ class Match implements QueryInterface
      * @param Fulltext $fulltextHelper
      * @param string $fulltextSearchMode
      * @param PreprocessorInterface[] $preprocessors
-     * @since 2.0.0
      */
     public function __construct(
         ResolverInterface $resolver,
@@ -76,7 +70,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(
         ScoreBuilder $scoreBuilder,
@@ -123,7 +116,6 @@ public function build(
      * @param string $queryValue
      * @param string $conditionType
      * @return string
-     * @since 2.0.0
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
index 71b53ba8183b5..a2446264d48d7 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\Mysql\Query\Builder\QueryInterface
  *
- * @since 2.0.0
  */
 interface QueryInterface
 {
@@ -20,7 +19,6 @@ interface QueryInterface
      * @param \Magento\Framework\Search\Request\QueryInterface $query
      * @param string $conditionType
      * @return \Magento\Framework\DB\Select
-     * @since 2.0.0
      */
     public function build(
         ScoreBuilder $scoreBuilder,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
index 2a10bd6120932..4c153d0925461 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Query\MatchContainer
  *
- * @since 2.0.0
  */
 class MatchContainer
 {
     /**
      * @var QueryInterface
-     * @since 2.0.0
      */
     private $request;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $conditionType;
 
@@ -33,7 +30,6 @@ class MatchContainer
      * @param QueryInterface $request
      * @param string $conditionType
      * @internal param string $name
-     * @since 2.0.0
      */
     public function __construct(QueryInterface $request, $conditionType)
     {
@@ -43,7 +39,6 @@ public function __construct(QueryInterface $request, $conditionType)
 
     /**
      * @return QueryInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -52,7 +47,6 @@ public function getRequest()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getConditionType()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
index 0e4fd9ae8f633..ba103e060ae7c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * MatchContainer Factory
- * @since 2.0.0
  */
 class MatchContainerFactory
 {
@@ -15,7 +14,6 @@ class MatchContainerFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -23,7 +21,6 @@ class MatchContainerFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -32,7 +29,6 @@ class MatchContainerFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\Adapter\Mysql\Query\QueryContainer
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
index d72c9f901a854..f9b99afabce5f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Search\Adapter\Mysql\Query\QueryContainer
  *
- * @since 2.0.0
  */
 class QueryContainer
 {
@@ -20,19 +19,16 @@ class QueryContainer
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $queries = [];
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\Query\MatchContainerFactory
-     * @since 2.0.0
      */
     private $matchContainerFactory;
 
     /**
      * @param MatchContainerFactory $matchContainerFactory
-     * @since 2.0.0
      */
     public function __construct(MatchContainerFactory $matchContainerFactory)
     {
@@ -44,7 +40,6 @@ public function __construct(MatchContainerFactory $matchContainerFactory)
      * @param RequestQueryInterface $query
      * @param string $conditionType
      * @return Select
-     * @since 2.0.0
      */
     public function addMatchQuery(
         Select $select,
@@ -64,7 +59,6 @@ public function addMatchQuery(
 
     /**
      * @return MatchContainer[]
-     * @since 2.0.0
      */
     public function getMatchQueries()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
index 7219f105e6a62..70fefec13dd88 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * MatchContainer Factory
- * @since 2.0.0
  */
 class QueryContainerFactory
 {
@@ -15,7 +14,6 @@ class QueryContainerFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -23,7 +21,6 @@ class QueryContainerFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -32,7 +29,6 @@ class QueryContainerFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\Adapter\Mysql\Query\QueryContainer
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
index fe69bb3c2087d..8a269d8d95bc2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Response Factory
- * @since 2.0.0
  */
 class ResponseFactory
 {
@@ -15,7 +14,6 @@ class ResponseFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class ResponseFactory
      * Document Factory
      *
      * @var DocumentFactory
-     * @since 2.0.0
      */
     protected $documentFactory;
 
@@ -31,7 +28,6 @@ class ResponseFactory
      * Aggregation Factory
      *
      * @var AggregationFactory
-     * @since 2.0.0
      */
     protected $aggregationFactory;
 
@@ -39,7 +35,6 @@ class ResponseFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param DocumentFactory $documentFactory
      * @param AggregationFactory $aggregationFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -56,7 +51,6 @@ public function __construct(
      *
      * @param mixed $rawResponse
      * @return \Magento\Framework\Search\Response\QueryResponse
-     * @since 2.0.0
      */
     public function create($rawResponse)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
index 13cac45d72712..190d3a04ed210 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
@@ -9,13 +9,11 @@
  * Class for generating sql condition for calculating store manager
  *
  * @api
- * @since 2.0.0
  */
 class ScoreBuilder
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $scoreCondition = '';
 
@@ -28,7 +26,6 @@ class ScoreBuilder
      * Get column alias for global score query in sql
      *
      * @return string
-     * @since 2.0.0
      */
     public function getScoreAlias()
     {
@@ -39,7 +36,6 @@ public function getScoreAlias()
      * Get generated sql condition for global score
      *
      * @return string
-     * @since 2.0.0
      */
     public function build()
     {
@@ -54,7 +50,6 @@ public function build()
      * Start Query
      *
      * @return void
-     * @since 2.0.0
      */
     public function startQuery()
     {
@@ -67,7 +62,6 @@ public function startQuery()
      *
      * @param float $boost
      * @return void
-     * @since 2.0.0
      */
     public function endQuery($boost)
     {
@@ -84,7 +78,6 @@ public function endQuery($boost)
      * @param string $score
      * @param bool $useWeights
      * @return void
-     * @since 2.0.0
      */
     public function addCondition($score, $useWeights = true)
     {
@@ -100,7 +93,6 @@ public function addCondition($score, $useWeights = true)
      * Add Plus sign for Score calculation
      *
      * @return void
-     * @since 2.0.0
      */
     private function addPlus()
     {
@@ -113,7 +105,6 @@ private function addPlus()
      * Clear score manager
      *
      * @return void
-     * @since 2.0.0
      */
     private function clear()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
index b86d82081282e..4a7612fcc3042 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * ScoreBuilder Factory
- * @since 2.0.0
  */
 class ScoreBuilderFactory
 {
@@ -15,7 +14,6 @@ class ScoreBuilderFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -23,7 +21,6 @@ class ScoreBuilderFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class ScoreBuilderFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\Adapter\Mysql\ScoreBuilder
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
index 3fe836a3ac464..84c10cda18f78 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class TemporaryStorage
 {
@@ -23,13 +22,11 @@ class TemporaryStorage
 
     /**
      * @var \Magento\Framework\App\ResourceConnection
-     * @since 2.0.0
      */
     private $resource;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
      * @param \Magento\Framework\Api\Search\DocumentInterface[] $documents
      * @return Table
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     public function storeDocuments($documents)
     {
@@ -97,7 +93,6 @@ private function populateTemporaryTable(Table $table, $data)
      * @param Select $select
      * @return Table
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     public function storeDocumentsFromSelect(Select $select)
     {
@@ -108,7 +103,6 @@ public function storeDocumentsFromSelect(Select $select)
 
     /**
      * @return false|AdapterInterface
-     * @since 2.0.0
      */
     private function getConnection()
     {
@@ -118,7 +112,6 @@ private function getConnection()
     /**
      * @return Table
      * @throws \Zend_Db_Exception
-     * @since 2.0.0
      */
     private function createTemporaryTable()
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
index 277b34f4c422f..4a282faf317ce 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
@@ -12,7 +12,6 @@
  *
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class TemporaryStorageFactory
 {
@@ -20,7 +19,6 @@ class TemporaryStorageFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -28,7 +26,6 @@ class TemporaryStorageFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -37,7 +34,6 @@ class TemporaryStorageFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Search\Adapter\Mysql\TemporaryStorage
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/OptionsInterface.php b/lib/internal/Magento/Framework/Search/Adapter/OptionsInterface.php
index 8eb38aa98c3da..f91af9bb12a2c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/OptionsInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/OptionsInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Search\Adapter\OptionsInterface
  *
- * @since 2.0.0
  */
 interface OptionsInterface
 {
@@ -16,7 +15,6 @@ interface OptionsInterface
      * Get all options
      *
      * @return array
-     * @since 2.0.0
      */
     public function get();
 }
diff --git a/lib/internal/Magento/Framework/Search/AdapterInterface.php b/lib/internal/Magento/Framework/Search/AdapterInterface.php
index 687c63655df53..38faac4cb095b 100644
--- a/lib/internal/Magento/Framework/Search/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Search/AdapterInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Search Adapter interface
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -18,7 +17,6 @@ interface AdapterInterface
      *
      * @param RequestInterface $request
      * @return QueryResponse
-     * @since 2.0.0
      */
     public function query(RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
index f9ec22f17c9c1..6f95060e2a8df 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
@@ -10,7 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
- * @since 2.0.0
  */
 class Algorithm
 {
@@ -46,7 +45,6 @@ class Algorithm
      * Upper values limit
      *
      * @var null|float
-     * @since 2.0.0
      */
     protected $_upperLimit = null;
 
@@ -54,7 +52,6 @@ class Algorithm
      * Lower values limit
      *
      * @var null|float
-     * @since 2.0.0
      */
     protected $_lowerLimit = null;
 
@@ -62,7 +59,6 @@ class Algorithm
      * Number of segmentation intervals
      *
      * @var null|int
-     * @since 2.0.0
      */
     protected $_intervalsNumber = null;
 
@@ -70,7 +66,6 @@ class Algorithm
      * Upper limits of skipped quantiles
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_skippedQuantilesUpperLimits = [];
 
@@ -78,7 +73,6 @@ class Algorithm
      * Total count of values
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_count = 0;
 
@@ -86,7 +80,6 @@ class Algorithm
      * Current quantile interval
      *
      * @var array [from, to]
-     * @since 2.0.0
      */
     protected $_quantileInterval = [0, 0];
 
@@ -94,7 +87,6 @@ class Algorithm
      * Values of current quantile
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_values = [];
 
@@ -102,7 +94,6 @@ class Algorithm
      * Max value
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_maxValue = 0;
 
@@ -110,7 +101,6 @@ class Algorithm
      * Min value
      *
      * @var float
-     * @since 2.0.0
      */
     protected $_minValue = 0;
 
@@ -118,7 +108,6 @@ class Algorithm
      * Last value query limiter
      *
      * @var array [index, value]
-     * @since 2.0.0
      */
     protected $_lastValueLimiter = [null, 0];
 
@@ -128,7 +117,6 @@ class Algorithm
      * @param null|float $lowerLimit
      * @param null|float $upperLimit
      * @return \Magento\Framework\Search\Dynamic\Algorithm
-     * @since 2.0.0
      */
     public function setLimits($lowerLimit = null, $upperLimit = null)
     {
@@ -146,7 +134,6 @@ public function setLimits($lowerLimit = null, $upperLimit = null)
      * @param float $standardDeviation
      * @param int $count
      * @return $this
-     * @since 2.0.0
      */
     public function setStatistics($min, $max, $standardDeviation, $count)
     {
@@ -179,7 +166,6 @@ public function setStatistics($min, $max, $standardDeviation, $count)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function calculateSeparators(IntervalInterface $interval)
     {
@@ -260,7 +246,6 @@ public function calculateSeparators(IntervalInterface $interval)
      * Get amount of segmentation intervals
      *
      * @return int
-     * @since 2.0.0
      */
     protected function getIntervalsNumber()
     {
@@ -280,7 +265,6 @@ protected function getIntervalsNumber()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     protected function _findValueSeparator($quantileNumber, IntervalInterface $interval)
     {
@@ -392,7 +376,6 @@ protected function _findValueSeparator($quantileNumber, IntervalInterface $inter
      *
      * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals
      * @return null|float[] [floatMin,floatMax]
-     * @since 2.0.0
      */
     protected function _getQuantileInterval($quantileNumber)
     {
@@ -424,7 +407,6 @@ protected function _getQuantileInterval($quantileNumber)
      *
      * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals
      * @return float|null
-     * @since 2.0.0
      */
     protected function _getQuantile($quantileNumber)
     {
@@ -445,7 +427,6 @@ protected function _getQuantile($quantileNumber)
      * @return false|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _findRoundValue($lowerValue, $upperValue, $returnEmpty = true, $roundingFactor = null)
     {
@@ -510,7 +491,6 @@ protected function _findRoundValue($lowerValue, $upperValue, $returnEmpty = true
      * @param array &$oldRoundValues
      * @param array &$newRoundValues
      * @return void
-     * @since 2.0.0
      */
     protected function _mergeRoundValues(&$oldRoundValues, &$newRoundValues)
     {
@@ -529,7 +509,6 @@ protected function _mergeRoundValues(&$oldRoundValues, &$newRoundValues)
      * Get intervals number with checking skipped quantiles
      *
      * @return int
-     * @since 2.0.0
      */
     protected function _getCalculatedIntervalsNumber()
     {
@@ -542,7 +521,6 @@ protected function _getCalculatedIntervalsNumber()
      * @param int $quantileNumber
      * @param array $separators
      * @return array|false [deflection, separatorValue, $valueIndex]
-     * @since 2.0.0
      */
     protected function _findBestSeparator($quantileNumber, $separators)
     {
@@ -580,7 +558,6 @@ protected function _findBestSeparator($quantileNumber, $separators)
      * @return int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _binarySearch($value, $limits = null)
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
index b15398b6c3bce..574c4a65b939d 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
@@ -12,7 +12,6 @@
 /**
  * Interface \Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface
  *
- * @since 2.0.0
  */
 interface AlgorithmInterface
 {
@@ -21,7 +20,6 @@ interface AlgorithmInterface
      * @param array $dimensions
      * @param EntityStorage $entityStorage
      * @return array
-     * @since 2.0.0
      */
     public function getItems(BucketInterface $bucket, array $dimensions, EntityStorage $entityStorage);
 }
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
index e1df711041beb..954f9d5f34e2b 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
@@ -14,26 +14,22 @@
 /**
  * Class \Magento\Framework\Search\Dynamic\Algorithm\Auto
  *
- * @since 2.0.0
  */
 class Auto implements AlgorithmInterface
 {
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @var OptionsInterface
-     * @since 2.0.0
      */
     private $options;
 
     /**
      * @param DataProviderInterface $dataProvider
      * @param OptionsInterface $options
-     * @since 2.0.0
      */
     public function __construct(DataProviderInterface $dataProvider, OptionsInterface $options)
     {
@@ -43,7 +39,6 @@ public function __construct(DataProviderInterface $dataProvider, OptionsInterfac
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems(
         BucketInterface $bucket,
@@ -66,7 +61,6 @@ public function getItems(
      * @param array $dimensions
      * @param EntityStorage $entityStorage
      * @return number
-     * @since 2.0.0
      */
     private function getRange($bucket, array $dimensions, EntityStorage $entityStorage)
     {
@@ -86,7 +80,6 @@ private function getRange($bucket, array $dimensions, EntityStorage $entityStora
      *
      * @param EntityStorage $entityStorage
      * @return float
-     * @since 2.0.0
      */
     private function getMaxPriceInt(EntityStorage $entityStorage)
     {
@@ -99,7 +92,6 @@ private function getMaxPriceInt(EntityStorage $entityStorage)
 
     /**
      * @return int
-     * @since 2.0.0
      */
     private function getMinRangePower()
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
index 791c0de77fb41..af85ce10e5faf 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
@@ -14,25 +14,21 @@
 /**
  * Class \Magento\Framework\Search\Dynamic\Algorithm\Improved
  *
- * @since 2.0.0
  */
 class Improved implements AlgorithmInterface
 {
     /**
      * @var Algorithm
-     * @since 2.0.0
      */
     private $algorithm;
 
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @var OptionsInterface
-     * @since 2.0.0
      */
     private $options;
 
@@ -40,7 +36,6 @@ class Improved implements AlgorithmInterface
      * @param DataProviderInterface $dataProvider
      * @param Algorithm $algorithm
      * @param OptionsInterface $options
-     * @since 2.0.0
      */
     public function __construct(
         DataProviderInterface $dataProvider,
@@ -54,7 +49,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems(
         BucketInterface $bucket,
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Manual.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Manual.php
index 624d925c92f18..afe5d513104f9 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Manual.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Manual.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Framework\Search\Dynamic\Algorithm\Manual
  *
- * @since 2.0.0
  */
 class Manual implements AlgorithmInterface
 {
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     private $dataProvider;
 
     /**
      * @var OptionsInterface
-     * @since 2.0.0
      */
     private $options;
 
     /**
      * @param DataProviderInterface $dataProvider
      * @param OptionsInterface $options
-     * @since 2.0.0
      */
     public function __construct(DataProviderInterface $dataProvider, OptionsInterface $options)
     {
@@ -42,7 +38,6 @@ public function __construct(DataProviderInterface $dataProvider, OptionsInterfac
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getItems(
         BucketInterface $bucket,
@@ -65,7 +60,6 @@ public function getItems(
      * @param array $items
      * @param int $maxIntervalsNumber
      * @return array
-     * @since 2.0.0
      */
     private function processRange($items, $maxIntervalsNumber)
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
index 47669b8f1e59b..3a964db113ef0 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
@@ -10,25 +10,21 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Repository
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $algorithms = [];
 
     /**
      * @var AlgorithmInterface[]
-     * @since 2.0.0
      */
     private $instances = [];
 
@@ -37,7 +33,6 @@ class Repository
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $algorithms
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, array $algorithms)
     {
@@ -52,7 +47,6 @@ public function __construct(ObjectManagerInterface $objectManager, array $algori
      * @param array $data
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return AlgorithmInterface
-     * @since 2.0.0
      */
     public function get($algorithmType, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
index 9b794ec0e6449..0c4ed8c9a084f 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DataProviderFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $dataProvider;
 
@@ -33,7 +30,6 @@ class DataProviderFactory
      * @param string $configPath
      * @param string[] $dataProviders
      * @param string $scope
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @param array $data
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
index e88ed0b02fa3d..fa360134663d6 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
@@ -19,14 +18,12 @@ interface DataProviderInterface
      * Get range
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRange();
 
     /**
      * @param EntityStorage $entityStorage
      * @return array
-     * @since 2.0.0
      */
     public function getAggregations(EntityStorage $entityStorage);
 
@@ -35,7 +32,6 @@ public function getAggregations(EntityStorage $entityStorage);
      * @param array $dimensions
      * @param EntityStorage $entityStorage
      * @return IntervalInterface
-     * @since 2.0.0
      */
     public function getInterval(
         BucketInterface $bucket,
@@ -49,7 +45,6 @@ public function getInterval(
      * @param int $range
      * @param EntityStorage $entityStorage
      * @return array
-     * @since 2.0.0
      */
     public function getAggregation(
         BucketInterface $bucket,
@@ -62,7 +57,6 @@ public function getAggregation(
      * @param int $range
      * @param array $dbRanges
      * @return array
-     * @since 2.0.0
      */
     public function prepareData($range, array $dbRanges);
 }
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
index 7069d9fcdf94b..e32096704025f 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
@@ -8,19 +8,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class EntityStorage
 {
     /**
      * @var mixed
-     * @since 2.0.0
      */
     private $source;
 
     /**
      * @param mixed $source
-     * @since 2.0.0
      */
     public function __construct($source)
     {
@@ -29,7 +26,6 @@ public function __construct($source)
 
     /**
      * @return mixed
-     * @since 2.0.0
      */
     public function getSource()
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
index 54e114c8dd847..96e6b0113d1a7 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
@@ -10,7 +10,6 @@
 /**
  * EntityStorage Factory
  * @api
- * @since 2.0.0
  */
 class EntityStorageFactory
 {
@@ -18,7 +17,6 @@ class EntityStorageFactory
      * Object Manager instance
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -26,7 +24,6 @@ class EntityStorageFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -35,7 +32,6 @@ class EntityStorageFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -50,7 +46,6 @@ public function __construct(
      *
      * @param array $source
      * @return \Magento\Framework\Search\Dynamic\EntityStorage
-     * @since 2.0.0
      */
     public function create($source)
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
index d2c1b9f2308ce..94e38eb152c66 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
@@ -11,19 +11,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class IntervalFactory
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $interval;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -33,7 +30,6 @@ class IntervalFactory
      * @param string $configPath
      * @param string[] $intervals
      * @param string $scope
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -56,7 +52,6 @@ public function __construct(
      *
      * @param array $data
      * @return IntervalInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
index 66dd93c6f9631..547166eb175ba 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface IntervalInterface
 {
@@ -17,7 +16,6 @@ interface IntervalInterface
      * @param null|int $lower
      * @param null|int $upper
      * @return array
-     * @since 2.0.0
      */
     public function load($limit, $offset = null, $lower = null, $upper = null);
 
@@ -26,7 +24,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null);
      * @param int $index
      * @param null|int $lower
      * @return array
-     * @since 2.0.0
      */
     public function loadPrevious($data, $index, $lower = null);
 
@@ -35,7 +32,6 @@ public function loadPrevious($data, $index, $lower = null);
      * @param int $rightIndex
      * @param null|int $upper
      * @return array
-     * @since 2.0.0
      */
     public function loadNext($data, $rightIndex, $upper = null);
 }
diff --git a/lib/internal/Magento/Framework/Search/EntityMetadata.php b/lib/internal/Magento/Framework/Search/EntityMetadata.php
index c58368420549f..8d25921813df3 100644
--- a/lib/internal/Magento/Framework/Search/EntityMetadata.php
+++ b/lib/internal/Magento/Framework/Search/EntityMetadata.php
@@ -9,20 +9,17 @@
 /**
  * Entity metadata
  * @api
- * @since 2.0.0
  */
 class EntityMetadata
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $entityId;
 
     /**
      * @param string $entityId
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($entityId)
     {
@@ -34,7 +31,6 @@ public function __construct($entityId)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getEntityId()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request.php b/lib/internal/Magento/Framework/Search/Request.php
index 3a2d0b7039a00..d55b2085e87ef 100644
--- a/lib/internal/Magento/Framework/Search/Request.php
+++ b/lib/internal/Magento/Framework/Search/Request.php
@@ -14,25 +14,21 @@
  *
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class Request implements RequestInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $index;
 
     /**
      * @var RequestBucketInterface[]
-     * @since 2.0.0
      */
     protected $buckets;
 
@@ -40,25 +36,21 @@ class Request implements RequestInterface
      * Main query which represents the whole query hierarchy
      *
      * @var QueryInterface
-     * @since 2.0.0
      */
     protected $query;
 
     /**
      * @var int|null
-     * @since 2.0.0
      */
     protected $from;
 
     /**
      * @var int|null
-     * @since 2.0.0
      */
     protected $size;
 
     /**
      * @var Dimension[]
-     * @since 2.0.0
      */
     protected $dimensions;
 
@@ -70,7 +62,6 @@ class Request implements RequestInterface
      * @param int|null $size
      * @param Dimension[] $dimensions
      * @param RequestBucketInterface[] $buckets
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -92,7 +83,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -101,7 +91,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getIndex()
     {
@@ -110,7 +99,6 @@ public function getIndex()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDimensions()
     {
@@ -119,7 +107,6 @@ public function getDimensions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAggregation()
     {
@@ -128,7 +115,6 @@ public function getAggregation()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQuery()
     {
@@ -137,7 +123,6 @@ public function getQuery()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFrom()
     {
@@ -146,7 +131,6 @@ public function getFrom()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSize()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
index 95ee654ab1cb0..dfa28911ca4ce 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
@@ -10,25 +10,21 @@
 /**
  * Dynamic Buckets
  * @api
- * @since 2.0.0
  */
 class DynamicBucket implements BucketInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $method;
 
@@ -37,7 +33,6 @@ class DynamicBucket implements BucketInterface
      * @param string $field
      * @param string $method
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $field, $method)
     {
@@ -48,7 +43,6 @@ public function __construct($name, $field, $method)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -57,7 +51,6 @@ public function getType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -67,7 +60,6 @@ public function getName()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -79,7 +71,6 @@ public function getField()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMethod()
     {
@@ -89,7 +80,6 @@ public function getMethod()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMetrics()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/Metric.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/Metric.php
index 12a51f2dcc0fc..197b21aef3288 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/Metric.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/Metric.php
@@ -7,20 +7,17 @@
 
 /**
  * Metric
- * @since 2.0.0
  */
 class Metric
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $type;
 
     /**
      * @param string $type
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($type)
     {
@@ -32,7 +29,6 @@ public function __construct($type)
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getType()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/Range.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/Range.php
index 150b33ff78c81..681e08305264b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/Range.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/Range.php
@@ -8,19 +8,16 @@
 /**
  * Range
  * @SuppressWarnings(PHPMD.ShortVariable)
- * @since 2.0.0
  */
 class Range
 {
     /**
      * @var int|null
-     * @since 2.0.0
      */
     protected $from;
 
     /**
      * @var int|null
-     * @since 2.0.0
      */
     protected $to;
 
@@ -28,7 +25,6 @@ class Range
      * @param int|null $from
      * @param int|null $to
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($from, $to)
     {
@@ -41,7 +37,6 @@ public function __construct($from, $to)
      *
      * @return int|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFrom()
     {
@@ -53,7 +48,6 @@ public function getFrom()
      *
      * @return int|null
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTo()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php
index 63c80513c84ef..399f5700c145b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php
@@ -9,31 +9,26 @@
 
 /**
  * Range Buckets
- * @since 2.0.0
  */
 class RangeBucket implements BucketInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $metrics;
 
     /**
      * @var Range[]
-     * @since 2.0.0
      */
     protected $ranges;
 
@@ -42,7 +37,6 @@ class RangeBucket implements BucketInterface
      * @param string $field
      * @param array $metrics
      * @param Range[] $ranges
-     * @since 2.0.0
      */
     public function __construct($name, $field, array $metrics, array $ranges)
     {
@@ -54,7 +48,6 @@ public function __construct($name, $field, array $metrics, array $ranges)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -64,7 +57,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -74,7 +66,6 @@ public function getName()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -84,7 +75,6 @@ public function getField()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMetrics()
     {
@@ -96,7 +86,6 @@ public function getMetrics()
      *
      * @return Range[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getRanges()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
index bee1a7924b8cc..ca0efa15f6c0b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Search\Request\Aggregation\Status
  *
- * @since 2.0.0
  */
 class Status implements StatusInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isEnabled()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
index fe2592a3035f6..29fbb5fc810a6 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
@@ -9,13 +9,11 @@
 /**
  * Interface \Magento\Framework\Search\Request\Aggregation\StatusInterface
  *
- * @since 2.0.0
  */
 interface StatusInterface
 {
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled();
 }
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php
index d424207f5d4ec..86a0743019659 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php
@@ -9,25 +9,21 @@
 
 /**
  * Term Buckets
- * @since 2.0.0
  */
 class TermBucket implements BucketInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $metrics;
 
@@ -36,7 +32,6 @@ class TermBucket implements BucketInterface
      * @param string $field
      * @param array $metrics
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $field, array $metrics)
     {
@@ -47,7 +42,6 @@ public function __construct($name, $field, array $metrics)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -57,7 +51,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -67,7 +60,6 @@ public function getName()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -77,7 +69,6 @@ public function getField()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMetrics()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Binder.php b/lib/internal/Magento/Framework/Search/Request/Binder.php
index 5e42b91f84db3..34b5d72005e74 100644
--- a/lib/internal/Magento/Framework/Search/Request/Binder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Binder.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Binder
 {
@@ -17,7 +16,6 @@ class Binder
      * @param array $requestData
      * @param array $bindData
      * @return array
-     * @since 2.0.0
      */
     public function bind(array $requestData, array $bindData)
     {
@@ -36,7 +34,6 @@ public function bind(array $requestData, array $bindData)
      * @param array $data
      * @param array $bindData
      * @return array
-     * @since 2.0.0
      */
     private function processLimits($data, $bindData)
     {
@@ -55,7 +52,6 @@ private function processLimits($data, $bindData)
      * @param array $bindData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     private function processDimensions($data, $bindData)
     {
@@ -74,7 +70,6 @@ private function processDimensions($data, $bindData)
      * @param array $data
      * @param array $bindData
      * @return array
-     * @since 2.0.0
      */
     private function processData($data, $bindData)
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
index 9ccece6231ff5..8da797e5a9767 100644
--- a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
@@ -9,7 +9,6 @@
  * Aggregation Bucket Interface
  *
  * @api
- * @since 2.0.0
  */
 interface BucketInterface
 {
@@ -30,7 +29,6 @@ interface BucketInterface
      * Get Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -38,7 +36,6 @@ public function getType();
      * Get Field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getField();
 
@@ -46,7 +43,6 @@ public function getField();
      * Get Metrics
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMetrics();
 
@@ -54,7 +50,6 @@ public function getMetrics();
      * Get Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 }
diff --git a/lib/internal/Magento/Framework/Search/Request/Builder.php b/lib/internal/Magento/Framework/Search/Request/Builder.php
index 3769a47bca1e2..a16b3369cdda0 100644
--- a/lib/internal/Magento/Framework/Search/Request/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Builder.php
@@ -12,31 +12,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var Config
-     * @since 2.0.0
      */
     private $config;
 
     /**
      * @var Binder
-     * @since 2.0.0
      */
     private $binder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [
         'dimensions' => [],
@@ -45,7 +40,6 @@ class Builder
 
     /**
      * @var Cleaner
-     * @since 2.0.0
      */
     private $cleaner;
 
@@ -56,7 +50,6 @@ class Builder
      * @param Config $config
      * @param Binder $binder
      * @param Cleaner $cleaner
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, Config $config, Binder $binder, Cleaner $cleaner)
     {
@@ -71,7 +64,6 @@ public function __construct(ObjectManagerInterface $objectManager, Config $confi
      *
      * @param string $requestName
      * @return $this
-     * @since 2.0.0
      */
     public function setRequestName($requestName)
     {
@@ -84,7 +76,6 @@ public function setRequestName($requestName)
      *
      * @param int $size
      * @return $this
-     * @since 2.0.0
      */
     public function setSize($size)
     {
@@ -97,7 +88,6 @@ public function setSize($size)
      *
      * @param int $from
      * @return $this
-     * @since 2.0.0
      */
     public function setFrom($from)
     {
@@ -111,7 +101,6 @@ public function setFrom($from)
      * @param string $name
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function bindDimension($name, $value)
     {
@@ -125,7 +114,6 @@ public function bindDimension($name, $value)
      * @param string $placeholder
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function bind($placeholder, $value)
     {
@@ -137,7 +125,6 @@ public function bind($placeholder, $value)
      * Create request object
      *
      * @return RequestInterface
-     * @since 2.0.0
      */
     public function create()
     {
@@ -163,7 +150,6 @@ public function create()
      * Clear data
      *
      * @return void
-     * @since 2.0.0
      */
     private function clear()
     {
@@ -178,7 +164,6 @@ private function clear()
      *
      * @param array $data
      * @return RequestInterface
-     * @since 2.0.0
      */
     private function convert($data)
     {
@@ -210,7 +195,6 @@ private function convert($data)
     /**
      * @param array $dimensionsData
      * @return array
-     * @since 2.0.0
      */
     private function buildDimensions(array $dimensionsData)
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index 4c8653f828e14..984065d1e2a2c 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -11,31 +11,26 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cleaner
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $requestData;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $mappedQueries;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $mappedFilters;
 
     /**
      * @var AggregationStatus
-     * @since 2.0.0
      */
     private $aggregationStatus;
 
@@ -43,7 +38,6 @@ class Cleaner
      * Cleaner constructor
      *
      * @param AggregationStatus $aggregationStatus
-     * @since 2.0.0
      */
     public function __construct(AggregationStatus $aggregationStatus)
     {
@@ -55,7 +49,6 @@ public function __construct(AggregationStatus $aggregationStatus)
      *
      * @param array $requestData
      * @return array
-     * @since 2.0.0
      */
     public function clean(array $requestData)
     {
@@ -82,7 +75,6 @@ public function clean(array $requestData)
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     private function cleanQuery($queryName)
     {
@@ -135,7 +127,6 @@ private function cleanQuery($queryName)
      * Clean aggregations if we don't need to process them
      *
      * @return void
-     * @since 2.0.0
      */
     private function cleanAggregations()
     {
@@ -165,7 +156,6 @@ private function cleanAggregations()
      * @throws StateException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function cleanFilter($filterName)
     {
@@ -215,7 +205,6 @@ private function cleanFilter($filterName)
      *
      * @param array $queryReference
      * @return array
-     * @since 2.0.0
      */
     private function processQueryReference($queryReference)
     {
@@ -233,7 +222,6 @@ private function processQueryReference($queryReference)
      *
      * @param array $filterReference
      * @return array
-     * @since 2.0.0
      */
     private function processFilterReference($filterReference)
     {
@@ -250,7 +238,6 @@ private function processFilterReference($filterReference)
      * Clear variables to default status
      *
      * @return void
-     * @since 2.0.0
      */
     private function clear()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Config.php b/lib/internal/Magento/Framework/Search/Request/Config.php
index 68a7297de51e1..1179973a267c3 100644
--- a/lib/internal/Magento/Framework/Search/Request/Config.php
+++ b/lib/internal/Magento/Framework/Search/Request/Config.php
@@ -9,7 +9,6 @@
 
 /**
  * Provides search request configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\Data
 {
@@ -25,7 +24,6 @@ class Config extends \Magento\Framework\Config\Data
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Search\Request\Config\FilesystemReader $reader,
diff --git a/lib/internal/Magento/Framework/Search/Request/Config/Converter.php b/lib/internal/Magento/Framework/Search/Request/Config/Converter.php
index a93266203b22f..98b4910932f39 100644
--- a/lib/internal/Magento/Framework/Search/Request/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Search/Request/Config/Converter.php
@@ -7,7 +7,6 @@
 
 /**
  * Search Request xml converter
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -16,7 +15,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
@@ -42,7 +40,6 @@ public function convert($source)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function mergeAttributes($data)
     {
@@ -59,7 +56,6 @@ protected function mergeAttributes($data)
      * @param \SimpleXMLElement $nodes
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     protected function convertNodes(\SimpleXMLElement $nodes, $name)
     {
@@ -87,7 +83,6 @@ protected function convertNodes(\SimpleXMLElement $nodes, $name)
      *
      * @param \SimpleXMLElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function convertToArray(\SimpleXMLElement $node)
     {
@@ -100,7 +95,6 @@ protected function convertToArray(\SimpleXMLElement $node)
      * @param array $element
      * @param \SimpleXMLElement $node
      * @return array
-     * @since 2.0.0
      */
     protected function convertChildNodes(array $element, \SimpleXMLElement $node)
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Config/FilesystemReader.php b/lib/internal/Magento/Framework/Search/Request/Config/FilesystemReader.php
index 5440111984a00..13a32249d4bda 100644
--- a/lib/internal/Magento/Framework/Search/Request/Config/FilesystemReader.php
+++ b/lib/internal/Magento/Framework/Search/Request/Config/FilesystemReader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Search\Request\Config\FilesystemReader
  *
- * @since 2.0.0
  */
 class FilesystemReader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -16,7 +15,6 @@ class FilesystemReader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = [
         '/requests/request' => 'query',
@@ -39,7 +37,6 @@ class FilesystemReader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
diff --git a/lib/internal/Magento/Framework/Search/Request/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Search/Request/Config/SchemaLocator.php
index 0d1fab356823c..22ec01b6eb0c1 100644
--- a/lib/internal/Magento/Framework/Search/Request/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Search/Request/Config/SchemaLocator.php
@@ -7,18 +7,15 @@
 
 /**
  * Search Request schema locator
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
     /**
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -29,7 +26,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -40,7 +36,6 @@ public function getSchema()
      * Get path to pre file validation schema
      *
      * @return null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Dimension.php b/lib/internal/Magento/Framework/Search/Request/Dimension.php
index 859ebd572478c..bc60af8c16959 100644
--- a/lib/internal/Magento/Framework/Search/Request/Dimension.php
+++ b/lib/internal/Magento/Framework/Search/Request/Dimension.php
@@ -10,7 +10,6 @@
 /**
  * Search Request Dimension
  * @api
- * @since 2.0.0
  */
 class Dimension extends AbstractKeyValuePair
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php b/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
index eebc8acb0ea1b..5a1d2ad528237 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
@@ -10,13 +10,11 @@
 /**
  * Bool Filter
  * @api
- * @since 2.0.0
  */
 class BoolExpression implements FilterInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -24,7 +22,6 @@ class BoolExpression implements FilterInterface
      * Filter names to which result set MUST satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $must = [];
 
@@ -32,7 +29,6 @@ class BoolExpression implements FilterInterface
      * Filter names to which result set SHOULD satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $should = [];
 
@@ -40,7 +36,6 @@ class BoolExpression implements FilterInterface
      * Filter names to which result set MUST NOT satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mustNot = [];
 
@@ -50,7 +45,6 @@ class BoolExpression implements FilterInterface
      * @param array $should
      * @param array $not
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, array $must = [], array $should = [], array $not = [])
     {
@@ -62,7 +56,6 @@ public function __construct($name, array $must = [], array $should = [], array $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -72,7 +65,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -84,7 +76,6 @@ public function getName()
      *
      * @return \Magento\Framework\Search\Request\FilterInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMust()
     {
@@ -96,7 +87,6 @@ public function getMust()
      *
      * @return \Magento\Framework\Search\Request\FilterInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getShould()
     {
@@ -108,7 +98,6 @@ public function getShould()
      *
      * @return \Magento\Framework\Search\Request\FilterInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMustNot()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Range.php b/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
index 2731cfad596e4..1be0c690483ab 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
@@ -11,31 +11,26 @@
  * Range Filter
  * @SuppressWarnings(PHPMD.ShortVariable)
  * @api
- * @since 2.0.0
  */
 class Range implements FilterInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $from;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $to;
 
@@ -44,7 +39,6 @@ class Range implements FilterInterface
      * @param string $field
      * @param int $from
      * @param int $to
-     * @since 2.0.0
      */
     public function __construct($name, $field, $from, $to)
     {
@@ -56,7 +50,6 @@ public function __construct($name, $field, $from, $to)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -66,7 +59,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -77,7 +69,6 @@ public function getName()
      * Get Field
      *
      * @return string
-     * @since 2.0.0
      */
     public function getField()
     {
@@ -89,7 +80,6 @@ public function getField()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getFrom()
     {
@@ -101,7 +91,6 @@ public function getFrom()
      *
      * @return int
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getTo()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Term.php b/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
index ae85f89866a79..5560c92164db4 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
@@ -11,13 +11,11 @@
 /**
  * Term Filter
  * @api
- * @since 2.0.0
  */
 class Term extends AbstractKeyValuePair implements FilterInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
@@ -26,7 +24,6 @@ class Term extends AbstractKeyValuePair implements FilterInterface
      * @param string|array $value
      * @param string $field
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $value, $field)
     {
@@ -36,7 +33,6 @@ public function __construct($name, $value, $field)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -48,7 +44,6 @@ public function getType()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getField()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php b/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
index def3d1e5349fc..60b5463132003 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
@@ -11,13 +11,11 @@
 /**
  * Wildcard Filter
  * @api
- * @since 2.0.0
  */
 class Wildcard extends AbstractKeyValuePair implements FilterInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $field;
 
@@ -26,7 +24,6 @@ class Wildcard extends AbstractKeyValuePair implements FilterInterface
      * @param string|array $value
      * @param string $field
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $value, $field)
     {
@@ -36,7 +33,6 @@ public function __construct($name, $value, $field)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -48,7 +44,6 @@ public function getType()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getField()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/FilterInterface.php b/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
index 15e916b36ea28..14fdd2929b15d 100644
--- a/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
@@ -9,7 +9,6 @@
  * Filter Interface
  *
  * @api
- * @since 2.0.0
  */
 interface FilterInterface
 {
@@ -30,7 +29,6 @@ interface FilterInterface
      * Get Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -38,7 +36,6 @@ public function getType();
      * Get Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 }
diff --git a/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php b/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
index 5d84a45a360c5..d9412cb8517fa 100644
--- a/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\Search\Request\IndexScopeResolverInterface
  *
- * @since 2.0.0
  */
 interface IndexScopeResolverInterface
 {
@@ -16,7 +15,6 @@ interface IndexScopeResolverInterface
      * @param string $index
      * @param Dimension[] $dimensions
      * @return string
-     * @since 2.0.0
      */
     public function resolve($index, array $dimensions);
 }
diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php
index d32f2904697ad..797d38ac7d39b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php
@@ -12,55 +12,46 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Mapper
 {
     /**
      * @var QueryInterface
-     * @since 2.0.0
      */
     private $rootQuery;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $queries;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $filters;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $mappedQueries;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $mappedFilters;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $aggregations;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $rootQueryName;
 
@@ -73,7 +64,6 @@ class Mapper
      * @throws \Exception
      * @throws \InvalidArgumentException
      * @throws StateException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -96,7 +86,6 @@ public function __construct(
      * @throws \Exception
      * @throws \InvalidArgumentException
      * @throws StateException
-     * @since 2.0.0
      */
     public function getRootQuery()
     {
@@ -118,7 +107,6 @@ public function getRootQuery()
      * @throws \InvalidArgumentException
      * @throws StateException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     private function mapQuery($queryName)
     {
@@ -188,7 +176,6 @@ private function mapQuery($queryName)
      * @throws \Exception
      * @throws \InvalidArgumentException
      * @throws StateException
-     * @since 2.0.0
      */
     private function mapFilter($filterName)
     {
@@ -254,7 +241,6 @@ private function mapFilter($filterName)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     private function aggregateFiltersByType($data)
     {
@@ -270,7 +256,6 @@ private function aggregateFiltersByType($data)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     private function aggregateQueriesByType($data)
     {
@@ -284,7 +269,6 @@ private function aggregateQueriesByType($data)
     /**
      * @return void
      * @throws StateException
-     * @since 2.0.0
      */
     private function validate()
     {
@@ -295,7 +279,6 @@ private function validate()
     /**
      * @return void
      * @throws StateException
-     * @since 2.0.0
      */
     private function validateQueries()
     {
@@ -308,7 +291,6 @@ private function validateQueries()
      * @param string $errorMessage
      * @return void
      * @throws \Magento\Framework\Exception\StateException
-     * @since 2.0.0
      */
     private function validateNotUsed($elements, $mappedElements, $errorMessage)
     {
@@ -322,7 +304,6 @@ private function validateNotUsed($elements, $mappedElements, $errorMessage)
     /**
      * @return void
      * @throws StateException
-     * @since 2.0.0
      */
     private function validateFilters()
     {
@@ -334,7 +315,6 @@ private function validateFilters()
      *
      * @return array
      * @throws StateException
-     * @since 2.0.0
      */
     public function getBuckets()
     {
@@ -384,7 +364,6 @@ public function getBuckets()
      *
      * @param array $bucketData
      * @return array
-     * @since 2.0.0
      */
     private function mapMetrics(array $bucketData)
     {
@@ -408,7 +387,6 @@ private function mapMetrics(array $bucketData)
      *
      * @param array $bucketData
      * @return array
-     * @since 2.0.0
      */
     private function mapRanges(array $bucketData)
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php b/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
index 33ed0ed29713a..1ac3ba6c09b3b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
@@ -10,7 +10,6 @@
 /**
  * Bool Query
  * @api
- * @since 2.0.0
  */
 class BoolExpression implements QueryInterface
 {
@@ -22,7 +21,6 @@ class BoolExpression implements QueryInterface
      * Boost
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $boost;
 
@@ -30,7 +28,6 @@ class BoolExpression implements QueryInterface
      * Query Name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -38,7 +35,6 @@ class BoolExpression implements QueryInterface
      * Query names to which result set SHOULD satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $should = [];
 
@@ -46,7 +42,6 @@ class BoolExpression implements QueryInterface
      * Query names to which result set MUST satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $must = [];
 
@@ -54,7 +49,6 @@ class BoolExpression implements QueryInterface
      * Query names to which result set MUST NOT satisfy
      *
      * @var array
-     * @since 2.0.0
      */
     protected $mustNot = [];
 
@@ -65,7 +59,6 @@ class BoolExpression implements QueryInterface
      * @param array $should
      * @param array $not
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $boost, array $must = [], array $should = [], array $not = [])
     {
@@ -78,7 +71,6 @@ public function __construct($name, $boost, array $must = [], array $should = [],
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -88,7 +80,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -97,7 +88,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBoost()
     {
@@ -109,7 +99,6 @@ public function getBoost()
      *
      * @return QueryInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getShould()
     {
@@ -121,7 +110,6 @@ public function getShould()
      *
      * @return QueryInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMust()
     {
@@ -133,7 +121,6 @@ public function getMust()
      *
      * @return QueryInterface[]
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMustNot()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/Filter.php b/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
index 716d45bfc4df2..7de25175793e4 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
@@ -10,7 +10,6 @@
 /**
  * Term Query
  * @api
- * @since 2.0.0
  */
 class Filter implements QueryInterface
 {
@@ -23,17 +22,13 @@ class Filter implements QueryInterface
 
     /**#@-*/
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $name;
 
     /**
      * Boost
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $boost;
 
@@ -41,7 +36,6 @@ class Filter implements QueryInterface
      * Reference Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $referenceType;
 
@@ -49,7 +43,6 @@ class Filter implements QueryInterface
      * Reference Name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $reference;
 
@@ -58,7 +51,6 @@ class Filter implements QueryInterface
      * @param int|null $boost
      * @param string $referenceType
      * @param string $reference
-     * @since 2.0.0
      */
     public function __construct($name, $boost, $referenceType, $reference)
     {
@@ -71,7 +63,6 @@ public function __construct($name, $boost, $referenceType, $reference)
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -81,7 +72,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -90,7 +80,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBoost()
     {
@@ -102,7 +91,6 @@ public function getBoost()
      *
      * @return mixed
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getReference()
     {
@@ -114,7 +102,6 @@ public function getReference()
      *
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getReferenceType()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/Match.php b/lib/internal/Magento/Framework/Search/Request/Query/Match.php
index b28f384804b74..a1f884dbc106e 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/Match.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/Match.php
@@ -10,7 +10,6 @@
 /**
  * Match Query
  * @api
- * @since 2.0.0
  */
 class Match implements QueryInterface
 {
@@ -18,7 +17,6 @@ class Match implements QueryInterface
      * Name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -26,7 +24,6 @@ class Match implements QueryInterface
      * Value
      *
      * @var string
-     * @since 2.0.0
      */
     protected $value;
 
@@ -34,7 +31,6 @@ class Match implements QueryInterface
      * Boost
      *
      * @var int|null
-     * @since 2.0.0
      */
     protected $boost;
 
@@ -47,7 +43,6 @@ class Match implements QueryInterface
      * )
      *
      * @var array
-     * @since 2.0.0
      */
     protected $matches = [];
 
@@ -57,7 +52,6 @@ class Match implements QueryInterface
      * @param int|null $boost
      * @param array $matches
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function __construct($name, $value, $boost, array $matches)
     {
@@ -69,7 +63,6 @@ public function __construct($name, $value, $boost, array $matches)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -79,7 +72,6 @@ public function getValue()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -89,7 +81,6 @@ public function getType()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -99,7 +90,6 @@ public function getName()
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getBoost()
     {
@@ -111,7 +101,6 @@ public function getBoost()
      *
      * @return array
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getMatches()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/QueryInterface.php b/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
index b196ddeb3490e..e7cf56172cbaf 100644
--- a/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
@@ -9,7 +9,6 @@
  * Query Interface
  *
  * @api
- * @since 2.0.0
  */
 interface QueryInterface
 {
@@ -28,7 +27,6 @@ interface QueryInterface
      * Get Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -36,7 +34,6 @@ public function getType();
      * Get Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -44,7 +41,6 @@ public function getName();
      * Get Boost
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getBoost();
 }
diff --git a/lib/internal/Magento/Framework/Search/RequestInterface.php b/lib/internal/Magento/Framework/Search/RequestInterface.php
index 342d515c26de6..16df80f755c07 100644
--- a/lib/internal/Magento/Framework/Search/RequestInterface.php
+++ b/lib/internal/Magento/Framework/Search/RequestInterface.php
@@ -13,7 +13,6 @@
  * Search Request
  *
  * @api
- * @since 2.0.0
  */
 interface RequestInterface
 {
@@ -21,7 +20,6 @@ interface RequestInterface
      * Get Name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -29,7 +27,6 @@ public function getName();
      * Get Index name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIndex();
 
@@ -37,7 +34,6 @@ public function getIndex();
      * Get all dimensions
      *
      * @return Dimension[]
-     * @since 2.0.0
      */
     public function getDimensions();
 
@@ -45,7 +41,6 @@ public function getDimensions();
      * Get Aggregation Buckets
      *
      * @return RequestBucketInterface[]
-     * @since 2.0.0
      */
     public function getAggregation();
 
@@ -53,7 +48,6 @@ public function getAggregation();
      * Get Main Request Query
      *
      * @return QueryInterface
-     * @since 2.0.0
      */
     public function getQuery();
 
@@ -61,7 +55,6 @@ public function getQuery();
      * Get From
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getFrom();
 
@@ -69,7 +62,6 @@ public function getFrom();
      * Get Size
      *
      * @return int|null
-     * @since 2.0.0
      */
     public function getSize();
 }
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
index b5950d0f8daae..9cb7a364ff21c 100644
--- a/lib/internal/Magento/Framework/Search/Response/Aggregation.php
+++ b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
@@ -11,7 +11,6 @@
 /**
  * Faceted data
  * @api
- * @since 2.0.0
  */
 class Aggregation implements AggregationInterface, \IteratorAggregate
 {
@@ -19,13 +18,11 @@ class Aggregation implements AggregationInterface, \IteratorAggregate
      * Buckets array
      *
      * @var BucketInterface[]
-     * @since 2.0.0
      */
     protected $buckets;
 
     /**
      * @param BucketInterface[] $buckets
-     * @since 2.0.0
      */
     public function __construct(array $buckets)
     {
@@ -36,7 +33,6 @@ public function __construct(array $buckets)
      * Implementation of \IteratorAggregate::getIterator()
      *
      * @return \ArrayIterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -48,7 +44,6 @@ public function getIterator()
      *
      * @param string $bucketName
      * @return BucketInterface
-     * @since 2.0.0
      */
     public function getBucket($bucketName)
     {
@@ -59,7 +54,6 @@ public function getBucket($bucketName)
      * Get all Document fields
      *
      * @return BucketInterface[]
-     * @since 2.0.0
      */
     public function getBuckets()
     {
@@ -70,7 +64,6 @@ public function getBuckets()
      * Get Document field names
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getBucketNames()
     {
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php b/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php
index 7f1c66827b661..335ce0d340dbf 100644
--- a/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php
+++ b/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php
@@ -10,26 +10,22 @@
 /**
  * Class \Magento\Framework\Search\Response\Aggregation\Value
  *
- * @since 2.0.0
  */
 class Value implements AggregationValueInterface
 {
     /**
      * @var string|array
-     * @since 2.0.0
      */
     private $value;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $metrics;
 
     /**
      * @param string|array $value
      * @param array $metrics
-     * @since 2.0.0
      */
     public function __construct($value, $metrics)
     {
@@ -39,7 +35,6 @@ public function __construct($value, $metrics)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -48,7 +43,6 @@ public function getValue()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMetrics()
     {
diff --git a/lib/internal/Magento/Framework/Search/Response/Bucket.php b/lib/internal/Magento/Framework/Search/Response/Bucket.php
index b9ff85009f17c..236498ad95d68 100644
--- a/lib/internal/Magento/Framework/Search/Response/Bucket.php
+++ b/lib/internal/Magento/Framework/Search/Response/Bucket.php
@@ -11,7 +11,6 @@
 
 /**
  * Facet Bucket
- * @since 2.0.0
  */
 class Bucket implements BucketInterface
 {
@@ -19,7 +18,6 @@ class Bucket implements BucketInterface
      * Field name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -27,14 +25,12 @@ class Bucket implements BucketInterface
      * Field values
      *
      * @var mixed
-     * @since 2.0.0
      */
     protected $values;
 
     /**
      * @param string $name
      * @param \Magento\Framework\Api\Search\AggregationValueInterface[] $values
-     * @since 2.0.0
      */
     public function __construct($name, $values)
     {
@@ -44,7 +40,6 @@ public function __construct($name, $values)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -53,7 +48,6 @@ public function getName()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getValues()
     {
diff --git a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
index f1e4eb1f01f64..c2328398e53dc 100644
--- a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
+++ b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
@@ -12,7 +12,6 @@
 /**
  * Search Response
  * @api
- * @since 2.0.0
  */
 class QueryResponse implements ResponseInterface
 {
@@ -20,7 +19,6 @@ class QueryResponse implements ResponseInterface
      * Document Collection
      *
      * @var Document[]
-     * @since 2.0.0
      */
     protected $documents;
 
@@ -28,14 +26,12 @@ class QueryResponse implements ResponseInterface
      * Aggregation Collection
      *
      * @var AggregationInterface
-     * @since 2.0.0
      */
     protected $aggregations;
 
     /**
      * @param Document[] $documents
      * @param AggregationInterface $aggregations
-     * @since 2.0.0
      */
     public function __construct(array $documents, AggregationInterface $aggregations)
     {
@@ -46,7 +42,6 @@ public function __construct(array $documents, AggregationInterface $aggregations
     /**
      * Countable: return count of fields in document
      * @return int
-     * @since 2.0.0
      */
     public function count()
     {
@@ -57,7 +52,6 @@ public function count()
      * Implementation of \IteratorAggregate::getIterator()
      *
      * @return \ArrayIterator
-     * @since 2.0.0
      */
     public function getIterator()
     {
@@ -66,7 +60,6 @@ public function getIterator()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAggregations()
     {
diff --git a/lib/internal/Magento/Framework/Search/ResponseInterface.php b/lib/internal/Magento/Framework/Search/ResponseInterface.php
index 15bca167ab05f..3b89528532602 100644
--- a/lib/internal/Magento/Framework/Search/ResponseInterface.php
+++ b/lib/internal/Magento/Framework/Search/ResponseInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Search Request
- * @since 2.0.0
  */
 interface ResponseInterface extends \IteratorAggregate, \Countable
 {
@@ -15,7 +14,6 @@ interface ResponseInterface extends \IteratorAggregate, \Countable
      * Return Aggregation Collection
      *
      * @return \Magento\Framework\Api\Search\AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations();
 }
diff --git a/lib/internal/Magento/Framework/Search/Search.php b/lib/internal/Magento/Framework/Search/Search.php
index fcab94cbda319..8f522f58fa8ef 100644
--- a/lib/internal/Magento/Framework/Search/Search.php
+++ b/lib/internal/Magento/Framework/Search/Search.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Framework\Search\Search
  *
- * @since 2.0.0
  */
 class Search implements SearchInterface
 {
     /**
      * @var Builder
-     * @since 2.0.0
      */
     private $requestBuilder;
 
     /**
      * @var ScopeResolverInterface
-     * @since 2.0.0
      */
     private $scopeResolver;
 
     /**
      * @var SearchEngineInterface
-     * @since 2.0.0
      */
     private $searchEngine;
 
     /**
      * @var SearchResponseBuilder
-     * @since 2.0.0
      */
     private $searchResponseBuilder;
 
@@ -46,7 +41,6 @@ class Search implements SearchInterface
      * @param ScopeResolverInterface $scopeResolver
      * @param SearchEngineInterface $searchEngine
      * @param SearchResponseBuilder $searchResponseBuilder
-     * @since 2.0.0
      */
     public function __construct(
         Builder $requestBuilder,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function search(SearchCriteriaInterface $searchCriteria)
     {
@@ -92,7 +85,6 @@ public function search(SearchCriteriaInterface $searchCriteria)
      * @param string $field
      * @param string|array|null $condition
      * @return $this
-     * @since 2.0.0
      */
     private function addFieldToFilter($field, $condition = null)
     {
diff --git a/lib/internal/Magento/Framework/Search/SearchEngineInterface.php b/lib/internal/Magento/Framework/Search/SearchEngineInterface.php
index a693bbe42cb7e..ecd7a1e0818dc 100644
--- a/lib/internal/Magento/Framework/Search/SearchEngineInterface.php
+++ b/lib/internal/Magento/Framework/Search/SearchEngineInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Search Engine interface
- * @since 2.0.0
  */
 interface SearchEngineInterface
 {
@@ -16,7 +15,6 @@ interface SearchEngineInterface
      *
      * @param RequestInterface $request
      * @return ResponseInterface
-     * @since 2.0.0
      */
     public function search(RequestInterface $request);
 }
diff --git a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
index 2bff8c57f5a8b..c35631c69ac57 100644
--- a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
+++ b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
@@ -12,27 +12,23 @@
 /**
  * Class \Magento\Framework\Search\SearchResponseBuilder
  *
- * @since 2.0.0
  */
 class SearchResponseBuilder
 {
     /**
      * @var DocumentFactory
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     private $documentFactory;
 
     /**
      * @var SearchResultFactory
-     * @since 2.0.0
      */
     private $searchResultFactory;
 
     /**
      * @param SearchResultFactory $searchResultFactory
      * @param DocumentFactory $documentFactory
-     * @since 2.0.0
      */
     public function __construct(
         SearchResultFactory $searchResultFactory,
@@ -45,7 +41,6 @@ public function __construct(
     /**
      * @param ResponseInterface $response
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function build(ResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 690dcfa90f347..498b88a4d8cf4 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -17,7 +17,6 @@
  * Magento session configuration
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Config implements ConfigInterface
 {
@@ -49,25 +48,21 @@ class Config implements ConfigInterface
      * All options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $options = [];
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_stringHelper;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_httpRequest;
 
@@ -75,7 +70,6 @@ class Config implements ConfigInterface
      * List of boolean options
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $booleanOptions = [
         'session.use_cookies',
@@ -86,7 +80,6 @@ class Config implements ConfigInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_scopeType;
 
@@ -98,7 +91,6 @@ class Config implements ConfigInterface
 
     /**
      * @var \Magento\Framework\ValidatorFactory
-     * @since 2.0.0
      */
     protected $_validatorFactory;
 
@@ -112,7 +104,6 @@ class Config implements ConfigInterface
      * @param string $scopeType
      * @param string $lifetimePath
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ValidatorFactory $validatorFactory,
@@ -182,7 +173,6 @@ public function __construct(
      * @param array $options
      * @param array $default
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options, $default = [])
     {
@@ -204,7 +194,6 @@ public function setOptions($options, $default = [])
      * Get all options set
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -217,7 +206,6 @@ public function getOptions()
      * @param string $option
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setOption($option, $value)
     {
@@ -232,7 +220,6 @@ public function setOption($option, $value)
      *
      * @param string $option
      * @return mixed
-     * @since 2.0.0
      */
     public function getOption($option)
     {
@@ -254,7 +241,6 @@ public function getOption($option)
      * Convert config to array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray()
     {
@@ -267,7 +253,6 @@ public function toArray()
      * @param string $name
      * @param string|null $default
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name, $default = null)
     {
@@ -284,7 +269,6 @@ public function setName($name, $default = null)
      * Get session.name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -296,7 +280,6 @@ public function getName()
      *
      * @param string $savePath
      * @return $this
-     * @since 2.0.0
      */
     public function setSavePath($savePath)
     {
@@ -308,7 +291,6 @@ public function setSavePath($savePath)
      * Set session.save_path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSavePath()
     {
@@ -321,7 +303,6 @@ public function getSavePath()
      * @param int $cookieLifetime
      * @param int|null $default
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieLifetime($cookieLifetime, $default = null)
     {
@@ -342,7 +323,6 @@ public function setCookieLifetime($cookieLifetime, $default = null)
      * Get session.cookie_lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCookieLifetime()
     {
@@ -355,7 +335,6 @@ public function getCookieLifetime()
      * @param string $cookiePath
      * @param string|null $default
      * @return $this
-     * @since 2.0.0
      */
     public function setCookiePath($cookiePath, $default = null)
     {
@@ -377,7 +356,6 @@ public function setCookiePath($cookiePath, $default = null)
      * Get session.cookie_path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookiePath()
     {
@@ -390,7 +368,6 @@ public function getCookiePath()
      * @param string $cookieDomain
      * @param string|null $default
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieDomain($cookieDomain, $default = null)
     {
@@ -411,7 +388,6 @@ public function setCookieDomain($cookieDomain, $default = null)
      * Get session.cookie_domain
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookieDomain()
     {
@@ -423,7 +399,6 @@ public function getCookieDomain()
      *
      * @param bool $cookieSecure
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieSecure($cookieSecure)
     {
@@ -436,7 +411,6 @@ public function setCookieSecure($cookieSecure)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCookieSecure()
     {
@@ -448,7 +422,6 @@ public function getCookieSecure()
      *
      * @param bool $cookieHttpOnly
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieHttpOnly($cookieHttpOnly)
     {
@@ -461,7 +434,6 @@ public function setCookieHttpOnly($cookieHttpOnly)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCookieHttpOnly()
     {
@@ -473,7 +445,6 @@ public function getCookieHttpOnly()
      *
      * @param bool $useCookies
      * @return $this
-     * @since 2.0.0
      */
     public function setUseCookies($useCookies)
     {
@@ -486,7 +457,6 @@ public function setUseCookies($useCookies)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseCookies()
     {
@@ -498,7 +468,6 @@ public function getUseCookies()
      *
      * @param string $option
      * @return string|bool
-     * @since 2.0.0
      */
     protected function getStorageOption($option)
     {
@@ -515,7 +484,6 @@ protected function getStorageOption($option)
      *
      * @param string $option
      * @return string
-     * @since 2.0.0
      */
     protected function getFixedOptionName($option)
     {
@@ -545,7 +513,6 @@ protected function getFixedOptionName($option)
      * @param  array $args
      * @return mixed
      * @throws \BadMethodCallException On non-getter/setter method
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
diff --git a/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php b/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
index 05e50d50a47b4..55c082b3d80aa 100644
--- a/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Session\Config\ConfigInterface
  *
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -19,7 +18,6 @@ interface ConfigInterface
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options);
 
@@ -27,7 +25,6 @@ public function setOptions($options);
      * Get all options set
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -37,7 +34,6 @@ public function getOptions();
      * @param string $option
      * @param mixed $value
      * @return $this
-     * @since 2.0.0
      */
     public function setOption($option, $value);
 
@@ -46,7 +42,6 @@ public function setOption($option, $value);
      *
      * @param string $option
      * @return mixed
-     * @since 2.0.0
      */
     public function getOption($option);
 
@@ -54,7 +49,6 @@ public function getOption($option);
      * Convert config to array
      *
      * @return array
-     * @since 2.0.0
      */
     public function toArray();
 
@@ -63,7 +57,6 @@ public function toArray();
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -71,7 +64,6 @@ public function setName($name);
      * Get session.name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -80,7 +72,6 @@ public function getName();
      *
      * @param string $savePath
      * @return $this
-     * @since 2.0.0
      */
     public function setSavePath($savePath);
 
@@ -88,7 +79,6 @@ public function setSavePath($savePath);
      * Set session.save_path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSavePath();
 
@@ -97,7 +87,6 @@ public function getSavePath();
      *
      * @param int $cookieLifetime
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieLifetime($cookieLifetime);
 
@@ -105,7 +94,6 @@ public function setCookieLifetime($cookieLifetime);
      * Get session.cookie_lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCookieLifetime();
 
@@ -114,7 +102,6 @@ public function getCookieLifetime();
      *
      * @param string $cookiePath
      * @return $this
-     * @since 2.0.0
      */
     public function setCookiePath($cookiePath);
 
@@ -122,7 +109,6 @@ public function setCookiePath($cookiePath);
      * Get session.cookie_path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookiePath();
 
@@ -131,7 +117,6 @@ public function getCookiePath();
      *
      * @param string $cookieDomain
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieDomain($cookieDomain);
 
@@ -139,7 +124,6 @@ public function setCookieDomain($cookieDomain);
      * Get session.cookie_domain
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookieDomain();
 
@@ -148,7 +132,6 @@ public function getCookieDomain();
      *
      * @param bool $cookieSecure
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieSecure($cookieSecure);
 
@@ -157,7 +140,6 @@ public function setCookieSecure($cookieSecure);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCookieSecure();
 
@@ -166,7 +148,6 @@ public function getCookieSecure();
      *
      * @param bool $cookieHttpOnly
      * @return $this
-     * @since 2.0.0
      */
     public function setCookieHttpOnly($cookieHttpOnly);
 
@@ -175,7 +156,6 @@ public function setCookieHttpOnly($cookieHttpOnly);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getCookieHttpOnly();
 
@@ -184,7 +164,6 @@ public function getCookieHttpOnly();
      *
      * @param bool $useCookies
      * @return $this
-     * @since 2.0.0
      */
     public function setUseCookies($useCookies);
 
@@ -193,7 +172,6 @@ public function setUseCookies($useCookies);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseCookies();
 }
diff --git a/lib/internal/Magento/Framework/Session/Config/Validator/CookieDomainValidator.php b/lib/internal/Magento/Framework/Session/Config/Validator/CookieDomainValidator.php
index 9ca49cea7b419..bf7d159300120 100644
--- a/lib/internal/Magento/Framework/Session/Config/Validator/CookieDomainValidator.php
+++ b/lib/internal/Magento/Framework/Session/Config/Validator/CookieDomainValidator.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Session\Config\Validator\CookieDomainValidator
  *
- * @since 2.0.0
  */
 class CookieDomainValidator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/lib/internal/Magento/Framework/Session/Config/Validator/CookieLifetimeValidator.php b/lib/internal/Magento/Framework/Session/Config/Validator/CookieLifetimeValidator.php
index 01fa532cce6c9..bb0df479f3544 100644
--- a/lib/internal/Magento/Framework/Session/Config/Validator/CookieLifetimeValidator.php
+++ b/lib/internal/Magento/Framework/Session/Config/Validator/CookieLifetimeValidator.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Session\Config\Validator\CookieLifetimeValidator
  *
- * @since 2.0.0
  */
 class CookieLifetimeValidator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/lib/internal/Magento/Framework/Session/Config/Validator/CookiePathValidator.php b/lib/internal/Magento/Framework/Session/Config/Validator/CookiePathValidator.php
index 687e3d948e2d5..d288b6bce9269 100644
--- a/lib/internal/Magento/Framework/Session/Config/Validator/CookiePathValidator.php
+++ b/lib/internal/Magento/Framework/Session/Config/Validator/CookiePathValidator.php
@@ -9,13 +9,11 @@
 /**
  * Class \Magento\Framework\Session\Config\Validator\CookiePathValidator
  *
- * @since 2.0.0
  */
 class CookiePathValidator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/lib/internal/Magento/Framework/Session/Generic.php b/lib/internal/Magento/Framework/Session/Generic.php
index 402aaaf2a96a4..8cd358dd56416 100644
--- a/lib/internal/Magento/Framework/Session/Generic.php
+++ b/lib/internal/Magento/Framework/Session/Generic.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Generic extends SessionManager
 {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php
index 039ce7c0cd677..ec6381fdc13fc 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler.php
@@ -12,7 +12,6 @@
 
 /**
  * Magento session save handler
- * @since 2.0.0
  */
 class SaveHandler implements SaveHandlerInterface
 {
@@ -20,7 +19,6 @@ class SaveHandler implements SaveHandlerInterface
      * Session handler
      *
      * @var \SessionHandler
-     * @since 2.0.0
      */
     protected $saveHandlerAdapter;
 
@@ -28,7 +26,7 @@ class SaveHandler implements SaveHandlerInterface
      * Config
      *
      * @var ConfigInterface
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $config;
 
@@ -38,7 +36,6 @@ class SaveHandler implements SaveHandlerInterface
      * @param SaveHandlerFactory $saveHandlerFactory
      * @param DeploymentConfig $deploymentConfig
      * @param string $default
-     * @since 2.0.0
      */
     public function __construct(
         SaveHandlerFactory $saveHandlerFactory,
@@ -70,7 +67,6 @@ public function __construct(
      * @param string $savePath
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function open($savePath, $name)
     {
@@ -81,7 +77,6 @@ public function open($savePath, $name)
      * Close Session - free resources
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close()
     {
@@ -93,7 +88,6 @@ public function close()
      *
      * @param string $sessionId
      * @return string
-     * @since 2.0.0
      */
     public function read($sessionId)
     {
@@ -106,7 +100,6 @@ public function read($sessionId)
      * @param string $sessionId
      * @param string $data
      * @return bool
-     * @since 2.0.0
      */
     public function write($sessionId, $data)
     {
@@ -118,7 +111,6 @@ public function write($sessionId, $data)
      *
      * @param string $sessionId
      * @return bool
-     * @since 2.0.0
      */
     public function destroy($sessionId)
     {
@@ -132,7 +124,6 @@ public function destroy($sessionId)
      * @param int $maxLifetime
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function gc($maxLifetime)
     {
@@ -143,8 +134,8 @@ public function gc($maxLifetime)
      * Get config
      *
      * @return ConfigInterface
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.6
+     * @since 2.0.6
      */
     private function getConfig()
     {
@@ -159,7 +150,7 @@ private function getConfig()
      *
      * @param string $saveHandler
      * @return $this
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function setSaveHandler($saveHandler)
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
index ac5dbcfddcfd3..67ae707860640 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
@@ -11,7 +11,6 @@
 
 /**
  * Data base session save handler
- * @since 2.0.0
  */
 class DbTable extends \SessionHandler
 {
@@ -19,7 +18,6 @@ class DbTable extends \SessionHandler
      * Session data table name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_sessionTable;
 
@@ -27,7 +25,6 @@ class DbTable extends \SessionHandler
      * Database write connection
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     protected $connection;
 
@@ -35,7 +32,6 @@ class DbTable extends \SessionHandler
      * Constructor
      *
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     {
@@ -49,7 +45,6 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
      *
      * @return void
      * @throws \Magento\Framework\Exception\SessionException
-     * @since 2.0.0
      */
     protected function checkConnection()
     {
@@ -68,7 +63,6 @@ protected function checkConnection()
      * @param string $sessionName ignored
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function open($savePath, $sessionName)
     {
@@ -79,7 +73,6 @@ public function open($savePath, $sessionName)
      * Close session
      *
      * @return bool
-     * @since 2.0.0
      */
     public function close()
     {
@@ -91,7 +84,6 @@ public function close()
      *
      * @param string $sessionId
      * @return string
-     * @since 2.0.0
      */
     public function read($sessionId)
     {
@@ -119,7 +111,6 @@ public function read($sessionId)
      * @param string $sessionId
      * @param string $sessionData
      * @return bool
-     * @since 2.0.0
      */
     public function write($sessionId, $sessionData)
     {
@@ -146,7 +137,6 @@ public function write($sessionId, $sessionData)
      *
      * @param string $sessionId
      * @return bool
-     * @since 2.0.0
      */
     public function destroy($sessionId)
     {
@@ -161,7 +151,6 @@ public function destroy($sessionId)
      * @param int $maxLifeTime
      * @return bool
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function gc($maxLifeTime)
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Native.php b/lib/internal/Magento/Framework/Session/SaveHandler/Native.php
index 86647a89e8ab5..abf0613da9a67 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Native.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Native.php
@@ -7,7 +7,6 @@
 
 /**
  * Php native session save handler
- * @since 2.0.0
  */
 class Native extends \SessionHandler
 {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
index 58dca9f19416c..d1420bd91f532 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
@@ -17,13 +17,13 @@
 /**
  * Class \Magento\Framework\Session\SaveHandler\Redis
  *
- * @since 2.1.0
+ * @since 2.0.6
  */
 class Redis extends \Cm\RedisSession\Handler
 {
     /**
      * @var Filesystem
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $filesystem;
 
@@ -32,7 +32,7 @@ class Redis extends \Cm\RedisSession\Handler
      * @param LoggerInterface $logger
      * @param Filesystem $filesystem
      * @throws SessionException
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function __construct(ConfigInterface $config, LoggerInterface $logger, Filesystem $filesystem)
     {
@@ -46,7 +46,7 @@ public function __construct(ConfigInterface $config, LoggerInterface $logger, Fi
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function read($sessionId)
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
index c9c212e3027b9..a4610f2ed63fa 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
@@ -12,7 +12,7 @@
 
 /**
  * Redis session save handler
- * @since 2.1.0
+ * @since 2.0.6
  */
 class Config implements \Cm\RedisSession\Handler\ConfigInterface
 {
@@ -120,13 +120,13 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      * Deployment config
      *
      * @var DeploymentConfig $deploymentConfig
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $deploymentConfig;
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $scopeConfig;
 
@@ -134,7 +134,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      * @param DeploymentConfig $deploymentConfig
      * @param State $appState
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -148,7 +148,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getLogLevel()
     {
@@ -157,7 +157,7 @@ public function getLogLevel()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getHost()
     {
@@ -166,7 +166,7 @@ public function getHost()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getPort()
     {
@@ -175,7 +175,7 @@ public function getPort()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getDatabase()
     {
@@ -184,7 +184,7 @@ public function getDatabase()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getPassword()
     {
@@ -193,7 +193,7 @@ public function getPassword()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getTimeout()
     {
@@ -202,7 +202,7 @@ public function getTimeout()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getPersistentIdentifier()
     {
@@ -211,7 +211,7 @@ public function getPersistentIdentifier()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getCompressionThreshold()
     {
@@ -220,7 +220,7 @@ public function getCompressionThreshold()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getCompressionLibrary()
     {
@@ -229,7 +229,7 @@ public function getCompressionLibrary()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getMaxConcurrency()
     {
@@ -238,7 +238,7 @@ public function getMaxConcurrency()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getMaxLifetime()
     {
@@ -247,7 +247,7 @@ public function getMaxLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getMinLifetime()
     {
@@ -256,7 +256,7 @@ public function getMinLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getDisableLocking()
     {
@@ -265,7 +265,7 @@ public function getDisableLocking()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getBotLifetime()
     {
@@ -274,7 +274,7 @@ public function getBotLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getBotFirstLifetime()
     {
@@ -283,7 +283,7 @@ public function getBotFirstLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getFirstLifetime()
     {
@@ -292,7 +292,7 @@ public function getFirstLifetime()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getBreakAfter()
     {
@@ -301,7 +301,7 @@ public function getBreakAfter()
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function getLifetime()
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
index 082de72a9f073..b5ff395b75e0a 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
@@ -12,25 +12,25 @@
 /**
  * Class \Magento\Framework\Session\SaveHandler\Redis\Logger
  *
- * @since 2.1.0
+ * @since 2.0.6
  */
 class Logger implements \Cm\RedisSession\Handler\LoggerInterface
 {
     /**
      * @var LoggerInterface
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $logger;
 
     /**
      * @var int
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $logLevel;
 
     /**
      * @var Request
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $request;
 
@@ -40,7 +40,7 @@ class Logger implements \Cm\RedisSession\Handler\LoggerInterface
      * @param ConfigInterface $config
      * @param LoggerInterface $logger
      * @param Request $request
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function __construct(ConfigInterface $config, LoggerInterface $logger, Request $request)
     {
@@ -51,7 +51,7 @@ public function __construct(ConfigInterface $config, LoggerInterface $logger, Re
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function setLogLevel($level)
     {
@@ -60,7 +60,7 @@ public function setLogLevel($level)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function log($message, $level)
     {
@@ -96,7 +96,7 @@ public function log($message, $level)
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function logException(\Exception $e)
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandlerFactory.php b/lib/internal/Magento/Framework/Session/SaveHandlerFactory.php
index 5e1cb7271b71a..deb476482393d 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandlerFactory.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandlerFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Magento session save handler factory
- * @since 2.0.0
  */
 class SaveHandlerFactory
 {
@@ -20,7 +19,6 @@ class SaveHandlerFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -28,7 +26,6 @@ class SaveHandlerFactory
      * Handlers
      *
      * @var array
-     * @since 2.0.0
      */
     protected $handlers = [];
 
@@ -37,7 +34,6 @@ class SaveHandlerFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManger
      * @param array $handlers
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManger, array $handlers = [])
     {
@@ -54,7 +50,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $params
      * @return \SessionHandler
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function create($saveMethod, $params = [])
     {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandlerInterface.php b/lib/internal/Magento/Framework/Session/SaveHandlerInterface.php
index 304a23dad41f0..0286847c547fe 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandlerInterface.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandlerInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Session\SaveHandlerInterface
  *
- * @since 2.0.0
  */
 interface SaveHandlerInterface extends \SessionHandlerInterface
 {
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index 74c192daad2da..8be2c5a306a12 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -12,7 +12,6 @@
 /**
  * Session Manager
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SessionManager implements SessionManagerInterface
 {
@@ -24,7 +23,6 @@ class SessionManager implements SessionManagerInterface
      * - clear_storage: whether or not to empty the storage object of any stored values
      *
      * @var array
-     * @since 2.0.0
      */
     protected $defaultDestroyOptions = ['send_expire_cookie' => true, 'clear_storage' => true];
 
@@ -32,7 +30,6 @@ class SessionManager implements SessionManagerInterface
      * URL host cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $urlHostCache = [];
 
@@ -40,7 +37,6 @@ class SessionManager implements SessionManagerInterface
      * Validator
      *
      * @var \Magento\Framework\Session\ValidatorInterface
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -48,7 +44,6 @@ class SessionManager implements SessionManagerInterface
      * Request
      *
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
@@ -56,7 +51,6 @@ class SessionManager implements SessionManagerInterface
      * SID resolver
      *
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $sidResolver;
 
@@ -64,7 +58,6 @@ class SessionManager implements SessionManagerInterface
      * Session config
      *
      * @var \Magento\Framework\Session\Config\ConfigInterface
-     * @since 2.0.0
      */
     protected $sessionConfig;
 
@@ -72,7 +65,6 @@ class SessionManager implements SessionManagerInterface
      * Save handler
      *
      * @var \Magento\Framework\Session\SaveHandlerInterface
-     * @since 2.0.0
      */
     protected $saveHandler;
 
@@ -80,7 +72,6 @@ class SessionManager implements SessionManagerInterface
      * Storage
      *
      * @var \Magento\Framework\Session\StorageInterface
-     * @since 2.0.0
      */
     protected $storage;
 
@@ -88,19 +79,16 @@ class SessionManager implements SessionManagerInterface
      * Cookie Manager
      *
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
-     * @since 2.0.0
      */
     protected $cookieManager;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     * @since 2.0.0
      */
     protected $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     private $appState;
 
@@ -115,7 +103,6 @@ class SessionManager implements SessionManagerInterface
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\App\State $appState
      * @throws \Magento\Framework\Exception\SessionException
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -146,7 +133,6 @@ public function __construct(
     /**
      * This method needs to support sessions with APC enabled
      * @return void
-     * @since 2.0.0
      */
     public function writeClose()
     {
@@ -160,7 +146,6 @@ public function writeClose()
      * @param array $args
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
@@ -178,7 +163,6 @@ public function __call($method, $args)
      *
      * @throws \Magento\Framework\Exception\SessionException
      * @return $this
-     * @since 2.0.0
      */
     public function start()
     {
@@ -249,7 +233,6 @@ private function renewCookie()
      * Register save handler
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function registerSaveHandler()
     {
@@ -267,7 +250,6 @@ protected function registerSaveHandler()
      * Does a session exist
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSessionExists()
     {
@@ -283,7 +265,6 @@ public function isSessionExists()
      * @param string $key
      * @param bool $clear
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $clear = false)
     {
@@ -298,7 +279,6 @@ public function getData($key = '', $clear = false)
      * Retrieve session Id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSessionId()
     {
@@ -309,7 +289,6 @@ public function getSessionId()
      * Retrieve session name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -321,7 +300,6 @@ public function getName()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setName($name)
     {
@@ -334,7 +312,6 @@ public function setName($name)
      *
      * @param  array $options
      * @return void
-     * @since 2.0.0
      */
     public function destroy(array $options = null)
     {
@@ -363,7 +340,6 @@ public function destroy(array $options = null)
      * Unset all session data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearStorage()
     {
@@ -375,7 +351,6 @@ public function clearStorage()
      * Retrieve Cookie domain
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookieDomain()
     {
@@ -386,7 +361,6 @@ public function getCookieDomain()
      * Retrieve cookie path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookiePath()
     {
@@ -397,7 +371,6 @@ public function getCookiePath()
      * Retrieve cookie lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCookieLifetime()
     {
@@ -409,7 +382,6 @@ public function getCookieLifetime()
      *
      * @param   string|null $sessionId
      * @return  $this
-     * @since 2.0.0
      */
     public function setSessionId($sessionId)
     {
@@ -426,7 +398,6 @@ public function setSessionId($sessionId)
      * @param string $urlHost can be host or url
      * @return string {session_id_key}={session_id_encrypted}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getSessionIdForHost($urlHost)
     {
@@ -456,7 +427,6 @@ public function getSessionIdForHost($urlHost)
      *
      * @param string $host
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForHost($host)
     {
@@ -470,7 +440,6 @@ public function isValidForHost($host)
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForPath($path)
     {
@@ -487,7 +456,6 @@ public function isValidForPath($path)
      * Register request host name as used with session
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _addHost()
     {
@@ -506,7 +474,6 @@ protected function _addHost()
      * Get all host names where session was used
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getHosts()
     {
@@ -517,7 +484,6 @@ protected function _getHosts()
      * Clean all host names that were registered with session
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _cleanHosts()
     {
@@ -529,7 +495,6 @@ protected function _cleanHosts()
      * Renew session id and update session cookie
      *
      * @return $this
-     * @since 2.0.0
      */
     public function regenerateId()
     {
@@ -553,7 +518,6 @@ public function regenerateId()
      * Expire the session cookie for sub domains
      *
      * @return void
-     * @since 2.0.0
      */
     protected function clearSubDomainSessionCookie()
     {
@@ -576,7 +540,6 @@ protected function clearSubDomainSessionCookie()
      * Sends a session cookie with no value, and with an expiry in the past.
      *
      * @return void
-     * @since 2.0.0
      */
     public function expireSessionCookie()
     {
@@ -597,7 +560,6 @@ public function expireSessionCookie()
      * Performs ini_set for all of the config options so they can be read by session_start
      *
      * @return void
-     * @since 2.0.0
      */
     private function initIniOptions()
     {
diff --git a/lib/internal/Magento/Framework/Session/SessionManagerInterface.php b/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
index 27ad07ebb7aa0..93fac2947eb61 100644
--- a/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
+++ b/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
@@ -11,7 +11,6 @@
  * Session Manager Interface
  *
  * @api
- * @since 2.0.0
  */
 interface SessionManagerInterface
 {
@@ -24,7 +23,6 @@ interface SessionManagerInterface
      * Start session
      *
      * @return SessionManagerInterface
-     * @since 2.0.0
      */
     public function start();
 
@@ -32,7 +30,6 @@ public function start();
      * Session write close
      *
      * @return void
-     * @since 2.0.0
      */
     public function writeClose();
 
@@ -40,7 +37,6 @@ public function writeClose();
      * Does a session exist
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSessionExists();
 
@@ -48,7 +44,6 @@ public function isSessionExists();
      * Retrieve session Id
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSessionId();
 
@@ -56,7 +51,6 @@ public function getSessionId();
      * Retrieve session name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -65,7 +59,6 @@ public function getName();
      *
      * @param string $name
      * @return SessionManagerInterface
-     * @since 2.0.0
      */
     public function setName($name);
 
@@ -74,7 +67,6 @@ public function setName($name);
      *
      * @param  array $options
      * @return void
-     * @since 2.0.0
      */
     public function destroy(array $options = null);
 
@@ -82,7 +74,6 @@ public function destroy(array $options = null);
      * Unset session data
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearStorage();
 
@@ -90,7 +81,6 @@ public function clearStorage();
      * Retrieve Cookie domain
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookieDomain();
 
@@ -98,7 +88,6 @@ public function getCookieDomain();
      * Retrieve cookie path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCookiePath();
 
@@ -106,7 +95,6 @@ public function getCookiePath();
      * Retrieve cookie lifetime
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCookieLifetime();
 
@@ -115,7 +103,6 @@ public function getCookieLifetime();
      *
      * @param string|null $sessionId
      * @return SessionManagerInterface
-     * @since 2.0.0
      */
     public function setSessionId($sessionId);
 
@@ -123,7 +110,6 @@ public function setSessionId($sessionId);
      * Renew session id and update session cookie
      *
      * @return SessionManagerInterface
-     * @since 2.0.0
      */
     public function regenerateId();
 
@@ -133,7 +119,6 @@ public function regenerateId();
      * Sends a session cookie with no value, and with an expiry in the past.
      *
      * @return void
-     * @since 2.0.0
      */
     public function expireSessionCookie();
 
@@ -142,7 +127,6 @@ public function expireSessionCookie();
      *
      * @param string $urlHost
      * @return string
-     * @since 2.0.0
      */
     public function getSessionIdForHost($urlHost);
 
@@ -151,7 +135,6 @@ public function getSessionIdForHost($urlHost);
      *
      * @param string $host
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForHost($host);
 
@@ -160,7 +143,6 @@ public function isValidForHost($host);
      *
      * @param string $path
      * @return bool
-     * @since 2.0.0
      */
     public function isValidForPath($path);
 }
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index a5b557ea70ad8..47f988ddeaa01 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Session\SidResolver
  *
- * @since 2.0.0
  */
 class SidResolver implements SidResolverInterface
 {
@@ -21,25 +20,21 @@ class SidResolver implements SidResolverInterface
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $sidNameMap;
 
@@ -47,7 +42,6 @@ class SidResolver implements SidResolverInterface
      * Use session var instead of SID for session in URL
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useSessionVar = false;
 
@@ -56,13 +50,11 @@ class SidResolver implements SidResolverInterface
      *
      * @var bool
      * @see \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_useSessionInUrl = true;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_scopeType;
 
@@ -72,7 +64,6 @@ class SidResolver implements SidResolverInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $scopeType
      * @param array $sidNameMap
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -91,7 +82,6 @@ public function __construct(
     /**
      * @param SessionManagerInterface $session
      * @return string
-     * @since 2.0.0
      */
     public function getSid(SessionManagerInterface $session)
     {
@@ -115,7 +105,6 @@ public function getSid(SessionManagerInterface $session)
      *
      * @param SessionManagerInterface $session
      * @return string
-     * @since 2.0.0
      */
     public function getSessionIdQueryParam(SessionManagerInterface $session)
     {
@@ -131,7 +120,6 @@ public function getSessionIdQueryParam(SessionManagerInterface $session)
      *
      * @param bool $var
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionVar($var)
     {
@@ -144,7 +132,6 @@ public function setUseSessionVar($var)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSessionVar()
     {
@@ -156,7 +143,6 @@ public function getUseSessionVar()
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionInUrl($flag = true)
     {
@@ -169,7 +155,6 @@ public function setUseSessionInUrl($flag = true)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSessionInUrl()
     {
diff --git a/lib/internal/Magento/Framework/Session/SidResolverInterface.php b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
index c3d0250f20ce5..8dd044adb6860 100644
--- a/lib/internal/Magento/Framework/Session/SidResolverInterface.php
+++ b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Session\SidResolverInterface
  *
- * @since 2.0.0
  */
 interface SidResolverInterface
 {
@@ -24,7 +23,6 @@ interface SidResolverInterface
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @return string
-     * @since 2.0.0
      */
     public function getSid(\Magento\Framework\Session\SessionManagerInterface $session);
 
@@ -33,7 +31,6 @@ public function getSid(\Magento\Framework\Session\SessionManagerInterface $sessi
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @return string
-     * @since 2.0.0
      */
     public function getSessionIdQueryParam(\Magento\Framework\Session\SessionManagerInterface $session);
 
@@ -42,7 +39,6 @@ public function getSessionIdQueryParam(\Magento\Framework\Session\SessionManager
      *
      * @param bool $var
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionVar($var);
 
@@ -51,7 +47,6 @@ public function setUseSessionVar($var);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSessionVar();
 
@@ -60,7 +55,6 @@ public function getUseSessionVar();
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setUseSessionInUrl($flag = true);
 
@@ -69,7 +63,6 @@ public function setUseSessionInUrl($flag = true);
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSessionInUrl();
 }
diff --git a/lib/internal/Magento/Framework/Session/Storage.php b/lib/internal/Magento/Framework/Session/Storage.php
index c87a8debad745..7154fc464ca1e 100644
--- a/lib/internal/Magento/Framework/Session/Storage.php
+++ b/lib/internal/Magento/Framework/Session/Storage.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Session\Storage
  *
- * @since 2.0.0
  */
 class Storage extends \Magento\Framework\DataObject implements StorageInterface
 {
@@ -18,7 +17,6 @@ class Storage extends \Magento\Framework\DataObject implements StorageInterface
      * Namespace of storage
      *
      * @var string
-     * @since 2.0.0
      */
     protected $namespace;
 
@@ -27,7 +25,6 @@ class Storage extends \Magento\Framework\DataObject implements StorageInterface
      *
      * @param string $namespace
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct($namespace = 'default', array $data = [])
     {
@@ -37,7 +34,6 @@ public function __construct($namespace = 'default', array $data = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function init(array $data)
     {
@@ -50,7 +46,6 @@ public function init(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNamespace()
     {
@@ -63,7 +58,6 @@ public function getNamespace()
      * @param string $key
      * @param bool $clear
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $clear = false)
     {
diff --git a/lib/internal/Magento/Framework/Session/StorageInterface.php b/lib/internal/Magento/Framework/Session/StorageInterface.php
index 587067c858530..1bd705848d654 100644
--- a/lib/internal/Magento/Framework/Session/StorageInterface.php
+++ b/lib/internal/Magento/Framework/Session/StorageInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Session\StorageInterface
  *
- * @since 2.0.0
  */
 interface StorageInterface
 {
@@ -19,7 +18,6 @@ interface StorageInterface
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function init(array $data);
 
@@ -27,7 +25,6 @@ public function init(array $data);
      * Get current storage namespace
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNamespace();
 }
diff --git a/lib/internal/Magento/Framework/Session/Validator.php b/lib/internal/Magento/Framework/Session/Validator.php
index 8370b91b4e047..65d3150cdbb59 100644
--- a/lib/internal/Magento/Framework/Session/Validator.php
+++ b/lib/internal/Magento/Framework/Session/Validator.php
@@ -10,7 +10,6 @@
 
 /**
  * Session Validator
- * @since 2.0.0
  */
 class Validator implements ValidatorInterface
 {
@@ -34,25 +33,21 @@ class Validator implements ValidatorInterface
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
-     * @since 2.0.0
      */
     protected $_remoteAddress;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_skippedAgentList;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_scopeType;
 
@@ -61,7 +56,6 @@ class Validator implements ValidatorInterface
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
      * @param string $scopeType
      * @param array $skippedUserAgentList
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -81,7 +75,6 @@ public function __construct(
      * @param SessionManagerInterface $session
      * @return void
      * @throws SessionException
-     * @since 2.0.0
      */
     public function validate(SessionManagerInterface $session)
     {
@@ -104,7 +97,6 @@ public function validate(SessionManagerInterface $session)
      * @return bool
      * @throws SessionException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _validate()
     {
@@ -175,7 +167,6 @@ protected function _validate()
      * Prepare session environment data for validation
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getSessionEnvironment()
     {
diff --git a/lib/internal/Magento/Framework/Session/ValidatorInterface.php b/lib/internal/Magento/Framework/Session/ValidatorInterface.php
index 28de0bfe53aee..56f11633a5b81 100644
--- a/lib/internal/Magento/Framework/Session/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Session/ValidatorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Session validator interface
- * @since 2.0.0
  */
 interface ValidatorInterface
 {
@@ -19,7 +18,6 @@ interface ValidatorInterface
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @return void
      * @throws \Magento\Framework\Exception\SessionException
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\Session\SessionManagerInterface $session);
 }
diff --git a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
index f48a48ea383bb..ae123e15da23c 100644
--- a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
+++ b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
@@ -8,7 +8,6 @@
 
 /**
  * Class to generate random backend URI
- * @since 2.0.0
  */
 class BackendFrontnameGenerator
 {
@@ -26,7 +25,6 @@ class BackendFrontnameGenerator
      * Generate Backend name
      *
      * @return string
-     * @since 2.0.0
      */
     public static function generate()
     {
diff --git a/lib/internal/Magento/Framework/Setup/BackupRollback.php b/lib/internal/Magento/Framework/Setup/BackupRollback.php
index 4f903e5d7d161..c19b78101db16 100644
--- a/lib/internal/Magento/Framework/Setup/BackupRollback.php
+++ b/lib/internal/Magento/Framework/Setup/BackupRollback.php
@@ -21,7 +21,6 @@
  * Class to deal with backup and rollback functionality for database and Code base
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BackupRollback
 {
@@ -34,7 +33,6 @@ class BackupRollback
      * Path to backup folder
      *
      * @var string
-     * @since 2.0.0
      */
     private $backupsDir;
 
@@ -42,7 +40,6 @@ class BackupRollback
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -50,7 +47,6 @@ class BackupRollback
      * Logger
      *
      * @var LoggerInterface
-     * @since 2.0.0
      */
     private $log;
 
@@ -58,7 +54,6 @@ class BackupRollback
      * Filesystem Directory List
      *
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -66,7 +61,6 @@ class BackupRollback
      * File
      *
      * @var File
-     * @since 2.0.0
      */
     private $file;
 
@@ -74,7 +68,6 @@ class BackupRollback
      * Filesystem Helper
      *
      * @var Helper
-     * @since 2.0.0
      */
     private $fsHelper;
 
@@ -86,7 +79,6 @@ class BackupRollback
      * @param DirectoryList $directoryList
      * @param File $file
      * @param Helper $fsHelper
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -111,7 +103,6 @@ public function __construct(
      * @param string $type
      * @return string
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
     {
@@ -153,7 +144,6 @@ public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
      * @param string $type
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM)
     {
@@ -204,7 +194,6 @@ public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM)
      *
      * @param int $time
      * @return string
-     * @since 2.0.0
      */
     public function dbBackup($time)
     {
@@ -231,7 +220,6 @@ public function dbBackup($time)
      * @param string $rollbackFile
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function dbRollback($rollbackFile)
     {
@@ -264,7 +252,6 @@ public function dbRollback($rollbackFile)
      * Get paths that should be excluded during iterative searches for locations for code backup only
      *
      * @return array
-     * @since 2.0.0
      */
     private function getCodeBackupIgnorePaths()
     {
@@ -285,7 +272,6 @@ private function getCodeBackupIgnorePaths()
      * Get paths that should be excluded during iterative searches for locations for media backup only
      *
      * @return array
-     * @since 2.0.0
      */
     private function getMediaBackupIgnorePaths()
     {
@@ -309,7 +295,6 @@ private function getMediaBackupIgnorePaths()
      * @param string $type
      * @return int
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getFSDiskSpace($type = Factory::TYPE_FILESYSTEM)
     {
@@ -337,7 +322,6 @@ public function getFSDiskSpace($type = Factory::TYPE_FILESYSTEM)
      *
      * @return int
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getDBDiskSpace()
     {
diff --git a/lib/internal/Magento/Framework/Setup/BackupRollbackFactory.php b/lib/internal/Magento/Framework/Setup/BackupRollbackFactory.php
index cb3aab49d6d42..2b2e74e549179 100644
--- a/lib/internal/Magento/Framework/Setup/BackupRollbackFactory.php
+++ b/lib/internal/Magento/Framework/Setup/BackupRollbackFactory.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Framework\Setup\BackupRollbackFactory
  *
- * @since 2.0.0
  */
 class BackupRollbackFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param OutputInterface $output
      * @return BackupRollback
-     * @since 2.0.0
      */
     public function create($output)
     {
diff --git a/lib/internal/Magento/Framework/Setup/ConfigOptionsListInterface.php b/lib/internal/Magento/Framework/Setup/ConfigOptionsListInterface.php
index 85e9d0afb358e..88a389f57af99 100644
--- a/lib/internal/Magento/Framework/Setup/ConfigOptionsListInterface.php
+++ b/lib/internal/Magento/Framework/Setup/ConfigOptionsListInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface for handling options in deployment configuration tool
- * @since 2.0.0
  */
 interface ConfigOptionsListInterface
 {
@@ -18,7 +17,6 @@ interface ConfigOptionsListInterface
      * information that will be used in deployment config file
      *
      * @return Option\AbstractConfigOption[]
-     * @since 2.0.0
      */
     public function getOptions();
 
@@ -29,7 +27,6 @@ public function getOptions();
      * @param array $options
      * @param DeploymentConfig $deploymentConfig
      * @return \Magento\Framework\Config\Data\ConfigData[]
-     * @since 2.0.0
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig);
 
@@ -39,7 +36,6 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
      * @param array $options
      * @param DeploymentConfig $deploymentConfig
      * @return string[]
-     * @since 2.0.0
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig);
 }
diff --git a/lib/internal/Magento/Framework/Setup/ConsoleLogger.php b/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
index 321949f777cca..01342ebb59b3a 100644
--- a/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
+++ b/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
@@ -13,7 +13,6 @@
  * Console Logger
  *
  * @package Magento\Setup\Model
- * @since 2.0.0
  */
 class ConsoleLogger implements LoggerInterface
 {
@@ -21,7 +20,6 @@ class ConsoleLogger implements LoggerInterface
      * Indicator of whether inline output is started
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isInline = false;
 
@@ -29,7 +27,6 @@ class ConsoleLogger implements LoggerInterface
      * Console
      *
      * @var OutputInterface
-     * @since 2.0.0
      */
     protected $console;
 
@@ -37,7 +34,6 @@ class ConsoleLogger implements LoggerInterface
      * Constructor
      *
      * @param OutputInterface $output
-     * @since 2.0.0
      */
     public function __construct(OutputInterface $output)
     {
@@ -49,7 +45,6 @@ public function __construct(OutputInterface $output)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logSuccess($message)
     {
@@ -59,7 +54,6 @@ public function logSuccess($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logError(\Exception $e)
     {
@@ -69,7 +63,6 @@ public function logError(\Exception $e)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function log($message)
     {
@@ -79,7 +72,6 @@ public function log($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logInline($message)
     {
@@ -89,7 +81,6 @@ public function logInline($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logMeta($message)
     {
@@ -101,7 +92,6 @@ public function logMeta($message)
      * Terminates line if the inline logging is started
      *
      * @return void
-     * @since 2.0.0
      */
     private function terminateLine()
     {
diff --git a/lib/internal/Magento/Framework/Setup/DataCacheInterface.php b/lib/internal/Magento/Framework/Setup/DataCacheInterface.php
index 3e51d1a7e169a..f698e1fe73c30 100644
--- a/lib/internal/Magento/Framework/Setup/DataCacheInterface.php
+++ b/lib/internal/Magento/Framework/Setup/DataCacheInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Data setup cache
- * @since 2.0.0
  */
 interface DataCacheInterface
 {
@@ -19,7 +18,6 @@ interface DataCacheInterface
      * @param string $rowId
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setRow($table, $parentId, $rowId, $value);
 
@@ -32,7 +30,6 @@ public function setRow($table, $parentId, $rowId, $value);
      * @param string $field
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setField($table, $parentId, $rowId, $field, $value);
 
@@ -44,7 +41,6 @@ public function setField($table, $parentId, $rowId, $field, $value);
      * @param string $rowId
      * @param string|null $field
      * @return mixed Returns false if there is no such record
-     * @since 2.0.0
      */
     public function get($table, $parentId, $rowId, $field = null);
 
@@ -55,7 +51,6 @@ public function get($table, $parentId, $rowId, $field = null);
      * @param string $parentId
      * @param string $rowId
      * @return void
-     * @since 2.0.0
      */
     public function remove($table, $parentId, $rowId);
 
@@ -67,7 +62,6 @@ public function remove($table, $parentId, $rowId);
      * @param string $rowId
      * @param string|null $field
      * @return bool
-     * @since 2.0.0
      */
     public function has($table, $parentId, $rowId, $field = null);
 }
diff --git a/lib/internal/Magento/Framework/Setup/InstallDataInterface.php b/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
index 2ffe0a509e61e..68e08f658faaf 100644
--- a/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
+++ b/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
@@ -9,7 +9,6 @@
  * Interface for data installs of a module
  *
  * @api
- * @since 2.0.0
  */
 interface InstallDataInterface
 {
@@ -19,7 +18,6 @@ interface InstallDataInterface
      * @param ModuleDataSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context);
 }
diff --git a/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php b/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
index 98a52131c2f3b..abb0017b85e93 100644
--- a/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
+++ b/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
@@ -9,7 +9,6 @@
  * Interface for DB schema installs of a module
  *
  * @api
- * @since 2.0.0
  */
 interface InstallSchemaInterface
 {
@@ -19,7 +18,6 @@ interface InstallSchemaInterface
      * @param SchemaSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context);
 }
diff --git a/lib/internal/Magento/Framework/Setup/Lists.php b/lib/internal/Magento/Framework/Setup/Lists.php
index b36fd819cde76..ab1d46c411412 100644
--- a/lib/internal/Magento/Framework/Setup/Lists.php
+++ b/lib/internal/Magento/Framework/Setup/Lists.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Framework\Setup\Lists
  *
- * @since 2.0.0
  */
 class Lists
 {
@@ -23,13 +22,11 @@ class Lists
      * List of allowed locales
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allowedLocales;
 
     /**
      * @param ConfigInterface $localeConfig
-     * @since 2.0.0
      */
     public function __construct(ConfigInterface $localeConfig)
     {
@@ -41,7 +38,6 @@ public function __construct(ConfigInterface $localeConfig)
      *
      * @param bool $doSort
      * @return array
-     * @since 2.0.0
      */
     public function getTimezoneList($doSort = true)
     {
@@ -66,7 +62,6 @@ public function getTimezoneList($doSort = true)
      * Retrieve list of currencies
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCurrencyList()
     {
@@ -83,7 +78,6 @@ public function getCurrencyList()
      * Retrieve list of locales
      *
      * @return  array
-     * @since 2.0.0
      */
     public function getLocaleList()
     {
diff --git a/lib/internal/Magento/Framework/Setup/LoggerInterface.php b/lib/internal/Magento/Framework/Setup/LoggerInterface.php
index 8abef7f329634..8f82cf8001127 100644
--- a/lib/internal/Magento/Framework/Setup/LoggerInterface.php
+++ b/lib/internal/Magento/Framework/Setup/LoggerInterface.php
@@ -10,7 +10,6 @@
  * Interface to Log Message in Setup
  *
  * @api
- * @since 2.0.0
  */
 interface LoggerInterface
 {
@@ -19,7 +18,6 @@ interface LoggerInterface
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     public function logSuccess($message);
 
@@ -28,7 +26,6 @@ public function logSuccess($message);
      *
      * @param \Exception $e
      * @return void
-     * @since 2.0.0
      */
     public function logError(\Exception $e);
 
@@ -37,7 +34,6 @@ public function logError(\Exception $e);
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     public function log($message);
 
@@ -46,7 +42,6 @@ public function log($message);
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     public function logInline($message);
 
@@ -55,7 +50,6 @@ public function logInline($message);
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     public function logMeta($message);
 }
diff --git a/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php b/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
index a275d0be72073..45c59f08bc691 100644
--- a/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
+++ b/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
@@ -8,7 +8,6 @@
 /**
  * Context of a module being installed/updated: version, user data, etc.
  * @api
- * @since 2.0.0
  */
 interface ModuleContextInterface
 {
@@ -16,7 +15,6 @@ interface ModuleContextInterface
      * Gets current version of the module
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVersion();
 }
diff --git a/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php b/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
index fac444ea44940..bcf50e6ff9851 100644
--- a/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
@@ -9,7 +9,6 @@
  * DB data resource interface for a module
  *
  * @api
- * @since 2.0.0
  */
 interface ModuleDataSetupInterface extends SetupInterface
 {
@@ -35,7 +34,6 @@ interface ModuleDataSetupInterface extends SetupInterface
      * @param string|null $parentField
      * @param string|integer $parentId
      * @return mixed
-     * @since 2.0.0
      */
     public function getTableRow($table, $idField, $rowId, $field = null, $parentField = null, $parentId = 0);
 
@@ -48,7 +46,6 @@ public function getTableRow($table, $idField, $rowId, $field = null, $parentFiel
      * @param null|string $parentField
      * @param int|string $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteTableRow($table, $idField, $rowId, $parentField = null, $parentId = 0);
 
@@ -63,7 +60,6 @@ public function deleteTableRow($table, $idField, $rowId, $parentField = null, $p
      * @param string $parentField
      * @param string|integer $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function updateTableRow($table, $idField, $rowId, $field, $value = null, $parentField = null, $parentId = 0);
 
@@ -71,7 +67,6 @@ public function updateTableRow($table, $idField, $rowId, $field, $value = null,
      * Gets event manager
      *
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager();
 
@@ -79,7 +74,6 @@ public function getEventManager();
      * Gets filesystem
      *
      * @return \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     public function getFilesystem();
 
@@ -88,7 +82,6 @@ public function getFilesystem();
      *
      * @param array $data
      * @return \Magento\Framework\Module\Setup\Migration
-     * @since 2.0.0
      */
     public function createMigrationSetup(array $data = []);
 
@@ -96,7 +89,6 @@ public function createMigrationSetup(array $data = []);
      * Gets setup cache
      *
      * @return DataCacheInterface
-     * @since 2.0.0
      */
     public function getSetupCache();
 }
diff --git a/lib/internal/Magento/Framework/Setup/Option/AbstractConfigOption.php b/lib/internal/Magento/Framework/Setup/Option/AbstractConfigOption.php
index 5cd10f0597c2a..cd82315a222fd 100644
--- a/lib/internal/Magento/Framework/Setup/Option/AbstractConfigOption.php
+++ b/lib/internal/Magento/Framework/Setup/Option/AbstractConfigOption.php
@@ -9,7 +9,6 @@
 
 /**
  * Abstract Option class in deployment configuration tool
- * @since 2.0.0
  */
 abstract class AbstractConfigOption extends InputOption
 {
@@ -17,7 +16,6 @@ abstract class AbstractConfigOption extends InputOption
      * Frontend input type
      *
      * @var string
-     * @since 2.0.0
      */
     private $frontendType;
 
@@ -25,7 +23,6 @@ abstract class AbstractConfigOption extends InputOption
      * Config path
      *
      * @var string
-     * @since 2.0.0
      */
     private $configPath;
 
@@ -39,7 +36,6 @@ abstract class AbstractConfigOption extends InputOption
      * @param string $description
      * @param string|array|null $defaultValue
      * @param string|array|null $shortcut
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -59,7 +55,6 @@ public function __construct(
      * Get frontend input type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFrontendType()
     {
@@ -70,7 +65,6 @@ public function getFrontendType()
      * Get config path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPath()
     {
@@ -82,7 +76,6 @@ public function getConfigPath()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param mixed $data
      * @return void
-     * @since 2.0.0
      */
     public function validate($data)
     {
diff --git a/lib/internal/Magento/Framework/Setup/Option/FlagConfigOption.php b/lib/internal/Magento/Framework/Setup/Option/FlagConfigOption.php
index 29bad171c65d4..fd3324b078c03 100644
--- a/lib/internal/Magento/Framework/Setup/Option/FlagConfigOption.php
+++ b/lib/internal/Magento/Framework/Setup/Option/FlagConfigOption.php
@@ -7,7 +7,6 @@
 
 /**
  * Flag option in deployment config tool
- * @since 2.0.0
  */
 class FlagConfigOption extends AbstractConfigOption
 {
@@ -23,7 +22,6 @@ class FlagConfigOption extends AbstractConfigOption
      * @param string $configPath
      * @param string $description
      * @param string|array|null $shortCut
-     * @since 2.0.0
      */
     public function __construct(
         $name,
diff --git a/lib/internal/Magento/Framework/Setup/Option/MultiSelectConfigOption.php b/lib/internal/Magento/Framework/Setup/Option/MultiSelectConfigOption.php
index 4398d7e0bf6f5..393213ed59c5d 100644
--- a/lib/internal/Magento/Framework/Setup/Option/MultiSelectConfigOption.php
+++ b/lib/internal/Magento/Framework/Setup/Option/MultiSelectConfigOption.php
@@ -7,7 +7,6 @@
 
 /**
  * Multi-select option in deployment config tool
- * @since 2.0.0
  */
 class MultiSelectConfigOption extends AbstractConfigOption
 {
@@ -18,12 +17,7 @@ class MultiSelectConfigOption extends AbstractConfigOption
     const FRONTEND_WIZARD_MULTISELECT = 'multiselect';
     /**#@- */
 
-    /**
-     * Available options
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@- */
     private $selectOptions;
 
     /**
@@ -37,7 +31,6 @@ class MultiSelectConfigOption extends AbstractConfigOption
      * @param array $defaultValue
      * @param string|array|null $shortCut
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -72,7 +65,6 @@ public function __construct(
      * Get available options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectOptions()
     {
@@ -85,7 +77,6 @@ public function getSelectOptions()
      * @param mixed $data
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validate($data)
     {
diff --git a/lib/internal/Magento/Framework/Setup/Option/SelectConfigOption.php b/lib/internal/Magento/Framework/Setup/Option/SelectConfigOption.php
index 873884e4882be..9f9c93db03f37 100644
--- a/lib/internal/Magento/Framework/Setup/Option/SelectConfigOption.php
+++ b/lib/internal/Magento/Framework/Setup/Option/SelectConfigOption.php
@@ -7,7 +7,6 @@
 
 /**
  * Select option in deployment config tool
- * @since 2.0.0
  */
 class SelectConfigOption extends AbstractConfigOption
 {
@@ -18,12 +17,7 @@ class SelectConfigOption extends AbstractConfigOption
     const FRONTEND_WIZARD_SELECT = 'select';
     /**#@- */
 
-    /**
-     * Available options
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@- */
     private $selectOptions;
 
     /**
@@ -37,7 +31,6 @@ class SelectConfigOption extends AbstractConfigOption
      * @param string|null $defaultValue
      * @param string|array|null $shortCut
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -70,7 +63,6 @@ public function __construct(
      * Get available options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getSelectOptions()
     {
@@ -83,7 +75,6 @@ public function getSelectOptions()
      * @param mixed $data
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validate($data)
     {
diff --git a/lib/internal/Magento/Framework/Setup/Option/TextConfigOption.php b/lib/internal/Magento/Framework/Setup/Option/TextConfigOption.php
index d21cb8162c505..c0aea6d6a8590 100644
--- a/lib/internal/Magento/Framework/Setup/Option/TextConfigOption.php
+++ b/lib/internal/Magento/Framework/Setup/Option/TextConfigOption.php
@@ -7,7 +7,6 @@
 
 /**
  * Text option in deployment config tool
- * @since 2.0.0
  */
 class TextConfigOption extends AbstractConfigOption
 {
@@ -29,7 +28,6 @@ class TextConfigOption extends AbstractConfigOption
      * @param string|null $defaultValue
      * @param string|array|null $shortCut
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -61,7 +59,6 @@ public function __construct(
      * @param mixed $data
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function validate($data)
     {
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/Context.php b/lib/internal/Magento/Framework/Setup/SampleData/Context.php
index fb3f4ce4825f5..18d2a01bf599b 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/Context.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/Context.php
@@ -17,26 +17,22 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
- * @since 2.0.0
  */
 class Context
 {
     /**
      * @var FixtureManager
-     * @since 2.0.0
      */
     private $fixtureManager;
 
     /**
      * @var Csv
-     * @since 2.0.0
      */
     private $csvReader;
 
     /**
      * @param FixtureManager $fixtureManager
      * @param Csv $csvReader
-     * @since 2.0.0
      */
     public function __construct(FixtureManager $fixtureManager, Csv $csvReader)
     {
@@ -46,7 +42,6 @@ public function __construct(FixtureManager $fixtureManager, Csv $csvReader)
 
     /**
      * @return FixtureManager
-     * @since 2.0.0
      */
     public function getFixtureManager()
     {
@@ -55,7 +50,6 @@ public function getFixtureManager()
 
     /**
      * @return Csv
-     * @since 2.0.0
      */
     public function getCsvReader()
     {
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/Executor.php b/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
index 7a54bfcf230ba..8217da251a1a8 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Framework\Setup\SampleData\Executor
  *
- * @since 2.0.0
  */
 class Executor
 {
     /**
      * @var State
-     * @since 2.0.0
      */
     private $state;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     private $logger;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     private $appState;
 
@@ -34,7 +30,6 @@ class Executor
      * @param \Psr\Log\LoggerInterface $logger
      * @param State $state
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -52,7 +47,6 @@ public function __construct(
      *
      * @param InstallerInterface $installer
      * @return void
-     * @since 2.0.0
      */
     public function exec(InstallerInterface $installer)
     {
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php b/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
index 876e6cacc9fe3..6984cc8a08f40 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Framework\Setup\SampleData\FixtureManager
  *
- * @since 2.0.0
  */
 class FixtureManager
 {
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -26,20 +24,17 @@ class FixtureManager
      * Modules root directory
      *
      * @var ReadInterface
-     * @since 2.0.0
      */
     protected $_modulesDirectory;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $_string;
 
     /**
      * @param ComponentRegistrar $componentRegistrar
      * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrar $componentRegistrar, \Magento\Framework\Stdlib\StringUtils $string)
     {
@@ -51,7 +46,6 @@ public function __construct(ComponentRegistrar $componentRegistrar, \Magento\Fra
      * @param string $fileId
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getFixture($fileId)
     {
@@ -68,7 +62,6 @@ public function getFixture($fileId)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public static function normalizePath($path)
     {
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/InstallerInterface.php b/lib/internal/Magento/Framework/Setup/SampleData/InstallerInterface.php
index 33ff95fa344d8..7bad230243c2e 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/InstallerInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/InstallerInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for SampleData modules installation
- * @since 2.0.0
  */
 interface InstallerInterface
 {
@@ -15,7 +14,6 @@ interface InstallerInterface
      * Install SampleData module
      *
      * @return void
-     * @since 2.0.0
      */
     public function install();
 }
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/State.php b/lib/internal/Magento/Framework/Setup/SampleData/State.php
index 3606207314f9c..dd5a1a27ceb47 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/State.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/State.php
@@ -11,31 +11,26 @@
 /**
  * Class \Magento\Framework\Setup\SampleData\State
  *
- * @since 2.0.0
  */
 class State implements StateInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $fileName = '.sample-data-state.flag';
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     protected $filePath;
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -44,7 +39,6 @@ public function __construct(Filesystem $filesystem)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function hasError()
     {
@@ -61,7 +55,6 @@ public function hasError()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setError()
     {
@@ -72,7 +65,6 @@ public function setError()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isInstalled()
     {
@@ -93,7 +85,6 @@ public function isInstalled()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function setInstalled()
     {
@@ -104,7 +95,6 @@ public function setInstalled()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function clearState()
     {
@@ -115,7 +105,6 @@ public function clearState()
 
     /**
      * @return \Magento\Framework\Filesystem\File\WriteInterface
-     * @since 2.0.0
      */
     protected function getStream()
     {
@@ -128,7 +117,6 @@ protected function getStream()
     /**
      * @param string $mode
      * @return bool|\Magento\Framework\Filesystem\File\WriteInterface
-     * @since 2.0.0
      */
     protected function openStream($mode = 'w')
     {
@@ -145,7 +133,6 @@ protected function openStream($mode = 'w')
      * @param string $data
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     protected function writeStream($data)
     {
@@ -165,7 +152,6 @@ protected function writeStream($data)
      *
      * @param \Magento\Framework\Filesystem\File\WriteInterface $stream
      * @return void
-     * @since 2.0.0
      */
     protected function closeStream($stream)
     {
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/StateInterface.php b/lib/internal/Magento/Framework/Setup/SampleData/StateInterface.php
index e963c09b28e86..2fe3ead419f6c 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/StateInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/StateInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for SampleData modules installation
- * @since 2.0.0
  */
 interface StateInterface
 {
@@ -21,7 +20,6 @@ interface StateInterface
      * Set error flag to Sample Data state
      *
      * @return void
-     * @since 2.0.0
      */
     public function setError();
 
@@ -29,7 +27,6 @@ public function setError();
      * Check if Sample Data state has error
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasError();
 
@@ -37,7 +34,6 @@ public function hasError();
      * Set installed flag to Sample Data state
      *
      * @return void
-     * @since 2.0.0
      */
     public function setInstalled();
 
@@ -45,7 +41,6 @@ public function setInstalled();
      * Check if Sample Data is installed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isInstalled();
 
@@ -53,7 +48,6 @@ public function isInstalled();
      * Clear Sample Data state
      *
      * @return void
-     * @since 2.0.0
      */
     public function clearState();
 }
diff --git a/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php b/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
index 8d679138c924a..48900c5cdc029 100644
--- a/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
@@ -8,7 +8,6 @@
 /**
  * DB schema resource interface
  * @api
- * @since 2.0.0
  */
 interface SchemaSetupInterface extends SetupInterface
 {
@@ -19,7 +18,6 @@ interface SchemaSetupInterface extends SetupInterface
      * @param array|string $fields
      * @param string $indexType
      * @return string
-     * @since 2.0.0
      */
     public function getIdxName($tableName, $fields, $indexType = '');
 
@@ -31,7 +29,6 @@ public function getIdxName($tableName, $fields, $indexType = '');
      * @param string $refTableName  the reference table name
      * @param string $refColumnName the reference table column name
      * @return string
-     * @since 2.0.0
      */
     public function getFkName($priTableName, $priColumnName, $refTableName, $refColumnName);
 }
diff --git a/lib/internal/Magento/Framework/Setup/SetupInterface.php b/lib/internal/Magento/Framework/Setup/SetupInterface.php
index db78e44368030..90d5203b53efe 100644
--- a/lib/internal/Magento/Framework/Setup/SetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SetupInterface.php
@@ -9,7 +9,6 @@
  * DB resource interface
  *
  * @api
- * @since 2.0.0
  */
 interface SetupInterface
 {
@@ -17,7 +16,6 @@ interface SetupInterface
      * Gets connection object
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
-     * @since 2.0.0
      */
     public function getConnection();
 
@@ -27,7 +25,6 @@ public function getConnection();
      * @param string $tableName
      * @param string $realTableName
      * @return $this
-     * @since 2.0.0
      */
     public function setTable($tableName, $realTableName);
 
@@ -36,7 +33,6 @@ public function setTable($tableName, $realTableName);
      *
      * @param string|array $tableName
      * @return string
-     * @since 2.0.0
      */
     public function getTable($tableName);
 
@@ -54,7 +50,6 @@ public function getTablePlaceholder($tableName);
      *
      * @param string $table
      * @return bool
-     * @since 2.0.0
      */
     public function tableExists($table);
 
@@ -63,7 +58,6 @@ public function tableExists($table);
      *
      * @param string $sql
      * @return $this
-     * @since 2.0.0
      */
     public function run($sql);
 
@@ -71,7 +65,6 @@ public function run($sql);
      * Prepares database before install/upgrade
      *
      * @return $this
-     * @since 2.0.0
      */
     public function startSetup();
 
@@ -79,7 +72,6 @@ public function startSetup();
      * Prepares database after install/upgrade
      *
      * @return $this
-     * @since 2.0.0
      */
     public function endSetup();
 }
diff --git a/lib/internal/Magento/Framework/Setup/UninstallInterface.php b/lib/internal/Magento/Framework/Setup/UninstallInterface.php
index 523b21a9394ce..28e8104610559 100644
--- a/lib/internal/Magento/Framework/Setup/UninstallInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UninstallInterface.php
@@ -9,7 +9,6 @@
  * Interface for handling data removal during module uninstall
  *
  * @api
- * @since 2.0.0
  */
 interface UninstallInterface
 {
@@ -19,7 +18,6 @@ interface UninstallInterface
      * @param SchemaSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context);
 }
diff --git a/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php b/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
index 7ae89fa906c7d..f700157cab98e 100644
--- a/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
@@ -9,7 +9,6 @@
  * Interface for data upgrades of a module
  *
  * @api
- * @since 2.0.0
  */
 interface UpgradeDataInterface
 {
@@ -19,7 +18,6 @@ interface UpgradeDataInterface
      * @param ModuleDataSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context);
 }
diff --git a/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php b/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
index de585a8ab8b74..22c3b2110ec69 100644
--- a/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
@@ -9,7 +9,6 @@
  * Interface for DB schema upgrades of a module
  *
  * @api
- * @since 2.0.0
  */
 interface UpgradeSchemaInterface
 {
@@ -19,7 +18,6 @@ interface UpgradeSchemaInterface
      * @param SchemaSetupInterface $setup
      * @param ModuleContextInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context);
 }
diff --git a/lib/internal/Magento/Framework/Shell.php b/lib/internal/Magento/Framework/Shell.php
index 769bb011e755d..8940903da81ee 100644
--- a/lib/internal/Magento/Framework/Shell.php
+++ b/lib/internal/Magento/Framework/Shell.php
@@ -9,7 +9,6 @@
 
 /**
  * Shell command line wrapper encapsulates command execution and arguments escaping
- * @since 2.0.0
  */
 class Shell implements ShellInterface
 {
@@ -17,20 +16,17 @@ class Shell implements ShellInterface
      * Logger instance
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var CommandRendererInterface
-     * @since 2.0.0
      */
     private $commandRenderer;
 
     /**
      * @param CommandRendererInterface $commandRenderer
      * @param \Psr\Log\LoggerInterface $logger Logger instance to be used to log commands and their output
-     * @since 2.0.0
      */
     public function __construct(
         CommandRendererInterface $commandRenderer,
@@ -47,7 +43,6 @@ public function __construct(
      * @param string[] $arguments Argument values to substitute markers with
      * @return string Output of an executed command
      * @throws \Magento\Framework\Exception\LocalizedException If a command returns non-zero exit code
-     * @since 2.0.0
      */
     public function execute($command, array $arguments = [])
     {
@@ -77,7 +72,6 @@ public function execute($command, array $arguments = [])
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     protected function log($message)
     {
diff --git a/lib/internal/Magento/Framework/Shell/CommandRenderer.php b/lib/internal/Magento/Framework/Shell/CommandRenderer.php
index aa2527ba273be..6ca290cd47a52 100644
--- a/lib/internal/Magento/Framework/Shell/CommandRenderer.php
+++ b/lib/internal/Magento/Framework/Shell/CommandRenderer.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Shell\CommandRenderer
  *
- * @since 2.0.0
  */
 class CommandRenderer implements CommandRendererInterface
 {
@@ -18,7 +17,6 @@ class CommandRenderer implements CommandRendererInterface
      * @param string $command
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render($command, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Shell/CommandRendererBackground.php b/lib/internal/Magento/Framework/Shell/CommandRendererBackground.php
index 9971f77a70e36..d2808ab54196a 100644
--- a/lib/internal/Magento/Framework/Shell/CommandRendererBackground.php
+++ b/lib/internal/Magento/Framework/Shell/CommandRendererBackground.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Shell\CommandRendererBackground
  *
- * @since 2.0.0
  */
 class CommandRendererBackground extends CommandRenderer
 {
     /**
      * @var \Magento\Framework\OsInfo
-     * @since 2.0.0
      */
     protected $osInfo;
 
     /**
      * @param OsInfo $osInfo
-     * @since 2.0.0
      */
     public function __construct(OsInfo $osInfo)
     {
@@ -35,7 +32,6 @@ public function __construct(OsInfo $osInfo)
      * @param string $command
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render($command, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php b/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
index 299f59f1a7b42..7460aaea74819 100644
--- a/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
+++ b/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
@@ -9,7 +9,6 @@
  * Shell command renderer
  *
  * @api
- * @since 2.0.0
  */
 interface CommandRendererInterface
 {
@@ -19,7 +18,6 @@ interface CommandRendererInterface
      * @param string $command
      * @param array $arguments
      * @return string
-     * @since 2.0.0
      */
     public function render($command, array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/Shell/ComplexParameter.php b/lib/internal/Magento/Framework/Shell/ComplexParameter.php
index 58555a6d0989f..6ff087aa77926 100644
--- a/lib/internal/Magento/Framework/Shell/ComplexParameter.php
+++ b/lib/internal/Magento/Framework/Shell/ComplexParameter.php
@@ -10,7 +10,6 @@
  * A parser for complex parameters in command-line arguments
  *
  * Transforms parameter formatted as a URL query string into an array
- * @since 2.0.0
  */
 class ComplexParameter
 {
@@ -23,7 +22,6 @@ class ComplexParameter
      * Argument name
      *
      * @var string
-     * @since 2.0.0
      */
     private $name;
 
@@ -31,7 +29,6 @@ class ComplexParameter
      * Regex pattern for searching the parameter among arguments
      *
      * @var string
-     * @since 2.0.0
      */
     private $pcre;
 
@@ -40,7 +37,6 @@ class ComplexParameter
      *
      * @param string $name
      * @param string $pattern
-     * @since 2.0.0
      */
     public function __construct($name, $pattern = self::DEFAULT_PATTERN)
     {
@@ -53,7 +49,6 @@ public function __construct($name, $pattern = self::DEFAULT_PATTERN)
      *
      * @param string[] $input
      * @return array
-     * @since 2.0.0
      */
     public function getFromArray($input)
     {
@@ -71,7 +66,6 @@ public function getFromArray($input)
      *
      * @param string $string
      * @return array
-     * @since 2.0.0
      */
     public function getFromString($string)
     {
@@ -88,7 +82,6 @@ public function getFromString($string)
      * @param array $server
      * @param array $into
      * @return array
-     * @since 2.0.0
      */
     public function mergeFromArgv($server, array $into = [])
     {
diff --git a/lib/internal/Magento/Framework/ShellInterface.php b/lib/internal/Magento/Framework/ShellInterface.php
index 5abfb7726e77d..96607b8a072af 100644
--- a/lib/internal/Magento/Framework/ShellInterface.php
+++ b/lib/internal/Magento/Framework/ShellInterface.php
@@ -9,7 +9,6 @@
  * Shell command line wrapper encapsulates command execution and arguments escaping
  *
  * @api
- * @since 2.0.0
  */
 interface ShellInterface
 {
@@ -20,7 +19,6 @@ interface ShellInterface
      * @param string[] $arguments Argument values to substitute markers with
      * @throws \Magento\Framework\Exception\LocalizedException If a command returns non-zero exit code
      * @return string
-     * @since 2.0.0
      */
     public function execute($command, array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/Simplexml/Config.php b/lib/internal/Magento/Framework/Simplexml/Config.php
index 40ef71f1f0dc9..0d8711c5011c0 100644
--- a/lib/internal/Magento/Framework/Simplexml/Config.php
+++ b/lib/internal/Magento/Framework/Simplexml/Config.php
@@ -9,7 +9,6 @@
  * Base class for simplexml based configurations
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -17,7 +16,6 @@ class Config
      * Configuration xml
      *
      * @var Element
-     * @since 2.0.0
      */
     protected $_xml = null;
 
@@ -25,7 +23,6 @@ class Config
      * Class name of simplexml elements for this configuration
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_elementClass = \Magento\Framework\Simplexml\Element::class;
 
@@ -33,7 +30,6 @@ class Config
      * Xpath describing nodes in configuration that need to be extended
      *
      * @example <allResources extends="/config/modules//resource"/>
-     * @since 2.0.0
      */
     protected $_xpathExtends = "//*[@extends]";
 
@@ -44,7 +40,6 @@ class Config
      *
      * @see \Magento\Framework\Simplexml\Config::setXml
      * @param Element|string $sourceData
-     * @since 2.0.0
      */
     public function __construct($sourceData = null)
     {
@@ -67,7 +62,6 @@ public function __construct($sourceData = null)
      *
      * @param Element $node
      * @return $this
-     * @since 2.0.0
      */
     public function setXml(Element $node)
     {
@@ -81,7 +75,6 @@ public function setXml(Element $node)
      * @see \Magento\Framework\Simplexml\Element::descend
      * @param string $path
      * @return Element|bool
-     * @since 2.0.0
      */
     public function getNode($path = null)
     {
@@ -99,7 +92,6 @@ public function getNode($path = null)
      *
      * @param string $xpath
      * @return Element[]|bool
-     * @since 2.0.0
      */
     public function getXpath($xpath)
     {
@@ -119,7 +111,6 @@ public function getXpath($xpath)
      * Return Xml of node as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getXmlString()
     {
@@ -131,7 +122,6 @@ public function getXmlString()
      *
      * @param string $filePath
      * @return boolean
-     * @since 2.0.0
      */
     public function loadFile($filePath)
     {
@@ -150,7 +140,6 @@ public function loadFile($filePath)
      *
      * @param string $string
      * @return boolean
-     * @since 2.0.0
      */
     public function loadString($string)
     {
@@ -169,7 +158,6 @@ public function loadString($string)
      *
      * @param \DOMNode $dom
      * @return bool
-     * @since 2.0.0
      */
     public function loadDom(\DOMNode $dom)
     {
@@ -189,7 +177,6 @@ public function loadDom(\DOMNode $dom)
      * @param string $value
      * @param boolean $overwrite
      * @return $this
-     * @since 2.0.0
      */
     public function setNode($path, $value, $overwrite = true)
     {
@@ -201,7 +188,6 @@ public function setNode($path, $value, $overwrite = true)
      * Process configuration xml
      *
      * @return $this
-     * @since 2.0.0
      */
     public function applyExtends()
     {
@@ -225,7 +211,6 @@ public function applyExtends()
      *
      * @param string $text
      * @return string
-     * @since 2.0.0
      */
     public function processFileData($text)
     {
@@ -238,7 +223,6 @@ public function processFileData($text)
      * @param Config $config
      * @param boolean $overwrite
      * @return $this
-     * @since 2.0.0
      */
     public function extend(Config $config, $overwrite = true)
     {
@@ -253,7 +237,6 @@ public function extend(Config $config, $overwrite = true)
      * https://bugs.php.net/bug.php?id=62468
      *
      * @return void
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -264,7 +247,6 @@ public function __destruct()
      * Getter for xml element
      *
      * @return Element
-     * @since 2.0.0
      */
     protected function getXml()
     {
diff --git a/lib/internal/Magento/Framework/Simplexml/Element.php b/lib/internal/Magento/Framework/Simplexml/Element.php
index 188a9bc63f83a..eec48bc555010 100644
--- a/lib/internal/Magento/Framework/Simplexml/Element.php
+++ b/lib/internal/Magento/Framework/Simplexml/Element.php
@@ -10,7 +10,6 @@
  * Extends SimpleXML to add valuable functionality to \SimpleXMLElement class
  *
  * @api
- * @since 2.0.0
  */
 class Element extends \SimpleXMLElement
 {
@@ -22,7 +21,6 @@ class Element extends \SimpleXMLElement
      * @todo make use of spl_object_hash to keep global array of simplexml elements
      *       to emulate complicated attributes
      * @var \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     protected $_parent = null;
 
@@ -32,7 +30,6 @@ class Element extends \SimpleXMLElement
      * @param \Magento\Framework\Simplexml\Element $element
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setParent($element)
     {
@@ -46,7 +43,6 @@ public function setParent($element)
      *
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     public function getParent()
     {
@@ -67,7 +63,6 @@ public function getParent()
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function hasChildren()
     {
@@ -87,7 +82,6 @@ public function hasChildren()
      *
      * @param string $name
      * @return string|null
-     * @since 2.0.0
      */
     public function getAttribute($name)
     {
@@ -104,7 +98,6 @@ public function getAttribute($name)
      * @param   string $path Example: "child/grand@attrName=attrValue/subGrand" (to make it faster without regex)
      * @return  \Magento\Framework\Simplexml\Element
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function descend($path)
     {
@@ -165,7 +158,6 @@ public function descend($path)
      * @param string $name
      * @param string $value
      * @return void
-     * @since 2.0.0
      */
     public function setAttribute($name, $value)
     {
@@ -180,7 +172,6 @@ public function setAttribute($name, $value)
      * Returns the node and children as an array
      *
      * @return array|string
-     * @since 2.0.0
      */
     public function asArray()
     {
@@ -190,7 +181,6 @@ public function asArray()
     /**
      * asArray() analog, but without attributes
      * @return array|string
-     * @since 2.0.0
      */
     public function asCanonicalArray()
     {
@@ -202,7 +192,6 @@ public function asCanonicalArray()
      *
      * @param bool $isCanonical - whether to ignore attributes
      * @return array|string
-     * @since 2.0.0
      */
     protected function _asArray($isCanonical = false)
     {
@@ -240,7 +229,6 @@ protected function _asArray($isCanonical = false)
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function asNiceXml($filename = '', $level = 0)
     {
@@ -300,7 +288,6 @@ public function asNiceXml($filename = '', $level = 0)
      *
      * @param int $level
      * @return string
-     * @since 2.0.0
      */
     public function innerXml($level = 0)
     {
@@ -316,7 +303,6 @@ public function innerXml($level = 0)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function xmlentities($value = null)
     {
@@ -339,7 +325,6 @@ public function xmlentities($value = null)
      *
      * @param \Magento\Framework\Simplexml\Element $source
      * @return $this
-     * @since 2.0.0
      */
     public function appendChild($source)
     {
@@ -370,7 +355,6 @@ public function appendChild($source)
      * @param \Magento\Framework\Simplexml\Element $source
      * @param boolean $overwrite
      * @return $this
-     * @since 2.0.0
      */
     public function extend($source, $overwrite = false)
     {
@@ -393,7 +377,6 @@ public function extend($source, $overwrite = false)
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function extendChild($source, $overwrite = false)
     {
@@ -456,7 +439,6 @@ public function extendChild($source, $overwrite = false)
      * @param string $value
      * @param bool $overwrite
      * @return $this
-     * @since 2.0.0
      */
     public function setNode($path, $value, $overwrite = true)
     {
@@ -490,7 +472,6 @@ public function setNode($path, $value, $overwrite = true)
      *
      * Note: trying to refer this object as a variable after "unsetting" like this will result in E_WARNING
      * @return void
-     * @since 2.0.0
      */
     public function unsetSelf()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
index 2375e86e2f209..87d4942d90914 100644
--- a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
@@ -9,7 +9,6 @@
  * Class ArrayUtils
  *
  * @api
- * @since 2.0.0
  */
 class ArrayUtils
 {
@@ -19,7 +18,6 @@ class ArrayUtils
      * @param  array $sort
      * @param  string $locale
      * @return array|bool
-     * @since 2.0.0
      */
     public function ksortMultibyte(array &$sort, $locale)
     {
@@ -61,7 +59,6 @@ public function ksortMultibyte(array &$sort, $locale)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function decorateArray($array, $prefix = 'decorated_', $forceSetAll = false)
     {
@@ -120,7 +117,6 @@ public function decorateArray($array, $prefix = 'decorated_', $forceSetAll = fal
      * @param bool $value
      * @param bool $isSkipped
      * @return void
-     * @since 2.0.0
      */
     private function _decorateArrayObject($element, $key, $value, $isSkipped)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
index 241cf6867fa1f..7c1db54d47488 100644
--- a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
@@ -9,7 +9,6 @@
  * Utility methods for the boolean data type
  *
  * @api
- * @since 2.0.0
  */
 class BooleanUtils
 {
@@ -17,7 +16,6 @@ class BooleanUtils
      * Expressions that mean boolean TRUE
      *
      * @var array
-     * @since 2.0.0
      */
     private $trueValues;
 
@@ -25,7 +23,6 @@ class BooleanUtils
      * Expressions that mean boolean FALSE
      *
      * @var array
-     * @since 2.0.0
      */
     private $falseValues;
 
@@ -33,7 +30,6 @@ class BooleanUtils
      * @param array $trueValues
      * @param array $falseValues
      * @codingStandardsIgnoreStart
-     * @since 2.0.0
      */
     public function __construct(
         array $trueValues = [true, 1, 'true', '1'],
@@ -51,7 +47,6 @@ public function __construct(
      * @param mixed $value Boolean expression
      * @return bool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function toBoolean($value)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 01b0e3d3f542a..2b4cddf242113 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -8,7 +8,6 @@
 /**
  * Class CookieMetadata
  * @api
- * @since 2.0.0
  */
 class CookieMetadata
 {
@@ -22,17 +21,11 @@ class CookieMetadata
     const KEY_DURATION = 'duration';
     /**#@-*/
 
-    /**
-     * Store the metadata in array format to distinguish between null values and no value set.
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $metadata;
 
     /**
      * @param array $metadata
-     * @since 2.0.0
      */
     public function __construct($metadata = [])
     {
@@ -48,7 +41,6 @@ public function __construct($metadata = [])
      * If a value has not yet been set then the key will not show up in the array.
      *
      * @return array
-     * @since 2.0.0
      */
     public function __toArray()
     {
@@ -60,7 +52,6 @@ public function __toArray()
      *
      * @param string $domain
      * @return $this
-     * @since 2.0.0
      */
     public function setDomain($domain)
     {
@@ -71,7 +62,6 @@ public function setDomain($domain)
      * Get the domain for the cookie
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getDomain()
     {
@@ -83,7 +73,6 @@ public function getDomain()
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path)
     {
@@ -94,7 +83,6 @@ public function setPath($path)
      * Get the path of the cookie
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPath()
     {
@@ -106,7 +94,6 @@ public function getPath()
      *
      * @param string $name
      * @return int|float|string|bool|null
-     * @since 2.0.0
      */
     protected function get($name)
     {
@@ -122,7 +109,6 @@ protected function get($name)
      * @param string $name
      * @param int|float|string|bool|null $value
      * @return $this
-     * @since 2.0.0
      */
     protected function set($name, $value)
     {
@@ -134,7 +120,6 @@ protected function set($name, $value)
      * Get HTTP Only flag
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getHttpOnly()
     {
@@ -145,7 +130,6 @@ public function getHttpOnly()
      * Get whether the cookie is only available under HTTPS
      *
      * @return bool|null
-     * @since 2.0.0
      */
     public function getSecure()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
index c00365be0e705..b60df1264863d 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
@@ -11,19 +11,16 @@
 /**
  * CookieMetadataFactory is used to construct SensitiveCookieMetadata and PublicCookieMetadata objects.
  * @api
- * @since 2.0.0
  */
 class CookieMetadataFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $metadata
      * @return SensitiveCookieMetadata
-     * @since 2.0.0
      */
     public function createSensitiveCookieMetadata($metadata = [])
     {
@@ -50,7 +46,6 @@ public function createSensitiveCookieMetadata($metadata = [])
      *
      * @param array $metadata
      * @return PublicCookieMetadata
-     * @since 2.0.0
      */
     public function createPublicCookieMetadata($metadata = [])
     {
@@ -65,7 +60,6 @@ public function createPublicCookieMetadata($metadata = [])
      *
      * @param array $metadata
      * @return CookieMetadata
-     * @since 2.0.0
      */
     public function createCookieMetadata($metadata = [])
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
index 860048cdb0387..121c168483a6e 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
@@ -9,7 +9,6 @@
 /**
  * CookieReaderInterface provides the ability to read cookies sent in a request.
  * @api
- * @since 2.0.0
  */
 interface CookieReaderInterface
 {
@@ -19,7 +18,6 @@ interface CookieReaderInterface
      * @param string $name
      * @param string|null $default The default value to return if no value could be found for the given $name.
      * @return string|null
-     * @since 2.0.0
      */
     public function getCookie($name, $default = null);
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScope.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScope.php
index 6571f9ab60006..d137292a4ec37 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScope.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScope.php
@@ -8,31 +8,26 @@
 
 /**
  * CookieScope is used to store default scope metadata.
- * @since 2.0.0
  */
 class CookieScope implements CookieScopeInterface
 {
     /**
      * @var SensitiveCookieMetadata
-     * @since 2.0.0
      */
     private $sensitiveCookieMetadata;
 
     /**
      * @var PublicCookieMetadata
-     * @since 2.0.0
      */
     private $publicCookieMetadata;
 
     /**
      * @var CookieMetadata
-     * @since 2.0.0
      */
     private $cookieMetadata;
 
     /**
      * @var CookieMetadataFactory
-     * @since 2.0.0
      */
     private $cookieMetadataFactory;
 
@@ -41,7 +36,6 @@ class CookieScope implements CookieScopeInterface
      * @param SensitiveCookieMetadata $sensitiveCookieMetadata
      * @param PublicCookieMetadata $publicCookieMetadata
      * @param CookieMetadata $deleteCookieMetadata
-     * @since 2.0.0
      */
     public function __construct(
         CookieMetadataFactory $cookieMetadataFactory,
@@ -61,7 +55,6 @@ public function __construct(
      *
      * @param SensitiveCookieMetadata|null $override
      * @return SensitiveCookieMetadata
-     * @since 2.0.0
      */
     public function getSensitiveCookieMetadata(SensitiveCookieMetadata $override = null)
     {
@@ -83,7 +76,6 @@ public function getSensitiveCookieMetadata(SensitiveCookieMetadata $override = n
      *
      * @param PublicCookieMetadata|null $override
      * @return PublicCookieMetadata
-     * @since 2.0.0
      */
     public function getPublicCookieMetadata(PublicCookieMetadata $override = null)
     {
@@ -105,7 +97,6 @@ public function getPublicCookieMetadata(PublicCookieMetadata $override = null)
      *
      * @param CookieMetadata|null $override
      * @return CookieMetadata
-     * @since 2.0.0
      */
     public function getCookieMetadata(CookieMetadata $override = null)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
index 565a146975b2b..b2870309ae5a5 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
@@ -8,7 +8,6 @@
 /**
  * CookieScope is used to store default scope metadata.
  * @api
- * @since 2.0.0
  */
 interface CookieScopeInterface
 {
@@ -18,7 +17,6 @@ interface CookieScopeInterface
      *
      * @param SensitiveCookieMetadata|null $override
      * @return SensitiveCookieMetadata
-     * @since 2.0.0
      */
     public function getSensitiveCookieMetadata(SensitiveCookieMetadata $override = null);
 
@@ -28,7 +26,6 @@ public function getSensitiveCookieMetadata(SensitiveCookieMetadata $override = n
      *
      * @param PublicCookieMetadata|null $override
      * @return PublicCookieMetadata
-     * @since 2.0.0
      */
     public function getPublicCookieMetadata(PublicCookieMetadata $override = null);
 
@@ -38,7 +35,6 @@ public function getPublicCookieMetadata(PublicCookieMetadata $override = null);
      *
      * @param CookieMetadata|null $override
      * @return CookieMetadata
-     * @since 2.0.0
      */
     public function getCookieMetadata(CookieMetadata $override = null);
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
index beba4e358479c..fabd3bbe2b0be 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
@@ -15,7 +15,6 @@
  * set for the domain.
  *
  * @api
- * @since 2.0.0
  */
 class CookieSizeLimitReachedException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php b/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
index cb217d7395cca..681d6b43c3d04 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
@@ -12,7 +12,6 @@
  * impossible to send any cookie information back to the client.
  *
  * @api
- * @since 2.0.0
  */
 class FailureToSendException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index 64e14d1d8c72f..fd081a0ba61e1 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -21,7 +21,6 @@
  * stores the cookie.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class PhpCookieManager implements CookieManagerInterface
 {
@@ -42,15 +41,11 @@ class PhpCookieManager implements CookieManagerInterface
     const KEY_EXPIRE_TIME = 'expiry';
     /**#@-*/
 
-    /**
-     * @var CookieScopeInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $scope;
 
     /**
      * @var CookieReaderInterface
-     * @since 2.0.0
      */
     private $reader;
 
@@ -75,7 +70,6 @@ class PhpCookieManager implements CookieManagerInterface
      * @param CookieReaderInterface $reader
      * @param LoggerInterface $logger
      * @param HttpHeader $httpHeader
-     * @since 2.0.0
      */
     public function __construct(
         CookieScopeInterface $scope,
@@ -102,7 +96,6 @@ public function __construct(
      * there is still no guarantee that the browser received and accepted the cookie.
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metadata = null)
     {
@@ -123,7 +116,6 @@ public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metad
      * @throws FailureToSendException If cookie couldn't be sent to the browser.
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function setPublicCookie($name, $value, PublicCookieMetadata $metadata = null)
     {
@@ -141,7 +133,6 @@ public function setPublicCookie($name, $value, PublicCookieMetadata $metadata =
      * @throws FailureToSendException If cookie couldn't be sent to the browser.
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     protected function setCookie($name, $value, array $metadataArray)
     {
@@ -180,7 +171,6 @@ protected function setCookie($name, $value, array $metadataArray)
      * @param string $name
      * @param string $value
      * @return int
-     * @since 2.0.0
      */
     private function sizeOfCookie($name, $value)
     {
@@ -197,7 +187,6 @@ private function sizeOfCookie($name, $value)
      * @return void if it is possible to send the cookie
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     private function checkAbilityToSendCookie($name, $value)
     {
@@ -242,7 +231,6 @@ private function checkAbilityToSendCookie($name, $value)
      *
      * @param array $metadataArray
      * @return int in seconds since the Unix epoch.
-     * @since 2.0.0
      */
     private function computeExpirationTime(array $metadataArray)
     {
@@ -269,7 +257,6 @@ private function computeExpirationTime(array $metadataArray)
      * @param array $metadataArray
      * @param string|boolean|int|null $defaultValue
      * @return string|boolean|int|null
-     * @since 2.0.0
      */
     private function extractValue($parameter, array $metadataArray, $defaultValue)
     {
@@ -286,7 +273,6 @@ private function extractValue($parameter, array $metadataArray, $defaultValue)
      * @param string $name
      * @param string|null $default The default value to return if no value could be found for the given $name.
      * @return string|null
-     * @since 2.0.0
      */
     public function getCookie($name, $default = null)
     {
@@ -303,7 +289,6 @@ public function getCookie($name, $default = null)
      *     If this exception isn't thrown, there is still no guarantee that the browser
      *     received and accepted the request to delete this cookie.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function deleteCookie($name, CookieMetadata $metadata = null)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieReader.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieReader.php
index da413301e5864..9e4fb51fda2f1 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieReader.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieReader.php
@@ -8,7 +8,6 @@
 
 /**
  * PhpCookieReader is an implementation of CookieReaderInterface that reads cookie data from the php $_COOKIE array.
- * @since 2.0.0
  */
 class PhpCookieReader implements CookieReaderInterface
 {
@@ -18,7 +17,6 @@ class PhpCookieReader implements CookieReaderInterface
      * @param string $name
      * @param string|null $default The default value to return if no value could be found for the given $name.
      * @return string|null
-     * @since 2.0.0
      */
     public function getCookie($name, $default = null)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
index 64a168dfe4cd0..ef40ea94a6d08 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
@@ -10,7 +10,6 @@
  * Class PublicCookieMetadata
  *
  * @api
- * @since 2.0.0
  */
 class PublicCookieMetadata extends CookieMetadata
 {
@@ -21,7 +20,6 @@ class PublicCookieMetadata extends CookieMetadata
      *
      * @param int $duration Time in seconds.
      * @return $this
-     * @since 2.0.0
      */
     public function setDuration($duration)
     {
@@ -32,7 +30,6 @@ public function setDuration($duration)
      * Set the cookie duration to one year
      *
      * @return $this
-     * @since 2.0.0
      */
     public function setDurationOneYear()
     {
@@ -45,7 +42,6 @@ public function setDurationOneYear()
      * The cookie duration can be translated into an expiration date at the time the cookie is sent.
      *
      * @return int|null Time in seconds.
-     * @since 2.0.0
      */
     public function getDuration()
     {
@@ -57,7 +53,6 @@ public function getDuration()
      *
      * @param bool $httpOnly
      * @return $this
-     * @since 2.0.0
      */
     public function setHttpOnly($httpOnly)
     {
@@ -69,7 +64,6 @@ public function setHttpOnly($httpOnly)
      *
      * @param bool $secure
      * @return $this
-     * @since 2.0.0
      */
     public function setSecure($secure)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
index 1969c05b26e72..aab8e93160c8d 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
@@ -15,20 +15,17 @@
  * as path and domain are only data to be exposed by SensitiveCookieMetadata
  *
  * @api
- * @since 2.0.0
  */
 class SensitiveCookieMetadata extends CookieMetadata
 {
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @param RequestInterface $request
      * @param array $metadata
-     * @since 2.0.0
      */
     public function __construct(RequestInterface $request, $metadata = [])
     {
@@ -41,7 +38,6 @@ public function __construct(RequestInterface $request, $metadata = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSecure()
     {
@@ -51,7 +47,6 @@ public function getSecure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function __toArray()
     {
@@ -63,7 +58,6 @@ public function __toArray()
      * Update secure value, set it to request setting if it has no explicit value assigned.
      *
      * @return void
-     * @since 2.0.0
      */
     private function updateSecureValue()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
index baa56617f8353..d4d37d656ebcf 100644
--- a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
@@ -22,7 +22,6 @@
  * about how the cookie should be stored and whether JavaScript can access the cookie.
  *
  * @api
- * @since 2.0.0
  */
 interface CookieManagerInterface extends CookieReaderInterface
 {
@@ -39,7 +38,6 @@ interface CookieManagerInterface extends CookieReaderInterface
      * there is still no guarantee that the browser received and accepted the cookie.
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metadata = null);
 
@@ -56,7 +54,6 @@ public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metad
      * @throws FailureToSendException If cookie couldn't be sent to the browser.
      * @throws CookieSizeLimitReachedException Thrown when the cookie is too big to store any additional data.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function setPublicCookie($name, $value, PublicCookieMetadata $metadata = null);
 
@@ -70,7 +67,6 @@ public function setPublicCookie($name, $value, PublicCookieMetadata $metadata =
      *     If this exception isn't thrown, there is still no guarantee that the browser
      *     received and accepted the request to delete this cookie.
      * @throws InputException If the cookie name is empty or contains invalid characters.
-     * @since 2.0.0
      */
     public function deleteCookie($name, CookieMetadata $metadata = null);
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime.php
index 6edd07a1359ac..7f25620fdc736 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime.php
@@ -10,7 +10,6 @@
  * Internal dates
  *
  * @api
- * @since 2.0.0
  */
 class DateTime
 {
@@ -44,7 +43,6 @@ class DateTime
      * @param boolean $includeTime
      * @return string|null
      * @api
-     * @since 2.0.0
      */
     public function formatDate($date, $includeTime = true)
     {
@@ -68,7 +66,6 @@ public function formatDate($date, $includeTime = true)
      *
      * @param string $date
      * @return boolean
-     * @since 2.0.0
      */
     public function isEmptyDate($date)
     {
@@ -83,7 +80,6 @@ public function isEmptyDate($date)
      * @return string The given time in given format
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function gmDate($format, $time)
     {
@@ -97,7 +93,6 @@ public function gmDate($format, $time)
      * @return int
      *
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function strToTime($timeStr)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
index d4266153fcdd2..7ac93c7b94305 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
@@ -10,7 +10,6 @@
  * Date conversion model
  *
  * @api
- * @since 2.0.0
  */
 class DateTime
 {
@@ -18,19 +17,16 @@ class DateTime
      * Current config offset in seconds
      *
      * @var int
-     * @since 2.0.0
      */
     private $_offset = 0;
 
     /**
      * @var TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @param TimezoneInterface $localeDate
-     * @since 2.0.0
      */
     public function __construct(TimezoneInterface $localeDate)
     {
@@ -43,7 +39,6 @@ public function __construct(TimezoneInterface $localeDate)
      *
      * @param  string|null $timezone
      * @return int offset between timezone and gmt
-     * @since 2.0.0
      */
     public function calculateOffset($timezone = null)
     {
@@ -68,7 +63,6 @@ public function calculateOffset($timezone = null)
      * @param  string $format
      * @param  int|string $input date in current timezone
      * @return string
-     * @since 2.0.0
      */
     public function gmtDate($format = null, $input = null)
     {
@@ -90,7 +84,6 @@ public function gmtDate($format = null, $input = null)
      * @param  string $format
      * @param  int|string $input date in GMT timezone
      * @return string
-     * @since 2.0.0
      */
     public function date($format = null, $input = null)
     {
@@ -106,7 +99,6 @@ public function date($format = null, $input = null)
      *
      * @param  int|string|\DateTimeInterface $input date in current timezone
      * @return int
-     * @since 2.0.0
      */
     public function gmtTimestamp($input = null)
     {
@@ -135,7 +127,6 @@ public function gmtTimestamp($input = null)
      *
      * @param  int|string $input date in GMT timezone
      * @return int
-     * @since 2.0.0
      */
     public function timestamp($input = null)
     {
@@ -163,7 +154,6 @@ public function timestamp($input = null)
      *
      * @param  string $type
      * @return int
-     * @since 2.0.0
      */
     public function getGmtOffset($type = 'seconds')
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
index 279d05c163859..87f7d5fb9b586 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
@@ -10,13 +10,11 @@
 
 /**
  * {@inheritdoc}
- * @since 2.0.0
  */
 class DateTimeFormatter implements DateTimeFormatterInterface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $useIntlFormatObject;
 
@@ -28,7 +26,6 @@ class DateTimeFormatter implements DateTimeFormatterInterface
 
     /**
      * @param bool|null $useIntlFormatObject
-     * @since 2.0.0
      */
     public function __construct(
         $useIntlFormatObject = null
@@ -56,7 +53,6 @@ private function getLocaleResolver()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function formatObject($object, $format = null, $locale = null)
     {
@@ -75,7 +71,6 @@ public function formatObject($object, $format = null, $locale = null)
      * @param string|null $locale
      * @return string
      * @throws LocalizedException
-     * @since 2.0.0
      */
     protected function doFormatObject($object, $format = null, $locale = null)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
index 5d24459e7d1f7..a2d18215385fc 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface DateTimeFormatterInterface
 {
@@ -18,7 +17,6 @@ interface DateTimeFormatterInterface
      * @param string|int|array|null $format
      * @param string|null $locale
      * @return string
-     * @since 2.0.0
      */
     public function formatObject($object, $format = null, $locale = null);
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
index 6468ba732a301..ee2d09a2736ee 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
@@ -11,7 +11,6 @@
  * Date filter. Converts date from localized to internal format.
  *
  * @api
- * @since 2.0.0
  */
 class Date implements \Zend_Filter_Interface
 {
@@ -21,7 +20,6 @@ class Date implements \Zend_Filter_Interface
      * @var \Zend_Filter_LocalizedToNormalized
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_localToNormalFilter;
 
@@ -31,21 +29,18 @@ class Date implements \Zend_Filter_Interface
      * @var \Zend_Filter_NormalizedToLocalized
      *
      * @deprecated 2.1.0
-     * @since 2.0.0
      */
     protected $_normalToLocalFilter;
 
     /**
      * @var TimezoneInterface
      *
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @param TimezoneInterface $localeDate
      *
-     * @since 2.0.0
      */
     public function __construct(TimezoneInterface $localeDate)
     {
@@ -64,7 +59,6 @@ public function __construct(TimezoneInterface $localeDate)
      * @param string $value
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function filter($value)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
index 0e36776cfc7c5..2800d18e7d143 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
@@ -9,14 +9,12 @@
  * Date/Time filter. Converts datetime from localized to internal format.
  *
  * @api
- * @since 2.0.0
  */
 class DateTime extends Date
 {
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      *
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
index 363bdfaa145ac..813e01ed56e8a 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -10,13 +10,11 @@
 
 /**
  * Timezone library
- * @since 2.0.0
  */
 class Timezone implements TimezoneInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedFormats = [
         \IntlDateFormatter::FULL,
@@ -27,31 +25,26 @@ class Timezone implements TimezoneInterface
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_scopeType;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $_scopeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @since 2.0.0
      */
     protected $_dateTime;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultTimezonePath;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -68,7 +61,6 @@ class Timezone implements TimezoneInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $scopeType
      * @param string $defaultTimezonePath
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
@@ -88,7 +80,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultTimezonePath()
     {
@@ -97,7 +88,6 @@ public function getDefaultTimezonePath()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDefaultTimezone()
     {
@@ -106,7 +96,6 @@ public function getDefaultTimezone()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfigTimezone($scopeType = null, $scopeCode = null)
     {
@@ -119,7 +108,6 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDateFormat($type = \IntlDateFormatter::SHORT)
     {
@@ -132,7 +120,6 @@ public function getDateFormat($type = \IntlDateFormatter::SHORT)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDateFormatWithLongYear()
     {
@@ -145,7 +132,6 @@ public function getDateFormatWithLongYear()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getTimeFormat($type = \IntlDateFormatter::SHORT)
     {
@@ -158,7 +144,6 @@ public function getTimeFormat($type = \IntlDateFormatter::SHORT)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDateTimeFormat($type)
     {
@@ -168,7 +153,6 @@ public function getDateTimeFormat($type)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true)
     {
@@ -201,7 +185,6 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function scopeDate($scope = null, $date = null, $includeTime = false)
     {
@@ -215,7 +198,6 @@ public function scopeDate($scope = null, $date = null, $includeTime = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $showTime = false)
     {
@@ -230,7 +212,6 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function scopeTimeStamp($scope = null)
     {
@@ -244,7 +225,6 @@ public function scopeTimeStamp($scope = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
     {
@@ -277,7 +257,6 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @param null $timezone
      * @param string|null $pattern
      * @return string
-     * @since 2.0.0
      */
     public function formatDateTime(
         $date,
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
index 23e6ffe6de886..aef2bfb808842 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Validator
 {
@@ -18,7 +17,6 @@ class Validator
      * Maximum allowed year value
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_yearMaxValue;
 
@@ -26,14 +24,12 @@ class Validator
      * Minimum allowed year value
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_yearMinValue;
 
     /**
      * @param int $yearMinValue
      * @param int $yearMaxValue
-     * @since 2.0.0
      */
     public function __construct(
         $yearMinValue = \Magento\Framework\Stdlib\DateTime::YEAR_MIN_VALUE,
@@ -50,7 +46,6 @@ public function __construct(
      * @param int|string $toDate
      * @return void
      * @throws \Magento\Framework\Exception\ValidatorException
-     * @since 2.0.0
      */
     public function validate($timestamp, $toDate)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
index 256b50ad80605..d2c2bdec03f18 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -9,7 +9,6 @@
 /**
  * Timezone Interface
  * @api
- * @since 2.0.0
  */
 interface TimezoneInterface
 {
@@ -17,7 +16,6 @@ interface TimezoneInterface
      * Return path to default timezone
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultTimezonePath();
 
@@ -25,7 +23,6 @@ public function getDefaultTimezonePath();
      * Retrieve timezone code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultTimezone();
 
@@ -34,7 +31,6 @@ public function getDefaultTimezone();
      *
      * @param   int $type
      * @return  string
-     * @since 2.0.0
      */
     public function getDateFormat($type = \IntlDateFormatter::SHORT);
 
@@ -42,7 +38,6 @@ public function getDateFormat($type = \IntlDateFormatter::SHORT);
      * Retrieve short date format with 4-digit year
      *
      * @return  string
-     * @since 2.0.0
      */
     public function getDateFormatWithLongYear();
 
@@ -51,7 +46,6 @@ public function getDateFormatWithLongYear();
      *
      * @param   string $type
      * @return  string
-     * @since 2.0.0
      */
     public function getTimeFormat($type = null);
 
@@ -60,7 +54,6 @@ public function getTimeFormat($type = null);
      *
      * @param   string $type
      * @return  string
-     * @since 2.0.0
      */
     public function getDateTimeFormat($type);
 
@@ -72,7 +65,6 @@ public function getDateTimeFormat($type);
      * @param bool $useTimezone
      * @param bool $includeTime
      * @return \DateTime
-     * @since 2.0.0
      */
     public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true);
 
@@ -83,7 +75,6 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
      * @param   string|integer|\DateTime|array|null $date date in UTC
      * @param   boolean $includeTime flag for including time to date
      * @return  \DateTime
-     * @since 2.0.0
      */
     public function scopeDate($scope = null, $date = null, $includeTime = false);
 
@@ -93,7 +84,6 @@ public function scopeDate($scope = null, $date = null, $includeTime = false);
      *
      * @param   mixed $scope
      * @return  int
-     * @since 2.0.0
      */
     public function scopeTimeStamp($scope = null);
 
@@ -104,7 +94,6 @@ public function scopeTimeStamp($scope = null);
      * @param int $format
      * @param bool $showTime
      * @return string
-     * @since 2.0.0
      */
     public function formatDate(
         $date = null,
@@ -118,7 +107,6 @@ public function formatDate(
      * @param string $scopeType
      * @param string $scopeCode
      * @return string
-     * @since 2.0.0
      */
     public function getConfigTimezone($scopeType = null, $scopeCode = null);
 
@@ -129,7 +117,6 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null);
      * @param string|null $dateFrom
      * @param string|null $dateTo
      * @return bool
-     * @since 2.0.0
      */
     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
 
@@ -141,7 +128,6 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @param null $timezone
      * @param string|null $pattern
      * @return string
-     * @since 2.0.0
      */
     public function formatDateTime(
         $date,
diff --git a/lib/internal/Magento/Framework/Stdlib/StringUtils.php b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
index 35980ceeec540..2ef7f3e79cd05 100644
--- a/lib/internal/Magento/Framework/Stdlib/StringUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
@@ -9,7 +9,6 @@
  * Magento methods to work with string
  *
  * @api
- * @since 2.0.0
  */
 class StringUtils
 {
@@ -25,7 +24,6 @@ class StringUtils
      * @param string $sourceSeparator
      * @param string $destinationSeparator
      * @return string
-     * @since 2.0.0
      */
     public function upperCaseWords($str, $sourceSeparator = '_', $destinationSeparator = '_')
     {
@@ -40,7 +38,6 @@ public function upperCaseWords($str, $sourceSeparator = '_', $destinationSeparat
      * @param string $needle
      * @param string $insert
      * @return string
-     * @since 2.0.0
      */
     public function splitInjection($str, $length = 50, $needle = '-', $insert = ' ')
     {
@@ -73,7 +70,6 @@ public function splitInjection($str, $length = 50, $needle = '-', $insert = ' ')
      * @return string[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function split($value, $length = 1, $keepWords = false, $trim = false, $wordSeparatorRegex = '\s')
     {
@@ -149,7 +145,6 @@ public function split($value, $length = 1, $keepWords = false, $trim = false, $w
      *
      * @param string $string
      * @return int
-     * @since 2.0.0
      */
     public function strlen($string)
     {
@@ -161,7 +156,6 @@ public function strlen($string)
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function cleanString($string)
     {
@@ -179,7 +173,6 @@ public function cleanString($string)
      * @param int $offset
      * @param int $length
      * @return string
-     * @since 2.0.0
      */
     public function substr($string, $offset, $length = null)
     {
@@ -195,7 +188,6 @@ public function substr($string, $offset, $length = null)
      *
      * @param string $str
      * @return string
-     * @since 2.0.0
      */
     public function strrev($str)
     {
@@ -217,7 +209,6 @@ public function strrev($str)
      * @param string $needle
      * @param int $offset
      * @return int|bool
-     * @since 2.0.0
      */
     public function strpos($haystack, $needle, $offset = null)
     {
diff --git a/lib/internal/Magento/Framework/System/Dirs.php b/lib/internal/Magento/Framework/System/Dirs.php
index ff7b8f15476bf..626423c04c223 100644
--- a/lib/internal/Magento/Framework/System/Dirs.php
+++ b/lib/internal/Magento/Framework/System/Dirs.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\System\Dirs
  *
- * @since 2.0.0
  */
 class Dirs
 {
@@ -20,7 +19,6 @@ class Dirs
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public static function rm($dirname)
     {
@@ -80,7 +78,6 @@ public static function rm($dirname)
      * @param int $mode
      * @return true
      * @throws \Exception
-     * @since 2.0.0
      */
     public static function mkdirStrict($path, $recursive = true, $mode = 0777)
     {
@@ -104,7 +101,6 @@ public static function mkdirStrict($path, $recursive = true, $mode = 0777)
      * @return void
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public static function copyFileStrict($source, $dest)
     {
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 3e5f8a295c57c..216026be8d72e 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -10,7 +10,6 @@
 
 /**
  * Class to work with remote FTP server
- * @since 2.0.0
  */
 class Ftp
 {
@@ -18,7 +17,6 @@ class Ftp
      * Connection object
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_conn = false;
 
@@ -27,7 +25,6 @@ class Ftp
      *
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     protected function checkConnected()
     {
@@ -41,7 +38,6 @@ protected function checkConnected()
      *
      * @param string $name
      * @return string the newly created directory name on success or <b>FALSE</b> on error.
-     * @since 2.0.0
      */
     public function mdkir($name)
     {
@@ -55,7 +51,6 @@ public function mdkir($name)
      * @param string $path
      * @param int $mode
      * @return bool
-     * @since 2.0.0
      */
     public function mkdirRecursive($path, $mode = 0777)
     {
@@ -85,7 +80,6 @@ public function mkdirRecursive($path, $mode = 0777)
      * @param string $password
      * @return bool
      * @throws \Exception on invalid login credentials
-     * @since 2.0.0
      */
     public function login($login = "anonymous", $password = "test@gmail.com")
     {
@@ -103,7 +97,6 @@ public function login($login = "anonymous", $password = "test@gmail.com")
      * @param string $string
      * @throws \Exception
      * @return string
-     * @since 2.0.0
      */
     public function validateConnectionString($string)
     {
@@ -126,7 +119,6 @@ public function validateConnectionString($string)
      * @param int $timeout
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function connect($string, $timeout = 900)
     {
@@ -158,7 +150,6 @@ public function connect($string, $timeout = 900)
      * @param int $mode  FTP_BINARY | FTP_ASCII
      * @param int $startPos
      * @return bool
-     * @since 2.0.0
      */
     public function fput($remoteFile, $handle, $mode = FTP_BINARY, $startPos = 0)
     {
@@ -174,7 +165,6 @@ public function fput($remoteFile, $handle, $mode = FTP_BINARY, $startPos = 0)
      * @param int $mode FTP_BINARY | FTP_ASCII
      * @param int $startPos
      * @return bool
-     * @since 2.0.0
      */
     public function put($remoteFile, $localFile, $mode = FTP_BINARY, $startPos = 0)
     {
@@ -186,7 +176,6 @@ public function put($remoteFile, $localFile, $mode = FTP_BINARY, $startPos = 0)
      * Get current working directory
      *
      * @return false|string
-     * @since 2.0.0
      */
     public function getcwd()
     {
@@ -210,7 +199,6 @@ public function getcwd()
      *
      * @param string $cmd
      * @return array The server's response as an array of strings.
-     * @since 2.0.0
      */
     public function raw($cmd)
     {
@@ -230,7 +218,6 @@ public function raw($cmd)
      * @param int $ftpMode
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function upload($remote, $local, $dirMode = 0777, $ftpMode = FTP_BINARY)
     {
@@ -273,7 +260,6 @@ public function upload($remote, $local, $dirMode = 0777, $ftpMode = FTP_BINARY)
      * @param string $local
      * @param int $ftpMode  FTP_BINARY|FTP_ASCII
      * @return bool
-     * @since 2.0.0
      */
     public function download($remote, $local, $ftpMode = FTP_BINARY)
     {
@@ -286,7 +272,6 @@ public function download($remote, $local, $ftpMode = FTP_BINARY)
      *
      * @param bool $pasv
      * @return bool
-     * @since 2.0.0
      */
     public function pasv($pasv)
     {
@@ -298,7 +283,6 @@ public function pasv($pasv)
      * Close FTP connection
      *
      * @return void
-     * @since 2.0.0
      */
     public function close()
     {
@@ -313,7 +297,6 @@ public function close()
      * @param int $mode
      * @param string $remoteFile
      * @return int The new file permissions on success or <b>FALSE</b> on error.
-     * @since 2.0.0
      */
     public function chmod($mode, $remoteFile)
     {
@@ -326,7 +309,6 @@ public function chmod($mode, $remoteFile)
      *
      * @param string $dir
      * @return bool
-     * @since 2.0.0
      */
     public function chdir($dir)
     {
@@ -338,7 +320,6 @@ public function chdir($dir)
      * ftp_cdup wrapper
      *
      * @return bool
-     * @since 2.0.0
      */
     public function cdup()
     {
@@ -355,7 +336,6 @@ public function cdup()
      * @param int $resumeOffset
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function get($localFile, $remoteFile, $fileMode = FTP_BINARY, $resumeOffset = 0)
     {
@@ -369,7 +349,6 @@ public function get($localFile, $remoteFile, $fileMode = FTP_BINARY, $resumeOffs
      *
      * @param string $dir
      * @return bool
-     * @since 2.0.0
      */
     public function nlist($dir = "/")
     {
@@ -384,7 +363,6 @@ public function nlist($dir = "/")
      * @param string $dir
      * @param bool $recursive
      * @return array an array where each element corresponds to one line of text.
-     * @since 2.0.0
      */
     public function rawlist($dir = "/", $recursive = false)
     {
@@ -398,7 +376,6 @@ public function rawlist($dir = "/", $recursive = false)
      *
      * @param int $bytes
      * @return string
-     * @since 2.0.0
      */
     public static function byteconvert($bytes)
     {
@@ -412,7 +389,6 @@ public static function byteconvert($bytes)
      *
      * @param string $chmod
      * @return string
-     * @since 2.0.0
      */
     public static function chmodnum($chmod)
     {
@@ -428,7 +404,6 @@ public static function chmodnum($chmod)
      * @param string $path
      * @param bool $excludeIfIsDir
      * @return bool
-     * @since 2.0.0
      */
     public function fileExists($path, $excludeIfIsDir = true)
     {
@@ -456,7 +431,6 @@ public function fileExists($path, $excludeIfIsDir = true)
      * @param bool $recursive
      * @return array
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function ls($dir = "/", $recursive = false)
     {
@@ -496,7 +470,6 @@ public function ls($dir = "/", $recursive = false)
      *
      * @param string $str
      * @return string
-     * @since 2.0.0
      */
     public function correctFilePath($str)
     {
@@ -510,7 +483,6 @@ public function correctFilePath($str)
      *
      * @param string $file
      * @return bool
-     * @since 2.0.0
      */
     public function delete($file)
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/AbstractFactoryTestCase.php b/lib/internal/Magento/Framework/TestFramework/Unit/AbstractFactoryTestCase.php
index 1d4be593a501b..d99b914d9f4f9 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/AbstractFactoryTestCase.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/AbstractFactoryTestCase.php
@@ -14,44 +14,37 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\AbstractFactoryTestCase
  *
- * @since 2.0.0
  */
 abstract class AbstractFactoryTestCase extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $factoryClassName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceClassName;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $objectManagerMock;
 
     /**
      * @var object
-     * @since 2.0.0
      */
     protected $factory;
 
     /**
      * Setup function
      * @return void
-     * @since 2.0.0
      */
     protected function setUp()
     {
@@ -68,7 +61,6 @@ protected function setUp()
     /**
      * Test create
      * @return void
-     * @since 2.0.0
      */
     public function testCreate()
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/BaseTestCase.php b/lib/internal/Magento/Framework/TestFramework/Unit/BaseTestCase.php
index b89bf44de8937..7c42938d127e5 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/BaseTestCase.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/BaseTestCase.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\BaseTestCase
  *
- * @since 2.0.0
  */
 abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -24,13 +23,11 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      * ObjectManager available since setUp()
      *
      * @var ObjectManager
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function setUp()
     {
@@ -42,7 +39,6 @@ protected function setUp()
      *
      * @param string $className
      * @return \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function basicMock($className)
     {
@@ -57,7 +53,6 @@ protected function basicMock($className)
      * Providing true and false.
      *
      * @return array
-     * @since 2.0.0
      */
     public function booleanDataProvider()
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
index 3dc44995d14dd..c9938d8b1bb76 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
@@ -14,120 +14,100 @@
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Adminhtml extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_designMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_sessionMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_translatorMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_layoutMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_requestMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_messagesMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_urlMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_eventManagerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_controllerMock;
 
     /**
      * @var \Magento\Backend\Block\Template\Context
-     * @since 2.0.0
      */
     protected $_context;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_loggerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_filesystemMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_cacheMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected $_scopeConfigMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManager
-     * @since 2.0.0
      */
     protected $_storeManagerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Math\Random
-     * @since 2.0.0
      */
     protected $_mathMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $_formKey;
 
     /**
-     * @since 2.0.0
      */
     protected function setUp()
     {
@@ -205,7 +185,6 @@ protected function setUp()
      *
      * @param string $className
      * @return \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function _makeMock($className)
     {
@@ -221,7 +200,6 @@ protected function _makeMock($className)
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount|null        $expects
      *
      * @return \PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     * @since 2.0.0
      */
     protected function _setStub(
         \PHPUnit_Framework_MockObject_MockObject $object,
@@ -240,7 +218,6 @@ protected function _setStub(
      *
      * @param array $args
      * @return mixed
-     * @since 2.0.0
      */
     public function translateCallback($args)
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 4ef366e6ba8dc..ea5720b8a60ca 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -11,7 +11,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ObjectManager
 {
@@ -19,7 +18,6 @@ class ObjectManager
      * Special cases configuration
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_specialCases = [
         \Magento\Framework\Model\ResourceModel\AbstractResource::class => '_getResourceModelMock',
@@ -30,7 +28,6 @@ class ObjectManager
      * Test object
      *
      * @var \PHPUnit_Framework_TestCase
-     * @since 2.0.0
      */
     protected $_testObject;
 
@@ -38,7 +35,6 @@ class ObjectManager
      * Class constructor
      *
      * @param \PHPUnit_Framework_TestCase $testObject
-     * @since 2.0.0
      */
     public function __construct(\PHPUnit_Framework_TestCase $testObject)
     {
@@ -51,7 +47,6 @@ public function __construct(\PHPUnit_Framework_TestCase $testObject)
      * @param string $argClassName
      * @param array $originalArguments
      * @return null|object|\PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function _createArgumentMock($argClassName, array $originalArguments)
     {
@@ -71,7 +66,6 @@ protected function _createArgumentMock($argClassName, array $originalArguments)
      * @param string $className
      * @param array $arguments
      * @return null|object
-     * @since 2.0.0
      */
     protected function _processSpecialCases($className, $arguments)
     {
@@ -91,7 +85,6 @@ protected function _processSpecialCases($className, $arguments)
      * Retrieve specific mock of core resource model
      *
      * @return \Magento\Framework\Module\ResourceInterface|\PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function _getResourceModelMock()
     {
@@ -118,7 +111,6 @@ protected function _getResourceModelMock()
      *
      * @param string $className
      * @return \Magento\Framework\TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function _getTranslatorMock($className)
     {
@@ -141,7 +133,6 @@ protected function _getTranslatorMock($className)
      *
      * @param string $className
      * @return \PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     protected function _getMockWithoutConstructorCall($className)
     {
@@ -161,7 +152,6 @@ protected function _getMockWithoutConstructorCall($className)
      * @param string $className
      * @param array $arguments
      * @return object
-     * @since 2.0.0
      */
     public function getObject($className, array $arguments = [])
     {
@@ -195,7 +185,6 @@ public function getObject($className, array $arguments = [])
      * @param string $className
      * @param array $arguments
      * @return object
-     * @since 2.0.0
      */
     protected function getBuilder($className, array $arguments)
     {
@@ -248,7 +237,6 @@ function ($className, $arguments) {
      * @param string $className
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     public function getConstructArguments($className, array $arguments = [])
     {
@@ -299,7 +287,6 @@ public function getConstructArguments($className, array $arguments = [])
      * @param array $data
      * @return \PHPUnit_Framework_MockObject_MockObject
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getCollectionMock($className, array $data)
     {
@@ -328,7 +315,6 @@ public function getCollectionMock($className, array $data)
      * @param string $argClassName
      * @param array $arguments
      * @return null|object|\PHPUnit_Framework_MockObject_MockObject
-     * @since 2.0.0
      */
     private function _getMockObject($argClassName, array $arguments)
     {
@@ -349,7 +335,7 @@ private function _getMockObject($argClassName, array $arguments)
      * @param object $propertyValue
      * @param string $className The namespace of parent class for injection private property into this class
      * @return void
-     * @since 2.1.0
+     * @since 2.0.10
      */
     public function setBackwardCompatibleProperty($object, $propertyName, $propertyValue, $className = '')
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
index 0c480ca57f79f..7b83436fe2d17 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\Helper\ProxyTesting
  *
- * @since 2.0.0
  */
 class ProxyTesting
 {
@@ -28,7 +27,6 @@ class ProxyTesting
      * @param null $expectedMethod Expected method, to be invoked in the proxied method
      * @param null $expectedParams Expected parameters, to be passed to the proxied method
      * @return mixed
-     * @since 2.0.0
      */
     public function invokeWithExpectations(
         $object,
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
index 1cfcceaaaccef..1c430319fb020 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\Listener\GarbageCleanup
  *
- * @since 2.0.0
  */
 class GarbageCleanup implements \PHPUnit_Framework_TestListener
 {
@@ -20,7 +19,6 @@ class GarbageCleanup implements \PHPUnit_Framework_TestListener
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ShortVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
     {
@@ -30,7 +28,6 @@ public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ShortVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
     {
@@ -40,7 +37,6 @@ public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Ass
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ShortVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
     {
@@ -50,7 +46,6 @@ public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e,
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ShortVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
     {
@@ -60,7 +55,6 @@ public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ShortVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
     {
@@ -69,7 +63,6 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     {
@@ -78,7 +71,6 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
     {
@@ -88,7 +80,6 @@ public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function startTest(\PHPUnit_Framework_Test $test)
     {
@@ -97,7 +88,6 @@ public function startTest(\PHPUnit_Framework_Test $test)
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function endTest(\PHPUnit_Framework_Test $test, $time)
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
index 30501fbd7ea41..4041d5633df81 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
@@ -17,20 +17,17 @@
  * $mock->getMethod(); // returns 2
  *
  * @package Magento\TestFramework\Matcher
- * @since 2.0.0
  */
 class MethodInvokedAtIndex extends \PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $indexes = [];
 
     /**
      * @param  \PHPUnit_Framework_MockObject_Invocation $invocation
      * @return boolean
-     * @since 2.0.0
      */
     public function matches(\PHPUnit_Framework_MockObject_Invocation $invocation)
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php b/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
index 648c47742b4e3..f6e8e94d1270f 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
@@ -8,14 +8,12 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\Module\Config
  *
- * @since 2.0.0
  */
 class Config
 {
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ShortMethodName))
-     * @since 2.0.0
      */
     public function is()
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Utility/XsdValidator.php b/lib/internal/Magento/Framework/TestFramework/Unit/Utility/XsdValidator.php
index 0a47778acc87f..6ca25c954e291 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Utility/XsdValidator.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Utility/XsdValidator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\TestFramework\Unit\Utility\XsdValidator
  *
- * @since 2.0.0
  */
 class XsdValidator
 {
@@ -16,7 +15,6 @@ class XsdValidator
      * @param string $schema
      * @param string $xml
      * @return array
-     * @since 2.0.0
      */
     public function validate($schema, $xml)
     {
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 2fbf5e3235dad..65376e47d7812 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -12,7 +12,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Translate implements \Magento\Framework\TranslateInterface
 {
@@ -20,7 +19,6 @@ class Translate implements \Magento\Framework\TranslateInterface
      * Locale code
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_localeCode;
 
@@ -28,7 +26,6 @@ class Translate implements \Magento\Framework\TranslateInterface
      * Translator configuration array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_config;
 
@@ -36,7 +33,6 @@ class Translate implements \Magento\Framework\TranslateInterface
      * Cache identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_cacheId;
 
@@ -44,85 +40,71 @@ class Translate implements \Magento\Framework\TranslateInterface
      * Translation data
      *
      * @var []
-     * @since 2.0.0
      */
     protected $_data = [];
 
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_viewDesign;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface $cache
-     * @since 2.0.0
      */
     protected $_cache;
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $_viewFileSystem;
 
     /**
      * @var \Magento\Framework\Module\ModuleList
-     * @since 2.0.0
      */
     protected $_moduleList;
 
     /**
      * @var \Magento\Framework\Module\Dir\Reader
-     * @since 2.0.0
      */
     protected $_modulesReader;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $_scopeResolver;
 
     /**
      * @var \Magento\Framework\Translate\ResourceInterface
-     * @since 2.0.0
      */
     protected $_translateResource;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_locale;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Read
-     * @since 2.0.0
      */
     protected $directory;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     protected $_csvParser;
 
     /**
      * @var \Magento\Framework\App\Language\Dictionary
-     * @since 2.0.0
      */
     protected $packDictionary;
 
@@ -148,7 +130,6 @@ class Translate implements \Magento\Framework\TranslateInterface
      * @param \Magento\Framework\App\Language\Dictionary $packDictionary
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\DesignInterface $viewDesign,
@@ -186,7 +167,6 @@ public function __construct(
      * @param string|null $area
      * @param bool $forceReload
      * @return $this
-     * @since 2.0.0
      */
     public function loadData($area = null, $forceReload = false)
     {
@@ -219,7 +199,6 @@ public function loadData($area = null, $forceReload = false)
      *
      * @param   array $config
      * @return  $this
-     * @since 2.0.0
      */
     protected function setConfig($config)
     {
@@ -243,7 +222,6 @@ protected function setConfig($config)
      * Retrieve scope code
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getScope()
     {
@@ -256,7 +234,6 @@ protected function getScope()
      *
      * @param   string $key
      * @return  mixed
-     * @since 2.0.0
      */
     protected function getConfig($key)
     {
@@ -269,7 +246,6 @@ protected function getConfig($key)
     /**
      * Retrieve name of the current module
      * @return mixed
-     * @since 2.0.0
      */
     protected function getControllerModuleName()
     {
@@ -280,7 +256,6 @@ protected function getControllerModuleName()
      * Load data from module translation files
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadModuleTranslation()
     {
@@ -297,7 +272,6 @@ protected function _loadModuleTranslation()
      *
      * @param array $modules
      * @return $this
-     * @since 2.0.0
      */
     protected function loadModuleTranslationByModulesList(array $modules)
     {
@@ -313,7 +287,6 @@ protected function loadModuleTranslationByModulesList(array $modules)
      *
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _addData($data)
     {
@@ -334,7 +307,6 @@ protected function _addData($data)
      * Load current theme translation
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadThemeTranslation()
     {
@@ -353,7 +325,6 @@ protected function _loadThemeTranslation()
      * Load translation dictionary from language packages
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _loadPackTranslation()
     {
@@ -365,7 +336,6 @@ protected function _loadPackTranslation()
      * Loading current translation from DB
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _loadDbTranslation()
     {
@@ -380,7 +350,6 @@ protected function _loadDbTranslation()
      * @param string $moduleName
      * @param string $locale
      * @return string
-     * @since 2.0.0
      */
     protected function _getModuleTranslationFile($moduleName, $locale)
     {
@@ -394,7 +363,6 @@ protected function _getModuleTranslationFile($moduleName, $locale)
      *
      * @param string $locale
      * @return string
-     * @since 2.0.0
      */
     protected function _getThemeTranslationFile($locale)
     {
@@ -409,7 +377,6 @@ protected function _getThemeTranslationFile($locale)
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     protected function _getFileData($file)
     {
@@ -425,7 +392,6 @@ protected function _getFileData($file)
      * Retrieve translation data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -439,7 +405,6 @@ public function getData()
      * Retrieve locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -454,7 +419,6 @@ public function getLocale()
      *
      * @param string $locale
      * @return \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     public function setLocale($locale)
     {
@@ -468,7 +432,6 @@ public function setLocale($locale)
      * Retrieve theme code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTheme()
     {
@@ -484,7 +447,6 @@ public function getTheme()
      *
      * @param bool $forceReload
      * @return string
-     * @since 2.0.0
      */
     protected function getCacheId($forceReload = false)
     {
@@ -513,7 +475,6 @@ protected function getCacheId($forceReload = false)
      * Loading data cache
      *
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _loadCache()
     {
@@ -528,7 +489,6 @@ protected function _loadCache()
      * Saving data cache
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveCache()
     {
diff --git a/lib/internal/Magento/Framework/Translate/AbstractAdapter.php b/lib/internal/Magento/Framework/Translate/AbstractAdapter.php
index e1947394e1d48..7ee572eb59c2d 100644
--- a/lib/internal/Magento/Framework/Translate/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Translate/AbstractAdapter.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Translate\AbstractAdapter
  *
- * @since 2.0.0
  */
 abstract class AbstractAdapter extends \Zend_Translate_Adapter implements AdapterInterface
 {
@@ -24,7 +23,6 @@ abstract class AbstractAdapter extends \Zend_Translate_Adapter implements Adapte
      * @param string $locale
      * @param array $options (optional)
      * @return array
-     * @since 2.0.0
      */
     protected function _loadTranslationData($data, $locale, array $options = [])
     {
@@ -41,7 +39,6 @@ protected function _loadTranslationData($data, $locale, array $options = [])
      * @param bool $original
      * @param null $locale
      * @return false
-     * @since 2.0.0
      */
     public function isTranslated($messageId, $original = false, $locale = null)
     {
@@ -54,7 +51,6 @@ public function isTranslated($messageId, $original = false, $locale = null)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param string $locale
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale)
     {
@@ -65,7 +61,6 @@ public function setLocale($locale)
      * Returns the adapter name
      *
      * @return string
-     * @since 2.0.0
      */
     public function toString()
     {
diff --git a/lib/internal/Magento/Framework/Translate/Adapter.php b/lib/internal/Magento/Framework/Translate/Adapter.php
index 6e49c78af576a..415036bf6c701 100644
--- a/lib/internal/Magento/Framework/Translate/Adapter.php
+++ b/lib/internal/Magento/Framework/Translate/Adapter.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Translate\Adapter
  *
- * @since 2.0.0
  */
 class Adapter extends AbstractAdapter
 {
@@ -23,7 +22,6 @@ class Adapter extends AbstractAdapter
      * @param array|string $messageId
      * @param null|string $locale
      * @return string
-     * @since 2.0.0
      */
     public function translate($messageId, $locale = null)
     {
@@ -41,7 +39,6 @@ public function translate($messageId, $locale = null)
      *
      * @SuppressWarnings(PHPMD.ShortMethodName)
      * @return string
-     * @since 2.0.0
      */
     public function __()
     {
diff --git a/lib/internal/Magento/Framework/Translate/AdapterInterface.php b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
index 8ee11e9c63a74..bcd08a0b27c29 100644
--- a/lib/internal/Magento/Framework/Translate/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
@@ -10,7 +10,6 @@
  * Magento translate adapter interface
  *
  * @api
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -20,7 +19,6 @@ interface AdapterInterface
      * @param string|array $messageId
      * @param null $locale
      * @return string
-     * @since 2.0.0
      */
     public function translate($messageId, $locale = null);
 
@@ -30,7 +28,6 @@ public function translate($messageId, $locale = null);
      *
      * @return string
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @since 2.0.0
      */
     public function __();
     // @codingStandardsIgnoreEnd
diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index ee8b83240b431..11f3504631543 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Translate\Inline
  *
- * @since 2.0.0
  */
 class Inline implements \Magento\Framework\Translate\InlineInterface
 {
@@ -19,13 +18,11 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
      * Indicator to hold state of whether inline translation is allowed
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isAllowed;
 
     /**
      * @var \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     protected $parser;
 
@@ -33,55 +30,46 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
      * Flag about inserted styles and scripts for inline translates
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isScriptInserted = false;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $url;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var \Magento\Framework\Translate\Inline\ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $scopeResolver;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $templateFileName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $translatorRoute;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $scope;
 
     /**
      * @var Inline\StateInterface
-     * @since 2.0.0
      */
     protected $state;
 
@@ -97,7 +85,6 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
      * @param string $templateFileName
      * @param string $translatorRoute
      * @param null $scope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
@@ -125,7 +112,6 @@ public function __construct(
      * Check if Inline Translates is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -143,7 +129,6 @@ public function isAllowed()
      * Retrieve Inline Parser instance
      *
      * @return Inline\ParserInterface
-     * @since 2.0.0
      */
     public function getParser()
     {
@@ -156,7 +141,6 @@ public function getParser()
      * @param array|string &$body
      * @param bool $isJson
      * @return $this
-     * @since 2.0.0
      */
     public function processResponseBody(&$body, $isJson = false)
     {
@@ -188,7 +172,6 @@ public function processResponseBody(&$body, $isJson = false)
      * @param mixed|string|null $tagName
      * @return null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getAdditionalHtmlAttribute($tagName = null)
     {
@@ -202,7 +185,6 @@ public function getAdditionalHtmlAttribute($tagName = null)
      * added inline translation content.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function addInlineScript()
     {
@@ -223,7 +205,6 @@ protected function addInlineScript()
      * added inline translation content.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getInlineScript()
     {
@@ -240,7 +221,6 @@ protected function getInlineScript()
      * Return URL for ajax requests
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getAjaxUrl()
     {
@@ -255,7 +235,6 @@ protected function getAjaxUrl()
      *
      * @param array|string &$body
      * @return $this
-     * @since 2.0.0
      */
     protected function stripInlineTranslations(&$body)
     {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
index 3f04ca4fd94c8..02ab3e92d1d16 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Inline Translation config interface
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -18,7 +17,6 @@ interface ConfigInterface
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $scope
      * @return bool
-     * @since 2.0.0
      */
     public function isActive($scope = null);
 
@@ -27,7 +25,6 @@ public function isActive($scope = null);
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $scope
      * @return bool
-     * @since 2.0.0
      */
     public function isDevAllowed($scope = null);
 }
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ParserFactory.php b/lib/internal/Magento/Framework/Translate/Inline/ParserFactory.php
index d2f15bac078b6..20e2607b7bfff 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ParserFactory.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ParserFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Translate\Inline\ParserFactory
  *
- * @since 2.0.0
  */
 class ParserFactory
 {
@@ -23,14 +22,12 @@ class ParserFactory
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * Object constructor
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Return instance of inline translate parser object
      *
      * @return \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     public function get()
     {
@@ -51,7 +47,6 @@ public function get()
     /**
      * @param array $arguments
      * @return \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
index adc3984d23f53..e8905f71ea732 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
@@ -9,7 +9,6 @@
  * Processes the content with the inline translation replacement so the inline translate JavaScript code will work.
  *
  * @api
- * @since 2.0.0
  */
 interface ParserInterface
 {
@@ -23,7 +22,6 @@ interface ParserInterface
      *
      * @param array $translateParams
      * @return $this
-     * @since 2.0.0
      */
     public function processAjaxPost(array $translateParams);
 
@@ -32,7 +30,6 @@ public function processAjaxPost(array $translateParams);
      *
      * @param string $body
      * @return string
-     * @since 2.0.0
      */
     public function processResponseBodyString($body);
 
@@ -40,7 +37,6 @@ public function processResponseBodyString($body);
      * Returns the body content that is being parsed.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -49,7 +45,6 @@ public function getContent();
      *
      * @param $content string
      * @return void
-     * @since 2.0.0
      */
     public function setContent($content);
 
@@ -58,7 +53,6 @@ public function setContent($content);
      *
      * @param bool $flag
      * @return $this
-     * @since 2.0.0
      */
     public function setIsJson($flag);
 }
diff --git a/lib/internal/Magento/Framework/Translate/Inline/Provider.php b/lib/internal/Magento/Framework/Translate/Inline/Provider.php
index f609af2f4df3b..22a460e2edbf6 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/Provider.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/Provider.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Framework\Translate\Inline\Provider
  *
- * @since 2.0.0
  */
 class Provider implements ProviderInterface
 {
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $inlineTranslate;
 
     /**
      * @param \Magento\Framework\Translate\InlineInterface $inlineTranslate
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Translate\InlineInterface $inlineTranslate)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\Translate\InlineInterface $inline
      * Return instance of inline translate class
      *
      * @return \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     public function get()
     {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ProviderInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ProviderInterface.php
index 3af2d104e3310..7be21c2239478 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ProviderInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ProviderInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory like class to return an instance of the inline translate.
- * @since 2.0.0
  */
 interface ProviderInterface
 {
@@ -16,7 +15,6 @@ interface ProviderInterface
      * Return instance of inline translate class
      *
      * @return \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     public function get();
 }
diff --git a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
index 33676d4dfdbd4..370a88d6d9a43 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
@@ -7,7 +7,6 @@
 
 /**
  * Proxy class for \Magento\Framework\Translate\Inline
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\Translate\Inline implements
     \Magento\Framework\ObjectManager\NoninterceptableInterface
@@ -16,7 +15,6 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -24,7 +22,6 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
      * Proxied instance
      *
      * @var \Magento\Framework\Translate\Inline
-     * @since 2.0.0
      */
     protected $subject;
 
@@ -40,7 +36,6 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isShared;
 
@@ -48,7 +43,6 @@ class Proxy extends \Magento\Framework\Translate\Inline implements
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -62,7 +56,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -73,7 +66,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -84,7 +76,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -95,7 +86,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\Translate\Inline
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -111,7 +101,6 @@ protected function _getSubject()
      * Check if Inline Translates is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed()
     {
@@ -122,7 +111,6 @@ public function isAllowed()
      * Retrieve Inline Parser instance
      *
      * @return \Magento\Framework\Translate\Inline\ParserInterface
-     * @since 2.0.0
      */
     public function getParser()
     {
@@ -135,7 +123,6 @@ public function getParser()
      * @param array|string &$body
      * @param bool $isJson
      * @return $this
-     * @since 2.0.0
      */
     public function processResponseBody(&$body, $isJson = false)
     {
@@ -147,7 +134,6 @@ public function processResponseBody(&$body, $isJson = false)
      *
      * @param mixed|string|null $tagName
      * @return mixed
-     * @since 2.0.0
      */
     public function getAdditionalHtmlAttribute($tagName = null)
     {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/State.php b/lib/internal/Magento/Framework/Translate/Inline/State.php
index 78215ae811146..71330a6399192 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/State.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/State.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Framework\Translate\Inline\State
  *
- * @since 2.0.0
  */
 class State implements StateInterface
 {
@@ -17,13 +16,11 @@ class State implements StateInterface
      * Flag to enable/disable inine translation
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isEnabled = true;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $storedStatus;
 
@@ -31,7 +28,6 @@ class State implements StateInterface
      * Disable inline translation
      *
      * @return void
-     * @since 2.0.0
      */
     public function disable()
     {
@@ -42,7 +38,6 @@ public function disable()
      * Enable inline translation
      *
      * @return void
-     * @since 2.0.0
      */
     public function enable()
     {
@@ -53,7 +48,6 @@ public function enable()
      * Check if inline translation enabled/disabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled()
     {
@@ -68,7 +62,6 @@ public function isEnabled()
      *
      * @param bool $status
      * @return void
-     * @since 2.0.0
      */
     public function suspend($status = false)
     {
@@ -86,7 +79,6 @@ public function suspend($status = false)
      *
      * @param bool $status
      * @return void
-     * @since 2.0.0
      */
     public function resume($status = true)
     {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php b/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
index b4684430e4ef7..cf56616ac4a99 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
@@ -10,7 +10,6 @@
  * Controls and represents the  state of the inline translation processing.
  *
  * @api
- * @since 2.0.0
  */
 interface StateInterface
 {
@@ -18,7 +17,6 @@ interface StateInterface
      * Disable inline translation
      *
      * @return void
-     * @since 2.0.0
      */
     public function disable();
 
@@ -26,7 +24,6 @@ public function disable();
      * Enable inline translation
      *
      * @return void
-     * @since 2.0.0
      */
     public function enable();
 
@@ -34,7 +31,6 @@ public function enable();
      * Check if inline translation enabled/disabled
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled();
 
@@ -46,7 +42,6 @@ public function isEnabled();
      *
      * @param bool $status
      * @return void
-     * @since 2.0.0
      */
     public function suspend($status = false);
 
@@ -58,7 +53,6 @@ public function suspend($status = false);
      *
      * @param bool $status
      * @return void
-     * @since 2.0.0
      */
     public function resume($status = true);
 }
diff --git a/lib/internal/Magento/Framework/Translate/InlineInterface.php b/lib/internal/Magento/Framework/Translate/InlineInterface.php
index 128d490c3af63..4669a536eedbf 100644
--- a/lib/internal/Magento/Framework/Translate/InlineInterface.php
+++ b/lib/internal/Magento/Framework/Translate/InlineInterface.php
@@ -9,7 +9,6 @@
  * Inline translation interface
  *
  * @api
- * @since 2.0.0
  */
 interface InlineInterface
 {
@@ -18,7 +17,6 @@ interface InlineInterface
      *
      * @param mixed $tagName
      * @return mixed
-     * @since 2.0.0
      */
     public function getAdditionalHtmlAttribute($tagName = null);
 
@@ -26,7 +24,6 @@ public function getAdditionalHtmlAttribute($tagName = null);
      * Check if inline translates is allowed
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isAllowed();
 
@@ -36,7 +33,6 @@ public function isAllowed();
      * @param array|string $body
      * @param bool $isJson
      * @return \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     public function processResponseBody(&$body, $isJson = false);
 
@@ -44,7 +40,6 @@ public function processResponseBody(&$body, $isJson = false);
      * Retrieve Inline Parser instance
      *
      * @return Inline\ParserInterface
-     * @since 2.0.0
      */
     public function getParser();
 }
diff --git a/lib/internal/Magento/Framework/Translate/Js/Config.php b/lib/internal/Magento/Framework/Translate/Js/Config.php
index 65d6cb5f31ea0..553a8427220c8 100644
--- a/lib/internal/Magento/Framework/Translate/Js/Config.php
+++ b/lib/internal/Magento/Framework/Translate/Js/Config.php
@@ -7,7 +7,6 @@
 
 /**
  * Js Translation config
- * @since 2.0.0
  */
 class Config
 {
@@ -15,7 +14,6 @@ class Config
      * Should the framework generate dictionary file
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $dictionaryEnabled;
 
@@ -23,14 +21,12 @@ class Config
      * Name of dictionary json file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $dictionaryFileName;
 
     /**
      * @param bool $dictionaryEnabled
      * @param string $dictionaryFileName
-     * @since 2.0.0
      */
     public function __construct($dictionaryEnabled = false, $dictionaryFileName = null)
     {
@@ -42,7 +38,6 @@ public function __construct($dictionaryEnabled = false, $dictionaryFileName = nu
      * Should the framework generate dictionary file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function dictionaryEnabled()
     {
@@ -53,7 +48,6 @@ public function dictionaryEnabled()
      * Name of dictionary json file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDictionaryFileName()
     {
diff --git a/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php b/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
index 202db3b1b6ffe..13da29a9382a9 100644
--- a/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
+++ b/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
@@ -7,19 +7,16 @@
 
 /**
  * Magento translate abstract adapter
- * @since 2.0.0
  */
 class Plugin
 {
     /**
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $_translate;
 
     /**
      * @param \Magento\Framework\TranslateInterface $translate
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\TranslateInterface $translate)
     {
@@ -31,7 +28,6 @@ public function __construct(\Magento\Framework\TranslateInterface $translate)
      * @param string|null $localeCode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterEmulate(\Magento\Framework\Locale\ResolverInterface $subject, $localeCode)
     {
@@ -43,7 +39,6 @@ public function afterEmulate(\Magento\Framework\Locale\ResolverInterface $subjec
      * @param string|null $localeCode
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function afterRevert(\Magento\Framework\Locale\ResolverInterface $subject, $localeCode)
     {
@@ -53,7 +48,6 @@ public function afterRevert(\Magento\Framework\Locale\ResolverInterface $subject
     /**
      * @param string|null $localeCode
      * @return void
-     * @since 2.0.0
      */
     protected function _init($localeCode)
     {
diff --git a/lib/internal/Magento/Framework/Translate/ResourceInterface.php b/lib/internal/Magento/Framework/Translate/ResourceInterface.php
index 9f11dacbea2fa..51e2f430c7281 100644
--- a/lib/internal/Magento/Framework/Translate/ResourceInterface.php
+++ b/lib/internal/Magento/Framework/Translate/ResourceInterface.php
@@ -9,7 +9,6 @@
  * Returns the translation resource data.
  *
  * @api
- * @since 2.0.0
  */
 interface ResourceInterface
 {
@@ -19,7 +18,6 @@ interface ResourceInterface
      * @param int $scope
      * @param string $locale
      * @return array
-     * @since 2.0.0
      */
     public function getTranslationArray($scope = null, $locale = null);
 }
diff --git a/lib/internal/Magento/Framework/TranslateInterface.php b/lib/internal/Magento/Framework/TranslateInterface.php
index 4d6b29f8825e0..af4e99cc5f950 100644
--- a/lib/internal/Magento/Framework/TranslateInterface.php
+++ b/lib/internal/Magento/Framework/TranslateInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @todo change this interface when i18n-related logic is moved to library
- * @since 2.0.0
  */
 interface TranslateInterface
 {
@@ -22,7 +21,6 @@ interface TranslateInterface
      * @param string|null $area
      * @param bool $forceReload
      * @return \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     public function loadData($area = null, $forceReload = false);
 
@@ -30,7 +28,6 @@ public function loadData($area = null, $forceReload = false);
      * Retrieve translation data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData();
 
@@ -38,7 +35,6 @@ public function getData();
      * Retrieve locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale();
 
@@ -47,7 +43,6 @@ public function getLocale();
      *
      * @param string $locale
      * @return \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     public function setLocale($locale);
 
@@ -55,7 +50,6 @@ public function setLocale($locale);
      * Retrieve theme code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTheme();
 }
diff --git a/lib/internal/Magento/Framework/Unserialize/Unserialize.php b/lib/internal/Magento/Framework/Unserialize/Unserialize.php
index 45591cbbcfe64..d4ab1065fbfac 100644
--- a/lib/internal/Magento/Framework/Unserialize/Unserialize.php
+++ b/lib/internal/Magento/Framework/Unserialize/Unserialize.php
@@ -11,7 +11,6 @@
 
 /**
  * @deprecated 2.2.0
- * @since 2.0.0
  */
 class Unserialize
 {
@@ -35,7 +34,6 @@ public function __construct(Serialize $serializer = null)
     /**
      * @param string $string
      * @return bool|mixed
-     * @since 2.0.0
      */
     public function unserialize($string)
     {
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 3ce195963c3c8..7333a85be71fd 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -62,7 +62,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class Url extends \Magento\Framework\DataObject implements \Magento\Framework\UrlInterface
 {
@@ -70,7 +69,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Configuration data cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected static $_configDataCache;
 
@@ -78,7 +76,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Reserved Route parameter keys
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_reservedRouteParams = [
         '_scope',
@@ -98,7 +95,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_scopeType;
 
@@ -106,7 +102,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Request instance
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -114,7 +109,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Use Session ID for generate URL
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_useSession;
 
@@ -122,19 +116,16 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Url security info list
      *
      * @var \Magento\Framework\Url\SecurityInfoInterface
-     * @since 2.0.0
      */
     protected $_urlSecurityInfo;
 
     /**
      * @var \Magento\Framework\Session\Generic
-     * @since 2.0.0
      */
     protected $_session;
 
     /**
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
@@ -142,31 +133,26 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Constructor
      *
      * @var \Magento\Framework\App\Route\ConfigInterface
-     * @since 2.0.0
      */
     protected $_routeConfig;
 
     /**
      * @var \Magento\Framework\Url\RouteParamsResolverInterface
-     * @since 2.0.0
      */
     private $_routeParamsResolver;
 
     /**
      * @var \Magento\Framework\Url\RouteParamsResolverFactory
-     * @since 2.0.0
      */
     private $_routeParamsResolverFactory;
 
     /**
      * @var \Magento\Framework\Url\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $_scopeResolver;
 
     /**
      * @var \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     protected $_queryParamsResolver;
 
@@ -174,13 +160,11 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * Cache urls requested by getUrl method
      *
      * @var array
-     * @since 2.0.0
      */
     private $cacheUrl = [];
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -230,7 +214,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * @param HostChecker|null $hostChecker
      * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
@@ -270,7 +253,6 @@ public function __construct(
      *
      * @param   string $url
      * @return  \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _parseUrl($url)
     {
@@ -299,7 +281,6 @@ protected function _parseUrl($url)
      *
      * @param bool $useSession
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setUseSession($useSession)
     {
@@ -312,7 +293,6 @@ public function setUseSession($useSession)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSession()
     {
@@ -328,7 +308,6 @@ public function getUseSession()
      * @param string $key
      * @param string|null $prefix
      * @return string
-     * @since 2.0.0
      */
     public function getConfigData($key, $prefix = null)
     {
@@ -351,7 +330,6 @@ public function getConfigData($key, $prefix = null)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     protected function _getConfigCacheId($path)
     {
@@ -363,7 +341,6 @@ protected function _getConfigCacheId($path)
      *
      * @param string $path
      * @return null|string
-     * @since 2.0.0
      */
     protected function _getConfig($path)
     {
@@ -379,7 +356,6 @@ protected function _getConfig($path)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setRequest(\Magento\Framework\App\RequestInterface $request)
     {
@@ -391,7 +367,6 @@ public function setRequest(\Magento\Framework\App\RequestInterface $request)
      * Zend request object
      *
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected function _getRequest()
     {
@@ -402,7 +377,6 @@ protected function _getRequest()
      * Retrieve URL type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getType()
     {
@@ -416,7 +390,6 @@ protected function _getType()
      * Retrieve is secure mode URL
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSecure()
     {
@@ -452,7 +425,6 @@ protected function _isSecure()
      *
      * @param mixed $params
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setScope($params)
     {
@@ -465,7 +437,6 @@ public function setScope($params)
      * Get current scope for the url instance
      *
      * @return \Magento\Framework\Url\ScopeInterface
-     * @since 2.0.0
      */
     protected function _getScope()
     {
@@ -480,7 +451,6 @@ protected function _getScope()
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl($params = [])
     {
@@ -526,7 +496,6 @@ public function getBaseUrl($params = [])
      * @param string $data
      * @return \Magento\Framework\UrlInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _setRoutePath($data)
     {
@@ -578,7 +547,6 @@ protected function _setRoutePath($data)
      * Retrieve action path
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getActionPath()
     {
@@ -609,7 +577,6 @@ protected function _getActionPath()
      * @param array $routeParams
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function _getRoutePath($routeParams = [])
     {
@@ -638,7 +605,6 @@ protected function _getRoutePath($routeParams = [])
      *
      * @param string $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _setRouteName($data)
     {
@@ -657,7 +623,6 @@ protected function _setRouteName($data)
      * Retrieve route front name
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getRouteFrontName()
     {
@@ -676,7 +641,6 @@ protected function _getRouteFrontName()
      *
      * @param mixed $default
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getRouteName($default = null)
     {
@@ -690,7 +654,6 @@ protected function _getRouteName($default = null)
      *
      * @param string $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _setControllerName($data)
     {
@@ -707,7 +670,6 @@ protected function _setControllerName($data)
      *
      * @param mixed $default
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getControllerName($default = null)
     {
@@ -720,7 +682,6 @@ protected function _getControllerName($default = null)
      *
      * @param string $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _setActionName($data)
     {
@@ -738,7 +699,6 @@ protected function _setActionName($data)
      *
      * @param mixed $default
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getActionName($default = null)
     {
@@ -751,7 +711,6 @@ protected function _getActionName($default = null)
      * @param array $data
      * @param boolean $unsetOldParams
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _setRouteParams(array $data, $unsetOldParams = true)
     {
@@ -763,7 +722,6 @@ protected function _setRouteParams(array $data, $unsetOldParams = true)
      * Retrieve route params
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getRouteParams()
     {
@@ -776,7 +734,6 @@ protected function _getRouteParams()
      * @param string $routePath
      * @param array $routeParams
      * @return string
-     * @since 2.0.0
      */
     public function getRouteUrl($routePath = null, $routeParams = null)
     {
@@ -805,7 +762,6 @@ public function getRouteUrl($routePath = null, $routeParams = null)
      * Add session param
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function addSessionParam()
     {
@@ -821,7 +777,6 @@ public function addSessionParam()
      *
      * @param mixed $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _setQuery($data)
     {
@@ -833,7 +788,6 @@ protected function _setQuery($data)
      *
      * @param bool $escape "&" escape flag
      * @return string
-     * @since 2.0.0
      */
     protected function _getQuery($escape = false)
     {
@@ -845,7 +799,6 @@ protected function _getQuery($escape = false)
      *
      * @param array $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function addQueryParams(array $data)
     {
@@ -859,7 +812,6 @@ public function addQueryParams(array $data)
      * @param string $key
      * @param mixed $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setQueryParam($key, $data)
     {
@@ -871,7 +823,6 @@ public function setQueryParam($key, $data)
      * Retrieve URL fragment
      *
      * @return string|null
-     * @since 2.0.0
      */
     protected function _getFragment()
     {
@@ -886,7 +837,6 @@ protected function _getFragment()
      * @return  string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function getUrl($routePath = null, $routeParams = null)
     {
@@ -940,7 +890,6 @@ function ($item) use (&$isCached) {
      * @return  string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     private function createUrl($routePath = null, array $routeParams = null)
     {
@@ -1025,7 +974,6 @@ private function createUrl($routePath = null, array $routeParams = null)
      * @param string $url
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected function _prepareSessionUrl($url)
     {
@@ -1046,7 +994,6 @@ protected function _prepareSessionUrl($url)
      *
      * @param string $url
      * @return string
-     * @since 2.0.0
      */
     public function getRebuiltUrl($url)
     {
@@ -1080,7 +1027,6 @@ public function getRebuiltUrl($url)
      * @param string $value
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escape($value)
     {
@@ -1097,7 +1043,6 @@ public function escape($value)
      * @param string $url
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getDirectUrl($url, $params = [])
     {
@@ -1110,7 +1055,6 @@ public function getDirectUrl($url, $params = [])
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     public function sessionUrlVar($html)
     {
@@ -1145,7 +1089,6 @@ function ($match) {
      *
      * @param bool $secure
      * @return bool
-     * @since 2.0.0
      */
     public function useSessionIdForUrl($secure = false)
     {
@@ -1170,7 +1113,6 @@ public function useSessionIdForUrl($secure = false)
      * Check if users originated URL is one of the domain URLs assigned to scopes
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isOwnOriginUrl()
     {
@@ -1183,7 +1125,6 @@ public function isOwnOriginUrl()
      * @param string $url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectUrl($url)
     {
@@ -1200,7 +1141,6 @@ public function getRedirectUrl($url)
      * Retrieve current url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentUrl()
     {
@@ -1225,7 +1165,6 @@ public function getCurrentUrl()
      * Get Route Params Resolver
      *
      * @return Url\RouteParamsResolverInterface
-     * @since 2.0.0
      */
     protected function getRouteParamsResolver()
     {
diff --git a/lib/internal/Magento/Framework/Url/Decoder.php b/lib/internal/Magento/Framework/Url/Decoder.php
index 6598169ff7333..a4959c17b9351 100644
--- a/lib/internal/Magento/Framework/Url/Decoder.php
+++ b/lib/internal/Magento/Framework/Url/Decoder.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Url\Decoder
  *
- * @since 2.0.0
  */
 class Decoder implements DecoderInterface
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @param UrlInterface $urlBuilder
-     * @since 2.0.0
      */
     public function __construct(
         UrlInterface $urlBuilder
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function decode($url)
     {
diff --git a/lib/internal/Magento/Framework/Url/DecoderInterface.php b/lib/internal/Magento/Framework/Url/DecoderInterface.php
index cb5a06fdc93ab..523a402c1dc84 100644
--- a/lib/internal/Magento/Framework/Url/DecoderInterface.php
+++ b/lib/internal/Magento/Framework/Url/DecoderInterface.php
@@ -9,7 +9,6 @@
  * Base64 decoder for URLs
  *
  * @api
- * @since 2.0.0
  */
 interface DecoderInterface
 {
@@ -18,7 +17,6 @@ interface DecoderInterface
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function decode($url);
 }
diff --git a/lib/internal/Magento/Framework/Url/Encoder.php b/lib/internal/Magento/Framework/Url/Encoder.php
index 76488cb44f9c5..6c966358fb47c 100644
--- a/lib/internal/Magento/Framework/Url/Encoder.php
+++ b/lib/internal/Magento/Framework/Url/Encoder.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Url\Encoder
  *
- * @since 2.0.0
  */
 class Encoder implements EncoderInterface
 {
@@ -17,7 +16,6 @@ class Encoder implements EncoderInterface
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function encode($url)
     {
diff --git a/lib/internal/Magento/Framework/Url/EncoderInterface.php b/lib/internal/Magento/Framework/Url/EncoderInterface.php
index 7798aabd28a16..9e5a999755063 100644
--- a/lib/internal/Magento/Framework/Url/EncoderInterface.php
+++ b/lib/internal/Magento/Framework/Url/EncoderInterface.php
@@ -9,7 +9,6 @@
  * Base64 encoder for URLs
  *
  * @api
- * @since 2.0.0
  */
 interface EncoderInterface
 {
@@ -18,7 +17,6 @@ interface EncoderInterface
      *
      * @param    string $url
      * @return   string
-     * @since 2.0.0
      */
     public function encode($url);
 }
diff --git a/lib/internal/Magento/Framework/Url/Helper/Data.php b/lib/internal/Magento/Framework/Url/Helper/Data.php
index fd3c09f3bbba0..6d89dfb39bc36 100644
--- a/lib/internal/Magento/Framework/Url/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Url/Helper/Data.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Url\Helper\Data
  *
- * @since 2.0.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -22,7 +21,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Retrieve current url in base64 encoding
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentBase64Url()
     {
@@ -32,7 +30,6 @@ public function getCurrentBase64Url()
     /**
      * @param string $url
      * @return string
-     * @since 2.0.0
      */
     public function getEncodedUrl($url = null)
     {
@@ -48,7 +45,6 @@ public function getEncodedUrl($url = null)
      * @param  string $url
      * @param  array $param array( 'key' => value )
      * @return string
-     * @since 2.0.0
      */
     public function addRequestParam($url, $param)
     {
@@ -82,7 +78,6 @@ public function addRequestParam($url, $param)
      * @param string $paramKey
      * @param bool $caseSensitive
      * @return string
-     * @since 2.0.0
      */
     public function removeRequestParam($url, $paramKey, $caseSensitive = false)
     {
diff --git a/lib/internal/Magento/Framework/Url/QueryParamsResolver.php b/lib/internal/Magento/Framework/Url/QueryParamsResolver.php
index b9361c27f79cb..521b312d8a44e 100644
--- a/lib/internal/Magento/Framework/Url/QueryParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/QueryParamsResolver.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\Url\QueryParamsResolver
  *
- * @since 2.0.0
  */
 class QueryParamsResolver extends \Magento\Framework\DataObject implements QueryParamsResolverInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQuery($escape = false)
     {
@@ -32,7 +30,6 @@ public function getQuery($escape = false)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQuery($data)
     {
@@ -45,7 +42,6 @@ public function setQuery($data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQueryParam($key, $data)
     {
@@ -61,7 +57,6 @@ public function setQueryParam($key, $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getQueryParams()
     {
@@ -80,7 +75,6 @@ public function getQueryParams()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setQueryParams(array $data)
     {
@@ -89,7 +83,6 @@ public function setQueryParams(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addQueryParams(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php b/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
index 7b6015009760d..c9bd2412cad9c 100644
--- a/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
@@ -9,7 +9,6 @@
  * Resolves query parameters in a URL.
  *
  * @api
- * @since 2.0.0
  */
 interface QueryParamsResolverInterface
 {
@@ -18,7 +17,6 @@ interface QueryParamsResolverInterface
      *
      * @param bool $escape "&" escape flag
      * @return string
-     * @since 2.0.0
      */
     public function getQuery($escape = false);
 
@@ -27,7 +25,6 @@ public function getQuery($escape = false);
      *
      * @param mixed $data
      * @return \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     public function setQuery($data);
 
@@ -37,7 +34,6 @@ public function setQuery($data);
      * @param string $key
      * @param mixed $data
      * @return \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     public function setQueryParam($key, $data);
 
@@ -45,7 +41,6 @@ public function setQueryParam($key, $data);
      * Return Query Params
      *
      * @return array
-     * @since 2.0.0
      */
     public function getQueryParams();
 
@@ -54,7 +49,6 @@ public function getQueryParams();
      *
      * @param array $data
      * @return \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     public function setQueryParams(array $data);
 
@@ -63,7 +57,6 @@ public function setQueryParams(array $data);
      *
      * @param array $data
      * @return \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     public function addQueryParams(array $data);
 
@@ -72,7 +65,6 @@ public function addQueryParams(array $data);
      *
      * @param null|string|array $key
      * @return \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     public function unsetData($key = null);
 }
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index 63a0bcc6c55b2..9e99f74316371 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -18,19 +18,16 @@
  * @method bool getSecureIsForced()
  * @method $this setSecure(bool $isForced)
  * @method bool getSecure()
- * @since 2.0.0
  */
 class RouteParamsResolver extends \Magento\Framework\DataObject implements RouteParamsResolverInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\Url\QueryParamsResolverInterface
-     * @since 2.0.0
      */
     protected $queryParamsResolver;
 
@@ -44,7 +41,6 @@ class RouteParamsResolver extends \Magento\Framework\DataObject implements Route
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -60,7 +56,6 @@ public function __construct(
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     public function setRouteParams(array $data, $unsetOldParams = true)
     {
@@ -128,7 +123,6 @@ public function setRouteParams(array $data, $unsetOldParams = true)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRouteParam($key, $data)
     {
@@ -143,7 +137,6 @@ public function setRouteParam($key, $data)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRouteParams()
     {
@@ -152,7 +145,6 @@ public function getRouteParams()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRouteParam($key)
     {
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolverFactory.php b/lib/internal/Magento/Framework/Url/RouteParamsResolverFactory.php
index 8effdd8aa33a6..15f7fdd9dc672 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolverFactory.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolverFactory.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\Framework\Url\RouteParamsResolverFactory
  *
- * @since 2.0.0
  */
 class RouteParamsResolverFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -42,7 +38,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\Url\RouteParamsResolverInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php b/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
index 1341652e9ba2f..349f3d8359f7d 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
@@ -9,7 +9,6 @@
  * Route parameters resolver.
  *
  * @api
- * @since 2.0.0
  */
 interface RouteParamsResolverInterface
 {
@@ -19,7 +18,6 @@ interface RouteParamsResolverInterface
      * @param array $data
      * @param boolean $unsetOldParams
      * @return RouteParamsResolverInterface
-     * @since 2.0.0
      */
     public function setRouteParams(array $data, $unsetOldParams = true);
 
@@ -29,7 +27,6 @@ public function setRouteParams(array $data, $unsetOldParams = true);
      * @param string $key
      * @param mixed $data
      * @return RouteParamsResolverInterface
-     * @since 2.0.0
      */
     public function setRouteParam($key, $data);
 
@@ -37,7 +34,6 @@ public function setRouteParam($key, $data);
      * Retrieve route params
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRouteParams();
 
@@ -46,7 +42,6 @@ public function getRouteParams();
      *
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getRouteParam($key);
 }
diff --git a/lib/internal/Magento/Framework/Url/ScopeInterface.php b/lib/internal/Magento/Framework/Url/ScopeInterface.php
index d62fd3a26ada7..821ae1814e9a3 100644
--- a/lib/internal/Magento/Framework/Url/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeInterface.php
@@ -10,7 +10,6 @@
  * determine scope based on URLs.
  *
  * @api
- * @since 2.0.0
  */
 interface ScopeInterface extends \Magento\Framework\App\ScopeInterface
 {
@@ -20,7 +19,6 @@ interface ScopeInterface extends \Magento\Framework\App\ScopeInterface
      * @param string $type
      * @param boolean|null $secure
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl($type = '', $secure = null);
 
@@ -28,7 +26,6 @@ public function getBaseUrl($type = '', $secure = null);
      * Check is URL should be secure
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isUrlSecure();
 }
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolver.php b/lib/internal/Magento/Framework/Url/ScopeResolver.php
index 2b70ab1316298..b43f70713daed 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolver.php
@@ -9,26 +9,22 @@
  * Class ScopeResolver
  *
  * URL scope resolver.
- * @since 2.0.0
  */
 class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
 {
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $scopeResolver;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $areaCode;
 
     /**
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string|null $areaCode
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\ScopeResolverInterface $scopeResolver, $areaCode = null)
     {
@@ -38,7 +34,6 @@ public function __construct(\Magento\Framework\App\ScopeResolverInterface $scope
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getScope($scopeId = null)
     {
@@ -56,7 +51,6 @@ public function getScope($scopeId = null)
      * Retrieve array of URL scopes.
      *
      * @return \Magento\Framework\Url\ScopeInterface[]
-     * @since 2.0.0
      */
     public function getScopes()
     {
@@ -65,7 +59,6 @@ public function getScopes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAreaCode()
     {
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
index 0aee5e50a390f..961ad6ecff8b5 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
@@ -9,7 +9,6 @@
  * This ScopeResolverInterface adds the ability to get the Magento area the code is executing in.
  *
  * @api
- * @since 2.0.0
  */
 interface ScopeResolverInterface extends \Magento\Framework\App\ScopeResolverInterface
 {
@@ -17,7 +16,6 @@ interface ScopeResolverInterface extends \Magento\Framework\App\ScopeResolverInt
      * Retrieve area code
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getAreaCode();
 }
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfo.php b/lib/internal/Magento/Framework/Url/SecurityInfo.php
index 19358d51ef223..0bcb1c39ec793 100644
--- a/lib/internal/Magento/Framework/Url/SecurityInfo.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfo.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Url\SecurityInfo
  *
- * @since 2.0.0
  */
 class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
 {
@@ -18,13 +17,11 @@ class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
      * List of secure url patterns
      *
      * @var array
-     * @since 2.0.0
      */
     protected $secureUrlsList = [];
 
     /**
      * List of patterns excluded form secure url list
-     * @since 2.0.0
      */
     protected $excludedUrlsList = [];
 
@@ -32,14 +29,12 @@ class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
      * List of already checked urls
      *
      * @var array
-     * @since 2.0.0
      */
     protected $secureUrlsCache = [];
 
     /**
      * @param string[] $secureUrlList
      * @param string[] $excludedUrlList
-     * @since 2.0.0
      */
     public function __construct($secureUrlList = [], $excludedUrlList = [])
     {
@@ -52,7 +47,6 @@ public function __construct($secureUrlList = [], $excludedUrlList = [])
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     public function isSecure($url)
     {
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php b/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
index 2df74eccaa4a9..c3cdab91d325f 100644
--- a/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
@@ -9,7 +9,6 @@
  * URL security information. Answers whether URL is secured.
  *
  * @api
- * @since 2.0.0
  */
 interface SecurityInfoInterface
 {
@@ -18,7 +17,6 @@ interface SecurityInfoInterface
      *
      * @param string $url
      * @return bool
-     * @since 2.0.0
      */
     public function isSecure($url);
 }
diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php
index f08d6e346b66b..d70c33ec7b282 100644
--- a/lib/internal/Magento/Framework/Url/Validator.php
+++ b/lib/internal/Magento/Framework/Url/Validator.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Url\Validator
  *
- * @since 2.0.0
  */
 class Validator extends \Zend_Validate_Abstract
 {
@@ -26,7 +25,6 @@ class Validator extends \Zend_Validate_Abstract
 
     /**
      * Object constructor
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -38,7 +36,6 @@ public function __construct()
      * Validation failure message template definitions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messageTemplates = [self::INVALID_URL => "Invalid URL '%value%'."];
 
@@ -47,7 +44,6 @@ public function __construct()
      *
      * @param string $value
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($value)
     {
diff --git a/lib/internal/Magento/Framework/UrlFactory.php b/lib/internal/Magento/Framework/UrlFactory.php
index 7396774d0c4ec..a326f0e8a7a87 100644
--- a/lib/internal/Magento/Framework/UrlFactory.php
+++ b/lib/internal/Magento/Framework/UrlFactory.php
@@ -9,26 +9,22 @@
 /**
  * Class \Magento\Framework\UrlFactory
  *
- * @since 2.0.0
  */
 class UrlFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -43,7 +39,6 @@ public function __construct(
      *
      * @param array $data
      * @return UrlInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/UrlInterface.php b/lib/internal/Magento/Framework/UrlInterface.php
index 16dd562462ebc..59806e14eb7c9 100644
--- a/lib/internal/Magento/Framework/UrlInterface.php
+++ b/lib/internal/Magento/Framework/UrlInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface UrlInterface
 {
@@ -54,7 +53,6 @@ interface UrlInterface
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @since 2.0.0
      */
     public function getUseSession();
 
@@ -63,7 +61,6 @@ public function getUseSession();
      *
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl($params = []);
 
@@ -71,7 +68,6 @@ public function getBaseUrl($params = []);
      * Retrieve current url with port number (if not default used)
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCurrentUrl();
 
@@ -81,7 +77,6 @@ public function getCurrentUrl();
      * @param string $routePath
      * @param array $routeParams
      * @return string
-     * @since 2.0.0
      */
     public function getRouteUrl($routePath = null, $routeParams = null);
 
@@ -89,7 +84,6 @@ public function getRouteUrl($routePath = null, $routeParams = null);
      * Add session param
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function addSessionParam();
 
@@ -98,7 +92,6 @@ public function addSessionParam();
      *
      * @param array $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function addQueryParams(array $data);
 
@@ -108,7 +101,6 @@ public function addQueryParams(array $data);
      * @param string $key
      * @param mixed $data
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setQueryParam($key, $data);
 
@@ -118,7 +110,6 @@ public function setQueryParam($key, $data);
      * @param   string|null $routePath
      * @param   array|null $routeParams
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($routePath = null, $routeParams = null);
 
@@ -127,7 +118,6 @@ public function getUrl($routePath = null, $routeParams = null);
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     public function escape($value);
 
@@ -137,7 +127,6 @@ public function escape($value);
      * @param string $url
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getDirectUrl($url, $params = []);
 
@@ -146,7 +135,6 @@ public function getDirectUrl($url, $params = []);
      *
      * @param string $html
      * @return string
-     * @since 2.0.0
      */
     public function sessionUrlVar($html);
 
@@ -154,7 +142,6 @@ public function sessionUrlVar($html);
      * Check if users originated URL is one of the domain URLs assigned to stores
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isOwnOriginUrl();
 
@@ -164,7 +151,6 @@ public function isOwnOriginUrl();
      * @param string $url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectUrl($url);
 
@@ -173,7 +159,6 @@ public function getRedirectUrl($url);
      *
      * @param mixed $params
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function setScope($params);
 }
diff --git a/lib/internal/Magento/Framework/Util.php b/lib/internal/Magento/Framework/Util.php
index 2c79b48cac30a..2afc93657f791 100644
--- a/lib/internal/Magento/Framework/Util.php
+++ b/lib/internal/Magento/Framework/Util.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Util
  *
- * @since 2.0.0
  */
 class Util
 {
@@ -18,7 +17,6 @@ class Util
      * Return PHP version without optional suffix
      * Scheme: major.minor.release
      * @return string
-     * @since 2.0.0
      */
     public function getTrimmedPhpVersion()
     {
diff --git a/lib/internal/Magento/Framework/Validator.php b/lib/internal/Magento/Framework/Validator.php
index 1547406126565..e15a1399a96a4 100644
--- a/lib/internal/Magento/Framework/Validator.php
+++ b/lib/internal/Magento/Framework/Validator.php
@@ -10,7 +10,6 @@
  * Validator class that represents chain of validators.
  *
  * @api
- * @since 2.0.0
  */
 class Validator extends \Magento\Framework\Validator\AbstractValidator
 {
@@ -18,7 +17,6 @@ class Validator extends \Magento\Framework\Validator\AbstractValidator
      * Validator chain
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_validators = [];
 
@@ -28,7 +26,6 @@ class Validator extends \Magento\Framework\Validator\AbstractValidator
      * @param \Magento\Framework\Validator\ValidatorInterface $validator
      * @param boolean $breakChainOnFailure
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function addValidator(
         \Magento\Framework\Validator\ValidatorInterface $validator,
@@ -49,7 +46,6 @@ public function addValidator(
      *
      * @param mixed $value
      * @return boolean
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -77,7 +73,6 @@ public function isValid($value)
      *
      * @param \Magento\Framework\Translate\AdapterInterface|null $translator
      * @return \Magento\Framework\Validator\AbstractValidator
-     * @since 2.0.0
      */
     public function setTranslator($translator = null)
     {
diff --git a/lib/internal/Magento/Framework/Validator/AbstractValidator.php b/lib/internal/Magento/Framework/Validator/AbstractValidator.php
index 6569e4079af97..db636516aacab 100644
--- a/lib/internal/Magento/Framework/Validator/AbstractValidator.php
+++ b/lib/internal/Magento/Framework/Validator/AbstractValidator.php
@@ -9,19 +9,16 @@
  * Abstract validator class.
  *
  * @api
- * @since 2.0.0
  */
 abstract class AbstractValidator implements \Magento\Framework\Validator\ValidatorInterface
 {
     /**
      * @var \Magento\Framework\Translate\AdapterInterface|null
-     * @since 2.0.0
      */
     protected static $_defaultTranslator = null;
 
     /**
      * @var \Magento\Framework\Translate\AdapterInterface|null
-     * @since 2.0.0
      */
     protected $_translator = null;
 
@@ -29,7 +26,6 @@ abstract class AbstractValidator implements \Magento\Framework\Validator\Validat
      * Array of validation failure messages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = [];
 
@@ -39,7 +35,6 @@ abstract class AbstractValidator implements \Magento\Framework\Validator\Validat
      * @param \Magento\Framework\Translate\AdapterInterface|null $translator
      * @return void
      * @api
-     * @since 2.0.0
      */
     public static function setDefaultTranslator(\Magento\Framework\Translate\AdapterInterface $translator = null)
     {
@@ -51,7 +46,6 @@ public static function setDefaultTranslator(\Magento\Framework\Translate\Adapter
      *
      * @return \Magento\Framework\Translate\AdapterInterface|null
      * @api
-     * @since 2.0.0
      */
     public static function getDefaultTranslator()
     {
@@ -63,7 +57,6 @@ public static function getDefaultTranslator()
      *
      * @param \Magento\Framework\Translate\AdapterInterface|null $translator
      * @return \Magento\Framework\Validator\AbstractValidator
-     * @since 2.0.0
      */
     public function setTranslator($translator = null)
     {
@@ -75,7 +68,6 @@ public function setTranslator($translator = null)
      * Get translator
      *
      * @return \Magento\Framework\Translate\AdapterInterface|null
-     * @since 2.0.0
      */
     public function getTranslator()
     {
@@ -89,7 +81,6 @@ public function getTranslator()
      * Check that translator is set.
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function hasTranslator()
     {
@@ -101,7 +92,6 @@ public function hasTranslator()
      *
      * @return string[]
      * @api
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -113,7 +103,6 @@ public function getMessages()
      *
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function hasMessages()
     {
@@ -124,7 +113,6 @@ public function hasMessages()
      * Clear messages
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _clearMessages()
     {
@@ -136,7 +124,6 @@ protected function _clearMessages()
      *
      * @param array $messages
      * @return void
-     * @since 2.0.0
      */
     protected function _addMessages(array $messages)
     {
diff --git a/lib/internal/Magento/Framework/Validator/AllowedProtocols.php b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
index ae3c70544d169..6c3bad05326a0 100644
--- a/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
+++ b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
@@ -14,7 +14,7 @@
  *
  * Class AllowedProtocols
  * @package Magento\Framework\Validator
- * @since 2.2.0
+ * @since 2.1.2
  */
 class AllowedProtocols extends AbstractValidator
 {
@@ -22,7 +22,7 @@ class AllowedProtocols extends AbstractValidator
      * List of supported protocols
      *
      * @var array
-     * @since 2.2.0
+     * @since 2.1.2
      */
     private $listOfProtocols = [
         'http',
@@ -32,7 +32,7 @@ class AllowedProtocols extends AbstractValidator
     /**
      * Constructor.
      * @param array $listOfProtocols
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function __construct($listOfProtocols = [])
     {
@@ -46,7 +46,7 @@ public function __construct($listOfProtocols = [])
      *
      * @param string $value
      * @return bool
-     * @since 2.2.0
+     * @since 2.1.2
      */
     public function isValid($value)
     {
diff --git a/lib/internal/Magento/Framework/Validator/Alnum.php b/lib/internal/Magento/Framework/Validator/Alnum.php
index 17d7f3baa72b9..5809f2d3abc59 100644
--- a/lib/internal/Magento/Framework/Validator/Alnum.php
+++ b/lib/internal/Magento/Framework/Validator/Alnum.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\Alnum
  *
- * @since 2.0.0
  */
 class Alnum extends \Zend_Validate_Alnum implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Builder.php b/lib/internal/Magento/Framework/Validator/Builder.php
index a9b237b091f47..89db161fa7673 100644
--- a/lib/internal/Magento/Framework/Validator/Builder.php
+++ b/lib/internal/Magento/Framework/Validator/Builder.php
@@ -13,31 +13,26 @@
 /**
  * Class \Magento\Framework\Validator\Builder
  *
- * @since 2.0.0
  */
 class Builder
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_constraints;
 
     /**
      * @var \Magento\Framework\Validator\ConstraintFactory
-     * @since 2.0.0
      */
     protected $_constraintFactory;
 
     /**
      * @var \Magento\Framework\ValidatorFactory
-     * @since 2.0.0
      */
     protected $_validatorFactory;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_oneValidatorFactory;
 
@@ -46,7 +41,6 @@ class Builder
      * @param \Magento\Framework\ValidatorFactory $validatorFactory
      * @param \Magento\Framework\Validator\UniversalFactory $oneValidatorFactory
      * @param array $constraints
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Validator\ConstraintFactory $constraintFactory,
@@ -73,7 +67,6 @@ public function __construct(
      * @param bool $argumentsIsArray
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _checkConfigurationArguments(array $configuration, $argumentsIsArray)
     {
@@ -105,7 +98,6 @@ protected function _checkConfigurationArguments(array $configuration, $arguments
      * @param array $configuration
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _checkMethodArguments(array $configuration)
     {
@@ -124,7 +116,6 @@ protected function _checkMethodArguments(array $configuration)
      * @param bool $callbackIsArray
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _checkConfigurationCallback(array $configuration, $callbackIsArray)
     {
@@ -148,7 +139,6 @@ protected function _checkConfigurationCallback(array $configuration, $callbackIs
      * Create validator instance and configure it
      *
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function createValidator()
     {
@@ -159,7 +149,6 @@ public function createValidator()
      * Get validator instance
      *
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     protected function _createValidatorInstance()
     {
@@ -179,7 +168,6 @@ protected function _createValidatorInstance()
      * @param array $configuration
      * @return $this
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function addConfiguration($alias, array $configuration)
     {
@@ -212,7 +200,6 @@ public function addConfiguration($alias, array $configuration)
      * @param array $constraint
      * @param \Magento\Framework\Validator\Constraint\Option\Callback $callback
      * @return array
-     * @since 2.0.0
      */
     protected function _addConstraintCallback(
         array $constraint,
@@ -231,7 +218,6 @@ protected function _addConstraintCallback(
      * @param array $constraint
      * @param array $configuration
      * @return array
-     * @since 2.0.0
      */
     protected function _addConstraintMethod(array $constraint, array $configuration)
     {
@@ -247,7 +233,6 @@ protected function _addConstraintMethod(array $constraint, array $configuration)
      *
      * @param array $configurations
      * @return $this
-     * @since 2.0.0
      */
     public function addConfigurations(array $configurations)
     {
@@ -264,7 +249,6 @@ public function addConfigurations(array $configurations)
      *
      * @param array $data
      * @return \Magento\Framework\Validator\Constraint
-     * @since 2.0.0
      */
     protected function _createConstraint(array $data)
     {
@@ -293,7 +277,6 @@ protected function _createConstraint(array $data)
      * @param array $data
      * @return \Magento\Framework\Validator\ValidatorInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _createConstraintValidator(array $data)
     {
@@ -325,7 +308,6 @@ protected function _createConstraintValidator(array $data)
      * @param \Magento\Framework\Validator\ValidatorInterface $validator
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     protected function _configureConstraintValidator(
         \Magento\Framework\Validator\ValidatorInterface $validator,
@@ -361,7 +343,6 @@ protected function _configureConstraintValidator(
      *
      * @param OptionInterface[] $arguments
      * @return OptionInterface[]
-     * @since 2.0.0
      */
     protected function _applyArgumentsCallback(array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/Validator/Config.php b/lib/internal/Magento/Framework/Validator/Config.php
index 830f4dc9ebc8a..df5c841ea1861 100644
--- a/lib/internal/Magento/Framework/Validator/Config.php
+++ b/lib/internal/Magento/Framework/Validator/Config.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Validator\Config
  *
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\AbstractXml
 {
@@ -26,15 +25,11 @@ class Config extends \Magento\Framework\Config\AbstractXml
     const CONSTRAINT_TYPE_PROPERTY = 'property';
     /**#@-*/
 
-    /**
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_defaultBuilderClass = \Magento\Framework\Validator\Builder::class;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory
-     * @since 2.0.0
      */
     protected $_builderFactory;
 
@@ -42,7 +37,6 @@ class Config extends \Magento\Framework\Config\AbstractXml
      * @param array $configFiles
      * @param \Magento\Framework\Config\DomFactory $domFactory
      * @param \Magento\Framework\Validator\UniversalFactory $builderFactory
-     * @since 2.0.0
      */
     public function __construct(
         $configFiles,
@@ -61,7 +55,6 @@ public function __construct(
      * @param array|null $builderConfig
      * @throws \InvalidArgumentException
      * @return \Magento\Framework\Validator\Builder
-     * @since 2.0.0
      */
     public function createValidatorBuilder($entityName, $groupName, array $builderConfig = null)
     {
@@ -105,7 +98,6 @@ public function createValidatorBuilder($entityName, $groupName, array $builderCo
      * @param string $groupName
      * @param array|null $builderConfig
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function createValidator($entityName, $groupName, array $builderConfig = null)
     {
@@ -117,7 +109,6 @@ public function createValidator($entityName, $groupName, array $builderConfig =
      *
      * @param \DOMDocument $dom
      * @return array
-     * @since 2.0.0
      */
     protected function _extractData(\DOMDocument $dom)
     {
@@ -135,7 +126,6 @@ protected function _extractData(\DOMDocument $dom)
      *
      * @param \DOMElement $entity
      * @return array
-     * @since 2.0.0
      */
     protected function _extractEntityGroupsConstraintsData(\DOMElement $entity)
     {
@@ -171,7 +161,6 @@ protected function _extractEntityGroupsConstraintsData(\DOMElement $entity)
      *
      * @param \DOMElement $entity
      * @return array
-     * @since 2.0.0
      */
     protected function _extractRulesConstraintsData(\DOMElement $entity)
     {
@@ -219,7 +208,6 @@ protected function _extractRulesConstraintsData(\DOMElement $entity)
      *
      * @param \DOMElement $constraint
      * @return array|null
-     * @since 2.0.0
      */
     protected function _extractConstraintOptions(\DOMElement $constraint)
     {
@@ -275,7 +263,6 @@ protected function _extractConstraintOptions(\DOMElement $constraint)
      *
      * @param \DOMElement $element
      * @return array
-     * @since 2.0.0
      */
     protected function _collectChildren($element)
     {
@@ -299,7 +286,6 @@ protected function _collectChildren($element)
      *
      * @param array $children
      * @return OptionInterface[]|null
-     * @since 2.0.0
      */
     protected function _readArguments($children)
     {
@@ -329,7 +315,6 @@ protected function _readArguments($children)
      *
      * @param array $children
      * @return Callback[]|null
-     * @since 2.0.0
      */
     protected function _readCallback($children)
     {
@@ -353,7 +338,6 @@ protected function _readCallback($children)
      *
      * @param array $children
      * @return Option|null
-     * @since 2.0.0
      */
     protected function _readOptions($children)
     {
@@ -392,7 +376,6 @@ protected function _readOptions($children)
      *
      * @param array $children
      * @return array|null
-     * @since 2.0.0
      */
     protected function _readMethods($children)
     {
@@ -418,7 +401,6 @@ protected function _readMethods($children)
      * Get absolute path to validation.xsd
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchemaFile()
     {
@@ -429,7 +411,6 @@ public function getSchemaFile()
      * Get initial XML of a valid document.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInitialXml()
     {
@@ -441,7 +422,6 @@ protected function _getInitialXml()
      * Define id attributes for entities
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getIdAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint.php b/lib/internal/Magento/Framework/Validator/Constraint.php
index f7e33521f17bb..d9be3c3d7ff9f 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Constraint extends \Magento\Framework\Validator\AbstractValidator
 {
@@ -17,7 +16,6 @@ class Constraint extends \Magento\Framework\Validator\AbstractValidator
      * Wrapped validator
      *
      * @var \Magento\Framework\Validator\ValidatorInterface
-     * @since 2.0.0
      */
     protected $_wrappedValidator;
 
@@ -25,7 +23,6 @@ class Constraint extends \Magento\Framework\Validator\AbstractValidator
      * Alias can be used for search
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_alias;
 
@@ -34,7 +31,6 @@ class Constraint extends \Magento\Framework\Validator\AbstractValidator
      *
      * @param \Magento\Framework\Validator\ValidatorInterface $validator
      * @param string $alias
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Validator\ValidatorInterface $validator, $alias = null)
     {
@@ -48,7 +44,6 @@ public function __construct(\Magento\Framework\Validator\ValidatorInterface $val
      * @param mixed $value
      * @return boolean
      * @api
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -68,7 +63,6 @@ public function isValid($value)
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getValidatorValue($value)
     {
@@ -83,7 +77,6 @@ protected function _getValidatorValue($value)
      *
      * @return string
      * @api
-     * @since 2.0.0
      */
     public function getAlias()
     {
@@ -95,7 +88,6 @@ public function getAlias()
      *
      * @param \Magento\Framework\Translate\AdapterInterface|null $translator
      * @return \Magento\Framework\Validator\AbstractValidator
-     * @since 2.0.0
      */
     public function setTranslator($translator = null)
     {
@@ -107,7 +99,6 @@ public function setTranslator($translator = null)
      * Get translator instance of wrapped validator
      *
      * @return \Magento\Framework\Translate\AdapterInterface|null
-     * @since 2.0.0
      */
     public function getTranslator()
     {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/Option.php b/lib/internal/Magento/Framework/Validator/Constraint/Option.php
index b2797262bcb62..5413218c15506 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/Option.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/Option.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Framework\Validator\Constraint\Option
  *
- * @since 2.0.0
  */
 class Option implements \Magento\Framework\Validator\Constraint\OptionInterface
 {
     /**
      * @var int|string|array
-     * @since 2.0.0
      */
     protected $_value;
 
@@ -24,7 +22,6 @@ class Option implements \Magento\Framework\Validator\Constraint\OptionInterface
      * Set value
      *
      * @param int|string|array $value
-     * @since 2.0.0
      */
     public function __construct($value)
     {
@@ -35,7 +32,6 @@ public function __construct($value)
      * Get value
      *
      * @return int|string|array
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/Option/Callback.php b/lib/internal/Magento/Framework/Validator/Constraint/Option/Callback.php
index a60f564d26d5e..b2ce93ba7a36f 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/Option/Callback.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/Option/Callback.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\Framework\Validator\Constraint\Option\Callback
  *
- * @since 2.0.0
  */
 class Callback implements \Magento\Framework\Validator\Constraint\OptionInterface
 {
     /**
      * @var callable
-     * @since 2.0.0
      */
     protected $_callable;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_arguments;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $_createInstance;
 
@@ -38,7 +34,6 @@ class Callback implements \Magento\Framework\Validator\Constraint\OptionInterfac
      * @param callable $callable
      * @param mixed $arguments
      * @param bool $createInstance If true than $callable[0] will be evaluated to new instance of class when get value
-     * @since 2.0.0
      */
     public function __construct($callable, $arguments = null, $createInstance = false)
     {
@@ -52,7 +47,6 @@ public function __construct($callable, $arguments = null, $createInstance = fals
      *
      * @param mixed $arguments
      * @return void
-     * @since 2.0.0
      */
     public function setArguments($arguments = null)
     {
@@ -70,7 +64,6 @@ public function setArguments($arguments = null)
      *
      * @return mixed
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getValue()
     {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/OptionInterface.php b/lib/internal/Magento/Framework/Validator/Constraint/OptionInterface.php
index bfb78a02044a7..b4c0f9252b5df 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/OptionInterface.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/OptionInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Validator\Constraint\OptionInterface
  *
- * @since 2.0.0
  */
 interface OptionInterface
 {
@@ -18,7 +17,6 @@ interface OptionInterface
      * Get option value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue();
 }
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/Property.php b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
index 7cd86a3d91ee9..8426104f45aef 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/Property.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Validator\Constraint\Property
  *
- * @since 2.0.0
  */
 class Property extends \Magento\Framework\Validator\Constraint
 {
@@ -19,7 +18,6 @@ class Property extends \Magento\Framework\Validator\Constraint
      * Property name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_property;
 
@@ -29,7 +27,6 @@ class Property extends \Magento\Framework\Validator\Constraint
      * @param \Magento\Framework\Validator\ValidatorInterface $validator
      * @param string $property
      * @param string $alias
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Validator\ValidatorInterface $validator, $property, $alias = null)
     {
@@ -43,7 +40,6 @@ public function __construct(\Magento\Framework\Validator\ValidatorInterface $val
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     protected function _getValidatorValue($value)
     {
@@ -63,7 +59,6 @@ protected function _getValidatorValue($value)
      *
      * @param array $messages
      * @return void
-     * @since 2.0.0
      */
     protected function _addMessages(array $messages)
     {
diff --git a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
index 8fb2c9cf7a078..7214982029f60 100644
--- a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
+++ b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Validator\ConstraintFactory
  *
- * @since 2.0.0
  */
 class ConstraintFactory
 {
@@ -20,7 +19,6 @@ class ConstraintFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -28,7 +26,6 @@ class ConstraintFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -37,7 +34,6 @@ class ConstraintFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -53,7 +49,6 @@ public function __construct(
      * @param array $data
      * @return \Magento\Framework\Validator\Constraint
      * @api
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Validator/Currency.php b/lib/internal/Magento/Framework/Validator/Currency.php
index ea9272a4f9773..3af6cef822ddf 100644
--- a/lib/internal/Magento/Framework/Validator/Currency.php
+++ b/lib/internal/Magento/Framework/Validator/Currency.php
@@ -10,13 +10,11 @@
 
 /**
  * Currency validator model
- * @since 2.0.0
  */
 class Currency
 {
     /**
      * @var Lists
-     * @since 2.0.0
      */
     protected $lists;
 
@@ -24,7 +22,6 @@ class Currency
      * Constructor
      *
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -37,7 +34,6 @@ public function __construct(Lists $lists)
      * @param string $currencyCode
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isValid($currencyCode)
     {
diff --git a/lib/internal/Magento/Framework/Validator/DataObject.php b/lib/internal/Magento/Framework/Validator/DataObject.php
index a71c26d07b249..7348550ab3880 100644
--- a/lib/internal/Magento/Framework/Validator/DataObject.php
+++ b/lib/internal/Magento/Framework/Validator/DataObject.php
@@ -12,7 +12,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DataObject implements \Zend_Validate_Interface
 {
@@ -20,7 +19,6 @@ class DataObject implements \Zend_Validate_Interface
      * Validation rules per scope (particular fields or entire entity)
      *
      * @var \Zend_Validate_Interface[]
-     * @since 2.0.0
      */
     private $_rules = [];
 
@@ -28,7 +26,6 @@ class DataObject implements \Zend_Validate_Interface
      * Validation error messages
      *
      * @var array
-     * @since 2.0.0
      */
     private $_messages = [];
 
@@ -39,7 +36,6 @@ class DataObject implements \Zend_Validate_Interface
      * @param string $fieldName Field name to apply validation to, or empty value to validate entity as a whole
      * @return \Magento\Framework\Validator\DataObject
      * @api
-     * @since 2.0.0
      */
     public function addRule(\Zend_Validate_Interface $validator, $fieldName = '')
     {
@@ -65,7 +61,6 @@ public function addRule(\Zend_Validate_Interface $validator, $fieldName = '')
      *
      * @throws \Exception
      * @api
-     * @since 2.0.0
      */
     public function isValid($entity)
     {
@@ -84,7 +79,6 @@ public function isValid($entity)
      * Return error messages (if any) after the last validation
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
diff --git a/lib/internal/Magento/Framework/Validator/EmailAddress.php b/lib/internal/Magento/Framework/Validator/EmailAddress.php
index d996c49828706..1a5db3118123f 100644
--- a/lib/internal/Magento/Framework/Validator/EmailAddress.php
+++ b/lib/internal/Magento/Framework/Validator/EmailAddress.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\Validator\EmailAddress
  *
- * @since 2.0.0
  */
 class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Entity/Properties.php b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
index 850496556564c..cc7e9c7358f8e 100644
--- a/lib/internal/Magento/Framework/Validator/Entity/Properties.php
+++ b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Framework\Validator\Entity\Properties
  *
- * @since 2.0.0
  */
 class Properties extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $_readOnlyProperties = [];
 
@@ -28,7 +26,6 @@ class Properties extends \Magento\Framework\Validator\AbstractValidator
      *
      * @param string[] $readOnlyProperties
      * @return void
-     * @since 2.0.0
      */
     public function setReadOnlyProperties(array $readOnlyProperties)
     {
@@ -44,7 +41,6 @@ public function setReadOnlyProperties(array $readOnlyProperties)
      * @return bool
      * @throws \InvalidArgumentException when $value is not instanceof \Magento\Framework\DataObject
      * @api
-     * @since 2.0.0
      */
     public function isValid($value)
     {
@@ -74,7 +70,6 @@ public function isValid($value)
      * @param mixed $firstValue
      * @param mixed $secondValue
      * @return bool
-     * @since 2.0.0
      */
     protected function _hasChanges($firstValue, $secondValue)
     {
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
index 4413ac18b812d..c70ecfabb52af 100644
--- a/lib/internal/Magento/Framework/Validator/Exception.php
+++ b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -16,13 +16,11 @@
  * Exception to be thrown when data validation fails
  *
  * @api
- * @since 2.0.0
  */
 class Exception extends InputException
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $messages = [];
 
@@ -33,7 +31,6 @@ class Exception extends InputException
      * @param \Exception $cause
      * @param array $messages Validation error messages
      * @param int $code
-     * @since 2.0.0
      */
     public function __construct(
         Phrase $phrase = null,
@@ -62,7 +59,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Message\AbstractMessage $message
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage(AbstractMessage $message)
     {
@@ -78,7 +74,6 @@ public function addMessage(AbstractMessage $message)
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     public function getMessages($type = '')
     {
diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
index b1c68b58e1a1b..a88bcb6e6e179 100644
--- a/lib/internal/Magento/Framework/Validator/Factory.php
+++ b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\Validator\Factory
  *
- * @since 2.0.0
  */
 class Factory
 {
@@ -20,7 +19,6 @@ class Factory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -28,13 +26,11 @@ class Factory
      * Validator config files
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $_configFiles = null;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $isDefaultTranslatorInitialized = false;
 
@@ -68,7 +64,6 @@ class Factory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param FrontendInterface $cache
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -107,7 +102,6 @@ protected function _initializeConfigList()
      * Create and set default translator to \Magento\Framework\Validator\AbstractValidator.
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _initializeDefaultTranslator()
     {
@@ -131,7 +125,6 @@ protected function _initializeDefaultTranslator()
      * Will instantiate \Magento\Framework\Validator\Config
      *
      * @return \Magento\Framework\Validator\Config
-     * @since 2.0.0
      */
     public function getValidatorConfig()
     {
@@ -150,7 +143,6 @@ public function getValidatorConfig()
      * @param string $groupName
      * @param array|null $builderConfig
      * @return \Magento\Framework\Validator\Builder
-     * @since 2.0.0
      */
     public function createValidatorBuilder($entityName, $groupName, array $builderConfig = null)
     {
@@ -165,7 +157,6 @@ public function createValidatorBuilder($entityName, $groupName, array $builderCo
      * @param string $groupName
      * @param array|null $builderConfig
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function createValidator($entityName, $groupName, array $builderConfig = null)
     {
diff --git a/lib/internal/Magento/Framework/Validator/File/Extension.php b/lib/internal/Magento/Framework/Validator/File/Extension.php
index 85ef74a6c64e1..22381ce445c50 100644
--- a/lib/internal/Magento/Framework/Validator/File/Extension.php
+++ b/lib/internal/Magento/Framework/Validator/File/Extension.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\File\Extension
  *
- * @since 2.0.0
  */
 class Extension extends \Zend_Validate_File_Extension implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/File/ImageSize.php b/lib/internal/Magento/Framework/Validator/File/ImageSize.php
index 2ec15bcf84a35..41b3149ada3d0 100644
--- a/lib/internal/Magento/Framework/Validator/File/ImageSize.php
+++ b/lib/internal/Magento/Framework/Validator/File/ImageSize.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\File\ImageSize
  *
- * @since 2.0.0
  */
 class ImageSize extends \Zend_Validate_File_ImageSize implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/File/IsImage.php b/lib/internal/Magento/Framework/Validator/File/IsImage.php
index 9f1aaf01f9776..1c70f346132f8 100644
--- a/lib/internal/Magento/Framework/Validator/File/IsImage.php
+++ b/lib/internal/Magento/Framework/Validator/File/IsImage.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\File\IsImage
  *
- * @since 2.0.0
  */
 class IsImage extends \Zend_Validate_File_IsImage implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/File/Size.php b/lib/internal/Magento/Framework/Validator/File/Size.php
index 64152be45dd24..06be138b89831 100644
--- a/lib/internal/Magento/Framework/Validator/File/Size.php
+++ b/lib/internal/Magento/Framework/Validator/File/Size.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\File\Size
  *
- * @since 2.0.0
  */
 class Size extends \Zend_Validate_File_Size implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/FloatUtils.php b/lib/internal/Magento/Framework/Validator/FloatUtils.php
index e7e9c0c85dd01..216a4fac7b9a5 100644
--- a/lib/internal/Magento/Framework/Validator/FloatUtils.php
+++ b/lib/internal/Magento/Framework/Validator/FloatUtils.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\FloatUtils
  *
- * @since 2.0.0
  */
 class FloatUtils extends \Zend_Validate_Float implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/IntUtils.php b/lib/internal/Magento/Framework/Validator/IntUtils.php
index 541b2a6b80a8d..f43db1bdb902f 100644
--- a/lib/internal/Magento/Framework/Validator/IntUtils.php
+++ b/lib/internal/Magento/Framework/Validator/IntUtils.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\IntUtils
  *
- * @since 2.0.0
  */
 class IntUtils extends \Zend_Validate_Int implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Ip.php b/lib/internal/Magento/Framework/Validator/Ip.php
index d804c34fc0fdf..4978b9b12eb23 100644
--- a/lib/internal/Magento/Framework/Validator/Ip.php
+++ b/lib/internal/Magento/Framework/Validator/Ip.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\Ip
  *
- * @since 2.0.0
  */
 class Ip extends \Zend_Validate_Ip implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Locale.php b/lib/internal/Magento/Framework/Validator/Locale.php
index 78ee4bdbf26e8..bf6022c223422 100644
--- a/lib/internal/Magento/Framework/Validator/Locale.php
+++ b/lib/internal/Magento/Framework/Validator/Locale.php
@@ -10,13 +10,11 @@
 
 /**
  * Locale validator model
- * @since 2.0.0
  */
 class Locale
 {
     /**
      * @var Lists
-     * @since 2.0.0
      */
     protected $lists;
 
@@ -24,7 +22,6 @@ class Locale
      * Constructor
      *
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -38,7 +35,6 @@ public function __construct(Lists $lists)
      * @return bool
      *
      * @api
-     * @since 2.0.0
      */
     public function isValid($localeCode)
     {
diff --git a/lib/internal/Magento/Framework/Validator/NotEmpty.php b/lib/internal/Magento/Framework/Validator/NotEmpty.php
index 5d451d75c2865..f7776066054c8 100644
--- a/lib/internal/Magento/Framework/Validator/NotEmpty.php
+++ b/lib/internal/Magento/Framework/Validator/NotEmpty.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\NotEmpty
  *
- * @since 2.0.0
  */
 class NotEmpty extends \Zend_Validate_NotEmpty implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Regex.php b/lib/internal/Magento/Framework/Validator/Regex.php
index 5ea5df6c5318f..d0b3a5c95a918 100644
--- a/lib/internal/Magento/Framework/Validator/Regex.php
+++ b/lib/internal/Magento/Framework/Validator/Regex.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Validator\Regex
  *
- * @since 2.0.0
  */
 class Regex extends \Zend_Validate_Regex implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/StringLength.php b/lib/internal/Magento/Framework/Validator/StringLength.php
index 3d28f075b4eb5..809eb77546c0a 100644
--- a/lib/internal/Magento/Framework/Validator/StringLength.php
+++ b/lib/internal/Magento/Framework/Validator/StringLength.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\Validator\StringLength
  *
- * @since 2.0.0
  */
 class StringLength extends \Zend_Validate_StringLength implements \Magento\Framework\Validator\ValidatorInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_encoding = 'UTF-8';
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setEncoding($encoding = null)
     {
diff --git a/lib/internal/Magento/Framework/Validator/Timezone.php b/lib/internal/Magento/Framework/Validator/Timezone.php
index 1c2b26821d653..5b6bef9fe97e5 100644
--- a/lib/internal/Magento/Framework/Validator/Timezone.php
+++ b/lib/internal/Magento/Framework/Validator/Timezone.php
@@ -10,13 +10,11 @@
 
 /**
  * Timezone validator model
- * @since 2.0.0
  */
 class Timezone
 {
     /**
      * @var Lists
-     * @since 2.0.0
      */
     protected $lists;
 
@@ -24,7 +22,6 @@ class Timezone
      * Constructor
      *
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -37,7 +34,6 @@ public function __construct(Lists $lists)
      * @param string $timezoneCode
      * @return bool
      * @api
-     * @since 2.0.0
      */
     public function isValid($timezoneCode)
     {
diff --git a/lib/internal/Magento/Framework/Validator/UniversalFactory.php b/lib/internal/Magento/Framework/Validator/UniversalFactory.php
index 1a4f95800b379..c4447b774f199 100644
--- a/lib/internal/Magento/Framework/Validator/UniversalFactory.php
+++ b/lib/internal/Magento/Framework/Validator/UniversalFactory.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Framework\Validator\UniversalFactory
  *
- * @since 2.0.0
  */
 class UniversalFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $arguments
      * @return \Magento\Framework\Validator\Builder
-     * @since 2.0.0
      */
     public function create($className, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/Validator/ValidatorInterface.php b/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
index 7f952626b486c..92fb6395c1e4a 100644
--- a/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 interface ValidatorInterface extends \Zend_Validate_Interface
 {
@@ -18,7 +17,6 @@ interface ValidatorInterface extends \Zend_Validate_Interface
      *
      * @param \Magento\Framework\Translate\AdapterInterface|null $translator
      * @return \Magento\Framework\Validator\ValidatorInterface
-     * @since 2.0.0
      */
     public function setTranslator($translator = null);
 
@@ -26,7 +24,6 @@ public function setTranslator($translator = null);
      * Get translator.
      *
      * @return \Magento\Framework\Translate\AdapterInterface|null
-     * @since 2.0.0
      */
     public function getTranslator();
 
@@ -34,7 +31,6 @@ public function getTranslator();
      * Check that translator is set.
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function hasTranslator();
 }
diff --git a/lib/internal/Magento/Framework/ValidatorFactory.php b/lib/internal/Magento/Framework/ValidatorFactory.php
index 8b2db4635b932..1d53196bbd7f5 100644
--- a/lib/internal/Magento/Framework/ValidatorFactory.php
+++ b/lib/internal/Magento/Framework/ValidatorFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Framework\Validator
- * @since 2.0.0
  */
 class ValidatorFactory
 {
@@ -17,7 +16,6 @@ class ValidatorFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -25,7 +23,6 @@ class ValidatorFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -34,7 +31,6 @@ class ValidatorFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -50,7 +46,6 @@ public function __construct(
      * @param array $data
      * @param string $instanceName
      * @return \Magento\Framework\Validator
-     * @since 2.0.0
      */
     public function create(array $data = [], $instanceName = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/AssetInterface.php b/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
index c70baaece687c..48dd4ddeff769 100644
--- a/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
@@ -9,7 +9,6 @@
  * An abstraction for static view file (or resource) that may be embedded to a web page
  *
  * @api
- * @since 2.0.0
  */
 interface AssetInterface
 {
@@ -17,7 +16,6 @@ interface AssetInterface
      * Retrieve URL pointing to a resource
      *
      * @return string
-     * @since 2.0.0
      */
     public function getUrl();
 
@@ -25,7 +23,6 @@ public function getUrl();
      * Retrieve type of contents
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType();
 
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle.php b/lib/internal/Magento/Framework/View/Asset/Bundle.php
index dde163310f680..695e3921bae41 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle.php
@@ -15,31 +15,26 @@
  * Bundle model
  * @deprecated 2.2.0 since 2.2.0
  * @see \Magento\Deploy\Package\Bundle
- * @since 2.0.0
  */
 class Bundle
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $assets = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $assetsContent = [];
 
     /**
      * @var \Magento\Framework\View\Asset\Bundle\ConfigInterface
-     * @since 2.0.0
      */
     protected $bundleConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $bundleNames = [
         Manager::ASSET_TYPE_JS => 'jsbuild',
@@ -48,13 +43,11 @@ class Bundle
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $content = [];
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     protected $minification;
 
@@ -62,7 +55,6 @@ class Bundle
      * @param Filesystem $filesystem
      * @param Bundle\ConfigInterface $bundleConfig
      * @param Minification $minification
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -77,7 +69,6 @@ public function __construct(
     /**
      * @param LocalInterface $asset
      * @return void
-     * @since 2.0.0
      */
     public function addAsset(LocalInterface $asset)
     {
@@ -90,7 +81,6 @@ public function addAsset(LocalInterface $asset)
      *
      * @param LocalInterface $asset
      * @return void
-     * @since 2.0.0
      */
     protected function add(LocalInterface $asset)
     {
@@ -105,7 +95,6 @@ protected function add(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return void
-     * @since 2.0.0
      */
     protected function init(LocalInterface $asset)
     {
@@ -120,7 +109,6 @@ protected function init(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return string
-     * @since 2.0.0
      */
     protected function getContextCode(LocalInterface $asset)
     {
@@ -132,7 +120,6 @@ protected function getContextCode(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return int
-     * @since 2.0.0
      */
     protected function getPartIndex(LocalInterface $asset)
     {
@@ -157,7 +144,6 @@ protected function getPartIndex(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return int
-     * @since 2.0.0
      */
     protected function getMaxPartSize(LocalInterface $asset)
     {
@@ -170,7 +156,6 @@ protected function getMaxPartSize(LocalInterface $asset)
      * @param LocalInterface $asset
      * @param LocalInterface[] $assets
      * @return float
-     * @since 2.0.0
      */
     protected function getSizePartWithNewAsset(LocalInterface $asset, $assets = [])
     {
@@ -183,7 +168,6 @@ protected function getSizePartWithNewAsset(LocalInterface $asset, $assets = [])
      *
      * @param LocalInterface $asset
      * @return string
-     * @since 2.0.0
      */
     protected function getAssetKey(LocalInterface $asset)
     {
@@ -197,7 +181,6 @@ protected function getAssetKey(LocalInterface $asset)
      *
      * @param LocalInterface[] $assets
      * @return array
-     * @since 2.0.0
      */
     protected function getPartContent($assets)
     {
@@ -222,7 +205,6 @@ protected function getPartContent($assets)
      *
      * @param LocalInterface $asset
      * @return string
-     * @since 2.0.0
      */
     protected function getAssetContent(LocalInterface $asset)
     {
@@ -238,7 +220,6 @@ protected function getAssetContent(LocalInterface $asset)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getInitJs()
     {
@@ -259,7 +240,6 @@ protected function getInitJs()
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function flush()
     {
@@ -274,7 +254,6 @@ public function flush()
     /**
      * @param array $types
      * @return void
-     * @since 2.0.0
      */
     protected function save($types)
     {
@@ -301,7 +280,6 @@ protected function save($types)
      * @param array $parts
      * @param FallbackContext $context
      * @return void
-     * @since 2.0.0
      */
     protected function fillContent($parts, $context)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
index 6f5bf4ebdd119..6cfa40bd2849e 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
@@ -17,7 +17,6 @@
  * Class Config
  * @deprecated 2.2.0 since 2.2.0
  * @see \Magento\Deploy\Config\BundleConfig
- * @since 2.0.0
  */
 class Config implements Bundle\ConfigInterface
 {
@@ -28,34 +27,29 @@ class Config implements Bundle\ConfigInterface
     const VIEW_CONFIG_BUNDLE_SIZE_NAME = 'bundle_size';
     /**#@-*/
 
-    /**
-     * @var ListInterface
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $themeList;
 
     /**
      * @var View\ConfigInterface
-     * @since 2.0.0
      */
     protected $viewConfig;
 
     /**
      * @var ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $themeProvider;
 
     /**
      * @var \Magento\Framework\Config\View[]
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $config = [];
 
     /**
      * @param View\ConfigInterface $viewConfig
      * @param ListInterface $themeList
-     * @since 2.0.0
      */
     public function __construct(
         View\ConfigInterface $viewConfig,
@@ -68,7 +62,6 @@ public function __construct(
     /**
      * @param FallbackContext $assetContext
      * @return bool
-     * @since 2.0.0
      */
     public function isSplit(FallbackContext $assetContext)
     {
@@ -78,7 +71,6 @@ public function isSplit(FallbackContext $assetContext)
     /**
      * @param FallbackContext $assetContext
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     public function getConfig(FallbackContext $assetContext)
     {
@@ -98,7 +90,6 @@ public function getConfig(FallbackContext $assetContext)
     /**
      * @param FallbackContext $assetContext
      * @return int
-     * @since 2.0.0
      */
     public function getPartSize(FallbackContext $assetContext)
     {
@@ -120,7 +111,7 @@ public function getPartSize(FallbackContext $assetContext)
 
     /**
      * @return ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getThemeProvider()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php b/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
index 699b745c9ea5f..e203f84638f22 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
@@ -12,28 +12,24 @@
  * Interface ConfigInterface
  * @deprecated 2.2.0 since 2.2.0
  * @see \Magento\Deploy\Config\BundleConfig
- * @since 2.0.0
  */
 interface ConfigInterface
 {
     /**
      * @param FallbackContext $assetContext
      * @return bool
-     * @since 2.0.0
      */
     public function isSplit(FallbackContext $assetContext);
 
     /**
      * @param FallbackContext $assetContext
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     public function getConfig(FallbackContext $assetContext);
 
     /**
      * @param FallbackContext $assetContext
      * @return false|float|int|string
-     * @since 2.0.0
      */
     public function getPartSize(FallbackContext $assetContext);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
index 539aa60878123..0fffefdd28fd5 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
@@ -17,7 +17,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 2.2.0 since 2.2.0
  * @see \Magento\Deploy\Service\Bundle
- * @since 2.0.0
  */
 class Manager
 {
@@ -31,43 +30,36 @@ class Manager
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var \Magento\Framework\View\Asset\Bundle
-     * @since 2.0.0
      */
     protected $bundle;
 
     /**
      * @var \Magento\Framework\View\Asset\Bundle\ConfigInterface
-     * @since 2.0.0
      */
     protected $bundleConfig;
 
     /**
      * @var \Magento\Framework\View\Asset\ConfigInterface
-     * @since 2.0.0
      */
     protected $assetConfig;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $excluded = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     public static $availableTypes = [self::ASSET_TYPE_JS, self::ASSET_TYPE_HTML];
 
     /**
      * @var Asset\Minification
-     * @since 2.0.0
      */
     private $minification;
 
@@ -77,7 +69,6 @@ class Manager
      * @param Bundle\ConfigInterface $bundleConfig
      * @param Asset\ConfigInterface $assetConfig
      * @param Asset\Minification $minification
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -98,7 +89,6 @@ public function __construct(
      *
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isExcluded(LocalInterface $asset)
     {
@@ -126,7 +116,6 @@ protected function isExcluded(LocalInterface $asset)
      * @param string $directoryPath
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isExcludedDirectory($directoryPath, $asset)
     {
@@ -149,7 +138,6 @@ protected function isExcludedDirectory($directoryPath, $asset)
      * @param string $filePath
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isExcludedFile($filePath, $asset)
     {
@@ -167,7 +155,6 @@ protected function isExcludedFile($filePath, $asset)
      * @param array $filePathInfo
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function compareModules($filePathInfo, $asset)
     {
@@ -185,7 +172,6 @@ protected function compareModules($filePathInfo, $asset)
      *
      * @param string $path
      * @return array|bool
-     * @since 2.0.0
      */
     protected function splitPath($path)
     {
@@ -204,7 +190,6 @@ protected function splitPath($path)
      *
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     public function addAsset(LocalInterface $asset)
     {
@@ -219,7 +204,6 @@ public function addAsset(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isAssetMinification(LocalInterface $asset)
     {
@@ -247,7 +231,6 @@ protected function isAssetMinification(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidAsset(LocalInterface $asset)
     {
@@ -263,7 +246,6 @@ protected function isValidAsset(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return bool
-     * @since 2.0.0
      */
     protected function isValidType(LocalInterface $asset)
     {
@@ -279,7 +261,6 @@ protected function isValidType(LocalInterface $asset)
      * Flush bundle
      *
      * @return void
-     * @since 2.0.0
      */
     public function flush()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Collection.php b/lib/internal/Magento/Framework/View/Asset/Collection.php
index 1de7beba66226..3f40edb3535b1 100644
--- a/lib/internal/Magento/Framework/View/Asset/Collection.php
+++ b/lib/internal/Magento/Framework/View/Asset/Collection.php
@@ -7,7 +7,6 @@
 
 /**
  * List of page asset instances associated with unique identifiers
- * @since 2.0.0
  */
 class Collection
 {
@@ -15,7 +14,6 @@ class Collection
      * Assets
      *
      * @var AssetInterface[]
-     * @since 2.0.0
      */
     protected $assets = [];
 
@@ -25,7 +23,6 @@ class Collection
      * @param string $identifier
      * @param AssetInterface $asset
      * @return void
-     * @since 2.0.0
      */
     public function add($identifier, AssetInterface $asset)
     {
@@ -37,7 +34,6 @@ public function add($identifier, AssetInterface $asset)
      * @param AssetInterface $asset
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function insert($identifier, AssetInterface $asset, $key)
     {
@@ -59,7 +55,6 @@ public function insert($identifier, AssetInterface $asset, $key)
      *
      * @param string $identifier
      * @return bool
-     * @since 2.0.0
      */
     public function has($identifier)
     {
@@ -71,7 +66,6 @@ public function has($identifier)
      *
      * @param string $identifier
      * @return void
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -82,7 +76,6 @@ public function remove($identifier)
      * Retrieve all items in the collection
      *
      * @return AssetInterface[]
-     * @since 2.0.0
      */
     public function getAll()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
index 85acd3e5709bf..2a3d0d3dad467 100644
--- a/lib/internal/Magento/Framework/View/Asset/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
@@ -12,7 +12,6 @@
 
 /**
  * View asset configuration interface
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\View\Asset\ConfigInterface
 {
@@ -38,13 +37,11 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(ScopeConfigInterface $scopeConfig)
     {
@@ -55,7 +52,6 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      * Check whether merging of CSS files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMergeCssFiles()
     {
@@ -69,7 +65,6 @@ public function isMergeCssFiles()
      * Check whether bundling of JavScript files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isBundlingJsFiles()
     {
@@ -83,7 +78,6 @@ public function isBundlingJsFiles()
      * Check whether merging of JavScript files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMergeJsFiles()
     {
@@ -97,7 +91,6 @@ public function isMergeJsFiles()
      * Check whether minify of HTML is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMinifyHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php b/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
index 17c1e0a619a38..21357911e4597 100644
--- a/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
@@ -9,7 +9,6 @@
  * View asset configuration interface
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      * Check whether merging of CSS files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMergeCssFiles();
 
@@ -25,7 +23,6 @@ public function isMergeCssFiles();
      * Check whether merging of JavScript files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMergeJsFiles();
 
@@ -33,7 +30,6 @@ public function isMergeJsFiles();
      * Check whether bundling of JavScript files is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isBundlingJsFiles();
 
@@ -41,7 +37,6 @@ public function isBundlingJsFiles();
      * Check whether minify of HTML is on
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isMinifyHtml();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
index c1eb3b6b32e9e..86daba29e5be8 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
@@ -9,7 +9,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class ContentProcessorException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php b/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
index c5ff026ce874f..bfaa5a8f82eea 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface ContentProcessorInterface
- * @since 2.0.0
  */
 interface ContentProcessorInterface
 {
@@ -23,7 +22,6 @@ interface ContentProcessorInterface
      *
      * @param File $asset
      * @return string
-     * @since 2.0.0
      */
     public function processContent(File $asset);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/ContextInterface.php b/lib/internal/Magento/Framework/View/Asset/ContextInterface.php
index 549578e2b72c9..bccb1921f2026 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContextInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContextInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * An abstraction for getting context path of an asset
- * @since 2.0.0
  */
 interface ContextInterface
 {
@@ -16,7 +15,6 @@ interface ContextInterface
      * Get context path of an asset
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPath();
 
@@ -24,7 +22,6 @@ public function getPath();
      * Get base URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/File.php b/lib/internal/Magento/Framework/View/Asset/File.php
index de1a052b00d36..1e1ad7d642266 100644
--- a/lib/internal/Magento/Framework/View/Asset/File.php
+++ b/lib/internal/Magento/Framework/View/Asset/File.php
@@ -12,49 +12,41 @@
  * This class is a value object with lazy loading of some of its data (content, physical file path)
  *
  * @api
- * @since 2.0.0
  */
 class File implements MergeableInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $filePath;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $module;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $contentType;
 
     /**
      * @var ContextInterface
-     * @since 2.0.0
      */
     protected $context;
 
     /**
      * @var Source
-     * @since 2.0.0
      */
     protected $source;
 
     /**
      * @var string|bool
-     * @since 2.0.0
      */
     private $resolvedFile;
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     private $minification;
 
@@ -71,7 +63,6 @@ class File implements MergeableInterface
      * @param string $module
      * @param string $contentType
      * @param Minification $minification
-     * @since 2.0.0
      */
     public function __construct(
         Source $source,
@@ -91,7 +82,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -100,7 +90,6 @@ public function getUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSourceUrl()
     {
@@ -109,7 +98,6 @@ public function getSourceUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -118,7 +106,6 @@ public function getContentType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPath()
     {
@@ -132,7 +119,6 @@ public function getPath()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRelativeSourceFilePath()
     {
@@ -156,7 +142,6 @@ public function getRelativeSourceFilePath()
      * @param string $path
      * @param string $item
      * @return string
-     * @since 2.0.0
      */
     private function join($path, $item)
     {
@@ -166,7 +151,6 @@ private function join($path, $item)
     /**
      * {@inheritdoc}
      * @throws File\NotFoundException if file cannot be resolved
-     * @since 2.0.0
      */
     public function getSourceFile()
     {
@@ -195,7 +179,6 @@ public function getSourceContentType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -208,7 +191,6 @@ public function getContent()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFilePath()
     {
@@ -218,7 +200,6 @@ public function getFilePath()
     /**
      * {@inheritdoc}
      * @return File\Context
-     * @since 2.0.0
      */
     public function getContext()
     {
@@ -227,7 +208,6 @@ public function getContext()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getModule()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/Context.php b/lib/internal/Magento/Framework/View/Asset/File/Context.php
index a7cdc0b007d53..1909879a1fbee 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/Context.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/Context.php
@@ -10,25 +10,21 @@
 
 /**
  * A basic path context for assets that includes a directory path
- * @since 2.0.0
  */
 class Context implements Asset\ContextInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $baseUrl;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $baseDir;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $path;
 
@@ -36,7 +32,6 @@ class Context implements Asset\ContextInterface
      * @param string $baseUrl
      * @param string $baseDirType
      * @param string $contextPath
-     * @since 2.0.0
      */
     public function __construct($baseUrl, $baseDirType, $contextPath)
     {
@@ -47,7 +42,6 @@ public function __construct($baseUrl, $baseDirType, $contextPath)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPath()
     {
@@ -56,7 +50,6 @@ public function getPath()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -67,7 +60,6 @@ public function getBaseUrl()
      * Get type of base directory
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseDirType()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/ContextFactory.php b/lib/internal/Magento/Framework/View/Asset/File/ContextFactory.php
index 500fa0cfd39b4..cccbe51304eb0 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/ContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/ContextFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * Factory class for @see \Magento\Framework\View\Asset\File\Context
- * @since 2.0.0
  */
 class ContextFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Asset\File\Context
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
index d3f5920dd5131..5f83358336ab6 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
@@ -12,25 +12,21 @@
  * An advanced context that contains information necessary for view files fallback system
  *
  * @api
- * @since 2.0.0
  */
 class FallbackContext extends Context
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $area;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $theme;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $locale;
 
@@ -39,7 +35,6 @@ class FallbackContext extends Context
      * @param string $areaType
      * @param string $themePath
      * @param string $localeCode
-     * @since 2.0.0
      */
     public function __construct($baseUrl, $areaType, $themePath, $localeCode)
     {
@@ -53,7 +48,6 @@ public function __construct($baseUrl, $areaType, $themePath, $localeCode)
      * Get area code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAreaCode()
     {
@@ -64,7 +58,6 @@ public function getAreaCode()
      * Get theme path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThemePath()
     {
@@ -75,7 +68,6 @@ public function getThemePath()
      * Get locale code
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale()
     {
@@ -86,7 +78,6 @@ public function getLocale()
      * Generate path based on the context parameters
      *
      * @return string
-     * @since 2.0.0
      */
     private function generatePath()
     {
@@ -99,7 +90,6 @@ private function generatePath()
      * Returns path to Require.js config object depending on HTTPS or HTTP protocol being used
      *
      * @return string
-     * @since 2.0.0
      */
     public function getConfigPath()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php b/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
index ce72c44598ec0..30d8acf8f9475 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * Factory class for @see \Magento\Framework\View\Asset\File\FallbackContext
- * @since 2.0.0
  */
 class FallbackContextFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Asset\File\FallbackContext
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
index db3e65538120d..93b88834edff9 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
@@ -12,7 +12,6 @@
  * Use this exception when file has not been found
  *
  * @api
- * @since 2.0.0
  */
 class NotFoundException extends \LogicException
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/FileFactory.php b/lib/internal/Magento/Framework/View/Asset/FileFactory.php
index 957465ff1c57b..44b4a847ce18a 100644
--- a/lib/internal/Magento/Framework/View/Asset/FileFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/FileFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * Factory class for \Magento\Framework\View\Asset\File
- * @since 2.0.0
  */
 class FileFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Asset\File
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php b/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
index 4959b796b6a43..a0942599480b4 100644
--- a/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
+++ b/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
@@ -9,7 +9,6 @@
  * List of page assets that combines into groups ones having the same properties
  *
  * @api
- * @since 2.0.0
  */
 class GroupedCollection extends Collection
 {
@@ -22,19 +21,13 @@ class GroupedCollection extends Collection
 
     /**#@-*/
 
-    /**
-     * Property Factory
-     *
-     * @var \Magento\Framework\View\Asset\PropertyGroupFactory
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $propertyFactory;
 
     /**
      * Property Groups
      *
      * @var PropertyGroup[]
-     * @since 2.0.0
      */
     protected $groups = [];
 
@@ -42,7 +35,6 @@ class GroupedCollection extends Collection
      * Constructor
      *
      * @param PropertyGroupFactory $propertyFactory
-     * @since 2.0.0
      */
     public function __construct(PropertyGroupFactory $propertyFactory)
     {
@@ -56,7 +48,6 @@ public function __construct(PropertyGroupFactory $propertyFactory)
      * @param AssetInterface $asset
      * @param array $properties
      * @return void
-     * @since 2.0.0
      */
     public function add($identifier, AssetInterface $asset, array $properties = [])
     {
@@ -70,7 +61,6 @@ public function add($identifier, AssetInterface $asset, array $properties = [])
      * @param AssetInterface $asset
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function insert($identifier, AssetInterface $asset, $key)
     {
@@ -83,7 +73,6 @@ public function insert($identifier, AssetInterface $asset, $key)
      * @param AssetInterface $asset
      * @param array $properties
      * @return array
-     * @since 2.0.0
      */
     public function getFilteredProperties(AssetInterface $asset, $properties = [])
     {
@@ -99,7 +88,6 @@ public function getFilteredProperties(AssetInterface $asset, $properties = [])
      *
      * @param array $properties
      * @return PropertyGroup
-     * @since 2.0.0
      */
     private function getGroupFor(array $properties)
     {
@@ -120,7 +108,6 @@ private function getGroupFor(array $properties)
      *
      * @param string $identifier
      * @return void
-     * @since 2.0.0
      */
     public function remove($identifier)
     {
@@ -138,7 +125,6 @@ public function remove($identifier)
      * Retrieve groups, containing assets that have the same properties
      *
      * @return PropertyGroup[]
-     * @since 2.0.0
      */
     public function getGroups()
     {
@@ -150,7 +136,6 @@ public function getGroups()
      *
      * @param string $contentType
      * @return bool|PropertyGroup
-     * @since 2.0.0
      */
     public function getGroupByContentType($contentType)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/LocalInterface.php b/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
index 1df3416889532..fd7d1ea473ecd 100644
--- a/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface of an asset with locally accessible source file
  * @api
- * @since 2.0.0
  */
 interface LocalInterface extends AssetInterface
 {
@@ -18,7 +17,6 @@ interface LocalInterface extends AssetInterface
      * Returns absolute path to file in local file system
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSourceFile();
 
@@ -26,7 +24,6 @@ public function getSourceFile();
      * Get content of a local asset
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -34,7 +31,6 @@ public function getContent();
      * Get an invariant relative path to file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilePath();
 
@@ -42,7 +38,6 @@ public function getFilePath();
      * Get context of the asset that contains data necessary to build an absolute path or URL to the file
      *
      * @return ContextInterface
-     * @since 2.0.0
      */
     public function getContext();
 
@@ -50,7 +45,6 @@ public function getContext();
      * Get the module context of file path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModule();
 
@@ -60,7 +54,6 @@ public function getModule();
      * This path includes both invariant and context part that can serve as an identifier of the file in current context
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPath();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/LockerProcess.php b/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
index 2eaaa802168c9..87679cfdaaadf 100644
--- a/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
+++ b/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
@@ -14,7 +14,6 @@
 
 /**
  * Class LockerProcess
- * @since 2.0.0
  */
 class LockerProcess implements LockerProcessInterface
 {
@@ -30,25 +29,22 @@ class LockerProcess implements LockerProcessInterface
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $lockFilePath;
 
     /**
      * @var WriteInterface
-     * @since 2.0.0
      */
     private $tmpDirectory;
 
     /**
      * @var State
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $state;
 
@@ -56,7 +52,6 @@ class LockerProcess implements LockerProcessInterface
      * Constructor
      *
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -65,7 +60,6 @@ public function __construct(Filesystem $filesystem)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function lockProcess($lockName)
     {
@@ -86,7 +80,6 @@ public function lockProcess($lockName)
     /**
      * @inheritdoc
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function unlockProcess()
     {
@@ -101,7 +94,6 @@ public function unlockProcess()
      * Check whether generation process has already locked
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isProcessLocked()
     {
@@ -128,7 +120,6 @@ private function isProcessLocked()
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     private function getFilePath($name)
     {
@@ -137,8 +128,8 @@ private function getFilePath($name)
 
     /**
      * @return State
-     * @deprecated 2.2.0
-     * @since 2.2.0
+     * @deprecated 2.1.1
+     * @since 2.1.1
      */
     private function getState()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/LockerProcessInterface.php b/lib/internal/Magento/Framework/View/Asset/LockerProcessInterface.php
index 267326870323d..19f5cc4ad16de 100644
--- a/lib/internal/Magento/Framework/View/Asset/LockerProcessInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/LockerProcessInterface.php
@@ -7,20 +7,17 @@
 
 /**
  * Interface LockerProcessInterface
- * @since 2.0.0
  */
 interface LockerProcessInterface
 {
     /**
      * @param string $lockName
      * @return void
-     * @since 2.0.0
      */
     public function lockProcess($lockName);
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function unlockProcess();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeService.php b/lib/internal/Magento/Framework/View/Asset/MergeService.php
index 496409165ad57..a5820a6d7651b 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeService.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeService.php
@@ -9,7 +9,6 @@
 
 /**
  * Service model responsible for making a decision of whether to use the merged asset in place of original ones
- * @since 2.0.0
  */
 class MergeService
 {
@@ -17,7 +16,6 @@ class MergeService
      * Object Manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class MergeService
      * Config
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $config;
 
@@ -33,7 +30,6 @@ class MergeService
      * Filesystem
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -41,7 +37,6 @@ class MergeService
      * State
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $state;
 
@@ -52,7 +47,6 @@ class MergeService
      * @param ConfigInterface $config
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\App\State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -73,7 +67,6 @@ public function __construct(
      * @param string $contentType
      * @return array|\Iterator
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getMergedAssets(array $assets, $contentType)
     {
@@ -107,7 +100,6 @@ public function getMergedAssets(array $assets, $contentType)
      * Remove all merged js/css files
      *
      * @return void
-     * @since 2.0.0
      */
     public function cleanMergedJsCss()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
index b0040144d4314..b24d483077707 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
@@ -14,19 +14,16 @@
  *
  * Each file will be resolved and its mtime will be checked.
  * Then combination of all mtimes will be compared to a special .dat file that contains mtimes from previous merging
- * @since 2.0.0
  */
 class Checksum implements \Magento\Framework\View\Asset\MergeStrategyInterface
 {
     /**
      * @var \Magento\Framework\View\Asset\MergeStrategyInterface
-     * @since 2.0.0
      */
     protected $strategy;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -39,7 +36,6 @@ class Checksum implements \Magento\Framework\View\Asset\MergeStrategyInterface
     /**
      * @param \Magento\Framework\View\Asset\MergeStrategyInterface $strategy
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\MergeStrategyInterface $strategy,
@@ -64,7 +60,6 @@ private function getAssetSource()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function merge(array $assetsToMerge, \Magento\Framework\View\Asset\LocalInterface $resultAsset)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
index 471c450190897..1e8eb74bf5414 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
@@ -10,7 +10,6 @@
 
 /**
  * The actual merging service
- * @since 2.0.0
  */
 class Direct implements \Magento\Framework\View\Asset\MergeStrategyInterface
 {
@@ -23,22 +22,17 @@ class Direct implements \Magento\Framework\View\Asset\MergeStrategyInterface
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $filesystem;
 
     /**
      * @var \Magento\Framework\View\Url\CssResolver
-     * @since 2.0.0
      */
     private $cssUrlResolver;
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Url\CssResolver $cssUrlResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -50,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function merge(array $assetsToMerge, Asset\LocalInterface $resultAsset)
     {
@@ -69,7 +62,6 @@ public function merge(array $assetsToMerge, Asset\LocalInterface $resultAsset)
      * @param \Magento\Framework\View\Asset\LocalInterface $resultAsset
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     private function composeMergedContent(array $assetsToMerge, Asset\LocalInterface $resultAsset)
     {
@@ -90,7 +82,6 @@ private function composeMergedContent(array $assetsToMerge, Asset\LocalInterface
      * @param Asset\LocalInterface $result
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     private function preProcessBeforeMerging(Asset\LocalInterface $item, Asset\LocalInterface $result, $content)
     {
@@ -108,7 +99,6 @@ private function preProcessBeforeMerging(Asset\LocalInterface $item, Asset\Local
      * @param Asset\LocalInterface $result
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     private function preProcessMergeResult(Asset\LocalInterface $result, $content)
     {
@@ -123,7 +113,6 @@ private function preProcessMergeResult(Asset\LocalInterface $result, $content)
      *
      * @param string $contentType
      * @return string
-     * @since 2.0.0
      */
     protected function _getFilesContentDelimiter($contentType)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/FileExists.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/FileExists.php
index c8f2457bdd108..c62876397b819 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/FileExists.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/FileExists.php
@@ -9,26 +9,22 @@
 
 /**
  * Skip merging if the merged file already exists
- * @since 2.0.0
  */
 class FileExists implements \Magento\Framework\View\Asset\MergeStrategyInterface
 {
     /**
      * @var \Magento\Framework\View\Asset\MergeStrategyInterface
-     * @since 2.0.0
      */
     protected $strategy;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @param \Magento\Framework\View\Asset\MergeStrategyInterface $strategy
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Asset\MergeStrategyInterface $strategy,
@@ -40,7 +36,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function merge(array $assetsToMerge, \Magento\Framework\View\Asset\LocalInterface $resultAsset)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategyInterface.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategyInterface.php
index b9450f63bda43..55b3efc13ac60 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategyInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategyInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for merging multiple assets into one
- * @since 2.0.0
  */
 interface MergeStrategyInterface
 {
@@ -19,7 +18,6 @@ interface MergeStrategyInterface
      * @param MergeableInterface[] $assetsToMerge
      * @param LocalInterface $resultAsset
      * @return void
-     * @since 2.0.0
      */
     public function merge(array $assetsToMerge, LocalInterface $resultAsset);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeableInterface.php b/lib/internal/Magento/Framework/View/Asset/MergeableInterface.php
index 9c84965f0a5b3..185bc7f452c10 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeableInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeableInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface of an asset that can be merged with other assets
- * @since 2.0.0
  */
 interface MergeableInterface extends LocalInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/Merged.php b/lib/internal/Magento/Framework/View/Asset/Merged.php
index eb67266a5c794..5b206b235eb11 100644
--- a/lib/internal/Magento/Framework/View/Asset/Merged.php
+++ b/lib/internal/Magento/Framework/View/Asset/Merged.php
@@ -7,7 +7,6 @@
 
 /**
  * \Iterator that aggregates one or more assets and provides a single public file with equivalent behavior
- * @since 2.0.0
  */
 class Merged implements \Iterator
 {
@@ -18,37 +17,31 @@ class Merged implements \Iterator
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var MergeStrategyInterface
-     * @since 2.0.0
      */
     protected $mergeStrategy;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
     /**
      * @var MergeableInterface[]
-     * @since 2.0.0
      */
     protected $assets;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $contentType;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isInitialized = false;
 
@@ -58,7 +51,6 @@ class Merged implements \Iterator
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param MergeableInterface[] $assets
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -95,7 +87,6 @@ public function __construct(
      * Attempt to merge assets, falling back to original non-merged ones, if merging fails
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initialize()
     {
@@ -116,7 +107,6 @@ protected function initialize()
      *
      * @param array $assets
      * @return MergeableInterface
-     * @since 2.0.0
      */
     private function createMergedAsset(array $assets)
     {
@@ -134,7 +124,6 @@ private function createMergedAsset(array $assets)
      * {@inheritdoc}
      *
      * @return AssetInterface
-     * @since 2.0.0
      */
     public function current()
     {
@@ -144,7 +133,6 @@ public function current()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function key()
     {
@@ -154,7 +142,6 @@ public function key()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function next()
     {
@@ -164,7 +151,6 @@ public function next()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function rewind()
     {
@@ -174,7 +160,6 @@ public function rewind()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -186,7 +171,6 @@ public function valid()
      * Returns directory for storing merged files relative to STATIC_VIEW
      *
      * @return string
-     * @since 2.0.0
      */
     public static function getRelativeDir()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
index be3b308e4c1ef..baca0387ccb96 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minification.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -11,7 +11,6 @@
 /**
  * Helper class for static files minification related processes.
  * @api
- * @since 2.0.0
  */
 class Minification
 {
@@ -24,25 +23,22 @@ class Minification
 
     /**
      * @var ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     private $appState;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $scope;
 
     /**
      * @var array
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $configCache = [];
 
@@ -50,7 +46,6 @@ class Minification
      * @param ScopeConfigInterface $scopeConfig
      * @param State $appState
      * @param string $scope
-     * @since 2.0.0
      */
     public function __construct(ScopeConfigInterface $scopeConfig, State $appState, $scope = 'store')
     {
@@ -64,7 +59,6 @@ public function __construct(ScopeConfigInterface $scopeConfig, State $appState,
      *
      * @param string $contentType
      * @return bool
-     * @since 2.0.0
      */
     public function isEnabled($contentType)
     {
@@ -85,7 +79,6 @@ public function isEnabled($contentType)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     public function addMinifiedSign($filename)
     {
@@ -105,7 +98,6 @@ public function addMinifiedSign($filename)
      *
      * @param string $filename
      * @return string
-     * @since 2.0.0
      */
     public function removeMinifiedSign($filename)
     {
@@ -123,7 +115,6 @@ public function removeMinifiedSign($filename)
     /**
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     public function isMinifiedFilename($filename)
     {
@@ -133,7 +124,6 @@ public function isMinifiedFilename($filename)
     /**
      * @param string $filename
      * @return boolean
-     * @since 2.0.0
      */
     public function isExcluded($filename)
     {
@@ -148,7 +138,6 @@ public function isExcluded($filename)
     /**
      * @param string $contentType
      * @return string[]
-     * @since 2.0.0
      */
     public function getExcludes($contentType)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/NotationResolver/Module.php b/lib/internal/Magento/Framework/View/Asset/NotationResolver/Module.php
index 8ed3499918eb9..222bc931a95e4 100644
--- a/lib/internal/Magento/Framework/View/Asset/NotationResolver/Module.php
+++ b/lib/internal/Magento/Framework/View/Asset/NotationResolver/Module.php
@@ -11,19 +11,16 @@
 
 /**
  * Module notation normalizer
- * @since 2.0.0
  */
 class Module
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
     /**
      * @param Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(Asset\Repository $assetRepo)
     {
@@ -40,7 +37,6 @@ public function __construct(Asset\Repository $assetRepo)
      * @param Asset\LocalInterface $thisAsset
      * @param string $relatedFileId
      * @return string
-     * @since 2.0.0
      */
     public function convertModuleNotationToPath(Asset\LocalInterface $thisAsset, $relatedFileId)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php b/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php
index 2baa2814cb00c..d516922a92a56 100644
--- a/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php
+++ b/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php
@@ -10,7 +10,6 @@
 
 /**
  * Variable resolver to allow specific placeholders in CSS files
- * @since 2.0.0
  */
 class Variable
 {
@@ -26,13 +25,11 @@ class Variable
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     private $assetRepo;
 
     /**
      * @param Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(Asset\Repository $assetRepo)
     {
@@ -44,7 +41,6 @@ public function __construct(Asset\Repository $assetRepo)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function convertVariableNotation($path)
     {
@@ -66,7 +62,6 @@ public function convertVariableNotation($path)
      *
      * @param string $placeholder
      * @return string
-     * @since 2.0.0
      */
     public function getPlaceholderValue($placeholder)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
index 0bcd698f44d32..38f2b220dee6f 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
@@ -16,7 +16,6 @@
  * Class AlternativeSource
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class AlternativeSource implements AlternativeSourceInterface
 {
@@ -27,49 +26,41 @@ class AlternativeSource implements AlternativeSourceInterface
 
     /**
      * @var Helper\SortInterface
-     * @since 2.0.0
      */
     private $sorter;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $alternatives;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $alternativesSorted;
 
     /**
      * @var LockerProcessInterface
-     * @since 2.0.0
      */
     private $lockerProcess;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $lockName;
 
     /**
      * @var AssetBuilder
-     * @since 2.0.0
      */
     private $assetBuilder;
 
     /**
      * @var FilenameResolverInterface
-     * @since 2.0.0
      */
     private $filenameResolver;
 
@@ -83,7 +74,6 @@ class AlternativeSource implements AlternativeSourceInterface
      * @param AssetBuilder $assetBuilder
      * @param string $lockName
      * @param array $alternatives
-     * @since 2.0.0
      */
     public function __construct(
         FilenameResolverInterface $filenameResolver,
@@ -106,7 +96,6 @@ public function __construct(
     /**
      * @inheritdoc
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
@@ -138,7 +127,6 @@ public function process(Chain $chain)
      * @param FallbackContext $context
      * @return string
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     private function processContent($path, $content, $module, FallbackContext $context)
     {
@@ -176,7 +164,6 @@ private function processContent($path, $content, $module, FallbackContext $conte
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function getAlternativesExtensionsNames()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource/AssetBuilder.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource/AssetBuilder.php
index 0edf3e6c24594..5de5201b8d489 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource/AssetBuilder.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource/AssetBuilder.php
@@ -10,43 +10,36 @@
 
 /**
  * Class AssetBuilder
- * @since 2.0.0
  */
 class AssetBuilder
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $area;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $theme;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $locale;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $module;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $path;
 
     /**
      * @var Repository
-     * @since 2.0.0
      */
     private $repository;
 
@@ -54,7 +47,6 @@ class AssetBuilder
      * Constructor
      *
      * @param Repository $repository
-     * @since 2.0.0
      */
     public function __construct(Repository $repository)
     {
@@ -66,7 +58,6 @@ public function __construct(Repository $repository)
      *
      * @param string $area
      * @return $this
-     * @since 2.0.0
      */
     public function setArea($area)
     {
@@ -79,7 +70,6 @@ public function setArea($area)
      *
      * @param string $theme
      * @return $this
-     * @since 2.0.0
      */
     public function setTheme($theme)
     {
@@ -92,7 +82,6 @@ public function setTheme($theme)
      *
      * @param string $locale
      * @return $this
-     * @since 2.0.0
      */
     public function setLocale($locale)
     {
@@ -105,7 +94,6 @@ public function setLocale($locale)
      *
      * @param string $module
      * @return $this
-     * @since 2.0.0
      */
     public function setModule($module)
     {
@@ -118,7 +106,6 @@ public function setModule($module)
      *
      * @param string $path
      * @return $this
-     * @since 2.0.0
      */
     public function setPath($path)
     {
@@ -128,7 +115,6 @@ public function setPath($path)
 
     /**
      * @return File
-     * @since 2.0.0
      */
     public function build()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
index 46382de5d8935..750c77e651dff 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
@@ -11,7 +11,6 @@
  * Interface AlternativeSourceInterface
  *
  * @api
- * @since 2.0.0
  */
 interface AlternativeSourceInterface extends PreProcessorInterface
 {
@@ -19,7 +18,6 @@ interface AlternativeSourceInterface extends PreProcessorInterface
      * Get extensions names of alternatives
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAlternativesExtensionsNames();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
index 3a3b88cd857d6..c2f2cead735dc 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
@@ -13,7 +13,6 @@
  * Encapsulates complexity of all necessary context and parameters
  *
  * @api
- * @since 2.0.0
  */
 class Chain
 {
@@ -25,49 +24,41 @@ class Chain
 
     /**
      * @var LocalInterface
-     * @since 2.0.0
      */
     private $asset;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $origContent;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $origContentType;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $content;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $contentType;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $targetContentType;
 
     /**
      * @var null|string
-     * @since 2.0.0
      */
     protected $targetAssetPath;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $origAssetPath;
 
@@ -77,7 +68,6 @@ class Chain
      * @param string $origContentType
      * @param string $origAssetPath
      * @param array $compatibleTypes
-     * @since 2.0.0
      */
     public function __construct(
         LocalInterface $asset,
@@ -101,7 +91,6 @@ public function __construct(
      * Get asset object
      *
      * @return LocalInterface
-     * @since 2.0.0
      */
     public function getAsset()
     {
@@ -112,7 +101,6 @@ public function getAsset()
      * Get original content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrigContent()
     {
@@ -123,7 +111,6 @@ public function getOrigContent()
      * Get current content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -135,7 +122,6 @@ public function getContent()
      *
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function setContent($content)
     {
@@ -146,7 +132,6 @@ public function setContent($content)
      * Get original content type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOrigContentType()
     {
@@ -157,7 +142,6 @@ public function getOrigContentType()
      * Get current content type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -169,7 +153,6 @@ public function getContentType()
      *
      * @param string $contentType
      * @return void
-     * @since 2.0.0
      */
     public function setContentType($contentType)
     {
@@ -180,7 +163,6 @@ public function setContentType($contentType)
      * Get the intended content type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTargetContentType()
     {
@@ -191,7 +173,6 @@ public function getTargetContentType()
      * Get the target asset path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTargetAssetPath()
     {
@@ -205,7 +186,6 @@ public function getTargetAssetPath()
      *
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function assertValid()
     {
@@ -221,7 +201,6 @@ public function assertValid()
      * Whether the contents or type have changed during the lifetime of the object
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isChanged()
     {
@@ -231,7 +210,6 @@ public function isChanged()
     /**
      * @return string
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function getOrigAssetPath()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
index 3f752b545ba0e..51957cdf4c789 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
@@ -11,7 +11,6 @@
  * Factory for @see \Magento\Framework\View\Asset\PreProcessor\Chain
  * @codeCoverageIgnore
  * @api
- * @since 2.0.0
  */
 class ChainFactory implements ChainFactoryInterface
 {
@@ -19,13 +18,11 @@ class ChainFactory implements ChainFactoryInterface
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
index ab6eb4b37469e..d81bc69158db9 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
@@ -9,7 +9,6 @@
  * Interface ChainFactoryInterface
  *
  * @api
- * @since 2.0.0
  */
 interface ChainFactoryInterface
 {
@@ -18,7 +17,6 @@ interface ChainFactoryInterface
      *
      * @param array $arguments
      * @return Chain
-     * @since 2.0.0
      */
     public function create(array $arguments = []);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/FilenameResolverInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/FilenameResolverInterface.php
index b028937247cfc..c91ff74b094f3 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/FilenameResolverInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/FilenameResolverInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface FilenameResolverInterface
- * @since 2.0.0
  */
 interface FilenameResolverInterface
 {
@@ -16,7 +15,6 @@ interface FilenameResolverInterface
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function resolve($path);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/Sort.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/Sort.php
index 35f7cc57b6c83..e363d71fa7f9e 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/Sort.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/Sort.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Sort
- * @since 2.0.0
  */
 class Sort implements SortInterface
 {
@@ -23,19 +22,16 @@ class Sort implements SortInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $result;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $array;
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function sort(array $array)
     {
@@ -61,7 +57,6 @@ public function sort(array $array)
     /**
      * @param array $structure
      * @return void
-     * @since 2.0.0
      */
     private function fillResult(array $structure)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/SortInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/SortInterface.php
index e67495882ec12..084cbdd03ece8 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/SortInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Helper/SortInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface SortInterface
- * @since 2.0.0
  */
 interface SortInterface
 {
@@ -19,7 +18,6 @@ interface SortInterface
      * ]
      * @param array $array
      * @return array
-     * @since 2.0.0
      */
     public function sort(array $array);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
index 60f7c5d6a1824..313f2daa80bcd 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
@@ -9,7 +9,6 @@
 
 /**
  * Class MinificationFilenameResolver
- * @since 2.0.0
  */
 class MinificationFilenameResolver implements FilenameResolverInterface
 {
@@ -20,7 +19,6 @@ class MinificationFilenameResolver implements FilenameResolverInterface
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     private $minification;
 
@@ -28,7 +26,6 @@ class MinificationFilenameResolver implements FilenameResolverInterface
      * Constructor
      *
      * @param Minification $minification
-     * @since 2.0.0
      */
     public function __construct(Minification $minification)
     {
@@ -40,7 +37,6 @@ public function __construct(Minification $minification)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function resolve($path)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
index e44b2aa85279c..c447285bc692b 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
@@ -12,26 +12,22 @@
 
 /**
  * Assets minification pre-processor
- * @since 2.0.0
  */
 class Minify implements PreProcessorInterface
 {
     /**
      * @var AdapterInterface
-     * @since 2.0.0
      */
     protected $adapter;
 
     /**
      * @var Minification
-     * @since 2.0.0
      */
     protected $minification;
 
     /**
      * @param AdapterInterface $adapter
      * @param Minification $minification
-     * @since 2.0.0
      */
     public function __construct(AdapterInterface $adapter, Minification $minification)
     {
@@ -44,7 +40,6 @@ public function __construct(AdapterInterface $adapter, Minification $minificatio
      *
      * @param PreProcessor\Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(PreProcessor\Chain $chain)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ModuleNotation.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ModuleNotation.php
index 6c34e205b9c3c..088248d7675cf 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ModuleNotation.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ModuleNotation.php
@@ -17,26 +17,22 @@
  * based off the current location of CSS-file. So context of base path can be known ONLY at the moment
  * of traversing the CSS contents in context of the file location.
  * Other than that, the algorithm of resolving notation "Module_Name::file/path.ext" is generic
- * @since 2.0.0
  */
 class ModuleNotation implements Asset\PreProcessorInterface
 {
     /**
      * @var \Magento\Framework\View\Url\CssResolver
-     * @since 2.0.0
      */
     private $cssResolver;
 
     /**
      * @var \Magento\Framework\View\Asset\NotationResolver\Module
-     * @since 2.0.0
      */
     private $notationResolver;
 
     /**
      * @param CssResolver $cssResolver
      * @param \Magento\Framework\View\Asset\NotationResolver\Module $notationResolver
-     * @since 2.0.0
      */
     public function __construct(
         CssResolver $cssResolver,
@@ -48,7 +44,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Passthrough.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Passthrough.php
index cc33d69dad9a5..50584a8e9bda5 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Passthrough.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Passthrough.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Passthrough
- * @since 2.0.0
  */
 class Passthrough implements PreProcessorInterface
 {
@@ -19,7 +18,6 @@ class Passthrough implements PreProcessorInterface
      *
      * @param Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Pool.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Pool.php
index 8a854cd7b1fe0..c3212b0f06b14 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Pool.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Pool.php
@@ -11,7 +11,6 @@
 
 /**
  * A registry of asset preprocessors (not to confuse with the "Registry" pattern)
- * @since 2.0.0
  */
 class Pool
 {
@@ -22,31 +21,26 @@ class Pool
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $preprocessors;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $instances;
 
     /**
      * @var Helper\SortInterface
-     * @since 2.0.0
      */
     private $sorter;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $defaultPreprocessor;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -57,7 +51,6 @@ class Pool
      * @param Helper\SortInterface $sorter
      * @param string $defaultPreprocessor
      * @param array $preprocessors
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -76,7 +69,6 @@ public function __construct(
      *
      * @param Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
@@ -92,7 +84,6 @@ public function process(Chain $chain)
      * @param string $type
      * @return PreProcessorInterface[]
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     private function getPreProcessors($type)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/VariableNotation.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/VariableNotation.php
index bfe94d61d51a8..c605e8e164de5 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/VariableNotation.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/VariableNotation.php
@@ -14,19 +14,16 @@
  * Support of notation "{{variable}}" in CSS-files
  *
  * Used to replace placeholder variables (such as {{base_url_path}}) with dynamic values.
- * @since 2.0.0
  */
 class VariableNotation implements Asset\PreProcessorInterface
 {
     /**
      * @var \Magento\Framework\View\Url\CssResolver
-     * @since 2.0.0
      */
     private $cssResolver;
 
     /**
      * @var NotationResolver\Variable
-     * @since 2.0.0
      */
     private $notationResolver;
 
@@ -35,7 +32,6 @@ class VariableNotation implements Asset\PreProcessorInterface
      *
      * @param CssResolver $cssResolver
      * @param NotationResolver\Variable $notationResolver
-     * @since 2.0.0
      */
     public function __construct(
         CssResolver $cssResolver,
@@ -47,7 +43,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function process(Chain $chain)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
index bec1835538e63..419b6cd8f612f 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
@@ -9,7 +9,6 @@
  * An interface for "preprocessing" asset contents
  *
  * @api
- * @since 2.0.0
  */
 interface PreProcessorInterface
 {
@@ -18,7 +17,6 @@ interface PreProcessorInterface
      *
      * @param PreProcessor\Chain $chain
      * @return void
-     * @since 2.0.0
      */
     public function process(PreProcessor\Chain $chain);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
index 2b0e8e2617567..ad86dfca47a25 100644
--- a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
+++ b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
@@ -7,7 +7,6 @@
 
 /**
  * Association of arbitrary properties with a list of page assets
- * @since 2.0.0
  */
 class PropertyGroup extends Collection
 {
@@ -15,7 +14,6 @@ class PropertyGroup extends Collection
      * Properties
      *
      * @var array
-     * @since 2.0.0
      */
     protected $properties = [];
 
@@ -23,7 +21,6 @@ class PropertyGroup extends Collection
      * Constructor
      *
      * @param array $properties
-     * @since 2.0.0
      */
     public function __construct(array $properties)
     {
@@ -34,7 +31,6 @@ public function __construct(array $properties)
      * Retrieve values of all properties
      *
      * @return array
-     * @since 2.0.0
      */
     public function getProperties()
     {
@@ -46,7 +42,6 @@ public function getProperties()
      *
      * @param string $name
      * @return mixed
-     * @since 2.0.0
      */
     public function getProperty($name)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PropertyGroupFactory.php b/lib/internal/Magento/Framework/View/Asset/PropertyGroupFactory.php
index 9cf38c85980b2..43b44a13c521f 100644
--- a/lib/internal/Magento/Framework/View/Asset/PropertyGroupFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/PropertyGroupFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Property group factory
- * @since 2.0.0
  */
 class PropertyGroupFactory
 {
@@ -15,7 +14,6 @@ class PropertyGroupFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class PropertyGroupFactory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return Collection
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Remote.php b/lib/internal/Magento/Framework/View/Asset/Remote.php
index 082383e5fbf49..d62b4a23eeb1d 100644
--- a/lib/internal/Magento/Framework/View/Asset/Remote.php
+++ b/lib/internal/Magento/Framework/View/Asset/Remote.php
@@ -7,7 +7,6 @@
 
 /**
  * Page asset residing outside of the local file system
- * @since 2.0.0
  */
 class Remote implements AssetInterface
 {
@@ -15,7 +14,6 @@ class Remote implements AssetInterface
      * URL
      *
      * @var string
-     * @since 2.0.0
      */
     protected $url;
 
@@ -23,7 +21,6 @@ class Remote implements AssetInterface
      * Content type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $contentType;
 
@@ -32,7 +29,6 @@ class Remote implements AssetInterface
      *
      * @param string $url
      * @param string $contentType
-     * @since 2.0.0
      */
     public function __construct($url, $contentType = 'unknown')
     {
@@ -42,7 +38,6 @@ public function __construct($url, $contentType = 'unknown')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUrl()
     {
@@ -51,7 +46,6 @@ public function getUrl()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getContentType()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/RemoteFactory.php b/lib/internal/Magento/Framework/View/Asset/RemoteFactory.php
index 7bd2dbe7787c2..bbe9e1b4cff0e 100644
--- a/lib/internal/Magento/Framework/View/Asset/RemoteFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/RemoteFactory.php
@@ -9,19 +9,16 @@
 
 /**
  * Factory class for \Magento\Framework\View\Asset\Remote
- * @since 2.0.0
  */
 class RemoteFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Asset\Remote
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php
index 9d4308c4f9bd5..385f46ec3ee32 100644
--- a/lib/internal/Magento/Framework/View/Asset/Repository.php
+++ b/lib/internal/Magento/Framework/View/Asset/Repository.php
@@ -16,7 +16,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Repository
 {
@@ -27,74 +26,63 @@ class Repository
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     private $baseUrl;
 
     /**
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     private $design;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     private $themeList;
 
     /**
      * @var \Magento\Framework\View\Asset\Source
-     * @since 2.0.0
      */
     private $assetSource;
 
     /**
      * @var \Magento\Framework\View\Asset\ContextInterface[]
-     * @since 2.0.0
      */
     private $fallbackContext;
 
     /**
      * @var \Magento\Framework\View\Asset\ContextInterface[]
-     * @since 2.0.0
      */
     private $fileContext;
 
     /**
      * @var null|array
-     * @since 2.0.0
      */
     private $defaults = null;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     private $fileFactory;
 
     /**
      * @var File\FallbackContextFactory
-     * @since 2.0.0
      */
     private $fallbackContextFactory;
 
     /**
      * @var File\ContextFactory
-     * @since 2.0.0
      */
     private $contextFactory;
 
     /**
      * @var RemoteFactory
-     * @since 2.0.0
      */
     private $remoteFactory;
 
     /**
      * @var ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $themeProvider;
 
@@ -108,7 +96,6 @@ class Repository
      * @param File\FallbackContextFactory $fallbackContextFactory
      * @param File\ContextFactory $contextFactory
      * @param RemoteFactory $remoteFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\UrlInterface $baseUrl,
@@ -140,7 +127,6 @@ public function __construct(
      * @return $this
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function updateDesignParams(array &$params)
     {
@@ -183,7 +169,7 @@ public function updateDesignParams(array &$params)
 
     /**
      * @return ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getThemeProvider()
     {
@@ -199,7 +185,6 @@ private function getThemeProvider()
      *
      * @param string $name
      * @return mixed
-     * @since 2.0.0
      */
     private function getDefaultParameter($name)
     {
@@ -213,7 +198,6 @@ private function getDefaultParameter($name)
      * @param string $fileId
      * @param array $params
      * @return File
-     * @since 2.0.0
      */
     public function createAsset($fileId, array $params = [])
     {
@@ -254,7 +238,6 @@ public function createAsset($fileId, array $params = [])
      * Get current context for static view files
      *
      * @return \Magento\Framework\View\Asset\File\FallbackContext
-     * @since 2.0.0
      */
     public function getStaticViewFileContext()
     {
@@ -282,7 +265,6 @@ public function getStaticViewFileContext()
      * @param string $themePath
      * @param string $locale
      * @return \Magento\Framework\View\Asset\File\FallbackContext
-     * @since 2.0.0
      */
     private function getFallbackContext($urlType, $isSecure, $area, $themePath, $locale)
     {
@@ -309,7 +291,6 @@ private function getFallbackContext($urlType, $isSecure, $area, $themePath, $loc
      * @param string $fileId
      * @param LocalInterface $similarTo
      * @return File
-     * @since 2.0.0
      */
     public function createSimilar($fileId, LocalInterface $similarTo)
     {
@@ -339,7 +320,6 @@ public function createSimilar($fileId, LocalInterface $similarTo)
      * @param string $baseDirType
      * @param string $baseUrlType
      * @return File
-     * @since 2.0.0
      */
     public function createArbitrary(
         $filePath,
@@ -369,7 +349,6 @@ public function createArbitrary(
      * @param string $urlType
      * @param string $dirPath
      * @return \Magento\Framework\View\Asset\File\Context
-     * @since 2.0.0
      */
     private function getFileContext($baseDirType, $urlType, $dirPath)
     {
@@ -389,7 +368,6 @@ private function getFileContext($baseDirType, $urlType, $dirPath)
      * @param string $fileId
      * @param LocalInterface $relativeTo
      * @return File
-     * @since 2.0.0
      */
     public function createRelated($fileId, LocalInterface $relativeTo)
     {
@@ -408,7 +386,6 @@ public function createRelated($fileId, LocalInterface $relativeTo)
      * @param string $contentType
      * @return Remote
      * @codeCoverageIgnore
-     * @since 2.0.0
      */
     public function createRemoteAsset($url, $contentType)
     {
@@ -420,7 +397,6 @@ public function createRemoteAsset($url, $contentType)
      *
      * @param string $fileId
      * @return string
-     * @since 2.0.0
      */
     public function getUrl($fileId)
     {
@@ -437,7 +413,6 @@ public function getUrl($fileId)
      * @param array $params
      * @return string
      * @see getUrl()
-     * @since 2.0.0
      */
     public function getUrlWithParams($fileId, array $params)
     {
@@ -451,7 +426,6 @@ public function getUrlWithParams($fileId, array $params)
      * @param string $fileId
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public static function extractModule($fileId)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php
index 603a884985546..d9d4b519eeec9 100644
--- a/lib/internal/Magento/Framework/View/Asset/Source.php
+++ b/lib/internal/Magento/Framework/View/Asset/Source.php
@@ -17,19 +17,16 @@
  * A service for preprocessing content of assets
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Source
 {
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $rootDir;
 
@@ -41,26 +38,22 @@ class Source
 
     /**
      * @var \Magento\Framework\View\Asset\PreProcessor\Pool
-     * @since 2.0.0
      */
     private $preProcessorPool;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile
-     * @since 2.0.0
      */
     protected $fallback;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 2.2.0
-     * @since 2.0.0
+     * @deprecated 2.1.1
      */
     private $themeList;
 
     /**
      * @var ChainFactoryInterface
-     * @since 2.0.0
      */
     private $chainFactory;
 
@@ -72,7 +65,7 @@ class Source
 
     /**
      * @var ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private $themeProvider;
 
@@ -85,7 +78,6 @@ class Source
      * @param \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile $fallback
      * @param \Magento\Framework\View\Design\Theme\ListInterface $themeList
      * @param ChainFactoryInterface $chainFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -110,7 +102,6 @@ public function __construct(
      *
      * @param LocalInterface $asset
      * @return bool|string
-     * @since 2.0.0
      */
     public function getFile(LocalInterface $asset)
     {
@@ -127,7 +118,6 @@ public function getFile(LocalInterface $asset)
      *
      * @param LocalInterface $asset
      * @return bool|string
-     * @since 2.0.0
      */
     public function getContent(LocalInterface $asset)
     {
@@ -150,7 +140,6 @@ public function getContent(LocalInterface $asset)
      *
      * @param LocalInterface $asset
      * @return array|bool
-     * @since 2.0.0
      */
     private function preProcess(LocalInterface $asset)
     {
@@ -192,7 +181,6 @@ public function getSourceContentType(LocalInterface $asset)
     /**
      * @param LocalInterface $asset
      * @return bool|string
-     * @since 2.0.0
      */
     public function findSource(LocalInterface $asset)
     {
@@ -204,7 +192,6 @@ public function findSource(LocalInterface $asset)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function getContentType($path)
     {
@@ -217,7 +204,6 @@ public function getContentType($path)
      * @param LocalInterface $asset
      * @return bool|string
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function findSourceFile(LocalInterface $asset)
     {
@@ -239,7 +225,6 @@ private function findSourceFile(LocalInterface $asset)
      * @param LocalInterface $asset
      * @param \Magento\Framework\View\Asset\File\FallbackContext $context
      * @return bool|string
-     * @since 2.0.0
      */
     private function findFileThroughFallback(
         LocalInterface $asset,
@@ -260,7 +245,7 @@ private function findFileThroughFallback(
 
     /**
      * @return ThemeProviderInterface
-     * @since 2.2.0
+     * @since 2.1.1
      */
     private function getThemeProvider()
     {
@@ -277,7 +262,6 @@ private function getThemeProvider()
      * @param LocalInterface $asset
      * @param \Magento\Framework\View\Asset\File\Context $context
      * @return string
-     * @since 2.0.0
      */
     private function findFile(LocalInterface $asset, \Magento\Framework\View\Asset\File\Context $context)
     {
@@ -292,7 +276,6 @@ private function findFile(LocalInterface $asset, \Magento\Framework\View\Asset\F
      * @return bool|string
      * @deprecated 2.1.0 If custom vendor directory is outside Magento root,
      * then this method will return unexpected result.
-     * @since 2.0.0
      */
     public function findRelativeSourceFilePath(LocalInterface $asset)
     {
@@ -310,7 +293,6 @@ public function findRelativeSourceFilePath(LocalInterface $asset)
      * @param string|bool $dir
      * @param string|bool $path
      * @return PreProcessor\Chain
-     * @since 2.0.0
      */
     private function createChain(LocalInterface $asset, $dir, $path)
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorInterface.php b/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorInterface.php
index 09efc3b2c66ef..ca1e822e3d8cf 100644
--- a/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorInterface.php
@@ -11,7 +11,6 @@
  * Interface SourceFileGenerator
  *
  * @package Magento\Framework\View\Asset
- * @since 2.0.0
  */
 interface SourceFileGeneratorInterface
 {
@@ -19,7 +18,6 @@ interface SourceFileGeneratorInterface
      * @param Chain $chain
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function generateFileTree(Chain $chain);
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorPool.php b/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorPool.php
index 64416ae904b7e..4fe371da7ef80 100644
--- a/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorPool.php
+++ b/lib/internal/Magento/Framework/View/Asset/SourceFileGeneratorPool.php
@@ -10,7 +10,6 @@
  * Class SourceFileGeneratorFactory
  *
  * @package Magento\Framework\View\Asset
- * @since 2.0.0
  */
 class SourceFileGeneratorPool
 {
@@ -18,7 +17,6 @@ class SourceFileGeneratorPool
      * Renderer Types
      *
      * @var array
-     * @since 2.0.0
      */
     private $fileGeneratorTypes;
 
@@ -26,7 +24,6 @@ class SourceFileGeneratorPool
      * Factory constructor
      *
      * @param SourceFileGeneratorInterface[] $fileGeneratorTypes
-     * @since 2.0.0
      */
     public function __construct(array $fileGeneratorTypes = [])
     {
@@ -39,7 +36,6 @@ public function __construct(array $fileGeneratorTypes = [])
      * @param string $generatorType
      *
      * @return SourceFileGeneratorInterface
-     * @since 2.0.0
      */
     public function create($generatorType)
     {
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index 10ee74f4e7a55..c50af9d5bbc5f 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -10,14 +10,12 @@
 
 /**
  * Class BlockPool
- * @since 2.0.0
  */
 class BlockPool
 {
     /**
      * Block factory
      * @var \Magento\Framework\View\Element\BlockFactory
-     * @since 2.0.0
      */
     protected $blockFactory;
 
@@ -25,7 +23,6 @@ class BlockPool
      * Blocks
      *
      * @var array
-     * @since 2.0.0
      */
     protected $blocks = [];
 
@@ -33,7 +30,6 @@ class BlockPool
      * Constructor
      *
      * @param BlockFactory $blockFactory
-     * @since 2.0.0
      */
     public function __construct(BlockFactory $blockFactory)
     {
@@ -48,7 +44,6 @@ public function __construct(BlockFactory $blockFactory)
      * @param array $arguments [optional]
      * @return BlockPool
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function add($name, $class, array $arguments = [])
     {
@@ -70,7 +65,6 @@ public function add($name, $class, array $arguments = [])
      *
      * @param string $name
      * @return BlockInterface|null
-     * @since 2.0.0
      */
     public function get($name = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Config.php b/lib/internal/Magento/Framework/View/Config.php
index 9c3bd0bdfb6cb..9b334b7e9b84d 100644
--- a/lib/internal/Magento/Framework/View/Config.php
+++ b/lib/internal/Magento/Framework/View/Config.php
@@ -10,7 +10,6 @@
 
 /**
  * Handles theme view.xml files
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\View\ConfigInterface
 {
@@ -18,7 +17,6 @@ class Config implements \Magento\Framework\View\ConfigInterface
      * List of view configuration objects per theme
      *
      * @var array
-     * @since 2.0.0
      */
     protected $viewConfigs = [];
 
@@ -26,7 +24,6 @@ class Config implements \Magento\Framework\View\ConfigInterface
      * View service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
@@ -34,7 +31,6 @@ class Config implements \Magento\Framework\View\ConfigInterface
      * File view factory
      *
      * @var \Magento\Framework\Config\ViewFactory
-     * @since 2.0.0
      */
     protected $viewConfigFactory;
 
@@ -43,7 +39,6 @@ class Config implements \Magento\Framework\View\ConfigInterface
      *
      * @param Asset\Repository $assetRepo
      * @param \Magento\Framework\Config\ViewFactory $viewConfigFactory
-     * @since 2.0.0
      */
     public function __construct(
         Repository $assetRepo,
@@ -58,7 +53,6 @@ public function __construct(
      *
      * @param array $params
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     public function getViewConfig(array $params = [])
     {
diff --git a/lib/internal/Magento/Framework/View/ConfigInterface.php b/lib/internal/Magento/Framework/View/ConfigInterface.php
index 785c3ebebec14..1b81f10f49d5a 100644
--- a/lib/internal/Magento/Framework/View/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/ConfigInterface.php
@@ -9,7 +9,6 @@
  * Config Interface
  *
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -23,7 +22,6 @@ interface ConfigInterface
      *
      * @param array $params
      * @return \Magento\Framework\Config\View
-     * @since 2.0.0
      */
     public function getViewConfig(array $params = []);
 }
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 0a4ecfed943c7..0c3932ffe4bd7 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -27,7 +27,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class Context
 {
@@ -35,7 +34,6 @@ class Context
      * Request
      *
      * @var Request
-     * @since 2.0.0
      */
     protected $request;
 
@@ -43,14 +41,12 @@ class Context
      * Event manager
      *
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * URL builder
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -58,7 +54,6 @@ class Context
      * Translator
      *
      * @var \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     protected $translator;
 
@@ -66,7 +61,6 @@ class Context
      * Cache
      *
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -74,7 +68,6 @@ class Context
      * Design
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $design;
 
@@ -82,7 +75,6 @@ class Context
      * Session
      *
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $session;
 
@@ -90,7 +82,6 @@ class Context
      * Store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -98,7 +89,6 @@ class Context
      * Front controller
      *
      * @var FrontControllerInterface
-     * @since 2.0.0
      */
     protected $frontController;
 
@@ -106,7 +96,6 @@ class Context
      * Layout
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -114,7 +103,6 @@ class Context
      * View config model
      *
      * @var \Magento\Framework\View\Config
-     * @since 2.0.0
      */
     protected $viewConfig;
 
@@ -122,7 +110,6 @@ class Context
      * Cache state
      *
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     protected $cacheState;
 
@@ -130,7 +117,6 @@ class Context
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -138,7 +124,6 @@ class Context
      * Application state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -163,7 +148,6 @@ class Context
      * @todo reduce parameter number
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         Request $request,
@@ -201,7 +185,6 @@ public function __construct(
      * Retrieve cache
      *
      * @return \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     public function getCache()
     {
@@ -212,7 +195,6 @@ public function getCache()
      * Retrieve design package
      *
      * @return \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     public function getDesignPackage()
     {
@@ -223,7 +205,6 @@ public function getDesignPackage()
      * Retrieve event manager
      *
      * @return ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -234,7 +215,6 @@ public function getEventManager()
      * Retrieve front controller
      *
      * @return FrontControllerInterface
-     * @since 2.0.0
      */
     public function getFrontController()
     {
@@ -245,7 +225,6 @@ public function getFrontController()
      * Retrieve layout
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -256,7 +235,6 @@ public function getLayout()
      * Retrieve request
      *
      * @return Request
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -267,7 +245,6 @@ public function getRequest()
      * Retrieve session
      *
      * @return \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -278,7 +255,6 @@ public function getSession()
      * Retrieve scope config
      *
      * @return \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     public function getScopeConfig()
     {
@@ -289,7 +265,6 @@ public function getScopeConfig()
      * Retrieve translator
      *
      * @return \Magento\Framework\TranslateInterface
-     * @since 2.0.0
      */
     public function getTranslator()
     {
@@ -300,7 +275,6 @@ public function getTranslator()
      * Retrieve URL builder
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function getUrlBuilder()
     {
@@ -311,7 +285,6 @@ public function getUrlBuilder()
      * Retrieve view config
      *
      * @return \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     public function getViewConfig()
     {
@@ -322,7 +295,6 @@ public function getViewConfig()
      * Retrieve cache state
      *
      * @return \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     public function getCacheState()
     {
@@ -333,7 +305,6 @@ public function getCacheState()
      * Retrieve logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -344,7 +315,6 @@ public function getLogger()
      * Retrieve layout area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -355,7 +325,6 @@ public function getArea()
      * Retrieve the module name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModuleName()
     {
@@ -368,7 +337,6 @@ public function getModuleName()
      * @return string
      *
      * @todo alias of getModuleName
-     * @since 2.0.0
      */
     public function getFrontName()
     {
@@ -379,7 +347,6 @@ public function getFrontName()
      * Retrieve the controller name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getControllerName()
     {
@@ -390,7 +357,6 @@ public function getControllerName()
      * Retrieve the action name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getActionName()
     {
@@ -401,7 +367,6 @@ public function getActionName()
      * Retrieve the full action name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullActionName()
     {
@@ -412,7 +377,6 @@ public function getFullActionName()
      * Retrieve acceptance type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAcceptType()
     {
@@ -435,7 +399,6 @@ public function getAcceptType()
      * @param string $key
      * @param mixed $default Default value to use if key not found
      * @return mixed|null if key does not exist
-     * @since 2.0.0
      */
     public function getPost($key = null, $default = null)
     {
@@ -448,7 +411,6 @@ public function getPost($key = null, $default = null)
      * @param string|null $key
      * @param mixed $default Default value to use if key not found
      * @return mixed alias of getPost
-     * @since 2.0.0
      */
     public function getQuery($key = null, $default = null)
     {
@@ -461,7 +423,6 @@ public function getQuery($key = null, $default = null)
      * @param string|null $key
      * @param mixed $default Default value to use if key not found
      * @return mixed
-     * @since 2.0.0
      */
     public function getParam($key = null, $default = null)
     {
@@ -472,7 +433,6 @@ public function getParam($key = null, $default = null)
      * Retrieve an array of parameters
      *
      * @return array
-     * @since 2.0.0
      */
     public function getParams()
     {
@@ -484,7 +444,6 @@ public function getParams()
      *
      * @param string $header
      * @return string|false HTTP header value, or false if not found
-     * @since 2.0.0
      */
     public function getHeader($header)
     {
@@ -495,7 +454,6 @@ public function getHeader($header)
      * Return the raw body of the request, if present
      *
      * @return string|false Raw body, or false if not present
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -506,7 +464,6 @@ public function getContent()
      * Retrieve application state
      *
      * @return \Magento\Framework\App\State
-     * @since 2.0.0
      */
     public function getAppState()
     {
@@ -519,7 +476,6 @@ public function getAppState()
      * @param Design\ThemeInterface $theme
      * @return Design\ThemeInterface
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function getPhysicalTheme(Design\ThemeInterface $theme)
     {
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index f701f44d284c6..24bdb6639981b 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -9,7 +9,6 @@
 
 /**
  * Class DataSourcePool
- * @since 2.0.0
  */
 class DataSourcePool
 {
@@ -17,7 +16,6 @@ class DataSourcePool
      * Block factory
      *
      * @var \Magento\Framework\View\Element\BlockFactory
-     * @since 2.0.0
      */
     protected $blockFactory;
 
@@ -25,7 +23,6 @@ class DataSourcePool
      * Data sources
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dataSources = [];
 
@@ -33,7 +30,6 @@ class DataSourcePool
      * Assignments
      *
      * @var array
-     * @since 2.0.0
      */
     protected $assignments = [];
 
@@ -41,7 +37,6 @@ class DataSourcePool
      * Constructors
      *
      * @param BlockFactory $blockFactory
-     * @since 2.0.0
      */
     public function __construct(BlockFactory $blockFactory)
     {
@@ -55,7 +50,6 @@ public function __construct(BlockFactory $blockFactory)
      * @param string $class
      * @return object
      * @throws \Exception
-     * @since 2.0.0
      */
     public function add($name, $class)
     {
@@ -79,7 +73,6 @@ public function add($name, $class)
      *
      * @param string|null $name
      * @return array|object|null
-     * @since 2.0.0
      */
     public function get($name = null)
     {
@@ -97,7 +90,6 @@ public function get($name = null)
      * @param string $namespace
      * @param string $alias
      * @return void
-     * @since 2.0.0
      */
     public function assign($dataName, $namespace, $alias)
     {
@@ -112,7 +104,6 @@ public function assign($dataName, $namespace, $alias)
      *
      * @param string $namespace
      * @return array
-     * @since 2.0.0
      */
     public function getNamespaceData($namespace)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Composite.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Composite.php
index 8a88a4acd197a..635353dad3fb9 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Composite.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Composite.php
@@ -9,7 +9,6 @@
  * Composite Rules
  *
  * Composite rule that represents sequence of child fallback rules
- * @since 2.0.0
  */
 class Composite implements RuleInterface
 {
@@ -17,7 +16,6 @@ class Composite implements RuleInterface
      * Rules
      *
      * @var RuleInterface[]
-     * @since 2.0.0
      */
     protected $rules = [];
 
@@ -26,7 +24,6 @@ class Composite implements RuleInterface
      *
      * @param RuleInterface[] $rules
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(array $rules)
     {
@@ -43,7 +40,6 @@ public function __construct(array $rules)
      *
      * @param array $params
      * @return array
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitch.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitch.php
index e051cb048b60b..81bb266c980a4 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitch.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitch.php
@@ -9,7 +9,6 @@
  * Modular Switch
  *
  * Fallback rule that delegates execution to either modular or non-modular sub-rule depending on input parameters.
- * @since 2.0.0
  */
 class ModularSwitch implements RuleInterface
 {
@@ -17,7 +16,6 @@ class ModularSwitch implements RuleInterface
      * Rule non-modular
      *
      * @var RuleInterface
-     * @since 2.0.0
      */
     protected $ruleNonModular;
 
@@ -25,7 +23,6 @@ class ModularSwitch implements RuleInterface
      * Rule modular
      *
      * @var RuleInterface
-     * @since 2.0.0
      */
     protected $ruleModular;
 
@@ -34,7 +31,6 @@ class ModularSwitch implements RuleInterface
      *
      * @param RuleInterface $ruleNonModular
      * @param RuleInterface $ruleModular
-     * @since 2.0.0
      */
     public function __construct(RuleInterface $ruleNonModular, RuleInterface $ruleModular)
     {
@@ -47,7 +43,6 @@ public function __construct(RuleInterface $ruleNonModular, RuleInterface $ruleMo
      *
      * @param array $params
      * @return array
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitchFactory.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitchFactory.php
index 0d423a59d8d53..2002ca5a09a5a 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitchFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModularSwitchFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Design\Fallback\Rule\ModularSwitchFactory
  *
- * @since 2.0.0
  */
 class ModularSwitchFactory
 {
@@ -18,7 +17,6 @@ class ModularSwitchFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -26,7 +24,6 @@ class ModularSwitchFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Fallback\Rule\Simple
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Module.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Module.php
index 5f985952d618f..6258679b31783 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Module.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Module.php
@@ -12,7 +12,6 @@
  * Fallback Rule Module
  *
  * Propagates all parameters necessary for modular rule
- * @since 2.0.0
  */
 class Module implements RuleInterface
 {
@@ -20,7 +19,6 @@ class Module implements RuleInterface
      * Rule
      *
      * @var RuleInterface
-     * @since 2.0.0
      */
     protected $rule;
 
@@ -28,7 +26,6 @@ class Module implements RuleInterface
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -37,7 +34,6 @@ class Module implements RuleInterface
      *
      * @param RuleInterface $rule
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(RuleInterface $rule, ComponentRegistrarInterface $componentRegistrar)
     {
@@ -51,7 +47,6 @@ public function __construct(RuleInterface $rule, ComponentRegistrarInterface $co
      * @param array $params
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModuleFactory.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModuleFactory.php
index ba931c6a3cb28..5a98bda3d8ffd 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModuleFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ModuleFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Design\Fallback\Rule\ModuleFactory
  *
- * @since 2.0.0
  */
 class ModuleFactory
 {
@@ -18,7 +17,6 @@ class ModuleFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -26,7 +24,6 @@ class ModuleFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Fallback\Rule\Simple
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/RuleInterface.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/RuleInterface.php
index a6dca9c704b04..4cb6801187010 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/RuleInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/RuleInterface.php
@@ -9,7 +9,6 @@
  * Rule Interface
  *
  * Interface for search path resolution during fallback process
- * @since 2.0.0
  */
 interface RuleInterface
 {
@@ -18,7 +17,6 @@ interface RuleInterface
      *
      * @param array $params Values to substitute placeholders with
      * @return array folders to perform a search
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
index 2964eb534d2a2..f4a2164e8bb48 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
@@ -11,7 +11,6 @@
 
 /**
  * Class with simple substitution parameters to values
- * @since 2.0.0
  */
 class Simple implements RuleInterface
 {
@@ -19,7 +18,6 @@ class Simple implements RuleInterface
      * Optional params for rule
      *
      * @var array
-     * @since 2.0.0
      */
     protected $optionalParams;
 
@@ -27,7 +25,6 @@ class Simple implements RuleInterface
      * Pattern for a simple rule
      *
      * @var string
-     * @since 2.0.0
      */
     protected $pattern;
 
@@ -36,7 +33,6 @@ class Simple implements RuleInterface
      *
      * @param string $pattern
      * @param array $optionalParams
-     * @since 2.0.0
      */
     public function __construct(
         $pattern,
@@ -52,7 +48,6 @@ public function __construct(
      * @param array $params array of parameters
      * @return array folders to perform a search
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/SimpleFactory.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/SimpleFactory.php
index 7d086f83571bf..82a1ec4b744f1 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/SimpleFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/SimpleFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\View\Design\Fallback\Rule\SimpleFactory
  *
- * @since 2.0.0
  */
 class SimpleFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Fallback\Rule\Simple
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
index 7475b2d6098a3..5dcdf02307d90 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
@@ -15,7 +15,6 @@
  * Fallback Rule Theme
  *
  * An aggregate of a fallback rule that propagates it to every theme according to a hierarchy
- * @since 2.0.0
  */
 class Theme implements RuleInterface
 {
@@ -23,7 +22,6 @@ class Theme implements RuleInterface
      * Rule
      *
      * @var RuleInterface
-     * @since 2.0.0
      */
     protected $rule;
 
@@ -31,7 +29,6 @@ class Theme implements RuleInterface
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -46,7 +43,6 @@ class Theme implements RuleInterface
      *
      * @param RuleInterface $rule
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(RuleInterface $rule, ComponentRegistrarInterface $componentRegistrar)
     {
@@ -60,7 +56,6 @@ public function __construct(RuleInterface $rule, ComponentRegistrarInterface $co
      * @param array $params
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getPatternDirs(array $params)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ThemeFactory.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ThemeFactory.php
index 60f33146c8f40..7e48ffb5878e5 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ThemeFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/ThemeFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\View\Design\Fallback\Rule\ThemeFactory
  *
- * @since 2.0.0
  */
 class ThemeFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Fallback\Rule\Theme
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php b/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
index 0f70b26c7459c..4a13ef60cb598 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
@@ -14,7 +14,6 @@
  * Fallback Factory
  *
  * Factory that produces all sorts of fallback rules
- * @since 2.0.0
  */
 class RulePool
 {
@@ -28,19 +27,13 @@ class RulePool
     const TYPE_EMAIL_TEMPLATE = 'email';
     /**#@-*/
 
-    /**
-     * File system
-     *
-     * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $filesystem;
 
     /**
      * Rules
      *
      * @var array
-     * @since 2.0.0
      */
     private $rules = [];
 
@@ -48,7 +41,6 @@ class RulePool
      * Factory for simple rule
      *
      * @var \Magento\Framework\View\Design\Fallback\Rule\SimpleFactory
-     * @since 2.0.0
      */
     private $simpleFactory;
 
@@ -56,7 +48,6 @@ class RulePool
      * Factory for theme rule
      *
      * @var Rule\ThemeFactory
-     * @since 2.0.0
      */
     private $themeFactory;
 
@@ -64,7 +55,6 @@ class RulePool
      * Factory for modular switcher
      *
      * @var Rule\ModularSwitchFactory
-     * @since 2.0.0
      */
     private $modularSwitchFactory;
 
@@ -72,7 +62,6 @@ class RulePool
      * Factory for module rule
      *
      * @var Rule\ModuleFactory
-     * @since 2.0.0
      */
     private $moduleFactory;
 
@@ -84,7 +73,6 @@ class RulePool
      * @param Rule\ThemeFactory $themeFactory
      * @param Rule\ModuleFactory $moduleFactory
      * @param Rule\ModularSwitchFactory $modularSwitchFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -104,7 +92,6 @@ public function __construct(
      * Retrieve newly created fallback rule for locale files, such as CSV translation maps
      *
      * @return RuleInterface
-     * @since 2.0.0
      */
     protected function createLocaleFileRule()
     {
@@ -117,7 +104,6 @@ protected function createLocaleFileRule()
      * Retrieve newly created fallback rule for template files
      *
      * @return RuleInterface
-     * @since 2.0.0
      */
     protected function createTemplateFileRule()
     {
@@ -146,7 +132,6 @@ protected function createTemplateFileRule()
      * Retrieve newly created fallback rule for dynamic view files
      *
      * @return RuleInterface
-     * @since 2.0.0
      */
     protected function createFileRule()
     {
@@ -174,7 +159,6 @@ protected function createFileRule()
      * Retrieve newly created fallback rule for static view files, such as CSS, JavaScript, images, etc.
      *
      * @return RuleInterface
-     * @since 2.0.0
      */
     protected function createViewFileRule()
     {
@@ -255,7 +239,6 @@ protected function createViewFileRule()
      * Emails are only loaded in a modular context, so a non-modular rule is not specified.
      *
      * @return RuleInterface
-     * @since 2.0.0
      */
     protected function createEmailTemplateFileRule()
     {
@@ -280,7 +263,6 @@ protected function createEmailTemplateFileRule()
      * @param string $type
      * @return RuleInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getRule($type)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/EmailTemplateFile.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/EmailTemplateFile.php
index 3036dc98f1ced..d59aaee098bad 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/EmailTemplateFile.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/EmailTemplateFile.php
@@ -10,13 +10,11 @@
 
 /**
  * Model that finds file paths by their fileId
- * @since 2.0.0
  */
 class EmailTemplateFile
 {
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple
-     * @since 2.0.0
      */
     protected $resolver;
 
@@ -24,7 +22,6 @@ class EmailTemplateFile
      * Constructor
      *
      * @param \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple $resolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple $resolver
@@ -41,7 +38,6 @@ public function __construct(
      * @param string $file
      * @param string|null $module
      * @return bool|string
-     * @since 2.0.0
      */
     public function getFile($area, ThemeInterface $themeModel, $locale, $file, $module = null)
     {
@@ -52,7 +48,6 @@ public function getFile($area, ThemeInterface $themeModel, $locale, $file, $modu
      * Get fallback type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getFallbackType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/File.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/File.php
index 5935f44ed2037..388269c57506c 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/File.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/File.php
@@ -10,13 +10,11 @@
 
 /**
  * Provider of dynamic view files
- * @since 2.0.0
  */
 class File
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     private $resolver;
 
@@ -24,7 +22,6 @@ class File
      * Constructor
      *
      * @param ResolverInterface $resolver
-     * @since 2.0.0
      */
     public function __construct(ResolverInterface $resolver)
     {
@@ -39,7 +36,6 @@ public function __construct(ResolverInterface $resolver)
      * @param string $file
      * @param string|null $module
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($area, ThemeInterface $themeModel, $file, $module = null)
     {
@@ -48,7 +44,6 @@ public function getFile($area, ThemeInterface $themeModel, $file, $module = null
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getFallbackType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/LocaleFile.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/LocaleFile.php
index 2a9e8e5ee60f2..9d1e8ddad20c0 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/LocaleFile.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/LocaleFile.php
@@ -10,13 +10,11 @@
 
 /**
  * Provider of localized view files
- * @since 2.0.0
  */
 class LocaleFile
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     private $resolver;
 
@@ -24,7 +22,6 @@ class LocaleFile
      * Constructor
      *
      * @param ResolverInterface $resolver
-     * @since 2.0.0
      */
     public function __construct(ResolverInterface $resolver)
     {
@@ -39,7 +36,6 @@ public function __construct(ResolverInterface $resolver)
      * @param string $locale
      * @param string $file
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($area, ThemeInterface $themeModel, $locale, $file)
     {
@@ -48,7 +44,6 @@ public function getFile($area, ThemeInterface $themeModel, $locale, $file)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getFallbackType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
index 91792e674bc8b..0d4975b9eaff8 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
@@ -12,13 +12,11 @@
 
 /**
  * Resolver for view files with support of alternative extensions map
- * @since 2.0.0
  */
 class Alternative extends Simple
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $alternativeExtensions;
 
@@ -28,7 +26,6 @@ class Alternative extends Simple
      * @param ReadFactory $readFactory
      * @param \Magento\Framework\View\Design\Fallback\RulePool $rulePool
      * @param array $alternativeExtensions
-     * @since 2.0.0
      */
     public function __construct(
         ReadFactory $readFactory,
@@ -49,7 +46,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolveFile(RuleInterface $fallbackRule, $file, array $params = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Minification.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Minification.php
index a2f1c5dd103da..746aa46753a3d 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Minification.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Minification.php
@@ -11,32 +11,27 @@
 
 /**
  * Resolver for minified asset, when minified is requested but not found
- * @since 2.0.0
  */
 class Minification implements ResolverInterface
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     protected $fallback;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $extensions;
 
     /**
      * @var AssetMinification
-     * @since 2.0.0
      */
     private $minification;
 
     /**
      * @param ResolverInterface $fallback
      * @param AssetMinification $minification
-     * @since 2.0.0
      */
     public function __construct(ResolverInterface $fallback, AssetMinification $minification)
     {
@@ -54,7 +49,6 @@ public function __construct(ResolverInterface $fallback, AssetMinification $mini
      * @param string|null $locale
      * @param string|null $module
      * @return string|false
-     * @since 2.0.0
      */
     public function resolve($type, $file, $area = null, ThemeInterface $theme = null, $locale = null, $module = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
index 0f23db2f892ef..89305251e6058 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
@@ -16,7 +16,6 @@
 
 /**
  * Resolver for view files
- * @since 2.0.0
  */
 class Simple implements Fallback\ResolverInterface
 {
@@ -32,7 +31,6 @@ class Simple implements Fallback\ResolverInterface
      * Fallback factory
      *
      * @var RulePool
-     * @since 2.0.0
      */
     protected $rulePool;
 
@@ -45,7 +43,6 @@ class Simple implements Fallback\ResolverInterface
     /**
      * @param ReadFactory $readFactory
      * @param RulePool $rulePool
-     * @since 2.0.0
      */
     public function __construct(ReadFactory $readFactory, RulePool $rulePool)
     {
@@ -55,7 +52,6 @@ public function __construct(ReadFactory $readFactory, RulePool $rulePool)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function resolve($type, $file, $area = null, ThemeInterface $theme = null, $locale = null, $module = null)
     {
@@ -80,7 +76,6 @@ public function resolve($type, $file, $area = null, ThemeInterface $theme = null
      * @param string $filePath
      * @throws \InvalidArgumentException
      * @return void
-     * @since 2.0.0
      */
     public static function assertFilePathFormat($filePath)
     {
@@ -125,7 +120,6 @@ private function checkFilePathAccess($fileName, $filePath)
      * @param string $file
      * @param array $params
      * @return string|bool
-     * @since 2.0.0
      */
     protected function resolveFile(RuleInterface $fallbackRule, $file, array $params = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/ResolverInterface.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/ResolverInterface.php
index 18c0ffa293c18..0a7ccb3468c37 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/ResolverInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * Interface for resolvers of view files using fallback rules
- * @since 2.0.0
  */
 interface ResolverInterface
 {
@@ -25,7 +24,6 @@ interface ResolverInterface
      * @param string|null $locale
      * @param string|null $module
      * @return string|bool
-     * @since 2.0.0
      */
     public function resolve($type, $file, $area = null, ThemeInterface $theme = null, $locale = null, $module = null);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/StaticFile.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/StaticFile.php
index ee1da744a2c6f..7571c992c4e5d 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/StaticFile.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/StaticFile.php
@@ -10,13 +10,11 @@
 
 /**
  * Provider of static view files
- * @since 2.0.0
  */
 class StaticFile
 {
     /**
      * @var ResolverInterface
-     * @since 2.0.0
      */
     private $resolver;
 
@@ -24,7 +22,6 @@ class StaticFile
      * Constructor
      *
      * @param ResolverInterface $resolver
-     * @since 2.0.0
      */
     public function __construct(ResolverInterface $resolver)
     {
@@ -40,7 +37,6 @@ public function __construct(ResolverInterface $resolver)
      * @param string $file
      * @param string|null $module
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($area, ThemeInterface $themeModel, $locale, $file, $module = null)
     {
@@ -49,7 +45,6 @@ public function getFile($area, ThemeInterface $themeModel, $locale, $file, $modu
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getFallbackType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
index 5abcd9e91bdae..8150b386eddef 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
@@ -13,25 +13,21 @@
 
 /**
  * Provider of template view files
- * @since 2.0.0
  */
 class TemplateFile extends File
 {
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var MinifierInterface
-     * @since 2.0.0
      */
     protected $templateMinifier;
 
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $assetConfig;
 
@@ -40,7 +36,6 @@ class TemplateFile extends File
      * @param MinifierInterface $templateMinifier
      * @param State $appState
      * @param ConfigInterface $assetConfig
-     * @since 2.0.0
      */
     public function __construct(
         ResolverInterface $resolver,
@@ -56,7 +51,6 @@ public function __construct(
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getFallbackType()
     {
@@ -71,7 +65,6 @@ protected function getFallbackType()
      * @param string $file
      * @param string|null $module
      * @return string|bool
-     * @since 2.0.0
      */
     public function getFile($area, ThemeInterface $themeModel, $file, $module = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization.php
index b3883cec72647..4ba20465f10e7 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme customizations manager
- * @since 2.0.0
  */
 class Customization implements CustomizationInterface
 {
@@ -15,7 +14,6 @@ class Customization implements CustomizationInterface
      * File provider
      *
      * @var \Magento\Framework\View\Design\Theme\FileProviderInterface
-     * @since 2.0.0
      */
     protected $fileProvider;
 
@@ -23,7 +21,6 @@ class Customization implements CustomizationInterface
      * Theme customization path
      *
      * @var \Magento\Framework\View\Design\Theme\Customization\Path
-     * @since 2.0.0
      */
     protected $customizationPath;
 
@@ -31,7 +28,6 @@ class Customization implements CustomizationInterface
      * Theme
      *
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected $theme;
 
@@ -39,7 +35,6 @@ class Customization implements CustomizationInterface
      * Theme files
      *
      * @var \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     protected $themeFiles;
 
@@ -47,7 +42,6 @@ class Customization implements CustomizationInterface
      * Theme files by type
      *
      * @var \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     protected $themeFilesByType = [];
 
@@ -57,7 +51,6 @@ class Customization implements CustomizationInterface
      * @param \Magento\Framework\View\Design\Theme\FileProviderInterface $fileProvider
      * @param \Magento\Framework\View\Design\Theme\Customization\Path $customizationPath
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\Theme\FileProviderInterface $fileProvider,
@@ -73,7 +66,6 @@ public function __construct(
      * Retrieve list of files which belong to a theme
      *
      * @return \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     public function getFiles()
     {
@@ -88,7 +80,6 @@ public function getFiles()
      *
      * @param string $type
      * @return \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     public function getFilesByType($type)
     {
@@ -103,7 +94,6 @@ public function getFilesByType($type)
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface[] $files
      * @return array
-     * @since 2.0.0
      */
     public function generateFileInfo(array $files)
     {
@@ -121,7 +111,6 @@ public function generateFileInfo(array $files)
      * Returns customization absolute path
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getCustomizationPath()
     {
@@ -132,7 +121,6 @@ public function getCustomizationPath()
      * Get directory where themes files are stored
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getThemeFilesPath()
     {
@@ -147,7 +135,6 @@ public function getThemeFilesPath()
      * Get path to custom view configuration file
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getCustomViewConfigPath()
     {
@@ -160,7 +147,6 @@ public function getCustomViewConfigPath()
      * @param string $type
      * @param array $sequence
      * @return $this|CustomizationInterface
-     * @since 2.0.0
      */
     public function reorder($type, array $sequence)
     {
@@ -184,7 +170,6 @@ public function reorder($type, array $sequence)
      *
      * @param array $fileIds
      * @return $this
-     * @since 2.0.0
      */
     public function delete(array $fileIds)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/AbstractFile.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/AbstractFile.php
index 584c9e42790e1..d5c4288768b08 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/AbstractFile.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/AbstractFile.php
@@ -9,7 +9,6 @@
 
 /**
  * Theme file service abstract class
- * @since 2.0.0
  */
 abstract class AbstractFile implements
     \Magento\Framework\View\Design\Theme\Customization\FileInterface,
@@ -19,7 +18,6 @@ abstract class AbstractFile implements
      * Customization path
      *
      * @var \Magento\Framework\View\Design\Theme\Customization\Path
-     * @since 2.0.0
      */
     protected $_customizationPath;
 
@@ -27,7 +25,6 @@ abstract class AbstractFile implements
      * File factory
      *
      * @var \Magento\Framework\View\Design\Theme\FileFactory
-     * @since 2.0.0
      */
     protected $_fileFactory;
 
@@ -35,7 +32,6 @@ abstract class AbstractFile implements
      * File system
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -45,7 +41,6 @@ abstract class AbstractFile implements
      * @param \Magento\Framework\View\Design\Theme\Customization\Path $customizationPath
      * @param \Magento\Framework\View\Design\Theme\FileFactory $fileFactory
      * @param \Magento\Framework\Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\Theme\Customization\Path $customizationPath,
@@ -61,7 +56,6 @@ public function __construct(
      * Create class instance with specified parameters
      *
      * @return \Magento\Framework\View\Design\Theme\FileInterface
-     * @since 2.0.0
      */
     public function create()
     {
@@ -75,7 +69,6 @@ public function create()
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return string
-     * @since 2.0.0
      */
     public function getFullPath(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -88,7 +81,6 @@ public function getFullPath(\Magento\Framework\View\Design\Theme\FileInterface $
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function prepareFile(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -106,7 +98,6 @@ public function prepareFile(\Magento\Framework\View\Design\Theme\FileInterface $
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -119,7 +110,6 @@ public function save(\Magento\Framework\View\Design\Theme\FileInterface $file)
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -132,7 +122,6 @@ public function delete(\Magento\Framework\View\Design\Theme\FileInterface $file)
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFileName(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -155,7 +144,6 @@ protected function _prepareFileName(\Magento\Framework\View\Design\Theme\FileInt
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareFilePath(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -167,7 +155,6 @@ protected function _prepareFilePath(\Magento\Framework\View\Design\Theme\FileInt
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return void
-     * @since 2.0.0
      */
     protected function _prepareSortOrder(\Magento\Framework\View\Design\Theme\FileInterface $file)
     {
@@ -188,7 +175,6 @@ protected function _prepareSortOrder(\Magento\Framework\View\Design\Theme\FileIn
      * @param string $filePath
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     protected function _saveFileContent($filePath, $content)
     {
@@ -203,7 +189,6 @@ protected function _saveFileContent($filePath, $content)
      *
      * @param string $filePath
      * @return void
-     * @since 2.0.0
      */
     protected function _deleteFileContent($filePath)
     {
@@ -217,7 +202,6 @@ protected function _deleteFileContent($filePath)
      * Returns filesystem directory instance for write operations
      *
      * @return \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected function getDirectoryWrite()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/ConfigInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/ConfigInterface.php
index cbf3ad0de0b99..d6e6b6a8508b8 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme customization configuration interface
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -15,7 +14,6 @@ interface ConfigInterface
      * Get customization file types
      *
      * @return array Mappings of customization file types to its classes
-     * @since 2.0.0
      */
     public function getFileTypes();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Css.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Css.php
index 6b4abdcce4a55..cff75f3b2c27c 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Css.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Css.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme CSS file service class
- * @since 2.0.0
  */
 class Css extends \Magento\Framework\View\Design\Theme\Customization\AbstractFile
 {
@@ -24,7 +23,6 @@ class Css extends \Magento\Framework\View\Design\Theme\Customization\AbstractFil
      * Get type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -35,7 +33,6 @@ public function getType()
      * Get content type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Js.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Js.php
index 9fa45ba19dd1b..866a00d5b7174 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Js.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/File/Js.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme JS file service class
- * @since 2.0.0
  */
 class Js extends \Magento\Framework\View\Design\Theme\Customization\AbstractFile
 {
@@ -24,7 +23,6 @@ class Js extends \Magento\Framework\View\Design\Theme\Customization\AbstractFile
      * Get type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -35,7 +33,6 @@ public function getType()
      * Get content type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileAssetInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileAssetInterface.php
index f816fbb07d843..9ba6002e6a11d 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileAssetInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileAssetInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme asset file interface
- * @since 2.0.0
  */
 interface FileAssetInterface
 {
@@ -15,7 +14,6 @@ interface FileAssetInterface
      * Get content type of file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileInterface.php
index 072e5728033c8..89fe485ecf7ed 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme service file interface
- * @since 2.0.0
  */
 interface FileInterface
 {
@@ -15,7 +14,6 @@ interface FileInterface
      * Get type of file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 
@@ -24,7 +22,6 @@ public function getType();
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return string
-     * @since 2.0.0
      */
     public function getFullPath(\Magento\Framework\View\Design\Theme\FileInterface $file);
 
@@ -32,7 +29,6 @@ public function getFullPath(\Magento\Framework\View\Design\Theme\FileInterface $
      * Creates new custom file and binds to concrete service model
      *
      * @return \Magento\Framework\View\Design\Theme\FileInterface
-     * @since 2.0.0
      */
     public function create();
 
@@ -41,7 +37,6 @@ public function create();
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function save(\Magento\Framework\View\Design\Theme\FileInterface $file);
 
@@ -50,7 +45,6 @@ public function save(\Magento\Framework\View\Design\Theme\FileInterface $file);
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function delete(\Magento\Framework\View\Design\Theme\FileInterface $file);
 
@@ -59,7 +53,6 @@ public function delete(\Magento\Framework\View\Design\Theme\FileInterface $file)
      *
      * @param \Magento\Framework\View\Design\Theme\FileInterface $file
      * @return $this
-     * @since 2.0.0
      */
     public function prepareFile(\Magento\Framework\View\Design\Theme\FileInterface $file);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileServiceFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileServiceFactory.php
index 82e5bfba6166f..9e39e80012913 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileServiceFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/FileServiceFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme customization files factory
- * @since 2.0.0
  */
 class FileServiceFactory
 {
@@ -15,7 +14,6 @@ class FileServiceFactory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -24,7 +22,6 @@ class FileServiceFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigInterface $config
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, ConfigInterface $config)
     {
@@ -39,7 +36,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Framework\View\Design\Theme\Customization\FileInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($type, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Customization/Path.php b/lib/internal/Magento/Framework/View/Design/Theme/Customization/Path.php
index 8fb8a1afca449..7645021c95e0c 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Customization/Path.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Customization/Path.php
@@ -11,7 +11,6 @@
 
 /**
  * Theme Customization Path
- * @since 2.0.0
  */
 class Path
 {
@@ -24,7 +23,6 @@ class Path
      * File name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $filename;
 
@@ -32,7 +30,6 @@ class Path
      * File system
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -40,7 +37,6 @@ class Path
      * Media directory read
      *
      * @var \Magento\Framework\Filesystem\Directory\Read
-     * @since 2.0.0
      */
     protected $mediaDirectoryRead;
 
@@ -48,7 +44,6 @@ class Path
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -58,7 +53,6 @@ class Path
      * @param \Magento\Framework\Filesystem $filesystem
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param string $filename
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -76,7 +70,6 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomizationPath(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
@@ -92,7 +85,6 @@ public function getCustomizationPath(\Magento\Framework\View\Design\ThemeInterfa
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return string|null
-     * @since 2.0.0
      */
     public function getThemeFilesPath(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
@@ -108,7 +100,6 @@ public function getThemeFilesPath(\Magento\Framework\View\Design\ThemeInterface
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return string|null
-     * @since 2.0.0
      */
     public function getCustomViewConfigPath(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/CustomizationInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/CustomizationInterface.php
index 70e5e34fa26a5..33cca00b08147 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/CustomizationInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/CustomizationInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme customization interface
- * @since 2.0.0
  */
 interface CustomizationInterface
 {
@@ -15,7 +14,6 @@ interface CustomizationInterface
      * Retrieve list of files which belong to a theme
      *
      * @return \Magento\Framework\View\Design\Theme\Customization\FileInterface[]
-     * @since 2.0.0
      */
     public function getFiles();
 
@@ -24,7 +22,6 @@ public function getFiles();
      *
      * @param string $type
      * @return \Magento\Framework\View\Design\Theme\Customization\FileInterface[]
-     * @since 2.0.0
      */
     public function getFilesByType($type);
 
@@ -32,7 +29,6 @@ public function getFilesByType($type);
      * Returns customization absolute path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomizationPath();
 
@@ -40,7 +36,6 @@ public function getCustomizationPath();
      * Get directory where themes files are stored
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThemeFilesPath();
 
@@ -48,7 +43,6 @@ public function getThemeFilesPath();
      * Get path to custom view configuration file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCustomViewConfigPath();
 
@@ -58,7 +52,6 @@ public function getCustomViewConfigPath();
      * @param string $type
      * @param array $sequence
      * @return CustomizationInterface
-     * @since 2.0.0
      */
     public function reorder($type, array $sequence);
 
@@ -67,7 +60,6 @@ public function reorder($type, array $sequence);
      *
      * @param array $fileIds
      * @return $this
-     * @since 2.0.0
      */
     public function delete(array $fileIds);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Domain/Factory.php b/lib/internal/Magento/Framework/View/Design/Theme/Domain/Factory.php
index a0cd53b699d38..ac7ff5017d990 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Domain/Factory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Domain/Factory.php
@@ -9,7 +9,6 @@
 
 /**
  * Theme domain model class factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -17,7 +16,6 @@ class Factory
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -25,7 +23,6 @@ class Factory
      * Types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_types = [
         ThemeInterface::TYPE_PHYSICAL => \Magento\Framework\View\Design\Theme\Domain\PhysicalInterface::class,
@@ -37,7 +34,6 @@ class Factory
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -50,7 +46,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param ThemeInterface $theme
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function create(ThemeInterface $theme)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Domain/PhysicalInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Domain/PhysicalInterface.php
index ac099dcbc23d5..a5b5a1bc350a7 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Domain/PhysicalInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Domain/PhysicalInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface PhysicalInterface
- * @since 2.0.0
  */
 interface PhysicalInterface
 {
@@ -16,7 +15,6 @@ interface PhysicalInterface
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function createVirtualTheme($theme);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Domain/StagingInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Domain/StagingInterface.php
index e44df359d0939..d73a35187c180 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Domain/StagingInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Domain/StagingInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface StagingInterface
- * @since 2.0.0
  */
 interface StagingInterface
 {
@@ -15,7 +14,6 @@ interface StagingInterface
      * Copy changes from 'staging' theme
      *
      * @return \Magento\Framework\View\Design\Theme\Domain\StagingInterface
-     * @since 2.0.0
      */
     public function updateFromStagingTheme();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Domain/VirtualInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Domain/VirtualInterface.php
index d993a20425bd7..3402ce7a19f03 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Domain/VirtualInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Domain/VirtualInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface VirtualInterface
- * @since 2.0.0
  */
 interface VirtualInterface
 {
@@ -15,7 +14,6 @@ interface VirtualInterface
      * Get 'staging' theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getStagingTheme();
 
@@ -23,7 +21,6 @@ public function getStagingTheme();
      * Get 'physical' theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getPhysicalTheme();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/File/CollectionInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/File/CollectionInterface.php
index c7d7efd4915f5..d5c4695243aa8 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/File/CollectionInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/File/CollectionInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Design Theme File collection interface
- * @since 2.0.0
  */
 interface CollectionInterface
 {
@@ -15,7 +14,6 @@ interface CollectionInterface
      * Get items
      *
      * @return \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     public function getItems();
 
@@ -24,7 +22,6 @@ public function getItems();
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return CollectionInterface
-     * @since 2.0.0
      */
     public function addThemeFilter(\Magento\Framework\View\Design\ThemeInterface $theme);
 
@@ -33,7 +30,6 @@ public function addThemeFilter(\Magento\Framework\View\Design\ThemeInterface $th
      *
      * @param string $direction
      * @return CollectionInterface
-     * @since 2.0.0
      */
     public function setDefaultOrder($direction = 'ASC');
 
@@ -43,7 +39,6 @@ public function setDefaultOrder($direction = 'ASC');
      * @param string $field
      * @param null|string|array $condition
      * @return CollectionInterface
-     * @since 2.0.0
      */
     public function addFieldToFilter($field, $condition = null);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/FileFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/FileFactory.php
index 8315db8a99b2a..35f294f0ab2ae 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/FileFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/FileFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme File Factory
- * @since 2.0.0
  */
 class FileFactory
 {
@@ -15,7 +14,6 @@ class FileFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -23,7 +21,6 @@ class FileFactory
      * Object manager
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Theme\FileInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/FileInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/FileInterface.php
index 9675c8dd22adf..f197f370b2a4e 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/FileInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/FileInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme file interface
- * @since 2.0.0
  */
 interface FileInterface
 {
@@ -16,7 +15,6 @@ interface FileInterface
      *
      * @param Customization\FileInterface $service
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomizationService(Customization\FileInterface $service);
 
@@ -24,7 +22,6 @@ public function setCustomizationService(Customization\FileInterface $service);
      * Get customization service model
      *
      * @return \Magento\Framework\View\Design\Theme\Customization\FileInterface
-     * @since 2.0.0
      */
     public function getCustomizationService();
 
@@ -33,7 +30,6 @@ public function getCustomizationService();
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return $this
-     * @since 2.0.0
      */
     public function setTheme(\Magento\Framework\View\Design\ThemeInterface $theme);
 
@@ -41,7 +37,6 @@ public function setTheme(\Magento\Framework\View\Design\ThemeInterface $theme);
      * Get theme model
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getTheme();
 
@@ -50,7 +45,6 @@ public function getTheme();
      *
      * @param string $fileName
      * @return $this
-     * @since 2.0.0
      */
     public function setFileName($fileName);
 
@@ -58,7 +52,6 @@ public function setFileName($fileName);
      * Get filename of custom file
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getFileName();
 
@@ -66,7 +59,6 @@ public function getFileName();
      * Return absolute path to file of customization
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullPath();
 
@@ -74,7 +66,6 @@ public function getFullPath();
      * Get short file information which can be serialized
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFileInfo();
 
@@ -82,7 +73,6 @@ public function getFileInfo();
      * Get content of current file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -90,7 +80,6 @@ public function getContent();
      * Save custom file
      *
      * @return $this
-     * @since 2.0.0
      */
     public function save();
 
@@ -98,7 +87,6 @@ public function save();
      * Delete custom file
      *
      * @return $this
-     * @since 2.0.0
      */
     public function delete();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
index 2beac878a1f96..bf431b085a106 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
@@ -9,7 +9,6 @@
  * Theme files provider
  *
  * @api
- * @since 2.0.0
  */
 interface FileProviderInterface
 {
@@ -19,7 +18,6 @@ interface FileProviderInterface
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param array $filters
      * @return \Magento\Framework\View\Design\Theme\FileInterface[]
-     * @since 2.0.0
      */
     public function getItems(\Magento\Framework\View\Design\ThemeInterface $theme, array $filters = []);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/FlyweightFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/FlyweightFactory.php
index 8c695948b70f9..c3d326572aa0a 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/FlyweightFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/FlyweightFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme factory
- * @since 2.0.0
  */
 class FlyweightFactory
 {
@@ -15,7 +14,6 @@ class FlyweightFactory
      * Theme provider
      *
      * @var ThemeProviderInterface
-     * @since 2.0.0
      */
     protected $themeProvider;
 
@@ -23,7 +21,6 @@ class FlyweightFactory
      * Themes
      *
      * @var \Magento\Framework\View\Design\ThemeInterface[]
-     * @since 2.0.0
      */
     protected $themes = [];
 
@@ -31,7 +28,6 @@ class FlyweightFactory
      * Themes by path
      *
      * @var \Magento\Framework\View\Design\ThemeInterface[]
-     * @since 2.0.0
      */
     protected $themesByPath = [];
 
@@ -39,7 +35,6 @@ class FlyweightFactory
      * Constructor
      *
      * @param ThemeProviderInterface $themeProvider
-     * @since 2.0.0
      */
     public function __construct(ThemeProviderInterface $themeProvider)
     {
@@ -58,7 +53,6 @@ public function __construct(ThemeProviderInterface $themeProvider)
      * @return \Magento\Framework\View\Design\ThemeInterface
      * @throws \InvalidArgumentException when incorrect $themeKey was specified
      * @throws \LogicException when theme with appropriate $themeKey was not found
-     * @since 2.0.0
      */
     public function create($themeKey, $area = \Magento\Framework\View\DesignInterface::DEFAULT_AREA)
     {
@@ -83,7 +77,6 @@ public function create($themeKey, $area = \Magento\Framework\View\DesignInterfac
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     private function extractThemeId($path)
     {
@@ -99,7 +92,6 @@ private function extractThemeId($path)
      *
      * @param int $themeId
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected function _loadById($themeId)
     {
@@ -116,7 +108,6 @@ protected function _loadById($themeId)
      * @param string $themePath
      * @param string $area
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     protected function _loadByPath($themePath, $area)
     {
@@ -133,7 +124,6 @@ protected function _loadByPath($themePath, $area)
      *
      * @param \Magento\Framework\View\Design\ThemeInterface $themeModel
      * @return $this
-     * @since 2.0.0
      */
     protected function _addTheme(\Magento\Framework\View\Design\ThemeInterface $themeModel)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image.php b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
index 0da465288f2b9..03d55d4cbd544 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
@@ -13,7 +13,6 @@
  * Theme Image model class
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Image
 {
@@ -31,7 +30,6 @@ class Image
      * Media directory
      *
      * @var WriteInterface
-     * @since 2.0.0
      */
     protected $mediaDirectory;
 
@@ -39,7 +37,6 @@ class Image
      * Root directory
      *
      * @var WriteInterface
-     * @since 2.0.0
      */
     protected $rootDirectory;
 
@@ -47,7 +44,6 @@ class Image
      * Image factory
      *
      * @var \Magento\Framework\Image\Factory
-     * @since 2.0.0
      */
     protected $imageFactory;
 
@@ -55,7 +51,6 @@ class Image
      * Image uploader
      *
      * @var Image\Uploader
-     * @since 2.0.0
      */
     protected $uploader;
 
@@ -63,7 +58,6 @@ class Image
      * Theme image path
      *
      * @var Image\PathInterface
-     * @since 2.0.0
      */
     protected $themeImagePath;
 
@@ -71,7 +65,6 @@ class Image
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -79,7 +72,6 @@ class Image
      * Theme
      *
      * @var ThemeInterface
-     * @since 2.0.0
      */
     protected $theme;
 
@@ -87,7 +79,6 @@ class Image
      * Width and height of preview image
      *
      * @var array
-     * @since 2.0.0
      */
     protected $imageParams;
 
@@ -102,7 +93,6 @@ class Image
      * @param array $imageParams
      * @param ThemeInterface $theme
      * @codingStandardsIgnoreStart
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -130,7 +120,6 @@ public function __construct(
      *
      * @param string $imagePath
      * @return $this
-     * @since 2.0.0
      */
     public function createPreviewImage($imagePath)
     {
@@ -154,7 +143,6 @@ public function createPreviewImage($imagePath)
      *
      * @param ThemeInterface $theme
      * @return bool
-     * @since 2.0.0
      */
     public function createPreviewImageCopy(ThemeInterface $theme)
     {
@@ -181,7 +169,6 @@ public function createPreviewImageCopy(ThemeInterface $theme)
      * Delete preview image
      *
      * @return bool
-     * @since 2.0.0
      */
     public function removePreviewImage()
     {
@@ -199,7 +186,6 @@ public function removePreviewImage()
      *
      * @param string $scope the request key for file
      * @return $this
-     * @since 2.0.0
      */
     public function uploadPreviewImage($scope)
     {
@@ -219,7 +205,6 @@ public function uploadPreviewImage($scope)
      * Get path to preview image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImagePath()
     {
@@ -230,7 +215,6 @@ public function getPreviewImagePath()
      * Get url of theme preview image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImageUrl()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
index 763953e8235c8..bd7b11605cbd8 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Theme Image Path interface
- * @since 2.0.0
  */
 interface PathInterface
 {
@@ -23,7 +22,6 @@ interface PathInterface
      *
      * @param ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImageUrl(ThemeInterface $theme);
 
@@ -32,7 +30,6 @@ public function getPreviewImageUrl(ThemeInterface $theme);
      *
      * @param ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImagePath(ThemeInterface $theme);
 
@@ -40,7 +37,6 @@ public function getPreviewImagePath(ThemeInterface $theme);
      * Return default themes preview image url
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPreviewImageDefaultUrl();
 
@@ -48,7 +44,6 @@ public function getPreviewImageDefaultUrl();
      * Get directory path for preview image
      *
      * @return string
-     * @since 2.0.0
      */
     public function getImagePreviewDirectory();
 
@@ -56,7 +51,6 @@ public function getImagePreviewDirectory();
      * Temporary directory path to store images
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemporaryDirectory();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
index c1d088ce8ae08..5df1e17dc8a46 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme Image Uploader
- * @since 2.0.0
  */
 class Uploader
 {
@@ -15,7 +14,6 @@ class Uploader
      * Allowed file extensions to upload
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_allowedExtensions = ['jpg', 'jpeg', 'gif', 'png', 'xbm', 'wbmp'];
 
@@ -23,7 +21,6 @@ class Uploader
      * File system
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -31,7 +28,6 @@ class Uploader
      * Transfer adapter
      *
      * @var \Zend_File_Transfer_Adapter_Http
-     * @since 2.0.0
      */
     protected $_transferAdapter;
 
@@ -39,7 +35,6 @@ class Uploader
      * Uploader factory
      *
      * @var \Magento\Framework\File\UploaderFactory
-     * @since 2.0.0
      */
     protected $_uploaderFactory;
 
@@ -49,7 +44,6 @@ class Uploader
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $adapterFactory
      * @param \Magento\Framework\File\UploaderFactory $uploaderFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -68,7 +62,6 @@ public function __construct(
      * @param string $destinationPath path to upload directory
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function uploadPreviewImage($scope, $destinationPath)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ImageFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/ImageFactory.php
index d21ef4aee4f8a..0e8c84251e08d 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ImageFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ImageFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for \Magento\Framework\View\Design\Theme\Image
- * @since 2.0.0
  */
 class ImageFactory
 {
@@ -15,7 +14,6 @@ class ImageFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -23,7 +21,6 @@ class ImageFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName;
 
@@ -32,7 +29,6 @@ class ImageFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return Image
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label.php b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
index 99bfafc5cece1..ab2b50d7cf00c 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Label.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\View\Design\Theme\Label
  *
- * @since 2.0.0
  */
 class Label implements \Magento\Framework\Option\ArrayInterface
 {
@@ -20,7 +19,6 @@ class Label implements \Magento\Framework\Option\ArrayInterface
      * Labels collection array
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_labelsCollection;
 
@@ -28,7 +26,6 @@ class Label implements \Magento\Framework\Option\ArrayInterface
      * Constructor
      *
      * @param \Magento\Framework\View\Design\Theme\Label\ListInterface $labelList
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Design\Theme\Label\ListInterface $labelList)
     {
@@ -40,7 +37,6 @@ public function __construct(\Magento\Framework\View\Design\Theme\Label\ListInter
      *
      * @param bool|string $label add empty values to result with specific label
      * @return array
-     * @since 2.0.0
      */
     public function getLabelsCollection($label = false)
     {
@@ -55,7 +51,6 @@ public function getLabelsCollection($label = false)
      * Return labels collection for backend system configuration with empty value "No Theme"
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLabelsCollectionForSystemConfiguration()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
index b8b72ef4f3606..7003ee17dd763 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
@@ -9,7 +9,6 @@
  * Label list interface
  *
  * @api
- * @since 2.0.0
  */
 interface ListInterface
 {
@@ -17,7 +16,6 @@ interface ListInterface
      * Return labels collection array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getLabels();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/LabelFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/LabelFactory.php
index 1edce20017c87..3b3fb38a0a9f3 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/LabelFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/LabelFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\View\Design\Theme\LabelFactory
  *
- * @since 2.0.0
  */
 class LabelFactory
 {
@@ -20,7 +19,6 @@ class LabelFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -28,7 +26,6 @@ class LabelFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -37,7 +34,6 @@ class LabelFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\View\Design\Theme\Label
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
index 7a8af580e649d..b3556a578db6a 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
@@ -9,7 +9,6 @@
  * Theme list interface
  *
  * @api
- * @since 2.0.0
  */
 interface ListInterface
 {
@@ -18,7 +17,6 @@ interface ListInterface
      *
      * @param string $fullPath
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getThemeByFullPath($fullPath);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ResolverInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/ResolverInterface.php
index 9cadcc64417dd..06d3f6f78a25e 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ResolverInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Theme resolver interface
- * @since 2.0.0
  */
 interface ResolverInterface
 {
@@ -15,7 +14,6 @@ interface ResolverInterface
      * Retrieve instance of a theme currently used in an area
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function get();
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackage.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackage.php
index 6e8ad87c5c1e0..e29d372c931b3 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackage.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackage.php
@@ -9,7 +9,6 @@
 
 /**
  * Value-object for a theme package
- * @since 2.0.0
  */
 class ThemePackage
 {
@@ -17,7 +16,6 @@ class ThemePackage
      * Area
      *
      * @var string
-     * @since 2.0.0
      */
     private $area;
 
@@ -25,7 +23,6 @@ class ThemePackage
      * Vendor name
      *
      * @var string
-     * @since 2.0.0
      */
     private $vendor;
 
@@ -33,7 +30,6 @@ class ThemePackage
      * Theme name
      *
      * @var string
-     * @since 2.0.0
      */
     private $name;
 
@@ -41,7 +37,6 @@ class ThemePackage
      * Theme path key
      *
      * @var string
-     * @since 2.0.0
      */
     private $key;
 
@@ -49,7 +44,6 @@ class ThemePackage
      * Full path to the theme
      *
      * @var string
-     * @since 2.0.0
      */
     private $path;
 
@@ -58,7 +52,6 @@ class ThemePackage
      *
      * @param string $key
      * @param string $path
-     * @since 2.0.0
      */
     public function __construct($key, $path)
     {
@@ -80,7 +73,6 @@ public function __construct($key, $path)
      * Get area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -91,7 +83,6 @@ public function getArea()
      * Get vendor name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getVendor()
     {
@@ -102,7 +93,6 @@ public function getVendor()
      * Get theme name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -113,7 +103,6 @@ public function getName()
      * Get path key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getKey()
     {
@@ -124,7 +113,6 @@ public function getKey()
      * Get full path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPath()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
index faebcafd5aeb6..eb9b386b5be50 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Factory for theme packages
- * @since 2.0.0
  */
 class ThemePackageFactory
 {
@@ -20,7 +19,6 @@ class ThemePackageFactory
      * @param string $path
      *
      * @return ThemePackage
-     * @since 2.0.0
      */
     public function create($key, $path)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageList.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageList.php
index ce31ee47fb2e0..4f0a58c3d110c 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageList.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageList.php
@@ -10,7 +10,6 @@
 
 /**
  * List of theme package value objects
- * @since 2.0.0
  */
 class ThemePackageList
 {
@@ -18,7 +17,6 @@ class ThemePackageList
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -26,7 +24,6 @@ class ThemePackageList
      * Factory for ThemePackage
      *
      * @var ThemePackageFactory
-     * @since 2.0.0
      */
     private $factory;
 
@@ -35,7 +32,6 @@ class ThemePackageList
      *
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param ThemePackageFactory $factory
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrarInterface $componentRegistrar, ThemePackageFactory $factory)
     {
@@ -49,7 +45,6 @@ public function __construct(ComponentRegistrarInterface $componentRegistrar, The
      * @param string $key
      * @return ThemePackage
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function getTheme($key)
     {
@@ -64,7 +59,6 @@ public function getTheme($key)
      * Get all themes
      *
      * @return ThemePackage[]
-     * @since 2.0.0
      */
     public function getThemes()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemeProviderInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemeProviderInterface.php
index d2e655a290ca6..2ca0547110fb8 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemeProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemeProviderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ThemeProviderInterface
- * @since 2.0.0
  */
 interface ThemeProviderInterface
 {
@@ -16,7 +15,6 @@ interface ThemeProviderInterface
      *
      * @param string $fullPath
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getThemeByFullPath($fullPath);
 
@@ -26,7 +24,6 @@ public function getThemeByFullPath($fullPath);
      * @param string $area
      * @param int $type
      * @return array
-     * @since 2.0.0
      */
     public function getThemeCustomizations($area, $type = \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL);
 
@@ -35,7 +32,6 @@ public function getThemeCustomizations($area, $type = \Magento\Framework\View\De
      *
      * @param int $themeId
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getThemeById($themeId);
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
index 5699298e650dc..06c78e7125040 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Validator
- * @since 2.0.0
  */
 class Validator
 {
@@ -16,7 +15,6 @@ class Validator
      * array('dataKey' => array('validator_name' => [validators], ...), ...)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dataValidators = [];
 
@@ -25,13 +23,11 @@ class Validator
      * array('dataKey' => 'Error message')
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errorMessages;
 
     /**
      * Initialize validators
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -43,7 +39,6 @@ public function __construct()
      * Set title validators
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _setTitleValidators()
     {
@@ -65,7 +60,6 @@ protected function _setTitleValidators()
      * Set theme type validators
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _setTypeValidators()
     {
@@ -103,7 +97,6 @@ protected function _setTypeValidators()
      * @param string $dataKey
      * @param array $validators
      * @return $this
-     * @since 2.0.0
      */
     public function addDataValidators($dataKey, $validators)
     {
@@ -121,7 +114,6 @@ public function addDataValidators($dataKey, $validators)
      *
      * @param string|null $dataKey
      * @return array
-     * @since 2.0.0
      */
     public function getErrorMessages($dataKey = null)
     {
@@ -136,7 +128,6 @@ public function getErrorMessages($dataKey = null)
      *
      * @param array &$validators
      * @return $this
-     * @since 2.0.0
      */
     protected function _instantiateValidators(array &$validators)
     {
@@ -156,7 +147,6 @@ protected function _instantiateValidators(array &$validators)
      * @param string $dataKey
      * @param mixed $dataValue
      * @return bool
-     * @since 2.0.0
      */
     protected function _validateDataItem($validator, $dataKey, $dataValue)
     {
@@ -179,7 +169,6 @@ protected function _validateDataItem($validator, $dataKey, $dataValue)
      *
      * @param \Magento\Framework\DataObject $data
      * @return bool
-     * @since 2.0.0
      */
     public function validate(\Magento\Framework\DataObject $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/ThemeFactory.php b/lib/internal/Magento/Framework/View/Design/ThemeFactory.php
index c4c17e74974bd..6959dfe0a2e9a 100644
--- a/lib/internal/Magento/Framework/View/Design/ThemeFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/ThemeFactory.php
@@ -11,7 +11,6 @@
  * Class ThemeFactory
  *
  * Minimal required interface a theme has to implement
- * @since 2.0.0
  */
 class ThemeFactory
 {
@@ -19,7 +18,6 @@ class ThemeFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -27,7 +25,6 @@ class ThemeFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -40,7 +37,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param int $themeId
      * @return null|\Magento\Framework\View\Design\ThemeInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getTheme($themeId)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/ThemeInterface.php b/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
index 511aae97b286f..adcd29db708c9 100644
--- a/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
@@ -9,7 +9,6 @@
  * Interface ThemeInterface
  *
  * @api
- * @since 2.0.0
  */
 interface ThemeInterface
 {
@@ -42,7 +41,6 @@ interface ThemeInterface
      * Retrieve code of an area a theme belongs to
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea();
 
@@ -50,7 +48,6 @@ public function getArea();
      * Retrieve theme path unique within an area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getThemePath();
 
@@ -58,7 +55,6 @@ public function getThemePath();
      * Retrieve theme path unique across areas
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFullPath();
 
@@ -66,7 +62,6 @@ public function getFullPath();
      * Retrieve parent theme instance
      *
      * @return ThemeInterface|null
-     * @since 2.0.0
      */
     public function getParentTheme();
 
@@ -74,7 +69,6 @@ public function getParentTheme();
      * Get code of the theme
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCode();
 
@@ -82,7 +76,6 @@ public function getCode();
      * Check if theme is physical
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPhysical();
 
@@ -91,7 +84,6 @@ public function isPhysical();
      * Format: array([<root_theme>, ..., <parent_theme>,] <current_theme>)
      *
      * @return ThemeInterface[]
-     * @since 2.0.0
      */
     public function getInheritedThemes();
 
@@ -99,7 +91,6 @@ public function getInheritedThemes();
      * Get theme id
      *
      * @return int
-     * @since 2.0.0
      */
     public function getId();
 }
diff --git a/lib/internal/Magento/Framework/View/DesignExceptions.php b/lib/internal/Magento/Framework/View/DesignExceptions.php
index 365f34a261ba7..fd19223ef5d64 100644
--- a/lib/internal/Magento/Framework/View/DesignExceptions.php
+++ b/lib/internal/Magento/Framework/View/DesignExceptions.php
@@ -10,7 +10,6 @@
 
 /**
  * Class DesignExceptions
- * @since 2.0.0
  */
 class DesignExceptions
 {
@@ -18,7 +17,6 @@ class DesignExceptions
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
@@ -26,7 +24,6 @@ class DesignExceptions
      * Exception config path
      *
      * @var string
-     * @since 2.0.0
      */
     protected $exceptionConfigPath;
 
@@ -34,7 +31,6 @@ class DesignExceptions
      * Scope Type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $scopeType;
 
@@ -51,7 +47,6 @@ class DesignExceptions
      * @param string $exceptionConfigPath
      * @param string $scopeType
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -70,7 +65,6 @@ public function __construct(
      *
      * @param \Magento\Framework\App\Request\Http $request
      * @return string|bool
-     * @since 2.0.0
      */
     public function getThemeByRequest(\Magento\Framework\App\Request\Http $request)
     {
diff --git a/lib/internal/Magento/Framework/View/DesignInterface.php b/lib/internal/Magento/Framework/View/DesignInterface.php
index 35b887b5ef9f0..ee501f1f494ad 100644
--- a/lib/internal/Magento/Framework/View/DesignInterface.php
+++ b/lib/internal/Magento/Framework/View/DesignInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Design Interface
- * @since 2.0.0
  */
 interface DesignInterface
 {
@@ -34,7 +33,6 @@ interface DesignInterface
      * @param string $area
      * @return DesignInterface
      * @TODO MAGETWO-31474: Remove deprecated method setArea
-     * @since 2.0.0
      */
     public function setArea($area);
 
@@ -42,7 +40,6 @@ public function setArea($area);
      * Retrieve package area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea();
 
@@ -52,7 +49,6 @@ public function getArea();
      * @param Design\ThemeInterface|int|string $theme
      * @param string|null $area
      * @return DesignInterface
-     * @since 2.0.0
      */
     public function setDesignTheme($theme, $area = null);
 
@@ -62,7 +58,6 @@ public function setDesignTheme($theme, $area = null);
      * @param string|null $area
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getConfigurationDesignTheme($area = null, array $params = []);
 
@@ -70,7 +65,6 @@ public function getConfigurationDesignTheme($area = null, array $params = []);
      * Set default design theme
      *
      * @return DesignInterface
-     * @since 2.0.0
      */
     public function setDefaultDesignTheme();
 
@@ -78,7 +72,6 @@ public function setDefaultDesignTheme();
      * Design theme model getter
      *
      * @return Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getDesignTheme();
 
@@ -87,7 +80,6 @@ public function getDesignTheme();
      *
      * @param Design\ThemeInterface $theme
      * @return string
-     * @since 2.0.0
      */
     public function getThemePath(Design\ThemeInterface $theme);
 
@@ -95,7 +87,6 @@ public function getThemePath(Design\ThemeInterface $theme);
      * Get locale
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLocale();
 
@@ -103,7 +94,6 @@ public function getLocale();
      * Get design settings for current request
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDesignParams();
 }
diff --git a/lib/internal/Magento/Framework/View/DesignLoader.php b/lib/internal/Magento/Framework/View/DesignLoader.php
index b6bf42d6be588..6d52e8deca26a 100644
--- a/lib/internal/Magento/Framework/View/DesignLoader.php
+++ b/lib/internal/Magento/Framework/View/DesignLoader.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\View\DesignLoader
  *
- * @since 2.0.0
  */
 class DesignLoader
 {
@@ -16,7 +15,6 @@ class DesignLoader
      * Request
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -24,7 +22,6 @@ class DesignLoader
      * Application
      *
      * @var \Magento\Framework\App\AreaList
-     * @since 2.0.0
      */
     protected $_areaList;
 
@@ -32,7 +29,6 @@ class DesignLoader
      * Layout
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
@@ -40,7 +36,6 @@ class DesignLoader
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\App\AreaList $areaList
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -56,7 +51,6 @@ public function __construct(
      * Load design
      *
      * @return void
-     * @since 2.0.0
      */
     public function load()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 211f3882e22c1..0ef97131c1b0e 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class AbstractBlock extends \Magento\Framework\DataObject implements BlockInterface
 {
@@ -38,7 +37,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Design
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
@@ -46,7 +44,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Session
      *
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -54,7 +51,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * SID Resolver
      *
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
@@ -62,7 +58,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Block name in layout
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_nameInLayout;
 
@@ -70,7 +65,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Parent layout of the block
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -78,7 +72,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * JS layout configuration
      *
      * @var array
-     * @since 2.0.0
      */
     protected $jsLayout = [];
 
@@ -86,7 +79,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Request
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -94,7 +86,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Url Builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
@@ -103,7 +94,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      *
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -111,7 +101,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Application front controller
      *
      * @var \Magento\Framework\App\FrontController
-     * @since 2.0.0
      */
     protected $_frontController;
 
@@ -119,7 +108,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Asset service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -127,7 +115,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * View config model
      *
      * @var \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     protected $_viewConfig;
 
@@ -135,7 +122,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Cache State
      *
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     protected $_cacheState;
 
@@ -143,7 +129,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -151,7 +136,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -159,19 +143,16 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * Filter manager
      *
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $filterManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -180,13 +161,11 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * If it isn't defined then application considers it as false.
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isScopePrivate = false;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -201,7 +180,6 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      *
      * @param \Magento\Framework\View\Element\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Element\Context $context, array $data = [])
     {
@@ -234,7 +212,6 @@ public function __construct(\Magento\Framework\View\Element\Context $context, ar
      * Retrieve serialized JS layout configuration ready to use in template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getJsLayout()
     {
@@ -245,7 +222,6 @@ public function getJsLayout()
      * Get request
      *
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -258,7 +234,6 @@ public function getRequest()
      * Please override this one instead of overriding real __construct constructor
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -271,7 +246,6 @@ protected function _construct()
      * Retrieve parent block
      *
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getParentBlock()
     {
@@ -291,7 +265,6 @@ public function getParentBlock()
      *
      * @param   \Magento\Framework\View\LayoutInterface $layout
      * @return  $this
-     * @since 2.0.0
      */
     public function setLayout(\Magento\Framework\View\LayoutInterface $layout)
     {
@@ -306,7 +279,6 @@ public function setLayout(\Magento\Framework\View\LayoutInterface $layout)
      * You can redefine this method in child classes for changing layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _prepareLayout()
     {
@@ -318,7 +290,6 @@ protected function _prepareLayout()
      *
      * @return \Magento\Framework\View\LayoutInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -335,7 +306,6 @@ public function getLayout()
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setNameInLayout($name)
     {
@@ -353,7 +323,6 @@ public function setNameInLayout($name)
      * Retrieves sorted list of child names
      *
      * @return array
-     * @since 2.0.0
      */
     public function getChildNames()
     {
@@ -372,7 +341,6 @@ public function getChildNames()
      * @param   string $name
      * @param   mixed $value
      * @return  $this
-     * @since 2.0.0
      */
     public function setAttribute($name, $value = null)
     {
@@ -385,7 +353,6 @@ public function setAttribute($name, $value = null)
      * @param   string $alias
      * @param   \Magento\Framework\View\Element\AbstractBlock|string $block
      * @return  $this
-     * @since 2.0.0
      */
     public function setChild($alias, $block)
     {
@@ -413,7 +380,6 @@ public function setChild($alias, $block)
      * @param string $block
      * @param array $data
      * @return $this new block
-     * @since 2.0.0
      */
     public function addChild($alias, $block, $data = [])
     {
@@ -431,7 +397,6 @@ public function addChild($alias, $block, $data = [])
      *
      * @param  string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function unsetChild($alias)
     {
@@ -461,7 +426,6 @@ public function unsetChild($alias)
      * @param mixed $result
      * @param array $params
      * @return $this
-     * @since 2.0.0
      */
     public function unsetCallChild($alias, $callback, $result, $params)
     {
@@ -488,7 +452,6 @@ public function unsetCallChild($alias, $callback, $result, $params)
      * Unset all children blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     public function unsetChildren()
     {
@@ -509,7 +472,6 @@ public function unsetChildren()
      *
      * @param string $alias
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getChildBlock($alias)
     {
@@ -530,7 +492,6 @@ public function getChildBlock($alias)
      * @param   string $alias
      * @param   boolean $useCache
      * @return  string
-     * @since 2.0.0
      */
     public function getChildHtml($alias = '', $useCache = true)
     {
@@ -561,7 +522,6 @@ public function getChildHtml($alias = '', $useCache = true)
      * @param string $childChildAlias
      * @param bool $useCache
      * @return string
-     * @since 2.0.0
      */
     public function getChildChildHtml($alias, $childChildAlias = '', $useCache = true)
     {
@@ -590,7 +550,6 @@ public function getChildChildHtml($alias, $childChildAlias = '', $useCache = tru
      *
      * @param   string $name
      * @return  string
-     * @since 2.0.0
      */
     public function getBlockHtml($name)
     {
@@ -611,7 +570,6 @@ public function getBlockHtml($name)
      * @param bool $after
      * @param string $alias
      * @return $this|bool
-     * @since 2.0.0
      */
     public function insert($element, $siblingName = 0, $after = true, $alias = '')
     {
@@ -635,7 +593,6 @@ public function insert($element, $siblingName = 0, $after = true, $alias = '')
      * @param \Magento\Framework\View\Element\AbstractBlock|string $element
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function append($element, $alias = '')
     {
@@ -651,7 +608,6 @@ public function append($element, $alias = '')
      *
      * @param string $groupName
      * @return array
-     * @since 2.0.0
      */
     public function getGroupChildNames($groupName)
     {
@@ -664,7 +620,6 @@ public function getGroupChildNames($groupName)
      * @param string $alias
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getChildData($alias, $key = '')
     {
@@ -679,7 +634,6 @@ public function getChildData($alias, $key = '')
      * Before rendering html, but after trying to load cache
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _beforeToHtml()
     {
@@ -692,7 +646,6 @@ protected function _beforeToHtml()
      * This method should not be overridden. You can override _toHtml() method in descendants if needed.
      *
      * @return string
-     * @since 2.0.0
      */
     public function toHtml()
     {
@@ -735,7 +688,6 @@ public function toHtml()
      *
      * @param   string $html
      * @return  string
-     * @since 2.0.0
      */
     protected function _afterToHtml($html)
     {
@@ -746,7 +698,6 @@ protected function _afterToHtml($html)
      * Override this method in descendants to produce html
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -766,7 +717,6 @@ protected function _toHtml()
      * @param string|null $arg4
      * @param string|null $arg5
      * @return string
-     * @since 2.0.0
      */
     public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
     {
@@ -784,7 +734,6 @@ public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null,
      * @param string|null $arg4
      * @param string|null $arg5
      * @return string
-     * @since 2.0.0
      */
     public function getJsId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
     {
@@ -814,7 +763,6 @@ public function getJsId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null,
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
@@ -827,7 +775,6 @@ public function getUrl($route = '', $params = [])
      * @param string $fileId
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getViewFileUrl($fileId, array $params = [])
     {
@@ -846,7 +793,6 @@ public function getViewFileUrl($fileId, array $params = [])
      * @param string $route
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     protected function _getNotFoundUrl($route = '', $params = ['_direct' => 'core/index/notFound'])
     {
@@ -861,7 +807,6 @@ protected function _getNotFoundUrl($route = '', $params = ['_direct' => 'core/in
      * @param bool $showTime
      * @param null|string $timezone
      * @return string
-     * @since 2.0.0
      */
     public function formatDate(
         $date = null,
@@ -886,7 +831,6 @@ public function formatDate(
      * @param   int $format
      * @param   bool $showDate
      * @return  string
-     * @since 2.0.0
      */
     public function formatTime(
         $time = null,
@@ -905,7 +849,6 @@ public function formatTime(
      * Retrieve module name of block
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModuleName()
     {
@@ -920,7 +863,6 @@ public function getModuleName()
      *
      * @param string $className
      * @return string
-     * @since 2.0.0
      */
     public static function extractModuleName($className)
     {
@@ -938,7 +880,6 @@ public static function extractModuleName($className)
      * @param string|array $data
      * @param array|null $allowedTags
      * @return string
-     * @since 2.0.0
      */
     public function escapeHtml($data, $allowedTags = null)
     {
@@ -989,7 +930,6 @@ public function escapeCss($string)
      * @param string|null $allowableTags
      * @param bool $allowHtmlEntities
      * @return string
-     * @since 2.0.0
      */
     public function stripTags($data, $allowableTags = null, $allowHtmlEntities = false)
     {
@@ -1004,7 +944,6 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     public function escapeUrl($string)
     {
@@ -1017,7 +956,6 @@ public function escapeUrl($string)
      * @param string $data
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeXssInUrl($data)
     {
@@ -1033,7 +971,6 @@ public function escapeXssInUrl($data)
      * @param  bool $addSlashes
      * @return string
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -1047,7 +984,6 @@ public function escapeQuote($data, $addSlashes = false)
      * @param string $quote
      * @return string|array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -1058,7 +994,6 @@ public function escapeJsQuote($data, $quote = '\'')
      * Get block name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNameInLayout()
     {
@@ -1071,7 +1006,6 @@ public function getNameInLayout()
      * Provide string array key to share specific info item with FPC placeholder
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -1082,7 +1016,6 @@ public function getCacheKeyInfo()
      * Get Key for caching block content
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCacheKey()
     {
@@ -1107,7 +1040,6 @@ public function getCacheKey()
      * Get tags array for saving cache
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getCacheTags()
     {
@@ -1128,7 +1060,6 @@ protected function getCacheTags()
      * Get block cache life time
      *
      * @return int|bool|null
-     * @since 2.0.0
      */
     protected function getCacheLifetime()
     {
@@ -1148,7 +1079,6 @@ protected function getCacheLifetime()
      * Load block html from cache storage
      *
      * @return string|false
-     * @since 2.0.0
      */
     protected function _loadCache()
     {
@@ -1172,7 +1102,6 @@ protected function _loadCache()
      *
      * @param string $data
      * @return $this
-     * @since 2.0.0
      */
     protected function _saveCache($data)
     {
@@ -1195,7 +1124,6 @@ protected function _saveCache($data)
      *
      * @param null|string $cacheKey
      * @return string
-     * @since 2.0.0
      */
     protected function _getSidPlaceholder($cacheKey = null)
     {
@@ -1214,7 +1142,6 @@ protected function _getSidPlaceholder($cacheKey = null)
      * @param string $name variable name
      * @param string|null $module optional module name
      * @return string|false
-     * @since 2.0.0
      */
     public function getVar($name, $module = null)
     {
@@ -1227,7 +1154,6 @@ public function getVar($name, $module = null)
      * Returns true if scope is private, false otherwise
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isScopePrivate()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/BlockFactory.php b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
index d06cee89a7e3a..068cb49a66319 100644
--- a/lib/internal/Magento/Framework/View/Element/BlockFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
@@ -11,7 +11,6 @@
  * Class BlockFactory
  *
  * @api
- * @since 2.0.0
  */
 class BlockFactory
 {
@@ -19,7 +18,6 @@ class BlockFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -27,7 +25,6 @@ class BlockFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -41,7 +38,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param array $arguments
      * @return \Magento\Framework\View\Element\BlockInterface
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function createBlock($blockName, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/BlockInterface.php b/lib/internal/Magento/Framework/View/Element/BlockInterface.php
index cb7b9008a05df..1b4326694df97 100644
--- a/lib/internal/Magento/Framework/View/Element/BlockInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/BlockInterface.php
@@ -11,7 +11,6 @@
  * Used to present information to user
  *
  * @api
- * @since 2.0.0
  */
 interface BlockInterface
 {
@@ -19,7 +18,6 @@ interface BlockInterface
      * Produce and return block's html output
      *
      * @return string
-     * @since 2.0.0
      */
     public function toHtml();
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Context.php b/lib/internal/Magento/Framework/View/Element/Context.php
index 91ef8276aac2c..522bec3e6a2a9 100644
--- a/lib/internal/Magento/Framework/View/Element/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Context.php
@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
@@ -28,7 +27,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Request
      *
      * @var \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -36,7 +34,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Layout
      *
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $_layout;
 
@@ -44,7 +41,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
@@ -52,7 +48,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * URL builder
      *
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $_urlBuilder;
 
@@ -60,7 +55,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Cache
      *
      * @var \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     protected $_cache;
 
@@ -68,7 +62,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Design
      *
      * @var \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     protected $_design;
 
@@ -76,7 +69,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Session
      *
      * @var \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     protected $_session;
 
@@ -84,7 +76,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * SID Resolver
      *
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     protected $_sidResolver;
 
@@ -92,13 +83,11 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Scope config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -106,7 +95,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * View config model
      *
      * @var \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     protected $_viewConfig;
 
@@ -114,7 +102,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Cache state
      *
      * @var \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     protected $_cacheState;
 
@@ -122,7 +109,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -130,7 +116,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Escaper
      *
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $_escaper;
 
@@ -138,19 +123,16 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * Filter manager
      *
      * @var \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     protected $_filterManager;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     protected $_localeDate;
 
     /**
      * @var \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     protected $inlineTranslation;
 
@@ -175,7 +157,6 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -219,7 +200,6 @@ public function __construct(
      * Get cache
      *
      * @return \Magento\Framework\App\CacheInterface
-     * @since 2.0.0
      */
     public function getCache()
     {
@@ -230,7 +210,6 @@ public function getCache()
      * Get design package
      *
      * @return \Magento\Framework\View\DesignInterface
-     * @since 2.0.0
      */
     public function getDesignPackage()
     {
@@ -241,7 +220,6 @@ public function getDesignPackage()
      * Get event manager
      *
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -252,7 +230,6 @@ public function getEventManager()
      * Get layout
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -263,7 +240,6 @@ public function getLayout()
      * Get request
      *
      * @return \Magento\Framework\App\RequestInterface
-     * @since 2.0.0
      */
     public function getRequest()
     {
@@ -274,7 +250,6 @@ public function getRequest()
      * Get session
      *
      * @return \Magento\Framework\Session\SessionManagerInterface
-     * @since 2.0.0
      */
     public function getSession()
     {
@@ -285,7 +260,6 @@ public function getSession()
      * Get SID resolver
      *
      * @return \Magento\Framework\Session\SidResolverInterface
-     * @since 2.0.0
      */
     public function getSidResolver()
     {
@@ -296,7 +270,6 @@ public function getSidResolver()
      * Get scope config
      *
      * @return \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     public function getScopeConfig()
     {
@@ -307,7 +280,6 @@ public function getScopeConfig()
      * Get inline translation status object
      *
      * @return \Magento\Framework\Translate\Inline\StateInterface
-     * @since 2.0.0
      */
     public function getInlineTranslation()
     {
@@ -318,7 +290,6 @@ public function getInlineTranslation()
      * Get URL builder
      *
      * @return \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     public function getUrlBuilder()
     {
@@ -329,7 +300,6 @@ public function getUrlBuilder()
      * Get asset service
      *
      * @return \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     public function getAssetRepository()
     {
@@ -340,7 +310,6 @@ public function getAssetRepository()
      * Get view config
      *
      * @return \Magento\Framework\View\ConfigInterface
-     * @since 2.0.0
      */
     public function getViewConfig()
     {
@@ -351,7 +320,6 @@ public function getViewConfig()
      * Get cache state
      *
      * @return \Magento\Framework\App\Cache\StateInterface
-     * @since 2.0.0
      */
     public function getCacheState()
     {
@@ -362,7 +330,6 @@ public function getCacheState()
      * Get logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -373,7 +340,6 @@ public function getLogger()
      * Get escaper
      *
      * @return \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     public function getEscaper()
     {
@@ -384,7 +350,6 @@ public function getEscaper()
      * Get filter manager
      *
      * @return \Magento\Framework\Filter\FilterManager
-     * @since 2.0.0
      */
     public function getFilterManager()
     {
@@ -393,7 +358,6 @@ public function getFilterManager()
 
     /**
      * @return \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @since 2.0.0
      */
     public function getLocaleDate()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
index c9a1c20fa1951..1749eb9c554e1 100644
--- a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
@@ -16,19 +16,16 @@
  *
  * When calls from parent to child block occurred and the error appeared in the child block,
  * all blocks chain would be removed.
- * @since 2.0.0
  */
 class ExceptionHandlerBlock implements BlockInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $blockName;
 
     /**
      * @param string $blockName
-     * @since 2.0.0
      */
     public function __construct($blockName = '')
     {
@@ -42,7 +39,6 @@ public function __construct($blockName = '')
      * @param array $args
      * @return void
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
@@ -56,7 +52,6 @@ public function __call($method, $args)
      *
      * @throws LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
index 3a6df0a632cbb..83f7dda94328f 100644
--- a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class ExceptionHandlerBlockFactory
  * @package Magento\Framework\View\Element
- * @since 2.0.0
  */
 class ExceptionHandlerBlockFactory
 {
@@ -16,20 +15,17 @@ class ExceptionHandlerBlockFactory
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -44,7 +40,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/FormKey.php b/lib/internal/Magento/Framework/View/Element/FormKey.php
index ccf71e8ca5a37..072ba42b34f1d 100644
--- a/lib/internal/Magento/Framework/View/Element/FormKey.php
+++ b/lib/internal/Magento/Framework/View/Element/FormKey.php
@@ -11,13 +11,11 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class FormKey extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey
-     * @since 2.0.0
      */
     protected $formKey;
 
@@ -25,7 +23,6 @@ class FormKey extends \Magento\Framework\View\Element\AbstractBlock
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
@@ -40,7 +37,6 @@ public function __construct(
      * Get form key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFormKey()
     {
@@ -49,7 +45,6 @@ public function getFormKey()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index b05abf82886b7..0c8187569cf28 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -13,7 +13,6 @@
  * Prepares localization data for calendar
  *
  * @api
- * @since 2.0.0
  */
 class Calendar extends \Magento\Framework\View\Element\Template
 {
@@ -21,7 +20,6 @@ class Calendar extends \Magento\Framework\View\Element\Template
      * Date model
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.0.0
      */
     protected $_date;
 
@@ -29,13 +27,11 @@ class Calendar extends \Magento\Framework\View\Element\Template
      * JSON Encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
-     * @since 2.0.0
      */
     protected $encoder;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $_localeResolver;
 
@@ -47,7 +43,6 @@ class Calendar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Json\EncoderInterface $encoder
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -66,7 +61,6 @@ public function __construct(
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -168,7 +162,6 @@ protected function _toHtml()
      * Return offset of current timezone with GMT in seconds
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTimezoneOffsetSeconds()
     {
@@ -180,7 +173,6 @@ public function getTimezoneOffsetSeconds()
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return int
-     * @since 2.0.0
      */
     public function getStoreTimestamp($store = null)
     {
@@ -191,7 +183,6 @@ public function getStoreTimestamp($store = null)
      * Getter for yearRange option in datepicker
      *
      * @return string
-     * @since 2.0.0
      */
     public function getYearRange()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
index 77489bb090009..648d9ad6917e4 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -7,7 +7,6 @@
 
 /**
  * Date element block
- * @since 2.0.0
  */
 class Date extends \Magento\Framework\View\Element\Template
 {
@@ -16,7 +15,6 @@ class Date extends \Magento\Framework\View\Element\Template
      *
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -72,7 +70,6 @@ protected function _toHtml()
      * Convert special characters to HTML entities
      *
      * @return string
-     * @since 2.0.0
      */
     public function getEscapedValue()
     {
@@ -88,7 +85,6 @@ public function getEscapedValue()
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 738bceab71306..71b73918120f8 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -11,13 +11,11 @@
  * @method string getLabel()
  * @method string getPath()
  * @method string getTitle()
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $allowedAttributes = [
         'href',
@@ -55,7 +53,6 @@ class Link extends \Magento\Framework\View\Element\Template
      * Prepare link attributes as serialized and formatted string
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLinkAttributes()
     {
@@ -82,7 +79,6 @@ public function getLinkAttributes()
      * @param   string $fieldSeparator
      * @param   string $quote
      * @return  string
-     * @since 2.0.0
      */
     public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
     {
@@ -98,7 +94,6 @@ public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparat
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -113,7 +108,6 @@ protected function _toHtml()
      * Get href URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index f52795fbfa7eb..ab1bca9f4548c 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -16,7 +16,6 @@
  * @method null|array                      getAttributes()
  * @method null|bool                       getCurrent()
  * @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
- * @since 2.0.0
  */
 class Current extends \Magento\Framework\View\Element\Template
 {
@@ -24,7 +23,6 @@ class Current extends \Magento\Framework\View\Element\Template
      * Default path
      *
      * @var \Magento\Framework\App\DefaultPathInterface
-     * @since 2.0.0
      */
     protected $_defaultPath;
 
@@ -34,7 +32,6 @@ class Current extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -49,7 +46,6 @@ public function __construct(
      * Get href URL
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHref()
     {
@@ -60,7 +56,6 @@ public function getHref()
      * Get current mca
      *
      * @return string
-     * @since 2.0.0
      */
     private function getMca()
     {
@@ -83,7 +78,6 @@ private function getMca()
      * Check if link leads to URL equivalent to URL of currently displayed page
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCurrent()
     {
@@ -94,7 +88,6 @@ public function isCurrent()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -141,7 +134,6 @@ protected function _toHtml()
      * Generate attributes' HTML code
      *
      * @return string
-     * @since 2.0.0
      */
     private function getAttributesHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Links.php b/lib/internal/Magento/Framework/View/Element/Html/Links.php
index 8f98f1b0cdbfd..472e24d7f2bfa 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Links.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Links.php
@@ -9,7 +9,6 @@
  * Links list block
  *
  * @api
- * @since 2.0.0
  */
 class Links extends \Magento\Framework\View\Element\Template
 {
@@ -17,7 +16,6 @@ class Links extends \Magento\Framework\View\Element\Template
      * Get links
      *
      * @return \Magento\Framework\View\Element\Html\Link[]
-     * @since 2.0.0
      */
     public function getLinks()
     {
@@ -29,7 +27,6 @@ public function getLinks()
      *
      * @param string $path
      * @return \Magento\Framework\View\Element\Html\Link
-     * @since 2.0.0
      */
     protected function getLinkByPath($path)
     {
@@ -45,7 +42,6 @@ protected function getLinkByPath($path)
      *
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     public function setActive($path)
     {
@@ -60,7 +56,6 @@ public function setActive($path)
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $link
      * @return string
-     * @since 2.0.0
      */
     public function renderLink(\Magento\Framework\View\Element\AbstractBlock $link)
     {
@@ -71,7 +66,6 @@ public function renderLink(\Magento\Framework\View\Element\AbstractBlock $link)
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Select.php b/lib/internal/Magento/Framework/View/Element/Html/Select.php
index 41d9521da72c0..09b5d7f2e821c 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Select.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Select.php
@@ -7,7 +7,6 @@
 
 /**
  * HTML select element block
- * @since 2.0.0
  */
 class Select extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -15,7 +14,6 @@ class Select extends \Magento\Framework\View\Element\AbstractBlock
      * Options
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_options = [];
 
@@ -23,7 +21,6 @@ class Select extends \Magento\Framework\View\Element\AbstractBlock
      * Get options of the element
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -35,7 +32,6 @@ public function getOptions()
      *
      * @param array $options
      * @return $this
-     * @since 2.0.0
      */
     public function setOptions($options)
     {
@@ -50,7 +46,6 @@ public function setOptions($options)
      * @param string $label  HTML label
      * @param array  $params HTML attributes
      * @return $this
-     * @since 2.0.0
      */
     public function addOption($value, $label, $params = [])
     {
@@ -63,7 +58,6 @@ public function addOption($value, $label, $params = [])
      *
      * @param string $elementId ID
      * @return $this
-     * @since 2.0.0
      */
     public function setId($elementId)
     {
@@ -76,7 +70,6 @@ public function setId($elementId)
      *
      * @param string $class Class
      * @return $this
-     * @since 2.0.0
      */
     public function setClass($class)
     {
@@ -89,7 +82,6 @@ public function setClass($class)
      *
      * @param string $title Title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -101,7 +93,6 @@ public function setTitle($title)
      * HTML ID of the element
      *
      * @return string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -112,7 +103,6 @@ public function getId()
      * CSS class of the element
      *
      * @return string
-     * @since 2.0.0
      */
     public function getClass()
     {
@@ -123,7 +113,6 @@ public function getClass()
      * Returns HTML title of the element
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -137,7 +126,6 @@ public function getTitle()
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -204,7 +192,6 @@ protected function _toHtml()
      * @param array $option
      * @param boolean $selected
      * @return string
-     * @since 2.0.0
      */
     protected function _optionToHtml($option, $selected = false)
     {
@@ -239,7 +226,6 @@ protected function _optionToHtml($option, $selected = false)
      * Alias for toHtml()
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtml()
     {
@@ -251,7 +237,6 @@ public function getHtml()
      *
      * @param string $optionValue Value of the option
      * @return string
-     * @since 2.0.0
      */
     public function calcOptionHash($optionValue)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Components.php b/lib/internal/Magento/Framework/View/Element/Js/Components.php
index 7ab0c63b816bf..3f9be417d62be 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Components.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Components.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Components extends Template
 {
@@ -18,7 +17,6 @@ class Components extends Template
      * Developer mode
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isDeveloperMode()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
index 224ef2f2a4a55..c44bad026ecac 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
@@ -11,7 +11,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Cookie extends Template
 {
@@ -19,13 +18,11 @@ class Cookie extends Template
      * Session config
      *
      * @var ConfigInterface
-     * @since 2.0.0
      */
     protected $sessionConfig;
 
     /**
      * @var \Magento\Framework\Validator\Ip
-     * @since 2.0.0
      */
     protected $ipValidator;
 
@@ -36,7 +33,6 @@ class Cookie extends Template
      * @param ConfigInterface $cookieConfig
      * @param \Magento\Framework\Validator\Ip $ipValidator
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Context $context,
@@ -53,7 +49,6 @@ public function __construct(
      * Get configured cookie domain
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDomain()
     {
@@ -73,7 +68,6 @@ public function getDomain()
      * Get configured cookie path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPath()
     {
@@ -82,7 +76,6 @@ public function getPath()
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getLifetime()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php b/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
index 1c532112692f5..f5e279c3939c1 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Framework\View\Element\Message\InterpretationMediator
  *
- * @since 2.0.0
  */
 class InterpretationMediator implements InterpretationStrategyInterface
 {
     /**
      * @var InterpretationStrategy
-     * @since 2.0.0
      */
     private $interpretationStrategy;
 
     /**
      * @param InterpretationStrategy $interpretationStrategy
-     * @since 2.0.0
      */
     public function __construct(
         InterpretationStrategy $interpretationStrategy
@@ -35,7 +32,6 @@ public function __construct(
      *
      * @param MessageInterface $message
      * @return string
-     * @since 2.0.0
      */
     public function interpret(MessageInterface $message)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategy.php b/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategy.php
index 93fc40ea98442..87af1e37da554 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategy.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategy.php
@@ -11,26 +11,22 @@
 /**
  * Class \Magento\Framework\View\Element\Message\InterpretationStrategy
  *
- * @since 2.0.0
  */
 class InterpretationStrategy implements InterpretationStrategyInterface
 {
     /**
      * @var RenderersPool
-     * @since 2.0.0
      */
     private $renderersPool;
 
     /**
      * @var MessageConfigurationsPool
-     * @since 2.0.0
      */
     private $messageConfigurationsPool;
 
     /**
      * @param RenderersPool $renderersPool
      * @param MessageConfigurationsPool $messageConfigurationsPool
-     * @since 2.0.0
      */
     public function __construct(
         RenderersPool $renderersPool,
@@ -46,7 +42,6 @@ public function __construct(
      * @param MessageInterface $message
      * @return string
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function interpret(MessageInterface $message)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategyInterface.php b/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategyInterface.php
index db9dbe9c1f00a..f635f59f3fb23 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategyInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/InterpretationStrategyInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\View\Element\Message\InterpretationStrategyInterface
  *
- * @since 2.0.0
  */
 interface InterpretationStrategyInterface
 {
@@ -19,7 +18,6 @@ interface InterpretationStrategyInterface
      *
      * @param MessageInterface $message
      * @return string
-     * @since 2.0.0
      */
     public function interpret(MessageInterface $message);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php b/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
index d87ecaac7bf88..16d0b24a06527 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\View\Element\Message\MessageConfigurationsPool
  *
- * @since 2.0.0
  */
 class MessageConfigurationsPool
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $configurationsMap;
 
@@ -23,7 +21,6 @@ class MessageConfigurationsPool
      * ['message_identifier' => ['renderer' => '{renderer_code}', 'data' => []], ...]
      *
      * @param array $configurationsMap
-     * @since 2.0.0
      */
     public function __construct(
         array $configurationsMap = []
@@ -58,7 +55,6 @@ function (array &$configuration) {
      *
      * @param string $identifier
      * @return null|array
-     * @since 2.0.0
      */
     public function getMessageConfiguration($identifier)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer.php
index 5fa8c9d0950c7..b261cf6683bab 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\View\Element\Message\Renderer\BlockRenderer
  *
- * @since 2.0.0
  */
 class BlockRenderer implements RendererInterface
 {
@@ -22,19 +21,16 @@ class BlockRenderer implements RendererInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $configuration;
 
     /**
      * @var Template
-     * @since 2.0.0
      */
     private $template;
 
     /**
      * @param Template $template
-     * @since 2.0.0
      */
     public function __construct(
         Template $template
@@ -48,7 +44,6 @@ public function __construct(
      * @param MessageInterface $message
      * @param array $initializationData
      * @return string
-     * @since 2.0.0
      */
     public function render(MessageInterface $message, array $initializationData)
     {
@@ -65,7 +60,6 @@ public function render(MessageInterface $message, array $initializationData)
      * @param array $configuration
      * @param array $initializationData
      * @return void
-     * @since 2.0.0
      */
     private function setUpConfiguration(array $configuration, array $initializationData)
     {
@@ -81,7 +75,6 @@ private function setUpConfiguration(array $configuration, array $initializationD
 
     /**
      * @return void
-     * @since 2.0.0
      */
     private function tearDownConfiguration()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer/Template.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer/Template.php
index 79abd2e4fa2f7..dc73a588624f3 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/BlockRenderer/Template.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\View\Element\Message\Renderer\BlockRenderer\Template
  *
- * @since 2.0.0
  */
 class Template extends \Magento\Framework\View\Element\Template
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/EscapeRenderer.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/EscapeRenderer.php
index 199a9424db7c8..011ec4ebf8a17 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/EscapeRenderer.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/EscapeRenderer.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\View\Element\Message\Renderer\EscapeRenderer
  *
- * @since 2.0.0
  */
 class EscapeRenderer implements RendererInterface
 {
@@ -22,13 +21,11 @@ class EscapeRenderer implements RendererInterface
 
     /**
      * @var Escaper
-     * @since 2.0.0
      */
     private $escaper;
 
     /**
      * @param Escaper $escaper
-     * @since 2.0.0
      */
     public function __construct(
         Escaper $escaper
@@ -42,7 +39,6 @@ public function __construct(
      * @param MessageInterface $message
      * @param array $initializationData
      * @return string
-     * @since 2.0.0
      */
     public function render(MessageInterface $message, array $initializationData)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/PoolInterface.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/PoolInterface.php
index ad7ef2ae62901..c94e7f97ecabf 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/PoolInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/PoolInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\View\Element\Message\Renderer\PoolInterface
  *
- * @since 2.0.0
  */
 interface PoolInterface
 {
@@ -17,7 +16,6 @@ interface PoolInterface
      *
      * @param string $rendererCode
      * @return RendererInterface | null
-     * @since 2.0.0
      */
     public function get($rendererCode);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RendererInterface.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RendererInterface.php
index 1ddbf6d5d539b..b5b2b51c2eab9 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RendererInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RendererInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\View\Element\Message\Renderer\RendererInterface
  *
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -20,7 +19,6 @@ interface RendererInterface
      * @param MessageInterface $message
      * @param array $initializationData
      * @return string
-     * @since 2.0.0
      */
     public function render(MessageInterface $message, array $initializationData);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
index 9970d3c404e19..056273ac808df 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\View\Element\Message\Renderer\RenderersPool
  *
- * @since 2.0.0
  */
 class RenderersPool implements PoolInterface
 {
     /**
      * @var RendererInterface[]
-     * @since 2.0.0
      */
     private $renderers;
 
     /**
      * @param array $renderers
-     * @since 2.0.0
      */
     public function __construct(
         array $renderers = []
@@ -40,7 +37,6 @@ function (RendererInterface $renderer) {
      *
      * @param string $rendererCode
      * @return RendererInterface | null
-     * @since 2.0.0
      */
     public function get($rendererCode)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Messages.php b/lib/internal/Magento/Framework/View/Element/Messages.php
index 26aec15c23046..409e678d4e30a 100644
--- a/lib/internal/Magento/Framework/View/Element/Messages.php
+++ b/lib/internal/Magento/Framework/View/Element/Messages.php
@@ -11,7 +11,6 @@
  * Class Messages
  *
  * @api
- * @since 2.0.0
  */
 class Messages extends Template
 {
@@ -19,7 +18,6 @@ class Messages extends Template
      * Messages collection
      *
      * @var \Magento\Framework\Message\Collection
-     * @since 2.0.0
      */
     protected $messages;
 
@@ -27,7 +25,6 @@ class Messages extends Template
      * Store first level html tag name for messages html output
      *
      * @var string
-     * @since 2.0.0
      */
     protected $firstLevelTagName = 'div';
 
@@ -35,7 +32,6 @@ class Messages extends Template
      * Store second level html tag name for messages html output
      *
      * @var string
-     * @since 2.0.0
      */
     protected $secondLevelTagName = 'div';
 
@@ -43,7 +39,6 @@ class Messages extends Template
      * Store content wrapper html tag name for messages html output
      *
      * @var string
-     * @since 2.0.0
      */
     protected $contentWrapTagName = 'div';
 
@@ -51,7 +46,6 @@ class Messages extends Template
      * Storage for used types of message storages
      *
      * @var array
-     * @since 2.0.0
      */
     protected $usedStorageTypes = [];
 
@@ -59,7 +53,6 @@ class Messages extends Template
      * Grouped message types
      *
      * @var string[]
-     * @since 2.0.0
      */
     protected $messageTypes = [
         MessageInterface::TYPE_ERROR,
@@ -72,7 +65,6 @@ class Messages extends Template
      * Message singleton
      *
      * @var \Magento\Framework\Message\Factory
-     * @since 2.0.0
      */
     protected $messageFactory;
 
@@ -80,7 +72,6 @@ class Messages extends Template
      * Message model factory
      *
      * @var \Magento\Framework\Message\CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
@@ -88,13 +79,11 @@ class Messages extends Template
      * Message manager
      *
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var Message\InterpretationStrategyInterface
-     * @since 2.0.0
      */
     private $interpretationStrategy;
 
@@ -107,7 +96,6 @@ class Messages extends Template
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param Message\InterpretationStrategyInterface $interpretationStrategy
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -129,7 +117,6 @@ public function __construct(
      *
      * @param   \Magento\Framework\Message\Collection $messages
      * @return  $this
-     * @since 2.0.0
      */
     public function setMessages(\Magento\Framework\Message\Collection $messages)
     {
@@ -142,7 +129,6 @@ public function setMessages(\Magento\Framework\Message\Collection $messages)
      *
      * @param \Magento\Framework\Message\Collection $messages
      * @return $this
-     * @since 2.0.0
      */
     public function addMessages(\Magento\Framework\Message\Collection $messages)
     {
@@ -156,7 +142,6 @@ public function addMessages(\Magento\Framework\Message\Collection $messages)
      * Retrieve messages collection
      *
      * @return \Magento\Framework\Message\Collection
-     * @since 2.0.0
      */
     public function getMessageCollection()
     {
@@ -171,7 +156,6 @@ public function getMessageCollection()
      *
      * @param MessageInterface $message
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage(MessageInterface $message)
     {
@@ -184,7 +168,6 @@ public function addMessage(MessageInterface $message)
      *
      * @param   string $message
      * @return  $this
-     * @since 2.0.0
      */
     public function addError($message)
     {
@@ -197,7 +180,6 @@ public function addError($message)
      *
      * @param   string $message
      * @return  $this
-     * @since 2.0.0
      */
     public function addWarning($message)
     {
@@ -210,7 +192,6 @@ public function addWarning($message)
      *
      * @param   string $message
      * @return  $this
-     * @since 2.0.0
      */
     public function addNotice($message)
     {
@@ -223,7 +204,6 @@ public function addNotice($message)
      *
      * @param   string $message
      * @return  $this
-     * @since 2.0.0
      */
     public function addSuccess($message)
     {
@@ -236,7 +216,6 @@ public function addSuccess($message)
      *
      * @param   string $type
      * @return  MessageInterface[]
-     * @since 2.0.0
      */
     public function getMessagesByType($type)
     {
@@ -247,7 +226,6 @@ public function getMessagesByType($type)
      * Return grouped message types
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessageTypes()
     {
@@ -258,7 +236,6 @@ public function getMessageTypes()
      * Retrieve messages in HTML format grouped by type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getGroupedHtml()
     {
@@ -272,7 +249,6 @@ public function getGroupedHtml()
      *
      * @param null|string|array|\Magento\Framework\DataObject &$html
      * @return void
-     * @since 2.0.0
      */
     protected function _dispatchRenderGroupedAfterEvent(&$html)
     {
@@ -290,7 +266,6 @@ protected function _dispatchRenderGroupedAfterEvent(&$html)
      * Render messages in HTML format grouped by type
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _renderMessagesByType()
     {
@@ -321,7 +296,6 @@ protected function _renderMessagesByType()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -338,7 +312,6 @@ protected function _toHtml()
      *
      * @param string $tagName
      * @return void
-     * @since 2.0.0
      */
     public function setFirstLevelTagName($tagName)
     {
@@ -350,7 +323,6 @@ public function setFirstLevelTagName($tagName)
      *
      * @param string $tagName
      * @return void
-     * @since 2.0.0
      */
     public function setSecondLevelTagName($tagName)
     {
@@ -361,7 +333,6 @@ public function setSecondLevelTagName($tagName)
      * Get cache key informative items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -373,7 +344,6 @@ public function getCacheKeyInfo()
      *
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     public function addStorageType($type)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Redirect.php b/lib/internal/Magento/Framework/View/Element/Redirect.php
index 53c9f38dbecc9..359a49b205817 100644
--- a/lib/internal/Magento/Framework/View/Element/Redirect.php
+++ b/lib/internal/Magento/Framework/View/Element/Redirect.php
@@ -7,7 +7,6 @@
 
 /**
  * Customer Redirect Page
- * @since 2.0.0
  */
 class Redirect extends Template
 {
@@ -15,7 +14,6 @@ class Redirect extends Template
      *  HTML form hidden fields
      *
      * @var array
-     * @since 2.0.0
      */
     protected $formFields = [];
 
@@ -23,7 +21,6 @@ class Redirect extends Template
      * Form factory
      *
      * @var \Magento\Framework\Data\FormFactory
-     * @since 2.0.0
      */
     protected $formFactory;
 
@@ -33,7 +30,6 @@ class Redirect extends Template
      * @param Template\Context $context
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
      * URL for redirect location
      *
      * @return string URL
-     * @since 2.0.0
      */
     public function getTargetURL()
     {
@@ -59,7 +54,6 @@ public function getTargetURL()
      * Additional custom message
      *
      * @return string Output message
-     * @since 2.0.0
      */
     public function getMessage()
     {
@@ -70,7 +64,6 @@ public function getMessage()
      * Client-side redirect engine output
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirectOutput()
     {
@@ -85,7 +78,6 @@ public function getRedirectOutput()
      * Redirect via JS location
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRedirect()
     {
@@ -102,7 +94,6 @@ public function getRedirect()
      * Redirect via HTML form submission
      *
      * @return string
-     * @since 2.0.0
      */
     public function getHtmlFormRedirect()
     {
@@ -132,7 +123,6 @@ public function getHtmlFormRedirect()
      * HTML form or JS redirect
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHtmlFormRedirect()
     {
@@ -143,7 +133,6 @@ public function isHtmlFormRedirect()
      * HTML form id/name attributes
      *
      * @return string Id/name
-     * @since 2.0.0
      */
     public function getFormId()
     {
@@ -154,7 +143,6 @@ public function getFormId()
      * HTML form method attribute
      *
      * @return string Method
-     * @since 2.0.0
      */
     public function getFormMethod()
     {
@@ -165,7 +153,6 @@ public function getFormMethod()
      * Array of hidden form fields (name => value)
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFormFields()
     {
@@ -176,7 +163,6 @@ public function getFormFields()
      * Optimized getFormFields() method
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getFormFields()
     {
@@ -190,7 +176,6 @@ protected function _getFormFields()
      * Get default HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getDefaultHtml()
     {
@@ -219,7 +204,6 @@ protected function _getDefaultHtml()
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/RendererInterface.php b/lib/internal/Magento/Framework/View/Element/RendererInterface.php
index 9ea99573c0f5a..e9be81b7f9d20 100644
--- a/lib/internal/Magento/Framework/View/Element/RendererInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/RendererInterface.php
@@ -9,7 +9,6 @@
  * Magento Block interface
  *
  * @api
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -18,7 +17,6 @@ interface RendererInterface
      *
      * @param mixed $data
      * @return mixed
-     * @since 2.0.0
      */
     public function render($data);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/RendererList.php b/lib/internal/Magento/Framework/View/Element/RendererList.php
index a5877dfc8d072..30bc38aed28f3 100644
--- a/lib/internal/Magento/Framework/View/Element/RendererList.php
+++ b/lib/internal/Magento/Framework/View/Element/RendererList.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class RendererList extends AbstractBlock
 {
@@ -15,7 +14,6 @@ class RendererList extends AbstractBlock
      * Renderer templates cache
      *
      * @var array
-     * @since 2.0.0
      */
     protected $rendererTemplates = [];
 
@@ -27,7 +25,6 @@ class RendererList extends AbstractBlock
      * @param string $rendererTemplate
      * @return bool|AbstractBlock
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getRenderer($type, $default = null, $rendererTemplate = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index ea1c3437f87e3..a1aa599156d2a 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -27,7 +27,6 @@
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Template extends AbstractBlock
 {
@@ -40,7 +39,6 @@ class Template extends AbstractBlock
      * Assigned variables for view
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_viewVars = [];
 
@@ -48,7 +46,6 @@ class Template extends AbstractBlock
      * Base URL
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_baseUrl;
 
@@ -56,7 +53,6 @@ class Template extends AbstractBlock
      * JS URL
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_jsUrl;
 
@@ -64,7 +60,6 @@ class Template extends AbstractBlock
      * Is allowed symlinks flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_allowSymlinks;
 
@@ -72,7 +67,6 @@ class Template extends AbstractBlock
      * Filesystem instance
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -80,7 +74,6 @@ class Template extends AbstractBlock
      * Path to template file in theme.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_template;
 
@@ -88,7 +81,6 @@ class Template extends AbstractBlock
      * Template engine pool
      *
      * @var \Magento\Framework\View\TemplateEnginePool
-     * @since 2.0.0
      */
     protected $templateEnginePool;
 
@@ -96,7 +88,6 @@ class Template extends AbstractBlock
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
@@ -104,7 +95,6 @@ class Template extends AbstractBlock
      * Application state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -112,7 +102,6 @@ class Template extends AbstractBlock
      * Root directory instance
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $directory;
 
@@ -120,7 +109,6 @@ class Template extends AbstractBlock
      * Media directory instance
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     private $mediaDirectory;
 
@@ -128,25 +116,21 @@ class Template extends AbstractBlock
      * Template context
      *
      * @var \Magento\Framework\View\Element\BlockInterface
-     * @since 2.0.0
      */
     protected $templateContext;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Element\Template\File\Resolver
-     * @since 2.0.0
      */
     protected $resolver;
 
     /**
      * @var \Magento\Framework\View\Element\Template\File\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -155,7 +139,6 @@ class Template extends AbstractBlock
      *
      * @param Template\Context $context
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(Template\Context $context, array $data = [])
     {
@@ -175,7 +158,6 @@ public function __construct(Template\Context $context, array $data = [])
      *
      * @param \Magento\Framework\View\Element\BlockInterface $templateContext
      * @return void
-     * @since 2.0.0
      */
     public function setTemplateContext($templateContext)
     {
@@ -185,7 +167,6 @@ public function setTemplateContext($templateContext)
     /**
      * Internal constructor, that is called from real constructor
      * @return void
-     * @since 2.0.0
      */
     protected function _construct()
     {
@@ -206,7 +187,6 @@ protected function _construct()
      * Get relevant path to template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplate()
     {
@@ -218,7 +198,6 @@ public function getTemplate()
      *
      * @param string $template
      * @return $this
-     * @since 2.0.0
      */
     public function setTemplate($template)
     {
@@ -231,7 +210,6 @@ public function setTemplate($template)
      *
      * @param string|null $template
      * @return string|bool
-     * @since 2.0.0
      */
     public function getTemplateFile($template = null)
     {
@@ -247,7 +225,6 @@ public function getTemplateFile($template = null)
      * Get design area
      *
      * @return string
-     * @since 2.0.0
      */
     public function getArea()
     {
@@ -260,7 +237,6 @@ public function getArea()
      * @param   string|array $key
      * @param   mixed $value
      * @return  $this
-     * @since 2.0.0
      */
     public function assign($key, $value = null)
     {
@@ -279,7 +255,6 @@ public function assign($key, $value = null)
      *
      * @param string $fileName
      * @return string
-     * @since 2.0.0
      */
     public function fetchView($fileName)
     {
@@ -316,7 +291,6 @@ public function fetchView($fileName)
      * Render block HTML
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
@@ -330,7 +304,6 @@ protected function _toHtml()
      * Get base url of the application
      *
      * @return string
-     * @since 2.0.0
      */
     public function getBaseUrl()
     {
@@ -346,7 +319,6 @@ public function getBaseUrl()
      * @param \Magento\Framework\DataObject $object
      * @param string $key
      * @return mixed
-     * @since 2.0.0
      */
     public function getObjectData(\Magento\Framework\DataObject $object, $key)
     {
@@ -357,7 +329,6 @@ public function getObjectData(\Magento\Framework\DataObject $object, $key)
      * Get cache key informative items
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCacheKeyInfo()
     {
@@ -374,7 +345,6 @@ public function getCacheKeyInfo()
      * Instantiates filesystem directory
      *
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected function getRootDirectory()
     {
@@ -389,7 +359,6 @@ protected function getRootDirectory()
      * Get media directory
      *
      * @return \Magento\Framework\Filesystem\Directory\Read
-     * @since 2.0.0
      */
     protected function getMediaDirectory()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index 48c063d101769..f7f701b98f929 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -18,7 +18,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context extends \Magento\Framework\View\Element\Context
 {
@@ -26,7 +25,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * Logger instance
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -34,7 +32,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * Filesystem instance
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -42,7 +39,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * View file system
      *
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $_viewFileSystem;
 
@@ -50,7 +46,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * Template engine pool
      *
      * @var \Magento\Framework\View\TemplateEnginePool
-     * @since 2.0.0
      */
     protected $enginePool;
 
@@ -58,7 +53,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * Application state
      *
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
@@ -66,25 +60,21 @@ class Context extends \Magento\Framework\View\Element\Context
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     protected $_storeManager;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Element\Template\File\Resolver
-     * @since 2.0.0
      */
     protected $resolver;
 
     /**
      * @var \Magento\Framework\View\Element\Template\File\Validator
-     * @since 2.0.0
      */
     protected $validator;
 
@@ -117,7 +107,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * @param \Magento\Framework\View\Element\Template\File\Validator $validator
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
@@ -180,7 +169,6 @@ public function __construct(
      * Get template file resolver
      *
      * @return File\Resolver
-     * @since 2.0.0
      */
     public function getResolver()
     {
@@ -191,7 +179,6 @@ public function getResolver()
      * Get validator
      *
      * @return File\Validator
-     * @since 2.0.0
      */
     public function getValidator()
     {
@@ -202,7 +189,6 @@ public function getValidator()
      * Get filesystem instance
      *
      * @return \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     public function getFilesystem()
     {
@@ -213,7 +199,6 @@ public function getFilesystem()
      * Get logger instance
      *
      * @return \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     public function getLogger()
     {
@@ -224,7 +209,6 @@ public function getLogger()
      * Get view file system model
      *
      * @return \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     public function getViewFileSystem()
     {
@@ -235,7 +219,6 @@ public function getViewFileSystem()
      * Get the template engine pool instance
      *
      * @return \Magento\Framework\View\TemplateEnginePool
-     * @since 2.0.0
      */
     public function getEnginePool()
     {
@@ -246,7 +229,6 @@ public function getEnginePool()
      * Get app state object
      *
      * @return \Magento\Framework\App\State
-     * @since 2.0.0
      */
     public function getAppState()
     {
@@ -257,7 +239,6 @@ public function getAppState()
      * Get store manager
      *
      * @return \Magento\Store\Model\StoreManagerInterface
-     * @since 2.0.0
      */
     public function getStoreManager()
     {
@@ -266,7 +247,6 @@ public function getStoreManager()
 
     /**
      * @return \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     public function getPageConfig()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php b/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
index 41d8715d024a5..f5dda4e271165 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
@@ -11,7 +11,6 @@
 /**
  * Class Resolver
  * @package Magento\Framework\View\Element\Template\File
- * @since 2.0.0
  */
 class Resolver
 {
@@ -19,7 +18,6 @@ class Resolver
      * Template files map
      *
      * @var []
-     * @since 2.0.0
      */
     protected $_templateFilesMap = [];
 
@@ -27,7 +25,6 @@ class Resolver
      * View filesystem
      *
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $_viewFileSystem;
 
@@ -42,7 +39,6 @@ class Resolver
      *
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param Json $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
@@ -58,7 +54,6 @@ public function __construct(
      * @param string $template
      * @param [] $params
      * @return string|bool
-     * @since 2.0.0
      */
     public function getTemplateFileName($template, $params = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
index 9613df5bd9f54..4b4e7e1bad467 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
@@ -11,7 +11,6 @@
 /**
  * Class Validator
  * @package Magento\Framework\View\Element\Template\File
- * @since 2.0.0
  */
 class Validator
 {
@@ -24,7 +23,6 @@ class Validator
      * Template files map
      *
      * @var []
-     * @since 2.0.0
      */
     protected $_templatesValidationResults = [];
 
@@ -32,7 +30,6 @@ class Validator
      * View filesystem
      *
      * @var \Magento\Framework\FileSystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
@@ -40,7 +37,6 @@ class Validator
      * Allow symlinks flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isAllowSymlinks = false;
 
@@ -48,7 +44,6 @@ class Validator
      * Root directory
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $directory = null;
 
@@ -56,7 +51,6 @@ class Validator
      * Themes directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_themesDir;
 
@@ -64,7 +58,6 @@ class Validator
      * Application directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_appDir;
 
@@ -72,7 +65,6 @@ class Validator
      * Compiled templates directory
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_compiledDir;
 
@@ -83,7 +75,6 @@ class Validator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface
      * @param ComponentRegistrar $componentRegistrar
      * @param string|null $scope
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -109,7 +100,6 @@ public function __construct(
      *
      * @param string $filename
      * @return bool
-     * @since 2.0.0
      */
     public function isValid($filename)
     {
@@ -131,7 +121,6 @@ public function isValid($filename)
      * @param string $path
      * @param string|array $directories
      * @return bool
-     * @since 2.0.0
      */
     protected function isPathInDirectories($path, $directories)
     {
@@ -150,7 +139,6 @@ protected function isPathInDirectories($path, $directories)
      * Instantiates filesystem directory
      *
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected function getRootDirectory()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Text.php b/lib/internal/Magento/Framework/View/Element/Text.php
index da17bf9a7c1a4..687317576c358 100644
--- a/lib/internal/Magento/Framework/View/Element/Text.php
+++ b/lib/internal/Magento/Framework/View/Element/Text.php
@@ -9,7 +9,6 @@
  * Class Text
  *
  * @api
- * @since 2.0.0
  */
 class Text extends \Magento\Framework\View\Element\AbstractBlock
 {
@@ -18,7 +17,6 @@ class Text extends \Magento\Framework\View\Element\AbstractBlock
      *
      * @param string $text
      * @return $this
-     * @since 2.0.0
      */
     public function setText($text)
     {
@@ -30,7 +28,6 @@ public function setText($text)
      * Retrieve text data
      *
      * @return string
-     * @since 2.0.0
      */
     public function getText()
     {
@@ -43,7 +40,6 @@ public function getText()
      * @param string $text
      * @param bool $before
      * @return void
-     * @since 2.0.0
      */
     public function addText($text, $before = false)
     {
@@ -58,7 +54,6 @@ public function addText($text, $before = false)
      * Render html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Text/ListText.php b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
index 01baa35093031..a18ed78967139 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/ListText.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
@@ -11,7 +11,6 @@
  * Class ListText
  *
  * @api
- * @since 2.0.0
  */
 class ListText extends \Magento\Framework\View\Element\Text
 {
@@ -19,7 +18,6 @@ class ListText extends \Magento\Framework\View\Element\Text
      * Render html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php b/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
index e4aa2a4338bc7..db0749ccbc453 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Item
- * @since 2.0.0
  */
 class Item extends \Magento\Framework\View\Element\Text
 {
@@ -19,7 +18,6 @@ class Item extends \Magento\Framework\View\Element\Text
      * @param array|string $liParams
      * @param string $innerText
      * @return $this
-     * @since 2.0.0
      */
     public function setLink($liParams, $innerText)
     {
@@ -33,7 +31,6 @@ public function setLink($liParams, $innerText)
      * Render html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php b/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
index dea37b3aed1f7..c99d29f40b2ba 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Link
- * @since 2.0.0
  */
 class Link extends \Magento\Framework\View\Element\Text
 {
@@ -21,7 +20,6 @@ class Link extends \Magento\Framework\View\Element\Text
      * @param string $innerText
      * @param string $afterText
      * @return $this
-     * @since 2.0.0
      */
     public function setLink($liParams, $aParams, $innerText, $afterText = '')
     {
@@ -37,7 +35,6 @@ public function setLink($liParams, $aParams, $innerText, $afterText = '')
      * Render html output
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _toHtml()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
index d4c7d837822e4..c40d26ab2f500 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
@@ -10,19 +10,16 @@
 
 /**
  * Class ConfigurableObject
- * @since 2.0.0
  */
 class ConfigurableObject implements InterpreterInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     protected $argumentInterpreter;
 
@@ -31,7 +28,6 @@ class ConfigurableObject implements InterpreterInterface
      *
      * @param ObjectManagerInterface $objectManager
      * @param InterpreterInterface $argumentInterpreter
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, InterpreterInterface $argumentInterpreter)
     {
@@ -41,7 +37,6 @@ public function __construct(ObjectManagerInterface $objectManager, InterpreterIn
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php
index 4ded32220bb4b..9f3bb4b3192c1 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class ArrayObjectFactory
- * @since 2.0.0
  */
 class ArrayObjectFactory
 {
@@ -16,7 +15,6 @@ class ArrayObjectFactory
      *
      * @param array $data
      * @return \ArrayObject
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Converter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Converter.php
index a0087028823c8..c8498a752142e 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Converter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Converter.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Converter
- * @since 2.0.0
  */
 class Converter implements ConverterInterface
 {
@@ -36,7 +35,6 @@ class Converter implements ConverterInterface
 
     /**
      * @var Parser
-     * @since 2.0.0
      */
     protected $argumentParser;
 
@@ -44,7 +42,6 @@ class Converter implements ConverterInterface
      * Constructor
      *
      * @param Parser $argumentParser
-     * @since 2.0.0
      */
     public function __construct(Parser $argumentParser)
     {
@@ -59,7 +56,6 @@ public function __construct(Parser $argumentParser)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function toArray(\DOMNode $node)
     {
@@ -115,7 +111,6 @@ protected function toArray(\DOMNode $node)
      *
      * @param \DOMDocument|null $source
      * @return array
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
index 9905032dac172..6fdfad49ed468 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
@@ -10,7 +10,6 @@
 
 /**
  * Class DomMerger
- * @since 2.0.0
  */
 class DomMerger implements DomMergerInterface
 {
@@ -21,7 +20,6 @@ class DomMerger implements DomMergerInterface
 
     /**
      * @var \Magento\Framework\Config\ValidationStateInterface
-     * @since 2.0.0
      */
     private $validationState;
 
@@ -29,7 +27,6 @@ class DomMerger implements DomMergerInterface
      * Location schema file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $schemaFilePath;
 
@@ -37,7 +34,6 @@ class DomMerger implements DomMergerInterface
      * Result DOM document
      *
      * @var \DOMDocument
-     * @since 2.0.0
      */
     protected $domDocument;
 
@@ -45,7 +41,6 @@ class DomMerger implements DomMergerInterface
      * Id attribute list
      *
      * @var array
-     * @since 2.0.0
      */
     protected $idAttributes = [];
 
@@ -53,7 +48,6 @@ class DomMerger implements DomMergerInterface
      * Context XPath
      *
      * @var array
-     * @since 2.0.0
      */
     protected $contextXPath = [];
 
@@ -61,7 +55,6 @@ class DomMerger implements DomMergerInterface
      * Is merge simple XML Element
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $isMergeSimpleXMLElement;
 
@@ -78,7 +71,6 @@ class DomMerger implements DomMergerInterface
      * @param bool $isMergeSimpleXMLElement
      * @param array $contextXPath
      * @param array $idAttributes
-     * @since 2.0.0
      */
     public function __construct(
         ValidationStateInterface $validationState,
@@ -99,7 +91,6 @@ public function __construct(
      *
      * @param string $attributeName
      * @return bool
-     * @since 2.0.0
      */
     protected function isIdAttribute($attributeName)
     {
@@ -111,7 +102,6 @@ protected function isIdAttribute($attributeName)
      *
      * @param string $xPath
      * @return bool
-     * @since 2.0.0
      */
     protected function isMergeContext($xPath)
     {
@@ -128,7 +118,6 @@ protected function isMergeContext($xPath)
      *
      * @param array $xPath
      * @return bool
-     * @since 2.0.0
      */
     protected function isContextXPath(array $xPath)
     {
@@ -141,7 +130,6 @@ protected function isContextXPath(array $xPath)
      * @param \DOMElement $baseNode
      * @param \DOMNode $mergeNode
      * @return void
-     * @since 2.0.0
      */
     protected function mergeAttributes(\DOMElement $baseNode, \DOMNode $mergeNode)
     {
@@ -155,7 +143,6 @@ protected function mergeAttributes(\DOMElement $baseNode, \DOMNode $mergeNode)
      *
      * @param \DOMNode $node
      * @return string
-     * @since 2.0.0
      */
     protected function createXPath(\DOMNode $node)
     {
@@ -195,7 +182,6 @@ protected function createXPath(\DOMNode $node)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function nestedMerge(\DOMXPath $rootDomXPath, \DOMNodeList $insertedNodes, \DOMNode $contextNode)
     {
@@ -252,7 +238,6 @@ protected function nestedMerge(\DOMXPath $rootDomXPath, \DOMNodeList $insertedNo
      * @param \DOMNode $parentNode
      * @param \DOMNode $childNode
      * @return void
-     * @since 2.0.0
      */
     protected function appendChild(\DOMNode $parentNode, \DOMNode $childNode)
     {
@@ -266,7 +251,6 @@ protected function appendChild(\DOMNode $parentNode, \DOMNode $childNode)
      * @param \DOMNode $parentNode
      * @param \DOMNode $childNode
      * @return void
-     * @since 2.0.0
      */
     protected function insertBefore(\DOMNode $parentNode, \DOMNode $childNode)
     {
@@ -279,7 +263,6 @@ protected function insertBefore(\DOMNode $parentNode, \DOMNode $childNode)
      *
      * @param \DOMNode $node
      * @return bool
-     * @since 2.0.0
      */
     protected function isTextNode(\DOMNode $node)
     {
@@ -292,7 +275,6 @@ protected function isTextNode(\DOMNode $node)
      * @param \DOMNode $node
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     protected function hasIdAttribute(\DOMNode $node)
     {
@@ -320,7 +302,6 @@ protected function hasIdAttribute(\DOMNode $node)
      * @param \DOMElement $node
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function mergeNode(\DOMElement $node)
     {
@@ -334,7 +315,6 @@ public function mergeNode(\DOMElement $node)
      * @param string $xml
      * @return \DOMDocument
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function createDomDocument($xml)
     {
@@ -359,7 +339,6 @@ public function createDomDocument($xml)
      * @param string|null $schemaFilePath
      * @return array of errors
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function validateDomDocument(\DOMDocument $domDocument, $schema = null)
     {
@@ -382,7 +361,6 @@ protected function validateDomDocument(\DOMDocument $domDocument, $schema = null
      * @param \LibXMLError $errorInfo
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function renderErrorMessage(\LibXMLError $errorInfo)
     {
@@ -406,7 +384,6 @@ protected function renderErrorMessage(\LibXMLError $errorInfo)
      *
      * @param string $xml
      * @return void
-     * @since 2.0.0
      */
     public function merge($xml)
     {
@@ -422,7 +399,6 @@ public function merge($xml)
      *
      * @return \DOMDocument
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getDom()
     {
@@ -440,7 +416,6 @@ public function getDom()
      *
      * @param \DOMDocument $domDocument
      * @return void
-     * @since 2.0.0
      */
     public function setDom(\DOMDocument $domDocument)
     {
@@ -451,7 +426,6 @@ public function setDom(\DOMDocument $domDocument)
      * Unset DOM document
      *
      * @return void
-     * @since 2.0.0
      */
     public function unsetDom()
     {
@@ -463,7 +437,6 @@ public function unsetDom()
      *
      * @param string|null $schemaFilePath
      * @return array
-     * @since 2.0.0
      */
     public function validate($schemaFilePath = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMergerInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMergerInterface.php
index 301b95a4a1c29..71d5320f0a9d2 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMergerInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMergerInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface DomMergerInterface
- * @since 2.0.0
  */
 interface DomMergerInterface
 {
@@ -16,7 +15,6 @@ interface DomMergerInterface
      *
      * @param string $xml
      * @return void
-     * @since 2.0.0
      */
     public function merge($xml);
 
@@ -31,7 +29,6 @@ public function merge($xml);
      * @param \DOMElement $node
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function mergeNode(\DOMElement $node);
 
@@ -39,7 +36,6 @@ public function mergeNode(\DOMElement $node);
      * Get DOM document
      *
      * @return \DOMDocument
-     * @since 2.0.0
      */
     public function getDom();
 
@@ -48,7 +44,6 @@ public function getDom();
      *
      * @param \DOMDocument $domDocument
      * @return void
-     * @since 2.0.0
      */
     public function setDom(\DOMDocument $domDocument);
 
@@ -56,7 +51,6 @@ public function setDom(\DOMDocument $domDocument);
      * Unset DOM document
      *
      * @return void
-     * @since 2.0.0
      */
     public function unsetDom();
 
@@ -65,7 +59,6 @@ public function unsetDom();
      *
      * @param string $schemaFileName
      * @return array
-     * @since 2.0.0
      */
     public function validate($schemaFileName);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
index b7bbe272ad9cb..ab35c533aa303 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
@@ -12,7 +12,6 @@
 
 /**
  * Class AggregatedFileCollector
- * @since 2.0.0
  */
 class AggregatedFileCollector implements FileCollectorInterface
 {
@@ -20,19 +19,16 @@ class AggregatedFileCollector implements FileCollectorInterface
      * Search pattern
      *
      * @var string
-     * @since 2.0.0
      */
     protected $searchPattern;
 
     /**
      * @var CollectorInterface
-     * @since 2.0.0
      */
     protected $collectorAggregated;
 
     /**
      * @var DesignInterface
-     * @since 2.0.0
      */
     protected $design;
 
@@ -49,7 +45,6 @@ class AggregatedFileCollector implements FileCollectorInterface
      * @param DesignInterface $design
      * @param ReadFactory $readFactory
      * @param string $searchPattern
-     * @since 2.0.0
      */
     public function __construct(
         CollectorInterface $collectorAggregated,
@@ -69,7 +64,6 @@ public function __construct(
      * @param string|null $searchPattern
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     public function collectFiles($searchPattern = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollectorFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollectorFactory.php
index 336bfef5e5cbe..e2481a2351ced 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollectorFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollectorFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Class AggregatedFileCollectorFactory
- * @since 2.0.0
  */
 class AggregatedFileCollectorFactory
 {
@@ -18,7 +17,6 @@ class AggregatedFileCollectorFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,7 +24,6 @@ class AggregatedFileCollectorFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return AggregatedFileCollector
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollectorInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollectorInterface.php
index bc18deaaf0ac9..c5f70fc100434 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollectorInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollectorInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface FileCollectorInterface
- * @since 2.0.0
  */
 interface FileCollectorInterface
 {
@@ -16,7 +15,6 @@ interface FileCollectorInterface
      *
      * @param string|null $searchPattern
      * @return array
-     * @since 2.0.0
      */
     public function collectFiles($searchPattern = null);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
index b9b79c9abe6bf..dc1c73385b090 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface ManagerInterface
  * @deprecated 2.2.0 since 2.2.0
- * @since 2.0.0
  */
 interface ManagerInterface
 {
@@ -43,7 +42,6 @@ interface ManagerInterface
      * @param string $name
      * @return ManagerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function prepareData($name);
 
@@ -52,7 +50,6 @@ public function prepareData($name);
      *
      * @param string $name
      * @return array
-     * @since 2.0.0
      */
     public function getData($name);
 
@@ -61,7 +58,6 @@ public function getData($name);
      *
      * @param string $component
      * @return array
-     * @since 2.0.0
      */
     public function createRawComponentData($component);
 
@@ -70,7 +66,6 @@ public function createRawComponentData($component);
      *
      * @param string $name
      * @return UiReaderInterface
-     * @since 2.0.0
      */
     public function getReader($name);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
index 0365392e2055e..92058114322a5 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
@@ -14,7 +14,6 @@
 
 /**
  * Class Definition
- * @since 2.0.0
  */
 class Definition
 {
@@ -30,7 +29,6 @@ class Definition
 
     /**
      * @var CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -38,7 +36,6 @@ class Definition
      * UI component data
      *
      * @var \ArrayObject
-     * @since 2.0.0
      */
     protected $componentData;
 
@@ -54,7 +51,6 @@ class Definition
      * @param UiReaderInterface $uiReader
      * @param ArrayObjectFactory $arrayObjectFactory
      * @param CacheInterface $cache
-     * @since 2.0.0
      */
     public function __construct(
         UiReaderInterface $uiReader,
@@ -79,7 +75,6 @@ public function __construct(
      * @param string $name
      * @return array
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function getComponentData($name)
     {
@@ -95,7 +90,6 @@ public function getComponentData($name)
      * @param string $name
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setComponentData($name, array $data)
     {
@@ -107,7 +101,6 @@ public function setComponentData($name, array $data)
      *
      * @param array $componentsData
      * @return void
-     * @since 2.0.0
      */
     protected function prepareComponentData(array $componentsData)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
index 964e3d6a9adcd..06aa74af2037c 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Template
- * @since 2.0.0
  */
 class Template
 {
@@ -26,19 +25,16 @@ class Template
 
     /**
      * @var AggregatedFileCollector
-     * @since 2.0.0
      */
     protected $aggregatedFileCollector;
 
     /**
      * @var \Magento\Framework\View\Element\UiComponent\Config\DomMergerInterface
-     * @since 2.0.0
      */
     protected $domMerger;
 
     /**
      * @var \Magento\Framework\Config\CacheInterface
-     * @since 2.0.0
      */
     protected $cache;
 
@@ -46,19 +42,16 @@ class Template
      * Factory for UI config reader
      *
      * @var \Magento\Framework\View\Element\UiComponent\Config\ReaderFactory
-     * @since 2.0.0
      */
     protected $readerFactory;
 
     /**
      * @var AggregatedFileCollectorFactory
-     * @since 2.0.0
      */
     protected $aggregatedFileCollectorFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $cachedTemplates = [];
 
@@ -76,7 +69,6 @@ class Template
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param \Magento\Framework\View\Element\UiComponent\Config\ReaderFactory $readerFactory
      * @param AggregatedFileCollectorFactory $aggregatedFileCollectorFactory
-     * @since 2.0.0
      */
     public function __construct(
         AggregatedFileCollector $aggregatedFileCollector,
@@ -103,7 +95,6 @@ public function __construct(
      * @param string $template
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getTemplate($template)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
index 61802fa36c6fa..4d13e68b69a05 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Reader
- * @since 2.0.0
  */
 class Reader implements UiReaderInterface
 {
@@ -21,7 +20,6 @@ class Reader implements UiReaderInterface
      * DOM document merger
      *
      * @var DomMergerInterface
-     * @since 2.0.0
      */
     protected $domMerger;
 
@@ -29,7 +27,6 @@ class Reader implements UiReaderInterface
      * XML converter
      *
      * @var ConverterInterface
-     * @since 2.0.0
      */
     protected $converter;
 
@@ -39,7 +36,6 @@ class Reader implements UiReaderInterface
      * @param FileCollectorInterface $fileCollector
      * @param ConverterInterface $converter
      * @param DomMergerInterface $domMerger
-     * @since 2.0.0
      */
     public function __construct(
         FileCollectorInterface $fileCollector,
@@ -57,7 +53,6 @@ public function __construct(
      * @param array $fileList
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function readFiles(array $fileList)
     {
@@ -71,7 +66,6 @@ protected function readFiles(array $fileList)
      *
      * @param string $xmlContent
      * @return void
-     * @since 2.0.0
      */
     public function addXMLContent($xmlContent)
     {
@@ -83,7 +77,6 @@ public function addXMLContent($xmlContent)
      *
      * @param \DOMNode $node
      * @return void
-     * @since 2.0.0
      */
     public function addNode(\DOMNode $node)
     {
@@ -96,7 +89,6 @@ public function addNode(\DOMNode $node)
      * @param string|null $scope
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function read($scope = null)
     {
@@ -107,7 +99,6 @@ public function read($scope = null)
      * Get content from the merged files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent()
     {
@@ -118,7 +109,6 @@ public function getContent()
      * Get DOM document
      *
      * @return \DOMDocument
-     * @since 2.0.0
      */
     public function getDOMDocument()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ReaderFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ReaderFactory.php
index 21c3458bbf4ea..5cad10c3706fc 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ReaderFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ReaderFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Class ReaderFactory
- * @since 2.0.0
  */
 class ReaderFactory
 {
@@ -17,7 +16,6 @@ class ReaderFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class ReaderFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return UiReaderInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/UiReaderInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/UiReaderInterface.php
index 9d25a4d3fa22c..b174288dac736 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/UiReaderInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/UiReaderInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface UiReaderInterface
- * @since 2.0.0
  */
 interface UiReaderInterface extends ReaderInterface
 {
@@ -18,7 +17,6 @@ interface UiReaderInterface extends ReaderInterface
      *
      * @param string $xmlContent
      * @return void
-     * @since 2.0.0
      */
     public function addXMLContent($xmlContent);
 
@@ -26,7 +24,6 @@ public function addXMLContent($xmlContent);
      * Get content from the merged files
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContent();
 
@@ -34,7 +31,6 @@ public function getContent();
      * Get DOM document
      *
      * @return \DOMDocument
-     * @since 2.0.0
      */
     public function getDOMDocument();
 
@@ -43,7 +39,6 @@ public function getDOMDocument();
      *
      * @param \DOMNode $node
      * @return void
-     * @since 2.0.0
      */
     public function addNode(\DOMNode $node);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContainerInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContainerInterface.php
index d138c974be1ac..5c7bd19db09a5 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContainerInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContainerInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface ContainerInterface
- * @since 2.0.0
  */
 interface ContainerInterface extends BlockInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/AbstractContentType.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/AbstractContentType.php
index 8abd4cc9199f2..4bb2061c7254d 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/AbstractContentType.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/AbstractContentType.php
@@ -10,19 +10,16 @@
 
 /**
  * Class AbstractContentType
- * @since 2.0.0
  */
 abstract class AbstractContentType implements ContentTypeInterface
 {
     /**
      * @var FileSystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var TemplateEnginePool
-     * @since 2.0.0
      */
     protected $templateEnginePool;
 
@@ -31,7 +28,6 @@ abstract class AbstractContentType implements ContentTypeInterface
      *
      * @param FileSystem $filesystem
      * @param TemplateEnginePool $templateEnginePool
-     * @since 2.0.0
      */
     public function __construct(
         FileSystem $filesystem,
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeFactory.php
index f49cc613e0177..7f769b32653b7 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Class ContentTypeFactory
- * @since 2.0.0
  */
 class ContentTypeFactory
 {
@@ -17,7 +16,6 @@ class ContentTypeFactory
      * Content types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $types;
 
@@ -25,7 +23,6 @@ class ContentTypeFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -34,7 +31,6 @@ class ContentTypeFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $types
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, array $types)
     {
@@ -48,7 +44,6 @@ public function __construct(ObjectManagerInterface $objectManager, array $types)
      * @param string $type
      * @return ContentTypeInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function get($type)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeInterface.php
index baf0f6f230296..56aca259bd665 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/ContentTypeInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface ContentTypeInterface
- * @since 2.0.0
  */
 interface ContentTypeInterface
 {
@@ -19,7 +18,6 @@ interface ContentTypeInterface
      * @param UiComponentInterface $component
      * @param string $template
      * @return string
-     * @since 2.0.0
      */
     public function render(UiComponentInterface $component, $template = '');
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Html.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Html.php
index eed487330b010..a261551329bac 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Html.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Html.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Html
- * @since 2.0.0
  */
 class Html extends AbstractContentType
 {
@@ -19,7 +18,6 @@ class Html extends AbstractContentType
      * @param UiComponentInterface $component
      * @param string $template
      * @return string
-     * @since 2.0.0
      */
     public function render(UiComponentInterface $component, $template = '')
     {
@@ -38,7 +36,6 @@ public function render(UiComponentInterface $component, $template = '')
      * @param string $extension
      * @param string $template
      * @return string
-     * @since 2.0.0
      */
     protected function getTemplate($extension, $template)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
index c966e2abd3290..26a295c81f6cb 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Json
- * @since 2.0.0
  */
 class Json extends AbstractContentType
 {
@@ -21,7 +20,6 @@ class Json extends AbstractContentType
      * Generator structure instance
      *
      * @var Structure
-     * @since 2.0.0
      */
     private $structure;
 
@@ -29,7 +27,6 @@ class Json extends AbstractContentType
      * Encoder
      *
      * @var Encoder
-     * @since 2.0.0
      */
     private $encoder;
 
@@ -40,7 +37,6 @@ class Json extends AbstractContentType
      * @param TemplateEnginePool $templateEnginePool
      * @param Encoder $encoder
      * @param Structure $structure
-     * @since 2.0.0
      */
     public function __construct(
         FileSystem $filesystem,
@@ -61,7 +57,6 @@ public function __construct(
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function render(UiComponentInterface $component, $template = '')
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
index c0461d87b8158..98e966daef918 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
@@ -12,25 +12,21 @@
 
 /**
  * Class Xml
- * @since 2.0.0
  */
 class Xml extends AbstractContentType
 {
     /**
      * @var FileSystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
     /**
      * @var TemplateEnginePool
-     * @since 2.0.0
      */
     protected $templateEnginePool;
 
     /**
      * @var Generator
-     * @since 2.0.0
      */
     protected $generator;
 
@@ -40,7 +36,6 @@ class Xml extends AbstractContentType
      * @param FileSystem $filesystem
      * @param TemplateEnginePool $templateEnginePool
      * @param Generator $generator
-     * @since 2.0.0
      */
     public function __construct(
         FileSystem $filesystem,
@@ -58,7 +53,6 @@ public function __construct(
      * @param string $template
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function render(UiComponentInterface $view, $template = '')
     {
@@ -80,7 +74,6 @@ public function render(UiComponentInterface $view, $template = '')
     /**
      * @param UiComponentInterface $view
      * @return string
-     * @since 2.0.0
      */
     protected function getDataXml(UiComponentInterface $view)
     {
@@ -107,7 +100,6 @@ protected function getDataXml(UiComponentInterface $view)
      *
      * @param \Magento\Framework\DataObject $object
      * @return string
-     * @since 2.0.0
      */
     protected function objectToXml(\Magento\Framework\DataObject $object)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index d87882115e325..d0de695706c9a 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -21,19 +21,16 @@
  * Class Context
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Context implements ContextInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $namespace;
 
     /**
      * @var DataProviderInterface
-     * @since 2.0.0
      */
     protected $dataProvider;
 
@@ -41,7 +38,6 @@ class Context implements ContextInterface
      * Application request
      *
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -49,7 +45,6 @@ class Context implements ContextInterface
      * Factory renderer for a content type
      *
      * @var ContentTypeFactory
-     * @since 2.0.0
      */
     protected $contentTypeFactory;
 
@@ -57,25 +52,21 @@ class Context implements ContextInterface
      * Accept type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $acceptType;
 
     /**
      * @var PageLayoutInterface
-     * @since 2.0.0
      */
     protected $pageLayout;
 
     /**
      * @var ButtonProviderFactory
-     * @since 2.0.0
      */
     protected $buttonProviderFactory;
 
     /**
      * @var ActionPoolInterface
-     * @since 2.0.0
      */
     protected $actionPool;
 
@@ -83,7 +74,6 @@ class Context implements ContextInterface
      * Registry components
      *
      * @var array
-     * @since 2.0.0
      */
     protected $componentsDefinitions = [];
 
@@ -91,13 +81,11 @@ class Context implements ContextInterface
      * Url Builder
      *
      * @var UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
     /**
      * @var Processor
-     * @since 2.0.0
      */
     protected $processor;
 
@@ -113,7 +101,6 @@ class Context implements ContextInterface
      * @param DataProviderInterface|null $dataProvider
      * @param null $namespace
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         PageLayoutInterface $pageLayout,
@@ -146,7 +133,6 @@ public function __construct(
      * @param string $name
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function addComponentDefinition($name, array $config)
     {
@@ -162,7 +148,6 @@ public function addComponentDefinition($name, array $config)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getComponentsDefinitions()
     {
@@ -171,7 +156,6 @@ public function getComponentsDefinitions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRenderEngine()
     {
@@ -180,7 +164,6 @@ public function getRenderEngine()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNamespace()
     {
@@ -189,7 +172,6 @@ public function getNamespace()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAcceptType()
     {
@@ -198,7 +180,6 @@ public function getAcceptType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRequestParams()
     {
@@ -207,7 +188,6 @@ public function getRequestParams()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRequestParam($key, $defaultValue = null)
     {
@@ -216,7 +196,6 @@ public function getRequestParam($key, $defaultValue = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFiltersParams()
     {
@@ -225,7 +204,6 @@ public function getFiltersParams()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getFilterParam($key, $defaultValue = null)
     {
@@ -235,7 +213,6 @@ public function getFilterParam($key, $defaultValue = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataProvider()
     {
@@ -244,7 +221,6 @@ public function getDataProvider()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDataSourceData(UiComponentInterface $component)
     {
@@ -270,7 +246,6 @@ public function getDataSourceData(UiComponentInterface $component)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPageLayout()
     {
@@ -279,7 +254,6 @@ public function getPageLayout()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addButtons(array $buttons, UiComponentInterface $component)
     {
@@ -315,7 +289,6 @@ public function addButtons(array $buttons, UiComponentInterface $component)
      * @param array $itemA
      * @param array $itemB
      * @return int
-     * @since 2.0.0
      */
     public function sortButtons(array $itemA, array $itemB)
     {
@@ -343,7 +316,6 @@ public function addHtmlBlocks(array $htmlBlocks, UiComponentInterface $component
      * Getting requested accept type
      *
      * @return void
-     * @since 2.0.0
      */
     protected function setAcceptType()
     {
@@ -361,7 +333,6 @@ protected function setAcceptType()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setDataProvider(DataProviderInterface $dataProvider)
     {
@@ -370,7 +341,6 @@ public function setDataProvider(DataProviderInterface $dataProvider)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = [])
     {
@@ -383,7 +353,6 @@ public function getUrl($route = '', $params = [])
      * @param array $data
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     protected function prepareDataSource(array & $data, UiComponentInterface $component)
     {
@@ -398,7 +367,6 @@ protected function prepareDataSource(array & $data, UiComponentInterface $compon
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getProcessor()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextFactory.php
index 99ea25e5947d3..ca515e29d8a66 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Class ContextFactory
- * @since 2.0.0
  */
 class ContextFactory
 {
@@ -17,7 +16,6 @@ class ContextFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class ContextFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return ContextInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
index b06583d0729e4..efe18719746fa 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
@@ -13,7 +13,6 @@
 
 /**
  * Interface ContextInterface
- * @since 2.0.0
  */
 interface ContextInterface
 {
@@ -28,7 +27,6 @@ interface ContextInterface
      * @param string $name
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function addComponentDefinition($name, array $config);
 
@@ -36,7 +34,6 @@ public function addComponentDefinition($name, array $config);
      * Get components definitions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getComponentsDefinitions();
 
@@ -44,7 +41,6 @@ public function getComponentsDefinitions();
      * Getting root component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getNamespace();
 
@@ -52,7 +48,6 @@ public function getNamespace();
      * Getting accept type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getAcceptType();
 
@@ -61,7 +56,6 @@ public function getAcceptType();
      *
      * @param DataProviderInterface $dataProvider
      * @return void
-     * @since 2.0.0
      */
     public function setDataProvider(DataProviderInterface $dataProvider);
 
@@ -69,7 +63,6 @@ public function setDataProvider(DataProviderInterface $dataProvider);
      * Get data provider
      *
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function getDataProvider();
 
@@ -78,7 +71,6 @@ public function getDataProvider();
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function getDataSourceData(UiComponentInterface $component);
 
@@ -86,7 +78,6 @@ public function getDataSourceData(UiComponentInterface $component);
      * Getting all request data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getRequestParams();
 
@@ -96,7 +87,6 @@ public function getRequestParams();
      * @param string $key
      * @param mixed|null $defaultValue
      * @return mixed
-     * @since 2.0.0
      */
     public function getRequestParam($key, $defaultValue = null);
 
@@ -104,7 +94,6 @@ public function getRequestParam($key, $defaultValue = null);
      * Get filters params
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFiltersParams();
 
@@ -114,7 +103,6 @@ public function getFiltersParams();
      * @param string $key
      * @param null|string $defaultValue
      * @return mixed|null
-     * @since 2.0.0
      */
     public function getFilterParam($key, $defaultValue = null);
 
@@ -122,7 +110,6 @@ public function getFilterParam($key, $defaultValue = null);
      * Get root layout
      *
      * @return PageLayoutInterface
-     * @since 2.0.0
      */
     public function getPageLayout();
 
@@ -132,7 +119,6 @@ public function getPageLayout();
      * @param array $buttons
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function addButtons(array $buttons, UiComponentInterface $component);
 
@@ -150,7 +136,6 @@ public function addHtmlBlocks(array $htmlBlocks, UiComponentInterface $component
      * Get render engine
      *
      * @return ContentTypeInterface
-     * @since 2.0.0
      */
     public function getRenderEngine();
 
@@ -160,7 +145,6 @@ public function getRenderEngine();
      * @param   string $route
      * @param   array $params
      * @return  string
-     * @since 2.0.0
      */
     public function getUrl($route = '', $params = []);
 
@@ -168,7 +152,6 @@ public function getUrl($route = '', $params = []);
      * Get component processor
      *
      * @return Processor
-     * @since 2.0.0
      */
     public function getProcessor();
 
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolFactory.php
index cb30351c3daf7..126d0c37c29ca 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Class ActionPoolFactory
- * @since 2.0.0
  */
 class ActionPoolFactory
 {
@@ -17,7 +16,6 @@ class ActionPoolFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class ActionPoolFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return ActionPoolInterface
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolInterface.php
index c365e776d1c6e..f614f98f186ac 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ActionPoolInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Interface ActionPoolInterface
- * @since 2.0.0
  */
 interface ActionPoolInterface
 {
@@ -21,7 +20,6 @@ interface ActionPoolInterface
      * @param array $data
      * @param UiComponentInterface $context
      * @return void
-     * @since 2.0.0
      */
     public function add($key, array $data, UiComponentInterface $context);
 
@@ -30,7 +28,6 @@ public function add($key, array $data, UiComponentInterface $context);
      *
      * @param string $key
      * @return void
-     * @since 2.0.0
      */
     public function remove($key);
 
@@ -40,7 +37,6 @@ public function remove($key);
      * @param string $key
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function update($key, array $data);
 
@@ -48,7 +44,6 @@ public function update($key, array $data);
      * Get toolbar block
      *
      * @return bool|BlockInterface
-     * @since 2.0.0
      */
     public function getToolbar();
 
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderFactory.php
index 1931770c06005..5786523032f3b 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderFactory.php
@@ -9,13 +9,11 @@
 
 /**
  * Class ButtonProviderFactory
- * @since 2.0.0
  */
 class ButtonProviderFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class ButtonProviderFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -36,7 +33,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $providerClass
      * @param array $arguments
      * @return ButtonProviderInterface
-     * @since 2.0.0
      */
     public function create($providerClass, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderInterface.php
index 0ff3089726812..df00c87db034d 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ButtonProviderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ButtonProviderInterface
- * @since 2.0.0
  */
 interface ButtonProviderInterface
 {
@@ -15,7 +14,6 @@ interface ButtonProviderInterface
      * Retrieve button-specified settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function getButtonData();
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ControlInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ControlInterface.php
index e2288c31f539c..5fc30e652be86 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ControlInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Control/ControlInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface ControlInterface
- * @since 2.0.0
  */
 interface ControlInterface extends BlockInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/CollectionFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/CollectionFactory.php
index 00ffa06059bac..fac01f529e444 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/CollectionFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/CollectionFactory.php
@@ -11,26 +11,22 @@
 
 /**
  * Class CollectionPool
- * @since 2.0.0
  */
 class CollectionFactory
 {
     /**
      * @var Collection[]
-     * @since 2.0.0
      */
     protected $collections;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManagerInterface
      * @param array $collections
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManagerInterface,
@@ -46,7 +42,6 @@ public function __construct(
      * @param string $requestName
      * @return Collection
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getReport($requestName)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
index 92a7b0f4e7a2c..b2288a47f8f83 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
@@ -14,7 +14,6 @@
 
 /**
  * Class DataProvider
- * @since 2.0.0
  */
 class DataProvider implements DataProviderInterface
 {
@@ -22,7 +21,6 @@ class DataProvider implements DataProviderInterface
      * Data Provider name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -30,7 +28,6 @@ class DataProvider implements DataProviderInterface
      * Data Provider Primary Identifier name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $primaryFieldName;
 
@@ -38,13 +35,11 @@ class DataProvider implements DataProviderInterface
      * Data Provider Request Parameter Identifier name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $requestFieldName;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $meta = [];
 
@@ -52,37 +47,31 @@ class DataProvider implements DataProviderInterface
      * Provider configuration data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data = [];
 
     /**
      * @var ReportingInterface
-     * @since 2.0.0
      */
     protected $reporting;
 
     /**
      * @var FilterBuilder
-     * @since 2.0.0
      */
     protected $filterBuilder;
 
     /**
      * @var SearchCriteriaBuilder
-     * @since 2.0.0
      */
     protected $searchCriteriaBuilder;
 
     /**
      * @var RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var SearchCriteria
-     * @since 2.0.0
      */
     protected $searchCriteria;
 
@@ -96,7 +85,6 @@ class DataProvider implements DataProviderInterface
      * @param FilterBuilder $filterBuilder
      * @param array $meta
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         $name,
@@ -123,7 +111,6 @@ public function __construct(
 
     /**
      * @return void
-     * @since 2.0.0
      */
     protected function prepareUpdateUrl()
     {
@@ -152,7 +139,6 @@ protected function prepareUpdateUrl()
      * Get Data Provider name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -163,7 +149,6 @@ public function getName()
      * Get primary field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrimaryFieldName()
     {
@@ -174,7 +159,6 @@ public function getPrimaryFieldName()
      * Get field name in request
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestFieldName()
     {
@@ -183,7 +167,6 @@ public function getRequestFieldName()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMeta()
     {
@@ -195,7 +178,6 @@ public function getMeta()
      *
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldSetMetaInfo($fieldSetName)
     {
@@ -205,7 +187,6 @@ public function getFieldSetMetaInfo($fieldSetName)
     /**
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldsMetaInfo($fieldSetName)
     {
@@ -216,7 +197,6 @@ public function getFieldsMetaInfo($fieldSetName)
      * @param string $fieldSetName
      * @param string $fieldName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldMetaInfo($fieldSetName, $fieldName)
     {
@@ -227,7 +207,6 @@ public function getFieldMetaInfo($fieldSetName, $fieldName)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
@@ -240,7 +219,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
      * @param string $field
      * @param string $direction
      * @return void
-     * @since 2.0.0
      */
     public function addOrder($field, $direction)
     {
@@ -253,7 +231,6 @@ public function addOrder($field, $direction)
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function setLimit($offset, $size)
     {
@@ -264,7 +241,6 @@ public function setLimit($offset, $size)
     /**
      * @param SearchResultInterface $searchResult
      * @return array
-     * @since 2.0.0
      */
     protected function searchResultToOutput(SearchResultInterface $searchResult)
     {
@@ -288,7 +264,6 @@ protected function searchResultToOutput(SearchResultInterface $searchResult)
      * Returns search criteria
      *
      * @return \Magento\Framework\Api\Search\SearchCriteria
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -303,7 +278,6 @@ public function getSearchCriteria()
      * Get data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -314,7 +288,6 @@ public function getData()
      * Get config data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfigData()
     {
@@ -326,7 +299,6 @@ public function getConfigData()
      *
      * @param mixed $config
      * @return void
-     * @since 2.0.0
      */
     public function setConfigData($config)
     {
@@ -337,7 +309,6 @@ public function setConfigData($config)
      * Returns Search result
      *
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function getSearchResult()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
index d458e8ddea320..9f3121f4e495d 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
@@ -11,7 +11,6 @@
  * Interface DataProviderInterface
  *
  * @api
- * @since 2.0.0
  */
 interface DataProviderInterface
 {
@@ -19,7 +18,6 @@ interface DataProviderInterface
      * Get Data Provider name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -27,7 +25,6 @@ public function getName();
      * Get config data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getConfigData();
 
@@ -36,13 +33,11 @@ public function getConfigData();
      *
      * @param mixed $config
      * @return void
-     * @since 2.0.0
      */
     public function setConfigData($config);
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMeta();
 
@@ -50,7 +45,6 @@ public function getMeta();
      * @param string $fieldSetName
      * @param string $fieldName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldMetaInfo($fieldSetName, $fieldName);
 
@@ -59,14 +53,12 @@ public function getFieldMetaInfo($fieldSetName, $fieldName);
      *
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldSetMetaInfo($fieldSetName);
 
     /**
      * @param string $fieldSetName
      * @return array
-     * @since 2.0.0
      */
     public function getFieldsMetaInfo($fieldSetName);
 
@@ -74,7 +66,6 @@ public function getFieldsMetaInfo($fieldSetName);
      * Get primary field name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPrimaryFieldName();
 
@@ -82,7 +73,6 @@ public function getPrimaryFieldName();
      * Get field name in request
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRequestFieldName();
 
@@ -90,7 +80,6 @@ public function getRequestFieldName();
      * Get data
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getData();
 
@@ -99,7 +88,6 @@ public function getData();
      *
      * @param \Magento\Framework\Api\Filter $filter
      * @return mixed
-     * @since 2.0.0
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter);
 
@@ -109,7 +97,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter);
      * @param string $field
      * @param string $direction
      * @return void
-     * @since 2.0.0
      */
     public function addOrder($field, $direction);
 
@@ -119,7 +106,6 @@ public function addOrder($field, $direction);
      * @param int $offset
      * @param int $size
      * @return void
-     * @since 2.0.0
      */
     public function setLimit($offset, $size);
 
@@ -127,13 +113,11 @@ public function setLimit($offset, $size);
      * Returns search criteria
      *
      * @return \Magento\Framework\Api\Search\SearchCriteriaInterface
-     * @since 2.0.0
      */
     public function getSearchCriteria();
 
     /**
      * @return \Magento\Framework\Api\Search\SearchResultInterface
-     * @since 2.0.0
      */
     public function getSearchResult();
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
index 8cf1814c26c73..1562f879ec6b6 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
@@ -11,25 +11,21 @@
 
 /**
  * Class Document
- * @since 2.0.0
  */
 class Document extends DataObject implements DocumentInterface
 {
     /**
      * @var string|int
-     * @since 2.0.0
      */
     protected $id;
 
     /**
      * @var AttributeValueFactory
-     * @since 2.0.0
      */
     protected $attributeValueFactory;
 
     /**
      * @param AttributeValueFactory $attributeValueFactory
-     * @since 2.0.0
      */
     public function __construct(AttributeValueFactory $attributeValueFactory)
     {
@@ -38,7 +34,6 @@ public function __construct(AttributeValueFactory $attributeValueFactory)
 
     /**
      * @return int|string
-     * @since 2.0.0
      */
     public function getId()
     {
@@ -51,7 +46,6 @@ public function getId()
     /**
      * @param int $id
      * @return void
-     * @since 2.0.0
      */
     public function setId($id)
     {
@@ -63,7 +57,6 @@ public function setId($id)
      *
      * @param string $attributeCode
      * @return \Magento\Framework\Api\AttributeInterface|null
-     * @since 2.0.0
      */
     public function getCustomAttribute($attributeCode)
     {
@@ -80,7 +73,6 @@ public function getCustomAttribute($attributeCode)
      * @param string $attributeCode
      * @param mixed $attributeValue
      * @return $this
-     * @since 2.0.0
      */
     public function setCustomAttribute($attributeCode, $attributeValue)
     {
@@ -92,7 +84,6 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      * Retrieve custom attributes values.
      *
      * @return \Magento\Framework\Api\AttributeInterface[]|null
-     * @since 2.0.0
      */
     public function getCustomAttributes()
     {
@@ -110,7 +101,6 @@ public function getCustomAttributes()
      * @param \Magento\Framework\Api\AttributeInterface[] $attributes
      * @return $this
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function setCustomAttributes(array $attributes)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterApplierInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterApplierInterface.php
index c0780d1efcce5..f52a4d055c746 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterApplierInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterApplierInterface.php
@@ -11,7 +11,6 @@
 
 /**
  * Interface FilterApplierInterface
- * @since 2.0.0
  */
 interface FilterApplierInterface
 {
@@ -21,7 +20,6 @@ interface FilterApplierInterface
      * @param Collection $collection
      * @param Filter $filter
      * @return void
-     * @since 2.0.0
      */
     public function apply(Collection $collection, Filter $filter);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
index 2e4b06333ca1e..24ea542649875 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
@@ -13,19 +13,16 @@
  * Class FilterPool
  *
  * @api
- * @since 2.0.0
  */
 class FilterPool
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $appliers;
 
     /**
      * @param array $appliers
-     * @since 2.0.0
      */
     public function __construct(array $appliers = [])
     {
@@ -36,7 +33,6 @@ public function __construct(array $appliers = [])
      * @param Collection $collection
      * @param SearchCriteriaInterface $criteria
      * @return void
-     * @since 2.0.0
      */
     public function applyFilters(Collection $collection, SearchCriteriaInterface $criteria)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index 331ae63f1563a..7c6570917db4f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -12,7 +12,6 @@
 
 /**
  * Class Fulltext
- * @since 2.0.0
  */
 class FulltextFilter implements FilterApplierInterface
 {
@@ -22,7 +21,6 @@ class FulltextFilter implements FilterApplierInterface
      * @param AbstractDb $collection
      * @param string $indexTable
      * @return array
-     * @since 2.0.0
      */
     protected function getFulltextIndexColumns(AbstractDb $collection, $indexTable)
     {
@@ -71,7 +69,6 @@ function ($column) use ($alias) {
      * @param Collection $collection
      * @param Filter $filter
      * @return void
-     * @since 2.0.0
      */
     public function apply(Collection $collection, Filter $filter)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
index 49aa24705cf4d..bcae4dd89cbe9 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
@@ -11,7 +11,6 @@
 
 /**
  * Class RegularFilter
- * @since 2.0.0
  */
 class RegularFilter implements FilterApplierInterface
 {
@@ -21,7 +20,6 @@ class RegularFilter implements FilterApplierInterface
      * @param Collection $collection
      * @param Filter $filter
      * @return void
-     * @since 2.0.0
      */
     public function apply(Collection $collection, Filter $filter)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Reporting.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Reporting.php
index d251030e2bac0..b5aeba5dcb89f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Reporting.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Reporting.php
@@ -11,26 +11,22 @@
 
 /**
  * Class Reporting
- * @since 2.0.0
  */
 class Reporting implements ReportingInterface
 {
     /**
      * @var CollectionFactory
-     * @since 2.0.0
      */
     protected $collectionFactory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $filterPool;
 
     /**
      * @param CollectionFactory $collectionFactory
      * @param FilterPool $filterPool
-     * @since 2.0.0
      */
     public function __construct(
         CollectionFactory $collectionFactory,
@@ -43,7 +39,6 @@ public function __construct(
     /**
      * @param SearchCriteriaInterface $searchCriteria
      * @return SearchResultInterface
-     * @since 2.0.0
      */
     public function search(SearchCriteriaInterface $searchCriteria)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
index 2844c57d17901..632905433b221 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
@@ -19,25 +19,21 @@
  * Class SearchResult
  * Generic Search Result
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SearchResult extends AbstractCollection implements Api\Search\SearchResultInterface
 {
     /**
      * @var Api\Search\AggregationInterface
-     * @since 2.0.0
      */
     protected $aggregations;
 
     /**
      * @var Api\Search\SearchCriteriaInterface
-     * @since 2.0.0
      */
     protected $searchCriteria;
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $totalCount;
 
@@ -70,7 +66,6 @@ class SearchResult extends AbstractCollection implements Api\Search\SearchResult
      * @param null|string $identifierName
      * @param null|string $connectionName
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -117,7 +112,6 @@ private function getResourceConnection()
 
     /**
      * @return \Magento\Framework\Api\Search\AggregationInterface
-     * @since 2.0.0
      */
     public function getAggregations()
     {
@@ -141,7 +135,6 @@ public function getResource()
     /**
      * @param \Magento\Framework\Api\Search\AggregationInterface $aggregations
      * @return void
-     * @since 2.0.0
      */
     public function setAggregations($aggregations)
     {
@@ -150,7 +143,6 @@ public function setAggregations($aggregations)
 
     /**
      * @return \Magento\Framework\Api\Search\SearchCriteriaInterface|null
-     * @since 2.0.0
      */
     public function getSearchCriteria()
     {
@@ -161,7 +153,6 @@ public function getSearchCriteria()
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -171,7 +162,6 @@ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface
 
     /**
      * @return int
-     * @since 2.0.0
      */
     public function getTotalCount()
     {
@@ -184,7 +174,6 @@ public function getTotalCount()
     /**
      * @param int $totalCount
      * @return $this
-     * @since 2.0.0
      */
     public function setTotalCount($totalCount)
     {
@@ -197,7 +186,6 @@ public function setTotalCount($totalCount)
      *
      * @param Document[] $items
      * @return $this
-     * @since 2.0.0
      */
     public function setItems(array $items = null)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataSourceInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataSourceInterface.php
index 4badaf8d12509..1640b7287fd19 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataSourceInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataSourceInterface.php
@@ -10,13 +10,11 @@
 
 /**
  * Interface DataSourceInterface
- * @since 2.0.0
  */
 interface DataSourceInterface extends UiComponentInterface
 {
     /**
      * @return DataProviderInterface
-     * @since 2.0.0
      */
     public function getDataProvider();
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/JsConfigInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/JsConfigInterface.php
index 688f59998c992..7db83117bf63f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/JsConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/JsConfigInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface JsConfigInterface
- * @since 2.0.0
  */
 interface JsConfigInterface extends UiComponentInterface
 {
@@ -18,7 +17,6 @@ interface JsConfigInterface extends UiComponentInterface
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function getJsConfig(UiComponentInterface $component);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/LayoutInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/LayoutInterface.php
index 7b098bea38a36..bcffda04b6768 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/LayoutInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/LayoutInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface LayoutInterface
- * @since 2.0.0
  */
 interface LayoutInterface
 {
@@ -26,7 +25,6 @@ interface LayoutInterface
     /**
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function build(UiComponentInterface $component);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ObserverInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ObserverInterface.php
index 7a68825f63fbe..18ec1879bc032 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ObserverInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ObserverInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface ObserverInterface
- * @since 2.0.0
  */
 interface ObserverInterface
 {
@@ -18,7 +17,6 @@ interface ObserverInterface
      *
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function update(UiComponentInterface $component);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/PoolInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/PoolInterface.php
index 3809f24882d9f..565bf5bf00780 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/PoolInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/PoolInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface PoolInterface
- * @since 2.0.0
  */
 interface PoolInterface
 {
@@ -18,7 +17,6 @@ interface PoolInterface
      *
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function register(UiComponentInterface $component);
 
@@ -26,7 +24,6 @@ public function register(UiComponentInterface $component);
      * Retrieve components pool
      *
      * @return UiComponentInterface[]
-     * @since 2.0.0
      */
     public function getComponents();
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
index 90629ed04bf76..f8554e001fb4e 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
@@ -9,13 +9,11 @@
 
 /**
  * Class Processor
- * @since 2.0.0
  */
 class Processor implements PoolInterface, SubjectInterface
 {
     /**
      * @var UiComponentInterface[]
-     * @since 2.0.0
      */
     protected $components = [];
 
@@ -28,13 +26,11 @@ class Processor implements PoolInterface, SubjectInterface
      * ]
      *
      * @var array
-     * @since 2.0.0
      */
     protected $observers = [];
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function register(UiComponentInterface $component)
     {
@@ -43,7 +39,6 @@ public function register(UiComponentInterface $component)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function getComponents()
     {
@@ -52,7 +47,6 @@ public function getComponents()
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function attach($type, ObserverInterface $observer)
     {
@@ -61,7 +55,6 @@ public function attach($type, ObserverInterface $observer)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function detach($type, ObserverInterface $observer)
     {
@@ -77,7 +70,6 @@ public function detach($type, ObserverInterface $observer)
 
     /**
      * @inheritDoc
-     * @since 2.0.0
      */
     public function notify($type)
     {
@@ -104,7 +96,6 @@ public function notify($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     protected function normalizeType($type)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/SubjectInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/SubjectInterface.php
index a5dccd0739b73..dce42950e0ab6 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/SubjectInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/SubjectInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface SubjectInterface
- * @since 2.0.0
  */
 interface SubjectInterface
 {
@@ -16,7 +15,6 @@ interface SubjectInterface
      * @param string $type
      * @param ObserverInterface $observer
      * @return void
-     * @since 2.0.0
      */
     public function attach($type, ObserverInterface $observer);
 
@@ -25,7 +23,6 @@ public function attach($type, ObserverInterface $observer);
      * @param string $type
      * @param ObserverInterface $observer
      * @return void
-     * @since 2.0.0
      */
     public function detach($type, ObserverInterface $observer);
 
@@ -33,7 +30,6 @@ public function detach($type, ObserverInterface $observer);
      * Notify an observer(s) by type
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     public function notify($type);
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
index f24a07f959b3e..e8c6faf88225d 100755
--- a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
@@ -23,7 +23,6 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class UiComponentFactory extends DataObject
 {
@@ -31,7 +30,6 @@ class UiComponentFactory extends DataObject
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -39,13 +37,11 @@ class UiComponentFactory extends DataObject
      * Argument interpreter
      *
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     protected $argumentInterpreter;
 
     /**
      * @var ContextFactory
-     * @since 2.0.0
      */
     protected $contextFactory;
 
@@ -54,7 +50,6 @@ class UiComponentFactory extends DataObject
      *
      * @deprecated 2.2.0 since 2.2.0
      * @var ManagerInterface
-     * @since 2.0.0
      */
     protected $componentManager;
 
@@ -85,7 +80,6 @@ class UiComponentFactory extends DataObject
      * @param array $data
      * @param array $componentChildFactories
      * @param DataInterface|null $definitionData
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -116,7 +110,6 @@ public function __construct(
      * @param string $identifier
      * @param array $arguments
      * @return UiComponentInterface
-     * @since 2.0.0
      */
     protected function createChildComponent(
         array &$bundleComponents,
@@ -170,7 +163,6 @@ protected function createChildComponent(
      * @param string $identifier
      * @param array $componentData
      * @return array
-     * @since 2.0.0
      */
     protected function argumentsResolver($identifier, array $componentData)
     {
@@ -197,7 +189,6 @@ protected function argumentsResolver($identifier, array $componentData)
      * @return UiComponentInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function create($identifier, $name = null, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
index 939722e29f2f3..b5c3546084fcb 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
@@ -11,7 +11,6 @@
  * Interface UiComponentInterface
  *
  * @api
- * @since 2.0.0
  */
 interface UiComponentInterface extends BlockInterface
 {
@@ -19,7 +18,6 @@ interface UiComponentInterface extends BlockInterface
      * Get component instance name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 
@@ -27,7 +25,6 @@ public function getName();
      * Get component name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getComponentName();
 
@@ -35,7 +32,6 @@ public function getComponentName();
      * Get component configuration
      *
      * @return array
-     * @since 2.0.0
      */
     public function getConfiguration();
 
@@ -43,7 +39,6 @@ public function getConfiguration();
      * Render component
      *
      * @return string
-     * @since 2.0.0
      */
     public function render();
 
@@ -53,14 +48,12 @@ public function render();
      * @param string $name
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     public function addComponent($name, UiComponentInterface $component);
 
     /**
      * @param string $name
      * @return UiComponentInterface
-     * @since 2.0.0
      */
     public function getComponent($name);
 
@@ -68,7 +61,6 @@ public function getComponent($name);
      * Get child components
      *
      * @return UiComponentInterface[]
-     * @since 2.0.0
      */
     public function getChildComponents();
 
@@ -76,7 +68,6 @@ public function getChildComponents();
      * Get template
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTemplate();
 
@@ -84,7 +75,6 @@ public function getTemplate();
      * Get component context
      *
      * @return ContextInterface
-     * @since 2.0.0
      */
     public function getContext();
 
@@ -93,7 +83,6 @@ public function getContext();
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     public function renderChildComponent($name);
 
@@ -103,7 +92,6 @@ public function renderChildComponent($name);
      * @param string|array $key
      * @param mixed $value
      * @return void
-     * @since 2.0.0
      */
     public function setData($key, $value = null);
 
@@ -113,7 +101,6 @@ public function setData($key, $value = null);
      * @param string $key
      * @param string|int $index
      * @return mixed
-     * @since 2.0.0
      */
     public function getData($key = '', $index = null);
 
@@ -121,7 +108,6 @@ public function getData($key = '', $index = null);
      * Prepare component configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepare();
 
@@ -130,7 +116,6 @@ public function prepare();
      *
      * @param array $dataSource
      * @return array
-     * @since 2.0.0
      */
     public function prepareDataSource(array $dataSource);
 
@@ -138,7 +123,6 @@ public function prepareDataSource(array $dataSource);
      * Get Data Source data
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDataSourceData();
 }
diff --git a/lib/internal/Magento/Framework/View/File.php b/lib/internal/Magento/Framework/View/File.php
index 81cb8fb7f22e8..02d35a7d4c3db 100644
--- a/lib/internal/Magento/Framework/View/File.php
+++ b/lib/internal/Magento/Framework/View/File.php
@@ -10,7 +10,6 @@
 
 /**
  * View file in the file system with context of its identity
- * @since 2.0.0
  */
 class File
 {
@@ -18,7 +17,6 @@ class File
      * File name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $filename;
 
@@ -26,7 +24,6 @@ class File
      * Module
      *
      * @var string
-     * @since 2.0.0
      */
     protected $module;
 
@@ -34,7 +31,6 @@ class File
      * Theme
      *
      * @var ThemeInterface
-     * @since 2.0.0
      */
     protected $theme;
 
@@ -42,7 +38,6 @@ class File
      * Base flag
      *
      * @var string
-     * @since 2.0.0
      */
     protected $isBase;
 
@@ -50,7 +45,6 @@ class File
      * Identifier
      *
      * @var string
-     * @since 2.0.0
      */
     protected $identifier;
 
@@ -61,7 +55,6 @@ class File
      * @param string $module
      * @param ThemeInterface $theme
      * @param bool $isBase
-     * @since 2.0.0
      */
     public function __construct($filename, $module, ThemeInterface $theme = null, $isBase = false)
     {
@@ -75,7 +68,6 @@ public function __construct($filename, $module, ThemeInterface $theme = null, $i
      * Retrieve full filename
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFilename()
     {
@@ -86,7 +78,6 @@ public function getFilename()
      * Retrieve name of a file without a directory path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -97,7 +88,6 @@ public function getName()
      * Retrieve fully-qualified name of a module a file belongs to
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModule()
     {
@@ -108,7 +98,6 @@ public function getModule()
      * Retrieve instance of a theme a file belongs to
      *
      * @return ThemeInterface|null
-     * @since 2.0.0
      */
     public function getTheme()
     {
@@ -119,7 +108,6 @@ public function getTheme()
      * Whether file is a base one
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isBase()
     {
@@ -130,7 +118,6 @@ public function isBase()
      * Calculate unique identifier for a view file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getFileIdentifier()
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Base.php b/lib/internal/Magento/Framework/View/File/Collector/Base.php
index 46051a1cf211b..a5824b7321e84 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Base.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Base.php
@@ -13,25 +13,21 @@
 
 /**
  * Source of base files introduced by modules
- * @since 2.0.0
  */
 class Base implements CollectorInterface
 {
     /**
      * @var DirSearch
-     * @since 2.0.0
      */
     protected $componentDirSearch;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $subDir;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     private $fileFactory;
 
@@ -41,7 +37,6 @@ class Base implements CollectorInterface
      * @param DirSearch $dirSearch
      * @param FileFactory $fileFactory
      * @param string $subDir
-     * @since 2.0.0
      */
     public function __construct(
         DirSearch $dirSearch,
@@ -59,7 +54,6 @@ public function __construct(
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleDependency.php b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleDependency.php
index dd415c53ea5af..593b7e9944826 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleDependency.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleDependency.php
@@ -13,7 +13,6 @@
 
 /**
  * Decorator that sorts view files according to dependencies between modules they belong to
- * @since 2.0.0
  */
 class ModuleDependency implements CollectorInterface
 {
@@ -21,7 +20,6 @@ class ModuleDependency implements CollectorInterface
      * Subject
      *
      * @var CollectorInterface
-     * @since 2.0.0
      */
     private $subject;
 
@@ -29,7 +27,6 @@ class ModuleDependency implements CollectorInterface
      * Module list
      *
      * @var ModuleListInterface
-     * @since 2.0.0
      */
     private $moduleList;
 
@@ -37,7 +34,6 @@ class ModuleDependency implements CollectorInterface
      * Fully-qualified names of modules, ordered by their priority in the system
      *
      * @var array|null
-     * @since 2.0.0
      */
     private $orderedModules;
 
@@ -46,7 +42,6 @@ class ModuleDependency implements CollectorInterface
      *
      * @param CollectorInterface $subject
      * @param ModuleListInterface $listInterface
-     * @since 2.0.0
      */
     public function __construct(
         CollectorInterface $subject,
@@ -62,7 +57,6 @@ public function __construct(
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
@@ -77,7 +71,6 @@ public function getFiles(ThemeInterface $theme, $filePath)
      * @param File $fileOne
      * @param File $fileTwo
      * @return int
-     * @since 2.0.0
      */
     public function compareFiles(File $fileOne, File $fileTwo)
     {
@@ -97,7 +90,6 @@ public function compareFiles(File $fileOne, File $fileTwo)
      *
      * @param string $moduleName
      * @return int
-     * @since 2.0.0
      */
     protected function getModulePriority($moduleName)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
index 062873e20a088..34f32b2f6b7b2 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
@@ -13,7 +13,6 @@
 
 /**
  * Decorator that filters out view files that belong to modules, output of which is prohibited
- * @since 2.0.0
  */
 class ModuleOutput implements CollectorInterface
 {
@@ -21,7 +20,6 @@ class ModuleOutput implements CollectorInterface
      * Subject
      *
      * @var CollectorInterface
-     * @since 2.0.0
      */
     private $subject;
 
@@ -29,7 +27,6 @@ class ModuleOutput implements CollectorInterface
      * Module manager
      *
      * @var \Magento\Framework\Module\Manager
-     * @since 2.0.0
      */
     private $moduleManager;
 
@@ -38,7 +35,6 @@ class ModuleOutput implements CollectorInterface
      *
      * @param CollectorInterface $subject
      * @param Manager $moduleManager
-     * @since 2.0.0
      */
     public function __construct(
         CollectorInterface $subject,
@@ -56,7 +52,6 @@ public function __construct(
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php b/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
index 753755529baf6..b0e3903b21c05 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
@@ -16,7 +16,6 @@
 
 /**
  * Source of view files that explicitly override base files introduced by modules
- * @since 2.0.0
  */
 class Base implements CollectorInterface
 {
@@ -24,7 +23,6 @@ class Base implements CollectorInterface
      * Pattern helper
      *
      * @var PathPattern
-     * @since 2.0.0
      */
     private $pathPatternHelper;
 
@@ -32,7 +30,6 @@ class Base implements CollectorInterface
      * File factory
      *
      * @var FileFactory
-     * @since 2.0.0
      */
     private $fileFactory;
 
@@ -40,7 +37,6 @@ class Base implements CollectorInterface
      * Directory factory
      *
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $readDirFactory;
 
@@ -48,7 +44,6 @@ class Base implements CollectorInterface
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -56,7 +51,6 @@ class Base implements CollectorInterface
      * Sub-directory path
      *
      * @var string
-     * @since 2.0.0
      */
     private $subDir;
 
@@ -68,7 +62,6 @@ class Base implements CollectorInterface
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param PathPattern $pathPatternHelper
      * @param string $subDir
-     * @since 2.0.0
      */
     public function __construct(
         FileFactory $fileFactory,
@@ -90,7 +83,6 @@ public function __construct(
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php b/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
index 15bfec33ed53a..0be91956be84c 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
@@ -16,7 +16,6 @@
 
 /**
  * Source of view files that explicitly override modular files of ancestor themes
- * @since 2.0.0
  */
 class ThemeModular implements CollectorInterface
 {
@@ -24,7 +23,6 @@ class ThemeModular implements CollectorInterface
      * Path pattern helper
      *
      * @var \Magento\Framework\View\Helper\PathPattern
-     * @since 2.0.0
      */
     private $pathPatternHelper;
 
@@ -32,7 +30,6 @@ class ThemeModular implements CollectorInterface
      * View file factopry
      *
      * @var FileFactory
-     * @since 2.0.0
      */
     private $fileFactory;
 
@@ -40,7 +37,6 @@ class ThemeModular implements CollectorInterface
      * Read directory factory
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadFactory
-     * @since 2.0.0
      */
     private $readDirFactory;
 
@@ -48,7 +44,6 @@ class ThemeModular implements CollectorInterface
      * Component registrar
      *
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -56,7 +51,6 @@ class ThemeModular implements CollectorInterface
      * Sub-directory path
      *
      * @var string
-     * @since 2.0.0
      */
     private $subDir;
 
@@ -68,7 +62,6 @@ class ThemeModular implements CollectorInterface
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param PathPattern $pathPatternHelper
      * @param string $subDir
-     * @since 2.0.0
      */
     public function __construct(
         FileFactory $fileFactory,
@@ -91,7 +84,6 @@ public function __construct(
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Theme.php b/lib/internal/Magento/Framework/View/File/Collector/Theme.php
index 8f7afc2236be9..000142ea1ebe3 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Theme.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Theme.php
@@ -15,7 +15,6 @@
 
 /**
  * Source of view files introduced by a theme
- * @since 2.0.0
  */
 class Theme implements CollectorInterface
 {
@@ -26,7 +25,6 @@ class Theme implements CollectorInterface
      * @param ReadFactory $readDirFactory
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param string $subDir
-     * @since 2.0.0
      */
     public function __construct(
         FileFactory $fileFactory,
@@ -47,7 +45,6 @@ public function __construct(
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/Collector/ThemeModular.php b/lib/internal/Magento/Framework/View/File/Collector/ThemeModular.php
index 22a9981558c62..00312ed36bcd0 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/ThemeModular.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/ThemeModular.php
@@ -15,37 +15,31 @@
 
 /**
  * Source of modular view files introduced by a theme
- * @since 2.0.0
  */
 class ThemeModular implements CollectorInterface
 {
     /**
      * @var PathPattern
-     * @since 2.0.0
      */
     private $pathPatternHelper;
 
     /**
      * @var FileFactory
-     * @since 2.0.0
      */
     private $fileFactory;
 
     /**
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $readDirFactory;
 
     /**
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $subDir;
 
@@ -57,7 +51,6 @@ class ThemeModular implements CollectorInterface
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param PathPattern $pathPatternHelper
      * @param string $subDir
-     * @since 2.0.0
      */
     public function __construct(
         FileFactory $fileFactory,
@@ -79,7 +72,6 @@ public function __construct(
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/File/CollectorInterface.php b/lib/internal/Magento/Framework/View/File/CollectorInterface.php
index ca5434f7b7299..31554d2a79238 100644
--- a/lib/internal/Magento/Framework/View/File/CollectorInterface.php
+++ b/lib/internal/Magento/Framework/View/File/CollectorInterface.php
@@ -11,7 +11,6 @@
  * Interface of locating view files in the file system
  *
  * @api
- * @since 2.0.0
  */
 interface CollectorInterface
 {
@@ -27,7 +26,6 @@ interface CollectorInterface
      * @param ThemeInterface $theme Theme that defines the design context
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath);
 }
diff --git a/lib/internal/Magento/Framework/View/File/Factory.php b/lib/internal/Magento/Framework/View/File/Factory.php
index ad379d189ffc9..9feef441fc142 100644
--- a/lib/internal/Magento/Framework/View/File/Factory.php
+++ b/lib/internal/Magento/Framework/View/File/Factory.php
@@ -11,7 +11,6 @@
 
 /**
  * Factory that produces view file instances
- * @since 2.0.0
  */
 class Factory
 {
@@ -19,7 +18,6 @@ class Factory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -27,7 +25,6 @@ class Factory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -42,7 +39,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param ThemeInterface|null $theme
      * @param bool $isBase
      * @return \Magento\Framework\View\File
-     * @since 2.0.0
      */
     public function create($filename, $module = '', ThemeInterface $theme = null, $isBase = false)
     {
diff --git a/lib/internal/Magento/Framework/View/File/FileList.php b/lib/internal/Magento/Framework/View/File/FileList.php
index 6c742cb9636db..7b2b064e7e4fa 100644
--- a/lib/internal/Magento/Framework/View/File/FileList.php
+++ b/lib/internal/Magento/Framework/View/File/FileList.php
@@ -11,7 +11,6 @@
 
 /**
  * Unordered list of view file instances with awareness of view file identity
- * @since 2.0.0
  */
 class FileList
 {
@@ -19,7 +18,6 @@ class FileList
      * Array of files
      *
      * @var File[]
-     * @since 2.0.0
      */
     protected $files = [];
 
@@ -27,7 +25,6 @@ class FileList
      * Collator
      *
      * @var \Magento\Framework\View\File\FileList\CollateInterface
-     * @since 2.0.0
      */
     protected $collator;
 
@@ -35,7 +32,6 @@ class FileList
      * Constructor
      *
      * @param \Magento\Framework\View\File\FileList\CollateInterface $collator
-     * @since 2.0.0
      */
     public function __construct(CollateInterface $collator)
     {
@@ -46,7 +42,6 @@ public function __construct(CollateInterface $collator)
      * Retrieve all view file instances
      *
      * @return File[]
-     * @since 2.0.0
      */
     public function getAll()
     {
@@ -59,7 +54,6 @@ public function getAll()
      * @param \Magento\Framework\View\File[] $files
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function add(array $files)
     {
@@ -80,7 +74,6 @@ public function add(array $files)
      *
      * @param File[] $files
      * @return void
-     * @since 2.0.0
      */
     public function replace(array $files)
     {
diff --git a/lib/internal/Magento/Framework/View/File/FileList/CollateInterface.php b/lib/internal/Magento/Framework/View/File/FileList/CollateInterface.php
index 61fb2d479015d..63724d797e317 100644
--- a/lib/internal/Magento/Framework/View/File/FileList/CollateInterface.php
+++ b/lib/internal/Magento/Framework/View/File/FileList/CollateInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * View file list collate interface
- * @since 2.0.0
  */
 interface CollateInterface
 {
@@ -18,7 +17,6 @@ interface CollateInterface
      * @param \Magento\Framework\View\File[] $files
      * @param \Magento\Framework\View\File[] $filesOrigin
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function collate($files, $filesOrigin);
 }
diff --git a/lib/internal/Magento/Framework/View/File/FileList/Collator.php b/lib/internal/Magento/Framework/View/File/FileList/Collator.php
index 61056b1593c59..d48ed02358ec5 100644
--- a/lib/internal/Magento/Framework/View/File/FileList/Collator.php
+++ b/lib/internal/Magento/Framework/View/File/FileList/Collator.php
@@ -8,7 +8,6 @@
 
 /**
  * View file list collator
- * @since 2.0.0
  */
 class Collator implements CollateInterface
 {
@@ -19,7 +18,6 @@ class Collator implements CollateInterface
      * @param \Magento\Framework\View\File[] $filesOrigin
      * @return \Magento\Framework\View\File[]
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function collate($files, $filesOrigin)
     {
diff --git a/lib/internal/Magento/Framework/View/File/FileList/Factory.php b/lib/internal/Magento/Framework/View/File/FileList/Factory.php
index 4a9c0e04d9814..d39e18333f25a 100644
--- a/lib/internal/Magento/Framework/View/File/FileList/Factory.php
+++ b/lib/internal/Magento/Framework/View/File/FileList/Factory.php
@@ -10,7 +10,6 @@
 
 /**
  * Factory that produces view file list instances
- * @since 2.0.0
  */
 class Factory
 {
@@ -23,7 +22,6 @@ class Factory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -31,7 +29,6 @@ class Factory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -44,7 +41,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $instanceName
      * @return \Magento\Framework\View\File\FileList
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function create($instanceName = self::FILE_LIST_COLLATOR)
     {
diff --git a/lib/internal/Magento/Framework/View/FileSystem.php b/lib/internal/Magento/Framework/View/FileSystem.php
index 9ddda40c23c6a..db269345eab98 100644
--- a/lib/internal/Magento/Framework/View/FileSystem.php
+++ b/lib/internal/Magento/Framework/View/FileSystem.php
@@ -9,37 +9,31 @@
  * Model that finds file paths by their fileId
  *
  * @api
- * @since 2.0.0
  */
 class FileSystem
 {
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\File
-     * @since 2.0.0
      */
     protected $_fileResolution;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile
-     * @since 2.0.0
      */
     protected $_templateFileResolution;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\LocaleFile
-     * @since 2.0.0
      */
     protected $_localeFileResolution;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile
-     * @since 2.0.0
      */
     protected $_staticFileResolution;
 
     /**
      * @var \Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile
-     * @since 2.0.0
      */
     protected $_emailTemplateFileResolution;
 
@@ -47,7 +41,6 @@ class FileSystem
      * View service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $_assetRepo;
 
@@ -60,7 +53,6 @@ class FileSystem
      * @param \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile $fallbackStaticFile
      * @param \Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile $fallbackEmailTemplateFile
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\FileResolution\Fallback\File $fallbackFile,
@@ -84,7 +76,6 @@ public function __construct(
      * @param string $fileId
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getFilename($fileId, array $params = [])
     {
@@ -106,7 +97,6 @@ public function getFilename($fileId, array $params = [])
      * @param string $file
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getLocaleFileName($file, array $params = [])
     {
@@ -121,7 +111,6 @@ public function getLocaleFileName($file, array $params = [])
      * @param string $fileId
      * @param array $params
      * @return string|bool
-     * @since 2.0.0
      */
     public function getTemplateFileName($fileId, array $params = [])
     {
@@ -142,7 +131,6 @@ public function getTemplateFileName($fileId, array $params = [])
      * @param string $fileId
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     public function getStaticFileName($fileId, array $params = [])
     {
@@ -164,7 +152,6 @@ public function getStaticFileName($fileId, array $params = [])
      * @param array $params
      * @param string $module
      * @return string|bool
-     * @since 2.0.0
      */
     public function getEmailTemplateFileName($fileId, array $params, $module)
     {
@@ -180,7 +167,6 @@ public function getEmailTemplateFileName($fileId, array $params, $module)
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public static function normalizePath($path)
     {
@@ -218,7 +204,6 @@ public static function normalizePath($path)
      * @param string $relatedPath
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public static function offsetPath($relatedPath, $path)
     {
@@ -240,7 +225,6 @@ public static function offsetPath($relatedPath, $path)
      * @param string $relativeTo
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public static function getRelatedPath($relativeTo, $path)
     {
@@ -253,7 +237,6 @@ public static function getRelatedPath($relativeTo, $path)
      * @param string $pathOne
      * @param string $pathTwo
      * @return array
-     * @since 2.0.0
      */
     private static function ltrimSamePart($pathOne, $pathTwo)
     {
diff --git a/lib/internal/Magento/Framework/View/Helper/Js.php b/lib/internal/Magento/Framework/View/Helper/Js.php
index fd79e5949bf68..6107429d50061 100644
--- a/lib/internal/Magento/Framework/View/Helper/Js.php
+++ b/lib/internal/Magento/Framework/View/Helper/Js.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\View\Helper\Js
  *
- * @since 2.0.0
  */
 class Js
 {
@@ -21,7 +20,6 @@ class Js
      *
      * @param   string $script
      * @return  string
-     * @since 2.0.0
      */
     public function getScript($script)
     {
diff --git a/lib/internal/Magento/Framework/View/Helper/PathPattern.php b/lib/internal/Magento/Framework/View/Helper/PathPattern.php
index 18cb51f1a531e..03658f608e3dd 100644
--- a/lib/internal/Magento/Framework/View/Helper/PathPattern.php
+++ b/lib/internal/Magento/Framework/View/Helper/PathPattern.php
@@ -7,7 +7,6 @@
 
 /**
  * Path pattern creation helper
- * @since 2.0.0
  */
 class PathPattern
 {
@@ -16,7 +15,6 @@ class PathPattern
      *
      * @param string $path
      * @return string
-     * @since 2.0.0
      */
     public function translatePatternFromGlob($path)
     {
@@ -37,7 +35,6 @@ public function translatePatternFromGlob($path)
      *
      * @param string $pattern
      * @return string
-     * @since 2.0.0
      */
     protected function translateGroupsFromGlob($pattern)
     {
@@ -64,7 +61,6 @@ protected function translateGroupsFromGlob($pattern)
      *
      * @param string $pattern
      * @return string
-     * @since 2.0.0
      */
     protected function translateCharacterGroupsFromGlob($pattern)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php
index 8e091cc6fb915..e59c24468b1ad 100755
--- a/lib/internal/Magento/Framework/View/Layout.php
+++ b/lib/internal/Magento/Framework/View/Layout.php
@@ -25,7 +25,6 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @since 2.0.0
  */
 class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Framework\View\LayoutInterface
 {
@@ -39,7 +38,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Layout Update module
      *
      * @var \Magento\Framework\View\Layout\ProcessorInterface
-     * @since 2.0.0
      */
     protected $_update;
 
@@ -47,7 +45,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Blocks registry
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_blocks = [];
 
@@ -55,7 +52,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Cache of elements to output during rendering
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_output = [];
 
@@ -63,7 +59,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Helper blocks cache for this layout
      *
      * @var array
-     * @since 2.0.0
      */
     protected $sharedBlocks = [];
 
@@ -71,7 +66,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * A variable for transporting output into observer during rendering
      *
      * @var \Magento\Framework\DataObject
-     * @since 2.0.0
      */
     protected $_renderingOutput;
 
@@ -79,7 +73,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Cache of generated elements' HTML
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_renderElementCache = [];
 
@@ -87,7 +80,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Layout structure model
      *
      * @var Layout\Data\Structure
-     * @since 2.0.0
      */
     protected $structure;
 
@@ -95,7 +87,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Renderers registered for particular name
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_renderers = [];
 
@@ -103,91 +94,76 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $_eventManager;
 
     /**
      * @var \Magento\Framework\View\Layout\ProcessorFactory
-     * @since 2.0.0
      */
     protected $_processorFactory;
 
     /**
      * @var \Magento\Framework\Message\ManagerInterface
-     * @since 2.0.0
      */
     protected $messageManager;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isPrivate = false;
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ResolverInterface
-     * @since 2.0.0
      */
     protected $themeResolver;
 
     /**
      * @var Layout\ReaderPool
-     * @since 2.0.0
      */
     protected $readerPool;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $cacheable;
 
     /**
      * @var \Magento\Framework\View\Layout\GeneratorPool
-     * @since 2.0.0
      */
     protected $generatorPool;
 
     /**
      * @var \Magento\Framework\View\Layout\BuilderInterface
-     * @since 2.0.0
      */
     protected $builder;
 
     /**
      * @var FrontendInterface
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var Layout\Reader\ContextFactory
-     * @since 2.0.0
      */
     protected $readerContextFactory;
 
     /**
      * @var Layout\Generator\ContextFactory
-     * @since 2.0.0
      */
     protected $generatorContextFactory;
 
     /**
      * @var Layout\Reader\Context
-     * @since 2.0.0
      */
     protected $readerContext;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -212,7 +188,6 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @param \Psr\Log\LoggerInterface $logger
      * @param bool $cacheable
      * @param SerializerInterface|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ProcessorFactory $processorFactory,
@@ -252,7 +227,6 @@ public function __construct(
     /**
      * @param Layout\GeneratorPool $generatorPool
      * @return $this
-     * @since 2.0.0
      */
     public function setGeneratorPool(Layout\GeneratorPool $generatorPool)
     {
@@ -263,7 +237,6 @@ public function setGeneratorPool(Layout\GeneratorPool $generatorPool)
     /**
      * @param Layout\BuilderInterface $builder
      * @return $this
-     * @since 2.0.0
      */
     public function setBuilder(Layout\BuilderInterface $builder)
     {
@@ -275,7 +248,6 @@ public function setBuilder(Layout\BuilderInterface $builder)
      * Build layout blocks from generic layouts and/or page configurations
      *
      * @return void
-     * @since 2.0.0
      */
     protected function build()
     {
@@ -287,7 +259,6 @@ protected function build()
     /**
      * TODO Will be eliminated in MAGETWO-28359
      * @return void
-     * @since 2.0.0
      */
     public function publicBuild()
     {
@@ -299,7 +270,6 @@ public function publicBuild()
      *
      * Destructor should be called explicitly in order to work around the PHP bug
      * https://bugs.php.net/bug.php?id=62468
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -315,7 +285,6 @@ public function __destruct()
      * Retrieve the layout update instance
      *
      * @return \Magento\Framework\View\Layout\ProcessorInterface
-     * @since 2.0.0
      */
     public function getUpdate()
     {
@@ -330,7 +299,6 @@ public function getUpdate()
      * Layout xml generation
      *
      * @return $this
-     * @since 2.0.0
      */
     public function generateXml()
     {
@@ -344,7 +312,6 @@ public function generateXml()
      * Create structure of elements from the loaded XML configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function generateElements()
     {
@@ -386,7 +353,6 @@ public function generateElements()
      * Add parent containers to output
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function addToOutputRootContainers()
     {
@@ -404,7 +370,6 @@ protected function addToOutputRootContainers()
      * @param string $parentName
      * @param string $alias
      * @return bool|\Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function getChildBlock($parentName, $alias)
     {
@@ -423,7 +388,6 @@ public function getChildBlock($parentName, $alias)
      * @param string $elementName
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function setChild($parentName, $elementName, $alias)
     {
@@ -444,7 +408,6 @@ public function setChild($parentName, $elementName, $alias)
      * @param string|int|null $offsetOrSibling
      * @param bool $after
      * @return void
-     * @since 2.0.0
      */
     public function reorderChild($parentName, $childName, $offsetOrSibling, $after = true)
     {
@@ -458,7 +421,6 @@ public function reorderChild($parentName, $childName, $offsetOrSibling, $after =
      * @param string $parentName
      * @param string $alias
      * @return $this
-     * @since 2.0.0
      */
     public function unsetChild($parentName, $alias)
     {
@@ -472,7 +434,6 @@ public function unsetChild($parentName, $alias)
      *
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     public function getChildNames($parentName)
     {
@@ -487,7 +448,6 @@ public function getChildNames($parentName)
      *
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     public function getChildBlocks($parentName)
     {
@@ -508,7 +468,6 @@ public function getChildBlocks($parentName)
      * @param string $parentName
      * @param string $alias
      * @return bool|string
-     * @since 2.0.0
      */
     public function getChildName($parentName, $alias)
     {
@@ -522,7 +481,6 @@ public function getChildName($parentName, $alias)
      * @param string $name
      * @param bool $useCache
      * @return string
-     * @since 2.0.0
      */
     public function renderElement($name, $useCache = true)
     {
@@ -549,7 +507,6 @@ public function renderElement($name, $useCache = true)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     protected function displayElement($name)
     {
@@ -567,7 +524,6 @@ protected function displayElement($name)
      * @param string $name
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function renderNonCachedElement($name)
     {
@@ -596,7 +552,6 @@ public function renderNonCachedElement($name)
      * @param string $name
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _renderBlock($name)
     {
@@ -610,7 +565,6 @@ protected function _renderBlock($name)
      * @param string $name
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _renderUiComponent($name)
     {
@@ -623,7 +577,6 @@ protected function _renderUiComponent($name)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function _renderContainer($name)
     {
@@ -659,7 +612,6 @@ protected function _renderContainer($name)
      * @param string $blockName
      * @param string $parentGroupName
      * @return bool
-     * @since 2.0.0
      */
     public function addToParentGroup($blockName, $parentGroupName)
     {
@@ -673,7 +625,6 @@ public function addToParentGroup($blockName, $parentGroupName)
      * @param string $blockName
      * @param string $groupName
      * @return array
-     * @since 2.0.0
      */
     public function getGroupChildNames($blockName, $groupName)
     {
@@ -686,7 +637,6 @@ public function getGroupChildNames($blockName, $groupName)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function hasElement($name)
     {
@@ -700,7 +650,6 @@ public function hasElement($name)
      * @param string $name
      * @param string $attribute
      * @return mixed
-     * @since 2.0.0
      */
     public function getElementProperty($name, $attribute)
     {
@@ -713,7 +662,6 @@ public function getElementProperty($name, $attribute)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isBlock($name)
     {
@@ -729,7 +677,6 @@ public function isBlock($name)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isUiComponent($name)
     {
@@ -745,7 +692,6 @@ public function isUiComponent($name)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isContainer($name)
     {
@@ -761,7 +707,6 @@ public function isContainer($name)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isManipulationAllowed($name)
     {
@@ -776,7 +721,6 @@ public function isManipulationAllowed($name)
      * @param string $name
      * @param \Magento\Framework\View\Element\AbstractBlock $block
      * @return $this
-     * @since 2.0.0
      */
     public function setBlock($name, $block)
     {
@@ -789,7 +733,6 @@ public function setBlock($name, $block)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function unsetElement($name)
     {
@@ -809,7 +752,6 @@ public function unsetElement($name)
      * @param string $name
      * @param array $arguments
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function createBlock($type, $name = '', array $arguments = [])
     {
@@ -827,7 +769,6 @@ public function createBlock($type, $name = '', array $arguments = [])
      * @param string $name
      * @param array $arguments
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function _createBlock($type, $name, array $arguments = [])
     {
@@ -846,7 +787,6 @@ protected function _createBlock($type, $name, array $arguments = [])
      * @param string $parent
      * @param string $alias
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function addBlock($block, $name = '', $parent = '', $alias = '')
     {
@@ -879,7 +819,6 @@ public function addBlock($block, $name = '', $parent = '', $alias = '')
      * @param string $parent
      * @param string $alias
      * @return void
-     * @since 2.0.0
      */
     public function addContainer($name, $label, array $options = [], $parent = '', $alias = '')
     {
@@ -900,7 +839,6 @@ public function addContainer($name, $label, array $options = [], $parent = '', $
      * @param string $oldName
      * @param string $newName
      * @return bool
-     * @since 2.0.0
      */
     public function renameElement($oldName, $newName)
     {
@@ -920,7 +858,6 @@ public function renameElement($oldName, $newName)
      * Retrieve all blocks from registry as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllBlocks()
     {
@@ -933,7 +870,6 @@ public function getAllBlocks()
      *
      * @param string $name
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getBlock($name)
     {
@@ -950,7 +886,6 @@ public function getBlock($name)
      *
      * @param string $name
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
-     * @since 2.0.0
      */
     public function getUiComponent($name)
     {
@@ -962,7 +897,6 @@ public function getUiComponent($name)
      *
      * @param string $childName
      * @return bool|string
-     * @since 2.0.0
      */
     public function getParentName($childName)
     {
@@ -975,7 +909,6 @@ public function getParentName($childName)
      *
      * @param string $name
      * @return bool|string
-     * @since 2.0.0
      */
     public function getElementAlias($name)
     {
@@ -988,7 +921,6 @@ public function getElementAlias($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function addOutputElement($name)
     {
@@ -1001,7 +933,6 @@ public function addOutputElement($name)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function removeOutputElement($name)
     {
@@ -1015,7 +946,6 @@ public function removeOutputElement($name)
      * Get all blocks marked for output
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOutput()
     {
@@ -1031,7 +961,6 @@ public function getOutput()
      * Retrieve messages block
      *
      * @return \Magento\Framework\View\Element\Messages
-     * @since 2.0.0
      */
     public function getMessagesBlock()
     {
@@ -1049,7 +978,6 @@ public function getMessagesBlock()
      * @param string $type
      * @return \Magento\Framework\App\Helper\AbstractHelper
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function getBlockSingleton($type)
     {
@@ -1072,7 +1000,6 @@ public function getBlockSingleton($type)
      * @param string $template
      * @param array $data
      * @return $this
-     * @since 2.0.0
      */
     public function addAdjustableRenderer($namespace, $staticType, $dynamicType, $type, $template, $data = [])
     {
@@ -1089,7 +1016,6 @@ public function addAdjustableRenderer($namespace, $staticType, $dynamicType, $ty
      * @param string $staticType
      * @param string $dynamicType
      * @return array|null
-     * @since 2.0.0
      */
     public function getRendererOptions($namespace, $staticType, $dynamicType)
     {
@@ -1111,7 +1037,6 @@ public function getRendererOptions($namespace, $staticType, $dynamicType)
      * @param string $dynamicType
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function executeRenderer($namespace, $staticType, $dynamicType, $data = [])
     {
@@ -1135,7 +1060,6 @@ public function executeRenderer($namespace, $staticType, $dynamicType, $data = [
      * @param string|array $messageGroups
      * @return void
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function initMessages($messageGroups = [])
     {
@@ -1152,7 +1076,6 @@ public function initMessages($messageGroups = [])
      *
      * @param array $messageGroups
      * @return array
-     * @since 2.0.0
      */
     protected function _prepareMessageGroup($messageGroups)
     {
@@ -1168,7 +1091,6 @@ protected function _prepareMessageGroup($messageGroups)
      * Check is exists non-cacheable layout elements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCacheable()
     {
@@ -1181,7 +1103,6 @@ public function isCacheable()
      * Check is exists non-cacheable layout elements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isPrivate()
     {
@@ -1193,7 +1114,6 @@ public function isPrivate()
      *
      * @param bool $isPrivate
      * @return Layout
-     * @since 2.0.0
      */
     public function setIsPrivate($isPrivate = true)
     {
@@ -1205,7 +1125,6 @@ public function setIsPrivate($isPrivate = true)
      * Getter and lazy loader for xml element
      *
      * @return \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     protected function getXml()
     {
@@ -1219,7 +1138,6 @@ protected function getXml()
      * Getter and lazy loader for reader context
      *
      * @return Layout\Reader\Context
-     * @since 2.0.0
      */
     public function getReaderContext()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
index 55c134fddadec..ea9fef369e312 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/DataObject.php
@@ -10,26 +10,22 @@
 
 /**
  * Interpreter that instantiates object by a class name
- * @since 2.0.0
  */
 class DataObject implements InterpreterInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string|null
-     * @since 2.0.0
      */
     private $expectedClass;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string|null $expectedClass
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, $expectedClass = null)
     {
@@ -42,7 +38,6 @@ public function __construct(ObjectManagerInterface $objectManager, $expectedClas
      * @return object
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Decorator/Updater.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Decorator/Updater.php
index d81cbd644f3f3..15dab36ee7e59 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Decorator/Updater.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Decorator/Updater.php
@@ -10,26 +10,22 @@
 
 /**
  * Interpreter decorator that passes value, computed by subject of decoration, through the sequence of "updaters"
- * @since 2.0.0
  */
 class Updater implements InterpreterInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     private $subject;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param InterpreterInterface $subject
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, InterpreterInterface $subject)
     {
@@ -40,7 +36,6 @@ public function __construct(ObjectManagerInterface $objectManager, InterpreterIn
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
@@ -63,7 +58,6 @@ public function evaluate(array $data)
      * @param string $updaterClass
      * @return mixed
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     protected function applyUpdater($value, $updaterClass)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/HelperMethod.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/HelperMethod.php
index 4ab488e26244a..288c2b3364bdf 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/HelperMethod.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/HelperMethod.php
@@ -10,26 +10,22 @@
 
 /**
  * Interpreter that returns invocation result of a helper method
- * @since 2.0.0
  */
 class HelperMethod implements InterpreterInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var NamedParams
-     * @since 2.0.0
      */
     private $paramsInterpreter;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param NamedParams $paramsInterpreter
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, NamedParams $paramsInterpreter)
     {
@@ -40,7 +36,6 @@ public function __construct(ObjectManagerInterface $objectManager, NamedParams $
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/NamedParams.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/NamedParams.php
index 1b1ee607c7c7b..93aaab9af3e1d 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/NamedParams.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/NamedParams.php
@@ -9,7 +9,6 @@
 
 /**
  * Interpreter of named parameters
- * @since 2.0.0
  */
 class NamedParams implements InterpreterInterface
 {
@@ -17,13 +16,11 @@ class NamedParams implements InterpreterInterface
      * Interpreter of individual parameter
      *
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     private $paramInterpreter;
 
     /**
      * @param InterpreterInterface $paramInterpreter
-     * @since 2.0.0
      */
     public function __construct(InterpreterInterface $paramInterpreter)
     {
@@ -34,7 +31,6 @@ public function __construct(InterpreterInterface $paramInterpreter)
      * {@inheritdoc}
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Options.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Options.php
index 4718aa6cd5694..1ba39cbea408c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Options.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Options.php
@@ -10,19 +10,16 @@
 
 /**
  * Interpreter that retrieves options from an option source model
- * @since 2.0.0
  */
 class Options implements InterpreterInterface
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @return array Format: array(array('value' => <value>, 'label' => '<label>'), ...)
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
index b1e431696e2b2..95b91bdedcaff 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
@@ -9,14 +9,12 @@
 
 /**
  * Interpreter that pass through params
- * @since 2.0.0
  */
 class Passthrough implements InterpreterInterface
 {
     /**
      * {@inheritdoc}
      * @return array
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Url.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Url.php
index dd234626adfe3..40effdfe11d0c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Url.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Url.php
@@ -10,26 +10,22 @@
 
 /**
  * Interpreter that builds URL by input path and optional parameters
- * @since 2.0.0
  */
 class Url implements InterpreterInterface
 {
     /**
      * @var UrlInterface
-     * @since 2.0.0
      */
     private $urlResolver;
 
     /**
      * @var NamedParams
-     * @since 2.0.0
      */
     private $paramsInterpreter;
 
     /**
      * @param UrlInterface $urlResolver
      * @param NamedParams $paramsInterpreter
-     * @since 2.0.0
      */
     public function __construct(UrlInterface $urlResolver, NamedParams $paramsInterpreter)
     {
@@ -41,7 +37,6 @@ public function __construct(UrlInterface $urlResolver, NamedParams $paramsInterp
      * {@inheritdoc}
      * @return string
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Parser.php b/lib/internal/Magento/Framework/View/Layout/Argument/Parser.php
index bf703d8529b13..cf7386b172009 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Parser.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Parser.php
@@ -11,13 +11,11 @@
 
 /**
  * Parser of a layout argument node that returns its array representation with no data loss
- * @since 2.0.0
  */
 class Parser
 {
     /**
      * @var FlatConverter
-     * @since 2.0.0
      */
     private $converter;
 
@@ -26,7 +24,6 @@ class Parser
      *
      * @param \DOMNode $argumentNode
      * @return array|string
-     * @since 2.0.0
      */
     public function parse(\DOMNode $argumentNode)
     {
@@ -38,7 +35,6 @@ public function parse(\DOMNode $argumentNode)
      * Retrieve instance of XML converter, suitable for layout argument nodes
      *
      * @return FlatConverter
-     * @since 2.0.0
      */
     protected function getConverter()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/UpdaterInterface.php b/lib/internal/Magento/Framework/View/Layout/Argument/UpdaterInterface.php
index 2cf6553a96242..93c6d83dd69ba 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/UpdaterInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/UpdaterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface of value modification with no value loss
- * @since 2.0.0
  */
 interface UpdaterInterface
 {
@@ -16,7 +15,6 @@ interface UpdaterInterface
      *
      * @param mixed $value
      * @return mixed
-     * @since 2.0.0
      */
     public function update($value);
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/Builder.php b/lib/internal/Magento/Framework/View/Layout/Builder.php
index e28a869f17926..aa6ce53ee1cde 100644
--- a/lib/internal/Magento/Framework/View/Layout/Builder.php
+++ b/lib/internal/Magento/Framework/View/Layout/Builder.php
@@ -12,31 +12,26 @@
 
 /**
  * Class Builder
- * @since 2.0.0
  */
 class Builder implements BuilderInterface
 {
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isBuilt = false;
 
@@ -44,7 +39,6 @@ class Builder implements BuilderInterface
      * @param View\LayoutInterface $layout
      * @param App\Request\Http $request
      * @param Event\ManagerInterface $eventManager
-     * @since 2.0.0
      */
     public function __construct(
         View\LayoutInterface $layout,
@@ -61,7 +55,6 @@ public function __construct(
      * Build layout structure
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function build()
     {
@@ -78,7 +71,6 @@ public function build()
      * Load layout updates
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function loadLayoutUpdates()
     {
@@ -102,7 +94,6 @@ protected function loadLayoutUpdates()
      * Generate layout xml
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function generateLayoutXml()
     {
@@ -121,7 +112,6 @@ protected function generateLayoutXml()
      * Generate layout blocks
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function generateLayoutBlocks()
     {
@@ -152,7 +142,6 @@ protected function generateLayoutBlocks()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function beforeGenerateBlock()
     {
@@ -161,7 +150,6 @@ protected function beforeGenerateBlock()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     protected function afterGenerateBlock()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php b/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
index 65c7ff5e12106..cc8734206f68e 100644
--- a/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
@@ -10,7 +10,6 @@
 
 /**
  * Class BuilderFactory
- * @since 2.0.0
  */
 class BuilderFactory
 {
@@ -21,12 +20,7 @@ class BuilderFactory
     const TYPE_PAGE   = 'page';
     /**#@-*/
 
-    /**
-     * Map of types which are references to classes
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $typeMap = [
         self::TYPE_LAYOUT => \Magento\Framework\View\Layout\Builder::class,
         self::TYPE_PAGE   => \Magento\Framework\View\Page\Builder::class,
@@ -34,7 +28,6 @@ class BuilderFactory
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -43,7 +36,6 @@ class BuilderFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $typeMap
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -58,7 +50,6 @@ public function __construct(
      *
      * @param array $typeMap
      * @return void
-     * @since 2.0.0
      */
     protected function mergeTypes(array $typeMap)
     {
@@ -76,7 +67,6 @@ protected function mergeTypes(array $typeMap)
      * @param array $arguments
      * @throws \InvalidArgumentException
      * @return BuilderInterface
-     * @since 2.0.0
      */
     public function create($type, array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php b/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
index 0b395f1183e4f..f579a539a12a9 100644
--- a/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
@@ -11,7 +11,6 @@
  * Interface BuilderInterface
  *
  * @api
- * @since 2.0.0
  */
 interface BuilderInterface
 {
@@ -19,7 +18,6 @@ interface BuilderInterface
      * Build structure
      *
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function build();
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
index a758dc6b7006b..d9aa739fb04f9 100644
--- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
@@ -12,7 +12,6 @@
  * An associative data structure, that features "nested set" parent-child relations
  *
  * @api
- * @since 2.0.0
  */
 class Structure extends DataStructure
 {
@@ -20,19 +19,16 @@ class Structure extends DataStructure
      * Name increment counter
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_nameIncrement = [];
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $state;
 
@@ -42,7 +38,6 @@ class Structure extends DataStructure
      * @param \Psr\Log\LoggerInterface $logger
      * @param State $state
      * @param array $elements
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -63,7 +58,6 @@ public function __construct(
      * @param string $type
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     public function createStructuralElement($name, $type, $class)
     {
@@ -79,7 +73,6 @@ public function createStructuralElement($name, $type, $class)
      *
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     protected function _generateAnonymousName($class)
     {
@@ -110,7 +103,6 @@ protected function _generateAnonymousName($class)
      * @param string|int|null $offsetOrSibling
      * @param bool $after
      * @return void
-     * @since 2.0.0
      */
     public function reorderChildElement($parentName, $childName, $offsetOrSibling, $after = true)
     {
@@ -150,7 +142,6 @@ public function reorderChildElement($parentName, $childName, $offsetOrSibling, $
      * @param array $haystack
      * @param bool $isLast
      * @return string
-     * @since 2.0.0
      */
     protected function _filterSearchMinus($needle, array $haystack, $isLast)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Element.php b/lib/internal/Magento/Framework/View/Layout/Element.php
index 866570d3edee7..203af4bf1553c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Element.php
+++ b/lib/internal/Magento/Framework/View/Layout/Element.php
@@ -9,7 +9,6 @@
  * Class Element
  *
  * @api
- * @since 2.0.0
  */
 class Element extends \Magento\Framework\Simplexml\Element
 {
@@ -65,7 +64,6 @@ class Element extends \Magento\Framework\Simplexml\Element
      * @return $this
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function prepare()
     {
@@ -101,7 +99,6 @@ public function prepare()
      * Get block name
      *
      * @return bool|string
-     * @since 2.0.0
      */
     public function getBlockName()
     {
@@ -123,7 +120,6 @@ public function getBlockName()
      * Advanced version of getBlockName() method: gets name for container as well as for block
      *
      * @return string|bool
-     * @since 2.0.0
      */
     public function getElementName()
     {
@@ -143,7 +139,6 @@ public function getElementName()
      * Extracts sibling from 'before' and 'after' attributes
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSibling()
     {
@@ -161,7 +156,6 @@ public function getSibling()
      * Add parent element name to parent attribute
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareBlock()
     {
@@ -177,7 +171,6 @@ public function prepareBlock()
      * Prepare references
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareReference()
     {
@@ -188,7 +181,6 @@ public function prepareReference()
      * Add parent element name to block attribute
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareAction()
     {
@@ -202,7 +194,6 @@ public function prepareAction()
      * Prepare action argument
      *
      * @return $this
-     * @since 2.0.0
      */
     public function prepareActionArgument()
     {
@@ -213,7 +204,6 @@ public function prepareActionArgument()
      * Returns information is this element allows caching
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCacheable()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/File/Collector/Aggregated.php b/lib/internal/Magento/Framework/View/Layout/File/Collector/Aggregated.php
index b3639d6794d47..dda153a72fe6c 100644
--- a/lib/internal/Magento/Framework/View/Layout/File/Collector/Aggregated.php
+++ b/lib/internal/Magento/Framework/View/Layout/File/Collector/Aggregated.php
@@ -12,7 +12,6 @@
 
 /**
  * Source of layout files aggregated from a theme and its parents according to merging and overriding conventions
- * @since 2.0.0
  */
 class Aggregated implements CollectorInterface
 {
@@ -20,7 +19,6 @@ class Aggregated implements CollectorInterface
      * File list factory
      *
      * @var Factory
-     * @since 2.0.0
      */
     protected $fileListFactory;
 
@@ -28,7 +26,6 @@ class Aggregated implements CollectorInterface
      * Base files
      *
      * @var CollectorInterface
-     * @since 2.0.0
      */
     protected $baseFiles;
 
@@ -36,7 +33,6 @@ class Aggregated implements CollectorInterface
      * Theme files
      *
      * @var CollectorInterface
-     * @since 2.0.0
      */
     protected $themeFiles;
 
@@ -44,7 +40,6 @@ class Aggregated implements CollectorInterface
      * Overridden base files
      *
      * @var CollectorInterface
-     * @since 2.0.0
      */
     protected $overrideBaseFiles;
 
@@ -52,7 +47,6 @@ class Aggregated implements CollectorInterface
      * Overridden theme files
      *
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $overrideThemeFiles;
 
@@ -64,7 +58,6 @@ class Aggregated implements CollectorInterface
      * @param CollectorInterface $themeFiles
      * @param \Magento\Framework\View\File\CollectorInterface $overrideBaseFiles
      * @param CollectorInterface $overrideThemeFiles
-     * @since 2.0.0
      */
     public function __construct(
         Factory $fileListFactory,
@@ -88,7 +81,6 @@ public function __construct(
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return \Magento\Framework\View\File[]
-     * @since 2.0.0
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index ba57929391637..d38c6b37fdd40 100755
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -12,7 +12,6 @@
 /**
  * Class Block
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Block implements Layout\GeneratorInterface
 {
@@ -23,49 +22,41 @@ class Block implements Layout\GeneratorInterface
 
     /**
      * @var \Magento\Framework\View\Element\BlockFactory
-     * @since 2.0.0
      */
     protected $blockFactory;
 
     /**
      * @var \Magento\Framework\Data\Argument\InterpreterInterface
-     * @since 2.0.0
      */
     protected $argumentInterpreter;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
-     * @since 2.0.0
      */
     protected $scopeResolver;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $appState;
 
     /**
      * @var \Magento\Framework\View\Element\ExceptionHandlerBlock
-     * @since 2.0.0
      */
     protected $exceptionHandlerBlockFactory;
 
@@ -78,7 +69,6 @@ class Block implements Layout\GeneratorInterface
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param \Magento\Framework\View\Element\ExceptionHandlerBlockFactory $exceptionHandlerBlockFactory
      * @param State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Element\BlockFactory $blockFactory,
@@ -104,7 +94,6 @@ public function __construct(
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -118,7 +107,6 @@ public function getType()
      * @param Context $generatorContext
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function process(Layout\Reader\Context $readerContext, Layout\Generator\Context $generatorContext)
     {
@@ -188,7 +176,6 @@ public function process(Layout\Reader\Context $readerContext, Layout\Generator\C
      * @param \Exception $cause
      * @throws \Exception
      * @return void
-     * @since 2.0.0
      */
     protected function handleRenderException(\Exception $cause)
     {
@@ -206,7 +193,6 @@ protected function handleRenderException(\Exception $cause)
      * @param \Magento\Framework\View\Layout\Data\Structure $structure
      * @param string $elementName
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function generateBlock(
         Layout\ScheduledStructure $scheduledStructure,
@@ -245,7 +231,6 @@ protected function generateBlock(
      * @param string $name
      * @param array $arguments
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     public function createBlock($block, $name, array $arguments = [])
     {
@@ -263,7 +248,6 @@ public function createBlock($block, $name, array $arguments = [])
      * @param array $arguments
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\View\Element\AbstractBlock
-     * @since 2.0.0
      */
     protected function getBlockInstance($block, array $arguments = [])
     {
@@ -294,7 +278,6 @@ protected function getBlockInstance($block, array $arguments = [])
      * @param string $methodName
      * @param array $actionArguments
      * @return void
-     * @since 2.0.0
      */
     protected function generateAction($block, $methodName, $actionArguments)
     {
@@ -310,7 +293,6 @@ protected function generateAction($block, $methodName, $actionArguments)
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     protected function evaluateArguments(array $arguments)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Container.php b/lib/internal/Magento/Framework/View/Layout/Generator/Container.php
index 4c23c5ea9e24b..5fa9239856acf 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Container.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Container.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Layout\Generator\Container
  *
- * @since 2.0.0
  */
 class Container implements Layout\GeneratorInterface
 {
@@ -27,7 +26,6 @@ class Container implements Layout\GeneratorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $allowedTags = [
         'aside',
@@ -51,7 +49,6 @@ class Container implements Layout\GeneratorInterface
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -64,7 +61,6 @@ public function getType()
      * @param \Magento\Framework\View\Layout\Reader\Context $readerContext
      * @param Context $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(Layout\Reader\Context $readerContext, Layout\Generator\Context $generatorContext)
     {
@@ -87,7 +83,6 @@ public function process(Layout\Reader\Context $readerContext, Layout\Generator\C
      * @param string $elementName
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     public function generateContainer(
         Layout\Data\Structure $structure,
@@ -107,7 +102,6 @@ public function generateContainer(
      * @param array $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function validateOptions($options)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Context.php b/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
index 26c2f08baa73f..951724b062829 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
@@ -10,19 +10,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Context
 {
     /**
      * @var Layout\Data\Structure
-     * @since 2.0.0
      */
     protected $structure;
 
     /**
      * @var LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
@@ -31,7 +28,6 @@ class Context
      *
      * @param Layout\Data\Structure $structure
      * @param LayoutInterface $layout
-     * @since 2.0.0
      */
     public function __construct(
         Layout\Data\Structure $structure,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Layout\Data\Structure
-     * @since 2.0.0
      */
     public function getStructure()
     {
@@ -52,7 +47,6 @@ public function getStructure()
 
     /**
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/ContextFactory.php b/lib/internal/Magento/Framework/View/Layout/Generator/ContextFactory.php
index fcb2573b89ad1..093ba9f12fa47 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/ContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/ContextFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\View\Layout\Generator\ContextFactory
  *
- * @since 2.0.0
  */
 class ContextFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Framework\View\Layout\Generator\Context
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php b/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
index 9f5217213f7fb..fcd1116bf58a0 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
@@ -11,13 +11,11 @@
 
 /**
  * Class Structure
- * @since 2.0.0
  */
 class Structure
 {
     /**
      * @var LayoutPool
-     * @since 2.0.0
      */
     protected $layoutPool;
 
@@ -25,7 +23,6 @@ class Structure
      * Constructor
      *
      * @param LayoutPool $layoutPool
-     * @since 2.0.0
      */
     public function __construct(LayoutPool $layoutPool)
     {
@@ -37,7 +34,6 @@ public function __construct(LayoutPool $layoutPool)
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function generate(UiComponentInterface $component)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
index 9d86ae4ac0c18..b82e79806acf9 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
@@ -19,7 +19,6 @@
 
 /**
  * Class UiComponent
- * @since 2.0.0
  */
 class UiComponent implements GeneratorInterface
 {
@@ -35,13 +34,11 @@ class UiComponent implements GeneratorInterface
 
     /**
      * @var UiComponentFactory
-     * @since 2.0.0
      */
     protected $uiComponentFactory;
 
     /**
      * @var UiComponentContextFactory
-     * @since 2.0.0
      */
     protected $contextFactory;
 
@@ -51,7 +48,6 @@ class UiComponent implements GeneratorInterface
      * @param UiComponentFactory $uiComponentFactory
      * @param BlockFactory $blockFactory
      * @param UiComponentContextFactory $contextFactory
-     * @since 2.0.0
      */
     public function __construct(
         UiComponentFactory $uiComponentFactory,
@@ -65,7 +61,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -78,7 +73,6 @@ public function getType()
      * @param ReaderContext $readerContext
      * @param GeneratorContext $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(ReaderContext $readerContext, GeneratorContext $generatorContext)
     {
@@ -117,7 +111,6 @@ public function process(ReaderContext $readerContext, GeneratorContext $generato
      * @param string $data
      * @param LayoutInterface $layout
      * @return ContainerInterface
-     * @since 2.0.0
      */
     protected function generateComponent(DataStructure $structure, $elementName, $data, LayoutInterface $layout)
     {
@@ -154,7 +147,6 @@ protected function generateComponent(DataStructure $structure, $elementName, $da
      *
      * @param UiComponentInterface $component
      * @return void
-     * @since 2.0.0
      */
     protected function prepareComponent(UiComponentInterface $component)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/GeneratorInterface.php b/lib/internal/Magento/Framework/View/Layout/GeneratorInterface.php
index ec37b530daf9a..134660dc34568 100644
--- a/lib/internal/Magento/Framework/View/Layout/GeneratorInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/GeneratorInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\View\Layout\GeneratorInterface
  *
- * @since 2.0.0
  */
 interface GeneratorInterface
 {
@@ -18,7 +17,6 @@ interface GeneratorInterface
      * @param Reader\Context $readerContext
      * @param Generator\Context $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(Reader\Context $readerContext, Generator\Context $generatorContext);
 
@@ -26,7 +24,6 @@ public function process(Reader\Context $readerContext, Generator\Context $genera
      * Return type of generator
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType();
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
index 68fd65d38d2c5..487c7259c0580 100644
--- a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
+++ b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
@@ -10,25 +10,21 @@
 /**
  * Pool of generators for structural elements
  * @api
- * @since 2.0.0
  */
 class GeneratorPool
 {
     /**
      * @var ScheduledStructure\Helper
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var GeneratorInterface[]
-     * @since 2.0.0
      */
     protected $generators = [];
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
@@ -43,7 +39,6 @@ class GeneratorPool
      * @param ConditionFactory $conditionFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param array $generators
-     * @since 2.0.0
      */
     public function __construct(
         ScheduledStructure\Helper $helper,
@@ -63,7 +58,6 @@ public function __construct(
      * @param string $type
      * @return GeneratorInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getGenerator($type)
     {
@@ -79,7 +73,6 @@ public function getGenerator($type)
      * @param Reader\Context $readerContext
      * @param Generator\Context $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(Reader\Context $readerContext, Generator\Context $generatorContext)
     {
@@ -95,7 +88,6 @@ public function process(Reader\Context $readerContext, Generator\Context $genera
      *
      * @param GeneratorInterface[] $generators
      * @return void
-     * @since 2.0.0
      */
     protected function addGenerators(array $generators)
     {
@@ -110,7 +102,6 @@ protected function addGenerators(array $generators)
      * @param ScheduledStructure $scheduledStructure
      * @param Data\Structure $structure
      * @return $this
-     * @since 2.0.0
      */
     protected function buildStructure(ScheduledStructure $scheduledStructure, Data\Structure $structure)
     {
@@ -147,7 +138,6 @@ protected function buildStructure(ScheduledStructure $scheduledStructure, Data\S
      * @param Data\Structure $structure
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     protected function reorderElements(
         ScheduledStructure $scheduledStructure,
@@ -189,7 +179,6 @@ protected function reorderElements(
      * @param string $elementName
      * @param bool $isChild
      * @return $this
-     * @since 2.0.0
      */
     protected function removeElement(
         ScheduledStructure $scheduledStructure,
@@ -216,7 +205,6 @@ protected function removeElement(
      * @param Data\Structure $structure
      * @param string $element
      * @return $this
-     * @since 2.0.0
      */
     protected function moveElementInStructure(
         ScheduledStructure $scheduledStructure,
diff --git a/lib/internal/Magento/Framework/View/Layout/Generic.php b/lib/internal/Magento/Framework/View/Layout/Generic.php
index 86edc80a2e2a0..e10616cc85518 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generic.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generic.php
@@ -13,7 +13,6 @@
 
 /**
  * Class Generic
- * @since 2.0.0
  */
 class Generic implements LayoutInterface
 {
@@ -61,7 +60,6 @@ public function __construct(UiComponentFactory $uiComponentFactory, $data = [])
      *
      * @param UiComponentInterface $component
      * @return array
-     * @since 2.0.0
      */
     public function build(UiComponentInterface $component)
     {
@@ -98,7 +96,6 @@ public function build(UiComponentInterface $component)
      * @param UiComponentInterface $component
      * @param string $componentType
      * @return void
-     * @since 2.0.0
      */
     protected function addChildren(
         array &$topNode,
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
index d95635c582eaa..14fffdb28823b 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Layout\PageType\Config
  *
- * @since 2.0.0
  */
 class Config
 {
@@ -18,7 +17,6 @@ class Config
      * Available page types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_pageTypes = null;
 
@@ -26,7 +24,6 @@ class Config
      * Data storage
      *
      * @var  \Magento\Framework\Config\DataInterface
-     * @since 2.0.0
      */
     protected $_dataStorage;
 
@@ -34,7 +31,6 @@ class Config
      * Constructor
      *
      * @param \Magento\Framework\Config\DataInterface $dataStorage
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\DataInterface $dataStorage)
     {
@@ -45,7 +41,6 @@ public function __construct(\Magento\Framework\Config\DataInterface $dataStorage
      * Initialize page types list
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initPageTypes()
     {
@@ -63,7 +58,6 @@ protected function _initPageTypes()
      * Retrieve available page types
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 2.0.0
      */
     public function getPageTypes()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config/Converter.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config/Converter.php
index f68f6f8f53606..8c7471cd5b05a 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config/Converter.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config/Converter.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\View\Layout\PageType\Config\Converter
  *
- * @since 2.0.0
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config/Reader.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config/Reader.php
index 695c57628a491..1b3f2ef5446ae 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config/Reader.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config/Reader.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Layout\PageType\Config\Reader
  *
- * @since 2.0.0
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
@@ -18,7 +17,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * List of identifier attributes for merging
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_idAttributes = ['/page_types/type' => 'id'];
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config/SchemaLocator.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config/SchemaLocator.php
index 6628352c085ba..b32e964e4ac5a 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config/SchemaLocator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Layout\PageType\Config\SchemaLocator
  *
- * @since 2.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
@@ -18,13 +17,11 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      * Path to corresponding XSD file with validation rules for config
      *
      * @var string
-     * @since 2.0.0
      */
     protected $schema;
 
     /**
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -35,7 +32,6 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getSchema()
     {
@@ -46,7 +42,6 @@ public function getSchema()
      * Get path to per file validation schema
      *
      * @return string|null
-     * @since 2.0.0
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Pool.php b/lib/internal/Magento/Framework/View/Layout/Pool.php
index 3a3f7e2bce979..1c6ea7870b42e 100644
--- a/lib/internal/Magento/Framework/View/Layout/Pool.php
+++ b/lib/internal/Magento/Framework/View/Layout/Pool.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Pool
- * @since 2.0.0
  */
 class Pool
 {
@@ -20,13 +19,11 @@ class Pool
      * Layouts pool
      *
      * @var array
-     * @since 2.0.0
      */
     protected $types;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -35,7 +32,6 @@ class Pool
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $types
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -51,7 +47,6 @@ public function __construct(
      * @param string $layoutType
      * @param array $arguments
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function create($layoutType, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ProcessorFactory.php b/lib/internal/Magento/Framework/View/Layout/ProcessorFactory.php
index 859be5c75b93b..80e52b5ba1636 100644
--- a/lib/internal/Magento/Framework/View/Layout/ProcessorFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/ProcessorFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for Processor
- * @since 2.0.0
  */
 class ProcessorFactory
 {
@@ -15,7 +14,6 @@ class ProcessorFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -23,7 +21,6 @@ class ProcessorFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -32,7 +29,6 @@ class ProcessorFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      *
      * @param array $data
      * @return ProcessorInterface
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ProcessorInterface.php b/lib/internal/Magento/Framework/View/Layout/ProcessorInterface.php
index 097d13b3a91bf..eb4771b1b89d8 100644
--- a/lib/internal/Magento/Framework/View/Layout/ProcessorInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/ProcessorInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ProcessorInterface
- * @since 2.0.0
  */
 interface ProcessorInterface
 {
@@ -16,7 +15,6 @@ interface ProcessorInterface
      *
      * @param string $update
      * @return ProcessorInterface
-     * @since 2.0.0
      */
     public function addUpdate($update);
 
@@ -24,7 +22,6 @@ public function addUpdate($update);
      * Get all registered updates as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function asArray();
 
@@ -32,7 +29,6 @@ public function asArray();
      * Get all registered updates as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function asString();
 
@@ -41,7 +37,6 @@ public function asString();
      *
      * @param string|string[] $handleName
      * @return ProcessorInterface
-     * @since 2.0.0
      */
     public function addHandle($handleName);
 
@@ -50,7 +45,6 @@ public function addHandle($handleName);
      *
      * @param string $handleName
      * @return ProcessorInterface
-     * @since 2.0.0
      */
     public function removeHandle($handleName);
 
@@ -58,7 +52,6 @@ public function removeHandle($handleName);
      * Get handle names array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHandles();
 
@@ -70,7 +63,6 @@ public function getHandles();
      *
      * @param array $handlesToTry
      * @return bool
-     * @since 2.0.0
      */
     public function addPageHandles(array $handlesToTry);
 
@@ -78,7 +70,6 @@ public function addPageHandles(array $handlesToTry);
      * Retrieve all design abstractions that exist in the system.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllDesignAbstractions();
 
@@ -87,7 +78,6 @@ public function getAllDesignAbstractions();
      *
      * @param array $abstraction
      * @return bool
-     * @since 2.0.0
      */
     public function isPageLayoutDesignAbstraction(array $abstraction);
 
@@ -96,7 +86,6 @@ public function isPageLayoutDesignAbstraction(array $abstraction);
      *
      * @param array $abstraction
      * @return bool
-     * @since 2.0.0
      */
     public function isCustomerDesignAbstraction(array $abstraction);
 
@@ -106,7 +95,6 @@ public function isCustomerDesignAbstraction(array $abstraction);
      * @param array|string $handles
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return ProcessorInterface
-     * @since 2.0.0
      */
     public function load($handles = []);
 
@@ -114,7 +102,6 @@ public function load($handles = []);
      * Get layout updates as \Magento\Framework\View\Layout\Element object
      *
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     public function asSimplexml();
 
@@ -122,7 +109,6 @@ public function asSimplexml();
      * Retrieve already merged layout updates from files for specified area/theme/package/store
      *
      * @return \Magento\Framework\View\Layout\Element
-     * @since 2.0.0
      */
     public function getFileLayoutUpdatesXml();
 
@@ -136,7 +122,6 @@ public function getFileLayoutUpdatesXml();
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getContainers();
 
@@ -144,7 +129,6 @@ public function getContainers();
      * Return cache ID based current area/package/theme/store and handles
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCacheId();
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/Proxy.php b/lib/internal/Magento/Framework/View/Layout/Proxy.php
index b8309b27895db..03020307c5380 100644
--- a/lib/internal/Magento/Framework/View/Layout/Proxy.php
+++ b/lib/internal/Magento/Framework/View/Layout/Proxy.php
@@ -8,7 +8,6 @@
 /**
  * Proxy class for @see \Magento\Framework\View\Layout
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
- * @since 2.0.0
  */
 class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
@@ -16,7 +15,6 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager = null;
 
@@ -24,7 +22,6 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
      * Proxied instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName = null;
 
@@ -32,7 +29,6 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
      * Proxied instance
      *
      * @var \Magento\Framework\View\Layout
-     * @since 2.0.0
      */
     protected $_subject = null;
 
@@ -40,7 +36,6 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
      * Instance shareability flag
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $_isShared = null;
 
@@ -50,7 +45,6 @@ class Proxy extends \Magento\Framework\View\Layout implements \Magento\Framework
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      * @param bool $shared
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -64,7 +58,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function __sleep()
     {
@@ -75,7 +68,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     * @since 2.0.0
      */
     public function __wakeup()
     {
@@ -86,7 +78,6 @@ public function __wakeup()
      * Clone proxied instance
      *
      * @return void
-     * @since 2.0.0
      */
     public function __clone()
     {
@@ -97,7 +88,6 @@ public function __clone()
      * Get proxied instance
      *
      * @return \Magento\Framework\View\Layout
-     * @since 2.0.0
      */
     protected function _getSubject()
     {
@@ -111,7 +101,6 @@ protected function _getSubject()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setGeneratorPool(\Magento\Framework\View\Layout\GeneratorPool $generatorPool)
     {
@@ -120,7 +109,6 @@ public function setGeneratorPool(\Magento\Framework\View\Layout\GeneratorPool $g
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBuilder(\Magento\Framework\View\Layout\BuilderInterface $builder)
     {
@@ -129,7 +117,6 @@ public function setBuilder(\Magento\Framework\View\Layout\BuilderInterface $buil
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function publicBuild()
     {
@@ -138,7 +125,6 @@ public function publicBuild()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUpdate()
     {
@@ -147,7 +133,6 @@ public function getUpdate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generateXml()
     {
@@ -156,7 +141,6 @@ public function generateXml()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function generateElements()
     {
@@ -165,7 +149,6 @@ public function generateElements()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildBlock($parentName, $alias)
     {
@@ -174,7 +157,6 @@ public function getChildBlock($parentName, $alias)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setChild($parentName, $elementName, $alias)
     {
@@ -183,7 +165,6 @@ public function setChild($parentName, $elementName, $alias)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function reorderChild($parentName, $childName, $offsetOrSibling, $after = true)
     {
@@ -192,7 +173,6 @@ public function reorderChild($parentName, $childName, $offsetOrSibling, $after =
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function unsetChild($parentName, $alias)
     {
@@ -201,7 +181,6 @@ public function unsetChild($parentName, $alias)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildNames($parentName)
     {
@@ -210,7 +189,6 @@ public function getChildNames($parentName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildBlocks($parentName)
     {
@@ -219,7 +197,6 @@ public function getChildBlocks($parentName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getChildName($parentName, $alias)
     {
@@ -228,7 +205,6 @@ public function getChildName($parentName, $alias)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function renderElement($name, $useCache = true)
     {
@@ -237,7 +213,6 @@ public function renderElement($name, $useCache = true)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function renderNonCachedElement($name)
     {
@@ -246,7 +221,6 @@ public function renderNonCachedElement($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addToParentGroup($blockName, $parentGroupName)
     {
@@ -255,7 +229,6 @@ public function addToParentGroup($blockName, $parentGroupName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getGroupChildNames($blockName, $groupName)
     {
@@ -264,7 +237,6 @@ public function getGroupChildNames($blockName, $groupName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function hasElement($name)
     {
@@ -273,7 +245,6 @@ public function hasElement($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getElementProperty($name, $attribute)
     {
@@ -282,7 +253,6 @@ public function getElementProperty($name, $attribute)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isBlock($name)
     {
@@ -291,7 +261,6 @@ public function isBlock($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isUiComponent($name)
     {
@@ -300,7 +269,6 @@ public function isUiComponent($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isContainer($name)
     {
@@ -309,7 +277,6 @@ public function isContainer($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isManipulationAllowed($name)
     {
@@ -318,7 +285,6 @@ public function isManipulationAllowed($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setBlock($name, $block)
     {
@@ -327,7 +293,6 @@ public function setBlock($name, $block)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function unsetElement($name)
     {
@@ -336,7 +301,6 @@ public function unsetElement($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createBlock($type, $name = '', array $arguments = [])
     {
@@ -345,7 +309,6 @@ public function createBlock($type, $name = '', array $arguments = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addBlock($block, $name = '', $parent = '', $alias = '')
     {
@@ -354,7 +317,6 @@ public function addBlock($block, $name = '', $parent = '', $alias = '')
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addContainer($name, $label, array $options = [], $parent = '', $alias = '')
     {
@@ -363,7 +325,6 @@ public function addContainer($name, $label, array $options = [], $parent = '', $
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function renameElement($oldName, $newName)
     {
@@ -372,7 +333,6 @@ public function renameElement($oldName, $newName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getAllBlocks()
     {
@@ -381,7 +341,6 @@ public function getAllBlocks()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBlock($name)
     {
@@ -390,7 +349,6 @@ public function getBlock($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getUiComponent($name)
     {
@@ -399,7 +357,6 @@ public function getUiComponent($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getParentName($childName)
     {
@@ -408,7 +365,6 @@ public function getParentName($childName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getElementAlias($name)
     {
@@ -417,7 +373,6 @@ public function getElementAlias($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addOutputElement($name)
     {
@@ -426,7 +381,6 @@ public function addOutputElement($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function removeOutputElement($name)
     {
@@ -435,7 +389,6 @@ public function removeOutputElement($name)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getOutput()
     {
@@ -444,7 +397,6 @@ public function getOutput()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getMessagesBlock()
     {
@@ -453,7 +405,6 @@ public function getMessagesBlock()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getBlockSingleton($type)
     {
@@ -462,7 +413,6 @@ public function getBlockSingleton($type)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function addAdjustableRenderer($namespace, $staticType, $dynamicType, $type, $template, $data = [])
     {
@@ -478,7 +428,6 @@ public function addAdjustableRenderer($namespace, $staticType, $dynamicType, $ty
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getRendererOptions($namespace, $staticType, $dynamicType)
     {
@@ -487,7 +436,6 @@ public function getRendererOptions($namespace, $staticType, $dynamicType)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function executeRenderer($namespace, $staticType, $dynamicType, $data = [])
     {
@@ -496,7 +444,6 @@ public function executeRenderer($namespace, $staticType, $dynamicType, $data = [
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function initMessages($messageGroups = [])
     {
@@ -505,7 +452,6 @@ public function initMessages($messageGroups = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isCacheable()
     {
@@ -514,7 +460,6 @@ public function isCacheable()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function isPrivate()
     {
@@ -523,7 +468,6 @@ public function isPrivate()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setIsPrivate($isPrivate = true)
     {
@@ -532,7 +476,6 @@ public function setIsPrivate($isPrivate = true)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getReaderContext()
     {
@@ -541,7 +484,6 @@ public function getReaderContext()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setXml(\Magento\Framework\Simplexml\Element $node)
     {
@@ -550,7 +492,6 @@ public function setXml(\Magento\Framework\Simplexml\Element $node)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getNode($path = null)
     {
@@ -559,7 +500,6 @@ public function getNode($path = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getXpath($xpath)
     {
@@ -568,7 +508,6 @@ public function getXpath($xpath)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getXmlString()
     {
@@ -577,7 +516,6 @@ public function getXmlString()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadFile($filePath)
     {
@@ -586,7 +524,6 @@ public function loadFile($filePath)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadString($string)
     {
@@ -595,7 +532,6 @@ public function loadString($string)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function loadDom(\DOMNode $dom)
     {
@@ -604,7 +540,6 @@ public function loadDom(\DOMNode $dom)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setNode($path, $value, $overwrite = true)
     {
@@ -613,7 +548,6 @@ public function setNode($path, $value, $overwrite = true)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function applyExtends()
     {
@@ -622,7 +556,6 @@ public function applyExtends()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function processFileData($text)
     {
@@ -631,7 +564,6 @@ public function processFileData($text)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function extend(\Magento\Framework\Simplexml\Config $config, $overwrite = true)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index da6956516e671..295cb635d05ca 100755
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
@@ -13,7 +13,6 @@
 
 /**
  * Block structure reader
- * @since 2.0.0
  */
 class Block implements Layout\ReaderInterface
 {
@@ -42,10 +41,7 @@ class Block implements Layout\ReaderInterface
     const ATTRIBUTE_ACL = 'aclResource';
     /**#@-*/
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $attributes = [
         self::ATTRIBUTE_GROUP,
         self::ATTRIBUTE_CLASS,
@@ -56,31 +52,26 @@ class Block implements Layout\ReaderInterface
 
     /**
      * @var \Magento\Framework\View\Layout\ScheduledStructure\Helper
-     * @since 2.0.0
      */
     protected $helper;
 
     /**
      * @var \Magento\Framework\View\Layout\Argument\Parser
-     * @since 2.0.0
      */
     protected $argumentParser;
 
     /**
      * @var \Magento\Framework\View\Layout\ReaderPool
-     * @since 2.0.0
      */
     protected $readerPool;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $scopeType;
 
     /**
      * @var InterpreterInterface
-     * @since 2.0.0
      */
     protected $argumentInterpreter;
 
@@ -106,7 +97,6 @@ class Block implements Layout\ReaderInterface
      * @param InterpreterInterface $argumentInterpreter
      * @param Condition $conditionReader
      * @param string|null $scopeType
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
@@ -128,7 +118,6 @@ public function __construct(
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -142,7 +131,6 @@ public function getSupportedNodes()
      * @param Element $currentElement
      * @param Element $parentElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(Context $readerContext, Element $currentElement)
     {
@@ -167,7 +155,6 @@ public function interpret(Context $readerContext, Element $currentElement)
      * @param ScheduledStructure $scheduledStructure
      * @param Element $currentElement
      * @return void
-     * @since 2.0.0
      */
     protected function scheduleBlock(
         ScheduledStructure $scheduledStructure,
@@ -195,7 +182,6 @@ protected function scheduleBlock(
      * @param array $elementData
      * @param Element $currentElement
      * @return array
-     * @since 2.0.0
      */
     protected function mergeBlockAttributes(array $elementData, Element $currentElement)
     {
@@ -244,7 +230,6 @@ private function replaceDeprecatedAclKey($data)
      * @param ScheduledStructure $scheduledStructure
      * @param Element $currentElement
      * @return void
-     * @since 2.0.0
      */
     protected function scheduleReference(
         ScheduledStructure $scheduledStructure,
@@ -271,7 +256,6 @@ protected function scheduleReference(
      * @param Element $currentElement
      * @param array &$data
      * @return array
-     * @since 2.0.0
      */
     protected function updateScheduledData($currentElement, array &$data)
     {
@@ -291,7 +275,6 @@ protected function updateScheduledData($currentElement, array &$data)
      *
      * @param Element $blockElement
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributes(Element $blockElement)
     {
@@ -307,7 +290,6 @@ protected function getAttributes(Element $blockElement)
      *
      * @param Element $blockElement
      * @return array[]
-     * @since 2.0.0
      */
     protected function getActions(Element $blockElement)
     {
@@ -327,7 +309,6 @@ protected function getActions(Element $blockElement)
      *
      * @param Element $blockElement
      * @return array
-     * @since 2.0.0
      */
     protected function getArguments(Element $blockElement)
     {
@@ -343,7 +324,6 @@ protected function getArguments(Element $blockElement)
      * @param Element $element
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     protected function getElementsByType(Element $element, $type)
     {
@@ -362,7 +342,6 @@ protected function getElementsByType(Element $element, $type)
      *
      * @param Element $node
      * @return array
-     * @since 2.0.0
      */
     protected function parseArguments(Element $node)
     {
@@ -383,7 +362,6 @@ protected function parseArguments(Element $node)
      * @param Element $blockElement
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function evaluateArguments(Element $blockElement, array &$data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
index 62fcec73cf6de..850b340e985e1 100755
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Container
- * @since 2.0.0
  */
 class Container implements Layout\ReaderInterface
 {
@@ -30,15 +29,11 @@ class Container implements Layout\ReaderInterface
     const CONTAINER_OPT_DISPLAY = 'display';
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\View\Layout\ScheduledStructure\Helper
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $helper;
 
     /**
      * @var \Magento\Framework\View\Layout\ReaderPool
-     * @since 2.0.0
      */
     protected $readerPool;
 
@@ -47,7 +42,6 @@ class Container implements Layout\ReaderInterface
      *
      * @param Layout\ScheduledStructure\Helper $helper
      * @param Layout\ReaderPool $readerPool
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
@@ -59,7 +53,6 @@ public function __construct(
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -73,7 +66,6 @@ public function getSupportedNodes()
      * @param Layout\Element $currentElement
      * @param Layout\Element $parentElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(Context $readerContext, Layout\Element $currentElement)
     {
@@ -104,7 +96,6 @@ public function interpret(Context $readerContext, Layout\Element $currentElement
      * @param \Magento\Framework\View\Layout\ScheduledStructure $scheduledStructure
      * @param \Magento\Framework\View\Layout\Element $currentElement
      * @return void
-     * @since 2.0.0
      */
     protected function mergeContainerAttributes(
         Layout\ScheduledStructure $scheduledStructure,
@@ -141,7 +132,6 @@ protected function mergeContainerAttributes(
      * @param Layout\ScheduledStructure $scheduledStructure
      * @param Layout\Element $currentElement
      * @return void
-     * @since 2.0.0
      */
     protected function containerReference(
         Layout\ScheduledStructure $scheduledStructure,
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Context.php b/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
index ed5ba3481f2d6..806c779186dc0 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
@@ -10,19 +10,16 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Context
 {
     /**
      * @var \Magento\Framework\View\Layout\ScheduledStructure
-     * @since 2.0.0
      */
     protected $scheduledStructure;
 
     /**
      * @var \Magento\Framework\View\Page\Config\Structure
-     * @since 2.0.0
      */
     protected $pageConfigStructure;
 
@@ -31,7 +28,6 @@ class Context
      *
      * @param Layout\ScheduledStructure $scheduledStructure
      * @param \Magento\Framework\View\Page\Config\Structure $pageConfigStructure
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ScheduledStructure $scheduledStructure,
@@ -43,7 +39,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Layout\ScheduledStructure
-     * @since 2.0.0
      */
     public function getScheduledStructure()
     {
@@ -52,7 +47,6 @@ public function getScheduledStructure()
 
     /**
      * @return \Magento\Framework\View\Page\Config\Structure
-     * @since 2.0.0
      */
     public function getPageConfigStructure()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/ContextFactory.php b/lib/internal/Magento/Framework/View/Layout/Reader/ContextFactory.php
index 1d28c4f432da1..104b3976a4576 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/ContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/ContextFactory.php
@@ -8,19 +8,16 @@
 /**
  * Class \Magento\Framework\View\Layout\Reader\ContextFactory
  *
- * @since 2.0.0
  */
 class ContextFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -32,7 +29,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param array $data
      * @return \Magento\Framework\View\Layout\Reader\Context
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Move.php b/lib/internal/Magento/Framework/View/Layout/Reader/Move.php
index 0a25138299239..4c9eaaaeffd94 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Move.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Move.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Layout\Reader\Move
  *
- * @since 2.0.0
  */
 class Move implements Layout\ReaderInterface
 {
@@ -24,7 +23,6 @@ class Move implements Layout\ReaderInterface
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -37,7 +35,6 @@ public function getSupportedNodes()
      * @param Context $readerContext
      * @param Layout\Element $currentElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(Context $readerContext, Layout\Element $currentElement)
     {
@@ -52,7 +49,6 @@ public function interpret(Context $readerContext, Layout\Element $currentElement
      * @param \Magento\Framework\View\Layout\Element $currentElement
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     protected function scheduleMove(Layout\ScheduledStructure $scheduledStructure, Layout\Element $currentElement)
     {
@@ -78,7 +74,6 @@ protected function scheduleMove(Layout\ScheduledStructure $scheduledStructure, L
      *
      * @param \Magento\Framework\View\Layout\Element $node
      * @return array
-     * @since 2.0.0
      */
     protected function beforeAfterToSibling($node)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
index ead28ec64fa54..a1f890462fc00 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
@@ -14,7 +14,6 @@
 
 /**
  * Class UiComponent
- * @since 2.0.0
  */
 class UiComponent implements ReaderInterface
 {
@@ -27,13 +26,11 @@ class UiComponent implements ReaderInterface
      * List of supported attributes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $attributes = ['group', 'component', 'aclResource'];
 
     /**
      * @var Helper
-     * @since 2.0.0
      */
     protected $layoutHelper;
 
@@ -62,7 +59,6 @@ class UiComponent implements ReaderInterface
      * @param Condition $conditionReader
      * @param DataInterfaceFactory $uiConfigFactory
      * @param ReaderPool $readerPool
-     * @since 2.0.0
      */
     public function __construct(
         Helper $helper,
@@ -78,7 +74,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -87,7 +82,6 @@ public function getSupportedNodes()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function interpret(Context $readerContext, Element $currentElement)
     {
@@ -144,7 +138,6 @@ private function getLayoutElementsFromUiConfiguration(array $config, array &$ele
      *
      * @param Element $element
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributes(Element $element)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ReaderFactory.php b/lib/internal/Magento/Framework/View/Layout/ReaderFactory.php
index 691bac115c359..4021e0b66bd0a 100644
--- a/lib/internal/Magento/Framework/View/Layout/ReaderFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/ReaderFactory.php
@@ -7,19 +7,16 @@
 
 /**
  * Class ReaderFactory
- * @since 2.0.0
  */
 class ReaderFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -33,7 +30,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param array $data
      * @return \Magento\Framework\View\Layout\ReaderInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($className, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ReaderInterface.php b/lib/internal/Magento/Framework/View/Layout/ReaderInterface.php
index dd12cd16116e3..1c3dada6f16d2 100644
--- a/lib/internal/Magento/Framework/View/Layout/ReaderInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/ReaderInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Framework\View\Layout\ReaderInterface
  *
- * @since 2.0.0
  */
 interface ReaderInterface
 {
@@ -18,7 +17,6 @@ interface ReaderInterface
      * @param Reader\Context $readerContext
      * @param Element $element
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(Reader\Context $readerContext, Element $element);
 
@@ -26,7 +24,6 @@ public function interpret(Reader\Context $readerContext, Element $element);
      * Get nodes types that current reader is support
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes();
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/ReaderPool.php b/lib/internal/Magento/Framework/View/Layout/ReaderPool.php
index ee109845221c9..e9db45a0e473c 100644
--- a/lib/internal/Magento/Framework/View/Layout/ReaderPool.php
+++ b/lib/internal/Magento/Framework/View/Layout/ReaderPool.php
@@ -9,19 +9,16 @@
 
 /**
  * Class Pool
- * @since 2.0.0
  */
 class ReaderPool implements ReaderInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $readers;
 
     /**
      * @var Layout\ReaderInterface[]
-     * @since 2.0.0
      */
     protected $nodeReaders = [];
 
@@ -29,7 +26,6 @@ class ReaderPool implements ReaderInterface
      * Object Manager
      *
      * @var \Magento\Framework\View\Layout\ReaderFactory
-     * @since 2.0.0
      */
     protected $readerFactory;
 
@@ -38,7 +34,6 @@ class ReaderPool implements ReaderInterface
      *
      * @param Layout\ReaderFactory $readerFactory
      * @param array $readers
-     * @since 2.0.0
      */
     public function __construct(
         Layout\ReaderFactory $readerFactory,
@@ -53,7 +48,6 @@ public function __construct(
      *
      * @param Layout\ReaderInterface $reader
      * @return $this
-     * @since 2.0.0
      */
     public function addReader(Layout\ReaderInterface $reader)
     {
@@ -67,7 +61,6 @@ public function addReader(Layout\ReaderInterface $reader)
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -79,7 +72,6 @@ public function getSupportedNodes()
      *
      * @param array $readers
      * @return void
-     * @since 2.0.0
      */
     protected function prepareReader($readers)
     {
@@ -98,7 +90,6 @@ protected function prepareReader($readers)
      * @param Reader\Context $readerContext
      * @param Layout\Element $element
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(Reader\Context $readerContext, Layout\Element $element)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
index 02f7a8aca5274..6456c1d701e29 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
@@ -9,7 +9,6 @@
  * Layout structure model
  *
  * @api
- * @since 2.0.0
  */
 class ScheduledStructure
 {
@@ -43,7 +42,6 @@ class ScheduledStructure
      * Information about structural elements, scheduled for creation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledStructure = [];
 
@@ -51,7 +49,6 @@ class ScheduledStructure
      * Scheduled structure data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledData = [];
 
@@ -59,7 +56,6 @@ class ScheduledStructure
      * Full information about elements to be populated in the layout structure after generating structure
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledElements = [];
 
@@ -67,7 +63,6 @@ class ScheduledStructure
      * Scheduled structure elements moves
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledMoves = [];
 
@@ -75,7 +70,6 @@ class ScheduledStructure
      * Scheduled structure elements removes
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledRemoves = [];
 
@@ -83,7 +77,6 @@ class ScheduledStructure
      * Materialized paths for overlapping workaround of scheduled structural elements
      *
      * @var array
-     * @since 2.0.0
      */
     protected $scheduledPaths = [];
 
@@ -91,7 +84,6 @@ class ScheduledStructure
      * Elements with reference to non-existing parent element
      *
      * @var array
-     * @since 2.0.0
      */
     protected $brokenParent = [];
 
@@ -99,13 +91,11 @@ class ScheduledStructure
      * Elements that need to sort
      *
      * @var array
-     * @since 2.0.0
      */
     protected $elementsToSort = [];
 
     /**
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(array $data = [])
     {
@@ -120,7 +110,6 @@ public function __construct(array $data = [])
      * @param string|int|null $offsetOrSibling
      * @param bool $isAfter
      * @return void
-     * @since 2.0.0
      */
     public function setElementToSortList($parentName, $elementName, $offsetOrSibling, $isAfter = true)
     {
@@ -136,7 +125,6 @@ public function setElementToSortList($parentName, $elementName, $offsetOrSibling
      * Check if elements list of sorting is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isListToSortEmpty()
     {
@@ -148,7 +136,6 @@ public function isListToSortEmpty()
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetElementToSort($elementName)
     {
@@ -161,7 +148,6 @@ public function unsetElementToSort($elementName)
      * @param string $elementName
      * @param array $default
      * @return array
-     * @since 2.0.0
      */
     public function getElementToSort($elementName, array $default = [])
     {
@@ -172,7 +158,6 @@ public function getElementToSort($elementName, array $default = [])
      * Get elements to sort
      *
      * @return array
-     * @since 2.0.0
      */
     public function getListToSort()
     {
@@ -183,7 +168,6 @@ public function getListToSort()
      * Get elements to move
      *
      * @return array
-     * @since 2.0.0
      */
     public function getListToMove()
     {
@@ -194,7 +178,6 @@ public function getListToMove()
      * Get elements to remove
      *
      * @return array
-     * @since 2.0.0
      */
     public function getListToRemove()
     {
@@ -208,7 +191,6 @@ public function getListToRemove()
      * Get scheduled elements list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getElements()
     {
@@ -221,7 +203,6 @@ public function getElements()
      * @param string $elementName
      * @param array $default
      * @return bool|array
-     * @since 2.0.0
      */
     public function getElement($elementName, $default = [])
     {
@@ -232,7 +213,6 @@ public function getElement($elementName, $default = [])
      * Check if scheduled elements list is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isElementsEmpty()
     {
@@ -245,7 +225,6 @@ public function isElementsEmpty()
      * @param string $elementName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setElement($elementName, array $data)
     {
@@ -257,7 +236,6 @@ public function setElement($elementName, array $data)
      *
      * @param string $elementName
      * @return bool
-     * @since 2.0.0
      */
     public function hasElement($elementName)
     {
@@ -269,7 +247,6 @@ public function hasElement($elementName)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetElement($elementName)
     {
@@ -282,7 +259,6 @@ public function unsetElement($elementName)
      * @param string $elementName
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getElementToMove($elementName, $default = null)
     {
@@ -295,7 +271,6 @@ public function getElementToMove($elementName, $default = null)
      * @param string $elementName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setElementToMove($elementName, array $data)
     {
@@ -307,7 +282,6 @@ public function setElementToMove($elementName, array $data)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetElementFromListToRemove($elementName)
     {
@@ -319,7 +293,6 @@ public function unsetElementFromListToRemove($elementName)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function setElementToRemoveList($elementName)
     {
@@ -330,7 +303,6 @@ public function setElementToRemoveList($elementName)
      * Get scheduled structure
      *
      * @return array
-     * @since 2.0.0
      */
     public function getStructure()
     {
@@ -343,7 +315,6 @@ public function getStructure()
      * @param string $elementName
      * @param mixed|null $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getStructureElement($elementName, $default = null)
     {
@@ -354,7 +325,6 @@ public function getStructureElement($elementName, $default = null)
      * Check if scheduled structure is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isStructureEmpty()
     {
@@ -366,7 +336,6 @@ public function isStructureEmpty()
      *
      * @param string $elementName
      * @return bool
-     * @since 2.0.0
      */
     public function hasStructureElement($elementName)
     {
@@ -379,7 +348,6 @@ public function hasStructureElement($elementName)
      * @param string $elementName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setStructureElement($elementName, array $data)
     {
@@ -391,7 +359,6 @@ public function setStructureElement($elementName, array $data)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetStructureElement($elementName)
     {
@@ -405,7 +372,6 @@ public function unsetStructureElement($elementName)
      * @param string $elementName
      * @param null $default
      * @return null
-     * @since 2.0.0
      */
     public function getStructureElementData($elementName, $default = null)
     {
@@ -418,7 +384,6 @@ public function getStructureElementData($elementName, $default = null)
      * @param string $elementName
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function setStructureElementData($elementName, array $data)
     {
@@ -429,7 +394,6 @@ public function setStructureElementData($elementName, array $data)
      * Get scheduled paths
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPaths()
     {
@@ -442,7 +406,6 @@ public function getPaths()
      * @param string $elementName
      * @param mixed $default
      * @return mixed
-     * @since 2.0.0
      */
     public function getPath($elementName, $default = null)
     {
@@ -454,7 +417,6 @@ public function getPath($elementName, $default = null)
      *
      * @param string $elementName
      * @return bool
-     * @since 2.0.0
      */
     public function hasPath($elementName)
     {
@@ -467,7 +429,6 @@ public function hasPath($elementName)
      * @param string $elementName
      * @param string $data
      * @return void
-     * @since 2.0.0
      */
     public function setPathElement($elementName, $data)
     {
@@ -479,7 +440,6 @@ public function setPathElement($elementName, $data)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetPathElement($elementName)
     {
@@ -491,7 +451,6 @@ public function unsetPathElement($elementName)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function unsetElementFromBrokenParentList($elementName)
     {
@@ -503,7 +462,6 @@ public function unsetElementFromBrokenParentList($elementName)
      *
      * @param string $elementName
      * @return void
-     * @since 2.0.0
      */
     public function setElementToBrokenParentList($elementName)
     {
@@ -514,7 +472,6 @@ public function setElementToBrokenParentList($elementName)
      * Flush scheduled paths list
      *
      * @return void
-     * @since 2.0.0
      */
     public function flushPaths()
     {
@@ -525,7 +482,6 @@ public function flushPaths()
      * Flush scheduled structure list
      *
      * @return void
-     * @since 2.0.0
      */
     public function flushScheduledStructure()
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
index 058192cce0f01..28523f205595c 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\View\Layout\ScheduledStructure\Helper
  *
- * @since 2.0.0
  */
 class Helper
 {
@@ -25,30 +24,22 @@ class Helper
     const SCHEDULED_STRUCTURE_INDEX_IS_AFTER = 4;
     /**#@-*/
 
-    /**
-     * Anonymous block counter
-     *
-     * @var int
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $counter = 0;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $state;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param State $state
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -63,7 +54,6 @@ public function __construct(
      *
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     protected function _generateAnonymousName($class)
     {
@@ -81,7 +71,6 @@ protected function _generateAnonymousName($class)
      * @param \Magento\Framework\View\Layout\Element $parentNode
      * @return string
      * @see scheduleElement() where the scheduledStructure is used
-     * @since 2.0.0
      */
     public function scheduleStructure(
         Layout\ScheduledStructure $scheduledStructure,
@@ -135,7 +124,6 @@ public function scheduleStructure(
      * @param string $name
      * @param string $path
      * @return void
-     * @since 2.0.0
      */
     protected function _overrideElementWorkaround(Layout\ScheduledStructure $scheduledStructure, $name, $path)
     {
@@ -155,7 +143,6 @@ protected function _overrideElementWorkaround(Layout\ScheduledStructure $schedul
      *
      * @param \Magento\Framework\View\Layout\Element $node
      * @return array
-     * @since 2.0.0
      */
     protected function _beforeAfterToSibling($node)
     {
@@ -182,7 +169,6 @@ protected function _beforeAfterToSibling($node)
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function scheduleElement(
         Layout\ScheduledStructure $scheduledStructure,
@@ -246,7 +232,6 @@ public function scheduleElement(
      * @param string $type
      * @param string $class
      * @return string
-     * @since 2.0.0
      */
     protected function _createStructuralElement(Layout\Data\Structure $structure, $name, $type, $class)
     {
diff --git a/lib/internal/Magento/Framework/View/LayoutFactory.php b/lib/internal/Magento/Framework/View/LayoutFactory.php
index db58ab3b7daa7..b33a97cfaad80 100644
--- a/lib/internal/Magento/Framework/View/LayoutFactory.php
+++ b/lib/internal/Magento/Framework/View/LayoutFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Factory class for Layout
- * @since 2.0.0
  */
 class LayoutFactory
 {
@@ -15,7 +14,6 @@ class LayoutFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -23,7 +21,6 @@ class LayoutFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_instanceName;
 
@@ -32,7 +29,6 @@ class LayoutFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      * @param array $data
      * @return LayoutInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/LayoutInterface.php b/lib/internal/Magento/Framework/View/LayoutInterface.php
index 5f0c805bd51f9..a8ad5e28de2d6 100644
--- a/lib/internal/Magento/Framework/View/LayoutInterface.php
+++ b/lib/internal/Magento/Framework/View/LayoutInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface LayoutInterface
  * @api
- * @since 2.0.0
  */
 interface LayoutInterface
 {
@@ -16,7 +15,6 @@ interface LayoutInterface
      * Retrieve the layout processor
      *
      * @return Layout\ProcessorInterface
-     * @since 2.0.0
      */
     public function getUpdate();
 
@@ -24,7 +22,6 @@ public function getUpdate();
      * Layout xml generation
      *
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function generateXml();
 
@@ -32,7 +29,6 @@ public function generateXml();
      * Create structure of elements from the loaded XML configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function generateElements();
 
@@ -42,7 +38,6 @@ public function generateElements();
      * @param string $name
      * @param bool $useCache
      * @return string
-     * @since 2.0.0
      */
     public function renderElement($name, $useCache = true);
 
@@ -51,7 +46,6 @@ public function renderElement($name, $useCache = true);
      *
      * @param string $name
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function addOutputElement($name);
 
@@ -59,7 +53,6 @@ public function addOutputElement($name);
      * Get all blocks marked for output
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOutput();
 
@@ -68,7 +61,6 @@ public function getOutput();
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function hasElement($name);
 
@@ -77,7 +69,6 @@ public function hasElement($name);
      *
      * @param string $name
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function unsetElement($name);
 
@@ -85,7 +76,6 @@ public function unsetElement($name);
      * Retrieve all blocks from registry as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllBlocks();
 
@@ -94,7 +84,6 @@ public function getAllBlocks();
      *
      * @param string $name
      * @return Element\BlockInterface|bool
-     * @since 2.0.0
      */
     public function getBlock($name);
 
@@ -104,7 +93,6 @@ public function getBlock($name);
      * @param string $parentName
      * @param string $alias
      * @return null
-     * @since 2.0.0
      */
     public function getChildBlock($parentName, $alias);
 
@@ -115,7 +103,6 @@ public function getChildBlock($parentName, $alias);
      * @param string $elementName
      * @param string $alias
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function setChild($parentName, $elementName, $alias);
 
@@ -131,7 +118,6 @@ public function setChild($parentName, $elementName, $alias);
      * @param string|int|null $offsetOrSibling
      * @param bool $after
      * @return void
-     * @since 2.0.0
      */
     public function reorderChild($parentName, $childName, $offsetOrSibling, $after = true);
 
@@ -141,7 +127,6 @@ public function reorderChild($parentName, $childName, $offsetOrSibling, $after =
      * @param string $parentName
      * @param string $alias
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function unsetChild($parentName, $alias);
 
@@ -150,7 +135,6 @@ public function unsetChild($parentName, $alias);
      *
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     public function getChildNames($parentName);
 
@@ -161,7 +145,6 @@ public function getChildNames($parentName);
      *
      * @param string $parentName
      * @return array
-     * @since 2.0.0
      */
     public function getChildBlocks($parentName);
 
@@ -171,7 +154,6 @@ public function getChildBlocks($parentName);
      * @param string $parentName
      * @param string $alias
      * @return bool|string
-     * @since 2.0.0
      */
     public function getChildName($parentName, $alias);
 
@@ -181,7 +163,6 @@ public function getChildName($parentName, $alias);
      * @param string $blockName
      * @param string $parentGroupName
      * @return bool
-     * @since 2.0.0
      */
     public function addToParentGroup($blockName, $parentGroupName);
 
@@ -191,7 +172,6 @@ public function addToParentGroup($blockName, $parentGroupName);
      * @param string $blockName
      * @param string $groupName
      * @return array
-     * @since 2.0.0
      */
     public function getGroupChildNames($blockName, $groupName);
 
@@ -200,7 +180,6 @@ public function getGroupChildNames($blockName, $groupName);
      *
      * @param string $childName
      * @return bool|string
-     * @since 2.0.0
      */
     public function getParentName($childName);
 
@@ -211,7 +190,6 @@ public function getParentName($childName);
      * @param  string $name
      * @param  array $arguments
      * @return Element\BlockInterface
-     * @since 2.0.0
      */
     public function createBlock($type, $name = '', array $arguments = []);
 
@@ -223,7 +201,6 @@ public function createBlock($type, $name = '', array $arguments = []);
      * @param string $parent
      * @param string $alias
      * @return Element\BlockInterface
-     * @since 2.0.0
      */
     public function addBlock($block, $name = '', $parent = '', $alias = '');
 
@@ -236,7 +213,6 @@ public function addBlock($block, $name = '', $parent = '', $alias = '');
      * @param string $parent
      * @param string $alias
      * @return void
-     * @since 2.0.0
      */
     public function addContainer($name, $label, array $options = [], $parent = '', $alias = '');
 
@@ -246,7 +222,6 @@ public function addContainer($name, $label, array $options = [], $parent = '', $
      * @param string $oldName
      * @param string $newName
      * @return bool
-     * @since 2.0.0
      */
     public function renameElement($oldName, $newName);
 
@@ -255,7 +230,6 @@ public function renameElement($oldName, $newName);
      *
      * @param string $name
      * @return bool|string
-     * @since 2.0.0
      */
     public function getElementAlias($name);
 
@@ -264,7 +238,6 @@ public function getElementAlias($name);
      *
      * @param string $name
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function removeOutputElement($name);
 
@@ -272,7 +245,6 @@ public function removeOutputElement($name);
      * Retrieve messages block
      *
      * @return \Magento\Framework\View\Element\Messages
-     * @since 2.0.0
      */
     public function getMessagesBlock();
 
@@ -281,7 +253,6 @@ public function getMessagesBlock();
      *
      * @param string $type
      * @return Element\BlockInterface
-     * @since 2.0.0
      */
     public function getBlockSingleton($type);
 
@@ -291,7 +262,6 @@ public function getBlockSingleton($type);
      * @param string $name
      * @param string $attribute
      * @return mixed
-     * @since 2.0.0
      */
     public function getElementProperty($name, $attribute);
 
@@ -300,7 +270,6 @@ public function getElementProperty($name, $attribute);
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isBlock($name);
 
@@ -309,7 +278,6 @@ public function isBlock($name);
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isContainer($name);
 
@@ -318,7 +286,6 @@ public function isContainer($name);
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function isManipulationAllowed($name);
 
@@ -328,7 +295,6 @@ public function isManipulationAllowed($name);
      * @param string $name
      * @param  Element\BlockInterface $block
      * @return LayoutInterface
-     * @since 2.0.0
      */
     public function setBlock($name, $block);
 
@@ -336,7 +302,6 @@ public function setBlock($name, $block);
      * Check is exists non-cacheable layout elements
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCacheable();
 }
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index 5eab71b341d75..1d720204ff9dd 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -15,7 +15,6 @@
  * Layout merge model
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
 {
@@ -46,13 +45,11 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
 
     /**
      * @var \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     private $theme;
 
     /**
      * @var \Magento\Framework\Url\ScopeInterface
-     * @since 2.0.0
      */
     private $scope;
 
@@ -60,7 +57,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * In-memory cache for loaded layout updates
      *
      * @var \Magento\Framework\View\Layout\Element
-     * @since 2.0.0
      */
     protected $layoutUpdatesCache;
 
@@ -68,7 +64,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Cumulative array of update XML strings
      *
      * @var array
-     * @since 2.0.0
      */
     protected $updates = [];
 
@@ -76,7 +71,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Handles used in this update
      *
      * @var array
-     * @since 2.0.0
      */
     protected $handles = [];
 
@@ -84,7 +78,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Page handle names sorted by from parent to child
      *
      * @var array
-     * @since 2.0.0
      */
     protected $pageHandles = [];
 
@@ -92,55 +85,46 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Substitution values in structure array('from' => array(), 'to' => array())
      *
      * @var array|null
-     * @since 2.0.0
      */
     protected $subst = null;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     private $fileSource;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     private $pageLayoutFileSource;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     private $appState;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Framework\View\Model\Layout\Update\Validator
-     * @since 2.0.0
      */
     protected $layoutValidator;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pageLayout;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $cacheSuffix;
 
@@ -148,7 +132,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * All processed handles used in this update
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allHandles = [];
 
@@ -156,7 +139,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Status for handle being processed
      *
      * @var int
-     * @since 2.0.0
      */
     protected $handleProcessing = 1;
 
@@ -164,13 +146,11 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Status for processed handle
      *
      * @var int
-     * @since 2.0.0
      */
     protected $handleProcessed = 2;
 
     /**
      * @var ReadFactory
-     * @since 2.0.0
      */
     private $readFactory;
 
@@ -189,7 +169,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
      * @param string $cacheSuffix
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\DesignInterface $design,
@@ -221,7 +200,6 @@ public function __construct(
      *
      * @param string $update
      * @return $this
-     * @since 2.0.0
      */
     public function addUpdate($update)
     {
@@ -235,7 +213,6 @@ public function addUpdate($update)
      * Get all registered updates as array
      *
      * @return array
-     * @since 2.0.0
      */
     public function asArray()
     {
@@ -246,7 +223,6 @@ public function asArray()
      * Get all registered updates as string
      *
      * @return string
-     * @since 2.0.0
      */
     public function asString()
     {
@@ -258,7 +234,6 @@ public function asString()
      *
      * @param array|string $handleName
      * @return $this
-     * @since 2.0.0
      */
     public function addHandle($handleName)
     {
@@ -277,7 +252,6 @@ public function addHandle($handleName)
      *
      * @param string $handleName
      * @return $this
-     * @since 2.0.0
      */
     public function removeHandle($handleName)
     {
@@ -289,7 +263,6 @@ public function removeHandle($handleName)
      * Get handle names array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHandles()
     {
@@ -302,7 +275,6 @@ public function getHandles()
      *
      * @param string[] $handlesToTry
      * @return bool
-     * @since 2.0.0
      */
     public function addPageHandles(array $handlesToTry)
     {
@@ -324,7 +296,6 @@ public function addPageHandles(array $handlesToTry)
      *
      * @param string $handleName
      * @return bool
-     * @since 2.0.0
      */
     public function pageHandleExists($handleName)
     {
@@ -333,7 +304,6 @@ public function pageHandleExists($handleName)
 
     /**
      * @return string|null
-     * @since 2.0.0
      */
     public function getPageLayout()
     {
@@ -344,7 +314,6 @@ public function getPageLayout()
      * Check current handles if layout was defined on it
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isLayoutDefined()
     {
@@ -362,7 +331,6 @@ public function isLayoutDefined()
      *
      * @param string $handleName
      * @return \Magento\Framework\View\Layout\Element|null
-     * @since 2.0.0
      */
     protected function _getPageHandleNode($handleName)
     {
@@ -382,7 +350,6 @@ protected function _getPageHandleNode($handleName)
      * Retrieve used page handle names sorted from parent to child
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPageHandles()
     {
@@ -403,7 +370,6 @@ public function getPageHandles()
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getAllDesignAbstractions()
     {
@@ -433,7 +399,6 @@ public function getAllDesignAbstractions()
      *
      * @param string $handleName
      * @return string|null
-     * @since 2.0.0
      */
     public function getPageHandleType($handleName)
     {
@@ -447,7 +412,6 @@ public function getPageHandleType($handleName)
      * @param array|string $handles
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
-     * @since 2.0.0
      */
     public function load($handles = [])
     {
@@ -488,7 +452,6 @@ public function load($handles = [])
      * @param string $layout
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _validateMergedLayout($cacheId, $layout)
     {
@@ -516,7 +479,6 @@ protected function _validateMergedLayout($cacheId, $layout)
      * Get layout updates as \Magento\Framework\View\Layout\Element object
      *
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     public function asSimplexml()
     {
@@ -533,7 +495,6 @@ public function asSimplexml()
      *
      * @param string $xmlString
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     protected function _loadXmlString($xmlString)
     {
@@ -545,7 +506,6 @@ protected function _loadXmlString($xmlString)
      *
      * @param string $handle
      * @return $this
-     * @since 2.0.0
      */
     protected function _merge($handle)
     {
@@ -567,7 +527,6 @@ protected function _merge($handle)
      *
      * @param string $handle
      * @return bool
-     * @since 2.0.0
      */
     protected function _fetchPackageLayoutUpdates($handle)
     {
@@ -590,7 +549,6 @@ protected function _fetchPackageLayoutUpdates($handle)
      *
      * @param string $handle
      * @return bool
-     * @since 2.0.0
      */
     protected function _fetchDbLayoutUpdates($handle)
     {
@@ -638,7 +596,6 @@ public function validateUpdate($handle, $updateXml)
      *
      * @param string $xmlString
      * @return string
-     * @since 2.0.0
      */
     protected function _substitutePlaceholders($xmlString)
     {
@@ -663,7 +620,6 @@ protected function _substitutePlaceholders($xmlString)
      * @return string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function getDbUpdateString($handle)
     {
@@ -675,7 +631,6 @@ public function getDbUpdateString($handle)
      *
      * @param \SimpleXMLElement $updateXml
      * @return $this
-     * @since 2.0.0
      */
     protected function _fetchRecursiveUpdates($updateXml)
     {
@@ -694,7 +649,6 @@ protected function _fetchRecursiveUpdates($updateXml)
      * Retrieve already merged layout updates from files for specified area/theme/package/store
      *
      * @return \Magento\Framework\View\Layout\Element
-     * @since 2.0.0
      */
     public function getFileLayoutUpdatesXml()
     {
@@ -718,7 +672,6 @@ public function getFileLayoutUpdatesXml()
      *
      * @param string $suffix
      * @return string
-     * @since 2.0.0
      */
     protected function generateCacheId($suffix = '')
     {
@@ -730,7 +683,6 @@ protected function generateCacheId($suffix = '')
      *
      * @param string $cacheId
      * @return string|bool
-     * @since 2.0.0
      */
     protected function _loadCache($cacheId)
     {
@@ -744,7 +696,6 @@ protected function _loadCache($cacheId)
      * @param string $cacheId
      * @param array $cacheTags
      * @return void
-     * @since 2.0.0
      */
     protected function _saveCache($data, $cacheId, array $cacheTags = [])
     {
@@ -756,7 +707,6 @@ protected function _saveCache($data, $cacheId, array $cacheTags = [])
      *
      * @return \Magento\Framework\View\Layout\Element
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _loadFileLayoutUpdatesXml()
     {
@@ -815,7 +765,6 @@ protected function _loadFileLayoutUpdatesXml()
      * @param string $fileName
      * @param array $xmlErrors
      * @return void
-     * @since 2.0.0
      */
     protected function _logXmlErrors($fileName, $xmlErrors)
     {
@@ -848,7 +797,6 @@ private function getXmlErrors($libXmlErrors)
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @return \Magento\Theme\Model\Theme
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
@@ -872,7 +820,6 @@ protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterfa
      *
      * @param \SimpleXMLElement $node
      * @return string
-     * @since 2.0.0
      */
     protected function _renderXmlAttributes(\SimpleXMLElement $node)
     {
@@ -893,7 +840,6 @@ protected function _renderXmlAttributes(\SimpleXMLElement $node)
      * )
      *
      * @return array
-     * @since 2.0.0
      */
     public function getContainers()
     {
@@ -914,7 +860,6 @@ public function getContainers()
      *
      * Destructor should be called explicitly in order to work around the PHP bug
      * https://bugs.php.net/bug.php?id=62468
-     * @since 2.0.0
      */
     public function __destruct()
     {
@@ -924,7 +869,6 @@ public function __destruct()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isCustomerDesignAbstraction(array $abstraction)
     {
@@ -936,7 +880,6 @@ public function isCustomerDesignAbstraction(array $abstraction)
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     public function isPageLayoutDesignAbstraction(array $abstraction)
     {
@@ -950,7 +893,6 @@ public function isPageLayoutDesignAbstraction(array $abstraction)
      * Retrieve theme
      *
      * @return \Magento\Framework\View\Design\ThemeInterface
-     * @since 2.0.0
      */
     public function getTheme()
     {
@@ -961,7 +903,6 @@ public function getTheme()
      * Retrieve current scope
      *
      * @return \Magento\Framework\Url\ScopeInterface
-     * @since 2.0.0
      */
     public function getScope()
     {
@@ -972,7 +913,6 @@ public function getScope()
      * Return cache ID based current area/package/theme/store and handles
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCacheId()
     {
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Translator.php b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
index 1226a2319b2c3..c0fdc1f0b66ed 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Model\Layout\Translator
  *
- * @since 2.0.0
  */
 class Translator
 {
@@ -20,7 +19,6 @@ class Translator
      * @param Element $node
      * @param array $args
      * @return void
-     * @since 2.0.0
      **/
     public function translateActionParameters(Element $node, &$args)
     {
@@ -64,7 +62,6 @@ public function translateActionParameters(Element $node, &$args)
      *
      * @param Element $node
      * @return string
-     * @since 2.0.0
      */
     public function translateArgument(Element $node)
     {
@@ -86,7 +83,6 @@ public function translateArgument(Element $node)
      *
      * @param Element $node
      * @return array
-     * @since 2.0.0
      */
     protected function _getNodeNamesToTranslate(Element $node)
     {
@@ -98,7 +94,6 @@ protected function _getNodeNamesToTranslate(Element $node)
      *
      * @param Element $node
      * @return bool
-     * @since 2.0.0
      */
     protected function _isNodeTranslatable(Element $node)
     {
@@ -110,7 +105,6 @@ protected function _isNodeTranslatable(Element $node)
      *
      * @param Element $node
      * @return bool
-     * @since 2.0.0
      */
     protected function _isSelfTranslatable(Element $node)
     {
@@ -122,7 +116,6 @@ protected function _isSelfTranslatable(Element $node)
      *
      * @param Element $node
      * @return string
-     * @since 2.0.0
      */
     protected function _getNodeValue(Element $node)
     {
@@ -134,7 +127,6 @@ protected function _getNodeValue(Element $node)
      *
      * @param string $value
      * @return \Magento\Framework\Phrase
-     * @since 2.0.0
      */
     protected function _translateValue($value)
     {
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
index f9a65871c8b0e..f8ae797521fc9 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
@@ -12,7 +12,6 @@
  * Validator for custom layout update
  *
  * Validator checked XML validation and protected expressions
- * @since 2.0.0
  */
 class Validator extends \Zend_Validate_Abstract
 {
@@ -34,7 +33,6 @@ class Validator extends \Zend_Validate_Abstract
      * The Magento SimpleXml object
      *
      * @var \Magento\Framework\Simplexml\Element
-     * @since 2.0.0
      */
     protected $_value;
 
@@ -42,7 +40,6 @@ class Validator extends \Zend_Validate_Abstract
      * Protected expressions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_protectedExpressions = [
         self::HELPER_ARGUMENT_TYPE => '//*[@xsi:type="helper"]',
@@ -53,20 +50,17 @@ class Validator extends \Zend_Validate_Abstract
      * XSD Schemas for Layout Update validation
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_xsdSchemas;
 
     /**
      * @var \Magento\Framework\Config\DomFactory
-     * @since 2.0.0
      */
     protected $_domConfigFactory;
 
     /**
      * @param \Magento\Framework\Config\DomFactory $domConfigFactory
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Config\DomFactory $domConfigFactory,
@@ -88,7 +82,6 @@ public function __construct(
      * Initialize messages templates with translating
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _initMessageTemplates()
     {
@@ -123,7 +116,6 @@ protected function _initMessageTemplates()
      * @param bool $isSecurityCheck
      * @return bool
      * @throws \Exception
-     * @since 2.0.0
      */
     public function isValid($value, $schema = self::LAYOUT_SCHEMA_PAGE_HANDLE, $isSecurityCheck = true)
     {
diff --git a/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
index ca95b85be0af2..0f110246db093 100644
--- a/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
+++ b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
@@ -7,13 +7,11 @@
 
 /**
  * Interface BuilderInterface
- * @since 2.0.0
  */
 interface BuilderInterface
 {
     /**
      * @return \Magento\Framework\View\PageLayout\Config
-     * @since 2.0.0
      */
     public function getPageLayoutsConfig();
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
index e779ba342b65d..66cc3f588a9a0 100644
--- a/lib/internal/Magento/Framework/View/Page/Builder.php
+++ b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -11,19 +11,16 @@
 
 /**
  * Class Builder
- * @since 2.0.0
  */
 class Builder extends View\Layout\Builder
 {
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Page\Layout\Reader
-     * @since 2.0.0
      */
     protected $pageLayoutReader;
 
@@ -33,7 +30,6 @@ class Builder extends View\Layout\Builder
      * @param Event\ManagerInterface $eventManager
      * @param Config $pageConfig
      * @param Layout\Reader $pageLayoutReader
-     * @since 2.0.0
      */
     public function __construct(
         View\LayoutInterface $layout,
@@ -52,7 +48,6 @@ public function __construct(
      * Read page layout before generation generic layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function generateLayoutBlocks()
     {
@@ -63,7 +58,6 @@ protected function generateLayoutBlocks()
     /**
      * Read page layout and write structure to ReadContext
      * @return void
-     * @since 2.0.0
      */
     protected function readPageLayout()
     {
@@ -76,7 +70,6 @@ protected function readPageLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getPageLayout()
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 802edd60baa64..19661338cb0df 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -23,7 +23,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
- * @since 2.0.0
  */
 class Config
 {
@@ -49,7 +48,6 @@ class Config
      * Allowed group of types
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allowedTypes = [
         self::ELEMENT_TYPE_BODY,
@@ -59,7 +57,6 @@ class Config
 
     /**
      * @var Title
-     * @since 2.0.0
      */
     protected $title;
 
@@ -67,61 +64,51 @@ class Config
      * Asset service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Magento\Framework\View\Asset\GroupedCollection
-     * @since 2.0.0
      */
     protected $pageAssets;
 
     /**
      * @var string[][]
-     * @since 2.0.0
      */
     protected $elements = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pageLayout;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $scopeConfig;
 
     /**
      * @var \Magento\Framework\View\Page\FaviconInterface
-     * @since 2.0.0
      */
     protected $favicon;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @since 2.0.0
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\View\Layout\BuilderInterface
-     * @since 2.0.0
      */
     protected $builder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $includes;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $metadata = [
         'charset' => null,
@@ -134,7 +121,7 @@ class Config
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.1.0
+     * @since 2.0.5
      */
     private $areaResolver;
 
@@ -149,8 +136,8 @@ class Config
      *
      * @return \Magento\Framework\App\State
      *
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.5
+     * @since 2.0.5
      */
     private function getAreaResolver()
     {
@@ -169,7 +156,6 @@ private function getAreaResolver()
      * @param Title $title
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $isIncludesAvailable
-     * @since 2.0.0
      */
     public function __construct(
         View\Asset\Repository $assetRepo,
@@ -197,7 +183,6 @@ public function __construct(
     /**
      * @param View\Layout\BuilderInterface $builder
      * @return $this
-     * @since 2.0.0
      */
     public function setBuilder(View\Layout\BuilderInterface $builder)
     {
@@ -208,7 +193,6 @@ public function setBuilder(View\Layout\BuilderInterface $builder)
     /**
      * Build page config from page configurations
      * @return void
-     * @since 2.0.0
      */
     protected function build()
     {
@@ -220,7 +204,6 @@ protected function build()
     /**
      * TODO Will be eliminated in MAGETWO-28359
      * @return void
-     * @since 2.0.0
      */
     public function publicBuild()
     {
@@ -231,7 +214,6 @@ public function publicBuild()
      * Retrieve title element text (encoded)
      *
      * @return Title
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -243,7 +225,6 @@ public function getTitle()
      * @param string $name
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function setMetadata($name, $content)
     {
@@ -253,7 +234,6 @@ public function setMetadata($name, $content)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getMetadata()
     {
@@ -264,7 +244,6 @@ public function getMetadata()
     /**
      * @param string $contentType
      * @return void
-     * @since 2.0.0
      */
     public function setContentType($contentType)
     {
@@ -275,7 +254,6 @@ public function setContentType($contentType)
      * Retrieve Content Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -289,7 +267,6 @@ public function getContentType()
     /**
      * @param string $mediaType
      * @return void
-     * @since 2.0.0
      */
     public function setMediaType($mediaType)
     {
@@ -300,7 +277,6 @@ public function setMediaType($mediaType)
      * Retrieve Media Type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMediaType()
     {
@@ -317,7 +293,6 @@ public function getMediaType()
     /**
      * @param string $charset
      * @return void
-     * @since 2.0.0
      */
     public function setCharset($charset)
     {
@@ -328,7 +303,6 @@ public function setCharset($charset)
      * Retrieve Charset
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCharset()
     {
@@ -345,7 +319,6 @@ public function getCharset()
     /**
      * @param string $description
      * @return void
-     * @since 2.0.0
      */
     public function setDescription($description)
     {
@@ -356,7 +329,6 @@ public function setDescription($description)
      * Retrieve content for description tag
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDescription()
     {
@@ -373,7 +345,6 @@ public function getDescription()
     /**
      * @param string $keywords
      * @return void
-     * @since 2.0.0
      */
     public function setKeywords($keywords)
     {
@@ -384,7 +355,6 @@ public function setKeywords($keywords)
      * Retrieve content for keywords tag
      *
      * @return string
-     * @since 2.0.0
      */
     public function getKeywords()
     {
@@ -401,7 +371,6 @@ public function getKeywords()
     /**
      * @param string $robots
      * @return void
-     * @since 2.0.0
      */
     public function setRobots($robots)
     {
@@ -412,7 +381,6 @@ public function setRobots($robots)
      * Retrieve URL to robots file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getRobots()
     {
@@ -431,7 +399,6 @@ public function getRobots()
 
     /**
      * @return \Magento\Framework\View\Asset\GroupedCollection
-     * @since 2.0.0
      */
     public function getAssetCollection()
     {
@@ -444,7 +411,6 @@ public function getAssetCollection()
      * @param array $properties
      * @param string|null $name
      * @return $this
-     * @since 2.0.0
      */
     public function addPageAsset($file, array $properties = [], $name = null)
     {
@@ -463,7 +429,6 @@ public function addPageAsset($file, array $properties = [], $name = null)
      * @param array $properties
      * @param string|null $name
      * @return $this
-     * @since 2.0.0
      */
     public function addRemotePageAsset($url, $contentType, array $properties = [], $name = null)
     {
@@ -480,7 +445,6 @@ public function addRemotePageAsset($url, $contentType, array $properties = [], $
      * @param string $title
      * @param string $href
      * @return $this
-     * @since 2.0.0
      */
     public function addRss($title, $href)
     {
@@ -499,7 +463,6 @@ public function addRss($title, $href)
      *
      * @param string $className
      * @return $this
-     * @since 2.0.0
      */
     public function addBodyClass($className)
     {
@@ -524,7 +487,6 @@ public function addBodyClass($className)
      * @param mixed $value
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function setElementAttribute($elementType, $attribute, $value)
     {
@@ -544,7 +506,6 @@ public function setElementAttribute($elementType, $attribute, $value)
      * @param string $elementType
      * @param string $attribute
      * @return null
-     * @since 2.0.0
      */
     public function getElementAttribute($elementType, $attribute)
     {
@@ -555,7 +516,6 @@ public function getElementAttribute($elementType, $attribute)
     /**
      * @param string $elementType
      * @return string[]
-     * @since 2.0.0
      */
     public function getElementAttributes($elementType)
     {
@@ -568,7 +528,6 @@ public function getElementAttributes($elementType)
      *
      * @param string $handle
      * @return $this
-     * @since 2.0.0
      */
     public function setPageLayout($handle)
     {
@@ -580,7 +539,6 @@ public function setPageLayout($handle)
      * Return current page layout
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPageLayout()
     {
@@ -589,7 +547,6 @@ public function getPageLayout()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFaviconFile()
     {
@@ -598,7 +555,6 @@ public function getFaviconFile()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultFavicon()
     {
@@ -609,7 +565,6 @@ public function getDefaultFavicon()
      * Get miscellaneous scripts/styles to be included in head before head closing tag
      *
      * @return string
-     * @since 2.0.0
      */
     public function getIncludes()
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php
index 1ffa0beeb7732..90e9861f339bd 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Framework\View\Page\Config\Generator\Body
  *
- * @since 2.0.0
  */
 class Body implements Layout\GeneratorInterface
 {
@@ -24,7 +23,6 @@ class Body implements Layout\GeneratorInterface
      * Constructor
      *
      * @param \Magento\Framework\View\Page\Config $pageConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\View\Page\Config $pageConfig)
     {
@@ -35,7 +33,6 @@ public function __construct(\Magento\Framework\View\Page\Config $pageConfig)
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -48,7 +45,6 @@ public function getType()
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Generator\Context $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(Layout\Reader\Context $readerContext, Layout\Generator\Context $generatorContext)
     {
@@ -62,7 +58,6 @@ public function process(Layout\Reader\Context $readerContext, Layout\Generator\C
      *
      * @param \Magento\Framework\View\Page\Config\Structure $pageStructure
      * @return $this
-     * @since 2.0.0
      */
     protected function processBodyClasses(Structure $pageStructure)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
index bcd038c8c89b2..a8aeb6c3717af 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Framework\View\Page\Config\Generator\Head
  *
- * @since 2.0.0
  */
 class Head implements Layout\GeneratorInterface
 {
@@ -36,7 +35,6 @@ class Head implements Layout\GeneratorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $remoteAssetTypes = [
         self::SRC_TYPE_CONTROLLER => self::SRC_TYPE_CONTROLLER,
@@ -45,7 +43,6 @@ class Head implements Layout\GeneratorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $assetProperties = [
         'ie_condition',
@@ -53,7 +50,6 @@ class Head implements Layout\GeneratorInterface
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $serviceAssetProperties = [
         'src',
@@ -63,7 +59,6 @@ class Head implements Layout\GeneratorInterface
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
@@ -78,7 +73,6 @@ class Head implements Layout\GeneratorInterface
      *
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\UrlInterface|null $url
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Page\Config $pageConfig,
@@ -92,7 +86,6 @@ public function __construct(
      * {@inheritdoc}
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -105,7 +98,6 @@ public function getType()
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Generator\Context $generatorContext
      * @return $this
-     * @since 2.0.0
      */
     public function process(Layout\Reader\Context $readerContext, Layout\Generator\Context $generatorContext)
     {
@@ -125,7 +117,6 @@ public function process(Layout\Reader\Context $readerContext, Layout\Generator\C
      *
      * @param \Magento\Framework\View\Page\Config\Structure $pageStructure
      * @return $this
-     * @since 2.0.0
      */
     protected function processAssets(Structure $pageStructure)
     {
@@ -153,7 +144,6 @@ protected function processAssets(Structure $pageStructure)
      *
      * @param array $data
      * @return array
-     * @since 2.0.0
      */
     protected function getAssetProperties(array $data = [])
     {
@@ -175,7 +165,6 @@ protected function getAssetProperties(array $data = [])
      *
      * @param \Magento\Framework\View\Page\Config\Structure $pageStructure
      * @return $this
-     * @since 2.0.0
      */
     protected function processTitle(Structure $pageStructure)
     {
@@ -190,7 +179,6 @@ protected function processTitle(Structure $pageStructure)
      *
      * @param \Magento\Framework\View\Page\Config\Structure $pageStructure
      * @return $this
-     * @since 2.0.0
      */
     protected function processMetadata(Structure $pageStructure)
     {
@@ -205,7 +193,6 @@ protected function processMetadata(Structure $pageStructure)
      *
      * @param \Magento\Framework\View\Page\Config\Structure $pageStructure
      * @return $this
-     * @since 2.0.0
      */
     protected function processElementAttributes(Structure $pageStructure)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Body.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Body.php
index a5048cad9a824..ff8d25dc6572e 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Body.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Body.php
@@ -10,7 +10,6 @@
 
 /**
  * Body structure reader
- * @since 2.0.0
  */
 class Body implements Layout\ReaderInterface
 {
@@ -26,17 +25,13 @@ class Body implements Layout\ReaderInterface
     const BODY_ATTRIBUTE = 'attribute';
     /**#@-*/
 
-    /**
-     * @var Layout\ReaderPool
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $readerPool;
 
     /**
      * Constructor
      *
      * @param Layout\ReaderPool $readerPool
-     * @since 2.0.0
      */
     public function __construct(Layout\ReaderPool $readerPool)
     {
@@ -47,7 +42,6 @@ public function __construct(Layout\ReaderPool $readerPool)
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -60,7 +54,6 @@ public function getSupportedNodes()
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Element $bodyElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(
         Layout\Reader\Context $readerContext,
@@ -82,7 +75,6 @@ public function interpret(
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Element $element
      * @return $this
-     * @since 2.0.0
      */
     protected function setBodyAttributeToStructure(Layout\Reader\Context $readerContext, Layout\Element $element)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
index ede03e9353cf7..09734bf295c05 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
@@ -10,7 +10,6 @@
 
 /**
  * Head structure reader is intended for collecting assets, title and metadata
- * @since 2.0.0
  */
 class Head implements Layout\ReaderInterface
 {
@@ -36,7 +35,6 @@ class Head implements Layout\ReaderInterface
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -48,7 +46,6 @@ public function getSupportedNodes()
      *
      * @param Layout\Element $node
      * @return void
-     * @since 2.0.0
      */
     protected function addContentTypeByNodeName(Layout\Element $node)
     {
@@ -68,7 +65,6 @@ protected function addContentTypeByNodeName(Layout\Element $node)
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Element $headElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(
         Layout\Reader\Context $readerContext,
@@ -117,7 +113,6 @@ public function interpret(
      *
      * @param \Magento\Framework\View\Layout\Element $element
      * @return array
-     * @since 2.0.0
      */
     protected function getAttributes($element)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Html.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Html.php
index 3d1a8a43b1d8c..ab4ff79aafe2b 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Html.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Html.php
@@ -10,7 +10,6 @@
 
 /**
  * Html reader is used for collecting attributes of html in to the scheduled page structure
- * @since 2.0.0
  */
 class Html implements Layout\ReaderInterface
 {
@@ -30,7 +29,6 @@ class Html implements Layout\ReaderInterface
      * {@inheritdoc}
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getSupportedNodes()
     {
@@ -43,7 +41,6 @@ public function getSupportedNodes()
      * @param Layout\Reader\Context $readerContext
      * @param Layout\Element $htmlElement
      * @return $this
-     * @since 2.0.0
      */
     public function interpret(
         Layout\Reader\Context $readerContext,
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index 9b164009ac5fb..e5ec04702b992 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -12,49 +12,41 @@
  * Page config Renderer model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Renderer implements RendererInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $assetTypeOrder = ['css', 'ico', 'js'];
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Asset\MergeService
-     * @since 2.0.0
      */
     protected $assetMergeService;
 
     /**
      * @var \Magento\Framework\Escaper
-     * @since 2.0.0
      */
     protected $escaper;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils
-     * @since 2.0.0
      */
     protected $string;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -65,7 +57,6 @@ class Renderer implements RendererInterface
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Psr\Log\LoggerInterface $logger
-     * @since 2.0.0
      */
     public function __construct(
         Config $pageConfig,
@@ -86,7 +77,6 @@ public function __construct(
     /**
      * @param string $elementType
      * @return string
-     * @since 2.0.0
      */
     public function renderElementAttributes($elementType)
     {
@@ -99,7 +89,6 @@ public function renderElementAttributes($elementType)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderHeadContent()
     {
@@ -114,7 +103,6 @@ public function renderHeadContent()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderTitle()
     {
@@ -123,7 +111,6 @@ public function renderTitle()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function renderMetadata()
     {
@@ -145,7 +132,6 @@ public function renderMetadata()
      * @param string $name
      * @param string $content
      * @return mixed
-     * @since 2.0.0
      */
     protected function processMetadataContent($name, $content)
     {
@@ -159,7 +145,6 @@ protected function processMetadataContent($name, $content)
     /**
      * @param string $name
      * @return bool|string
-     * @since 2.0.0
      */
     protected function getMetadataTemplate($name)
     {
@@ -193,7 +178,6 @@ protected function getMetadataTemplate($name)
 
     /**
      * @return void
-     * @since 2.0.0
      */
     public function prepareFavicon()
     {
@@ -230,7 +214,6 @@ public function prepareFavicon()
      * @param array $resultGroups
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderAssets($resultGroups = [])
     {
@@ -250,7 +233,6 @@ public function renderAssets($resultGroups = [])
      *
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string
-     * @since 2.0.0
      */
     protected function renderAssetGroup(\Magento\Framework\View\Asset\PropertyGroup $group)
     {
@@ -263,7 +245,6 @@ protected function renderAssetGroup(\Magento\Framework\View\Asset\PropertyGroup
      * @param array $groupAssets
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return array
-     * @since 2.0.0
      */
     protected function processMerge($groupAssets, $group)
     {
@@ -279,7 +260,6 @@ protected function processMerge($groupAssets, $group)
     /**
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string|null
-     * @since 2.0.0
      */
     protected function getGroupAttributes($group)
     {
@@ -302,7 +282,6 @@ protected function getGroupAttributes($group)
      * @param string $contentType
      * @param string $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function addDefaultAttributes($contentType, $attributes)
     {
@@ -322,7 +301,6 @@ protected function addDefaultAttributes($contentType, $attributes)
      * @param string $contentType
      * @param string|null $attributes
      * @return string
-     * @since 2.0.0
      */
     protected function getAssetTemplate($contentType, $attributes)
     {
@@ -343,7 +321,6 @@ protected function getAssetTemplate($contentType, $attributes)
      * @param string $groupHtml
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string
-     * @since 2.0.0
      */
     protected function processIeCondition($groupHtml, $group)
     {
@@ -359,7 +336,6 @@ protected function processIeCondition($groupHtml, $group)
      *
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string
-     * @since 2.0.0
      */
     protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $group)
     {
@@ -397,7 +373,6 @@ protected function getAssetContentType(\Magento\Framework\View\Asset\AssetInterf
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAvailableResultGroups()
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/RendererFactory.php b/lib/internal/Magento/Framework/View/Page/Config/RendererFactory.php
index 17046bbf92a5a..706e2809471ce 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/RendererFactory.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/RendererFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory class for \Magento\Framework\View\Page\Config\Renderer
- * @since 2.0.0
  */
 class RendererFactory
 {
@@ -16,7 +15,6 @@ class RendererFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -24,7 +22,6 @@ class RendererFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -33,7 +30,6 @@ class RendererFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\View\Page\Config\Renderer
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/RendererInterface.php b/lib/internal/Magento/Framework/View/Page/Config/RendererInterface.php
index 9b533cfcaa3ef..e49c8f141ec24 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/RendererInterface.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/RendererInterface.php
@@ -10,7 +10,6 @@
  * Interface RendererInterface
  *
  * @package Magento\Framework\View\Page\Config
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -20,7 +19,6 @@ interface RendererInterface
      * @param string $elementType
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderElementAttributes($elementType);
 
@@ -28,7 +26,6 @@ public function renderElementAttributes($elementType);
      * Render Head Content
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderHeadContent();
 
@@ -36,7 +33,6 @@ public function renderHeadContent();
      * Render Title
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderTitle();
 
@@ -44,7 +40,6 @@ public function renderTitle();
      * Render Metadata
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderMetadata();
 
@@ -52,7 +47,6 @@ public function renderMetadata();
      * Prepare Favicon
      *
      * @return void
-     * @since 2.0.0
      */
     public function prepareFavicon();
 
@@ -62,7 +56,6 @@ public function prepareFavicon();
      * @param array $resultGroups
      *
      * @return string
-     * @since 2.0.0
      */
     public function renderAssets($resultGroups = []);
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
index 8c92d9a490a53..285690f2ec9a3 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -10,7 +10,6 @@
  * Page config structure model
  *
  * @api
- * @since 2.0.0
  */
 class Structure
 {
@@ -35,7 +34,6 @@ class Structure
      * Information assets elements on page
      *
      * @var array
-     * @since 2.0.0
      */
     protected $assets = [];
 
@@ -43,43 +41,36 @@ class Structure
      * List asset which will be removed
      *
      * @var array
-     * @since 2.0.0
      */
     protected $removeAssets = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $title;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     protected $metadata = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $elementAttributes = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $removeElementAttributes = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $bodyClasses = [];
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $isBodyClassesDeleted = false;
 
@@ -88,7 +79,6 @@ class Structure
      * @param string $attributeName
      * @param string $attributeValue
      * @return $this
-     * @since 2.0.0
      */
     public function setElementAttribute($element, $attributeName, $attributeValue)
     {
@@ -102,7 +92,6 @@ public function setElementAttribute($element, $attributeName, $attributeValue)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function processRemoveElementAttributes()
     {
@@ -121,7 +110,6 @@ public function processRemoveElementAttributes()
     /**
      * @param string $value
      * @return $this
-     * @since 2.0.0
      */
     public function setBodyClass($value)
     {
@@ -135,7 +123,6 @@ public function setBodyClass($value)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getBodyClasses()
     {
@@ -144,7 +131,6 @@ public function getBodyClasses()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getElementAttributes()
     {
@@ -154,7 +140,6 @@ public function getElementAttributes()
     /**
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function setTitle($title)
     {
@@ -164,7 +149,6 @@ public function setTitle($title)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getTitle()
     {
@@ -175,7 +159,6 @@ public function getTitle()
      * @param string $name
      * @param string $content
      * @return $this
-     * @since 2.0.0
      */
     public function setMetadata($name, $content)
     {
@@ -185,7 +168,6 @@ public function setMetadata($name, $content)
 
     /**
      * @return string[]
-     * @since 2.0.0
      */
     public function getMetadata()
     {
@@ -196,7 +178,6 @@ public function getMetadata()
      * @param string $name
      * @param array $attributes
      * @return $this
-     * @since 2.0.0
      */
     public function addAssets($name, $attributes)
     {
@@ -207,7 +188,6 @@ public function addAssets($name, $attributes)
     /**
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function removeAssets($name)
     {
@@ -217,7 +197,6 @@ public function removeAssets($name)
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function processRemoveAssets()
     {
@@ -228,7 +207,6 @@ public function processRemoveAssets()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getAssets()
     {
diff --git a/lib/internal/Magento/Framework/View/Page/ConfigFactory.php b/lib/internal/Magento/Framework/View/Page/ConfigFactory.php
index 05978f01067d6..556353c35c02e 100644
--- a/lib/internal/Magento/Framework/View/Page/ConfigFactory.php
+++ b/lib/internal/Magento/Framework/View/Page/ConfigFactory.php
@@ -8,7 +8,6 @@
 
 /**
  * Factory class for \Magento\Framework\View\Page\Config
- * @since 2.0.0
  */
 class ConfigFactory
 {
@@ -16,7 +15,6 @@ class ConfigFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager = null;
 
@@ -24,7 +22,6 @@ class ConfigFactory
      * Instance name to create
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName = null;
 
@@ -33,7 +30,6 @@ class ConfigFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -48,7 +44,6 @@ public function __construct(
      *
      * @param array $data
      * @return \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Page/FaviconInterface.php b/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
index 0a1a373193ece..d7286029c466c 100644
--- a/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
+++ b/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
@@ -9,19 +9,16 @@
  * Favicon interface
  *
  * @api
- * @since 2.0.0
  */
 interface FaviconInterface
 {
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getFaviconFile();
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultFavicon();
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Layout/Reader.php b/lib/internal/Magento/Framework/View/Page/Layout/Reader.php
index f0fc983f6b895..c708dbfccc8c7 100644
--- a/lib/internal/Magento/Framework/View/Page/Layout/Reader.php
+++ b/lib/internal/Magento/Framework/View/Page/Layout/Reader.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Page layout reader
- * @since 2.0.0
  */
 class Reader
 {
@@ -21,31 +20,26 @@ class Reader
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ResolverInterface
-     * @since 2.0.0
      */
     protected $themeResolver;
 
     /**
      * @var \Magento\Framework\View\Layout\ProcessorFactory
-     * @since 2.0.0
      */
     protected $processorFactory;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
-     * @since 2.0.0
      */
     protected $pageLayoutFileSource;
 
     /**
      * @var \Magento\Framework\View\Layout\ProcessorInterface
-     * @since 2.0.0
      */
     protected $pageLayoutMerge;
 
     /**
      * @var \Magento\Framework\View\Layout\ReaderPool
-     * @since 2.0.0
      */
     protected $reader;
 
@@ -56,7 +50,6 @@ class Reader
      * @param \Magento\Framework\View\Layout\ProcessorFactory $processorFactory
      * @param \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource
      * @param \Magento\Framework\View\Layout\ReaderPool $reader
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\View\Design\Theme\ResolverInterface $themeResolver,
@@ -74,7 +67,6 @@ public function __construct(
      * Retrieve the layout update instance
      *
      * @return \Magento\Framework\View\Layout\ProcessorInterface
-     * @since 2.0.0
      */
     protected function getPageLayoutMerge()
     {
@@ -95,7 +87,6 @@ protected function getPageLayoutMerge()
      * @param Layout\Reader\Context $readerContext
      * @param string $pageLayout
      * @return void
-     * @since 2.0.0
      */
     public function read(Layout\Reader\Context $readerContext, $pageLayout)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Title.php b/lib/internal/Magento/Framework/View/Page/Title.php
index 86bfcf46146fe..b0c8b155c878e 100644
--- a/lib/internal/Magento/Framework/View/Page/Title.php
+++ b/lib/internal/Magento/Framework/View/Page/Title.php
@@ -12,7 +12,6 @@
  * Page title
  *
  * @api
- * @since 2.0.0
  */
 class Title
 {
@@ -23,31 +22,26 @@ class Title
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     private $scopeConfig;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $prependedValues = [];
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $appendedValues = [];
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $textValue;
 
     /**
      * @param App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(
         App\Config\ScopeConfigInterface $scopeConfig
@@ -60,7 +54,6 @@ public function __construct(
      *
      * @param string $title
      * @return $this
-     * @since 2.0.0
      */
     public function set($title)
     {
@@ -72,7 +65,6 @@ public function set($title)
      * Retrieve title element text (encoded)
      *
      * @return string
-     * @since 2.0.0
      */
     public function get()
     {
@@ -83,7 +75,6 @@ public function get()
      * Same as getTitle(), but return only first item from chunk
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getShort()
     {
@@ -94,7 +85,6 @@ public function getShort()
     /**
      * Same as getShort(), but return title without prefix and suffix
      * @return mixed
-     * @since 2.0.0
      */
     public function getShortHeading()
     {
@@ -105,7 +95,6 @@ public function getShortHeading()
     /**
      * @param bool $withConfigValues
      * @return array
-     * @since 2.0.0
      */
     protected function build($withConfigValues = true)
     {
@@ -119,7 +108,6 @@ protected function build($withConfigValues = true)
     /**
      * @param string $title
      * @return string
-     * @since 2.0.0
      */
     protected function addConfigValues($title)
     {
@@ -137,7 +125,6 @@ protected function addConfigValues($title)
      * Retrieve default title text
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefault()
     {
@@ -151,7 +138,6 @@ public function getDefault()
     /**
      * @param string $suffix
      * @return void
-     * @since 2.0.0
      */
     public function append($suffix)
     {
@@ -161,7 +147,6 @@ public function append($suffix)
     /**
      * @param string $prefix
      * @return void
-     * @since 2.0.0
      */
     public function prepend($prefix)
     {
@@ -172,7 +157,6 @@ public function prepend($prefix)
      * Unset title
      *
      * @return void
-     * @since 2.0.0
      */
     public function unsetValue()
     {
diff --git a/lib/internal/Magento/Framework/View/PageLayout/Config.php b/lib/internal/Magento/Framework/View/PageLayout/Config.php
index 488ff3cd1dfb3..ba00e6beeda8e 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/Config.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/Config.php
@@ -8,13 +8,11 @@
 
 /**
  * Page layouts configuration
- * @since 2.0.0
  */
 class Config extends \Magento\Framework\Config\AbstractXml
 {
     /**
      * @var \Magento\Framework\Config\Dom\UrnResolver
-     * @since 2.0.0
      */
     protected $urnResolver;
 
@@ -25,7 +23,6 @@ class Config extends \Magento\Framework\Config\AbstractXml
      * @param \Magento\Framework\Config\DomFactory $domFactory
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         $configFiles,
@@ -40,7 +37,6 @@ public function __construct(
      * Get absolute path to the XML-schema file
      *
      * @return string
-     * @since 2.0.0
      */
     public function getSchemaFile()
     {
@@ -51,7 +47,6 @@ public function getSchemaFile()
      * Get page layout that contains declared in system
      *
      * @return string[][]
-     * @since 2.0.0
      */
     public function getPageLayouts()
     {
@@ -63,7 +58,6 @@ public function getPageLayouts()
      *
      * @param string $pageLayout
      * @return bool
-     * @since 2.0.0
      */
     public function hasPageLayout($pageLayout)
     {
@@ -74,7 +68,6 @@ public function hasPageLayout($pageLayout)
      * Retrieve page layout options
      *
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -84,7 +77,6 @@ public function getOptions()
     /**
      * @param bool $withEmpty
      * @return array
-     * @since 2.0.0
      */
     public function toOptionArray($withEmpty = false)
     {
@@ -107,7 +99,6 @@ public function toOptionArray($withEmpty = false)
      *
      * @param \DOMDocument $dom
      * @return array
-     * @since 2.0.0
      */
     protected function _extractData(\DOMDocument $dom)
     {
@@ -124,7 +115,6 @@ protected function _extractData(\DOMDocument $dom)
      * Get XML-contents, initial for merging
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getInitialXml()
     {
@@ -136,7 +126,6 @@ protected function _getInitialXml()
      * Get list of paths to identifiable nodes
      *
      * @return array
-     * @since 2.0.0
      */
     protected function _getIdAttributes()
     {
diff --git a/lib/internal/Magento/Framework/View/PageLayout/File/Collector/Aggregated.php b/lib/internal/Magento/Framework/View/PageLayout/File/Collector/Aggregated.php
index ac7fe731cc248..c760367337ca1 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/File/Collector/Aggregated.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/File/Collector/Aggregated.php
@@ -10,7 +10,6 @@
 
 /**
  * Source of layout files aggregated from a theme and its parents according to merging and overriding conventions
- * @since 2.0.0
  */
 class Aggregated extends \Magento\Framework\View\Layout\File\Collector\Aggregated
 {
@@ -18,7 +17,6 @@ class Aggregated extends \Magento\Framework\View\Layout\File\Collector\Aggregate
      * @param ThemeInterface $theme
      * @param string $filePath
      * @return array
-     * @since 2.0.0
      */
     public function getFilesContent(ThemeInterface $theme, $filePath)
     {
diff --git a/lib/internal/Magento/Framework/View/Render/RenderFactory.php b/lib/internal/Magento/Framework/View/Render/RenderFactory.php
index bec632382fc75..3f90bc2e8f2bb 100644
--- a/lib/internal/Magento/Framework/View/Render/RenderFactory.php
+++ b/lib/internal/Magento/Framework/View/Render/RenderFactory.php
@@ -12,7 +12,6 @@
  * Class RenderFactory
  *
  * @api
- * @since 2.0.0
  */
 class RenderFactory
 {
@@ -20,7 +19,6 @@ class RenderFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -28,7 +26,6 @@ class RenderFactory
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -41,7 +38,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $type
      * @return RenderInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function get($type)
     {
diff --git a/lib/internal/Magento/Framework/View/RenderInterface.php b/lib/internal/Magento/Framework/View/RenderInterface.php
index ec19ec2b41d64..041893f81232a 100644
--- a/lib/internal/Magento/Framework/View/RenderInterface.php
+++ b/lib/internal/Magento/Framework/View/RenderInterface.php
@@ -9,7 +9,6 @@
  * Interface RenderInterface
  *
  * @api
- * @since 2.0.0
  */
 interface RenderInterface
 {
@@ -19,7 +18,6 @@ interface RenderInterface
      * @param string $template
      * @param array $data
      * @return string
-     * @since 2.0.0
      */
     public function renderTemplate($template, array $data);
 
@@ -29,7 +27,6 @@ public function renderTemplate($template, array $data);
      * @param string $content
      * @param array $containerInfo
      * @return string
-     * @since 2.0.0
      */
     public function renderContainer($content, array $containerInfo = []);
 }
diff --git a/lib/internal/Magento/Framework/View/Result/Layout.php b/lib/internal/Magento/Framework/View/Result/Layout.php
index 999769e610cfe..83e0a991cb959 100644
--- a/lib/internal/Magento/Framework/View/Result/Layout.php
+++ b/lib/internal/Magento/Framework/View/Result/Layout.php
@@ -19,49 +19,41 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
- * @since 2.0.0
  */
 class Layout extends AbstractResult
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @since 2.0.0
      */
     protected $layoutFactory;
 
     /**
      * @var \Magento\Framework\View\Layout\BuilderFactory
-     * @since 2.0.0
      */
     protected $layoutBuilderFactory;
 
     /**
      * @var \Magento\Framework\View\Layout\ReaderPool
-     * @since 2.0.0
      */
     protected $layoutReaderPool;
 
     /**
      * @var \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     protected $layout;
 
     /**
      * @var \Magento\Framework\Translate\InlineInterface
-     * @since 2.0.0
      */
     protected $translateInline;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     protected $eventManager;
 
     /**
      * @var \Magento\Framework\App\Request\Http
-     * @since 2.0.0
      */
     protected $request;
 
@@ -75,7 +67,6 @@ class Layout extends AbstractResult
      * @param View\Layout\BuilderFactory $layoutBuilderFactory
      * @param View\Layout\GeneratorPool $generatorPool
      * @param bool $isIsolated
-     * @since 2.0.0
      */
     public function __construct(
         View\Element\Template\Context $context,
@@ -104,7 +95,6 @@ public function __construct(
      * Create layout builder
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initLayoutBuilder()
     {
@@ -115,7 +105,6 @@ protected function initLayoutBuilder()
      * Get layout instance for current page
      *
      * @return \Magento\Framework\View\LayoutInterface
-     * @since 2.0.0
      */
     public function getLayout()
     {
@@ -124,7 +113,6 @@ public function getLayout()
 
     /**
      * @return $this
-     * @since 2.0.0
      */
     public function addDefaultHandle()
     {
@@ -136,7 +124,6 @@ public function addDefaultHandle()
      * Retrieve the default layout handle name for the current action
      *
      * @return string
-     * @since 2.0.0
      */
     public function getDefaultLayoutHandle()
     {
@@ -146,7 +133,6 @@ public function getDefaultLayoutHandle()
     /**
      * @param string|string[] $handleName
      * @return $this
-     * @since 2.0.0
      */
     public function addHandle($handleName)
     {
@@ -159,7 +145,6 @@ public function addHandle($handleName)
      *
      * @param string $update
      * @return $this
-     * @since 2.0.0
      */
     public function addUpdate($update)
     {
@@ -172,7 +157,6 @@ public function addUpdate($update)
      *
      * @param HttpResponseInterface|ResponseInterface $httpResponse
      * @return $this
-     * @since 2.0.0
      */
     public function renderResult(ResponseInterface $httpResponse)
     {
@@ -192,7 +176,6 @@ public function renderResult(ResponseInterface $httpResponse)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
diff --git a/lib/internal/Magento/Framework/View/Result/LayoutFactory.php b/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
index 24e55e6e48166..4104e19686244 100644
--- a/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
+++ b/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
@@ -10,26 +10,22 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class LayoutFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -41,7 +37,6 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\View\Result\Layout
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/lib/internal/Magento/Framework/View/Result/Page.php b/lib/internal/Magento/Framework/View/Result/Page.php
index ea77452d90dcd..bcff40e2e915b 100644
--- a/lib/internal/Magento/Framework/View/Result/Page.php
+++ b/lib/internal/Magento/Framework/View/Result/Page.php
@@ -25,61 +25,51 @@
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  *
  * @api
- * @since 2.0.0
  */
 class Page extends Layout
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $pageLayout;
 
     /**
      * @var \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     protected $pageConfig;
 
     /**
      * @var \Magento\Framework\View\Page\Config\RendererInterface
-     * @since 2.0.0
      */
     protected $pageConfigRenderer;
 
     /**
      * @var \Magento\Framework\View\Page\Config\RendererFactory
-     * @since 2.0.0
      */
     protected $pageConfigRendererFactory;
 
     /**
      * @var \Magento\Framework\View\Page\Layout\Reader
-     * @since 2.0.0
      */
     protected $pageLayoutReader;
 
     /**
      * @var \Magento\Framework\View\FileSystem
-     * @since 2.0.0
      */
     protected $viewFileSystem;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $viewVars;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $template;
 
     /**
      * @var Framework\App\RequestInterface
-     * @since 2.0.0
      */
     protected $request;
 
@@ -87,19 +77,16 @@ class Page extends Layout
      * Asset service
      *
      * @var \Magento\Framework\View\Asset\Repository
-     * @since 2.0.0
      */
     protected $assetRepo;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var Framework\UrlInterface
-     * @since 2.0.0
      */
     protected $urlBuilder;
 
@@ -125,7 +112,6 @@ class Page extends Layout
      * @param View\EntitySpecificHandlesList $entitySpecificHandlesList
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         View\Element\Template\Context $context,
@@ -167,7 +153,6 @@ public function __construct(
      * Initialize page config reader
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initPageConfigReader()
     {
@@ -178,7 +163,6 @@ protected function initPageConfigReader()
      * Create layout builder
      *
      * @return void
-     * @since 2.0.0
      */
     protected function initLayoutBuilder()
     {
@@ -193,7 +177,6 @@ protected function initLayoutBuilder()
      * Set up default handles for current page
      *
      * @return $this
-     * @since 2.0.0
      */
     public function initLayout()
     {
@@ -210,7 +193,6 @@ public function initLayout()
      * Add default handle
      *
      * @return $this
-     * @since 2.0.0
      */
     public function addDefaultHandle()
     {
@@ -222,7 +204,6 @@ public function addDefaultHandle()
      * Return page configuration
      *
      * @return \Magento\Framework\View\Page\Config
-     * @since 2.0.0
      */
     public function getConfig()
     {
@@ -236,7 +217,6 @@ public function getConfig()
      * @param string|null $defaultHandle
      * @param bool $entitySpecific
      * @return bool
-     * @since 2.0.0
      */
     public function addPageLayoutHandles(array $parameters = [], $defaultHandle = null, $entitySpecific = true)
     {
@@ -256,7 +236,6 @@ public function addPageLayoutHandles(array $parameters = [], $defaultHandle = nu
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function render(HttpResponseInterface $response)
     {
@@ -291,7 +270,6 @@ protected function render(HttpResponseInterface $response)
      * Add default body classes for current page layout
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function addDefaultBodyClasses()
     {
@@ -305,7 +283,6 @@ protected function addDefaultBodyClasses()
 
     /**
      * @return string
-     * @since 2.0.0
      */
     protected function getPageLayout()
     {
@@ -318,7 +295,6 @@ protected function getPageLayout()
      * @param   string|array $key
      * @param   mixed $value
      * @return  $this
-     * @since 2.0.0
      */
     protected function assign($key, $value = null)
     {
@@ -337,7 +313,6 @@ protected function assign($key, $value = null)
      *
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function renderPage()
     {
@@ -364,7 +339,6 @@ protected function renderPage()
      * @param string $fileId
      * @param array $params
      * @return string
-     * @since 2.0.0
      */
     protected function getViewFileUrl($fileId, array $params = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Result/PageFactory.php b/lib/internal/Magento/Framework/View/Result/PageFactory.php
index 8f28ddf192866..ef234ca4d4429 100644
--- a/lib/internal/Magento/Framework/View/Result/PageFactory.php
+++ b/lib/internal/Magento/Framework/View/Result/PageFactory.php
@@ -14,26 +14,22 @@
  * which is by convention is determined from the controller action class
  *
  * @api
- * @since 2.0.0
  */
 class PageFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      * @param bool $isView
      * @param array $arguments
      * @return \Magento\Framework\View\Result\Page
-     * @since 2.0.0
      */
     public function create($isView = false, array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 77769ccc7a8b4..371ddcc94f1bb 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Framework\View\Template\Html\Minifier
  *
- * @since 2.0.0
  */
 class Minifier implements MinifierInterface
 {
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -26,7 +24,6 @@ class Minifier implements MinifierInterface
      * All inline HTML tags
      *
      * @var array
-     * @since 2.0.0
      */
     protected $inlineHtmlTags = [
         'b',
@@ -64,7 +61,6 @@ class Minifier implements MinifierInterface
 
     /**
      * @var Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $htmlDirectory;
 
@@ -77,7 +73,6 @@ class Minifier implements MinifierInterface
     /**
      * @param Filesystem $filesystem
      * @param Filesystem\Directory\ReadFactory $readFactory
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -93,7 +88,6 @@ public function __construct(
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMinified($file)
     {
@@ -109,7 +103,6 @@ public function getMinified($file)
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getPathToMinified($file)
     {
@@ -121,7 +114,6 @@ public function getPathToMinified($file)
      *
      * @param string $file
      * @return void
-     * @since 2.0.0
      */
     public function minify($file)
     {
diff --git a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
index e557db277c46a..edd8caeb914b3 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
@@ -10,7 +10,6 @@
  * HTML minifier
  *
  * @api
- * @since 2.0.0
  */
 interface MinifierInterface
 {
@@ -19,7 +18,6 @@ interface MinifierInterface
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getMinified($file);
 
@@ -28,7 +26,6 @@ public function getMinified($file);
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     public function getPathToMinified($file);
 
@@ -37,7 +34,6 @@ public function getPathToMinified($file);
      *
      * @param string $file
      * @return void
-     * @since 2.0.0
      */
     public function minify($file);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
index 1e02d2bfcd95d..8c51433779424 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
@@ -10,7 +10,6 @@
 
 /**
  * Template engine that enables PHP templates to be used for rendering
- * @since 2.0.0
  */
 class Php implements TemplateEngineInterface
 {
@@ -18,7 +17,6 @@ class Php implements TemplateEngineInterface
      * Current block
      *
      * @var BlockInterface
-     * @since 2.0.0
      */
     protected $_currentBlock;
 
@@ -26,7 +24,6 @@ class Php implements TemplateEngineInterface
      * Helper factory
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_helperFactory;
 
@@ -34,7 +31,6 @@ class Php implements TemplateEngineInterface
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $helperFactory
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManagerInterface $helperFactory)
     {
@@ -52,7 +48,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $helperFac
      * @param array                    $dictionary
      * @return string
      * @throws \Exception
-     * @since 2.0.0
      */
     public function render(BlockInterface $block, $fileName, array $dictionary = [])
     {
@@ -81,7 +76,6 @@ public function render(BlockInterface $block, $fileName, array $dictionary = [])
      * @param   string $method
      * @param   array  $args
      * @return  mixed
-     * @since 2.0.0
      */
     public function __call($method, $args)
     {
@@ -96,7 +90,6 @@ public function __call($method, $args)
      *
      * @param string $name
      * @return bool
-     * @since 2.0.0
      */
     public function __isset($name)
     {
@@ -111,7 +104,6 @@ public function __isset($name)
      *
      * @param string $name
      * @return mixed
-     * @since 2.0.0
      */
     public function __get($name)
     {
@@ -124,7 +116,6 @@ public function __get($name)
      * @param string $className
      * @return \Magento\Framework\App\Helper\AbstractHelper
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function helper($className)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
index d3cf46b124dbd..923e249649574 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
@@ -16,31 +16,26 @@
 
 /**
  * Class Xhtml
- * @since 2.0.0
  */
 class Xhtml implements TemplateEngineInterface
 {
     /**
      * @var TemplateProvider
-     * @since 2.0.0
      */
     protected $templateProvider;
 
     /**
      * @var ResultFactory
-     * @since 2.0.0
      */
     protected $resultFactory;
 
     /**
      * @var TemplateFactory
-     * @since 2.0.0
      */
     protected $templateFactory;
 
     /**
      * @var CompilerFactory
-     * @since 2.0.0
      */
     protected $compilerFactory;
 
@@ -51,7 +46,6 @@ class Xhtml implements TemplateEngineInterface
      * @param ResultFactory $resultFactory
      * @param TemplateFactory $templateFactory
      * @param CompilerFactory $compilerFactory
-     * @since 2.0.0
      */
     public function __construct(
         TemplateProvider $templateProvider,
@@ -77,7 +71,6 @@ public function __construct(
      * @return ResultInterface
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function render(BlockInterface $block, $templateFile, array $dictionary = [])
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
index 25e05534f3a75..94d24124469cd 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
@@ -14,37 +14,31 @@
 
 /**
  * Class Compiler
- * @since 2.0.0
  */
 class Compiler implements CompilerInterface
 {
     /**
      * @var TextInterface
-     * @since 2.0.0
      */
     protected $compilerText;
 
     /**
      * @var AttributeInterface
-     * @since 2.0.0
      */
     protected $compilerAttribute;
 
     /**
      * @var CdataInterface
-     * @since 2.0.0
      */
     protected $compilerCdata;
 
     /**
      * @var CommentInterface
-     * @since 2.0.0
      */
     protected $compilerComment;
 
     /**
      * @var ElementInterface[]
-     * @since 2.0.0
      */
     protected $elementCompilers;
 
@@ -52,7 +46,6 @@ class Compiler implements CompilerInterface
      * Postprocessing data
      *
      * @var array
-     * @since 2.0.0
      */
     protected $data;
 
@@ -64,7 +57,6 @@ class Compiler implements CompilerInterface
      * @param AttributeInterface|CdataInterface $compilerCdata
      * @param CommentInterface $compilerComment
      * @param ElementInterface[] $elementCompilers
-     * @since 2.0.0
      */
     public function __construct(
         TextInterface $compilerText,
@@ -87,7 +79,6 @@ public function __construct(
      * @param DataObject $processedObject
      * @param DataObject $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMNode $node, DataObject $processedObject, DataObject $context)
     {
@@ -124,7 +115,6 @@ public function compile(\DOMNode $node, DataObject $processedObject, DataObject
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     public function postprocessing($content)
     {
@@ -144,7 +134,6 @@ function ($match) {
      * @param string $key
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function setPostprocessingData($key, $content)
     {
@@ -156,7 +145,6 @@ public function setPostprocessingData($key, $content)
      *
      * @param \DOMElement $node
      * @return \DOMElement[]
-     * @since 2.0.0
      */
     protected function getChildNodes(\DOMElement $node)
     {
@@ -173,7 +161,6 @@ protected function getChildNodes(\DOMElement $node)
      *
      * @param string $name
      * @return ElementInterface
-     * @since 2.0.0
      */
     protected function getElementCompiler($name)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Attribute.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Attribute.php
index f758aa51b16f9..af234cb87bf29 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Attribute.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Attribute.php
@@ -10,13 +10,11 @@
 
 /**
  * Class Attribute
- * @since 2.0.0
  */
 class Attribute implements AttributeInterface
 {
     /**
      * @var DirectiveInterface[]
-     * @since 2.0.0
      */
     protected $directivePool;
 
@@ -24,7 +22,6 @@ class Attribute implements AttributeInterface
      * Constructor
      *
      * @param DirectiveInterface[] $directivePool
-     * @since 2.0.0
      */
     public function __construct(array $directivePool)
     {
@@ -37,7 +34,6 @@ public function __construct(array $directivePool)
      * @param \DOMAttr $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMAttr $node, DataObject $processedObject)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/AttributeInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/AttributeInterface.php
index 4fcef65735f55..c682fff45246d 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/AttributeInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/AttributeInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface AttributeInterface
- * @since 2.0.0
  */
 interface AttributeInterface
 {
@@ -19,7 +18,6 @@ interface AttributeInterface
      * @param \DOMAttr $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMAttr $node, DataObject $processedObject);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Cdata.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Cdata.php
index cd02a2f90e6ec..5bbd60da1134d 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Cdata.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Cdata.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Cdata
- * @since 2.0.0
  */
 class Cdata implements CdataInterface
 {
@@ -19,7 +18,6 @@ class Cdata implements CdataInterface
      * @param \DOMCdataSection $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMCdataSection $node, DataObject $processedObject)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CdataInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CdataInterface.php
index 6ac573170059e..303a67c80b94d 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CdataInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CdataInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CdataInterface
- * @since 2.0.0
  */
 interface CdataInterface
 {
@@ -19,7 +18,6 @@ interface CdataInterface
      * @param \DOMCdataSection $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMCdataSection $node, DataObject $processedObject);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Comment.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Comment.php
index c272b98676d76..c362c4365719b 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Comment.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Comment.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Comment
- * @since 2.0.0
  */
 class Comment implements CommentInterface
 {
@@ -19,7 +18,6 @@ class Comment implements CommentInterface
      * @param \DOMComment $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMComment $node, DataObject $processedObject)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CommentInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CommentInterface.php
index 05a28528f4821..4b54d74d1e3e0 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CommentInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/CommentInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CommentInterface
- * @since 2.0.0
  */
 interface CommentInterface
 {
@@ -19,7 +18,6 @@ interface CommentInterface
      * @param \DOMComment $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMComment $node, DataObject $processedObject);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/CallableMethod.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/CallableMethod.php
index 370b62609b902..7b08520a74432 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/CallableMethod.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/CallableMethod.php
@@ -9,7 +9,6 @@
 
 /**
  * Class CallableMethod
- * @since 2.0.0
  */
 class CallableMethod implements DirectiveInterface
 {
@@ -19,7 +18,6 @@ class CallableMethod implements DirectiveInterface
      * @param array $directive
      * @param DataObject $processedObject
      * @return string
-     * @since 2.0.0
      */
     public function execute($directive, DataObject $processedObject)
     {
@@ -45,7 +43,6 @@ public function execute($directive, DataObject $processedObject)
      * Get regexp search pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPattern()
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/DirectiveInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/DirectiveInterface.php
index 9f25bcc4153a5..dce2d3dfb4348 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/DirectiveInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/DirectiveInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface DirectiveInterface
- * @since 2.0.0
  */
 interface DirectiveInterface
 {
@@ -19,7 +18,6 @@ interface DirectiveInterface
      * @param array $directive
      * @param DataObject $processedObject
      * @return string
-     * @since 2.0.0
      */
     public function execute($directive, DataObject $processedObject);
 
@@ -27,7 +25,6 @@ public function execute($directive, DataObject $processedObject);
      * Get regexp search pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPattern();
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/Variable.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/Variable.php
index 1eb0b20f79fcc..cbd0f260c3418 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/Variable.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Directive/Variable.php
@@ -9,7 +9,6 @@
 
 /**
  * Class Variable
- * @since 2.0.0
  */
 class Variable implements DirectiveInterface
 {
@@ -19,7 +18,6 @@ class Variable implements DirectiveInterface
      * @param array $directive
      * @param DataObject $processedObject
      * @return string
-     * @since 2.0.0
      */
     public function execute($directive, DataObject $processedObject)
     {
@@ -30,7 +28,6 @@ public function execute($directive, DataObject $processedObject)
      * Get regexp search pattern
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPattern()
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Element/ElementInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Element/ElementInterface.php
index 3e200d318c324..994b8848af416 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Element/ElementInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Element/ElementInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Interface ElementInterface
- * @since 2.0.0
  */
 interface ElementInterface
 {
@@ -22,7 +21,6 @@ interface ElementInterface
      * @param DataObject $processedObject
      * @param DataObject $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(
         CompilerInterface $compiler,
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Text.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Text.php
index 071299b13656e..3de1a63680153 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Text.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/Text.php
@@ -10,13 +10,11 @@
 
 /**
  * Class Text
- * @since 2.0.0
  */
 class Text implements TextInterface
 {
     /**
      * @var DirectiveInterface[]
-     * @since 2.0.0
      */
     protected $directivePool;
 
@@ -24,7 +22,6 @@ class Text implements TextInterface
      * Constructor
      *
      * @param DirectiveInterface[] $directivePool
-     * @since 2.0.0
      */
     public function __construct(array $directivePool)
     {
@@ -37,7 +34,6 @@ public function __construct(array $directivePool)
      * @param \DOMText $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMText $node, DataObject $processedObject)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/TextInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/TextInterface.php
index a305834a5ea79..4295b10e6b87b 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/TextInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler/TextInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface TextInterface
- * @since 2.0.0
  */
 interface TextInterface
 {
@@ -19,7 +18,6 @@ interface TextInterface
      * @param \DOMText $node
      * @param DataObject $processedObject
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMText $node, DataObject $processedObject);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
index 025e59f862d32..5d251a278ccdc 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
@@ -11,7 +11,6 @@
 
 /**
  * Class CompilerFactory
- * @since 2.0.0
  */
 class CompilerFactory
 {
@@ -19,7 +18,6 @@ class CompilerFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -27,7 +25,6 @@ class CompilerFactory
      * Instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -36,7 +33,6 @@ class CompilerFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, $instanceName)
     {
@@ -50,7 +46,6 @@ public function __construct(ObjectManagerInterface $objectManager, $instanceName
      * @param array $arguments
      * @return CompilerInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
index b38d75dc87fc6..565bb7c92324c 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
@@ -11,7 +11,6 @@
  * Interface CompilerInterface
  *
  * @api
- * @since 2.0.0
  */
 interface CompilerInterface
 {
@@ -24,7 +23,6 @@ interface CompilerInterface
      * @param Object $dataObject
      * @param Object $context
      * @return void
-     * @since 2.0.0
      */
     public function compile(\DOMNode $node, DataObject $dataObject, DataObject $context);
 
@@ -33,7 +31,6 @@ public function compile(\DOMNode $node, DataObject $dataObject, DataObject $cont
      *
      * @param string $content
      * @return string
-     * @since 2.0.0
      */
     public function postprocessing($content);
 
@@ -43,7 +40,6 @@ public function postprocessing($content);
      * @param string $key
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function setPostprocessingData($key, $content);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
index 6beefcf9d5acb..c0e56a4844840 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
@@ -11,7 +11,6 @@
 
 /**
  * Class ResultFactory
- * @since 2.0.0
  */
 class ResultFactory
 {
@@ -19,7 +18,6 @@ class ResultFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -27,7 +25,6 @@ class ResultFactory
      * Instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -36,7 +33,6 @@ class ResultFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      * @param array $arguments
      * @return ResultInterface
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultInterface.php
index 8b33cbe0c4b7b..e7583cac16ffe 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ResultInterface
- * @since 2.0.0
  */
 interface ResultInterface
 {
@@ -15,7 +14,6 @@ interface ResultInterface
      * Get result document root element \DOMElement
      *
      * @return \DOMElement
-     * @since 2.0.0
      */
     public function getDocumentElement();
 
@@ -23,7 +21,6 @@ public function getDocumentElement();
      * Append layout configuration
      *
      * @return void
-     * @since 2.0.0
      */
     public function appendLayoutConfiguration();
 
@@ -31,7 +28,6 @@ public function appendLayoutConfiguration();
      * Returns the string representation
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString();
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Template.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Template.php
index e9d83c985f22f..e75c80777ec0c 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Template.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Template.php
@@ -7,7 +7,6 @@
 
 /**
  * Class Template
- * @since 2.0.0
  */
 class Template
 {
@@ -17,20 +16,17 @@ class Template
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $logger;
 
     /**
      * @var \DOMElement
-     * @since 2.0.0
      */
     protected $templateNode;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param string $content
-     * @since 2.0.0
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
@@ -46,7 +42,6 @@ public function __construct(
      * Get template root element
      *
      * @return \DOMElement
-     * @since 2.0.0
      */
     public function getDocumentElement()
     {
@@ -58,7 +53,6 @@ public function getDocumentElement()
      *
      * @param string $content
      * @return void
-     * @since 2.0.0
      */
     public function append($content)
     {
@@ -71,7 +65,6 @@ public function append($content)
      * Returns the string representation
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
index 902e8bbf5b9d3..cd372399fcbc0 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
@@ -11,7 +11,6 @@
 
 /**
  * Class TemplateFactory
- * @since 2.0.0
  */
 class TemplateFactory
 {
@@ -19,7 +18,6 @@ class TemplateFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -27,7 +25,6 @@ class TemplateFactory
      * Instance name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $instanceName;
 
@@ -36,7 +33,6 @@ class TemplateFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $instanceName
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -52,7 +48,6 @@ public function __construct(
      * @param array $arguments
      * @return Template
      * @throws LocalizedException
-     * @since 2.0.0
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngineFactory.php b/lib/internal/Magento/Framework/View/TemplateEngineFactory.php
index 38fed59d89dca..d9d8322a10555 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngineFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngineFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Factory class for Template Engine
- * @since 2.0.0
  */
 class TemplateEngineFactory
 {
@@ -17,7 +16,6 @@ class TemplateEngineFactory
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -25,7 +23,6 @@ class TemplateEngineFactory
      * Engines
      *
      * @var array
-     * @since 2.0.0
      */
     protected $engines;
 
@@ -34,7 +31,6 @@ class TemplateEngineFactory
      *
      * @param ObjectManagerInterface $objectManager
      * @param array $engines Format: array('<name>' => 'TemplateEngine\Class', ...)
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager, array $engines)
     {
@@ -49,7 +45,6 @@ public function __construct(ObjectManagerInterface $objectManager, array $engine
      * @return TemplateEngineInterface
      * @throws \UnexpectedValueException If template engine doesn't implement the necessary interface
      * @throws \InvalidArgumentException If template engine doesn't exist
-     * @since 2.0.0
      */
     public function create($name)
     {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngineInterface.php b/lib/internal/Magento/Framework/View/TemplateEngineInterface.php
index 2e1fa06c3dbc9..30c653229c2c7 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngineInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngineInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface for Template Engine
- * @since 2.0.0
  */
 interface TemplateEngineInterface
 {
@@ -21,7 +20,6 @@ interface TemplateEngineInterface
      * @param string $templateFile
      * @param array $dictionary
      * @return string rendered template
-     * @since 2.0.0
      */
     public function render(
         \Magento\Framework\View\Element\BlockInterface $block,
diff --git a/lib/internal/Magento/Framework/View/TemplateEnginePool.php b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
index fb11a802f78d1..1aec127a17bd1 100644
--- a/lib/internal/Magento/Framework/View/TemplateEnginePool.php
+++ b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
@@ -7,7 +7,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class TemplateEnginePool
 {
@@ -15,7 +14,6 @@ class TemplateEnginePool
      * Factory
      *
      * @var TemplateEngineFactory
-     * @since 2.0.0
      */
     protected $factory;
 
@@ -23,7 +21,6 @@ class TemplateEnginePool
      * Template engines
      *
      * @var \Magento\Framework\View\TemplateEngineInterface[]
-     * @since 2.0.0
      */
     protected $engines = [];
 
@@ -31,7 +28,6 @@ class TemplateEnginePool
      * Constructor
      *
      * @param TemplateEngineFactory $factory
-     * @since 2.0.0
      */
     public function __construct(TemplateEngineFactory $factory)
     {
@@ -43,7 +39,6 @@ public function __construct(TemplateEngineFactory $factory)
      *
      * @param string $name
      * @return \Magento\Framework\View\TemplateEngineInterface
-     * @since 2.0.0
      */
     public function get($name)
     {
diff --git a/lib/internal/Magento/Framework/View/Url/Config.php b/lib/internal/Magento/Framework/View/Url/Config.php
index 164aec40784c7..ff67799587dd2 100644
--- a/lib/internal/Magento/Framework/View/Url/Config.php
+++ b/lib/internal/Magento/Framework/View/Url/Config.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Framework\View\Url\Config
  *
- * @since 2.0.0
  */
 class Config implements \Magento\Framework\View\Url\ConfigInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @since 2.0.0
      */
     protected $_scopeConfig;
 
@@ -22,7 +20,6 @@ class Config implements \Magento\Framework\View\Url\ConfigInterface
      * View url config model
      *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($path)
     {
diff --git a/lib/internal/Magento/Framework/View/Url/ConfigInterface.php b/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
index e541676bd0593..d1076abdb0ec5 100644
--- a/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
@@ -8,7 +8,6 @@
 /**
  * Url Config Interface
  * @api
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -17,7 +16,6 @@ interface ConfigInterface
      *
      * @param string $path
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($path);
 }
diff --git a/lib/internal/Magento/Framework/View/Url/CssResolver.php b/lib/internal/Magento/Framework/View/Url/CssResolver.php
index 373fa8b3126e6..8c73e2ab9bcf9 100644
--- a/lib/internal/Magento/Framework/View/Url/CssResolver.php
+++ b/lib/internal/Magento/Framework/View/Url/CssResolver.php
@@ -11,7 +11,6 @@
  * CSS URLs resolver class.
  * This utility class provides a set of methods to work with CSS files.
  * @api
- * @since 2.0.0
  */
 class CssResolver
 {
@@ -28,7 +27,6 @@ class CssResolver
      * @param string $relatedPath
      * @param string $filePath
      * @return mixed
-     * @since 2.0.0
      */
     public function relocateRelativeUrls($cssContent, $relatedPath, $filePath)
     {
@@ -48,7 +46,6 @@ public function relocateRelativeUrls($cssContent, $relatedPath, $filePath)
      * @param string $cssContent
      * @param callback $inlineCallback
      * @return string
-     * @since 2.0.0
      */
     public function replaceRelativeUrls($cssContent, $inlineCallback)
     {
@@ -74,7 +71,6 @@ public function replaceRelativeUrls($cssContent, $inlineCallback)
      *
      * @param string $cssContent
      * @return string
-     * @since 2.0.0
      */
     public function aggregateImportDirectives($cssContent)
     {
@@ -103,7 +99,6 @@ public function aggregateImportDirectives($cssContent)
      *
      * @param string $cssContent
      * @return array
-     * @since 2.0.0
      */
     private static function extractRelativeUrls($cssContent)
     {
diff --git a/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorInterface.php b/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorInterface.php
index 4f722049a9e01..2472e6ecfe20a 100644
--- a/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorInterface.php
+++ b/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface that encapsulates complexity of expression computation
- * @since 2.0.0
  */
 interface TypeDataExtractorInterface
 {
@@ -17,7 +16,6 @@ interface TypeDataExtractorInterface
      * @param \DOMElement $childNode
      * @param string $mediaParentTag
      * @return mixed
-     * @since 2.0.0
      */
     public function process(\DOMElement $childNode, $mediaParentTag);
 }
diff --git a/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorPool.php b/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorPool.php
index c92ac1ba21a48..0d7ca57c4321a 100644
--- a/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorPool.php
+++ b/lib/internal/Magento/Framework/View/Xsd/Media/TypeDataExtractorPool.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\View\Xsd\Media\TypeDataExtractorPool
  *
- * @since 2.0.0
  */
 class TypeDataExtractorPool
 {
@@ -18,7 +17,6 @@ class TypeDataExtractorPool
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -26,14 +24,12 @@ class TypeDataExtractorPool
      * List of extractors
      *
      * @var array
-     * @since 2.0.0
      */
     protected $extractors = [];
 
     /**
      * @param ObjectManagerInterface $objectManager
      * @param \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface[] $extractors
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -53,7 +49,6 @@ public function __construct(
      *
      * @param string $tagName
      * @return object
-     * @since 2.0.0
      */
     public function nodeProcessor($tagName)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
index cdd25a18e730a..d5cdc8c7b2ffa 100644
--- a/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
@@ -8,7 +8,6 @@
 
 /**
  * Interface to locate types for custom attributes
- * @since 2.0.0
  */
 interface CustomAttributeTypeLocatorInterface
 {
@@ -18,7 +17,6 @@ interface CustomAttributeTypeLocatorInterface
      * @param string $attributeCode
      * @param string $serviceClass
      * @return string
-     * @since 2.0.0
      */
     public function getType($attributeCode, $serviceClass);
 
@@ -26,7 +24,6 @@ public function getType($attributeCode, $serviceClass);
      * Get list of all Data Interface corresponding to complex custom attribute types
      *
      * @return string[] array of Data Interface class names
-     * @since 2.0.0
      */
     public function getAllServiceDataInterfaces();
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index 2b8df29ba86eb..f1a4ac3e4a32b 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -22,7 +22,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class ErrorProcessor
 {
@@ -43,21 +42,16 @@ class ErrorProcessor
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\Json\Encoder
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $encoder;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     protected $_logger;
 
@@ -65,13 +59,11 @@ class ErrorProcessor
      * Filesystem instance
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $_filesystem;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
-     * @since 2.0.0
      */
     protected $directoryWrite;
 
@@ -89,7 +81,6 @@ class ErrorProcessor
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
      * @param Json|null $serializer
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Json\Encoder $encoder,
@@ -115,7 +106,6 @@ public function __construct(
      * @param \Exception $exception Exception to convert to a WebAPI exception
      *
      * @return WebapiException
-     * @since 2.0.0
      */
     public function maskException(\Exception $exception)
     {
@@ -184,7 +174,6 @@ public function maskException(\Exception $exception)
      * @param int $httpCode
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
-     * @since 2.0.0
      */
     public function renderException(\Exception $exception, $httpCode = self::DEFAULT_ERROR_HTTP_CODE)
     {
@@ -208,7 +197,6 @@ public function renderException(\Exception $exception, $httpCode = self::DEFAULT
      *
      * @param \Exception $exception
      * @return string $reportId
-     * @since 2.0.0
      */
     protected function _critical(\Exception $exception)
     {
@@ -227,7 +215,6 @@ protected function _critical(\Exception $exception)
      * @param string $trace
      * @param int $httpCode
      * @return void
-     * @since 2.0.0
      */
     public function renderErrorMessage(
         $errorMessage,
@@ -257,7 +244,6 @@ public function renderErrorMessage(
      * @param int $httpCode
      * @param string $format
      * @return array|string
-     * @since 2.0.0
      */
     protected function _formatError($errorMessage, $trace, $httpCode, $format)
     {
@@ -294,7 +280,6 @@ protected function _formatError($errorMessage, $trace, $httpCode, $format)
      * Declare web API-specific shutdown function.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function registerShutdownFunction()
     {
@@ -306,7 +291,6 @@ public function registerShutdownFunction()
      * Function to catch errors, that has not been caught by the user error dispatcher function.
      *
      * @return void
-     * @since 2.0.0
      */
     public function apiShutdownFunction()
     {
@@ -330,7 +314,6 @@ public function apiShutdownFunction()
      *
      * @param string $reportData
      * @return string
-     * @since 2.0.0
      */
     protected function _saveFatalErrorReport($reportData)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Exception.php b/lib/internal/Magento/Framework/Webapi/Exception.php
index bb77c4821643e..97ebbc40865ab 100644
--- a/lib/internal/Magento/Framework/Webapi/Exception.php
+++ b/lib/internal/Magento/Framework/Webapi/Exception.php
@@ -16,7 +16,6 @@
  *
  * During web API requests, all exceptions are converted to this exception,
  * which is then used for proper error response generation.
- * @since 2.0.0
  */
 class Exception extends LocalizedException
 {
@@ -49,7 +48,6 @@ class Exception extends LocalizedException
      * Optional exception details.
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_details;
 
@@ -57,7 +55,6 @@ class Exception extends LocalizedException
      * HTTP status code associated with current exception.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_httpCode;
 
@@ -65,7 +62,6 @@ class Exception extends LocalizedException
      * Exception name is used for SOAP faults generation.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_name;
 
@@ -73,7 +69,6 @@ class Exception extends LocalizedException
      * Stacktrace
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_stackTrace;
 
@@ -81,7 +76,6 @@ class Exception extends LocalizedException
      * List of errors
      *
      * @var null|\Magento\Framework\Exception\LocalizedException[]
-     * @since 2.0.0
      */
     protected $_errors;
 
@@ -97,7 +91,6 @@ class Exception extends LocalizedException
      * @param string $stackTrace
      *
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct(
         Phrase $phrase,
@@ -125,7 +118,6 @@ public function __construct(
      * Retrieve current HTTP code.
      *
      * @return int
-     * @since 2.0.0
      */
     public function getHttpCode()
     {
@@ -136,7 +128,6 @@ public function getHttpCode()
      * Identify exception originator: sender or receiver.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getOriginator()
     {
@@ -147,7 +138,6 @@ public function getOriginator()
      * Retrieve exception details.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDetails()
     {
@@ -158,7 +148,6 @@ public function getDetails()
      * Retrieve exception name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -169,7 +158,6 @@ public function getName()
      * Retrieve list of errors.
      *
      * @return null|\Magento\Framework\Exception\LocalizedException[]
-     * @since 2.0.0
      */
     public function getErrors()
     {
@@ -180,7 +168,6 @@ public function getErrors()
      * Retrieve stack trace string.
      *
      * @return null|string
-     * @since 2.0.0
      */
     public function getStackTrace()
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Request.php b/lib/internal/Magento/Framework/Webapi/Request.php
index e2237aa64392d..eac1100081a05 100644
--- a/lib/internal/Magento/Framework/Webapi/Request.php
+++ b/lib/internal/Magento/Framework/Webapi/Request.php
@@ -18,7 +18,6 @@
 /**
  * Class \Magento\Framework\Webapi\Request
  *
- * @since 2.0.0
  */
 class Request extends HttpRequest implements RequestInterface
 {
@@ -40,7 +39,6 @@ class Request extends HttpRequest implements RequestInterface
      * @param AreaList $areaList
      * @param ScopeInterface $configScope
      * @param null|string|\Zend_Uri $uri
-     * @since 2.0.0
      */
     public function __construct(
         CookieReaderInterface $cookieReader,
@@ -64,7 +62,6 @@ public function __construct(
      * {@inheritdoc}
      *
      * Added CGI environment support.
-     * @since 2.0.0
      */
     public function getHeader($header, $default = false)
     {
@@ -85,7 +82,6 @@ public function getHeader($header, $default = false)
      * @param string|null $default
      * @return array|string
      * @throws \Magento\Framework\Webapi\Exception When GET parameters are invalid
-     * @since 2.0.0
      */
     public function getRequestedServices($default = null)
     {
@@ -102,7 +98,6 @@ public function getRequestedServices($default = null)
      *      'testModule2AllSoapNoRestV1',
      *      )</pre>
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     protected function _convertRequestParamToServiceArray($param)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Response.php b/lib/internal/Magento/Framework/Webapi/Response.php
index 3d8ae02377e01..204cd545b05ec 100644
--- a/lib/internal/Magento/Framework/Webapi/Response.php
+++ b/lib/internal/Magento/Framework/Webapi/Response.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Webapi\Response
  *
- * @since 2.0.0
  */
 class Response extends \Magento\Framework\HTTP\PhpEnvironment\Response implements
     \Magento\Framework\App\Response\HttpInterface
@@ -38,12 +37,7 @@ class Response extends \Magento\Framework\HTTP\PhpEnvironment\Response implement
 
     /**#@-*/
 
-    /**
-     * Messages.
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $_messages = [];
 
     /**
@@ -51,7 +45,6 @@ class Response extends \Magento\Framework\HTTP\PhpEnvironment\Response implement
      *
      * @param string $mimeType MIME type
      * @return $this
-     * @since 2.0.0
      */
     public function setMimeType($mimeType)
     {
@@ -66,7 +59,6 @@ public function setMimeType($mimeType)
      * @param array $params
      * @param string $type
      * @return $this
-     * @since 2.0.0
      */
     public function addMessage($message, $code, $params = [], $type = self::MESSAGE_TYPE_ERROR)
     {
@@ -80,7 +72,6 @@ public function addMessage($message, $code, $params = [], $type = self::MESSAGE_
      * Has messages.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasMessages()
     {
@@ -91,7 +82,6 @@ public function hasMessages()
      * Return messages.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMessages()
     {
@@ -102,7 +92,6 @@ public function getMessages()
      * Clear messages.
      *
      * @return $this
-     * @since 2.0.0
      */
     public function clearMessages()
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request.php b/lib/internal/Magento/Framework/Webapi/Rest/Request.php
index 609c89a5dccb5..5a67783c30aef 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Request
  *
- * @since 2.0.0
  */
 class Request extends \Magento\Framework\Webapi\Request
 {
@@ -36,31 +35,26 @@ class Request extends \Magento\Framework\Webapi\Request
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_serviceName;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_serviceType;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
-     * @since 2.0.0
      */
     protected $_deserializer;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_bodyParams;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Request\DeserializerFactory
-     * @since 2.0.0
      */
     protected $_deserializerFactory;
 
@@ -73,7 +67,6 @@ class Request extends \Magento\Framework\Webapi\Request
      * @param \Magento\Framework\Config\ScopeInterface $configScope
      * @param \Magento\Framework\Webapi\Rest\Request\DeserializerFactory $deserializerFactory
      * @param null|string $uri
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Stdlib\Cookie\CookieReaderInterface $cookieReader,
@@ -91,7 +84,6 @@ public function __construct(
      * Get request deserializer.
      *
      * @return \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
-     * @since 2.0.0
      */
     protected function _getDeserializer()
     {
@@ -105,7 +97,6 @@ protected function _getDeserializer()
      * Retrieve accept types understandable by requester in a form of array sorted by quality in descending order.
      *
      * @return string[]
-     * @since 2.0.0
      */
     public function getAcceptTypes()
     {
@@ -144,7 +135,6 @@ public function getAcceptTypes()
      * Fetch data from HTTP Request body.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getBodyParams()
     {
@@ -163,7 +153,6 @@ public function getBodyParams()
      *
      * @return string
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getContentType()
     {
@@ -188,7 +177,6 @@ public function getContentType()
      *
      * @return string
      * @throws \Magento\Framework\Exception\InputException
-     * @since 2.0.0
      */
     public function getHttpMethod()
     {
@@ -202,7 +190,6 @@ public function getHttpMethod()
      * Fetch and return parameter data from the request.
      *
      * @return array
-     * @since 2.0.0
      */
     public function getRequestData()
     {
@@ -236,7 +223,6 @@ public function getRequestData()
      *
      * @deprecated 2.1.0
      * @see \Magento\Webapi\Controller\Rest\ParamsOverrider::overrideRequestBodyIdWithPathParam
-     * @since 2.0.0
      */
     protected function overrideRequestBodyIdWithPathParam($urlPathParams)
     {
@@ -267,7 +253,6 @@ protected function overrideRequestBodyIdWithPathParam($urlPathParams)
      * @return void
      * @deprecated 2.1.0
      * @see \Magento\Webapi\Controller\Rest\ParamsOverrider::substituteParameters
-     * @since 2.0.0
      */
     protected function substituteParameters(&$requestData, $key, $value)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
index e5b504f3a83de..52fc13036c2ba 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Request\Deserializer\Json
  *
- * @since 2.0.0
  */
 class Json implements \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
 {
     /**
      * @var \Magento\Framework\Json\Decoder
-     * @since 2.0.0
      */
     protected $decoder;
 
     /**
      * @var State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @param \Magento\Framework\Json\Decoder $decoder
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Json\Decoder $decoder, State $appState)
     {
@@ -47,7 +43,6 @@ public function __construct(\Magento\Framework\Json\Decoder $decoder, State $app
      * @return array|null Return NULL if content is invalid.
      * @throws \InvalidArgumentException
      * @throws \Magento\Framework\Webapi\Exception If decoding error was encountered.
-     * @since 2.0.0
      */
     public function deserialize($encodedBody)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php
index b3fa00348e7e4..632551af4946f 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Request\Deserializer\Xml
  *
- * @since 2.0.0
  */
 class Xml implements \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
 {
     /**
      * @var \Magento\Framework\Xml\Parser
-     * @since 2.0.0
      */
     protected $_xmlParser;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * @param \Magento\Framework\Xml\Parser $xmlParser
      * @param State $appState
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Xml\Parser $xmlParser, State $appState)
     {
@@ -46,7 +42,6 @@ public function __construct(\Magento\Framework\Xml\Parser $xmlParser, State $app
      * Is null if there was no error while loading
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_errorMessage = null;
 
@@ -57,7 +52,6 @@ public function __construct(\Magento\Framework\Xml\Parser $xmlParser, State $app
      * @return array Data converted from XML document to array. Root node is excluded from response.
      * @throws \InvalidArgumentException In case of invalid argument type.
      * @throws \Magento\Framework\Webapi\Exception If decoding error occurs.
-     * @since 2.0.0
      */
     public function deserialize($xmlRequestBody)
     {
@@ -98,7 +92,6 @@ public function deserialize($xmlRequestBody)
      * @param integer $errorLine
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function handleErrors($errorNumber, $errorMessage, $errorFile, $errorLine)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerFactory.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerFactory.php
index 184403b1d363b..77d32ce02aace 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerFactory.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerFactory.php
@@ -12,26 +12,22 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Request\DeserializerFactory
  *
- * @since 2.0.0
  */
 class DeserializerFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_deserializers;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $deserializers
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -47,7 +43,6 @@ public function __construct(
      * @param string $contentType
      * @return \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
      * @throws \LogicException|\Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     public function get($contentType)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerInterface.php
index e9b424970fe6e..70a30a68b93e7 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/DeserializerInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
  *
- * @since 2.0.0
  */
 interface DeserializerInterface
 {
@@ -19,7 +18,6 @@ interface DeserializerInterface
      *
      * @param string $body Posted content from request
      * @return array|null Return NULL if content is invalid
-     * @since 2.0.0
      */
     public function deserialize($body);
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
index 612891e908d48..21741a2c16c1d 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
@@ -27,7 +27,6 @@
  * adding to the parameter list for ParamsOverrider's dependency injection configuration.
  *
  * @api
- * @since 2.0.0
  */
 interface ParamOverriderInterface
 {
@@ -35,7 +34,6 @@ interface ParamOverriderInterface
      * Returns the overridden value to use.
      *
      * @return string|int|null
-     * @since 2.0.0
      */
     public function getOverriddenValue();
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response.php b/lib/internal/Magento/Framework/Webapi/Rest/Response.php
index 9d64cdd19d897..06167596f85ab 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response.php
@@ -10,32 +10,27 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Response
  *
- * @since 2.0.0
  */
 class Response extends \Magento\Framework\Webapi\Response
 {
     /**
      * @var \Magento\Framework\Webapi\ErrorProcessor
-     * @since 2.0.0
      */
     protected $_errorProcessor;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Response\RendererInterface
-     * @since 2.0.0
      */
     protected $_renderer;
 
     /**
      * @var \Magento\Framework\App\State
-     * @since 2.0.0
      */
     protected $_appState;
 
     /**
      * Exception stack
      * @var \Exception
-     * @since 2.0.0
      */
     protected $exceptions = [];
 
@@ -45,7 +40,6 @@ class Response extends \Magento\Framework\Webapi\Response
      * @param \Magento\Framework\Webapi\Rest\Response\RendererFactory $rendererFactory
      * @param \Magento\Framework\Webapi\ErrorProcessor $errorProcessor
      * @param \Magento\Framework\App\State $appState
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Webapi\Rest\Response\RendererFactory $rendererFactory,
@@ -61,7 +55,6 @@ public function __construct(
      * Send response to the client, render exceptions if they are present.
      *
      * @return void
-     * @since 2.0.0
      */
     public function sendResponse()
     {
@@ -90,7 +83,6 @@ public function sendResponse()
      * Generate and set HTTP response code, error messages to Response object.
      *
      * @return $this
-     * @since 2.0.0
      */
     protected function _renderMessages()
     {
@@ -134,7 +126,6 @@ protected function _renderMessages()
      *
      * @param array|int|string|bool|float|null $outputData
      * @return $this
-     * @since 2.0.0
      */
     public function prepareResponse($outputData = null)
     {
@@ -150,7 +141,6 @@ public function prepareResponse($outputData = null)
      *
      * @param array|int|string|bool|float|null $data
      * @return void
-     * @since 2.0.0
      */
     protected function _render($data)
     {
@@ -164,7 +154,6 @@ protected function _render($data)
      *
      * @param \Exception $e
      * @return $this
-     * @since 2.0.0
      */
     public function setException($e)
     {
@@ -176,7 +165,6 @@ public function setException($e)
      * Has an exception been registered with the response?
      *
      * @return boolean
-     * @since 2.0.0
      */
     public function isException()
     {
@@ -187,7 +175,6 @@ public function isException()
      * Retrieve the exception stack
      *
      * @return array
-     * @since 2.0.0
      */
     public function getException()
     {
@@ -199,7 +186,6 @@ public function getException()
      *
      * @param  string $type
      * @return boolean
-     * @since 2.0.0
      */
     public function hasExceptionOfType($type)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
index fa9b8af079cc3..9b50b45a9215c 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
@@ -10,7 +10,6 @@
 
 /**
  * Class to handle partial service response
- * @since 2.0.0
  */
 class FieldsFilter
 {
@@ -18,7 +17,6 @@ class FieldsFilter
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Request
-     * @since 2.0.0
      */
     protected $_request;
 
@@ -26,7 +24,6 @@ class FieldsFilter
      * Initialize dependencies
      *
      * @param RestRequest $request
-     * @since 2.0.0
      */
     public function __construct(RestRequest $request)
     {
@@ -38,7 +35,6 @@ public function __construct(RestRequest $request)
      *
      * @param array $response
      * @return array partial response array or empty array if invalid filter criteria is provided
-     * @since 2.0.0
      */
     public function filter($response)
     {
@@ -84,7 +80,6 @@ public function filter($response)
      * </pre>
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function parse($filterString)
     {
@@ -155,7 +150,6 @@ protected function parse($filterString)
      * @param array $responseArray
      * @param array $filter
      * @return array
-     * @since 2.0.0
      */
     protected function applyFilter(array $responseArray, array $filter)
     {
@@ -178,7 +172,6 @@ protected function applyFilter(array $responseArray, array $filter)
      * @param array $array1
      * @param array $array2
      * @return array
-     * @since 2.0.0
      */
     protected function recursiveArrayIntersectKey(array $array1, array $array2)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Json.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Json.php
index 7f16ffa12c5b1..f72fe7a6336bc 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Json.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Json.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Response\Renderer\Json
  *
- * @since 2.0.0
  */
 class Json implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 {
@@ -21,7 +20,6 @@ class Json implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 
     /**
      * @var \Magento\Framework\Json\Encoder
-     * @since 2.0.0
      */
     protected $encoder;
 
@@ -29,7 +27,6 @@ class Json implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
      * Initialize dependencies.
      *
      * @param \Magento\Framework\Json\Encoder $encoder
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Json\Encoder $encoder)
     {
@@ -41,7 +38,6 @@ public function __construct(\Magento\Framework\Json\Encoder $encoder)
      *
      * @param object|array|int|string|bool|float|null $data
      * @return string
-     * @since 2.0.0
      */
     public function render($data)
     {
@@ -52,7 +48,6 @@ public function render($data)
      * Get JSON renderer MIME type.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMimeType()
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
index 4de9f1b65a939..d061b4796144d 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Response\Renderer\Xml
  *
- * @since 2.0.0
  */
 class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 {
@@ -31,7 +30,6 @@ class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 
     /**
      * @var \Magento\Framework\Xml\Generator
-     * @since 2.0.0
      */
     protected $_xmlGenerator;
 
@@ -39,7 +37,6 @@ class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
      * Initialize dependencies.
      *
      * @param \Magento\Framework\Xml\Generator $xmlGenerator
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Xml\Generator $xmlGenerator)
     {
@@ -50,7 +47,6 @@ public function __construct(\Magento\Framework\Xml\Generator $xmlGenerator)
      * Get XML renderer MIME type.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMimeType()
     {
@@ -62,7 +58,6 @@ public function getMimeType()
      *
      * @param object|array|int|string|bool|float|null $data
      * @return string
-     * @since 2.0.0
      */
     public function render($data)
     {
@@ -82,7 +77,6 @@ public function render($data)
      * @param bool $isRoot
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _formatData($data, $isRoot = false)
     {
@@ -114,7 +108,6 @@ protected function _formatData($data, $isRoot = false)
      *
      * @param string $value
      * @return string
-     * @since 2.0.0
      */
     protected function _formatValue($value)
     {
@@ -133,7 +126,6 @@ protected function _formatValue($value)
      *
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     protected function _prepareKey($key)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
index 96c822c10f49b..341c12a993d93 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
@@ -12,25 +12,21 @@
 /**
  * Class \Magento\Framework\Webapi\Rest\Response\RendererFactory
  *
- * @since 2.0.0
  */
 class RendererFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
     /**
      * @var \Magento\Framework\Webapi\Rest\Request
-     * @since 2.0.0
      */
     protected $_request;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_renders;
 
@@ -38,7 +34,6 @@ class RendererFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Webapi\Rest\Request $request
      * @param array $renders
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -56,7 +51,6 @@ public function __construct(
      * @return \Magento\Framework\Webapi\Rest\Response\RendererInterface
      * @throws \Magento\Framework\Webapi\Exception
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function get()
     {
@@ -74,7 +68,6 @@ public function get()
      *
      * @return string
      * @throws \Magento\Framework\Webapi\Exception
-     * @since 2.0.0
      */
     protected function _getRendererClass()
     {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
index f24ccc0953199..9d905ce599779 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
@@ -11,7 +11,6 @@
  * Renderer interface allows REST response data rendering in a specific format (e.g. Json or Xml)
  *
  * @api
- * @since 2.0.0
  */
 interface RendererInterface
 {
@@ -20,7 +19,6 @@ interface RendererInterface
      *
      * @param object|array|int|string|bool|float|null $data
      * @return string
-     * @since 2.0.0
      */
     public function render($data);
 
@@ -28,7 +26,6 @@ public function render($data);
      * Get MIME type generated by renderer.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getMimeType();
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index bd94678cd70a7..98ec3c872ecab 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -24,7 +24,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
- * @since 2.0.0
  */
 class ServiceInputProcessor implements ServicePayloadConverterInterface
 {
@@ -32,31 +31,26 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
 
     /**
      * @var \Magento\Framework\Reflection\TypeProcessor
-     * @since 2.0.0
      */
     protected $typeProcessor;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Framework\Api\AttributeValueFactory
-     * @since 2.0.0
      */
     protected $attributeValueFactory;
 
     /**
      * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface
-     * @since 2.0.0
      */
     protected $customAttributeTypeLocator;
 
     /**
      * @var \Magento\Framework\Reflection\MethodsMap
-     * @since 2.0.0
      */
     protected $methodsMap;
 
@@ -74,7 +68,6 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      * @param AttributeValueFactory $attributeValueFactory
      * @param CustomAttributeTypeLocatorInterface $customAttributeTypeLocator
      * @param MethodsMap $methodsMap
-     * @since 2.0.0
      */
     public function __construct(
         TypeProcessor $typeProcessor,
@@ -122,7 +115,6 @@ private function getNameFinder()
      * @return array list of parameters that can be used to call the service method
      * @throws InputException if no value is provided for required parameters
      * @throws WebapiException
-     * @since 2.0.0
      */
     public function process($serviceClassName, $serviceMethodName, array $inputArray)
     {
@@ -162,7 +154,6 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
      * @param array $data
      * @return object the newly created and populated object
      * @throws \Exception
-     * @since 2.0.0
      */
     protected function _createFromArray($className, $data)
     {
@@ -220,7 +211,6 @@ protected function _createFromArray($className, $data)
      * @param string $dataObjectClassName
      * @return AttributeValue[]
      * @throws SerializationException
-     * @since 2.0.0
      */
     protected function convertCustomAttributeValue($customAttributesValueArray, $dataObjectClassName)
     {
@@ -302,7 +292,6 @@ private function processCustomAttribute($customAttribute)
      * @param string $type The type of data object to create
      * @param array $customAttributeValue The data object values
      * @return mixed
-     * @since 2.0.0
      */
     protected function _createDataObjectForTypeAndArrayValue($type, $customAttributeValue)
     {
@@ -326,7 +315,6 @@ protected function _createDataObjectForTypeAndArrayValue($type, $customAttribute
      * @param string $type Convert given value to the this type
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function convertValue($data, $type)
     {
@@ -360,7 +348,6 @@ public function convertValue($data, $type)
      * @param array|mixed $value
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _removeSoapItemNode($value)
     {
@@ -388,7 +375,6 @@ protected function _removeSoapItemNode($value)
      * @param array $inputError
      * @return void
      * @throws InputException
-     * @since 2.0.0
      */
     protected function processInputError($inputError)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
index 4df10a2ac92ec..d8e1a3de3670a 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
@@ -15,26 +15,22 @@
  * Data object converter
  *
  * @api
- * @since 2.0.0
  */
 class ServiceOutputProcessor implements ServicePayloadConverterInterface
 {
     /**
      * @var DataObjectProcessor
-     * @since 2.0.0
      */
     protected $dataObjectProcessor;
 
     /**
      * @var MethodsMap
-     * @since 2.0.0
      */
     protected $methodsMapProcessor;
 
     /**
      * @param DataObjectProcessor $dataObjectProcessor
      * @param MethodsMap $methodsMapProcessor
-     * @since 2.0.0
      */
     public function __construct(
         DataObjectProcessor $dataObjectProcessor,
@@ -57,7 +53,6 @@ public function __construct(
      * @param string $serviceClassName
      * @param string $serviceMethodName
      * @return array|int|string|bool|float Scalar or array of scalars
-     * @since 2.0.0
      */
     public function process($data, $serviceClassName, $serviceMethodName)
     {
@@ -71,7 +66,6 @@ public function process($data, $serviceClassName, $serviceMethodName)
      *
      * @param array $dataObjectArray
      * @return array
-     * @since 2.0.0
      */
     protected function processDataObject($dataObjectArray)
     {
@@ -95,7 +89,6 @@ protected function processDataObject($dataObjectArray)
      * @param array $data
      * @param string $type
      * @return array|object
-     * @since 2.0.0
      */
     public function convertValue($data, $type)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php b/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
index de93afe1006d7..30f93efdb9ef9 100644
--- a/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
@@ -11,7 +11,6 @@
  * Interface for data conversion based on data type.
  *
  * @api
- * @since 2.0.0
  */
 interface ServicePayloadConverterInterface
 {
@@ -21,7 +20,6 @@ interface ServicePayloadConverterInterface
      * @param mixed $data
      * @param string $type
      * @return mixed
-     * @since 2.0.0
      */
     public function convertValue($data, $type);
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Soap/ClientFactory.php b/lib/internal/Magento/Framework/Webapi/Soap/ClientFactory.php
index 50d3bc6ddf222..0a64f99b7d338 100644
--- a/lib/internal/Magento/Framework/Webapi/Soap/ClientFactory.php
+++ b/lib/internal/Magento/Framework/Webapi/Soap/ClientFactory.php
@@ -8,7 +8,6 @@
 /**
  * Class ClientFactory
  * @package Magento\Framework\Webapi\Soap
- * @since 2.0.0
  */
 class ClientFactory
 {
@@ -18,7 +17,6 @@ class ClientFactory
      * @param string $wsdl
      * @param array $options
      * @return \SoapClient
-     * @since 2.0.0
      */
     public function create($wsdl, array $options = [])
     {
diff --git a/lib/internal/Magento/Framework/Xml/Generator.php b/lib/internal/Magento/Framework/Xml/Generator.php
index c310c3b1e28f4..b3165356551e5 100644
--- a/lib/internal/Magento/Framework/Xml/Generator.php
+++ b/lib/internal/Magento/Framework/Xml/Generator.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Framework\Xml\Generator
  *
- * @since 2.0.0
  */
 class Generator
 {
@@ -19,25 +18,21 @@ class Generator
 
     /**
      * @var \DOMDocument|null
-     * @since 2.0.0
      */
     protected $_dom = null;
 
     /**
      * @var \DOMDocument
-     * @since 2.0.0
      */
     protected $_currentDom;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $_defaultIndexedArrayItemName;
 
     /**
      *
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -49,7 +44,6 @@ public function __construct()
 
     /**
      * @return \DOMDocument|null
-     * @since 2.0.0
      */
     public function getDom()
     {
@@ -58,7 +52,6 @@ public function getDom()
 
     /**
      * @return \DOMDocument
-     * @since 2.0.0
      */
     protected function _getCurrentDom()
     {
@@ -68,7 +61,6 @@ protected function _getCurrentDom()
     /**
      * @param \DOMDocument $node
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCurrentDom($node)
     {
@@ -81,7 +73,6 @@ protected function _setCurrentDom($node)
      * @return $this
      * @throws \DOMException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function arrayToXml($content)
     {
@@ -124,7 +115,6 @@ public function arrayToXml($content)
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -134,7 +124,6 @@ public function __toString()
     /**
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function save($file)
     {
@@ -147,7 +136,6 @@ public function save($file)
      *
      * @param string $name
      * @return $this
-     * @since 2.0.0
      */
     public function setIndexedArrayItemName($name)
     {
@@ -159,7 +147,6 @@ public function setIndexedArrayItemName($name)
      * Get xml node name to use instead of numeric index during numeric arrays conversion.
      *
      * @return string
-     * @since 2.0.0
      */
     protected function _getIndexedArrayItemName()
     {
diff --git a/lib/internal/Magento/Framework/Xml/Parser.php b/lib/internal/Magento/Framework/Xml/Parser.php
index 961c1e03c2206..30365cc308ff0 100644
--- a/lib/internal/Magento/Framework/Xml/Parser.php
+++ b/lib/internal/Magento/Framework/Xml/Parser.php
@@ -8,37 +8,31 @@
 /**
  * Class \Magento\Framework\Xml\Parser
  *
- * @since 2.0.0
  */
 class Parser
 {
     /**
      * @var \DOMDocument|null
-     * @since 2.0.0
      */
     protected $_dom = null;
 
     /**
      * @var \DOMDocument
-     * @since 2.0.0
      */
     protected $_currentDom;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $_content = [];
 
     /**
      * @var boolean
-     * @since 2.0.0
      */
     protected $errorHandlerIsActive = false;
 
     /**
      *
-     * @since 2.0.0
      */
     public function __construct()
     {
@@ -51,7 +45,6 @@ public function __construct()
      * Initializes error handler
      *
      * @return void
-     * @since 2.0.0
      */
     public function initErrorHandler()
     {
@@ -60,7 +53,6 @@ public function initErrorHandler()
 
     /**
      * @return \DOMDocument|null
-     * @since 2.0.0
      */
     public function getDom()
     {
@@ -69,7 +61,6 @@ public function getDom()
 
     /**
      * @return \DOMDocument
-     * @since 2.0.0
      */
     protected function _getCurrentDom()
     {
@@ -79,7 +70,6 @@ protected function _getCurrentDom()
     /**
      * @param \DOMDocument $node
      * @return $this
-     * @since 2.0.0
      */
     protected function _setCurrentDom($node)
     {
@@ -89,7 +79,6 @@ protected function _setCurrentDom($node)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function xmlToArray()
     {
@@ -102,7 +91,6 @@ public function xmlToArray()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     protected function _xmlToArray($currentNode = false)
     {
@@ -155,7 +143,6 @@ protected function _xmlToArray($currentNode = false)
     /**
      * @param string $file
      * @return $this
-     * @since 2.0.0
      */
     public function load($file)
     {
@@ -167,7 +154,6 @@ public function load($file)
      * @param string $string
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function loadXML($string)
     {
@@ -201,7 +187,6 @@ public function loadXML($string)
      * @param int $errorLine
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function errorHandler($errorNo, $errorStr, $errorFile, $errorLine)
     {
diff --git a/lib/internal/Magento/Framework/Xml/Security.php b/lib/internal/Magento/Framework/Xml/Security.php
index d4928897b16d5..72af506a3294e 100644
--- a/lib/internal/Magento/Framework/Xml/Security.php
+++ b/lib/internal/Magento/Framework/Xml/Security.php
@@ -10,7 +10,6 @@
 
 /**
  * Class Security
- * @since 2.0.0
  */
 class Security
 {
@@ -19,7 +18,6 @@ class Security
      *
      * @param string $xmlContent
      * @return bool
-     * @since 2.0.0
      */
     private function heuristicScan($xmlContent)
     {
@@ -30,7 +28,6 @@ private function heuristicScan($xmlContent)
      * Return true if PHP is running with PHP-FPM
      *
      * @return bool
-     * @since 2.0.0
      */
     private function isPhpFpm()
     {
@@ -44,7 +41,6 @@ private function isPhpFpm()
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @since 2.0.0
      */
     public function scan($xmlContent)
     {
diff --git a/lib/internal/Magento/Framework/XsltProcessor/XsltProcessorFactory.php b/lib/internal/Magento/Framework/XsltProcessor/XsltProcessorFactory.php
index 455dc12165294..c69b4e662f44d 100644
--- a/lib/internal/Magento/Framework/XsltProcessor/XsltProcessorFactory.php
+++ b/lib/internal/Magento/Framework/XsltProcessor/XsltProcessorFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * XSLTProcessor document factory
- * @since 2.0.0
  */
 class XsltProcessorFactory
 {
@@ -15,7 +14,6 @@ class XsltProcessorFactory
      * Create empty XSLTProcessor instance.
      *
      * @return \XSLTProcessor
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
index 20976e0b63880..f115277654fae 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
@@ -19,7 +19,6 @@
 
 /**
  * Abstract class for dependency report commands
- * @since 2.0.0
  */
 abstract class AbstractDependenciesCommand extends Command
 {
@@ -37,7 +36,6 @@ abstract class AbstractDependenciesCommand extends Command
      * Object Manager
      *
      * @var ObjectManager
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -45,7 +43,6 @@ abstract class AbstractDependenciesCommand extends Command
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -55,7 +52,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -78,7 +74,6 @@ protected function configure()
      *
      * @param string $outputPath
      * @return void
-     * @since 2.0.0
      */
     abstract protected function buildReport($outputPath);
 
@@ -86,13 +81,11 @@ abstract protected function buildReport($outputPath);
      * Get the default output report filename
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function getDefaultOutputFilename();
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
index 4a0960f12a5ea..92a8212b9ac53 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Setup\Console\Command\AbstractMaintenanceCommand
  *
- * @since 2.0.0
  */
 abstract class AbstractMaintenanceCommand extends AbstractSetupCommand
 {
@@ -25,13 +24,11 @@ abstract class AbstractMaintenanceCommand extends AbstractSetupCommand
 
     /**
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     protected $maintenanceMode;
 
     /**
      * @var IpValidator
-     * @since 2.0.0
      */
     protected $ipValidator;
 
@@ -40,7 +37,6 @@ abstract class AbstractMaintenanceCommand extends AbstractSetupCommand
      *
      * @param MaintenanceMode $maintenanceMode
      * @param IpValidator $ipValidator
-     * @since 2.0.0
      */
     public function __construct(MaintenanceMode $maintenanceMode, IpValidator $ipValidator)
     {
@@ -53,7 +49,6 @@ public function __construct(MaintenanceMode $maintenanceMode, IpValidator $ipVal
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -73,7 +68,6 @@ protected function configure()
      * Get maintenance mode to set
      *
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function isEnable();
 
@@ -81,13 +75,11 @@ abstract protected function isEnable();
      * Get display string after mode is set
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function getDisplayString();
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -118,7 +110,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      *
      * @param string[] $addresses
      * @return string[]
-     * @since 2.0.0
      */
     protected function validate(array $addresses)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractModuleCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractModuleCommand.php
index ceb51183adbac..51c4114bf0442 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractModuleCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractModuleCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Abstract class for Enable and Disable commands to consolidate common logic
- * @since 2.0.0
  */
 abstract class AbstractModuleCommand extends AbstractSetupCommand
 {
@@ -28,7 +27,6 @@ abstract class AbstractModuleCommand extends AbstractSetupCommand
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -36,7 +34,6 @@ abstract class AbstractModuleCommand extends AbstractSetupCommand
      * Inject dependencies
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -46,7 +43,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -69,7 +65,6 @@ protected function configure()
      * Returns if module argument is required
      *
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function isModuleRequired();
 
@@ -79,7 +74,6 @@ abstract protected function isModuleRequired();
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     protected function cleanup(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
index 5f2fb95abd641..008a6ea0cdf7e 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Setup\Console\Command\AbstractModuleManageCommand
  *
- * @since 2.0.0
  */
 abstract class AbstractModuleManageCommand extends AbstractModuleCommand
 {
@@ -34,13 +33,12 @@ abstract class AbstractModuleManageCommand extends AbstractModuleCommand
 
     /**
      * @var DeploymentConfig
-     * @since 2.1.0
+     * @since 2.0.6
      */
     protected $deploymentConfig;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -62,7 +60,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function isModuleRequired()
     {
@@ -71,7 +68,6 @@ protected function isModuleRequired()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -130,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param string[] $modulesToChange
      * @param OutputInterface $output
      * @return void
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function setIsEnabled($isEnable, $modulesToChange, $output)
     {
@@ -156,7 +152,7 @@ private function setIsEnabled($isEnable, $modulesToChange, $output)
      * Get module status
      *
      * @return Status
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function getStatus()
     {
@@ -168,7 +164,6 @@ private function getStatus()
      *
      * @param string[] $modules
      * @return string[]
-     * @since 2.0.0
      */
     protected function validate(array $modules)
     {
@@ -184,7 +179,6 @@ protected function validate(array $modules)
      * Is it "enable" or "disable" command
      *
      * @return bool
-     * @since 2.0.0
      */
     abstract protected function isEnable();
 
@@ -192,8 +186,8 @@ abstract protected function isEnable();
      * Get deployment config
      *
      * @return DeploymentConfig
-     * @deprecated 2.1.0
-     * @since 2.1.0
+     * @deprecated 2.0.6
+     * @since 2.0.6
      */
     private function getDeploymentConfig()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractSetupCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractSetupCommand.php
index 622cf48bfcd75..4215d563f4f02 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractSetupCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractSetupCommand.php
@@ -12,7 +12,6 @@
 /**
  * An abstract class for all Magento Setup command.
  * It adds InitParamListener's magento-init-params option to all setup command.
- * @since 2.0.0
  */
 abstract class AbstractSetupCommand extends Command
 {
@@ -20,7 +19,6 @@ abstract class AbstractSetupCommand extends Command
      * Initialize basic Magento Setup command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
index e2012d3d3fbc8..d0b7a793e598f 100644
--- a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
@@ -17,26 +17,22 @@
 /**
  * Class \Magento\Setup\Console\Command\AdminUserCreateCommand
  *
- * @since 2.0.0
  */
 class AdminUserCreateCommand extends AbstractSetupCommand
 {
     /**
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installerFactory;
 
     /**
      * @var UserValidationRules
-     * @since 2.0.0
      */
     private $validationRules;
 
     /**
      * @param InstallerFactory $installerFactory
      * @param UserValidationRules $validationRules
-     * @since 2.0.0
      */
     public function __construct(InstallerFactory $installerFactory, UserValidationRules $validationRules)
     {
@@ -49,7 +45,6 @@ public function __construct(InstallerFactory $installerFactory, UserValidationRu
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -61,7 +56,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -82,7 +76,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Get list of arguments for the command
      *
      * @return InputOption[]
-     * @since 2.0.0
      */
     public function getOptionsList()
     {
@@ -110,7 +103,6 @@ public function getOptionsList()
      *
      * @param InputInterface $input
      * @return string[]
-     * @since 2.0.0
      */
     public function validate(InputInterface $input)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/BackupCommand.php b/setup/src/Magento/Setup/Console/Command/BackupCommand.php
index de44ea616d874..fafa47296d304 100644
--- a/setup/src/Magento/Setup/Console/Command/BackupCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/BackupCommand.php
@@ -19,7 +19,6 @@
  * Command to backup code base and user data
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class BackupCommand extends AbstractSetupCommand
 {
@@ -34,7 +33,6 @@ class BackupCommand extends AbstractSetupCommand
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -42,7 +40,6 @@ class BackupCommand extends AbstractSetupCommand
      * Handler for maintenance mode
      *
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -50,7 +47,6 @@ class BackupCommand extends AbstractSetupCommand
      * Factory for BackupRollback
      *
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -58,7 +54,6 @@ class BackupCommand extends AbstractSetupCommand
      * Existing deployment config
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -68,7 +63,6 @@ class BackupCommand extends AbstractSetupCommand
      * @param ObjectManagerProvider $objectManagerProvider
      * @param MaintenanceMode $maintenanceMode
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
@@ -84,7 +78,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -116,7 +109,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -165,7 +157,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Sets area code to start a session for database backup and rollback
      *
      * @return void
-     * @since 2.0.0
      */
     private function setAreaCode()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
index d153aacf6dd35..8d997305b2d1c 100644
--- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
@@ -16,13 +16,11 @@
 /**
  * Class \Magento\Setup\Console\Command\ConfigSetCommand
  *
- * @since 2.0.0
  */
 class ConfigSetCommand extends AbstractSetupCommand
 {
     /**
      * @var ConfigModel
-     * @since 2.0.0
      */
     protected $configModel;
 
@@ -30,13 +28,11 @@ class ConfigSetCommand extends AbstractSetupCommand
      * Enabled module list
      *
      * @var ModuleList
-     * @since 2.0.0
      */
     private $moduleList;
 
     /**
      * Existing deployment config
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -46,7 +42,6 @@ class ConfigSetCommand extends AbstractSetupCommand
      * @param \Magento\Setup\Model\ConfigModel $configModel
      * @param ModuleList $moduleList
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(
         ConfigModel $configModel,
@@ -63,7 +58,6 @@ public function __construct(
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -78,7 +72,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -141,7 +134,6 @@ function ($value) {
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/CronRunCommand.php b/setup/src/Magento/Setup/Console/Command/CronRunCommand.php
index 98a8dea18a279..9649db2d6b92b 100644
--- a/setup/src/Magento/Setup/Console/Command/CronRunCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/CronRunCommand.php
@@ -14,31 +14,26 @@
 
 /**
  * Command to run scheduled jobs, this command should be run as a cron job
- * @since 2.0.0
  */
 class CronRunCommand extends AbstractSetupCommand
 {
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
     /**
      * @var Queue
-     * @since 2.0.0
      */
     protected $queue;
 
     /**
      * @var Status
-     * @since 2.0.0
      */
     protected $status;
 
     /**
      * @var ReadinessCheck
-     * @since 2.0.0
      */
     protected $readinessCheck;
 
@@ -47,7 +42,6 @@ class CronRunCommand extends AbstractSetupCommand
      * @param Queue $queue
      * @param ReadinessCheck $readinessCheck
      * @param Status $status
-     * @since 2.0.0
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -66,7 +60,6 @@ public function __construct(
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -78,7 +71,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -116,7 +108,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Check if Cron job can be run
      *
      * @return bool
-     * @since 2.0.0
      */
     private function checkRun()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
index a9057318e318f..36b010d6d1e38 100644
--- a/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Command for install and update of data in DB
- * @since 2.0.0
  */
 class DbDataUpgradeCommand extends AbstractSetupCommand
 {
@@ -22,7 +21,6 @@ class DbDataUpgradeCommand extends AbstractSetupCommand
      * Factory to create installer
      *
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installFactory;
 
@@ -30,7 +28,6 @@ class DbDataUpgradeCommand extends AbstractSetupCommand
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -39,7 +36,6 @@ class DbDataUpgradeCommand extends AbstractSetupCommand
      *
      * @param InstallerFactory $installFactory
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(InstallerFactory $installFactory, DeploymentConfig $deploymentConfig)
     {
@@ -52,7 +48,6 @@ public function __construct(InstallerFactory $installFactory, DeploymentConfig $
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -62,7 +57,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
index 81a48252d2719..fbe1843e7e606 100644
--- a/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Command for install and update of DB schema
- * @since 2.0.0
  */
 class DbSchemaUpgradeCommand extends AbstractSetupCommand
 {
@@ -22,7 +21,6 @@ class DbSchemaUpgradeCommand extends AbstractSetupCommand
      * Factory to create installer
      *
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installFactory;
 
@@ -30,7 +28,6 @@ class DbSchemaUpgradeCommand extends AbstractSetupCommand
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -39,7 +36,6 @@ class DbSchemaUpgradeCommand extends AbstractSetupCommand
      *
      * @param InstallerFactory $installFactory
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(InstallerFactory $installFactory, DeploymentConfig $deploymentConfig)
     {
@@ -52,7 +48,6 @@ public function __construct(InstallerFactory $installFactory, DeploymentConfig $
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -62,7 +57,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php b/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
index 0dab9aea3a5a5..138986590e3e3 100644
--- a/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
@@ -15,7 +15,6 @@
 
 /**
  * Command for checking if DB version is in sync with the code base version
- * @since 2.0.0
  */
 class DbStatusCommand extends AbstractSetupCommand
 {
@@ -28,7 +27,6 @@ class DbStatusCommand extends AbstractSetupCommand
      * Object manager provider
      *
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -36,7 +34,6 @@ class DbStatusCommand extends AbstractSetupCommand
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -45,7 +42,6 @@ class DbStatusCommand extends AbstractSetupCommand
      *
      * @param ObjectManagerProvider $objectManagerProvider
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider, DeploymentConfig $deploymentConfig)
     {
@@ -56,7 +52,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider, Deploy
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -67,7 +62,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
index c5d44f06ea29d..3ea98d7aa252d 100644
--- a/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
@@ -13,13 +13,11 @@
 
 /**
  * Command for showing numbers of dependencies on Magento Framework
- * @since 2.0.0
  */
 class DependenciesShowFrameworkCommand extends AbstractDependenciesCommand
 {
     /**
      * @var ComponentRegistrarInterface
-     * @since 2.0.0
      */
     private $registrar;
 
@@ -28,7 +26,6 @@ class DependenciesShowFrameworkCommand extends AbstractDependenciesCommand
      *
      * @param ComponentRegistrarInterface $registrar
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrarInterface $registrar, ObjectManagerProvider $objectManagerProvider)
     {
@@ -38,7 +35,6 @@ public function __construct(ComponentRegistrarInterface $registrar, ObjectManage
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -51,7 +47,6 @@ protected function configure()
      * Return default output filename for framework dependencies report
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDefaultOutputFilename()
     {
@@ -63,7 +58,6 @@ protected function getDefaultOutputFilename()
      *
      * @param string $outputPath
      * @return void
-     * @since 2.0.0
      */
     protected function buildReport($outputPath)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
index 1a74977036168..c9cfdd7526136 100644
--- a/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
@@ -11,13 +11,11 @@
 
 /**
  * Command for showing number of circular dependencies between modules
- * @since 2.0.0
  */
 class DependenciesShowModulesCircularCommand extends AbstractDependenciesCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -30,7 +28,6 @@ protected function configure()
      * Return default output filename for modules circular dependencies report
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDefaultOutputFilename()
     {
@@ -42,7 +39,6 @@ protected function getDefaultOutputFilename()
      *
      * @param string $outputPath
      * @return void
-     * @since 2.0.0
      */
     protected function buildReport($outputPath)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
index cacf4296e58b7..13499b56412a1 100644
--- a/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
@@ -11,13 +11,11 @@
 
 /**
  * Command for showing number of dependencies between modules
- * @since 2.0.0
  */
 class DependenciesShowModulesCommand extends AbstractDependenciesCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -30,7 +28,6 @@ protected function configure()
      * Return default output filename for modules dependencies report
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDefaultOutputFilename()
     {
@@ -42,7 +39,6 @@ protected function getDefaultOutputFilename()
      *
      * @param string $outputPath
      * @return void
-     * @since 2.0.0
      */
     protected function buildReport($outputPath)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index aba38ebccd7fc..538750001aa8a 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -25,7 +25,6 @@
 /**
  * Command to run compile in single-tenant mode
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class DiCompileCommand extends Command
 {
@@ -34,49 +33,41 @@ class DiCompileCommand extends Command
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var \Magento\Setup\Module\Di\App\Task\Manager
-     * @since 2.0.0
      */
     private $taskManager;
 
     /**
      * @var \Magento\Framework\App\Filesystem\DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $excludedPathsList;
 
     /**
      * @var \Magento\Framework\Filesystem\DriverInterface
-     * @since 2.0.0
      */
     private $fileDriver;
 
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -90,7 +81,6 @@ class DiCompileCommand extends Command
      * @param Filesystem $filesystem
      * @param DriverInterface $fileDriver
      * @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -113,7 +103,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -128,7 +117,6 @@ protected function configure()
      * Checks that application is installed and DI resources are cleared
      *
      * @return string[]
-     * @since 2.0.0
      */
     private function checkEnvironment()
     {
@@ -144,7 +132,6 @@ private function checkEnvironment()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -233,7 +220,7 @@ function (OperationInterface $operation) use ($progressBar) {
      *
      * @param string[] $modulePaths
      * @return string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getExcludedModulePaths(array $modulePaths)
     {
@@ -269,7 +256,7 @@ private function getExcludedModulePaths(array $modulePaths)
      *
      * @param string[] $libraryPaths
      * @return string[]
-     * @since 2.2.0
+     * @since 2.1.3
      */
     private function getExcludedLibraryPaths(array $libraryPaths)
     {
@@ -299,7 +286,6 @@ private function getExcludedSetupPaths($setupPath)
      *
      * @param array $directoryCodeList
      * @return void
-     * @since 2.0.0
      */
     private function cleanupFilesystem($directoryCodeList)
     {
@@ -313,7 +299,6 @@ private function cleanupFilesystem($directoryCodeList)
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     private function configureObjectManager(OutputInterface $output)
     {
@@ -365,7 +350,6 @@ private function configureObjectManager(OutputInterface $output)
      *
      * @param array $compiledPathsList
      * @return array
-     * @since 2.0.0
      */
     private function getOperationsConfiguration(
         array $compiledPathsList
diff --git a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
index 19c01166e0bdb..d9de5c0a8e2b3 100644
--- a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
@@ -17,7 +17,6 @@
 
 /**
  * Command generates fixtures for performance tests
- * @since 2.0.0
  */
 class GenerateFixturesCommand extends Command
 {
@@ -30,13 +29,11 @@ class GenerateFixturesCommand extends Command
 
     /**
      * @var FixtureModel
-     * @since 2.0.0
      */
     private $fixtureModel;
 
     /**
      * @param FixtureModel $fixtureModel
-     * @since 2.0.0
      */
     public function __construct(FixtureModel $fixtureModel)
     {
@@ -46,7 +43,6 @@ public function __construct(FixtureModel $fixtureModel)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -70,7 +66,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
index 6636c7d168c8e..1151ba7630d5d 100644
--- a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Command for i18n dictionary generation
- * @since 2.0.0
  */
 class I18nCollectPhrasesCommand extends Command
 {
@@ -30,7 +29,6 @@ class I18nCollectPhrasesCommand extends Command
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -60,7 +58,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php b/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
index 9e460ea25be6b..0fa3f474500db 100644
--- a/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
@@ -14,7 +14,6 @@
 
 /**
  * Command for i18n language packaging
- * @since 2.0.0
  */
 class I18nPackCommand extends Command
 {
@@ -39,7 +38,6 @@ class I18nPackCommand extends Command
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -77,7 +75,6 @@ protected function configure()
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php b/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
index 75e5275c385a8..18fcfa93d1e30 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
@@ -14,13 +14,11 @@
 /**
  * Class \Magento\Setup\Console\Command\InfoAdminUriCommand
  *
- * @since 2.0.0
  */
 class InfoAdminUriCommand extends Command
 {
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -30,7 +28,6 @@ class InfoAdminUriCommand extends Command
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\App\DeploymentConfig $deploymentConfig)
     {
@@ -42,7 +39,6 @@ public function __construct(\Magento\Framework\App\DeploymentConfig $deploymentC
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -53,7 +49,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
index f2a96a7f63511..c22367bded29a 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
@@ -16,7 +16,6 @@
 
 /**
  * Command prints list of available backup files
- * @since 2.0.0
  */
 class InfoBackupsListCommand extends Command
 {
@@ -24,7 +23,6 @@ class InfoBackupsListCommand extends Command
      * File
      *
      * @var File
-     * @since 2.0.0
      */
     private $file;
 
@@ -32,14 +30,12 @@ class InfoBackupsListCommand extends Command
      * Filesystem Directory List
      *
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
     /**
      * @param DirectoryList $directoryList
      * @param File $file
-     * @since 2.0.0
      */
     public function __construct(
         DirectoryList $directoryList,
@@ -52,7 +48,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -64,7 +59,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
index 727c91c51058b..b9734807e3522 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
@@ -13,7 +13,6 @@
 
 /**
  * Command prints list of available currencies
- * @since 2.0.0
  */
 class InfoCurrencyListCommand extends Command
 {
@@ -21,13 +20,11 @@ class InfoCurrencyListCommand extends Command
      * List model provides lists of available options for currency, language locales, timezones
      *
      * @var Lists
-     * @since 2.0.0
      */
     private $lists;
 
     /**
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -37,7 +34,6 @@ public function __construct(Lists $lists)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -49,7 +45,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
index c2311401434fe..171ee32266a7f 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -13,7 +13,6 @@
 
 /**
  * Command prints list of available language locales
- * @since 2.0.0
  */
 class InfoLanguageListCommand extends Command
 {
@@ -21,13 +20,11 @@ class InfoLanguageListCommand extends Command
      * List model provides lists of available options for currency, language locales, timezones
      *
      * @var Lists
-     * @since 2.0.0
      */
     private $lists;
 
     /**
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -37,7 +34,6 @@ public function __construct(Lists $lists)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -49,7 +45,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
index 7e69611666765..587334a7e1dfd 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
@@ -13,7 +13,6 @@
 
 /**
  * Command prints list of available timezones
- * @since 2.0.0
  */
 class InfoTimezoneListCommand extends Command
 {
@@ -21,13 +20,11 @@ class InfoTimezoneListCommand extends Command
      * List model provides lists of available options for currency, language locales, timezones
      *
      * @var Lists
-     * @since 2.0.0
      */
     private $lists;
 
     /**
      * @param Lists $lists
-     * @since 2.0.0
      */
     public function __construct(Lists $lists)
     {
@@ -37,7 +34,6 @@ public function __construct(Lists $lists)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -49,7 +45,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index fb133fdda0c66..3554aa56434ca 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -15,7 +15,6 @@
 /**
  * Command to install Magento application
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallCommand extends AbstractSetupCommand
 {
@@ -43,25 +42,21 @@ class InstallCommand extends AbstractSetupCommand
      * Installer service factory
      *
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installerFactory;
 
     /**
      * @var ConfigModel
-     * @since 2.0.0
      */
     protected $configModel;
 
     /**
      * @var InstallStoreConfigurationCommand
-     * @since 2.0.0
      */
     protected $userConfig;
 
     /**
      * @var AdminUserCreateCommand
-     * @since 2.0.0
      */
     protected $adminUser;
 
@@ -72,7 +67,6 @@ class InstallCommand extends AbstractSetupCommand
      * @param ConfigModel $configModel
      * @param InstallStoreConfigurationCommand $userConfig
      * @param AdminUserCreateCommand $adminUser
-     * @since 2.0.0
      */
     public function __construct(
         InstallerFactory $installerFactory,
@@ -89,7 +83,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -124,7 +117,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -135,7 +127,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
@@ -168,7 +159,6 @@ protected function initialize(InputInterface $input, OutputInterface $output)
      *
      * @param InputInterface $input
      * @return string[] Array of error messages
-     * @since 2.0.0
      */
     public function validate(InputInterface $input)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php b/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
index 16449d3b23463..982f3d1dc081c 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
@@ -23,13 +23,11 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallStoreConfigurationCommand extends AbstractSetupCommand
 {
     /**
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installerFactory;
 
@@ -37,7 +35,6 @@ class InstallStoreConfigurationCommand extends AbstractSetupCommand
      * Deployment configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -46,7 +43,6 @@ class InstallStoreConfigurationCommand extends AbstractSetupCommand
      *
      * @var ObjectManagerInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -84,7 +80,6 @@ class InstallStoreConfigurationCommand extends AbstractSetupCommand
      * @param TimezoneValidator $timezoneValidator,
      * @param CurrencyValidator $currencyValidator,
      * @param UrlValidator $urlValidator
-     * @since 2.0.0
      */
     public function __construct(
         InstallerFactory $installerFactory,
@@ -107,7 +102,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -119,7 +113,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -144,7 +137,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Get list of options for the command
      *
      * @return InputOption[]
-     * @since 2.0.0
      */
     public function getOptionsList()
     {
@@ -223,7 +215,6 @@ public function getOptionsList()
      * @return string[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function validate(InputInterface $input)
     {
@@ -309,7 +300,6 @@ public function validate(InputInterface $input)
      * @param string $value
      * @param string $key
      * @return string
-     * @since 2.0.0
      */
     private function validateBinaryValue($value, $key)
     {
@@ -327,7 +317,6 @@ private function validateBinaryValue($value, $key)
      * @param string  $code
      * @param string  $type
      * @return string
-     * @since 2.0.0
      */
     private function validateCodes($lists, $code, $type)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
index 752ae7cb24b21..3df2825dfec1d 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
@@ -16,7 +16,6 @@
 
 /**
  * Command for setting allowed IPs in maintenance mode
- * @since 2.0.0
  */
 class MaintenanceAllowIpsCommand extends AbstractSetupCommand
 {
@@ -28,13 +27,11 @@ class MaintenanceAllowIpsCommand extends AbstractSetupCommand
 
     /**
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
     /**
      * @var IpValidator
-     * @since 2.0.0
      */
     private $ipValidator;
 
@@ -43,7 +40,6 @@ class MaintenanceAllowIpsCommand extends AbstractSetupCommand
      *
      * @param MaintenanceMode $maintenanceMode
      * @param IpValidator $ipValidator
-     * @since 2.0.0
      */
     public function __construct(MaintenanceMode $maintenanceMode, IpValidator $ipValidator)
     {
@@ -56,7 +52,6 @@ public function __construct(MaintenanceMode $maintenanceMode, IpValidator $ipVal
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -83,7 +78,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -114,7 +108,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      *
      * @param string[] $addresses
      * @return string[]
-     * @since 2.0.0
      */
     protected function validate(array $addresses)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceDisableCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceDisableCommand.php
index 8e4cf41780ee5..853df9729ee34 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceDisableCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceDisableCommand.php
@@ -8,7 +8,6 @@
 
 /**
  * Command for disabling maintenance mode
- * @since 2.0.0
  */
 class MaintenanceDisableCommand extends AbstractMaintenanceCommand
 {
@@ -16,7 +15,6 @@ class MaintenanceDisableCommand extends AbstractMaintenanceCommand
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -28,7 +26,6 @@ protected function configure()
      * Disable maintenance mode
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
@@ -39,7 +36,6 @@ protected function isEnable()
      * Get disabled maintenance mode display string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDisplayString()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceEnableCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceEnableCommand.php
index 8e2a3cb836f8d..94ab312b60811 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceEnableCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceEnableCommand.php
@@ -8,7 +8,6 @@
 
 /**
  * Command for enabling maintenance mode
- * @since 2.0.0
  */
 class MaintenanceEnableCommand extends AbstractMaintenanceCommand
 {
@@ -16,7 +15,6 @@ class MaintenanceEnableCommand extends AbstractMaintenanceCommand
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -28,7 +26,6 @@ protected function configure()
      * Enable maintenance mode
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
@@ -39,7 +36,6 @@ protected function isEnable()
      * Get enabled maintenance mode display string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function getDisplayString()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
index 950128ab29b03..9162cc47f6bd9 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
@@ -13,13 +13,11 @@
 
 /**
  * Command for checking maintenance mode status
- * @since 2.0.0
  */
 class MaintenanceStatusCommand extends AbstractSetupCommand
 {
     /**
      * @var MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -27,7 +25,6 @@ class MaintenanceStatusCommand extends AbstractSetupCommand
      * Constructor
      *
      * @param MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     public function __construct(MaintenanceMode $maintenanceMode)
     {
@@ -39,7 +36,6 @@ public function __construct(MaintenanceMode $maintenanceMode)
      * Initialization of the command
      *
      * @return void
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -50,7 +46,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleDisableCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleDisableCommand.php
index e04acd049527c..cf3dd328616ba 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleDisableCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleDisableCommand.php
@@ -7,13 +7,11 @@
 
 /**
  * Command for disabling list or all of modules
- * @since 2.0.0
  */
 class ModuleDisableCommand extends AbstractModuleManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -26,7 +24,6 @@ protected function configure()
      * Disable modules
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleEnableCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleEnableCommand.php
index e79c01e20ebae..62a514ada9b8d 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleEnableCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleEnableCommand.php
@@ -7,13 +7,11 @@
 
 /**
  * Command for enabling list or all of modules
- * @since 2.0.0
  */
 class ModuleEnableCommand extends AbstractModuleManageCommand
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -26,7 +24,6 @@ protected function configure()
      * Enable modules
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isEnable()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index a89ca7455d8bc..d4305c9572a66 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -11,7 +11,6 @@
 
 /**
  * Command for displaying status of modules
- * @since 2.0.0
  */
 class ModuleStatusCommand extends AbstractSetupCommand
 {
@@ -19,7 +18,6 @@ class ModuleStatusCommand extends AbstractSetupCommand
      * Object manager provider
      *
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -27,7 +25,6 @@ class ModuleStatusCommand extends AbstractSetupCommand
      * Inject dependencies
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -37,7 +34,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -48,7 +44,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
index 2633d59f4c7a6..4e25cf60a56d3 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
@@ -27,7 +27,6 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @since 2.0.0
  */
 class ModuleUninstallCommand extends AbstractModuleCommand
 {
@@ -43,7 +42,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Maintenance mode
      *
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -51,7 +49,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Deployment Configuration
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -59,7 +56,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Full module list
      *
      * @var FullModuleList
-     * @since 2.0.0
      */
     private $fullModuleList;
 
@@ -67,7 +63,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Module package info
      *
      * @var PackageInfo
-     * @since 2.0.0
      */
     private $packageInfo;
 
@@ -75,7 +70,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Uninstall classes collector
      *
      * @var UninstallCollector
-     * @since 2.0.0
      */
     private $collector;
 
@@ -83,7 +77,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Composer general dependency checker
      *
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $dependencyChecker;
 
@@ -91,7 +84,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Root composer.json information
      *
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composer;
 
@@ -99,7 +91,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * BackupRollback factory
      *
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -107,7 +98,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Module Uninstaller
      *
      * @var ModuleUninstaller
-     * @since 2.0.0
      */
     private $moduleUninstaller;
 
@@ -115,7 +105,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * Module Registry uninstaller
      *
      * @var ModuleRegistryUninstaller
-     * @since 2.0.0
      */
     private $moduleRegistryUninstaller;
 
@@ -130,7 +119,6 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      * @param UninstallCollector $collector
      * @param ModuleUninstaller $moduleUninstaller
      * @param ModuleRegistryUninstaller $moduleRegistryUninstaller
-     * @since 2.0.0
      */
     public function __construct(
         ComposerInformation $composer,
@@ -157,7 +145,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -195,7 +182,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function isModuleRequired()
     {
@@ -205,7 +191,6 @@ protected function isModuleRequired()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -285,7 +270,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     private function takeBackup(InputInterface $input, OutputInterface $output)
     {
@@ -312,7 +296,6 @@ private function takeBackup(InputInterface $input, OutputInterface $output)
      * @param OutputInterface $output
      * @param bool $dbBackupOption
      * @return void
-     * @since 2.0.0
      */
     private function removeData(array $modules, OutputInterface $output, $dbBackupOption)
     {
@@ -329,7 +312,6 @@ private function removeData(array $modules, OutputInterface $output, $dbBackupOp
      *
      * @param string[] $modules
      * @return string[]
-     * @since 2.0.0
      */
     protected function validate(array $modules)
     {
@@ -362,7 +344,6 @@ protected function validate(array $modules)
      *
      * @param string[] $modules
      * @return string[]
-     * @since 2.0.0
      */
     private function checkDependencies(array $modules)
     {
@@ -386,7 +367,6 @@ private function checkDependencies(array $modules)
      * Sets area code to start a session for database backup and rollback
      *
      * @return void
-     * @since 2.0.0
      */
     private function setAreaCode()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
index d9966c08403f6..2d728e22fa140 100644
--- a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
@@ -20,7 +20,6 @@
  * Command to rollback code, media and DB
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class RollbackCommand extends AbstractSetupCommand
 {
@@ -35,19 +34,16 @@ class RollbackCommand extends AbstractSetupCommand
      * Object Manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
     /**
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -55,7 +51,6 @@ class RollbackCommand extends AbstractSetupCommand
      * Existing deployment config
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
@@ -65,7 +60,6 @@ class RollbackCommand extends AbstractSetupCommand
      * @param ObjectManagerProvider $objectManagerProvider
      * @param MaintenanceMode $maintenanceMode
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
@@ -81,7 +75,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -113,7 +106,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -155,7 +147,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param OutputInterface $output
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     private function doRollback(InputInterface $input, OutputInterface $output)
     {
@@ -185,7 +176,6 @@ private function doRollback(InputInterface $input, OutputInterface $output)
      * Sets area code to start a session for database backup and rollback
      *
      * @return void
-     * @since 2.0.0
      */
     private function setAreaCode()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/UninstallCommand.php b/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
index 548decffd842e..c0f51c432242d 100644
--- a/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Setup\Console\Command\UninstallCommand
  *
- * @since 2.0.0
  */
 class UninstallCommand extends AbstractSetupCommand
 {
     /**
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installerFactory;
 
     /**
      * @param InstallerFactory $installerFactory
-     * @since 2.0.0
      */
     public function __construct(InstallerFactory $installerFactory)
     {
@@ -37,7 +34,6 @@ public function __construct(InstallerFactory $installerFactory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -48,7 +44,6 @@ protected function configure()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 4486e914a5a87..00795fbd23f63 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -17,7 +17,6 @@
 
 /**
  * Command for updating installed application after the code base has changed
- * @since 2.0.0
  */
 class UpgradeCommand extends AbstractSetupCommand
 {
@@ -30,7 +29,6 @@ class UpgradeCommand extends AbstractSetupCommand
      * Installer service factory
      *
      * @var InstallerFactory
-     * @since 2.0.0
      */
     private $installerFactory;
 
@@ -45,7 +43,6 @@ class UpgradeCommand extends AbstractSetupCommand
      *
      * @param InstallerFactory $installerFactory
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(InstallerFactory $installerFactory, DeploymentConfig $deploymentConfig = null)
     {
@@ -56,7 +53,6 @@ public function __construct(InstallerFactory $installerFactory, DeploymentConfig
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function configure()
     {
@@ -78,7 +74,6 @@ protected function configure()
 
     /**
      * @inheritdoc
-     * @since 2.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/CommandList.php b/setup/src/Magento/Setup/Console/CommandList.php
index 40f3a9f875023..39f383806c6c4 100644
--- a/setup/src/Magento/Setup/Console/CommandList.php
+++ b/setup/src/Magento/Setup/Console/CommandList.php
@@ -12,7 +12,6 @@
  * Class CommandList contains predefined list of commands for Setup
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class CommandList
 {
@@ -20,7 +19,6 @@ class CommandList
      * Service Manager
      *
      * @var ServiceManager
-     * @since 2.0.0
      */
     private $serviceManager;
 
@@ -28,7 +26,6 @@ class CommandList
      * Constructor
      *
      * @param ServiceManager $serviceManager
-     * @since 2.0.0
      */
     public function __construct(ServiceManager $serviceManager)
     {
@@ -39,7 +36,6 @@ public function __construct(ServiceManager $serviceManager)
      * Gets list of setup command classes
      *
      * @return string[]
-     * @since 2.0.0
      */
     protected function getCommandsClasses()
     {
@@ -85,7 +81,6 @@ protected function getCommandsClasses()
      *
      * @return \Symfony\Component\Console\Command\Command[]
      * @throws \Exception
-     * @since 2.0.0
      */
     public function getCommands()
     {
diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
index 27d32850352a6..b972cf90958fa 100644
--- a/setup/src/Magento/Setup/Console/CompilerPreparation.php
+++ b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -19,25 +19,21 @@
 
 /**
  * Class prepares folders for code generation
- * @since 2.0.0
  */
 class CompilerPreparation
 {
     /**
      * @var ServiceManager
-     * @since 2.0.0
      */
     private $serviceManager;
 
     /**
      * @var ArgvInput
-     * @since 2.0.0
      */
     private $input;
 
     /**
      * @var File
-     * @since 2.0.0
      */
     private $filesystemDriver;
 
@@ -51,7 +47,6 @@ class CompilerPreparation
      * @param ServiceManager $serviceManager
      * @param ArgvInput $input
      * @param File $filesystemDriver
-     * @since 2.0.0
      */
     public function __construct(
         ServiceManager $serviceManager,
@@ -68,7 +63,6 @@ public function __construct(
      *
      * @throws GenerationDirectoryAccessException If generation directory is read-only
      * @return void
-     * @since 2.0.0
      */
     public function handleCompilerEnvironment()
     {
diff --git a/setup/src/Magento/Setup/Controller/AddDatabase.php b/setup/src/Magento/Setup/Controller/AddDatabase.php
index 1df6085d5c751..cc89c84d15a5c 100644
--- a/setup/src/Magento/Setup/Controller/AddDatabase.php
+++ b/setup/src/Magento/Setup/Controller/AddDatabase.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Setup\Controller\AddDatabase
  *
- * @since 2.0.0
  */
 class AddDatabase extends AbstractActionController
 {
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/BackupActionItems.php b/setup/src/Magento/Setup/Controller/BackupActionItems.php
index dbcfc296e411f..6230cf4edd760 100644
--- a/setup/src/Magento/Setup/Controller/BackupActionItems.php
+++ b/setup/src/Magento/Setup/Controller/BackupActionItems.php
@@ -16,7 +16,6 @@
 /**
  * Class \Magento\Setup\Controller\BackupActionItems
  *
- * @since 2.0.0
  */
 class BackupActionItems extends AbstractActionController
 {
@@ -25,7 +24,6 @@ class BackupActionItems extends AbstractActionController
      * Handler for BackupRollback
      *
      * @var \Magento\Framework\Setup\BackupRollback
-     * @since 2.0.0
      */
     private $backupHandler;
 
@@ -33,7 +31,6 @@ class BackupActionItems extends AbstractActionController
      * Filesystem
      *
      * @var \Magento\Framework\Backup\Filesystem
-     * @since 2.0.0
      */
     private $fileSystem;
 
@@ -41,7 +38,6 @@ class BackupActionItems extends AbstractActionController
      * Filesystem Directory List
      *
      * @var \Magento\Framework\App\Filesystem\DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -52,7 +48,6 @@ class BackupActionItems extends AbstractActionController
      * @param \Magento\Setup\Model\WebLogger $logger
      * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
      * @param \Magento\Framework\Backup\Filesystem $fileSystem
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
@@ -87,7 +82,6 @@ public function indexAction()
      * Checks disk space availability
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function checkAction()
     {
@@ -126,7 +120,6 @@ public function checkAction()
      * Takes backup for code, media or DB
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function createAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/CompleteBackup.php b/setup/src/Magento/Setup/Controller/CompleteBackup.php
index bd15cc0815e50..446cf61bbcfb4 100644
--- a/setup/src/Magento/Setup/Controller/CompleteBackup.php
+++ b/setup/src/Magento/Setup/Controller/CompleteBackup.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Setup\Controller\CompleteBackup
  *
- * @since 2.0.0
  */
 class CompleteBackup extends AbstractActionController
 {
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -31,7 +29,6 @@ public function indexAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function progressAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/CreateAdminAccount.php b/setup/src/Magento/Setup/Controller/CreateAdminAccount.php
index b1665a7e32f0b..f5f313ac84f81 100644
--- a/setup/src/Magento/Setup/Controller/CreateAdminAccount.php
+++ b/setup/src/Magento/Setup/Controller/CreateAdminAccount.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Setup\Controller\CreateAdminAccount
  *
- * @since 2.0.0
  */
 class CreateAdminAccount extends AbstractActionController
 {
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/CreateBackup.php b/setup/src/Magento/Setup/Controller/CreateBackup.php
index 2549301a68912..f08da18c6ec96 100644
--- a/setup/src/Magento/Setup/Controller/CreateBackup.php
+++ b/setup/src/Magento/Setup/Controller/CreateBackup.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Setup\Controller\CreateBackup
  *
- * @since 2.0.0
  */
 class CreateBackup extends AbstractActionController
 {
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/CustomizeYourStore.php b/setup/src/Magento/Setup/Controller/CustomizeYourStore.php
index 11d6d30e541e7..9975be8004916 100644
--- a/setup/src/Magento/Setup/Controller/CustomizeYourStore.php
+++ b/setup/src/Magento/Setup/Controller/CustomizeYourStore.php
@@ -16,25 +16,21 @@
 /**
  * Class \Magento\Setup\Controller\CustomizeYourStore
  *
- * @since 2.0.0
  */
 class CustomizeYourStore extends AbstractActionController
 {
     /**
      * @var FullModuleList
-     * @since 2.0.0
      */
     protected $moduleList;
 
     /**
      * @var Lists
-     * @since 2.0.0
      */
     protected $list;
 
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     protected $objectManagerProvider;
 
@@ -42,7 +38,6 @@ class CustomizeYourStore extends AbstractActionController
      * @param FullModuleList $moduleList
      * @param Lists $list
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(FullModuleList $moduleList, Lists $list, ObjectManagerProvider $objectManagerProvider)
     {
@@ -53,7 +48,6 @@ public function __construct(FullModuleList $moduleList, Lists $list, ObjectManag
 
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -83,7 +77,6 @@ public function indexAction()
      * Getting default time zone from server settings
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function defaultTimeZoneAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/DataOption.php b/setup/src/Magento/Setup/Controller/DataOption.php
index 9bbb5bf30d91f..7c94139aad92b 100644
--- a/setup/src/Magento/Setup/Controller/DataOption.php
+++ b/setup/src/Magento/Setup/Controller/DataOption.php
@@ -14,13 +14,11 @@
 
 /**
  * Controller of data option selection
- * @since 2.0.0
  */
 class DataOption extends AbstractActionController
 {
     /**
      * @var UninstallCollector
-     * @since 2.0.0
      */
     private $uninstallCollector;
 
@@ -28,7 +26,6 @@ class DataOption extends AbstractActionController
      * Constructor
      *
      * @param UninstallCollector $uninstallCollector
-     * @since 2.0.0
      */
     public function __construct(UninstallCollector $uninstallCollector)
     {
@@ -39,7 +36,6 @@ public function __construct(UninstallCollector $uninstallCollector)
      * Shows data option page
      *
      * @return ViewModel|\Zend\Http\Response
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -53,7 +49,6 @@ public function indexAction()
      * Checks if module has uninstall class
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function hasUninstallAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/DatabaseCheck.php b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
index c138ba72db7d8..9e7792054c6fd 100644
--- a/setup/src/Magento/Setup/Controller/DatabaseCheck.php
+++ b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Setup\Controller\DatabaseCheck
  *
- * @since 2.0.0
  */
 class DatabaseCheck extends AbstractActionController
 {
     /**
      * @var DbValidator
-     * @since 2.0.0
      */
     private $dbValidator;
 
@@ -27,7 +25,6 @@ class DatabaseCheck extends AbstractActionController
      * Constructor
      *
      * @param DbValidator $dbValidator
-     * @since 2.0.0
      */
     public function __construct(DbValidator $dbValidator)
     {
@@ -38,7 +35,6 @@ public function __construct(DbValidator $dbValidator)
      * Result of checking DB credentials
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/DependencyCheck.php b/setup/src/Magento/Setup/Controller/DependencyCheck.php
index 6b864c92c50f8..e0e1050fa628d 100644
--- a/setup/src/Magento/Setup/Controller/DependencyCheck.php
+++ b/setup/src/Magento/Setup/Controller/DependencyCheck.php
@@ -18,7 +18,6 @@
  * Class DependencyCheck
  *
  * Checks dependencies.
- * @since 2.0.0
  */
 class DependencyCheck extends AbstractActionController
 {
@@ -26,7 +25,6 @@ class DependencyCheck extends AbstractActionController
      * Dependency Readiness Check
      *
      * @var DependencyReadinessCheck
-     * @since 2.0.0
      */
     protected $dependencyReadinessCheck;
 
@@ -34,7 +32,6 @@ class DependencyCheck extends AbstractActionController
      * Uninstall Dependency Readiness Check
      *
      * @var UninstallDependencyCheck
-     * @since 2.0.0
      */
     protected $uninstallDependencyCheck;
 
@@ -42,7 +39,6 @@ class DependencyCheck extends AbstractActionController
      * Module/Status Object
      *
      * @var Status
-     * @since 2.0.0
      */
     protected $moduleStatus;
 
@@ -52,7 +48,6 @@ class DependencyCheck extends AbstractActionController
      * @param DependencyReadinessCheck $dependencyReadinessCheck
      * @param UninstallDependencyCheck $uninstallDependencyCheck
      * @param ModuleStatusFactory $moduleStatusFactory
-     * @since 2.0.0
      */
     public function __construct(
         DependencyReadinessCheck $dependencyReadinessCheck,
@@ -68,7 +63,6 @@ public function __construct(
      * Verifies component dependency
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function componentDependencyAction()
     {
@@ -92,7 +86,6 @@ public function componentDependencyAction()
      * Verifies component dependency for uninstall
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function uninstallDependencyCheckAction()
     {
@@ -118,7 +111,6 @@ public function uninstallDependencyCheckAction()
      * Verifies component dependency for enable/disable actions
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function enableDisableDependencyCheckAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Environment.php b/setup/src/Magento/Setup/Controller/Environment.php
index 2446098547921..41bcb8cad1615 100644
--- a/setup/src/Magento/Setup/Controller/Environment.php
+++ b/setup/src/Magento/Setup/Controller/Environment.php
@@ -14,7 +14,6 @@
  * Class Environment
  *
  * Provides information and checks about the environment.
- * @since 2.0.0
  */
 class Environment extends AbstractActionController
 {
@@ -27,7 +26,6 @@ class Environment extends AbstractActionController
      * File system
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -35,7 +33,6 @@ class Environment extends AbstractActionController
      * Cron Script Readiness Check
      *
      * @var \Magento\Setup\Model\CronScriptReadinessCheck
-     * @since 2.0.0
      */
     protected $cronScriptReadinessCheck;
 
@@ -43,7 +40,6 @@ class Environment extends AbstractActionController
      * PHP Readiness Check
      *
      * @var \Magento\Setup\Model\PhpReadinessCheck
-     * @since 2.0.0
      */
     protected $phpReadinessCheck;
 
@@ -54,7 +50,6 @@ class Environment extends AbstractActionController
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Setup\Model\CronScriptReadinessCheck $cronScriptReadinessCheck
      * @param \Magento\Setup\Model\PhpReadinessCheck $phpReadinessCheck
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Setup\FilePermissions $permissions,
@@ -86,7 +81,6 @@ public function indexAction()
      * Verifies php version
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function phpVersionAction()
     {
@@ -105,7 +99,6 @@ public function phpVersionAction()
      * Checks PHP settings
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function phpSettingsAction()
     {
@@ -124,7 +117,6 @@ public function phpSettingsAction()
      * Verifies php verifications
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function phpExtensionsAction()
     {
@@ -144,7 +136,6 @@ public function phpExtensionsAction()
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     private function getPhpChecksInfo($type)
     {
@@ -166,7 +157,6 @@ private function getPhpChecksInfo($type)
      * Verifies file permissions
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function filePermissionsAction()
     {
@@ -201,7 +191,6 @@ public function filePermissionsAction()
      * Verifies updater application exists
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function updaterApplicationAction()
     {
@@ -220,7 +209,6 @@ public function updaterApplicationAction()
      * Verifies Setup and Updater Cron status
      *
      * @return \Zend\View\Model\JsonModel
-     * @since 2.0.0
      */
     public function cronScriptAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Home.php b/setup/src/Magento/Setup/Controller/Home.php
index 004087f344461..4b0f4ef7917bd 100644
--- a/setup/src/Magento/Setup/Controller/Home.php
+++ b/setup/src/Magento/Setup/Controller/Home.php
@@ -11,13 +11,11 @@
 
 /**
  * Controller of homepage of setup
- * @since 2.0.0
  */
 class Home extends AbstractActionController
 {
     /**
      * @return ViewModel|\Zend\Http\Response
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Index.php b/setup/src/Magento/Setup/Controller/Index.php
index ad047aa2cf1f9..ea2fadd94f65e 100644
--- a/setup/src/Magento/Setup/Controller/Index.php
+++ b/setup/src/Magento/Setup/Controller/Index.php
@@ -11,13 +11,11 @@
 
 /**
  * Main controller of the Setup Wizard
- * @since 2.0.0
  */
 class Index extends AbstractActionController
 {
     /**
      * @return ViewModel|\Zend\Http\Response
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Install.php b/setup/src/Magento/Setup/Controller/Install.php
index f33128c7bc83c..adfe99fa66f3f 100644
--- a/setup/src/Magento/Setup/Controller/Install.php
+++ b/setup/src/Magento/Setup/Controller/Install.php
@@ -23,37 +23,32 @@
  * Install controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Install extends AbstractActionController
 {
     /**
      * @var WebLogger
-     * @since 2.0.0
      */
     private $log;
 
     /**
      * @var Installer
-     * @since 2.0.0
      */
     private $installer;
 
     /**
      * @var ProgressFactory
-     * @since 2.0.0
      */
     private $progressFactory;
 
     /**
      * @var \Magento\Framework\Setup\SampleData\State
-     * @since 2.0.0
      */
     protected $sampleDataState;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $deploymentConfig;
 
@@ -72,7 +67,6 @@ class Install extends AbstractActionController
      * @param \Magento\Framework\Setup\SampleData\State $sampleDataState
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @param RequestDataConverter $requestDataConverter
-     * @since 2.0.0
      */
     public function __construct(
         WebLogger $logger,
@@ -92,7 +86,6 @@ public function __construct(
 
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -105,7 +98,6 @@ public function indexAction()
      * Index Action
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function startAction()
     {
@@ -138,7 +130,6 @@ public function startAction()
      * Checks progress of installation
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function progressAction()
     {
@@ -174,7 +165,7 @@ public function progressAction()
      *
      * @return void
      * @throws \Magento\Setup\Exception
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function checkForPriorInstall()
     {
diff --git a/setup/src/Magento/Setup/Controller/InstallExtensionGrid.php b/setup/src/Magento/Setup/Controller/InstallExtensionGrid.php
index 3106c926fe5e2..6ffc28592b81b 100644
--- a/setup/src/Magento/Setup/Controller/InstallExtensionGrid.php
+++ b/setup/src/Magento/Setup/Controller/InstallExtensionGrid.php
@@ -13,7 +13,6 @@
 
 /**
  * Controller for extensions grid tasks
- * @since 2.0.0
  */
 class InstallExtensionGrid extends AbstractActionController
 {
@@ -25,7 +24,6 @@ class InstallExtensionGrid extends AbstractActionController
 
     /**
      * @param PackagesData $packagesData
-     * @since 2.0.0
      */
     public function __construct(
         PackagesData $packagesData
@@ -37,7 +35,6 @@ public function __construct(
      * Index page action
      *
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -50,7 +47,6 @@ public function indexAction()
      * Get Extensions info action
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function extensionsAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/LandingInstaller.php b/setup/src/Magento/Setup/Controller/LandingInstaller.php
index 2a8b62a67c9fc..a0811c3673969 100644
--- a/setup/src/Magento/Setup/Controller/LandingInstaller.php
+++ b/setup/src/Magento/Setup/Controller/LandingInstaller.php
@@ -10,7 +10,6 @@
 
 /**
  * Controller for Setup Landing page
- * @since 2.0.0
  */
 class LandingInstaller extends AbstractActionController
 {
@@ -31,7 +30,6 @@ public function __construct(\Magento\Framework\App\ProductMetadata $productMetad
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/LandingUpdater.php b/setup/src/Magento/Setup/Controller/LandingUpdater.php
index b0c508ad419f0..3cccf0664ed18 100644
--- a/setup/src/Magento/Setup/Controller/LandingUpdater.php
+++ b/setup/src/Magento/Setup/Controller/LandingUpdater.php
@@ -10,7 +10,6 @@
 
 /**
  * Controller for Updater Landing page
- * @since 2.0.0
  */
 class LandingUpdater extends AbstractActionController
 {
@@ -31,7 +30,6 @@ public function __construct(\Magento\Framework\App\ProductMetadata $productMetad
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/License.php b/setup/src/Magento/Setup/Controller/License.php
index b72a03dbe5da4..84caaebe6c5eb 100644
--- a/setup/src/Magento/Setup/Controller/License.php
+++ b/setup/src/Magento/Setup/Controller/License.php
@@ -13,7 +13,6 @@
  * Class LicenseController
  *
  * @package Magento\Setup\Controller
- * @since 2.0.0
  */
 class License extends AbstractActionController
 {
@@ -21,7 +20,6 @@ class License extends AbstractActionController
      * Licence Model
      *
      * @var LicenseModel
-     * @since 2.0.0
      */
     protected $license;
 
@@ -29,7 +27,6 @@ class License extends AbstractActionController
      * Constructor
      *
      * @param LicenseModel $license
-     * @since 2.0.0
      */
     public function __construct(LicenseModel $license)
     {
@@ -40,7 +37,6 @@ public function __construct(LicenseModel $license)
      * Displays license
      *
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Maintenance.php b/setup/src/Magento/Setup/Controller/Maintenance.php
index d08b1fdb9bc60..881d620cc58c0 100644
--- a/setup/src/Magento/Setup/Controller/Maintenance.php
+++ b/setup/src/Magento/Setup/Controller/Maintenance.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Setup\Controller\Maintenance
  *
- * @since 2.0.0
  */
 class Maintenance extends AbstractActionController
 {
@@ -21,7 +20,6 @@ class Maintenance extends AbstractActionController
      * Handler for maintenance mode
      *
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -29,7 +27,6 @@ class Maintenance extends AbstractActionController
      * Constructor
      *
      * @param MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     public function __construct(MaintenanceMode $maintenanceMode)
     {
@@ -40,7 +37,6 @@ public function __construct(MaintenanceMode $maintenanceMode)
      * Puts store in maintenance mode
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Marketplace.php b/setup/src/Magento/Setup/Controller/Marketplace.php
index 223aa888bf51a..f63f41a0f80e4 100644
--- a/setup/src/Magento/Setup/Controller/Marketplace.php
+++ b/setup/src/Magento/Setup/Controller/Marketplace.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Setup\Controller\Marketplace
  *
- * @since 2.0.0
  */
 class Marketplace extends AbstractActionController
 {
@@ -34,7 +33,6 @@ class Marketplace extends AbstractActionController
     /**
      * @param PackagesAuth $packagesAuth
      * @param PackagesData $packagesData
-     * @since 2.0.0
      */
     public function __construct(PackagesAuth $packagesAuth, PackagesData $packagesData)
     {
@@ -60,7 +58,6 @@ public function indexAction()
      * Save auth.json
      *
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function saveAuthJsonAction()
     {
@@ -88,7 +85,6 @@ public function saveAuthJsonAction()
      * Check if user authorize in connect
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function checkAuthAction()
     {
@@ -117,7 +113,6 @@ public function checkAuthAction()
      * Remove credentials from auth.json
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function removeCredentialsAction()
     {
@@ -131,7 +126,6 @@ public function removeCredentialsAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function popupAuthAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/MarketplaceCredentials.php b/setup/src/Magento/Setup/Controller/MarketplaceCredentials.php
index dab0dbe798e14..8316b65064e2a 100644
--- a/setup/src/Magento/Setup/Controller/MarketplaceCredentials.php
+++ b/setup/src/Magento/Setup/Controller/MarketplaceCredentials.php
@@ -11,13 +11,13 @@
 /**
  * Class \Magento\Setup\Controller\MarketplaceCredentials
  *
- * @since 2.1.0
+ * @since 2.0.11
  */
 class MarketplaceCredentials extends AbstractActionController
 {
     /**
      * @return ViewModel
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Modules.php b/setup/src/Magento/Setup/Controller/Modules.php
index f5c601d2b21b2..04118091d6ba9 100644
--- a/setup/src/Magento/Setup/Controller/Modules.php
+++ b/setup/src/Magento/Setup/Controller/Modules.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Setup\Controller\Modules
  *
- * @since 2.0.0
  */
 class Modules extends AbstractActionController
 {
@@ -22,20 +21,17 @@ class Modules extends AbstractActionController
      * Object manager
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var ModuleStatus
-     * @since 2.0.0
      */
     protected $allModules;
 
     /**
      * @param ModuleStatus $allModules
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ModuleStatus $allModules, ObjectManagerProvider $objectManagerProvider)
     {
@@ -47,7 +43,6 @@ public function __construct(ModuleStatus $allModules, ObjectManagerProvider $obj
      * Returns list of Modules
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -73,7 +68,6 @@ public function indexAction()
      * Result of checking Modules Validity
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function allModulesValidAction()
     {
@@ -92,7 +86,6 @@ public function allModulesValidAction()
      * @param array $toBeEnabledModules
      * @param bool $prettyFormat
      * @return JsonModel
-     * @since 2.0.0
      */
     private function checkGraph(array $toBeEnabledModules, $prettyFormat = false)
     {
@@ -112,7 +105,6 @@ private function checkGraph(array $toBeEnabledModules, $prettyFormat = false)
      * Check Module Dependencies
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function validateAction()
     {
@@ -141,7 +133,6 @@ public function validateAction()
      * @param bool $isEnable
      * @param string[] $constraints
      * @return string
-     * @since 2.0.0
      */
     private function getConstraintsFailureMessage($isEnable, array $constraints)
     {
diff --git a/setup/src/Magento/Setup/Controller/Navigation.php b/setup/src/Magento/Setup/Controller/Navigation.php
index 55988d9b5c0cd..5ac0bbfe38c45 100644
--- a/setup/src/Magento/Setup/Controller/Navigation.php
+++ b/setup/src/Magento/Setup/Controller/Navigation.php
@@ -14,32 +14,27 @@
 /**
  * Class Navigation
  *
- * @since 2.0.0
  */
 class Navigation extends AbstractActionController
 {
     /**
      * @var NavModel
-     * @since 2.0.0
      */
     protected $navigation;
 
     /**
      * @var Status
-     * @since 2.0.0
      */
     protected $status;
 
     /**
      * @var ViewModel
-     * @since 2.0.0
      */
     protected $view;
 
     /**
      * @param NavModel $navigation
      * @param Status $status
-     * @since 2.0.0
      */
     public function __construct(NavModel $navigation, Status $status)
     {
@@ -52,7 +47,6 @@ public function __construct(NavModel $navigation, Status $status)
 
     /**
      * @return JsonModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -66,7 +60,6 @@ public function indexAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function menuAction()
     {
@@ -79,7 +72,6 @@ public function menuAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function sideMenuAction()
     {
@@ -91,7 +83,6 @@ public function sideMenuAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function headerBarAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/OtherComponentsGrid.php b/setup/src/Magento/Setup/Controller/OtherComponentsGrid.php
index 3cf9db61e24ad..282611b79538b 100644
--- a/setup/src/Magento/Setup/Controller/OtherComponentsGrid.php
+++ b/setup/src/Magento/Setup/Controller/OtherComponentsGrid.php
@@ -12,26 +12,22 @@
 
 /**
  * Controller for other components grid on select version page
- * @since 2.0.0
  */
 class OtherComponentsGrid extends AbstractActionController
 {
     /**
      * @var \Magento\Framework\Composer\ComposerInformation
-     * @since 2.0.0
      */
     private $composerInformation;
 
     /**
      * @var \Magento\Composer\InfoCommand
-     * @since 2.0.0
      */
     private $infoCommand;
 
     /**
      * @param \Magento\Framework\Composer\ComposerInformation $composerInformation
      * @param \Magento\Framework\Composer\MagentoComposerApplicationFactory $magentoComposerApplicationFactory
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Composer\ComposerInformation $composerInformation,
@@ -60,7 +56,6 @@ public function indexAction()
      *
      * @return JsonModel
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function componentsAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/ReadinessCheckInstaller.php b/setup/src/Magento/Setup/Controller/ReadinessCheckInstaller.php
index 014e7374f7652..8fbdd1cf2966b 100644
--- a/setup/src/Magento/Setup/Controller/ReadinessCheckInstaller.php
+++ b/setup/src/Magento/Setup/Controller/ReadinessCheckInstaller.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Setup\Controller\ReadinessCheckInstaller
  *
- * @since 2.0.0
  */
 class ReadinessCheckInstaller extends AbstractActionController
 {
@@ -19,7 +18,6 @@ class ReadinessCheckInstaller extends AbstractActionController
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -32,7 +30,6 @@ public function indexAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function progressAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/ReadinessCheckUpdater.php b/setup/src/Magento/Setup/Controller/ReadinessCheckUpdater.php
index 9e31881e81057..934fa4fac8084 100644
--- a/setup/src/Magento/Setup/Controller/ReadinessCheckUpdater.php
+++ b/setup/src/Magento/Setup/Controller/ReadinessCheckUpdater.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Setup\Controller\ReadinessCheckUpdater
  *
- * @since 2.0.0
  */
 class ReadinessCheckUpdater extends AbstractActionController
 {
@@ -19,7 +18,6 @@ class ReadinessCheckUpdater extends AbstractActionController
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -32,7 +30,6 @@ public function indexAction()
 
     /**
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function progressAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/ResponseTypeInterface.php b/setup/src/Magento/Setup/Controller/ResponseTypeInterface.php
index a35cc8eb85737..4adf41c379b31 100644
--- a/setup/src/Magento/Setup/Controller/ResponseTypeInterface.php
+++ b/setup/src/Magento/Setup/Controller/ResponseTypeInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Setup\Controller\ResponseTypeInterface
  *
- * @since 2.0.0
  */
 interface ResponseTypeInterface
 {
diff --git a/setup/src/Magento/Setup/Controller/SelectVersion.php b/setup/src/Magento/Setup/Controller/SelectVersion.php
index 99d16ed9bae4f..1625ba9cf4dd4 100644
--- a/setup/src/Magento/Setup/Controller/SelectVersion.php
+++ b/setup/src/Magento/Setup/Controller/SelectVersion.php
@@ -14,19 +14,16 @@
 
 /**
  * Controller for selecting version
- * @since 2.0.0
  */
 class SelectVersion extends AbstractActionController
 {
     /**
      * @var SystemPackage
-     * @since 2.0.0
      */
     protected $systemPackage;
 
     /**
      * @param SystemPackage $systemPackage
-     * @since 2.0.0
      */
     public function __construct(
         SystemPackage $systemPackage
@@ -36,7 +33,6 @@ public function __construct(
 
     /**
      * @return ViewModel|\Zend\Http\Response
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -50,7 +46,6 @@ public function indexAction()
      * Gets system package and versions
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function systemPackageAction()
     {
@@ -71,7 +66,7 @@ public function systemPackageAction()
      * Gets installed system package
      *
      * @return JsonModel
-     * @since 2.1.0
+     * @since 2.0.11
      */
     public function installedSystemPackageAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index bb597be69019b..0184bb57a171e 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -8,26 +8,22 @@
 /**
  * Class \Magento\Setup\Controller\Session
  *
- * @since 2.0.0
  */
 class Session extends \Zend\Mvc\Controller\AbstractActionController
 {
     /**
      * @var \Zend\ServiceManager\ServiceManager
-     * @since 2.0.0
      */
     private $serviceManager;
 
     /**
      * @var \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
     /**
      * @param \Zend\ServiceManager\ServiceManager $serviceManager
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(
         \Zend\ServiceManager\ServiceManager $serviceManager,
@@ -55,7 +51,6 @@ public function indexAction()
      * Prolong session
      *
      * @return string
-     * @since 2.0.0
      */
     public function prolongAction()
     {
@@ -89,7 +84,6 @@ public function prolongAction()
 
     /**
      * @return \Zend\View\Model\ViewModel|\Zend\Http\Response
-     * @since 2.0.0
      */
     public function unloginAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/StartUpdater.php b/setup/src/Magento/Setup/Controller/StartUpdater.php
index 78d766b4419d5..674f0ce7f0a16 100644
--- a/setup/src/Magento/Setup/Controller/StartUpdater.php
+++ b/setup/src/Magento/Setup/Controller/StartUpdater.php
@@ -14,7 +14,6 @@
 
 /**
  * Controller for updater tasks
- * @since 2.0.0
  */
 class StartUpdater extends AbstractActionController
 {
@@ -35,7 +34,6 @@ class StartUpdater extends AbstractActionController
      *
      * @param \Magento\Setup\Model\UpdaterTaskCreator $updaterTaskCreator
      * @param \Magento\Setup\Model\PayloadValidator $payloadValidator
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Model\UpdaterTaskCreator $updaterTaskCreator,
@@ -49,7 +47,6 @@ public function __construct(
      * Index page action
      *
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
@@ -62,7 +59,6 @@ public function indexAction()
      * Update action
      *
      * @return JsonModel
-     * @since 2.0.0
      */
     public function updateAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/Success.php b/setup/src/Magento/Setup/Controller/Success.php
index cb834aa94de2f..fd363b1d5ebba 100644
--- a/setup/src/Magento/Setup/Controller/Success.php
+++ b/setup/src/Magento/Setup/Controller/Success.php
@@ -13,26 +13,22 @@
 /**
  * Class \Magento\Setup\Controller\Success
  *
- * @since 2.0.0
  */
 class Success extends AbstractActionController
 {
     /**
      * @var ModuleList
-     * @since 2.0.0
      */
     protected $moduleList;
 
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     protected $objectManagerProvider;
 
     /**
      * @param ModuleList $moduleList
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ModuleList $moduleList, ObjectManagerProvider $objectManagerProvider)
     {
@@ -42,7 +38,6 @@ public function __construct(ModuleList $moduleList, ObjectManagerProvider $objec
 
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/SystemConfig.php b/setup/src/Magento/Setup/Controller/SystemConfig.php
index 1e9b5f83d7178..2b2f501e3e63e 100644
--- a/setup/src/Magento/Setup/Controller/SystemConfig.php
+++ b/setup/src/Magento/Setup/Controller/SystemConfig.php
@@ -11,13 +11,11 @@
 /**
  * Class \Magento\Setup\Controller\SystemConfig
  *
- * @since 2.0.0
  */
 class SystemConfig extends AbstractActionController
 {
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/UpdaterSuccess.php b/setup/src/Magento/Setup/Controller/UpdaterSuccess.php
index 625419cc8ecd3..016d16f4596a4 100644
--- a/setup/src/Magento/Setup/Controller/UpdaterSuccess.php
+++ b/setup/src/Magento/Setup/Controller/UpdaterSuccess.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Setup\Controller\UpdaterSuccess
  *
- * @since 2.0.0
  */
 class UpdaterSuccess extends AbstractActionController
 {
     /**
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -26,7 +24,6 @@ class UpdaterSuccess extends AbstractActionController
      * Constructor
      *
      * @param MaintenanceMode $maintenanceMode
-     * @since 2.0.0
      */
     public function __construct(MaintenanceMode $maintenanceMode)
     {
@@ -35,7 +32,6 @@ public function __construct(MaintenanceMode $maintenanceMode)
 
     /**
      * @return ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Controller/WebConfiguration.php b/setup/src/Magento/Setup/Controller/WebConfiguration.php
index 45f780e245da4..27c86dbe8dc38 100644
--- a/setup/src/Magento/Setup/Controller/WebConfiguration.php
+++ b/setup/src/Magento/Setup/Controller/WebConfiguration.php
@@ -13,7 +13,6 @@
 /**
  * Class \Magento\Setup\Controller\WebConfiguration
  *
- * @since 2.0.0
  */
 class WebConfiguration extends AbstractActionController
 {
@@ -21,7 +20,6 @@ class WebConfiguration extends AbstractActionController
      * Displays web configuration form
      *
      * @return array|ViewModel
-     * @since 2.0.0
      */
     public function indexAction()
     {
diff --git a/setup/src/Magento/Setup/Exception.php b/setup/src/Magento/Setup/Exception.php
index a86568bb5d8b9..56f23cb39a92e 100644
--- a/setup/src/Magento/Setup/Exception.php
+++ b/setup/src/Magento/Setup/Exception.php
@@ -10,7 +10,6 @@
  * Exception thrown if an error occurs on setup process.
  *
  * @api
- * @since 2.0.0
  */
 class Exception extends \Exception
 {
diff --git a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
index f3a0fa21e6e5c..c2c3bf38536a3 100755
--- a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
@@ -17,13 +17,11 @@
  * <cart_price_rules_floor>{int}</cart_price_rules_floor>
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
- * @since 2.0.0
  */
 class CartPriceRulesFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 80;
 
@@ -70,7 +68,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -449,7 +446,6 @@ public function generateAdvancedRules($ruleFactory, $categoriesArray)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -458,7 +454,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
index a6abcc023f933..27cdb6322fc37 100644
--- a/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
@@ -14,20 +14,17 @@
  * <catalog_price_rules>{int}</catalog_price_rules>
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
- * @since 2.0.0
  */
 class CatalogPriceRulesFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 90;
 
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -145,7 +142,6 @@ public function execute()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -154,7 +150,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
index 3d11b233d29e6..bac4f949e53e7 100644
--- a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
@@ -19,7 +19,6 @@
  *
  * If config "assign_entities_to_all_websites" set to "0" then all categories will be
  * uniformly distributed per root categories, else all categories assigned to one root category
- * @since 2.0.0
  */
 class CategoriesFixture extends Fixture
 {
@@ -87,13 +86,11 @@ public function __construct(
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 20;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -255,7 +252,6 @@ private function getCategoryPrefix()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -264,7 +260,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/ConfigsApplyFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigsApplyFixture.php
index f040adb96f015..d65441f878cc5 100644
--- a/setup/src/Magento/Setup/Fixtures/ConfigsApplyFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ConfigsApplyFixture.php
@@ -8,19 +8,16 @@
 
 /**
  * Class ConfigsApplyFixture
- * @since 2.0.0
  */
 class ConfigsApplyFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 0;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -50,7 +47,6 @@ public function execute()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -59,7 +55,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
index 2e26e0788c9d0..2829a145edbe2 100644
--- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
@@ -73,13 +73,11 @@
  * @see setup/performance-toolkit/profiles/ce/small.xml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @since 2.0.0
  */
 class ConfigurableProductsFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 50;
 
@@ -223,7 +221,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -425,7 +422,6 @@ private function getConfigurableVariationIndex($entityNumber, $variationCount)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -434,7 +430,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/CustomersFixture.php b/setup/src/Magento/Setup/Fixtures/CustomersFixture.php
index d4efdccdb1f30..9661b34d4a4f6 100644
--- a/setup/src/Magento/Setup/Fixtures/CustomersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CustomersFixture.php
@@ -37,13 +37,11 @@
  * </customer-config>
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
- * @since 2.0.0
  */
 class CustomersFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 70;
 
@@ -95,7 +93,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -129,7 +126,6 @@ private function getCustomersAmount()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -138,7 +134,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
index 6de077568d31a..1cdf8cc6cc610 100644
--- a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
@@ -16,13 +16,11 @@
 
 /**
  * Generate attributes default attribute set
- * @since 2.0.0
  */
 class EavVariationsFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 40;
 
@@ -86,7 +84,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -103,7 +100,6 @@ public function execute()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -112,7 +108,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/Fixture.php b/setup/src/Magento/Setup/Fixtures/Fixture.php
index b524e04cc8ec0..a9ab574b80afc 100644
--- a/setup/src/Magento/Setup/Fixtures/Fixture.php
+++ b/setup/src/Magento/Setup/Fixtures/Fixture.php
@@ -10,25 +10,21 @@
 
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @since 2.0.0
  */
 abstract class Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority;
 
     /**
      * @var FixtureModel
-     * @since 2.0.0
      */
     protected $fixtureModel;
 
     /**
      * @param FixtureModel $fixtureModel
-     * @since 2.0.0
      */
     public function __construct(FixtureModel $fixtureModel)
     {
@@ -39,7 +35,6 @@ public function __construct(FixtureModel $fixtureModel)
      * Execute fixture
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function execute();
 
@@ -47,7 +42,6 @@ abstract public function execute();
      * Get fixture action description
      *
      * @return string
-     * @since 2.0.0
      */
     abstract public function getActionTitle();
 
@@ -76,7 +70,6 @@ public function printInfo(OutputInterface $output)
      * Introduce parameters labels
      *
      * @return array
-     * @since 2.0.0
      */
     abstract public function introduceParamLabels();
 
@@ -84,7 +77,6 @@ abstract public function introduceParamLabels();
      * Get fixture priority
      *
      * @return int
-     * @since 2.0.0
      */
     public function getPriority()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/FixtureModel.php b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
index 4aac13ce963a5..9f1bed6492e87 100644
--- a/setup/src/Magento/Setup/Fixtures/FixtureModel.php
+++ b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
@@ -15,7 +15,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class FixtureModel
 {
@@ -33,13 +32,11 @@ class FixtureModel
      * Application object
      *
      * @var \Magento\Framework\AppInterface
-     * @since 2.0.0
      */
     protected $application;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -47,7 +44,6 @@ class FixtureModel
      * List of fixtures applied to the application
      *
      * @var \Magento\Setup\Fixtures\Fixture[]
-     * @since 2.0.0
      */
     protected $fixtures = [];
 
@@ -56,19 +52,16 @@ class FixtureModel
      *
      * @var array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     protected $paramLabels = [];
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $initArguments;
 
     /**
      * @var FixtureConfig
-     * @since 2.0.0
      */
     private $config;
 
@@ -77,7 +70,6 @@ class FixtureModel
      *
      * @param IndexerReindexCommand $reindexCommand
      * @param array $initArguments
-     * @since 2.0.0
      */
     public function __construct(IndexerReindexCommand $reindexCommand, $initArguments = [])
     {
@@ -90,7 +82,6 @@ public function __construct(IndexerReindexCommand $reindexCommand, $initArgument
      *
      * @param OutputInterface $output
      * @return void
-     * @since 2.0.0
      */
     public function reindex(OutputInterface $output)
     {
@@ -103,7 +94,6 @@ public function reindex(OutputInterface $output)
      *
      * @return $this
      * @throws \Exception
-     * @since 2.0.0
      */
     public function loadFixtures()
     {
@@ -136,7 +126,6 @@ public function loadFixtures()
      *
      * @return array
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function getParamLabels()
     {
@@ -147,7 +136,6 @@ public function getParamLabels()
      * Get fixtures
      *
      * @return Fixture[]
-     * @since 2.0.0
      */
     public function getFixtures()
     {
@@ -158,7 +146,6 @@ public function getFixtures()
      * Get object manager
      *
      * @return \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     public function getObjectManager()
     {
@@ -179,7 +166,6 @@ public function getObjectManager()
      *
      * @param string $area
      * @return FixtureModel
-     * @since 2.0.0
      */
     public function initObjectManager($area = self::AREA_CODE)
     {
@@ -211,7 +197,6 @@ public function initObjectManager($area = self::AREA_CODE)
      *
      * @return \Magento\Framework\ObjectManagerInterface
      * @deprecated 2.2.0
-     * @since 2.0.0
      */
     public function resetObjectManager()
     {
@@ -238,7 +223,6 @@ private function getConfig()
      * @throws \Exception
      *
      * @return void
-     * @since 2.0.0
      */
     public function loadConfig($filename)
     {
@@ -252,7 +236,6 @@ public function loadConfig($filename)
      * @param null|mixed $default
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getValue($key, $default = null)
     {
diff --git a/setup/src/Magento/Setup/Fixtures/IndexersStatesApplyFixture.php b/setup/src/Magento/Setup/Fixtures/IndexersStatesApplyFixture.php
index fe3e8ea9c0e2e..7b5bd92663008 100644
--- a/setup/src/Magento/Setup/Fixtures/IndexersStatesApplyFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/IndexersStatesApplyFixture.php
@@ -8,19 +8,16 @@
 
 /**
  * Class IndexersStatesApplyFixture
- * @since 2.0.0
  */
 class IndexersStatesApplyFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 170;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -38,7 +35,6 @@ public function execute()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -47,7 +43,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
index 95fed937226ea..6e83b04bba40f 100644
--- a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
@@ -41,7 +41,6 @@
  * @see setup/performance-toolkit/profiles/ce/small.xml
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class OrdersFixture extends Fixture
 {
@@ -105,7 +104,6 @@ class OrdersFixture extends Fixture
      * Fixture execution priority.
      *
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 135;
 
@@ -205,7 +203,6 @@ public function __construct(
      * @throws \Exception Any exception raised during DB query.
      * @return void
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -732,7 +729,6 @@ private function commitBatch()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -741,7 +737,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
@@ -757,7 +752,6 @@ public function introduceParamLabels()
      * @param string $tableName
      * @param string $resourceName
      * @return string
-     * @since 2.0.0
      */
     public function getTableName($tableName, $resourceName)
     {
diff --git a/setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php b/setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php
index de44140185c43..3a47d03cf0a12 100644
--- a/setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php
@@ -29,7 +29,6 @@
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class SimpleProductsFixture extends Fixture
 {
@@ -40,7 +39,6 @@ class SimpleProductsFixture extends Fixture
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 31;
 
@@ -147,7 +145,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -156,7 +153,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
@@ -168,7 +164,6 @@ public function introduceParamLabels()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/StoresFixture.php b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
index 572d39af24a1a..bcef2fc94a52b 100644
--- a/setup/src/Magento/Setup/Fixtures/StoresFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
@@ -38,7 +38,6 @@
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
  * @SuppressWarnings(PHPMD)
- * @since 2.0.0
  */
 class StoresFixture extends Fixture
 {
@@ -50,7 +49,6 @@ class StoresFixture extends Fixture
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 10;
 
@@ -197,7 +195,6 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD)
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -382,7 +379,6 @@ private function getStoreCategoryId($storeGroupName)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -391,7 +387,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php b/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
index f63ccf3a66ee6..120e46741120a 100644
--- a/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
@@ -14,19 +14,16 @@
  * <tax_rates_file>{csv file name}</tax_rates_file>
  *
  * @see setup/performance-toolkit/profiles/ce/small.xml
- * @since 2.0.0
  */
 class TaxRatesFixture extends Fixture
 {
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $priority = 100;
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -66,7 +63,6 @@ public function execute()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getActionTitle()
     {
@@ -75,7 +71,6 @@ public function getActionTitle()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function introduceParamLabels()
     {
diff --git a/setup/src/Magento/Setup/Model/AdminAccount.php b/setup/src/Magento/Setup/Model/AdminAccount.php
index 716553ff58db0..e5b49b09e08fa 100644
--- a/setup/src/Magento/Setup/Model/AdminAccount.php
+++ b/setup/src/Magento/Setup/Model/AdminAccount.php
@@ -15,7 +15,6 @@
 /**
  * Class \Magento\Setup\Model\AdminAccount
  *
- * @since 2.0.0
  */
 class AdminAccount
 {
@@ -42,13 +41,11 @@ class AdminAccount
      * Configurations
      *
      * @var []
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var EncryptorInterface
-     * @since 2.0.0
      */
     private $encryptor;
 
@@ -58,7 +55,6 @@ class AdminAccount
      * @param AdapterInterface $connection
      * @param EncryptorInterface $encryptor
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         AdapterInterface $connection,
@@ -74,7 +70,6 @@ public function __construct(
      * Generate password string
      *
      * @return string
-     * @since 2.0.0
      */
     protected function generatePassword()
     {
@@ -87,7 +82,6 @@ protected function generatePassword()
      * If the administrator account exists, update it.
      *
      * @return void
-     * @since 2.0.0
      */
     public function save()
     {
@@ -102,7 +96,6 @@ public function save()
      * and set the is_active flag.
      *
      * @return int The admin user id
-     * @since 2.0.0
      */
     private function saveAdminUser()
     {
@@ -173,7 +166,6 @@ private function trackPassword($adminId, $passwordHash)
      * @return void
      * @throws \Exception If the username and email do not both match data provided to install
      * @throws \Exception If password is empty and if password is the same as the user name
-     * @since 2.0.0
      */
     public function validateUserMatches()
     {
@@ -227,7 +219,6 @@ public function validateUserMatches()
      *
      * @param int $adminId User id of administrator to set role for
      * @return void
-     * @since 2.0.0
      */
     private function saveAdminUserRole($adminId)
     {
@@ -255,7 +246,6 @@ private function saveAdminUserRole($adminId)
      *
      * @return int The id of the Administrators role
      * @throws \Exception If Administrators role not found or problem connecting with database.
-     * @since 2.0.0
      */
     private function retrieveAdministratorsRoleId()
     {
diff --git a/setup/src/Magento/Setup/Model/AdminAccountFactory.php b/setup/src/Magento/Setup/Model/AdminAccountFactory.php
index eeb9dc125d669..884b756e24239 100644
--- a/setup/src/Magento/Setup/Model/AdminAccountFactory.php
+++ b/setup/src/Magento/Setup/Model/AdminAccountFactory.php
@@ -14,19 +14,16 @@
 /**
  * Class \Magento\Setup\Model\AdminAccountFactory
  *
- * @since 2.0.0
  */
 class AdminAccountFactory
 {
     /**
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     protected $serviceLocator;
 
     /**
      * @param ServiceLocatorInterface $serviceLocator
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator)
     {
@@ -37,7 +34,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
      * @param AdapterInterface $connection
      * @param array $data
      * @return AdminAccount
-     * @since 2.0.0
      */
     public function create(AdapterInterface $connection, $data)
     {
diff --git a/setup/src/Magento/Setup/Model/Complex/Generator.php b/setup/src/Magento/Setup/Model/Complex/Generator.php
index ab5786f97a7be..8d422bc789e80 100644
--- a/setup/src/Magento/Setup/Model/Complex/Generator.php
+++ b/setup/src/Magento/Setup/Model/Complex/Generator.php
@@ -12,7 +12,6 @@
  * Class Generator
  *
  *
- * @since 2.0.0
  */
 class Generator extends AbstractSource
 {
@@ -20,7 +19,6 @@ class Generator extends AbstractSource
      * Data row pattern
      *
      * @var Pattern
-     * @since 2.0.0
      */
     protected $_pattern;
 
@@ -28,7 +26,6 @@ class Generator extends AbstractSource
      * Entities limit
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_limit = 0;
 
@@ -36,7 +33,6 @@ class Generator extends AbstractSource
      * Entities Count
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_count = 0;
 
@@ -44,7 +40,6 @@ class Generator extends AbstractSource
      * Array of template variables (static values or callables)
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_variables = [];
 
@@ -52,7 +47,6 @@ class Generator extends AbstractSource
      * Current index
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_index = 1;
 
@@ -60,7 +54,6 @@ class Generator extends AbstractSource
      * Rows count in pattern
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_patternRowsCount = 0;
 
@@ -69,7 +62,6 @@ class Generator extends AbstractSource
      *
      * @param Pattern $rowPattern
      * @param int $count how many records to generate
-     * @since 2.0.0
      */
     public function __construct(Pattern $rowPattern, $count)
     {
@@ -86,7 +78,6 @@ public function __construct(Pattern $rowPattern, $count)
      * @param int $key
      *
      * @return float
-     * @since 2.0.0
      */
     public function getIndex($key)
     {
@@ -97,7 +88,6 @@ public function getIndex($key)
      * Whether limit of generated elements is reached (according to "Iterator" interface)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -108,7 +98,6 @@ public function valid()
      * Get next row in set
      *
      * @return array|bool
-     * @since 2.0.0
      */
     protected function _getNextRow()
     {
@@ -127,7 +116,6 @@ protected function _getNextRow()
      * Returns the row in associative array format: array(<col_name> => <value>, ...)
      *
      * @return array
-     * @since 2.0.0
      */
     public function current()
     {
diff --git a/setup/src/Magento/Setup/Model/Complex/Pattern.php b/setup/src/Magento/Setup/Model/Complex/Pattern.php
index a5f195458f9a6..a90849c7df2d9 100644
--- a/setup/src/Magento/Setup/Model/Complex/Pattern.php
+++ b/setup/src/Magento/Setup/Model/Complex/Pattern.php
@@ -10,7 +10,6 @@
  * Complex pattern class for complex generator (used for creating configurable products)
  *
  *
- * @since 2.0.0
  */
 class Pattern
 {
@@ -18,7 +17,6 @@ class Pattern
      * Pattern headers set
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_headers;
 
@@ -26,7 +24,6 @@ class Pattern
      * Rows set - array of rows pattern, can contain as many rows as you need
      *
      * @var array(array)
-     * @since 2.0.0
      */
     protected $_rowsSet;
 
@@ -34,7 +31,6 @@ class Pattern
      * Position
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_position = 0;
 
@@ -44,7 +40,6 @@ class Pattern
      * @param array $headers
      *
      * @return Pattern
-     * @since 2.0.0
      */
     public function setHeaders(array $headers)
     {
@@ -56,7 +51,6 @@ public function setHeaders(array $headers)
      * Get headers array
      *
      * @return array
-     * @since 2.0.0
      */
     public function getHeaders()
     {
@@ -70,7 +64,6 @@ public function getHeaders()
      *
      * @return Pattern
      * @throws \Exception
-     * @since 2.0.0
      */
     public function setRowsSet(array $rowsSet)
     {
@@ -90,7 +83,6 @@ public function setRowsSet(array $rowsSet)
      * @param array $row
      *
      * @return Pattern
-     * @since 2.0.0
      */
     public function addRow(array $row)
     {
@@ -105,7 +97,6 @@ public function addRow(array $row)
      * @param int $generatorKey
      *
      * @return array|null
-     * @since 2.0.0
      */
     public function getRow($index, $generatorKey)
     {
@@ -128,7 +119,6 @@ public function getRow($index, $generatorKey)
      * Get rows count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getRowsCount()
     {
diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
index 73b166e8346d3..00ed16db74d8a 100644
--- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
@@ -17,7 +17,6 @@
 /**
  * Creates deployment config data based on user input array
  * this class introduced to break down Magento\Setup\Model\ConfigOptionsList::createConfig
- * @since 2.0.0
  */
 class ConfigGenerator
 {
@@ -25,7 +24,6 @@ class ConfigGenerator
      * Maps configuration parameters to array keys in deployment config file
      *
      * @var array
-     * @since 2.0.0
      */
     private static $paramMap = [
         ConfigOptionsListConstants::INPUT_KEY_DB_HOST => ConfigOptionsListConstants::KEY_HOST,
@@ -43,13 +41,11 @@ class ConfigGenerator
 
     /**
      * @var Random
-     * @since 2.0.0
      */
     protected $random;
 
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
@@ -58,7 +54,6 @@ class ConfigGenerator
      *
      * @param Random $random
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(Random $random, DeploymentConfig $deploymentConfig)
     {
@@ -70,7 +65,6 @@ public function __construct(Random $random, DeploymentConfig $deploymentConfig)
      * Creates encryption key config data
      * @param array $data
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createCryptConfig(array $data)
     {
@@ -102,7 +96,6 @@ public function createCryptConfig(array $data)
      *
      * @param array $data
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createSessionConfig(array $data)
     {
@@ -125,7 +118,6 @@ public function createSessionConfig(array $data)
      * @return ConfigData
      * @deprecated 2.2.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function createDefinitionsConfig(array $data)
     {
@@ -137,7 +129,6 @@ public function createDefinitionsConfig(array $data)
      *
      * @param array $data
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createDbConfig(array $data)
     {
@@ -188,7 +179,6 @@ public function createDbConfig(array $data)
      * Creates resource config data
      *
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createResourceConfig()
     {
@@ -205,7 +195,6 @@ public function createResourceConfig()
      * Creates x-frame-options header config data
      *
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createXFrameConfig()
     {
@@ -220,7 +209,6 @@ public function createXFrameConfig()
      * Create default entry for mode config option
      *
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createModeConfig()
     {
@@ -236,7 +224,6 @@ public function createModeConfig()
      *
      * @param array $data
      * @return ConfigData
-     * @since 2.0.0
      */
     public function createCacheHostsConfig(array $data)
     {
diff --git a/setup/src/Magento/Setup/Model/ConfigModel.php b/setup/src/Magento/Setup/Model/ConfigModel.php
index df7684c06ea0e..b82f9a5be4786 100644
--- a/setup/src/Magento/Setup/Model/ConfigModel.php
+++ b/setup/src/Magento/Setup/Model/ConfigModel.php
@@ -15,19 +15,16 @@
 /**
  * Class \Magento\Setup\Model\ConfigModel
  *
- * @since 2.0.0
  */
 class ConfigModel
 {
     /**
      * @var \Magento\Setup\Model\ConfigOptionsListCollector
-     * @since 2.0.0
      */
     protected $collector;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig\Writer
-     * @since 2.0.0
      */
     protected $writer;
 
@@ -35,13 +32,11 @@ class ConfigModel
      * File permissions checker
      *
      * @var FilePermissions
-     * @since 2.0.0
      */
     private $filePermissions;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
@@ -52,7 +47,6 @@ class ConfigModel
      * @param Writer $writer
      * @param DeploymentConfig $deploymentConfig
      * @param FilePermissions $filePermissions
-     * @since 2.0.0
      */
     public function __construct(
         ConfigOptionsListCollector $collector,
@@ -70,7 +64,6 @@ public function __construct(
      * Gets available config options
      *
      * @return AbstractConfigOption[]
-     * @since 2.0.0
      */
     public function getAvailableOptions()
     {
@@ -98,7 +91,6 @@ public function getAvailableOptions()
      * @param array $inputOptions
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function process($inputOptions)
     {
@@ -137,7 +129,6 @@ public function process($inputOptions)
      *
      * @param array $inputOptions
      * @return array
-     * @since 2.0.0
      */
     public function validate(array $inputOptions)
     {
@@ -170,7 +161,6 @@ public function validate(array $inputOptions)
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     private function checkInstallationFilePermissions()
     {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index 10e5ebd554571..30fa42b9556ab 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -18,7 +18,6 @@
  * Deployment configuration options needed for Setup application
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ConfigOptionsList implements ConfigOptionsListInterface
 {
@@ -26,19 +25,16 @@ class ConfigOptionsList implements ConfigOptionsListInterface
      * Generate config data for individual segments
      *
      * @var  ConfigGenerator
-     * @since 2.0.0
      */
     private $configGenerator;
 
     /**
      * @var \Magento\Setup\Validator\DbValidator
-     * @since 2.0.0
      */
     private $dbValidator;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $validSaveHandlers = [
         ConfigOptionsListConstants::SESSION_SAVE_FILES,
@@ -50,7 +46,6 @@ class ConfigOptionsList implements ConfigOptionsListInterface
      *
      * @param ConfigGenerator $configGenerator
      * @param DbValidator $dbValidator
-     * @since 2.0.0
      */
     public function __construct(ConfigGenerator $configGenerator, DbValidator $dbValidator)
     {
@@ -61,7 +56,6 @@ public function __construct(ConfigGenerator $configGenerator, DbValidator $dbVal
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -160,7 +154,6 @@ public function getOptions()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createConfig(array $data, DeploymentConfig $deploymentConfig)
     {
@@ -181,7 +174,6 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -221,7 +213,6 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
      * @param DeploymentConfig $deploymentConfig
      *
      * @return array
-     * @since 2.0.0
      */
     private function getDbSettings(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -265,7 +256,6 @@ private function getDbSettings(array $options, DeploymentConfig $deploymentConfi
      *
      * @param array $options
      * @return string[]
-     * @since 2.0.0
      */
     private function validateSessionSave(array $options)
     {
@@ -284,7 +274,6 @@ private function validateSessionSave(array $options)
      *
      * @param array $options
      * @return string[]
-     * @since 2.0.0
      */
     private function validateEncryptionKey(array $options)
     {
@@ -303,7 +292,6 @@ private function validateEncryptionKey(array $options)
      *
      * @param string $option
      * @return string[]
-     * @since 2.0.0
      */
     private function validateHttpCacheHosts($option)
     {
@@ -320,7 +308,6 @@ private function validateHttpCacheHosts($option)
      *
      * @param string $option
      * @return string[]
-     * @since 2.0.0
      */
     private function validateDbPrefix($option)
     {
@@ -339,7 +326,6 @@ private function validateDbPrefix($option)
      * @param array $options
      * @param DeploymentConfig $deploymentConfig
      * @return string[]
-     * @since 2.0.0
      */
     private function validateDbSettings(array $options, DeploymentConfig $deploymentConfig)
     {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
index 24520b8c38212..cd2442c215bb3 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
@@ -13,7 +13,6 @@
 
 /**
  * Collects all ConfigOptionsList class in modules and setup
- * @since 2.0.0
  */
 class ConfigOptionsListCollector
 {
@@ -21,7 +20,6 @@ class ConfigOptionsListCollector
      * Directory List
      *
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -29,7 +27,6 @@ class ConfigOptionsListCollector
      * Filesystem
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -37,7 +34,6 @@ class ConfigOptionsListCollector
      * Module list including enabled and disabled modules
      *
      * @var FullModuleList
-     * @since 2.0.0
      */
     private $fullModuleList;
 
@@ -45,7 +41,6 @@ class ConfigOptionsListCollector
      * Object manager provider
      *
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -53,7 +48,6 @@ class ConfigOptionsListCollector
      * Service locator
      *
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     private $serviceLocator;
 
@@ -65,7 +59,6 @@ class ConfigOptionsListCollector
      * @param FullModuleList $fullModuleList
      * @param ObjectManagerProvider $objectManagerProvider
      * @param ServiceLocatorInterface $serviceLocator
-     * @since 2.0.0
      */
     public function __construct(
         DirectoryList $directoryList,
@@ -86,7 +79,6 @@ public function __construct(
      * These classes should reside in <module>/Setup directories.
      *
      * @return \Magento\Framework\Setup\ConfigOptionsListInterface[]
-     * @since 2.0.0
      */
     public function collectOptionsLists()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/AbstractJob.php b/setup/src/Magento/Setup/Model/Cron/AbstractJob.php
index cde51cd699899..ce481e2b7ab8b 100644
--- a/setup/src/Magento/Setup/Model/Cron/AbstractJob.php
+++ b/setup/src/Magento/Setup/Model/Cron/AbstractJob.php
@@ -11,55 +11,46 @@
 
 /**
  * Abstract class for jobs run by setup:cron:run command
- * @since 2.0.0
  */
 abstract class AbstractJob
 {
     /**
      * @var \Magento\Setup\Console\Command\AbstractSetupCommand
-     * @since 2.0.0
      */
     protected $command;
 
     /**
      * @var \Symfony\Component\Console\Output\OutputInterface
-     * @since 2.0.0
      */
     protected $output;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $params;
 
     /**
      * @var \Magento\Framework\App\Cache
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Framework\App\State\CleanupFiles
-     * @since 2.0.0
      */
     protected $cleanupFiles;
 
     /**
      * @var Status
-     * @since 2.0.0
      */
     protected $status;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
@@ -71,7 +62,6 @@ abstract class AbstractJob
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
      * @param string $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         \Symfony\Component\Console\Output\OutputInterface $output,
@@ -94,7 +84,6 @@ public function __construct(
      * Get job name.
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -105,7 +94,6 @@ public function getName()
      * Get string representation of a job.
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
@@ -116,7 +104,6 @@ public function __toString()
      * Do the cleanup
      *
      * @return void
-     * @since 2.0.0
      */
     protected function performCleanup()
     {
@@ -132,7 +119,6 @@ protected function performCleanup()
      * Execute job
      *
      * @return void
-     * @since 2.0.0
      */
     abstract public function execute();
 }
diff --git a/setup/src/Magento/Setup/Model/Cron/Helper/ModuleUninstall.php b/setup/src/Magento/Setup/Model/Cron/Helper/ModuleUninstall.php
index afea4d360a17a..b88dd845dc331 100644
--- a/setup/src/Magento/Setup/Model/Cron/Helper/ModuleUninstall.php
+++ b/setup/src/Magento/Setup/Model/Cron/Helper/ModuleUninstall.php
@@ -12,25 +12,21 @@
 
 /**
  * Helper class for JobComponentUninstall to uninstall a module component
- * @since 2.0.0
  */
 class ModuleUninstall
 {
     /**
      * @var ModuleUninstaller
-     * @since 2.0.0
      */
     private $moduleUninstaller;
 
     /**
      * @var ModuleRegistryUninstaller
-     * @since 2.0.0
      */
     private $moduleRegistryUninstaller;
 
     /**
      * @var PackageInfoFactory
-     * @since 2.0.0
      */
     private $packageInfoFactory;
 
@@ -40,7 +36,6 @@ class ModuleUninstall
      * @param ModuleUninstaller $moduleUninstaller
      * @param ModuleRegistryUninstaller $moduleRegistryUninstaller
      * @param PackageInfoFactory $packageInfoFactory
-     * @since 2.0.0
      */
     public function __construct(
         ModuleUninstaller $moduleUninstaller,
@@ -59,7 +54,6 @@ public function __construct(
      * @param string $componentName
      * @param bool $dataOption
      * @return void
-     * @since 2.0.0
      */
     public function uninstall(OutputInterface $output, $componentName, $dataOption)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/Helper/ThemeUninstall.php b/setup/src/Magento/Setup/Model/Cron/Helper/ThemeUninstall.php
index b1cac2209b51d..21a660f32d01e 100644
--- a/setup/src/Magento/Setup/Model/Cron/Helper/ThemeUninstall.php
+++ b/setup/src/Magento/Setup/Model/Cron/Helper/ThemeUninstall.php
@@ -11,19 +11,16 @@
 
 /**
  * Helper class for JobComponentUninstall to uninstall a theme component
- * @since 2.0.0
  */
 class ThemeUninstall
 {
     /**
      * @var ThemeUninstaller
-     * @since 2.0.0
      */
     private $themeUninstaller;
 
     /**
      * @var ThemePackageInfo
-     * @since 2.0.0
      */
     private $themePackageInfo;
 
@@ -32,7 +29,6 @@ class ThemeUninstall
      *
      * @param ThemeUninstaller $themeUninstaller
      * @param ThemePackageInfo $themePackageInfo
-     * @since 2.0.0
      */
     public function __construct(ThemeUninstaller $themeUninstaller, ThemePackageInfo $themePackageInfo)
     {
@@ -46,7 +42,6 @@ public function __construct(ThemeUninstaller $themeUninstaller, ThemePackageInfo
      * @param OutputInterface $output
      * @param string $componentName
      * @return void
-     * @since 2.0.0
      */
     public function uninstall(OutputInterface $output, $componentName)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobComponentUninstall.php b/setup/src/Magento/Setup/Model/Cron/JobComponentUninstall.php
index 192a7792bdfbd..f1292394b57c1 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobComponentUninstall.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobComponentUninstall.php
@@ -13,7 +13,6 @@
  * Job to remove a component. Run by Setup Cron Task
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @since 2.0.0
  */
 class JobComponentUninstall extends AbstractJob
 {
@@ -29,37 +28,31 @@ class JobComponentUninstall extends AbstractJob
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $objectManager;
 
     /**
      * @var \Magento\Setup\Model\Updater
-     * @since 2.0.0
      */
     private $updater;
 
     /**
      * @var \Magento\Framework\Composer\ComposerInformation
-     * @since 2.0.0
      */
     private $composerInformation;
 
     /**
      * @var Helper\ModuleUninstall
-     * @since 2.0.0
      */
     private $moduleUninstall;
 
     /**
      * @var Helper\ThemeUninstall
-     * @since 2.0.0
      */
     private $themeUninstall;
 
     /**
      * @var \Magento\Setup\Model\Cron\Queue
-     * @since 2.0.0
      */
     private $queue;
 
@@ -76,7 +69,6 @@ class JobComponentUninstall extends AbstractJob
      * @param \Magento\Setup\Model\Updater $updater
      * @param string $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Composer\ComposerInformation $composerInformation,
@@ -104,7 +96,6 @@ public function __construct(
      *
      * @return void
      * @throw \RuntimeException
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -132,7 +123,6 @@ public function execute()
      * @param array $component
      * @return void
      * @throw \RuntimeException
-     * @since 2.0.0
      */
     private function executeComponent(array $component)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobDbRollback.php b/setup/src/Magento/Setup/Model/Cron/JobDbRollback.php
index 6432f94b802a6..3be6137fad869 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobDbRollback.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobDbRollback.php
@@ -13,13 +13,11 @@
 
 /**
  * DB Rollback job
- * @since 2.0.0
  */
 class JobDbRollback extends AbstractJob
 {
     /**
      * @var BackupRollbackFactory
-     * @since 2.0.0
      */
     private $backupRollbackFactory;
 
@@ -31,7 +29,6 @@ class JobDbRollback extends AbstractJob
      * @param ObjectManagerProvider $objectManagerProvider
      * @param array $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         BackupRollbackFactory $backupRollbackFactory,
@@ -50,7 +47,6 @@ public function __construct(
      *
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -81,7 +77,6 @@ public function execute()
      * Sets area code to start a session for database backup and rollback
      *
      * @return void
-     * @since 2.0.0
      */
     private function setAreaCode()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobFactory.php b/setup/src/Magento/Setup/Model/Cron/JobFactory.php
index 5581d879ed12b..a29bf389254f7 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobFactory.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobFactory.php
@@ -19,7 +19,6 @@
  * Factory class to create jobs
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class JobFactory
 {
@@ -39,7 +38,6 @@ class JobFactory
 
     /**
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     private $serviceLocator;
 
@@ -47,7 +45,6 @@ class JobFactory
      * Constructor
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator)
     {
@@ -63,7 +60,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
      * @throws \RuntimeException
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function create($name, array $params = [])
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobModule.php b/setup/src/Magento/Setup/Model/Cron/JobModule.php
index 88c2951578f16..c5c222db3d68a 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobModule.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobModule.php
@@ -12,13 +12,11 @@
 
 /**
  * Job that handles module commands. E.g. "module:enable", "module:disable"
- * @since 2.0.0
  */
 class JobModule extends AbstractJob
 {
     /**
      * @var string $cmdString
-     * @since 2.0.0
      */
     protected $cmdString;
 
@@ -31,7 +29,6 @@ class JobModule extends AbstractJob
      * @param Status $status
      * @param string $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         AbstractSetupCommand $command,
@@ -53,7 +50,6 @@ public function __construct(
      *
      * @param string $name
      * @return void
-     * @since 2.0.0
      */
     private function setCommandString($name)
     {
@@ -69,7 +65,6 @@ private function setCommandString($name)
      *
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobStaticRegenerate.php b/setup/src/Magento/Setup/Model/Cron/JobStaticRegenerate.php
index 31dbd958e6952..9edbf3e981e8a 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobStaticRegenerate.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobStaticRegenerate.php
@@ -7,25 +7,21 @@
 
 /**
  * Static regenerate job
- * @since 2.0.0
  */
 class JobStaticRegenerate extends AbstractJob
 {
     /**
      * @var \Magento\Framework\App\Cache
-     * @since 2.0.0
      */
     protected $cache;
 
     /**
      * @var \Magento\Framework\App\State\CleanupFiles
-     * @since 2.0.0
      */
     protected $cleanupFiles;
 
     /**
      * @var \Magento\Setup\Model\Cron\Status
-     * @since 2.0.0
      */
     protected $status;
 
@@ -37,7 +33,6 @@ class JobStaticRegenerate extends AbstractJob
      * @param \Magento\Setup\Model\Cron\Status $status
      * @param array $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
@@ -57,7 +52,6 @@ public function __construct(
      *
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
@@ -90,7 +84,6 @@ public function execute()
      * Returns cache object
      *
      * @return \Magento\Framework\App\Cache
-     * @since 2.0.0
      */
     public function getCacheObject()
     {
@@ -101,7 +94,6 @@ public function getCacheObject()
      * Returns CleanFiles object
      *
      * @return \Magento\Framework\App\State\CleanupFiles
-     * @since 2.0.0
      */
     public function getCleanFilesObject()
     {
@@ -112,7 +104,6 @@ public function getCleanFilesObject()
      * Returns Status object
      *
      * @return \Magento\Setup\Model\Cron\Status
-     * @since 2.0.0
      */
     public function getStatusObject()
     {
@@ -123,7 +114,6 @@ public function getStatusObject()
      * Returns output object
      *
      * @return \Symfony\Component\Console\Output\OutputInterface
-     * @since 2.0.0
      */
     public function getOutputObject()
     {
@@ -134,7 +124,6 @@ public function getOutputObject()
      * Returns filesystem object
      *
      * @return \Magento\Deploy\Model\Filesystem
-     * @since 2.0.0
      */
     public function getFilesystem()
     {
@@ -145,7 +134,6 @@ public function getFilesystem()
      * Returns mode object
      *
      * @return \Magento\Deploy\Model\Mode
-     * @since 2.0.0
      */
     public function getModeObject()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/JobUpgrade.php b/setup/src/Magento/Setup/Model/Cron/JobUpgrade.php
index 4815b5b66aa5b..ab88f123ec2e8 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobUpgrade.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobUpgrade.php
@@ -13,19 +13,16 @@
 
 /**
  * Upgrade job
- * @since 2.0.0
  */
 class JobUpgrade extends AbstractJob
 {
     /**
      * @var \Magento\Setup\Model\Cron\Status
-     * @since 2.0.0
      */
     protected $status;
 
     /**
      * @var \Magento\Setup\Model\Cron\Queue
-     * @since 2.0.0
      */
     private $queue;
 
@@ -39,7 +36,6 @@ class JobUpgrade extends AbstractJob
      * @param \Magento\Setup\Model\Cron\Status $status
      * @param string $name
      * @param array $params
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Console\Command\AbstractSetupCommand $command,
@@ -60,7 +56,6 @@ public function __construct(
      *
      * @throws \RuntimeException
      * @return void
-     * @since 2.0.0
      */
     public function execute()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
index 455be58b13574..29392daecb8fd 100644
--- a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
+++ b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
@@ -10,13 +10,11 @@
 
 /**
  * Class to allow output to multiple file streams
- * @since 2.0.0
  */
 class MultipleStreamOutput extends Output
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $streams;
 
@@ -27,7 +25,6 @@ class MultipleStreamOutput extends Output
      * @param bool|int $verbosity
      * @param bool $decorated
      * @param OutputFormatterInterface $formatter
-     * @since 2.0.0
      */
     public function __construct(
         array $streams,
@@ -46,7 +43,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function doWrite($message, $newline)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/Queue.php b/setup/src/Magento/Setup/Model/Cron/Queue.php
index b87f0526ea07f..e168b50730871 100644
--- a/setup/src/Magento/Setup/Model/Cron/Queue.php
+++ b/setup/src/Magento/Setup/Model/Cron/Queue.php
@@ -7,7 +7,6 @@
 
 /**
  * Job Queue
- * @since 2.0.0
  */
 class Queue
 {
@@ -19,21 +18,16 @@ class Queue
     const KEY_JOB_PARAMS = 'params';
     /**#@-*/
 
-    /**
-     * @var Queue\Reader
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $reader;
 
     /**
      * @var Queue\Writer
-     * @since 2.0.0
      */
     protected $writer;
 
     /**
      * @var JobFactory
-     * @since 2.0.0
      */
     protected $jobFactory;
 
@@ -43,7 +37,6 @@ class Queue
      * @param Queue\Reader $reader
      * @param Queue\Writer $writer
      * @param JobFactory $jobFactory
-     * @since 2.0.0
      */
     public function __construct(Queue\Reader $reader, Queue\Writer $writer, JobFactory $jobFactory)
     {
@@ -56,7 +49,6 @@ public function __construct(Queue\Reader $reader, Queue\Writer $writer, JobFacto
      * Peek at job queue
      *
      * @return array
-     * @since 2.0.0
      */
     public function peek()
     {
@@ -77,7 +69,6 @@ public function peek()
      *
      * @return AbstractJob|null
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function popQueuedJob()
     {
@@ -108,7 +99,6 @@ public function popQueuedJob()
      * Returns if job queue is empty
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEmpty()
     {
@@ -119,7 +109,6 @@ public function isEmpty()
     /**
      * @param array $jobs
      * @return void
-     * @since 2.0.0
      */
     public function addJobs(array $jobs)
     {
@@ -137,7 +126,6 @@ public function addJobs(array $jobs)
      * @param object $job
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function validateJobDeclaration($job)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/Queue/Reader.php b/setup/src/Magento/Setup/Model/Cron/Queue/Reader.php
index fae7ead55dd77..3e771e3b0c568 100644
--- a/setup/src/Magento/Setup/Model/Cron/Queue/Reader.php
+++ b/setup/src/Magento/Setup/Model/Cron/Queue/Reader.php
@@ -11,19 +11,16 @@
 
 /**
  * Queue content file reader.
- * @since 2.0.0
  */
 class Reader
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     protected $reader;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $queueFileBasename;
 
@@ -32,7 +29,6 @@ class Reader
      *
      * @param Filesystem $filesystem
      * @param string|null $queueFileBasename
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem, $queueFileBasename = null)
     {
@@ -45,7 +41,6 @@ public function __construct(Filesystem $filesystem, $queueFileBasename = null)
      *
      * @return string Queue file content (valid JSON string)
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function read()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/Queue/Writer.php b/setup/src/Magento/Setup/Model/Cron/Queue/Writer.php
index c039aa6df703c..21285f0c78092 100644
--- a/setup/src/Magento/Setup/Model/Cron/Queue/Writer.php
+++ b/setup/src/Magento/Setup/Model/Cron/Queue/Writer.php
@@ -10,13 +10,11 @@
 
 /**
  * Queue content writer
- * @since 2.0.0
  */
 class Writer extends Reader
 {
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     private $writer;
 
@@ -25,7 +23,6 @@ class Writer extends Reader
      *
      * @param Filesystem $filesystem
      * @param string|null $queueFileBasename
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem, $queueFileBasename = null)
     {
@@ -38,7 +35,6 @@ public function __construct(Filesystem $filesystem, $queueFileBasename = null)
      *
      * @param string $data
      * @return void
-     * @since 2.0.0
      */
     public function write($data)
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php b/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php
index 3905ba62df425..14708f8688f52 100644
--- a/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php
@@ -11,7 +11,6 @@
 /**
  * This class is used by setup:cron:run command to check if this command can be run properly. It also checks if PHP
  * version, settings and extensions are correct.
- * @since 2.0.0
  */
 class ReadinessCheck
 {
@@ -36,27 +35,21 @@ class ReadinessCheck
     const KEY_LAST_TIMESTAMP = 'last_timestamp';
     /**#@-*/
 
-    /**
-     * @var \Magento\Setup\Validator\DbValidator
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $dbValidator;
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
     /**
      * @var \Magento\Setup\Model\PhpReadinessCheck
-     * @since 2.0.0
      */
     private $phpReadinessCheck;
 
@@ -81,7 +74,6 @@ class ReadinessCheck
      * @param \Magento\Setup\Model\PhpReadinessCheck $phpReadinessCheck
      * @param BasePackageInfo $basePackageInfo
      * @param Status $status
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Validator\DbValidator $dbValidator,
@@ -103,7 +95,6 @@ public function __construct(
      * Run the readiness check
      *
      * @return bool
-     * @since 2.0.0
      */
     public function runReadinessCheck()
     {
diff --git a/setup/src/Magento/Setup/Model/Cron/Status.php b/setup/src/Magento/Setup/Model/Cron/Status.php
index b2258a7039bb2..410e94198224d 100644
--- a/setup/src/Magento/Setup/Model/Cron/Status.php
+++ b/setup/src/Magento/Setup/Model/Cron/Status.php
@@ -17,7 +17,6 @@
  * Current status can be seen on the update app web page.
  *
  * @SuppressWarnings(PHPMD.NPathComplexity)
- * @since 2.0.0
  */
 class Status
 {
@@ -25,7 +24,6 @@ class Status
      * Path to a file, which content is displayed on the update web page.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $statusFilePath;
 
@@ -35,7 +33,6 @@ class Status
      * Note that it can be cleared only manually, it is not cleared by clear() method.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $logFilePath;
 
@@ -43,7 +40,6 @@ class Status
      * Path to a flag, which exists when update app is running.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $updateInProgressFlagFilePath;
 
@@ -51,13 +47,11 @@ class Status
      * Path to a flag, which exists when error occurred during update app execution.
      *
      * @var string
-     * @since 2.0.0
      */
     protected $updateErrorFlagFilePath;
 
     /**
      * @var Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $varReaderWriter;
 
@@ -76,7 +70,6 @@ class Status
      * @param string $logFilePath
      * @param string $updateInProgressFlagFilePath
      * @param string $updateErrorFlagFilePath
-     * @since 2.0.0
      */
     public function __construct(
         Filesystem $filesystem,
@@ -102,7 +95,6 @@ public function __construct(
      * Get status file path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getStatusFilePath()
     {
@@ -113,7 +105,6 @@ public function getStatusFilePath()
      * Get log file path
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLogFilePath()
     {
@@ -131,7 +122,6 @@ public function getLogFilePath()
      *
      * @return $this
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function add($text, $severity = \Psr\Log\LogLevel::INFO, $writeToStatusFile = true)
     {
@@ -151,7 +141,6 @@ public function add($text, $severity = \Psr\Log\LogLevel::INFO, $writeToStatusFi
      * @param string $filePath
      * @return $this
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function writeMessageToFile($text, $filePath)
     {
@@ -174,7 +163,6 @@ protected function writeMessageToFile($text, $filePath)
      * Check if update application is running.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUpdateInProgress()
     {
@@ -186,7 +174,6 @@ public function isUpdateInProgress()
      *
      * @param bool $isInProgress
      * @return $this
-     * @since 2.0.0
      */
     public function toggleUpdateInProgress($isInProgress = true)
     {
@@ -197,7 +184,6 @@ public function toggleUpdateInProgress($isInProgress = true)
      * Check if error has occurred during update application execution.
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isUpdateError()
     {
@@ -209,7 +195,6 @@ public function isUpdateError()
      *
      * @param bool $isErrorOccurred
      * @return $this
-     * @since 2.0.0
      */
     public function toggleUpdateError($isErrorOccurred = true)
     {
@@ -222,7 +207,6 @@ public function toggleUpdateError($isErrorOccurred = true)
      * @param string $pathToFlagFile
      * @param bool $value
      * @return $this
-     * @since 2.0.0
      */
     protected function setFlagValue($pathToFlagFile, $value)
     {
diff --git a/setup/src/Magento/Setup/Model/CronScriptReadinessCheck.php b/setup/src/Magento/Setup/Model/CronScriptReadinessCheck.php
index 8eb0430d14597..a2b292a7127fe 100644
--- a/setup/src/Magento/Setup/Model/CronScriptReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/CronScriptReadinessCheck.php
@@ -15,7 +15,6 @@
  * This includes verifying file permission in Updater Cron and db privileges in Setup Cron.
  * It also verifies Cron time interval configuration.
  * This class only verifies the status files created by both Cron jobs. No actual checking logic is done in this class.
- * @since 2.0.0
  */
 class CronScriptReadinessCheck
 {
@@ -47,7 +46,6 @@ class CronScriptReadinessCheck
 
     /**
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -55,7 +53,6 @@ class CronScriptReadinessCheck
      * Constructor
      *
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -66,7 +63,6 @@ public function __construct(Filesystem $filesystem)
      * Check Setup Cron job status file
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkSetup()
     {
@@ -77,7 +73,6 @@ public function checkSetup()
      * Check Updater Cron job status file
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkUpdater()
     {
@@ -89,7 +84,6 @@ public function checkUpdater()
      *
      * @param string $type
      * @return array
-     * @since 2.0.0
      */
     private function checkJson($type)
     {
@@ -141,7 +135,6 @@ private function checkJson($type)
      *
      * @param array $jsonData
      * @return array
-     * @since 2.0.0
      */
     private function checkCronTime(array $jsonData)
     {
diff --git a/setup/src/Magento/Setup/Model/DateTime/DateTimeProvider.php b/setup/src/Magento/Setup/Model/DateTime/DateTimeProvider.php
index c18f74a78e808..0f162533fa210 100644
--- a/setup/src/Magento/Setup/Model/DateTime/DateTimeProvider.php
+++ b/setup/src/Magento/Setup/Model/DateTime/DateTimeProvider.php
@@ -9,7 +9,7 @@
 
 /**
  * Provider of DateTime instance
- * @since 2.1.0
+ * @since 2.0.6
  */
 class DateTimeProvider
 {
@@ -17,7 +17,7 @@ class DateTimeProvider
      * Timezone provider
      *
      * @var TimeZoneProvider
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $tzProvider;
 
@@ -25,7 +25,7 @@ class DateTimeProvider
      * Object Manager provider
      *
      * @var ObjectManagerProvider
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $objectManagerProvider;
 
@@ -33,7 +33,7 @@ class DateTimeProvider
      * DateTime instance
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private $dateTime;
 
@@ -42,7 +42,7 @@ class DateTimeProvider
      *
      * @param TimeZoneProvider $tzProvider
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function __construct(TimeZoneProvider $tzProvider, ObjectManagerProvider $objectManagerProvider)
     {
@@ -54,7 +54,7 @@ public function __construct(TimeZoneProvider $tzProvider, ObjectManagerProvider
      * Get instance of DateTime
      *
      * @return \Magento\Framework\Stdlib\DateTime\DateTime
-     * @since 2.1.0
+     * @since 2.0.6
      */
     public function get()
     {
diff --git a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
index c0dc4edf7d853..4adb3a6a49b0d 100644
--- a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
@@ -14,37 +14,31 @@
 
 /**
  * This class checks for dependencies between components after an upgrade. It is used in readiness check.
- * @since 2.0.0
  */
 class DependencyReadinessCheck
 {
     /**
      * @var ComposerJsonFinder
-     * @since 2.0.0
      */
     private $composerJsonFinder;
 
     /**
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
     /**
      * @var RequireUpdateDryRunCommand
-     * @since 2.0.0
      */
     private $requireUpdateDryRunCommand;
 
     /**
      * @var File
-     * @since 2.0.0
      */
     private $file;
 
     /**
      * @var MagentoComposerApplication
-     * @since 2.0.0
      */
     private $magentoComposerApplication;
 
@@ -55,7 +49,6 @@ class DependencyReadinessCheck
      * @param DirectoryList $directoryList
      * @param File $file
      * @param MagentoComposerApplicationFactory $composerAppFactory
-     * @since 2.0.0
      */
     public function __construct(
         ComposerJsonFinder $composerJsonFinder,
@@ -76,7 +69,6 @@ public function __construct(
      * @param array $packages
      * @return array
      * @throws \Exception
-     * @since 2.0.0
      */
     public function runReadinessCheck(array $packages)
     {
diff --git a/setup/src/Magento/Setup/Model/Generator.php b/setup/src/Magento/Setup/Model/Generator.php
index ae43d87c65fc7..472685e346512 100644
--- a/setup/src/Magento/Setup/Model/Generator.php
+++ b/setup/src/Magento/Setup/Model/Generator.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Setup\Model\Generator
  *
- * @since 2.0.0
  */
 class Generator extends AbstractSource
 {
@@ -22,7 +21,6 @@ class Generator extends AbstractSource
      * Data row pattern
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_pattern = [];
 
@@ -30,13 +28,11 @@ class Generator extends AbstractSource
      * Which columns are determined as dynamic
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_dynamicColumns = [];
 
     /**
      * @var int
-     * @since 2.0.0
      */
     protected $_limit = 0;
 
@@ -45,7 +41,6 @@ class Generator extends AbstractSource
      *
      * @param array $rowPattern
      * @param int $limit how many records to generate
-     * @since 2.0.0
      */
     public function __construct(array $rowPattern, $limit)
     {
@@ -63,7 +58,6 @@ public function __construct(array $rowPattern, $limit)
      * Whether limit of generated elements is reached (according to "Iterator" interface)
      *
      * @return bool
-     * @since 2.0.0
      */
     public function valid()
     {
@@ -76,7 +70,6 @@ public function valid()
      * Return array or false on error
      *
      * @return array|false
-     * @since 2.0.0
      */
     protected function _getNextRow()
     {
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 4662a8f073571..be73862232b7b 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -46,7 +46,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @since 2.0.0
  */
 class Installer
 {
@@ -84,7 +83,6 @@ class Installer
      * File permissions checker
      *
      * @var FilePermissions
-     * @since 2.0.0
      */
     private $filePermissions;
 
@@ -92,7 +90,6 @@ class Installer
      * Deployment configuration repository
      *
      * @var Writer
-     * @since 2.0.0
      */
     private $deploymentConfigWriter;
 
@@ -100,7 +97,6 @@ class Installer
      * Deployment configuration reader
      *
      * @var Reader
-     * @since 2.0.0
      */
     private $deploymentConfigReader;
 
@@ -108,7 +104,6 @@ class Installer
      * Module list
      *
      * @var ModuleListInterface
-     * @since 2.0.0
      */
     private $moduleList;
 
@@ -116,7 +111,6 @@ class Installer
      * Module list loader
      *
      * @var ModuleLoader
-     * @since 2.0.0
      */
     private $moduleLoader;
 
@@ -124,7 +118,6 @@ class Installer
      * Admin account factory
      *
      * @var AdminAccountFactory
-     * @since 2.0.0
      */
     private $adminAccountFactory;
 
@@ -132,7 +125,6 @@ class Installer
      * Logger
      *
      * @var LoggerInterface
-     * @since 2.0.0
      */
     private $log;
 
@@ -140,7 +132,6 @@ class Installer
      * DB connection factory
      *
      * @var ConnectionFactory
-     * @since 2.0.0
      */
     private $connectionFactory;
 
@@ -148,7 +139,6 @@ class Installer
      * Progress indicator
      *
      * @var Installer\Progress
-     * @since 2.0.0
      */
     private $progress;
 
@@ -156,7 +146,6 @@ class Installer
      * Maintenance mode handler
      *
      * @var MaintenanceMode
-     * @since 2.0.0
      */
     private $maintenanceMode;
 
@@ -164,7 +153,6 @@ class Installer
      * Magento filesystem
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -172,43 +160,36 @@ class Installer
      * Installation information
      *
      * @var array
-     * @since 2.0.0
      */
     private $installInfo = [];
 
     /**
      * @var \Magento\Framework\App\DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
     /**
      * @var Context
-     * @since 2.0.0
      */
     private $context;
 
     /**
      * @var SetupConfigModel
-     * @since 2.0.0
      */
     private $setupConfigModel;
 
     /**
      * @var CleanupFiles
-     * @since 2.0.0
      */
     private $cleanupFiles;
 
     /**
      * @var DbValidator
-     * @since 2.0.0
      */
     private $dbValidator;
 
@@ -216,7 +197,6 @@ class Installer
      * Factory to create \Magento\Setup\Module\Setup
      *
      * @var SetupFactory
-     * @since 2.0.0
      */
     private $setupFactory;
 
@@ -224,13 +204,11 @@ class Installer
      * Factory to create \Magento\Setup\Module\DataSetup
      *
      * @var DataSetupFactory
-     * @since 2.0.0
      */
     private $dataSetupFactory;
 
     /**
      * @var \Magento\Framework\Setup\SampleData\State
-     * @since 2.0.0
      */
     protected $sampleDataState;
 
@@ -238,7 +216,6 @@ class Installer
      * Component Registrar
      *
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     private $componentRegistrar;
 
@@ -274,7 +251,6 @@ class Installer
      * @param PhpReadinessCheck $phpReadinessCheck
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @since 2.0.0
      */
     public function __construct(
         FilePermissions $filePermissions,
@@ -329,7 +305,6 @@ public function __construct(
      * @param \ArrayObject|array $request
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function install($request)
     {
@@ -388,7 +363,7 @@ public function install($request)
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function writeInstallationDate()
     {
@@ -405,7 +380,6 @@ private function writeInstallationDate()
      * @param bool $dryRun
      * @return array
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function createModulesConfig($request, $dryRun = false)
     {
@@ -443,7 +417,6 @@ private function createModulesConfig($request, $dryRun = false)
      * @param string $key
      * @return string[]
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function readListOfModules($all, $request, $key)
     {
@@ -467,7 +440,6 @@ private function readListOfModules($all, $request, $key)
      * Logs progress
      *
      * @return void
-     * @since 2.0.0
      */
     private function logProgress()
     {
@@ -485,7 +457,6 @@ private function logProgress()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function checkInstallationFilePermissions()
     {
@@ -517,7 +488,6 @@ public function checkExtensions()
      * Check permissions of directories that are expected to be non-writable for application
      *
      * @return void
-     * @since 2.0.0
      */
     public function checkApplicationFilePermissions()
     {
@@ -535,7 +505,6 @@ public function checkApplicationFilePermissions()
      *
      * @param \ArrayObject|array $data
      * @return void
-     * @since 2.0.0
      */
     public function installDeploymentConfig($data)
     {
@@ -556,7 +525,6 @@ public function installDeploymentConfig($data)
      *
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function setupModuleRegistry(SchemaSetupInterface $setup)
     {
@@ -595,7 +563,6 @@ private function setupModuleRegistry(SchemaSetupInterface $setup)
      *
      * @param SchemaSetupInterface $setup
      * @return void
-     * @since 2.0.0
      */
     private function setupCoreTables(SchemaSetupInterface $setup)
     {
@@ -618,7 +585,6 @@ private function setupCoreTables(SchemaSetupInterface $setup)
      * @param SchemaSetupInterface $setup
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return void
-     * @since 2.0.0
      */
     private function setupSessionTable(
         SchemaSetupInterface $setup,
@@ -658,7 +624,6 @@ private function setupSessionTable(
      * @param SchemaSetupInterface $setup
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return void
-     * @since 2.0.0
      */
     private function setupCacheTable(
         SchemaSetupInterface $setup,
@@ -713,7 +678,6 @@ private function setupCacheTable(
      * @param SchemaSetupInterface $setup
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return void
-     * @since 2.0.0
      */
     private function setupCacheTagTable(
         SchemaSetupInterface $setup,
@@ -750,7 +714,6 @@ private function setupCacheTagTable(
      * @param SchemaSetupInterface $setup
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return void
-     * @since 2.0.0
      */
     private function setupFlagTable(
         SchemaSetupInterface $setup,
@@ -803,7 +766,6 @@ private function setupFlagTable(
      * Installs DB schema
      *
      * @return void
-     * @since 2.0.0
      */
     public function installSchema()
     {
@@ -821,7 +783,6 @@ public function installSchema()
      *
      * @return void
      * @throws \Exception
-     * @since 2.0.0
      */
     public function installDataFixtures()
     {
@@ -873,7 +834,6 @@ private function throwExceptionForNotWritablePaths(array $paths)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 2.0.0
      */
     private function handleDBSchemaData($setup, $type)
     {
@@ -946,7 +906,7 @@ private function handleDBSchemaData($setup, $type)
     /**
      * @return void
      * @throws \Magento\Setup\Exception
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function assertDbConfigExists()
     {
@@ -963,7 +923,6 @@ private function assertDbConfigExists()
      *
      * @param \ArrayObject|array $data
      * @return void
-     * @since 2.0.0
      */
     public function installUserConfig($data)
     {
@@ -991,7 +950,6 @@ public function installUserConfig($data)
      * @param string $interfaceName
      * @return mixed|null
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     protected function createSchemaDataHandler($className, $interfaceName)
     {
@@ -1012,7 +970,6 @@ protected function createSchemaDataHandler($className, $interfaceName)
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
-     * @since 2.0.0
      */
     private function installOrderIncrementPrefix($orderIncrementPrefix)
     {
@@ -1055,7 +1012,6 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
      *
      * @param \ArrayObject|array $data
      * @return void
-     * @since 2.0.0
      */
     public function installAdminUser($data)
     {
@@ -1071,7 +1027,6 @@ public function installAdminUser($data)
      * @param bool $keepGeneratedFiles Cleanup generated classes and view files and reset ObjectManager
      * @return void
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     public function updateModulesSequence($keepGeneratedFiles = false)
     {
@@ -1094,7 +1049,6 @@ public function updateModulesSequence($keepGeneratedFiles = false)
      * Uninstall Magento application
      *
      * @return void
-     * @since 2.0.0
      */
     public function uninstall()
     {
@@ -1129,7 +1083,6 @@ public function uninstall()
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
-     * @since 2.0.0
      */
     private function enableCaches()
     {
@@ -1149,7 +1102,6 @@ private function enableCaches()
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
-     * @since 2.0.0
      */
     private function cleanCaches()
     {
@@ -1167,7 +1119,6 @@ private function cleanCaches()
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
-     * @since 2.0.0
      */
     private function setMaintenanceMode($value)
     {
@@ -1178,7 +1129,6 @@ private function setMaintenanceMode($value)
      * Return messages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInstallInfo()
     {
@@ -1189,7 +1139,6 @@ public function getInstallInfo()
      * Deletes the database and creates it again
      *
      * @return void
-     * @since 2.0.0
      */
     public function cleanupDb()
     {
@@ -1217,7 +1166,6 @@ public function cleanupDb()
      * Removes deployment configuration
      *
      * @return void
-     * @since 2.0.0
      */
     private function deleteDeploymentConfig()
     {
@@ -1242,7 +1190,6 @@ private function deleteDeploymentConfig()
      * Validates that MySQL is accessible and MySQL version is supported
      *
      * @return void
-     * @since 2.0.0
      */
     private function assertDbAccessible()
     {
@@ -1280,7 +1227,6 @@ private function assertDbAccessible()
      * @param string $type
      * @return InstallSchemaInterface | UpgradeSchemaInterface | InstallDataInterface | UpgradeDataInterface | null
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     private function getSchemaDataHandler($moduleName, $type)
     {
@@ -1324,7 +1270,6 @@ private function getSchemaDataHandler($moduleName, $type)
      * @param string $type
      * @return ModuleContext[]
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     private function generateListOfModuleContext($resource, $type)
     {
diff --git a/setup/src/Magento/Setup/Model/Installer/Progress.php b/setup/src/Magento/Setup/Model/Installer/Progress.php
index 02177da3d5d01..b6a2e026cde3b 100644
--- a/setup/src/Magento/Setup/Model/Installer/Progress.php
+++ b/setup/src/Magento/Setup/Model/Installer/Progress.php
@@ -8,7 +8,6 @@
 
 /**
  * Installation progress model
- * @since 2.0.0
  */
 class Progress
 {
@@ -16,7 +15,6 @@ class Progress
      * Total number of steps
      *
      * @var int
-     * @since 2.0.0
      */
     private $total;
 
@@ -24,7 +22,6 @@ class Progress
      * Current step
      *
      * @var int
-     * @since 2.0.0
      */
     private $current;
 
@@ -33,7 +30,6 @@ class Progress
      *
      * @param int $total
      * @param int $current
-     * @since 2.0.0
      */
     public function __construct($total, $current = 0)
     {
@@ -46,7 +42,6 @@ public function __construct($total, $current = 0)
      * Increments current counter
      *
      * @return void
-     * @since 2.0.0
      */
     public function setNext()
     {
@@ -58,7 +53,6 @@ public function setNext()
      * Sets current counter to the end
      *
      * @return void
-     * @since 2.0.0
      */
     public function finish()
     {
@@ -69,7 +63,6 @@ public function finish()
      * Gets the current counter
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCurrent()
     {
@@ -80,7 +73,6 @@ public function getCurrent()
      * Gets the total number
      *
      * @return int
-     * @since 2.0.0
      */
     public function getTotal()
     {
@@ -91,7 +83,6 @@ public function getTotal()
      * Gets ratio of current to total
      *
      * @return float
-     * @since 2.0.0
      */
     public function getRatio()
     {
@@ -105,7 +96,6 @@ public function getRatio()
      * @param int $current
      * @return void
      * @throws \LogicException
-     * @since 2.0.0
      */
     private function validate($total, $current)
     {
diff --git a/setup/src/Magento/Setup/Model/Installer/ProgressFactory.php b/setup/src/Magento/Setup/Model/Installer/ProgressFactory.php
index 1a82343374472..f7cfad8b4bd53 100644
--- a/setup/src/Magento/Setup/Model/Installer/ProgressFactory.php
+++ b/setup/src/Magento/Setup/Model/Installer/ProgressFactory.php
@@ -11,7 +11,6 @@
 
 /**
  * Factory for progress indicator model
- * @since 2.0.0
  */
 class ProgressFactory
 {
@@ -20,7 +19,6 @@ class ProgressFactory
      *
      * @param WebLogger $logger
      * @return Progress
-     * @since 2.0.0
      */
     public function createFromLog(WebLogger $logger)
     {
diff --git a/setup/src/Magento/Setup/Model/InstallerFactory.php b/setup/src/Magento/Setup/Model/InstallerFactory.php
index 187082c00d09e..c8d8017386b9a 100644
--- a/setup/src/Magento/Setup/Model/InstallerFactory.php
+++ b/setup/src/Magento/Setup/Model/InstallerFactory.php
@@ -14,7 +14,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InstallerFactory
 {
@@ -22,13 +21,11 @@ class InstallerFactory
      * Zend Framework's service locator
      *
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     protected $serviceLocator;
 
     /**
      * @var ResourceFactory
-     * @since 2.0.0
      */
     private $resourceFactory;
 
@@ -37,7 +34,6 @@ class InstallerFactory
      *
      * @param ServiceLocatorInterface $serviceLocator
      * @param ResourceFactory $resourceFactory
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory)
     {
@@ -53,7 +49,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFac
      *
      * @param LoggerInterface $log
      * @return Installer
-     * @since 2.0.0
      */
     public function create(LoggerInterface $log)
     {
@@ -90,7 +85,6 @@ public function create(LoggerInterface $log)
      * creates Resource Factory
      *
      * @return Resource
-     * @since 2.0.0
      */
     private function getResource()
     {
diff --git a/setup/src/Magento/Setup/Model/License.php b/setup/src/Magento/Setup/Model/License.php
index a2d16cb4cc1a2..a133c6577b433 100644
--- a/setup/src/Magento/Setup/Model/License.php
+++ b/setup/src/Magento/Setup/Model/License.php
@@ -13,7 +13,6 @@
  * License file reader
  *
  * @package Magento\Setup\Model
- * @since 2.0.0
  */
 class License
 {
@@ -35,7 +34,6 @@ class License
      * Directory that contains license file
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     * @since 2.0.0
      */
     private $dir;
 
@@ -43,7 +41,6 @@ class License
      * Constructor
      *
      * @param Filesystem $filesystem
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem)
     {
@@ -54,7 +51,6 @@ public function __construct(Filesystem $filesystem)
      * Returns contents of License file.
      *
      * @return string|boolean
-     * @since 2.0.0
      */
     public function getContents()
     {
diff --git a/setup/src/Magento/Setup/Model/ModuleContext.php b/setup/src/Magento/Setup/Model/ModuleContext.php
index 6dee82742e12c..e17c3216e5ff8 100644
--- a/setup/src/Magento/Setup/Model/ModuleContext.php
+++ b/setup/src/Magento/Setup/Model/ModuleContext.php
@@ -11,7 +11,6 @@
  * Context of a module being installed/updated: version, user data, etc.
  *
  * @api
- * @since 2.0.0
  */
 class ModuleContext implements ModuleContextInterface
 {
@@ -19,7 +18,6 @@ class ModuleContext implements ModuleContextInterface
      * Current version of a module
      *
      * @var string
-     * @since 2.0.0
      */
     private $version;
 
@@ -27,7 +25,6 @@ class ModuleContext implements ModuleContextInterface
      * Init
      *
      * @param string $version Current version of a module
-     * @since 2.0.0
      */
     public function __construct($version)
     {
@@ -36,7 +33,6 @@ public function __construct($version)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getVersion()
     {
diff --git a/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php b/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
index ddb0aad53ae09..bb01ce3cac1ee 100644
--- a/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
+++ b/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
@@ -12,31 +12,26 @@
 
 /**
  * Used to uninstall registry from the database and deployment config
- * @since 2.0.0
  */
 class ModuleRegistryUninstaller
 {
     /**
      * @var DataSetupFactory
-     * @since 2.0.0
      */
     private $dataSetupFactory;
 
     /**
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     private $deploymentConfig;
 
     /**
      * @var DeploymentConfig\Writer
-     * @since 2.0.0
      */
     private $writer;
 
     /**
      * @var Loader
-     * @since 2.0.0
      */
     private $loader;
 
@@ -47,7 +42,6 @@ class ModuleRegistryUninstaller
      * @param DeploymentConfig $deploymentConfig
      * @param DeploymentConfig\Writer $writer
      * @param Loader $loader
-     * @since 2.0.0
      */
     public function __construct(
         DataSetupFactory $dataSetupFactory,
@@ -67,7 +61,6 @@ public function __construct(
      * @param OutputInterface $output
      * @param string[] $modules
      * @return void
-     * @since 2.0.0
      */
     public function removeModulesFromDb(OutputInterface $output, array $modules)
     {
@@ -87,7 +80,6 @@ public function removeModulesFromDb(OutputInterface $output, array $modules)
      * @param OutputInterface $output
      * @param string[] $modules
      * @return void
-     * @since 2.0.0
      */
     public function removeModulesFromDeploymentConfig(OutputInterface $output, array $modules)
     {
diff --git a/setup/src/Magento/Setup/Model/ModuleStatus.php b/setup/src/Magento/Setup/Model/ModuleStatus.php
index c0601cff4563e..719a4f98ba316 100644
--- a/setup/src/Magento/Setup/Model/ModuleStatus.php
+++ b/setup/src/Magento/Setup/Model/ModuleStatus.php
@@ -14,7 +14,6 @@
 /**
  * Class \Magento\Setup\Model\ModuleStatus
  *
- * @since 2.0.0
  */
 class ModuleStatus
 {
@@ -22,7 +21,6 @@ class ModuleStatus
      * List of Modules
      *
      * @var array
-     * @since 2.0.0
      */
     protected $allModules;
 
@@ -30,7 +28,6 @@ class ModuleStatus
      * Deployment Config
      *
      * @var DeploymentConfig
-     * @since 2.0.0
      */
     protected $deploymentConfig;
 
@@ -38,7 +35,6 @@ class ModuleStatus
      * Dependency Checker
      *
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $dependencyChecker;
 
@@ -48,7 +44,6 @@ class ModuleStatus
      * @param ModuleLoader $moduleLoader
      * @param DeploymentConfig $deploymentConfig
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(
         ModuleLoader $moduleLoader,
@@ -70,7 +65,6 @@ public function __construct(
      *
      * @param array $selectedModules
      * @return array
-     * @since 2.0.0
      */
     public function getAllModules(array $selectedModules = null)
     {
@@ -104,7 +98,6 @@ public function getAllModules(array $selectedModules = null)
      * Returns list of modules that can be disabled
      *
      * @return array
-     * @since 2.0.0
      */
     private function getListOfDisableModules()
     {
@@ -126,7 +119,6 @@ private function getListOfDisableModules()
      * Returns list of enabled modules
      *
      * @return array
-     * @since 2.0.0
      */
     private function getListOfEnabledModules()
     {
@@ -144,7 +136,6 @@ private function getListOfEnabledModules()
      * @param String $moduleName
      *
      * @return void
-     * @since 2.0.0
      */
     public function setIsEnabled($status, $moduleName)
     {
@@ -155,7 +146,6 @@ public function setIsEnabled($status, $moduleName)
      * Marks modules that are disabled in deploymentConfig as unselected.
      *
      * @return void
-     * @since 2.0.0
      */
     private function deselectDisabledModules()
     {
diff --git a/setup/src/Magento/Setup/Model/ModuleStatusFactory.php b/setup/src/Magento/Setup/Model/ModuleStatusFactory.php
index 26989f17b5994..b55f1b6340bcd 100644
--- a/setup/src/Magento/Setup/Model/ModuleStatusFactory.php
+++ b/setup/src/Magento/Setup/Model/ModuleStatusFactory.php
@@ -10,13 +10,11 @@
 
 /**
  * Class ModuleStatusFactory creates instance of Status
- * @since 2.0.0
  */
 class ModuleStatusFactory
 {
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -24,7 +22,6 @@ class ModuleStatusFactory
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -35,7 +32,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
      * Creates Status object
      *
      * @return Status
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/setup/src/Magento/Setup/Model/ModuleUninstaller.php b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
index cfa1baf9660f4..b7d26b09a3754 100644
--- a/setup/src/Magento/Setup/Model/ModuleUninstaller.php
+++ b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
@@ -9,31 +9,26 @@
 
 /**
  * Class to uninstall a module component
- * @since 2.0.0
  */
 class ModuleUninstaller
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @var \Magento\Framework\Composer\Remove
-     * @since 2.0.0
      */
     private $remove;
 
     /**
      * @var UninstallCollector
-     * @since 2.0.0
      */
     private $collector;
 
     /**
      * @var \Magento\Setup\Module\SetupFactory
-     * @since 2.0.0
      */
     private $setupFactory;
 
@@ -44,7 +39,6 @@ class ModuleUninstaller
      * @param \Magento\Framework\Composer\Remove $remove
      * @param UninstallCollector $collector
      * @param \Magento\Setup\Module\SetupFactory $setupFactory
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
@@ -64,7 +58,6 @@ public function __construct(
      * @param OutputInterface $output
      * @param array $modules
      * @return void
-     * @since 2.0.0
      */
     public function uninstallData(OutputInterface $output, array $modules)
     {
@@ -90,7 +83,6 @@ public function uninstallData(OutputInterface $output, array $modules)
      * @param OutputInterface $output
      * @param array $modules
      * @return void
-     * @since 2.0.0
      */
     public function uninstallCode(OutputInterface $output, array $modules)
     {
diff --git a/setup/src/Magento/Setup/Model/Navigation.php b/setup/src/Magento/Setup/Model/Navigation.php
index 46dc965627644..b24071b78e03d 100644
--- a/setup/src/Magento/Setup/Model/Navigation.php
+++ b/setup/src/Magento/Setup/Model/Navigation.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Setup\Model\Navigation
  *
- * @since 2.0.0
  */
 class Navigation
 {
@@ -23,28 +22,22 @@ class Navigation
     const NAV_UPDATER = 'navUpdater';
     /**#@- */
 
-    /**
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@- */
     private $navStates;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $navType;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $titles;
 
     /**
      * @param ServiceLocatorInterface $serviceLocator
      * @param DeploymentConfig $deploymentConfig
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator, DeploymentConfig $deploymentConfig)
     {
@@ -61,7 +54,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator, DeploymentC
 
     /**
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -70,7 +62,6 @@ public function getType()
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getData()
     {
@@ -83,7 +74,6 @@ public function getData()
      * Returns only items with 'nav' equal to TRUE
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMenuItems()
     {
@@ -101,7 +91,6 @@ function ($value) {
      * Returns only items with 'main' equal to TRUE
      *
      * @return array
-     * @since 2.0.0
      */
     public function getMainItems()
     {
@@ -118,7 +107,6 @@ function ($value) {
      * Returns titles of the navigation pages
      *
      * @return array
-     * @since 2.0.0
      */
     public function getTitles()
     {
diff --git a/setup/src/Magento/Setup/Model/ObjectManagerProvider.php b/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
index 2257aefc58ed7..74bfe3478565f 100644
--- a/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
+++ b/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
@@ -18,19 +18,16 @@
  * Links Zend Framework's service locator and Magento object manager.
  * Guaranties single object manager per application run.
  * Hides complexity of creating Magento object manager
- * @since 2.0.0
  */
 class ObjectManagerProvider
 {
     /**
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     private $serviceLocator;
 
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -43,7 +40,6 @@ class ObjectManagerProvider
     /**
      * @param ServiceLocatorInterface $serviceLocator
      * @param Bootstrap $bootstrap
-     * @since 2.0.0
      */
     public function __construct(
         ServiceLocatorInterface $serviceLocator,
@@ -58,7 +54,6 @@ public function __construct(
      *
      * @return ObjectManagerInterface
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     public function get()
     {
@@ -94,7 +89,6 @@ private function createCliCommands()
      * Causes object manager to be reinitialized the next time it is retrieved.
      *
      * @return void
-     * @since 2.0.0
      */
     public function reset()
     {
@@ -106,7 +100,6 @@ public function reset()
      *
      * @param ObjectManagerInterface $objectManager
      * @return void
-     * @since 2.0.0
      */
     public function setObjectManager(ObjectManagerInterface $objectManager)
     {
@@ -118,7 +111,6 @@ public function setObjectManager(ObjectManagerInterface $objectManager)
      *
      * @param array $initParams
      * @return \Magento\Framework\App\ObjectManagerFactory
-     * @since 2.0.0
      */
     public function getObjectManagerFactory($initParams = [])
     {
diff --git a/setup/src/Magento/Setup/Model/PhpInformation.php b/setup/src/Magento/Setup/Model/PhpInformation.php
index 0f62c30cdd91f..8e4f849abbac9 100644
--- a/setup/src/Magento/Setup/Model/PhpInformation.php
+++ b/setup/src/Magento/Setup/Model/PhpInformation.php
@@ -10,7 +10,6 @@
  * Class PhpInformation
  *
  * Provides information and checks about the current and required PHP settings.
- * @since 2.0.0
  */
 class PhpInformation
 {
@@ -24,14 +23,12 @@ class PhpInformation
      * List of currently installed extensions
      *
      * @var array
-     * @since 2.0.0
      */
     protected $current = [];
 
     /**
      * Returns minimum required XDebug nested level
      * @return int
-     * @since 2.0.0
      */
     public function getRequiredMinimumXDebugNestedLevel()
     {
@@ -42,7 +39,6 @@ public function getRequiredMinimumXDebugNestedLevel()
      * Retrieve list of currently installed extensions
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCurrent()
     {
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
index a3191a1384ca2..2ab3294a5f87d 100644
--- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
@@ -12,25 +12,21 @@
 
 /**
  * Checks for PHP readiness. It is used by both Cron and Setup wizard.
- * @since 2.0.0
  */
 class PhpReadinessCheck
 {
     /**
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composerInformation;
 
     /**
      * @var PhpInformation
-     * @since 2.0.0
      */
     private $phpInformation;
 
     /**
      * @var VersionParser
-     * @since 2.0.0
      */
     private $versionParser;
 
@@ -49,7 +45,6 @@ class PhpReadinessCheck
      * @param PhpInformation $phpInformation
      * @param VersionParser $versionParser
      * @param DataSize $dataSize
-     * @since 2.0.0
      */
     public function __construct(
         ComposerInformation $composerInformation,
@@ -67,7 +62,6 @@ public function __construct(
      * Checks PHP version
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkPhpVersion()
     {
@@ -102,7 +96,6 @@ public function checkPhpVersion()
      * Checks PHP settings
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkPhpSettings()
     {
@@ -157,7 +150,6 @@ public function checkPhpCronSettings()
      * Checks PHP extensions
      *
      * @return array
-     * @since 2.0.0
      */
     public function checkPhpExtensions()
     {
@@ -247,7 +239,6 @@ public function checkMemoryLimit()
     /**
      * Checks if xdebug.max_nesting_level is set 200 or more
      * @return array
-     * @since 2.0.0
      */
     private function checkXDebugNestedLevel()
     {
@@ -288,7 +279,6 @@ private function checkXDebugNestedLevel()
      * is set to a value other than -1.
      *
      * @return array
-     * @since 2.0.0
      */
     private function checkPopulateRawPostSetting()
     {
@@ -360,7 +350,6 @@ private function checkFunctionsExistence()
      *
      * @param string $version
      * @return string
-     * @since 2.0.0
      */
     private function getNormalizedCurrentPhpVersion($version)
     {
diff --git a/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php b/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
index fe882f4103753..45006ecd11409 100644
--- a/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
+++ b/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
@@ -17,7 +17,6 @@
  * Model Class to Install User Configuration Data
  *
  * @package Magento\Setup\Model
- * @since 2.0.0
  */
 class StoreConfigurationDataMapper
 {
@@ -36,12 +35,7 @@ class StoreConfigurationDataMapper
     const KEY_JS_LOGGING = 'js-logging';
     /**#@- */
 
-    /**
-     * Map of configuration paths to data keys
-     *
-     * @var array
-     * @since 2.0.0
-     */
+    /**#@- */
     private $pathDataMap = [
         Store::XML_PATH_USE_REWRITES => self::KEY_USE_SEF_URL,
         Store::XML_PATH_UNSECURE_BASE_URL => self::KEY_BASE_URL,
@@ -62,7 +56,6 @@ class StoreConfigurationDataMapper
      *
      * @param array $installParamData
      * @return array
-     * @since 2.0.0
      */
     public function getConfigData($installParamData)
     {
@@ -82,7 +75,6 @@ public function getConfigData($installParamData)
      * @param string $key
      * @param string $path
      * @return array
-     * @since 2.0.0
      */
     private function addParamToConfigData($configData, $installParamData, $key, $path)
     {
diff --git a/setup/src/Magento/Setup/Model/SystemPackage.php b/setup/src/Magento/Setup/Model/SystemPackage.php
index 010ffdc3cd74d..344905305d755 100755
--- a/setup/src/Magento/Setup/Model/SystemPackage.php
+++ b/setup/src/Magento/Setup/Model/SystemPackage.php
@@ -13,25 +13,21 @@
 
 /**
  * Class SystemPackage returns system package and available for update versions
- * @since 2.0.0
  */
 class SystemPackage
 {
     /**
      * @var InfoCommand
-     * @since 2.0.0
      */
     private $infoCommand;
 
     /**
      * @var MagentoComposerApplication
-     * @since 2.0.0
      */
     private $magentoComposerApplication;
 
     /**
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composerInfo;
 
@@ -44,7 +40,6 @@ class SystemPackage
      *
      * @param MagentoComposerApplicationFactory $composerAppFactory
      * @param ComposerInformation $composerInfo
-     * @since 2.0.0
      */
     public function __construct(
         MagentoComposerApplicationFactory $composerAppFactory,
@@ -60,7 +55,6 @@ public function __construct(
      *
      * @throws \RuntimeException
      * @return array
-     * @since 2.0.0
      */
     public function getPackageVersions()
     {
@@ -104,7 +98,6 @@ public function getPackageVersions()
      *
      * @param string $currentCE
      * @return array
-     * @since 2.0.0
      */
     public function getAllowedEnterpriseVersions($currentCE)
     {
@@ -134,7 +127,6 @@ public function getAllowedEnterpriseVersions($currentCE)
      *
      * @param array $systemPackageInfo
      * @return array
-     * @since 2.0.0
      */
     public function getSystemPackageVersions($systemPackageInfo)
     {
@@ -165,7 +157,6 @@ public function getSystemPackageVersions($systemPackageInfo)
      * @return array
      * @throws \Exception
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function getInstalledSystemPackages()
     {
@@ -198,7 +189,6 @@ public function getInstalledSystemPackages()
     /**
      * @param array $enterpriseVersions
      * @return array
-     * @since 2.0.0
      */
     public function sortVersions($enterpriseVersions)
     {
@@ -256,7 +246,6 @@ private function formatPackages($packages)
      * @param array $enterpriseVersions
      * @param string $maxVersion
      * @return array
-     * @since 2.0.0
      */
     public function filterEeVersions($currentCE, $enterpriseVersions, $maxVersion)
     {
diff --git a/setup/src/Magento/Setup/Model/ThemeDependencyCheckerFactory.php b/setup/src/Magento/Setup/Model/ThemeDependencyCheckerFactory.php
index 19d118f7462ee..37ee79a759831 100644
--- a/setup/src/Magento/Setup/Model/ThemeDependencyCheckerFactory.php
+++ b/setup/src/Magento/Setup/Model/ThemeDependencyCheckerFactory.php
@@ -10,13 +10,11 @@
 
 /**
  * Class ThemeDependencyCheckerFactory creates instance of ThemeDependencyChecker
- * @since 2.0.0
  */
 class ThemeDependencyCheckerFactory
 {
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -24,7 +22,6 @@ class ThemeDependencyCheckerFactory
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -35,7 +32,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
      * Creates ThemeDependencyChecker object
      *
      * @return ThemeDependencyChecker
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/setup/src/Magento/Setup/Model/UninstallCollector.php b/setup/src/Magento/Setup/Model/UninstallCollector.php
index 08df07ad5d835..2e22913975fef 100644
--- a/setup/src/Magento/Setup/Model/UninstallCollector.php
+++ b/setup/src/Magento/Setup/Model/UninstallCollector.php
@@ -12,7 +12,6 @@
 
 /**
  * Class for collecting all Uninstall interfaces in all modules
- * @since 2.0.0
  */
 class UninstallCollector
 {
@@ -20,7 +19,6 @@ class UninstallCollector
      * Object manager
      *
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -28,7 +26,6 @@ class UninstallCollector
      * DataSetup Factory
      *
      * @var DataSetupFactory
-     * @since 2.0.0
      */
     private $dataSetupFactory;
 
@@ -37,7 +34,6 @@ class UninstallCollector
      *
      * @param ObjectManagerProvider $objectManagerProvider
      * @param DataSetupFactory $dataSetupFactory
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
@@ -52,7 +48,6 @@ public function __construct(
      *
      * @param array $filterModules
      * @return UninstallInterface[]
-     * @since 2.0.0
      */
     public function collectUninstall($filterModules = [])
     {
diff --git a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
index 3360132af91ae..757ee99f7f1ba 100644
--- a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
+++ b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
@@ -12,19 +12,16 @@
 
 /**
  * Class checks components dependencies for uninstall flow
- * @since 2.0.0
  */
 class UninstallDependencyCheck
 {
     /**
      * @var ComposerInformation
-     * @since 2.0.0
      */
     private $composerInfo;
 
     /**
      * @var DependencyChecker
-     * @since 2.0.0
      */
     private $packageDependencyChecker;
 
@@ -32,7 +29,6 @@ class UninstallDependencyCheck
      * Theme Dependency Checker
      *
      * @var ThemeDependencyChecker
-     * @since 2.0.0
      */
     private $themeDependencyChecker;
 
@@ -42,7 +38,6 @@ class UninstallDependencyCheck
      * @param ComposerInformation $composerInfo
      * @param DependencyChecker $dependencyChecker
      * @param ThemeDependencyCheckerFactory $themeDependencyCheckerFactory
-     * @since 2.0.0
      */
     public function __construct(
         ComposerInformation $composerInfo,
@@ -60,7 +55,6 @@ public function __construct(
      * @param array $packages
      * @return array
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function runUninstallReadinessCheck(array $packages)
     {
diff --git a/setup/src/Magento/Setup/Model/Updater.php b/setup/src/Magento/Setup/Model/Updater.php
index 428b468651d21..d55d1eb77f457 100644
--- a/setup/src/Magento/Setup/Model/Updater.php
+++ b/setup/src/Magento/Setup/Model/Updater.php
@@ -11,7 +11,6 @@
 
 /**
  * Class Updater passes information to the updater application
- * @since 2.0.0
  */
 class Updater
 {
@@ -23,17 +22,13 @@ class Updater
     const TASK_TYPE_MAINTENANCE_MODE = 'maintenance_mode';
     /**#@-*/
 
-    /**
-     * @var Queue
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $queue;
 
     /**
      * Constructor
      *
      * @param Queue $queue
-     * @since 2.0.0
      */
     public function __construct(Queue $queue)
     {
@@ -47,7 +42,6 @@ public function __construct(Queue $queue)
      * @param string $type
      * @param array $additionalOptions
      * @return string
-     * @since 2.0.0
      */
     public function createUpdaterTask(array $packages, $type, array $additionalOptions = [])
     {
diff --git a/setup/src/Magento/Setup/Model/WebLogger.php b/setup/src/Magento/Setup/Model/WebLogger.php
index 0e130bcfb6735..93ac7fa1d5f66 100644
--- a/setup/src/Magento/Setup/Model/WebLogger.php
+++ b/setup/src/Magento/Setup/Model/WebLogger.php
@@ -14,7 +14,6 @@
  * Web UI Logger
  *
  * @package Magento\Setup\Model
- * @since 2.0.0
  */
 class WebLogger implements LoggerInterface
 {
@@ -22,7 +21,6 @@ class WebLogger implements LoggerInterface
      * Log File
      *
      * @var string
-     * @since 2.0.0
      */
     protected $logFile = 'install.log';
 
@@ -30,7 +28,6 @@ class WebLogger implements LoggerInterface
      * Currently open file resource
      *
      * @var Filesystem
-     * @since 2.0.0
      */
     protected $filesystem;
 
@@ -38,7 +35,6 @@ class WebLogger implements LoggerInterface
      * Currently open file resource
      *
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface
-     * @since 2.0.0
      */
     protected $directory;
 
@@ -46,7 +42,6 @@ class WebLogger implements LoggerInterface
      * Indicator of whether inline output is started
      *
      * @var bool
-     * @since 2.0.0
      */
     private $isInline = false;
 
@@ -54,7 +49,6 @@ class WebLogger implements LoggerInterface
      * Constructor
      * @param Filesystem $filesystem
      * @param string $logFile
-     * @since 2.0.0
      */
     public function __construct(Filesystem $filesystem, $logFile = null)
     {
@@ -66,7 +60,6 @@ public function __construct(Filesystem $filesystem, $logFile = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logSuccess($message)
     {
@@ -76,7 +69,6 @@ public function logSuccess($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logError(\Exception $e)
     {
@@ -86,7 +78,6 @@ public function logError(\Exception $e)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function log($message)
     {
@@ -96,7 +87,6 @@ public function log($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logInline($message)
     {
@@ -106,7 +96,6 @@ public function logInline($message)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function logMeta($message)
     {
@@ -119,7 +108,6 @@ public function logMeta($message)
      *
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     private function writeToFile($message)
     {
@@ -130,7 +118,6 @@ private function writeToFile($message)
      * Gets contents of the log
      *
      * @return array
-     * @since 2.0.0
      */
     public function get()
     {
@@ -142,7 +129,6 @@ public function get()
      * Clears contents of the log
      *
      * @return void
-     * @since 2.0.0
      */
     public function clear()
     {
@@ -155,7 +141,6 @@ public function clear()
      * Checks existence of install.log file
      *
      * @return bool
-     * @since 2.0.0
      */
     public function logfileExists()
     {
@@ -166,7 +151,6 @@ public function logfileExists()
      * Terminates line if the inline logging is started
      *
      * @return void
-     * @since 2.0.0
      */
     private function terminateLine()
     {
diff --git a/setup/src/Magento/Setup/Module.php b/setup/src/Magento/Setup/Module.php
index 36b49ca00e30d..08cd2cd4fa921 100644
--- a/setup/src/Magento/Setup/Module.php
+++ b/setup/src/Magento/Setup/Module.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Setup\Module
  *
- * @since 2.0.0
  */
 class Module implements
     BootstrapListenerInterface,
@@ -25,7 +24,6 @@ class Module implements
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function onBootstrap(EventInterface $e)
     {
@@ -68,7 +66,6 @@ public function onBootstrap(EventInterface $e)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConfig()
     {
diff --git a/setup/src/Magento/Setup/Module/ConnectionFactory.php b/setup/src/Magento/Setup/Module/ConnectionFactory.php
index 8c5ee66e49bf7..ccb1f819bb0a9 100644
--- a/setup/src/Magento/Setup/Module/ConnectionFactory.php
+++ b/setup/src/Magento/Setup/Module/ConnectionFactory.php
@@ -12,13 +12,11 @@
  * Connection adapter factory
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ConnectionFactory implements \Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface
 {
     /**
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     private $serviceLocator;
 
@@ -26,7 +24,6 @@ class ConnectionFactory implements \Magento\Framework\Model\ResourceModel\Type\D
      * Constructor
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator)
     {
@@ -35,7 +32,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function create(array $connectionConfig)
     {
diff --git a/setup/src/Magento/Setup/Module/DataSetup.php b/setup/src/Magento/Setup/Module/DataSetup.php
index ff2c1c24cb26a..e64a85037659a 100644
--- a/setup/src/Magento/Setup/Module/DataSetup.php
+++ b/setup/src/Magento/Setup/Module/DataSetup.php
@@ -13,7 +13,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSetupInterface
 {
@@ -21,7 +20,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      * Tables data cache
      *
      * @var SetupCache
-     * @since 2.0.0
      */
     private $setupCache;
 
@@ -29,7 +27,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      * Event manager
      *
      * @var \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     private $_eventManager;
 
@@ -37,7 +34,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      * Logger
      *
      * @var \Psr\Log\LoggerInterface
-     * @since 2.0.0
      */
     private $_logger;
 
@@ -45,7 +41,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      * Migration factory
      *
      * @var \Magento\Framework\Module\Setup\MigrationFactory
-     * @since 2.0.0
      */
     private $_migrationFactory;
 
@@ -53,7 +48,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      * Filesystem instance
      *
      * @var \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     private $filesystem;
 
@@ -62,7 +56,6 @@ class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSet
      *
      * @param \Magento\Framework\Module\Setup\Context $context
      * @param string $connectionName
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Module\Setup\Context $context,
@@ -78,7 +71,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getSetupCache()
     {
@@ -95,7 +87,6 @@ public function getSetupCache()
      * @param string|null $parentField
      * @param string|integer $parentId
      * @return mixed
-     * @since 2.0.0
      */
     public function getTableRow($table, $idField, $rowId, $field = null, $parentField = null, $parentId = 0)
     {
@@ -125,7 +116,6 @@ public function getTableRow($table, $idField, $rowId, $field = null, $parentFiel
      * @param null|string $parentField
      * @param int|string $parentId
      * @return $this
-     * @since 2.0.0
      */
     public function deleteTableRow($table, $idField, $rowId, $parentField = null, $parentId = 0)
     {
@@ -155,7 +145,6 @@ public function deleteTableRow($table, $idField, $rowId, $parentField = null, $p
      * @param string|integer $parentId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     public function updateTableRow($table, $idField, $rowId, $field, $value = null, $parentField = null, $parentId = 0)
     {
@@ -187,7 +176,6 @@ public function updateTableRow($table, $idField, $rowId, $field, $value = null,
      * Gets event manager
      *
      * @return \Magento\Framework\Event\ManagerInterface
-     * @since 2.0.0
      */
     public function getEventManager()
     {
@@ -198,7 +186,6 @@ public function getEventManager()
      * Gets filesystem
      *
      * @return \Magento\Framework\Filesystem
-     * @since 2.0.0
      */
     public function getFilesystem()
     {
@@ -210,7 +197,6 @@ public function getFilesystem()
      *
      * @param array $data
      * @return \Magento\Framework\Module\Setup\Migration
-     * @since 2.0.0
      */
     public function createMigrationSetup(array $data = [])
     {
diff --git a/setup/src/Magento/Setup/Module/DataSetupFactory.php b/setup/src/Magento/Setup/Module/DataSetupFactory.php
index e2dbba55d1e9d..b19defbf1bc8e 100644
--- a/setup/src/Magento/Setup/Module/DataSetupFactory.php
+++ b/setup/src/Magento/Setup/Module/DataSetupFactory.php
@@ -10,13 +10,11 @@
 /**
  * Factory class to create DataSetup
  * @api
- * @since 2.0.0
  */
 class DataSetupFactory
 {
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -24,7 +22,6 @@ class DataSetupFactory
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -35,7 +32,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
      * Creates DataSetup
      *
      * @return DataSetup
-     * @since 2.0.0
      */
     public function create()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Circular.php b/setup/src/Magento/Setup/Module/Dependency/Circular.php
index 349be7a73780c..8f5bd8716f650 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Circular.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Circular.php
@@ -9,7 +9,6 @@
 
 /**
  * Build circular dependencies by modules map
- * @since 2.0.0
  */
 class Circular
 {
@@ -17,7 +16,6 @@ class Circular
      * Map where the key is the vertex and the value are the adjacent vertices(dependencies) of this vertex
      *
      * @var array
-     * @since 2.0.0
      */
     protected $dependencies = [];
 
@@ -25,7 +23,6 @@ class Circular
      * Modules circular dependencies map
      *
      * @var array
-     * @since 2.0.0
      */
     protected $circularDependencies = [];
 
@@ -33,7 +30,6 @@ class Circular
      * Graph object
      *
      * @var \Magento\Framework\Data\Graph
-     * @since 2.0.0
      */
     protected $graph;
 
@@ -42,7 +38,6 @@ class Circular
      *
      * @param array $dependencies Key is the vertex and the value are the adjacent vertices(dependencies) of this vertex
      * @return array
-     * @since 2.0.0
      */
     public function buildCircularDependencies($dependencies)
     {
@@ -66,7 +61,6 @@ public function buildCircularDependencies($dependencies)
      *
      * @param array $dependencies
      * @return void
-     * @since 2.0.0
      */
     protected function init($dependencies)
     {
@@ -81,7 +75,6 @@ protected function init($dependencies)
      * @param string $vertex
      * @param array $path nesting path
      * @return void
-     * @since 2.0.0
      */
     protected function expandDependencies($vertex, $path = [])
     {
@@ -117,7 +110,6 @@ protected function expandDependencies($vertex, $path = [])
      *
      * @param array $modules
      * @return void
-     * @since 2.0.0
      */
     protected function buildCircular($modules)
     {
@@ -135,7 +127,6 @@ protected function buildCircular($modules)
      *
      * @param array $circularDependencies
      * @return array
-     * @since 2.0.0
      */
     protected function divideByModules($circularDependencies)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
index de3520f9e5bca..10b3b4f109346 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
@@ -9,7 +9,6 @@
 
 /**
  * Code parser
- * @since 2.0.0
  */
 class Code implements ParserInterface
 {
@@ -17,7 +16,6 @@ class Code implements ParserInterface
      * Declared namespaces
      *
      * @var array
-     * @since 2.0.0
      */
     protected $declaredNamespaces;
 
@@ -25,7 +23,6 @@ class Code implements ParserInterface
      * Template method. Main algorithm
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function parse(array $options)
     {
@@ -74,7 +71,6 @@ public function parse(array $options)
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -102,7 +98,6 @@ protected function checkOptions($options)
      *
      * @param string $file
      * @return string
-     * @since 2.0.0
      */
     protected function extractModuleName($file)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
index dbd0257086485..e3d4ebd3282c1 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
@@ -10,13 +10,11 @@
 
 /**
  * Composer Json parser
- * @since 2.0.0
  */
 class Json implements ParserInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function parse(array $options)
     {
@@ -39,7 +37,6 @@ public function parse(array $options)
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -58,7 +55,6 @@ protected function checkOptions($options)
      *
      * @param Package $package
      * @return string
-     * @since 2.0.0
      */
     protected function extractModuleName($package)
     {
@@ -70,7 +66,6 @@ protected function extractModuleName($package)
      *
      * @param Package $package
      * @return array
-     * @since 2.0.0
      */
     protected function extractDependencies($package)
     {
@@ -103,7 +98,6 @@ protected function extractDependencies($package)
      *
      * @param string $file
      * @return Package
-     * @since 2.0.0
      */
     protected function getModuleComposerPackage($file)
     {
@@ -115,7 +109,6 @@ protected function getModuleComposerPackage($file)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function prepareModuleName($name)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
index b851940b133cf..09836ead71c55 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
@@ -9,7 +9,6 @@
 
 /**
  * Config xml parser
- * @since 2.0.0
  */
 class Xml implements ParserInterface
 {
@@ -17,7 +16,6 @@ class Xml implements ParserInterface
      * Template method. Main algorithm
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function parse(array $options)
     {
@@ -37,7 +35,6 @@ public function parse(array $options)
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -56,7 +53,6 @@ protected function checkOptions($options)
      *
      * @param \SimpleXMLElement $config
      * @return string
-     * @since 2.0.0
      */
     protected function extractModuleName($config)
     {
@@ -68,7 +64,6 @@ protected function extractModuleName($config)
      *
      * @param string $file
      * @return \SimpleXMLElement
-     * @since 2.0.0
      */
     protected function getModuleConfig($file)
     {
@@ -80,7 +75,6 @@ protected function getModuleConfig($file)
      *
      * @param string $name
      * @return string
-     * @since 2.0.0
      */
     protected function prepareModuleName($name)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php b/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
index 5124ae6e2f456..cc21b6fd8ccf4 100644
--- a/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Parser Interface
- * @since 2.0.0
  */
 interface ParserInterface
 {
@@ -16,7 +15,6 @@ interface ParserInterface
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     public function parse(array $options);
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
index d3ef8dee919ad..def3898aea3b8 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
@@ -11,7 +11,6 @@
 
 /**
  *  Abstract report builder by config files
- * @since 2.0.0
  */
 abstract class AbstractBuilder implements BuilderInterface
 {
@@ -19,7 +18,6 @@ abstract class AbstractBuilder implements BuilderInterface
      * Dependencies parser
      *
      * @var \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     protected $dependenciesParser;
 
@@ -27,13 +25,11 @@ abstract class AbstractBuilder implements BuilderInterface
      * Report writer
      *
      * @var \Magento\Setup\Module\Dependency\Report\WriterInterface
-     * @since 2.0.0
      */
     protected $reportWriter;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options = [];
 
@@ -42,7 +38,6 @@ abstract class AbstractBuilder implements BuilderInterface
      *
      * @param ParserInterface $dependenciesParser
      * @param WriterInterface $reportWriter
-     * @since 2.0.0
      */
     public function __construct(ParserInterface $dependenciesParser, WriterInterface $reportWriter)
     {
@@ -54,7 +49,6 @@ public function __construct(ParserInterface $dependenciesParser, WriterInterface
      * Template method. Main algorithm
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function build(array $options)
     {
@@ -71,7 +65,6 @@ public function build(array $options)
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -89,7 +82,6 @@ protected function checkOptions($options)
      *
      * @param array $modulesData
      * @return \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface
-     * @since 2.0.0
      */
     abstract protected function buildData($modulesData);
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
index d23813442a275..55d68609f4fc0 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
@@ -7,7 +7,6 @@
 
 /**
  *  Builder Interface
- * @since 2.0.0
  */
 interface BuilderInterface
 {
@@ -16,7 +15,6 @@ interface BuilderInterface
      *
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     public function build(array $options);
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
index 0acc7922d29a9..80935ea0e760c 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
@@ -12,7 +12,6 @@
 
 /**
  *  Dependencies report builder
- * @since 2.0.0
  */
 class Builder extends AbstractBuilder
 {
@@ -20,7 +19,6 @@ class Builder extends AbstractBuilder
      * Circular dependencies builder
      *
      * @var \Magento\Setup\Module\Dependency\Circular
-     * @since 2.0.0
      */
     protected $circularBuilder;
 
@@ -30,7 +28,6 @@ class Builder extends AbstractBuilder
      * @param \Magento\Setup\Module\Dependency\ParserInterface $dependenciesParser
      * @param \Magento\Setup\Module\Dependency\Report\WriterInterface $reportWriter
      * @param \Magento\Setup\Module\Dependency\Circular $circularBuilder
-     * @since 2.0.0
      */
     public function __construct(
         ParserInterface $dependenciesParser,
@@ -47,7 +44,6 @@ public function __construct(
      *
      * @param array $modulesData
      * @return \Magento\Setup\Module\Dependency\Report\Circular\Data\Config
-     * @since 2.0.0
      */
     protected function buildData($modulesData)
     {
@@ -67,7 +63,6 @@ protected function buildData($modulesData)
      *
      * @param array $modulesData
      * @return array
-     * @since 2.0.0
      */
     protected function buildCircularDependencies($modulesData)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
index 1433dfac9d8d5..031846aac26dc 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
@@ -7,7 +7,6 @@
 
 /**
  * Chain
- * @since 2.0.0
  */
 class Chain
 {
@@ -15,7 +14,6 @@ class Chain
      * Chain construct
      *
      * @param array $modules
-     * @since 2.0.0
      */
     public function __construct($modules)
     {
@@ -26,7 +24,6 @@ public function __construct($modules)
      * Get modules
      *
      * @return array
-     * @since 2.0.0
      */
     public function getModules()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
index 377e9567bf749..f8fe9507c5b06 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
@@ -11,13 +11,11 @@
  * Config
  *
  * @method \Magento\Setup\Module\Dependency\Report\Circular\Data\Module[] getModules()
- * @since 2.0.0
  */
 class Config extends AbstractConfig
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDependenciesCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
index b76d102e24f1f..d8f7cb755240e 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
@@ -7,7 +7,6 @@
 
 /**
  * Module
- * @since 2.0.0
  */
 class Module
 {
@@ -15,7 +14,6 @@ class Module
      * Module name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -23,7 +21,6 @@ class Module
      * Circular dependencies chains
      *
      * @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[]
-     * @since 2.0.0
      */
     protected $chains;
 
@@ -32,7 +29,6 @@ class Module
      *
      * @param array $name
      * @param \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[] $chains
-     * @since 2.0.0
      */
     public function __construct($name, array $chains = [])
     {
@@ -44,7 +40,6 @@ public function __construct($name, array $chains = [])
      * Get name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -55,7 +50,6 @@ public function getName()
      * Get circular dependencies chains
      *
      * @return \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[]
-     * @since 2.0.0
      */
     public function getChains()
     {
@@ -66,7 +60,6 @@ public function getChains()
      * Get circular dependencies chains count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getChainsCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
index 7e377f80629dd..b23bc577b8372 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
@@ -9,7 +9,6 @@
 
 /**
  * Csv file writer for circular dependencies report
- * @since 2.0.0
  */
 class Writer extends AbstractWriter
 {
@@ -23,7 +22,6 @@ class Writer extends AbstractWriter
      *
      * @param \Magento\Setup\Module\Dependency\Report\Circular\Data\Config $config
      * @return array
-     * @since 2.0.0
      */
     protected function prepareData($config)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php b/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
index cae4932afbd18..700e6fdc80d06 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
@@ -9,7 +9,6 @@
 
 /**
  * Config
- * @since 2.0.0
  */
 abstract class AbstractConfig implements ConfigInterface
 {
@@ -17,7 +16,6 @@ abstract class AbstractConfig implements ConfigInterface
      * Modules
      *
      * @var array
-     * @since 2.0.0
      */
     private $modules;
 
@@ -25,7 +23,6 @@ abstract class AbstractConfig implements ConfigInterface
      * Config construct
      *
      * @param array $modules
-     * @since 2.0.0
      */
     public function __construct(array $modules = [])
     {
@@ -34,7 +31,6 @@ public function __construct(array $modules = [])
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getModules()
     {
@@ -43,7 +39,6 @@ public function getModules()
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     abstract public function getDependenciesCount();
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
index e230687154aef..e1ac923f41816 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Config
- * @since 2.0.0
  */
 interface ConfigInterface
 {
@@ -15,7 +14,6 @@ interface ConfigInterface
      * Get modules
      *
      * @return array
-     * @since 2.0.0
      */
     public function getModules();
 
@@ -23,7 +21,6 @@ public function getModules();
      * Get total dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDependenciesCount();
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
index abc8a9c990032..dd48d5dac01de 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
@@ -9,7 +9,6 @@
 
 /**
  *  Modules dependencies report builder
- * @since 2.0.0
  */
 class Builder extends AbstractBuilder
 {
@@ -18,7 +17,6 @@ class Builder extends AbstractBuilder
      *
      * @param array $modulesData
      * @return \Magento\Setup\Module\Dependency\Report\Dependency\Data\Config
-     * @since 2.0.0
      */
     protected function buildData($modulesData)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
index e7bc54ceaab65..d02e7804e1a39 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
@@ -11,13 +11,11 @@
  * Config
  *
  * @method \Magento\Setup\Module\Dependency\Report\Dependency\Data\Module[] getModules()
- * @since 2.0.0
  */
 class Config extends AbstractConfig
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDependenciesCount()
     {
@@ -28,7 +26,6 @@ public function getDependenciesCount()
      * Get hard dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getHardDependenciesCount()
     {
@@ -43,7 +40,6 @@ public function getHardDependenciesCount()
      * Get soft dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSoftDependenciesCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
index dab814774b1eb..9c3e97830d83f 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
@@ -7,7 +7,6 @@
 
 /**
  * Dependency
- * @since 2.0.0
  */
 class Dependency
 {
@@ -20,19 +19,13 @@ class Dependency
 
     /**#@-*/
 
-    /**
-     * Module we depend on
-     *
-     * @var string
-     * @since 2.0.0
-     */
+    /**#@-*/
     protected $module;
 
     /**
      * Dependency type
      *
      * @var string
-     * @since 2.0.0
      */
     protected $type;
 
@@ -41,7 +34,6 @@ class Dependency
      *
      * @param string $module
      * @param string $type One of self::TYPE_* constants
-     * @since 2.0.0
      */
     public function __construct($module, $type = self::TYPE_HARD)
     {
@@ -54,7 +46,6 @@ public function __construct($module, $type = self::TYPE_HARD)
      * Get module
      *
      * @return string
-     * @since 2.0.0
      */
     public function getModule()
     {
@@ -65,7 +56,6 @@ public function getModule()
      * Get type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -76,7 +66,6 @@ public function getType()
      * Check is hard dependency
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isHard()
     {
@@ -87,7 +76,6 @@ public function isHard()
      * Check is soft dependency
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSoft()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
index 90fbc4dfaf60d..775d76ea2001d 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
@@ -7,7 +7,6 @@
 
 /**
  * Module
- * @since 2.0.0
  */
 class Module
 {
@@ -15,7 +14,6 @@ class Module
      * Module name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -23,7 +21,6 @@ class Module
      * Module dependencies
      *
      * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[]
-     * @since 2.0.0
      */
     protected $dependencies;
 
@@ -32,7 +29,6 @@ class Module
      *
      * @param array $name
      * @param \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[] $dependencies
-     * @since 2.0.0
      */
     public function __construct($name, array $dependencies = [])
     {
@@ -44,7 +40,6 @@ public function __construct($name, array $dependencies = [])
      * Get name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -55,7 +50,6 @@ public function getName()
      * Get dependencies
      *
      * @return \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[]
-     * @since 2.0.0
      */
     public function getDependencies()
     {
@@ -66,7 +60,6 @@ public function getDependencies()
      * Get total dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDependenciesCount()
     {
@@ -77,7 +70,6 @@ public function getDependenciesCount()
      * Get hard dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getHardDependenciesCount()
     {
@@ -94,7 +86,6 @@ public function getHardDependenciesCount()
      * Get soft dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getSoftDependenciesCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
index dc7d62e5bdffb..e3b5bd9ad2131 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
@@ -9,7 +9,6 @@
 
 /**
  * Csv file writer for modules dependencies report
- * @since 2.0.0
  */
 class Writer extends AbstractWriter
 {
@@ -18,7 +17,6 @@ class Writer extends AbstractWriter
      *
      * @param \Magento\Setup\Module\Dependency\Report\Dependency\Data\Config $config
      * @return array
-     * @since 2.0.0
      */
     protected function prepareData($config)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
index a7039b27c4906..105ef091f7a31 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
@@ -11,7 +11,6 @@
 
 /**
  *  Framework dependencies report builder
- * @since 2.0.0
  */
 class Builder extends AbstractBuilder
 {
@@ -19,7 +18,6 @@ class Builder extends AbstractBuilder
      * Config parser
      *
      * @var \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     protected $configParser;
 
@@ -29,7 +27,6 @@ class Builder extends AbstractBuilder
      * @param ParserInterface $dependenciesParser
      * @param WriterInterface $reportWriter
      * @param ParserInterface $configParser
-     * @since 2.0.0
      */
     public function __construct(
         ParserInterface $dependenciesParser,
@@ -47,7 +44,6 @@ public function __construct(
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -63,7 +59,6 @@ protected function checkOptions($options)
      *
      * @param array $modulesData
      * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Config
-     * @since 2.0.0
      */
     protected function buildData($modulesData)
     {
@@ -86,7 +81,6 @@ protected function buildData($modulesData)
      * Get allowed modules
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getAllowedModules()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
index 086286199e741..7c0d38f3f94a6 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
@@ -11,13 +11,11 @@
  * Config
  *
  * @method \Magento\Setup\Module\Dependency\Report\Framework\Data\Module[] getModules()
- * @since 2.0.0
  */
 class Config extends AbstractConfig
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getDependenciesCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
index 6f9e1c3f85c4e..ec05137186fb3 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
@@ -7,7 +7,6 @@
 
 /**
  * Dependency
- * @since 2.0.0
  */
 class Dependency
 {
@@ -15,7 +14,6 @@ class Dependency
      * Lib we depend on
      *
      * @var string
-     * @since 2.0.0
      */
     protected $lib;
 
@@ -23,7 +21,6 @@ class Dependency
      * Dependencies count
      *
      * @var int
-     * @since 2.0.0
      */
     protected $count;
 
@@ -32,7 +29,6 @@ class Dependency
      *
      * @param string $lib
      * @param int $count
-     * @since 2.0.0
      */
     public function __construct($lib, $count)
     {
@@ -44,7 +40,6 @@ public function __construct($lib, $count)
      * Get lib
      *
      * @return string
-     * @since 2.0.0
      */
     public function getLib()
     {
@@ -55,7 +50,6 @@ public function getLib()
      * Get count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
index dad903fa2d02f..e9fd7cda0ef6f 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
@@ -7,7 +7,6 @@
 
 /**
  * Module
- * @since 2.0.0
  */
 class Module
 {
@@ -15,7 +14,6 @@ class Module
      * Module name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $name;
 
@@ -23,7 +21,6 @@ class Module
      * Module dependencies
      *
      * @var \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[]
-     * @since 2.0.0
      */
     protected $dependencies;
 
@@ -32,7 +29,6 @@ class Module
      *
      * @param array $name
      * @param \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[] $dependencies
-     * @since 2.0.0
      */
     public function __construct($name, array $dependencies = [])
     {
@@ -44,7 +40,6 @@ public function __construct($name, array $dependencies = [])
      * Get name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -55,7 +50,6 @@ public function getName()
      * Get dependencies
      *
      * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[]
-     * @since 2.0.0
      */
     public function getDependencies()
     {
@@ -66,7 +60,6 @@ public function getDependencies()
      * Get total dependencies count
      *
      * @return int
-     * @since 2.0.0
      */
     public function getDependenciesCount()
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
index e5a11255d7e2d..48abb2cf08627 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
@@ -9,7 +9,6 @@
 
 /**
  * Csv file writer for framework dependencies report
- * @since 2.0.0
  */
 class Writer extends AbstractWriter
 {
@@ -18,7 +17,6 @@ class Writer extends AbstractWriter
      *
      * @param \Magento\Setup\Module\Dependency\Report\Framework\Data\Config $config
      * @return array
-     * @since 2.0.0
      */
     protected function prepareData($config)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php b/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
index b1cb01a16e501..05d3327cb0320 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
@@ -10,7 +10,6 @@
 
 /**
  * Abstract csv file writer for reports
- * @since 2.0.0
  */
 abstract class AbstractWriter implements WriterInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractWriter implements WriterInterface
      * Csv write object
      *
      * @var \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     protected $writer;
 
@@ -26,7 +24,6 @@ abstract class AbstractWriter implements WriterInterface
      * Writer constructor
      *
      * @param \Magento\Framework\File\Csv $writer
-     * @since 2.0.0
      */
     public function __construct($writer)
     {
@@ -37,7 +34,6 @@ public function __construct($writer)
      * Template method. Main algorithm
      *
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function write(array $options, ConfigInterface $config)
     {
@@ -52,7 +48,6 @@ public function write(array $options, ConfigInterface $config)
      * @param array $options
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function checkOptions($options)
     {
@@ -66,7 +61,6 @@ protected function checkOptions($options)
      *
      * @param \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface $config
      * @return array
-     * @since 2.0.0
      */
     abstract protected function prepareData($config);
 
@@ -76,7 +70,6 @@ abstract protected function prepareData($config);
      * @param string $filename
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     protected function writeToFile($filename, $data)
     {
diff --git a/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
index f17ee0cd38273..61009952a446d 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
@@ -9,7 +9,6 @@
 
 /**
  *  Writer Interface
- * @since 2.0.0
  */
 interface WriterInterface
 {
@@ -19,7 +18,6 @@ interface WriterInterface
      * @param array $options
      * @param \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface $config
      * @return void
-     * @since 2.0.0
      */
     public function write(array $options, ConfigInterface $config);
 }
diff --git a/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
index d394679d528d1..27f0c7e8e616f 100644
--- a/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
+++ b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
@@ -16,7 +16,6 @@
  * Service Locator (instead DI container)
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ServiceLocator
 {
@@ -24,7 +23,6 @@ class ServiceLocator
      * Xml config dependencies parser
      *
      * @var \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static $xmlConfigParser;
 
@@ -32,7 +30,6 @@ class ServiceLocator
      * Composer Json parser
      *
      * @var \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static $composerJsonParser;
 
@@ -40,7 +37,6 @@ class ServiceLocator
      * Framework dependencies parser
      *
      * @var \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static $frameworkDependenciesParser;
 
@@ -48,7 +44,6 @@ class ServiceLocator
      * Modules dependencies report builder
      *
      * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     private static $dependenciesReportBuilder;
 
@@ -56,7 +51,6 @@ class ServiceLocator
      * Modules circular dependencies report builder
      *
      * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     private static $circularDependenciesReportBuilder;
 
@@ -64,7 +58,6 @@ class ServiceLocator
      * Framework dependencies report builder
      *
      * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     private static $frameworkDependenciesReportBuilder;
 
@@ -72,7 +65,6 @@ class ServiceLocator
      * Csv file writer
      *
      * @var \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     private static $csvWriter;
 
@@ -80,7 +72,6 @@ class ServiceLocator
      * Get modules dependencies report builder
      *
      * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     public static function getDependenciesReportBuilder()
     {
@@ -97,7 +88,6 @@ public static function getDependenciesReportBuilder()
      * Get modules circular dependencies report builder
      *
      * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     public static function getCircularDependenciesReportBuilder()
     {
@@ -115,7 +105,6 @@ public static function getCircularDependenciesReportBuilder()
      * Get framework dependencies report builder
      *
      * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
-     * @since 2.0.0
      */
     public static function getFrameworkDependenciesReportBuilder()
     {
@@ -133,7 +122,6 @@ public static function getFrameworkDependenciesReportBuilder()
      * Get modules dependencies parser
      *
      * @return \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static function getXmlConfigParser()
     {
@@ -147,7 +135,6 @@ private static function getXmlConfigParser()
      * Get modules dependencies from composer.json parser
      *
      * @return \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static function getComposerJsonParser()
     {
@@ -161,7 +148,6 @@ private static function getComposerJsonParser()
      * Get framework dependencies parser
      *
      * @return \Magento\Setup\Module\Dependency\ParserInterface
-     * @since 2.0.0
      */
     private static function getFrameworkDependenciesParser()
     {
@@ -175,7 +161,6 @@ private static function getFrameworkDependenciesParser()
      * Get csv file writer
      *
      * @return \Magento\Framework\File\Csv
-     * @since 2.0.0
      */
     private static function getCsvWriter()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Manager.php b/setup/src/Magento/Setup/Module/Di/App/Task/Manager.php
index 27f47915717d3..9ad397eeb47e6 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Manager.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Manager.php
@@ -8,25 +8,21 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Manager
  *
- * @since 2.0.0
  */
 class Manager
 {
     /**
      * @var OperationFactory
-     * @since 2.0.0
      */
     private $operationFactory;
 
     /**
      * @var OperationInterface[]
-     * @since 2.0.0
      */
     private $operationsList = [];
 
     /**
      * @param OperationFactory $operationFactory
-     * @since 2.0.0
      */
     public function __construct(
         OperationFactory $operationFactory
@@ -40,7 +36,6 @@ public function __construct(
      * @param string $operationCode
      * @param mixed $arguments
      * @return void
-     * @since 2.0.0
      */
     public function addOperation($operationCode, $arguments = null)
     {
@@ -53,7 +48,6 @@ public function addOperation($operationCode, $arguments = null)
      * @param callable $beforeCallback
      * @param callable $afterCallback
      * @return void
-     * @since 2.0.0
      */
     public function process(\Closure $beforeCallback = null, \Closure $afterCallback = null)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
index 952deef5229dd..3623ed04c7cd2 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
@@ -15,31 +15,26 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\ApplicationCodeGenerator
  *
- * @since 2.0.0
  */
 class ApplicationCodeGenerator implements OperationInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * @var ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
     /**
      * @var PhpScanner
-     * @since 2.0.0
      */
     private $phpScanner;
 
     /**
      * @var DirectoryScanner
-     * @since 2.0.0
      */
     private $directoryScanner;
 
@@ -48,7 +43,6 @@ class ApplicationCodeGenerator implements OperationInterface
      * @param PhpScanner $phpScanner
      * @param DirectoryScanner $directoryScanner
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ClassesScanner $classesScanner,
@@ -64,7 +58,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -96,7 +89,6 @@ class_exists($entityName);
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
index d1676a11f8acc..a4d4a687986c0 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
@@ -13,43 +13,36 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\Area
  *
- * @since 2.0.0
  */
 class Area implements OperationInterface
 {
     /**
      * @var App\AreaList
-     * @since 2.0.0
      */
     private $areaList;
 
     /**
      * @var \Magento\Setup\Module\Di\Code\Reader\Decorator\Area
-     * @since 2.0.0
      */
     private $areaInstancesNamesList;
 
     /**
      * @var Config\Reader
-     * @since 2.0.0
      */
     private $configReader;
 
     /**
      * @var Config\WriterInterface
-     * @since 2.0.0
      */
     private $configWriter;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * @var \Magento\Setup\Module\Di\Compiler\Config\ModificationChain
-     * @since 2.0.0
      */
     private $modificationChain;
 
@@ -60,7 +53,6 @@ class Area implements OperationInterface
      * @param Config\WriterInterface $configWriter
      * @param \Magento\Setup\Module\Di\Compiler\Config\ModificationChain $modificationChain
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         App\AreaList $areaList,
@@ -80,7 +72,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -115,7 +106,6 @@ public function doOperation()
      *
      * @param string $path
      * @return DefinitionsCollection
-     * @since 2.0.0
      */
     protected function getDefinitionsCollection($path)
     {
@@ -130,7 +120,6 @@ protected function getDefinitionsCollection($path)
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php
index 3f19333d6f985..8d37ce69aaabd 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php
@@ -15,37 +15,31 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\Interception
  *
- * @since 2.0.0
  */
 class Interception implements OperationInterface
 {
     /**
      * @var App\AreaList
-     * @since 2.0.0
      */
     private $areaList;
 
     /**
      * @var InterceptionConfigurationBuilder
-     * @since 2.0.0
      */
     private $interceptionConfigurationBuilder;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * @var ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
     /**
      * @var GeneratorFactory
-     * @since 2.0.0
      */
     private $generatorFactory;
 
@@ -55,7 +49,6 @@ class Interception implements OperationInterface
      * @param ClassesScanner $classesScanner
      * @param GeneratorFactory $generatorFactory
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         InterceptionConfigurationBuilder $interceptionConfigurationBuilder,
@@ -73,7 +66,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -116,7 +108,6 @@ public function doOperation()
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/InterceptionCache.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/InterceptionCache.php
index 046cc95bdffb6..902c30f6a47d7 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/InterceptionCache.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/InterceptionCache.php
@@ -10,25 +10,21 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\InterceptionCache
  *
- * @since 2.0.0
  */
 class InterceptionCache implements OperationInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * @var \Magento\Framework\Interception\Config\Config
-     * @since 2.0.0
      */
     private $configInterface;
 
     /**
      * @var \Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions
-     * @since 2.0.0
      */
     private $interceptionsInstancesNamesList;
 
@@ -36,7 +32,6 @@ class InterceptionCache implements OperationInterface
      * @param \Magento\Framework\Interception\Config\Config $configInterface
      * @param \Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions $interceptionsInstancesNamesList
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\Interception\Config\Config $configInterface,
@@ -52,7 +47,6 @@ public function __construct(
      * Flushes interception cached configuration and generates a new one
      *
      * @return void
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -77,7 +71,6 @@ public function doOperation()
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ProxyGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ProxyGenerator.php
index 64146f5a9ccab..c02d85bc47ba7 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ProxyGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ProxyGenerator.php
@@ -12,25 +12,22 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\ProxyGenerator
  *
- * @since 2.0.0
  */
 class ProxyGenerator implements OperationInterface
 {
     /**
      * @var Scanner\XmlScanner
-     * @since 2.0.0
      */
     private $proxyScanner;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var Scanner\ConfigurationScanner
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $configurationScanner;
 
@@ -38,7 +35,6 @@ class ProxyGenerator implements OperationInterface
      * @param Scanner\XmlScanner $proxyScanner
      * @param Scanner\ConfigurationScanner $configurationScanner
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Scanner\XmlScanner $proxyScanner,
@@ -54,7 +50,6 @@ public function __construct(
      * Processes operation task
      *
      * @return void
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -69,7 +64,6 @@ class_exists($entityName);
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/RepositoryGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/RepositoryGenerator.php
index d3093e8061ba9..02c676e1619a2 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/RepositoryGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/RepositoryGenerator.php
@@ -13,31 +13,27 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\Operation\RepositoryGenerator
  *
- * @since 2.0.0
  */
 class RepositoryGenerator implements OperationInterface
 {
     /**
      * @var Scanner\RepositoryScanner
-     * @since 2.0.0
      */
     private $repositoryScanner;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
     /**
      * @var Scanner\ConfigurationScanner
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $configurationScanner;
 
@@ -46,7 +42,6 @@ class RepositoryGenerator implements OperationInterface
      * @param Scanner\RepositoryScanner $repositoryScanner
      * @param Scanner\ConfigurationScanner $configurationScanner
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         ClassesScanner $classesScanner,
@@ -64,7 +59,6 @@ public function __construct(
      * Processes operation task
      *
      * @return void
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -83,7 +77,6 @@ class_exists($entityName);
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ServiceDataAttributesGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ServiceDataAttributesGenerator.php
index d9f9272139955..cdc94ac6e9242 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ServiceDataAttributesGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ServiceDataAttributesGenerator.php
@@ -13,25 +13,22 @@
  * Class ServiceDataAttributesGenerator
  *
  * Generates extension classes for data objects.
- * @since 2.0.0
  */
 class ServiceDataAttributesGenerator implements OperationInterface
 {
     /**
      * @var Scanner\ServiceDataAttributesScanner
-     * @since 2.0.0
      */
     private $serviceDataAttributesScanner;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $data;
 
     /**
      * @var Scanner\ConfigurationScanner
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $configurationScanner;
 
@@ -39,7 +36,6 @@ class ServiceDataAttributesGenerator implements OperationInterface
      * @param Scanner\ServiceDataAttributesScanner $serviceDataAttributesScanner
      * @param Scanner\ConfigurationScanner $configurationScanner
      * @param array $data
-     * @since 2.0.0
      */
     public function __construct(
         Scanner\ServiceDataAttributesScanner $serviceDataAttributesScanner,
@@ -55,7 +51,6 @@ public function __construct(
      * Processes operation task
      *
      * @return void
-     * @since 2.0.0
      */
     public function doOperation()
     {
@@ -70,7 +65,6 @@ class_exists($entityName);
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationException.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationException.php
index 751fa29b53616..de35de2f568d5 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationException.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationException.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\OperationException
  *
- * @since 2.0.0
  */
 class OperationException extends \Exception
 {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
index b6f4f7a158024..e86f041c2eb0b 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Setup\Module\Di\App\Task\OperationFactory
  *
- * @since 2.0.0
  */
 class OperationFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
@@ -57,7 +55,6 @@ class OperationFactory
      * Operations definitions
      *
      * @var array
-     * @since 2.0.0
      */
     private $operationsDefinitions = [
         self::DATA_ATTRIBUTES_GENERATOR =>
@@ -72,7 +69,6 @@ class OperationFactory
 
     /**
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(\Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider)
     {
@@ -86,7 +82,6 @@ public function __construct(\Magento\Setup\Model\ObjectManagerProvider $objectMa
      * @param mixed $arguments
      * @return OperationInterface
      * @throws OperationException
-     * @since 2.0.0
      */
     public function create($operationAlias, $arguments = null)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationInterface.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationInterface.php
index 9bfc3c6e69e77..93cb2ecbc610e 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Setup\Module\Di\App\Task\OperationInterface
  *
- * @since 2.0.0
  */
 interface OperationInterface
 {
@@ -16,7 +15,6 @@ interface OperationInterface
      * Processes operation task
      *
      * @return void
-     * @since 2.0.0
      */
     public function doOperation();
 
@@ -24,7 +22,6 @@ public function doOperation();
      * Returns operation name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName();
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator.php b/setup/src/Magento/Setup/Module/Di/Code/Generator.php
index 45c591d72a732..c83ccf1d05450 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Generator.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Generator.php
@@ -14,7 +14,6 @@
 /**
  * Class Generator
  * @package Magento\Setup\Module\Di\Code
- * @since 2.0.0
  */
 class Generator extends FrameworkGenerator
 {
@@ -22,7 +21,6 @@ class Generator extends FrameworkGenerator
      * List of class methods
      *
      * @var array
-     * @since 2.0.0
      */
     private $classMethods = [];
 
@@ -31,7 +29,6 @@ class Generator extends FrameworkGenerator
      * @param FrameworkGenerator\Io $ioObject
      * @param array $generatedEntities
      * @param DefinedClasses $definedClasses
-     * @since 2.0.0
      */
     public function __construct(
         ObjectManagerInterface $objectManagerInterface,
@@ -50,7 +47,6 @@ public function __construct(
      * @param string $entityName
      * @param string $className
      * @return \Magento\Framework\Code\Generator\EntityAbstract
-     * @since 2.0.0
      */
     protected function createGeneratorInstance($generatorClass, $entityName, $className)
     {
@@ -65,7 +61,6 @@ protected function createGeneratorInstance($generatorClass, $entityName, $classN
      * @param array $classesToGenerate
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     * @since 2.0.0
      */
     public function generateList($classesToGenerate)
     {
@@ -81,7 +76,6 @@ public function generateList($classesToGenerate)
      *
      * @param array $methods
      * @return void
-     * @since 2.0.0
      */
     private function setClassMethods($methods)
     {
@@ -91,7 +85,6 @@ private function setClassMethods($methods)
     /**
      * Clear class methods
      * @return void
-     * @since 2.0.0
      */
     private function clearClassMethods()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php b/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php
index 84264f7b5206c..17252fb1aa5e9 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php
@@ -17,7 +17,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Generator\InterceptionConfigurationBuilder
  *
- * @since 2.0.0
  */
 class InterceptionConfigurationBuilder
 {
@@ -25,37 +24,32 @@ class InterceptionConfigurationBuilder
      * Area code list: global, frontend, etc.
      *
      * @var array
-     * @since 2.0.0
      */
     private $areaCodesList = [];
 
     /**
      * @var InterceptionConfig
-     * @since 2.0.0
      */
     private $interceptionConfig;
 
     /**
      * @var PluginList
-     * @since 2.0.0
      */
     private $pluginList;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     private $typeReader;
 
     /**
      * @var Manager
-     * @since 2.0.0
      */
     private $cacheManager;
 
     /**
      * @var InterceptableValidator
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $interceptableValidator;
 
@@ -65,7 +59,6 @@ class InterceptionConfigurationBuilder
      * @param Type $typeReader
      * @param Manager $cacheManager
      * @param InterceptableValidator $interceptableValidator
-     * @since 2.0.0
      */
     public function __construct(
         InterceptionConfig $interceptionConfig,
@@ -86,7 +79,6 @@ public function __construct(
      *
      * @param string $areaCode
      * @return void
-     * @since 2.0.0
      */
     public function addAreaCode($areaCode)
     {
@@ -100,7 +92,6 @@ public function addAreaCode($areaCode)
      *
      * @param array $definedClasses
      * @return array
-     * @since 2.0.0
      */
     public function getInterceptionConfiguration($definedClasses)
     {
@@ -117,7 +108,6 @@ public function getInterceptionConfiguration($definedClasses)
      *
      * @param array $definedClasses
      * @return array
-     * @since 2.0.0
      */
     private function getInterceptedClasses($definedClasses)
     {
@@ -138,7 +128,6 @@ private function getInterceptedClasses($definedClasses)
      *
      * @param array $interceptedInstances
      * @return array
-     * @since 2.0.0
      */
     private function getPluginsList($interceptedInstances)
     {
@@ -164,7 +153,6 @@ private function getPluginsList($interceptedInstances)
      *
      * @param array $pluginInheritance
      * @return array
-     * @since 2.0.0
      */
     private function filterNullInheritance($pluginInheritance)
     {
@@ -192,7 +180,6 @@ private function filterNullInheritance($pluginInheritance)
      *
      * @param array $inheritedConfig
      * @return array
-     * @since 2.0.0
      */
     private function mergeAreaPlugins($inheritedConfig)
     {
@@ -212,7 +199,6 @@ private function mergeAreaPlugins($inheritedConfig)
      *
      * @param array $interceptionConfiguration
      * @return array
-     * @since 2.0.0
      */
     private function getInterceptedMethods($interceptionConfiguration)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator/Interceptor.php b/setup/src/Magento/Setup/Module/Di/Code/Generator/Interceptor.php
index 6299204c6acda..2cc94e88b0959 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Generator/Interceptor.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Generator/Interceptor.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Generator\Interceptor
  *
- * @since 2.0.0
  */
 class Interceptor extends FrameworkInterceptor
 {
@@ -20,7 +19,6 @@ class Interceptor extends FrameworkInterceptor
      * Intercepted methods list
      *
      * @var array
-     * @since 2.0.0
      */
     private $interceptedMethods = [];
 
@@ -30,7 +28,6 @@ class Interceptor extends FrameworkInterceptor
      * @param \ReflectionMethod $method
      *
      * @return bool
-     * @since 2.0.0
      */
     protected function isInterceptedMethod(\ReflectionMethod $method)
     {
@@ -43,7 +40,6 @@ protected function isInterceptedMethod(\ReflectionMethod $method)
      * @param array $interceptedMethods
      *
      * @return void
-     * @since 2.0.0
      */
     public function setInterceptedMethods($interceptedMethods)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator/PluginList.php b/setup/src/Magento/Setup/Module/Di/Code/Generator/PluginList.php
index 30c5aa8b1236c..e2d23eb25dd91 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Generator/PluginList.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Generator/PluginList.php
@@ -9,13 +9,11 @@
 
 /**
  * Provides plugin list configuration
- * @since 2.0.0
  */
 class PluginList extends Interception\PluginList\PluginList
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     private $interceptedClasses;
 
@@ -23,7 +21,6 @@ class PluginList extends Interception\PluginList\PluginList
      * Returns plugins config
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPluginsConfig()
     {
@@ -37,7 +34,6 @@ public function getPluginsConfig()
      *
      * @param array $areaCodes
      * @return void
-     * @since 2.0.0
      */
     public function setScopePriorityScheme($areaCodes)
     {
@@ -51,7 +47,6 @@ public function setScopePriorityScheme($areaCodes)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 2.0.0
      */
     protected function isCurrentScope($scopeCode)
     {
@@ -61,7 +56,6 @@ protected function isCurrentScope($scopeCode)
     /**
      * @param array $interceptedClasses
      * @return void
-     * @since 2.0.0
      */
     public function setInterceptedClasses($interceptedClasses)
     {
@@ -72,7 +66,6 @@ public function setInterceptedClasses($interceptedClasses)
      * Returns class definitions
      *
      * @return array
-     * @since 2.0.0
      */
     protected function getClassDefinitions()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/GeneratorFactory.php b/setup/src/Magento/Setup/Module/Di/Code/GeneratorFactory.php
index a07edc6dfbc19..19cafe2c35d42 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/GeneratorFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/GeneratorFactory.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\GeneratorFactory
  *
- * @since 2.0.0
  */
 class GeneratorFactory
 {
     /**
      * @var ObjectManagerInterface
-     * @since 2.0.0
      */
     private $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
@@ -34,7 +31,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      *
      * @param array $arguments
      * @return Generator
-     * @since 2.0.0
      */
     public function create($arguments = [])
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassReaderDecorator.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassReaderDecorator.php
index 5965be5497dbc..e3bcfa4c1b5c6 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassReaderDecorator.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassReaderDecorator.php
@@ -11,19 +11,16 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Reader\ClassReaderDecorator
  *
- * @since 2.0.0
  */
 class ClassReaderDecorator implements \Magento\Framework\Code\Reader\ClassReaderInterface
 {
     /**
      * @var \Magento\Framework\Code\Reader\ClassReader
-     * @since 2.0.0
      */
     private $classReader;
 
     /**
      * @param \Magento\Framework\Code\Reader\ClassReader $classReader
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\Code\Reader\ClassReader $classReader)
     {
@@ -36,7 +33,6 @@ public function __construct(\Magento\Framework\Code\Reader\ClassReader $classRea
      * @param string $className
      * @return ConstructorArgument[]|null
      * @throws \ReflectionException
-     * @since 2.0.0
      */
     public function getConstructor($className)
     {
@@ -64,7 +60,6 @@ public function getConstructor($className)
      *
      * @param string $className
      * @return string[]
-     * @since 2.0.0
      */
     public function getParents($className)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
index c3f2a593da9e0..7600f00ee2012 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
@@ -12,13 +12,11 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Reader\ClassesScanner
  *
- * @since 2.0.0
  */
 class ClassesScanner implements ClassesScannerInterface
 {
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $excludePatterns = [];
 
@@ -37,7 +35,6 @@ class ClassesScanner implements ClassesScannerInterface
     /**
      * @param array $excludePatterns
      * @param string $generationDirectory
-     * @since 2.0.0
      */
     public function __construct(array $excludePatterns = [], DirectoryList $directoryList = null)
     {
@@ -53,7 +50,6 @@ public function __construct(array $excludePatterns = [], DirectoryList $director
      *
      * @param array $excludePatterns
      * @return void
-     * @since 2.0.0
      */
     public function addExcludePatterns(array $excludePatterns)
     {
@@ -67,7 +63,6 @@ public function addExcludePatterns(array $excludePatterns)
      * @return array
      * @throws FileSystemException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function getList($path)
     {
@@ -146,7 +141,6 @@ private function includeClasses(array $classNames, $fileItemPath)
      * @param string $fileItemPath
      * @param string $patterns
      * @return bool
-     * @since 2.0.0
      */
     private function isExclude($fileItemPath, $patterns)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
index 21a25a38cbe8c..01e99567960f0 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
@@ -9,7 +9,6 @@
  * Interface ClassesScannerInterface
  *
  * @package Magento\Setup\Module\Di\Code\Reader
- * @since 2.0.0
  */
 interface ClassesScannerInterface
 {
@@ -19,7 +18,6 @@ interface ClassesScannerInterface
      * @param string $path path to dir with files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getList($path);
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Area.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Area.php
index 4105f737fc172..f6138d8be303b 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Area.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Area.php
@@ -13,26 +13,22 @@
  * Class Area
  *
  * @package Magento\Setup\Module\Di\Code\Reader\Decorator
- * @since 2.0.0
  */
 class Area implements \Magento\Setup\Module\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var ClassReaderDecorator
-     * @since 2.0.0
      */
     private $classReaderDecorator;
 
     /**
      * @var ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
     /**
      * @param ClassesScanner $classesScanner
      * @param ClassReaderDecorator $classReaderDecorator
-     * @since 2.0.0
      */
     public function __construct(
         ClassesScanner $classesScanner,
@@ -49,7 +45,6 @@ public function __construct(
      *
      * @return array
      * @throws FileSystemException
-     * @since 2.0.0
      */
     public function getList($path)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Directory.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Directory.php
index 0dbe7d9de6cb3..a544a59b4dd2d 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Directory.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Directory.php
@@ -11,43 +11,36 @@
  * Class Directory
  *
  * @package Magento\Setup\Module\Di\Code\Reader\Decorator
- * @since 2.0.0
  */
 class Directory implements \Magento\Setup\Module\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $current;
 
     /**
      * @var \Magento\Setup\Module\Di\Compiler\Log\Log
-     * @since 2.0.0
      */
     private $log;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     private $relations = [];
 
     /**
      * @var \Magento\Framework\Code\Validator
-     * @since 2.0.0
      */
     private $validator;
 
     /**
      * @var \Magento\Framework\Code\Reader\ClassReader
-     * @since 2.0.0
      */
     private $classReader;
 
     /**
      * @var \Magento\Setup\Module\Di\Code\Reader\ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
@@ -57,7 +50,6 @@ class Directory implements \Magento\Setup\Module\Di\Code\Reader\ClassesScannerIn
      * @param \Magento\Setup\Module\Di\Code\Reader\ClassesScanner $classesScanner
      * @param \Magento\Framework\Code\Validator $validator
      * @param string $generationDir directory where generated files is
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Module\Di\Compiler\Log\Log $log,
@@ -82,7 +74,6 @@ public function __construct(
      * @param string $msg
      *
      * @return void
-     * @since 2.0.0
      */
     public function errorHandler($errorNumber, $msg)
     {
@@ -95,7 +86,6 @@ public function errorHandler($errorNumber, $msg)
      * @param string $path path to dir with files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getList($path)
     {
@@ -118,7 +108,6 @@ public function getList($path)
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getRelations()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
index 0c232d1ae23a9..a1f8d77ca77d3 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
@@ -12,31 +12,26 @@
  * Class Interceptions
  *
  * @package Magento\Setup\Module\Di\Code\Reader\Decorator
- * @since 2.0.0
  */
 class Interceptions implements \Magento\Setup\Module\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var \Magento\Setup\Module\Di\Code\Reader\ClassReaderDecorator
-     * @since 2.0.0
      */
     private $classReader;
 
     /**
      * @var \Magento\Setup\Module\Di\Code\Reader\ClassesScanner
-     * @since 2.0.0
      */
     private $classesScanner;
 
     /**
      * @var \Magento\Setup\Module\Di\Compiler\Log\Log
-     * @since 2.0.0
      */
     private $log;
 
     /**
      * @var \Magento\Framework\Code\Validator
-     * @since 2.0.0
      */
     private $validator;
 
@@ -46,7 +41,6 @@ class Interceptions implements \Magento\Setup\Module\Di\Code\Reader\ClassesScann
      * @param \Magento\Framework\Code\Validator $validator
      * @param \Magento\Framework\Code\Validator\ConstructorIntegrity $constructorIntegrityValidator
      * @param Log $log
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Setup\Module\Di\Code\Reader\ClassesScanner $classesScanner,
@@ -69,7 +63,6 @@ public function __construct(
      * @param string $path path to dir with files
      *
      * @return array
-     * @since 2.0.0
      */
     public function getList($path)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
index b2c5c433259e7..b16fdccdf5d4a 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
@@ -10,19 +10,19 @@
 
 /**
  * @SuppressWarnings(PHPMD)
- * @since 2.1.0
+ * @since 2.0.8
  */
 class FileScanner extends \Zend\Code\Scanner\FileScanner
 {
     /**
      * @var int
-     * @since 2.1.0
+     * @since 2.0.8
      */
     private $tokenType;
 
     /**
      * {@inheritdoc}
-     * @since 2.1.0
+     * @since 2.0.8
      */
     protected function scan()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/Type.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/Type.php
index 2b9abd6707296..49ed36ef9795c 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/Type.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/Type.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Reader\Type
  *
- * @since 2.0.0
  */
 class Type
 {
@@ -19,7 +18,6 @@ class Type
      *
      * @param string $type
      * @return bool
-     * @since 2.0.0
      */
     public function isConcrete($type)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ArrayScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ArrayScanner.php
index e28b640e974e2..06043f511f509 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ArrayScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ArrayScanner.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\ArrayScanner
  *
- * @since 2.0.0
  */
 class ArrayScanner implements ScannerInterface
 {
@@ -17,7 +16,6 @@ class ArrayScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/CompositeScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/CompositeScanner.php
index 842866ac496d5..eab961c6e993d 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/CompositeScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/CompositeScanner.php
@@ -8,13 +8,11 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\CompositeScanner
  *
- * @since 2.0.0
  */
 class CompositeScanner implements ScannerInterface
 {
     /**
      * @var ScannerInterface[]
-     * @since 2.0.0
      */
     protected $_children = [];
 
@@ -24,7 +22,6 @@ class CompositeScanner implements ScannerInterface
      * @param ScannerInterface $scanner
      * @param string $type
      * @return void
-     * @since 2.0.0
      */
     public function addChild(ScannerInterface $scanner, $type)
     {
@@ -36,7 +33,6 @@ public function addChild(ScannerInterface $scanner, $type)
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
index 3ebb7dab16a04..e28391c4df5a5 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
@@ -10,7 +10,7 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\ConfigurationScanner
  *
- * @since 2.1.0
+ * @since 2.0.1
  */
 class ConfigurationScanner
 {
@@ -19,7 +19,7 @@ class ConfigurationScanner
      *
      * @param \Magento\Framework\App\Config\FileResolver $fileResolver
      * @param \Magento\Framework\App\AreaList $areaList
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(
         \Magento\Framework\App\Config\FileResolver $fileResolver,
@@ -35,7 +35,7 @@ public function __construct(
      * @param string $fileName
      *
      * @return array array of paths to the configuration files
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function scan($fileName)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/DirectoryScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/DirectoryScanner.php
index 7db0809c75104..9335ab11659c7 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/DirectoryScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/DirectoryScanner.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\DirectoryScanner
  *
- * @since 2.0.0
  */
 class DirectoryScanner
 {
@@ -19,7 +18,6 @@ class DirectoryScanner
      * @param array $patterns
      * @param string[] $excludePatterns
      * @return array
-     * @since 2.0.0
      */
     public function scan($dir, array $patterns = [], array $excludePatterns = [])
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php
index 73bf9c01f00d4..a9415e91262fb 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php
@@ -10,19 +10,18 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\InheritanceInterceptorScanner
  *
- * @since 2.0.0
  */
 class InheritanceInterceptorScanner implements ScannerInterface
 {
     /**
      * @var InterceptableValidator
-     * @since 2.1.0
+     * @since 2.0.1
      */
     private $interceptableValidator;
 
     /**
      * @param InterceptableValidator $interceptableValidator
-     * @since 2.1.0
+     * @since 2.0.1
      */
     public function __construct(InterceptableValidator $interceptableValidator)
     {
@@ -35,7 +34,6 @@ public function __construct(InterceptableValidator $interceptableValidator)
      * @param array $classes
      * @param array $interceptedEntities
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $classes, array $interceptedEntities = [])
     {
@@ -61,7 +59,6 @@ public function collectEntities(array $classes, array $interceptedEntities = [])
      *
      * @param string[] $interceptedEntities
      * @return string[]
-     * @since 2.0.0
      */
     private function filterOutAbstractClasses($interceptedEntities)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/InterceptedInstancesScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/InterceptedInstancesScanner.php
index 1f605137c928e..c94dcef28ced9 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/InterceptedInstancesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/InterceptedInstancesScanner.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\InterceptedInstancesScanner
  *
- * @since 2.0.0
  */
 class InterceptedInstancesScanner implements ScannerInterface
 {
@@ -18,7 +17,6 @@ class InterceptedInstancesScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
index 40beb9f3c2520..ca6b226d950ff 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -13,19 +13,16 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\PhpScanner
  *
- * @since 2.0.0
  */
 class PhpScanner implements ScannerInterface
 {
     /**
      * @var Log $log
-     * @since 2.0.0
      */
     protected $_log;
 
     /**
      * @param Log $log
-     * @since 2.0.0
      */
     public function __construct(Log $log)
     {
@@ -40,7 +37,6 @@ public function __construct(Log $log)
      * @param string $methodName
      * @param string $entityType
      * @return string[]
-     * @since 2.0.0
      */
     protected function _findMissingClasses($file, $classReflection, $methodName, $entityType)
     {
@@ -81,7 +77,6 @@ protected function _findMissingClasses($file, $classReflection, $methodName, $en
      * @param string $missingClassName
      * @param string $entityType
      * @return string
-     * @since 2.0.0
      */
     protected function getSourceClassName($missingClassName, $entityType)
     {
@@ -113,7 +108,6 @@ protected function getSourceClassName($missingClassName, $entityType)
      * @param \ReflectionClass $reflectionClass
      * @param string $file
      * @return string[]
-     * @since 2.0.0
      */
     protected function _fetchFactories($reflectionClass, $file)
     {
@@ -144,7 +138,6 @@ protected function _fetchFactories($reflectionClass, $file)
      * @param \ReflectionClass $reflectionClass
      * @param string $file
      * @return string[]
-     * @since 2.0.0
      */
     protected function _fetchMissingExtensionAttributesClasses($reflectionClass, $file)
     {
@@ -174,7 +167,6 @@ protected function _fetchMissingExtensionAttributesClasses($reflectionClass, $fi
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
@@ -198,7 +190,6 @@ public function collectEntities(array $files)
      * @param $count int
      * @param $tokens array
      * @return string
-     * @since 2.0.0
      */
     protected function _fetchNamespace($tokenIterator, $count, $tokens)
     {
@@ -219,7 +210,6 @@ protected function _fetchNamespace($tokenIterator, $count, $tokens)
      * @param $count int
      * @param $tokens array
      * @return array
-     * @since 2.0.0
      */
     protected function _fetchClasses($namespace, $tokenIterator, $count, $tokens)
     {
@@ -237,7 +227,6 @@ protected function _fetchClasses($namespace, $tokenIterator, $count, $tokens)
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     protected function _getDeclaredClasses($file)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PluginScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PluginScanner.php
index d0549ccf5b2ec..7e7dbe7f0639d 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PluginScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PluginScanner.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\PluginScanner
  *
- * @since 2.0.0
  */
 class PluginScanner implements ScannerInterface
 {
@@ -17,7 +16,6 @@ class PluginScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
index 19511e52642bc..81bca0f764fcc 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
@@ -9,13 +9,11 @@
 
 /**
  * Class RepositoryScanner
- * @since 2.0.0
  */
 class RepositoryScanner implements ScannerInterface
 {
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $useAutoload = true;
 
@@ -24,7 +22,6 @@ class RepositoryScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
@@ -63,7 +60,6 @@ public function collectEntities(array $files)
      *
      * @param boolean $useAutoload
      * @return void
-     * @since 2.0.0
      */
     public function setUseAutoload($useAutoload)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ScannerInterface.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ScannerInterface.php
index 053bd0133dd84..83d0b32e1eecc 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ScannerInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ScannerInterface.php
@@ -8,7 +8,6 @@
 /**
  * Interface \Magento\Setup\Module\Di\Code\Scanner\ScannerInterface
  *
- * @since 2.0.0
  */
 interface ScannerInterface
 {
@@ -17,7 +16,6 @@ interface ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files);
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ServiceDataAttributesScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ServiceDataAttributesScanner.php
index 6aabb8faab121..c494eae41c0e7 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ServiceDataAttributesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ServiceDataAttributesScanner.php
@@ -7,7 +7,6 @@
 
 /**
  * Class ServiceDataAttributesScanner
- * @since 2.0.0
  */
 class ServiceDataAttributesScanner implements ScannerInterface
 {
@@ -16,7 +15,6 @@ class ServiceDataAttributesScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
index 0f69e1d48d75f..c17c39cd75b3f 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\XmlInterceptorScanner
  *
- * @since 2.0.0
  */
 class XmlInterceptorScanner implements ScannerInterface
 {
@@ -17,7 +16,6 @@ class XmlInterceptorScanner implements ScannerInterface
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
@@ -36,7 +34,6 @@ public function collectEntities(array $files)
      *
      * @param string $content
      * @return array
-     * @since 2.0.0
      */
     protected function _collectEntitiesFromString($content)
     {
@@ -62,7 +59,6 @@ protected function _collectEntitiesFromString($content)
      *
      * @param array $output
      * @return array
-     * @since 2.0.0
      */
     protected function _filterEntities(array $output)
     {
@@ -99,7 +95,6 @@ protected function _filterEntities(array $output)
      *
      * @param string $className
      * @return void
-     * @since 2.0.0
      */
     protected function _handleControllerClassName($className)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
index 5e540235b885b..1168e87b93dbe 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
@@ -10,19 +10,16 @@
 /**
  * Class \Magento\Setup\Module\Di\Code\Scanner\XmlScanner
  *
- * @since 2.0.0
  */
 class XmlScanner implements ScannerInterface
 {
     /**
      * @var \Magento\Setup\Module\Di\Compiler\Log\Log $log
-     * @since 2.0.0
      */
     protected $_log;
 
     /**
      * @param \Magento\Setup\Module\Di\Compiler\Log\Log $log
-     * @since 2.0.0
      */
     public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
     {
@@ -34,7 +31,6 @@ public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
      *
      * @param array $files
      * @return array
-     * @since 2.0.0
      */
     public function collectEntities(array $files)
     {
@@ -64,7 +60,6 @@ public function collectEntities(array $files)
      *
      * @param array $output
      * @return array
-     * @since 2.0.0
      */
     protected function _filterEntities(array $output)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolver.php b/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolver.php
index 394a1c095a1e9..8ad3a041014b0 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolver.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolver.php
@@ -10,13 +10,11 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\ArgumentsResolver
  *
- * @since 2.0.0
  */
 class ArgumentsResolver
 {
     /**
      * @var \Magento\Framework\ObjectManager\ConfigInterface
-     * @since 2.0.0
      */
     private $diContainerConfig;
 
@@ -24,7 +22,6 @@ class ArgumentsResolver
      * Shared instance argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $sharedInstancePattern = [
         '_i_' => null,
@@ -34,7 +31,6 @@ class ArgumentsResolver
      * Instance argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $notSharedInstancePattern = [
         '_ins_' => null,
@@ -44,7 +40,6 @@ class ArgumentsResolver
      * Value argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $valuePattern = [
         '_v_' => null,
@@ -54,7 +49,6 @@ class ArgumentsResolver
      * Value null argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $nullValuePattern = [
         '_vn_' => true,
@@ -64,7 +58,6 @@ class ArgumentsResolver
      * Value configured array argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $configuredArrayValuePattern = [
         '_vac_' => true,
@@ -74,7 +67,6 @@ class ArgumentsResolver
      * Configured argument pattern used for configuration
      *
      * @var array
-     * @since 2.0.0
      */
     private $configuredPattern = [
         '_a_' => null,
@@ -83,7 +75,6 @@ class ArgumentsResolver
 
     /**
      * @param \Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig
-     * @since 2.0.0
      */
     public function __construct(\Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig)
     {
@@ -96,7 +87,6 @@ public function __construct(\Magento\Framework\ObjectManager\ConfigInterface $di
      * @param string $instanceType
      * @param ConstructorArgument[] $constructor
      * @return array|null
-     * @since 2.0.0
      */
     public function getResolvedConstructorArguments($instanceType, $constructor)
     {
@@ -132,7 +122,6 @@ public function getResolvedConstructorArguments($instanceType, $constructor)
      * @param array $configuredArgument
      * @param ConstructorArgument $constructorArgument
      * @return mixed
-     * @since 2.0.0
      */
     private function getConfiguredArgument($configuredArgument, ConstructorArgument $constructorArgument)
     {
@@ -151,7 +140,6 @@ private function getConfiguredArgument($configuredArgument, ConstructorArgument
      *
      * @param array $array
      * @return mixed
-     * @since 2.0.0
      */
     private function getConfiguredArrayAttribute($array)
     {
@@ -181,7 +169,6 @@ private function getConfiguredArrayAttribute($array)
      *
      * @param array $config
      * @return array|mixed
-     * @since 2.0.0
      */
     private function getConfiguredInstanceArgument(array $config)
     {
@@ -204,7 +191,6 @@ private function getConfiguredInstanceArgument(array $config)
      *
      * @param string $instanceType
      * @return array
-     * @since 2.0.0
      */
     private function getConfiguredArguments($instanceType)
     {
@@ -226,7 +212,6 @@ function ($type) {
      *
      * @param string $instanceType
      * @return array|mixed
-     * @since 2.0.0
      */
     private function getInstanceArgument($instanceType)
     {
@@ -245,7 +230,6 @@ private function getInstanceArgument($instanceType)
      *
      * @param mixed $value
      * @return array
-     * @since 2.0.0
      */
     private function getNonObjectArgument($value)
     {
@@ -272,7 +256,6 @@ private function getNonObjectArgument($value)
      *
      * @param array $value
      * @return bool
-     * @since 2.0.0
      */
     private function isConfiguredArray($value)
     {
@@ -299,7 +282,6 @@ private function isConfiguredArray($value)
      * @param string $value
      * @param string $default
      * @return array
-     * @since 2.0.0
      */
     private function getGlobalArgument($value, $default)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolverFactory.php b/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolverFactory.php
index 97b47eb2e88b2..3b780d0a07318 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolverFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolverFactory.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\ArgumentsResolverFactory
  *
- * @since 2.0.0
  */
 class ArgumentsResolverFactory
 {
@@ -18,7 +17,6 @@ class ArgumentsResolverFactory
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 2.0.0
      */
     protected $_objectManager;
 
@@ -26,7 +24,6 @@ class ArgumentsResolverFactory
      * Factory constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @since 2.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager
@@ -39,7 +36,6 @@ public function __construct(
      *
      * @param \Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig
      * @return \Magento\Setup\Module\Di\Compiler\ArgumentsResolver
-     * @since 2.0.0
      */
     public function create(\Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/ArgumentsSerialization.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/ArgumentsSerialization.php
index 111a9ea5432af..42a125092c9a5 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/ArgumentsSerialization.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/ArgumentsSerialization.php
@@ -16,7 +16,6 @@
  *
  * @deprecated 2.2.0 Di arguments are now stored in raw php format and could be cached by OPcache,
  *             this class will be removed in the next backward incompatible release.
- * @since 2.0.0
  */
 class ArgumentsSerialization implements ModificationInterface
 {
@@ -44,7 +43,6 @@ public function __construct(SerializerInterface $serializer = null)
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
index fbeefc48e9859..d871f6c91e601 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Config\Chain\BackslashTrim
  *
- * @since 2.0.0
  */
 class BackslashTrim implements ModificationInterface
 {
@@ -20,7 +19,6 @@ class BackslashTrim implements ModificationInterface
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config)
     {
@@ -39,7 +37,6 @@ public function modify(array $config)
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     private function resolveInstancesNames(array $arguments)
     {
@@ -56,7 +53,6 @@ private function resolveInstancesNames(array $arguments)
      *
      * @param array $argument
      * @return array
-     * @since 2.0.0
      */
     private function resolveArguments(&$argument)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/InterceptorSubstitution.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/InterceptorSubstitution.php
index b84d413bec453..c9e4841056499 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/InterceptorSubstitution.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/InterceptorSubstitution.php
@@ -10,7 +10,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitution
  *
- * @since 2.0.0
  */
 class InterceptorSubstitution implements ModificationInterface
 {
@@ -19,7 +18,6 @@ class InterceptorSubstitution implements ModificationInterface
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config)
     {
@@ -55,7 +53,6 @@ public function modify(array $config)
      *
      * @param array $arguments
      * @return array
-     * @since 2.0.0
      */
     private function getInterceptorsList(array $arguments)
     {
@@ -77,7 +74,6 @@ private function getInterceptorsList(array $arguments)
      * @param array $preferences
      * @param array $interceptors
      * @return array
-     * @since 2.0.0
      */
     private function resolvePreferences(array $preferences, array $interceptors)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
index a64426661704d..6879ccf713d35 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving
  *
- * @since 2.0.0
  */
 class PreferencesResolving implements ModificationInterface
 {
@@ -20,7 +19,6 @@ class PreferencesResolving implements ModificationInterface
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config)
     {
@@ -39,7 +37,6 @@ public function modify(array $config)
      * @param array $argument
      * @param array $preferences
      * @return array
-     * @since 2.0.0
      */
     private function resolvePreferences(&$argument, &$preferences)
     {
@@ -66,7 +63,6 @@ private function resolvePreferences(&$argument, &$preferences)
      * @param array $preferences
      *
      * @return string
-     * @since 2.0.0
      */
     private function resolvePreferenceRecursive(&$value, &$preferences)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationChain.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationChain.php
index 97168475542d2..d5bf4fd16912f 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationChain.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationChain.php
@@ -9,19 +9,16 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Config\ModificationChain
  *
- * @since 2.0.0
  */
 class ModificationChain implements ModificationInterface
 {
     /**
      * @var ModificationInterface[]
-     * @since 2.0.0
      */
     private $modificationsList;
 
     /**
      * @param array $modificationsList
-     * @since 2.0.0
      */
     public function __construct(array $modificationsList = [])
     {
@@ -41,7 +38,6 @@ function ($modification) {
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationInterface.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationInterface.php
index c1849103c5347..6c2e7ca95c29d 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/ModificationInterface.php
@@ -9,7 +9,6 @@
 /**
  * Interface \Magento\Setup\Module\Di\Compiler\Config\ModificationInterface
  *
- * @since 2.0.0
  */
 interface ModificationInterface
 {
@@ -18,7 +17,6 @@ interface ModificationInterface
      *
      * @param array $config
      * @return array
-     * @since 2.0.0
      */
     public function modify(array $config);
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
index 7d5da29fd4552..353e15d2da5d2 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
@@ -17,37 +17,31 @@
  * Class Reader
  * @package Magento\Setup\Module\Di\Compiler\Config
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class Reader
 {
     /**
      * @var ConfigInterface
-     * @since 2.0.0
      */
     private $diContainerConfig;
 
     /**
      * @var App\ObjectManager\ConfigLoader
-     * @since 2.0.0
      */
     private $configLoader;
 
     /**
      * @var ArgumentsResolverFactory
-     * @since 2.0.0
      */
     private $argumentsResolverFactory;
 
     /**
      * @var ClassReaderDecorator
-     * @since 2.0.0
      */
     private $classReaderDecorator;
 
     /**
      * @var Type
-     * @since 2.0.0
      */
     private $typeReader;
 
@@ -57,7 +51,6 @@ class Reader
      * @param ArgumentsResolverFactory $argumentsResolverFactory
      * @param ClassReaderDecorator $classReaderDecorator
      * @param Type $typeReader
-     * @since 2.0.0
      */
     public function __construct(
         ConfigInterface $diContainerConfig,
@@ -80,7 +73,6 @@ public function __construct(
      * @param string $areaCode
      *
      * @return array
-     * @since 2.0.0
      */
     public function generateCachePerScope(
         DefinitionsCollection $definitionsCollection,
@@ -116,7 +108,6 @@ public function generateCachePerScope(
      * @param ConfigInterface $config
      * @return array|mixed
      * @throws \ReflectionException
-     * @since 2.0.0
      */
     private function getConfigForScope(DefinitionsCollection $definitionsCollection, ConfigInterface $config)
     {
@@ -157,7 +148,6 @@ private function getConfigForScope(DefinitionsCollection $definitionsCollection,
      * @param DefinitionsCollection $definitionsCollection
      *
      * @return void
-     * @since 2.0.0
      */
     private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
index ac7ea22c67017..169996fce3081 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
@@ -13,13 +13,11 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Config\Writer\Filesystem
  *
- * @since 2.0.0
  */
 class Filesystem implements WriterInterface
 {
     /**
      * @var DirectoryList
-     * @since 2.0.0
      */
     private $directoryList;
 
@@ -27,7 +25,6 @@ class Filesystem implements WriterInterface
      * Constructor
      *
      * @param DirectoryList $directoryList
-     * @since 2.0.0
      */
     public function __construct(DirectoryList $directoryList)
     {
@@ -40,7 +37,6 @@ public function __construct(DirectoryList $directoryList)
      * @param string $key
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function write($key, array $config)
     {
@@ -56,7 +52,6 @@ public function write($key, array $config)
      * Initializes writer
      *
      * @return void
-     * @since 2.0.0
      */
     private function initialize()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
index bb0971b56655e..9e6a3008283dc 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
@@ -10,7 +10,6 @@
 /**
  * Interface \Magento\Setup\Module\Di\Compiler\Config\WriterInterface
  *
- * @since 2.0.0
  */
 interface WriterInterface
 {
@@ -20,7 +19,6 @@ interface WriterInterface
      * @param string $key
      * @param array $config
      * @return void
-     * @since 2.0.0
      */
     public function write($key, array $config);
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/ConstructorArgument.php b/setup/src/Magento/Setup/Module/Di/Compiler/ConstructorArgument.php
index 5227c7122312e..a7dc5a4dc05bd 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/ConstructorArgument.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/ConstructorArgument.php
@@ -10,37 +10,31 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\ConstructorArgument
  *
- * @since 2.0.0
  */
 class ConstructorArgument
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     private $name;
 
     /**
      * @var string
-     * @since 2.0.0
      */
     private $type;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     private $isRequired;
 
     /**
      * @var mixed
-     * @since 2.0.0
      */
     private $defaultValue;
 
     /**
      * @param array $configuration
-     * @since 2.0.0
      */
     public function __construct(array $configuration)
     {
@@ -54,7 +48,6 @@ public function __construct(array $configuration)
      * Returns attribute name
      *
      * @return string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -65,7 +58,6 @@ public function getName()
      * Returns attribute type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getType()
     {
@@ -76,7 +68,6 @@ public function getType()
      * Whether attribute is required
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isRequired()
     {
@@ -87,7 +78,6 @@ public function isRequired()
      * Returns attribute default value
      *
      * @return mixed
-     * @since 2.0.0
      */
     public function getDefaultValue()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
index 3386c3bd137dc..b250b0c45e923 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
@@ -8,7 +8,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Log\Log
  *
- * @since 2.0.0
  */
 class Log
 {
@@ -24,7 +23,6 @@ class Log
      * Success log writer
      *
      * @var Writer\Console
-     * @since 2.0.0
      */
     protected $_successWriter;
 
@@ -32,7 +30,6 @@ class Log
      * Error log writer
      *
      * @var Writer\Console
-     * @since 2.0.0
      */
     protected $_errorWriter;
 
@@ -40,7 +37,6 @@ class Log
      * List of success log entries
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_successEntries = [];
 
@@ -48,14 +44,12 @@ class Log
      * List of error entries
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_errorEntries = [];
 
     /**
      * @param Writer\Console $successWriter
      * @param Writer\Console $errorWriter
-     * @since 2.0.0
      */
     public function __construct(Writer\Console $successWriter, Writer\Console $errorWriter)
     {
@@ -76,7 +70,6 @@ public function __construct(Writer\Console $successWriter, Writer\Console $error
      * @param string $key
      * @param string $message
      * @return void
-     * @since 2.0.0
      */
     public function add($type, $key, $message = '')
     {
@@ -92,7 +85,6 @@ public function add($type, $key, $message = '')
      *
      * @return void
      * @throws \Magento\Framework\Validator\Exception
-     * @since 2.0.0
      */
     public function report()
     {
@@ -109,7 +101,6 @@ public function report()
      * Check whether error exists
      *
      * @return bool
-     * @since 2.0.0
      */
     public function hasError()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Writer/Console.php b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Writer/Console.php
index bc971a19c6af7..c532516619c08 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Writer/Console.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Writer/Console.php
@@ -11,7 +11,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Compiler\Log\Writer\Console
  *
- * @since 2.0.0
  */
 class Console
 {
@@ -19,7 +18,6 @@ class Console
      * Report messages by type
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_messages = [
         Log::GENERATION_SUCCESS => 'Generated classes:',
@@ -32,13 +30,11 @@ class Console
      * Console
      *
      * @var OutputInterface
-     * @since 2.0.0
      */
     protected $console;
 
     /**
      * @param OutputInterface $output
-     * @since 2.0.0
      */
     public function __construct(OutputInterface $output)
     {
@@ -50,7 +46,6 @@ public function __construct(OutputInterface $output)
      *
      * @param array $data
      * @return void
-     * @since 2.0.0
      */
     public function write(array $data)
     {
@@ -87,7 +82,6 @@ public function write(array $data)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     private function getStartTag($type)
     {
@@ -103,7 +97,6 @@ private function getStartTag($type)
      *
      * @param string $type
      * @return string
-     * @since 2.0.0
      */
     private function getEndTag($type)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Definition/Collection.php b/setup/src/Magento/Setup/Module/Di/Definition/Collection.php
index 7c5dbce2a6d26..0343fa5239f69 100644
--- a/setup/src/Magento/Setup/Module/Di/Definition/Collection.php
+++ b/setup/src/Magento/Setup/Module/Di/Definition/Collection.php
@@ -9,7 +9,6 @@
 /**
  * Class \Magento\Setup\Module\Di\Definition\Collection
  *
- * @since 2.0.0
  */
 class Collection
 {
@@ -17,7 +16,6 @@ class Collection
      * List of definitions
      *
      * @var array
-     * @since 2.0.0
      */
     private $definitions = [];
 
@@ -25,7 +23,6 @@ class Collection
      * Returns definitions as [instance => list of arguments]
      *
      * @return array
-     * @since 2.0.0
      */
     public function getCollection()
     {
@@ -38,7 +35,6 @@ public function getCollection()
      * @param array $definitions
      *
      * @return void
-     * @since 2.0.0
      */
     public function initialize(array $definitions)
     {
@@ -51,7 +47,6 @@ public function initialize(array $definitions)
      * @param Collection $collection
      *
      * @return void
-     * @since 2.0.0
      */
     public function addCollection(Collection $collection)
     {
@@ -65,7 +60,6 @@ public function addCollection(Collection $collection)
      * @param array|null $arguments
      *
      * @return void
-     * @since 2.0.0
      */
     public function addDefinition($instance, $arguments = [])
     {
@@ -77,7 +71,6 @@ public function addDefinition($instance, $arguments = [])
      *
      * @param string $instanceName
      * @return null|array
-     * @since 2.0.0
      */
     public function getInstanceArguments($instanceName)
     {
@@ -88,7 +81,6 @@ public function getInstanceArguments($instanceName)
      * Returns instances names list
      *
      * @return array
-     * @since 2.0.0
      */
     public function getInstancesNamesList()
     {
@@ -100,7 +92,6 @@ public function getInstancesNamesList()
      *
      * @param string $instanceName
      * @return bool
-     * @since 2.0.0
      */
     public function hasInstance($instanceName)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Context.php b/setup/src/Magento/Setup/Module/I18n/Context.php
index 0bb519919a311..fd6902259c178 100644
--- a/setup/src/Magento/Setup/Module/I18n/Context.php
+++ b/setup/src/Magento/Setup/Module/I18n/Context.php
@@ -11,7 +11,6 @@
 
 /**
  *  Context
- * @since 2.0.0
  */
 class Context
 {
@@ -31,17 +30,13 @@ class Context
 
     /**#@-*/
 
-    /**
-     * @var ComponentRegistrar
-     * @since 2.0.0
-     */
+    /**#@-*/
     private $componentRegistrar;
 
     /**
      * Constructor
      *
      * @param ComponentRegistrar $componentRegistrar
-     * @since 2.0.0
      */
     public function __construct(ComponentRegistrar $componentRegistrar)
     {
@@ -57,7 +52,6 @@ public function __construct(ComponentRegistrar $componentRegistrar)
      * @param string $path
      * @return array
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function getContextByPath($path)
     {
@@ -80,7 +74,6 @@ public function getContextByPath($path)
      * @param string $componentType
      * @param string $path
      * @return bool|string
-     * @since 2.0.0
      */
     private function getComponentName($componentType, $path)
     {
@@ -100,7 +93,6 @@ private function getComponentName($componentType, $path)
      * @param array $value
      * @return string|null
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function buildPathToLocaleDirectoryByContext($type, $value)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary.php b/setup/src/Magento/Setup/Module/I18n/Dictionary.php
index 363b21d4b8652..42c0646686c5b 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary.php
@@ -9,7 +9,6 @@
 
 /**
  *  Dictionary
- * @since 2.0.0
  */
 class Dictionary
 {
@@ -17,7 +16,6 @@ class Dictionary
      * Phrases
      *
      * @var array
-     * @since 2.0.0
      */
     private $_phrases = [];
 
@@ -25,7 +23,6 @@ class Dictionary
      * List of phrases where array key is vo key
      *
      * @var array
-     * @since 2.0.0
      */
     private $_phrasesByKey = [];
 
@@ -34,7 +31,6 @@ class Dictionary
      *
      * @param Phrase $phrase
      * @return void
-     * @since 2.0.0
      */
     public function addPhrase(Phrase $phrase)
     {
@@ -46,7 +42,6 @@ public function addPhrase(Phrase $phrase)
      * Get phrases
      *
      * @return Phrase[]
-     * @since 2.0.0
      */
     public function getPhrases()
     {
@@ -57,7 +52,6 @@ public function getPhrases()
      * Get duplicates in container
      *
      * @return array
-     * @since 2.0.0
      */
     public function getDuplicates()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Generator.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Generator.php
index c6d551f35100d..4788fe1857601 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Generator.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Generator.php
@@ -10,7 +10,6 @@
 
 /**
  * Dictionary generator
- * @since 2.0.0
  */
 class Generator
 {
@@ -18,7 +17,6 @@ class Generator
      * Parser
      *
      * @var \Magento\Setup\Module\I18n\ParserInterface
-     * @since 2.0.0
      */
     protected $parser;
 
@@ -26,7 +24,6 @@ class Generator
      * Contextual parser
      *
      * @var \Magento\Setup\Module\I18n\ParserInterface
-     * @since 2.0.0
      */
     protected $contextualParser;
 
@@ -34,7 +31,6 @@ class Generator
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     protected $factory;
 
@@ -42,13 +38,11 @@ class Generator
      * Generator options resolver
      *
      * @var Options\ResolverFactory
-     * @since 2.0.0
      */
     protected $optionResolverFactory;
 
     /**
      * @var WriterInterface
-     * @since 2.0.0
      */
     protected $writer;
 
@@ -59,7 +53,6 @@ class Generator
      * @param ParserInterface $contextualParser
      * @param Factory $factory
      * @param Options\ResolverFactory $optionsResolver
-     * @since 2.0.0
      */
     public function __construct(
         ParserInterface $parser,
@@ -81,7 +74,6 @@ public function __construct(
      * @param bool $withContext
      * @throws \UnexpectedValueException
      * @return void
-     * @since 2.0.0
      */
     public function generate($directory, $outputFilename, $withContext = false)
     {
@@ -103,7 +95,6 @@ public function generate($directory, $outputFilename, $withContext = false)
     /**
      * @param string $outputFilename
      * @return WriterInterface
-     * @since 2.0.0
      */
     protected function getDictionaryWriter($outputFilename)
     {
@@ -118,7 +109,6 @@ protected function getDictionaryWriter($outputFilename)
      *
      * @param bool $withContext
      * @return \Magento\Setup\Module\I18n\ParserInterface
-     * @since 2.0.0
      */
     protected function getActualParser($withContext)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/AbstractFile.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/AbstractFile.php
index 0e322209d8e13..19d6d898253f7 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/AbstractFile.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/AbstractFile.php
@@ -10,7 +10,6 @@
 
 /**
  *  Abstract dictionary loader from file
- * @since 2.0.0
  */
 abstract class AbstractFile implements FileInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractFile implements FileInterface
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -26,7 +24,6 @@ abstract class AbstractFile implements FileInterface
      * File handler
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_fileHandler;
 
@@ -34,7 +31,6 @@ abstract class AbstractFile implements FileInterface
      * Current row position
      *
      * @var int
-     * @since 2.0.0
      */
     protected $_position;
 
@@ -42,7 +38,6 @@ abstract class AbstractFile implements FileInterface
      * Loader construct
      *
      * @param Factory $factory
-     * @since 2.0.0
      */
     public function __construct(Factory $factory)
     {
@@ -51,7 +46,6 @@ public function __construct(Factory $factory)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function load($file)
     {
@@ -84,7 +78,6 @@ public function load($file)
      * @param string $file
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _openFile($file)
     {
@@ -97,7 +90,6 @@ protected function _openFile($file)
      * Read file. Template method
      *
      * @return array
-     * @since 2.0.0
      */
     abstract protected function _readFile();
 
@@ -105,7 +97,6 @@ abstract protected function _readFile();
      * Close file handler
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _closeFile()
     {
@@ -116,7 +107,6 @@ protected function _closeFile()
      * Create dictionary
      *
      * @return \Magento\Setup\Module\I18n\Dictionary
-     * @since 2.0.0
      */
     protected function _createDictionary()
     {
@@ -129,7 +119,6 @@ protected function _createDictionary()
      * @param array $data
      * @return \Magento\Setup\Module\I18n\Dictionary\Phrase
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _createPhrase($data)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/Csv.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/Csv.php
index d8de0246f861e..5751e845869a8 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/Csv.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/File/Csv.php
@@ -9,13 +9,11 @@
 
 /**
  *  Dictionary loader from csv
- * @since 2.0.0
  */
 class Csv extends AbstractFile
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _readFile()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/FileInterface.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/FileInterface.php
index 6906e0331eec9..20cd4ffa9fd98 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/FileInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Loader/FileInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Dictionary loader interface
- * @since 2.0.0
  */
 interface FileInterface
 {
@@ -17,7 +16,6 @@ interface FileInterface
      * @param string $file
      * @return \Magento\Setup\Module\I18n\Dictionary
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function load($file);
 }
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/Resolver.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/Resolver.php
index 65444ed3ab473..2f58b5feb5df3 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/Resolver.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/Resolver.php
@@ -10,31 +10,26 @@
 
 /**
  * Dictionary generator options resolver
- * @since 2.0.0
  */
 class Resolver implements ResolverInterface
 {
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $directory;
 
     /**
      * @var array
-     * @since 2.0.0
      */
     protected $options;
 
     /**
      * @var bool
-     * @since 2.0.0
      */
     protected $withContext;
 
     /**
      * @var ComponentRegistrar
-     * @since 2.0.0
      */
     protected $componentRegistrar;
 
@@ -44,7 +39,6 @@ class Resolver implements ResolverInterface
      * @param ComponentRegistrar $componentRegistrar
      * @param string $directory
      * @param bool $withContext
-     * @since 2.0.0
      */
     public function __construct(
         ComponentRegistrar $componentRegistrar,
@@ -58,7 +52,6 @@ public function __construct(
 
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOptions()
     {
@@ -117,7 +110,6 @@ public function getOptions()
      * @param array $directories
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function isValidPaths($directories)
     {
@@ -137,7 +129,6 @@ protected function isValidPaths($directories)
      *
      * @param string $componentType
      * @return array
-     * @since 2.0.0
      */
     private function getComponentDirectories($componentType)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverFactory.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverFactory.php
index ff1425e9ad64b..6efbc575867d0 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverFactory.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverFactory.php
@@ -9,7 +9,6 @@
 
 /**
  * Options resolver factory
- * @since 2.0.0
  */
 class ResolverFactory
 {
@@ -20,13 +19,11 @@ class ResolverFactory
 
     /**
      * @var string
-     * @since 2.0.0
      */
     protected $resolverClass;
 
     /**
      * @param string $resolverClass
-     * @since 2.0.0
      */
     public function __construct($resolverClass = self::DEFAULT_RESOLVER)
     {
@@ -38,7 +35,6 @@ public function __construct($resolverClass = self::DEFAULT_RESOLVER)
      * @param bool $withContext
      * @return ResolverInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function create($directory, $withContext)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverInterface.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverInterface.php
index e7a46a0b94b14..561a81be9a50a 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Options/ResolverInterface.php
@@ -7,13 +7,11 @@
 
 /**
  * Generator options resolver interface
- * @since 2.0.0
  */
 interface ResolverInterface
 {
     /**
      * @return array
-     * @since 2.0.0
      */
     public function getOptions();
 }
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php
index 47fe746aa1e7c..5fcddfb11efa7 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php
@@ -7,7 +7,6 @@
 
 /**
  *  Phrase
- * @since 2.0.0
  */
 class Phrase
 {
@@ -29,7 +28,6 @@ class Phrase
      * Phrase
      *
      * @var string
-     * @since 2.0.0
      */
     private $_phrase;
 
@@ -37,7 +35,6 @@ class Phrase
      * Translation
      *
      * @var string
-     * @since 2.0.0
      */
     private $_translation;
 
@@ -45,7 +42,6 @@ class Phrase
      * Context type
      *
      * @var string
-     * @since 2.0.0
      */
     private $_contextType;
 
@@ -53,7 +49,6 @@ class Phrase
      * Context value
      *
      * @var array
-     * @since 2.0.0
      */
     private $_contextValue = [];
 
@@ -61,7 +56,6 @@ class Phrase
      * Quote type that enclose the phrase, single or double
      *
      * @var string
-     * @since 2.0.0
      */
     private $_quote;
 
@@ -73,7 +67,6 @@ class Phrase
      * @param string|null $contextType
      * @param string|array|null $contextValue
      * @param string|null $quote
-     * @since 2.0.0
      */
     public function __construct($phrase, $translation, $contextType = null, $contextValue = null, $quote = null)
     {
@@ -90,7 +83,6 @@ public function __construct($phrase, $translation, $contextType = null, $context
      * @param string $phrase
      * @return void
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function setPhrase($phrase)
     {
@@ -104,7 +96,6 @@ public function setPhrase($phrase)
      * Get phrase
      *
      * @return string
-     * @since 2.0.0
      */
     public function getPhrase()
     {
@@ -116,7 +107,6 @@ public function getPhrase()
      *
      * @param string $quote
      * @return void
-     * @since 2.0.0
      */
     public function setQuote($quote)
     {
@@ -129,7 +119,6 @@ public function setQuote($quote)
      * Get quote type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getQuote()
     {
@@ -142,7 +131,6 @@ public function getQuote()
      * @param string $translation
      * @return void
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function setTranslation($translation)
     {
@@ -156,7 +144,6 @@ public function setTranslation($translation)
      * Get translation
      *
      * @return string
-     * @since 2.0.0
      */
     public function getTranslation()
     {
@@ -168,7 +155,6 @@ public function getTranslation()
      *
      * @param string $contextType
      * @return void
-     * @since 2.0.0
      */
     public function setContextType($contextType)
     {
@@ -179,7 +165,6 @@ public function setContextType($contextType)
      * Get context type
      *
      * @return string
-     * @since 2.0.0
      */
     public function getContextType()
     {
@@ -192,7 +177,6 @@ public function getContextType()
      * @param string $contextValue
      * @return void
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function addContextValue($contextValue)
     {
@@ -210,7 +194,6 @@ public function addContextValue($contextValue)
      * @param string $contextValue
      * @return void
      * @throws \DomainException
-     * @since 2.0.0
      */
     public function setContextValue($contextValue)
     {
@@ -228,7 +211,6 @@ public function setContextValue($contextValue)
      * Get context value
      *
      * @return array
-     * @since 2.0.0
      */
     public function getContextValue()
     {
@@ -240,7 +222,6 @@ public function getContextValue()
      *
      * @param string $separator
      * @return string
-     * @since 2.0.0
      */
     public function getContextValueAsString($separator = ',')
     {
@@ -251,7 +232,6 @@ public function getContextValueAsString($separator = ',')
      * Get VO identifier key
      *
      * @return string
-     * @since 2.0.0
      */
     public function getKey()
     {
@@ -262,7 +242,6 @@ public function getKey()
      * Compile PHP string based on quotes type it enclosed with
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompiledPhrase()
     {
@@ -273,7 +252,6 @@ public function getCompiledPhrase()
      * Compile PHP string based on quotes type it enclosed with
      *
      * @return string
-     * @since 2.0.0
      */
     public function getCompiledTranslation()
     {
@@ -285,7 +263,6 @@ public function getCompiledTranslation()
      *
      * @param string $string
      * @return string
-     * @since 2.0.0
      */
     private function getCompiledString($string)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php
index 6808ac0ea2478..88a653c770b43 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php
@@ -10,7 +10,6 @@
 
 /**
  * Csv writer
- * @since 2.0.0
  */
 class Csv implements WriterInterface
 {
@@ -18,7 +17,6 @@ class Csv implements WriterInterface
      * File handler
      *
      * @var resource
-     * @since 2.0.0
      */
     protected $_fileHandler;
 
@@ -27,7 +25,6 @@ class Csv implements WriterInterface
      *
      * @param string $outputFilename
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct($outputFilename)
     {
@@ -41,7 +38,6 @@ public function __construct($outputFilename)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function write(Phrase $phrase)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv/Stdo.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv/Stdo.php
index a4bd49f34b168..3518d2d47f063 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv/Stdo.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv/Stdo.php
@@ -11,13 +11,11 @@
  * Stdout writer
  *
  * Output csv format to stdout
- * @since 2.0.0
  */
 class Stdo extends Csv
 {
     /**
      * Writer construct
-     * @since 2.0.0
      */
     public function __construct()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/WriterInterface.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/WriterInterface.php
index ead05fb86b414..0c053b3711876 100644
--- a/setup/src/Magento/Setup/Module/I18n/Dictionary/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/WriterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Writer interface
- * @since 2.0.0
  */
 interface WriterInterface
 {
@@ -16,7 +15,6 @@ interface WriterInterface
      *
      * @param Phrase $phrase
      * @return void
-     * @since 2.0.0
      */
     public function write(Phrase $phrase);
 }
diff --git a/setup/src/Magento/Setup/Module/I18n/Factory.php b/setup/src/Magento/Setup/Module/I18n/Factory.php
index b9a0118ce8f56..c09c6bb6e648a 100644
--- a/setup/src/Magento/Setup/Module/I18n/Factory.php
+++ b/setup/src/Magento/Setup/Module/I18n/Factory.php
@@ -7,7 +7,6 @@
 
 /**
  *  Abstract Factory
- * @since 2.0.0
  */
 class Factory
 {
@@ -17,7 +16,6 @@ class Factory
      * @param string $filename
      * @return \Magento\Setup\Module\I18n\Dictionary\WriterInterface
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function createDictionaryWriter($filename = null)
     {
@@ -39,7 +37,6 @@ public function createDictionaryWriter($filename = null)
      *
      * @param string $locale
      * @return \Magento\Setup\Module\I18n\Locale
-     * @since 2.0.0
      */
     public function createLocale($locale)
     {
@@ -50,7 +47,6 @@ public function createLocale($locale)
      * Create dictionary
      *
      * @return \Magento\Setup\Module\I18n\Dictionary
-     * @since 2.0.0
      */
     public function createDictionary()
     {
@@ -62,7 +58,6 @@ public function createDictionary()
      *
      * @param array $data
      * @return \Magento\Setup\Module\I18n\Dictionary\Phrase
-     * @since 2.0.0
      */
     public function createPhrase(array $data)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/FilesCollector.php b/setup/src/Magento/Setup/Module/I18n/FilesCollector.php
index 6845b64df4493..c7451c1041483 100644
--- a/setup/src/Magento/Setup/Module/I18n/FilesCollector.php
+++ b/setup/src/Magento/Setup/Module/I18n/FilesCollector.php
@@ -7,7 +7,6 @@
 
 /**
  *  Files collector
- * @since 2.0.0
  */
 class FilesCollector
 {
@@ -17,7 +16,6 @@ class FilesCollector
      * @param array $paths
      * @param bool $fileMask
      * @return array
-     * @since 2.0.0
      */
     public function getFiles(array $paths, $fileMask = false)
     {
@@ -38,7 +36,6 @@ public function getFiles(array $paths, $fileMask = false)
      * @param bool $fileMask
      * @return \RecursiveIteratorIterator|\RegexIterator
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _getIterator($path, $fileMask = false)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Locale.php b/setup/src/Magento/Setup/Module/I18n/Locale.php
index 171242d81c45b..5a61929625f57 100644
--- a/setup/src/Magento/Setup/Module/I18n/Locale.php
+++ b/setup/src/Magento/Setup/Module/I18n/Locale.php
@@ -7,7 +7,6 @@
 
 /**
  *  Locale
- * @since 2.0.0
  */
 class Locale
 {
@@ -20,7 +19,6 @@ class Locale
      * Locale name
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_locale;
 
@@ -29,7 +27,6 @@ class Locale
      *
      * @param string $locale
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function __construct($locale)
     {
@@ -43,7 +40,6 @@ public function __construct($locale)
      * Return locale string
      *
      * @return string
-     * @since 2.0.0
      */
     public function __toString()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
index 4a5248853b13c..720fc351bea00 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
@@ -11,7 +11,6 @@
 
 /**
  * Pack generator
- * @since 2.0.0
  */
 class Generator
 {
@@ -19,7 +18,6 @@ class Generator
      * Dictionary loader
      *
      * @var \Magento\Setup\Module\I18n\Dictionary\Loader\FileInterface
-     * @since 2.0.0
      */
     protected $dictionaryLoader;
 
@@ -27,7 +25,6 @@ class Generator
      * Pack writer
      *
      * @var \Magento\Setup\Module\I18n\Pack\WriterInterface
-     * @since 2.0.0
      */
     protected $packWriter;
 
@@ -35,7 +32,6 @@ class Generator
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     protected $factory;
 
@@ -45,7 +41,6 @@ class Generator
      * @param \Magento\Setup\Module\I18n\Dictionary\Loader\FileInterface $dictionaryLoader
      * @param \Magento\Setup\Module\I18n\Pack\WriterInterface $packWriter
      * @param \Magento\Setup\Module\I18n\Factory $factory
-     * @since 2.0.0
      */
     public function __construct(
         Dictionary\Loader\FileInterface $dictionaryLoader,
@@ -66,7 +61,6 @@ public function __construct(
      * @param bool $allowDuplicates
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     public function generate(
         $dictionaryPath,
@@ -96,7 +90,6 @@ public function generate(
      *
      * @param array $duplicates
      * @return string
-     * @since 2.0.0
      */
     protected function createDuplicatesPhrasesError($duplicates)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/AbstractFile.php b/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/AbstractFile.php
index d6e8a63da34ff..62319fae3ff19 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/AbstractFile.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/AbstractFile.php
@@ -13,7 +13,6 @@
 
 /**
  * Abstract pack writer
- * @since 2.0.0
  */
 abstract class AbstractFile implements WriterInterface
 {
@@ -21,7 +20,6 @@ abstract class AbstractFile implements WriterInterface
      * Context
      *
      * @var \Magento\Setup\Module\I18n\Context
-     * @since 2.0.0
      */
     protected $_context;
 
@@ -29,7 +27,6 @@ abstract class AbstractFile implements WriterInterface
      * Dictionary loader. This object is need for read dictionary for merge mode
      *
      * @var \Magento\Setup\Module\I18n\Dictionary\Loader\FileInterface
-     * @since 2.0.0
      */
     protected $_dictionaryLoader;
 
@@ -37,7 +34,6 @@ abstract class AbstractFile implements WriterInterface
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -45,7 +41,6 @@ abstract class AbstractFile implements WriterInterface
      * Locale
      *
      * @var \Magento\Setup\Module\I18n\Locale
-     * @since 2.0.0
      */
     protected $_locale;
 
@@ -53,7 +48,6 @@ abstract class AbstractFile implements WriterInterface
      * Save mode. One of const of WriterInterface::MODE_
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_mode;
 
@@ -63,7 +57,6 @@ abstract class AbstractFile implements WriterInterface
      * @param Context $context
      * @param Dictionary\Loader\FileInterface $dictionaryLoader
      * @param Factory $factory
-     * @since 2.0.0
      */
     public function __construct(Context $context, Dictionary\Loader\FileInterface $dictionaryLoader, Factory $factory)
     {
@@ -74,7 +67,6 @@ public function __construct(Context $context, Dictionary\Loader\FileInterface $d
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function write(Dictionary $dictionary, $packPath, Locale $locale, $mode = self::MODE_REPLACE)
     {
@@ -103,7 +95,6 @@ public function writeDictionary(Dictionary $dictionary, Locale $locale, $mode =
      * @param array $phrases
      * @return void
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     abstract public function _writeFile($file, $phrases);
 
@@ -113,7 +104,6 @@ abstract public function _writeFile($file, $phrases);
      * @param Dictionary $dictionary
      * @return array
      * @throws \RuntimeException
-     * @since 2.0.0
      */
     protected function _buildPackFilesData(Dictionary $dictionary)
     {
@@ -148,7 +138,6 @@ protected function _buildPackFilesData(Dictionary $dictionary)
      * Get file extension
      *
      * @return string
-     * @since 2.0.0
      */
     abstract protected function _getFileExtension();
 
@@ -159,7 +148,6 @@ abstract protected function _getFileExtension();
      * @param int $mode
      * @param bool $recursive Allows the creation of nested directories specified in the $destinationPath
      * @return void
-     * @since 2.0.0
      */
     protected function _createDirectoryIfNotExist($destinationPath, $mode = 0777, $recursive = true)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/Csv.php b/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/Csv.php
index b057ca970c099..baeb2328f1f2e 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/Csv.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/Csv.php
@@ -7,7 +7,6 @@
 
 /**
  * Pack writer csv
- * @since 2.0.0
  */
 class Csv extends AbstractFile
 {
@@ -18,7 +17,6 @@ class Csv extends AbstractFile
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function _writeFile($file, $phrases)
     {
@@ -42,7 +40,6 @@ public function _writeFile($file, $phrases)
      * @param string $file
      * @param array $phrases
      * @return array
-     * @since 2.0.0
      */
     protected function _mergeDictionaries($file, $phrases)
     {
@@ -64,7 +61,6 @@ protected function _mergeDictionaries($file, $phrases)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _getFileExtension()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/WriterInterface.php b/setup/src/Magento/Setup/Module/I18n/Pack/WriterInterface.php
index 75b6b705d2a9a..44acb3b16f9f6 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/WriterInterface.php
@@ -10,7 +10,6 @@
 
 /**
  * Pack writer interface
- * @since 2.0.0
  */
 interface WriterInterface
 {
@@ -31,9 +30,8 @@ interface WriterInterface
      * @param \Magento\Setup\Module\I18n\Locale $locale
      * @param string $mode One of const of WriterInterface::MODE_
      * @return void
-     * @deprecated 2.2.0 Writing to a specified pack path is not supported after custom vendor directory support.
+     * @deprecated 2.1.0 Writing to a specified pack path is not supported after custom vendor directory support.
      * Dictionary data will be written to current Magento codebase.
-     * @since 2.0.0
      */
     public function write(Dictionary $dictionary, $packPath, Locale $locale, $mode);
 
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/AbstractParser.php b/setup/src/Magento/Setup/Module/I18n/Parser/AbstractParser.php
index 28daf1f327789..952f14365a3d7 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/AbstractParser.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/AbstractParser.php
@@ -9,7 +9,6 @@
 
 /**
  * Abstract parser
- * @since 2.0.0
  */
 abstract class AbstractParser implements I18n\ParserInterface
 {
@@ -17,7 +16,6 @@ abstract class AbstractParser implements I18n\ParserInterface
      * Files collector
      *
      * @var \Magento\Setup\Module\I18n\FilesCollector
-     * @since 2.0.0
      */
     protected $_filesCollector = [];
 
@@ -25,7 +23,6 @@ abstract class AbstractParser implements I18n\ParserInterface
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     protected $_factory;
 
@@ -33,7 +30,6 @@ abstract class AbstractParser implements I18n\ParserInterface
      * Adapters
      *
      * @var \Magento\Setup\Module\I18n\Parser\AdapterInterface[]
-     * @since 2.0.0
      */
     protected $_adapters = [];
 
@@ -41,7 +37,6 @@ abstract class AbstractParser implements I18n\ParserInterface
      * Parsed phrases
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_phrases = [];
 
@@ -50,7 +45,6 @@ abstract class AbstractParser implements I18n\ParserInterface
      *
      * @param I18n\FilesCollector $filesCollector
      * @param I18n\Factory $factory
-     * @since 2.0.0
      */
     public function __construct(I18n\FilesCollector $filesCollector, I18n\Factory $factory)
     {
@@ -64,7 +58,6 @@ public function __construct(I18n\FilesCollector $filesCollector, I18n\Factory $f
      * @param string $type
      * @param AdapterInterface $adapter
      * @return void
-     * @since 2.0.0
      */
     public function addAdapter($type, AdapterInterface $adapter)
     {
@@ -73,7 +66,6 @@ public function addAdapter($type, AdapterInterface $adapter)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function parse(array $parseOptions)
     {
@@ -90,7 +82,6 @@ public function parse(array $parseOptions)
      *
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     abstract protected function _parseByTypeOptions($options);
 
@@ -100,7 +91,6 @@ abstract protected function _parseByTypeOptions($options);
      * @param array $parseOptions
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _validateOptions($parseOptions)
     {
@@ -124,7 +114,6 @@ protected function _validateOptions($parseOptions)
      *
      * @param array $options
      * @return array
-     * @since 2.0.0
      */
     protected function _getFiles($options)
     {
@@ -135,7 +124,6 @@ protected function _getFiles($options)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPhrases()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/AbstractAdapter.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/AbstractAdapter.php
index 333fa5198a940..6f2f005847f11 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/AbstractAdapter.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/AbstractAdapter.php
@@ -10,7 +10,6 @@
 
 /**
  * Abstract parser adapter
- * @since 2.0.0
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
@@ -18,7 +17,6 @@ abstract class AbstractAdapter implements AdapterInterface
      * Processed file
      *
      * @var string
-     * @since 2.0.0
      */
     protected $_file;
 
@@ -26,13 +24,11 @@ abstract class AbstractAdapter implements AdapterInterface
      * Parsed phrases
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_phrases = [];
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function parse($file)
     {
@@ -45,13 +41,11 @@ public function parse($file)
      * Template method
      *
      * @return void
-     * @since 2.0.0
      */
     abstract protected function _parse();
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getPhrases()
     {
@@ -65,7 +59,6 @@ public function getPhrases()
      * @param string|int $line
      * @return void
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     protected function _addPhrase($phrase, $line = '')
     {
@@ -92,7 +85,6 @@ protected function _addPhrase($phrase, $line = '')
      *
      * @param string $phrase
      * @return string
-     * @since 2.0.0
      */
     protected function _stripFirstAndLastChar($phrase)
     {
@@ -104,7 +96,6 @@ protected function _stripFirstAndLastChar($phrase)
      *
      * @param string $phrase
      * @return bool
-     * @since 2.0.0
      */
     protected function _isFirstAndLastCharIsQuote($phrase)
     {
@@ -118,7 +109,6 @@ protected function _isFirstAndLastCharIsQuote($phrase)
      *
      * @param string $phrase
      * @return string
-     * @since 2.0.0
      */
     protected function getEnclosureCharacter($phrase)
     {
@@ -133,7 +123,6 @@ protected function getEnclosureCharacter($phrase)
     /**
      * @param string $phrase
      * @return string
-     * @since 2.0.0
      */
     protected function trimEnclosure($phrase)
     {
@@ -143,7 +132,6 @@ protected function trimEnclosure($phrase)
     /**
      * @param string $char
      * @return bool
-     * @since 2.0.0
      */
     protected function isQuote($char)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
index 6e6500345d6be..a4e3063abece4 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
@@ -9,7 +9,6 @@
 
 /**
  * Html parser adapter
- * @since 2.0.0
  */
 class Html extends AbstractAdapter
 {
@@ -22,7 +21,6 @@ class Html extends AbstractAdapter
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _parse()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
index 2e24ac421e391..4095b12c9a6c6 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
@@ -7,13 +7,11 @@
 
 /**
  * Js parser adapter
- * @since 2.0.0
  */
 class Js extends AbstractAdapter
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _parse()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php.php
index 1925bbb2484ad..74736d575fd80 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php.php
@@ -9,7 +9,6 @@
 
 /**
  * Php parser adapter
- * @since 2.0.0
  */
 class Php extends AbstractAdapter
 {
@@ -17,7 +16,6 @@ class Php extends AbstractAdapter
      * Phrase collector
      *
      * @var \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
-     * @since 2.0.0
      */
     protected $_phraseCollector;
 
@@ -25,7 +23,6 @@ class Php extends AbstractAdapter
      * Adapter construct
      *
      * @param \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector $phraseCollector
-     * @since 2.0.0
      */
     public function __construct(PhraseCollector $phraseCollector)
     {
@@ -34,7 +31,6 @@ public function __construct(PhraseCollector $phraseCollector)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _parse()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer.php
index 72d78dcb7ad7e..a7f55a9c9eb5d 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer.php
@@ -7,7 +7,6 @@
 
 /**
  * Tokenizer
- * @since 2.0.0
  */
 class Tokenizer
 {
@@ -15,7 +14,6 @@ class Tokenizer
      * Tokens
      *
      * @var array
-     * @since 2.0.0
      */
     private $_tokens = [];
 
@@ -23,7 +21,6 @@ class Tokenizer
      * Tokens count
      *
      * @var int
-     * @since 2.0.0
      */
     private $_tokensCount;
 
@@ -31,7 +28,6 @@ class Tokenizer
      * Open brackets
      *
      * @var int
-     * @since 2.0.0
      */
     private $_openBrackets;
 
@@ -39,7 +35,6 @@ class Tokenizer
      * Close brackets
      *
      * @var int
-     * @since 2.0.0
      */
     private $_closeBrackets;
 
@@ -48,7 +43,6 @@ class Tokenizer
      *
      * @param string $filePath
      * @return void
-     * @since 2.0.0
      */
     public function parse($filePath)
     {
@@ -62,7 +56,6 @@ public function parse($filePath)
      * @param string $className
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function isMatchingClass($className)
     {
@@ -98,7 +91,6 @@ public function isMatchingClass($className)
      * Get arguments tokens of function
      *
      * @return array
-     * @since 2.0.0
      */
     public function getFunctionArgumentsTokens()
     {
@@ -138,7 +130,6 @@ public function getFunctionArgumentsTokens()
      * Whenever inner argument closed
      *
      * @return bool
-     * @since 2.0.0
      */
     private function _isInnerArgumentClosed()
     {
@@ -149,7 +140,6 @@ private function _isInnerArgumentClosed()
      * Skip invoke the inner argument of function
      *
      * @return void
-     * @since 2.0.0
      */
     private function _skipInnerArgumentInvoke()
     {
@@ -169,7 +159,6 @@ private function _skipInnerArgumentInvoke()
      * Get current token
      *
      * @return \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\Token
-     * @since 2.0.0
      */
     public function getCurrentToken()
     {
@@ -180,7 +169,6 @@ public function getCurrentToken()
      * Get next token
      *
      * @return bool|\Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\Token
-     * @since 2.0.0
      */
     public function getNextToken()
     {
@@ -191,7 +179,6 @@ public function getNextToken()
      * Get next token skipping all whitespaces
      *
      * @return \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\Token|false
-     * @since 2.0.0
      */
     public function getNextRealToken()
     {
@@ -205,7 +192,6 @@ public function getNextRealToken()
      * Check if it is end of loop
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isEndOfLoop()
     {
@@ -217,7 +203,6 @@ public function isEndOfLoop()
      *
      * @param array|string $tokenData
      * @return \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\Token
-     * @since 2.0.0
      */
     private function _createToken($tokenData)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index dc3d69301e16b..21f087bfd5aad 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -9,13 +9,11 @@
 
 /**
  * PhraseCollector
- * @since 2.0.0
  */
 class PhraseCollector
 {
     /**
      * @var \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer
-     * @since 2.0.0
      */
     protected $_tokenizer;
 
@@ -23,7 +21,6 @@ class PhraseCollector
      * Phrases
      *
      * @var array
-     * @since 2.0.0
      */
     protected $_phrases = [];
 
@@ -31,7 +28,6 @@ class PhraseCollector
      * Processed file
      *
      * @var \SplFileInfo
-     * @since 2.0.0
      */
     protected $_file;
 
@@ -39,13 +35,11 @@ class PhraseCollector
      * Are the Phrase objects are parsed as well
      *
      * @var bool
-     * @since 2.0.0
      */
     protected $includeObjects = false;
 
     /**
      * The class name of the phrase object
-     * @since 2.0.0
      */
     protected $className = 'Phrase';
 
@@ -55,7 +49,6 @@ class PhraseCollector
      * @param Tokenizer $tokenizer
      * @param bool $includeObjects
      * @param String $className
-     * @since 2.0.0
      */
     public function __construct(Tokenizer $tokenizer, $includeObjects = false, $className = 'Phrase')
     {
@@ -68,7 +61,6 @@ public function __construct(Tokenizer $tokenizer, $includeObjects = false, $clas
      * Get phrases for given file
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPhrases()
     {
@@ -80,7 +72,6 @@ public function getPhrases()
      *
      * @param string $file
      * @return void
-     * @since 2.0.0
      */
     public function parse($file)
     {
@@ -96,7 +87,6 @@ public function parse($file)
      * Extract phrases from given tokens. e.g.: __('phrase', ...)
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _extractPhrases()
     {
@@ -110,7 +100,6 @@ protected function _extractPhrases()
     /**
      * @param Token $firstToken
      * @return bool
-     * @since 2.0.0
      */
     protected function extractMethodPhrase(Token $firstToken)
     {
@@ -131,7 +120,6 @@ protected function extractMethodPhrase(Token $firstToken)
     /**
      * @param Token $firstToken
      * @return bool
-     * @since 2.0.0
      */
     protected function extractObjectPhrase(Token $firstToken)
     {
@@ -151,7 +139,6 @@ protected function extractObjectPhrase(Token $firstToken)
      *
      * @param array $phraseTokens
      * @return string|null
-     * @since 2.0.0
      */
     protected function _collectPhrase($phraseTokens)
     {
@@ -178,7 +165,6 @@ protected function _collectPhrase($phraseTokens)
      * @param \SplFileInfo $file
      * @param int $line
      * @return void
-     * @since 2.0.0
      */
     protected function _addPhrase($phrase, $argumentsAmount, $file, $line)
     {
@@ -193,7 +179,6 @@ protected function _addPhrase($phrase, $argumentsAmount, $file, $line)
     /**
      * @param bool $includeObjects
      * @return $this
-     * @since 2.0.0
      */
     public function setIncludeObjects($includeObjects = true)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php
index 5f40c53ff2822..d7e04c45e0104 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php
@@ -7,7 +7,6 @@
 
 /**
  * Token
- * @since 2.0.0
  */
 class Token
 {
@@ -15,7 +14,6 @@ class Token
      * Value
      *
      * @var int|string
-     * @since 2.0.0
      */
     private $_value;
 
@@ -23,7 +21,6 @@ class Token
      * Name
      *
      * @var int|string
-     * @since 2.0.0
      */
     private $_name;
 
@@ -31,7 +28,6 @@ class Token
      * Line
      *
      * @var int
-     * @since 2.0.0
      */
     private $_line;
 
@@ -41,7 +37,6 @@ class Token
      * @param int|string $name
      * @param int|string $value
      * @param int $line
-     * @since 2.0.0
      */
     public function __construct($name, $value, $line = 0)
     {
@@ -54,7 +49,6 @@ public function __construct($name, $value, $line = 0)
      * Get token name
      *
      * @return int|string
-     * @since 2.0.0
      */
     public function getName()
     {
@@ -65,7 +59,6 @@ public function getName()
      * Get token value
      *
      * @return int|string
-     * @since 2.0.0
      */
     public function getValue()
     {
@@ -76,7 +69,6 @@ public function getValue()
      * Get line of token beginning
      *
      * @return int
-     * @since 2.0.0
      */
     public function getLine()
     {
@@ -87,7 +79,6 @@ public function getLine()
      * Is "new" operator
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNew()
     {
@@ -99,7 +90,6 @@ public function isNew()
      *
      * @param string $functionName
      * @return bool
-     * @since 2.0.0
      */
     public function isEqualFunction($functionName)
     {
@@ -110,7 +100,6 @@ public function isEqualFunction($functionName)
      * Is object operator
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isObjectOperator()
     {
@@ -121,7 +110,6 @@ public function isObjectOperator()
      * Is whitespace
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isWhitespace()
     {
@@ -132,7 +120,6 @@ public function isWhitespace()
      * Is constant encapsed string
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isConstantEncapsedString()
     {
@@ -143,7 +130,6 @@ public function isConstantEncapsedString()
      * Is open brace
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isOpenBrace()
     {
@@ -154,7 +140,6 @@ public function isOpenBrace()
      * Is close brace
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isCloseBrace()
     {
@@ -165,7 +150,6 @@ public function isCloseBrace()
      * Is comma
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isComma()
     {
@@ -176,7 +160,6 @@ public function isComma()
      * Is semicolon
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isSemicolon()
     {
@@ -185,7 +168,6 @@ public function isSemicolon()
 
     /**
      * @return bool
-     * @since 2.0.0
      */
     public function isConcatenateOperator()
     {
@@ -196,7 +178,6 @@ public function isConcatenateOperator()
      * Is namespace separator
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isNamespaceSeparator()
     {
@@ -207,7 +188,6 @@ public function isNamespaceSeparator()
      * Is identifier
      *
      * @return bool
-     * @since 2.0.0
      */
     public function isIdentifier()
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
index ae5de540c225f..1ee5e5bd112e6 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
@@ -9,7 +9,6 @@
 
 /**
  * MethodCollector
- * @since 2.0.0
  */
 class MethodCollector extends PhraseCollector
 {
@@ -17,7 +16,6 @@ class MethodCollector extends PhraseCollector
      * Extract phrases from given tokens. e.g.: __('phrase', ...)
      *
      * @return void
-     * @since 2.0.0
      */
     protected function _extractPhrases()
     {
@@ -37,7 +35,6 @@ protected function _extractPhrases()
      *
      * @param \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\Token $token
      * @return bool
-     * @since 2.0.0
      */
     protected function _isTranslateFunction($token)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
index 2e917c1721872..ab10aee3da9f3 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
@@ -12,13 +12,11 @@
  * Parse "translate" and 'translatable' node and collect phrases:
  * - from itself, it @translate or @translatable == true
  * - from given attributes, split by ",", " "
- * @since 2.0.0
  */
 class Xml extends AbstractAdapter
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     protected function _parse()
     {
@@ -40,7 +38,6 @@ protected function _parse()
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     protected function _getNodes($file)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/AdapterInterface.php b/setup/src/Magento/Setup/Module/I18n/Parser/AdapterInterface.php
index 20984b54b0b52..974e2c27a8190 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/AdapterInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/AdapterInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Adapter Interface
- * @since 2.0.0
  */
 interface AdapterInterface
 {
@@ -16,7 +15,6 @@ interface AdapterInterface
      *
      * @param string $file
      * @return array
-     * @since 2.0.0
      */
     public function parse($file);
 
@@ -24,7 +22,6 @@ public function parse($file);
      * Get parsed phrases
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPhrases();
 }
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
index 357414ae15c0a..a15fb64d92c52 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
@@ -9,7 +9,6 @@
 
 /**
  * Contextual Parser
- * @since 2.0.0
  */
 class Contextual extends AbstractParser
 {
@@ -17,7 +16,6 @@ class Contextual extends AbstractParser
      * Context
      *
      * @var \Magento\Setup\Module\I18n\Context
-     * @since 2.0.0
      */
     protected $_context;
 
@@ -27,7 +25,6 @@ class Contextual extends AbstractParser
      * @param I18n\FilesCollector $filesCollector
      * @param I18n\Factory $factory
      * @param I18n\Context $context
-     * @since 2.0.0
      */
     public function __construct(I18n\FilesCollector $filesCollector, I18n\Factory $factory, I18n\Context $context)
     {
@@ -41,7 +38,6 @@ public function __construct(I18n\FilesCollector $filesCollector, I18n\Factory $f
      *
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     protected function _parseByTypeOptions($options)
     {
@@ -64,7 +60,6 @@ protected function _parseByTypeOptions($options)
      * @param string $contextType
      * @param string $contextValue
      * @return void
-     * @since 2.0.0
      */
     protected function _addPhrase($phraseData, $contextType, $contextValue)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Parser.php b/setup/src/Magento/Setup/Module/I18n/Parser/Parser.php
index 8e79dac69a34a..a6c65cd23aa27 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Parser.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Parser.php
@@ -7,7 +7,6 @@
 
 /**
  * Parser
- * @since 2.0.0
  */
 class Parser extends AbstractParser
 {
@@ -16,7 +15,6 @@ class Parser extends AbstractParser
      *
      * @param array $options
      * @return void
-     * @since 2.0.0
      */
     protected function _parseByTypeOptions($options)
     {
@@ -35,7 +33,6 @@ protected function _parseByTypeOptions($options)
      *
      * @param array $phraseData
      * @return void
-     * @since 2.0.0
      */
     protected function _addPhrase($phraseData)
     {
diff --git a/setup/src/Magento/Setup/Module/I18n/ParserInterface.php b/setup/src/Magento/Setup/Module/I18n/ParserInterface.php
index c9bed2990eb98..57f1e227dc255 100644
--- a/setup/src/Magento/Setup/Module/I18n/ParserInterface.php
+++ b/setup/src/Magento/Setup/Module/I18n/ParserInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Parser Interface
- * @since 2.0.0
  */
 interface ParserInterface
 {
@@ -16,7 +15,6 @@ interface ParserInterface
      *
      * @param array $parseOptions
      * @return array
-     * @since 2.0.0
      */
     public function parse(array $parseOptions);
 
@@ -24,7 +22,6 @@ public function parse(array $parseOptions);
      * Get parsed phrases
      *
      * @return array
-     * @since 2.0.0
      */
     public function getPhrases();
 }
diff --git a/setup/src/Magento/Setup/Module/I18n/ServiceLocator.php b/setup/src/Magento/Setup/Module/I18n/ServiceLocator.php
index 6a48d12f7e00a..a3964d7df1b86 100644
--- a/setup/src/Magento/Setup/Module/I18n/ServiceLocator.php
+++ b/setup/src/Magento/Setup/Module/I18n/ServiceLocator.php
@@ -10,7 +10,6 @@
 /**
  *  Service Locator (instead DI container)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class ServiceLocator
 {
@@ -18,7 +17,6 @@ class ServiceLocator
      * Domain abstract factory
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     private static $_factory;
 
@@ -26,7 +24,6 @@ class ServiceLocator
      * Context manager
      *
      * @var \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     private static $_context;
 
@@ -34,7 +31,6 @@ class ServiceLocator
      * Dictionary generator
      *
      * @var \Magento\Setup\Module\I18n\Dictionary\Generator
-     * @since 2.0.0
      */
     private static $_dictionaryGenerator;
 
@@ -42,7 +38,6 @@ class ServiceLocator
      * Pack generator
      *
      * @var \Magento\Setup\Module\I18n\Pack\Generator
-     * @since 2.0.0
      */
     private static $_packGenerator;
 
@@ -50,7 +45,6 @@ class ServiceLocator
      * Get dictionary generator
      *
      * @return \Magento\Setup\Module\I18n\Dictionary\Generator
-     * @since 2.0.0
      */
     public static function getDictionaryGenerator()
     {
@@ -86,7 +80,6 @@ public static function getDictionaryGenerator()
      * Get pack generator
      *
      * @return \Magento\Setup\Module\I18n\Pack\Generator
-     * @since 2.0.0
      */
     public static function getPackGenerator()
     {
@@ -103,7 +96,6 @@ public static function getPackGenerator()
      * Get factory
      *
      * @return \Magento\Setup\Module\I18n\Factory
-     * @since 2.0.0
      */
     private static function _getFactory()
     {
@@ -117,7 +109,6 @@ private static function _getFactory()
      * Get context
      *
      * @return \Magento\Setup\Module\I18n\Context
-     * @since 2.0.0
      */
     private static function _getContext()
     {
diff --git a/setup/src/Magento/Setup/Module/ResourceFactory.php b/setup/src/Magento/Setup/Module/ResourceFactory.php
index 6a831624e5eeb..ea3c29316074e 100644
--- a/setup/src/Magento/Setup/Module/ResourceFactory.php
+++ b/setup/src/Magento/Setup/Module/ResourceFactory.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Setup\Module\ResourceFactory
  *
- * @since 2.0.0
  */
 class ResourceFactory
 {
@@ -20,7 +19,6 @@ class ResourceFactory
      * Zend Framework's service locator
      *
      * @var ServiceLocatorInterface
-     * @since 2.0.0
      */
     protected $serviceLocator;
 
@@ -28,7 +26,6 @@ class ResourceFactory
      * Constructor
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @since 2.0.0
      */
     public function __construct(ServiceLocatorInterface $serviceLocator)
     {
@@ -38,7 +35,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
     /**
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @return Resource
-     * @since 2.0.0
      */
     public function create(\Magento\Framework\App\DeploymentConfig $deploymentConfig)
     {
diff --git a/setup/src/Magento/Setup/Module/Setup.php b/setup/src/Magento/Setup/Module/Setup.php
index d46c9b1b77118..5c5d9a65ec901 100644
--- a/setup/src/Magento/Setup/Module/Setup.php
+++ b/setup/src/Magento/Setup/Module/Setup.php
@@ -10,7 +10,6 @@
 
 /**
  * @api
- * @since 2.0.0
  */
 class Setup extends \Magento\Framework\Module\Setup implements SchemaSetupInterface
 {
@@ -22,7 +21,6 @@ class Setup extends \Magento\Framework\Module\Setup implements SchemaSetupInterf
      * @param string $indexType
      * @param string $connectionName
      * @return string
-     * @since 2.0.0
      */
     public function getIdxName(
         $tableName,
@@ -42,7 +40,6 @@ public function getIdxName(
      * @param string $refColumnName the reference table column name
      * @param string $connectionName
      * @return string
-     * @since 2.0.0
      */
     public function getFkName(
         $priTableName,
diff --git a/setup/src/Magento/Setup/Module/Setup/ResourceConfig.php b/setup/src/Magento/Setup/Module/Setup/ResourceConfig.php
index 170227609ab7c..76450451289ca 100644
--- a/setup/src/Magento/Setup/Module/Setup/ResourceConfig.php
+++ b/setup/src/Magento/Setup/Module/Setup/ResourceConfig.php
@@ -7,13 +7,11 @@
 
 /**
  * Simplified resource config for Setup tools
- * @since 2.0.0
  */
 class ResourceConfig implements \Magento\Framework\App\ResourceConnection\ConfigInterface
 {
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function getConnectionName($resourceName)
     {
diff --git a/setup/src/Magento/Setup/Module/Setup/SetupCache.php b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
index 592f35f177395..8de00c6cb6ffb 100644
--- a/setup/src/Magento/Setup/Module/Setup/SetupCache.php
+++ b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
@@ -9,7 +9,6 @@
 
 /**
  * In-memory cache of DB data
- * @since 2.0.0
  */
 class SetupCache implements DataCacheInterface
 {
@@ -17,13 +16,11 @@ class SetupCache implements DataCacheInterface
      * Cache storage
      *
      * @var array
-     * @since 2.0.0
      */
     private $data = [];
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setRow($table, $parentId, $rowId, $value)
     {
@@ -32,7 +29,6 @@ public function setRow($table, $parentId, $rowId, $value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function setField($table, $parentId, $rowId, $field, $value)
     {
@@ -41,7 +37,6 @@ public function setField($table, $parentId, $rowId, $field, $value)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function get($table, $parentId, $rowId, $field = null)
     {
@@ -58,7 +53,6 @@ public function get($table, $parentId, $rowId, $field = null)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function remove($table, $parentId, $rowId)
     {
@@ -69,7 +63,6 @@ public function remove($table, $parentId, $rowId)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function has($table, $parentId, $rowId, $field = null)
     {
diff --git a/setup/src/Magento/Setup/Module/SetupFactory.php b/setup/src/Magento/Setup/Module/SetupFactory.php
index 0c94fa59b1b8c..6f1063a6e7495 100644
--- a/setup/src/Magento/Setup/Module/SetupFactory.php
+++ b/setup/src/Magento/Setup/Module/SetupFactory.php
@@ -12,13 +12,11 @@
  * Factory class to create Setup
  *
  * @api
- * @since 2.0.0
  */
 class SetupFactory
 {
     /**
      * @var ObjectManagerProvider
-     * @since 2.0.0
      */
     private $objectManagerProvider;
 
@@ -26,7 +24,6 @@ class SetupFactory
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @since 2.0.0
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
     {
@@ -38,7 +35,6 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
      *
      * @param ResourceConnection $appResource
      * @return Setup
-     * @since 2.0.0
      */
     public function create(ResourceConnection $appResource = null)
     {
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
index 1adf1951abedd..83b5ec2502daf 100644
--- a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
+++ b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
@@ -29,7 +29,6 @@
  * A listener that injects relevant Magento initialization parameters and initializes filesystem
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 2.0.0
  */
 class InitParamListener implements ListenerAggregateInterface, FactoryInterface
 {
@@ -40,7 +39,6 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
 
     /**
      * @var \Zend\Stdlib\CallbackHandler[]
-     * @since 2.0.0
      */
     private $listeners = [];
 
@@ -48,7 +46,6 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
      * List of controllers and their actions which should be skipped from auth check
      *
      * @var array
-     * @since 2.0.0
      */
     private $controllersToSkip = [
         \Magento\Setup\Controller\Session::class => ['index', 'unlogin'],
@@ -61,7 +58,6 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
      * The $priority argument is added to support latest versions of Zend Event Manager.
      * Starting from Zend Event Manager 3.0.0 release the ListenerAggregateInterface::attach()
      * supports the `priority` argument.
-     * @since 2.0.0
      */
     public function attach(EventManagerInterface $events, $priority = 1)
     {
@@ -76,7 +72,6 @@ public function attach(EventManagerInterface $events, $priority = 1)
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function detach(EventManagerInterface $events)
     {
@@ -92,7 +87,6 @@ public function detach(EventManagerInterface $events)
      *
      * @param MvcEvent $e
      * @return void
-     * @since 2.0.0
      */
     public function onBootstrap(MvcEvent $e)
     {
@@ -116,7 +110,6 @@ public function onBootstrap(MvcEvent $e)
      * @param \Zend\Mvc\MvcEvent $event
      * @return false|\Zend\Http\Response
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 2.0.0
      */
     public function authPreDispatch($event)
     {
@@ -180,7 +173,7 @@ public function authPreDispatch($event)
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @return string
-     * @since 2.1.0
+     * @since 2.0.6
      */
     private function getSetupCookiePath(\Magento\Framework\ObjectManagerInterface $objectManager)
     {
@@ -197,7 +190,6 @@ private function getSetupCookiePath(\Magento\Framework\ObjectManagerInterface $o
 
     /**
      * {@inheritdoc}
-     * @since 2.0.0
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
@@ -214,7 +206,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
      *
      * @param Application $application
      * @return array
-     * @since 2.0.0
      */
     private function extractInitParameters(Application $application)
     {
@@ -239,7 +230,6 @@ private function extractInitParameters(Application $application)
      *
      * @param RequestInterface $request
      * @return array
-     * @since 2.0.0
      */
     private function extractFromCli(RequestInterface $request)
     {
@@ -262,7 +252,6 @@ private function extractFromCli(RequestInterface $request)
      * @param array $initParams
      * @return DirectoryList
      * @throws \LogicException
-     * @since 2.0.0
      */
     public function createDirectoryList($initParams)
     {
@@ -279,7 +268,6 @@ public function createDirectoryList($initParams)
      *
      * @param DirectoryList $directoryList
      * @return Filesystem
-     * @since 2.0.0
      */
     public function createFilesystem(DirectoryList $directoryList)
     {
diff --git a/setup/src/Magento/Setup/Mvc/View/Http/InjectTemplateListener.php b/setup/src/Magento/Setup/Mvc/View/Http/InjectTemplateListener.php
index ca0f3e9277d62..641ad7bd41f3b 100644
--- a/setup/src/Magento/Setup/Mvc/View/Http/InjectTemplateListener.php
+++ b/setup/src/Magento/Setup/Mvc/View/Http/InjectTemplateListener.php
@@ -12,7 +12,6 @@
 /**
  * Class \Magento\Setup\Mvc\View\Http\InjectTemplateListener
  *
- * @since 2.0.0
  */
 class InjectTemplateListener extends ZendInjectTemplateListener
 {
@@ -21,7 +20,6 @@ class InjectTemplateListener extends ZendInjectTemplateListener
      *
      * @param  string $controller
      * @return string
-     * @since 2.0.0
      */
     protected function deriveModuleNamespace($controller)
     {
@@ -38,7 +36,6 @@ protected function deriveModuleNamespace($controller)
     /**
      * @param string $namespace
      * @return string
-     * @since 2.0.0
      */
     protected function deriveControllerSubNamespace($namespace)
     {
@@ -63,7 +60,6 @@ protected function deriveControllerSubNamespace($namespace)
      *
      * @param  MvcEvent $e
      * @return void
-     * @since 2.0.0
      */
     public function injectTemplate(MvcEvent $e)
     {
diff --git a/setup/src/Magento/Setup/Validator/DbValidator.php b/setup/src/Magento/Setup/Validator/DbValidator.php
index 5499f1c993565..1eae39160ff8e 100644
--- a/setup/src/Magento/Setup/Validator/DbValidator.php
+++ b/setup/src/Magento/Setup/Validator/DbValidator.php
@@ -12,7 +12,6 @@
 
 /**
  * Class DbValidator - validates DB related settings
- * @since 2.0.0
  */
 class DbValidator
 {
@@ -26,7 +25,6 @@ class DbValidator
      * DB connection factory
      *
      * @var ConnectionFactory
-     * @since 2.0.0
      */
     private $connectionFactory;
 
@@ -34,7 +32,6 @@ class DbValidator
      * Constructor
      *
      * @param ConnectionFactory $connectionFactory
-     * @since 2.0.0
      */
     public function __construct(ConnectionFactory $connectionFactory)
     {
@@ -47,7 +44,6 @@ public function __construct(ConnectionFactory $connectionFactory)
      * @param string $prefix
      * @return boolean
      * @throws \InvalidArgumentException
-     * @since 2.0.0
      */
     public function checkDatabaseTablePrefix($prefix)
     {
@@ -78,7 +74,6 @@ public function checkDatabaseTablePrefix($prefix)
      * @param string $dbPass
      * @return boolean
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
     {
@@ -118,7 +113,6 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
      * @param string $dbName
      * @return bool
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     private function checkDatabaseName(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $dbName)
     {
@@ -142,7 +136,6 @@ private function checkDatabaseName(\Magento\Framework\DB\Adapter\AdapterInterfac
      * @param string $dbName
      * @return bool
      * @throws \Magento\Setup\Exception
-     * @since 2.0.0
      */
     private function checkDatabasePrivileges(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $dbName)
     {
@@ -191,7 +184,6 @@ private function checkDatabasePrivileges(\Magento\Framework\DB\Adapter\AdapterIn
      *
      * @param array $grantInfo
      * @return array
-     * @since 2.0.0
      */
     private function parseGrantInfo(array $grantInfo)
     {
diff --git a/setup/src/Magento/Setup/Validator/IpValidator.php b/setup/src/Magento/Setup/Validator/IpValidator.php
index 9a4ef966fc4c4..1b5624c0c6ffe 100644
--- a/setup/src/Magento/Setup/Validator/IpValidator.php
+++ b/setup/src/Magento/Setup/Validator/IpValidator.php
@@ -7,25 +7,21 @@
 
 /**
  * Class to validate list of IPs for maintenance commands
- * @since 2.0.0
  */
 class IpValidator
 {
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $none;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $validIps;
 
     /**
      * @var string[]
-     * @since 2.0.0
      */
     private $invalidIps;
 
@@ -36,7 +32,6 @@ class IpValidator
      * @param bool $noneAllowed
      * @return string[]
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @since 2.0.0
      */
     public function validateIps(array $ips, $noneAllowed)
     {
@@ -68,7 +63,6 @@ public function validateIps(array $ips, $noneAllowed)
      *
      * @param string[] $ips
      * @return void
-     * @since 2.0.0
      */
     private function filterIps(array $ips)
     {